[glib/glib-2-36] gio/gdbusaddress.c: Silence RunDLL errors

[Chun-wei Fan <fanchunwei src gnome org>]

commit 85b4abfaf8de7983b27855d6c6f5d5e84d7fefa3
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Aug 15 21:27:02 2013 +0800

    gio/gdbusaddress.c: Silence RunDLL errors
    
    The RunDLL command call during get_session_address_dbus_launch() was
    expecting _g_win32_run_session_bus 16 and g_win32_run_session_bus
    on Win32 and Win64 respectively at least when GLib is compiled with MSVC,
    not g_win32_run_session_bus 16, which caused annoying RunDLL error dialogue
    boxes to show up during the use of GtkApplication (such as when running
    gtk3-demo-application on Windows), prevented GtkApplication items from
    being run for more than one time during the lifespan of the program,
    and this also interfered with some GTK+ tests, causing them to fail.
    
    Update accordingly to address the issue.

 gio/gdbusaddress.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index cc9703c..7bfcffd 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -1400,7 +1400,15 @@ get_session_address_dbus_launch (GError **error)
          wcscat (args, rundll_path);
          wcscat (args, L"\" ");
          wcscat (args, gio_path_short);
+#ifdef _MSC_VER
+#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
+         wcscat (args, L",g_win32_run_session_bus");
+#else
+         wcscat (args, L",_g_win32_run_session_bus 16");
+#endif
+#else
          wcscat (args, L",g_win32_run_session_bus 16");
+#endif
 
          res = CreateProcessW (rundll_path, args,
                                0, 0, FALSE,