Changeset 6177 for trunk/src/user32/user32.cpp

Timestamp:

Jul 5, 2001, 8:10:56 PM (24 years ago)

Author:

sandervl

Message:

WinHelpA now uses shared memory

File:

• trunk/src/user32/user32.cpp (modified) (4 diffs)

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.105 2001-07-04 06:39:01 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.106 2001-07-05 18:10:56 sandervl Exp $ */
 
 /*
@@ -976 +976 @@
   HWND hDest;
   LPWINHELP lpwh;
-  HGLOBAL hwh;
   HINSTANCE winhelp;
   int size,dsize,nlen;
-
-  dprintf(("USER32:  WinHelpA %s\n", lpszHelp));
+  BOOL ret;
+
+  dprintf(("USER32: WinHelpA %x %s %d %x", hwnd, lpszHelp, uCommand, dwData));
 
   if(!WM_WINHELP)
@@ -1036 +1036 @@
     nlen = 0;
   size = sizeof(WINHELP) + nlen + dsize;
-#if 1
-  hwh = GlobalAlloc(GMEM_SHARE,size);
-  lpwh = (WINHELP*)GlobalLock(hwh);
-#else
-  hwh  = (HANDLE)_smalloc(size);
-  lpwh = (WINHELP*)hwh;
-#endif
+
+  //allocate shared memory
+  lpwh = (WINHELP*)_smalloc(size);
   lpwh->size = size;
   lpwh->command = uCommand;
@@ -1058 +1054 @@
   } else
       lpwh->ofsData = 0;
-  GlobalUnlock(hwh);
-
-  return SendMessageA(hDest,WM_WINHELP,hwnd,hwh);
+
+  ret = SendMessageA(hDest,WM_WINHELP,hwnd,(LPARAM)lpwh);
+  free(lpwh);
+  return ret;
 }
 //******************************************************************************