[PATCH 01/25] programs/schtasks: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 programs/schtasks/Makefile.in |    1 -
 programs/schtasks/schtasks.c  |    8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in
index 63afc93a876..6eb8d530425 100644
--- a/programs/schtasks/Makefile.in
+++ b/programs/schtasks/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = schtasks.exe
 IMPORTS   = oleaut32 ole32
 
diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c
index 340aeaa56fb..c9434801db8 100644
--- a/programs/schtasks/schtasks.c
+++ b/programs/schtasks/schtasks.c
@@ -40,14 +40,14 @@ static ITaskFolder *get_tasks_root_folder(void)
     V_VT(&empty) = VT_EMPTY;
     hres = ITaskService_Connect(service, empty, empty, empty, empty);
     if (FAILED(hres)) {
-        FIXME("Connect failed: %08x\n", hres);
+        FIXME("Connect failed: %08lx\n", hres);
         return NULL;
     }
 
     hres = ITaskService_GetFolder(service, NULL, &root);
     ITaskService_Release(service);
     if (FAILED(hres)) {
-        FIXME("GetFolder failed: %08x\n", hres);
+        FIXME("GetFolder failed: %08lx\n", hres);
         return NULL;
     }
 
@@ -70,7 +70,7 @@ static IRegisteredTask *get_registered_task(const WCHAR *name)
     SysFreeString(str);
     ITaskFolder_Release(root);
     if (FAILED(hres)) {
-        FIXME("GetTask failed: %08x\n", hres);
+        FIXME("GetTask failed: %08lx\n", hres);
         return NULL;
     }
 
@@ -183,7 +183,7 @@ static int change_command(int argc, WCHAR *argv[])
         hres = IRegisteredTask_put_Enabled(task, VARIANT_TRUE);
         if (FAILED(hres)) {
             IRegisteredTask_Release(task);
-            FIXME("put_Enabled failed: %08x\n", hres);
+            FIXME("put_Enabled failed: %08lx\n", hres);
             return 1;
         }
     }

[PATCH 02/25] dlls/browseui: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/browseui/Makefile.in     |    1 -
 dlls/browseui/aclmulti.c      |    2 +-
 dlls/browseui/aclsource.c     |    8 ++++----
 dlls/browseui/browseui_main.c |    2 +-
 dlls/browseui/progressdlg.c   |    6 +++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in
index 1f2521aa853..6c14ace37cf 100644
--- a/dlls/browseui/Makefile.in
+++ b/dlls/browseui/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = browseui.dll
 IMPORTS   = uuid ole32 comctl32 user32 advapi32
 
diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c
index 820b246a403..a41cb810369 100644
--- a/dlls/browseui/aclmulti.c
+++ b/dlls/browseui/aclmulti.c
@@ -140,7 +140,7 @@ static HRESULT WINAPI ACLMulti_Next(IEnumString *iface, ULONG celt, LPOLESTR *rg
 {
     ACLMulti *This = impl_from_IEnumString(iface);
 
-    TRACE("(%p, %d, %p, %p)\n", iface, celt, rgelt, pceltFetched);
+    TRACE("(%p, %ld, %p, %p)\n", iface, celt, rgelt, pceltFetched);
     while (This->currObj < This->nObjs)
     {
         if (This->objs[This->currObj].pEnum)
diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c
index 5ac7cb10761..4412ca38003 100644
--- a/dlls/browseui/aclsource.c
+++ b/dlls/browseui/aclsource.c
@@ -94,7 +94,7 @@ static ULONG WINAPI ACLShellSource_AddRef(IEnumString *iface)
 {
     ACLShellSource *This = impl_from_IEnumString(iface);
     ULONG ref = InterlockedIncrement(&This->refCount);
-    TRACE("(%p)->(%u)\n", This, ref);
+    TRACE("(%p)->(%lu)\n", This, ref);
     return ref;
 }
 
@@ -103,7 +103,7 @@ static ULONG WINAPI ACLShellSource_Release(IEnumString *iface)
     ACLShellSource *This = impl_from_IEnumString(iface);
     ULONG ref = InterlockedDecrement(&This->refCount);
 
-    TRACE("(%p)->(%u)\n", This, ref);
+    TRACE("(%p)->(%lu)\n", This, ref);
 
     if (ref == 0)
         ACLShellSource_Destructor(This);
@@ -114,14 +114,14 @@ static HRESULT WINAPI ACLShellSource_Next(IEnumString *iface, ULONG celt, LPOLES
     ULONG *fetched)
 {
     ACLShellSource *This = impl_from_IEnumString(iface);
-    FIXME("(%p)->(%u %p %p): stub\n", This, celt, rgelt, fetched);
+    FIXME("(%p)->(%lu %p %p): stub\n", This, celt, rgelt, fetched);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI ACLShellSource_Skip(IEnumString *iface, ULONG celt)
 {
     ACLShellSource *This = impl_from_IEnumString(iface);
-    FIXME("(%p)->(%u): stub\n", This, celt);
+    FIXME("(%p)->(%lu): stub\n", This, celt);
     return E_NOTIMPL;
 }
 
diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c
index d2c5ecf3622..b6962b30f26 100644
--- a/dlls/browseui/browseui_main.c
+++ b/dlls/browseui/browseui_main.c
@@ -162,7 +162,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut)
  */
 BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
 {
-    TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad);
+    TRACE("%p 0x%lx %p\n", hinst, fdwReason, fImpLoad);
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c
index 89e70e90201..dc0fe813f68 100644
--- a/dlls/browseui/progressdlg.c
+++ b/dlls/browseui/progressdlg.c
@@ -343,7 +343,7 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface,
     struct create_params params;
     HANDLE hThread;
 
-    TRACE("(%p, %p, %x, %p)\n", iface, punkEnableModeless, dwFlags, reserved);
+    TRACE("(%p, %p, %lx, %p)\n", iface, punkEnableModeless, dwFlags, reserved);
     if (punkEnableModeless || reserved)
         FIXME("Reserved parameters not null (%p, %p)\n", punkEnableModeless, reserved);
     if (dwFlags & PROGDLG_NOTIME)
@@ -509,7 +509,7 @@ static HRESULT WINAPI ProgressDialog_SetLine(IProgressDialog *iface, DWORD dwLin
     ProgressDialog *This = impl_from_IProgressDialog(iface);
     HWND hwnd;
 
-    TRACE("(%p, %d, %s, %d)\n", This, dwLineNum, wine_dbgstr_w(pwzLine), bPath);
+    TRACE("(%p, %ld, %s, %d)\n", This, dwLineNum, wine_dbgstr_w(pwzLine), bPath);
 
     if (reserved)
         FIXME("reserved pointer not null (%p)\n", reserved);
@@ -556,7 +556,7 @@ static HRESULT WINAPI ProgressDialog_Timer(IProgressDialog *iface, DWORD dwTimer
 {
     ProgressDialog *This = impl_from_IProgressDialog(iface);
 
-    FIXME("(%p, %d, %p) - stub\n", This, dwTimerAction, reserved);
+    FIXME("(%p, %ld, %p) - stub\n", This, dwTimerAction, reserved);
 
     if (reserved)
         FIXME("Reserved field not NULL but %p\n", reserved);

[PATCH 03/25] dlls/cabinet: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/cabinet/Makefile.in |    1 -
 dlls/cabinet/fdi.c       |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in
index eb45aae8df7..4ee406480ac 100644
--- a/dlls/cabinet/Makefile.in
+++ b/dlls/cabinet/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cabinet.dll
 IMPORTLIB = cabinet
 IMPORTS   = $(ZLIB_PE_LIBS)
diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
index 1f442917d56..7e2e6b8fdde 100644
--- a/dlls/cabinet/fdi.c
+++ b/dlls/cabinet/fdi.c
@@ -482,7 +482,7 @@ static char *FDI_read_string(FDI_Int *fdi, INT_PTR hf, long cabsize)
   unsigned int i;
   cab_UBYTE *buf = NULL;
 
-  TRACE("(fdi == %p, hf == %ld, cabsize == %ld)\n", fdi, hf, cabsize);
+  TRACE("(fdi == %p, hf == %Id, cabsize == %ld)\n", fdi, hf, cabsize);
 
   do {
     if (len > maxlen) len = maxlen;
@@ -541,7 +541,7 @@ static BOOL FDI_read_entries(
   cab_UBYTE buf[64], block_resv;
   char *prevname = NULL, *previnfo = NULL, *nextname = NULL, *nextinfo = NULL;
 
-  TRACE("(fdi == ^%p, hf == %ld, pfdici == ^%p)\n", fdi, hf, pfdici);
+  TRACE("(fdi == ^%p, hf == %Id, pfdici == ^%p)\n", fdi, hf, pfdici);
 
   /* read in the CFHEADER */
   if (fdi->read(hf, buf, cfhead_SIZEOF) != cfhead_SIZEOF) {
@@ -698,7 +698,7 @@ BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici)
   BOOL rv;
   FDI_Int *fdi = get_fdi_ptr( hfdi );
 
-  TRACE("(hfdi == ^%p, hf == ^%ld, pfdici == ^%p)\n", hfdi, hf, pfdici);
+  TRACE("(hfdi == ^%p, hf == ^%Id, pfdici == ^%p)\n", hfdi, hf, pfdici);
 
   if (!fdi) return FALSE;

[PATCH 04/25] dlls/cards: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/cards/Makefile.in |    1 -
 dlls/cards/cards.c     |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/cards/Makefile.in b/dlls/cards/Makefile.in
index 7a6f14dda06..395b15018ad 100644
--- a/dlls/cards/Makefile.in
+++ b/dlls/cards/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cards.dll
 IMPORTLIB = cards
 IMPORTS   = user32 gdi32
diff --git a/dlls/cards/cards.c b/dlls/cards/cards.c
index dec25f3252c..e774d7df4a4 100644
--- a/dlls/cards/cards.c
+++ b/dlls/cards/cards.c
@@ -92,7 +92,7 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int mode
 	BOOL eraseFlag = FALSE;
 	BOOL drawFlag = TRUE;
 
-	TRACE("(%p, %d, %d, %d, %d, %d, %d, %d)\n", hdc, x, y, dx, dy, card, mode, color);
+	TRACE("(%p, %d, %d, %d, %d, %d, %d, %ld)\n", hdc, x, y, dx, dy, card, mode, color);
 
 	roundCornersFlag = !(mode & MODEFLAG_DONT_ROUND_CORNERS) &&
 			   (dx == cardWidth) && (dy == cardHeight);
@@ -238,7 +238,7 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int mode
  */
 BOOL WINAPI cdtDraw(HDC hdc, int x, int y, int card, int mode, DWORD color)
 {
-	TRACE("(%p, %d, %d, %d, %d, %d)\n", hdc, x, y, card, mode, color);
+	TRACE("(%p, %d, %d, %d, %d, %ld)\n", hdc, x, y, card, mode, color);
 
 	return cdtDrawExt(hdc, x, y, cardWidth, cardHeight, card, mode, color);
 }

[PATCH 05/25] dlls/clusapi: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/clusapi/Makefile.in |    1 -
 dlls/clusapi/clusapi.c   |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/clusapi/Makefile.in b/dlls/clusapi/Makefile.in
index 9514378e663..01451a1d743 100644
--- a/dlls/clusapi/Makefile.in
+++ b/dlls/clusapi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = clusapi.dll
 IMPORTLIB = clusapi
 
diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c
index b1dde6f0290..28c5f63d4ca 100644
--- a/dlls/clusapi/clusapi.c
+++ b/dlls/clusapi/clusapi.c
@@ -89,7 +89,7 @@ BOOL WINAPI CloseCluster(HCLUSTER hCluster)
  */
 HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType)
 {
-    FIXME("(%p, %u) stub!\n", hCluster,dwType);
+    FIXME("(%p, %lu) stub!\n", hCluster,dwType);
 
     return (HCLUSENUM)0xdeadbeef;
 }
@@ -111,7 +111,7 @@ DWORD WINAPI ClusterCloseEnum(HCLUSENUM hEnum)
  */
 DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName)
 {
-    FIXME("(%p, %u, %p, %p, %u) stub!\n", hEnum, dwIndex, lpdwType, lpszName, *lpcchName);
+    FIXME("(%p, %lu, %p, %p, %lu) stub!\n", hEnum, dwIndex, lpdwType, lpszName, *lpcchName);
 
     return ERROR_NO_MORE_ITEMS;
 }

[PATCH 06/25] dlls/comdlg32: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/comdlg32/Makefile.in      |    1 
 dlls/comdlg32/cdlg32.c         |    4 +-
 dlls/comdlg32/colordlg.c       |    4 +-
 dlls/comdlg32/filedlg.c        |   36 +++++++--------
 dlls/comdlg32/filedlg31.c      |   16 +++----
 dlls/comdlg32/filedlgbrowser.c |   14 +++---
 dlls/comdlg32/finddlg.c        |    2 -
 dlls/comdlg32/fontdlg.c        |   12 ++---
 dlls/comdlg32/itemdlg.c        |   98 ++++++++++++++++++++--------------------
 dlls/comdlg32/printdlg.c       |   30 ++++++------
 10 files changed, 108 insertions(+), 109 deletions(-)

diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in
index 959f4bac63c..f919a266a07 100644
--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = comdlg32.dll
 IMPORTLIB = comdlg32
 IMPORTS   = uuid shell32 shlwapi comctl32 winspool user32 gdi32 advapi32
diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c
index c63d201d526..f9619cc6a49 100644
--- a/dlls/comdlg32/cdlg32.c
+++ b/dlls/comdlg32/cdlg32.c
@@ -67,7 +67,7 @@ static const char GPA_string[] = "Failed to get entry point %s for hinst = %p\n"
 
 BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
 {
-	TRACE("(%p, %d, %p)\n", hInstance, Reason, Reserved);
+	TRACE("(%p, %ld, %p)\n", hInstance, Reason, Reserved);
 
 	switch(Reason)
 	{
@@ -118,7 +118,7 @@ void *COMDLG32_AllocMem(int size)
  */
 void COMDLG32_SetCommDlgExtendedError(DWORD err)
 {
-	TRACE("(%08x)\n", err);
+	TRACE("(%08lx)\n", err);
         if (COMDLG32_TlsIndex == TLS_OUT_OF_INDEXES)
 	  COMDLG32_TlsIndex = TlsAlloc();
 	if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES)
diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c
index 1d459dd2d87..e16014c8d19 100644
--- a/dlls/comdlg32/colordlg.c
+++ b/dlls/comdlg32/colordlg.c
@@ -851,7 +851,7 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam )
    POINT point;
    CCPRIV *lpp;
 
-   TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
+   TRACE("WM_INITDIALOG lParam=%08IX\n", lParam);
 
    if (cc->lStructSize != sizeof(CHOOSECOLORW))
    {
@@ -958,7 +958,7 @@ static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD noti
     HDC hdc;
     COLORREF *cr;
 
-    TRACE("CC_WMCommand wParam=%lx lParam=%lx\n", wParam, lParam);
+    TRACE("CC_WMCommand wParam=%Ix lParam=%Ix\n", wParam, lParam);
     switch (LOWORD(wParam))
     {
         case COLOR_RED:  /* edit notify RGB */
diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index 0f74c85fcd8..415c0580461 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -304,7 +304,7 @@ static void filedlg_collect_places_pidls(FileOpenDlgInfos *fodInfos)
             {
                 hr = SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]);
                 if (FAILED(hr))
-                    WARN("Unrecognized special folder %u.\n", value);
+                    WARN("Unrecognized special folder %lu.\n", value);
             }
             else if (get_config_key_string(hkey, nameW, &str))
             {
@@ -346,7 +346,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos)
     /* test for missing functionality */
     if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS)
     {
-      FIXME("Flags 0x%08x not yet implemented\n",
+      FIXME("Flags 0x%08lx not yet implemented\n",
          fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS);
     }
 
@@ -968,7 +968,7 @@ LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode)
     else
         hook_result = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg, WM_NOTIFY, 0, (LPARAM)&ofnNotify);
 
-    TRACE("RET NOTIFY retval %#lx\n", hook_result);
+    TRACE("RET NOTIFY retval %#Ix\n", hook_result);
 
     return hook_result;
 }
@@ -1132,7 +1132,7 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam)
     if( !(fodInfos->ofnInfos->Flags & OFN_ENABLESIZING)) return FALSE;
     /* get the new dialog rectangle */
     GetWindowRect( hwnd, &rc);
-    TRACE("%p, size from %d,%d to %d,%d\n", hwnd, fodInfos->sizedlg.cx, fodInfos->sizedlg.cy,
+    TRACE("%p, size from %ld,%ld to %ld,%ld\n", hwnd, fodInfos->sizedlg.cx, fodInfos->sizedlg.cy,
             rc.right -rc.left, rc.bottom -rc.top);
     /* not initialized yet */
     if( (fodInfos->sizedlg.cx == 0 && fodInfos->sizedlg.cy == 0) ||
@@ -2253,7 +2253,7 @@ static WCHAR FILEDLG95_MRU_get_slot(LPCWSTR module_name, LPWSTR stored_path, PHK
     ret = RegCreateKeyW(HKEY_CURRENT_USER,
             L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ComDlg32\\LastVisitedMRU", hkey);
     if(ret){
-        WARN("Unable to create MRU key: %d\n", ret);
+        WARN("Unable to create MRU key: %ld\n", ret);
         return 0;
     }
 
@@ -2263,7 +2263,7 @@ static WCHAR FILEDLG95_MRU_get_slot(LPCWSTR module_name, LPWSTR stored_path, PHK
         if(ret == ERROR_FILE_NOT_FOUND)
             return 'a';
 
-        WARN("Error getting MRUList data: type: %d, ret: %d\n", key_type, ret);
+        WARN("Error getting MRUList data: type: %ld, ret: %ld\n", key_type, ret);
         RegCloseKey(*hkey);
         return 0;
     }
@@ -2277,7 +2277,7 @@ static WCHAR FILEDLG95_MRU_get_slot(LPCWSTR module_name, LPWSTR stored_path, PHK
         ret = RegGetValueW(*hkey, NULL, value_name, RRF_RT_REG_BINARY,
                 &key_type, (LPBYTE)value_data, &value_data_size);
         if(ret || key_type != REG_BINARY){
-            WARN("Error getting MRU slot data: type: %d, ret: %d\n", key_type, ret);
+            WARN("Error getting MRU slot data: type: %ld, ret: %ld\n", key_type, ret);
             continue;
         }
 
@@ -2316,7 +2316,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename)
     /* get the current executable's name */
     if (!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, ARRAY_SIZE(module_path)))
     {
-        WARN("GotModuleFileName failed: %d\n", GetLastError());
+        WARN("GotModuleFileName failed: %ld\n", GetLastError());
         return;
     }
     module_name = wcsrchr(module_path, '\\');
@@ -2350,7 +2350,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename)
         ret = RegSetValueExW(hkey, slot_name, 0, REG_BINARY, (LPBYTE)final,
                 final_len * sizeof(WCHAR));
         if(ret){
-            WARN("Error saving MRU data to slot %s: %d\n", wine_dbgstr_w(slot_name), ret);
+            WARN("Error saving MRU data to slot %s: %ld\n", wine_dbgstr_w(slot_name), ret);
             heap_free(final);
             RegCloseKey(hkey);
             return;
@@ -2371,7 +2371,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename)
                 new_mru_list[0] = slot;
                 new_mru_list[1] = '\0';
             }else{
-                WARN("Error getting MRUList data: type: %d, ret: %d\n", key_type, ret);
+                WARN("Error getting MRUList data: type: %ld, ret: %ld\n", key_type, ret);
                 RegCloseKey(hkey);
                 return;
             }
@@ -2389,7 +2389,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename)
         ret = RegSetValueExW(hkey, L"MRUList", 0, REG_SZ, (LPBYTE)new_mru_list,
                 (lstrlenW(new_mru_list) + 1) * sizeof(WCHAR));
         if(ret){
-            WARN("Error saving MRUList data: %d\n", ret);
+            WARN("Error saving MRUList data: %ld\n", ret);
             RegCloseKey(hkey);
             return;
         }
@@ -2404,7 +2404,7 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path)
     /* get the current executable's name */
     if (!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, ARRAY_SIZE(module_path)))
     {
-        WARN("GotModuleFileName failed: %d\n", GetLastError());
+        WARN("GotModuleFileName failed: %ld\n", GetLastError());
         return;
     }
     module_name = wcsrchr(module_path, '\\');
@@ -2492,7 +2492,7 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf,
         if(SUCCEEDED(IShellFolder_ParseDisplayName(*ppsf, hwnd, NULL, lpwstrTemp, &dwEaten, &pidl, &dwAttributes)))
         {
             /* the path component is valid, we have a pidl of the next path component */
-            TRACE("parse OK attr=0x%08x pidl=%p\n", dwAttributes, pidl);
+            TRACE("parse OK attr=0x%08lx pidl=%p\n", dwAttributes, pidl);
             if(dwAttributes & SFGAO_FOLDER)
             {
                 if(FAILED(IShellFolder_BindToObject(*ppsf, pidl, 0, &IID_IShellFolder, (LPVOID*)&lpsfChild)))
@@ -3541,7 +3541,7 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId)
                   sizeof(sfi),
                   SHGFI_DISPLAYNAME | SHGFI_PIDL | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED);
 
-  TRACE("-- Add %s attr=0x%08x\n", debugstr_w(sfi.szDisplayName), sfi.dwAttributes);
+  TRACE("-- Add %s attr=0x%08lx\n", debugstr_w(sfi.szDisplayName), sfi.dwAttributes);
 
   if((sfi.dwAttributes & SFGAO_FILESYSANCESTOR) || (sfi.dwAttributes & SFGAO_FILESYSTEM))
   {
@@ -3684,7 +3684,7 @@ static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMet
 
   iCount = SendMessageW(hwnd, CB_GETCOUNT, 0, 0);
 
-  TRACE("0x%08lx 0x%x\n",searchArg, iSearchMethod);
+  TRACE("0x%08Ix 0x%x\n",searchArg, iSearchMethod);
 
   if (iCount != CB_ERR)
   {
@@ -4092,7 +4092,7 @@ static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl)
 
   	ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
 
-	TRACE("-- 0x%08x 0x%08x\n", uAttr, ret);
+	TRACE("-- 0x%08lx 0x%08lx\n", uAttr, ret);
 	/* see documentation shell 4.1*/
         return uAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER);
 }
@@ -4158,7 +4158,7 @@ static inline BOOL is_win16_looks(DWORD flags)
  */
 BOOL WINAPI GetOpenFileNameA(OPENFILENAMEA *ofn)
 {
-    TRACE("flags 0x%08x\n", ofn->Flags);
+    TRACE("flags 0x%08lx\n", ofn->Flags);
 
     if (!valid_struct_size( ofn->lStructSize ))
     {
@@ -4193,7 +4193,7 @@ BOOL WINAPI GetOpenFileNameA(OPENFILENAMEA *ofn)
  */
 BOOL WINAPI GetOpenFileNameW(OPENFILENAMEW *ofn)
 {
-    TRACE("flags 0x%08x\n", ofn->Flags);
+    TRACE("flags 0x%08lx\n", ofn->Flags);
 
     if (!valid_struct_size( ofn->lStructSize ))
     {
diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c
index b134814ab03..16a67422b02 100644
--- a/dlls/comdlg32/filedlg31.c
+++ b/dlls/comdlg32/filedlg31.c
@@ -125,18 +125,18 @@ static BOOL FD31_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam,
 
     if (lfs->ofnA)
     {
-        TRACE("Call hookA %p (%p, %04x, %08lx, %08lx)\n",
+        TRACE("Call hookA %p (%p, %04x, %08Ix, %08Ix)\n",
                lfs->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
         ret = lfs->ofnA->lpfnHook(lfs->hwnd, wMsg, wParam, lParam);
-        TRACE("ret hookA %p (%p, %04x, %08lx, %08lx)\n",
+        TRACE("ret hookA %p (%p, %04x, %08Ix, %08Ix)\n",
                lfs->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
         return ret;
     }
 
-    TRACE("Call hookW %p (%p, %04x, %08lx, %08lx)\n",
+    TRACE("Call hookW %p (%p, %04x, %08Ix, %08Ix)\n",
            lfs->ofnW->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
     ret = lfs->ofnW->lpfnHook(lfs->hwnd, wMsg, wParam, lParam);
-    TRACE("Ret hookW %p (%p, %04x, %08lx, %08lx)\n",
+    TRACE("Ret hookW %p (%p, %04x, %08Ix, %08Ix)\n",
            lfs->ofnW->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
     return ret;
 }
@@ -968,7 +968,7 @@ static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
   lfs->hwnd = hWnd;
   ofn = lfs->ofnW;
 
-  TRACE("flags=%x initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir));
+  TRACE("flags=%lx initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir));
 
   SetWindowTextW( hWnd, ofn->lpstrTitle );
   /* read custom filter information */
@@ -1021,7 +1021,7 @@ static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
   {
     lstrcpynW(tmpstr, FD31_GetFileType(ofn->lpstrCustomFilter,
 	     ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
-    TRACE("nFilterIndex = %d, SetText of edt1 to %s\n",
+    TRACE("nFilterIndex = %ld, SetText of edt1 to %s\n",
   			ofn->nFilterIndex, debugstr_w(tmpstr));
     SetDlgItemTextW( hWnd, edt1, tmpstr );
   }
@@ -1099,7 +1099,7 @@ static INT_PTR CALLBACK FD31_FileOpenDlgProc(HWND hWnd, UINT wMsg,
 {
     PFD31_DATA lfs = (PFD31_DATA)GetPropA( hWnd, FD31_OFN_PROP );
 
-    TRACE("msg=%x wparam=%lx lParam=%lx\n", wMsg, wParam, lParam);
+    TRACE("msg=%x wparam=%Ix lParam=%Ix\n", wMsg, wParam, lParam);
     if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
     {
         INT_PTR lRet;
@@ -1149,7 +1149,7 @@ BOOL GetFileName31A( OPENFILENAMEA *lpofn, UINT dlgType )
 
     if (!lpofn || !FD31_Init()) return FALSE;
 
-    TRACE("ofn flags %08x\n", lpofn->Flags);
+    TRACE("ofn flags %08lx\n", lpofn->Flags);
     lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, FALSE);
     if (lfs)
     {
diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c
index 5b5323f4d22..8f4e74b018c 100644
--- a/dlls/comdlg32/filedlgbrowser.c
+++ b/dlls/comdlg32/filedlgbrowser.c
@@ -150,7 +150,7 @@ static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos)
 /* copied from shell32 to avoid linking to it */
 static BOOL COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPCITEMIDLIST pidl)
 {
-        TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest , len, src, pidl);
+        TRACE("dest=%p len=0x%lx strret=%p pidl=%p\n", dest , len, src, pidl);
 
 	switch (src->uType)
 	{
@@ -252,7 +252,7 @@ static ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface)
     IShellBrowserImpl *This = impl_from_IShellBrowser(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p,%u)\n", This, ref - 1);
+    TRACE("(%p,%lu)\n", This, ref - 1);
 
     return ref;
 }
@@ -265,7 +265,7 @@ static ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface)
     IShellBrowserImpl *This = impl_from_IShellBrowser(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p,%u)\n", This, ref + 1);
+    TRACE("(%p,%lu)\n", This, ref + 1);
 
     if (!ref)
         heap_free(This);
@@ -448,7 +448,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
             &fodInfos->ShellInfos.folderSettings, fodInfos->Shell.FOIShellBrowser,
             &rectView, &hwndView)))
     {
-        WARN("Failed to create view window, hr %#x.\n", hRes);
+        WARN("Failed to create view window, hr %#lx.\n", hRes);
         return hRes;
     }
 
@@ -513,7 +513,7 @@ static HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
 {
     IShellBrowserImpl *This = impl_from_IShellBrowser(iface);
 
-    FIXME("(%p 0x%08x %p)\n", This, grfMode, ppStrm);
+    FIXME("(%p 0x%08lx %p)\n", This, grfMode, ppStrm);
 
     /* Feature not implemented */
     return E_NOTIMPL;
@@ -602,7 +602,7 @@ static HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,
     IShellBrowserImpl *This = impl_from_IShellBrowser(iface);
     LRESULT lres;
 
-    TRACE("(%p)->(0x%08x 0x%08x 0x%08lx 0x%08lx %p)\n", This, id, uMsg, wParam, lParam, pret);
+    TRACE("(%p)->(0x%08x 0x%08x 0x%08Ix 0x%08Ix %p)\n", This, id, uMsg, wParam, lParam, pret);
 
     switch (id)
     {
@@ -903,7 +903,7 @@ static LRESULT send_includeitem_notification(HWND hwndParentDlg, LPCITEMIDLIST p
                 hook_result = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg, WM_NOTIFY, 0, (LPARAM)&ofnNotify);
         }
     }
-    TRACE("Retval: 0x%08lx\n", hook_result);
+    TRACE("Retval: 0x%08Ix\n", hook_result);
     return hook_result;
 }
 
diff --git a/dlls/comdlg32/finddlg.c b/dlls/comdlg32/finddlg.c
index d769325e9f0..e627dbce0c7 100644
--- a/dlls/comdlg32/finddlg.c
+++ b/dlls/comdlg32/finddlg.c
@@ -369,7 +369,7 @@ static HWND COMDLG32_FR_DoFindReplace(
         DWORD error;
         LPDLGTEMPLATEW rcs;
 
-	TRACE("hInst=%p, Flags=%08x\n", pdata->fr.hInstance, pdata->fr.Flags);
+	TRACE("hInst=%p, Flags=%08lx\n", pdata->fr.hInstance, pdata->fr.Flags);
 
         if(!(pdata->fr.Flags & FR_ENABLETEMPLATEHANDLE))
         {
diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c
index e2c8eb2b3ad..03c712c6bc2 100644
--- a/dlls/comdlg32/fontdlg.c
+++ b/dlls/comdlg32/fontdlg.c
@@ -496,7 +496,7 @@ static INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *
     HDC hdc;
 
     TRACE("(nFontType=%d)\n",nFontType);
-    TRACE("  %s h=%d w=%d e=%d o=%d wg=%d i=%d u=%d s=%d"
+    TRACE("  %s h=%ld w=%ld e=%ld o=%ld wg=%ld i=%d u=%d s=%d"
             " ch=%d op=%d cp=%d q=%d pf=%xh\n",
             debugstr_w(lplf->lfFaceName),lplf->lfHeight,lplf->lfWidth,
             lplf->lfEscapement,lplf->lfOrientation,
@@ -619,7 +619,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf)
 
     SetPropW(hDlg, strWineFontData, lpcf);
     lpxx=lpcf->lpLogFont;
-    TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
+    TRACE("WM_INITDIALOG lParam=%08IX\n", lParam);
 
     if (lpcf->lStructSize != sizeof(CHOOSEFONTW))
     {
@@ -937,7 +937,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
         }
     }
 
-    TRACE("WM_COMMAND wParam=%08X lParam=%08lX\n", (LONG)wParam, lParam);
+    TRACE("WM_COMMAND wParam=%08lX lParam=%08IX\n", (LONG)wParam, lParam);
     switch (LOWORD(wParam))
     {
     case cmb1:
@@ -998,7 +998,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
             WINDOWINFO wininfo;
             LPLOGFONTW lpxx=lpcf->lpLogFont;
 
-            TRACE("WM_COMMAND/cmb2,3 =%08lX\n", lParam);
+            TRACE("WM_COMMAND/cmb2,3 =%08IX\n", lParam);
 
             /* face name */
             i=SendDlgItemMessageW(hDlg,cmb1,CB_GETCURSEL,0,0);
@@ -1244,7 +1244,7 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
     case WM_CHOOSEFONT_GETLOGFONT:
     {
         LOGFONTA *logfont = (LOGFONTA *)lParam;
-        TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam);
+        TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08IX\n", lParam);
         memcpy( logfont, lpcfw->lpLogFont, FIELD_OFFSET( LOGFONTA, lfFaceName ));
         WideCharToMultiByte( CP_ACP, 0, lpcfw->lpLogFont->lfFaceName, LF_FACESIZE,
                              logfont->lfFaceName, LF_FACESIZE, NULL, NULL );
@@ -1294,7 +1294,7 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
     case WM_DESTROY:
         return TRUE;
     case WM_CHOOSEFONT_GETLOGFONT:
-        TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam);
+        TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08IX\n", lParam);
         memcpy( (LOGFONTW *)lParam, lpcf->lpLogFont, sizeof(LOGFONTW) );
         break;
     case WM_PAINT:
diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c
index 603d48876c0..95778c2f358 100644
--- a/dlls/comdlg32/itemdlg.c
+++ b/dlls/comdlg32/itemdlg.c
@@ -237,7 +237,7 @@ static HRESULT events_OnOverwrite(FileDialogImpl *This, IShellItem *shellitem)
     {
         TRACE("Notifying %p\n", cursor);
         hr = IFileDialogEvents_OnOverwrite(cursor->pfde, (IFileDialog*)&This->IFileDialog2_iface, shellitem, &response);
-        TRACE("<-- hr=%x response=%u\n", hr, response);
+        TRACE("<-- hr=%lx response=%u\n", hr, response);
         if(FAILED(hr) && hr != E_NOTIMPL)
             break;
     }
@@ -294,7 +294,7 @@ static HRESULT cctrl_event_OnButtonClicked(FileDialogImpl *This, DWORD ctl_id)
 static HRESULT cctrl_event_OnItemSelected(FileDialogImpl *This, DWORD ctl_id, DWORD item_id)
 {
     events_client *cursor;
-    TRACE("%p %i %i\n", This, ctl_id, item_id);
+    TRACE("%p %li %li\n", This, ctl_id, item_id);
 
     LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry)
     {
@@ -622,7 +622,7 @@ static HRESULT on_default_action(FileDialogImpl *This)
     case ONOPEN_BROWSE:
         hr = IExplorerBrowser_BrowseToObject(This->peb, (IUnknown*)psf_parent, SBSP_DEFBROWSER);
         if(FAILED(hr))
-            ERR("Failed to browse to directory: %08x\n", hr);
+            ERR("Failed to browse to directory: %08lx\n", hr);
 
         IShellFolder_Release(psf_parent);
         break;
@@ -823,7 +823,7 @@ static inline customctrl *get_cctrl_from_dlgid(FileDialogImpl *This, DWORD dlgid
                 return sub_ctrl;
     }
 
-    ERR("Failed to find control with dialog id %d\n", dlgid);
+    ERR("Failed to find control with dialog id %ld\n", dlgid);
     return NULL;
 }
 
@@ -844,7 +844,7 @@ static inline customctrl *get_cctrl(FileDialogImpl *This, DWORD ctlid)
     if (This->hmenu_opendropdown && This->cctrl_opendropdown.id == ctlid)
         return &This->cctrl_opendropdown;
 
-    TRACE("No existing control with control id %d\n", ctlid);
+    TRACE("No existing control with control id %ld\n", ctlid);
     return NULL;
 }
 
@@ -1026,7 +1026,7 @@ static LRESULT notifysink_on_bn_clicked(FileDialogImpl *This, HWND hwnd, WPARAM
 {
     customctrl *ctrl = get_cctrl_from_dlgid(This, LOWORD(wparam));
 
-    TRACE("%p, %lx\n", This, wparam);
+    TRACE("%p, %Ix\n", This, wparam);
 
     if(ctrl)
     {
@@ -1045,7 +1045,7 @@ static LRESULT notifysink_on_bn_clicked(FileDialogImpl *This, HWND hwnd, WPARAM
 static LRESULT notifysink_on_cbn_selchange(FileDialogImpl *This, HWND hwnd, WPARAM wparam)
 {
     customctrl *ctrl = get_cctrl_from_dlgid(This, LOWORD(wparam));
-    TRACE("%p, %p (%lx)\n", This, ctrl, wparam);
+    TRACE("%p, %p (%Ix)\n", This, ctrl, wparam);
 
     if(ctrl)
     {
@@ -1065,7 +1065,7 @@ static LRESULT notifysink_on_tvn_dropdown(FileDialogImpl *This, LPARAM lparam)
     TBBUTTON tbb;
     UINT idcmd;
 
-    TRACE("%p, %p (%lx)\n", This, ctrl, lparam);
+    TRACE("%p, %p (%Ix)\n", This, ctrl, lparam);
 
     if(ctrl)
     {
@@ -1651,7 +1651,7 @@ static void update_layout(FileDialogImpl *This)
 
     if(dialog_rc.right < min_width || dialog_rc.bottom < min_height)
     {
-        TRACE("Dialog size (%d, %d) too small, not updating layout\n", dialog_rc.right, dialog_rc.bottom);
+        TRACE("Dialog size (%ld, %ld) too small, not updating layout\n", dialog_rc.right, dialog_rc.bottom);
         return;
     }
 
@@ -1881,7 +1881,7 @@ static HRESULT init_explorerbrowser(FileDialogImpl *This)
         hr = IObjectWithSite_SetSite(client, (IUnknown*)&This->IFileDialog2_iface);
         IObjectWithSite_Release(client);
         if(FAILED(hr))
-            ERR("SetSite failed, 0x%08x\n", hr);
+            ERR("SetSite failed, 0x%08lx\n", hr);
     }
 
     /* Browse somewhere */
@@ -2251,11 +2251,11 @@ static HRESULT create_dialog(FileDialogImpl *This, HWND parent)
     This->dlg_hwnd = NULL;
     if(res == -1)
     {
-        ERR("Failed to show dialog (LastError: %d)\n", GetLastError());
+        ERR("Failed to show dialog (LastError: %ld)\n", GetLastError());
         return E_FAIL;
     }
 
-    TRACE("Returning 0x%08x\n", (HRESULT)res);
+    TRACE("Returning 0x%08lx\n", (HRESULT)res);
     return (HRESULT)res;
 }
 
@@ -2328,7 +2328,7 @@ static ULONG WINAPI IFileDialog2_fnAddRef(IFileDialog2 *iface)
 {
     FileDialogImpl *This = impl_from_IFileDialog2(iface);
     LONG ref = InterlockedIncrement(&This->ref);
-    TRACE("%p - ref %d\n", This, ref);
+    TRACE("%p - ref %ld\n", This, ref);
 
     return ref;
 }
@@ -2337,7 +2337,7 @@ static ULONG WINAPI IFileDialog2_fnRelease(IFileDialog2 *iface)
 {
     FileDialogImpl *This = impl_from_IFileDialog2(iface);
     LONG ref = InterlockedDecrement(&This->ref);
-    TRACE("%p - ref %d\n", This, ref);
+    TRACE("%p - ref %ld\n", This, ref);
 
     if(!ref)
     {
@@ -2466,7 +2466,7 @@ static HRESULT WINAPI IFileDialog2_fnUnadvise(IFileDialog2 *iface, DWORD dwCooki
 {
     FileDialogImpl *This = impl_from_IFileDialog2(iface);
     events_client *client, *found = NULL;
-    TRACE("%p (%d)\n", This, dwCookie);
+    TRACE("%p (%ld)\n", This, dwCookie);
 
     LIST_FOR_EACH_ENTRY(client, &This->events_clients, events_client, entry)
     {
@@ -2491,7 +2491,7 @@ static HRESULT WINAPI IFileDialog2_fnUnadvise(IFileDialog2 *iface, DWORD dwCooki
 static HRESULT WINAPI IFileDialog2_fnSetOptions(IFileDialog2 *iface, FILEOPENDIALOGOPTIONS fos)
 {
     FileDialogImpl *This = impl_from_IFileDialog2(iface);
-    TRACE("%p (0x%x)\n", This, fos);
+    TRACE("%p (0x%lx)\n", This, fos);
 
     if (fos & ~(FOS_OVERWRITEPROMPT | FOS_STRICTFILETYPES | FOS_NOCHANGEDIR | FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM
             | FOS_ALLNONSTORAGEITEMS | FOS_NOVALIDATE | FOS_ALLOWMULTISELECT | FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST
@@ -2499,7 +2499,7 @@ static HRESULT WINAPI IFileDialog2_fnSetOptions(IFileDialog2 *iface, FILEOPENDIA
             | FOS_HIDEPINNEDPLACES | FOS_NODEREFERENCELINKS | FOS_DONTADDTORECENT | FOS_FORCESHOWHIDDEN
             | FOS_DEFAULTNOMINIMODE | FOS_FORCEPREVIEWPANEON | FOS_SUPPORTSTREAMABLEITEMS))
     {
-        WARN("Invalid option %#x\n", fos);
+        WARN("Invalid option %#lx\n", fos);
         return E_INVALIDARG;
     }
 
@@ -2714,7 +2714,7 @@ static HRESULT WINAPI IFileDialog2_fnSetDefaultExtension(IFileDialog2 *iface, LP
 static HRESULT WINAPI IFileDialog2_fnClose(IFileDialog2 *iface, HRESULT hr)
 {
     FileDialogImpl *This = impl_from_IFileDialog2(iface);
-    TRACE("%p (0x%08x)\n", This, hr);
+    TRACE("%p (0x%08lx)\n", This, hr);
 
     if(This->dlg_hwnd)
         EndDialog(This->dlg_hwnd, hr);
@@ -3497,7 +3497,7 @@ static HRESULT WINAPI ICommDlgBrowser3_fnOnStateChange(ICommDlgBrowser3 *iface,
     FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface);
     IDataObject *new_selection;
     HRESULT hr;
-    TRACE("%p (%p, %x)\n", This, shv, uChange);
+    TRACE("%p (%p, %lx)\n", This, shv, uChange);
 
     switch(uChange)
     {
@@ -3552,7 +3552,7 @@ static HRESULT WINAPI ICommDlgBrowser3_fnIncludeObject(ICommDlgBrowser3 *iface,
     }
     if(FAILED(hr))
     {
-        ERR("Failed to get shellitem (%08x).\n", hr);
+        ERR("Failed to get shellitem (%08lx).\n", hr);
         return S_OK;
     }
 
@@ -3585,7 +3585,7 @@ static HRESULT WINAPI ICommDlgBrowser3_fnNotify(ICommDlgBrowser3 *iface,
                                                 IShellView *ppshv, DWORD dwNotifyType)
 {
     FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface);
-    FIXME("Stub: %p (%p, 0x%x)\n", This, ppshv, dwNotifyType);
+    FIXME("Stub: %p (%p, 0x%lx)\n", This, ppshv, dwNotifyType);
     return E_NOTIMPL;
 }
 
@@ -3725,7 +3725,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnEnableOpenDropDown(IFileDialogCusto
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     MENUINFO mi;
-    TRACE("%p (%d)\n", This, dwIDCtl);
+    TRACE("%p (%ld)\n", This, dwIDCtl);
 
     if (This->hmenu_opendropdown || get_cctrl(This, dwIDCtl))
         return E_UNEXPECTED;
@@ -3760,7 +3760,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddMenu(IFileDialogCustomize *iface
     customctrl *ctrl;
     TBBUTTON tbb;
     HRESULT hr;
-    TRACE("%p (%d, %p)\n", This, dwIDCtl, pszLabel);
+    TRACE("%p (%ld, %p)\n", This, dwIDCtl, pszLabel);
 
     hr = cctrl_create_new(This, dwIDCtl, NULL, TOOLBARCLASSNAMEW,
                           TBSTYLE_FLAT | CCS_NODIVIDER, 0,
@@ -3791,7 +3791,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddPushButton(IFileDialogCustomize
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl;
     HRESULT hr;
-    TRACE("%p (%d, %p)\n", This, dwIDCtl, pszLabel);
+    TRACE("%p (%ld, %p)\n", This, dwIDCtl, pszLabel);
 
     hr = cctrl_create_new(This, dwIDCtl, pszLabel, WC_BUTTONW, BS_MULTILINE, 0,
                           This->cctrl_def_height, &ctrl);
@@ -3807,7 +3807,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddComboBox(IFileDialogCustomize *i
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl;
     HRESULT hr;
-    TRACE("%p (%d)\n", This, dwIDCtl);
+    TRACE("%p (%ld)\n", This, dwIDCtl);
 
     hr =  cctrl_create_new(This, dwIDCtl, NULL, WC_COMBOBOXW, CBS_DROPDOWNLIST, 0,
                            This->cctrl_def_height, &ctrl);
@@ -3823,7 +3823,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddRadioButtonList(IFileDialogCusto
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl;
     HRESULT hr;
-    TRACE("%p (%d)\n", This, dwIDCtl);
+    TRACE("%p (%ld)\n", This, dwIDCtl);
 
     hr =  cctrl_create_new(This, dwIDCtl, NULL, L"RadioButtonList", 0, 0, 0, &ctrl);
     if(SUCCEEDED(hr))
@@ -3843,7 +3843,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddCheckButton(IFileDialogCustomize
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl;
     HRESULT hr;
-    TRACE("%p (%d, %p, %d)\n", This, dwIDCtl, pszLabel, bChecked);
+    TRACE("%p (%ld, %p, %d)\n", This, dwIDCtl, pszLabel, bChecked);
 
     hr = cctrl_create_new(This, dwIDCtl, pszLabel, WC_BUTTONW, BS_AUTOCHECKBOX|BS_MULTILINE, 0,
                           This->cctrl_def_height, &ctrl);
@@ -3863,7 +3863,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddEditBox(IFileDialogCustomize *if
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl;
     HRESULT hr;
-    TRACE("%p (%d, %p)\n", This, dwIDCtl, pszText);
+    TRACE("%p (%ld, %p)\n", This, dwIDCtl, pszText);
 
     hr = cctrl_create_new(This, dwIDCtl, pszText, WC_EDITW, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE,
                           This->cctrl_def_height, &ctrl);
@@ -3879,7 +3879,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddSeparator(IFileDialogCustomize *
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl;
     HRESULT hr;
-    TRACE("%p (%d)\n", This, dwIDCtl);
+    TRACE("%p (%ld)\n", This, dwIDCtl);
 
     hr = cctrl_create_new(This, dwIDCtl, NULL, WC_STATICW, SS_ETCHEDHORZ, 0,
                           GetSystemMetrics(SM_CYEDGE), &ctrl);
@@ -3896,7 +3896,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddText(IFileDialogCustomize *iface
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl;
     HRESULT hr;
-    TRACE("%p (%d, %p)\n", This, dwIDCtl, pszText);
+    TRACE("%p (%ld, %p)\n", This, dwIDCtl, pszText);
 
     hr = cctrl_create_new(This, dwIDCtl, pszText, WC_STATICW, 0, 0,
                           This->cctrl_def_height, &ctrl);
@@ -3912,7 +3912,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlLabel(IFileDialogCustomiz
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
-    TRACE("%p (%d, %p)\n", This, dwIDCtl, pszLabel);
+    TRACE("%p (%ld, %p)\n", This, dwIDCtl, pszLabel);
 
     if(!ctrl) return E_INVALIDARG;
 
@@ -3940,7 +3940,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetControlState(IFileDialogCustomiz
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
-    TRACE("%p (%d, %p)\n", This, dwIDCtl, pdwState);
+    TRACE("%p (%ld, %p)\n", This, dwIDCtl, pdwState);
 
     if(!ctrl || ctrl->type == IDLG_CCTRL_OPENDROPDOWN) return E_NOTIMPL;
 
@@ -3954,7 +3954,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlState(IFileDialogCustomiz
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This,dwIDCtl);
-    TRACE("%p (%d, %x)\n", This, dwIDCtl, dwState);
+    TRACE("%p (%ld, %x)\n", This, dwIDCtl, dwState);
 
     if(ctrl && ctrl->hwnd)
     {
@@ -3987,7 +3987,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetEditBoxText(IFileDialogCustomize
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
     WCHAR len, *text;
-    TRACE("%p (%d, %p)\n", This, dwIDCtl, ppszText);
+    TRACE("%p (%ld, %p)\n", This, dwIDCtl, ppszText);
 
     if(!ctrl || !ctrl->hwnd || !(len = SendMessageW(ctrl->hwnd, WM_GETTEXTLENGTH, 0, 0)))
         return E_FAIL;
@@ -4006,7 +4006,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetEditBoxText(IFileDialogCustomize
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
-    TRACE("%p (%d, %s)\n", This, dwIDCtl, debugstr_w(pszText));
+    TRACE("%p (%ld, %s)\n", This, dwIDCtl, debugstr_w(pszText));
 
     if(!ctrl || ctrl->type != IDLG_CCTRL_EDITBOX)
         return E_FAIL;
@@ -4021,7 +4021,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetCheckButtonState(IFileDialogCust
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
-    TRACE("%p (%d, %p)\n", This, dwIDCtl, pbChecked);
+    TRACE("%p (%ld, %p)\n", This, dwIDCtl, pbChecked);
 
     if(ctrl && ctrl->hwnd)
         *pbChecked = (SendMessageW(ctrl->hwnd, BM_GETCHECK, 0, 0) == BST_CHECKED);
@@ -4035,7 +4035,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetCheckButtonState(IFileDialogCust
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
-    TRACE("%p (%d, %d)\n", This, dwIDCtl, bChecked);
+    TRACE("%p (%ld, %d)\n", This, dwIDCtl, bChecked);
 
     if(ctrl && ctrl->hwnd)
         SendMessageW(ctrl->hwnd, BM_SETCHECK, bChecked ? BST_CHECKED:BST_UNCHECKED, 0);
@@ -4054,7 +4054,7 @@ static UINT get_combobox_index_from_id(HWND cb_hwnd, DWORD dwIDItem)
         if(SendMessageW(cb_hwnd, CB_GETITEMDATA, i, 0) == dwIDItem)
             return i;
 
-    TRACE("Item with id %d not found in combobox %p (item count: %d)\n", dwIDItem, cb_hwnd, count);
+    TRACE("Item with id %ld not found in combobox %p (item count: %d)\n", dwIDItem, cb_hwnd, count);
     return -1;
 }
 
@@ -4066,7 +4066,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddControlItem(IFileDialogCustomize
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
     HRESULT hr;
-    TRACE("%p (%d, %d, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel));
+    TRACE("%p (%ld, %ld, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel));
 
     if(!ctrl) return E_FAIL;
 
@@ -4144,7 +4144,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveControlItem(IFileDialogCustom
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
-    TRACE("%p (%d, %d)\n", This, dwIDCtl, dwIDItem);
+    TRACE("%p (%ld, %ld)\n", This, dwIDCtl, dwIDItem);
 
     if(!ctrl) return E_FAIL;
 
@@ -4224,7 +4224,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveAllControlItems(IFileDialogCu
                                                                    DWORD dwIDCtl)
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
-    TRACE("%p (%d)\n", This, dwIDCtl);
+    TRACE("%p (%ld)\n", This, dwIDCtl);
 
     /* Not implemented by native */
     return E_NOTIMPL;
@@ -4237,7 +4237,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetControlItemState(IFileDialogCust
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
-    TRACE("%p (%d, %d, %p)\n", This, dwIDCtl, dwIDItem, pdwState);
+    TRACE("%p (%ld, %ld, %p)\n", This, dwIDCtl, dwIDItem, pdwState);
 
     if(!ctrl) return E_FAIL;
 
@@ -4273,7 +4273,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemState(IFileDialogCust
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
-    TRACE("%p (%d, %d, %x)\n", This, dwIDCtl, dwIDItem, dwState);
+    TRACE("%p (%ld, %ld, %x)\n", This, dwIDCtl, dwIDItem, dwState);
 
     if(!ctrl) return E_FAIL;
 
@@ -4396,7 +4396,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetSelectedControlItem(IFileDialogC
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
-    TRACE("%p (%d, %p)\n", This, dwIDCtl, pdwIDItem);
+    TRACE("%p (%ld, %p)\n", This, dwIDCtl, pdwIDItem);
 
     if(!ctrl) return E_FAIL;
 
@@ -4460,7 +4460,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetSelectedControlItem(IFileDialogC
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *ctrl = get_cctrl(This, dwIDCtl);
-    TRACE("%p (%d, %d)\n", This, dwIDCtl, dwIDItem);
+    TRACE("%p (%ld, %ld)\n", This, dwIDCtl, dwIDItem);
 
     if(!ctrl) return E_INVALIDARG;
 
@@ -4506,7 +4506,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnStartVisualGroup(IFileDialogCustomi
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
     customctrl *vg;
     HRESULT hr;
-    TRACE("%p (%d, %s)\n", This, dwIDCtl, debugstr_w(pszLabel));
+    TRACE("%p (%ld, %s)\n", This, dwIDCtl, debugstr_w(pszLabel));
 
     if(This->cctrl_active_vg)
         return E_UNEXPECTED;
@@ -4536,7 +4536,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnMakeProminent(IFileDialogCustomize
                                                            DWORD dwIDCtl)
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
-    FIXME("stub - %p (%d)\n", This, dwIDCtl);
+    FIXME("stub - %p (%ld)\n", This, dwIDCtl);
     return S_OK;
 }
 
@@ -4546,7 +4546,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemText(IFileDialogCusto
                                                                 LPCWSTR pszLabel)
 {
     FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
-    FIXME("stub - %p (%d, %d, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel));
+    FIXME("stub - %p (%ld, %ld, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel));
     return E_NOTIMPL;
 }
 
@@ -4637,7 +4637,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p
     hr = init_custom_controls(fdimpl);
     if(FAILED(hr))
     {
-        ERR("Failed to initialize custom controls (0x%08x).\n", hr);
+        ERR("Failed to initialize custom controls (0x%08lx).\n", hr);
         IFileDialog2_Release(&fdimpl->IFileDialog2_iface);
         return E_FAIL;
     }
diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index 8d5ffc0e972..a466687dca3 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -178,7 +178,7 @@ static DRIVER_INFO_3W * get_driver_infoW(HANDLE hprn)
     if (res)
         return di3;
 
-    TRACE("GetPrinterDriverW failed with %u\n", GetLastError());
+    TRACE("GetPrinterDriverW failed with %lu\n", GetLastError());
     HeapFree(GetProcessHeap(), 0, di3);
     return NULL;
 }
@@ -198,7 +198,7 @@ static DRIVER_INFO_3A * get_driver_infoA(HANDLE hprn)
     if (res)
         return di3;
 
-    TRACE("GetPrinterDriverA failed with %u\n", GetLastError());
+    TRACE("GetPrinterDriverA failed with %lu\n", GetLastError());
     HeapFree(GetProcessHeap(), 0, di3);
     return NULL;
 }
@@ -225,7 +225,7 @@ static PRINTER_INFO_2W * get_printer_infoW(HANDLE hprn)
     if (res)
         return pi2;
 
-    TRACE("GetPrinterW failed with %u\n", GetLastError());
+    TRACE("GetPrinterW failed with %lu\n", GetLastError());
     HeapFree(GetProcessHeap(), 0, pi2);
     return NULL;
 }
@@ -245,7 +245,7 @@ static PRINTER_INFO_2A * get_printer_infoA(HANDLE hprn)
     if (res)
         return pi2;
 
-    TRACE("GetPrinterA failed with %u\n", GetLastError());
+    TRACE("GetPrinterA failed with %lu\n", GetLastError());
     HeapFree(GetProcessHeap(), 0, pi2);
     return NULL;
 }
@@ -1232,12 +1232,12 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru
 		    {
 			if(dpiX == Resolutions[i])
 			    IsDefault = TRUE;
-			sprintf(buf, "%d dpi", Resolutions[i]);
+			sprintf(buf, "%ld dpi", Resolutions[i]);
 		    } else
 		    {
 			if(dpiX == Resolutions[i] && dpiY == Resolutions[i+1])
 			    IsDefault = TRUE;
-			sprintf(buf, "%d dpi x %d dpi", Resolutions[i], Resolutions[i+1]);
+			sprintf(buf, "%ld dpi x %ld dpi", Resolutions[i], Resolutions[i+1]);
 		    }
 
 		    Index = SendMessageA(hQuality, CB_ADDSTRING, 0, (LPARAM)buf);
@@ -2249,7 +2249,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
 	}
 	TRACE("(%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
               "pp. %d-%d, min p %d, max p %d, copies %d, hinst %p\n"
-              "flags %08x (%s)\n",
+              "flags %08lx (%s)\n",
 	      lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
 	      lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
 	      lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
@@ -2285,7 +2285,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
 	GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
 	dbuf = HeapAlloc(GetProcessHeap(),0,needed);
 	if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
-	    ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",
+	    ERR("GetPrinterDriverA failed, le %ld, fix your config for printer %s!\n",
 	        GetLastError(),pbuf->pPrinterName);
 	    HeapFree(GetProcessHeap(), 0, dbuf);
 	    HeapFree(GetProcessHeap(), 0, pbuf);
@@ -2400,7 +2400,7 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd)
 	}
 	TRACE("(%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
               "pp. %d-%d, min p %d, max p %d, copies %d, hinst %p\n"
-              "flags %08x (%s)\n",
+              "flags %08lx (%s)\n",
 	      lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
 	      lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
 	      lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
@@ -2436,7 +2436,7 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd)
 	GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed);
 	dbuf = HeapAlloc(GetProcessHeap(),0,needed);
 	if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
-	    ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",
+	    ERR("GetPrinterDriverA failed, le %ld, fix your config for printer %s!\n",
 	        GetLastError(),debugstr_w(pbuf->pPrinterName));
 	    HeapFree(GetProcessHeap(), 0, dbuf);
 	    HeapFree(GetProcessHeap(), 0, pbuf);
@@ -3180,7 +3180,7 @@ static void pagesetup_change_preview(const pagesetup_data *data)
     }
     x = (data->rtDrawRect.right + data->rtDrawRect.left - width) / 2;
     y = (data->rtDrawRect.bottom + data->rtDrawRect.top - height) / 2;
-    TRACE("draw rect %s x=%d, y=%d, w=%d, h=%d\n",
+    TRACE("draw rect %s x=%ld, y=%ld, w=%ld, h=%ld\n",
           wine_dbgstr_rect(&data->rtDrawRect), x, y, width, height);
 
     MoveWindow(GetDlgItem(data->hDlg, rct2), x + width, y + shadow, shadow, height, FALSE);
@@ -3348,7 +3348,7 @@ static BOOL pagesetup_wm_command(HWND hDlg, WPARAM wParam, LPARAM lParam, pagese
     WORD msg = HIWORD(wParam);
     WORD id  = LOWORD(wParam);
 
-    TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n",
+    TRACE("loword (lparam) %d, wparam 0x%Ix, lparam %08Ix\n",
 	    LOWORD(lParam),wParam,lParam);
     switch (id)  {
     case IDOK:
@@ -3778,7 +3778,7 @@ static void pagesetup_dump_dlg_struct(const pagesetup_data *data)
             }
         }
         TRACE("%s: (%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
-              "hinst %p, flags %08x (%s)\n",
+              "hinst %p, flags %08lx (%s)\n",
               data->unicode ? "unicode" : "ansi",
               data->u.dlgw, data->u.dlgw->hwndOwner, data->u.dlgw->hDevMode,
               data->u.dlgw->hDevNames, data->u.dlgw->hInstance,
@@ -4025,7 +4025,7 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd)
         if (!lppd->nPropertyPages)
             return E_INVALIDARG;
 
-        FIXME("custom property sheets (%d at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages);
+        FIXME("custom property sheets (%ld at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages);
     }
 
     /* Use PD_NOPAGENUMS or set nMaxPageRanges and lpPageRanges */
@@ -4178,7 +4178,7 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd)
         if (!lppd->nPropertyPages)
             return E_INVALIDARG;
 
-        FIXME("custom property sheets (%d at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages);
+        FIXME("custom property sheets (%ld at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages);
     }
 
     /* Use PD_NOPAGENUMS or set nMaxPageRanges and lpPageRanges */

[PATCH 07/25] dlls/commdlg.dll16: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/commdlg.dll16/Makefile.in |    1 -
 dlls/commdlg.dll16/filedlg.c   |    2 +-
 dlls/commdlg.dll16/fontdlg.c   |    4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/commdlg.dll16/Makefile.in b/dlls/commdlg.dll16/Makefile.in
index 1b2e19d09e3..69731147d07 100644
--- a/dlls/commdlg.dll16/Makefile.in
+++ b/dlls/commdlg.dll16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = commdlg.dll16
 IMPORTS   = comdlg32 user32 gdi32
 EXTRADLLFLAGS = -m16 -Wb,--main-module,comdlg32.dll
diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c
index 0a4dad4a37a..5ad67a4a91f 100644
--- a/dlls/commdlg.dll16/filedlg.c
+++ b/dlls/commdlg.dll16/filedlg.c
@@ -218,7 +218,7 @@ static LRESULT call_hook16( WNDPROC16 hook, HWND hwnd, UINT msg, WPARAM wp, LPAR
     CONTEXT context;
     WORD params[5];
 
-    TRACE( "%p: %p %08x %lx %lx: stub\n", hook, hwnd, msg, wp, lp );
+    TRACE( "%p: %p %08x %x %lx: stub\n", hook, hwnd, msg, wp, lp );
 
     memset( &context, 0, sizeof(context) );
     context.SegDs = context.SegEs = CURRENT_SS;
diff --git a/dlls/commdlg.dll16/fontdlg.c b/dlls/commdlg.dll16/fontdlg.c
index b7c87fd7361..79efb3a292f 100644
--- a/dlls/commdlg.dll16/fontdlg.c
+++ b/dlls/commdlg.dll16/fontdlg.c
@@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics,
                                    UINT16 nFontType, LPARAM lParam )
 {
-    FIXME( "%08x %08x %u %lx\n", logfont, metrics, nFontType, lParam );
+    FIXME( "%08lx %08lx %u %lx\n", logfont, metrics, nFontType, lParam );
     return 0;
 }
 
@@ -53,7 +53,7 @@ INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics,
 INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics,
                                   UINT16 nFontType, LPARAM lParam )
 {
-    FIXME( "%08x %08x %u %lx\n", logfont, metrics, nFontType, lParam );
+    FIXME( "%08lx %08lx %u %lx\n", logfont, metrics, nFontType, lParam );
     return 0;
 }

[PATCH 08/25] dlls/compobj.dll16: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/compobj.dll16/Makefile.in |    1 -
 dlls/compobj.dll16/compobj.c   |   28 ++++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/dlls/compobj.dll16/Makefile.in b/dlls/compobj.dll16/Makefile.in
index 8ab9d824683..5b11e840c7f 100644
--- a/dlls/compobj.dll16/Makefile.in
+++ b/dlls/compobj.dll16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = compobj.dll16
 IMPORTS   = uuid ole32 advapi32
 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c
index 831d62d25ee..12a41775333 100644
--- a/dlls/compobj.dll16/compobj.c
+++ b/dlls/compobj.dll16/compobj.c
@@ -143,7 +143,7 @@ ULONG CDECL IMalloc16_fnAddRef(IMalloc16 *iface)
 {
     IMalloc16Impl *malloc = impl_from_IMalloc16(iface);
     ULONG refcount = InterlockedIncrement(&malloc->refcount);
-    TRACE("%p increasing refcount to %u.\n", malloc, refcount);
+    TRACE("%p increasing refcount to %lu.\n", malloc, refcount);
     return refcount;
 }
 
@@ -154,7 +154,7 @@ ULONG CDECL IMalloc16_fnRelease(SEGPTR iface)
 {
     IMalloc16Impl *malloc = impl_from_IMalloc16(MapSL(iface));
     ULONG refcount = InterlockedDecrement(&malloc->refcount);
-    TRACE("%p decreasing refcount to %u.\n", malloc, refcount);
+    TRACE("%p decreasing refcount to %lu.\n", malloc, refcount);
     if (!refcount)
     {
         UnMapLS(iface);
@@ -169,7 +169,7 @@ ULONG CDECL IMalloc16_fnRelease(SEGPTR iface)
 SEGPTR CDECL IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
         IMalloc16Impl *This = impl_from_IMalloc16(iface);
 
-	TRACE("(%p)->Alloc(%d)\n",This,cb);
+	TRACE("(%p)->Alloc(%ld)\n",This,cb);
         return MapLS( HeapAlloc( GetProcessHeap(), 0, cb ) );
 }
 
@@ -180,7 +180,7 @@ VOID CDECL IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
 {
     void *ptr = MapSL(pv);
     IMalloc16Impl *This = impl_from_IMalloc16(iface);
-    TRACE("(%p)->Free(%08x)\n",This,pv);
+    TRACE("(%p)->Free(%08lx)\n",This,pv);
     UnMapLS(pv);
     HeapFree( GetProcessHeap(), 0, ptr );
 }
@@ -193,7 +193,7 @@ SEGPTR CDECL IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
     SEGPTR ret;
     IMalloc16Impl *This = impl_from_IMalloc16(iface);
 
-    TRACE("(%p)->Realloc(%08x,%d)\n",This,pv,cb);
+    TRACE("(%p)->Realloc(%08lx,%ld)\n",This,pv,cb);
     if (!pv)
 	ret = IMalloc16_fnAlloc(iface, cb);
     else if (cb) {
@@ -213,7 +213,7 @@ DWORD CDECL IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv)
 {
         IMalloc16Impl *This = impl_from_IMalloc16(iface);
 
-        TRACE("(%p)->GetSize(%08x)\n",This,pv);
+        TRACE("(%p)->GetSize(%08lx)\n",This,pv);
         return HeapSize( GetProcessHeap(), 0, MapSL(pv) );
 }
 
@@ -301,11 +301,11 @@ HRESULT WINAPI CoCreateStandardMalloc16(MEMCTX context, SEGPTR *malloc)
  */
 SEGPTR WINAPI CoMemAlloc(DWORD size, MEMCTX context, DWORD unknown)
 {
-    TRACE("size %u, context %d, unknown %#x.\n", size, context, unknown);
+    TRACE("size %lu, context %d, unknown %#lx.\n", size, context, unknown);
     if (context != MEMCTX_TASK)
         FIXME("Ignoring context %d.\n", context);
     if (unknown)
-        FIXME("Ignoring unknown parameter %#x.\n", unknown);
+        FIXME("Ignoring unknown parameter %#lx.\n", unknown);
 
     return call_IMalloc_Alloc(compobj_malloc, size);
 }
@@ -504,7 +504,7 @@ HRESULT WINAPI CoRegisterClassObject16(
 	DWORD flags,        /* [in] REGCLS flags indicating how connections are made */
 	LPDWORD lpdwRegister
 ) {
-	FIXME("(%s,%p,0x%08x,0x%08x,%p),stub\n",
+	FIXME("(%s,%p,0x%08lx,0x%08lx,%p),stub\n",
 		debugstr_guid(rclsid),pUnk,dwClsContext,flags,lpdwRegister
 	);
 	return 0;
@@ -516,7 +516,7 @@ HRESULT WINAPI CoRegisterClassObject16(
  */
 HRESULT WINAPI CoRevokeClassObject16(DWORD dwRegister) /* [in] token on class obj */
 {
-    FIXME("(0x%08x),stub!\n", dwRegister);
+    FIXME("(0x%08lx),stub!\n", dwRegister);
     return 0;
 }
 
@@ -613,7 +613,7 @@ HRESULT WINAPI CoGetState16(LPDWORD state)
  */
 BOOL WINAPI COMPOBJ_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst, WORD ds, WORD HeapSize, DWORD res1, WORD res2)
 {
-        TRACE("(%08x, %04x, %04x, %04x, %08x, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2);
+        TRACE("(%08lx, %04x, %04x, %04x, %08lx, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2);
         return TRUE;
 }
 
@@ -738,7 +738,7 @@ HRESULT WINAPI CoGetClassObject16(
         WOWCallback16Ex((DWORD) DllGetClassObject, WCB16_PASCAL, sizeof(args), args, &dwRet);
         if (dwRet != S_OK)
         {
-            ERR("DllGetClassObject returned error 0x%08x\n", dwRet);
+            ERR("DllGetClassObject returned error 0x%08lx\n", dwRet);
             FreeLibrary16(dll);
             return dwRet;
         }
@@ -768,7 +768,7 @@ HRESULT WINAPI CoCreateInstance16(
 	REFIID iid,
 	LPVOID *ppv)
 {
-  FIXME("(%s, %p, %x, %s, %p), stub!\n",
+  FIXME("(%s, %p, %lx, %s, %p), stub!\n",
 	debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid),
 	ppv
   );
@@ -780,6 +780,6 @@ HRESULT WINAPI CoCreateInstance16(
  */
 HRESULT WINAPI CoDisconnectObject16( LPUNKNOWN lpUnk, DWORD reserved )
 {
-  FIXME("(%p, 0x%08x): stub!\n", lpUnk, reserved);
+  FIXME("(%p, 0x%08lx): stub!\n", lpUnk, reserved);
   return E_NOTIMPL;
 }

[PATCH 09/25] dlls/comsvcs: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/comsvcs/Makefile.in |    1 -
 dlls/comsvcs/main.c      |   32 ++++++++++++++++----------------
 dlls/comsvcs/property.c  |   10 +++++-----
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in
index 5eede59d5b6..22090938b52 100644
--- a/dlls/comsvcs/Makefile.in
+++ b/dlls/comsvcs/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = comsvcs.dll
 IMPORTLIB = comsvcs
 IMPORTS   = ole32 uuid
diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c
index 797e2db97db..b34c7d21309 100644
--- a/dlls/comsvcs/main.c
+++ b/dlls/comsvcs/main.c
@@ -97,7 +97,7 @@ static ULONG WINAPI holder_AddRef(IHolder *iface)
 {
     holder *This = impl_from_IHolder(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p)->(%d)\n", This, ref);
+    TRACE("(%p)->(%ld)\n", This, ref);
     return ref;
 }
 
@@ -105,7 +105,7 @@ static ULONG WINAPI holder_Release(IHolder *iface)
 {
     holder *This = impl_from_IHolder(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
-    TRACE("(%p)->(%d)\n", This, ref);
+    TRACE("(%p)->(%ld)\n", This, ref);
 
     if (!ref)
     {
@@ -121,11 +121,11 @@ static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid
     HRESULT hr;
     TIMEINSECS secs;
 
-    TRACE("(%p)->(%08lx, %p) stub\n", This, typeid, resid);
+    TRACE("(%p)->(%08Ix, %p) stub\n", This, typeid, resid);
 
     hr = IDispenserDriver_CreateResource(This->driver, typeid, resid, &secs);
 
-    TRACE("<- 0x%08x\n", hr);
+    TRACE("<- 0x%08lx\n", hr);
     return hr;
 }
 
@@ -134,11 +134,11 @@ static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid)
     holder *This = impl_from_IHolder(iface);
     HRESULT hr;
 
-    TRACE("(%p)->(%08lx) stub\n", This, resid);
+    TRACE("(%p)->(%08Ix) stub\n", This, resid);
 
     hr = IDispenserDriver_DestroyResource(This->driver, resid);
 
-    TRACE("<- 0x%08x\n", hr);
+    TRACE("<- 0x%08lx\n", hr);
 
     return hr;
 }
@@ -147,7 +147,7 @@ static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid)
 {
     holder *This = impl_from_IHolder(iface);
 
-    FIXME("(%p)->(%08lx) stub\n", This, resid);
+    FIXME("(%p)->(%08Ix) stub\n", This, resid);
 
     return E_NOTIMPL;
 }
@@ -165,7 +165,7 @@ static HRESULT WINAPI holder_UntrackResource(IHolder *iface, const RESID resid,
 {
     holder *This = impl_from_IHolder(iface);
 
-    FIXME("(%p)->(%08lx, %d) stub\n", This, resid, value);
+    FIXME("(%p)->(%08Ix, %d) stub\n", This, resid, value);
 
     return E_NOTIMPL;
 }
@@ -194,7 +194,7 @@ static HRESULT WINAPI holder_RequestDestroyResource(IHolder *iface, const RESID
 {
     holder *This = impl_from_IHolder(iface);
 
-    FIXME("(%p)->(%08lx) stub\n", This, resid);
+    FIXME("(%p)->(%08Ix) stub\n", This, resid);
 
     return E_NOTIMPL;
 }
@@ -263,7 +263,7 @@ static ULONG WINAPI dismanager_AddRef(IDispenserManager *iface)
 {
     dispensermanager *This = impl_from_IDispenserManager(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p)->(%d)\n", This, ref);
+    TRACE("(%p)->(%ld)\n", This, ref);
     return ref;
 }
 
@@ -271,7 +271,7 @@ static ULONG WINAPI dismanager_Release(IDispenserManager *iface)
 {
     dispensermanager *This = impl_from_IDispenserManager(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
-    TRACE("(%p)->(%d)\n", This, ref);
+    TRACE("(%p)->(%ld)\n", This, ref);
 
     if (!ref)
     {
@@ -299,7 +299,7 @@ static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDi
     if (!This->mta_cookie)
         CoIncrementMTAUsage(&This->mta_cookie);
 
-    TRACE("<-- 0x%08x, %p\n", hr, *dispenser);
+    TRACE("<-- 0x%08lx, %p\n", hr, *dispenser);
 
     return hr;
 }
@@ -429,7 +429,7 @@ static ULONG WINAPI new_moniker_AddRef(IMoniker* iface)
     struct new_moniker *moniker = impl_from_IMoniker(iface);
     ULONG refcount = InterlockedIncrement(&moniker->refcount);
 
-    TRACE("%p, refcount %u.\n", iface, refcount);
+    TRACE("%p, refcount %lu.\n", iface, refcount);
 
     return refcount;
 }
@@ -439,7 +439,7 @@ static ULONG WINAPI new_moniker_Release(IMoniker* iface)
     struct new_moniker *moniker = impl_from_IMoniker(iface);
     ULONG refcount = InterlockedDecrement(&moniker->refcount);
 
-    TRACE("%p, refcount %u.\n", iface, refcount);
+    TRACE("%p, refcount %lu.\n", iface, refcount);
 
     if (!refcount)
     {
@@ -600,7 +600,7 @@ static HRESULT WINAPI new_moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc,
 static HRESULT WINAPI new_moniker_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD flags, IMoniker **ppmkToLeft,
         IMoniker **ret)
 {
-    TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, flags, ppmkToLeft, ret);
+    TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, flags, ppmkToLeft, ret);
 
     if (!ret)
         return E_POINTER;
@@ -758,7 +758,7 @@ static ULONG WINAPI new_moniker_rotdata_Release(IROTData *iface)
 
 static HRESULT WINAPI new_moniker_rotdata_GetComparisonData(IROTData *iface, byte *data, ULONG data_len, ULONG *length)
 {
-    FIXME("%p, %p, %u, %p.\n", iface, data, data_len, length);
+    FIXME("%p, %p, %lu, %p.\n", iface, data, data_len, length);
 
     return E_NOTIMPL;
 }
diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c
index 4dc6e1d9a46..7a47135769e 100644
--- a/dlls/comsvcs/property.c
+++ b/dlls/comsvcs/property.c
@@ -59,7 +59,7 @@ static ULONG WINAPI group_manager_AddRef(ISharedPropertyGroupManager *iface)
     struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface);
     ULONG refcount = InterlockedIncrement(&manager->refcount);
 
-    TRACE("%p increasing refcount to %u.\n", iface, refcount);
+    TRACE("%p increasing refcount to %lu.\n", iface, refcount);
 
     return refcount;
 }
@@ -69,7 +69,7 @@ static ULONG WINAPI group_manager_Release(ISharedPropertyGroupManager *iface)
     struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface);
     ULONG refcount = InterlockedDecrement(&manager->refcount);
 
-    TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+    TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
 
     return refcount;
 }
@@ -83,14 +83,14 @@ static HRESULT WINAPI group_manager_GetTypeInfoCount(ISharedPropertyGroupManager
 static HRESULT WINAPI group_manager_GetTypeInfo(ISharedPropertyGroupManager *iface, UINT index, LCID lcid,
         ITypeInfo **info)
 {
-    FIXME("iface %p, index %u, lcid %u, info %p: stub.\n", iface, index, lcid, info);
+    FIXME("iface %p, index %u, lcid %lu, info %p: stub.\n", iface, index, lcid, info);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *iface, REFIID riid,
         LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid)
 {
-    FIXME("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p: stub.\n",
+    FIXME("iface %p, riid %s, names %p, count %u, lcid %lu, dispid %p: stub.\n",
             iface, debugstr_guid(riid), names, count, lcid, dispid);
 
     return E_NOTIMPL;
@@ -99,7 +99,7 @@ static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *i
 static HRESULT WINAPI group_manager_Invoke(ISharedPropertyGroupManager *iface, DISPID member, REFIID riid,
         LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr)
 {
-    FIXME("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p: stub.\n",
+    FIXME("iface %p, member %lu, riid %s, lcid %lu, flags %x, params %p, result %p, except %p, argerr %p: stub.\n",
             iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr);
     return E_NOTIMPL;
 }

[PATCH 10/25] dlls/crypt32: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/crypt32/Makefile.in       |    2 
 dlls/crypt32/base64.c          |   16 +--
 dlls/crypt32/cert.c            |   94 ++++++++--------
 dlls/crypt32/chain.c           |   76 ++++++-------
 dlls/crypt32/collectionstore.c |   14 +-
 dlls/crypt32/context.c         |    4 -
 dlls/crypt32/crl.c             |   30 +++--
 dlls/crypt32/ctl.c             |   24 ++--
 dlls/crypt32/decode.c          |  240 ++++++++++++++++++++--------------------
 dlls/crypt32/encode.c          |   42 ++++---
 dlls/crypt32/filestore.c       |   26 ++--
 dlls/crypt32/main.c            |   28 ++---
 dlls/crypt32/message.c         |   18 ++-
 dlls/crypt32/msg.c             |   52 ++++-----
 dlls/crypt32/object.c          |   22 ++--
 dlls/crypt32/oid.c             |   42 ++++---
 dlls/crypt32/pfx.c             |   20 ++-
 dlls/crypt32/proplist.c        |    2 
 dlls/crypt32/protectdata.c     |   14 +-
 dlls/crypt32/provstore.c       |    8 +
 dlls/crypt32/regstore.c        |   22 ++--
 dlls/crypt32/rootstore.c       |    6 +
 dlls/crypt32/serialize.c       |   20 ++-
 dlls/crypt32/sip.c             |   10 +-
 dlls/crypt32/store.c           |   66 ++++++-----
 dlls/crypt32/str.c             |   48 ++++----
 26 files changed, 473 insertions(+), 473 deletions(-)

diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in
index f4e2fcbce67..996044bbc37 100644
--- a/dlls/crypt32/Makefile.in
+++ b/dlls/crypt32/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRYPT32_
+EXTRADEFS = -D_CRYPT32_
 MODULE    = crypt32.dll
 UNIXLIB   = crypt32.so
 IMPORTLIB = crypt32
diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c
index 0e8bd2227eb..11fb137ed91 100644
--- a/dlls/crypt32/base64.c
+++ b/dlls/crypt32/base64.c
@@ -246,7 +246,7 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary,
 {
     BinaryToStringAFunc encoder = NULL;
 
-    TRACE("(%p, %d, %08x, %p, %p)\n", pbBinary, cbBinary, dwFlags, pszString,
+    TRACE("(%p, %ld, %08lx, %p, %p)\n", pbBinary, cbBinary, dwFlags, pszString,
      pcchString);
 
     if (!pbBinary)
@@ -275,7 +275,7 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary,
     case CRYPT_STRING_HEXASCII:
     case CRYPT_STRING_HEXADDR:
     case CRYPT_STRING_HEXASCIIADDR:
-        FIXME("Unimplemented type %d\n", dwFlags & 0x0fffffff);
+        FIXME("Unimplemented type %ld\n", dwFlags & 0x0fffffff);
         /* fall through */
     default:
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -584,7 +584,7 @@ BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary,
 {
     BinaryToStringWFunc encoder = NULL;
 
-    TRACE("(%p, %d, %08x, %p, %p)\n", pbBinary, cbBinary, dwFlags, pszString,
+    TRACE("(%p, %ld, %08lx, %p, %p)\n", pbBinary, cbBinary, dwFlags, pszString,
      pcchString);
 
     if (!pbBinary)
@@ -618,7 +618,7 @@ BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary,
     case CRYPT_STRING_HEXASCII:
     case CRYPT_STRING_HEXADDR:
     case CRYPT_STRING_HEXASCIIADDR:
-        FIXME("Unimplemented type %d\n", dwFlags & 0x0fffffff);
+        FIXME("Unimplemented type %ld\n", dwFlags & 0x0fffffff);
         /* fall through */
     default:
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -890,7 +890,7 @@ BOOL WINAPI CryptStringToBinaryA(LPCSTR pszString,
     StringToBinaryAFunc decoder;
     LONG ret;
 
-    TRACE("(%s, %d, %08x, %p, %p, %p, %p)\n", debugstr_an(pszString, cchString ? cchString : -1),
+    TRACE("(%s, %ld, %08lx, %p, %p, %p, %p)\n", debugstr_an(pszString, cchString ? cchString : -1),
      cchString, dwFlags, pbBinary, pcbBinary, pdwSkip, pdwFlags);
 
     if (!pszString)
@@ -931,7 +931,7 @@ BOOL WINAPI CryptStringToBinaryA(LPCSTR pszString,
     case CRYPT_STRING_HEXASCII:
     case CRYPT_STRING_HEXADDR:
     case CRYPT_STRING_HEXASCIIADDR:
-        FIXME("Unimplemented type %d\n", dwFlags & 0x7fffffff);
+        FIXME("Unimplemented type %ld\n", dwFlags & 0x7fffffff);
         /* fall through */
     default:
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -1101,7 +1101,7 @@ BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString,
     StringToBinaryWFunc decoder;
     LONG ret;
 
-    TRACE("(%s, %d, %08x, %p, %p, %p, %p)\n", debugstr_wn(pszString, cchString ? cchString : -1),
+    TRACE("(%s, %ld, %08lx, %p, %p, %p, %p)\n", debugstr_wn(pszString, cchString ? cchString : -1),
      cchString, dwFlags, pbBinary, pcbBinary, pdwSkip, pdwFlags);
 
     if (!pszString)
@@ -1142,7 +1142,7 @@ BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString,
     case CRYPT_STRING_HEXASCII:
     case CRYPT_STRING_HEXADDR:
     case CRYPT_STRING_HEXASCIIADDR:
-        FIXME("Unimplemented type %d\n", dwFlags & 0x7fffffff);
+        FIXME("Unimplemented type %ld\n", dwFlags & 0x7fffffff);
         /* fall through */
     default:
         SetLastError(ERROR_INVALID_PARAMETER);
diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
index 7d4041f1fb3..33811dfadc1 100644
--- a/dlls/crypt32/cert.c
+++ b/dlls/crypt32/cert.c
@@ -62,7 +62,7 @@ BOOL WINAPI CertAddEncodedCertificateToStore(HCERTSTORE hCertStore,
      pbCertEncoded, cbCertEncoded);
     BOOL ret;
 
-    TRACE("(%p, %08x, %p, %d, %08x, %p)\n", hCertStore, dwCertEncodingType,
+    TRACE("(%p, %08lx, %p, %ld, %08lx, %p)\n", hCertStore, dwCertEncodingType,
      pbCertEncoded, cbCertEncoded, dwAddDisposition, ppCertContext);
 
     if (cert)
@@ -82,7 +82,7 @@ BOOL WINAPI CertAddEncodedCertificateToSystemStoreA(LPCSTR pszCertStoreName,
     HCERTSTORE store;
     BOOL ret = FALSE;
 
-    TRACE("(%s, %p, %d)\n", debugstr_a(pszCertStoreName), pbCertEncoded,
+    TRACE("(%s, %p, %ld)\n", debugstr_a(pszCertStoreName), pbCertEncoded,
      cbCertEncoded);
 
     store = CertOpenSystemStoreA(0, pszCertStoreName);
@@ -101,7 +101,7 @@ BOOL WINAPI CertAddEncodedCertificateToSystemStoreW(LPCWSTR pszCertStoreName,
     HCERTSTORE store;
     BOOL ret = FALSE;
 
-    TRACE("(%s, %p, %d)\n", debugstr_w(pszCertStoreName), pbCertEncoded,
+    TRACE("(%s, %p, %ld)\n", debugstr_w(pszCertStoreName), pbCertEncoded,
      cbCertEncoded);
 
     store = CertOpenSystemStoreW(0, pszCertStoreName);
@@ -200,7 +200,7 @@ static BOOL add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *ce
         break;
     }
     default:
-        FIXME("Unimplemented add disposition %d\n", add_disposition);
+        FIXME("Unimplemented add disposition %ld\n", add_disposition);
         SetLastError(E_INVALIDARG);
         return FALSE;
     }
@@ -287,7 +287,7 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, PCCERT_CONTE
 {
     WINECRYPT_CERTSTORE *store = hCertStore;
 
-    TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, dwAddDisposition, ppStoreContext);
+    TRACE("(%p, %p, %08lx, %p)\n", hCertStore, pCertContext, dwAddDisposition, ppStoreContext);
 
     return add_cert_to_store(store, pCertContext, dwAddDisposition, FALSE, ppStoreContext);
 }
@@ -300,7 +300,7 @@ BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore,
     WINECRYPT_CERTSTORE *store = (WINECRYPT_CERTSTORE*)hCertStore;
 
     if (!(calls++))
-        FIXME("(%p, %p, %08x, %p): semi-stub\n", hCertStore, pCertContext,
+        FIXME("(%p, %p, %08lx, %p): semi-stub\n", hCertStore, pCertContext,
          dwAddDisposition, ppCertContext);
     if (store->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
         return FALSE;
@@ -321,7 +321,7 @@ PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType,
     PCERT_INFO certInfo = NULL;
     DWORD size = 0;
 
-    TRACE("(%08x, %p, %d)\n", dwCertEncodingType, pbCertEncoded,
+    TRACE("(%08lx, %p, %ld)\n", dwCertEncodingType, pbCertEncoded,
      cbCertEncoded);
 
     if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING)
@@ -382,7 +382,7 @@ DWORD WINAPI CertEnumCertificateContextProperties(PCCERT_CONTEXT pCertContext,
     cert_t *cert = cert_from_ptr(pCertContext);
     DWORD ret;
 
-    TRACE("(%p, %d)\n", pCertContext, dwPropId);
+    TRACE("(%p, %ld)\n", pCertContext, dwPropId);
 
     if (cert->base.properties)
         ret = ContextPropertyList_EnumPropIDs(cert->base.properties, dwPropId);
@@ -518,7 +518,7 @@ static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId,
     BOOL ret;
     CRYPT_DATA_BLOB blob;
 
-    TRACE("(%p, %d, %p, %p)\n", cert, dwPropId, pvData, pcbData);
+    TRACE("(%p, %ld, %p, %p)\n", cert, dwPropId, pvData, pcbData);
 
     if (cert->base.properties)
         ret = ContextPropertyList_FindProperty(cert->base.properties, dwPropId, &blob);
@@ -619,7 +619,7 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext,
     cert_t *cert = cert_from_ptr(pCertContext);
     BOOL ret;
 
-    TRACE("(%p, %d, %p, %p)\n", pCertContext, dwPropId, pvData, pcbData);
+    TRACE("(%p, %ld, %p, %p)\n", pCertContext, dwPropId, pvData, pcbData);
 
     switch (dwPropId)
     {
@@ -710,7 +710,7 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId,
 {
     BOOL ret;
 
-    TRACE("(%p, %d, %08x, %p)\n", cert, dwPropId, dwFlags, pvData);
+    TRACE("(%p, %ld, %08lx, %p)\n", cert, dwPropId, dwFlags, pvData);
 
     if (!cert->base.properties)
         ret = FALSE;
@@ -815,7 +815,7 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId,
             break;
         }
         default:
-            FIXME("%d: stub\n", dwPropId);
+            FIXME("%ld: stub\n", dwPropId);
             ret = FALSE;
         }
     }
@@ -828,7 +828,7 @@ BOOL WINAPI CertSetCertificateContextProperty(PCCERT_CONTEXT pCertContext,
 {
     BOOL ret;
 
-    TRACE("(%p, %d, %08x, %p)\n", pCertContext, dwPropId, dwFlags, pvData);
+    TRACE("(%p, %ld, %08lx, %p)\n", pCertContext, dwPropId, dwFlags, pvData);
 
     /* Handle special cases for "read-only"/invalid prop IDs.  Windows just
      * crashes on most of these, I'll be safer.
@@ -915,7 +915,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert,
     DWORD size;
     PCCERT_CONTEXT cert_in_store = NULL;
 
-    TRACE("(%p, %08x, %p, %p, %p, %p)\n", pCert, dwFlags, pvReserved,
+    TRACE("(%p, %08lx, %p, %p, %p, %p)\n", pCert, dwFlags, pvReserved,
      phCryptProv, pdwKeySpec, pfCallerFreeProv);
 
     if (dwFlags & CRYPT_ACQUIRE_USE_PROV_INFO_FLAG)
@@ -1123,7 +1123,7 @@ static BOOL find_matching_provider(PCCERT_CONTEXT pCert, DWORD dwFlags)
     DWORD index = 0, cbProvName = 0;
     CRYPT_KEY_PROV_INFO keyProvInfo;
 
-    TRACE("(%p, %08x)\n", pCert, dwFlags);
+    TRACE("(%p, %08lx)\n", pCert, dwFlags);
 
     memset(&keyProvInfo, 0, sizeof(keyProvInfo));
     while (ret && !found)
@@ -1212,7 +1212,7 @@ BOOL WINAPI CryptFindCertificateKeyProvInfo(PCCERT_CONTEXT pCert,
 {
     BOOL matches;
 
-    TRACE("(%p, %08x, %p)\n", pCert, dwFlags, pvReserved);
+    TRACE("(%p, %08lx, %p)\n", pCert, dwFlags, pvReserved);
 
     matches = cert_prov_info_matches_cert(pCert);
     if (!matches)
@@ -1225,7 +1225,7 @@ BOOL WINAPI CertCompareCertificate(DWORD dwCertEncodingType,
 {
     BOOL ret;
 
-    TRACE("(%08x, %p, %p)\n", dwCertEncodingType, pCertId1, pCertId2);
+    TRACE("(%08lx, %p, %p)\n", dwCertEncodingType, pCertId1, pCertId2);
 
     ret = CertCompareCertificateName(dwCertEncodingType, &pCertId1->Issuer,
      &pCertId2->Issuer) && CertCompareIntegerBlob(&pCertId1->SerialNumber,
@@ -1239,7 +1239,7 @@ BOOL WINAPI CertCompareCertificateName(DWORD dwCertEncodingType,
 {
     BOOL ret;
 
-    TRACE("(%08x, %p, %p)\n", dwCertEncodingType, pCertName1, pCertName2);
+    TRACE("(%08lx, %p, %p)\n", dwCertEncodingType, pCertName1, pCertName2);
 
     if (pCertName1->cbData == pCertName2->cbData)
     {
@@ -1303,7 +1303,7 @@ BOOL WINAPI CertComparePublicKeyInfo(DWORD dwCertEncodingType,
 {
     BOOL ret;
 
-    TRACE("(%08x, %p, %p)\n", dwCertEncodingType, pPublicKey1, pPublicKey2);
+    TRACE("(%08lx, %p, %p)\n", dwCertEncodingType, pPublicKey1, pPublicKey2);
 
     /* RSA public key data should start with ASN_SEQUENCE,
      * otherwise it's not a RSA_CSP_PUBLICKEYBLOB.
@@ -1327,7 +1327,7 @@ BOOL WINAPI CertComparePublicKeyInfo(DWORD dwCertEncodingType,
             ret = FALSE;
         break;
     default:
-        WARN("Unknown encoding type %08x\n", dwCertEncodingType);
+        WARN("Unknown encoding type %08lx\n", dwCertEncodingType);
         /* FALLTHROUGH */
     case X509_ASN_ENCODING:
     {
@@ -1364,7 +1364,7 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType,
 {
     DWORD len = 0;
 
-    TRACE("(%08x, %p)\n", dwCertEncodingType, pPublicKey);
+    TRACE("(%08lx, %p)\n", dwCertEncodingType, pPublicKey);
 
     if (GET_CERT_ENCODING_TYPE(dwCertEncodingType) != X509_ASN_ENCODING)
     {
@@ -1818,7 +1818,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore,
     CertCompareFunc compare = NULL;
     CERT_ID cert_id;
 
-    TRACE("(%p, %08x, %08x, %08x, %p, %p)\n", hCertStore, dwCertEncodingType,
+    TRACE("(%p, %08lx, %08lx, %08lx, %p, %p)\n", hCertStore, dwCertEncodingType,
 	 dwFlags, dwType, pvPara, pPrevCertContext);
 
     switch (dwType >> CERT_COMPARE_SHIFT)
@@ -1865,7 +1865,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore,
         compare = compare_cert_by_signature_hash;
         break;
     default:
-        FIXME("find type %08x unimplemented\n", dwType);
+        FIXME("find type %08lx unimplemented\n", dwType);
     }
 
     if (find)
@@ -1884,7 +1884,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore,
 PCCERT_CONTEXT WINAPI CertGetSubjectCertificateFromStore(HCERTSTORE hCertStore,
  DWORD dwCertEncodingType, PCERT_INFO pCertId)
 {
-    TRACE("(%p, %08x, %p)\n", hCertStore, dwCertEncodingType, pCertId);
+    TRACE("(%p, %08lx, %p)\n", hCertStore, dwCertEncodingType, pCertId);
 
     if (!pCertId)
     {
@@ -1943,7 +1943,7 @@ PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE hCertStore,
 {
     PCCERT_CONTEXT ret;
 
-    TRACE("(%p, %p, %p, %08x)\n", hCertStore, pSubjectContext,
+    TRACE("(%p, %p, %p, %08lx)\n", hCertStore, pSubjectContext,
      pPrevIssuerContext, *pdwFlags);
 
     if (!pSubjectContext)
@@ -1990,7 +1990,7 @@ BOOL WINAPI CertVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
 {
     BOOL ret;
 
-    TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType,
+    TRACE("(%08lx, %ld, %ld, %p, %08lx, %p, %p)\n", dwEncodingType, dwRevType,
      cContext, rgpvContext, dwFlags, pRevPara, pRevStatus);
 
     if (pRevStatus->cbSize != sizeof(OLD_CERT_REVOCATION_STATUS) &&
@@ -2062,7 +2062,7 @@ PCRYPT_ATTRIBUTE WINAPI CertFindAttribute(LPCSTR pszObjId, DWORD cAttr,
     PCRYPT_ATTRIBUTE ret = NULL;
     DWORD i;
 
-    TRACE("%s %d %p\n", debugstr_a(pszObjId), cAttr, rgAttr);
+    TRACE("%s %ld %p\n", debugstr_a(pszObjId), cAttr, rgAttr);
 
     if (!cAttr)
         return NULL;
@@ -2084,7 +2084,7 @@ PCERT_EXTENSION WINAPI CertFindExtension(LPCSTR pszObjId, DWORD cExtensions,
     PCERT_EXTENSION ret = NULL;
     DWORD i;
 
-    TRACE("%s %d %p\n", debugstr_a(pszObjId), cExtensions, rgExtensions);
+    TRACE("%s %ld %p\n", debugstr_a(pszObjId), cExtensions, rgExtensions);
 
     if (!cExtensions)
         return NULL;
@@ -2189,7 +2189,7 @@ BOOL WINAPI CertIsRDNAttrsInCertificateName(DWORD dwCertEncodingType,
     DWORD size;
     BOOL ret;
 
-    TRACE("(%08x, %08x, %p, %p)\n", dwCertEncodingType, dwFlags, pCertName,
+    TRACE("(%08lx, %08lx, %p, %p)\n", dwCertEncodingType, dwFlags, pCertName,
      pRDN);
 
     type = dwFlags & CERT_UNICODE_IS_RDN_ATTRS_FLAG ? X509_UNICODE_NAME :
@@ -2244,7 +2244,7 @@ BOOL WINAPI CryptHashCertificate(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid,
     BOOL ret = TRUE;
     HCRYPTHASH hHash = 0;
 
-    TRACE("(%08lx, %d, %08x, %p, %d, %p, %p)\n", hCryptProv, Algid, dwFlags,
+    TRACE("(%08Ix, %d, %08lx, %p, %ld, %p, %p)\n", hCryptProv, Algid, dwFlags,
      pbEncoded, cbEncoded, pbComputedHash, pcbComputedHash);
 
     if (!hCryptProv)
@@ -2276,7 +2276,7 @@ BOOL WINAPI CryptHashCertificate2(LPCWSTR pwszCNGHashAlgid, DWORD dwFlags,
     DWORD hash_len;
     DWORD hash_len_size;
 
-    TRACE("(%s, %08x, %p, %p, %d, %p, %p)\n", debugstr_w(pwszCNGHashAlgid),
+    TRACE("(%s, %08lx, %p, %p, %ld, %p, %p)\n", debugstr_w(pwszCNGHashAlgid),
      dwFlags, pvReserved, pbEncoded, cbEncoded, pbComputedHash, pcbComputedHash);
 
     if ((status = BCryptOpenAlgorithmProvider(&alg, pwszCNGHashAlgid, NULL, 0)))
@@ -2326,7 +2326,7 @@ BOOL WINAPI CryptHashPublicKeyInfo(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid,
     BOOL ret = TRUE;
     HCRYPTHASH hHash = 0;
 
-    TRACE("(%08lx, %d, %08x, %d, %p, %p, %p)\n", hCryptProv, Algid, dwFlags,
+    TRACE("(%08Ix, %d, %08lx, %ld, %p, %p, %p)\n", hCryptProv, Algid, dwFlags,
      dwCertEncodingType, pInfo, pbComputedHash, pcbComputedHash);
 
     if (!hCryptProv)
@@ -2371,7 +2371,7 @@ BOOL WINAPI CryptHashToBeSigned(HCRYPTPROV_LEGACY hCryptProv,
     CERT_SIGNED_CONTENT_INFO *info;
     DWORD size;
 
-    TRACE("(%08lx, %08x, %p, %d, %p, %d)\n", hCryptProv, dwCertEncodingType,
+    TRACE("(%08Ix, %08lx, %p, %ld, %p, %ld)\n", hCryptProv, dwCertEncodingType,
      pbEncoded, cbEncoded, pbComputedHash, *pcbComputedHash);
 
     ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT,
@@ -2417,7 +2417,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv,
     PCCRYPT_OID_INFO info;
     HCRYPTHASH hHash;
 
-    TRACE("(%08lx, %d, %d, %p, %d, %p, %p, %p, %p)\n", hCryptProv,
+    TRACE("(%08Ix, %ld, %ld, %p, %ld, %p, %p, %p, %p)\n", hCryptProv,
      dwKeySpec, dwCertEncodingType, pbEncodedToBeSigned, cbEncodedToBeSigned,
      pSignatureAlgorithm, pvHashAuxInfo, pbSignature, pcbSignature);
 
@@ -2475,7 +2475,7 @@ BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCrypt
     BOOL ret;
     DWORD encodedSize, hashSize;
 
-    TRACE("(%08lx, %d, %d, %s, %p, %p, %p, %p, %p)\n", hCryptProv, dwKeySpec,
+    TRACE("(%08Ix, %ld, %ld, %s, %p, %p, %p, %p, %p)\n", hCryptProv, dwKeySpec,
      dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo,
      pSignatureAlgorithm, pvHashAuxInfo, pbEncoded, pcbEncoded);
 
@@ -2732,7 +2732,7 @@ static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *k
 
     modulus_len = size - sizeof(*hdr) - sizeof(*rsapubkey);
     if (modulus_len != rsapubkey->bitlen / 8)
-        FIXME("RSA pubkey has wrong modulus_len %u\n", modulus_len);
+        FIXME("RSA pubkey has wrong modulus_len %lu\n", modulus_len);
 
     size = sizeof(*rsakey) + sizeof(ULONG) + modulus_len;
 
@@ -2871,7 +2871,7 @@ static BOOL CNG_VerifySignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodi
                 status = BCryptVerifySignature(key, NULL, hash_value, hash_len, sig_value, sig_len, 0);
                 if (status)
                 {
-                    FIXME("Failed to verify signature: %08x\n", status);
+                    FIXME("Failed to verify signature: %08lx\n", status);
                     SetLastError(RtlNtStatusToDosError(status));
                     ret = FALSE;
                 }
@@ -2910,7 +2910,7 @@ BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV_LEGACY hCryptProv,
     BOOL ret = TRUE;
     CRYPT_DATA_BLOB subjectBlob;
 
-    TRACE("(%08lx, %d, %d, %p, %d, %p, %08x, %p)\n", hCryptProv,
+    TRACE("(%08Ix, %ld, %ld, %p, %ld, %p, %08lx, %p)\n", hCryptProv,
      dwCertEncodingType, dwSubjectType, pvSubject, dwIssuerType, pvIssuer,
      dwFlags, pvReserved);
 
@@ -3002,7 +3002,7 @@ BOOL WINAPI CertGetIntendedKeyUsage(DWORD dwCertEncodingType,
     PCERT_EXTENSION ext;
     BOOL ret = FALSE;
 
-    TRACE("(%08x, %p, %p, %d)\n", dwCertEncodingType, pCertInfo, pbKeyUsage,
+    TRACE("(%08lx, %p, %p, %ld)\n", dwCertEncodingType, pCertInfo, pbKeyUsage,
      cbKeyUsage);
 
     ext = CertFindExtension(szOID_KEY_USAGE, pCertInfo->cExtension,
@@ -3046,7 +3046,7 @@ BOOL WINAPI CertGetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext, DWORD dwFlags,
         return FALSE;
     }
 
-    TRACE("(%p, %08x, %p, %d)\n", pCertContext, dwFlags, pUsage, *pcbUsage);
+    TRACE("(%p, %08lx, %p, %ld)\n", pCertContext, dwFlags, pUsage, *pcbUsage);
 
     if (!(dwFlags & CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG))
     {
@@ -3353,7 +3353,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts,
     BOOL allUsagesValid = TRUE;
     CERT_ENHKEY_USAGE validUsages = { 0, NULL };
 
-    TRACE("(%d, %p, %d, %p, %d)\n", cCerts, rghCerts, *cNumOIDs,
+    TRACE("(%ld, %p, %d, %p, %ld)\n", cCerts, rghCerts, *cNumOIDs,
      rghOIDs, *pcbOIDs);
 
     for (i = 0; i < cCerts; i++)
@@ -3749,7 +3749,7 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN
     PCERT_PUBLIC_KEY_INFO pubKey = NULL;
     DWORD pubKeySize = 0, dwKeySpec;
 
-    TRACE("(%08lx, %p, %08x, %p, %p, %p, %p, %p)\n", hProv,
+    TRACE("(%08Ix, %p, %08lx, %p, %p, %p, %p, %p)\n", hProv,
      pSubjectIssuerBlob, dwFlags, pKeyProvInfo, pSignatureAlgorithm, pStartTime,
      pExtensions, pExtensions);
 
@@ -3858,7 +3858,7 @@ BOOL WINAPI CertVerifyCTLUsage(DWORD dwEncodingType, DWORD dwSubjectType,
                                PCTL_VERIFY_USAGE_PARA pVerifyUsagePara,
                                PCTL_VERIFY_USAGE_STATUS pVerifyUsageStatus)
 {
-    FIXME("(0x%x, %d, %p, %p, 0x%x, %p, %p): stub\n", dwEncodingType,
+    FIXME("(0x%lx, %ld, %p, %p, 0x%lx, %p, %p): stub\n", dwEncodingType,
           dwSubjectType, pvSubject, pSubjectUsage, dwFlags, pVerifyUsagePara,
           pVerifyUsageStatus);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -3869,12 +3869,12 @@ const void * WINAPI CertCreateContext(DWORD dwContextType, DWORD dwEncodingType,
                                       const BYTE *pbEncoded, DWORD cbEncoded,
                                       DWORD dwFlags, PCERT_CREATE_CONTEXT_PARA pCreatePara)
 {
-    TRACE("(0x%x, 0x%x, %p, %d, 0x%08x, %p)\n", dwContextType, dwEncodingType,
+    TRACE("(0x%lx, 0x%lx, %p, %ld, 0x%08lx, %p)\n", dwContextType, dwEncodingType,
           pbEncoded, cbEncoded, dwFlags, pCreatePara);
 
     if (dwFlags)
     {
-        FIXME("dwFlags 0x%08x not handled\n", dwFlags);
+        FIXME("dwFlags 0x%08lx not handled\n", dwFlags);
         return NULL;
     }
     if (pCreatePara)
@@ -3892,7 +3892,7 @@ const void * WINAPI CertCreateContext(DWORD dwContextType, DWORD dwEncodingType,
     case CERT_STORE_CTL_CONTEXT:
         return CertCreateCTLContext(dwEncodingType, pbEncoded, cbEncoded);
     default:
-        WARN("unknown context type: 0x%x\n", dwContextType);
+        WARN("unknown context type: 0x%lx\n", dwContextType);
         return NULL;
     }
 }
@@ -3900,7 +3900,7 @@ const void * WINAPI CertCreateContext(DWORD dwContextType, DWORD dwEncodingType,
 BOOL WINAPI CryptSetKeyIdentifierProperty(const CRYPT_HASH_BLOB *pKeyIdentifier, DWORD dwPropId,
     DWORD dwFlags, LPCWSTR pwszComputerName, void *pvReserved, const void *pvData)
 {
-    FIXME("(%p, 0x%x, 0x%x, %s, %p, %p): stub\n", pKeyIdentifier, dwPropId, dwFlags,
+    FIXME("(%p, 0x%lx, 0x%lx, %s, %p, %p): stub\n", pKeyIdentifier, dwPropId, dwFlags,
         debugstr_w(pwszComputerName), pvReserved, pvData);
     return FALSE;
 }
diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c
index 63bcfebec38..3e9bdb66e0a 100644
--- a/dlls/crypt32/chain.c
+++ b/dlls/crypt32/chain.c
@@ -609,7 +609,7 @@ static BOOL CRYPT_CheckBasicConstraintsForCA(CertificateChainEngine *engine,
         chainConstraints->fCA = constraints.fCA;
         if (!constraints.fCA)
         {
-            TRACE_(chain)("chain element %d can't be a CA\n", remainingCAs + 1);
+            TRACE_(chain)("chain element %ld can't be a CA\n", remainingCAs + 1);
             validBasicConstraints = FALSE;
         }
         else if (constraints.fPathLenConstraint)
@@ -621,7 +621,7 @@ static BOOL CRYPT_CheckBasicConstraintsForCA(CertificateChainEngine *engine,
              constraints.dwPathLenConstraint <
              chainConstraints->dwPathLenConstraint)
             {
-                TRACE_(chain)("setting path length constraint to %d\n",
+                TRACE_(chain)("setting path length constraint to %ld\n",
                  chainConstraints->dwPathLenConstraint);
                 chainConstraints->fPathLenConstraint = TRUE;
                 chainConstraints->dwPathLenConstraint =
@@ -632,7 +632,7 @@ static BOOL CRYPT_CheckBasicConstraintsForCA(CertificateChainEngine *engine,
     if (chainConstraints->fPathLenConstraint &&
      remainingCAs > chainConstraints->dwPathLenConstraint)
     {
-        TRACE_(chain)("remaining CAs %d exceed max path length %d\n",
+        TRACE_(chain)("remaining CAs %ld exceed max path length %ld\n",
          remainingCAs, chainConstraints->dwPathLenConstraint);
         validBasicConstraints = FALSE;
         *pathLengthConstraintViolated = TRUE;
@@ -818,7 +818,7 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint,
 {
     BOOL match = FALSE;
 
-    TRACE("(%d, %p), (%d, %p)\n", constraint->cbData, constraint->pbData,
+    TRACE("(%ld, %p), (%ld, %p)\n", constraint->cbData, constraint->pbData,
      name->cbData, name->pbData);
 
     /* RFC5280, section 4.2.1.10, iPAddress syntax: either 8 or 32 bytes, for
@@ -911,7 +911,7 @@ static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name,
              &name->u.DirectoryName);
             break;
         default:
-            ERR("name choice %d unsupported in this context\n",
+            ERR("name choice %ld unsupported in this context\n",
              constraint->dwAltNameChoice);
             *trustErrorStatus |=
              CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT;
@@ -987,7 +987,7 @@ static void compare_alt_name_with_constraints(const CERT_EXTENSION *altNameExt,
              &subjectAltName->rgAltEntry[i], nameConstraints,
              trustErrorStatus))
             {
-                TRACE_(chain)("subject alternate name form %d excluded\n",
+                TRACE_(chain)("subject alternate name form %ld excluded\n",
                  subjectAltName->rgAltEntry[i].dwAltNameChoice);
                 *trustErrorStatus |=
                  CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT;
@@ -997,7 +997,7 @@ static void compare_alt_name_with_constraints(const CERT_EXTENSION *altNameExt,
              &subjectAltName->rgAltEntry[i], nameConstraints,
              trustErrorStatus, &nameFormPresent) && nameFormPresent)
             {
-                TRACE_(chain)("subject alternate name form %d not permitted\n",
+                TRACE_(chain)("subject alternate name form %ld not permitted\n",
                  subjectAltName->rgAltEntry[i].dwAltNameChoice);
                 *trustErrorStatus |=
                  CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT;
@@ -1446,7 +1446,7 @@ static void dump_alt_name_entry(const CERT_ALT_NAME_ENTRY *entry)
         TRACE_(chain)("CERT_ALT_NAME_URL: %s\n", debugstr_w(entry->u.pwszURL));
         break;
     case CERT_ALT_NAME_IP_ADDRESS:
-        TRACE_(chain)("CERT_ALT_NAME_IP_ADDRESS: %d bytes\n",
+        TRACE_(chain)("CERT_ALT_NAME_IP_ADDRESS: %ld bytes\n",
          entry->u.IPAddress.cbData);
         break;
     case CERT_ALT_NAME_REGISTERED_ID:
@@ -1454,7 +1454,7 @@ static void dump_alt_name_entry(const CERT_ALT_NAME_ENTRY *entry)
          debugstr_a(entry->u.pszRegisteredID));
         break;
     default:
-        TRACE_(chain)("dwAltNameChoice = %d\n", entry->dwAltNameChoice);
+        TRACE_(chain)("dwAltNameChoice = %ld\n", entry->dwAltNameChoice);
     }
 }
 
@@ -1470,7 +1470,7 @@ static void dump_alt_name(LPCSTR type, const CERT_EXTENSION *ext)
     {
         DWORD i;
 
-        TRACE_(chain)("%d alt name entries:\n", name->cAltEntry);
+        TRACE_(chain)("%ld alt name entries:\n", name->cAltEntry);
         for (i = 0; i < name->cAltEntry; i++)
             dump_alt_name_entry(&name->rgAltEntry[i]);
         LocalFree(name);
@@ -1489,7 +1489,7 @@ static void dump_basic_constraints(const CERT_EXTENSION *ext)
         TRACE_(chain)("SubjectType: %02x\n", info->SubjectType.pbData[0]);
         TRACE_(chain)("%s path length constraint\n",
          info->fPathLenConstraint ? "has" : "doesn't have");
-        TRACE_(chain)("path length=%d\n", info->dwPathLenConstraint);
+        TRACE_(chain)("path length=%ld\n", info->dwPathLenConstraint);
         LocalFree(info);
     }
 }
@@ -1507,7 +1507,7 @@ static void dump_basic_constraints2(const CERT_EXTENSION *ext)
         TRACE_(chain)("can%s be a CA\n", constraints.fCA ? "" : "not");
         TRACE_(chain)("%s path length constraint\n",
          constraints.fPathLenConstraint ? "has" : "doesn't have");
-        TRACE_(chain)("path length=%d\n", constraints.dwPathLenConstraint);
+        TRACE_(chain)("path length=%ld\n", constraints.dwPathLenConstraint);
     }
 }
 
@@ -1541,7 +1541,7 @@ static void dump_key_usage(const CERT_EXTENSION *ext)
 static void dump_general_subtree(const CERT_GENERAL_SUBTREE *subtree)
 {
     dump_alt_name_entry(&subtree->Base);
-    TRACE_(chain)("dwMinimum = %d, fMaximum = %d, dwMaximum = %d\n",
+    TRACE_(chain)("dwMinimum = %ld, fMaximum = %d, dwMaximum = %ld\n",
      subtree->dwMinimum, subtree->fMaximum, subtree->dwMaximum);
 }
 
@@ -1557,11 +1557,11 @@ static void dump_name_constraints(const CERT_EXTENSION *ext)
     {
         DWORD i;
 
-        TRACE_(chain)("%d permitted subtrees:\n",
+        TRACE_(chain)("%ld permitted subtrees:\n",
          nameConstraints->cPermittedSubtree);
         for (i = 0; i < nameConstraints->cPermittedSubtree; i++)
             dump_general_subtree(&nameConstraints->rgPermittedSubtree[i]);
-        TRACE_(chain)("%d excluded subtrees:\n",
+        TRACE_(chain)("%ld excluded subtrees:\n",
          nameConstraints->cExcludedSubtree);
         for (i = 0; i < nameConstraints->cExcludedSubtree; i++)
             dump_general_subtree(&nameConstraints->rgExcludedSubtree[i]);
@@ -1580,12 +1580,12 @@ static void dump_cert_policies(const CERT_EXTENSION *ext)
     {
         DWORD i, j;
 
-        TRACE_(chain)("%d policies:\n", policies->cPolicyInfo);
+        TRACE_(chain)("%ld policies:\n", policies->cPolicyInfo);
         for (i = 0; i < policies->cPolicyInfo; i++)
         {
             TRACE_(chain)("policy identifier: %s\n",
              debugstr_a(policies->rgPolicyInfo[i].pszPolicyIdentifier));
-            TRACE_(chain)("%d policy qualifiers:\n",
+            TRACE_(chain)("%ld policy qualifiers:\n",
              policies->rgPolicyInfo[i].cPolicyQualifier);
             for (j = 0; j < policies->rgPolicyInfo[i].cPolicyQualifier; j++)
                 TRACE_(chain)("%s\n", debugstr_a(
@@ -1607,7 +1607,7 @@ static void dump_enhanced_key_usage(const CERT_EXTENSION *ext)
     {
         DWORD i;
 
-        TRACE_(chain)("%d usages:\n", usage->cUsageIdentifier);
+        TRACE_(chain)("%ld usages:\n", usage->cUsageIdentifier);
         for (i = 0; i < usage->cUsageIdentifier; i++)
             TRACE_(chain)("%s\n", usage->rgpszUsageIdentifier[i]);
         LocalFree(usage);
@@ -1687,7 +1687,7 @@ static void dump_element(PCCERT_CONTEXT cert)
     LPWSTR name = NULL;
     DWORD len, i;
 
-    TRACE_(chain)("%p: version %d\n", cert, cert->pCertInfo->dwVersion);
+    TRACE_(chain)("%p: version %ld\n", cert, cert->pCertInfo->dwVersion);
     len = CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE,
      CERT_NAME_ISSUER_FLAG, NULL, NULL, 0);
     name = CryptMemAlloc(len * sizeof(WCHAR));
@@ -1711,7 +1711,7 @@ static void dump_element(PCCERT_CONTEXT cert)
     TRACE_(chain)("valid from %s to %s\n",
      filetime_to_str(&cert->pCertInfo->NotBefore),
      filetime_to_str(&cert->pCertInfo->NotAfter));
-    TRACE_(chain)("%d extensions\n", cert->pCertInfo->cExtension);
+    TRACE_(chain)("%ld extensions\n", cert->pCertInfo->cExtension);
     for (i = 0; i < cert->pCertInfo->cExtension; i++)
         dump_extension(&cert->pCertInfo->rgExtension[i]);
 }
@@ -1866,7 +1866,7 @@ static BOOL CRYPT_IsCertVersionValid(PCCERT_CONTEXT cert)
         /* Do nothing, all fields are allowed for V3 certs */
         break;
     default:
-        WARN_(chain)("invalid cert version %d\n", cert->pCertInfo->dwVersion);
+        WARN_(chain)("invalid cert version %ld\n", cert->pCertInfo->dwVersion);
         ret = FALSE;
     }
     return ret;
@@ -1881,7 +1881,7 @@ static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine,
     CERT_BASIC_CONSTRAINTS2_INFO constraints = { FALSE, FALSE, 0 };
     DWORD status;
 
-    TRACE_(chain)("checking chain with %d elements for time %s\n",
+    TRACE_(chain)("checking chain with %ld elements for time %s\n",
      chain->cElement, filetime_to_str(time));
     for (i = chain->cElement - 1; i >= 0; i--)
     {
@@ -2027,7 +2027,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con
              0, (void**)&new_cert, NULL, NULL, NULL, NULL);
             if(!res)
             {
-                TRACE("CryptRetrieveObjectByUrlW failed: %u\n", GetLastError());
+                TRACE("CryptRetrieveObjectByUrlW failed: %lu\n", GetLastError());
                 continue;
             }
 
@@ -2723,7 +2723,7 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain,
                         error = CERT_TRUST_IS_REVOKED;
                         break;
                     default:
-                        WARN("unmapped error %08x\n", revocationStatus.dwError);
+                        WARN("unmapped error %08lx\n", revocationStatus.dwError);
                         error = 0;
                     }
                     if (element)
@@ -2859,16 +2859,16 @@ static void dump_usage_match(LPCSTR name, const CERT_USAGE_MATCH *usageMatch)
 
 static void dump_chain_para(const CERT_CHAIN_PARA *pChainPara)
 {
-    TRACE_(chain)("%d\n", pChainPara->cbSize);
+    TRACE_(chain)("%ld\n", pChainPara->cbSize);
     if (pChainPara->cbSize >= sizeof(CERT_CHAIN_PARA_NO_EXTRA_FIELDS))
         dump_usage_match("RequestedUsage", &pChainPara->RequestedUsage);
     if (pChainPara->cbSize >= sizeof(CERT_CHAIN_PARA))
     {
         dump_usage_match("RequestedIssuancePolicy",
          &pChainPara->RequestedIssuancePolicy);
-        TRACE_(chain)("%d\n", pChainPara->dwUrlRetrievalTimeout);
+        TRACE_(chain)("%ld\n", pChainPara->dwUrlRetrievalTimeout);
         TRACE_(chain)("%d\n", pChainPara->fCheckRevocationFreshnessTime);
-        TRACE_(chain)("%d\n", pChainPara->dwRevocationFreshnessTime);
+        TRACE_(chain)("%ld\n", pChainPara->dwRevocationFreshnessTime);
     }
 }
 
@@ -2881,7 +2881,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine,
     BOOL ret;
     CertificateChain *chain = NULL;
 
-    TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext,
+    TRACE("(%p, %p, %s, %p, %p, %08lx, %p, %p)\n", hChainEngine, pCertContext,
      debugstr_filetime(pTime), hAdditionalStore, pChainPara, dwFlags,
      pvReserved, ppChainContext);
 
@@ -2930,7 +2930,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine,
         CRYPT_VerifyChainRevocation(pChain, pTime, hAdditionalStore,
          pChainPara, dwFlags);
         CRYPT_CheckUsages(pChain, pChainPara);
-        TRACE_(chain)("error status: %08x\n",
+        TRACE_(chain)("error status: %08lx\n",
          pChain->TrustStatus.dwErrorStatus);
         if (ppChainContext)
             *ppChainContext = pChain;
@@ -2970,7 +2970,7 @@ PCCERT_CHAIN_CONTEXT WINAPI CertFindChainInStore(HCERTSTORE store,
  DWORD certEncodingType, DWORD findFlags, DWORD findType,
  const void *findPara, PCCERT_CHAIN_CONTEXT prevChainContext)
 {
-    FIXME("(%p, %08x, %08x, %d, %p, %p): stub\n", store, certEncodingType,
+    FIXME("(%p, %08lx, %08lx, %ld, %p, %p): stub\n", store, certEncodingType,
      findFlags, findType, findPara, prevChainContext);
     return NULL;
 }
@@ -3076,8 +3076,8 @@ static void dump_authenticode_extra_chain_policy_para(
 {
     if (extraPara)
     {
-        TRACE_(chain)("cbSize = %d\n", extraPara->cbSize);
-        TRACE_(chain)("dwRegPolicySettings = %08x\n",
+        TRACE_(chain)("cbSize = %ld\n", extraPara->cbSize);
+        TRACE_(chain)("dwRegPolicySettings = %08lx\n",
          extraPara->dwRegPolicySettings);
         TRACE_(chain)("pSignerInfo = %p\n", extraPara->pSignerInfo);
     }
@@ -3439,9 +3439,9 @@ static void dump_ssl_extra_chain_policy_para(HTTPSPolicyCallbackData *sslPara)
 {
     if (sslPara)
     {
-        TRACE_(chain)("cbSize = %d\n", sslPara->u.cbSize);
-        TRACE_(chain)("dwAuthType = %d\n", sslPara->dwAuthType);
-        TRACE_(chain)("fdwChecks = %08x\n", sslPara->fdwChecks);
+        TRACE_(chain)("cbSize = %ld\n", sslPara->u.cbSize);
+        TRACE_(chain)("dwAuthType = %ld\n", sslPara->dwAuthType);
+        TRACE_(chain)("fdwChecks = %08lx\n", sslPara->fdwChecks);
         TRACE_(chain)("pwszServerName = %s\n",
          debugstr_w(sslPara->pwszServerName));
     }
@@ -3742,8 +3742,8 @@ static void dump_policy_para(PCERT_CHAIN_POLICY_PARA para)
 {
     if (para)
     {
-        TRACE_(chain)("cbSize = %d\n", para->cbSize);
-        TRACE_(chain)("dwFlags = %08x\n", para->dwFlags);
+        TRACE_(chain)("cbSize = %ld\n", para->cbSize);
+        TRACE_(chain)("dwFlags = %08lx\n", para->dwFlags);
         TRACE_(chain)("pvExtraPolicyPara = %p\n", para->pvExtraPolicyPara);
     }
 }
@@ -3798,6 +3798,6 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID,
          pPolicyStatus);
     if (hFunc)
         CryptFreeOIDFunctionAddress(hFunc, 0);
-    TRACE("returning %d (%08x)\n", ret, pPolicyStatus->dwError);
+    TRACE("returning %d (%08lx)\n", ret, pPolicyStatus->dwError);
     return ret;
 }
diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c
index 2c2398d7455..e8d6db78641 100644
--- a/dlls/crypt32/collectionstore.c
+++ b/dlls/crypt32/collectionstore.c
@@ -42,7 +42,7 @@ typedef struct _WINE_COLLECTIONSTORE
 static void Collection_addref(WINECRYPT_CERTSTORE *store)
 {
     LONG ref = InterlockedIncrement(&store->ref);
-    TRACE("ref = %d\n", ref);
+    TRACE("ref = %ld\n", ref);
 }
 
 static DWORD Collection_release(WINECRYPT_CERTSTORE *store, DWORD flags)
@@ -52,10 +52,10 @@ static DWORD Collection_release(WINECRYPT_CERTSTORE *store, DWORD flags)
     LONG ref;
 
     if(flags)
-        FIXME("Unimplemented flags %x\n", flags);
+        FIXME("Unimplemented flags %lx\n", flags);
 
     ref = InterlockedDecrement(&cs->hdr.ref);
-    TRACE("(%p) ref=%d\n", store, ref);
+    TRACE("(%p) ref=%ld\n", store, ref);
     if(ref)
         return ERROR_SUCCESS;
 
@@ -411,7 +411,7 @@ static BOOL Collection_control(WINECRYPT_CERTSTORE *cert_store, DWORD dwFlags,
     WINE_COLLECTIONSTORE *store = (WINE_COLLECTIONSTORE*)cert_store;
     WINE_STORE_LIST_ENTRY *entry;
 
-    TRACE("(%p, %08x, %d, %p)\n", cert_store, dwFlags, dwCtrlType, pvCtrlPara);
+    TRACE("(%p, %08lx, %ld, %p)\n", cert_store, dwFlags, dwCtrlType, pvCtrlPara);
 
     if (!store)
         return TRUE;
@@ -494,7 +494,7 @@ BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore,
     WINE_STORE_LIST_ENTRY *entry;
     BOOL ret;
 
-    TRACE("(%p, %p, %08x, %d)\n", hCollectionStore, hSiblingStore,
+    TRACE("(%p, %p, %08lx, %ld)\n", hCollectionStore, hSiblingStore,
      dwUpdateFlags, dwPriority);
 
     if (!collection || !sibling)
@@ -519,11 +519,11 @@ BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore,
     if (entry)
     {
         InterlockedIncrement(&sibling->ref);
-        TRACE("sibling %p's ref count is %d\n", sibling, sibling->ref);
+        TRACE("sibling %p's ref count is %ld\n", sibling, sibling->ref);
         entry->store = sibling;
         entry->dwUpdateFlags = dwUpdateFlags;
         entry->dwPriority = dwPriority;
-        TRACE("%p: adding %p, priority %d\n", collection, entry, dwPriority);
+        TRACE("%p: adding %p, priority %ld\n", collection, entry, dwPriority);
         EnterCriticalSection(&collection->cs);
         if (dwPriority)
         {
diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c
index 90d1afd2021..4a16d42296b 100644
--- a/dlls/crypt32/context.c
+++ b/dlls/crypt32/context.c
@@ -79,7 +79,7 @@ void Context_AddRef(context_t *context)
 {
     LONG ref = InterlockedIncrement(&context->ref);
 
-    TRACE("(%p) ref=%d\n", context, context->ref);
+    TRACE("(%p) ref=%ld\n", context, context->ref);
 
     if(ref == 1) {
         /* This is the first external (non-store) reference. Increase store ref cnt. */
@@ -107,7 +107,7 @@ void Context_Release(context_t *context)
 {
     LONG ref = InterlockedDecrement(&context->ref);
 
-    TRACE("(%p) ref=%d\n", context, ref);
+    TRACE("(%p) ref=%ld\n", context, ref);
     assert(ref >= 0);
 
     if (!ref) {
diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c
index 657810e0c6b..51ae270ae73 100644
--- a/dlls/crypt32/crl.c
+++ b/dlls/crypt32/crl.c
@@ -185,7 +185,7 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType,
     BYTE *data = NULL;
     DWORD size = 0;
 
-    TRACE("(%08x, %p, %d)\n", dwCertEncodingType, pbCrlEncoded,
+    TRACE("(%08lx, %p, %ld)\n", dwCertEncodingType, pbCrlEncoded,
      cbCrlEncoded);
 
     if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING)
@@ -228,7 +228,7 @@ BOOL WINAPI CertAddEncodedCRLToStore(HCERTSTORE hCertStore,
      pbCrlEncoded, cbCrlEncoded);
     BOOL ret;
 
-    TRACE("(%p, %08x, %p, %d, %08x, %p)\n", hCertStore, dwCertEncodingType,
+    TRACE("(%p, %08lx, %p, %ld, %08lx, %p)\n", hCertStore, dwCertEncodingType,
      pbCrlEncoded, cbCrlEncoded, dwAddDisposition, ppCrlContext);
 
     if (crl)
@@ -385,7 +385,7 @@ PCCRL_CONTEXT WINAPI CertFindCRLInStore(HCERTSTORE hCertStore,
     PCCRL_CONTEXT ret;
     CrlCompareFunc compare;
 
-    TRACE("(%p, %d, %d, %d, %p, %p)\n", hCertStore, dwCertEncodingType,
+    TRACE("(%p, %ld, %ld, %ld, %p, %p)\n", hCertStore, dwCertEncodingType,
 	 dwFindFlags, dwFindType, pvFindPara, pPrevCrlContext);
 
     switch (dwFindType)
@@ -403,7 +403,7 @@ PCCRL_CONTEXT WINAPI CertFindCRLInStore(HCERTSTORE hCertStore,
         compare = compare_crl_issued_for;
         break;
     default:
-        FIXME("find type %08x unimplemented\n", dwFindType);
+        FIXME("find type %08lx unimplemented\n", dwFindType);
         compare = NULL;
     }
 
@@ -436,7 +436,7 @@ PCCRL_CONTEXT WINAPI CertGetCRLFromStore(HCERTSTORE hCertStore,
      CERT_STORE_DELTA_CRL_FLAG;
     PCCRL_CONTEXT ret;
 
-    TRACE("(%p, %p, %p, %08x)\n", hCertStore, pIssuerContext, pPrevCrlContext,
+    TRACE("(%p, %p, %p, %08lx)\n", hCertStore, pIssuerContext, pPrevCrlContext,
      *pdwFlags);
 
     if (*pdwFlags & ~supportedFlags)
@@ -489,7 +489,7 @@ BOOL WINAPI CertFreeCRLContext(PCCRL_CONTEXT pCrlContext)
 DWORD WINAPI CertEnumCRLContextProperties(PCCRL_CONTEXT pCRLContext,
  DWORD dwPropId)
 {
-    TRACE("(%p, %d)\n", pCRLContext, dwPropId);
+    TRACE("(%p, %ld)\n", pCRLContext, dwPropId);
 
     return ContextPropertyList_EnumPropIDs(crl_from_ptr(pCRLContext)->base.properties, dwPropId);
 }
@@ -518,7 +518,7 @@ static BOOL CRLContext_GetProperty(crl_t *crl, DWORD dwPropId,
     BOOL ret;
     CRYPT_DATA_BLOB blob;
 
-    TRACE("(%p, %d, %p, %p)\n", crl, dwPropId, pvData, pcbData);
+    TRACE("(%p, %ld, %p, %p)\n", crl, dwPropId, pvData, pcbData);
 
     if (crl->base.properties)
         ret = ContextPropertyList_FindProperty(crl->base.properties, dwPropId, &blob);
@@ -568,7 +568,7 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
 {
     BOOL ret;
 
-    TRACE("(%p, %d, %p, %p)\n", pCRLContext, dwPropId, pvData, pcbData);
+    TRACE("(%p, %ld, %p, %p)\n", pCRLContext, dwPropId, pvData, pcbData);
 
     switch (dwPropId)
     {
@@ -607,7 +607,7 @@ static BOOL CRLContext_SetProperty(crl_t *crl, DWORD dwPropId,
 {
     BOOL ret;
 
-    TRACE("(%p, %d, %08x, %p)\n", crl, dwPropId, dwFlags, pvData);
+    TRACE("(%p, %ld, %08lx, %p)\n", crl, dwPropId, dwFlags, pvData);
 
     if (!crl->base.properties)
         ret = FALSE;
@@ -649,7 +649,7 @@ static BOOL CRLContext_SetProperty(crl_t *crl, DWORD dwPropId,
              pvData, sizeof(FILETIME));
             break;
         default:
-            FIXME("%d: stub\n", dwPropId);
+            FIXME("%ld: stub\n", dwPropId);
             ret = FALSE;
         }
     }
@@ -662,7 +662,7 @@ BOOL WINAPI CertSetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
 {
     BOOL ret;
 
-    TRACE("(%p, %d, %08x, %p)\n", pCRLContext, dwPropId, dwFlags, pvData);
+    TRACE("(%p, %ld, %08lx, %p)\n", pCRLContext, dwPropId, dwFlags, pvData);
 
     /* Handle special cases for "read-only"/invalid prop IDs.  Windows just
      * crashes on most of these, I'll be safer.
@@ -719,7 +719,7 @@ static BOOL compare_dist_point_name(const CRL_DIST_POINT_NAME *name1,
                              entry1->u.DirectoryName.cbData);
                             break;
                         default:
-                            FIXME("unimplemented for type %d\n",
+                            FIXME("unimplemented for type %ld\n",
                              entry1->dwAltNameChoice);
                             match = FALSE;
                         }
@@ -778,7 +778,7 @@ BOOL WINAPI CertIsValidCRLForCertificate(PCCERT_CONTEXT pCert,
     PCERT_EXTENSION ext;
     BOOL ret;
 
-    TRACE("(%p, %p, %08x, %p)\n", pCert, pCrl, dwFlags, pvReserved);
+    TRACE("(%p, %p, %08lx, %p)\n", pCert, pCrl, dwFlags, pvReserved);
 
     if (!pCert)
         return TRUE;
@@ -845,7 +845,7 @@ BOOL WINAPI CertFindCertificateInCRL(PCCERT_CONTEXT pCert,
  PCCRL_CONTEXT pCrlContext, DWORD dwFlags, void *pvReserved,
  PCRL_ENTRY *ppCrlEntry)
 {
-    TRACE("(%p, %p, %08x, %p, %p)\n", pCert, pCrlContext, dwFlags, pvReserved,
+    TRACE("(%p, %p, %08lx, %p, %p)\n", pCert, pCrlContext, dwFlags, pvReserved,
      ppCrlEntry);
 
     *ppCrlEntry = CRYPT_FindCertificateInCRL(pCert->pCertInfo,
@@ -859,7 +859,7 @@ BOOL WINAPI CertVerifyCRLRevocation(DWORD dwCertEncodingType,
     DWORD i;
     PCRL_ENTRY entry = NULL;
 
-    TRACE("(%08x, %p, %d, %p)\n", dwCertEncodingType, pCertId, cCrlInfo,
+    TRACE("(%08lx, %p, %ld, %p)\n", dwCertEncodingType, pCertId, cCrlInfo,
      rgpCrlInfo);
 
     for (i = 0; !entry && i < cCrlInfo; i++)
diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c
index b8b728f387c..201a802ceea 100644
--- a/dlls/crypt32/ctl.c
+++ b/dlls/crypt32/ctl.c
@@ -68,7 +68,7 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore,
     BOOL ret = TRUE;
     PCCTL_CONTEXT toAdd = NULL, existing = NULL;
 
-    TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCtlContext, dwAddDisposition,
+    TRACE("(%p, %p, %08lx, %p)\n", hCertStore, pCtlContext, dwAddDisposition,
      ppStoreContext);
 
     if (dwAddDisposition != CERT_STORE_ADD_ALWAYS)
@@ -150,7 +150,7 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore,
             toAdd = CertDuplicateCTLContext(pCtlContext);
         break;
     default:
-        FIXME("Unimplemented add disposition %d\n", dwAddDisposition);
+        FIXME("Unimplemented add disposition %ld\n", dwAddDisposition);
         ret = FALSE;
     }
 
@@ -182,7 +182,7 @@ BOOL WINAPI CertAddEncodedCTLToStore(HCERTSTORE hCertStore,
      pbCtlEncoded, cbCtlEncoded);
     BOOL ret;
 
-    TRACE("(%p, %08x, %p, %d, %08x, %p)\n", hCertStore,
+    TRACE("(%p, %08lx, %p, %ld, %08lx, %p)\n", hCertStore,
      dwMsgAndCertEncodingType, pbCtlEncoded, cbCtlEncoded, dwAddDisposition,
      ppCtlContext);
 
@@ -295,7 +295,7 @@ PCCTL_CONTEXT WINAPI CertFindCTLInStore(HCERTSTORE hCertStore,
     PCCTL_CONTEXT ret;
     CtlCompareFunc compare;
 
-    TRACE("(%p, %d, %d, %d, %p, %p)\n", hCertStore, dwCertEncodingType,
+    TRACE("(%p, %ld, %ld, %ld, %p, %p)\n", hCertStore, dwCertEncodingType,
 	 dwFindFlags, dwFindType, pvFindPara, pPrevCtlContext);
 
     switch (dwFindType)
@@ -313,7 +313,7 @@ PCCTL_CONTEXT WINAPI CertFindCTLInStore(HCERTSTORE hCertStore,
         compare = compare_ctl_existing;
         break;
     default:
-        FIXME("find type %08x unimplemented\n", dwFindType);
+        FIXME("find type %08lx unimplemented\n", dwFindType);
         compare = NULL;
     }
 
@@ -370,7 +370,7 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType,
     DWORD contentSize = 0, size;
     PCTL_INFO ctlInfo = NULL;
 
-    TRACE("(%08x, %p, %d)\n", dwMsgAndCertEncodingType, pbCtlEncoded,
+    TRACE("(%08lx, %p, %ld)\n", dwMsgAndCertEncodingType, pbCtlEncoded,
      cbCtlEncoded);
 
     if (GET_CERT_ENCODING_TYPE(dwMsgAndCertEncodingType) != X509_ASN_ENCODING)
@@ -511,7 +511,7 @@ DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext,
     ctl_t *ctl = ctl_from_ptr(pCTLContext);
     DWORD ret;
 
-    TRACE("(%p, %d)\n", pCTLContext, dwPropId);
+    TRACE("(%p, %ld)\n", pCTLContext, dwPropId);
 
     if (ctl->base.properties)
         ret = ContextPropertyList_EnumPropIDs(ctl->base.properties, dwPropId);
@@ -544,7 +544,7 @@ static BOOL CTLContext_GetProperty(ctl_t *ctl, DWORD dwPropId,
     BOOL ret;
     CRYPT_DATA_BLOB blob;
 
-    TRACE("(%p, %d, %p, %p)\n", ctl, dwPropId, pvData, pcbData);
+    TRACE("(%p, %ld, %p, %p)\n", ctl, dwPropId, pvData, pcbData);
 
     if (ctl->base.properties)
         ret = ContextPropertyList_FindProperty(ctl->base.properties, dwPropId, &blob);
@@ -592,7 +592,7 @@ BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext,
 {
     BOOL ret;
 
-    TRACE("(%p, %d, %p, %p)\n", pCTLContext, dwPropId, pvData, pcbData);
+    TRACE("(%p, %ld, %p, %p)\n", pCTLContext, dwPropId, pvData, pcbData);
 
     switch (dwPropId)
     {
@@ -632,7 +632,7 @@ static BOOL CTLContext_SetProperty(ctl_t *ctl, DWORD dwPropId,
 {
     BOOL ret;
 
-    TRACE("(%p, %d, %08x, %p)\n", ctl, dwPropId, dwFlags, pvData);
+    TRACE("(%p, %ld, %08lx, %p)\n", ctl, dwPropId, dwFlags, pvData);
 
     if (!ctl->base.properties)
         ret = FALSE;
@@ -674,7 +674,7 @@ static BOOL CTLContext_SetProperty(ctl_t *ctl, DWORD dwPropId,
              pvData, sizeof(FILETIME));
             break;
         default:
-            FIXME("%d: stub\n", dwPropId);
+            FIXME("%ld: stub\n", dwPropId);
             ret = FALSE;
         }
     }
@@ -687,7 +687,7 @@ BOOL WINAPI CertSetCTLContextProperty(PCCTL_CONTEXT pCTLContext,
 {
     BOOL ret;
 
-    TRACE("(%p, %d, %08x, %p)\n", pCTLContext, dwPropId, dwFlags, pvData);
+    TRACE("(%p, %ld, %08lx, %p)\n", pCTLContext, dwPropId, dwFlags, pvData);
 
     /* Handle special cases for "read-only"/invalid prop IDs.  Windows just
      * crashes on most of these, I'll be safer.
diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c
index d4a13a55a1b..1550b3d6f85 100644
--- a/dlls/crypt32/decode.c
+++ b/dlls/crypt32/decode.c
@@ -319,7 +319,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[],
     DWORD i, decoded = 0;
     const BYTE *ptr = pbEncoded;
 
-    TRACE("%p, %d, %p, %d, %08x, %p, %p, %p\n", items, cItem, pbEncoded,
+    TRACE("%p, %ld, %p, %ld, %08lx, %p, %p, %p\n", items, cItem, pbEncoded,
      cbEncoded, dwFlags, pvStructInfo, nextData, cbDecoded);
 
     for (i = 0, ret = TRUE; ret && i < cItem; i++)
@@ -353,9 +353,9 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[],
                         DWORD itemDecoded;
 
                         if (pvStructInfo)
-                            TRACE("decoding item %d\n", i);
+                            TRACE("decoding item %ld\n", i);
                         else
-                            TRACE("sizing item %d\n", i);
+                            TRACE("sizing item %ld\n", i);
                         ret = items[i].decodeFunc(ptr, itemEncodedLen,
                          dwFlags & ~CRYPT_DECODE_ALLOC_FLAG,
                          pvStructInfo ?  (BYTE *)pvStructInfo + items[i].offset
@@ -369,13 +369,13 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[],
                                 /* Account for alignment padding */
                                 items[i].size = ALIGN_DWORD_PTR(items[i].size);
                             }
-                            TRACE("item %d size: %d\n", i, items[i].size);
+                            TRACE("item %ld size: %ld\n", i, items[i].size);
                             if (nextData && items[i].hasPointer &&
                              items[i].size > items[i].minSize)
                                 nextData += items[i].size - items[i].minSize;
                             if (itemDecoded > itemEncodedLen)
                             {
-                                WARN("decoded length %d exceeds encoded %d\n",
+                                WARN("decoded length %ld exceeds encoded %ld\n",
                                  itemDecoded, itemEncodedLen);
                                 SetLastError(CRYPT_E_ASN1_CORRUPT);
                                 ret = FALSE;
@@ -384,20 +384,20 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[],
                             {
                                 ptr += itemDecoded;
                                 decoded += itemDecoded;
-                                TRACE("item %d: decoded %d bytes\n", i,
+                                TRACE("item %ld: decoded %ld bytes\n", i,
                                  itemDecoded);
                             }
                         }
                         else if (items[i].optional &&
                          GetLastError() == CRYPT_E_ASN1_BADTAG)
                         {
-                            TRACE("skipping optional item %d\n", i);
+                            TRACE("skipping optional item %ld\n", i);
                             items[i].size = items[i].minSize;
                             SetLastError(NOERROR);
                             ret = TRUE;
                         }
                         else
-                            TRACE("item %d failed: %08x\n", i,
+                            TRACE("item %ld failed: %08lx\n", i,
                              GetLastError());
                     }
                     else if (itemLen == CMSG_INDEFINITE_LENGTH)
@@ -408,7 +408,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[],
                     }
                     else
                     {
-                        TRACE("item %d: decoded %d bytes\n", i, itemEncodedLen);
+                        TRACE("item %ld: decoded %ld bytes\n", i, itemEncodedLen);
                         ptr += itemEncodedLen;
                         decoded += itemEncodedLen;
                         items[i].size = items[i].minSize;
@@ -416,12 +416,12 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[],
                 }
                 else if (items[i].optional)
                 {
-                    TRACE("skipping optional item %d\n", i);
+                    TRACE("skipping optional item %ld\n", i);
                     items[i].size = items[i].minSize;
                 }
                 else
                 {
-                    TRACE("item %d: tag %02x doesn't match expected %02x\n",
+                    TRACE("item %ld: tag %02x doesn't match expected %02x\n",
                      i, ptr[0], items[i].tag);
                     SetLastError(CRYPT_E_ASN1_BADTAG);
                     ret = FALSE;
@@ -430,12 +430,12 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[],
         }
         else if (items[i].optional)
         {
-            TRACE("missing optional item %d, skipping\n", i);
+            TRACE("missing optional item %ld, skipping\n", i);
             items[i].size = items[i].minSize;
         }
         else
         {
-            TRACE("not enough bytes for item %d, failing\n", i);
+            TRACE("not enough bytes for item %ld, failing\n", i);
             SetLastError(CRYPT_E_ASN1_CORRUPT);
             ret = FALSE;
         }
@@ -460,7 +460,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[],
 {
     BOOL ret;
 
-    TRACE("%p, %d, %p, %d, %08x, %p, %p, %d, %p\n", items, cItem, pbEncoded,
+    TRACE("%p, %ld, %p, %ld, %08lx, %p, %p, %ld, %p\n", items, cItem, pbEncoded,
      cbEncoded, dwFlags, pDecodePara, pvStructInfo, *pcbStructInfo,
      startingPointer);
 
@@ -488,7 +488,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[],
             }
             else if (cbEncoded < dataLen)
             {
-                TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen,
+                TRACE("dataLen %ld exceeds cbEncoded %ld, failing\n", dataLen,
                  cbEncoded);
                 SetLastError(CRYPT_E_ASN1_CORRUPT);
                 ret = FALSE;
@@ -518,7 +518,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[],
             }
             if (ret && !indefinite && cbDecoded != dataLen)
             {
-                TRACE("expected %d decoded, got %d, failing\n", dataLen,
+                TRACE("expected %ld decoded, got %ld, failing\n", dataLen,
                  cbDecoded);
                 SetLastError(CRYPT_E_ASN1_CORRUPT);
                 ret = FALSE;
@@ -564,7 +564,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[],
         SetLastError(CRYPT_E_ASN1_BADTAG);
         ret = FALSE;
     }
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -622,7 +622,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc,
 {
     BOOL ret = TRUE;
 
-    TRACE("%p, %p, %d, %p, %d\n", arrayDesc, pbEncoded,
+    TRACE("%p, %p, %ld, %p, %ld\n", arrayDesc, pbEncoded,
      cbEncoded, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0);
 
     if (!cbEncoded)
@@ -847,7 +847,7 @@ static BOOL CRYPT_AsnDecodeBitsSwapBytes(const BYTE *pbEncoded,
 {
     BOOL ret;
 
-    TRACE("(%p, %d, 0x%08x, %p, %d, %p)\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("(%p, %ld, 0x%08lx, %p, %ld, %p)\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     /* Can't use the CRYPT_DECODE_NOCOPY_FLAG, because we modify the bytes in-
@@ -873,7 +873,7 @@ static BOOL CRYPT_AsnDecodeBitsSwapBytes(const BYTE *pbEncoded,
             }
         }
     }
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -883,7 +883,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCertSignedContent(DWORD dwCertEncodingType,
 {
     BOOL ret = TRUE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -914,7 +914,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCertSignedContent(DWORD dwCertEncodingType,
     }
     __ENDTRY
 
-    TRACE("Returning %d (%08x)\n", ret, GetLastError());
+    TRACE("Returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -965,7 +965,7 @@ static BOOL CRYPT_AsnDecodeCertExtensionsInternal(const BYTE *pbEncoded,
      CRYPT_AsnDecodeExtension, sizeof(CERT_EXTENSION), TRUE,
      offsetof(CERT_EXTENSION, pszObjId) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -1030,7 +1030,7 @@ static BOOL CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType,
        TRUE, TRUE, offsetof(CERT_INFO, rgExtension), 0 },
     };
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -1055,7 +1055,7 @@ static BOOL CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType,
         }
     }
 
-    TRACE("Returning %d (%08x)\n", ret, GetLastError());
+    TRACE("Returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -1065,7 +1065,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCert(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -1105,7 +1105,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCert(DWORD dwCertEncodingType,
     }
     __ENDTRY
 
-    TRACE("Returning %d (%08x)\n", ret, GetLastError());
+    TRACE("Returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -1120,7 +1120,7 @@ static BOOL CRYPT_AsnDecodeCRLEntryExtensions(const BYTE *pbEncoded,
      CRYPT_AsnDecodeExtension, sizeof(CERT_EXTENSION), TRUE,
      offsetof(CERT_EXTENSION, pszObjId) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -1145,7 +1145,7 @@ static BOOL CRYPT_AsnDecodeCRLEntry(const BYTE *pbEncoded, DWORD cbEncoded,
     };
     PCRL_ENTRY entry = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, entry,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, entry,
      *pcbStructInfo);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -1173,12 +1173,12 @@ static BOOL CRYPT_AsnDecodeCRLEntries(const BYTE *pbEncoded, DWORD cbEncoded,
      CRYPT_AsnDecodeCRLEntry, sizeof(CRL_ENTRY), TRUE,
      offsetof(CRL_ENTRY, SerialNumber.pbData) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
      dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded);
-    TRACE("Returning %d (%08x)\n", ret, GetLastError());
+    TRACE("Returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -1193,7 +1193,7 @@ static BOOL CRYPT_AsnDecodeCRLExtensionsInternal(const BYTE *pbEncoded,
      CRYPT_AsnDecodeExtension, sizeof(CERT_EXTENSION), TRUE,
      offsetof(CERT_EXTENSION, pszObjId) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -1246,13 +1246,13 @@ static BOOL CRYPT_AsnDecodeCRLInfo(DWORD dwCertEncodingType,
     };
     BOOL ret = TRUE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL);
 
-    TRACE("Returning %d (%08x)\n", ret, GetLastError());
+    TRACE("Returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -1262,7 +1262,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCRL(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -1302,7 +1302,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCRL(DWORD dwCertEncodingType,
     }
     __ENDTRY
 
-    TRACE("Returning %d (%08x)\n", ret, GetLastError());
+    TRACE("Returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -1312,7 +1312,7 @@ static BOOL CRYPT_AsnDecodeOidIgnoreTag(const BYTE *pbEncoded, DWORD cbEncoded,
     BOOL ret = TRUE;
     DWORD dataLen;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen)))
@@ -1410,7 +1410,7 @@ static BOOL CRYPT_AsnDecodeOidInternal(const BYTE *pbEncoded, DWORD cbEncoded,
 {
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     if (pbEncoded[0] == ASN_OBJECTIDENTIFIER)
@@ -1440,7 +1440,7 @@ static BOOL CRYPT_AsnDecodeExtension(const BYTE *pbEncoded, DWORD cbEncoded,
     BOOL ret = TRUE;
     PCERT_EXTENSION ext = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, ext,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, ext,
      *pcbStructInfo);
 
     if (ext)
@@ -1451,7 +1451,7 @@ static BOOL CRYPT_AsnDecodeExtension(const BYTE *pbEncoded, DWORD cbEncoded,
     if (ext)
         TRACE("ext->pszObjId is %p (%s)\n", ext->pszObjId,
          debugstr_a(ext->pszObjId));
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -1461,7 +1461,7 @@ static BOOL WINAPI CRYPT_AsnDecodeExtensions(DWORD dwCertEncodingType,
 {
     BOOL ret = TRUE;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, pvStructInfo ? *pcbStructInfo : 0);
 
     __TRY
@@ -1875,7 +1875,7 @@ static BOOL CRYPT_AsnDecodeRdnAttr(const BYTE *pbEncoded, DWORD cbEncoded,
     };
     CERT_RDN_ATTR *attr = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     if (attr)
@@ -1887,9 +1887,9 @@ static BOOL CRYPT_AsnDecodeRdnAttr(const BYTE *pbEncoded, DWORD cbEncoded,
     {
         TRACE("attr->pszObjId is %p (%s)\n", attr->pszObjId,
          debugstr_a(attr->pszObjId));
-        TRACE("attr->dwValueType is %d\n", attr->dwValueType);
+        TRACE("attr->dwValueType is %ld\n", attr->dwValueType);
     }
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -1972,7 +1972,7 @@ static BOOL CRYPT_AsnDecodeUnicodeRdnAttr(const BYTE *pbEncoded,
     };
     CERT_RDN_ATTR *attr = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     if (attr)
@@ -1984,9 +1984,9 @@ static BOOL CRYPT_AsnDecodeUnicodeRdnAttr(const BYTE *pbEncoded,
     {
         TRACE("attr->pszObjId is %p (%s)\n", attr->pszObjId,
          debugstr_a(attr->pszObjId));
-        TRACE("attr->dwValueType is %d\n", attr->dwValueType);
+        TRACE("attr->dwValueType is %ld\n", attr->dwValueType);
     }
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -2060,7 +2060,7 @@ static BOOL CRYPT_FindEncodedLen(const BYTE *pbEncoded, DWORD cbEncoded,
     BOOL ret = TRUE, done = FALSE;
     DWORD indefiniteNestingLevels = 0, decoded = 0;
 
-    TRACE("(%p, %d)\n", pbEncoded, cbEncoded);
+    TRACE("(%p, %ld)\n", pbEncoded, cbEncoded);
 
     do {
         DWORD dataLen;
@@ -2078,7 +2078,7 @@ static BOOL CRYPT_FindEncodedLen(const BYTE *pbEncoded, DWORD cbEncoded,
                 pbEncoded += 1 + lenBytes;
                 cbEncoded -= 1 + lenBytes;
                 decoded += 1 + lenBytes;
-                TRACE("indefiniteNestingLevels = %d\n",
+                TRACE("indefiniteNestingLevels = %ld\n",
                  indefiniteNestingLevels);
             }
             else
@@ -2087,7 +2087,7 @@ static BOOL CRYPT_FindEncodedLen(const BYTE *pbEncoded, DWORD cbEncoded,
                  indefiniteNestingLevels)
                 {
                     indefiniteNestingLevels--;
-                    TRACE("indefiniteNestingLevels = %d\n",
+                    TRACE("indefiniteNestingLevels = %ld\n",
                      indefiniteNestingLevels);
                 }
                 pbEncoded += 1 + lenBytes + dataLen;
@@ -2106,7 +2106,7 @@ static BOOL CRYPT_FindEncodedLen(const BYTE *pbEncoded, DWORD cbEncoded,
     }
     if (ret)
         *pcbDecoded = decoded;
-    TRACE("returning %d (%d)\n", ret, ret ? *pcbDecoded : 0);
+    TRACE("returning %d (%ld)\n", ret, ret ? *pcbDecoded : 0);
     return ret;
 }
 
@@ -2117,7 +2117,7 @@ static BOOL CRYPT_AsnDecodeCopyBytes(const BYTE *pbEncoded,
     BOOL ret = TRUE;
     DWORD bytesNeeded = sizeof(CRYPT_OBJID_BLOB), encodedLen = 0;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     if ((ret = CRYPT_FindEncodedLen(pbEncoded, cbEncoded, &encodedLen)))
@@ -2203,7 +2203,7 @@ static BOOL CRYPT_AsnDecodeCTLEntry(const BYTE *pbEncoded, DWORD cbEncoded,
     BOOL ret = TRUE;
     CTL_ENTRY *entry = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, entry,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, entry,
      *pcbStructInfo);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -2222,7 +2222,7 @@ static BOOL CRYPT_AsnDecodeCTLEntries(const BYTE *pbEncoded, DWORD cbEncoded,
      CRYPT_AsnDecodeCTLEntry, sizeof(CTL_ENTRY), TRUE,
      offsetof(CTL_ENTRY, SubjectIdentifier.pbData) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -2241,7 +2241,7 @@ static BOOL CRYPT_AsnDecodeCTLExtensionsInternal(const BYTE *pbEncoded,
      CRYPT_AsnDecodeExtension, sizeof(CERT_EXTENSION), TRUE,
      offsetof(CERT_EXTENSION, pszObjId) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -2274,7 +2274,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCTL(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -2336,7 +2336,7 @@ static BOOL CRYPT_AsnDecodeSMIMECapability(const BYTE *pbEncoded,
     };
     PCRYPT_SMIME_CAPABILITY capability = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -2352,7 +2352,7 @@ static BOOL WINAPI CRYPT_AsnDecodeSMIMECapabilities(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -2440,7 +2440,7 @@ static BOOL CRYPT_AsnDecodeNoticeNumbers(const BYTE *pbEncoded,
      CRYPT_AsnDecodeIntInternal, sizeof(int), FALSE, 0 };
     BOOL ret;
 
-    TRACE("(%p, %d, %08x, %p, %d)\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("(%p, %ld, %08lx, %p, %ld)\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, pvStructInfo ? *pcbDecoded : 0);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -2466,7 +2466,7 @@ static BOOL CRYPT_AsnDecodeNoticeReference(const BYTE *pbEncoded,
     };
     DWORD bytesNeeded = 0;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, pvStructInfo ? *pcbStructInfo : 0);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -2657,7 +2657,7 @@ static BOOL CRYPT_AsnDecodePolicyQualifierUserNoticeInternal(
     };
     PCERT_POLICY_QUALIFIER_USER_NOTICE notice = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -2674,7 +2674,7 @@ static BOOL WINAPI CRYPT_AsnDecodePolicyQualifierUserNotice(
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -2728,7 +2728,7 @@ static BOOL CRYPT_AsnDecodePKCSAttributeValue(const BYTE *pbEncoded,
      CRYPT_AsnDecodeCopyBytes,
      sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, pvStructInfo ? *pcbStructInfo : 0, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -2752,7 +2752,7 @@ static BOOL CRYPT_AsnDecodePKCSAttributeInternal(const BYTE *pbEncoded,
     };
     PCRYPT_ATTRIBUTE attr = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -2768,7 +2768,7 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttribute(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -2830,7 +2830,7 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttributes(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -2870,7 +2870,7 @@ static BOOL CRYPT_AsnDecodeAlgorithmId(const BYTE *pbEncoded, DWORD cbEncoded,
        offsetof(CRYPT_ALGORITHM_IDENTIFIER, Parameters.pbData), 0 },
     };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -2987,7 +2987,7 @@ static BOOL CRYPT_AsnDecodeBool(const BYTE *pbEncoded, DWORD cbEncoded,
         *(BOOL *)pvStructInfo = pbEncoded[2] != 0;
         ret = TRUE;
     }
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -2998,7 +2998,7 @@ static BOOL CRYPT_AsnDecodeAltNameEntry(const BYTE *pbEncoded, DWORD cbEncoded,
     DWORD dataLen, lenBytes, bytesNeeded = sizeof(CERT_ALT_NAME_ENTRY);
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     if (cbEncoded < 2)
@@ -3127,7 +3127,7 @@ static BOOL CRYPT_AsnDecodeAltNameInternal(const BYTE *pbEncoded,
      CRYPT_AsnDecodeAltNameEntry, sizeof(CERT_ALT_NAME_ENTRY), TRUE,
      offsetof(CERT_ALT_NAME_ENTRY, u.pwszURL) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags,
@@ -3232,7 +3232,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityInfoAccess(DWORD dwCertEncodingType,
 {
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -3265,7 +3265,7 @@ static BOOL CRYPT_AsnDecodePKCSContent(const BYTE *pbEncoded, DWORD cbEncoded,
     BOOL ret;
     DWORD dataLen;
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     /* The caller has already checked the tag, no need to check it again.
@@ -3304,7 +3304,7 @@ static BOOL CRYPT_AsnDecodePKCSContent(const BYTE *pbEncoded, DWORD cbEncoded,
             if (ret && pcbDecoded)
             {
                 *pcbDecoded = 1 + lenBytes + decodedLen;
-                TRACE("decoded %d bytes\n", *pcbDecoded);
+                TRACE("decoded %ld bytes\n", *pcbDecoded);
             }
         }
     }
@@ -3327,7 +3327,7 @@ static BOOL CRYPT_AsnDecodePKCSContentInfoInternal(const BYTE *pbEncoded,
     };
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -3342,7 +3342,7 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSContentInfo(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -3411,7 +3411,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAltName(DWORD dwCertEncodingType,
 {
     BOOL ret = TRUE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -3463,7 +3463,7 @@ static BOOL CRYPT_AsnDecodePathLenConstraint(const BYTE *pbEncoded,
     BOOL ret = TRUE;
     DWORD bytesNeeded = sizeof(struct PATH_LEN_CONSTRAINT), size;
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     if (!pvStructInfo)
@@ -3488,10 +3488,10 @@ static BOOL CRYPT_AsnDecodePathLenConstraint(const BYTE *pbEncoded,
          &constraint->dwPathLenConstraint, &size, pcbDecoded);
         if (ret)
             constraint->fPathLenConstraint = TRUE;
-        TRACE("got an int, dwPathLenConstraint is %d\n",
+        TRACE("got an int, dwPathLenConstraint is %ld\n",
          constraint->dwPathLenConstraint);
     }
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -3507,12 +3507,12 @@ static BOOL CRYPT_AsnDecodeSubtreeConstraints(const BYTE *pbEncoded,
      CRYPT_AsnDecodeCopyBytes, sizeof(CERT_NAME_BLOB), TRUE,
      offsetof(CERT_NAME_BLOB, pbData) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
      dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded);
-    TRACE("Returning %d (%08x)\n", ret, GetLastError());
+    TRACE("Returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -3596,7 +3596,7 @@ static BOOL CRYPT_AsnDecodePolicyQualifier(const BYTE *pbEncoded,
     BOOL ret;
     CERT_POLICY_QUALIFIER_INFO *qualifier = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, pvStructInfo ? *pcbStructInfo : 0);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -3617,12 +3617,12 @@ static BOOL CRYPT_AsnDecodePolicyQualifiers(const BYTE *pbEncoded,
      CRYPT_AsnDecodePolicyQualifier, sizeof(CERT_POLICY_QUALIFIER_INFO), TRUE,
      offsetof(CERT_POLICY_QUALIFIER_INFO, pszPolicyQualifierId) };
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, pvStructInfo ? *pcbStructInfo : 0);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
      dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded);
-    TRACE("Returning %d (%08x)\n", ret, GetLastError());
+    TRACE("Returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -3641,7 +3641,7 @@ static BOOL CRYPT_AsnDecodeCertPolicy(const BYTE *pbEncoded, DWORD cbEncoded,
     CERT_POLICY_INFO *info = pvStructInfo;
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, pvStructInfo ? *pcbStructInfo : 0);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -3656,7 +3656,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicies(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0);
 
     __TRY
@@ -3698,7 +3698,7 @@ static BOOL CRYPT_AsnDecodeCertPolicyMapping(const BYTE *pbEncoded,
     CERT_POLICY_MAPPING *mapping = pvStructInfo;
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, pvStructInfo ? *pcbStructInfo : 0);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -3713,7 +3713,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicyMappings(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0);
 
     __TRY
@@ -3840,7 +3840,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicyConstraints(
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0);
 
     __TRY
@@ -3913,7 +3913,7 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey_Bcrypt(DWORD dwCertEncodingType,
         struct DECODED_RSA_PUB_KEY *decodedKey = NULL;
         DWORD size = 0;
 
-        TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+        TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
          pvStructInfo, *pcbStructInfo);
 
         ret = CRYPT_raw_decode_rsa_pub_key(&decodedKey, &size, pbEncoded, cbEncoded);
@@ -4170,7 +4170,7 @@ static BOOL CRYPT_AsnDecodeOctets(const BYTE *pbEncoded,
     BOOL ret;
     DWORD bytesNeeded, dataLen;
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen)))
@@ -4310,7 +4310,7 @@ static BOOL WINAPI CRYPT_AsnDecodeOctetString(DWORD dwCertEncodingType,
 {
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     if (!cbEncoded)
@@ -4361,7 +4361,7 @@ static BOOL CRYPT_AsnDecodeBitsInternal(const BYTE *pbEncoded, DWORD cbEncoded,
     DWORD bytesNeeded, dataLen;
     BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]);
 
-    TRACE("(%p, %d, 0x%08x, %p, %d, %p)\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("(%p, %ld, 0x%08lx, %p, %ld, %p)\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen)))
@@ -4415,7 +4415,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType,
 {
     BOOL ret;
 
-    TRACE("(%p, %d, 0x%08x, %p, %p, %p)\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("(%p, %ld, 0x%08lx, %p, %p, %p)\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, pcbStructInfo);
 
     __TRY
@@ -4460,7 +4460,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType,
         ret = FALSE;
     }
     __ENDTRY
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -5337,7 +5337,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCRLDistPoints(DWORD dwCertEncodingType,
 {
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -5370,7 +5370,7 @@ static BOOL WINAPI CRYPT_AsnDecodeEnhancedKeyUsage(DWORD dwCertEncodingType,
 {
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -5402,7 +5402,7 @@ static BOOL WINAPI CRYPT_AsnDecodeIssuingDistPoint(DWORD dwCertEncodingType,
 {
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -5447,7 +5447,7 @@ static BOOL CRYPT_AsnDecodeMaximum(const BYTE *pbEncoded,
     BOOL ret;
     DWORD max, size = sizeof(max);
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     if (!cbEncoded)
@@ -5507,7 +5507,7 @@ static BOOL CRYPT_AsnDecodeSubtree(const BYTE *pbEncoded,
     };
     CERT_GENERAL_SUBTREE *subtree = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -5515,7 +5515,7 @@ static BOOL CRYPT_AsnDecodeSubtree(const BYTE *pbEncoded,
      pcbDecoded, subtree ? subtree->Base.u.pwszURL : NULL);
     if (pcbDecoded)
     {
-        TRACE("%d\n", *pcbDecoded);
+        TRACE("%ld\n", *pcbDecoded);
         if (*pcbDecoded < cbEncoded)
             TRACE("%02x %02x\n", *(pbEncoded + *pcbDecoded),
              *(pbEncoded + *pcbDecoded + 1));
@@ -5537,7 +5537,7 @@ static BOOL CRYPT_AsnDecodePermittedSubtree(const BYTE *pbEncoded,
      CRYPT_AsnDecodeSubtree, sizeof(CERT_GENERAL_SUBTREE), TRUE,
      offsetof(CERT_GENERAL_SUBTREE, Base.u.pwszURL) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -5557,7 +5557,7 @@ static BOOL CRYPT_AsnDecodeExcludedSubtree(const BYTE *pbEncoded,
      CRYPT_AsnDecodeSubtree, sizeof(CERT_GENERAL_SUBTREE), TRUE,
      offsetof(CERT_GENERAL_SUBTREE, Base.u.pwszURL) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -5571,7 +5571,7 @@ static BOOL WINAPI CRYPT_AsnDecodeNameConstraints(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -5618,7 +5618,7 @@ static BOOL CRYPT_AsnDecodeIssuerSerialNumber(const BYTE *pbEncoded,
     };
     CERT_ISSUER_SERIAL_NUMBER *issuerSerial = pvStructInfo;
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -5665,7 +5665,7 @@ static BOOL CRYPT_AsnDecodePKCSSignerInfoInternal(const BYTE *pbEncoded,
     };
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -5680,7 +5680,7 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -5725,7 +5725,7 @@ static BOOL verify_and_copy_certificate(const BYTE *pbEncoded, DWORD cbEncoded,
     cert = CertCreateCertificateContext(X509_ASN_ENCODING, pbEncoded, cbEncoded);
     if (!cert)
     {
-        WARN("CertCreateCertificateContext error %#x\n", GetLastError());
+        WARN("CertCreateCertificateContext error %#lx\n", GetLastError());
         *pcbStructInfo = 0;
         *pcbDecoded = 0;
         return TRUE;
@@ -5748,7 +5748,7 @@ static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded,
      verify_and_copy_certificate,
      sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, pvStructInfo ? *pcbStructInfo : 0, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -5768,7 +5768,7 @@ static BOOL CRYPT_AsnDecodeCMSCrlEncoded(const BYTE *pbEncoded,
      CRYPT_AsnDecodeCopyBytes, sizeof(CRYPT_DER_BLOB),
      TRUE, offsetof(CRYPT_DER_BLOB, pbData) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, pvStructInfo ? *pcbStructInfo : 0, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -5850,7 +5850,7 @@ static BOOL CRYPT_AsnDecodeCMSSignerInfoInternal(const BYTE *pbEncoded,
     };
     BOOL ret;
 
-    TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -5865,7 +5865,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCMSSignerInfo(DWORD dwCertEncodingType,
 {
     BOOL ret = FALSE;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, pvStructInfo, *pcbStructInfo);
 
     __TRY
@@ -5913,7 +5913,7 @@ static BOOL CRYPT_DecodeSignerArray(const BYTE *pbEncoded, DWORD cbEncoded,
      CRYPT_AsnDecodeCMSSignerInfoInternal, sizeof(CMSG_CMS_SIGNER_INFO), TRUE,
      offsetof(CMSG_CMS_SIGNER_INFO, SignerId.u.KeyId.pbData) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -5950,7 +5950,7 @@ BOOL CRYPT_AsnDecodeCMSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded,
        offsetof(CRYPT_SIGNED_INFO, rgSignerInfo), 0 },
     };
 
-    TRACE("%p, %d, %08x, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, signedInfo, pcbSignedInfo);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -5983,7 +5983,7 @@ static BOOL CRYPT_AsnDecodeRecipientInfo(const BYTE *pbEncoded, DWORD cbEncoded,
        offsetof(CMSG_KEY_TRANS_RECIPIENT_INFO, EncryptedKey.pbData), 0 },
     };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -6009,7 +6009,7 @@ static BOOL CRYPT_DecodeRecipientInfoArray(const BYTE *pbEncoded,
      offsetof(CMSG_KEY_TRANS_RECIPIENT_INFO,
      RecipientId.u.IssuerSerialNumber.Issuer.pbData) };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded,
@@ -6040,7 +6040,7 @@ static BOOL CRYPT_AsnDecodeEncryptedContentInfo(const BYTE *pbEncoded,
        offsetof(CRYPT_ENCRYPTED_CONTENT_INFO, encryptedContent.pbData) },
     };
 
-    TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %ld, %p\n", pbEncoded, cbEncoded, dwFlags,
      pvStructInfo, *pcbStructInfo, pcbDecoded);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -6068,7 +6068,7 @@ BOOL CRYPT_AsnDecodePKCSEnvelopedData(const BYTE *pbEncoded, DWORD cbEncoded,
        offsetof(CRYPT_ENVELOPED_DATA, encryptedContentInfo.contentType), 0 },
     };
 
-    TRACE("%p, %d, %08x, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags,
+    TRACE("%p, %ld, %08lx, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags,
      pDecodePara, envelopedData, pcbEnvelopedData);
 
     ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items),
@@ -6400,7 +6400,7 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
     CryptDecodeObjectExFunc decodeFunc;
     HCRYPTOIDFUNCADDR hFunc = NULL;
 
-    TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p, %p)\n",
+    TRACE_(crypt)("(0x%08lx, %s, %p, %ld, 0x%08lx, %p, %p, %p)\n",
      dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded,
      cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo);
 
@@ -6411,7 +6411,7 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
     }
     if (cbEncoded > MAX_ENCODED_LEN)
     {
-        FIXME_(crypt)("Returning CRYPT_E_ASN1_LARGE, cbEncoded %u.\n", cbEncoded);
+        FIXME_(crypt)("Returning CRYPT_E_ASN1_LARGE, cbEncoded %lu.\n", cbEncoded);
         SetLastError(CRYPT_E_ASN1_LARGE);
         return FALSE;
     }
diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c
index af0dd2cf743..7668d0ddb2c 100644
--- a/dlls/crypt32/encode.c
+++ b/dlls/crypt32/encode.c
@@ -180,7 +180,7 @@ BOOL WINAPI CRYPT_AsnEncodeSequence(DWORD dwCertEncodingType,
     BOOL ret;
     DWORD i, dataLen = 0;
 
-    TRACE("%p, %d, %08x, %p, %p, %d\n", items, cItem, dwFlags, pEncodePara,
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", items, cItem, dwFlags, pEncodePara,
      pbEncoded, pbEncoded ? *pcbEncoded : 0);
     for (i = 0, ret = TRUE; ret && i < cItem; i++)
     {
@@ -228,7 +228,7 @@ BOOL WINAPI CRYPT_AsnEncodeSequence(DWORD dwCertEncodingType,
             }
         }
     }
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -576,7 +576,7 @@ static BOOL CRYPT_AsnEncodeCRLEntry(const CRL_ENTRY *entry,
     DWORD cItem = 2;
     BOOL ret;
 
-    TRACE("%p, %p, %d\n", entry, pbEncoded, pbEncoded ? *pcbEncoded : 0);
+    TRACE("%p, %p, %ld\n", entry, pbEncoded, pbEncoded ? *pcbEncoded : 0);
 
     if (entry->cExtension)
     {
@@ -588,7 +588,7 @@ static BOOL CRYPT_AsnEncodeCRLEntry(const CRL_ENTRY *entry,
     ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, cItem, 0, NULL,
      pbEncoded, pcbEncoded);
 
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -732,7 +732,7 @@ static BOOL CRYPT_AsnEncodeExtension(CERT_EXTENSION *ext, BYTE *pbEncoded,
     };
     DWORD cItem = 1;
 
-    TRACE("%p, %p, %d\n", ext, pbEncoded, pbEncoded ? *pcbEncoded : 0);
+    TRACE("%p, %p, %ld\n", ext, pbEncoded, pbEncoded ? *pcbEncoded : 0);
 
     if (ext->fCritical)
     {
@@ -746,7 +746,7 @@ static BOOL CRYPT_AsnEncodeExtension(CERT_EXTENSION *ext, BYTE *pbEncoded,
 
     ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, cItem, 0, NULL,
      pbEncoded, pcbEncoded);
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -1405,7 +1405,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUnicodeName(DWORD dwCertEncodingType,
         const CERT_NAME_INFO *info = pvStructInfo;
         DWORD bytesNeeded = 0, lenBytes, size, i;
 
-        TRACE("encoding name with %d RDNs\n", info->cRDN);
+        TRACE("encoding name with %ld RDNs\n", info->cRDN);
         ret = TRUE;
         for (i = 0; ret && i < info->cRDN; i++)
         {
@@ -2306,7 +2306,7 @@ static BOOL WINAPI CRYPT_AsnEncodeName(DWORD dwCertEncodingType,
         const CERT_NAME_INFO *info = pvStructInfo;
         DWORD bytesNeeded = 0, lenBytes, size, i;
 
-        TRACE("encoding name with %d RDNs\n", info->cRDN);
+        TRACE("encoding name with %ld RDNs\n", info->cRDN);
         ret = TRUE;
         for (i = 0; ret && i < info->cRDN; i++)
         {
@@ -2387,7 +2387,7 @@ static BOOL WINAPI CRYPT_AsnEncodeBool(DWORD dwCertEncodingType,
         *pbEncoded++ = val ? 0xff : 0;
         ret = TRUE;
     }
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -2444,7 +2444,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAltNameEntry(DWORD dwCertEncodingType,
          pcbEncoded);
     }
     case CERT_ALT_NAME_OTHER_NAME:
-        FIXME("name type %d unimplemented\n", entry->dwAltNameChoice);
+        FIXME("name type %ld unimplemented\n", entry->dwAltNameChoice);
         return FALSE;
     default:
         SetLastError(E_INVALIDARG);
@@ -2492,7 +2492,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAltNameEntry(DWORD dwCertEncodingType,
                 *pcbEncoded = bytesNeeded;
         }
     }
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -3226,7 +3226,7 @@ BOOL WINAPI CRYPT_AsnEncodeOctets(DWORD dwCertEncodingType,
         const CRYPT_DATA_BLOB *blob = pvStructInfo;
         DWORD bytesNeeded, lenBytes;
 
-        TRACE("(%d, %p), %08x, %p, %p, %d\n", blob->cbData, blob->pbData,
+        TRACE("(%ld, %p), %08lx, %p, %p, %ld\n", blob->cbData, blob->pbData,
          dwFlags, pEncodePara, pbEncoded, pbEncoded ? *pcbEncoded : 0);
 
         CRYPT_EncodeLen(blob->cbData, NULL, &lenBytes);
@@ -3257,7 +3257,7 @@ BOOL WINAPI CRYPT_AsnEncodeOctets(DWORD dwCertEncodingType,
         ret = FALSE;
     }
     __ENDTRY
-    TRACE("returning %d (%08x)\n", ret, GetLastError());
+    TRACE("returning %d (%08lx)\n", ret, GetLastError());
     return ret;
 }
 
@@ -4707,7 +4707,7 @@ BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType,
     CryptEncodeObjectFunc pCryptEncodeObject = NULL;
     CryptEncodeObjectExFunc pCryptEncodeObjectEx = NULL;
 
-    TRACE_(crypt)("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType,
+    TRACE_(crypt)("(0x%08lx, %s, %p, %p, %p)\n", dwCertEncodingType,
      debugstr_a(lpszStructType), pvStructInfo, pbEncoded,
      pcbEncoded);
 
@@ -4748,7 +4748,7 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
     HCRYPTOIDFUNCADDR hFunc = NULL;
     CryptEncodeObjectExFunc encodeFunc = NULL;
 
-    TRACE_(crypt)("(0x%08x, %s, %p, 0x%08x, %p, %p, %p)\n", dwCertEncodingType,
+    TRACE_(crypt)("(0x%08lx, %s, %p, 0x%08lx, %p, %p, %p)\n", dwCertEncodingType,
      debugstr_a(lpszStructType), pvStructInfo, dwFlags, pEncodePara,
      pvEncoded, pcbEncoded);
 
@@ -4824,7 +4824,7 @@ static BOOL WINAPI CRYPT_ExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE h
     HCRYPTKEY key;
     static CHAR rsa_oid[] = szOID_RSA_RSA;
 
-    TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %d)\n", hCryptProv,
+    TRACE_(crypt)("(%08Ix, %ld, %08lx, %s, %08lx, %p, %p, %ld)\n", hCryptProv,
      dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags,
      pvAuxInfo, pInfo, pInfo ? *pcbInfo : 0);
 
@@ -4973,7 +4973,7 @@ BOOL WINAPI CryptExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptPro
     ExportPublicKeyInfoExFunc exportFunc = NULL;
     HCRYPTOIDFUNCADDR hFunc = NULL;
 
-    TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %d)\n", hCryptProv,
+    TRACE_(crypt)("(%08Ix, %ld, %08lx, %s, %08lx, %p, %p, %ld)\n", hCryptProv,
      dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags,
      pvAuxInfo, pInfo, pInfo ? *pcbInfo : 0);
 
@@ -5022,7 +5022,7 @@ static BOOL WINAPI CRYPT_ImportPublicKeyInfoEx(HCRYPTPROV hCryptProv,
     DWORD pubKeySize;
     LPBYTE pubKey;
 
-    TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv,
+    TRACE_(crypt)("(%08Ix, %08lx, %p, %08x, %08lx, %p, %p)\n", hCryptProv,
      dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey);
 
     if (!set)
@@ -5083,7 +5083,7 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv,
     ImportPublicKeyInfoExFunc importFunc = NULL;
     HCRYPTOIDFUNCADDR hFunc = NULL;
 
-    TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv,
+    TRACE_(crypt)("(%08Ix, %08lx, %p, %08x, %08lx, %p, %p)\n", hCryptProv,
      dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey);
 
     if (!set)
@@ -5103,11 +5103,11 @@ BOOL WINAPI CryptImportPublicKeyInfoEx2(DWORD dwCertEncodingType,
  PCERT_PUBLIC_KEY_INFO pInfo, DWORD dwFlags, void *pvAuxInfo,
  BCRYPT_KEY_HANDLE *phKey)
 {
-    TRACE_(crypt)("(%d, %p, %08x, %p, %p)\n", dwCertEncodingType, pInfo,
+    TRACE_(crypt)("(%ld, %p, %08lx, %p, %p)\n", dwCertEncodingType, pInfo,
      dwFlags, pvAuxInfo, phKey);
 
     if (dwFlags)
-        FIXME("flags %#x ignored\n", dwFlags);
+        FIXME("flags %#lx ignored\n", dwFlags);
 
     return CNG_ImportPubKey(pInfo, phKey);
 }
diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c
index 5c4d385aa88..3753283fbca 100644
--- a/dlls/crypt32/filestore.c
+++ b/dlls/crypt32/filestore.c
@@ -38,7 +38,7 @@ static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)
 {
     WINE_FILESTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %08x)\n", store, dwFlags);
+    TRACE("(%p, %08lx)\n", store, dwFlags);
     if (store->dirty)
         CertSaveStore(store->memStore, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
          store->type, CERT_STORE_SAVE_TO_FILE, store->file, 0);
@@ -51,7 +51,7 @@ static BOOL WINAPI CRYPT_FileWriteCert(HCERTSTORE hCertStore,
 {
     WINE_FILESTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %d)\n", hCertStore, cert, dwFlags);
+    TRACE("(%p, %p, %ld)\n", hCertStore, cert, dwFlags);
     store->dirty = TRUE;
     return TRUE;
 }
@@ -61,7 +61,7 @@ static BOOL WINAPI CRYPT_FileDeleteCert(HCERTSTORE hCertStore,
 {
     WINE_FILESTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %08x)\n", hCertStore, pCertContext, dwFlags);
+    TRACE("(%p, %p, %08lx)\n", hCertStore, pCertContext, dwFlags);
     store->dirty = TRUE;
     return TRUE;
 }
@@ -71,7 +71,7 @@ static BOOL WINAPI CRYPT_FileWriteCRL(HCERTSTORE hCertStore,
 {
     WINE_FILESTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %d)\n", hCertStore, crl, dwFlags);
+    TRACE("(%p, %p, %ld)\n", hCertStore, crl, dwFlags);
     store->dirty = TRUE;
     return TRUE;
 }
@@ -81,7 +81,7 @@ static BOOL WINAPI CRYPT_FileDeleteCRL(HCERTSTORE hCertStore,
 {
     WINE_FILESTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %08x)\n", hCertStore, pCrlContext, dwFlags);
+    TRACE("(%p, %p, %08lx)\n", hCertStore, pCrlContext, dwFlags);
     store->dirty = TRUE;
     return TRUE;
 }
@@ -91,7 +91,7 @@ static BOOL WINAPI CRYPT_FileWriteCTL(HCERTSTORE hCertStore,
 {
     WINE_FILESTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %d)\n", hCertStore, ctl, dwFlags);
+    TRACE("(%p, %p, %ld)\n", hCertStore, ctl, dwFlags);
     store->dirty = TRUE;
     return TRUE;
 }
@@ -101,7 +101,7 @@ static BOOL WINAPI CRYPT_FileDeleteCTL(HCERTSTORE hCertStore,
 {
     WINE_FILESTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %08x)\n", hCertStore, pCtlContext, dwFlags);
+    TRACE("(%p, %p, %08lx)\n", hCertStore, pCtlContext, dwFlags);
     store->dirty = TRUE;
     return TRUE;
 }
@@ -133,7 +133,7 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags,
     WINE_FILESTOREINFO *store = hCertStore;
     BOOL ret;
 
-    TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType,
+    TRACE("(%p, %08lx, %ld, %p)\n", hCertStore, dwFlags, dwCtrlType,
      pvCtrlPara);
 
     switch (dwCtrlType)
@@ -173,7 +173,7 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags,
         }
         else
         {
-            WARN("unknown type %d\n", store->type);
+            WARN("unknown type %ld\n", store->type);
             ret = FALSE;
         }
         break;
@@ -191,7 +191,7 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags,
             ret = TRUE;
         break;
     default:
-        FIXME("%d: stub\n", dwCtrlType);
+        FIXME("%ld: stub\n", dwCtrlType);
         ret = FALSE;
     }
     return ret;
@@ -244,7 +244,7 @@ WINECRYPT_CERTSTORE *CRYPT_FileOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags,
     WINECRYPT_CERTSTORE *store = NULL;
     HANDLE file = (HANDLE)pvPara;
 
-    TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);
+    TRACE("(%Id, %08lx, %p)\n", hCryptProv, dwFlags, pvPara);
 
     if (!pvPara)
     {
@@ -296,7 +296,7 @@ WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv,
     DWORD access, create;
     HANDLE file;
 
-    TRACE("(%ld, %08x, %s)\n", hCryptProv, dwFlags, debugstr_w(fileName));
+    TRACE("(%Id, %08lx, %s)\n", hCryptProv, dwFlags, debugstr_w(fileName));
 
     if (!fileName)
     {
@@ -383,7 +383,7 @@ WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv,
     int len;
     WINECRYPT_CERTSTORE *ret = NULL;
 
-    TRACE("(%ld, %08x, %s)\n", hCryptProv, dwFlags,
+    TRACE("(%Id, %08lx, %s)\n", hCryptProv, dwFlags,
      debugstr_a(pvPara));
 
     if (!pvPara)
diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c
index 94dabbe6fc7..cce90125bc0 100644
--- a/dlls/crypt32/main.c
+++ b/dlls/crypt32/main.c
@@ -106,31 +106,31 @@ BOOL WINAPI I_CryptCreateLruCache(void *unknown, HLRUCACHE *out)
 
 BOOL WINAPI I_CryptFindLruEntry(DWORD unk0, DWORD unk1)
 {
-    FIXME("(%08x, %08x): stub!\n", unk0, unk1);
+    FIXME("(%08lx, %08lx): stub!\n", unk0, unk1);
     return FALSE;
 }
 
 BOOL WINAPI I_CryptFindLruEntryData(DWORD unk0, DWORD unk1, DWORD unk2)
 {
-    FIXME("(%08x, %08x, %08x): stub!\n", unk0, unk1, unk2);
+    FIXME("(%08lx, %08lx, %08lx): stub!\n", unk0, unk1, unk2);
     return FALSE;
 }
 
 BOOL WINAPI I_CryptCreateLruEntry(HLRUCACHE h, DWORD unk0, DWORD unk1)
 {
-    FIXME("(%p, %08x, %08x): stub!\n", h, unk0, unk1);
+    FIXME("(%p, %08lx, %08lx): stub!\n", h, unk0, unk1);
     return FALSE;
 }
 
 DWORD WINAPI I_CryptFlushLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1)
 {
-    FIXME("(%p, %08x, %08x): stub!\n", h, unk0, unk1);
+    FIXME("(%p, %08lx, %08lx): stub!\n", h, unk0, unk1);
     return 0;
 }
 
 HLRUCACHE WINAPI I_CryptFreeLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1)
 {
-    FIXME("(%p, %08x, %08x): stub!\n", h, unk0, unk1);
+    FIXME("(%p, %08lx, %08lx): stub!\n", h, unk0, unk1);
     return h;
 }
 
@@ -177,7 +177,7 @@ BOOL WINAPI I_CryptFreeTls(DWORD dwTlsIndex, DWORD unknown)
 {
     BOOL ret;
 
-    TRACE("(%d, %d)\n", dwTlsIndex, unknown);
+    TRACE("(%ld, %ld)\n", dwTlsIndex, unknown);
 
     ret = TlsFree(dwTlsIndex);
     if (!ret) SetLastError( E_INVALIDARG );
@@ -186,7 +186,7 @@ BOOL WINAPI I_CryptFreeTls(DWORD dwTlsIndex, DWORD unknown)
 
 BOOL WINAPI I_CryptGetOssGlobal(DWORD x)
 {
-    FIXME("%08x\n", x);
+    FIXME("%08lx\n", x);
     return FALSE;
 }
 
@@ -281,44 +281,44 @@ DWORD WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z)
 {
     static int ret = 8;
     ret++;
-    FIXME("%08x %08x %08x, return value %d\n", x, y, z,ret);
+    FIXME("%08lx %08lx %08lx, return value %d\n", x, y, z,ret);
     return ret;
 }
 
 BOOL WINAPI I_CryptInstallAsn1Module(ASN1module_t x, DWORD y, void* z)
 {
-    FIXME("(%p %08x %p): stub\n", x, y, z);
+    FIXME("(%p %08lx %p): stub\n", x, y, z);
     return TRUE;
 }
 
 BOOL WINAPI I_CryptUninstallAsn1Module(HCRYPTASN1MODULE x)
 {
-    FIXME("(%08x): stub\n", x);
+    FIXME("(%08lx): stub\n", x);
     return TRUE;
 }
 
 ASN1decoding_t WINAPI I_CryptGetAsn1Decoder(HCRYPTASN1MODULE x)
 {
-    FIXME("(%08x): stub\n", x);
+    FIXME("(%08lx): stub\n", x);
     return NULL;
 }
 
 ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE x)
 {
-    FIXME("(%08x): stub\n", x);
+    FIXME("(%08lx): stub\n", x);
     return NULL;
 }
 
 BOOL WINAPI CryptProtectMemory(void *data, DWORD len, DWORD flags)
 {
     static int fixme_once;
-    if (!fixme_once++) FIXME("(%p %u %08x): stub\n", data, len, flags);
+    if (!fixme_once++) FIXME("(%p %lu %08lx): stub\n", data, len, flags);
     return TRUE;
 }
 
 BOOL WINAPI CryptUnprotectMemory(void *data, DWORD len, DWORD flags)
 {
     static int fixme_once;
-    if (!fixme_once++) FIXME("(%p %u %08x): stub\n", data, len, flags);
+    if (!fixme_once++) FIXME("(%p %lu %08lx): stub\n", data, len, flags);
     return TRUE;
 }
diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c
index 5b77c87bc48..9e7705bddb8 100644
--- a/dlls/crypt32/message.c
+++ b/dlls/crypt32/message.c
@@ -31,7 +31,7 @@ HCERTSTORE WINAPI CryptGetMessageCertificates(DWORD dwMsgAndCertEncodingType,
 {
     CRYPT_DATA_BLOB blob = { cbSignedBlob, (LPBYTE)pbSignedBlob };
 
-    TRACE("(%08x, %ld, %d08x %p, %d)\n", dwMsgAndCertEncodingType, hCryptProv,
+    TRACE("(%08lx, %Id, %ld08x %p, %ld)\n", dwMsgAndCertEncodingType, hCryptProv,
      dwFlags, pbSignedBlob, cbSignedBlob);
 
     return CertOpenStore(CERT_STORE_PROV_PKCS7, dwMsgAndCertEncodingType,
@@ -44,7 +44,7 @@ LONG WINAPI CryptGetMessageSignerCount(DWORD dwMsgEncodingType,
     HCRYPTMSG msg;
     LONG count = -1;
 
-    TRACE("(%08x, %p, %d)\n", dwMsgEncodingType, pbSignedBlob, cbSignedBlob);
+    TRACE("(%08lx, %p, %ld)\n", dwMsgEncodingType, pbSignedBlob, cbSignedBlob);
 
     msg = CryptMsgOpenToDecode(dwMsgEncodingType, 0, 0, 0, NULL, NULL);
     if (msg)
@@ -114,7 +114,7 @@ BOOL WINAPI CryptVerifyDetachedMessageSignature(
     BOOL ret = FALSE;
     HCRYPTMSG msg;
 
-    TRACE("(%p, %d, %p, %d, %d, %p, %p, %p)\n", pVerifyPara, dwSignerIndex,
+    TRACE("(%p, %ld, %p, %ld, %ld, %p, %p, %p)\n", pVerifyPara, dwSignerIndex,
      pbDetachedSignBlob, cbDetachedSignBlob, cToBeSigned, rgpbToBeSigned,
      rgcbToBeSigned, ppSignerCert);
 
@@ -188,7 +188,7 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara,
     BOOL ret = FALSE;
     HCRYPTMSG msg;
 
-    TRACE("(%p, %d, %p, %d, %p, %p, %p)\n",
+    TRACE("(%p, %ld, %p, %ld, %p, %p, %p)\n",
      pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob,
      pbDecoded, pcbDecoded, ppSignerCert);
 
@@ -262,7 +262,7 @@ BOOL WINAPI CryptHashMessage(PCRYPT_HASH_MESSAGE_PARA pHashPara,
     HCRYPTMSG msg;
     CMSG_HASHED_ENCODE_INFO info;
 
-    TRACE("(%p, %d, %d, %p, %p, %p, %p, %p, %p)\n", pHashPara, fDetachedHash,
+    TRACE("(%p, %d, %ld, %p, %p, %p, %p, %p, %p)\n", pHashPara, fDetachedHash,
      cToBeHashed, rgpbToBeHashed, rgcbToBeHashed, pbHashedBlob, pcbHashedBlob,
      pbComputedHash, pcbComputedHash);
 
@@ -314,7 +314,7 @@ BOOL WINAPI CryptVerifyDetachedMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara,
     HCRYPTMSG msg;
     BOOL ret = FALSE;
 
-    TRACE("(%p, %p, %d, %d, %p, %p, %p, %p)\n", pHashPara, pbDetachedHashBlob,
+    TRACE("(%p, %p, %ld, %ld, %p, %p, %p, %p)\n", pHashPara, pbDetachedHashBlob,
      cbDetachedHashBlob, cToBeHashed, rgpbToBeHashed, rgcbToBeHashed,
      pbComputedHash, pcbComputedHash);
 
@@ -368,7 +368,7 @@ BOOL WINAPI CryptVerifyMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara,
     HCRYPTMSG msg;
     BOOL ret = FALSE;
 
-    TRACE("(%p, %p, %d, %p, %p, %p, %p)\n", pHashPara, pbHashedBlob,
+    TRACE("(%p, %p, %ld, %p, %p, %p, %p)\n", pHashPara, pbHashedBlob,
      cbHashedBlob, pbToBeHashed, pcbToBeHashed, pbComputedHash,
      pcbComputedHash);
 
@@ -416,7 +416,7 @@ BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara,
     CMSG_SIGNER_ENCODE_INFO signer;
     HCRYPTMSG msg = 0;
 
-    TRACE("(%p, %d, %d, %p, %p, %p, %p)\n", pSignPara, fDetachedSignature,
+    TRACE("(%p, %d, %ld, %p, %p, %p, %p)\n", pSignPara, fDetachedSignature,
      cToBeSigned, rgpbToBeSigned, rgcbToBeSigned, pbSignedBlob, pcbSignedBlob);
 
     if (pSignPara->cbSize != sizeof(CRYPT_SIGN_MESSAGE_PARA) ||
@@ -529,7 +529,7 @@ BOOL WINAPI CryptEncryptMessage(PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara,
     CMSG_ENVELOPED_ENCODE_INFO envelopedInfo;
     HCRYPTMSG msg = 0;
 
-    TRACE("(%p, %d, %p, %p, %d, %p, %p)\n", pEncryptPara, cRecipientCert,
+    TRACE("(%p, %ld, %p, %p, %ld, %p, %p)\n", pEncryptPara, cRecipientCert,
      rgpRecipientCert, pbToBeEncrypted, cbToBeEncrypted, pbEncryptedBlob,
      pcbEncryptedBlob);
 
diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c
index fac9561bbbd..6087f423f8c 100644
--- a/dlls/crypt32/msg.c
+++ b/dlls/crypt32/msg.c
@@ -46,7 +46,7 @@ typedef BOOL (*CryptMsgControlFunc)(HCRYPTMSG hCryptMsg, DWORD dwFlags,
 static BOOL CRYPT_DefaultMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags,
  DWORD dwCtrlType, const void *pvCtrlPara)
 {
-    TRACE("(%p, %08x, %d, %p)\n", hCryptMsg, dwFlags, dwCtrlType, pvCtrlPara);
+    TRACE("(%p, %08lx, %ld, %p)\n", hCryptMsg, dwFlags, dwCtrlType, pvCtrlPara);
     SetLastError(E_INVALIDARG);
     return FALSE;
 }
@@ -439,7 +439,7 @@ static BOOL CHashEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType,
     CHashEncodeMsg *msg = hCryptMsg;
     BOOL ret = FALSE;
 
-    TRACE("(%p, %d, %d, %p, %p)\n", hCryptMsg, dwParamType, dwIndex,
+    TRACE("(%p, %ld, %ld, %p, %p)\n", hCryptMsg, dwParamType, dwIndex,
      pvData, pcbData);
 
     switch (dwParamType)
@@ -506,7 +506,7 @@ static BOOL CHashEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData,
     CHashEncodeMsg *msg = hCryptMsg;
     BOOL ret = FALSE;
 
-    TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal);
+    TRACE("(%p, %p, %ld, %d)\n", hCryptMsg, pbData, cbData, fFinal);
 
     if (msg->base.state == MsgStateFinalized)
         SetLastError(CRYPT_E_MSG_ERROR);
@@ -2034,7 +2034,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags,
 {
     HCRYPTMSG msg = NULL;
 
-    TRACE("(%08x, %08x, %08x, %p, %s, %p)\n", dwMsgEncodingType, dwFlags,
+    TRACE("(%08lx, %08lx, %08lx, %p, %s, %p)\n", dwMsgEncodingType, dwFlags,
      dwMsgType, pvMsgEncodeInfo, debugstr_a(pszInnerContentObjID), pStreamInfo);
 
     if (GET_CMSG_ENCODING_TYPE(dwMsgEncodingType) != PKCS_7_ASN_ENCODING)
@@ -2471,13 +2471,13 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData,
     CDecodeMsg *msg = hCryptMsg;
     BOOL ret = FALSE;
 
-    TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal);
+    TRACE("(%p, %p, %ld, %d)\n", hCryptMsg, pbData, cbData, fFinal);
 
     if (msg->base.state == MsgStateFinalized)
         SetLastError(CRYPT_E_MSG_ERROR);
     else if (msg->base.streamed)
     {
-        FIXME("(%p, %p, %d, %d): streamed update stub\n", hCryptMsg, pbData,
+        FIXME("(%p, %p, %ld, %d): streamed update stub\n", hCryptMsg, pbData,
          cbData, fFinal);
         switch (msg->base.state)
         {
@@ -2728,7 +2728,7 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData,
     DWORD size = sizeof(CMSG_SIGNER_INFO), rdnSize = 0;
     BOOL ret;
 
-    TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in);
+    TRACE("(%p, %ld, %p)\n", pvData, pvData ? *pcbData : 0, in);
 
     if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER)
     {
@@ -2800,7 +2800,7 @@ static BOOL CRYPT_CopyCMSSignerInfo(void *pvData, DWORD *pcbData,
     DWORD size = sizeof(CMSG_CMS_SIGNER_INFO);
     BOOL ret;
 
-    TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in);
+    TRACE("(%p, %ld, %p)\n", pvData, pvData ? *pcbData : 0, in);
 
     if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER)
     {
@@ -2867,7 +2867,7 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData,
     DWORD size = sizeof(CERT_INFO), rdnSize = 0;
     BOOL ret;
 
-    TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in);
+    TRACE("(%p, %ld, %p)\n", pvData, pvData ? *pcbData : 0, in);
 
     if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER)
     {
@@ -2918,7 +2918,7 @@ static BOOL CRYPT_CopyRecipientInfo(void *pvData, DWORD *pcbData,
     DWORD size = sizeof(CERT_INFO);
     BOOL ret;
 
-    TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in);
+    TRACE("(%p, %ld, %p)\n", pvData, pvData ? *pcbData : 0, in);
 
     size += in->SerialNumber.cbData;
     size += in->Issuer.cbData;
@@ -2989,7 +2989,7 @@ static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType,
             SetLastError(CRYPT_E_INVALID_MSG_TYPE);
         break;
     default:
-        FIXME("unimplemented for %d\n", dwParamType);
+        FIXME("unimplemented for %ld\n", dwParamType);
         SetLastError(CRYPT_E_INVALID_MSG_TYPE);
     }
     return ret;
@@ -3000,7 +3000,7 @@ static BOOL CRYPT_CopyAttr(void *pvData, DWORD *pcbData, const CRYPT_ATTRIBUTES
     DWORD size;
     BOOL ret;
 
-    TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, attr);
+    TRACE("(%p, %ld, %p)\n", pvData, pvData ? *pcbData : 0, attr);
 
     size = CRYPT_SizeOfAttributes(attr);
     if (!pvData)
@@ -3225,7 +3225,7 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType,
             SetLastError(CRYPT_E_INVALID_MSG_TYPE);
         break;
     default:
-        FIXME("unimplemented for %d\n", dwParamType);
+        FIXME("unimplemented for %ld\n", dwParamType);
         SetLastError(CRYPT_E_INVALID_MSG_TYPE);
     }
     return ret;
@@ -3384,7 +3384,7 @@ static BOOL CDecodeSignedMsg_VerifySignature(CDecodeMsg *msg, PCERT_INFO info)
         }
         else
         {
-            FIXME("signer %d: unimplemented for key id\n", i);
+            FIXME("signer %ld: unimplemented for key id\n", i);
         }
     }
     if (ret)
@@ -3424,7 +3424,7 @@ static BOOL CDecodeSignedMsg_VerifySignatureEx(CDecodeMsg *msg,
             break;
         }
         default:
-            FIXME("unimplemented for signer type %d\n", para->dwSignerType);
+            FIXME("unimplemented for signer type %ld\n", para->dwSignerType);
             SetLastError(CRYPT_E_SIGNER_NOT_FOUND);
         }
     }
@@ -3608,7 +3608,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags,
 {
     CDecodeMsg *msg;
 
-    TRACE("(%08x, %08x, %08x, %08lx, %p, %p)\n", dwMsgEncodingType,
+    TRACE("(%08lx, %08lx, %08lx, %08Ix, %p, %p)\n", dwMsgEncodingType,
      dwFlags, dwMsgType, hCryptProv, pRecipientInfo, pStreamInfo);
 
     if (GET_CMSG_ENCODING_TYPE(dwMsgEncodingType) != PKCS_7_ASN_ENCODING)
@@ -3671,7 +3671,7 @@ BOOL WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData,
 {
     CryptMsgBase *msg = hCryptMsg;
 
-    TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal);
+    TRACE("(%p, %p, %ld, %d)\n", hCryptMsg, pbData, cbData, fFinal);
 
     return msg->update(hCryptMsg, pbData, cbData, fFinal);
 }
@@ -3681,7 +3681,7 @@ BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType,
 {
     CryptMsgBase *msg = hCryptMsg;
 
-    TRACE("(%p, %d, %d, %p, %p)\n", hCryptMsg, dwParamType, dwIndex,
+    TRACE("(%p, %ld, %ld, %p, %p)\n", hCryptMsg, dwParamType, dwIndex,
      pvData, pcbData);
     return msg->get_param(hCryptMsg, dwParamType, dwIndex, pvData, pcbData);
 }
@@ -3691,7 +3691,7 @@ BOOL WINAPI CryptMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags,
 {
     CryptMsgBase *msg = hCryptMsg;
 
-    TRACE("(%p, %08x, %d, %p)\n", hCryptMsg, dwFlags, dwCtrlType,
+    TRACE("(%p, %08lx, %ld, %p)\n", hCryptMsg, dwFlags, dwCtrlType,
      pvCtrlPara);
     return msg->control(hCryptMsg, dwFlags, dwCtrlType, pvCtrlPara);
 }
@@ -3728,7 +3728,7 @@ BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore,
     PCCERT_CONTEXT signerCert = NULL;
     BOOL ret = FALSE;
 
-    TRACE("(%p, %d, %p, %08x, %p, %p)\n", hCryptMsg, cSignerStore,
+    TRACE("(%p, %ld, %p, %08lx, %p, %p)\n", hCryptMsg, cSignerStore,
      rghSignerStore, dwFlags, ppSigner, pdwSignerIndex);
 
     /* Clear output parameters */
@@ -3817,7 +3817,7 @@ BOOL WINAPI CryptMsgVerifyCountersignatureEncoded(HCRYPTPROV_LEGACY hCryptProv,
  PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature,
  CERT_INFO *pciCountersigner)
 {
-    FIXME("(%08lx, %08x, %p, %d, %p, %d, %p): stub\n", hCryptProv,
+    FIXME("(%08Ix, %08lx, %p, %ld, %p, %ld, %p): stub\n", hCryptProv,
      dwEncodingType, pbSignerInfo, cbSignerInfo, pbSignerInfoCountersignature,
      cbSignerInfoCountersignature, pciCountersigner);
     return FALSE;
@@ -3828,7 +3828,7 @@ BOOL WINAPI CryptMsgVerifyCountersignatureEncodedEx(HCRYPTPROV_LEGACY hCryptProv
  PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature,
  DWORD dwSignerType, void *pvSigner, DWORD dwFlags, void *pvReserved)
 {
-    FIXME("(%08lx, %08x, %p, %d, %p, %d, %d, %p, %08x, %p): stub\n", hCryptProv,
+    FIXME("(%08Ix, %08lx, %p, %ld, %p, %ld, %ld, %p, %08lx, %p): stub\n", hCryptProv,
      dwEncodingType, pbSignerInfo, cbSignerInfo, pbSignerInfoCountersignature,
      cbSignerInfoCountersignature, dwSignerType, pvSigner, dwFlags, pvReserved);
     return FALSE;
@@ -3842,12 +3842,12 @@ BOOL WINAPI CryptMsgEncodeAndSignCTL(DWORD dwMsgEncodingType,
     BYTE *pbCtlContent;
     DWORD cbCtlContent;
 
-    TRACE("(%08x, %p, %p, %08x, %p, %p)\n", dwMsgEncodingType, pCtlInfo,
+    TRACE("(%08lx, %p, %p, %08lx, %p, %p)\n", dwMsgEncodingType, pCtlInfo,
      pSignInfo, dwFlags, pbEncoded, pcbEncoded);
 
     if (dwFlags)
     {
-        FIXME("unimplemented for flags %08x\n", dwFlags);
+        FIXME("unimplemented for flags %08lx\n", dwFlags);
         return FALSE;
     }
     if ((ret = CryptEncodeObjectEx(dwMsgEncodingType, PKCS_CTL, pCtlInfo,
@@ -3868,12 +3868,12 @@ BOOL WINAPI CryptMsgSignCTL(DWORD dwMsgEncodingType, BYTE *pbCtlContent,
     BOOL ret;
     HCRYPTMSG msg;
 
-    TRACE("(%08x, %p, %d, %p, %08x, %p, %p)\n", dwMsgEncodingType,
+    TRACE("(%08lx, %p, %ld, %p, %08lx, %p, %p)\n", dwMsgEncodingType,
      pbCtlContent, cbCtlContent, pSignInfo, dwFlags, pbEncoded, pcbEncoded);
 
     if (dwFlags)
     {
-        FIXME("unimplemented for flags %08x\n", dwFlags);
+        FIXME("unimplemented for flags %08lx\n", dwFlags);
         return FALSE;
     }
     msg = CryptMsgOpenToEncode(dwMsgEncodingType, 0, CMSG_SIGNED, pSignInfo,
diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c
index 83cdd535a3c..6fbd3d25496 100644
--- a/dlls/crypt32/object.c
+++ b/dlls/crypt32/object.c
@@ -328,7 +328,7 @@ static BOOL CRYPT_QuerySerializedStoreFromBlob(const CRYPT_DATA_BLOB *blob,
      CERT_STORE_CREATE_NEW_FLAG, NULL);
     BOOL ret;
 
-    TRACE("(%d, %p)\n", blob->cbData, blob->pbData);
+    TRACE("(%ld, %p)\n", blob->cbData, blob->pbData);
 
     ret = CRYPT_ReadSerializedStoreFromBlob(blob, store);
     if (ret)
@@ -358,7 +358,7 @@ static BOOL CRYPT_QuerySerializedStoreObject(DWORD dwObjectType,
         return CRYPT_QuerySerializedStoreFromBlob(pvObject,
          pdwMsgAndCertEncodingType, pdwContentType, phCertStore, phMsg);
     default:
-        FIXME("unimplemented for type %d\n", dwObjectType);
+        FIXME("unimplemented for type %ld\n", dwObjectType);
         SetLastError(E_INVALIDARG); /* FIXME: is this the correct error? */
         return FALSE;
     }
@@ -481,7 +481,7 @@ static BOOL CRYPT_QueryMessageObject(DWORD dwObjectType, const void *pvObject,
     DWORD encodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING;
     DWORD formatType = 0;
 
-    TRACE("(%d, %p, %08x, %08x, %p, %p, %p, %p, %p)\n", dwObjectType, pvObject,
+    TRACE("(%ld, %p, %08lx, %08lx, %p, %p, %p, %p, %p)\n", dwObjectType, pvObject,
      dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags,
      pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, phCertStore,
      phMsg);
@@ -631,7 +631,7 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType,
 
     if (dwObjectType != CERT_QUERY_OBJECT_FILE)
     {
-        WARN("don't know what to do for type %d embedded signed messages\n",
+        WARN("don't know what to do for type %ld embedded signed messages\n",
          dwObjectType);
         SetLastError(E_INVALIDARG);
         return FALSE;
@@ -703,7 +703,7 @@ static BOOL CRYPT_QueryPFXObject(DWORD dwObjectType, const void *pvObject,
     CRYPT_DATA_BLOB blob = {0}, *ptr;
     BOOL ret;
 
-    TRACE("(%d, %p, %08x, %08x, %p, %p, %p, %p, %p)\n", dwObjectType, pvObject,
+    TRACE("(%ld, %p, %08lx, %08lx, %p, %p, %p, %p, %p)\n", dwObjectType, pvObject,
      dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags,
      pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, phCertStore,
      phMsg);
@@ -747,7 +747,7 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject,
      CERT_QUERY_CONTENT_FLAG_PKCS10 | CERT_QUERY_CONTENT_FLAG_CERT_PAIR;
     BOOL ret = TRUE;
 
-    TRACE("(%08x, %p, %08x, %08x, %08x, %p, %p, %p, %p, %p, %p)\n",
+    TRACE("(%08lx, %p, %08lx, %08lx, %08lx, %p, %p, %p, %p, %p, %p)\n",
      dwObjectType, pvObject, dwExpectedContentTypeFlags,
      dwExpectedFormatTypeFlags, dwFlags, pdwMsgAndCertEncodingType,
      pdwContentType, pdwFormatType, phCertStore, phMsg, ppvContext);
@@ -755,7 +755,7 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject,
     if (dwObjectType != CERT_QUERY_OBJECT_BLOB &&
      dwObjectType != CERT_QUERY_OBJECT_FILE)
     {
-        WARN("unsupported type %d\n", dwObjectType);
+        WARN("unsupported type %ld\n", dwObjectType);
         SetLastError(E_INVALIDARG);
         return FALSE;
     }
@@ -766,7 +766,7 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject,
         return FALSE;
     }
     if (dwExpectedContentTypeFlags & unimplementedTypes)
-        WARN("unimplemented for types %08x\n",
+        WARN("unimplemented for types %08lx\n",
          dwExpectedContentTypeFlags & unimplementedTypes);
 
     if (pdwFormatType)
@@ -1290,14 +1290,14 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel,
         }
         else
         {
-            FIXME("unknown IP address format (%d bytes)\n",
+            FIXME("unknown IP address format (%ld bytes)\n",
              entry->u.IPAddress.cbData);
             ret = FALSE;
         }
         break;
     }
     default:
-        FIXME("unimplemented for %d\n", entry->dwAltNameChoice);
+        FIXME("unimplemented for %ld\n", entry->dwAltNameChoice);
         ret = FALSE;
     }
     if (ret)
@@ -2590,7 +2590,7 @@ BOOL WINAPI CryptFormatObject(DWORD dwCertEncodingType, DWORD dwFormatType,
     HCRYPTOIDFUNCADDR hFunc = NULL;
     BOOL ret = FALSE;
 
-    TRACE("(%08x, %d, %08x, %p, %s, %p, %d, %p, %p)\n", dwCertEncodingType,
+    TRACE("(%08lx, %ld, %08lx, %p, %s, %p, %ld, %p, %p)\n", dwCertEncodingType,
      dwFormatType, dwFormatStrType, pFormatStruct, debugstr_a(lpszStructType),
      pbEncoded, cbEncoded, pbFormat, pcbFormat);
 
diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c
index 95e34528a04..a4dcc3997f0 100644
--- a/dlls/crypt32/oid.c
+++ b/dlls/crypt32/oid.c
@@ -105,7 +105,7 @@ HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR pszFuncName,
 {
     struct OIDFunctionSet *cursor, *ret = NULL;
 
-    TRACE("(%s, %x)\n", debugstr_a(pszFuncName), dwFlags);
+    TRACE("(%s, %lx)\n", debugstr_a(pszFuncName), dwFlags);
 
     EnterCriticalSection(&funcSetCS);
     LIST_FOR_EACH_ENTRY(cursor, &funcSets, struct OIDFunctionSet, next)
@@ -147,7 +147,7 @@ static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName,
  LPCSTR pszOID)
 {
     static const char szEncodingTypeFmt[] =
-     "Software\\Microsoft\\Cryptography\\OID\\EncodingType %d\\%s\\%s";
+     "Software\\Microsoft\\Cryptography\\OID\\EncodingType %ld\\%s\\%s";
     UINT len;
     char numericOID[7]; /* enough for "#65535" */
     const char *oid;
@@ -187,7 +187,7 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet,
     HKEY key;
     LSTATUS rc;
 
-    TRACE("(%p, %d, %p, %p)\n", hFuncSet, dwEncodingType, pwszDllList,
+    TRACE("(%p, %ld, %p, %p)\n", hFuncSet, dwEncodingType, pwszDllList,
      pcchDllList);
 
     keyName = CRYPT_GetKeyName(dwEncodingType, set->name, "DEFAULT");
@@ -229,7 +229,7 @@ BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule,
     BOOL ret = TRUE;
     struct OIDFunctionSet *set;
 
-    TRACE("(%p, %d, %s, %d, %p, %08x)\n", hModule, dwEncodingType,
+    TRACE("(%p, %ld, %s, %ld, %p, %08lx)\n", hModule, dwEncodingType,
      debugstr_a(pszFuncName), cFuncEntry, rgFuncEntry, dwFlags);
 
     set = CryptInitOIDFunctionSet(pszFuncName, 0);
@@ -379,7 +379,7 @@ BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet,
     BOOL ret = FALSE;
     struct OIDFunctionSet *set = hFuncSet;
 
-    TRACE("(%p, %d, %s, %08x, %p, %p)\n", hFuncSet, dwEncodingType,
+    TRACE("(%p, %ld, %s, %08lx, %p, %p)\n", hFuncSet, dwEncodingType,
      debugstr_a(pszOID), dwFlags, ppvFuncAddr, phFuncAddr);
 
     *ppvFuncAddr = NULL;
@@ -456,7 +456,7 @@ static BOOL is_module_registered(HMODULE hModule)
 BOOL WINAPI CryptFreeOIDFunctionAddress(HCRYPTOIDFUNCADDR hFuncAddr,
  DWORD dwFlags)
 {
-    TRACE("(%p, %08x)\n", hFuncAddr, dwFlags);
+    TRACE("(%p, %08lx)\n", hFuncAddr, dwFlags);
 
     /* FIXME: as MSDN states, need to check for DllCanUnloadNow in the DLL,
      * and only unload it if it can be unloaded.  Also need to implement ref
@@ -503,7 +503,7 @@ BOOL WINAPI CryptGetDefaultOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet,
     struct OIDFunctionSet *set = hFuncSet;
     BOOL ret = FALSE;
 
-    TRACE("(%p, %d, %s, %08x, %p, %p)\n", hFuncSet, dwEncodingType,
+    TRACE("(%p, %ld, %s, %08lx, %p, %p)\n", hFuncSet, dwEncodingType,
      debugstr_w(pwszDll), dwFlags, ppvFuncAddr, phFuncAddr);
 
     if (pwszDll)
@@ -639,7 +639,7 @@ BOOL WINAPI CryptRegisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName,
     HKEY hKey;
     LPSTR szKey;
 
-    TRACE("(%x, %s, %s, %s, %s)\n", dwEncodingType, debugstr_a(pszFuncName),
+    TRACE("(%lx, %s, %s, %s, %s)\n", dwEncodingType, debugstr_a(pszFuncName),
           debugstr_a(pszOID), debugstr_w(pwszDll), debugstr_a(pszOverrideFuncName));
 
     /* Native does nothing pwszDll is NULL */
@@ -717,7 +717,7 @@ BOOL WINAPI CryptUnregisterOIDInfo(PCCRYPT_OID_INFO info)
     key_name = CryptMemAlloc(strlen(info->pszOID) + 16);
     if (key_name)
     {
-        sprintf(key_name, "%s!%u", info->pszOID, info->dwGroupId);
+        sprintf(key_name, "%s!%lu", info->pszOID, info->dwGroupId);
         err = RegDeleteKeyA(root, key_name);
     }
     else
@@ -741,7 +741,7 @@ BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO info, DWORD flags)
     HKEY root = 0, key = 0;
     DWORD err;
 
-    TRACE("(%p, %x)\n", info, flags );
+    TRACE("(%p, %lx)\n", info, flags );
 
     if (!info || info->cbSize != sizeof(*info) || !info->pszOID)
     {
@@ -762,7 +762,7 @@ BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO info, DWORD flags)
                           0, NULL, 0, KEY_ALL_ACCESS, NULL, &root, NULL);
     if (err != ERROR_SUCCESS) goto done;
 
-    sprintf(key_name, "%s!%u", info->pszOID, info->dwGroupId);
+    sprintf(key_name, "%s!%lu", info->pszOID, info->dwGroupId);
     err = RegCreateKeyA(root, key_name, &key);
     if (err != ERROR_SUCCESS) goto done;
 
@@ -822,7 +822,7 @@ BOOL WINAPI CryptUnregisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName,
     LPSTR szKey;
     LONG rc;
 
-    TRACE("%x %s %s\n", dwEncodingType, debugstr_a(pszFuncName),
+    TRACE("%lx %s %s\n", dwEncodingType, debugstr_a(pszFuncName),
      debugstr_a(pszOID));
 
     if (!pszFuncName || !pszOID)
@@ -847,7 +847,7 @@ BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
     LONG rc;
     HKEY hKey;
 
-    TRACE("%x %s %s %s %p %p %p\n", dwEncodingType, debugstr_a(pszFuncName),
+    TRACE("%lx %s %s %s %p %p %p\n", dwEncodingType, debugstr_a(pszFuncName),
      debugstr_a(pszOID), debugstr_w(pwszValueName), pdwValueType, pbValueData,
      pcbValueData);
 
@@ -884,7 +884,7 @@ BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
     LONG rc;
     HKEY hKey;
 
-    TRACE("%x %s %s %s %d %p %d\n", dwEncodingType, debugstr_a(pszFuncName),
+    TRACE("%lx %s %s %s %ld %p %ld\n", dwEncodingType, debugstr_a(pszFuncName),
      debugstr_a(pszOID), debugstr_w(pwszValueName), dwValueType, pbValueData,
      cbValueData);
 
@@ -1101,7 +1101,7 @@ BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD dwEncodingType,
     LPWSTR dlls;
     BOOL ret = FALSE;
 
-    TRACE("(%x, %s, %d, %s)\n", dwEncodingType, debugstr_a(pszFuncName),
+    TRACE("(%lx, %s, %ld, %s)\n", dwEncodingType, debugstr_a(pszFuncName),
      dwIndex, debugstr_w(pwszDll));
 
     if (!pwszDll)
@@ -1134,7 +1134,7 @@ BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD dwEncodingType,
     LPWSTR dlls;
     BOOL ret;
 
-    TRACE("(%x, %s, %s)\n", dwEncodingType, debugstr_a(pszFuncName),
+    TRACE("(%lx, %s, %s)\n", dwEncodingType, debugstr_a(pszFuncName),
      debugstr_w(pwszDll));
 
     if (!pwszDll)
@@ -1584,7 +1584,7 @@ static void init_registered_oid_info(void)
         {
             if ((info = read_oid_info(root, key_name, &flags)))
             {
-                TRACE("adding oid %s, name %s, groupid %u, algid %u, extra %u, CNG algid %s, CNG extra %s\n",
+                TRACE("adding oid %s, name %s, groupid %lu, algid %u, extra %lu, CNG algid %s, CNG extra %s\n",
                       debugstr_a(info->info.pszOID), debugstr_w(info->info.pwszName),
                       info->info.dwGroupId, info->info.u.Algid, info->info.ExtraInfo.cbData,
                       debugstr_w(info->info.pwszCNGAlgid), debugstr_w(info->info.pwszCNGExtraAlgid));
@@ -1692,7 +1692,7 @@ BOOL WINAPI CryptEnumOIDInfo(DWORD dwGroupId, DWORD dwFlags, void *pvArg,
     BOOL ret = TRUE;
     struct OIDInfo *info;
 
-    TRACE("(%d, %08x, %p, %p)\n", dwGroupId, dwFlags, pvArg,
+    TRACE("(%ld, %08lx, %p, %p)\n", dwGroupId, dwFlags, pvArg,
      pfnEnumOIDInfo);
 
     EnterCriticalSection(&oidInfoCS);
@@ -1714,7 +1714,7 @@ PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo(DWORD dwKeyType, void *pvKey,
 {
     PCCRYPT_OID_INFO ret = NULL;
 
-    TRACE("(%d, %p, %d)\n", dwKeyType, pvKey, dwGroupId);
+    TRACE("(%ld, %p, %ld)\n", dwKeyType, pvKey, dwGroupId);
 
     switch(dwKeyType)
     {
@@ -1722,7 +1722,7 @@ PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo(DWORD dwKeyType, void *pvKey,
     {
         struct OIDInfo *info;
 
-        TRACE("CRYPT_OID_INFO_ALGID_KEY: %d\n", *(DWORD *)pvKey);
+        TRACE("CRYPT_OID_INFO_ALGID_KEY: %ld\n", *(DWORD *)pvKey);
         EnterCriticalSection(&oidInfoCS);
         LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
         {
@@ -1777,7 +1777,7 @@ PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo(DWORD dwKeyType, void *pvKey,
     {
         struct OIDInfo *info;
 
-        TRACE("CRYPT_OID_INFO_SIGN_KEY: %d\n", *(DWORD *)pvKey);
+        TRACE("CRYPT_OID_INFO_SIGN_KEY: %ld\n", *(DWORD *)pvKey);
         EnterCriticalSection(&oidInfoCS);
         LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
         {
diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c
index ca29c2aadfc..fbcc7c72c89 100644
--- a/dlls/crypt32/pfx.c
+++ b/dlls/crypt32/pfx.c
@@ -50,7 +50,7 @@ static HCRYPTPROV import_key( cert_store_data_t data, DWORD flags )
         acquire_flags &= ~CRYPT_NEWKEYSET;
         if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, acquire_flags ))
         {
-            WARN( "CryptAcquireContextW failed %08x\n", GetLastError() );
+            WARN( "CryptAcquireContextW failed %08lx\n", GetLastError() );
             return 0;
         }
     }
@@ -59,7 +59,7 @@ static HCRYPTPROV import_key( cert_store_data_t data, DWORD flags )
     if (CRYPT32_CALL( import_store_key, ¶ms ) ||
         !CryptImportKey( prov, key, size, 0, flags & CRYPT_EXPORTABLE, &cryptkey ))
     {
-        WARN( "CryptImportKey failed %08x\n", GetLastError() );
+        WARN( "CryptImportKey failed %08lx\n", GetLastError() );
         CryptReleaseContext( prov, 0 );
         free( key );
         return 0;
@@ -156,7 +156,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor
     }
     if (flags & ~(CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|CRYPT_MACHINE_KEYSET|PKCS12_NO_PERSIST_KEY))
     {
-        FIXME( "flags %08x not supported\n", flags );
+        FIXME( "flags %08lx not supported\n", flags );
         return NULL;
     }
     if (CRYPT32_CALL( open_cert_store, &open_params )) return NULL;
@@ -166,7 +166,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor
 
     if (!(store = CertOpenStore( CERT_STORE_PROV_MEMORY, 0, 0, 0, NULL )))
     {
-        WARN( "CertOpenStore failed %08x\n", GetLastError() );
+        WARN( "CertOpenStore failed %08lx\n", GetLastError() );
         goto error;
     }
 
@@ -183,27 +183,27 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor
         free( cert );
         if (!ctx)
         {
-            WARN( "CertCreateContext failed %08x\n", GetLastError() );
+            WARN( "CertCreateContext failed %08lx\n", GetLastError() );
             goto error;
         }
         if (flags & PKCS12_NO_PERSIST_KEY)
         {
             if (!set_key_context( ctx, prov ))
             {
-                WARN( "failed to set context property %08x\n", GetLastError() );
+                WARN( "failed to set context property %08lx\n", GetLastError() );
                 CertFreeCertificateContext( ctx );
                 goto error;
             }
         }
         else if (!set_key_prov_info( ctx, prov ))
         {
-            WARN( "failed to set provider info property %08x\n", GetLastError() );
+            WARN( "failed to set provider info property %08lx\n", GetLastError() );
             CertFreeCertificateContext( ctx );
             goto error;
         }
         if (!CertAddCertificateContextToStore( store, ctx, CERT_STORE_ADD_ALWAYS, NULL ))
         {
-            WARN( "CertAddCertificateContextToStore failed %08x\n", GetLastError() );
+            WARN( "CertAddCertificateContextToStore failed %08lx\n", GetLastError() );
             CertFreeCertificateContext( ctx );
             goto error;
         }
@@ -224,7 +224,7 @@ error:
 
 BOOL WINAPI PFXVerifyPassword( CRYPT_DATA_BLOB *pfx, const WCHAR *password, DWORD flags )
 {
-    FIXME( "(%p, %p, %08x): stub\n", pfx, password, flags );
+    FIXME( "(%p, %p, %08lx): stub\n", pfx, password, flags );
     return FALSE;
 }
 
@@ -236,6 +236,6 @@ BOOL WINAPI PFXExportCertStore( HCERTSTORE store, CRYPT_DATA_BLOB *pfx, const WC
 BOOL WINAPI PFXExportCertStoreEx( HCERTSTORE store, CRYPT_DATA_BLOB *pfx, const WCHAR *password, void *reserved,
                                   DWORD flags )
 {
-    FIXME( "(%p, %p, %p, %p, %08x): stub\n", store, pfx, password, reserved, flags );
+    FIXME( "(%p, %p, %p, %p, %08lx): stub\n", store, pfx, password, reserved, flags );
     return FALSE;
 }
diff --git a/dlls/crypt32/proplist.c b/dlls/crypt32/proplist.c
index f5ae2213525..9d3317307f8 100644
--- a/dlls/crypt32/proplist.c
+++ b/dlls/crypt32/proplist.c
@@ -75,7 +75,7 @@ BOOL ContextPropertyList_FindProperty(CONTEXT_PROPERTY_LIST *list, DWORD id,
     CONTEXT_PROPERTY *prop;
     BOOL ret = FALSE;
 
-    TRACE("(%p, %d, %p)\n", list, id, blob);
+    TRACE("(%p, %ld, %p)\n", list, id, blob);
 
     EnterCriticalSection(&list->cs);
     LIST_FOR_EACH_ENTRY(prop, &list->properties, CONTEXT_PROPERTY, entry)
diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c
index b23f1f02117..f7d9f439872 100644
--- a/dlls/crypt32/protectdata.c
+++ b/dlls/crypt32/protectdata.c
@@ -330,7 +330,7 @@ BOOL serialize(const struct protect_data_t *pInfo, DATA_BLOB *pSerial)
 
     if (ptr - pSerial->pbData != dwStruct)
     {
-        ERR("struct size changed!? expected %u\n", dwStruct);
+        ERR("struct size changed!? expected %lu\n", dwStruct);
         LocalFree(pSerial->pbData);
         pSerial->pbData=NULL;
         pSerial->cbData=0;
@@ -475,7 +475,7 @@ BOOL unserialize(const DATA_BLOB *pSerial, struct protect_data_t *pInfo)
     {
         /* this is an impossible-to-reach test, but if the padding
          * issue is ever understood, this may become more useful */
-        ERR("loaded corrupt structure! (used %u expected %u)\n", index, size);
+        ERR("loaded corrupt structure! (used %lu expected %lu)\n", index, size);
         status=FALSE;
     }
 
@@ -772,15 +772,15 @@ report(const DATA_BLOB* pDataIn, const DATA_BLOB* pOptionalEntropy,
     TRACE("pPromptStruct: %p\n", pPromptStruct);
     if (pPromptStruct)
     {
-        TRACE("  cbSize: 0x%x\n", pPromptStruct->cbSize);
-        TRACE("  dwPromptFlags: 0x%x\n", pPromptStruct->dwPromptFlags);
+        TRACE("  cbSize: 0x%lx\n", pPromptStruct->cbSize);
+        TRACE("  dwPromptFlags: 0x%lx\n", pPromptStruct->dwPromptFlags);
         TRACE("  hwndApp: %p\n", pPromptStruct->hwndApp);
         TRACE("  szPrompt: %p %s\n",
               pPromptStruct->szPrompt,
               pPromptStruct->szPrompt ? debugstr_w(pPromptStruct->szPrompt)
               : "");
     }
-    TRACE("dwFlags: 0x%04x\n", dwFlags);
+    TRACE("dwFlags: 0x%04lx\n", dwFlags);
     TRACE_DATA_BLOB(pDataIn);
     if (pOptionalEntropy)
     {
@@ -888,7 +888,7 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn,
         ERR("CryptEncrypt\n");
         goto free_hash;
     }
-    TRACE("required encrypted storage: %u\n", dwLength);
+    TRACE("required encrypted storage: %lu\n", dwLength);
 
     /* copy plain text into cipher area for CryptEncrypt call */
     protect_data.cipher.cbData=dwLength;
@@ -905,7 +905,7 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn,
     if (!CryptEncrypt(hKey, hHash, TRUE, 0, protect_data.cipher.pbData,
                       &dwLength, protect_data.cipher.cbData))
     {
-        ERR("CryptEncrypt %u\n", GetLastError());
+        ERR("CryptEncrypt %lu\n", GetLastError());
         goto free_hash;
     }
     protect_data.cipher.cbData=dwLength;
diff --git a/dlls/crypt32/provstore.c b/dlls/crypt32/provstore.c
index a6f7130be8e..96945e313e8 100644
--- a/dlls/crypt32/provstore.c
+++ b/dlls/crypt32/provstore.c
@@ -46,7 +46,7 @@ typedef struct _WINE_PROVIDERSTORE
 static void ProvStore_addref(WINECRYPT_CERTSTORE *store)
 {
     LONG ref = InterlockedIncrement(&store->ref);
-    TRACE("ref = %d\n", ref);
+    TRACE("ref = %ld\n", ref);
 }
 
 static DWORD ProvStore_release(WINECRYPT_CERTSTORE *cert_store, DWORD flags)
@@ -55,10 +55,10 @@ static DWORD ProvStore_release(WINECRYPT_CERTSTORE *cert_store, DWORD flags)
     LONG ref;
 
     if(flags)
-        FIXME("Unimplemented flags %x\n", flags);
+        FIXME("Unimplemented flags %lx\n", flags);
 
     ref = InterlockedDecrement(&store->hdr.ref);
-    TRACE("(%p) ref=%d\n", store, ref);
+    TRACE("(%p) ref=%ld\n", store, ref);
 
     if(ref)
         return ERROR_SUCCESS;
@@ -275,7 +275,7 @@ static BOOL ProvStore_control(WINECRYPT_CERTSTORE *cert_store, DWORD dwFlags, DW
     WINE_PROVIDERSTORE *store = (WINE_PROVIDERSTORE*)cert_store;
     BOOL ret = TRUE;
 
-    TRACE("(%p, %08x, %d, %p)\n", store, dwFlags, dwCtrlType,
+    TRACE("(%p, %08lx, %ld, %p)\n", store, dwFlags, dwCtrlType,
      pvCtrlPara);
 
     if (store->provControl)
diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c
index 33fad5335f0..3899c805531 100644
--- a/dlls/crypt32/regstore.c
+++ b/dlls/crypt32/regstore.c
@@ -316,9 +316,9 @@ static void WINAPI CRYPT_RegCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)
 {
     WINE_REGSTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %08x)\n", store, dwFlags);
+    TRACE("(%p, %08lx)\n", store, dwFlags);
     if (dwFlags)
-        FIXME("Unimplemented flags: %08x\n", dwFlags);
+        FIXME("Unimplemented flags: %08lx\n", dwFlags);
 
     CRYPT_RegFlushStore(store, FALSE);
     RegCloseKey(store->key);
@@ -388,7 +388,7 @@ static BOOL WINAPI CRYPT_RegWriteCert(HCERTSTORE hCertStore,
 {
     WINE_REGSTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %d)\n", hCertStore, cert, dwFlags);
+    TRACE("(%p, %p, %ld)\n", hCertStore, cert, dwFlags);
 
     return CRYPT_RegWriteContext(store, cert, dwFlags);
 }
@@ -398,7 +398,7 @@ static BOOL WINAPI CRYPT_RegDeleteCert(HCERTSTORE hCertStore,
 {
     WINE_REGSTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %08x)\n", store, pCertContext, dwFlags);
+    TRACE("(%p, %p, %08lx)\n", store, pCertContext, dwFlags);
 
     return CRYPT_RegDeleteContext(store, &store->certsToDelete, pCertContext,
      pCertInterface);
@@ -409,7 +409,7 @@ static BOOL WINAPI CRYPT_RegWriteCRL(HCERTSTORE hCertStore,
 {
     WINE_REGSTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %d)\n", hCertStore, crl, dwFlags);
+    TRACE("(%p, %p, %ld)\n", hCertStore, crl, dwFlags);
 
     return CRYPT_RegWriteContext(store, crl, dwFlags);
 }
@@ -419,7 +419,7 @@ static BOOL WINAPI CRYPT_RegDeleteCRL(HCERTSTORE hCertStore,
 {
     WINE_REGSTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %08x)\n", store, pCrlContext, dwFlags);
+    TRACE("(%p, %p, %08lx)\n", store, pCrlContext, dwFlags);
 
     return CRYPT_RegDeleteContext(store, &store->crlsToDelete, pCrlContext,
      pCRLInterface);
@@ -430,7 +430,7 @@ static BOOL WINAPI CRYPT_RegWriteCTL(HCERTSTORE hCertStore,
 {
     WINE_REGSTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %d)\n", hCertStore, ctl, dwFlags);
+    TRACE("(%p, %p, %ld)\n", hCertStore, ctl, dwFlags);
 
     return CRYPT_RegWriteContext(store, ctl, dwFlags);
 }
@@ -440,7 +440,7 @@ static BOOL WINAPI CRYPT_RegDeleteCTL(HCERTSTORE hCertStore,
 {
     WINE_REGSTOREINFO *store = hCertStore;
 
-    TRACE("(%p, %p, %08x)\n", store, pCtlContext, dwFlags);
+    TRACE("(%p, %p, %08lx)\n", store, pCtlContext, dwFlags);
 
     return CRYPT_RegDeleteContext(store, &store->ctlsToDelete, pCtlContext,
      pCTLInterface);
@@ -452,7 +452,7 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags,
     WINE_REGSTOREINFO *store = hCertStore;
     BOOL ret = TRUE;
 
-    TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType,
+    TRACE("(%p, %08lx, %ld, %p)\n", hCertStore, dwFlags, dwCtrlType,
      pvCtrlPara);
 
     switch (dwCtrlType)
@@ -479,7 +479,7 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags,
         FIXME("CERT_STORE_CTRL_NOTIFY_CHANGE: stub\n");
         break;
     default:
-        FIXME("%u: stub\n", dwCtrlType);
+        FIXME("%lu: stub\n", dwCtrlType);
         ret = FALSE;
     }
     return ret;
@@ -507,7 +507,7 @@ WINECRYPT_CERTSTORE *CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags,
 {
     WINECRYPT_CERTSTORE *store = NULL;
 
-    TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);
+    TRACE("(%Id, %08lx, %p)\n", hCryptProv, dwFlags, pvPara);
 
     if (dwFlags & CERT_STORE_DELETE_FLAG)
     {
diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c
index 82620428397..43256c71039 100644
--- a/dlls/crypt32/rootstore.c
+++ b/dlls/crypt32/rootstore.c
@@ -166,7 +166,7 @@ static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to)
         } while (cert);
         CertFreeCertificateChainEngine(engine);
     }
-    TRACE("Added %d root certificates\n", root_count);
+    TRACE("Added %ld root certificates\n", root_count);
 }
 
 static const BYTE authenticode[] = {
@@ -605,7 +605,7 @@ static void add_ms_root_certs(HCERTSTORE to)
     for (i = 0; i < ARRAY_SIZE(msRootCerts); i++)
         if (!CertAddEncodedCertificateToStore(to, X509_ASN_ENCODING,
          msRootCerts[i].pb, msRootCerts[i].cb, CERT_STORE_ADD_NEW, NULL))
-            WARN("adding root cert %d failed: %08x\n", i, GetLastError());
+            WARN("adding root cert %ld failed: %08lx\n", i, GetLastError());
 }
 
 /* Reads certificates from the list of known locations into store.  Stops when
@@ -685,7 +685,7 @@ void CRYPT_ImportSystemRootCertsToReg(void)
             if (!rc)
             {
                 if (!CRYPT_SerializeContextsToReg(key, REG_OPTION_VOLATILE, pCertInterface, store))
-                    ERR("Failed to import system certs into registry, %08x\n", GetLastError());
+                    ERR("Failed to import system certs into registry, %08lx\n", GetLastError());
                 RegCloseKey(key);
             }
             CertCloseStore(store, 0);
diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c
index 8fa24370b65..e1e2593169d 100644
--- a/dlls/crypt32/serialize.c
+++ b/dlls/crypt32/serialize.c
@@ -123,7 +123,7 @@ static BOOL CRYPT_SerializeStoreElement(const void *context,
 {
     BOOL ret;
 
-    TRACE("(%p, %p, %08x, %d, %p, %p)\n", context, contextInterface, dwFlags,
+    TRACE("(%p, %p, %08lx, %d, %p, %p)\n", context, contextInterface, dwFlags,
      omitHashes, pbElement, pcbElement);
 
     if (context)
@@ -382,7 +382,7 @@ static DWORD read_serialized_KeyProvInfoProperty(const struct store_CRYPT_KEY_PR
     else
         info->rgProvParam = NULL;
 
-    TRACE("%s,%s,%u,%08x,%u,%p,%u\n", debugstr_w(info->pwszContainerName), debugstr_w(info->pwszProvName),
+    TRACE("%s,%s,%lu,%08lx,%lu,%p,%lu\n", debugstr_w(info->pwszContainerName), debugstr_w(info->pwszProvName),
           info->dwProvType, info->dwFlags, info->cProvParam, info->rgProvParam, info->dwKeySpec);
 
     *ret = info;
@@ -478,7 +478,7 @@ const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, DWORD cbElement,
 {
     const void *context;
 
-    TRACE("(%p, %d, %08x, %p)\n", pbElement, cbElement, dwContextTypeFlags,
+    TRACE("(%p, %ld, %08lx, %p)\n", pbElement, cbElement, dwContextTypeFlags,
      pdwContentType);
 
     if (!cbElement)
@@ -565,7 +565,7 @@ const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, DWORD cbElement,
                     const WINE_CERT_PROP_HEADER *hdr =
                      (const WINE_CERT_PROP_HEADER *)pbElement;
 
-                    TRACE("prop is %d\n", hdr->propID);
+                    TRACE("prop is %ld\n", hdr->propID);
                     cbElement -= sizeof(WINE_CERT_PROP_HEADER);
                     pbElement += sizeof(WINE_CERT_PROP_HEADER);
                     if (!hdr->propID)
@@ -685,7 +685,7 @@ static BOOL CRYPT_ReadSerializedStore(void *handle,
                             {
                                 if (!contextInterface)
                                 {
-                                    WARN("prop id %d before a context id\n",
+                                    WARN("prop id %ld before a context id\n",
                                      propHdr.propID);
                                     ret = FALSE;
                                 }
@@ -879,7 +879,7 @@ static BOOL CRYPT_SavePKCSToMem(HCERTSTORE store,
     DWORD size;
     BOOL ret = TRUE;
 
-    TRACE("(%d, %p)\n", blob->pbData ? blob->cbData : 0, blob->pbData);
+    TRACE("(%ld, %p)\n", blob->pbData ? blob->cbData : 0, blob->pbData);
 
     do {
         cert = CertEnumCertificatesInStore(store, cert);
@@ -1080,7 +1080,7 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType,
     void *handle;
     BOOL ret, closeFile = TRUE;
 
-    TRACE("(%p, %08x, %d, %d, %p, %08x)\n", hCertStore,
+    TRACE("(%p, %08lx, %ld, %ld, %p, %08lx)\n", hCertStore,
           dwMsgAndCertEncodingType, dwSaveAs, dwSaveTo, pvSaveToPara, dwFlags);
 
     switch (dwSaveAs)
@@ -1098,7 +1098,7 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType,
             saveFunc = CRYPT_SavePKCSToFile;
         break;
     default:
-        WARN("unimplemented for %d\n", dwSaveAs);
+        WARN("unimplemented for %ld\n", dwSaveAs);
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
@@ -1120,7 +1120,7 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType,
         handle = pvSaveToPara;
         break;
     default:
-        WARN("unimplemented for %d\n", dwSaveTo);
+        WARN("unimplemented for %ld\n", dwSaveTo);
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
@@ -1139,7 +1139,7 @@ BOOL WINAPI CertAddSerializedElementToStore(HCERTSTORE hCertStore,
     DWORD type;
     BOOL ret;
 
-    TRACE("(%p, %p, %d, %08x, %08x, %08x, %p, %p)\n", hCertStore,
+    TRACE("(%p, %p, %ld, %08lx, %08lx, %08lx, %p, %p)\n", hCertStore,
      pbElement, cbElement, dwAddDisposition, dwFlags, dwContextTypeFlags,
      pdwContentType, ppvContext);
 
diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c
index 82eb87c16bf..132f491b2f1 100644
--- a/dlls/crypt32/sip.c
+++ b/dlls/crypt32/sip.c
@@ -352,7 +352,7 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid
     {
         DWORD fileLen = GetFileSize(hFile, NULL);
 
-        TRACE("fileLen = %d\n", fileLen);
+        TRACE("fileLen = %ld\n", fileLen);
         /* Sanity-check length */
         if (hdr[1] < 0x80 && fileLen == 2 + hdr[1])
         {
@@ -657,7 +657,7 @@ error:
 BOOL WINAPI CryptSIPLoad
        (const GUID *pgSubject, DWORD dwFlags, SIP_DISPATCH_INFO *pSipDispatch)
 {
-    TRACE("(%s %d %p)\n", debugstr_guid(pgSubject), dwFlags, pSipDispatch);
+    TRACE("(%s %ld %p)\n", debugstr_guid(pgSubject), dwFlags, pSipDispatch);
 
     if (!pgSubject || dwFlags != 0 || !pSipDispatch)
     {
@@ -708,7 +708,7 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn
     WINE_SIP_PROVIDER *sip;
     BOOL ret = FALSE;
 
-    TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex,
+    TRACE("(%p %p %ld %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex,
           pcbSignedDataMsg, pbSignedDataMsg);
 
     if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)))
@@ -727,7 +727,7 @@ BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEnc
     WINE_SIP_PROVIDER *sip;
     BOOL ret = FALSE;
 
-    TRACE("(%p %d %p %d %p)\n", pSubjectInfo, pdwEncodingType, pdwIndex,
+    TRACE("(%p %ld %p %ld %p)\n", pSubjectInfo, pdwEncodingType, pdwIndex,
           cbSignedDataMsg, pbSignedDataMsg);
 
     if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)))
@@ -746,7 +746,7 @@ BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo,
     WINE_SIP_PROVIDER *sip;
     BOOL ret = FALSE;
 
-    TRACE("(%p %d)\n", pSubjectInfo, dwIndex);
+    TRACE("(%p %ld)\n", pSubjectInfo, dwIndex);
 
     if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)))
         ret = sip->info.pfRemove(pSubjectInfo, dwIndex);
diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c
index b6321ea3b93..fef3a1fc4f9 100644
--- a/dlls/crypt32/store.c
+++ b/dlls/crypt32/store.c
@@ -111,7 +111,7 @@ BOOL WINAPI I_CertUpdateStore(HCERTSTORE store1, HCERTSTORE store2, DWORD unk0,
      pCRLInterface, pCTLInterface };
     DWORD i;
 
-    TRACE("(%p, %p, %08x, %08x)\n", store1, store2, unk0, unk1);
+    TRACE("(%p, %p, %08lx, %08lx)\n", store1, store2, unk0, unk1);
     if (!warned)
     {
         FIXME("semi-stub\n");
@@ -317,7 +317,7 @@ static BOOL MemStore_deleteCTL(WINECRYPT_CERTSTORE *store, context_t *context)
 static void MemStore_addref(WINECRYPT_CERTSTORE *store)
 {
     LONG ref = InterlockedIncrement(&store->ref);
-    TRACE("ref = %d\n", ref);
+    TRACE("ref = %ld\n", ref);
 }
 
 static DWORD MemStore_release(WINECRYPT_CERTSTORE *cert_store, DWORD flags)
@@ -326,10 +326,10 @@ static DWORD MemStore_release(WINECRYPT_CERTSTORE *cert_store, DWORD flags)
     LONG ref;
 
     if(flags & ~CERT_CLOSE_STORE_CHECK_FLAG)
-        FIXME("Unimplemented flags %x\n", flags);
+        FIXME("Unimplemented flags %lx\n", flags);
 
     ref = InterlockedDecrement(&store->hdr.ref);
-    TRACE("(%p) ref=%d\n", store, ref);
+    TRACE("(%p) ref=%ld\n", store, ref);
     if(ref)
         return (flags & CERT_CLOSE_STORE_CHECK_FLAG) ? CRYPT_E_PENDING_CLOSE : ERROR_SUCCESS;
 
@@ -374,7 +374,7 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv,
 {
     WINE_MEMSTORE *store;
 
-    TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);
+    TRACE("(%Id, %08lx, %p)\n", hCryptProv, dwFlags, pvPara);
 
     if (dwFlags & CERT_STORE_DELETE_FLAG)
     {
@@ -410,7 +410,7 @@ static WINECRYPT_CERTSTORE *CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv,
     HKEY root;
     LPCWSTR base;
 
-    TRACE("(%ld, %08x, %s)\n", hCryptProv, dwFlags,
+    TRACE("(%Id, %08lx, %s)\n", hCryptProv, dwFlags,
      debugstr_w(pvPara));
 
     if (!pvPara)
@@ -512,7 +512,7 @@ static WINECRYPT_CERTSTORE *CRYPT_SysRegOpenStoreA(HCRYPTPROV hCryptProv,
     int len;
     WINECRYPT_CERTSTORE *ret = NULL;
 
-    TRACE("(%ld, %08x, %s)\n", hCryptProv, dwFlags,
+    TRACE("(%Id, %08lx, %s)\n", hCryptProv, dwFlags,
      debugstr_a(pvPara));
 
     if (!pvPara)
@@ -541,7 +541,7 @@ static WINECRYPT_CERTSTORE *CRYPT_SysOpenStoreW(HCRYPTPROV hCryptProv,
     HCERTSTORE store = 0;
     BOOL ret;
 
-    TRACE("(%ld, %08x, %s)\n", hCryptProv, dwFlags,
+    TRACE("(%Id, %08lx, %s)\n", hCryptProv, dwFlags,
      debugstr_w(pvPara));
 
     if (!pvPara)
@@ -613,7 +613,7 @@ static WINECRYPT_CERTSTORE *CRYPT_SysOpenStoreA(HCRYPTPROV hCryptProv,
     int len;
     WINECRYPT_CERTSTORE *ret = NULL;
 
-    TRACE("(%ld, %08x, %s)\n", hCryptProv, dwFlags,
+    TRACE("(%Id, %08lx, %s)\n", hCryptProv, dwFlags,
      debugstr_a(pvPara));
 
     if (!pvPara)
@@ -640,7 +640,7 @@ static void WINAPI CRYPT_MsgCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)
 {
     HCRYPTMSG msg = hCertStore;
 
-    TRACE("(%p, %08x)\n", msg, dwFlags);
+    TRACE("(%p, %08lx)\n", msg, dwFlags);
     CryptMsgClose(msg);
 }
 
@@ -655,7 +655,7 @@ static WINECRYPT_CERTSTORE *CRYPT_MsgOpenStore(HCRYPTPROV hCryptProv,
     HCRYPTMSG msg = (HCRYPTMSG)pvPara;
     WINECRYPT_CERTSTORE *memStore;
 
-    TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);
+    TRACE("(%Id, %08lx, %p)\n", hCryptProv, dwFlags, pvPara);
 
     memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
      CERT_STORE_CREATE_NEW_FLAG, NULL);
@@ -736,7 +736,7 @@ static WINECRYPT_CERTSTORE *CRYPT_PKCSOpenStore(HCRYPTPROV hCryptProv,
     DWORD msgOpenFlags = dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG ? 0 :
      CMSG_CRYPT_RELEASE_CONTEXT_FLAG;
 
-    TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);
+    TRACE("(%Id, %08lx, %p)\n", hCryptProv, dwFlags, pvPara);
 
     msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, msgOpenFlags, CMSG_SIGNED,
      hCryptProv, NULL, NULL);
@@ -773,7 +773,7 @@ static WINECRYPT_CERTSTORE *CRYPT_SerializedOpenStore(HCRYPTPROV hCryptProv,
     HCERTSTORE store;
     const CRYPT_DATA_BLOB *data = pvPara;
 
-    TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);
+    TRACE("(%Id, %08lx, %p)\n", hCryptProv, dwFlags, pvPara);
 
     if (dwFlags & CERT_STORE_DELETE_FLAG)
     {
@@ -799,9 +799,9 @@ static WINECRYPT_CERTSTORE *CRYPT_PhysOpenStoreW(HCRYPTPROV hCryptProv,
  DWORD dwFlags, const void *pvPara)
 {
     if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG)
-        FIXME("(%ld, %08x, %p): stub\n", hCryptProv, dwFlags, pvPara);
+        FIXME("(%Id, %08lx, %p): stub\n", hCryptProv, dwFlags, pvPara);
     else
-        FIXME("(%ld, %08x, %s): stub\n", hCryptProv, dwFlags,
+        FIXME("(%Id, %08lx, %s): stub\n", hCryptProv, dwFlags,
          debugstr_w(pvPara));
     return NULL;
 }
@@ -813,7 +813,7 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider,
     WINECRYPT_CERTSTORE *hcs;
     StoreOpenFunc openFunc = NULL;
 
-    TRACE("(%s, %08x, %08lx, %08x, %p)\n", debugstr_a(lpszStoreProvider),
+    TRACE("(%s, %08lx, %08Ix, %08lx, %p)\n", debugstr_a(lpszStoreProvider),
           dwMsgAndCertEncodingType, hCryptProv, dwFlags, pvPara);
 
     if (IS_INTOID(lpszStoreProvider))
@@ -959,7 +959,7 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore,
     BOOL ret = TRUE;
     PCCRL_CONTEXT toAdd = NULL, existing = NULL;
 
-    TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCrlContext,
+    TRACE("(%p, %p, %08lx, %p)\n", hCertStore, pCrlContext,
      dwAddDisposition, ppStoreContext);
 
     /* Weird case to pass a test */
@@ -1047,7 +1047,7 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore,
             toAdd = CertDuplicateCRLContext(pCrlContext);
         break;
     default:
-        FIXME("Unimplemented add disposition %d\n", dwAddDisposition);
+        FIXME("Unimplemented add disposition %ld\n", dwAddDisposition);
         ret = FALSE;
     }
 
@@ -1123,7 +1123,7 @@ BOOL WINAPI CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)
     WINECRYPT_CERTSTORE *hcs = hCertStore;
     DWORD res;
 
-    TRACE("(%p, %08x)\n", hCertStore, dwFlags);
+    TRACE("(%p, %08lx)\n", hCertStore, dwFlags);
 
     if( ! hCertStore )
         return TRUE;
@@ -1146,7 +1146,7 @@ BOOL WINAPI CertControlStore(HCERTSTORE hCertStore, DWORD dwFlags,
     WINECRYPT_CERTSTORE *hcs = hCertStore;
     BOOL ret;
 
-    TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType,
+    TRACE("(%p, %08lx, %ld, %p)\n", hCertStore, dwFlags, dwCtrlType,
      pvCtrlPara);
 
     if (!hcs)
@@ -1169,7 +1169,7 @@ BOOL WINAPI CertGetStoreProperty(HCERTSTORE hCertStore, DWORD dwPropId,
     WINECRYPT_CERTSTORE *store = hCertStore;
     BOOL ret = FALSE;
 
-    TRACE("(%p, %d, %p, %p)\n", hCertStore, dwPropId, pvData, pcbData);
+    TRACE("(%p, %ld, %p, %p)\n", hCertStore, dwPropId, pvData, pcbData);
 
     switch (dwPropId)
     {
@@ -1233,7 +1233,7 @@ BOOL WINAPI CertSetStoreProperty(HCERTSTORE hCertStore, DWORD dwPropId,
     WINECRYPT_CERTSTORE *store = hCertStore;
     BOOL ret = FALSE;
 
-    TRACE("(%p, %d, %08x, %p)\n", hCertStore, dwPropId, dwFlags, pvData);
+    TRACE("(%p, %ld, %08lx, %p)\n", hCertStore, dwPropId, dwFlags, pvData);
 
     if (!store->properties)
         store->properties = ContextPropertyList_Create();
@@ -1265,7 +1265,7 @@ static LONG CRYPT_OpenParentStore(DWORD dwFlags,
     HKEY root;
     LPCWSTR base;
 
-    TRACE("(%08x, %p)\n", dwFlags, pvSystemStoreLocationPara);
+    TRACE("(%08lx, %p)\n", dwFlags, pvSystemStoreLocationPara);
 
     switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK)
     {
@@ -1320,7 +1320,7 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara,
     HKEY key;
     CERT_SYSTEM_STORE_INFO info = { sizeof(info) };
 
-    TRACE("(%08x, %p, %p, %p)\n", dwFlags, pvSystemStoreLocationPara, pvArg,
+    TRACE("(%08lx, %p, %p, %p)\n", dwFlags, pvSystemStoreLocationPara, pvArg,
         pfnEnum);
 
     rc = CRYPT_OpenParentStore(dwFlags, pvArg, &key);
@@ -1356,10 +1356,10 @@ BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags,
  void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum)
 {
     if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG)
-        FIXME("(%p, %08x, %p, %p): stub\n", pvSystemStore, dwFlags, pvArg,
+        FIXME("(%p, %08lx, %p, %p): stub\n", pvSystemStore, dwFlags, pvArg,
          pfnEnum);
     else
-        FIXME("(%s, %08x, %p, %p): stub\n", debugstr_w(pvSystemStore),
+        FIXME("(%s, %08lx, %p, %p): stub\n", debugstr_w(pvSystemStore),
          dwFlags, pvArg,
          pfnEnum);
     return FALSE;
@@ -1369,10 +1369,10 @@ BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags,
  LPCWSTR pwszStoreName, PCERT_PHYSICAL_STORE_INFO pStoreInfo, void *pvReserved)
 {
     if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG)
-        FIXME("(%p, %08x, %s, %p, %p): stub\n", pvSystemStore, dwFlags,
+        FIXME("(%p, %08lx, %s, %p, %p): stub\n", pvSystemStore, dwFlags,
          debugstr_w(pwszStoreName), pStoreInfo, pvReserved);
     else
-        FIXME("(%s, %08x, %s, %p, %p): stub\n", debugstr_w(pvSystemStore),
+        FIXME("(%s, %08lx, %s, %p, %p): stub\n", debugstr_w(pvSystemStore),
          dwFlags, debugstr_w(pwszStoreName), pStoreInfo, pvReserved);
     return FALSE;
 }
@@ -1380,7 +1380,7 @@ BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags,
 BOOL WINAPI CertUnregisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags,
  LPCWSTR pwszStoreName)
 {
-    FIXME("(%p, %08x, %s): stub\n", pvSystemStore, dwFlags, debugstr_w(pwszStoreName));
+    FIXME("(%p, %08lx, %s): stub\n", pvSystemStore, dwFlags, debugstr_w(pwszStoreName));
     return TRUE;
 }
 
@@ -1391,11 +1391,11 @@ BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags,
 
     if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG )
     {
-        FIXME("(%p, %08x, %p, %p): flag not supported\n", pvSystemStore, dwFlags, pStoreInfo, pvReserved);
+        FIXME("(%p, %08lx, %p, %p): flag not supported\n", pvSystemStore, dwFlags, pStoreInfo, pvReserved);
         return FALSE;
     }
 
-    TRACE("(%s, %08x, %p, %p)\n", debugstr_w(pvSystemStore), dwFlags, pStoreInfo, pvReserved);
+    TRACE("(%s, %08lx, %p, %p)\n", debugstr_w(pvSystemStore), dwFlags, pStoreInfo, pvReserved);
 
     hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, dwFlags, pvSystemStore);
     if (hstore)
@@ -1413,10 +1413,10 @@ BOOL WINAPI CertUnregisterSystemStore(const void *pvSystemStore, DWORD dwFlags)
 
     if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG)
     {
-        FIXME("(%p, %08x): flag not supported\n", pvSystemStore, dwFlags);
+        FIXME("(%p, %08lx): flag not supported\n", pvSystemStore, dwFlags);
         return FALSE;
     }
-    TRACE("(%s, %08x)\n", debugstr_w(pvSystemStore), dwFlags);
+    TRACE("(%s, %08lx)\n", debugstr_w(pvSystemStore), dwFlags);
 
     hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, dwFlags | CERT_STORE_OPEN_EXISTING_FLAG, pvSystemStore);
     if (hstore == NULL)
diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c
index 0e75a674b55..277aeb70d4a 100644
--- a/dlls/crypt32/str.c
+++ b/dlls/crypt32/str.c
@@ -34,7 +34,7 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
 {
     DWORD ret = 0, len;
 
-    TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz);
+    TRACE("(%ld, %p, %p, %ld)\n", dwValueType, pValue, psz, csz);
 
     switch (dwValueType)
     {
@@ -82,7 +82,7 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
         }
         break;
     default:
-        FIXME("string type %d unimplemented\n", dwValueType);
+        FIXME("string type %ld unimplemented\n", dwValueType);
     }
     if (psz && csz)
     {
@@ -92,7 +92,7 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
     }
     else
         ret++;
-    TRACE("returning %d (%s)\n", ret, debugstr_a(psz));
+    TRACE("returning %ld (%s)\n", ret, debugstr_a(psz));
     return ret;
 }
 
@@ -101,7 +101,7 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
 {
     DWORD ret = 0, len, i, strLen;
 
-    TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz);
+    TRACE("(%ld, %p, %p, %ld)\n", dwValueType, pValue, psz, csz);
 
     switch (dwValueType)
     {
@@ -142,7 +142,7 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
         }
         break;
     default:
-        FIXME("string type %d unimplemented\n", dwValueType);
+        FIXME("string type %ld unimplemented\n", dwValueType);
     }
     if (psz && csz)
     {
@@ -152,7 +152,7 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
     }
     else
         ret++;
-    TRACE("returning %d (%s)\n", ret, debugstr_w(psz));
+    TRACE("returning %ld (%s)\n", ret, debugstr_w(psz));
     return ret;
 }
 
@@ -181,7 +181,7 @@ static DWORD quote_rdn_value_to_str_a(DWORD dwValueType,
     DWORD ret = 0, len, i;
     BOOL needsQuotes = FALSE;
 
-    TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz);
+    TRACE("(%ld, %p, %p, %ld)\n", dwValueType, pValue, psz, csz);
 
     switch (dwValueType)
     {
@@ -270,7 +270,7 @@ static DWORD quote_rdn_value_to_str_a(DWORD dwValueType,
         }
         break;
     default:
-        FIXME("string type %d unimplemented\n", dwValueType);
+        FIXME("string type %ld unimplemented\n", dwValueType);
     }
     if (psz && csz)
     {
@@ -280,7 +280,7 @@ static DWORD quote_rdn_value_to_str_a(DWORD dwValueType,
     }
     else
         ret++;
-    TRACE("returning %d (%s)\n", ret, debugstr_a(psz));
+    TRACE("returning %ld (%s)\n", ret, debugstr_a(psz));
     return ret;
 }
 
@@ -290,7 +290,7 @@ static DWORD quote_rdn_value_to_str_w(DWORD dwValueType,
     DWORD ret = 0, len, i, strLen;
     BOOL needsQuotes = FALSE;
 
-    TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz);
+    TRACE("(%ld, %p, %p, %ld)\n", dwValueType, pValue, psz, csz);
 
     switch (dwValueType)
     {
@@ -373,7 +373,7 @@ static DWORD quote_rdn_value_to_str_w(DWORD dwValueType,
         }
         break;
     default:
-        FIXME("string type %d unimplemented\n", dwValueType);
+        FIXME("string type %ld unimplemented\n", dwValueType);
     }
     if (psz && csz)
     {
@@ -383,7 +383,7 @@ static DWORD quote_rdn_value_to_str_w(DWORD dwValueType,
     }
     else
         ret++;
-    TRACE("returning %d (%s)\n", ret, debugstr_w(psz));
+    TRACE("returning %ld (%s)\n", ret, debugstr_w(psz));
     return ret;
 }
 
@@ -396,7 +396,7 @@ static DWORD CRYPT_AddPrefixA(LPCSTR prefix, LPSTR psz, DWORD csz)
 {
     DWORD chars;
 
-    TRACE("(%s, %p, %d)\n", debugstr_a(prefix), psz, csz);
+    TRACE("(%s, %p, %ld)\n", debugstr_a(prefix), psz, csz);
 
     if (psz)
     {
@@ -424,10 +424,10 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName,
     BOOL bRet;
     CERT_NAME_INFO *info;
 
-    TRACE("(%d, %p, %08x, %p, %d)\n", dwCertEncodingType, pName, dwStrType,
+    TRACE("(%ld, %p, %08lx, %p, %ld)\n", dwCertEncodingType, pName, dwStrType,
      psz, csz);
     if (dwStrType & unsupportedFlags)
-        FIXME("unsupported flags: %08x\n", dwStrType & unsupportedFlags);
+        FIXME("unsupported flags: %08lx\n", dwStrType & unsupportedFlags);
 
     bRet = CryptDecodeObjectEx(dwCertEncodingType, X509_NAME, pName->pbData,
      pName->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &bytes);
@@ -530,7 +530,7 @@ static DWORD CRYPT_AddPrefixAToW(LPCSTR prefix, LPWSTR psz, DWORD csz)
 {
     DWORD chars;
 
-    TRACE("(%s, %p, %d)\n", debugstr_a(prefix), psz, csz);
+    TRACE("(%s, %p, %ld)\n", debugstr_a(prefix), psz, csz);
 
     if (psz)
     {
@@ -556,7 +556,7 @@ static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz)
 {
     DWORD chars;
 
-    TRACE("(%s, %p, %d)\n", debugstr_w(prefix), psz, csz);
+    TRACE("(%s, %p, %ld)\n", debugstr_w(prefix), psz, csz);
 
     if (psz)
     {
@@ -582,7 +582,7 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel,
     CERT_NAME_INFO *info;
 
     if (dwStrType & unsupportedFlags)
-        FIXME("unsupported flags: %08x\n", dwStrType & unsupportedFlags);
+        FIXME("unsupported flags: %08lx\n", dwStrType & unsupportedFlags);
 
     bRet = CryptDecodeObjectEx(dwCertEncodingType, X509_NAME, pName->pbData,
      pName->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &bytes);
@@ -698,7 +698,7 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName,
 {
     BOOL ret;
 
-    TRACE("(%d, %p, %08x, %p, %d)\n", dwCertEncodingType, pName, dwStrType,
+    TRACE("(%ld, %p, %08lx, %p, %ld)\n", dwCertEncodingType, pName, dwStrType,
      psz, csz);
 
     ret = cert_name_to_str_with_indent(dwCertEncodingType, 0, pName, dwStrType,
@@ -714,7 +714,7 @@ BOOL WINAPI CertStrToNameA(DWORD dwCertEncodingType, LPCSTR pszX500,
     BOOL ret;
     int len;
 
-    TRACE("(%08x, %s, %08x, %p, %p, %p, %p)\n", dwCertEncodingType,
+    TRACE("(%08lx, %s, %08lx, %p, %p, %p, %p)\n", dwCertEncodingType,
      debugstr_a(pszX500), dwStrType, pvReserved, pbEncoded, pcbEncoded,
      ppszError);
 
@@ -1025,7 +1025,7 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500,
     DWORD i;
     BOOL ret = TRUE;
 
-    TRACE("(%08x, %s, %08x, %p, %p, %p, %p)\n", dwCertEncodingType,
+    TRACE("(%08lx, %s, %08lx, %p, %p, %p, %p)\n", dwCertEncodingType,
      debugstr_w(pszX500), dwStrType, pvReserved, pbEncoded, pcbEncoded,
      ppszError);
 
@@ -1118,7 +1118,7 @@ DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType,
 {
     DWORD ret;
 
-    TRACE("(%p, %d, %08x, %p, %p, %d)\n", pCertContext, dwType, dwFlags,
+    TRACE("(%p, %ld, %08lx, %p, %p, %ld)\n", pCertContext, dwType, dwFlags,
      pvTypePara, pszNameString, cchNameString);
 
     if (pszNameString)
@@ -1221,7 +1221,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType,
     PCERT_NAME_BLOB name;
     LPCSTR altNameOID;
 
-    TRACE("(%p, %d, %08x, %p, %p, %d)\n", pCertContext, dwType,
+    TRACE("(%p, %ld, %08lx, %p, %p, %ld)\n", pCertContext, dwType,
      dwFlags, pvTypePara, pszNameString, cchNameString);
 
     if (!pCertContext)
@@ -1410,7 +1410,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType,
         break;
     }
     default:
-        FIXME("unimplemented for type %d\n", dwType);
+        FIXME("unimplemented for type %ld\n", dwType);
         ret = 0;
     }
 done:

[PATCH 11/25] dlls/cryptdlg: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/cryptdlg/Makefile.in |    1 -
 dlls/cryptdlg/main.c      |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in
index 7aaf4b90ff4..b9fccf2e31e 100644
--- a/dlls/cryptdlg/Makefile.in
+++ b/dlls/cryptdlg/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cryptdlg.dll
 IMPORTS   = cryptui crypt32 wintrust user32 advapi32
 
diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c
index 0cc408b741a..1597dc2704c 100644
--- a/dlls/cryptdlg/main.c
+++ b/dlls/cryptdlg/main.c
@@ -39,7 +39,7 @@ static HINSTANCE hInstance;
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason)
     {
@@ -83,7 +83,7 @@ HRESULT WINAPI CertTrustInit(CRYPT_PROVIDER_DATA *pProvData)
     if (pProvData->padwTrustStepErrors &&
      !pProvData->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_WVTINIT])
         ret = S_OK;
-    TRACE("returning %08x\n", ret);
+    TRACE("returning %08lx\n", ret);
     return ret;
 }
 
@@ -92,7 +92,7 @@ HRESULT WINAPI CertTrustInit(CRYPT_PROVIDER_DATA *pProvData)
  */
 BOOL WINAPI CertTrustCertPolicy(CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSignerChain, DWORD idxCounterSigner)
 {
-    FIXME("(%p, %d, %s, %d)\n", pProvData, idxSigner, fCounterSignerChain ? "TRUE" : "FALSE", idxCounterSigner);
+    FIXME("(%p, %ld, %s, %ld)\n", pProvData, idxSigner, fCounterSignerChain ? "TRUE" : "FALSE", idxCounterSigner);
     return FALSE;
 }
 
@@ -295,7 +295,7 @@ HRESULT WINAPI CertTrustFinalPolicy(CRYPT_PROVIDER_DATA *data)
     TRACE("(%p)\n", data);
 
     if (data->pWintrustData->dwUIChoice != WTD_UI_NONE)
-        FIXME("unimplemented for UI choice %d\n",
+        FIXME("unimplemented for UI choice %ld\n",
          data->pWintrustData->dwUIChoice);
     if (pCert)
     {
@@ -354,7 +354,7 @@ HRESULT WINAPI CertTrustFinalPolicy(CRYPT_PROVIDER_DATA *data)
      */
     if (!ret)
         data->dwFinalError = err;
-    TRACE("returning %d (%08x)\n", S_OK, data->dwFinalError);
+    TRACE("returning %ld (%08lx)\n", S_OK, data->dwFinalError);
     return S_OK;
 }

[PATCH 12/25] dlls/cryptnet: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/cryptnet/Makefile.in     |    1 -
 dlls/cryptnet/cryptnet_main.c |   24 ++++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in
index f394b0c1f79..8b13861da1e 100644
--- a/dlls/cryptnet/Makefile.in
+++ b/dlls/cryptnet/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cryptnet.dll
 IMPORTLIB = cryptnet
 IMPORTS   = crypt32 shell32 ole32
diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c
index e1b32216353..8aec76e9b81 100644
--- a/dlls/cryptnet/cryptnet_main.c
+++ b/dlls/cryptnet/cryptnet_main.c
@@ -145,7 +145,7 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateIssuer(LPCSTR pszUrlOid,
                         }
                     }
                     else
-                        FIXME("unsupported alt name type %d\n",
+                        FIXME("unsupported alt name type %ld\n",
                          aia->rgAccDescr[i].AccessLocation.dwAltNameChoice);
                 }
             if (!pcbUrlArray)
@@ -358,7 +358,7 @@ BOOL WINAPI CryptGetObjectUrl(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags,
     HCRYPTOIDFUNCADDR hFunc = NULL;
     BOOL ret = FALSE;
 
-    TRACE("(%s, %p, %08x, %p, %p, %p, %p, %p)\n", debugstr_a(pszUrlOid),
+    TRACE("(%s, %p, %08lx, %p, %p, %p, %p, %p)\n", debugstr_a(pszUrlOid),
      pvPara, dwFlags, pUrlArray, pcbUrlArray, pUrlInfo, pcbUrlInfo, pvReserved);
 
     if (IS_INTOID(pszUrlOid))
@@ -404,7 +404,7 @@ BOOL WINAPI CryptRetrieveObjectByUrlA(LPCSTR pszURL, LPCSTR pszObjectOid,
     BOOL ret = FALSE;
     int len;
 
-    TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p)\n", debugstr_a(pszURL),
+    TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p)\n", debugstr_a(pszURL),
      debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, ppvObject,
      hAsyncRetrieve, pCredentials, pvVerify, pAuxInfo);
 
@@ -842,7 +842,7 @@ static BOOL WINAPI FTP_RetrieveEncodedObjectW(LPCWSTR pszURL,
  void **ppvFreeContext, HCRYPTASYNC hAsyncRetrieve,
  PCRYPT_CREDENTIALS pCredentials, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo)
 {
-    FIXME("(%s, %s, %08x, %d, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL),
+    FIXME("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL),
      debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, pObject,
      ppfnFreeObject, ppvFreeContext, hAsyncRetrieve, pCredentials, pAuxInfo);
 
@@ -861,7 +861,7 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL,
 {
     BOOL ret = FALSE;
 
-    TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL),
+    TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL),
      debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, pObject,
      ppfnFreeObject, ppvFreeContext, hAsyncRetrieve, pCredentials, pAuxInfo);
 
@@ -971,7 +971,7 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL,
     URL_COMPONENTSW components = { sizeof(components), 0 };
     BOOL ret;
 
-    TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL),
+    TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL),
      debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, pObject,
      ppfnFreeObject, ppvFreeContext, hAsyncRetrieve, pCredentials, pAuxInfo);
 
@@ -1477,7 +1477,7 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid,
     ContextDllCreateObjectContext create;
     HCRYPTOIDFUNCADDR hRetrieve = 0, hCreate = 0;
 
-    TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL),
+    TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL),
      debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, ppvObject,
      hAsyncRetrieve, pCredentials, pvVerify, pAuxInfo);
 
@@ -1546,7 +1546,7 @@ static FILE *open_cached_revocation_file(const CRYPT_INTEGER_BLOB *serial, const
 
     if (FAILED(hr = SHGetKnownFolderPath(&FOLDERID_LocalAppDataLow, 0, NULL, &appdata_path)))
     {
-        ERR("Failed to get LocalAppDataLow path, hr %#x.\n", hr);
+        ERR("Failed to get LocalAppDataLow path, hr %#lx.\n", hr);
         return INVALID_HANDLE_VALUE;
     }
 
@@ -1617,7 +1617,7 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial,
         return FALSE;
     }
 
-    TRACE("Using cached status %#x, reason %#x.\n", status->dwError, status->dwReason);
+    TRACE("Using cached status %#lx, reason %#lx.\n", status->dwError, status->dwReason);
     return TRUE;
 }
 
@@ -1742,7 +1742,7 @@ static DWORD verify_cert_revocation_from_aia_ext(const CRYPT_DATA_BLOB *value, c
                     FIXME("OCSP URL = %s\n",
                      debugstr_w(aia->rgAccDescr[i].AccessLocation.u.pwszURL));
                 else
-                    FIXME("unsupported AccessLocation type %d\n",
+                    FIXME("unsupported AccessLocation type %ld\n",
                      aia->rgAccDescr[i].AccessLocation.dwAltNameChoice);
             }
         LocalFree(aia);
@@ -1902,7 +1902,7 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
     FILETIME now;
     LPFILETIME pTime = NULL;
 
-    TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType,
+    TRACE("(%08lx, %ld, %ld, %p, %08lx, %p, %p)\n", dwEncodingType, dwRevType,
      cContext, rgpvContext, dwFlags, pRevPara, pRevStatus);
 
     if (pRevStatus->cbSize != sizeof(OLD_CERT_REVOCATION_STATUS) &&
@@ -1943,6 +1943,6 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType,
         SetLastError(error);
         pRevStatus->dwError = error;
     }
-    TRACE("returning %d (%08x)\n", !error, error);
+    TRACE("returning %d (%08lx)\n", !error, error);
     return !error;
 }

[PATCH 13/25] dlls/cryptui: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/cryptui/Makefile.in |    1 -
 dlls/cryptui/main.c      |   38 +++++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in
index 60b38f058e1..9e2031dc17b 100644
--- a/dlls/cryptui/Makefile.in
+++ b/dlls/cryptui/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cryptui.dll
 IMPORTS   = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 advapi32
 DELAYIMPORTS = wintrust urlmon
diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c
index 500ed439a5b..03054ae180c 100644
--- a/dlls/cryptui/main.c
+++ b/dlls/cryptui/main.c
@@ -48,7 +48,7 @@ static const WCHAR empty[] = {0};
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason)
     {
@@ -1298,7 +1298,7 @@ BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr)
 
     if (pCryptUICertMgr->dwSize != sizeof(CRYPTUI_CERT_MGR_STRUCT))
     {
-        WARN("unexpected size %d\n", pCryptUICertMgr->dwSize);
+        WARN("unexpected size %ld\n", pCryptUICertMgr->dwSize);
         SetLastError(E_INVALIDARG);
         return FALSE;
     }
@@ -1605,7 +1605,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreW(PCRYPTUI_SELECTSTORE_INFO_W info)
 
     if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_W))
     {
-        WARN("unexpected size %d\n", info->dwSize);
+        WARN("unexpected size %ld\n", info->dwSize);
         SetLastError(E_INVALIDARG);
         return NULL;
     }
@@ -1627,7 +1627,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreA(PCRYPTUI_SELECTSTORE_INFO_A info)
 
     if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_A))
     {
-        WARN("unexpected size %d\n", info->dwSize);
+        WARN("unexpected size %ld\n", info->dwSize);
         SetLastError(E_INVALIDARG);
         return NULL;
     }
@@ -1706,7 +1706,7 @@ static DWORD CALLBACK read_text_callback(DWORD_PTR dwCookie, LPBYTE buf,
     struct ReadStringStruct *string = (struct ReadStringStruct *)dwCookie;
     LONG cch = min(cb / sizeof(WCHAR), string->len - string->pos);
 
-    TRACE("(%p, %p, %d, %p)\n", string, buf, cb, pcb);
+    TRACE("(%p, %p, %ld, %p)\n", string, buf, cb, pcb);
 
     memmove(buf, string->buf + string->pos, cch * sizeof(WCHAR));
     string->pos += cch;
@@ -2497,7 +2497,7 @@ static INT_PTR CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
     PROPSHEETPAGEW *page;
     PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo;
 
-    TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);
+    TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
 
     switch (msg)
     {
@@ -3586,7 +3586,7 @@ static INT_PTR CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg,
 {
     PROPSHEETPAGEW *page;
 
-    TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);
+    TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
 
     switch (msg)
     {
@@ -3781,7 +3781,7 @@ static INT_PTR CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
     PROPSHEETPAGEW *page;
     struct detail_data *data;
 
-    TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);
+    TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
 
     switch (msg)
     {
@@ -4138,7 +4138,7 @@ static INT_PTR CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
     INT_PTR ret = 0;
     HWND tree = GetDlgItem(hwnd, IDC_CERTPATH);
 
-    TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);
+    TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
 
     switch (msg)
     {
@@ -4267,7 +4267,7 @@ static int CALLBACK cert_prop_sheet_proc(HWND hwnd, UINT msg, LPARAM lp)
 {
     RECT rc;
 
-    TRACE("(%p, %08x, %08lx)\n", hwnd, msg, lp);
+    TRACE("(%p, %08x, %08Ix)\n", hwnd, msg, lp);
 
     switch (msg)
     {
@@ -4469,7 +4469,7 @@ BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext,
 {
     BOOL ret;
 
-    TRACE("(%d, %p, %p, %s, %08x, %p)\n", dwContextType, pvContext, hwnd,
+    TRACE("(%ld, %p, %p, %s, %08lx, %p)\n", dwContextType, pvContext, hwnd,
      debugstr_w(pwszTitle), dwFlags, pvReserved);
 
     switch (dwContextType)
@@ -4487,7 +4487,7 @@ BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext,
         break;
     }
     default:
-        FIXME("unimplemented for context type %d\n", dwContextType);
+        FIXME("unimplemented for context type %ld\n", dwContextType);
         SetLastError(E_INVALIDARG);
         ret = FALSE;
     }
@@ -5335,7 +5335,7 @@ static BOOL do_import(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle,
          pImportSrc->u.hCertStore, hDestCertStore);
         break;
     default:
-        WARN("unknown source type: %u\n", pImportSrc->dwSubjectChoice);
+        WARN("unknown source type: %lu\n", pImportSrc->dwSubjectChoice);
         SetLastError(E_INVALIDARG);
         ret = FALSE;
     }
@@ -5536,7 +5536,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT
 {
     BOOL ret;
 
-    TRACE("(0x%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle),
+    TRACE("(0x%08lx, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle),
           pImportSrc, hDestCertStore);
 
     if (pImportSrc &&
@@ -6967,7 +6967,7 @@ BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent,
 {
     BOOL ret;
 
-    TRACE("(%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent,
+    TRACE("(%08lx, %p, %s, %p, %p)\n", dwFlags, hwndParent,
      debugstr_w(pwszWizardTitle), pExportInfo, pvoid);
 
     if (!(dwFlags & CRYPTUI_WIZ_NO_UI))
@@ -7409,7 +7409,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateW(PCCRYPTUI_SELECTCERTIFICATE_S
 
     if (pcsc->dwSize != sizeof(*pcsc) && pcsc->dwSize != sizeof(*pcsc) - sizeof(HCERTSTORE))
     {
-        WARN("unexpected size %d\n", pcsc->dwSize);
+        WARN("unexpected size %ld\n", pcsc->dwSize);
         SetLastError(E_INVALIDARG);
         return NULL;
     }
@@ -7511,7 +7511,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA(PCCRYPTUI_SELECTCERTIFICATE_S
 
     if (pcsc->dwSize != sizeof(*pcsc) && pcsc->dwSize != sizeof(*pcsc) - sizeof(HCERTSTORE))
     {
-        WARN("unexpected size %d\n", pcsc->dwSize);
+        WARN("unexpected size %ld\n", pcsc->dwSize);
         SetLastError(E_INVALIDARG);
         return NULL;
     }
@@ -7548,7 +7548,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore
 {
     CRYPTUI_SELECTCERTIFICATE_STRUCTW sc;
 
-    TRACE("%p %p %s %s %x %x %p\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved);
+    TRACE("%p %p %s %s %lx %lx %p\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved);
 
     memset(&sc, 0, sizeof(sc));
 
@@ -7566,6 +7566,6 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore
 BOOL WINAPI CryptUIWizDigitalSign(DWORD flags, HWND parent, LPCWSTR title, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO info,
                                   PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *context)
 {
-    FIXME("%d %p %s %p %p: stub\n", flags, parent, debugstr_w(title), info, context);
+    FIXME("%ld %p %s %p %p: stub\n", flags, parent, debugstr_w(title), info, context);
     return FALSE;
 }

[PATCH 14/25] dlls/credui: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/credui/Makefile.in   |    1 -
 dlls/credui/credui_main.c |   18 +++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in
index e8b3d407fa7..149f6ddbbee 100644
--- a/dlls/credui/Makefile.in
+++ b/dlls/credui/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = credui.dll
 IMPORTLIB = credui
 IMPORTS   = comctl32 user32 advapi32
diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c
index b5a0897f520..221965f6182 100644
--- a/dlls/credui/credui_main.c
+++ b/dlls/credui/credui_main.c
@@ -67,7 +67,7 @@ static CRITICAL_SECTION csPendingCredentials = { &critsect_debug, -1, 0, 0, 0, 0
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     struct pending_credentials *entry, *cursor2;
-    TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved);
+    TRACE("(0x%p, %ld, %p)\n",hinstDLL,fdwReason,lpvReserved);
 
     switch (fdwReason)
     {
@@ -120,7 +120,7 @@ static DWORD save_credentials(PCWSTR pszTargetName, PCWSTR pszUsername,
     else
     {
         DWORD ret = GetLastError();
-        ERR("CredWriteW failed with error %d\n", ret);
+        ERR("CredWriteW failed with error %ld\n", ret);
         return ret;
     }
 }
@@ -566,7 +566,7 @@ static BOOL find_existing_credential(const WCHAR *target, WCHAR *username, ULONG
         if (credentials[i]->Type != CRED_TYPE_DOMAIN_PASSWORD &&
             credentials[i]->Type != CRED_TYPE_GENERIC)
         {
-            FIXME("no support for type %u credentials\n", credentials[i]->Type);
+            FIXME("no support for type %lu credentials\n", credentials[i]->Type);
             continue;
         }
         if ((!*username || !lstrcmpW(username, credentials[i]->UserName)) &&
@@ -604,7 +604,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo,
     struct cred_dialog_params params;
     DWORD result = ERROR_SUCCESS;
 
-    TRACE("(%p, %s, %p, %d, %s, %d, %p, %d, %p, 0x%08x)\n", pUIInfo,
+    TRACE("(%p, %s, %p, %ld, %s, %ld, %p, %ld, %p, 0x%08lx)\n", pUIInfo,
           debugstr_w(pszTargetName), Reserved, dwAuthError, debugstr_w(pszUsername),
           ulUsernameMaxChars, pszPassword, ulPasswordMaxChars, pfSave, dwFlags);
 
@@ -758,7 +758,7 @@ DWORD WINAPI CredUIParseUserNameW(PCWSTR pszUserName, PWSTR pszUser,
 {
     PWSTR p;
 
-    TRACE("(%s, %p, %d, %p, %d)\n", debugstr_w(pszUserName), pszUser,
+    TRACE("(%s, %p, %ld, %p, %ld)\n", debugstr_w(pszUserName), pszUser,
           ulMaxUserChars, pszDomain, ulMaxDomainChars);
 
     if (!pszUserName || !pszUser || !ulMaxUserChars || !pszDomain ||
@@ -873,7 +873,7 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info,
     CREDUI_INFOW *cred_info = info;
     SEC_WINNT_AUTH_IDENTITY_W *id = input_id;
 
-    FIXME( "(%s, %p, %u, %s, %p, %p, %p, %x) stub\n", debugstr_w(target), info,
+    FIXME( "(%s, %p, %lu, %s, %p, %p, %p, %lx) stub\n", debugstr_w(target), info,
            error, debugstr_w(package), input_id, output_id, save, sspi_flags );
 
     if (!target) return ERROR_INVALID_PARAMETER;
@@ -967,7 +967,7 @@ DWORD WINAPI CredUIPromptForWindowsCredentialsW( CREDUI_INFOW *info, DWORD error
                                                  const void *in_buf, ULONG in_buf_size, void **out_buf,
                                                  ULONG *out_buf_size, BOOL *save, DWORD flags )
 {
-    FIXME( "(%p, %u, %p, %p, %u, %p, %p, %p, %08x) stub\n", info, error, package, in_buf, in_buf_size,
+    FIXME( "(%p, %lu, %p, %p, %lu, %p, %p, %p, %08lx) stub\n", info, error, package, in_buf, in_buf_size,
            out_buf, out_buf_size, save, flags );
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
@@ -978,7 +978,7 @@ DWORD WINAPI CredUIPromptForWindowsCredentialsW( CREDUI_INFOW *info, DWORD error
 BOOL  WINAPI CredPackAuthenticationBufferW( DWORD flags, WCHAR *username, WCHAR *password, BYTE *buf,
                                             DWORD *size )
 {
-    FIXME( "(%08x, %s, %p, %p, %p) stub\n", flags, debugstr_w(username), password, buf, size );
+    FIXME( "(%08lx, %s, %p, %p, %p) stub\n", flags, debugstr_w(username), password, buf, size );
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
@@ -989,7 +989,7 @@ BOOL  WINAPI CredUnPackAuthenticationBufferW( DWORD flags, void *buf, DWORD size
                                               DWORD *len_username, WCHAR *domain, DWORD *len_domain,
                                               WCHAR *password, DWORD *len_password )
 {
-    FIXME( "(%08x, %p, %u, %p, %p, %p, %p, %p, %p) stub\n", flags, buf, size, username, len_username,
+    FIXME( "(%08lx, %p, %lu, %p, %p, %p, %p, %p, %p) stub\n", flags, buf, size, username, len_username,
            domain, len_domain, password, len_password );
     return ERROR_CALL_NOT_IMPLEMENTED;
 }

[PATCH 15/25] dlls/davclnt: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/davclnt/Makefile.in |    1 -
 dlls/davclnt/main.c      |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/davclnt/Makefile.in b/dlls/davclnt/Makefile.in
index bc6e4b04132..007258ed236 100644
--- a/dlls/davclnt/Makefile.in
+++ b/dlls/davclnt/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = davclnt.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/davclnt/main.c b/dlls/davclnt/main.c
index 5859c3c06c5..b55c435b8a1 100644
--- a/dlls/davclnt/main.c
+++ b/dlls/davclnt/main.c
@@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(davclnt);
  */
 OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK cb, ULONG version)
 {
-    FIXME("%p, %u\n", cb, version);
+    FIXME("%p, %lu\n", cb, version);
     return 0xdeadbeef;
 }
 
@@ -43,5 +43,5 @@ OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK cb, ULONG versio
  */
 VOID WINAPI DavUnregisterAuthCallback(OPAQUE_HANDLE handle)
 {
-    FIXME("%08x\n", handle);
+    FIXME("%08lx\n", handle);
 }

[PATCH 16/25] dlls/dbghelp: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/dbghelp/Makefile.in    |    2 -
 dlls/dbghelp/coff.c         |    6 +-
 dlls/dbghelp/cpu_i386.c     |   14 ++--
 dlls/dbghelp/cpu_x86_64.c   |   20 +++--
 dlls/dbghelp/dbghelp.c      |   20 +++--
 dlls/dbghelp/dwarf.c        |  162 ++++++++++++++++++++++---------------------
 dlls/dbghelp/elf_module.c   |   20 +++--
 dlls/dbghelp/image.c        |    2 -
 dlls/dbghelp/macho_module.c |   44 ++++++------
 dlls/dbghelp/minidump.c     |    2 -
 dlls/dbghelp/module.c       |   10 +--
 dlls/dbghelp/msc.c          |   42 ++++++-----
 dlls/dbghelp/path.c         |    4 +
 dlls/dbghelp/pe_module.c    |    6 +-
 dlls/dbghelp/source.c       |    4 +
 dlls/dbghelp/stabs.c        |   10 +--
 dlls/dbghelp/stack.c        |   12 ++-
 dlls/dbghelp/symbol.c       |   46 ++++++------
 18 files changed, 213 insertions(+), 213 deletions(-)

diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
index abb440ffbe6..22be2612eeb 100644
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = dbghelp.dll
 IMPORTLIB = dbghelp
 IMPORTS   = $(ZLIB_PE_LIBS)
 EXTRAINCL = $(ZLIB_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_IMAGEHLP_SOURCE_
+EXTRADEFS = -D_IMAGEHLP_SOURCE_
 DELAYIMPORTS = version
 
 C_SRCS = \
diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c
index cc005a3bbc5..0f29b131a86 100644
--- a/dlls/dbghelp/coff.c
+++ b/dlls/dbghelp/coff.c
@@ -223,12 +223,12 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg)
                 fn = source_get(msc_dbg->module,
                                 coff_files.files[curr_file_idx].compiland->source);
 
-                TRACE("Duplicating sect from %s: %x %x %x %d %d\n",
+                TRACE("Duplicating sect from %s: %lx %x %x %d %d\n",
                       fn, aux->Section.Length,
                       aux->Section.NumberOfRelocations,
                       aux->Section.NumberOfLinenumbers,
                       aux->Section.Number, aux->Section.Selection);
-                TRACE("More sect %d %s %08x %d %d %d\n",
+                TRACE("More sect %d %s %08lx %d %d %d\n",
                       coff_sym->SectionNumber,
                       coff_get_name(coff_sym, coff_strtab),
                       coff_sym->Value, coff_sym->Type,
@@ -242,7 +242,7 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg)
 	    }
             else
 	    {
-                TRACE("New text sect from %s: %x %x %x %d %d\n",
+                TRACE("New text sect from %s: %lx %x %x %d %d\n",
                       source_get(msc_dbg->module, coff_files.files[curr_file_idx].compiland->source),
                       aux->Section.Length,
                       aux->Section.NumberOfRelocations,
diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c
index 45b3bd95df6..bd860e0cdd8 100644
--- a/dlls/dbghelp/cpu_i386.c
+++ b/dlls/dbghelp/cpu_i386.c
@@ -252,7 +252,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk *csw, STACKFRAME64 *frame,
                 p = sw_xlat_addr(csw, &tmp);
                 if (!sw_read_mem(csw, p, &frame16, sizeof(frame16)))
                 {
-                    WARN("Bad stack frame 0x%08x\n", p);
+                    WARN("Bad stack frame 0x%08lx\n", p);
                     goto done_err;
                 }
                 curr_switch = (DWORD_PTR)frame16.frame32;
@@ -316,7 +316,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk *csw, STACKFRAME64 *frame,
 
                 if (!sw_read_mem(csw, p, &frame16, sizeof(frame16)))
                 {
-                    WARN("Bad stack frame 0x%08x\n", p);
+                    WARN("Bad stack frame 0x%08lx\n", p);
                     goto done_err;
                 }
                 curr_switch = (DWORD_PTR)frame16.frame32;
@@ -333,16 +333,16 @@ static BOOL i386_stack_walk(struct cpu_stack_walk *csw, STACKFRAME64 *frame,
 
                 if (!sw_read_mem(csw, p, &frame16, sizeof(frame16)))
                 {
-                    WARN("Bad stack frame 0x%08x\n", p);
+                    WARN("Bad stack frame 0x%08lx\n", p);
                     goto done_err;
                 }
 
                 TRACE("Got a 16 bit stack switch:"
                       "\n\tframe32: %p"
-                      "\n\tedx:%08x ecx:%08x ebp:%08x"
+                      "\n\tedx:%08lx ecx:%08lx ebp:%08lx"
                       "\n\tds:%04x es:%04x fs:%04x gs:%04x"
-                      "\n\tcall_from_ip:%08x module_cs:%04x relay=%08x"
-                      "\n\tentry_ip:%04x entry_point:%08x"
+                      "\n\tcall_from_ip:%08lx module_cs:%04lx relay=%08lx"
+                      "\n\tentry_ip:%04x entry_point:%08lx"
                       "\n\tbp:%04x ip:%04x cs:%04x\n",
                       frame16.frame32,
                       frame16.edx, frame16.ecx, frame16.ebp,
@@ -403,7 +403,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk *csw, STACKFRAME64 *frame,
                 frame->AddrStack.Offset = context->x86.Esp;
                 frame->AddrFrame.Offset = context->x86.Ebp;
                 if (frame->AddrReturn.Offset != context->x86.Eip)
-                    FIXME("new PC=%s different from Eip=%x\n",
+                    FIXME("new PC=%s different from Eip=%lx\n",
                           wine_dbgstr_longlong(frame->AddrReturn.Offset), context->x86.Eip);
                 frame->AddrPC.Offset = context->x86.Eip;
             }
diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c
index 4fd8d76e010..1ad9aa41395 100644
--- a/dlls/dbghelp/cpu_x86_64.c
+++ b/dlls/dbghelp/cpu_x86_64.c
@@ -125,14 +125,14 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F
     RUNTIME_FUNCTION snext;
     ULONG64 addr;
 
-    TRACE("**** func %x-%x\n", function->BeginAddress, function->EndAddress);
+    TRACE("**** func %lx-%lx\n", function->BeginAddress, function->EndAddress);
     for (;;)
     {
         if (function->UnwindData & 1)
         {
             if (!sw_read_mem(csw, base + function->UnwindData, &snext, sizeof(snext)))
             {
-                TRACE("Couldn't unwind RUNTIME_INFO at %lx\n", base + function->UnwindData);
+                TRACE("Couldn't unwind RUNTIME_INFO at %Ix\n", base + function->UnwindData);
                 return;
             }
             TRACE("unwind info for function %p-%p chained to function %p-%p\n",
@@ -146,7 +146,7 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F
             !sw_read_mem(csw, addr + FIELD_OFFSET(UNWIND_INFO, UnwindCode),
                          info->UnwindCode, info->CountOfCodes * sizeof(UNWIND_CODE)))
         {
-            FIXME("couldn't read memory for UNWIND_INFO at %lx\n", addr);
+            FIXME("couldn't read memory for UNWIND_INFO at %Ix\n", addr);
             return;
         }
         TRACE("unwind info at %p flags %x prolog 0x%x bytes function %p-%p\n",
@@ -499,13 +499,13 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw,
             !sw_read_mem(csw, base + function->UnwindData + FIELD_OFFSET(UNWIND_INFO, UnwindCode),
                          info->UnwindCode, info->CountOfCodes * sizeof(UNWIND_CODE)))
         {
-            WARN("Couldn't read unwind_code at %lx\n", base + function->UnwindData);
+            WARN("Couldn't read unwind_code at %Ix\n", base + function->UnwindData);
             return FALSE;
         }
 
         if (info->Version != 1 && info->Version != 2)
         {
-            WARN("unknown unwind info version %u at %lx\n", info->Version, base + function->UnwindData);
+            WARN("unknown unwind info version %u at %Ix\n", info->Version, base + function->UnwindData);
             return FALSE;
         }
 
@@ -625,14 +625,14 @@ static BOOL fetch_next_frame(struct cpu_stack_walk *csw, union ctx *pcontext,
     else if (dwarf2_virtual_unwind(csw, curr_pc, pcontext, &cfa))
     {
         context->Rsp = cfa;
-        TRACE("next function rip=%016lx\n", context->Rip);
-        TRACE("  rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n",
+        TRACE("next function rip=%016Ix\n", context->Rip);
+        TRACE("  rax=%016Ix rbx=%016Ix rcx=%016Ix rdx=%016Ix\n",
               context->Rax, context->Rbx, context->Rcx, context->Rdx);
-        TRACE("  rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n",
+        TRACE("  rsi=%016Ix rdi=%016Ix rbp=%016Ix rsp=%016Ix\n",
               context->Rsi, context->Rdi, context->Rbp, context->Rsp);
-        TRACE("   r8=%016lx  r9=%016lx r10=%016lx r11=%016lx\n",
+        TRACE("   r8=%016Ix  r9=%016Ix r10=%016Ix r11=%016Ix\n",
               context->R8, context->R9, context->R10, context->R11);
-        TRACE("  r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n",
+        TRACE("  r12=%016Ix r13=%016Ix r14=%016Ix r15=%016Ix\n",
               context->R12, context->R13, context->R14, context->R15);
         return TRUE;
     }
diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c
index d854f6287a0..6d775b633f8 100644
--- a/dlls/dbghelp/dbghelp.c
+++ b/dlls/dbghelp/dbghelp.c
@@ -137,11 +137,11 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr)
     case AddrModeFlat:
         return wine_dbg_sprintf("flat<%s>", wine_dbgstr_longlong(addr->Offset));
     case AddrMode1616:
-        return wine_dbg_sprintf("1616<%04x:%04x>", addr->Segment, (DWORD)addr->Offset);
+        return wine_dbg_sprintf("1616<%04x:%04lx>", addr->Segment, (DWORD)addr->Offset);
     case AddrMode1632:
-        return wine_dbg_sprintf("1632<%04x:%08x>", addr->Segment, (DWORD)addr->Offset);
+        return wine_dbg_sprintf("1632<%04x:%08lx>", addr->Segment, (DWORD)addr->Offset);
     case AddrModeReal:
-        return wine_dbg_sprintf("real<%04x:%04x>", addr->Segment, (DWORD)addr->Offset);
+        return wine_dbg_sprintf("real<%04x:%04lx>", addr->Segment, (DWORD)addr->Offset);
     default:
         return "unknown";
     }
@@ -409,9 +409,9 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64)
 
     if (!base) return FALSE;
 
-    TRACE("got debug info address %#lx from PEB %p\n", base, pbi.PebBaseAddress);
+    TRACE("got debug info address %#Ix from PEB %p\n", base, pbi.PebBaseAddress);
     if (!elf_read_wine_loader_dbg_info(pcs, base) && !macho_read_wine_loader_dbg_info(pcs, base))
-        WARN("couldn't load process debug info at %#lx\n", base);
+        WARN("couldn't load process debug info at %#Ix\n", base);
     return TRUE;
 }
 
@@ -688,7 +688,7 @@ BOOL WINAPI SymSetScopeFromIndex(HANDLE hProcess, ULONG64 addr, DWORD index)
     struct module_pair pair;
     struct symt* sym;
 
-    TRACE("(%p %#I64x %u)\n", hProcess, addr, index);
+    TRACE("(%p %#I64x %lu)\n", hProcess, addr, index);
 
     if (!module_init_pair(&pair, hProcess, addr)) return FALSE;
     sym = symt_index2ptr(pair.effective, index);
@@ -708,7 +708,7 @@ BOOL WINAPI SymSetScopeFromInlineContext(HANDLE hProcess, ULONG64 addr, DWORD in
     struct module_pair pair;
     struct symt_inlinesite* inlined;
 
-    TRACE("(%p %I64x %x)\n", hProcess, addr, inlinectx);
+    TRACE("(%p %I64x %lx)\n", hProcess, addr, inlinectx);
 
     switch (IFC_MODE(inlinectx))
     {
@@ -770,7 +770,7 @@ static BOOL CALLBACK reg_cb64to32(HANDLE hProcess, ULONG action, ULONG64 data, U
     case CBA_EVENT:
     case CBA_READ_MEMORY:
     default:
-        FIXME("No mapping for action %u\n", action);
+        FIXME("No mapping for action %lu\n", action);
         return FALSE;
     }
     return pcs->reg_cb32(hProcess, action, data32, (PVOID)(DWORD_PTR)user);
@@ -783,7 +783,7 @@ BOOL pcs_callback(const struct process* pcs, ULONG action, void* data)
 {
     IMAGEHLP_DEFERRED_SYMBOL_LOAD64 idsl;
 
-    TRACE("%p %u %p\n", pcs, action, data);
+    TRACE("%p %lu %p\n", pcs, action, data);
 
     if (!pcs->reg_cb) return FALSE;
     if (!pcs->reg_is_unicode)
@@ -815,7 +815,7 @@ BOOL pcs_callback(const struct process* pcs, ULONG action, void* data)
         case CBA_EVENT:
         case CBA_READ_MEMORY:
         default:
-            FIXME("No mapping for action %u\n", action);
+            FIXME("No mapping for action %lu\n", action);
             return FALSE;
         }
     }
diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index fc88b741a56..5cc105d35c9 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -462,7 +462,7 @@ static void dwarf2_parse_abbrev_set(dwarf2_traverse_context_t* abbrev_ctx,
     {
         TRACE("now at %s\n", dwarf2_debug_traverse_ctx(abbrev_ctx)); 
         entry_code = dwarf2_leb128_as_unsigned(abbrev_ctx);
-        TRACE("found entry_code %lu\n", entry_code);
+        TRACE("found entry_code %Iu\n", entry_code);
         if (!entry_code)
         {
             TRACE("NULL entry code at %s\n", dwarf2_debug_traverse_ctx(abbrev_ctx)); 
@@ -477,7 +477,7 @@ static void dwarf2_parse_abbrev_set(dwarf2_traverse_context_t* abbrev_ctx,
         abbrev_entry->attrs      = NULL;
         abbrev_entry->num_attr   = 0;
 
-        TRACE("table:(%p,#%u) entry_code(%lu) tag(0x%lx) have_child(%u) -> %p\n",
+        TRACE("table:(%p,#%u) entry_code(%Iu) tag(0x%Ix) have_child(%u) -> %p\n",
               abbrev_table, sparse_array_length(abbrev_table),
               entry_code, abbrev_entry->tag, abbrev_entry->have_child, abbrev_entry);
 
@@ -509,7 +509,7 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx,
 {
     unsigned    step;
 
-    TRACE("(attr:0x%lx,form:0x%lx)\n", abbrev_attr->attribute, abbrev_attr->form);
+    TRACE("(attr:0x%Ix,form:0x%Ix)\n", abbrev_attr->attribute, abbrev_attr->form);
 
     switch (abbrev_attr->form)
     {
@@ -539,7 +539,7 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx,
     case DW_FORM_GNU_strp_alt:
     case DW_FORM_strp:   step = head->offset_size; break;
     default:
-        FIXME("Unhandled attribute form %lx\n", abbrev_attr->form);
+        FIXME("Unhandled attribute form %Ix\n", abbrev_attr->form);
         return;
     }
     ctx->data += step;
@@ -558,17 +558,17 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx,
             attr->u.uvalue = dwarf2_get_addr(data, ctx->head.offset_size);
         else
             attr->u.uvalue = dwarf2_get_addr(data, ctx->head.word_size);
-        TRACE("addr<0x%lx>\n", attr->u.uvalue);
+        TRACE("addr<0x%Ix>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_addr:
         attr->u.uvalue = dwarf2_get_addr(data, ctx->head.word_size);
-        TRACE("addr<0x%lx>\n", attr->u.uvalue);
+        TRACE("addr<0x%Ix>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_flag:
         attr->u.uvalue = dwarf2_get_byte(data);
-        TRACE("flag<0x%lx>\n", attr->u.uvalue);
+        TRACE("flag<0x%Ix>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_flag_present:
@@ -578,17 +578,17 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx,
 
     case DW_FORM_data1:
         attr->u.uvalue = dwarf2_get_byte(data);
-        TRACE("data1<%lu>\n", attr->u.uvalue);
+        TRACE("data1<%Iu>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_data2:
         attr->u.uvalue = dwarf2_get_u2(data);
-        TRACE("data2<%lu>\n", attr->u.uvalue);
+        TRACE("data2<%Iu>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_data4:
         attr->u.uvalue = dwarf2_get_u4(data);
-        TRACE("data4<%lu>\n", attr->u.uvalue);
+        TRACE("data4<%Iu>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_data8:
@@ -598,17 +598,17 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx,
 
     case DW_FORM_ref1:
         attr->u.uvalue = ctx->ref_offset + dwarf2_get_byte(data);
-        TRACE("ref1<0x%lx>\n", attr->u.uvalue);
+        TRACE("ref1<0x%Ix>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_ref2:
         attr->u.uvalue = ctx->ref_offset + dwarf2_get_u2(data);
-        TRACE("ref2<0x%lx>\n", attr->u.uvalue);
+        TRACE("ref2<0x%Ix>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_ref4:
         attr->u.uvalue = ctx->ref_offset + dwarf2_get_u4(data);
-        TRACE("ref4<0x%lx>\n", attr->u.uvalue);
+        TRACE("ref4<0x%Ix>\n", attr->u.uvalue);
         break;
     
     case DW_FORM_ref8:
@@ -621,12 +621,12 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx,
 
     case DW_FORM_ref_udata:
         attr->u.uvalue = ctx->ref_offset + dwarf2_get_leb128_as_unsigned(data, NULL);
-        TRACE("ref_udata<0x%lx>\n", attr->u.uvalue);
+        TRACE("ref_udata<0x%Ix>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_udata:
         attr->u.uvalue = dwarf2_get_leb128_as_unsigned(data, NULL);
-        TRACE("udata<0x%lx>\n", attr->u.uvalue);
+        TRACE("udata<0x%Ix>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_string:
@@ -639,7 +639,7 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx,
             ULONG_PTR ofs = dwarf2_get_addr(data, ctx->head.offset_size);
             if (ofs >= ctx->module_ctx->sections[section_string].size)
             {
-                ERR("Out of bounds string offset (%08lx)\n", ofs);
+                ERR("Out of bounds string offset (%08Ix)\n", ofs);
                 attr->u.string = "<<outofbounds-strp>>";
             }
             else
@@ -687,7 +687,7 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx,
             return FALSE;
         }
         attr->u.uvalue = dwarf2_get_addr(data, ctx->head.offset_size);
-        TRACE("ref_alt<0x%lx>\n", attr->u.uvalue);
+        TRACE("ref_alt<0x%Ix>\n", attr->u.uvalue);
         break;
 
     case DW_FORM_GNU_strp_alt:
@@ -701,7 +701,7 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx,
             }
             else
             {
-                ERR("out of bounds strp_alt: 0x%lx 0x%x (%u)\n", ofs, ctx->module_ctx->dwz->sections[section_string].size, ctx->head.offset_size);
+                ERR("out of bounds strp_alt: 0x%Ix 0x%x (%u)\n", ofs, ctx->module_ctx->dwz->sections[section_string].size, ctx->head.offset_size);
                 attr->u.string = "<<outofbounds-strpalt>>";
             }
         }
@@ -713,7 +713,7 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx,
         break;
 
     default:
-        FIXME("Unhandled attribute form %lx\n", abbrev_attr->form);
+        FIXME("Unhandled attribute form %Ix\n", abbrev_attr->form);
         break;
     }
     return TRUE;
@@ -744,7 +744,7 @@ static BOOL dwarf2_find_attribute(const dwarf2_debug_info_t* di,
                 at != DW_AT_sibling)
             {
                 if (ref_abbrev_attr)
-                    FIXME("two references %lx and %lx\n", ref_abbrev_attr->attribute, abbrev_attr->attribute);
+                    FIXME("two references %Ix and %Ix\n", ref_abbrev_attr->attribute, abbrev_attr->attribute);
                 ref_abbrev_attr = abbrev_attr;
                 refidx = i;
                 attr->gotten_from = (abbrev_attr->attribute == DW_AT_abstract_origin) ?
@@ -846,7 +846,7 @@ compute_location(const struct module *module, const dwarf2_cuhead_t* head,
             {
                 DWORD   cvreg = dwarf2_map_register(op - DW_OP_reg0, module);
                 if (loc->reg != Wine_DW_no_register)
-                    FIXME("Only supporting one reg (%s/%d -> %s/%d)\n",
+                    FIXME("Only supporting one reg (%s/%d -> %s/%ld)\n",
                           module->cpu->fetch_regname(loc->reg), loc->reg,
                           module->cpu->fetch_regname(cvreg), cvreg);
                 loc->reg = cvreg;
@@ -863,7 +863,7 @@ compute_location(const struct module *module, const dwarf2_cuhead_t* head,
             {
                 DWORD   cvreg = dwarf2_map_register(op - DW_OP_breg0, module);
                 if (loc->reg != Wine_DW_no_register)
-                    FIXME("Only supporting one breg (%s/%d -> %s/%d)\n",
+                    FIXME("Only supporting one breg (%s/%d -> %s/%ld)\n",
                           module->cpu->fetch_regname(loc->reg), loc->reg,
                           module->cpu->fetch_regname(cvreg), cvreg);
                 loc->reg = cvreg;
@@ -985,7 +985,7 @@ compute_location(const struct module *module, const dwarf2_cuhead_t* head,
 
                 if (!ReadProcessMemory(hproc, (void*)addr, &deref, head->word_size, NULL))
                 {
-                    WARN("Couldn't read memory at %lx\n", addr);
+                    WARN("Couldn't read memory at %Ix\n", addr);
                     return loc_err_cant_read;
                 }
                 stack[++stk] = deref;
@@ -1014,7 +1014,7 @@ compute_location(const struct module *module, const dwarf2_cuhead_t* head,
 
                 if (!ReadProcessMemory(hproc, (void*)addr, &deref, derefsize, NULL))
                 {
-                    WARN("Couldn't read memory at %lx\n", addr);
+                    WARN("Couldn't read memory at %Ix\n", addr);
                        return loc_err_cant_read;
                 }
 
@@ -1094,7 +1094,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx,
     case DW_FORM_block4:
     case DW_FORM_exprloc:
         break;
-    default: FIXME("Unsupported yet form %lx\n", xloc.form);
+    default: FIXME("Unsupported yet form %Ix\n", xloc.form);
         return FALSE;
     }
 
@@ -1153,7 +1153,7 @@ static struct symt* dwarf2_lookup_type(const dwarf2_debug_info_t* di)
         dwarf2_load_one_entry(type);
         if (!type->symt)
         {
-            FIXME("Unable to load forward reference for tag %lx\n", type->abbrev->tag);
+            FIXME("Unable to load forward reference for tag %Ix\n", type->abbrev->tag);
             return di->unit_ctx->module_ctx->symt_cache[sc_unknown];
         }
     }
@@ -1249,7 +1249,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in
             if (high > *phigh) *phigh = high;
         }
         if (*plow == UMAX || *phigh == 0) {FIXME("no entry found\n"); return FALSE;}
-        if (*plow == *phigh) {WARN("entry found, but low=high %lx %lx\n", low, high); return FALSE;}
+        if (*plow == *phigh) {WARN("entry found, but low=high %Ix %Ix\n", low, high); return FALSE;}
 
         return TRUE;
     }
@@ -1383,7 +1383,7 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx,
 
     offset = traverse->data - ctx->module_ctx->sections[ctx->section].address;
     entry_code = dwarf2_leb128_as_unsigned(traverse);
-    TRACE("found entry_code %lu at 0x%lx\n", entry_code, offset);
+    TRACE("found entry_code %Iu at 0x%Ix\n", entry_code, offset);
     if (!entry_code)
     {
         *pdi = NULL;
@@ -1392,7 +1392,7 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx,
     abbrev = dwarf2_abbrev_table_find_entry(&ctx->abbrev_table, entry_code);
     if (!abbrev)
     {
-	WARN("Cannot find abbrev entry for %lu at 0x%lx\n", entry_code, offset);
+	WARN("Cannot find abbrev entry for %Iu at 0x%Ix\n", entry_code, offset);
 	return FALSE;
     }
     di = sparse_array_add(&ctx->debug_info_table, offset, &ctx->pool);
@@ -1429,11 +1429,11 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx,
     {
         if (sibling.u.uvalue >= ctx->module_ctx->sections[ctx->section].size)
         {
-            FIXME("cursor sibling after section end %s: 0x%lx 0x%x\n",
+            FIXME("cursor sibling after section end %s: 0x%Ix 0x%x\n",
                   dwarf2_debug_unit_ctx(ctx), sibling.u.uvalue, ctx->module_ctx->sections[ctx->section].size);
             return FALSE;
         }
-        WARN("setting cursor for %s to next sibling <0x%lx>\n",
+        WARN("setting cursor for %s to next sibling <0x%Ix>\n",
              dwarf2_debug_traverse_ctx(traverse), sibling.u.uvalue);
         traverse->data = ctx->module_ctx->sections[ctx->section].address + sibling.u.uvalue;
     }
@@ -1535,8 +1535,8 @@ static struct symt* dwarf2_parse_subrange_type(dwarf2_debug_info_t* di)
     TRACE("%s\n", dwarf2_debug_di(di));
 
     if (dwarf2_find_attribute(di, DW_AT_name, &name)) FIXME("Found name for subrange %s\n", name.u.string);
-    if (dwarf2_find_attribute(di, DW_AT_byte_size, &dummy)) FIXME("Found byte_size %lu\n", dummy.u.uvalue);
-    if (dwarf2_find_attribute(di, DW_AT_bit_size, &dummy)) FIXME("Found bit_size %lu\n", dummy.u.uvalue);
+    if (dwarf2_find_attribute(di, DW_AT_byte_size, &dummy)) FIXME("Found byte_size %Iu\n", dummy.u.uvalue);
+    if (dwarf2_find_attribute(di, DW_AT_bit_size, &dummy)) FIXME("Found bit_size %Iu\n", dummy.u.uvalue);
     /* for now, we don't support the byte_size nor bit_size about the subrange, and pretend the two
      * types are the same (FIXME)
      */
@@ -1608,7 +1608,7 @@ static struct symt* dwarf2_parse_array_type(dwarf2_debug_info_t* di)
             }
             break;
         default:
-            FIXME("Unhandled Tag type 0x%lx at %s\n",
+            FIXME("Unhandled Tag type 0x%Ix at %s\n",
                   child->abbrev->tag, dwarf2_debug_di(di));
             break;
         }
@@ -1725,7 +1725,7 @@ static void dwarf2_parse_udt_member(dwarf2_debug_info_t* di,
             loc.offset = 0;
         }
         else
-            TRACE("found member_location at %s -> %lu\n",
+            TRACE("found member_location at %s -> %Iu\n",
                   dwarf2_debug_di(di), loc.offset);
     }
     else
@@ -1828,7 +1828,7 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_debug_info_t* di,
             /* FIXME: some C++ related stuff */
             break;
         default:
-            FIXME("Unhandled Tag type 0x%lx at %s\n",
+            FIXME("Unhandled Tag type 0x%Ix at %s\n",
                   child->abbrev->tag, dwarf2_debug_di(di));
             break;
         }
@@ -1900,7 +1900,7 @@ static struct symt* dwarf2_parse_enumeration_type(dwarf2_debug_info_t* di)
                 dwarf2_parse_enumerator(child, (struct symt_enum*)di->symt);
             break;
         default:
-            FIXME("Unhandled Tag type 0x%lx at %s\n",
+            FIXME("Unhandled Tag type 0x%Ix at %s\n",
                   di->abbrev->tag, dwarf2_debug_di(di));
 	}
     }
@@ -1945,7 +1945,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm,
     {
         struct attribute ext;
 
-	TRACE("found parameter %s (kind=%d, offset=%ld, reg=%d) at %s\n",
+	TRACE("found parameter %s (kind=%d, offset=%Id, reg=%d) at %s\n",
               debugstr_a(name.u.string), loc.kind, loc.offset, loc.reg,
               dwarf2_debug_unit_ctx(subpgm->ctx));
 
@@ -2032,7 +2032,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm,
             break;
 
         default:
-            FIXME("Unsupported form for const value %s (%lx)\n",
+            FIXME("Unsupported form for const value %s (%Ix)\n",
                   debugstr_a(name.u.string), value.form);
             V_VT(&v) = VT_EMPTY;
         }
@@ -2178,7 +2178,7 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm,
             /* this isn't properly supported by dbghelp interface. skip it for now */
             break;
         default:
-            FIXME("Unhandled Tag type 0x%lx at %s\n",
+            FIXME("Unhandled Tag type 0x%Ix at %s\n",
                   child->abbrev->tag, dwarf2_debug_di(di));
         }
     }
@@ -2259,7 +2259,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm,
             /* the type referred to will be loaded when we need it, so skip it */
             break;
         default:
-            FIXME("Unhandled Tag type 0x%lx at %s\n",
+            FIXME("Unhandled Tag type 0x%Ix at %s\n",
                   child->abbrev->tag, dwarf2_debug_di(di));
         }
     }
@@ -2299,7 +2299,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di)
         inline_flags.gotten_from == attr_direct &&
         inline_flags.u.uvalue != DW_INL_not_inlined)
     {
-        TRACE("Function %s declared as inlined (%ld)... skipping\n",
+        TRACE("Function %s declared as inlined (%Id)... skipping\n",
               debugstr_a(name.u.string), inline_flags.u.uvalue);
         return NULL;
     }
@@ -2396,7 +2396,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di)
             /* FIXME: no support in dbghelp's internals so far */
             break;
         default:
-            FIXME("Unhandled Tag type 0x%lx at %s\n",
+            FIXME("Unhandled Tag type 0x%Ix at %s\n",
                   child->abbrev->tag, dwarf2_debug_di(di));
 	}
     }
@@ -2567,7 +2567,7 @@ static void dwarf2_load_one_entry(dwarf2_debug_info_t* di)
     case DW_TAG_ptr_to_member_type:
         break;
     default:
-        FIXME("Unhandled Tag type 0x%lx at %s\n",
+        FIXME("Unhandled Tag type 0x%Ix at %s\n",
               di->abbrev->tag, dwarf2_debug_di(di));
     }
 }
@@ -2582,7 +2582,7 @@ static void dwarf2_set_line_number(struct module* module, ULONG_PTR address,
 
     if (!file || !(psrc = vector_at(v, file - 1))) return;
 
-    TRACE("%s %lx %s %u\n",
+    TRACE("%s %Ix %s %u\n",
           debugstr_w(module->modulename), address, debugstr_a(source_get(module, *psrc)), line);
     symt = symt_find_nearest(module, address);
     if (symt_check_tag(&symt->symt, SymTagFunction))
@@ -2699,7 +2699,7 @@ static BOOL dwarf2_parse_line_numbers(dwarf2_parse_context_t* ctx,
         mod_time = dwarf2_leb128_as_unsigned(&traverse);
         length = dwarf2_leb128_as_unsigned(&traverse);
         dir = *(const char**)vector_at(&dirs, dir_index);
-        TRACE("Got file %s/%s (%u,%lu)\n", debugstr_a(dir), debugstr_a(name), mod_time, length);
+        TRACE("Got file %s/%s (%u,%Iu)\n", debugstr_a(dir), debugstr_a(name), mod_time, length);
         psrc = vector_add(&files, &ctx->pool);
         *psrc = source_new(ctx->module_ctx->module, dir, name);
     }
@@ -2833,7 +2833,7 @@ static dwarf2_parse_context_t* dwarf2_locate_cu(dwarf2_parse_module_context_t* m
         if (where >= ctx->traverse_DIE.data && where < ctx->traverse_DIE.end_data)
             return ctx;
     }
-    FIXME("Couldn't find ref 0x%lx inside sect\n", ref);
+    FIXME("Couldn't find ref 0x%Ix inside sect\n", ref);
     return NULL;
 }
 
@@ -2859,9 +2859,9 @@ static BOOL dwarf2_parse_compilation_unit_head(dwarf2_parse_context_t* ctx,
 
     TRACE("Compilation Unit Header found at 0x%x:\n",
           (int)(comp_unit_start - ctx->module_ctx->sections[section_debug].address));
-    TRACE("- length:        %lu\n", cu_length);
+    TRACE("- length:        %Iu\n", cu_length);
     TRACE("- version:       %u\n",  ctx->head.version);
-    TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset);
+    TRACE("- abbrev_offset: %Iu\n", cu_abbrev_offset);
     TRACE("- word_size:     %u\n",  ctx->head.word_size);
     TRACE("- offset_size:   %u\n",  ctx->head.offset_size);
 
@@ -2876,7 +2876,7 @@ static BOOL dwarf2_parse_compilation_unit_head(dwarf2_parse_context_t* ctx,
 
     if (ctx->head.version < 2 || ctx->head.version > max_supported_dwarf_version)
     {
-        WARN("DWARF version %d isn't supported. Wine dbghelp only supports DWARF 2 up to %u.\n",
+        WARN("DWARF version %d isn't supported. Wine dbghelp only supports DWARF 2 up to %lu.\n",
              ctx->head.version, max_supported_dwarf_version);
         return FALSE;
     }
@@ -2952,7 +2952,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx)
             ctx->status = UNIT_LOADED;
             ret = TRUE;
         }
-        else FIXME("Should have a compilation unit here %lu\n", di->abbrev->tag);
+        else FIXME("Should have a compilation unit here %Iu\n", di->abbrev->tag);
     }
     if (ctx->status == UNIT_BEINGLOADED) ctx->status = UNIT_LOADED_FAIL;
     return ret;
@@ -3286,7 +3286,7 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt
 
 static int valid_reg(ULONG_PTR reg)
 {
-    if (reg >= NB_FRAME_REGS) FIXME("unsupported reg %lx\n", reg);
+    if (reg >= NB_FRAME_REGS) FIXME("unsupported reg %Ix\n", reg);
     return (reg < NB_FRAME_REGS);
 }
 
@@ -3304,7 +3304,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
             case DW_CFA_advance_loc:
             {
                 ULONG_PTR offset = (op & 0x3f) * info->code_align;
-                TRACE("%lx: DW_CFA_advance_loc %lu\n", info->ip, offset);
+                TRACE("%Ix: DW_CFA_advance_loc %Iu\n", info->ip, offset);
                 info->ip += offset;
                 break;
             }
@@ -3313,7 +3313,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
                 ULONG_PTR reg = op & 0x3f;
                 LONG_PTR offset = dwarf2_leb128_as_unsigned(ctx) * info->data_align;
                 if (!valid_reg(reg)) break;
-                TRACE("%lx: DW_CFA_offset %s, %ld\n",
+                TRACE("%Ix: DW_CFA_offset %s, %Id\n",
                       info->ip,
                       module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg, module, TRUE)),
                       offset);
@@ -3325,7 +3325,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
             {
                 ULONG_PTR reg = op & 0x3f;
                 if (!valid_reg(reg)) break;
-                TRACE("%lx: DW_CFA_restore %s\n",
+                TRACE("%Ix: DW_CFA_restore %s\n",
                       info->ip,
                       module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg, module, TRUE)));
                 info->state.rules[reg] = RULE_UNSET;
@@ -3341,28 +3341,28 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
         {
             ULONG_PTR loc = dwarf2_parse_augmentation_ptr(ctx, info->fde_encoding,
                                                           module->format_info[DFI_DWARF]->u.dwarf2_info->word_size);
-            TRACE("%lx: DW_CFA_set_loc %lx\n", info->ip, loc);
+            TRACE("%Ix: DW_CFA_set_loc %Ix\n", info->ip, loc);
             info->ip = loc;
             break;
         }
         case DW_CFA_advance_loc1:
         {
             ULONG_PTR offset = dwarf2_parse_byte(ctx) * info->code_align;
-            TRACE("%lx: DW_CFA_advance_loc1 %lu\n", info->ip, offset);
+            TRACE("%Ix: DW_CFA_advance_loc1 %Iu\n", info->ip, offset);
             info->ip += offset;
             break;
         }
         case DW_CFA_advance_loc2:
         {
             ULONG_PTR offset = dwarf2_parse_u2(ctx) * info->code_align;
-            TRACE("%lx: DW_CFA_advance_loc2 %lu\n", info->ip, offset);
+            TRACE("%Ix: DW_CFA_advance_loc2 %Iu\n", info->ip, offset);
             info->ip += offset;
             break;
         }
         case DW_CFA_advance_loc4:
         {
             ULONG_PTR offset = dwarf2_parse_u4(ctx) * info->code_align;
-            TRACE("%lx: DW_CFA_advance_loc4 %lu\n", info->ip, offset);
+            TRACE("%Ix: DW_CFA_advance_loc4 %Iu\n", info->ip, offset);
             info->ip += offset;
             break;
         }
@@ -3373,7 +3373,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
             LONG_PTR offset = (op == DW_CFA_offset_extended) ? dwarf2_leb128_as_unsigned(ctx) * info->data_align
                                                              : dwarf2_leb128_as_signed(ctx) * info->data_align;
             if (!valid_reg(reg)) break;
-            TRACE("%lx: DW_CFA_offset_extended %s, %ld\n",
+            TRACE("%Ix: DW_CFA_offset_extended %s, %Id\n",
                   info->ip,
                   module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg, module, TRUE)),
                   offset);
@@ -3385,7 +3385,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
         {
             ULONG_PTR reg = dwarf2_leb128_as_unsigned(ctx);
             if (!valid_reg(reg)) break;
-            TRACE("%lx: DW_CFA_restore_extended %s\n",
+            TRACE("%Ix: DW_CFA_restore_extended %s\n",
                   info->ip,
                   module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg, module, TRUE)));
             info->state.rules[reg] = RULE_UNSET;
@@ -3395,7 +3395,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
         {
             ULONG_PTR reg = dwarf2_leb128_as_unsigned(ctx);
             if (!valid_reg(reg)) break;
-            TRACE("%lx: DW_CFA_undefined %s\n",
+            TRACE("%Ix: DW_CFA_undefined %s\n",
                   info->ip,
                   module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg, module, TRUE)));
             info->state.rules[reg] = RULE_UNDEFINED;
@@ -3405,7 +3405,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
         {
             ULONG_PTR reg = dwarf2_leb128_as_unsigned(ctx);
             if (!valid_reg(reg)) break;
-            TRACE("%lx: DW_CFA_same_value %s\n",
+            TRACE("%Ix: DW_CFA_same_value %s\n",
                   info->ip,
                   module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg, module, TRUE)));
             info->state.regs[reg]  = reg;
@@ -3417,7 +3417,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
             ULONG_PTR reg = dwarf2_leb128_as_unsigned(ctx);
             ULONG_PTR reg2 = dwarf2_leb128_as_unsigned(ctx);
             if (!valid_reg(reg) || !valid_reg(reg2)) break;
-            TRACE("%lx: DW_CFA_register %s == %s\n",
+            TRACE("%Ix: DW_CFA_register %s == %s\n",
                   info->ip,
                   module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg, module, TRUE)),
                   module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg2, module, TRUE)));
@@ -3426,16 +3426,16 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
             break;
         }
         case DW_CFA_remember_state:
-            TRACE("%lx: DW_CFA_remember_state\n", info->ip);
+            TRACE("%Ix: DW_CFA_remember_state\n", info->ip);
             if (info->state_sp >= MAX_SAVED_STATES)
-                FIXME("%lx: DW_CFA_remember_state too many nested saves\n", info->ip);
+                FIXME("%Ix: DW_CFA_remember_state too many nested saves\n", info->ip);
             else
                 info->state_stack[info->state_sp++] = info->state;
             break;
         case DW_CFA_restore_state:
-            TRACE("%lx: DW_CFA_restore_state\n", info->ip);
+            TRACE("%Ix: DW_CFA_restore_state\n", info->ip);
             if (!info->state_sp)
-                FIXME("%lx: DW_CFA_restore_state without corresponding save\n", info->ip);
+                FIXME("%Ix: DW_CFA_restore_state without corresponding save\n", info->ip);
             else
                 info->state = info->state_stack[--info->state_sp];
             break;
@@ -3446,7 +3446,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
             ULONG_PTR offset = (op == DW_CFA_def_cfa) ? dwarf2_leb128_as_unsigned(ctx)
                                                       : dwarf2_leb128_as_signed(ctx) * info->data_align;
             if (!valid_reg(reg)) break;
-            TRACE("%lx: DW_CFA_def_cfa %s, %ld\n",
+            TRACE("%Ix: DW_CFA_def_cfa %s, %Id\n",
                   info->ip,
                   module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg, module, TRUE)),
                   offset);
@@ -3459,7 +3459,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
         {
             ULONG_PTR reg = dwarf2_leb128_as_unsigned(ctx);
             if (!valid_reg(reg)) break;
-            TRACE("%lx: DW_CFA_def_cfa_register %s\n",
+            TRACE("%Ix: DW_CFA_def_cfa_register %s\n",
                   info->ip,
                   module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg, module, TRUE)));
             info->state.cfa_reg  = reg;
@@ -3471,7 +3471,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
         {
             ULONG_PTR offset = (op == DW_CFA_def_cfa_offset) ? dwarf2_leb128_as_unsigned(ctx)
                                                              : dwarf2_leb128_as_signed(ctx) * info->data_align;
-            TRACE("%lx: DW_CFA_def_cfa_offset %ld\n", info->ip, offset);
+            TRACE("%Ix: DW_CFA_def_cfa_offset %Id\n", info->ip, offset);
             info->state.cfa_offset = offset;
             info->state.cfa_rule   = RULE_CFA_OFFSET;
             break;
@@ -3480,7 +3480,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
         {
             ULONG_PTR expr = (ULONG_PTR)ctx->data;
             ULONG_PTR len = dwarf2_leb128_as_unsigned(ctx);
-            TRACE("%lx: DW_CFA_def_cfa_expression %lx-%lx\n", info->ip, expr, expr+len);
+            TRACE("%Ix: DW_CFA_def_cfa_expression %Ix-%Ix\n", info->ip, expr, expr+len);
             info->state.cfa_offset = expr;
             info->state.cfa_rule   = RULE_VAL_EXPRESSION;
             ctx->data += len;
@@ -3493,7 +3493,7 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
             ULONG_PTR expr = (ULONG_PTR)ctx->data;
             ULONG_PTR len = dwarf2_leb128_as_unsigned(ctx);
             if (!valid_reg(reg)) break;
-            TRACE("%lx: DW_CFA_%sexpression %s %lx-%lx\n",
+            TRACE("%Ix: DW_CFA_%sexpression %s %Ix-%Ix\n",
                   info->ip, (op == DW_CFA_expression) ? "" : "val_",
                   module->cpu->fetch_regname(module->cpu->map_dwarf_register(reg, module, TRUE)),
                   expr, expr + len);
@@ -3506,12 +3506,12 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont
         /* FIXME: should check that GCC is the compiler for this CU */
         {
             ULONG_PTR   args = dwarf2_leb128_as_unsigned(ctx);
-            TRACE("%lx: DW_CFA_GNU_args_size %lu\n", info->ip, args);
+            TRACE("%Ix: DW_CFA_GNU_args_size %Iu\n", info->ip, args);
             /* ignored */
             break;
         }
         default:
-            FIXME("%lx: unknown CFA opcode %02x\n", info->ip, op);
+            FIXME("%Ix: unknown CFA opcode %02x\n", info->ip, op);
             break;
         }
     }
@@ -3548,7 +3548,7 @@ static void set_context_reg(const struct module* module, struct cpu_stack_walk*
 
         if (sz > sizeof(tmp))
         {
-            FIXME("register %lu/%u size is too wide: %u\n", dw_reg, regno, sz);
+            FIXME("register %Iu/%u size is too wide: %u\n", dw_reg, regno, sz);
             return;
         }
         if (!sw_read_mem(csw, val, tmp, sz))
@@ -3562,7 +3562,7 @@ static void set_context_reg(const struct module* module, struct cpu_stack_walk*
     {
         if (sz != sizeof(ULONG_PTR))
         {
-            FIXME("assigning to register %lu/%u of wrong size %u\n", dw_reg, regno, sz);
+            FIXME("assigning to register %Iu/%u of wrong size %u\n", dw_reg, regno, sz);
             return;
         }
         *ptr = val;
@@ -3582,7 +3582,7 @@ static void copy_context_reg(const struct module* module, struct cpu_stack_walk
     if (csw->cpu != module->cpu) FIXME("mismatch in cpu\n");
     if (szdst != szsrc)
     {
-        FIXME("Cannot copy register %lu/%u => %lu/%u because of size mismatch (%u => %u)\n",
+        FIXME("Cannot copy register %Iu/%u => %Iu/%u because of size mismatch (%u => %u)\n",
               dwregsrc, regsrcno, dwregdst, regdstno, szsrc, szdst);
         return;
     }
@@ -3693,7 +3693,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w
             case 2: stack[sp] = *(unsigned short*)&tmp; break;
             case 4: stack[sp] = *(unsigned int*)&tmp; break;
             case 8: stack[sp] = tmp; break; /* FIXME: won't work on 32bit platform */
-            default: FIXME("Unknown size for deref 0x%lx\n", sz);
+            default: FIXME("Unknown size for deref 0x%Ix\n", sz);
             }
             break;
         default:
@@ -3783,12 +3783,12 @@ static BOOL dwarf2_fetch_frame_info(struct module* module, struct cpu* cpu, LONG
         if (modfmt->u.dwarf2_info->debug_frame.address == IMAGE_NO_MAP ||
             !dwarf2_get_cie(ip, module, delta, &fde_ctx, &cie_ctx, info, FALSE))
         {
-            TRACE("Couldn't find information for %lx\n", ip);
+            TRACE("Couldn't find information for %Ix\n", ip);
             return FALSE;
         }
     }
 
-    TRACE("function %lx/%lx code_align %lu data_align %ld retaddr %s\n",
+    TRACE("function %Ix/%Ix code_align %Iu data_align %Id retaddr %s\n",
           ip, info->ip, info->code_align, info->data_align,
           cpu->fetch_regname(cpu->map_dwarf_register(info->retaddr_reg, module, TRUE)));
 
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index def8b444e4e..404c7c11dbb 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -162,14 +162,14 @@ static const char* elf_map_section(struct image_section_map* ism)
     size = fmap->sect[ism->sidx].shdr.sh_offset + fmap->sect[ism->sidx].shdr.sh_size - ofst;
     if (!(mapping = CreateFileMappingW(fmap->handle, NULL, PAGE_READONLY, 0, ofst + size, NULL)))
     {
-        ERR("map creation %p failed %u offset %lu %lu size %lu\n", fmap->handle, GetLastError(), ofst, ofst % 4096, size);
+        ERR("map creation %p failed %lu offset %Iu %Iu size %Iu\n", fmap->handle, GetLastError(), ofst, ofst % 4096, size);
         return IMAGE_NO_MAP;
     }
     fmap->sect[ism->sidx].mapped = MapViewOfFile(mapping, FILE_MAP_READ, 0, ofst, size);
     CloseHandle(mapping);
     if (!fmap->sect[ism->sidx].mapped)
     {
-        ERR("map %p failed %u offset %lu %lu size %lu\n", fmap->handle, GetLastError(), ofst, ofst % 4096, size);
+        ERR("map %p failed %lu offset %Iu %Iu size %Iu\n", fmap->handle, GetLastError(), ofst, ofst % 4096, size);
         return IMAGE_NO_MAP;
     }
     return fmap->sect[ism->sidx].mapped + (fmap->sect[ism->sidx].shdr.sh_offset & (sysinfo.dwAllocationGranularity - 1));
@@ -861,12 +861,12 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table
             {
                 if (((struct symt_function*)sym)->address != elf_info->elf_addr &&
                     ((struct symt_function*)sym)->address != elf_info->elf_addr + symp->st_value)
-                    FIXME("Changing address for %p/%s!%s from %08lx to %s\n",
+                    FIXME("Changing address for %p/%s!%s from %08Ix to %s\n",
                           sym, debugstr_w(module->modulename), sym->hash_elt.name,
                           ((struct symt_function*)sym)->address,
                           wine_dbgstr_longlong(elf_info->elf_addr + symp->st_value));
                 if (((struct symt_function*)sym)->size && ((struct symt_function*)sym)->size != symp->st_size)
-                    FIXME("Changing size for %p/%s!%s from %08lx to %08x\n",
+                    FIXME("Changing size for %p/%s!%s from %08Ix to %08x\n",
                           sym, debugstr_w(module->modulename), sym->hash_elt.name,
                           ((struct symt_function*)sym)->size, (unsigned int)symp->st_size);
 
@@ -890,7 +890,7 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table
                 {
                     if (((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr &&
                         ((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr + symp->st_value)
-                        FIXME("Changing address for %p/%s!%s from %08lx to %s\n",
+                        FIXME("Changing address for %p/%s!%s from %08Ix to %s\n",
                               sym, debugstr_w(module->modulename), sym->hash_elt.name,
                               ((struct symt_function*)sym)->address,
                               wine_dbgstr_longlong(elf_info->elf_addr + symp->st_value));
@@ -1227,12 +1227,12 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
         {
             ULONG_PTR rva_dyn = elf_get_map_rva(&ism);
 
-            TRACE("For module %s, got ELF (start=%lx dyn=%lx), link_map (start=%lx dyn=%lx)\n",
+            TRACE("For module %s, got ELF (start=%Ix dyn=%Ix), link_map (start=%Ix dyn=%Ix)\n",
                   debugstr_w(filename), (ULONG_PTR)fmap->u.elf.elf_start, rva_dyn,
                   load_offset, dyn_addr);
             if (dyn_addr && load_offset + rva_dyn != dyn_addr)
             {
-                WARN("\thave to relocate: %lx\n", dyn_addr - rva_dyn);
+                WARN("\thave to relocate: %Ix\n", dyn_addr - rva_dyn);
                 modbase = dyn_addr - rva_dyn;
             }
 	} else WARN("For module %s, no .dynamic section\n", debugstr_w(filename));
@@ -1301,7 +1301,7 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename,
     struct image_file_map       fmap;
     struct elf_map_file_data    emfd;
 
-    TRACE("Processing elf file '%s' at %08lx\n", debugstr_w(filename), load_offset);
+    TRACE("Processing elf file '%s' at %08Ix\n", debugstr_w(filename), load_offset);
 
     emfd.kind = from_file;
     emfd.u.file.filename = filename;
@@ -1667,7 +1667,7 @@ static struct module* elf_load_module(struct process* pcs, const WCHAR* name, UL
 {
     struct elf_load     el;
 
-    TRACE("(%p %s %08lx)\n", pcs, debugstr_w(name), addr);
+    TRACE("(%p %s %08Ix)\n", pcs, debugstr_w(name), addr);
 
     el.elf_info.flags = ELF_INFO_MODULE;
     el.ret = FALSE;
@@ -1770,7 +1770,7 @@ BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr)
     }
     if (!ret || !elf_info.dbg_hdr_addr) return FALSE;
 
-    TRACE("Found ELF debug header %#lx\n", elf_info.dbg_hdr_addr);
+    TRACE("Found ELF debug header %#Ix\n", elf_info.dbg_hdr_addr);
     elf_info.module->format_info[DFI_ELF]->u.elf_info->elf_loader = 1;
     module_set_module(elf_info.module, S_WineLoaderW);
     pcs->dbg_hdr_addr = elf_info.dbg_hdr_addr;
diff --git a/dlls/dbghelp/image.c b/dlls/dbghelp/image.c
index 7de0a6e23c8..a9c83849311 100644
--- a/dlls/dbghelp/image.c
+++ b/dlls/dbghelp/image.c
@@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(HANDLE FileHandle, PCSTR FileName,
                                                     PCSTR SymbolPath, ULONG ImageBase)
 {
-    FIXME("(%p, %s, %s, 0x%08x): stub\n", FileHandle, FileName, SymbolPath, ImageBase);
+    FIXME("(%p, %s, %s, 0x%08lx): stub\n", FileHandle, FileName, SymbolPath, ImageBase);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return NULL;
 }
diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c
index 50ae32bc826..b90f248b15d 100644
--- a/dlls/dbghelp/macho_module.c
+++ b/dlls/dbghelp/macho_module.c
@@ -242,24 +242,24 @@ static const char* macho_map_range(const struct macho_file_map* fmap, ULONG_PTR
     const void*     aligned_ptr;
     HANDLE          mapping;
 
-    TRACE("(%p/%p, 0x%08lx, 0x%08lx)\n", fmap, fmap->handle, offset, len);
+    TRACE("(%p/%p, 0x%08Ix, 0x%08Ix)\n", fmap, fmap->handle, offset, len);
 
     macho_calc_range(fmap, offset, len, &aligned_offset, &aligned_map_end, &misalign);
 
     if (!(mapping = CreateFileMappingW(fmap->handle, NULL, PAGE_READONLY, 0, 0, NULL)))
     {
-        ERR("map creation %p failed %u size %lu\n", fmap->handle, GetLastError(), aligned_map_end);
+        ERR("map creation %p failed %lu size %Iu\n", fmap->handle, GetLastError(), aligned_map_end);
         return IMAGE_NO_MAP;
     }
     aligned_ptr = MapViewOfFile(mapping, FILE_MAP_READ, 0, aligned_offset, aligned_map_end - aligned_offset);
     CloseHandle(mapping);
     if (!aligned_ptr)
     {
-        ERR("map failed %u\n", GetLastError());
+        ERR("map failed %lu\n", GetLastError());
         return IMAGE_NO_MAP;
     }
 
-    TRACE("Mapped (0x%08lx - 0x%08lx) to %p\n", aligned_offset, aligned_map_end, aligned_ptr);
+    TRACE("Mapped (0x%08Ix - 0x%08Ix) to %p\n", aligned_offset, aligned_map_end, aligned_ptr);
 
     if (base)
         *base = aligned_ptr;
@@ -274,7 +274,7 @@ static const char* macho_map_range(const struct macho_file_map* fmap, ULONG_PTR
 static void macho_unmap_range(const char** base, const void** mapped, const struct macho_file_map* fmap,
                               ULONG_PTR offset, ULONG_PTR len)
 {
-    TRACE("(%p, %p, %p/%p, 0x%08lx, 0x%08lx)\n", base, mapped, fmap, fmap->handle, offset, len);
+    TRACE("(%p, %p, %p/%p, 0x%08Ix, 0x%08Ix)\n", base, mapped, fmap, fmap->handle, offset, len);
 
     if ((mapped && *mapped != IMAGE_NO_MAP) || (base && *base != IMAGE_NO_MAP))
     {
@@ -311,7 +311,7 @@ static BOOL macho_map_ranges(const struct macho_file_map* fmap,
     ULONG_PTR aligned_offset1, aligned_map_end1;
     ULONG_PTR aligned_offset2, aligned_map_end2;
 
-    TRACE("(%p/%p, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, %p, %p)\n", fmap, fmap->handle,
+    TRACE("(%p/%p, 0x%08Ix, 0x%08Ix, 0x%08Ix, 0x%08Ix, %p, %p)\n", fmap, fmap->handle,
             offset1, len1, offset2, len2, mapped1, mapped2);
 
     macho_calc_range(fmap, offset1, len1, &aligned_offset1, &aligned_map_end1, NULL);
@@ -363,7 +363,7 @@ static void macho_unmap_ranges(const struct macho_file_map* fmap,
     ULONG_PTR       aligned_offset1, aligned_map_end1;
     ULONG_PTR       aligned_offset2, aligned_map_end2;
 
-    TRACE("(%p/%p, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, %p/%p, %p/%p)\n", fmap, fmap->handle,
+    TRACE("(%p/%p, 0x%08Ix, 0x%08Ix, 0x%08Ix, 0x%08Ix, %p/%p, %p/%p)\n", fmap, fmap->handle,
             offset1, len1, offset2, len2, mapped1, *mapped1, mapped2, *mapped2);
 
     macho_calc_range(fmap, offset1, len1, &aligned_offset1, &aligned_map_end1, NULL);
@@ -648,9 +648,9 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct mach
         sections = (const void *)(sc + 1);
     }
 
-    TRACE("(%p/%p, %p, %p) before: 0x%08lx - 0x%08lx\n", fmap, fmap->handle, lc, user,
+    TRACE("(%p/%p, %p, %p) before: 0x%08Ix - 0x%08Ix\n", fmap, fmap->handle, lc, user,
             (ULONG_PTR)fmap->segs_start, (ULONG_PTR)fmap->segs_size);
-    TRACE("Segment command vm: 0x%08lx - 0x%08lx\n", (ULONG_PTR)vmaddr,
+    TRACE("Segment command vm: 0x%08Ix - 0x%08Ix\n", (ULONG_PTR)vmaddr,
             (ULONG_PTR)(vmaddr + vmsize));
 
     /* Images in the dyld shared cache have their segments mapped non-contiguously.
@@ -674,7 +674,7 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct mach
         tmp = (vmaddr + vmsize + page_mask) & ~page_mask;
         if (fmap->segs_size < tmp) fmap->segs_size = tmp;
 
-        TRACE("after: 0x%08lx - 0x%08lx\n", (ULONG_PTR)fmap->segs_start, (ULONG_PTR)fmap->segs_size);
+        TRACE("after: 0x%08Ix - 0x%08Ix\n", (ULONG_PTR)fmap->segs_start, (ULONG_PTR)fmap->segs_size);
     }
 
     for (i = 0; i < nsects; i++)
@@ -777,7 +777,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW,
 
     if (!ReadFile(fmap->handle, &fat_header, sizeof(fat_header), &bytes_read, NULL) || bytes_read != sizeof(fat_header))
     {
-        TRACE("failed to read fat header: %u\n", GetLastError());
+        TRACE("failed to read fat header: %lu\n", GetLastError());
         goto done;
     }
     TRACE("... got possible fat header\n");
@@ -859,7 +859,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW,
     }
 
     fmap->segs_size -= fmap->segs_start;
-    TRACE("segs_start: 0x%08lx, segs_size: 0x%08lx\n", (ULONG_PTR)fmap->segs_start,
+    TRACE("segs_start: 0x%08Ix, segs_size: 0x%08Ix\n", (ULONG_PTR)fmap->segs_start,
             (ULONG_PTR)fmap->segs_size);
 
     if (macho_enum_load_commands(ifm, MACHO_LC_UUID, find_uuid, NULL) < 0)
@@ -973,7 +973,7 @@ static void macho_stabs_def_cb(struct module* module, ULONG_PTR load_offset,
     struct macho_debug_info*    mdi = user;
     struct symtab_elt*          ste;
 
-    TRACE("(%p, 0x%08lx, %s, 0x%08lx, %d, %d, %u, %p, %p/%p/%p)\n", module, load_offset,
+    TRACE("(%p, 0x%08Ix, %s, 0x%08Ix, %d, %d, %u, %p, %p/%p/%p)\n", module, load_offset,
             debugstr_a(name), offset, is_public, is_global, sectidx,
             compiland, mdi, mdi->fmap, mdi->fmap->handle);
 
@@ -1065,7 +1065,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt
                 func = (struct symt_function*)sym;
                 if (func->address == module->format_info[DFI_MACHO]->u.macho_info->load_addr)
                 {
-                    TRACE("Adjusting function %p/%s!%s from 0x%08lx to 0x%08lx\n", func,
+                    TRACE("Adjusting function %p/%s!%s from 0x%08Ix to 0x%08Ix\n", func,
                           debugstr_w(module->modulename), sym->hash_elt.name,
                           func->address, ste->addr);
                     func->address = ste->addr;
@@ -1082,7 +1082,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt
                 case DataIsFileStatic:
                     if (data->u.var.offset == module->format_info[DFI_MACHO]->u.macho_info->load_addr)
                     {
-                        TRACE("Adjusting data symbol %p/%s!%s from 0x%08lx to 0x%08lx\n",
+                        TRACE("Adjusting data symbol %p/%s!%s from 0x%08Ix to 0x%08Ix\n",
                               data, debugstr_w(module->modulename), sym->hash_elt.name,
                               data->u.var.offset, ste->addr);
                         data->u.var.offset = ste->addr;
@@ -1154,7 +1154,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt
                 symt_get_info(module, &sym->symt, TI_GET_LENGTH,   &size);
                 symt_get_info(module, &sym->symt, TI_GET_DATAKIND, &kind);
                 if (size && kind == (ste->is_global ? DataIsGlobal : DataIsFileStatic))
-                    FIXME("Duplicate in %s: %s<%08lx> %s<%s-%s>\n",
+                    FIXME("Duplicate in %s: %s<%08Ix> %s<%s-%s>\n",
                           debugstr_w(module->modulename),
                           ste->ht_elt.name, ste->addr,
                           sym->hash_elt.name,
@@ -1462,7 +1462,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename,
     BOOL                    split_segs;
     struct image_file_map   fmap;
 
-    TRACE("(%p/%p, %s, 0x%08lx, %p/0x%08x)\n", pcs, pcs->handle, debugstr_w(filename),
+    TRACE("(%p/%p, %s, 0x%08Ix, %p/0x%08x)\n", pcs, pcs->handle, debugstr_w(filename),
             load_addr, macho_info, macho_info->flags);
 
     split_segs = image_uses_split_segs(pcs, load_addr);
@@ -1549,7 +1549,7 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam
     const WCHAR*        p;
     struct macho_load_params load_params;
 
-    TRACE("(%p/%p, %s, 0x%08lx, %p)\n", pcs, pcs->handle, debugstr_w(filename), load_addr,
+    TRACE("(%p/%p, %s, 0x%08Ix, %p)\n", pcs, pcs->handle, debugstr_w(filename), load_addr,
             macho_info);
 
     if (filename == NULL || *filename == '\0') return FALSE;
@@ -1673,7 +1673,7 @@ static BOOL macho_enum_sync_cb(const WCHAR* name, ULONG_PTR addr, void* user)
 {
     struct macho_sync*  ms = user;
 
-    TRACE("(%s, 0x%08lx, %p)\n", debugstr_w(name), addr, user);
+    TRACE("(%s, 0x%08Ix, %p)\n", debugstr_w(name), addr, user);
     macho_search_and_load_file(ms->pcs, name, addr, &ms->macho_info);
     return TRUE;
 }
@@ -1759,7 +1759,7 @@ static BOOL macho_load_cb(const WCHAR* name, ULONG_PTR addr, void* user)
     struct macho_load*  ml = user;
     const WCHAR*        p;
 
-    TRACE("(%s, 0x%08lx, %p)\n", debugstr_w(name), addr, user);
+    TRACE("(%s, 0x%08Ix, %p)\n", debugstr_w(name), addr, user);
 
     /* memcmp is needed for matches when bufstr contains also version information
      * ml->name: libc.so, name: libc.so.6.0
@@ -1784,7 +1784,7 @@ static struct module* macho_load_module(struct process* pcs, const WCHAR* name,
 {
     struct macho_load   ml;
 
-    TRACE("(%p/%p, %s, 0x%08lx)\n", pcs, pcs->handle, debugstr_w(name), addr);
+    TRACE("(%p/%p, %s, 0x%08Ix)\n", pcs, pcs->handle, debugstr_w(name), addr);
 
     ml.macho_info.flags = MACHO_INFO_MODULE;
     ml.ret = FALSE;
@@ -1916,6 +1916,6 @@ BOOL macho_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr)
     macho_info.module->format_info[DFI_MACHO]->u.macho_info->is_loader = 1;
     module_set_module(macho_info.module, S_WineLoaderW);
     pcs->loader = &macho_loader_ops;
-    TRACE("Found macho debug header %#lx\n", pcs->dbg_hdr_addr);
+    TRACE("Found macho debug header %#Ix\n", pcs->dbg_hdr_addr);
     return TRUE;
 }
diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c
index c2461413570..172847529f1 100644
--- a/dlls/dbghelp/minidump.c
+++ b/dlls/dbghelp/minidump.c
@@ -141,7 +141,7 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx,
 
     if ((hThread = OpenThread(THREAD_ALL_ACCESS, FALSE, tid)) == NULL)
     {
-        FIXME("Couldn't open thread %u (%u)\n", tid, GetLastError());
+        FIXME("Couldn't open thread %lu (%lu)\n", tid, GetLastError());
         return FALSE;
     }
     
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index def7b799d73..cd34b81460f 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -489,7 +489,7 @@ static BOOL image_check_debug_link_crc(const WCHAR* file, struct image_file_map*
     crc = calc_crc32(handle);
     if (crc != link_crc)
     {
-        WARN("Bad CRC for file %s (got %08x while expecting %08x)\n",  debugstr_w(file), crc, link_crc);
+        WARN("Bad CRC for file %s (got %08lx while expecting %08lx)\n",  debugstr_w(file), crc, link_crc);
         CloseHandle(handle);
         return FALSE;
     }
@@ -858,7 +858,7 @@ DWORD64 WINAPI  SymLoadModuleEx(HANDLE hProcess, HANDLE hFile, PCSTR ImageName,
     unsigned    len;
     DWORD64     ret;
 
-    TRACE("(%p %p %s %s %s %08x %p %08x)\n",
+    TRACE("(%p %p %s %s %s %08lx %p %08lx)\n",
           hProcess, hFile, debugstr_a(ImageName), debugstr_a(ModuleName),
           wine_dbgstr_longlong(BaseOfDll), DllSize, Data, Flags);
 
@@ -895,7 +895,7 @@ DWORD64 WINAPI  SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam
     struct module*      module = NULL;
     struct module*      altmodule;
 
-    TRACE("(%p %p %s %s %s %08x %p %08x)\n",
+    TRACE("(%p %p %s %s %s %08lx %p %08lx)\n",
           hProcess, hFile, debugstr_w(wImageName), debugstr_w(wModuleName),
           wine_dbgstr_longlong(BaseOfDll), SizeOfDll, Data, Flags);
 
@@ -906,7 +906,7 @@ DWORD64 WINAPI  SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam
     if (!(pcs = process_find_by_handle(hProcess))) return 0;
 
     if (Flags & ~(SLMFLAG_VIRTUAL))
-        FIXME("Unsupported Flags %08x for %s\n", Flags, debugstr_w(wImageName));
+        FIXME("Unsupported Flags %08lx for %s\n", Flags, debugstr_w(wImageName));
 
     pcs->loader->synchronize_module_list(pcs);
 
@@ -1342,7 +1342,7 @@ BOOL  WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr,
     if (sizeof(mi64) < ModuleInfo->SizeOfStruct)
     {
         SetLastError(ERROR_MOD_NOT_FOUND); /* NOTE: native returns this error */
-        WARN("Wrong size %u\n", ModuleInfo->SizeOfStruct);
+        WARN("Wrong size %lu\n", ModuleInfo->SizeOfStruct);
         return FALSE;
     }
 
diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index 317f7bb84b5..079e3a2ee4a 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -693,7 +693,7 @@ static struct symt* codeview_add_type_array(struct codeview_type_parse* ctp,
     if (symt_get_info(ctp->module, elem, TI_GET_LENGTH, &elem_size) && elem_size)
     {
         if (arr_len % (DWORD)elem_size)
-            FIXME("array size should be a multiple of element size %u %u\n", arr_len, (DWORD)elem_size);
+            FIXME("array size should be a multiple of element size %u %lu\n", arr_len, (DWORD)elem_size);
         count = arr_len / (unsigned)elem_size;
     }
     return &symt_new_array(ctp->module, 0, count, elem, index)->symt;
@@ -1465,7 +1465,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B
                     /* FIXME: at least labels support line numbers */
                     if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite))
                     {
-                        WARN("--not a func at %04x:%08x %lx tag=%d\n",
+                        WARN("--not a func at %04x:%08x %Ix tag=%d\n",
                              ltb->seg, ltb->offsets[k], addr, func ? func->symt.tag : -1);
                         func = NULL;
                         break;
@@ -1871,7 +1871,7 @@ static BOOL cv_dbgsubsect_find_inlinee(const struct msc_debug_info* msc_dbg,
             }
             break;
         default:
-            FIXME("Unknown signature %x in INLINEELINES subsection\n", *(DWORD*)CV_RECORD_AFTER(hdr));
+            FIXME("Unknown signature %lx in INLINEELINES subsection\n", *(DWORD*)CV_RECORD_AFTER(hdr));
             break;
         }
     }
@@ -3069,7 +3069,7 @@ static BOOL pdb_init_type_parse(const struct msc_debug_info* msc_dbg,
     case 20040203:      /* VC 8.0 */
         break;
     default:
-        ERR("-Unknown type info version %d\n", types.version);
+        ERR("-Unknown type info version %ld\n", types.version);
         return FALSE;
     }
 
@@ -3150,7 +3150,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info*
         case 19970604:      /* VC 6.0 */
             break;
         default:
-            ERR("-Unknown root block version %d\n", root->Version);
+            ERR("-Unknown root block version %ld\n", root->Version);
         }
         if (pdb_lookup->kind != PDB_JG)
         {
@@ -3162,12 +3162,12 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info*
         pdb_file->u.jg.timestamp = root->TimeDateStamp;
         pdb_file->age = root->Age;
         if (root->TimeDateStamp == pdb_lookup->timestamp) (*matched)++;
-        else WARN("Found %s, but wrong signature: %08x %08x\n",
+        else WARN("Found %s, but wrong signature: %08lx %08lx\n",
                   pdb_lookup->filename, root->TimeDateStamp, pdb_lookup->timestamp);
         if (root->Age == pdb_lookup->age) (*matched)++;
-        else WARN("Found %s, but wrong age: %08x %08x\n",
+        else WARN("Found %s, but wrong age: %08lx %08lx\n",
                   pdb_lookup->filename, root->Age, pdb_lookup->age);
-        TRACE("found JG for %s: age=%x timestamp=%x\n",
+        TRACE("found JG for %s: age=%lx timestamp=%lx\n",
               pdb_lookup->filename, root->Age, root->TimeDateStamp);
         pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames);
 
@@ -3193,7 +3193,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info*
         case 20000404:
             break;
         default:
-            ERR("-Unknown root block version %d\n", root->Version);
+            ERR("-Unknown root block version %ld\n", root->Version);
         }
         pdb_file->kind = PDB_DS;
         pdb_file->u.ds.guid = root->guid;
@@ -3203,9 +3203,9 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info*
                   pdb_lookup->filename, debugstr_guid(&root->guid),
                      debugstr_guid(&pdb_lookup->guid));
         if (root->Age == pdb_lookup->age) (*matched)++;
-        else WARN("Found %s, but wrong age: %08x %08x\n",
+        else WARN("Found %s, but wrong age: %08lx %08lx\n",
                   pdb_lookup->filename, root->Age, pdb_lookup->age);
-        TRACE("found DS for %s: age=%x guid=%s\n",
+        TRACE("found DS for %s: age=%lx guid=%s\n",
               pdb_lookup->filename, root->Age, debugstr_guid(&root->guid));
         pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames);
 
@@ -3284,7 +3284,7 @@ static void pdb_process_symbol_imports(const struct process* pcs,
                 imp_pdb_lookup.kind = PDB_JG;
                 imp_pdb_lookup.timestamp = imp->TimeDateStamp;
                 imp_pdb_lookup.age = imp->Age;
-                TRACE("got for %s: age=%u ts=%x\n",
+                TRACE("got for %s: age=%lu ts=%lx\n",
                       imp->filename, imp->Age, imp->TimeDateStamp);
                 pdb_process_internal(pcs, msc_dbg, &imp_pdb_lookup, pdb_module_info, i);
             }
@@ -3359,7 +3359,7 @@ static BOOL pdb_process_internal(const struct process* pcs,
         case 19990903:
             break;
         default:
-            ERR("-Unknown symbol info version %d %08x\n",
+            ERR("-Unknown symbol info version %ld %08lx\n",
                 symbols.version, symbols.version);
         }
 
@@ -3377,7 +3377,7 @@ static BOOL pdb_process_internal(const struct process* pcs,
             pdb_file->fpoext_stream = psi->FPO_EXT;
             break;
         default:
-            FIXME("Unknown PDB_STREAM_INDEXES size (%d)\n", symbols.stream_index_size);
+            FIXME("Unknown PDB_STREAM_INDEXES size (%ld)\n", symbols.stream_index_size);
             break;
         }
         files_image = pdb_read_strings(pdb_file);
@@ -3673,7 +3673,7 @@ static BOOL  pev_binop(struct pevaluator* pev, char op)
     case '%': c = v1 % v2; break;
     default: return PEV_ERROR1(pev, "binop: unknown op (%c)", op);
     }
-    snprintf(res, sizeof(res), "%ld", c);
+    snprintf(res, sizeof(res), "%Id", c);
     pev_push(pev, res);
     return TRUE;
 }
@@ -3686,8 +3686,8 @@ static BOOL  pev_deref(struct pevaluator* pev)
 
     if (!pev_pop_val(pev, &v1)) return FALSE;
     if (!sw_read_mem(pev->csw, v1, &v2, pev->csw->cpu->word_size))
-        return PEV_ERROR1(pev, "deref: cannot read mem at %lx\n", v1);
-    snprintf(res, sizeof(res), "%ld", v2);
+        return PEV_ERROR1(pev, "deref: cannot read mem at %Ix\n", v1);
+    snprintf(res, sizeof(res), "%Id", v2);
     pev_push(pev, res);
     return TRUE;
 }
@@ -3802,7 +3802,7 @@ BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip,
     if (!module_init_pair(&pair, csw->hProcess, ip)) return FALSE;
     if (!pair.effective->format_info[DFI_PDB]) return FALSE;
     pdb_info = pair.effective->format_info[DFI_PDB]->u.pdb_info;
-    TRACE("searching %lx => %lx\n", ip, ip - (DWORD_PTR)pair.effective->module.BaseOfImage);
+    TRACE("searching %Ix => %Ix\n", ip, ip - (DWORD_PTR)pair.effective->module.BaseOfImage);
     ip -= (DWORD_PTR)pair.effective->module.BaseOfImage;
 
     strbase = pdb_read_strings(&pdb_info->pdb_files[0]);
@@ -3817,7 +3817,7 @@ BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip,
         {
             if (fpoext[i].start <= ip && ip < fpoext[i].start + fpoext[i].func_size)
             {
-                TRACE("\t%08x %08x %8x %8x %4x %4x %4x %08x %s\n",
+                TRACE("\t%08lx %08lx %8lx %8lx %4lx %4x %4x %08lx %s\n",
                       fpoext[i].start, fpoext[i].func_size, fpoext[i].locals_size,
                       fpoext[i].params_size, fpoext[i].maxstack_size, fpoext[i].prolog_size,
                       fpoext[i].savedregs_size, fpoext[i].flags,
@@ -3951,7 +3951,7 @@ static BOOL codeview_process_info(const struct process* pcs,
     {
         const OMFSignatureRSDS* rsds = (const OMFSignatureRSDS*)msc_dbg->root;
 
-        TRACE("Got RSDS type of PDB file: guid=%s age=%08x name=%s\n",
+        TRACE("Got RSDS type of PDB file: guid=%s age=%08lx name=%s\n",
               wine_dbgstr_guid(&rsds->guid), rsds->age, rsds->name);
         pdb_lookup.filename = rsds->name;
         pdb_lookup.kind = PDB_DS;
@@ -3961,7 +3961,7 @@ static BOOL codeview_process_info(const struct process* pcs,
         break;
     }
     default:
-        ERR("Unknown CODEVIEW signature %08x in module %s\n",
+        ERR("Unknown CODEVIEW signature %08lx in module %s\n",
             *signature, debugstr_w(msc_dbg->module->modulename));
         break;
     }
diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c
index f99129eac49..5b4172e4001 100644
--- a/dlls/dbghelp/path.c
+++ b/dlls/dbghelp/path.c
@@ -389,7 +389,7 @@ BOOL WINAPI SymFindFileInPathW(HANDLE hProcess, PCWSTR searchPath, PCWSTR full_p
     WCHAR*              ptr;
     const WCHAR*        filename;
 
-    TRACE("(hProcess = %p, searchPath = %s, full_path = %s, id = %p, two = 0x%08x, three = 0x%08x, flags = 0x%08x, buffer = %p, cb = %p, user = %p)\n",
+    TRACE("(hProcess = %p, searchPath = %s, full_path = %s, id = %p, two = 0x%08lx, three = 0x%08lx, flags = 0x%08lx, buffer = %p, cb = %p, user = %p)\n",
           hProcess, debugstr_w(searchPath), debugstr_w(full_path),
           id, two, three, flags, buffer, cb, user);
 
@@ -617,7 +617,7 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct module* modul
     const WCHAR*        filename;
     WCHAR*              searchPath = pcs->search_path;
 
-    TRACE("(pcs = %p, full_path = %s, guid = %s, dw1 = 0x%08x, dw2 = 0x%08x, buffer = %p)\n",
+    TRACE("(pcs = %p, full_path = %s, guid = %s, dw1 = 0x%08lx, dw2 = 0x%08lx, buffer = %p)\n",
           pcs, debugstr_a(full_path), debugstr_guid(guid), dw1, dw2, buffer);
 
     mf.guid = guid;
diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c
index e0266db0387..3e697912718 100644
--- a/dlls/dbghelp/pe_module.c
+++ b/dlls/dbghelp/pe_module.c
@@ -87,7 +87,7 @@ static const char* pe_map_section(struct image_section_map* ism)
 
         if (fmap->sect[ism->sidx].shdr.Misc.VirtualSize > fmap->sect[ism->sidx].shdr.SizeOfRawData)
         {
-            FIXME("Section %ld: virtual (0x%x) > raw (0x%x) size - not supported\n",
+            FIXME("Section %Id: virtual (0x%lx) > raw (0x%lx) size - not supported\n",
                   ism->sidx, fmap->sect[ism->sidx].shdr.Misc.VirtualSize,
                   fmap->sect[ism->sidx].shdr.SizeOfRawData);
             return IMAGE_NO_MAP;
@@ -407,7 +407,7 @@ static BOOL pe_locate_with_coff_symbol_table(struct module* module)
                     sym->u.var.kind == loc_absolute &&
                     !strcmp(sym->hash_elt.name, name))
                 {
-                    TRACE("Changing absolute address for %d.%s: %lx -> %s\n",
+                    TRACE("Changing absolute address for %d.%s: %Ix -> %s\n",
                           isym->SectionNumber, name, sym->u.var.offset,
                           wine_dbgstr_longlong(module->module.BaseOfImage +
                                                fmap->u.pe.sect[isym->SectionNumber - 1].shdr.VirtualAddress +
@@ -715,7 +715,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module*
                 for (j = 0; j < exports->NumberOfNames; j++)
                     if ((ordinals[j] == i) && names[j]) break;
                 if (j < exports->NumberOfNames) continue;
-                snprintf(buffer, sizeof(buffer), "%d", i + exports->Base);
+                snprintf(buffer, sizeof(buffer), "%ld", i + exports->Base);
                 symt_new_public(module, NULL, buffer, FALSE, base + functions[i], 1);
             }
         }
diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c
index a78e62a8661..380101f66be 100644
--- a/dlls/dbghelp/source.c
+++ b/dlls/dbghelp/source.c
@@ -293,7 +293,7 @@ BOOL WINAPI SymEnumSourceLines(HANDLE hProcess, ULONG64 base, PCSTR obj,
                                PSYM_ENUMLINES_CALLBACK EnumLinesCallback,
                                PVOID UserContext)
 {
-    FIXME("%p %s %s %s %u %u %p %p: stub!\n",
+    FIXME("%p %s %s %s %lu %lu %p %p: stub!\n",
           hProcess, wine_dbgstr_longlong(base), debugstr_a(obj), debugstr_a(file),
           line, flags, EnumLinesCallback, UserContext);
     SetLastError(ERROR_NOT_SUPPORTED);
@@ -309,7 +309,7 @@ BOOL WINAPI SymEnumSourceLinesW(HANDLE hProcess, ULONG64 base, PCWSTR obj,
                                 PSYM_ENUMLINES_CALLBACKW EnumLinesCallback,
                                 PVOID UserContext)
 {
-    FIXME("%p %s %s %s %u %u %p %p: stub!\n",
+    FIXME("%p %s %s %s %lu %lu %p %p: stub!\n",
           hProcess, wine_dbgstr_longlong(base), debugstr_w(obj), debugstr_w(file),
           line, flags, EnumLinesCallback, UserContext);
     SetLastError(ERROR_NOT_SUPPORTED);
diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c
index 931102c4fb3..89ae0951a6a 100644
--- a/dlls/dbghelp/stabs.c
+++ b/dlls/dbghelp/stabs.c
@@ -255,7 +255,7 @@ static struct symt** stabs_find_ref(LONG_PTR filenr, LONG_PTR subnr)
 	}
         ret = &idef->vector[subnr];
     }
-    TRACE("(%ld,%ld) => %p (%p)\n", filenr, subnr, ret, *ret);
+    TRACE("(%Id,%Id) => %p (%p)\n", filenr, subnr, ret, *ret);
     return ret;
 }
 
@@ -974,7 +974,7 @@ static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typ
 
     *stabs_find_ref(filenr1, subnr1) = *ret_dt = new_dt;
 
-    TRACE("Adding (%ld,%ld) %s\n", filenr1, subnr1, debugstr_a(typename));
+    TRACE("Adding (%Id,%Id) %s\n", filenr1, subnr1, debugstr_a(typename));
 
     return 0;
 }
@@ -1449,7 +1449,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset,
                 case 35:
                 case 36: loc.reg = CV_REG_MM0 + n_value - 29; break;
                 default:
-                    FIXME("Unknown register value (%lu)\n", (ULONG_PTR)n_value);
+                    FIXME("Unknown register value (%Iu)\n", (ULONG_PTR)n_value);
                     loc.reg = CV_REG_NONE;
                     break;
                 }
@@ -1609,7 +1609,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset,
 	case N_EXCL:
             if (stabs_add_include(stabs_find_include(ptr, n_value)) < 0)
             {
-                ERR("Excluded header not found (%s,%ld)\n", ptr, (ULONG_PTR)n_value);
+                ERR("Excluded header not found (%s,%Id)\n", ptr, (ULONG_PTR)n_value);
                 module_reset_debug_info(module);
                 ret = FALSE;
                 goto done;
@@ -1657,7 +1657,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset,
             break;
         }
         stabbuff[0] = '\0';
-        TRACE("0x%02x %lx %s\n",
+        TRACE("0x%02x %Ix %s\n",
               stab_ptr->n_type, (ULONG_PTR)n_value, debugstr_a(strs + stab_ptr->n_strx));
     }
     module->module.SymType = SymDia;
diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c
index 2271612bdd1..6c4047376b7 100644
--- a/dlls/dbghelp/stack.c
+++ b/dlls/dbghelp/stack.c
@@ -147,7 +147,7 @@ BOOL WINAPI StackWalk(DWORD MachineType, HANDLE hProcess, HANDLE hThread,
     BOOL                        ret;
     struct cpu*                 cpu;
 
-    TRACE("(%d, %p, %p, %p, %p, %p, %p, %p, %p)\n",
+    TRACE("(%ld, %p, %p, %p, %p, %p, %p, %p, %p)\n",
           MachineType, hProcess, hThread, frame32, ctx,
           f_read_mem, FunctionTableAccessRoutine,
           GetModuleBaseRoutine, f_xlat_adr);
@@ -217,7 +217,7 @@ BOOL WINAPI StackWalk64(DWORD MachineType, HANDLE hProcess, HANDLE hThread,
     struct cpu_stack_walk       csw;
     struct cpu*                 cpu;
 
-    TRACE("(%d, %p, %p, %p, %p, %p, %p, %p, %p)\n",
+    TRACE("(%ld, %p, %p, %p, %p, %p, %p, %p, %p)\n",
           MachineType, hProcess, hThread, frame, ctx,
           f_read_mem, FunctionTableAccessRoutine,
           GetModuleBaseRoutine, f_xlat_adr);
@@ -276,7 +276,7 @@ BOOL WINAPI StackWalkEx(DWORD MachineType, HANDLE hProcess, HANDLE hThread,
     struct cpu*                 cpu;
     DWORD64                     addr;
 
-    TRACE("(%d, %p, %p, %p, %p, %p, %p, %p, %p, 0x%x)\n",
+    TRACE("(%ld, %p, %p, %p, %p, %p, %p, %p, %p, 0x%lx)\n",
           MachineType, hProcess, hThread, frame, ctx,
           f_read_mem, FunctionTableAccessRoutine,
           GetModuleBaseRoutine, f_xlat_adr, flags);
@@ -293,7 +293,7 @@ BOOL WINAPI StackWalkEx(DWORD MachineType, HANDLE hProcess, HANDLE hThread,
     }
     if (flags != 0)
     {
-        FIXME("Unsupported yet flags 0x%x\n", flags);
+        FIXME("Unsupported yet flags 0x%lx\n", flags);
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
@@ -315,7 +315,7 @@ BOOL WINAPI StackWalkEx(DWORD MachineType, HANDLE hProcess, HANDLE hThread,
         DWORD depth = symt_get_inlinesite_depth(hProcess, addr);
         if (IFC_DEPTH(frame->InlineFrameContext) + 1 < depth) /* move to next inlined function? */
         {
-            TRACE("found inline ctx: depth=%u current=%u++\n",
+            TRACE("found inline ctx: depth=%lu current=%lu++\n",
                   depth, frame->InlineFrameContext);
             frame->InlineFrameContext++; /* just increase index, FIXME detect overflow */
         }
@@ -331,7 +331,7 @@ BOOL WINAPI StackWalkEx(DWORD MachineType, HANDLE hProcess, HANDLE hThread,
         {
             addr = sw_xlat_addr(&csw, &frame->AddrPC);
             frame->InlineFrameContext = symt_get_inlinesite_depth(hProcess, addr) == 0 ? IFC_MODE_REGULAR : IFC_MODE_INLINE;
-            TRACE("setting IFC mode to %x\n", frame->InlineFrameContext);
+            TRACE("setting IFC mode to %lx\n", frame->InlineFrameContext);
         }
     }
 
diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index d3ba4521fa0..49172701405 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -258,7 +258,7 @@ struct symt_public* symt_new_public(struct module* module,
     struct symt_public* sym;
     struct symt**       p;
 
-    TRACE_(dbghelp_symt)("Adding public symbol %s:%s @%lx\n",
+    TRACE_(dbghelp_symt)("Adding public symbol %s:%s @%Ix\n",
                          debugstr_w(module->modulename), name, address);
     if ((dbghelp_options & SYMOPT_AUTO_PUBLICS) &&
         symt_find_nearest(module, address) != NULL)
@@ -291,7 +291,7 @@ struct symt_data* symt_new_global_variable(struct module* module,
     struct symt**       p;
     DWORD64             tsz;
 
-    TRACE_(dbghelp_symt)("Adding global symbol %s:%s %d@%lx %p\n",
+    TRACE_(dbghelp_symt)("Adding global symbol %s:%s %d@%Ix %p\n",
                          debugstr_w(module->modulename), name, loc.kind, loc.offset, type);
     if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
     {
@@ -304,7 +304,7 @@ struct symt_data* symt_new_global_variable(struct module* module,
         if (type && size && symt_get_info(module, type, TI_GET_LENGTH, &tsz))
         {
             if (tsz != size)
-                FIXME("Size mismatch for %s.%s between type (%s) and src (%lu)\n",
+                FIXME("Size mismatch for %s.%s between type (%s) and src (%Iu)\n",
                       debugstr_w(module->modulename), name,
                       wine_dbgstr_longlong(tsz), size);
         }
@@ -345,7 +345,7 @@ struct symt_function* symt_new_function(struct module* module,
 {
     struct symt_function* sym;
 
-    TRACE_(dbghelp_symt)("Adding global function %s:%s @%lx-%lx\n",
+    TRACE_(dbghelp_symt)("Adding global function %s:%s @%Ix-%Ix\n",
                          debugstr_w(module->modulename), name, addr, addr + size - 1);
     if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
     {
@@ -371,7 +371,7 @@ struct symt_inlinesite* symt_new_inlinesite(struct module* module,
 {
     struct symt_inlinesite* sym;
 
-    TRACE_(dbghelp_symt)("Adding inline site %s @%lx\n", name, addr);
+    TRACE_(dbghelp_symt)("Adding inline site %s @%Ix\n", name, addr);
     if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
     {
         struct symt** p;
@@ -627,7 +627,7 @@ struct symt_thunk* symt_new_thunk(struct module* module,
 {
     struct symt_thunk*  sym;
 
-    TRACE_(dbghelp_symt)("Adding global thunk %s:%s @%lx-%lx\n",
+    TRACE_(dbghelp_symt)("Adding global thunk %s:%s @%Ix-%Ix\n",
                          debugstr_w(module->modulename), name, addr, addr + size - 1);
 
     if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
@@ -889,7 +889,7 @@ static void symt_fill_sym_info(struct module_pair* pair,
     else
         symbol_setname(sym_info, name);
 
-    TRACE_(dbghelp_symt)("%p => %s %u %s\n",
+    TRACE_(dbghelp_symt)("%p => %s %lu %s\n",
                          sym, sym_info->Name, sym_info->Size,
                          wine_dbgstr_longlong(sym_info->Address));
 }
@@ -2186,7 +2186,7 @@ BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64 sym, PSTR UnDecName, DWORD UnDecName
 DWORD WINAPI UnDecorateSymbolName(const char *decorated_name, char *undecorated_name,
                                   DWORD undecorated_length, DWORD flags)
 {
-    TRACE("(%s, %p, %d, 0x%08x)\n",
+    TRACE("(%s, %p, %ld, 0x%08lx)\n",
           debugstr_a(decorated_name), undecorated_name, undecorated_length, flags);
 
     if (!undecorated_name || !undecorated_length)
@@ -2205,7 +2205,7 @@ DWORD WINAPI UnDecorateSymbolNameW(const WCHAR *decorated_name, WCHAR *undecorat
     char *buf, *ptr;
     int len, ret = 0;
 
-    TRACE("(%s, %p, %d, 0x%08x)\n",
+    TRACE("(%s, %p, %ld, 0x%08lx)\n",
           debugstr_w(decorated_name), undecorated_name, undecorated_length, flags);
 
     if (!undecorated_name || !undecorated_length)
@@ -2410,7 +2410,7 @@ static inline BOOL doSymSearch(HANDLE hProcess, ULONG64 BaseOfDll, DWORD Index,
 
     if (Options != SYMSEARCH_GLOBALSONLY)
     {
-        FIXME("Unsupported searching with options (%x)\n", Options);
+        FIXME("Unsupported searching with options (%lx)\n", Options);
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
@@ -2436,7 +2436,7 @@ BOOL WINAPI SymSearch(HANDLE hProcess, ULONG64 BaseOfDll, DWORD Index,
     LPWSTR      maskW = NULL;
     BOOLEAN     ret;
 
-    TRACE("(%p %s %u %u %s %s %p %p %x)\n",
+    TRACE("(%p %s %lu %lu %s %s %p %p %lx)\n",
           hProcess, wine_dbgstr_longlong(BaseOfDll), Index, SymTag, Mask,
           wine_dbgstr_longlong(Address), EnumSymbolsCallback,
           UserContext, Options);
@@ -2465,7 +2465,7 @@ BOOL WINAPI SymSearchW(HANDLE hProcess, ULONG64 BaseOfDll, DWORD Index,
 {
     struct sym_enumW    sew;
 
-    TRACE("(%p %s %u %u %s %s %p %p %x)\n",
+    TRACE("(%p %s %lu %lu %s %s %p %p %lx)\n",
           hProcess, wine_dbgstr_longlong(BaseOfDll), Index, SymTag, debugstr_w(Mask),
           wine_dbgstr_longlong(Address), EnumSymbolsCallback,
           UserContext, Options);
@@ -2487,7 +2487,7 @@ BOOL WINAPI SymAddSymbol(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR name,
 {
     struct module_pair  pair;
 
-    TRACE("(%p %s %s %u)\n", hProcess, wine_dbgstr_a(name), wine_dbgstr_longlong(addr), size);
+    TRACE("(%p %s %s %lu)\n", hProcess, wine_dbgstr_a(name), wine_dbgstr_longlong(addr), size);
 
     if (!module_init_pair(&pair, hProcess, BaseOfDll)) return FALSE;
 
@@ -2503,7 +2503,7 @@ BOOL WINAPI SymAddSymbolW(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR nameW,
 {
     char       name[MAX_SYM_NAME];
 
-    TRACE("(%p %s %s %u)\n", hProcess, wine_dbgstr_w(nameW), wine_dbgstr_longlong(addr), size);
+    TRACE("(%p %s %s %lu)\n", hProcess, wine_dbgstr_w(nameW), wine_dbgstr_longlong(addr), size);
 
     WideCharToMultiByte(CP_ACP, 0, nameW, -1, name, ARRAY_SIZE(name), NULL, NULL);
 
@@ -2583,7 +2583,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland,
 BOOL WINAPI SymGetLineFromName(HANDLE hProcess, PCSTR ModuleName, PCSTR FileName,
                 DWORD dwLineNumber, PLONG plDisplacement, PIMAGEHLP_LINE Line)
 {
-    FIXME("(%p) (%s, %s, %d %p %p): stub\n", hProcess, ModuleName, FileName,
+    FIXME("(%p) (%s, %s, %ld %p %p): stub\n", hProcess, ModuleName, FileName,
                 dwLineNumber, plDisplacement, Line);
     return FALSE;
 }
@@ -2591,7 +2591,7 @@ BOOL WINAPI SymGetLineFromName(HANDLE hProcess, PCSTR ModuleName, PCSTR FileName
 BOOL WINAPI SymGetLineFromName64(HANDLE hProcess, PCSTR ModuleName, PCSTR FileName,
                 DWORD dwLineNumber, PLONG lpDisplacement, PIMAGEHLP_LINE64 Line)
 {
-    FIXME("(%p) (%s, %s, %d %p %p): stub\n", hProcess, ModuleName, FileName,
+    FIXME("(%p) (%s, %s, %ld %p %p): stub\n", hProcess, ModuleName, FileName,
                 dwLineNumber, lpDisplacement, Line);
     return FALSE;
 }
@@ -2599,7 +2599,7 @@ BOOL WINAPI SymGetLineFromName64(HANDLE hProcess, PCSTR ModuleName, PCSTR FileNa
 BOOL WINAPI SymGetLineFromNameW64(HANDLE hProcess, PCWSTR ModuleName, PCWSTR FileName,
                 DWORD dwLineNumber, PLONG plDisplacement, PIMAGEHLP_LINEW64 Line)
 {
-    FIXME("(%p) (%s, %s, %d %p %p): stub\n", hProcess, debugstr_w(ModuleName), debugstr_w(FileName),
+    FIXME("(%p) (%s, %s, %ld %p %p): stub\n", hProcess, debugstr_w(ModuleName), debugstr_w(FileName),
                 dwLineNumber, plDisplacement, Line);
     return FALSE;
 }
@@ -2610,7 +2610,7 @@ BOOL WINAPI SymGetLineFromNameW64(HANDLE hProcess, PCWSTR ModuleName, PCWSTR Fil
  */
 BOOL WINAPI SymFromIndex(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBOL_INFO symbol)
 {
-    FIXME("hProcess = %p, BaseOfDll = %s, index = %d, symbol = %p\n",
+    FIXME("hProcess = %p, BaseOfDll = %s, index = %ld, symbol = %p\n",
           hProcess, wine_dbgstr_longlong(BaseOfDll), index, symbol);
 
     return FALSE;
@@ -2622,7 +2622,7 @@ BOOL WINAPI SymFromIndex(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBO
  */
 BOOL WINAPI SymFromIndexW(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBOL_INFOW symbol)
 {
-    FIXME("hProcess = %p, BaseOfDll = %s, index = %d, symbol = %p\n",
+    FIXME("hProcess = %p, BaseOfDll = %s, index = %ld, symbol = %p\n",
           hProcess, wine_dbgstr_longlong(BaseOfDll), index, symbol);
 
     return FALSE;
@@ -2659,7 +2659,7 @@ BOOL WINAPI SymFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx
     struct module_pair pair;
     struct symt_inlinesite* inlined;
 
-    TRACE("(%p, %#I64x, 0x%x, %p, %p)\n", hProcess, addr, inline_ctx, disp, si);
+    TRACE("(%p, %#I64x, 0x%lx, %p, %p)\n", hProcess, addr, inline_ctx, disp, si);
 
     switch (IFC_MODE(inline_ctx))
     {
@@ -2692,7 +2692,7 @@ BOOL WINAPI SymFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG inline_ct
     unsigned            len;
     BOOL                ret;
 
-    TRACE("(%p, %#I64x, 0x%x, %p, %p)\n", hProcess, addr, inline_ctx, disp, siW);
+    TRACE("(%p, %#I64x, 0x%lx, %p, %p)\n", hProcess, addr, inline_ctx, disp, siW);
 
     len = sizeof(*si) + siW->MaxNameLen * sizeof(WCHAR);
     si = HeapAlloc(GetProcessHeap(), 0, len);
@@ -2739,7 +2739,7 @@ BOOL WINAPI SymGetLineFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inl
 {
     struct internal_line_t intl;
 
-    TRACE("(%p, %#I64x, 0x%x, %#I64x, %p, %p)\n",
+    TRACE("(%p, %#I64x, 0x%lx, %#I64x, %p, %p)\n",
           hProcess, addr, inline_ctx, mod_addr, disp, line);
 
     if (line->SizeOfStruct < sizeof(*line)) return FALSE;
@@ -2757,7 +2757,7 @@ BOOL WINAPI SymGetLineFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG in
 {
     struct internal_line_t intl;
 
-    TRACE("(%p, %#I64x, 0x%x, %#I64x, %p, %p)\n",
+    TRACE("(%p, %#I64x, 0x%lx, %#I64x, %p, %p)\n",
           hProcess, addr, inline_ctx, mod_addr, disp, line);
 
     if (line->SizeOfStruct < sizeof(*line)) return FALSE;

[PATCH 17/25] dlls/dhcpcsvc: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/dhcpcsvc/Makefile.in |    1 -
 dlls/dhcpcsvc/dhcpcsvc.c  |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/dhcpcsvc/Makefile.in b/dlls/dhcpcsvc/Makefile.in
index 34add6620d1..989264d8b43 100644
--- a/dlls/dhcpcsvc/Makefile.in
+++ b/dlls/dhcpcsvc/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE = dhcpcsvc.dll
 DELAYIMPORTS = iphlpapi
 IMPORTLIB = dhcpcsvc
diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c
index dfce5a8dc84..57bb9a9b6ff 100644
--- a/dlls/dhcpcsvc/dhcpcsvc.c
+++ b/dlls/dhcpcsvc/dhcpcsvc.c
@@ -87,15 +87,15 @@ DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adapter, DHC
     HANDLE mgr;
     char unix_name[IF_NAMESIZE];
 
-    TRACE( "(%08x, %p, %s, %p, %u, %u, %p, %p, %s)\n", flags, reserved, debugstr_w(adapter), class_id,
+    TRACE( "(%08lx, %p, %s, %p, %lu, %lu, %p, %p, %s)\n", flags, reserved, debugstr_w(adapter), class_id,
            send_params.nParams, recv_params.nParams, buf, buflen, debugstr_w(request_id) );
 
     if (!adapter || !buflen) return ERROR_INVALID_PARAMETER;
-    if (flags != DHCPCAPI_REQUEST_SYNCHRONOUS) FIXME( "unsupported flags %08x\n", flags );
+    if (flags != DHCPCAPI_REQUEST_SYNCHRONOUS) FIXME( "unsupported flags %08lx\n", flags );
     if ((err = get_adapter_name( adapter, unix_name, sizeof(unix_name) ))) return err;
 
     for (i = 0; i < send_params.nParams; i++)
-        FIXME( "send option %u not supported\n", send_params.Params->OptionId );
+        FIXME( "send option %lu not supported\n", send_params.Params->OptionId );
 
     mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
                        OPEN_EXISTING, 0, 0 );

[PATCH 18/25] dlls/dhtmled.ocx: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/dhtmled.ocx/Makefile.in |    1 -
 dlls/dhtmled.ocx/edit.c      |   68 +++++++++++++++++++++---------------------
 dlls/dhtmled.ocx/main.c      |    2 +
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in
index 6abaee48a2e..02556ba89e0 100644
--- a/dlls/dhtmled.ocx/Makefile.in
+++ b/dlls/dhtmled.ocx/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = dhtmled.ocx
 IMPORTS   = uuid ole32 oleaut32 user32 gdi32
 
diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c
index 226fc7856ed..8af10321652 100644
--- a/dlls/dhtmled.ocx/edit.c
+++ b/dlls/dhtmled.ocx/edit.c
@@ -46,7 +46,7 @@ static HRESULT load_typelib(void)
 
     hr = LoadRegTypeLib(&LIBID_DHTMLEDLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl);
     if (FAILED(hr)) {
-        ERR("LoadRegTypeLib failed: %08x\n", hr);
+        ERR("LoadRegTypeLib failed: %08lx\n", hr);
         return hr;
     }
 
@@ -85,7 +85,7 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)
         hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti);
         if (FAILED(hr))
         {
-            ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr);
+            ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hr);
             return hr;
         }
 
@@ -192,7 +192,7 @@ static ULONG dhtml_edit_addref(DHTMLEditImpl *This)
 {
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -291,7 +291,7 @@ static ULONG dhtml_edit_release(DHTMLEditImpl *This)
 {
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref)
     {
@@ -332,7 +332,7 @@ static HRESULT WINAPI DHTMLEdit_GetTypeInfo(IDHTMLEdit *iface, UINT type_index,
     DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface);
     HRESULT hr;
 
-    TRACE("(%p)->(%u, %08x, %p)\n", This, type_index, lcid, type_info);
+    TRACE("(%p)->(%u, %08lx, %p)\n", This, type_index, lcid, type_info);
 
     hr = get_typeinfo(IDHTMLEdit_tid, type_info);
     if (SUCCEEDED(hr))
@@ -347,7 +347,7 @@ static HRESULT WINAPI DHTMLEdit_GetIDsOfNames(IDHTMLEdit *iface, REFIID iid, OLE
     ITypeInfo *ti;
     HRESULT hr;
 
-    TRACE("(%p)->(%s, %p, %u, %08x, %p)\n", This, debugstr_guid(iid), names, name_count, lcid, disp_ids);
+    TRACE("(%p)->(%s, %p, %u, %08lx, %p)\n", This, debugstr_guid(iid), names, name_count, lcid, disp_ids);
 
     hr = get_typeinfo(IDHTMLEdit_tid, &ti);
     if (FAILED(hr))
@@ -363,7 +363,7 @@ static HRESULT WINAPI DHTMLEdit_Invoke(IDHTMLEdit *iface, DISPID member, REFIID
     ITypeInfo *ti;
     HRESULT hr;
 
-    TRACE("(%p)->(%d, %s, %08x, 0x%x, %p, %p, %p, %p)\n",
+    TRACE("(%p)->(%ld, %s, %08lx, 0x%x, %p, %p, %p, %p)\n",
           This, member, debugstr_guid(iid), lcid, flags, params, ret, exception_info, error_index);
 
     hr = get_typeinfo(IDHTMLEdit_tid, &ti);
@@ -594,7 +594,7 @@ static HRESULT WINAPI DHTMLEdit_get_SnapToGridX(IDHTMLEdit *iface, LONG *value)
 static HRESULT WINAPI DHTMLEdit_put_SnapToGridX(IDHTMLEdit *iface, LONG value)
 {
     DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface);
-    FIXME("(%p)->(%d) stub\n", This, value);
+    FIXME("(%p)->(%ld) stub\n", This, value);
     return E_NOTIMPL;
 }
 
@@ -608,7 +608,7 @@ static HRESULT WINAPI DHTMLEdit_get_SnapToGridY(IDHTMLEdit *iface, LONG *value)
 static HRESULT WINAPI DHTMLEdit_put_SnapToGridY(IDHTMLEdit *iface, LONG value)
 {
     DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface);
-    FIXME("(%p)->(%d) stub\n", This, value);
+    FIXME("(%p)->(%ld) stub\n", This, value);
     return E_NOTIMPL;
 }
 
@@ -833,21 +833,21 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface,
 static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD save)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%u) stub\n", This, save);
+    FIXME("(%p)->(%lu) stub\n", This, save);
     return S_OK;
 }
 
 static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD moniker_id, IMoniker *value)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%u, %p) stub\n", This, moniker_id, value);
+    FIXME("(%p)->(%lu, %p) stub\n", This, moniker_id, value);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD assign, DWORD moniker_id, IMoniker **value)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%u, %p) stub\n", This, moniker_id, value);
+    FIXME("(%p)->(%lu, %p) stub\n", This, moniker_id, value);
     *value = NULL;
     return E_NOTIMPL;
 }
@@ -855,14 +855,14 @@ static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD assign, DWOR
 static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, IDataObject *data_obj, BOOL creation, DWORD reserved)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%p, %u, %u) stub\n", This, data_obj, creation, reserved);
+    FIXME("(%p)->(%p, %u, %lu) stub\n", This, data_obj, creation, reserved);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD reserved, IDataObject **value)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%u, %p) stub\n", This, reserved, value);
+    FIXME("(%p)->(%lu, %p) stub\n", This, reserved, value);
     *value = NULL;
     return E_NOTIMPL;
 }
@@ -871,7 +871,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG verb, MSG *msg, I
                                        LONG index, HWND parent, const RECT *pos)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    TRACE("(%p)->(%d, %p, %p, %d, %p, %p) stub\n", This, verb, msg, active_site, index, parent, pos);
+    TRACE("(%p)->(%ld, %p, %p, %ld, %p, %p) stub\n", This, verb, msg, active_site, index, parent, pos);
 
     if (verb == OLEIVERB_INPLACEACTIVATE)
     {
@@ -914,7 +914,7 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *clsid)
 static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD type_type, OLECHAR **type)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%u, %p) stub\n", This, type_type, type);
+    FIXME("(%p)->(%lu, %p) stub\n", This, type_type, type);
     *type = NULL;
     return E_NOTIMPL;
 }
@@ -922,7 +922,7 @@ static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD type_type,
 static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD aspect, SIZEL *size_limit)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    TRACE("(%p)->(%u, %p)\n", This, aspect, size_limit);
+    TRACE("(%p)->(%lu, %p)\n", This, aspect, size_limit);
 
     if(aspect != DVASPECT_CONTENT)
         return DV_E_DVASPECT;
@@ -934,7 +934,7 @@ static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD aspect, SIZEL
 static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD aspect, SIZEL *size_limit)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    TRACE("(%p)->(%u, %p)\n", This, aspect, size_limit);
+    TRACE("(%p)->(%lu, %p)\n", This, aspect, size_limit);
 
     if(aspect != DVASPECT_CONTENT)
         return E_FAIL;
@@ -954,7 +954,7 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *sink, DWO
 static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD conn)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%u) stub\n", This, conn);
+    FIXME("(%p)->(%lu) stub\n", This, conn);
     return E_NOTIMPL;
 }
 
@@ -969,7 +969,7 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ad
 static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD aspect, DWORD *status)
 {
     DHTMLEditImpl *This = impl_from_IOleObject(iface);
-    TRACE("(%p)->(%u, %p)\n", This, aspect, status);
+    TRACE("(%p)->(%lu, %p)\n", This, aspect, status);
 
     return OleRegGetMiscStatus(&CLSID_DHTMLEdit, aspect, status);
 }
@@ -1033,7 +1033,7 @@ static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface,
 static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID)
 {
     DHTMLEditImpl *This = impl_from_IProvideClassInfo2(iface);
-    FIXME("(%p)->(%d %p)\n", This, dwGuidKind, pGUID);
+    FIXME("(%p)->(%ld %p)\n", This, dwGuidKind, pGUID);
     return E_NOTIMPL;
 }
 
@@ -1217,7 +1217,7 @@ static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg)
 static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID)
 {
     DHTMLEditImpl *This = impl_from_IOleControl(iface);
-    FIXME("(%p)->(%d)\n", This, dispID);
+    FIXME("(%p)->(%ld)\n", This, dispID);
     return E_NOTIMPL;
 }
 
@@ -1259,7 +1259,7 @@ static HRESULT WINAPI ViewObjectEx_Draw(IViewObjectEx *iface, DWORD drawaspect,
 {
     DHTMLEditImpl *This = impl_from_IViewObjectEx(iface);
 
-    FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %lu)\n", This, drawaspect, index, aspect, device, target_dev,
+    FIXME("(%p)->(%ld %ld %p %p %p %p %p %p %p %Iu)\n", This, drawaspect, index, aspect, device, target_dev,
         hdc_draw, bounds, win_bounds, fn_continue, cont);
 
     return E_NOTIMPL;
@@ -1270,7 +1270,7 @@ static HRESULT WINAPI ViewObjectEx_GetColorSet(IViewObjectEx *iface, DWORD drawa
 {
     DHTMLEditImpl *This = impl_from_IViewObjectEx(iface);
 
-    FIXME("(%p)->(%d %d %p %p %p %p)\n", This, drawaspect, index, aspect, device, hic_target,
+    FIXME("(%p)->(%ld %ld %p %p %p %p)\n", This, drawaspect, index, aspect, device, hic_target,
         colorset);
 
     return E_NOTIMPL;
@@ -1281,7 +1281,7 @@ static HRESULT WINAPI ViewObjectEx_Freeze(IViewObjectEx *iface, DWORD drawaspect
 {
     DHTMLEditImpl *This = impl_from_IViewObjectEx(iface);
 
-    FIXME("(%p)->(%d %d %p %p)\n", This, drawaspect, index, aspect, freeze);
+    FIXME("(%p)->(%ld %ld %p %p)\n", This, drawaspect, index, aspect, freeze);
 
     return E_NOTIMPL;
 }
@@ -1290,7 +1290,7 @@ static HRESULT WINAPI ViewObjectEx_Unfreeze(IViewObjectEx *iface, DWORD freeze)
 {
     DHTMLEditImpl *This = impl_from_IViewObjectEx(iface);
 
-    FIXME("(%p)->(%d)\n", This, freeze);
+    FIXME("(%p)->(%ld)\n", This, freeze);
 
     return E_NOTIMPL;
 }
@@ -1299,7 +1299,7 @@ static HRESULT WINAPI ViewObjectEx_SetAdvise(IViewObjectEx *iface, DWORD aspects
 {
     DHTMLEditImpl *This = impl_from_IViewObjectEx(iface);
 
-    FIXME("(%p)->(%d %d %p)\n", This, aspects, advf, sink);
+    FIXME("(%p)->(%ld %ld %p)\n", This, aspects, advf, sink);
 
     return E_NOTIMPL;
 }
@@ -1318,7 +1318,7 @@ static HRESULT WINAPI ViewObjectEx_GetExtent(IViewObjectEx *iface, DWORD draw_as
 {
     DHTMLEditImpl *This = impl_from_IViewObjectEx(iface);
 
-    FIXME("(%p)->(%d %d %p %p)\n", This, draw_aspect, index, device, size);
+    FIXME("(%p)->(%ld %ld %p %p)\n", This, draw_aspect, index, device, size);
 
     return E_NOTIMPL;
 }
@@ -1327,7 +1327,7 @@ static HRESULT WINAPI ViewObjectEx_GetRect(IViewObjectEx *iface, DWORD aspect, R
 {
     DHTMLEditImpl *This = impl_from_IViewObjectEx(iface);
 
-    FIXME("(%p)->(%d %p)\n", This, aspect, rect);
+    FIXME("(%p)->(%ld %p)\n", This, aspect, rect);
 
     return E_NOTIMPL;
 }
@@ -1347,7 +1347,7 @@ static HRESULT WINAPI ViewObjectEx_QueryHitPoint(IViewObjectEx *iface, DWORD asp
 {
     DHTMLEditImpl *This = impl_from_IViewObjectEx(iface);
 
-    FIXME("(%p)->(%d %s %s %d %p)\n", This, aspect, wine_dbgstr_rect(bounds), wine_dbgstr_point(&pt), close_hint, hit_result);
+    FIXME("(%p)->(%ld %s %s %ld %p)\n", This, aspect, wine_dbgstr_rect(bounds), wine_dbgstr_point(&pt), close_hint, hit_result);
 
     return E_NOTIMPL;
 }
@@ -1357,7 +1357,7 @@ static HRESULT WINAPI ViewObjectEx_QueryHitRect(IViewObjectEx *iface, DWORD aspe
 {
     DHTMLEditImpl *This = impl_from_IViewObjectEx(iface);
 
-    FIXME("(%p)->(%d %s %s %d %p)\n", This, aspect, wine_dbgstr_rect(bounds), wine_dbgstr_rect(loc), close_hint, hit_result);
+    FIXME("(%p)->(%ld %s %s %ld %p)\n", This, aspect, wine_dbgstr_rect(bounds), wine_dbgstr_rect(loc), close_hint, hit_result);
 
     return E_NOTIMPL;
 }
@@ -1367,7 +1367,7 @@ static HRESULT WINAPI ViewObjectEx_GetNaturalExtent(IViewObjectEx *iface, DWORD
 {
     DHTMLEditImpl *This = impl_from_IViewObjectEx(iface);
 
-    FIXME("(%p)->(%d %d %p %p %p %p)\n", This, aspect, index, device, target_hdc, extent_info, size);
+    FIXME("(%p)->(%ld %ld %p %p %p %p)\n", This, aspect, index, device, target_hdc, extent_info, size);
 
     return E_NOTIMPL;
 }
@@ -1454,7 +1454,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_OnWindowMessage(IOleInPlaceObje
         UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *lpResult)
 {
     DHTMLEditImpl *This = impl_from_IOleInPlaceObjectWindowless(iface);
-    FIXME("(%p)->(%u %lu %lu %p)\n", This, msg, wParam, lParam, lpResult);
+    FIXME("(%p)->(%u %Iu %Iu %p)\n", This, msg, wParam, lParam, lpResult);
     return E_NOTIMPL;
 }
 
@@ -1676,7 +1676,7 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *
 static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD cookie)
 {
     ConnectionPoint *This = impl_from_IConnectionPoint(iface);
-    FIXME("%p, %d\n", This, cookie);
+    FIXME("%p, %ld\n", This, cookie);
     return E_NOTIMPL;
 }
 
diff --git a/dlls/dhtmled.ocx/main.c b/dlls/dhtmled.ocx/main.c
index a0acd8b620b..c9fa1161d7b 100644
--- a/dlls/dhtmled.ocx/main.c
+++ b/dlls/dhtmled.ocx/main.c
@@ -101,7 +101,7 @@ static const IClassFactoryVtbl ClassFactoryVtbl = {
  */
 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, VOID *reserved)
 {
-    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
+    TRACE("(%p, %lu, %p)\n", instance, reason, reserved);
 
     switch (reason)
     {

[PATCH 19/25] dlls/difxapi: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/difxapi/Makefile.in |    1 -
 dlls/difxapi/main.c      |   12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/difxapi/Makefile.in b/dlls/difxapi/Makefile.in
index 7ca39d4e8ca..3f61fd319ff 100644
--- a/dlls/difxapi/Makefile.in
+++ b/dlls/difxapi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE = difxapi.dll
 
 C_SRCS = \
diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c
index 7b7b1d6d949..8addbc304f7 100644
--- a/dlls/difxapi/main.c
+++ b/dlls/difxapi/main.c
@@ -27,40 +27,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(difxapi);
 
 DWORD WINAPI DriverPackagePreinstallA(LPCSTR inf, DWORD flags)
 {
-    FIXME("(%s, %u) stub\n", wine_dbgstr_a(inf), flags);
+    FIXME("(%s, %lu) stub\n", wine_dbgstr_a(inf), flags);
     return ERROR_SUCCESS;
 }
 
 DWORD WINAPI DriverPackagePreinstallW(LPCWSTR inf, DWORD flags)
 {
-    FIXME("(%s, %u) stub\n", wine_dbgstr_w(inf), flags);
+    FIXME("(%s, %lu) stub\n", wine_dbgstr_w(inf), flags);
     return ERROR_SUCCESS;
 }
 
 DWORD WINAPI DriverPackageInstallA(LPCSTR inf, DWORD flags, PCINSTALLERINFO_A info, BOOL *reboot)
 {
-    FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot);
+    FIXME("(%s, %lu, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot);
     if (reboot) *reboot = FALSE;
     return ERROR_SUCCESS;
 }
 
 DWORD WINAPI DriverPackageInstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W info, BOOL *reboot)
 {
-    FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot);
+    FIXME("(%s, %lu, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot);
     if (reboot) *reboot = FALSE;
     return ERROR_SUCCESS;
 }
 
 DWORD WINAPI DriverPackageUninstallA(LPCSTR inf, DWORD flags, PCINSTALLERINFO_A info, BOOL *reboot)
 {
-    FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot);
+    FIXME("(%s, %lu, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot);
     if (reboot) *reboot = FALSE;
     return ERROR_SUCCESS;
 }
 
 DWORD WINAPI DriverPackageUninstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W info, BOOL *reboot)
 {
-    FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot);
+    FIXME("(%s, %lu, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot);
     if (reboot) *reboot = FALSE;
     return ERROR_SUCCESS;
 }

[PATCH 20/25] dlls/directmanipulation: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/directmanipulation/Makefile.in          |    1 -
 dlls/directmanipulation/directmanipulation.c |   40 +++++++++++++-------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in
index f33edbe6e8d..a258835e3ab 100644
--- a/dlls/directmanipulation/Makefile.in
+++ b/dlls/directmanipulation/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = directmanipulation.dll
 IMPORTS   = uuid
 
diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c
index 28fe52ac0fc..b20c41331e5 100644
--- a/dlls/directmanipulation/directmanipulation.c
+++ b/dlls/directmanipulation/directmanipulation.c
@@ -75,7 +75,7 @@ ULONG WINAPI update_manager_AddRef(IDirectManipulationUpdateManager *iface)
     struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%u\n", This, ref);
+    TRACE("(%p) ref=%lu\n", This, ref);
 
     return ref;
 }
@@ -85,7 +85,7 @@ ULONG WINAPI update_manager_Release(IDirectManipulationUpdateManager *iface)
     struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%u\n", This, ref);
+    TRACE("(%p) ref=%lu\n", This, ref);
 
     if (!ref)
     {
@@ -105,7 +105,7 @@ static HRESULT WINAPI update_manager_RegisterWaitHandleCallback(IDirectManipulat
 static HRESULT WINAPI update_manager_UnregisterWaitHandleCallback(IDirectManipulationUpdateManager *iface, DWORD cookie)
 {
     struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface);
-    FIXME("%p, %x\n", This, cookie);
+    FIXME("%p, %lx\n", This, cookie);
     return E_NOTIMPL;
 }
 
@@ -187,7 +187,7 @@ static ULONG WINAPI primary_AddRef(IDirectManipulationPrimaryContent *iface)
     struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%u\n", This, ref);
+    TRACE("(%p) ref=%lu\n", This, ref);
 
     return ref;
 }
@@ -197,7 +197,7 @@ static ULONG WINAPI primary_Release(IDirectManipulationPrimaryContent *iface)
     struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%u\n", This, ref);
+    TRACE("(%p) ref=%lu\n", This, ref);
 
     if (!ref)
     {
@@ -218,7 +218,7 @@ static HRESULT WINAPI primary_SetSnapPoints(IDirectManipulationPrimaryContent *i
             const float *points, DWORD count)
 {
     struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface);
-    FIXME("%p, %d, %p, %d\n", This, motion, points, count);
+    FIXME("%p, %d, %p, %ld\n", This, motion, points, count);
     return E_NOTIMPL;
 }
 
@@ -262,7 +262,7 @@ static HRESULT WINAPI primary_SetVerticalAlignment(IDirectManipulationPrimaryCon
 static HRESULT WINAPI primary_GetInertiaEndTransform(IDirectManipulationPrimaryContent *iface, float *matrix, DWORD count)
 {
     struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface);
-    FIXME("%p,  %p, %d\n", This, matrix, count);
+    FIXME("%p,  %p, %ld\n", This, matrix, count);
     return E_NOTIMPL;
 }
 
@@ -350,7 +350,7 @@ static HRESULT WINAPI content_GetOutputTransform(IDirectManipulationContent *ifa
                     float *matrix, DWORD count)
 {
     struct primarycontext *This = impl_from_IDirectManipulationContent(iface);
-    FIXME("%p, %p, %d\n", This, matrix, count);
+    FIXME("%p, %p, %ld\n", This, matrix, count);
     return E_NOTIMPL;
 }
 
@@ -358,7 +358,7 @@ static HRESULT WINAPI content_GetContentTransform(IDirectManipulationContent *if
                     float *matrix, DWORD count)
 {
     struct primarycontext *This = impl_from_IDirectManipulationContent(iface);
-    FIXME("%p, %p, %d\n", This, matrix, count);
+    FIXME("%p, %p, %ld\n", This, matrix, count);
     return E_NOTIMPL;
 }
 
@@ -366,7 +366,7 @@ static HRESULT WINAPI content_SyncContentTransform(IDirectManipulationContent *i
                     const float *matrix, DWORD count)
 {
     struct primarycontext *This = impl_from_IDirectManipulationContent(iface);
-    FIXME("%p, %p, %d\n", This, matrix, count);
+    FIXME("%p, %p, %ld\n", This, matrix, count);
     return E_NOTIMPL;
 }
 
@@ -419,7 +419,7 @@ static ULONG WINAPI viewport_AddRef(IDirectManipulationViewport2 *iface)
     struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%u\n", This, ref);
+    TRACE("(%p) ref=%lu\n", This, ref);
 
     return ref;
 }
@@ -429,7 +429,7 @@ static ULONG WINAPI viewport_Release(IDirectManipulationViewport2 *iface)
     struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%u\n", This, ref);
+    TRACE("(%p) ref=%lu\n", This, ref);
 
     if (!ref)
     {
@@ -520,7 +520,7 @@ static HRESULT WINAPI viewport_SetViewportTransform(IDirectManipulationViewport2
                     const float *matrix, DWORD count)
 {
     struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-    FIXME("%p, %p, %d\n", This, matrix, count);
+    FIXME("%p, %p, %ld\n", This, matrix, count);
     return E_NOTIMPL;
 }
 
@@ -528,7 +528,7 @@ static HRESULT WINAPI viewport_SyncDisplayTransform(IDirectManipulationViewport2
                     const float *matrix, DWORD count)
 {
     struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-    FIXME("%p, %p, %d\n", This, matrix, count);
+    FIXME("%p, %p, %ld\n", This, matrix, count);
     return E_NOTIMPL;
 }
 
@@ -624,7 +624,7 @@ static HRESULT WINAPI viewport_AddEventHandler(IDirectManipulationViewport2 *ifa
 static HRESULT WINAPI viewport_RemoveEventHandler(IDirectManipulationViewport2 *iface, DWORD cookie)
 {
     struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-    FIXME("%p, %d\n", This, cookie);
+    FIXME("%p, %ld\n", This, cookie);
     return E_NOTIMPL;
 }
 
@@ -666,7 +666,7 @@ static HRESULT WINAPI viewport_AddBehavior(IDirectManipulationViewport2 *iface,
 static HRESULT WINAPI viewport_RemoveBehavior(IDirectManipulationViewport2 *iface, DWORD cookie)
 {
     struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-    FIXME("%p, %d\n", This, cookie);
+    FIXME("%p, %ld\n", This, cookie);
     return E_NOTIMPL;
 }
 
@@ -750,7 +750,7 @@ static ULONG WINAPI direct_manip_AddRef(IDirectManipulationManager2 *iface)
     struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%u\n", This, ref);
+    TRACE("(%p) ref=%lu\n", This, ref);
 
     return ref;
 }
@@ -760,7 +760,7 @@ static ULONG WINAPI direct_manip_Release(IDirectManipulationManager2 *iface)
     struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%u\n", This, ref);
+    TRACE("(%p) ref=%lu\n", This, ref);
 
     if (!ref)
     {
@@ -946,7 +946,7 @@ static ULONG WINAPI compositor_AddRef(IDirectManipulationCompositor2 *iface)
     struct directcompositor *This = impl_from_IDirectManipulationCompositor2(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%u\n", This, ref);
+    TRACE("(%p) ref=%lu\n", This, ref);
 
     return ref;
 }
@@ -956,7 +956,7 @@ static ULONG WINAPI compositor_Release(IDirectManipulationCompositor2 *iface)
     struct directcompositor *This = impl_from_IDirectManipulationCompositor2(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%u\n", This, ref);
+    TRACE("(%p) ref=%lu\n", This, ref);
 
     if (!ref)
     {

[PATCH 21/25] dlls/dispex: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/dispex/Makefile.in  |    1 -
 dlls/dispex/usrmarshal.c |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in
index a40e2b49215..98a05926727 100644
--- a/dlls/dispex/Makefile.in
+++ b/dlls/dispex/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = dispex.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32
 
diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c
index 6e3c7239f16..4c837b53397 100644
--- a/dlls/dispex/usrmarshal.c
+++ b/dlls/dispex/usrmarshal.c
@@ -50,7 +50,7 @@ HRESULT CALLBACK IDispatchEx_InvokeEx_Proxy(IDispatchEx* This, DISPID id, LCID l
     UINT *ref_idx = &dummy_idx;
     DWORD dword_flags = wFlags & 0xf;
 
-    TRACE("(%p)->(%08x, %04x, %04x, %p, %p, %p, %p)\n", This, id, lcid, wFlags,
+    TRACE("(%p)->(%08lx, %04lx, %04x, %p, %p, %p, %p)\n", This, id, lcid, wFlags,
           pdp, pvarRes, pei, pspCaller);
 
     if(!pvarRes)
@@ -118,7 +118,7 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID
     UINT arg;
     VARTYPE *vt_list = NULL;
 
-    TRACE("(%p)->(%08x, %04x, %08x, %p, %p, %p, %p, %d, %p, %p)\n", This, id, lcid, dwFlags,
+    TRACE("(%p)->(%08lx, %04lx, %08lx, %p, %p, %p, %p, %d, %p, %p)\n", This, id, lcid, dwFlags,
           pdp, result, pei, pspCaller, byref_args, ref_idx, ref_arg);
 
     VariantInit(result);

[PATCH 22/25] dlls/dmcompos: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/dmcompos/Makefile.in     |    1 -
 dlls/dmcompos/chordmap.c      |   14 +++++++-------
 dlls/dmcompos/chordmaptrack.c |   24 ++++++++++++------------
 dlls/dmcompos/composer.c      |    8 ++++----
 dlls/dmcompos/dmobject.c      |   20 ++++++++++----------
 dlls/dmcompos/signposttrack.c |   24 ++++++++++++------------
 6 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/dlls/dmcompos/Makefile.in b/dlls/dmcompos/Makefile.in
index 2f511a8568c..d1e9b5e5b45 100644
--- a/dlls/dmcompos/Makefile.in
+++ b/dlls/dmcompos/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = dmcompos.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 
diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c
index c58857e04c4..ef2fa036ccb 100644
--- a/dlls/dmcompos/chordmap.c
+++ b/dlls/dmcompos/chordmap.c
@@ -67,7 +67,7 @@ static ULONG WINAPI IDirectMusicChordMapImpl_AddRef(IDirectMusicChordMap *iface)
     IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -77,7 +77,7 @@ static ULONG WINAPI IDirectMusicChordMapImpl_Release(IDirectMusicChordMap *iface
     IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
@@ -160,7 +160,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 	FIXME("(%p, %p): Loading not implemented yet\n", This, pStm);
 	IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL);
 	IStream_Read (pStm, &chunkSize, sizeof(DWORD), NULL);
-	TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize);
+	TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (chunkID), chunkSize);
 	switch (chunkID) {	
 		case FOURCC_RIFF: {
 			IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL);				
@@ -174,7 +174,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 						IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL);
 						IStream_Read (pStm, &chunkSize, sizeof(FOURCC), NULL);
 						StreamCount += sizeof(FOURCC) + sizeof(DWORD) + chunkSize;
-						TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize);
+						TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (chunkID), chunkSize);
 						switch (chunkID) {
 							case DMUS_FOURCC_GUID_CHUNK: {
 								TRACE_(dmfile)(": GUID chunk\n");
@@ -206,7 +206,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 											IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL);
 											IStream_Read (pStm, &chunkSize, sizeof(FOURCC), NULL);
 											ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + chunkSize;
-											TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize);
+											TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (chunkID), chunkSize);
 											switch (chunkID) {
 												/* don't ask me why, but M$ puts INFO elements in UNFO list sometimes
                                               (though strings seem to be valid unicode) */
@@ -252,7 +252,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 													break;						
 												}
 											}
-											TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+											TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
 										} while (ListCount[0] < ListSize[0]);
 										break;
 									}
@@ -272,7 +272,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 								break;						
 							}
 						}
-						TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize);
+						TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize);
 					} while (StreamCount < StreamSize);
 					break;
 				}
diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c
index cf4f8259868..27e7dd94887 100644
--- a/dlls/dmcompos/chordmaptrack.c
+++ b/dlls/dmcompos/chordmaptrack.c
@@ -65,7 +65,7 @@ static ULONG WINAPI chordmap_track_AddRef(IDirectMusicTrack8 *iface)
     IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -75,7 +75,7 @@ static ULONG WINAPI chordmap_track_Release(IDirectMusicTrack8 *iface)
     IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
@@ -97,7 +97,7 @@ static HRESULT WINAPI chordmap_track_InitPlay(IDirectMusicTrack8 *iface,
         void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
 {
         IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
+	FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
 	return S_OK;
 }
 
@@ -113,7 +113,7 @@ static HRESULT WINAPI chordmap_track_Play(IDirectMusicTrack8 *iface, void *pStat
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
+	FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
 
@@ -122,7 +122,7 @@ static HRESULT WINAPI chordmap_track_GetParam(IDirectMusicTrack8 *iface, REFGUID
 {
     IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param);
+    TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param);
 
     if (!type)
         return E_POINTER;
@@ -139,7 +139,7 @@ static HRESULT WINAPI chordmap_track_SetParam(IDirectMusicTrack8 *iface, REFGUID
 {
     IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param);
+    TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
 
     if (!type)
         return E_POINTER;
@@ -189,7 +189,7 @@ static HRESULT WINAPI chordmap_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME
         MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
 {
         IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
+	FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
 	return S_OK;
 }
 
@@ -198,7 +198,7 @@ static HRESULT WINAPI chordmap_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
+	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
 	    wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
@@ -208,7 +208,7 @@ static HRESULT WINAPI chordmap_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU
         DWORD dwFlags)
 {
         IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -217,7 +217,7 @@ static HRESULT WINAPI chordmap_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU
         REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
 {
         IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -227,7 +227,7 @@ static HRESULT WINAPI chordmap_track_Compose(IDirectMusicTrack8 *iface, IUnknown
 {
     IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+    TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track);
     return E_NOTIMPL;
 }
 
@@ -236,7 +236,7 @@ static HRESULT WINAPI chordmap_track_Join(IDirectMusicTrack8 *iface, IDirectMusi
         IDirectMusicTrack **ppResultTrack)
 {
         IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
+	FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
 	return S_OK;
 }
 
diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c
index 9fbe1689c66..84ca90aaf42 100644
--- a/dlls/dmcompos/composer.c
+++ b/dlls/dmcompos/composer.c
@@ -55,7 +55,7 @@ static ULONG WINAPI IDirectMusicComposerImpl_AddRef(IDirectMusicComposer *iface)
     IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -65,7 +65,7 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface
     IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (ref == 0) {
         HeapFree(GetProcessHeap(), 0, This);
@@ -100,7 +100,7 @@ static HRESULT WINAPI IDirectMusicComposerImpl_ComposeTransition(IDirectMusicCom
         IDirectMusicSegment **ppTransSeg)
 {
         IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
-	FIXME("(%p, %p, %p, %d, %d, %d, %p, %p): stub\n", This, pFromSeg, pToSeg, mtTime, wCommand, dwFlags, pChordMap, ppTransSeg);
+	FIXME("(%p, %p, %p, %ld, %d, %ld, %p, %p): stub\n", This, pFromSeg, pToSeg, mtTime, wCommand, dwFlags, pChordMap, ppTransSeg);
 	return S_OK;
 }
 
@@ -110,7 +110,7 @@ static HRESULT WINAPI IDirectMusicComposerImpl_AutoTransition(IDirectMusicCompos
         IDirectMusicSegmentState **ppToSegState, IDirectMusicSegmentState **ppTransSegState)
 {
         IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
-	FIXME("(%p, %p, %d, %d, %p, %p, %p, %p): stub\n", This, pPerformance, wCommand, dwFlags, pChordMap, ppTransSeg, ppToSegState, ppTransSegState);
+	FIXME("(%p, %p, %d, %ld, %p, %p, %p, %p): stub\n", This, pPerformance, wCommand, dwFlags, pChordMap, ppTransSeg, ppToSegState, ppTransSegState);
 	return S_OK;
 }
 
diff --git a/dlls/dmcompos/dmobject.c b/dlls/dmcompos/dmobject.c
index e6a1ce906a7..84b08e0d772 100644
--- a/dlls/dmcompos/dmobject.c
+++ b/dlls/dmcompos/dmobject.c
@@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
         return;
 
     TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc);
-    TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize);
+    TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
 
 #define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
-    TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData);
+    TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData);
     X(DMUS_OBJ_OBJECT);
     X(DMUS_OBJ_CLASS);
     X(DMUS_OBJ_NAME);
@@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk)
         return "(null)";
     if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
         type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type));
-    return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size);
+    return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size);
 }
 
 static HRESULT stream_read(IStream *stream, void *data, ULONG size)
@@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size)
 
     hr = IStream_Read(stream, data, size, &read);
     if (FAILED(hr))
-        TRACE_(dmfile)("IStream_Read failed: %08x\n", hr);
+        TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr);
     else if (!read && read < size) {
         /* All or nothing: Handle a partial read due to end of stream as an error */
-        TRACE_(dmfile)("Short read: %u < %u\n", read, size);
+        TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);
         return E_FAIL;
     }
 
@@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,
     if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
         return hr;
     if (size != elem_size) {
-        WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n",
+        WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n",
                 debugstr_chunk(chunk), size, elem_size);
         return DMUS_E_UNSUPPORTED_STREAM;
     }
@@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk,
         ULONG size)
 {
     if (chunk->size != size) {
-        WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n",
+        WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n",
                 debugstr_fourcc(chunk->id), chunk->size,
                 wine_dbgstr_longlong(chunk->offset.QuadPart), size);
         return E_FAIL;
@@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
     struct chunk_entry chunk = {.parent = riff};
     HRESULT hr;
 
-    TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff));
+    TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
 
     desc->dwValidData = 0;
     desc->dwSize = sizeof(*desc);
@@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
                 break;
         }
     }
-    TRACE("Found %#x\n", desc->dwValidData);
+    TRACE("Found %#lx\n", desc->dwValidData);
 
     return hr;
 }
@@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
         WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
         return hr;
     }
-    TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID),
+    TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID),
             reference.dwValidData);
 
     if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c
index d07982975c9..8da4ade961a 100644
--- a/dlls/dmcompos/signposttrack.c
+++ b/dlls/dmcompos/signposttrack.c
@@ -65,7 +65,7 @@ static ULONG WINAPI signpost_track_AddRef(IDirectMusicTrack8 *iface)
     IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -75,7 +75,7 @@ static ULONG WINAPI signpost_track_Release(IDirectMusicTrack8 *iface)
     IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
@@ -97,7 +97,7 @@ static HRESULT WINAPI signpost_track_InitPlay(IDirectMusicTrack8 *iface,
         void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
 {
         IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
+	FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
 	return S_OK;
 }
 
@@ -113,7 +113,7 @@ static HRESULT WINAPI signpost_track_Play(IDirectMusicTrack8 *iface, void *pStat
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
+	FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
 
@@ -122,7 +122,7 @@ static HRESULT WINAPI signpost_track_GetParam(IDirectMusicTrack8 *iface, REFGUID
 {
     IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time,
+    TRACE("(%p, %s, %ld, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time,
             next, param);
     return E_NOTIMPL;
 }
@@ -132,7 +132,7 @@ static HRESULT WINAPI signpost_track_SetParam(IDirectMusicTrack8 *iface, REFGUID
 {
     IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param);
+    TRACE("(%p, %s, %ld, %p): method not implemented\n", This, debugstr_dmguid(type), time, param);
     return E_NOTIMPL;
 }
 
@@ -164,7 +164,7 @@ static HRESULT WINAPI signpost_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME
         MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
 {
         IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
+	FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
 	return S_OK;
 }
 
@@ -173,7 +173,7 @@ static HRESULT WINAPI signpost_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
+	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
 	    wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
@@ -183,7 +183,7 @@ static HRESULT WINAPI signpost_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU
 {
     IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type),
+    TRACE("(%p, %s, %s, %p, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type),
             wine_dbgstr_longlong(time), next, param, state, flags);
     return E_NOTIMPL;
 }
@@ -193,7 +193,7 @@ static HRESULT WINAPI signpost_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU
 {
     IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type),
+    TRACE("(%p, %s, %s, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type),
             wine_dbgstr_longlong(time), param, state, flags);
     return E_NOTIMPL;
 }
@@ -202,7 +202,7 @@ static HRESULT WINAPI signpost_track_Compose(IDirectMusicTrack8 *iface, IUnknown
         DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack)
 {
         IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack);
+	FIXME("(%p, %p, %ld, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack);
 	return S_OK;
 }
 
@@ -211,7 +211,7 @@ static HRESULT WINAPI signpost_track_Join(IDirectMusicTrack8 *iface, IDirectMusi
         IDirectMusicTrack **ppResultTrack)
 {
         IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
+	FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
 	return S_OK;
 }

[PATCH 23/25] dlls/dmloader: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/dmloader/Makefile.in     |    1 -
 dlls/dmloader/container.c     |   30 +++++++++++++++---------------
 dlls/dmloader/debug.c         |    4 ++--
 dlls/dmloader/dmloader_main.c |    2 +-
 dlls/dmloader/dmobject.c      |   20 ++++++++++----------
 dlls/dmloader/loader.c        |   10 +++++-----
 dlls/dmloader/loaderstream.c  |   36 ++++++++++++++++++------------------
 7 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in
index 880f2bfc02a..4aa80c6dfb3 100644
--- a/dlls/dmloader/Makefile.in
+++ b/dlls/dmloader/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = dmloader.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 
diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c
index 005f0d7e9ed..86326d257a3 100644
--- a/dlls/dmloader/container.c
+++ b/dlls/dmloader/container.c
@@ -121,7 +121,7 @@ static ULONG WINAPI IDirectMusicContainerImpl_AddRef(IDirectMusicContainer *ifac
     IDirectMusicContainerImpl *This = impl_from_IDirectMusicContainer(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -131,7 +131,7 @@ static ULONG WINAPI IDirectMusicContainerImpl_Release(IDirectMusicContainer *ifa
     IDirectMusicContainerImpl *This = impl_from_IDirectMusicContainer(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         if (This->pStream)
@@ -151,12 +151,12 @@ static HRESULT WINAPI IDirectMusicContainerImpl_EnumObject(IDirectMusicContainer
 	LPWINE_CONTAINER_ENTRY pContainedObject;
 	DWORD dwCount = 0;
 
-	TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc, pwszAlias);
+	TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc, pwszAlias);
 
 	if (!pDesc)
 		return E_POINTER;
 	if (pDesc->dwSize != sizeof(DMUS_OBJECTDESC)) {
-		ERR(": invalid pDesc->dwSize %d\n", pDesc->dwSize);
+		ERR(": invalid pDesc->dwSize %ld\n", pDesc->dwSize);
 		return E_INVALIDARG;
 	}
 
@@ -278,7 +278,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 	
 	/* start with load */
 	IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
-	TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+	TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 	switch (Chunk.fccID) {	
 		case FOURCC_RIFF: {
 			IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);				
@@ -293,7 +293,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 					do {
 						IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 						StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-						TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+						TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 						switch (Chunk.fccID) {
 							case DMUS_FOURCC_CONTAINER_CHUNK: {
 								IStream_Read (pStm, &This->Header, Chunk.dwSize, NULL);
@@ -343,7 +343,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 										do {
 											IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 											ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-											TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+											TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 											switch (Chunk.fccID) {
 												/* don't ask me why, but M$ puts INFO elements in UNFO list sometimes
                                               (though strings seem to be valid unicode) */
@@ -369,7 +369,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 													break;						
 												}
 											}
-											TRACE_(dmfile)(": ListCount[0] = 0x%08X < ListSize[0] = 0x%08X\n", ListCount[0], ListSize[0]);
+											TRACE_(dmfile)(": ListCount[0] = 0x%08lX < ListSize[0] = 0x%08lX\n", ListCount[0], ListSize[0]);
 										} while (ListCount[0] < ListSize[0]);
 										break;
 									}
@@ -378,7 +378,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 										do {
 											IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 											ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-											TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+											TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 											switch (Chunk.fccID) {
 												case FOURCC_LIST: {
 													IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);				
@@ -394,7 +394,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 															do {
 																IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 																ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-																TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+																TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 																switch (Chunk.fccID) {
 																	case DMUS_FOURCC_CONTAINED_ALIAS_CHUNK: {
 																		TRACE_(dmfile)(": alias chunk\n");
@@ -428,7 +428,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 																				do {
 																					IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 																					ListCount[2] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-																					TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+																					TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 																					switch (Chunk.fccID) {
 																						case DMUS_FOURCC_REF_CHUNK: {
 																							DMUS_IO_REFERENCE tmpReferenceHeader; /* temporary structure */
@@ -486,7 +486,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 																							break;
 																						}
 																					}
-																					TRACE_(dmfile)(": ListCount[2] = 0x%08X < ListSize[2] = 0x%08X\n", ListCount[2], ListSize[2]);
+																					TRACE_(dmfile)(": ListCount[2] = 0x%08lX < ListSize[2] = 0x%08lX\n", ListCount[2], ListSize[2]);
 																				} while (ListCount[2] < ListSize[2]);
 																				break;
 																			}
@@ -531,7 +531,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 																		break;						
 																	}
 																}
-																TRACE_(dmfile)(": ListCount[1] = 0x%08X < ListSize[1] = 0x%08X\n", ListCount[1], ListSize[1]);
+																TRACE_(dmfile)(": ListCount[1] = 0x%08lX < ListSize[1] = 0x%08lX\n", ListCount[1], ListSize[1]);
 															} while (ListCount[1] < ListSize[1]);
 															/* SetObject: this will fill descriptor with additional info	and add alias in loader's cache */
 															IDirectMusicLoader_SetObject (pLoader, &pNewEntry->Desc);
@@ -564,7 +564,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 													break;						
 												}
 											}
-											TRACE_(dmfile)(": ListCount[0] = 0x%08X < ListSize[0] = 0x%08X\n", ListCount[0], ListSize[0]);
+											TRACE_(dmfile)(": ListCount[0] = 0x%08lX < ListSize[0] = 0x%08lX\n", ListCount[0], ListSize[0]);
 										} while (ListCount[0] < ListSize[0]);
 										break;
 									}									
@@ -584,7 +584,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 								break;						
 							}
 						}
-						TRACE_(dmfile)(": StreamCount[0] = 0x%08X < StreamSize[0] = 0x%08X\n", StreamCount, StreamSize);
+						TRACE_(dmfile)(": StreamCount[0] = 0x%08lX < StreamSize[0] = 0x%08lX\n", StreamCount, StreamSize);
 					} while (StreamCount < StreamSize);
 					break;
 				}
diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c
index 1be92e72af4..ac1d6ac7d72 100644
--- a/dlls/dmloader/debug.c
+++ b/dlls/dmloader/debug.c
@@ -48,7 +48,7 @@ const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeade
 		char buffer[1024], *ptr = buffer;
 
 		ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader);
-		ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags,
+		ptr += sprintf(ptr, "\n - dwFlags = %#lx%s", pHeader->dwFlags,
                         pHeader->dwFlags & DMUS_CONTAINER_NOLOADS ? " (DMUS_CONTAINER_NOLOADS)" : "");
 
 		return wine_dbg_sprintf("%s", buffer);
@@ -63,7 +63,7 @@ const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT
 		
 		ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):", pHeader);
 		ptr += sprintf(ptr, "\n - guidClassID = %s", debugstr_dmguid(&pHeader->guidClassID));
-		ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags,
+		ptr += sprintf(ptr, "\n - dwFlags = %#lx%s", pHeader->dwFlags,
                         pHeader->dwFlags & DMUS_CONTAINED_OBJF_KEEP ? " (DMUS_CONTAINED_OBJF_KEEP)" : "");
 		ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid));
 		ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType));
diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c
index 04e30fc791d..61aa092b5f8 100644
--- a/dlls/dmloader/dmloader_main.c
+++ b/dlls/dmloader/dmloader_main.c
@@ -128,7 +128,7 @@ static IClassFactoryImpl dm_container_CF = {{&classfactory_vtbl}, create_dmconta
  */
 HRESULT WINAPI DllCanUnloadNow (void)
 {
-    TRACE("() ref=%d\n", module_ref);
+    TRACE("() ref=%ld\n", module_ref);
 
     return module_ref ? S_FALSE : S_OK;
 }
diff --git a/dlls/dmloader/dmobject.c b/dlls/dmloader/dmobject.c
index e6a1ce906a7..84b08e0d772 100644
--- a/dlls/dmloader/dmobject.c
+++ b/dlls/dmloader/dmobject.c
@@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
         return;
 
     TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc);
-    TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize);
+    TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
 
 #define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
-    TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData);
+    TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData);
     X(DMUS_OBJ_OBJECT);
     X(DMUS_OBJ_CLASS);
     X(DMUS_OBJ_NAME);
@@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk)
         return "(null)";
     if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
         type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type));
-    return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size);
+    return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size);
 }
 
 static HRESULT stream_read(IStream *stream, void *data, ULONG size)
@@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size)
 
     hr = IStream_Read(stream, data, size, &read);
     if (FAILED(hr))
-        TRACE_(dmfile)("IStream_Read failed: %08x\n", hr);
+        TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr);
     else if (!read && read < size) {
         /* All or nothing: Handle a partial read due to end of stream as an error */
-        TRACE_(dmfile)("Short read: %u < %u\n", read, size);
+        TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);
         return E_FAIL;
     }
 
@@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,
     if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
         return hr;
     if (size != elem_size) {
-        WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n",
+        WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n",
                 debugstr_chunk(chunk), size, elem_size);
         return DMUS_E_UNSUPPORTED_STREAM;
     }
@@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk,
         ULONG size)
 {
     if (chunk->size != size) {
-        WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n",
+        WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n",
                 debugstr_fourcc(chunk->id), chunk->size,
                 wine_dbgstr_longlong(chunk->offset.QuadPart), size);
         return E_FAIL;
@@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
     struct chunk_entry chunk = {.parent = riff};
     HRESULT hr;
 
-    TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff));
+    TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
 
     desc->dwValidData = 0;
     desc->dwSize = sizeof(*desc);
@@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
                 break;
         }
     }
-    TRACE("Found %#x\n", desc->dwValidData);
+    TRACE("Found %#lx\n", desc->dwValidData);
 
     return hr;
 }
@@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
         WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
         return hr;
     }
-    TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID),
+    TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID),
             reference.dwValidData);
 
     if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 00170f42937..110db024d93 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -138,7 +138,7 @@ static ULONG WINAPI IDirectMusicLoaderImpl_AddRef(IDirectMusicLoader8 *iface)
     IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p)->(): new ref = %u\n", iface, ref);
+    TRACE("(%p)->(): new ref = %lu\n", iface, ref);
 
     return ref;
 }
@@ -148,7 +148,7 @@ static ULONG WINAPI IDirectMusicLoaderImpl_Release(IDirectMusicLoader8 *iface)
     IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p)->(): new ref = %u\n", iface, ref);
+    TRACE("(%p)->(): new ref = %lu\n", iface, ref);
 
     if (!ref) {
         unsigned int i;
@@ -402,7 +402,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac
 		IStream_Release(pStream);
 		IPersistStream_Release(pPersistStream);
 		IDirectMusicObject_Release(pObject);
-		WARN(": failed to (completely) load object (%08x)\n", result);
+		WARN(": failed to (completely) load object (%08lx)\n", result);
 		return result;
 	}
 	/* get descriptor */
@@ -534,7 +534,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac
 	hr = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject);
         if (FAILED(hr)) {
 		IStream_Release(pStream);
-		ERR("Object creation of %s failed 0x%08x\n", debugstr_guid(&pDesc->guidClass),hr);
+		ERR("Object creation of %s failed 0x%08lx\n", debugstr_guid(&pDesc->guidClass),hr);
 		return DMUS_E_LOADER_FAILEDOPEN;
         }
 
@@ -786,7 +786,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_EnumObject(IDirectMusicLoader8 *ifa
 	IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface);
 	DWORD dwCount = 0;
         struct cache_entry *pObjectEntry;
-	TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc);
+	TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc);
 
 	DM_STRUCT_INIT(pDesc);
 
diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c
index 150a53524a7..efe16c6d46c 100644
--- a/dlls/dmloader/loaderstream.c
+++ b/dlls/dmloader/loaderstream.c
@@ -110,7 +110,7 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_QueryInterface (LPSTR
 
 static ULONG WINAPI IDirectMusicLoaderFileStream_IStream_AddRef (LPSTREAM iface) {
 	ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
-	TRACE("(%p): AddRef from %d\n", This, This->dwRef);
+	TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
 	return InterlockedIncrement (&This->dwRef);
 }
 
@@ -118,7 +118,7 @@ static ULONG WINAPI IDirectMusicLoaderFileStream_IStream_Release (LPSTREAM iface
 	ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
 	
 	DWORD dwRef = InterlockedDecrement (&This->dwRef);
-	TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
+	TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
 	if (dwRef == 0) {
 		if (This->hFile)
 			IDirectMusicLoaderFileStream_Detach (iface);
@@ -132,12 +132,12 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Read (LPSTREAM iface,
 	ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
     ULONG cbRead;
 	
-	TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbRead);
+	TRACE_(dmfileraw)("(%p, %p, 0x%08lX, %p)\n", This, pv, cb, pcbRead);
     if (This->hFile == INVALID_HANDLE_VALUE) return E_FAIL;
     if (pcbRead == NULL) pcbRead = &cbRead;
     if (!ReadFile (This->hFile, pv, cb, pcbRead, NULL) || *pcbRead != cb) return E_FAIL;
 	
-	TRACE_(dmfileraw)(": data (size = 0x%08X): %s\n", *pcbRead, debugstr_an(pv, *pcbRead));
+	TRACE_(dmfileraw)(": data (size = 0x%08lX): %s\n", *pcbRead, debugstr_an(pv, *pcbRead));
     return S_OK;
 }
 
@@ -194,12 +194,12 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Write (LPSTREAM iface
 	ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
     ULONG cbWrite;
 	
-	TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbWritten);
+	TRACE_(dmfileraw)("(%p, %p, 0x%08lX, %p)\n", This, pv, cb, pcbWritten);
     if (This->hFile == INVALID_HANDLE_VALUE) return E_FAIL;
     if (pcbWritten == NULL) pcbWritten = &cbWrite;
     if (!WriteFile (This->hFile, pv, cb, pcbWritten, NULL) || *pcbWritten != cb) return E_FAIL;
 	
-	TRACE_(dmfileraw)(": data (size = 0x%08X): %s\n", *pcbWritten, debugstr_an(pv, *pcbWritten));
+	TRACE_(dmfileraw)(": data (size = 0x%08lX): %s\n", *pcbWritten, debugstr_an(pv, *pcbWritten));
     return S_OK;
 }
 
@@ -358,7 +358,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_QueryInterface (L
 
 static ULONG WINAPI IDirectMusicLoaderResourceStream_IStream_AddRef (LPSTREAM iface) {
 	ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface);
-	TRACE("(%p): AddRef from %d\n", This, This->dwRef);
+	TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
 	return InterlockedIncrement (&This->dwRef);
 }
 
@@ -366,7 +366,7 @@ static ULONG WINAPI IDirectMusicLoaderResourceStream_IStream_Release (LPSTREAM i
 	ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface);
 	
 	DWORD dwRef = InterlockedDecrement (&This->dwRef);
-	TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
+	TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
 	if (dwRef == 0) {
 		IDirectMusicLoaderResourceStream_Detach (iface);
 		HeapFree (GetProcessHeap(), 0, This);
@@ -379,7 +379,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Read (LPSTREAM if
 	LPBYTE pByte;
 	ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface);
 	
-	TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbRead);
+	TRACE_(dmfileraw)("(%p, %p, 0x%08lX, %p)\n", This, pv, cb, pcbRead);
 	if ((This->llPos + cb) > This->llMemLength) {
 		WARN_(dmfileraw)(": requested size out of range\n");
 		return E_FAIL;
@@ -391,7 +391,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Read (LPSTREAM if
 	/* FIXME: error checking would be nice */
 	if (pcbRead) *pcbRead = cb;
 	
-	TRACE_(dmfileraw)(": data (size = 0x%08X): %s\n", cb, debugstr_an(pv, cb));
+	TRACE_(dmfileraw)(": data (size = 0x%08lX): %s\n", cb, debugstr_an(pv, cb));
     return S_OK;
 }
 
@@ -618,7 +618,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_QueryInterface (LP
 
 static ULONG WINAPI IDirectMusicLoaderGenericStream_IStream_AddRef (LPSTREAM iface) {
 	ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
-	TRACE("(%p): AddRef from %d\n", This, This->dwRef);
+	TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
 	return InterlockedIncrement (&This->dwRef);
 }
 
@@ -626,7 +626,7 @@ static ULONG WINAPI IDirectMusicLoaderGenericStream_IStream_Release (LPSTREAM if
 	ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
 	
 	DWORD dwRef = InterlockedDecrement (&This->dwRef);
-	TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
+	TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
 	if (dwRef == 0) {
 		IDirectMusicLoaderGenericStream_Detach (iface);
 		HeapFree (GetProcessHeap(), 0, This);
@@ -638,7 +638,7 @@ static ULONG WINAPI IDirectMusicLoaderGenericStream_IStream_Release (LPSTREAM if
 static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Read (LPSTREAM iface, void* pv, ULONG cb, ULONG* pcbRead) {
 	ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
 
-	TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p): redirecting to low-level stream\n", This, pv, cb, pcbRead);
+	TRACE_(dmfileraw)("(%p, %p, 0x%08lX, %p): redirecting to low-level stream\n", This, pv, cb, pcbRead);
 	if (!This->pStream)
 		return E_FAIL;
 
@@ -677,7 +677,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Clone (LPSTREAM if
 
 static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Write (LPSTREAM iface, const void* pv, ULONG cb, ULONG* pcbWritten) {
 	ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);	
-	TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p): redirecting to low-level stream\n", This, pv, cb, pcbWritten);
+	TRACE_(dmfileraw)("(%p, %p, 0x%08lX, %p): redirecting to low-level stream\n", This, pv, cb, pcbWritten);
 	if (!This->pStream)
 		return E_FAIL;
 
@@ -704,7 +704,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_CopyTo (LPSTREAM i
 
 static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Commit (LPSTREAM iface, DWORD grfCommitFlags) {
 	ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);	
-	TRACE("(%p, 0x%08X): redirecting to low-level stream\n", This, grfCommitFlags);
+	TRACE("(%p, 0x%08lX): redirecting to low-level stream\n", This, grfCommitFlags);
 	if (!This->pStream)
 		return E_FAIL;
 
@@ -722,7 +722,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Revert (LPSTREAM i
 
 static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_LockRegion (LPSTREAM iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {
 	ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);	
-	TRACE("(%p, %s, %s, 0x%08X): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType);
+	TRACE("(%p, %s, %s, 0x%08lX): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType);
 	if (!This->pStream)
 		return E_FAIL;
 
@@ -731,7 +731,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_LockRegion (LPSTRE
 
 static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_UnlockRegion (LPSTREAM iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {
 	ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);	
-	TRACE("(%p, %s, %s, 0x%08X): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType);
+	TRACE("(%p, %s, %s, 0x%08lX): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType);
 	if (!This->pStream)
 		return E_FAIL;
 
@@ -740,7 +740,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_UnlockRegion (LPST
 
 static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Stat (LPSTREAM iface, STATSTG* pstatstg, DWORD grfStatFlag) {
 	ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);	
-	TRACE("(%p, %p, 0x%08X): redirecting to low-level stream\n", This, pstatstg, grfStatFlag);
+	TRACE("(%p, %p, 0x%08lX): redirecting to low-level stream\n", This, pstatstg, grfStatFlag);
 	if (!This->pStream)
 		return E_FAIL;

[PATCH 24/25] dlls/dmscript: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/dmscript/Makefile.in   |    1 -
 dlls/dmscript/dmobject.c    |   20 ++++++++++----------
 dlls/dmscript/script.c      |   22 +++++++++++-----------
 dlls/dmscript/scripttrack.c |   24 ++++++++++++------------
 4 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in
index 9544d88dacc..55107e116c9 100644
--- a/dlls/dmscript/Makefile.in
+++ b/dlls/dmscript/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = dmscript.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 
diff --git a/dlls/dmscript/dmobject.c b/dlls/dmscript/dmobject.c
index e6a1ce906a7..84b08e0d772 100644
--- a/dlls/dmscript/dmobject.c
+++ b/dlls/dmscript/dmobject.c
@@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
         return;
 
     TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc);
-    TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize);
+    TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
 
 #define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
-    TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData);
+    TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData);
     X(DMUS_OBJ_OBJECT);
     X(DMUS_OBJ_CLASS);
     X(DMUS_OBJ_NAME);
@@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk)
         return "(null)";
     if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
         type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type));
-    return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size);
+    return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size);
 }
 
 static HRESULT stream_read(IStream *stream, void *data, ULONG size)
@@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size)
 
     hr = IStream_Read(stream, data, size, &read);
     if (FAILED(hr))
-        TRACE_(dmfile)("IStream_Read failed: %08x\n", hr);
+        TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr);
     else if (!read && read < size) {
         /* All or nothing: Handle a partial read due to end of stream as an error */
-        TRACE_(dmfile)("Short read: %u < %u\n", read, size);
+        TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);
         return E_FAIL;
     }
 
@@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,
     if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
         return hr;
     if (size != elem_size) {
-        WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n",
+        WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n",
                 debugstr_chunk(chunk), size, elem_size);
         return DMUS_E_UNSUPPORTED_STREAM;
     }
@@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk,
         ULONG size)
 {
     if (chunk->size != size) {
-        WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n",
+        WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n",
                 debugstr_fourcc(chunk->id), chunk->size,
                 wine_dbgstr_longlong(chunk->offset.QuadPart), size);
         return E_FAIL;
@@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
     struct chunk_entry chunk = {.parent = riff};
     HRESULT hr;
 
-    TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff));
+    TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
 
     desc->dwValidData = 0;
     desc->dwSize = sizeof(*desc);
@@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
                 break;
         }
     }
-    TRACE("Found %#x\n", desc->dwValidData);
+    TRACE("Found %#lx\n", desc->dwValidData);
 
     return hr;
 }
@@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
         WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
         return hr;
     }
-    TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID),
+    TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID),
             reference.dwValidData);
 
     if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
index 80c5273a710..5bc6a8b3067 100644
--- a/dlls/dmscript/script.c
+++ b/dlls/dmscript/script.c
@@ -76,7 +76,7 @@ static ULONG WINAPI IDirectMusicScriptImpl_AddRef(IDirectMusicScript *iface)
     IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -86,7 +86,7 @@ static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface)
     IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         HeapFree(GetProcessHeap(), 0, This->pHeader);
@@ -139,7 +139,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableNumber(IDirectMusicScrip
         WCHAR *pwszVariableName, LONG lValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo)
 {
   IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface);
-  FIXME("(%p, %s, %i, %p): stub\n", This, debugstr_w(pwszVariableName), lValue, pErrorInfo);
+  FIXME("(%p, %s, %li, %p): stub\n", This, debugstr_w(pwszVariableName), lValue, pErrorInfo);
   return S_OK;
 }
 
@@ -171,7 +171,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_EnumRoutine(IDirectMusicScript *ifa
         WCHAR *pwszName)
 {
   IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface);
-  FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName);
+  FIXME("(%p, %ld, %p): stub\n", This, dwIndex, pwszName);
   return S_OK;
 }
 
@@ -179,7 +179,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_EnumVariable(IDirectMusicScript *if
         WCHAR *pwszName)
 {
   IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface);
-  FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName);
+  FIXME("(%p, %ld, %p): stub\n", This, dwIndex, pwszName);
   return S_OK;
 }
 
@@ -259,7 +259,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 
 	FIXME("(%p, %p): Loading not implemented yet\n", This, pStm);
 	IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
-	TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+	TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 	switch (Chunk.fccID) {	
 		case FOURCC_RIFF: {
 			IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);				
@@ -272,7 +272,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 					do {
 						IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 						StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-						TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+						TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 						switch (Chunk.fccID) { 
 						        case DMUS_FOURCC_SCRIPT_CHUNK: {
 							        TRACE_(dmfile)(": script header chunk\n");
@@ -284,7 +284,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 							        TRACE_(dmfile)(": script version chunk\n");
 								This->pVersion = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, Chunk.dwSize);
 								IStream_Read (pStm, This->pVersion, Chunk.dwSize, NULL); 
-								TRACE_(dmfile)("version: 0x%08x.0x%08x\n", This->pVersion->dwVersionMS, This->pVersion->dwVersionLS);
+								TRACE_(dmfile)("version: 0x%08lx.0x%08lx\n", This->pVersion->dwVersionMS, This->pVersion->dwVersionLS);
 								break;
 						        }
 						        case DMUS_FOURCC_SCRIPTLANGUAGE_CHUNK: {
@@ -385,7 +385,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 										do {
 											IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 											ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-											TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+											TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 											switch (Chunk.fccID) {
 												/* don't ask me why, but M$ puts INFO elements in UNFO list sometimes
                                               (though strings seem to be valid unicode) */
@@ -431,7 +431,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 													break;						
 												}
 											}
-											TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+											TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
 										} while (ListCount[0] < ListSize[0]);
 										break;
 									}
@@ -451,7 +451,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 								break;						
 							}
 						}
-						TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize);
+						TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize);
 					} while (StreamCount < StreamSize);
 					break;
 				}
diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c
index 1bdf3e13c5e..6e430de3f39 100644
--- a/dlls/dmscript/scripttrack.c
+++ b/dlls/dmscript/scripttrack.c
@@ -72,7 +72,7 @@ static ULONG WINAPI script_track_AddRef(IDirectMusicTrack8 *iface)
     DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -82,7 +82,7 @@ static ULONG WINAPI script_track_Release(IDirectMusicTrack8 *iface)
     DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
@@ -104,7 +104,7 @@ static HRESULT WINAPI script_track_InitPlay(IDirectMusicTrack8 *iface,
         void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
 {
 	DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
+	FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
 	return S_OK;
 }
 
@@ -120,7 +120,7 @@ static HRESULT WINAPI script_track_Play(IDirectMusicTrack8 *iface, void *pStateD
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
 	DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
+	FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
 
@@ -129,7 +129,7 @@ static HRESULT WINAPI script_track_GetParam(IDirectMusicTrack8 *iface, REFGUID t
 {
     DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param);
+    TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param);
 
     return DMUS_E_GET_UNSUPPORTED;
 }
@@ -139,7 +139,7 @@ static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID t
 {
     DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param);
+    TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param);
 
     return DMUS_E_SET_UNSUPPORTED;
 }
@@ -175,7 +175,7 @@ static HRESULT WINAPI script_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME m
         MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
 {
 	DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
+	FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
 	return S_OK;
 }
 
@@ -184,7 +184,7 @@ static HRESULT WINAPI script_track_PlayEx(IDirectMusicTrack8 *iface, void *pStat
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
 	DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
+	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
 	    wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
@@ -194,7 +194,7 @@ static HRESULT WINAPI script_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID
         DWORD dwFlags)
 {
 	DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -203,7 +203,7 @@ static HRESULT WINAPI script_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID
         REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
 {
 	DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -213,7 +213,7 @@ static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown *
 {
     DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, group, res_track);
+    TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, group, res_track);
 
     return E_NOTIMPL;
 }
@@ -223,7 +223,7 @@ static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicT
 {
     DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, track2, join, context,
+    TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, track2, join, context,
             group, res_track);
 
     return E_NOTIMPL;

[PATCH 25/25] dlls/dmstyle: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/dmstyle/Makefile.in     |    1 -
 dlls/dmstyle/auditiontrack.c |   24 ++++++++---------
 dlls/dmstyle/chordtrack.c    |   52 ++++++++++++++++++------------------
 dlls/dmstyle/commandtrack.c  |   30 +++++++++++----------
 dlls/dmstyle/dmobject.c      |   20 +++++++-------
 dlls/dmstyle/dmutils.c       |    6 ++--
 dlls/dmstyle/motiftrack.c    |   24 ++++++++---------
 dlls/dmstyle/mutetrack.c     |   24 ++++++++---------
 dlls/dmstyle/style.c         |   60 +++++++++++++++++++++---------------------
 dlls/dmstyle/styletrack.c    |   38 +++++++++++++--------------
 10 files changed, 139 insertions(+), 140 deletions(-)

diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in
index 8067d5e4675..a95a524d473 100644
--- a/dlls/dmstyle/Makefile.in
+++ b/dlls/dmstyle/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = dmstyle.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 
diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c
index ececce9728f..29ad868f773 100644
--- a/dlls/dmstyle/auditiontrack.c
+++ b/dlls/dmstyle/auditiontrack.c
@@ -65,7 +65,7 @@ static ULONG WINAPI audition_track_AddRef(IDirectMusicTrack8 *iface)
     IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -75,7 +75,7 @@ static ULONG WINAPI audition_track_Release(IDirectMusicTrack8 *iface)
     IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
@@ -97,7 +97,7 @@ static HRESULT WINAPI audition_track_InitPlay(IDirectMusicTrack8 *iface,
         void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
 {
         IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
+	FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
 	return S_OK;
 }
 
@@ -113,7 +113,7 @@ static HRESULT WINAPI audition_track_Play(IDirectMusicTrack8 *iface, void *pStat
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
+	FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
 
@@ -122,7 +122,7 @@ static HRESULT WINAPI audition_track_GetParam(IDirectMusicTrack8 *iface, REFGUID
 {
     IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
+    TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
 
     if (!type)
         return E_POINTER;
@@ -143,7 +143,7 @@ static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID
 {
     IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param);
+    TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
 
     if (!type)
         return E_POINTER;
@@ -208,7 +208,7 @@ static HRESULT WINAPI audition_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME
         MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
 {
         IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
+	FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
 	return S_OK;
 }
 
@@ -217,7 +217,7 @@ static HRESULT WINAPI audition_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
+	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
 	    wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
@@ -227,7 +227,7 @@ static HRESULT WINAPI audition_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU
         DWORD dwFlags)
 {
         IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -236,7 +236,7 @@ static HRESULT WINAPI audition_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU
         REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
 {
         IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -246,7 +246,7 @@ static HRESULT WINAPI audition_track_Compose(IDirectMusicTrack8 *iface, IUnknown
 {
     IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+    TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track);
     return E_NOTIMPL;
 }
 
@@ -254,7 +254,7 @@ static HRESULT WINAPI audition_track_Join(IDirectMusicTrack8 *iface, IDirectMusi
         MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack)
 {
     IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
-    TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup,
+    TRACE("(%p, %p, %ld, %p, %ld, %p): stub\n", This, newtrack, join, context, trackgroup,
             resulttrack);
     return E_NOTIMPL;
 }
diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c
index 90db0a202a0..98c9169d2ee 100644
--- a/dlls/dmstyle/chordtrack.c
+++ b/dlls/dmstyle/chordtrack.c
@@ -68,7 +68,7 @@ static ULONG WINAPI chord_track_AddRef(IDirectMusicTrack8 *iface)
     IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -78,7 +78,7 @@ static ULONG WINAPI chord_track_Release(IDirectMusicTrack8 *iface)
     IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
@@ -100,7 +100,7 @@ static HRESULT WINAPI chord_track_InitPlay(IDirectMusicTrack8 *iface,
         void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
 {
   IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
-  FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
+  FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
   return S_OK;
 }
 
@@ -116,7 +116,7 @@ static HRESULT WINAPI chord_track_Play(IDirectMusicTrack8 *iface, void *pStateDa
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
   IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
-  FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
+  FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
   return S_OK;
 }
 
@@ -125,7 +125,7 @@ static HRESULT WINAPI chord_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty
 {
     IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
+    TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
 
     if (!type)
         return E_POINTER;
@@ -146,7 +146,7 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty
 {
     IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param);
+    TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
 
     if (!type)
         return E_POINTER;
@@ -194,7 +194,7 @@ static HRESULT WINAPI chord_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt
         MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
 {
   IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
-  FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
+  FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
   return S_OK;
 }
 
@@ -203,7 +203,7 @@ static HRESULT WINAPI chord_track_PlayEx(IDirectMusicTrack8 *iface, void *pState
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
   IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
-  FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
+  FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
       wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
   return S_OK;
 }
@@ -213,7 +213,7 @@ static HRESULT WINAPI chord_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID
         DWORD dwFlags)
 {
   IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
-  FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+  FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
       wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
   return S_OK;
 }
@@ -222,7 +222,7 @@ static HRESULT WINAPI chord_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID
         REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
 {
   IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
-  FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+  FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
       wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
   return S_OK;
 }
@@ -232,7 +232,7 @@ static HRESULT WINAPI chord_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c
 {
     IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+    TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track);
     return E_NOTIMPL;
 }
 
@@ -241,7 +241,7 @@ static HRESULT WINAPI chord_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr
         IDirectMusicTrack **ppResultTrack)
 {
   IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
-  FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
+  FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
   return S_OK;
 }
 
@@ -284,12 +284,12 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_
   do {
     IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
     ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
     switch (Chunk.fccID) { 
     case DMUS_FOURCC_CHORDTRACKHEADER_CHUNK: {
       TRACE_(dmfile)(": Chord track header chunk\n");
       IStream_Read (pStm, &This->dwScale, sizeof(DWORD), NULL);
-      TRACE_(dmfile)(" - dwScale: %d\n", This->dwScale);
+      TRACE_(dmfile)(" - dwScale: %ld\n", This->dwScale);
       break;
     }
     case DMUS_FOURCC_CHORDTRACKBODY_CHUNK: {
@@ -302,28 +302,28 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_
       TRACE_(dmfile)(": Chord track body chunk\n");
 
       IStream_Read (pStm, &sz, sizeof(DWORD), NULL);
-      TRACE_(dmfile)(" - sizeof(DMUS_IO_CHORD): %d\n", sz);
+      TRACE_(dmfile)(" - sizeof(DMUS_IO_CHORD): %ld\n", sz);
       if (sz != sizeof(DMUS_IO_CHORD)) return E_FAIL;
       IStream_Read (pStm, &body, sizeof(DMUS_IO_CHORD), NULL);
       TRACE_(dmfile)(" - wszName: %s\n", debugstr_w(body.wszName));
-      TRACE_(dmfile)(" - mtTime: %u\n", body.mtTime);
+      TRACE_(dmfile)(" - mtTime: %lu\n", body.mtTime);
       TRACE_(dmfile)(" - wMeasure: %u\n", body.wMeasure);
       TRACE_(dmfile)(" - bBeat:  %u\n", body.bBeat);
       TRACE_(dmfile)(" - bFlags: 0x%02x\n", body.bFlags);
       
       IStream_Read (pStm, &num, sizeof(DWORD), NULL);
-      TRACE_(dmfile)(" - # DMUS_IO_SUBCHORDS: %d\n", num);
+      TRACE_(dmfile)(" - # DMUS_IO_SUBCHORDS: %ld\n", num);
       IStream_Read (pStm, &sz, sizeof(DWORD), NULL);
-      TRACE_(dmfile)(" - sizeof(DMUS_IO_SUBCHORDS): %d\n", sz);
+      TRACE_(dmfile)(" - sizeof(DMUS_IO_SUBCHORDS): %ld\n", sz);
       if (sz != sizeof(DMUS_IO_SUBCHORD)) return E_FAIL;
 
       for (it = 0; it < num; ++it) {
 	IStream_Read (pStm, &subchords, sizeof(DMUS_IO_SUBCHORD), NULL);
-	TRACE_(dmfile)("DMUS_IO_SUBCHORD #%d\n", it+1);
-	TRACE_(dmfile)(" - dwChordPattern: %u\n", subchords.dwChordPattern);
-	TRACE_(dmfile)(" - dwScalePattern: %u\n", subchords.dwScalePattern);
-	TRACE_(dmfile)(" - dwInversionPoints: %u\n", subchords.dwInversionPoints);
-	TRACE_(dmfile)(" - dwLevels: %u\n", subchords.dwLevels);
+	TRACE_(dmfile)("DMUS_IO_SUBCHORD #%ld\n", it+1);
+	TRACE_(dmfile)(" - dwChordPattern: %lu\n", subchords.dwChordPattern);
+	TRACE_(dmfile)(" - dwScalePattern: %lu\n", subchords.dwScalePattern);
+	TRACE_(dmfile)(" - dwInversionPoints: %lu\n", subchords.dwInversionPoints);
+	TRACE_(dmfile)(" - dwLevels: %lu\n", subchords.dwLevels);
 	TRACE_(dmfile)(" - bChordRoot:  %u\n", subchords.bChordRoot);
 	TRACE_(dmfile)(" - bScaleRoot: %u\n", subchords.bScaleRoot);
       }
@@ -336,7 +336,7 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_
       break;		
     }
     }
-    TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+    TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
   } while (ListCount[0] < ListSize[0]);
 
   return S_OK;
@@ -357,11 +357,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
   TRACE("(%p, %p): Loading\n", This, pStm);
 
   IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
-  TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+  TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
   switch (Chunk.fccID) {	
   case FOURCC_LIST: {
     IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
     switch (Chunk.fccID) { 
     case DMUS_FOURCC_CHORDTRACK_LIST: {
       TRACE_(dmfile)(": Chord track list\n");
diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c
index d8b57b8c1f0..417b7847403 100644
--- a/dlls/dmstyle/commandtrack.c
+++ b/dlls/dmstyle/commandtrack.c
@@ -67,7 +67,7 @@ static ULONG WINAPI command_track_AddRef(IDirectMusicTrack8 *iface)
     IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -77,7 +77,7 @@ static ULONG WINAPI command_track_Release(IDirectMusicTrack8 *iface)
     IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
@@ -99,7 +99,7 @@ static HRESULT WINAPI command_track_InitPlay(IDirectMusicTrack8 *iface,
         void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
 {
         IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
+	FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
 	return S_OK;
 }
 
@@ -115,7 +115,7 @@ static HRESULT WINAPI command_track_Play(IDirectMusicTrack8 *iface, void *pState
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
+	FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
 
@@ -124,7 +124,7 @@ static HRESULT WINAPI command_track_GetParam(IDirectMusicTrack8 *iface, REFGUID
 {
     IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
+    TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
 
     if (!type)
         return E_POINTER;
@@ -148,7 +148,7 @@ static HRESULT WINAPI command_track_SetParam(IDirectMusicTrack8 *iface, REFGUID
 {
     IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param);
+    TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
 
     if (!type)
         return E_POINTER;
@@ -204,7 +204,7 @@ static HRESULT WINAPI command_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME
         MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
 {
         IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
+	FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
 	return S_OK;
 }
 
@@ -213,7 +213,7 @@ static HRESULT WINAPI command_track_PlayEx(IDirectMusicTrack8 *iface, void *pSta
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
+	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
 	    wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
@@ -223,7 +223,7 @@ static HRESULT WINAPI command_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUI
         void *pStateData, DWORD dwFlags)
 {
         IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -232,7 +232,7 @@ static HRESULT WINAPI command_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUI
         REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
 {
         IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -242,7 +242,7 @@ static HRESULT WINAPI command_track_Compose(IDirectMusicTrack8 *iface, IUnknown
 {
     IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+    TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track);
     return E_NOTIMPL;
 }
 
@@ -251,7 +251,7 @@ static HRESULT WINAPI command_track_Join(IDirectMusicTrack8 *iface, IDirectMusic
         IDirectMusicTrack **ppResultTrack)
 {
         IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
+	FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
 	return S_OK;
 }
 
@@ -290,14 +290,14 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 	
 	IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL);
 	IStream_Read (pStm, &chunkSize, sizeof(DWORD), NULL);
-	TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize);
+	TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (chunkID), chunkSize);
 	switch (chunkID) {
 		case DMUS_FOURCC_COMMANDTRACK_CHUNK: {
 			DWORD count;
 			TRACE_(dmfile)(": command track chunk\n");
 			IStream_Read (pStm, &dwSizeOfStruct, sizeof(DWORD), NULL);
 			if (dwSizeOfStruct != sizeof(DMUS_IO_COMMAND)) {
-				TRACE_(dmfile)(": declared size of struct (=%d) != actual size; indicates older direct music version\n", dwSizeOfStruct);
+				TRACE_(dmfile)(": declared size of struct (=%ld) != actual size; indicates older direct music version\n", dwSizeOfStruct);
 			}
 			chunkSize -= sizeof(DWORD); /* now chunk size is one DWORD shorter */
 			nrCommands = chunkSize/dwSizeOfStruct; /* and this is the number of commands */
@@ -329,7 +329,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
 		LIST_FOR_EACH (listEntry, &This->Commands) {
 			tmpEntry = LIST_ENTRY (listEntry, DMUS_PRIVATE_COMMAND, entry);
 			TRACE("    - Command[%i]:\n", r);
-			TRACE("       - mtTime = %i\n", tmpEntry->pCommand.mtTime);
+			TRACE("       - mtTime = %li\n", tmpEntry->pCommand.mtTime);
 			TRACE("       - wMeasure = %d\n", tmpEntry->pCommand.wMeasure);
 			TRACE("       - bBeat = %i\n", tmpEntry->pCommand.bBeat);
 			TRACE("       - bCommand = %i\n", tmpEntry->pCommand.bCommand);
diff --git a/dlls/dmstyle/dmobject.c b/dlls/dmstyle/dmobject.c
index e6a1ce906a7..84b08e0d772 100644
--- a/dlls/dmstyle/dmobject.c
+++ b/dlls/dmstyle/dmobject.c
@@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
         return;
 
     TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc);
-    TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize);
+    TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
 
 #define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
-    TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData);
+    TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData);
     X(DMUS_OBJ_OBJECT);
     X(DMUS_OBJ_CLASS);
     X(DMUS_OBJ_NAME);
@@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk)
         return "(null)";
     if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
         type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type));
-    return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size);
+    return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size);
 }
 
 static HRESULT stream_read(IStream *stream, void *data, ULONG size)
@@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size)
 
     hr = IStream_Read(stream, data, size, &read);
     if (FAILED(hr))
-        TRACE_(dmfile)("IStream_Read failed: %08x\n", hr);
+        TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr);
     else if (!read && read < size) {
         /* All or nothing: Handle a partial read due to end of stream as an error */
-        TRACE_(dmfile)("Short read: %u < %u\n", read, size);
+        TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);
         return E_FAIL;
     }
 
@@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,
     if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
         return hr;
     if (size != elem_size) {
-        WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n",
+        WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n",
                 debugstr_chunk(chunk), size, elem_size);
         return DMUS_E_UNSUPPORTED_STREAM;
     }
@@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk,
         ULONG size)
 {
     if (chunk->size != size) {
-        WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n",
+        WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n",
                 debugstr_fourcc(chunk->id), chunk->size,
                 wine_dbgstr_longlong(chunk->offset.QuadPart), size);
         return E_FAIL;
@@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
     struct chunk_entry chunk = {.parent = riff};
     HRESULT hr;
 
-    TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff));
+    TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
 
     desc->dwValidData = 0;
     desc->dwSize = sizeof(*desc);
@@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
                 break;
         }
     }
-    TRACE("Found %#x\n", desc->dwValidData);
+    TRACE("Found %#lx\n", desc->dwValidData);
 
     return hr;
 }
@@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
         WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
         return hr;
     }
-    TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID),
+    TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID),
             reference.dwValidData);
 
     if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c
index d12d64f76dc..58a1c40622a 100644
--- a/dlls/dmstyle/dmutils.c
+++ b/dlls/dmstyle/dmutils.c
@@ -167,7 +167,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
   do {
     IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
     ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-    TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 
     hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc);
     if (FAILED(hr)) return hr;
@@ -179,7 +179,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
 	if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL;
 	IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL);
 	TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID));
-	TRACE(" - dwValidData: %u\n", ref.dwValidData);
+	TRACE(" - dwValidData: %lu\n", ref.dwValidData);
 	break;
       } 
       default: {
@@ -190,7 +190,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
       }
       }
     }
-    TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+    TRACE(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
   } while (ListCount[0] < ListSize[0]);
 
   ref_desc.dwValidData |= DMUS_OBJ_CLASS;
diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c
index 2452d1a94d0..0fa1a48bcc4 100644
--- a/dlls/dmstyle/motiftrack.c
+++ b/dlls/dmstyle/motiftrack.c
@@ -65,7 +65,7 @@ static ULONG WINAPI motif_track_AddRef(IDirectMusicTrack8 *iface)
     IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -75,7 +75,7 @@ static ULONG WINAPI motif_track_Release(IDirectMusicTrack8 *iface)
     IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
@@ -97,7 +97,7 @@ static HRESULT WINAPI motif_track_InitPlay(IDirectMusicTrack8 *iface,
         void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
 {
         IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
+	FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
 	return S_OK;
 }
 
@@ -113,7 +113,7 @@ static HRESULT WINAPI motif_track_Play(IDirectMusicTrack8 *iface, void *pStateDa
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
+	FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
 
@@ -122,7 +122,7 @@ static HRESULT WINAPI motif_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty
 {
     IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
+    TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
 
     if (!type)
         return E_POINTER;
@@ -139,7 +139,7 @@ static HRESULT WINAPI motif_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty
 {
     IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param);
+    TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
 
     if (!type)
         return E_POINTER;
@@ -198,7 +198,7 @@ static HRESULT WINAPI motif_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt
         MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
 {
         IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
+	FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
 	return S_OK;
 }
 
@@ -207,7 +207,7 @@ static HRESULT WINAPI motif_track_PlayEx(IDirectMusicTrack8 *iface, void *pState
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
+	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
 	    wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
@@ -217,7 +217,7 @@ static HRESULT WINAPI motif_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID
         DWORD dwFlags)
 {
         IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -226,7 +226,7 @@ static HRESULT WINAPI motif_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID
         REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
 {
         IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -236,7 +236,7 @@ static HRESULT WINAPI motif_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c
 {
     IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+    TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track);
     return E_NOTIMPL;
 }
 
@@ -244,7 +244,7 @@ static HRESULT WINAPI motif_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr
         MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack)
 {
     IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
-    TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup,
+    TRACE("(%p, %p, %ld, %p, %ld, %p): stub\n", This, newtrack, join, context, trackgroup,
             resulttrack);
     return E_NOTIMPL;
 }
diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c
index deba4966a9e..08fed5d5f2a 100644
--- a/dlls/dmstyle/mutetrack.c
+++ b/dlls/dmstyle/mutetrack.c
@@ -65,7 +65,7 @@ static ULONG WINAPI mute_track_AddRef(IDirectMusicTrack8 *iface)
     IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -75,7 +75,7 @@ static ULONG WINAPI mute_track_Release(IDirectMusicTrack8 *iface)
     IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
@@ -97,7 +97,7 @@ static HRESULT WINAPI mute_track_InitPlay(IDirectMusicTrack8 *iface,
         void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
 {
         IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
+	FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
 	return S_OK;
 }
 
@@ -113,7 +113,7 @@ static HRESULT WINAPI mute_track_Play(IDirectMusicTrack8 *iface, void *pStateDat
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
+	FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
 
@@ -122,7 +122,7 @@ static HRESULT WINAPI mute_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ
 {
     IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
+    TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
 
     if (!type)
         return E_POINTER;
@@ -139,7 +139,7 @@ static HRESULT WINAPI mute_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ
 {
     IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param);
+    TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
 
     if (!type)
         return E_POINTER;
@@ -189,7 +189,7 @@ static HRESULT WINAPI mute_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS
         MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
 {
         IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
+	FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
 	return S_OK;
 }
 
@@ -198,7 +198,7 @@ static HRESULT WINAPI mute_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateD
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
+	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
 	    wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
@@ -208,7 +208,7 @@ static HRESULT WINAPI mute_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID r
         DWORD dwFlags)
 {
         IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -217,7 +217,7 @@ static HRESULT WINAPI mute_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r
         REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
 {
         IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -227,7 +227,7 @@ static HRESULT WINAPI mute_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co
 {
     IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+    TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track);
     return E_NOTIMPL;
 }
 
@@ -235,7 +235,7 @@ static HRESULT WINAPI mute_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra
         MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack)
 {
     IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
-    TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup,
+    TRACE("(%p, %p, %ld, %p, %ld, %p): stub\n", This, newtrack, join, context, trackgroup,
             resulttrack);
     return E_NOTIMPL;
 }
diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index f8a62604a99..87b7eed0902 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -95,7 +95,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface)
     IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -105,7 +105,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface)
     IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         struct style_band *band, *band2;
@@ -173,7 +173,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface,
         WCHAR *pwszName)
 {
         IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface);
-	FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName);
+	FIXME("(%p, %ld, %p): stub\n", This, dwIndex, pwszName);
 	return S_OK;
 }
 
@@ -199,7 +199,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface
     const struct list *cursor;
     unsigned int i = 0;
 
-    TRACE("(%p, %u, %p)\n", This, index, name);
+    TRACE("(%p, %lu, %p)\n", This, index, name);
 
     if (!name)
         return E_POINTER;
@@ -244,7 +244,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *if
         WCHAR *pwszName)
 {
         IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface);
-	FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName);
+	FIXME("(%p, %ld, %p): stub\n", This, dwIndex, pwszName);
 	return S_OK;
 }
 
@@ -268,7 +268,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetEmbellishmentLength(IDirectMusic
         DWORD dwType, DWORD dwLevel, DWORD *pdwMin, DWORD *pdwMax)
 {
         IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface);
-	FIXME("(%p, %d, %d, %p, %p): stub\n", This, dwType, dwLevel, pdwMin, pdwMax);
+	FIXME("(%p, %ld, %ld, %p, %p): stub\n", This, dwType, dwLevel, pdwMin, pdwMax);
 	return S_OK;
 }
 
@@ -283,7 +283,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumPattern(IDirectMusicStyle8 *ifa
         DWORD dwPatternType, WCHAR *pwszName)
 {
         IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface);
-	FIXME("(%p, %d, %d, %p): stub\n", This, dwIndex, dwPatternType, pwszName);
+	FIXME("(%p, %ld, %ld, %p): stub\n", This, dwIndex, dwPatternType, pwszName);
 	return S_OK;
 }
 
@@ -402,7 +402,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm,
   do {
     IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
     ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
     switch (Chunk.fccID) {
     case DMUS_FOURCC_PARTREF_CHUNK: {
       TRACE_(dmfile)(": PartRef chunk\n");
@@ -428,7 +428,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm,
 	do {
 	  IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 	  ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-          TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+          TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 	  
           if (!pNewItem) {
 	    ERR(": pNewItem not yet allocated, chunk order bad?\n");
@@ -447,7 +447,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm,
 	    }
 	    }
 	  }  
-          TRACE_(dmfile)(": ListCount[1] = %d < ListSize[1] = %d\n", ListCount[1], ListSize[1]);
+          TRACE_(dmfile)(": ListCount[1] = %ld < ListSize[1] = %ld\n", ListCount[1], ListSize[1]);
 	} while (ListCount[1] < ListSize[1]);
 	break;
       }
@@ -467,7 +467,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm,
       break;						
     }
     }
-    TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+    TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
   } while (ListCount[0] < ListSize[0]);
 
   return S_OK;
@@ -495,7 +495,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm)
   do {
     IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
     ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
     switch (Chunk.fccID) {
     case DMUS_FOURCC_PART_CHUNK: {
       TRACE_(dmfile)(": Part chunk (skipping for now)\n" );
@@ -507,8 +507,8 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm)
       TRACE_(dmfile)(": Note chunk (skipping for now)\n");
       IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL);
       cnt = (Chunk.dwSize - sizeof(DWORD));
-      TRACE_(dmfile)(" - dwSize: %u\n", dwSize);
-      TRACE_(dmfile)(" - cnt: %u (%u / %u)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize);
+      TRACE_(dmfile)(" - dwSize: %lu\n", dwSize);
+      TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize);
       if (cnt % dwSize != 0) {
 	ERR("Invalid Array Size\n");
 	return E_FAIL;
@@ -523,8 +523,8 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm)
       TRACE_(dmfile)(": Curve chunk (skipping for now)\n");
       IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL);
       cnt = (Chunk.dwSize - sizeof(DWORD));
-      TRACE_(dmfile)(" - dwSize: %u\n", dwSize);
-      TRACE_(dmfile)(" - cnt: %u (%u / %u)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize);
+      TRACE_(dmfile)(" - dwSize: %lu\n", dwSize);
+      TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize);
       if (cnt % dwSize != 0) {
 	ERR("Invalid Array Size\n");
 	return E_FAIL;
@@ -564,7 +564,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm)
 	do {
 	  IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 	  ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-          TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+          TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 	  
 	  hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &desc);
 	  if (FAILED(hr)) return hr;
@@ -579,7 +579,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm)
 	    }
 	    }
 	  }  
-          TRACE_(dmfile)(": ListCount[1] = %d < ListSize[1] = %d\n", ListCount[1], ListSize[1]);
+          TRACE_(dmfile)(": ListCount[1] = %ld < ListSize[1] = %ld\n", ListCount[1], ListSize[1]);
 	} while (ListCount[1] < ListSize[1]);
 	break;
       }
@@ -599,7 +599,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm)
       break;						
     }
     }
-    TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+    TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
   } while (ListCount[0] < ListSize[0]);
 
   return S_OK;
@@ -626,7 +626,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU
   do {
     IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
     ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
     switch (Chunk.fccID) {
     case DMUS_FOURCC_PATTERN_CHUNK: {
       TRACE_(dmfile)(": Pattern chunk\n");
@@ -649,7 +649,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU
     case DMUS_FOURCC_RHYTHM_CHUNK: { 
       TRACE_(dmfile)(": Rhythm chunk\n");
       IStream_Read (pStm, &pNewMotif->dwRhythm, sizeof(DWORD), NULL);
-      TRACE_(dmfile)(" - dwRhythm: %u\n", pNewMotif->dwRhythm);
+      TRACE_(dmfile)(" - dwRhythm: %lu\n", pNewMotif->dwRhythm);
       /** TODO understand why some Chunks have size > 4 */
       liMove.QuadPart = Chunk.dwSize - sizeof(DWORD);
       IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
@@ -719,7 +719,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU
 	do {
 	  IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 	  ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-          TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+          TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 	  
 	  hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &pNewMotif->desc);
 	  if (FAILED(hr)) return hr;
@@ -734,7 +734,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU
 	    }
 	    }
 	  }  
-          TRACE_(dmfile)(": ListCount[1] = %d < ListSize[1] = %d\n", ListCount[1], ListSize[1]);
+          TRACE_(dmfile)(": ListCount[1] = %ld < ListSize[1] = %ld\n", ListCount[1], ListSize[1]);
 	} while (ListCount[1] < ListSize[1]);
 	break;
       }
@@ -760,7 +760,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU
       break;						
     }
     }
-    TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+    TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
   } while (ListCount[0] < ListSize[0]);
 
   return S_OK;
@@ -787,7 +787,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK
   do {
     IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
     StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 
     hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc);
     if (FAILED(hr)) return hr;
@@ -864,7 +864,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK
 	  do {
 	    IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
 	    ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-            TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+            TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 
             hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc);
 	    if (FAILED(hr)) return hr;
@@ -879,7 +879,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK
 	      }
 	      }
 	    }  
-            TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+            TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
 	  } while (ListCount[0] < ListSize[0]);
 	  break;
 	}
@@ -912,7 +912,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK
       }
       }
     }
-    TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize);
+    TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize);
   } while (StreamCount < StreamSize);  
 
   return S_OK;
@@ -928,11 +928,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
   FIXME("(%p, %p): Loading\n", This, pStm);
 
   IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
-  TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+  TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
   switch (Chunk.fccID) {
   case FOURCC_RIFF: {
     IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
     switch (Chunk.fccID) {
     case DMUS_FOURCC_STYLE_FORM: {
       TRACE_(dmfile)(": Style form\n");
diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c
index f80073e42bf..a1e31bcd3b4 100644
--- a/dlls/dmstyle/styletrack.c
+++ b/dlls/dmstyle/styletrack.c
@@ -69,7 +69,7 @@ static ULONG WINAPI style_track_AddRef(IDirectMusicTrack8 *iface)
     IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -79,7 +79,7 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface)
     IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
         struct list *cursor, *cursor2;
@@ -112,7 +112,7 @@ static HRESULT WINAPI style_track_InitPlay(IDirectMusicTrack8 *iface,
         void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
 {
         IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
+	FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
 	return S_OK;
 }
 
@@ -128,7 +128,7 @@ static HRESULT WINAPI style_track_Play(IDirectMusicTrack8 *iface, void *pStateDa
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
+	FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
 
@@ -138,7 +138,7 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty
     IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
     struct list *item = NULL;
 
-    TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
+    TRACE("(%p, %s, %ld, %p, %p):\n", This, debugstr_dmguid(type), time, next, param);
 
     if (!type)
         return E_POINTER;
@@ -168,7 +168,7 @@ static HRESULT WINAPI style_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty
 {
     IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param);
+    TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
 
     if (!type)
         return E_POINTER;
@@ -231,7 +231,7 @@ static HRESULT WINAPI style_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt
         MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
 {
         IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack);
+	FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack);
 	return S_OK;
 }
 
@@ -240,7 +240,7 @@ static HRESULT WINAPI style_track_PlayEx(IDirectMusicTrack8 *iface, void *pState
         IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
 {
         IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
+	FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart),
 	    wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
 	return S_OK;
 }
@@ -250,7 +250,7 @@ static HRESULT WINAPI style_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID
         DWORD dwFlags)
 {
         IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -259,7 +259,7 @@ static HRESULT WINAPI style_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID
         REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
 {
         IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
+	FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType),
 	    wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
 	return S_OK;
 }
@@ -269,7 +269,7 @@ static HRESULT WINAPI style_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c
 {
     IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
 
-    TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track);
+    TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track);
     return E_NOTIMPL;
 }
 
@@ -278,7 +278,7 @@ static HRESULT WINAPI style_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr
         IDirectMusicTrack **ppResultTrack)
 {
         IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
+	FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack);
 	return S_OK;
 }
 
@@ -325,7 +325,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK
   do {
     IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
     ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
     switch (Chunk.fccID) { 
     case DMUS_FOURCC_TIME_STAMP_CHUNK: {
       TRACE_(dmfile)(": Time Stamp chunk\n");
@@ -335,7 +335,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK
 	return  E_OUTOFMEMORY;
       }
       IStream_Read (pStm, &pNewItem->dwTimeStamp, sizeof(DWORD), NULL);
-      TRACE_(dmfile)(" - dwTimeStamp: %u\n", pNewItem->dwTimeStamp);
+      TRACE_(dmfile)(" - dwTimeStamp: %lu\n", pNewItem->dwTimeStamp);
       list_add_tail (&This->Items, &pNewItem->entry);      
       break;
     }
@@ -381,7 +381,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK
       break;						
     }
     }
-    TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+    TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
   } while (ListCount[0] < ListSize[0]);
 
   return S_OK;
@@ -406,7 +406,7 @@ static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_
   do {
     IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
     ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
     switch (Chunk.fccID) { 
     case FOURCC_LIST: { 
       IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
@@ -436,7 +436,7 @@ static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_
       break;		
     }
     }
-    TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+    TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
   } while (ListCount[0] < ListSize[0]);
 
   return S_OK;
@@ -457,11 +457,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
   FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm);
 
   IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
-  TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+  TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
   switch (Chunk.fccID) {	
   case FOURCC_LIST: {
     IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
     switch (Chunk.fccID) { 
     case DMUS_FOURCC_STYLE_TRACK_LIST: {
       TRACE_(dmfile)(": Chord track list\n");