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

Timestamp:

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

Author:

hugh

Message:

Synced with WINE

File:

• trunk/src/DPlayX/name_server.cpp (modified) (12 diffs)

trunk/src/DPlayX/name_server.cpp

@@ -1 @@
-// $Id: name_server.cpp,v 1.3 2000-10-06 19:49:06 hugh Exp $
+// $Id: name_server.cpp,v 1.4 2001-03-13 23:13:27 hugh Exp $
 /* DPLAYX.DLL name server implementation
  *
@@ -18 +18 @@
 #include "winbase.h"
 #include "winuser.h"
+#include "winnls.h"
+#include "wine/unicode.h"
 #include "debugtools.h"
 #include "heap.h"
@@ -82 +84 @@
                                        LPVOID                    lpNSInfo )
 {
+  DWORD len;
   lpNSCache     lpCache = (lpNSCache)lpNSInfo;
   lpNSCacheData lpCacheNode;
@@ -128 +131 @@
 
   CopyMemory( lpCacheNode->data, &lpMsg->sd, sizeof( *lpCacheNode->data ) );
-  lpCacheNode->data->sess.lpszSessionNameA = HEAP_strdupWtoA( GetProcessHeap(),
-                                                              HEAP_ZERO_MEMORY,
-                                                              (LPWSTR)(lpMsg+1) );
-
-  lpCacheNode->dwTime = GetTickCount();
+  len = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)(lpMsg+1), -1, NULL, 0, NULL, NULL );
+  if ((lpCacheNode->data->u1.lpszSessionNameA = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len )))
+      WideCharToMultiByte( CP_ACP, 0, (LPWSTR)(lpMsg+1), -1,
+                           lpCacheNode->data->u1.lpszSessionNameA, len, NULL, NULL );
+
+  lpCacheNode->dwTime = timeGetTime();
 
   DPQ_INSERT(lpCache->first, lpCacheNode, next );
@@ -199 +203 @@
 }
 
+/* Delete a name server node which has been allocated on the heap */
 DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData )
 {
@@ -209 +214 @@
 }
 
-
-
 /* Render all data in a session cache invalid */
 void NS_InvalidateSessionCache( LPVOID lpNSInfo )
@@ -257 +260 @@
 void NS_ResetSessionEnumeration( LPVOID lpNSInfo )
 {
-
   ((lpNSCache)lpNSInfo)->present = ((lpNSCache)lpNSInfo)->first.lpQHFirst;
 }
@@ -285 +287 @@
  * older than the criteria. If so, just delete that information.
  */
+/* FIXME: This needs to be called by some periodic timer */
 void NS_PruneSessionCache( LPVOID lpNSInfo )
 {
@@ -337 +340 @@
 }
 
-
-
-/* Message stuff */
+/* NAME SERVER Message stuff */
 void NS_ReplyToEnumSessionsRequest( LPVOID lpMsg,
                                     LPDPSP_REPLYDATA lpReplyData,
@@ -347 +348 @@
   DWORD dwVariableSize;
   DWORD dwVariableLen;
-  LPWSTR string;
   /* LPDPMSG_ENUMSESSIONSREQUEST msg = (LPDPMSG_ENUMSESSIONSREQUEST)lpMsg; */
   BOOL bAnsi = TRUE; /* FIXME: This needs to be in the DPLAY interface */
@@ -353 +353 @@
   FIXME( ": few fixed + need to check request for response\n" );
 
-  dwVariableLen = bAnsi ? lstrlenA( lpDP->dp2->lpSessionDesc->sess.lpszSessionNameA ) + 1
-                         : lstrlenW( lpDP->dp2->lpSessionDesc->sess.lpszSessionName ) + 1;
+  if (bAnsi)
+      dwVariableLen = MultiByteToWideChar( CP_ACP, 0,
+                                           lpDP->dp2->lpSessionDesc->u1.lpszSessionNameA,
+                                           -1, NULL, 0 );
+  else
+      dwVariableLen = strlenW( lpDP->dp2->lpSessionDesc->u1.lpszSessionName ) + 1;
 
   dwVariableSize = dwVariableLen * sizeof( WCHAR );
@@ -374 +378 @@
   rmsg->dwUnknown = 0x0000005c;
   if( bAnsi )
-  {
-    string = HEAP_strdupAtoW( GetProcessHeap(), 0,
-                              lpDP->dp2->lpSessionDesc->sess.lpszSessionNameA );
-    /* FIXME: Memory leak */
-  }
+      MultiByteToWideChar( CP_ACP, 0, lpDP->dp2->lpSessionDesc->u1.lpszSessionNameA, -1,
+                           (LPWSTR)(rmsg+1), dwVariableLen );
   else
-  {
-    string = lpDP->dp2->lpSessionDesc->sess.lpszSessionName;
-  }
-
-  lstrcpyW( (LPWSTR)(rmsg+1), string );
-
-}
-
+      strcpyW( (LPWSTR)(rmsg+1), lpDP->dp2->lpSessionDesc->u1.lpszSessionName );
+}