shlwapi: Enable compilation with long types.

dlls/shlwapi/Makefile.in

-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHLWAPI_
+EXTRADEFS = -D_SHLWAPI_
 MODULE    = shlwapi.dll
 IMPORTLIB = shlwapi
 IMPORTS   = uuid shcore user32 gdi32 advapi32 kernelbase

dlls/shlwapi/assoc.c

@@ -148,7 +148,7 @@ HRESULT WINAPI AssocQueryKeyW(ASSOCF cfFlags, ASSOCKEY assockey, LPCWSTR pszAsso
   HRESULT hRet;
   IQueryAssociations* lpAssoc;
 
-  TRACE("(0x%x,%d,%s,%s,%p)\n", cfFlags, assockey, debugstr_w(pszAssoc),
+  TRACE("(0x%lx,%d,%s,%s,%p)\n", cfFlags, assockey, debugstr_w(pszAssoc),
         debugstr_w(pszExtra), phkeyOut);
 
   hRet = AssocCreate( CLSID_QueryAssociations, &IID_IQueryAssociations, (void **)&lpAssoc );
@@ -187,7 +187,7 @@ HRESULT WINAPI AssocQueryKeyA(ASSOCF cfFlags, ASSOCKEY assockey, LPCSTR pszAssoc
   WCHAR szExtraW[MAX_PATH], *lpszExtraW = NULL;
   HRESULT hRet = E_OUTOFMEMORY;
 
-  TRACE("(0x%x,%d,%s,%s,%p)\n", cfFlags, assockey, debugstr_a(pszAssoc),
+  TRACE("(0x%lx,%d,%s,%s,%p)\n", cfFlags, assockey, debugstr_a(pszAssoc),
         debugstr_a(pszExtra), phkeyOut);
 
   if (SHLWAPI_ParamAToW(pszAssoc, szAssocW, MAX_PATH, &lpszAssocW) &&
@@ -216,7 +216,7 @@ HRESULT WINAPI AssocQueryStringW(ASSOCF cfFlags, ASSOCSTR str, LPCWSTR pszAssoc,
   HRESULT hRet;
   IQueryAssociations* lpAssoc;
 
-  TRACE("(0x%x,%d,%s,%s,%p,%p)\n", cfFlags, str, debugstr_w(pszAssoc),
+  TRACE("(0x%lx,%d,%s,%s,%p,%p)\n", cfFlags, str, debugstr_w(pszAssoc),
         debugstr_w(pszExtra), pszOut, pcchOut);
 
   if (!pcchOut)
@@ -260,7 +260,7 @@ HRESULT WINAPI AssocQueryStringA(ASSOCF cfFlags, ASSOCSTR str, LPCSTR pszAssoc,
   WCHAR szExtraW[MAX_PATH], *lpszExtraW = NULL;
   HRESULT hRet = E_OUTOFMEMORY;
 
-  TRACE("(0x%x,0x%d,%s,%s,%p,%p)\n", cfFlags, str, debugstr_a(pszAssoc),
+  TRACE("(0x%lx,0x%d,%s,%s,%p,%p)\n", cfFlags, str, debugstr_a(pszAssoc),
         debugstr_a(pszExtra), pszOut, pcchOut);
 
   if (!pcchOut)
@@ -313,7 +313,7 @@ HRESULT WINAPI AssocQueryStringByKeyW(ASSOCF cfFlags, ASSOCSTR str, HKEY hkAssoc
   HRESULT hRet;
   IQueryAssociations* lpAssoc;
 
-  TRACE("(0x%x,0x%d,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc,
+  TRACE("(0x%lx,0x%d,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc,
         debugstr_w(pszExtra), pszOut, pcchOut);
 
   hRet = AssocCreate( CLSID_QueryAssociations, &IID_IQueryAssociations, (void **)&lpAssoc );
@@ -355,7 +355,7 @@ HRESULT WINAPI AssocQueryStringByKeyA(ASSOCF cfFlags, ASSOCSTR str, HKEY hkAssoc
   WCHAR szReturnW[MAX_PATH], *lpszReturnW = szReturnW;
   HRESULT hRet = E_OUTOFMEMORY;
 
-  TRACE("(0x%x,0x%d,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc,
+  TRACE("(0x%lx,0x%d,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc,
         debugstr_a(pszExtra), pszOut, pcchOut);
 
   if (!pcchOut)

dlls/shlwapi/clist.c

@@ -85,7 +85,7 @@ BOOL WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem)
   {
     /* Tune size to a ULONG boundary, add space for container element */
     ulSize = ((ulSize + 0x3) & 0xFFFFFFFC) + sizeof(DATABLOCK_HEADER);
-    TRACE("Creating container item, new size = %d\n", ulSize);
+    TRACE("Creating container item, new size = %ld\n", ulSize);
   }
 
   if(!*lppList)
@@ -359,7 +359,7 @@ BOOL WINAPI SHRemoveDataBlock(LPDBLIST* lppList, DWORD dwSignature)
   LPDATABLOCK_HEADER lpNext;
   ULONG ulNewSize;
 
-  TRACE("(%p,%d)\n", lppList, dwSignature);
+  TRACE("(%p,%ld)\n", lppList, dwSignature);
 
   if(lppList && (lpList = *lppList))
   {
@@ -423,7 +423,7 @@ BOOL WINAPI SHRemoveDataBlock(LPDBLIST* lppList, DWORD dwSignature)
  */
 DATABLOCK_HEADER* WINAPI SHFindDataBlock(LPDBLIST lpList, DWORD dwSignature)
 {
-  TRACE("(%p,%d)\n", lpList, dwSignature);
+  TRACE("(%p,%ld)\n", lpList, dwSignature);
 
   if(lpList)
   {

dlls/shlwapi/msgbox.c

@@ -57,7 +57,7 @@ static INT_PTR CALLBACK SHDlgProcEx(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 {
   DLGDATAEX *d = (DLGDATAEX *)GetWindowLongPtrW(hDlg, DWLP_USER);
 
-  TRACE("(%p,%u,%ld,%ld) data %p\n", hDlg, uMsg, wParam, lParam, d);
+  TRACE("(%p,%u,%Id,%Id) data %p\n", hDlg, uMsg, wParam, lParam, d);
 
   switch (uMsg)
   {
@@ -181,14 +181,14 @@ typedef struct tagDLGDATA
 /* Dialogue procedure for shlwapi message boxes */
 static INT_PTR CALLBACK SHDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-  TRACE("(%p,%u,%ld,%ld)\n", hDlg, uMsg, wParam, lParam);
+  TRACE("(%p,%u,%Id,%Id)\n", hDlg, uMsg, wParam, lParam);
 
   switch (uMsg)
   {
   case WM_INITDIALOG:
   {
     DLGDATA *d = (DLGDATA *)lParam;
-    TRACE("WM_INITDIALOG: %p, %s,%s,%d\n", hDlg, debugstr_w(d->lpszTitle),
+    TRACE("WM_INITDIALOG: %p, %s,%s,%ld\n", hDlg, debugstr_w(d->lpszTitle),
           debugstr_w(d->lpszText), d->dwType);
 
     SetWindowTextW(hDlg, d->lpszTitle);

dlls/shlwapi/path.c

@@ -162,7 +162,7 @@ BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath,DWORD dwWhich)
                                        { '.', 'c', 'm', 'd', 0},
                                        { 0, 0, 0, 0, 0} };
 
-  TRACE("(%s,%d)\n", debugstr_w(lpszPath), dwWhich);
+  TRACE("(%s,%ld)\n", debugstr_w(lpszPath), dwWhich);
 
   if (!lpszPath || PathIsUNCServerW(lpszPath) || PathIsUNCServerShareW(lpszPath))
     return FALSE;
@@ -218,7 +218,7 @@ BOOL WINAPI PathFileExistsDefExtA(LPSTR lpszPath,DWORD dwWhich)
 {
   BOOL bRet = FALSE;
 
-  TRACE("(%s,%d)\n", debugstr_a(lpszPath), dwWhich);
+  TRACE("(%s,%ld)\n", debugstr_a(lpszPath), dwWhich);
 
   if (lpszPath)
   {
@@ -245,7 +245,7 @@ static BOOL SHLWAPI_PathFindInOtherDirs(LPWSTR lpszFile, DWORD dwWhich)
   WCHAR *lpszPATH;
   WCHAR buff[MAX_PATH];
 
-  TRACE("(%s,%08x)\n", debugstr_w(lpszFile), dwWhich);
+  TRACE("(%s,%08lx)\n", debugstr_w(lpszFile), dwWhich);
 
   /* Try system directories */
   GetSystemDirectoryW(buff, MAX_PATH);
@@ -331,7 +331,7 @@ BOOL WINAPI PathFindOnPathExA(LPSTR lpszFile,LPCSTR *lppszOtherDirs,DWORD dwWhic
   WCHAR szFile[MAX_PATH];
   WCHAR buff[MAX_PATH];
 
-  TRACE("(%s,%p,%08x)\n", debugstr_a(lpszFile), lppszOtherDirs, dwWhich);
+  TRACE("(%s,%p,%08lx)\n", debugstr_a(lpszFile), lppszOtherDirs, dwWhich);
 
   if (!lpszFile || !PathIsFileSpecA(lpszFile))
     return FALSE;
@@ -374,7 +374,7 @@ BOOL WINAPI PathFindOnPathExW(LPWSTR lpszFile,LPCWSTR *lppszOtherDirs,DWORD dwWh
 {
   WCHAR buff[MAX_PATH];
 
-  TRACE("(%s,%p,%08x)\n", debugstr_w(lpszFile), lppszOtherDirs, dwWhich);
+  TRACE("(%s,%p,%08lx)\n", debugstr_w(lpszFile), lppszOtherDirs, dwWhich);
 
   if (!lpszFile || !PathIsFileSpecW(lpszFile))
     return FALSE;
@@ -459,7 +459,7 @@ BOOL WINAPI PathCompactPathExA(LPSTR lpszDest, LPCSTR lpszPath,
 {
   BOOL bRet = FALSE;
 
-  TRACE("(%p,%s,%d,0x%08x)\n", lpszDest, debugstr_a(lpszPath), cchMax, dwFlags);
+  TRACE("(%p,%s,%d,0x%08lx)\n", lpszDest, debugstr_a(lpszPath), cchMax, dwFlags);
 
   if (lpszPath && lpszDest)
   {
@@ -486,7 +486,7 @@ BOOL WINAPI PathCompactPathExW(LPWSTR lpszDest, LPCWSTR lpszPath,
   LPCWSTR lpszFile;
   DWORD dwLen, dwFileLen = 0;
 
-  TRACE("(%p,%s,%d,0x%08x)\n", lpszDest, debugstr_w(lpszPath), cchMax, dwFlags);
+  TRACE("(%p,%s,%d,0x%08lx)\n", lpszDest, debugstr_w(lpszPath), cchMax, dwFlags);
 
   if (!lpszPath)
     return FALSE;
@@ -764,7 +764,7 @@ BOOL WINAPI PathIsContentTypeW(LPCWSTR lpszPath, LPCWSTR lpszContentType)
  */
 BOOL WINAPI PathIsSystemFolderA(LPCSTR lpszPath, DWORD dwAttrib)
 {
-  TRACE("(%s,0x%08x)\n", debugstr_a(lpszPath), dwAttrib);
+  TRACE("(%s,0x%08lx)\n", debugstr_a(lpszPath), dwAttrib);
 
   if (lpszPath && *lpszPath)
     dwAttrib = GetFileAttributesA(lpszPath);
@@ -782,7 +782,7 @@ BOOL WINAPI PathIsSystemFolderA(LPCSTR lpszPath, DWORD dwAttrib)
  */
 BOOL WINAPI PathIsSystemFolderW(LPCWSTR lpszPath, DWORD dwAttrib)
 {
-  TRACE("(%s,0x%08x)\n", debugstr_w(lpszPath), dwAttrib);
+  TRACE("(%s,0x%08lx)\n", debugstr_w(lpszPath), dwAttrib);
 
   if (lpszPath && *lpszPath)
     dwAttrib = GetFileAttributesW(lpszPath);
@@ -1502,7 +1502,7 @@ HRESULT WINAPI SHGetWebFolderFilePathA(LPCSTR lpszFile, LPSTR lpszPath, DWORD dw
   WCHAR szFile[MAX_PATH], szPath[MAX_PATH];
   HRESULT hRet;
 
-  TRACE("(%s,%p,%d)\n", lpszFile, lpszPath, dwPathLen);
+  TRACE("(%s,%p,%ld)\n", lpszFile, lpszPath, dwPathLen);
 
   MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, szFile, MAX_PATH);
   szPath[0] = '\0';
@@ -1523,7 +1523,7 @@ HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR lpszFile, LPWSTR lpszPath, DWORD
   DWORD dwLen, dwFileLen;
   LANGID lidSystem, lidUser;
 
-  TRACE("(%s,%p,%d)\n", debugstr_w(lpszFile), lpszPath, dwPathLen);
+  TRACE("(%s,%p,%ld)\n", debugstr_w(lpszFile), lpszPath, dwPathLen);
 
   /* Get base directory for web content */
   dwLen = GetSystemWindowsDirectoryW(lpszPath, dwPathLen);

dlls/shlwapi/reg.c

@@ -225,7 +225,7 @@ BOOL WINAPI UnregisterMIMETypeForExtensionW(LPCWSTR lpszSubKey)
  */
 BOOL WINAPI GetMIMETypeSubKeyA(LPCSTR lpszType, LPSTR lpszBuffer, DWORD dwLen)
 {
-  TRACE("(%s,%p,%d)\n", debugstr_a(lpszType), lpszBuffer, dwLen);
+  TRACE("(%s,%p,%ld)\n", debugstr_a(lpszType), lpszBuffer, dwLen);
 
   if (dwLen > dwLenMimeDbContent && lpszType && lpszBuffer)
   {
@@ -248,7 +248,7 @@ BOOL WINAPI GetMIMETypeSubKeyA(LPCSTR lpszType, LPSTR lpszBuffer, DWORD dwLen)
  */
 BOOL WINAPI GetMIMETypeSubKeyW(LPCWSTR lpszType, LPWSTR lpszBuffer, DWORD dwLen)
 {
-  TRACE("(%s,%p,%d)\n", debugstr_w(lpszType), lpszBuffer, dwLen);
+  TRACE("(%s,%p,%ld)\n", debugstr_w(lpszType), lpszBuffer, dwLen);
 
   if (dwLen > dwLenMimeDbContent && lpszType && lpszBuffer)
   {

dlls/shlwapi/regstream.c

@@ -82,7 +82,7 @@ static ULONG WINAPI IStream_fnAddRef(IStream *iface)
 	ISHRegStream *This = impl_from_IStream(iface);
 	ULONG refCount = InterlockedIncrement(&This->ref);
 	
-	TRACE("(%p)->(ref before=%u)\n",This, refCount - 1);
+	TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1);
 
 	return refCount;
 }
@@ -95,7 +95,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface)
 	ISHRegStream *This = impl_from_IStream(iface);
 	ULONG refCount = InterlockedDecrement(&This->ref);
 
-	TRACE("(%p)->(ref before=%u)\n",This, refCount + 1);
+	TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1);
 
 	if (!refCount)
 	{
@@ -115,7 +115,7 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG
 	ISHRegStream *This = impl_from_IStream(iface);
 	DWORD dwBytesToRead;
 
-	TRACE("(%p)->(%p,0x%08x,%p)\n",This, pv, cb, pcbRead);
+	TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead);
 
 	if (This->dwPos >= This->dwLength)
 	  dwBytesToRead = 0;
@@ -143,7 +143,7 @@ static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb
 	ISHRegStream *This = impl_from_IStream(iface);
 	DWORD newLen = This->dwPos + cb;
 
-	TRACE("(%p, %p, %d, %p)\n",This, pv, cb, pcbWritten);
+	TRACE("(%p, %p, %ld, %p)\n",This, pv, cb, pcbWritten);
 
 	if (newLen < This->dwPos) /* overflow */
 	  return STG_E_INSUFFICIENTMEMORY;
@@ -173,7 +173,7 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D
 {
 	ISHRegStream *This = impl_from_IStream(iface);
 	LARGE_INTEGER tmp;
-	TRACE("(%p, %s, %d %p)\n", This,
+	TRACE("(%p, %s, %ld %p)\n", This,
               wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition);
 
 	if (dwOrigin == STREAM_SEEK_SET)
@@ -282,7 +282,7 @@ static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD
 {
 	ISHRegStream *This = impl_from_IStream(iface);
 
-	TRACE("(%p, %p, %d)\n",This,pstatstg,grfStatFlag);
+	TRACE("(%p, %p, %ld)\n",This,pstatstg,grfStatFlag);
 
 	pstatstg->pwcsName = NULL;
 	pstatstg->type = STGTY_STREAM;

dlls/shlwapi/shlwapi_main.c

@@ -54,7 +54,7 @@ DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0;
  */
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
-	TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad);
+	TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
 	switch (fdwReason)
 	{
 	  case DLL_PROCESS_ATTACH:
@@ -105,7 +105,7 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
     return S_OK;
  }
 
- WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize);
+ WARN("pdvi->cbSize = %ld, unhandled\n", pdvi2->info1.cbSize);
  return E_INVALIDARG;
 }
 
@@ -162,7 +162,7 @@ UINT WINAPI WhichPlatform(void)
  */
 HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bag_name, DWORD flags, REFIID riid, void **ppv)
 {
-    FIXME("%p, %s, %#x, %s, %p stub.\n", pidl, debugstr_w(bag_name), flags, debugstr_guid(riid), ppv);
+    FIXME("%p, %s, %#lx, %s, %p stub.\n", pidl, debugstr_w(bag_name), flags, debugstr_guid(riid), ppv);
 
     return E_NOTIMPL;
 }
@@ -172,7 +172,7 @@ HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bag_name
  */
 BOOL WINAPI SHIsLowMemoryMachine(DWORD type)
 {
-    FIXME("%d stub\n", type);
+    FIXME("%ld stub\n", type);
 
     return FALSE;
 }

dlls/shlwapi/stopwatch.c

@@ -93,7 +93,7 @@ void WINAPI StopWatchFlush(void)
 DWORD WINAPI StopWatchW(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown,
                         DWORD dwMode, DWORD dwTimeStamp)
 {
-    FIXME("(%d,%s,%d,%d,%d) stub!\n", dwClass, debugstr_w(lpszStr),
+    FIXME("(%ld,%s,%ld,%ld,%ld) stub!\n", dwClass, debugstr_w(lpszStr),
         dwUnknown, dwMode, dwTimeStamp);
   return ERROR_SUCCESS;
 }
@@ -171,7 +171,7 @@ void WINAPI StopWatch_MarkFrameStart(LPCSTR lpszName)
  */
 void WINAPI StopWatch_MarkJavaStop(LPCWSTR lpszEvent, HWND hWnd, DWORD dwReserved)
 {
-  FIXME("(%s,%p,0x%08x) stub!\n", debugstr_w(lpszEvent), hWnd, dwReserved);
+  FIXME("(%s,%p,0x%08lx) stub!\n", debugstr_w(lpszEvent), hWnd, dwReserved);
 }
 
 /*************************************************************************
@@ -215,7 +215,7 @@ DWORD WINAPI GetPerfTime(void)
  */
 DWORD WINAPI StopWatch_SetMsgLastLocation(DWORD dwUnknown)
 {
-  FIXME("(%d) stub!\n", dwUnknown);
+  FIXME("(%ld) stub!\n", dwUnknown);
 
   return dwUnknown;
 }

dlls/shlwapi/string.c

@@ -754,7 +754,7 @@ INT WINAPI StrFromTimeIntervalA(LPSTR lpszStr, UINT cchMax, DWORD dwMS,
 {
   INT iRet = 0;
 
-  TRACE("(%p,%d,%d,%d)\n", lpszStr, cchMax, dwMS, iDigits);
+  TRACE("(%p,%d,%ld,%d)\n", lpszStr, cchMax, dwMS, iDigits);
 
   if (lpszStr && cchMax)
   {
@@ -776,7 +776,7 @@ INT WINAPI StrFromTimeIntervalW(LPWSTR lpszStr, UINT cchMax, DWORD dwMS,
 {
   INT iRet = 0;
 
-  TRACE("(%p,%d,%d,%d)\n", lpszStr, cchMax, dwMS, iDigits);
+  TRACE("(%p,%d,%ld,%d)\n", lpszStr, cchMax, dwMS, iDigits);
 
   if (lpszStr && cchMax)
   {
@@ -947,7 +947,7 @@ LPSTR WINAPI StrFormatByteSize64A(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax)
  */
 LPSTR WINAPI StrFormatByteSizeA(DWORD dwBytes, LPSTR lpszDest, UINT cchMax)
 {
-  TRACE("(%d,%p,%d)\n", dwBytes, lpszDest, cchMax);
+  TRACE("(%ld,%p,%d)\n", dwBytes, lpszDest, cchMax);
 
   return StrFormatByteSize64A(dwBytes, lpszDest, cchMax);
 }
@@ -1036,7 +1036,7 @@ DWORD WINAPI SHAnsiToUnicodeCP(DWORD dwCp, LPCSTR lpSrcStr, LPWSTR lpDstStr, int
   DWORD dwRet;
 
   dwRet = MultiByteToWideChar(dwCp, 0, lpSrcStr, -1, lpDstStr, iLen);
-  TRACE("%s->%s,ret=%d\n", debugstr_a(lpSrcStr), debugstr_w(lpDstStr), dwRet);
+  TRACE("%s->%s,ret=%ld\n", debugstr_a(lpSrcStr), debugstr_w(lpDstStr), dwRet);
   return dwRet;
 }
 

dlls/shlwapi/thread.c

@@ -68,7 +68,7 @@ LPSECURITY_ATTRIBUTES WINAPI CreateAllAccessSecurityAttributes(
   /* This function is used within SHLWAPI only to create security attributes
    * for shell semaphores. */
 
-  TRACE("(%p,%p,%08x)\n", lpAttr, lpSec, p3);
+  TRACE("(%p,%p,%08lx)\n", lpAttr, lpSec, p3);
 
   if (!(GetVersion() & 0x80000000))  /* NT */
   {
@@ -185,7 +185,7 @@ HANDLE WINAPI SHGlobalCounterCreateNamedW(LPCWSTR lpszName, DWORD iInitial)
   SECURITY_ATTRIBUTES sAttr, *pSecAttr;
   HANDLE hRet;
 
-  TRACE("(%s,%d)\n", debugstr_w(lpszName), iInitial);
+  TRACE("(%s,%ld)\n", debugstr_w(lpszName), iInitial);
 
   /* Create Semaphore name */
   memcpy(szBuff, szPrefix, (iPrefixLen + 1) * sizeof(WCHAR));
@@ -216,7 +216,7 @@ HANDLE WINAPI SHGlobalCounterCreateNamedA(LPCSTR lpszName, DWORD iInitial)
 {
   WCHAR szBuff[MAX_PATH];
 
-  TRACE("(%s,%d)\n", debugstr_a(lpszName), iInitial);
+  TRACE("(%s,%ld)\n", debugstr_a(lpszName), iInitial);
 
   if (lpszName)
     MultiByteToWideChar(CP_ACP, 0, lpszName, -1, szBuff, MAX_PATH);

dlls/shlwapi/url.c

@@ -111,7 +111,7 @@ HRESULT WINAPI MLBuildResURLW(LPCWSTR lpszLibName, HMODULE hMod, DWORD dwFlags,
   static const unsigned int szResLen = ARRAY_SIZE(szRes) - 1;
   HRESULT hRet = E_FAIL;
 
-  TRACE("(%s,%p,0x%08x,%s,%p,%d)\n", debugstr_w(lpszLibName), hMod, dwFlags,
+  TRACE("(%s,%p,0x%08lx,%s,%p,%ld)\n", debugstr_w(lpszLibName), hMod, dwFlags,
         debugstr_w(lpszRes), lpszDest, dwDestLen);
 
   if (!lpszLibName || !hMod || hMod == INVALID_HANDLE_VALUE || !lpszRes ||