Changeset 5311 for trunk/src/DPlayX/dplobby.cpp

Timestamp:

Mar 14, 2001, 12:13:28 AM (24 years ago)

Author:

hugh

Message:

Synced with WINE

File:

• trunk/src/DPlayX/dplobby.cpp (modified) (16 diffs)

trunk/src/DPlayX/dplobby.cpp

@@ -1 @@
-// $Id: dplobby.cpp,v 1.3 2000-10-06 19:49:05 hugh Exp $
+// $Id: dplobby.cpp,v 1.4 2001-03-13 23:13:27 hugh Exp $
 /* Direct Play Lobby 2 & 3 Implementation
  *
@@ -16 +16 @@
 #include "winnt.h"
 #include "winreg.h"
+#include "winnls.h"
 #include "heap.h"
 #include "heapstring.h"
@@ -26 +27 @@
 #include "dplayx_queue.h"
 
-DEFAULT_DEBUG_CHANNEL(dplay)
+DEFAULT_DEBUG_CHANNEL(dplay);
 
 #undef  debugstr_guid
@@ -363 +364 @@
 
   CopyMemory( *ppvObj, iface, sizeof( IDirectPlayLobbyWImpl )  );
-  (*(IDirectPlayLobbyWImpl**)ppvObj)->ulInterfaceRef = 0;
+  (*(IDirectPlayLobbyAImpl**)ppvObj)->ulInterfaceRef = 0;
 
   if( IsEqualGUID( &IID_IDirectPlayLobby, riid ) )
@@ -767 +768 @@
       char     atSubKey[51];
       char     returnBuffer[51];
-      LPWSTR   lpWGUIDString;
+      WCHAR    buff[51];
       DWORD    dwAtIndex;
       LPSTR    atKey = "Address Types";
@@ -793 +794 @@
 
       /* FIXME: Check return types to ensure we're interpreting data right */
-      lpWGUIDString = HEAP_strdupAtoW( GetProcessHeap(), 0, returnBuffer );
-      CLSIDFromString( (LPCOLESTR)lpWGUIDString, &serviceProviderGUID );
-      HeapFree( GetProcessHeap(), 0, lpWGUIDString );
+      MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) );
+      CLSIDFromString( (LPCOLESTR)buff, &serviceProviderGUID );
       /* FIXME: Have I got a memory leak on the serviceProviderGUID? */
 
@@ -821 +821 @@
 
         /* FIXME: Check return types to ensure we're interpreting data right */
-        lpWGUIDString = HEAP_strdupAtoW( GetProcessHeap(), 0, atSubKey );
-        CLSIDFromString( (LPCOLESTR)lpWGUIDString, &serviceProviderGUID );
-        HeapFree( GetProcessHeap(), 0, lpWGUIDString );
+        MultiByteToWideChar( CP_ACP, 0, atSubKey, -1, buff, sizeof(buff)/sizeof(WCHAR) );
+        CLSIDFromString( (LPCOLESTR)buff, &serviceProviderGUID );
         /* FIXME: Have I got a memory leak on the serviceProviderGUID? */
 
@@ -918 +917 @@
     DWORD      returnTypeGUID, sizeOfReturnBuffer = 50;
     char       returnBuffer[51];
-    LPWSTR     lpWGUIDString;
+    WCHAR      buff[51];
     DPLAPPINFO dplAppInfo;
 
@@ -940 +939 @@
 
     /* FIXME: Check return types to ensure we're interpreting data right */
-    lpWGUIDString = HEAP_strdupAtoW( GetProcessHeap(), 0, returnBuffer );
-    CLSIDFromString( (LPCOLESTR)lpWGUIDString, &serviceProviderGUID );
-    HeapFree( GetProcessHeap(), 0, lpWGUIDString );
+    MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) );
+    CLSIDFromString( (LPCOLESTR)buff, &serviceProviderGUID );
     /* FIXME: Have I got a memory leak on the serviceProviderGUID? */
 
     dplAppInfo.dwSize               = sizeof( dplAppInfo );
     dplAppInfo.guidApplication      = serviceProviderGUID;
-    dplAppInfo.appName.lpszAppNameA = subKeyName;
+    dplAppInfo.u.lpszAppNameA = subKeyName;
 
     EnterCriticalSection( &This->unk->DPL_lock );
@@ -1096 +1094 @@
     else
     {
-      lpData->lpszCommandLine = HEAP_strdupA( GetProcessHeap(), HEAP_ZERO_MEMORY, returnBuffer );
+        if ((lpData->lpszCommandLine = (LPSTR)HeapAlloc( GetProcessHeap(), 0, strlen(returnBuffer)+1 )))
+            strcpy( lpData->lpszCommandLine, returnBuffer );
     }
 
@@ -1109 +1108 @@
     else
     {
-      lpData->lpszCurrentDirectory = HEAP_strdupA( GetProcessHeap(), HEAP_ZERO_MEMORY, returnBuffer );
+        if ((lpData->lpszCurrentDirectory = (LPSTR)HeapAlloc( GetProcessHeap(), 0, strlen(returnBuffer)+1 )))
+            strcpy( lpData->lpszCurrentDirectory, returnBuffer );
     }
 
@@ -1122 +1122 @@
     else
     {
-      lpData->lpszFileName = HEAP_strdupA( GetProcessHeap(), HEAP_ZERO_MEMORY, returnBuffer );
+        if ((lpData->lpszFileName = (LPSTR)HeapAlloc( GetProcessHeap(), 0, strlen(returnBuffer)+1 )))
+            strcpy( lpData->lpszFileName, returnBuffer );
     }
 
@@ -1135 +1136 @@
     else
     {
-      lpData->lpszPath = HEAP_strdupA( GetProcessHeap(), HEAP_ZERO_MEMORY, returnBuffer );
+        if ((lpData->lpszPath = (LPSTR)HeapAlloc( GetProcessHeap(), 0, strlen(returnBuffer)+1 )))
+            strcpy( lpData->lpszPath, returnBuffer );
     }
 
@@ -1149 +1151 @@
 {
   /* These are the handles for the created process */
-  HANDLE hAppStart, hAppDeath, hAppRead, hTemp;;
+  HANDLE hAppStart, hAppDeath, hAppRead, hTemp;
   SECURITY_ATTRIBUTES s_attrib;
 
@@ -1245 +1247 @@
   HeapFree( GetProcessHeap(), 0, enumData.lpszPath );
   HeapFree( GetProcessHeap(), 0, enumData.lpszFileName );
-  appName = HEAP_strdupA( GetProcessHeap(), HEAP_ZERO_MEMORY, temp );
+  if ((appName = (LPSTR)HeapAlloc( GetProcessHeap(), 0, strlen(temp)+1 ))) strcpy( appName, temp );
 
   /* Now the command line */
@@ -1251 +1253 @@
   strcat( temp, enumData.lpszCommandLine );
   HeapFree( GetProcessHeap(), 0, enumData.lpszCommandLine );
-  enumData.lpszCommandLine = HEAP_strdupA( GetProcessHeap(), HEAP_ZERO_MEMORY, temp );
+  if ((enumData.lpszCommandLine = (LPSTR)HeapAlloc( GetProcessHeap(), 0, strlen(temp)+1 )))
+      strcpy( enumData.lpszCommandLine, temp );
 
   ZeroMemory( &startupInfo, sizeof( startupInfo ) );