DSTRICT: shlwapi dll

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello,

big but trivial patch.

License: LGPL, X11
Changelog:
	Michael Stefaniuc <mstefani@redhat.com>
	- compile the shlwapi dll with -DSTRICT

bye
	michael
-- 
Michael Stefaniuc               Tel.: +49-711-96437-199
System Administration           Fax.: +49-711-96437-111
Red Hat GmbH                    Email: mstefani@redhat.com
Hauptstaetterstr. 58            http://www.redhat.de/
D-70178 Stuttgart
Index: dlls/shlwapi/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/Makefile.in,v
retrieving revision 1.24
diff -u -r1.24 Makefile.in
--- dlls/shlwapi/Makefile.in	18 Oct 2002 23:46:28 -0000	1.24
+++ dlls/shlwapi/Makefile.in	24 Oct 2002 19:28:34 -0000
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_SHLWAPI_ -DWINE_NO_STRICT
+EXTRADEFS = -D_SHLWAPI_
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
Index: dlls/shlwapi/ordinal.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/ordinal.c,v
retrieving revision 1.57
diff -u -r1.57 ordinal.c
--- dlls/shlwapi/ordinal.c	10 Oct 2002 21:22:12 -0000	1.57
+++ dlls/shlwapi/ordinal.c	24 Oct 2002 19:28:36 -0000
@@ -700,7 +700,7 @@
  */
 BOOL WINAPI SHLWAPI_36(HMENU hMenu, UINT flags, UINT id, LPCWSTR str)
 {
-    TRACE("(0x%08x,0x%08x,0x%08x,%s)\n",hMenu, flags, id, debugstr_w(str));
+    TRACE("(%p,0x%08x,0x%08x,%s)\n",hMenu, flags, id, debugstr_w(str));
     return InsertMenuW(hMenu, -1, flags | MF_BITMAP, id, str);
 }
 
@@ -992,7 +992,7 @@
  */
 DWORD WINAPI SHLWAPI_167(HWND hWnd, HWND hWndParent)
 {
-	FIXME("0x%08x,0x%08x\n", hWnd, hWndParent);
+	FIXME("%p,%p\n", hWnd, hWndParent);
 	return 0;
 }
 
@@ -1163,7 +1163,7 @@
     hRet = IOleWindow_GetWindow((IOleWindow*)lpOle, lphWnd);
     IUnknown_Release(lpOle);
     if (lphWnd)
-      TRACE("Returning HWND=%08x\n", *lphWnd);
+      TRACE("Returning HWND=%p\n", *lphWnd);
   }
 
   return hRet;
@@ -1541,7 +1541,7 @@
  */
 BOOL WINAPI SHLWAPI_204(HWND hParent, HWND hChild)
 {
-  TRACE("(%08x,%08x)\n", hParent, hChild);
+  TRACE("(%p,%p)\n", hParent, hChild);
 
   if (!hParent || !hChild)
     return TRUE;
@@ -1815,7 +1815,7 @@
 {
 	WNDCLASSW WndClass;
 
-	TRACE("(0x%08x %s)\n",lpWndClass->hInstance, debugstr_w(lpWndClass->lpszClassName));
+	TRACE("(%p %s)\n",lpWndClass->hInstance, debugstr_w(lpWndClass->lpszClassName));
 
 	if (GetClassInfoW(lpWndClass->hInstance, lpWndClass->lpszClassName, &WndClass))
 		return TRUE;
@@ -1827,7 +1827,7 @@
  */
 DWORD WINAPI SHLWAPI_239(HINSTANCE hInstance, LPVOID p2, DWORD dw3)
 {
-    FIXME("(0x%08x %p 0x%08lx) stub\n",
+    FIXME("(%p %p 0x%08lx) stub\n",
 	  hInstance, p2, dw3);
     return 0;
 #if 0
@@ -2021,7 +2021,7 @@
 	HCURSOR hCursor;
 	char * clsname = "WorkerA";
 
-	FIXME("(0x%08lx 0x%08x 0x%08lx 0x%08lx 0x%08x 0x%08lx) partial stub\n",
+	FIXME("(0x%08lx %p 0x%08lx 0x%08lx %p 0x%08lx) partial stub\n",
 	  wndProc,hWndParent,dwExStyle,dwStyle,hMenu,z);
 
 	hCursor = LoadCursorA(0x00000000,IDC_ARROWA);
@@ -2033,7 +2033,7 @@
 	  wndclass.cbWndExtra = 4;
 	  wndclass.hInstance = shlwapi_hInstance;
 	  wndclass.hCursor = hCursor;
-	  wndclass.hbrBackground = COLOR_BTNSHADOW;
+	  wndclass.hbrBackground = (HBRUSH)COLOR_BTNSHADOW;
 	  wndclass.lpszMenuName = NULL;
 	  wndclass.lpszClassName = clsname;
 	  RegisterClassA (&wndclass);
Index: dlls/shlwapi/path.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/path.c,v
retrieving revision 1.24
diff -u -r1.24 path.c
--- dlls/shlwapi/path.c	20 Sep 2002 19:41:08 -0000	1.24
+++ dlls/shlwapi/path.c	24 Oct 2002 19:28:37 -0000
@@ -2683,7 +2683,7 @@
 {
   BOOL bRet = FALSE;
 
-  TRACE("(%08x,%s,%d)\n", hDC, debugstr_a(lpszPath), dx);
+  TRACE("(%p,%s,%d)\n", hDC, debugstr_a(lpszPath), dx);
 
   if (lpszPath)
   {
@@ -2709,7 +2709,7 @@
   SIZE size;
   DWORD dwLen;
 
-  TRACE("(%08x,%s,%d)\n", hDC, debugstr_w(lpszPath), dx);
+  TRACE("(%p,%s,%d)\n", hDC, debugstr_w(lpszPath), dx);
 
   if (!lpszPath)
     return bRet;
@@ -3343,7 +3343,7 @@
 {
   WCHAR szPath[MAX_PATH];
 
-  TRACE("(%8x,%8x,%s)\n",hDlg, id, debugstr_a(lpszPath));
+  TRACE("(%p,%8x,%s)\n",hDlg, id, debugstr_a(lpszPath));
 
   if (lpszPath)
     MultiByteToWideChar(0,0,lpszPath,-1,szPath,MAX_PATH);
@@ -3365,7 +3365,7 @@
   HDC hdc;
   HGDIOBJ hPrevObj;
 
-  TRACE("(%8x,%8x,%s)\n",hDlg, id, debugstr_w(lpszPath));
+  TRACE("(%p,%8x,%s)\n",hDlg, id, debugstr_w(lpszPath));
 
   if (!(hwItem = GetDlgItem(hDlg, id)))
     return;
Index: dlls/shlwapi/reg.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/reg.c,v
retrieving revision 1.32
diff -u -r1.32 reg.c
--- dlls/shlwapi/reg.c	12 Sep 2002 18:02:14 -0000	1.32
+++ dlls/shlwapi/reg.c	24 Oct 2002 19:28:37 -0000
@@ -737,7 +737,7 @@
 {
   DWORD dwSize = MAX_PATH;
 
-  TRACE("(hkey=0x%08x,%s,%s,%p,%ld)\n", hKey, debugstr_a(lpszSubKey),
+  TRACE("(hkey=%p,%s,%s,%p,%ld)\n", hKey, debugstr_a(lpszSubKey),
         debugstr_a(lpszValue), lpszPath, dwFlags);
 
   return SHGetValueA(hKey, lpszSubKey, lpszValue, 0, lpszPath, &dwSize);
@@ -753,7 +753,7 @@
 {
   DWORD dwSize = MAX_PATH;
 
-  TRACE("(hkey=0x%08x,%s,%s,%p,%ld)\n", hKey, debugstr_w(lpszSubKey),
+  TRACE("(hkey=%p,%s,%s,%p,%ld)\n", hKey, debugstr_w(lpszSubKey),
         debugstr_w(lpszValue), lpszPath, dwFlags);
 
   return SHGetValueW(hKey, lpszSubKey, lpszValue, 0, lpszPath, &dwSize);
@@ -781,7 +781,7 @@
 {
   char szBuff[MAX_PATH];
 
-  FIXME("(hkey=0x%08x,%s,%s,%p,%ld) - semi-stub\n",hKey, debugstr_a(lpszSubKey),
+  FIXME("(hkey=%p,%s,%s,%p,%ld) - semi-stub\n",hKey, debugstr_a(lpszSubKey),
         debugstr_a(lpszValue), lpszPath, dwFlags);
 
   lstrcpyA(szBuff, lpszPath);
@@ -802,7 +802,7 @@
 {
   WCHAR szBuff[MAX_PATH];
 
-  FIXME("(hkey=0x%08x,%s,%s,%p,%ld) - semi-stub\n",hKey, debugstr_w(lpszSubKey),
+  FIXME("(hkey=%p,%s,%s,%p,%ld) - semi-stub\n",hKey, debugstr_w(lpszSubKey),
         debugstr_w(lpszValue), lpszPath, dwFlags);
 
   lstrcpyW(szBuff, lpszPath);
@@ -836,7 +836,7 @@
   DWORD dwRet = 0;
   HKEY hSubKey = 0;
 
-  TRACE("(hkey=0x%08x,%s,%s,%p,%p,%p)\n", hKey, debugstr_a(lpszSubKey),
+  TRACE("(hkey=%p,%s,%s,%p,%p,%p)\n", hKey, debugstr_a(lpszSubKey),
         debugstr_a(lpszValue), pwType, pvData, pcbData);
 
   /*   lpszSubKey can be 0. In this case the value is taken from the
@@ -865,7 +865,7 @@
   DWORD dwRet = 0;
   HKEY hSubKey = 0;
 
-  TRACE("(hkey=0x%08x,%s,%s,%p,%p,%p)\n", hKey, debugstr_w(lpszSubKey),
+  TRACE("(hkey=%p,%s,%s,%p,%p,%p)\n", hKey, debugstr_w(lpszSubKey),
         debugstr_w(lpszValue), pwType, pvData, pcbData);
 
   if(lpszSubKey)
@@ -908,7 +908,7 @@
   HKEY  hSubKey;
   LPSTR szEmpty = "";
 
-  TRACE("(hkey=0x%08x,%s,%s,%ld,%p,%ld)\n", hKey, debugstr_a(lpszSubKey),
+  TRACE("(hkey=%p,%s,%s,%ld,%p,%ld)\n", hKey, debugstr_a(lpszSubKey),
           debugstr_a(lpszValue), dwType, pvData, cbData);
 
   if (lpszSubKey && *lpszSubKey)
@@ -937,7 +937,7 @@
   HKEY  hSubKey;
   WCHAR szEmpty[] = { '\0' };
 
-  TRACE("(hkey=0x%08x,%s,%s,%ld,%p,%ld)\n", hKey, debugstr_w(lpszSubKey),
+  TRACE("(hkey=%p,%s,%s,%ld,%p,%ld)\n", hKey, debugstr_w(lpszSubKey),
         debugstr_w(lpszValue), dwType, pvData, cbData);
 
   if (lpszSubKey && *lpszSubKey)
@@ -962,7 +962,7 @@
 LONG WINAPI SHQueryInfoKeyA(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax,
                             LPDWORD pwValues, LPDWORD pwValueMax)
 {
-  TRACE("(hkey=0x%08x,%p,%p,%p,%p)\n", hKey, pwSubKeys, pwSubKeyMax,
+  TRACE("(hkey=%p,%p,%p,%p,%p)\n", hKey, pwSubKeys, pwSubKeyMax,
         pwValues, pwValueMax);
   return RegQueryInfoKeyA(hKey, NULL, NULL, NULL, pwSubKeys, pwSubKeyMax,
                           NULL, pwValues, pwValueMax, NULL, NULL, NULL);
@@ -976,7 +976,7 @@
 LONG WINAPI SHQueryInfoKeyW(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax,
                             LPDWORD pwValues, LPDWORD pwValueMax)
 {
-  TRACE("(hkey=0x%08x,%p,%p,%p,%p)\n", hKey, pwSubKeys, pwSubKeyMax,
+  TRACE("(hkey=%p,%p,%p,%p,%p)\n", hKey, pwSubKeys, pwSubKeyMax,
         pwValues, pwValueMax);
   return RegQueryInfoKeyW(hKey, NULL, NULL, NULL, pwSubKeys, pwSubKeyMax,
                           NULL, pwValues, pwValueMax, NULL, NULL, NULL);
@@ -1030,7 +1030,7 @@
 {
   DWORD dwRet, dwType, dwUnExpDataLen = 0, dwExpDataLen;
 
-  TRACE("(hkey=0x%08x,%s,%p,%p,%p,%p=%ld)\n", hKey, debugstr_a(lpszValue),
+  TRACE("(hkey=%p,%s,%p,%p,%p,%p=%ld)\n", hKey, debugstr_a(lpszValue),
         lpReserved, pwType, pvData, pcbData, pcbData ? *pcbData : 0);
 
   if (pcbData) dwUnExpDataLen = *pcbData;
@@ -1089,7 +1089,7 @@
 {
   DWORD dwRet, dwType, dwUnExpDataLen = 0, dwExpDataLen;
 
-  TRACE("(hkey=0x%08x,%s,%p,%p,%p,%p=%ld)\n", hKey, debugstr_w(lpszValue),
+  TRACE("(hkey=%p,%s,%p,%p,%p,%p=%ld)\n", hKey, debugstr_w(lpszValue),
         lpReserved, pwType, pvData, pcbData, pcbData ? *pcbData : 0);
 
   if (pcbData) dwUnExpDataLen = *pcbData;
@@ -1156,7 +1156,7 @@
   CHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf;
   HKEY hSubKey = 0;
 
-  TRACE("(hkey=0x%08x,%s)\n", hKey, debugstr_a(lpszSubKey));
+  TRACE("(hkey=%p,%s)\n", hKey, debugstr_a(lpszSubKey));
 
   dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
   if(!dwRet)
@@ -1206,7 +1206,7 @@
   WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf;
   HKEY hSubKey = 0;
 
-  TRACE("(hkey=0x%08x,%s)\n", hKey, debugstr_w(lpszSubKey));
+  TRACE("(hkey=%p,%s)\n", hKey, debugstr_w(lpszSubKey));
 
   dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
   if(!dwRet)
@@ -1266,7 +1266,7 @@
   DWORD dwRet, dwKeyCount = 0;
   HKEY hSubKey = 0;
 
-  TRACE("(hkey=0x%08x,%s)\n", hKey, debugstr_a(lpszSubKey));
+  TRACE("(hkey=%p,%s)\n", hKey, debugstr_a(lpszSubKey));
 
   dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
   if(!dwRet)
@@ -1295,7 +1295,7 @@
   DWORD dwRet, dwKeyCount = 0;
   HKEY hSubKey = 0;
 
-  TRACE("(hkey=0x%08x, %s)\n", hKey, debugstr_w(lpszSubKey));
+  TRACE("(hkey=%p, %s)\n", hKey, debugstr_w(lpszSubKey));
 
   dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
   if(!dwRet)
@@ -1332,7 +1332,7 @@
   HKEY hSubKey;
   DWORD dwKeyCount = 0, dwValueCount = 0, dwRet;
 
-  TRACE("(hkey=0x%08x,%s)\n", hKey, debugstr_a(lpszSubKey));
+  TRACE("(hkey=%p,%s)\n", hKey, debugstr_a(lpszSubKey));
 
   dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
 
@@ -1361,7 +1361,7 @@
   HKEY hSubKey;
   DWORD dwKeyCount = 0, dwValueCount = 0, dwRet;
 
-  TRACE("(hkey=0x%08x,%s)\n", hKey, debugstr_w(lpszSubKey));
+  TRACE("(hkey=%p,%s)\n", hKey, debugstr_w(lpszSubKey));
 
   dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
 
@@ -1399,7 +1399,7 @@
   DWORD dwRet;
   HKEY hSubKey;
 
-  TRACE("(hkey=0x%08x,%s,%s)\n", hKey, debugstr_a(lpszSubKey), debugstr_a(lpszValue));
+  TRACE("(hkey=%p,%s,%s)\n", hKey, debugstr_a(lpszSubKey), debugstr_a(lpszValue));
 
   dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_SET_VALUE, &hSubKey);
   if (!dwRet)
@@ -1420,7 +1420,7 @@
   DWORD dwRet;
   HKEY hSubKey;
 
-  TRACE("(hkey=0x%08x,%s,%s)\n", hKey, debugstr_w(lpszSubKey), debugstr_w(lpszValue));
+  TRACE("(hkey=%p,%s,%s)\n", hKey, debugstr_w(lpszSubKey), debugstr_w(lpszValue));
 
   dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_SET_VALUE, &hSubKey);
   if (!dwRet)
@@ -1449,7 +1449,7 @@
 LONG WINAPI SHEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpszSubKey,
                          LPDWORD pwLen)
 {
-  TRACE("(hkey=0x%08x,%ld,%s,%p)\n", hKey, dwIndex, debugstr_a(lpszSubKey), pwLen);
+  TRACE("(hkey=%p,%ld,%s,%p)\n", hKey, dwIndex, debugstr_a(lpszSubKey), pwLen);
 
   return RegEnumKeyExA(hKey, dwIndex, lpszSubKey, pwLen, NULL, NULL, NULL, NULL);
 }
@@ -1462,7 +1462,7 @@
 LONG WINAPI SHEnumKeyExW(HKEY hKey, DWORD dwIndex, LPWSTR lpszSubKey,
                          LPDWORD pwLen)
 {
-  TRACE("(hkey=0x%08x,%ld,%s,%p)\n", hKey, dwIndex, debugstr_w(lpszSubKey), pwLen);
+  TRACE("(hkey=%p,%ld,%s,%p)\n", hKey, dwIndex, debugstr_w(lpszSubKey), pwLen);
 
   return RegEnumKeyExW(hKey, dwIndex, lpszSubKey, pwLen, NULL, NULL, NULL, NULL);
 }
@@ -1489,7 +1489,7 @@
                          LPDWORD pwLen, LPDWORD pwType,
                          LPVOID pvData, LPDWORD pcbData)
 {
-  TRACE("(hkey=0x%08x,%ld,%s,%p,%p,%p,%p)\n", hKey, dwIndex,
+  TRACE("(hkey=%p,%ld,%s,%p,%p,%p,%p)\n", hKey, dwIndex,
         debugstr_a(lpszValue), pwLen, pwType, pvData, pcbData);
 
   return RegEnumValueA(hKey, dwIndex, lpszValue, pwLen, NULL,
@@ -1505,7 +1505,7 @@
                          LPDWORD pwLen, LPDWORD pwType,
                          LPVOID pvData, LPDWORD pcbData)
 {
-  TRACE("(hkey=0x%08x,%ld,%s,%p,%p,%p,%p)\n", hKey, dwIndex,
+  TRACE("(hkey=%p,%ld,%s,%p,%p,%p,%p)\n", hKey, dwIndex,
         debugstr_w(lpszValue), pwLen, pwType, pvData, pcbData);
 
   return RegEnumValueW(hKey, dwIndex, lpszValue, pwLen, NULL,
@@ -1789,7 +1789,7 @@
     HKEY newKey = 0;
 
     RegOpenKeyExA(hKey, 0, 0, MAXIMUM_ALLOWED, &newKey);
-    TRACE("new key is %08x\n", newKey);
+    TRACE("new key is %p\n", newKey);
     return newKey;
 }
 
@@ -1817,7 +1817,7 @@
 {
   WCHAR szSubKeyW[MAX_PATH];
 
-  TRACE("(hkey=0x%08x,%s,%0x08x,%ld)\n", hKeyDst, debugstr_a(lpszSubKey), hKeySrc, dwReserved);
+  TRACE("(hkey=%p,%s,%p08x,%ld)\n", hKeyDst, debugstr_a(lpszSubKey), hKeySrc, dwReserved);
 
   if (lpszSubKey)
     MultiByteToWideChar(0, 0, lpszSubKey, -1, szSubKeyW, MAX_PATH);
@@ -1839,7 +1839,7 @@
   WCHAR szName[MAX_PATH], *lpszName = szName;
   DWORD dwRet = S_OK;
 
-  TRACE("hkey=0x%08x,%s,%0x08x,%ld)\n", hKeyDst, debugstr_w(lpszSubKey), hKeySrc, dwReserved);
+  TRACE("hkey=%p,%s,%p08x,%ld)\n", hKeyDst, debugstr_w(lpszSubKey), hKeySrc, dwReserved);
 
   if(!hKeyDst || !hKeySrc)
     dwRet = ERROR_INVALID_PARAMETER;
Index: dlls/shlwapi/regstream.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/regstream.c,v
retrieving revision 1.8
diff -u -r1.8 regstream.c
--- dlls/shlwapi/regstream.c	20 Sep 2002 19:41:08 -0000	1.8
+++ dlls/shlwapi/regstream.c	24 Oct 2002 19:28:37 -0000
@@ -377,7 +377,7 @@
   LPBYTE lpBuff = NULL;
   DWORD dwLength, dwType;
 
-  TRACE("(0x%08x,%s,%s,0x%08lx)\n", hKey, pszSubkey, pszValue, dwMode);
+  TRACE("(%p,%s,%s,0x%08lx)\n", hKey, pszSubkey, pszValue, dwMode);
 
   /* Open the key, read in binary data and create stream */
   if (!RegOpenKeyExA (hKey, pszSubkey, 0, KEY_READ, &hStrKey) &&
@@ -406,7 +406,7 @@
   LPBYTE lpBuff = NULL;
   DWORD dwLength, dwType;
 
-  TRACE("(0x%08x,%s,%s,0x%08lx)\n", hKey, debugstr_w(pszSubkey),
+  TRACE("(%p,%s,%s,0x%08lx)\n", hKey, debugstr_w(pszSubkey),
         debugstr_w(pszValue), dwMode);
 
   /* Open the key, read in binary data and create stream */
@@ -445,7 +445,7 @@
 {
   IStream *iStream;
 
-  TRACE("(0x%08x,%s,%s,0x%08lx)\n", hkey, pszSubkey, pszValue, dwMode);
+  TRACE("(%p,%s,%s,0x%08lx)\n", hkey, pszSubkey, pszValue, dwMode);
 
   iStream = SHOpenRegStream2A(hkey, pszSubkey, pszValue, dwMode);
   return iStream ? iStream : (IStream *)&rsDummyRegStream;
@@ -461,7 +461,7 @@
 {
   IStream *iStream;
 
-  TRACE("(0x%08x,%s,%s,0x%08lx)\n", hkey, debugstr_w(pszSubkey),
+  TRACE("(%p,%s,%s,0x%08lx)\n", hkey, debugstr_w(pszSubkey),
         debugstr_w(pszValue), dwMode);
   iStream = SHOpenRegStream2W(hkey, pszSubkey, pszValue, dwMode);
   return iStream ? iStream : (IStream *)&rsDummyRegStream;
Index: dlls/shlwapi/shlwapi_main.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/shlwapi_main.c,v
retrieving revision 1.17
diff -u -r1.17 shlwapi_main.c
--- dlls/shlwapi/shlwapi_main.c	19 Aug 2002 23:55:46 -0000	1.17
+++ dlls/shlwapi/shlwapi_main.c	24 Oct 2002 19:28:37 -0000
@@ -47,7 +47,7 @@
  */
 BOOL WINAPI SHLWAPI_LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
-	TRACE("0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
+	TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
 	switch (fdwReason)
 	{
 	  case DLL_PROCESS_ATTACH:
Index: dlls/shlwapi/thread.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/thread.c,v
retrieving revision 1.4
diff -u -r1.4 thread.c
--- dlls/shlwapi/thread.c	20 Sep 2002 19:41:08 -0000	1.4
+++ dlls/shlwapi/thread.c	24 Oct 2002 19:28:37 -0000
@@ -353,7 +353,7 @@
 {
   DWORD dwOldCount = 0;
 
-  TRACE("(0x%08x)\n", hSem);
+  TRACE("(%p)\n", hSem);
   ReleaseSemaphore(hSem, 1, &dwOldCount); /* +1 */
   WaitForSingleObject(hSem, 0);           /* -1 */
   return dwOldCount;
@@ -374,7 +374,7 @@
 {
   DWORD dwOldCount = 0;
 
-  TRACE("(0x%08x)\n", hSem);
+  TRACE("(%p)\n", hSem);
   ReleaseSemaphore(hSem, 1, &dwOldCount);
   return dwOldCount + 1;
 }
@@ -394,7 +394,7 @@
 {
   DWORD dwOldCount = 0;
 
-  TRACE("(0x%08x)\n", hSem);
+  TRACE("(%p)\n", hSem);
 
   dwOldCount = SHLWAPI_223(hSem);
   WaitForSingleObject(hSem, 0);

Attachment: pgp00075.pgp
Description: PGP signature


[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux