diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 673e0f92cc6..ba9b494c107 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SHLWAPI_ -DWINE_NO_STRICT +EXTRADEFS = -D_SHLWAPI_ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index f69003a780c..95c306e9054 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -700,7 +700,7 @@ BOOL WINAPI SHLWAPI_35(LPVOID p1, DWORD dw2, LPVOID p3) */ 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 @@ LONG WINAPI SHLWAPI_165(HWND hwnd, INT offset, UINT wMask, UINT wFlags) */ 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 @@ HRESULT WINAPI SHLWAPI_172(IUnknown *lpUnknown, PHWND lphWnd) 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 @@ VOID WINAPI SHLWAPI_203(LPCSTR lpszStr) */ 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 @@ DWORD WINAPI SHLWAPI_237 (WNDCLASSW * lpWndClass) { 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_237 (WNDCLASSW * lpWndClass) */ 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 @@ HWND WINAPI SHLWAPI_278 ( 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 @@ HWND WINAPI SHLWAPI_278 ( 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); diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 1b2db2698e5..f8ee23599c2 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -2683,7 +2683,7 @@ BOOL WINAPI PathCompactPathA(HDC hDC, LPSTR lpszPath, UINT dx) { 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 @@ BOOL WINAPI PathCompactPathW(HDC hDC, LPWSTR lpszPath, UINT dx) 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 @@ VOID WINAPI PathSetDlgItemPathA(HWND hDlg, int id, LPCSTR lpszPath) { 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 @@ VOID WINAPI PathSetDlgItemPathW(HWND hDlg, int id, LPCWSTR lpszPath) 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; diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index b5ff9b2d1f6..eb2a73c120a 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -737,7 +737,7 @@ DWORD WINAPI SHRegGetPathA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, { 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 WINAPI SHRegGetPathW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, { 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 @@ DWORD WINAPI SHRegSetPathA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, { 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 @@ DWORD WINAPI SHRegSetPathW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, { 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 WINAPI SHGetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, 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 WINAPI SHGetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, 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 @@ DWORD WINAPI SHSetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, 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 @@ DWORD WINAPI SHSetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, 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 @@ DWORD WINAPI SHSetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, 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 SHQueryInfoKeyA(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax, 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 WINAPI SHQueryValueExA( HKEY hKey, LPCSTR lpszValue, { 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 WINAPI SHQueryValueExW(HKEY hKey, LPCWSTR lpszValue, { 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 @@ DWORD WINAPI SHDeleteKeyA(HKEY hKey, LPCSTR lpszSubKey) 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 @@ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPCWSTR lpszSubKey) 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 WINAPI SHDeleteEmptyKeyA(HKEY hKey, LPCSTR lpszSubKey) 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 WINAPI SHDeleteEmptyKeyW(HKEY hKey, LPCWSTR lpszSubKey) 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 @@ DWORD WINAPI SHDeleteOrphanKeyA(HKEY hKey, LPCSTR lpszSubKey) 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 @@ DWORD WINAPI SHDeleteOrphanKeyW(HKEY hKey, LPCWSTR lpszSubKey) 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 WINAPI SHDeleteValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue) 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 WINAPI SHDeleteValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue) 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 @@ DWORD WINAPI SHDeleteValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue) 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 SHEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpszSubKey, 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 @@ LONG WINAPI SHEnumValueA(HKEY hKey, DWORD dwIndex, LPSTR lpszValue, 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 @@ LONG WINAPI SHEnumValueW(HKEY hKey, DWORD dwIndex, LPWSTR lpszValue, 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 WINAPI SHRegDuplicateHKey(HKEY hKey) 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 @@ DWORD WINAPI SHCopyKeyA(HKEY hKeyDst, LPCSTR lpszSubKey, HKEY hKeySrc, DWORD dwR { 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 @@ DWORD WINAPI SHCopyKeyW(HKEY hKeyDst, LPCWSTR lpszSubKey, HKEY hKeySrc, DWORD dw 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; diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 49f3a3b207f..3f53744b91d 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -377,7 +377,7 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, 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 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, 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 * WINAPI SHOpenRegStreamA(HKEY hkey, LPCSTR pszSubkey, { 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 * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, { 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; diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index d22432a3b32..5667b9266e9 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -47,7 +47,7 @@ DWORD SHLWAPI_ThreadRef_index = -1; */ 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: diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index 4b97af22e57..466e3c5b51e 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -353,7 +353,7 @@ DWORD WINAPI SHLWAPI_223(HANDLE hSem) { 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 WINAPI SHLWAPI_224(HANDLE hSem) { DWORD dwOldCount = 0; - TRACE("(0x%08x)\n", hSem); + TRACE("(%p)\n", hSem); ReleaseSemaphore(hSem, 1, &dwOldCount); return dwOldCount + 1; } @@ -394,7 +394,7 @@ DWORD WINAPI SHLWAPI_424(HANDLE hSem) { DWORD dwOldCount = 0; - TRACE("(0x%08x)\n", hSem); + TRACE("(%p)\n", hSem); dwOldCount = SHLWAPI_223(hSem); WaitForSingleObject(hSem, 0);