Dmitry Timoshkov : explorer: Make initialize_display_settings work with a Win9x version of rpcrt4.

Alexandre Julliard julliard at winehq.org
Wed Dec 5 06:56:38 CST 2007


Module: wine
Branch: master
Commit: 8d2ef748611ae3999a77926d8d88cde1a3dc3d87
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8d2ef748611ae3999a77926d8d88cde1a3dc3d87

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Wed Dec  5 13:03:10 2007 +0800

explorer: Make initialize_display_settings work with a Win9x version of rpcrt4.

---

 programs/explorer/desktop.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index e67f680..743da35 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -121,18 +121,18 @@ static void initialize_display_settings( HWND desktop )
         '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_',
         'd','e','v','i','c','e','_','g','u','i','d',0 };
     GUID guid;
-    LPWSTR guid_str;
+    RPC_CSTR guid_str;
     ATOM guid_atom;
     DEVMODEW dmW;
 
     UuidCreate( &guid );
-    UuidToStringW( &guid, &guid_str );
-    WINE_TRACE( "display guid %s\n", wine_dbgstr_w(guid_str) );
+    UuidToStringA( &guid, &guid_str );
+    WINE_TRACE( "display guid %s\n", guid_str );
 
-    guid_atom = GlobalAddAtomW( guid_str );
+    guid_atom = GlobalAddAtomA( (LPCSTR)guid_str );
     SetPropW( desktop, display_device_guid_propW, ULongToHandle(guid_atom) );
 
-    RpcStringFreeW( &guid_str );
+    RpcStringFreeA( &guid_str );
 
     /* Store current display mode in the registry */
     if (EnumDisplaySettingsExW( NULL, ENUM_CURRENT_SETTINGS, &dmW, 0 ))




More information about the wine-cvs mailing list