[PATCH 01/25] dlls/usbd.sys: enable compilation with long types

[Eric Pouech]

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

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

diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in
index 026f4ba4219..6040071ddaf 100644
--- a/dlls/usbd.sys/Makefile.in
+++ b/dlls/usbd.sys/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = usbd.sys
 IMPORTLIB = usbd
 IMPORTS   = ntoskrnl
diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c
index 1cb25259258..d562cf1f81e 100644
--- a/dlls/usbd.sys/usbd.c
+++ b/dlls/usbd.sys/usbd.c
@@ -173,7 +173,7 @@ PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(
 
     PUSB_INTERFACE_DESCRIPTOR interface;
 
-    TRACE( "(%p, %p, %d, %d, %d, %d, %d)\n", ConfigurationDescriptor,
+    TRACE( "(%p, %p, %ld, %ld, %ld, %ld, %ld)\n", ConfigurationDescriptor,
             StartPosition, InterfaceNumber, AlternateSetting,
             InterfaceClass, InterfaceSubClass, InterfaceProtocol );
 
@@ -214,7 +214,7 @@ PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors(
 {
     PUSB_COMMON_DESCRIPTOR common;
 
-    TRACE( "(%p, %u, %p, %d)\n", DescriptorBuffer, TotalLength, StartPosition, DescriptorType );
+    TRACE( "(%p, %lu, %p, %ld)\n", DescriptorBuffer, TotalLength, StartPosition, DescriptorType );
 
     for (common = (PUSB_COMMON_DESCRIPTOR)DescriptorBuffer;
          ((char*)common) + sizeof(USB_COMMON_DESCRIPTOR) <= ((char*)DescriptorBuffer) + TotalLength;
@@ -233,7 +233,7 @@ USBD_STATUS WINAPI USBD_ValidateConfigurationDescriptor(
         PUCHAR *offset,
         ULONG tag )
 {
-    FIXME( "(%p, %u, %u, %p, %u) partial stub!\n", descr, length, level, offset, tag );
+    FIXME( "(%p, %lu, %u, %p, %lu) partial stub!\n", descr, length, level, offset, tag );
 
     if (offset) *offset = 0;

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

[Eric Pouech]

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

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

diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in
index 8dde5344c9c..dcda835708e 100644
--- a/dlls/userenv/Makefile.in
+++ b/dlls/userenv/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = userenv.dll
 IMPORTS   = advapi32
 IMPORTLIB = userenv
diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c
index 08dede60d35..2b5171254dc 100644
--- a/dlls/userenv/userenv_main.c
+++ b/dlls/userenv/userenv_main.c
@@ -349,7 +349,7 @@ BOOL WINAPI ExpandEnvironmentStringsForUserA( HANDLE hToken, LPCSTR lpSrc,
 {
     BOOL ret;
 
-    TRACE("%p %s %p %d\n", hToken, debugstr_a(lpSrc), lpDest, dwSize);
+    TRACE("%p %s %p %ld\n", hToken, debugstr_a(lpSrc), lpDest, dwSize);
 
     ret = ExpandEnvironmentStringsA( lpSrc, lpDest, dwSize );
     TRACE("<- %s\n", debugstr_a(lpDest));
@@ -361,7 +361,7 @@ BOOL WINAPI ExpandEnvironmentStringsForUserW( HANDLE hToken, LPCWSTR lpSrc,
 {
     BOOL ret;
 
-    TRACE("%p %s %p %d\n", hToken, debugstr_w(lpSrc), lpDest, dwSize);
+    TRACE("%p %s %p %ld\n", hToken, debugstr_w(lpSrc), lpDest, dwSize);
 
     ret = ExpandEnvironmentStringsW( lpSrc, lpDest, dwSize );
     TRACE("<- %s\n", debugstr_w(lpDest));
@@ -648,7 +648,7 @@ BOOL WINAPI LeaveCriticalPolicySection(HANDLE hSection)
 DWORD WINAPI GetAppliedGPOListW(DWORD dwFlags, LPCWSTR pMachineName, PSID pSidUser, GUID *pGuidExtension,
         PGROUP_POLICY_OBJECTW *ppGPOList)
 {
-    FIXME("(%x %s %p %s %p)\n", dwFlags, debugstr_w(pMachineName), pSidUser, debugstr_guid(pGuidExtension), ppGPOList);
+    FIXME("(%lx %s %p %s %p)\n", dwFlags, debugstr_w(pMachineName), pSidUser, debugstr_guid(pGuidExtension), ppGPOList);
     return ERROR_ACCESS_DENIED;
 }
 
@@ -681,7 +681,7 @@ BOOL WINAPI USERENV_138( int csidl, LPCSTR lnk_dir, LPCSTR lnk_filename,
             LPCSTR work_directory, WORD hotkey, DWORD win_state, LPCSTR comment,
             LPCSTR loc_filename_resfile, DWORD loc_filename_resid)
 {
-    FIXME("(%d,%s,%s,%s,%s,%d,%s,0x%x,%d,%s,%s,%d) - stub\n", csidl, debugstr_a(lnk_dir),
+    FIXME("(%d,%s,%s,%s,%s,%ld,%s,0x%x,%ld,%s,%s,%ld) - stub\n", csidl, debugstr_a(lnk_dir),
             debugstr_a(lnk_filename), debugstr_a(lnk_target), debugstr_a(lnk_iconfile),
             lnk_iconid, debugstr_a(work_directory), hotkey, win_state,
             debugstr_a(comment), debugstr_a(loc_filename_resfile), loc_filename_resid );

[PATCH 03/25] dlls/user.exe16: enable compilation with long types

[Eric Pouech]

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

---
 dlls/user.exe16/Makefile.in |    1 -
 dlls/user.exe16/bidi.c      |    2 +-
 dlls/user.exe16/comm.c      |    8 ++++----
 dlls/user.exe16/dialog.c    |    4 ++--
 dlls/user.exe16/message.c   |    4 ++--
 dlls/user.exe16/network.c   |    2 +-
 dlls/user.exe16/user.c      |    8 ++++----
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in
index e4a2c4a723a..7e2438d033f 100644
--- a/dlls/user.exe16/Makefile.in
+++ b/dlls/user.exe16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = user.exe16
 IMPORTS   = mpr user32 gdi32 win32u
 EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520
diff --git a/dlls/user.exe16/bidi.c b/dlls/user.exe16/bidi.c
index d9a320f0271..7b91a322a10 100644
--- a/dlls/user.exe16/bidi.c
+++ b/dlls/user.exe16/bidi.c
@@ -309,7 +309,7 @@ void WINAPI SetDlgItemTextEx16( HWND16 hwnd, INT16 id,
  */
 BOOL16 WINAPI SetProcessDefaultLayout16( DWORD dwDefaultLayout )
 {
-    FIXME( "( %08x ): No BiDi16\n", dwDefaultLayout );
+    FIXME( "( %08lx ): No BiDi16\n", dwDefaultLayout );
     return SetProcessDefaultLayout( dwDefaultLayout );
 }
 
diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c
index 9125c6d0f37..911e0eeea4b 100644
--- a/dlls/user.exe16/comm.c
+++ b/dlls/user.exe16/comm.c
@@ -194,11 +194,11 @@ static VOID WINAPI COMM16_ReadComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPPE
 
 	/* read data from comm port */
 	if (dwErrorCode != NO_ERROR) {
-		ERR("async read failed, error %d\n",dwErrorCode);
+		ERR("async read failed, error %ld\n",dwErrorCode);
 		COM[cid].commerror = CE_RXOVER;
 		return;
 	}
-	TRACE("async read completed %d bytes\n",len);
+	TRACE("async read completed %ld bytes\n",len);
 
 	prev = comm_inbuf(ptr);
 
@@ -274,11 +274,11 @@ static VOID WINAPI COMM16_WriteComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPP
 
 	/* read data from comm port */
 	if (dwErrorCode != NO_ERROR) {
-		ERR("async write failed, error %d\n",dwErrorCode);
+		ERR("async write failed, error %ld\n",dwErrorCode);
 		COM[cid].commerror = CE_RXOVER;
 		return;
 	}
-	TRACE("async write completed %d bytes\n",len);
+	TRACE("async write completed %ld bytes\n",len);
 
 	/* update the buffer pointers */
 	prev = comm_outbuf(&COM[cid]);
diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c
index 10416384562..ecd7acb9bfc 100644
--- a/dlls/user.exe16/dialog.c
+++ b/dlls/user.exe16/dialog.c
@@ -156,7 +156,7 @@ static LPCSTR DIALOG_GetControl16( LPCSTR p, DLG_CONTROL_INFO *info )
 
     p += *p + 1;
 
-    TRACE("   %s %s %d, %d, %d, %d, %d, %08x, %p\n",
+    TRACE("   %s %s %d, %d, %d, %d, %d, %08lx, %p\n",
           debugstr_a(info->className),  debugstr_a(info->windowName),
           info->id, info->x, info->y, info->cx, info->cy,
           info->style, info->data );
@@ -238,7 +238,7 @@ static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result )
     result->cy      = GET_WORD(p);  p += sizeof(WORD);
 
     TRACE("DIALOG %d, %d, %d, %d\n", result->x, result->y, result->cx, result->cy );
-    TRACE(" STYLE %08x\n", result->style );
+    TRACE(" STYLE %08lx\n", result->style );
 
     /* Get the menu name */
 
diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c
index 5d388a55312..6d3de0f77e6 100644
--- a/dlls/user.exe16/message.c
+++ b/dlls/user.exe16/message.c
@@ -895,7 +895,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1
             case 1:
                 break; /* atom, nothing to do */
             case 3:
-                WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi);
+                WARN("DDE_ACK: %Ix both atom and handle... choosing handle\n", hi);
                 /* fall through */
             case 2:
                 hi = convert_handle_16_to_32(hi, GMEM_DDESHARE);
@@ -1278,7 +1278,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT
             case 1:
                 break; /* atom, nothing to do */
             case 3:
-                WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi);
+                WARN("DDE_ACK: %Ix both atom and handle... choosing handle\n", hi);
                 /* fall through */
             case 2:
                 hi = convert_handle_32_to_16(hi, GMEM_DDESHARE);
diff --git a/dlls/user.exe16/network.c b/dlls/user.exe16/network.c
index c137bb19f70..96135a3064a 100644
--- a/dlls/user.exe16/network.c
+++ b/dlls/user.exe16/network.c
@@ -319,7 +319,7 @@ WORD WINAPI WNetGetUser16( LPSTR szUser, LPINT16 nBufferSize )
         case ERROR_MORE_DATA:
             return WN16_MORE_DATA;
         default:
-            FIXME("Untranslated return value %d\n", ret);
+            FIXME("Untranslated return value %ld\n", ret);
     }
     return ret;
 }
diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c
index 5063f9d2343..4a56a67389b 100644
--- a/dlls/user.exe16/user.c
+++ b/dlls/user.exe16/user.c
@@ -1659,7 +1659,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
 LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
                                LPARAM lParam1, LPARAM lParam2)
 {
-    FIXME( "devID=0x%08x hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx: stub\n",
+    FIXME( "devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx: stub\n",
 	  dwDevID, hDriv, wMsg, lParam1, lParam2);
     return 0;
 }
@@ -1681,7 +1681,7 @@ BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, struct DRIVERINFOSTRUCT16 *lpDrvInf
  */
 HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags)
 {
-    FIXME( "(%04x, %08x): stub\n", hDrvr, dwFlags);
+    FIXME( "(%04x, %08lx): stub\n", hDrvr, dwFlags);
     return 0;
 }
 
@@ -3170,7 +3170,7 @@ DWORD WINAPI FormatMessage16(
     BOOL        eos = FALSE;
     LPSTR       allocstring = NULL;
 
-    TRACE("(0x%x,%x,%d,0x%x,%p,%d,%p)\n",
+    TRACE("(0x%lx,%lx,%d,0x%x,%p,%d,%p)\n",
           dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
         if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)
                 && (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)) return 0;
@@ -3179,7 +3179,7 @@ DWORD WINAPI FormatMessage16(
                         || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0;
 
     if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK)
-        FIXME("line wrapping (%u) not supported.\n", width);
+        FIXME("line wrapping (%lu) not supported.\n", width);
     from = NULL;
     if (dwFlags & FORMAT_MESSAGE_FROM_STRING)
     {

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

[Eric Pouech]

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

---
 dlls/uxtheme/Makefile.in |    1 -
 dlls/uxtheme/draw.c      |   12 ++++++------
 dlls/uxtheme/main.c      |    2 +-
 dlls/uxtheme/msstyles.c  |    2 +-
 dlls/uxtheme/scrollbar.c |    2 +-
 dlls/uxtheme/system.c    |   22 +++++++++++-----------
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
index 42f4c9867b4..933650f4261 100644
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = uxtheme.dll
 IMPORTLIB = uxtheme
 IMPORTS   = user32 gdi32 advapi32
diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
index 75db466967c..d503fad3fea 100644
--- a/dlls/uxtheme/draw.c
+++ b/dlls/uxtheme/draw.c
@@ -57,7 +57,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD new_flag)
     DWORD old_flag = 0;
     BOOL res;
 
-    TRACE("(%p,%#x\n", hwnd, new_flag);
+    TRACE("(%p,%#lx\n", hwnd, new_flag);
 
     new_flag &= ETDT_VALIDBITS;
 
@@ -267,7 +267,7 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStat
                 }
             }
             if(reqsize.x <= size.x && reqsize.y <= size.y) {
-                TRACE("Using image size %dx%d, image %d\n", reqsize.x, reqsize.y,
+                TRACE("Using image size %ldx%ld, image %d\n", reqsize.x, reqsize.y,
                       imagefile_index_to_property(i));
                 return fileProp;
             }
@@ -957,7 +957,7 @@ static HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId,
     HRESULT hr = S_OK;
     int filltype = FT_SOLID;
 
-    TRACE("(%d,%d,%d)\n", iPartId, iStateId, pOptions->dwFlags);
+    TRACE("(%d,%d,%ld)\n", iPartId, iStateId, pOptions->dwFlags);
 
     if(pOptions->dwFlags & DTBG_OMITCONTENT)
         return S_OK;
@@ -1055,7 +1055,7 @@ HRESULT WINAPI DrawThemeBackgroundEx(HTHEME hTheme, HDC hdc, int iPartId,
     int bgtype = BT_BORDERFILL;
     RECT rt;
 
-    TRACE("(%p,%p,%d,%d,%d,%d)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top);
+    TRACE("(%p,%p,%d,%d,%ld,%ld)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top);
     if(!hTheme)
         return E_HANDLE;
 
@@ -1744,14 +1744,14 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId
     int oldBkMode;
     int fontProp;
 
-    TRACE("%p %p %d %d %s:%d 0x%08x %p %p\n", hTheme, hdc, iPartId, iStateId,
+    TRACE("%p %p %d %d %s:%d 0x%08lx %p %p\n", hTheme, hdc, iPartId, iStateId,
         debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options);
 
     if(!hTheme)
         return E_HANDLE;
 
     if (options->dwFlags & ~(DTT_TEXTCOLOR | DTT_FONTPROP))
-        FIXME("unsupported flags 0x%08x\n", options->dwFlags);
+        FIXME("unsupported flags 0x%08lx\n", options->dwFlags);
 
     if (options->dwFlags & DTT_FONTPROP)
         fontProp = options->iFontPropId;
diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c
index 5f79dd6ed0d..211b6e3bddc 100644
--- a/dlls/uxtheme/main.c
+++ b/dlls/uxtheme/main.c
@@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
 /* For the moment, do nothing here. */
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *reserved)
 {
-    TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, reserved);
+    TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, reserved);
     switch(fdwReason) {
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hInstDLL);
diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index 376d8bc6db9..7d3ee72efe8 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -98,7 +98,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST
     }
     if((versize = SizeofResource(hTheme, hrsc)) != 2)
     {
-        TRACE("Version resource found, but wrong size: %d\n", versize);
+        TRACE("Version resource found, but wrong size: %ld\n", versize);
         hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
         goto invalid_theme;
     }
diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c
index e96e5e89b69..719081ad5b8 100644
--- a/dlls/uxtheme/scrollbar.c
+++ b/dlls/uxtheme/scrollbar.c
@@ -273,7 +273,7 @@ LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
     HTHEME theme;
     LRESULT result;
 
-    TRACE("(%p, 0x%x, %lu, %lu, %d)\n", hwnd, msg, wParam, lParam, unicode);
+    TRACE("(%p, 0x%x, %Iu, %Iu, %d)\n", hwnd, msg, wParam, lParam, unicode);
 
     switch (msg) {
         case WM_CREATE:
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index 37c484387ec..8333d6b99ce 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -153,7 +153,7 @@ static void UXTHEME_LoadTheme(void)
         }
         else {
             bThemeActive = FALSE;
-            TRACE("Failed to get ThemeActive: %d\n", GetLastError());
+            TRACE("Failed to get ThemeActive: %ld\n", GetLastError());
         }
         buffsize = sizeof(szCurrentColor);
         if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize))
@@ -446,7 +446,7 @@ HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf)
             if (!RegQueryValueExW(hKey, L"LoadedBefore", NULL, NULL, (BYTE *)tmp, &size))
                 loaded_before = (tmp[0] != '0');
             else
-                WARN("Failed to get LoadedBefore: %d\n", GetLastError());
+                WARN("Failed to get LoadedBefore: %ld\n", GetLastError());
             RegCloseKey(hKey);
         }
         if (loaded_before && same_theme)
@@ -621,7 +621,7 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT
     LPCWSTR pszAppName;
     LPCWSTR pszUseClassList;
     HTHEME hTheme = NULL;
-    TRACE("(%p,%s, %x)\n", hwnd, debugstr_w(pszClassList), flags);
+    TRACE("(%p,%s, %lx)\n", hwnd, debugstr_w(pszClassList), flags);
 
     if(!pszClassList)
     {
@@ -630,7 +630,7 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT
     }
 
     if(flags)
-        FIXME("unhandled flags: %x\n", flags);
+        FIXME("unhandled flags: %lx\n", flags);
 
     if(bThemeActive)
     {
@@ -738,7 +738,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName,
 HRESULT WINAPI SetWindowThemeAttribute(HWND hwnd, enum WINDOWTHEMEATTRIBUTETYPE type,
                                        PVOID attribute, DWORD size)
 {
-   FIXME("(%p,%d,%p,%d): stub\n", hwnd, type, attribute, size);
+   FIXME("(%p,%d,%p,%ld): stub\n", hwnd, type, attribute, size);
    return E_NOTIMPL;
 }
 
@@ -770,7 +770,7 @@ DWORD WINAPI GetThemeAppProperties(void)
  */
 void WINAPI SetThemeAppProperties(DWORD dwFlags)
 {
-    TRACE("(0x%08x)\n", dwFlags);
+    TRACE("(0x%08lx)\n", dwFlags);
     dwThemeAppProperties = dwFlags;
 }
 
@@ -793,7 +793,7 @@ HRESULT WINAPI HitTestThemeBackground(HTHEME hTheme, HDC hdc, int iPartId,
                                      const RECT *pRect, HRGN hrgn,
                                      POINT ptTest, WORD *pwHitTestCode)
 {
-    FIXME("%d %d 0x%08x: stub\n", iPartId, iStateId, dwOptions);
+    FIXME("%d %d 0x%08lx: stub\n", iPartId, iStateId, dwOptions);
     if(!hTheme)
         return E_HANDLE;
     return E_NOTIMPL;
@@ -912,7 +912,7 @@ HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName,
                              LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile,
                              DWORD unknown)
 {
-    TRACE("(%s,%s,%s,%p,%d)\n", debugstr_w(pszThemeFileName),
+    TRACE("(%s,%s,%s,%p,%ld)\n", debugstr_w(pszThemeFileName),
           debugstr_w(pszColorName), debugstr_w(pszSizeName),
           hThemeFile, unknown);
     return MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName, (PTHEME_FILE*)hThemeFile);
@@ -992,7 +992,7 @@ HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName,
 {
     PTHEME_FILE pt;
     HRESULT hr;
-    TRACE("(%s,%p,%d,%p,%d)\n", debugstr_w(pszThemeFileName),
+    TRACE("(%s,%p,%ld,%p,%ld)\n", debugstr_w(pszThemeFileName),
           pszColorName, dwColorNameLen,
           pszSizeName, dwSizeNameLen);
 
@@ -1107,7 +1107,7 @@ HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName,
     HRESULT hr;
     LPWSTR tmp;
     UINT resourceId = dwColorNum + 1000;
-    TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName),
+    TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName),
           debugstr_w(pszSizeName), dwColorNum);
 
     hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, pszSizeName, &pt);
@@ -1165,7 +1165,7 @@ HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName,
     HRESULT hr;
     LPWSTR tmp;
     UINT resourceId = dwSizeNum + 3000;
-    TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName),
+    TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName),
           debugstr_w(pszColorName), dwSizeNum);
 
     hr = MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, NULL, &pt);

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

[Eric Pouech]

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

---
 dlls/vbscript/Makefile.in     |    1 -
 dlls/vbscript/global.c        |   12 +++----
 dlls/vbscript/interp.c        |   14 ++++----
 dlls/vbscript/parser.y        |    2 +
 dlls/vbscript/regexp.c        |    6 ++-
 dlls/vbscript/utils.c         |    6 ++-
 dlls/vbscript/vbdisp.c        |   74 +++++++++++++++++++++--------------------
 dlls/vbscript/vbregexp.c      |   54 +++++++++++++++---------------
 dlls/vbscript/vbscript.c      |   36 ++++++++++----------
 dlls/vbscript/vbscript_main.c |    2 +
 10 files changed, 103 insertions(+), 104 deletions(-)

diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in
index 96e4e0affb9..a6a0569cc03 100644
--- a/dlls/vbscript/Makefile.in
+++ b/dlls/vbscript/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vbscript.dll
 IMPORTS   = oleaut32 ole32 user32
 
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index feab156c7b4..ab06db87624 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -84,7 +84,7 @@ static ULONG WINAPI Builtin_AddRef(IDispatch *iface)
     BuiltinDisp *This = impl_from_IDispatch(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -94,7 +94,7 @@ static ULONG WINAPI Builtin_Release(IDispatch *iface)
     BuiltinDisp *This = impl_from_IDispatch(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref) {
         assert(!This->ctx);
@@ -115,7 +115,7 @@ static HRESULT WINAPI Builtin_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo)
 static HRESULT WINAPI Builtin_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
 {
     BuiltinDisp *This = impl_from_IDispatch(iface);
-    TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+    TRACE("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
     return DISP_E_BADINDEX;
 }
 
@@ -148,7 +148,7 @@ static HRESULT WINAPI Builtin_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLE
     unsigned i;
     HRESULT hres;
 
-    TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), names, name_cnt, lcid, ids);
+    TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), names, name_cnt, lcid, ids);
 
     if(!This->ctx) {
         FIXME("NULL context\n");
@@ -173,7 +173,7 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L
     unsigned argn, i;
     HRESULT hres;
 
-    TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, id, debugstr_guid(riid), lcid, flags, dp, res, ei, err);
+    TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, id, debugstr_guid(riid), lcid, flags, dp, res, ei, err);
 
     if(!This->ctx) {
         FIXME("NULL context\n");
@@ -626,7 +626,7 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, unsigned type, BSTR o
     heap_free(title_buf);
     IActiveScriptSiteWindow_Release(acts_window);
     if(FAILED(hres)) {
-        FIXME("failed: %08x\n", hres);
+        FIXME("failed: %08lx\n", hres);
         return hres;
     }
 
diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index f33454604d0..c43b5383dee 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -1223,7 +1223,7 @@ static HRESULT interp_dim(exec_ctx_t *ctx)
 
         hres = lookup_identifier(ctx, ident, VBDISP_LET, &ref);
         if(FAILED(hres)) {
-            FIXME("lookup %s failed: %08x\n", debugstr_w(ident), hres);
+            FIXME("lookup %s failed: %08lx\n", debugstr_w(ident), hres);
             return hres;
         }
 
@@ -1292,7 +1292,7 @@ static HRESULT interp_redim(exec_ctx_t *ctx)
 
     hres = lookup_identifier(ctx, identifier, VBDISP_LET, &ref);
     if(FAILED(hres)) {
-        FIXME("lookup %s failed: %08x\n", debugstr_w(identifier), hres);
+        FIXME("lookup %s failed: %08lx\n", debugstr_w(identifier), hres);
         return hres;
     }
 
@@ -1332,7 +1332,7 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx)
 
     hres = lookup_identifier(ctx, identifier, VBDISP_LET, &ref);
     if(FAILED(hres)) {
-        FIXME("lookup %s failed: %08x\n", debugstr_w(identifier), hres);
+        FIXME("lookup %s failed: %08lx\n", debugstr_w(identifier), hres);
         return hres;
     }
 
@@ -1367,7 +1367,7 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx)
         /* can resize the last dimensions (if others match */
         for(i = 0; i+1 < dim_cnt; ++i) {
             if(array->rgsabound[array->cDims - 1 - i].cElements != bounds[i].cElements) {
-                TRACE("Can't resize %s, bound[%d] %d != %d\n", debugstr_w(identifier), i, array->rgsabound[i].cElements, bounds[i].cElements);
+                TRACE("Can't resize %s, bound[%d] %ld != %ld\n", debugstr_w(identifier), i, array->rgsabound[i].cElements, bounds[i].cElements);
                 return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS);
             }
         }
@@ -1448,7 +1448,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx)
         hres = IUnknown_QueryInterface(V_UNKNOWN(&iterv), &IID_IEnumVARIANT, (void**)&iter);
         IUnknown_Release(V_UNKNOWN(&iterv));
         if(FAILED(hres)) {
-            FIXME("Could not get IEnumVARIANT iface: %08x\n", hres);
+            FIXME("Could not get IEnumVARIANT iface: %08lx\n", hres);
             return hres;
         }
 
@@ -1689,7 +1689,7 @@ static HRESULT interp_int(exec_ctx_t *ctx)
     const LONG arg = ctx->instr->arg1.lng;
     VARIANT v;
 
-    TRACE("%d\n", arg);
+    TRACE("%ld\n", arg);
 
     if(arg == (INT16)arg) {
         V_VT(&v) = VT_I2;
@@ -2501,7 +2501,7 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd
             if(exec.resume_next) {
                 unsigned stack_off;
 
-                WARN("Failed %08x in resume next mode\n", hres);
+                WARN("Failed %08lx in resume next mode\n", hres);
 
                 /*
                  * Unwinding here is simple. We need to find the next OP_catch, which contains
diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index 948f27288b0..90ed921c2a9 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -518,7 +518,7 @@ static int parser_error(unsigned *loc, parser_ctx_t *ctx, const char *str)
         FIXME("%s: %s\n", debugstr_w(ctx->code + *loc), debugstr_a(str));
         ctx->hres = E_FAIL;
     }else {
-        WARN("%s: %08x\n", debugstr_w(ctx->code + *loc), ctx->hres);
+        WARN("%s: %08lx\n", debugstr_w(ctx->code + *loc), ctx->hres);
     }
     return 0;
 }
diff --git a/dlls/vbscript/regexp.c b/dlls/vbscript/regexp.c
index 33eec2aa848..030b0cf5d2d 100644
--- a/dlls/vbscript/regexp.c
+++ b/dlls/vbscript/regexp.c
@@ -1935,7 +1935,7 @@ PushBackTrackState(REGlobalData *gData, REOp op,
     ptrdiff_t btincr = ((char *)result + sz) -
                        ((char *)gData->backTrackStack + btsize);
 
-    TRACE("\tBT_Push: %lu,%lu\n", (ULONG_PTR)parenIndex, (ULONG_PTR)parenCount);
+    TRACE("\tBT_Push: %Iu,%Iu\n", (ULONG_PTR)parenIndex, (ULONG_PTR)parenCount);
 
     JS_COUNT_OPERATION(gData->cx, JSOW_JUMP * (1 + parenCount));
     if (btincr > 0) {
@@ -2684,7 +2684,7 @@ ExecuteREBytecode(REGlobalData *gData, match_state_t *x)
 
               case REOP_LPAREN:
                 pc = ReadCompactIndex(pc, &parenIndex);
-                TRACE("[ %lu ]\n", (ULONG_PTR)parenIndex);
+                TRACE("[ %Iu ]\n", (ULONG_PTR)parenIndex);
                 assert(parenIndex < gData->regexp->parenCount);
                 if (parenIndex + 1 > parenSoFar)
                     parenSoFar = parenIndex + 1;
@@ -3047,7 +3047,7 @@ ExecuteREBytecode(REGlobalData *gData, match_state_t *x)
                 parenSoFar = curState->parenSoFar;
             }
 
-            TRACE("\tBT_Pop: %ld,%ld\n",
+            TRACE("\tBT_Pop: %Id,%Id\n",
                      (ULONG_PTR)backTrackData->parenIndex,
                      (ULONG_PTR)backTrackData->parenCount);
             continue;
diff --git a/dlls/vbscript/utils.c b/dlls/vbscript/utils.c
index d30842c52eb..b8c034b354a 100644
--- a/dlls/vbscript/utils.c
+++ b/dlls/vbscript/utils.c
@@ -62,7 +62,7 @@ static ULONG WINAPI safearray_iter_IEnumVARIANT_AddRef(IEnumVARIANT *iface)
     safearray_iter *This = impl_from_IEnumVARIANT(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -72,7 +72,7 @@ static ULONG WINAPI safearray_iter_IEnumVARIANT_Release(IEnumVARIANT *iface)
     safearray_iter *This = impl_from_IEnumVARIANT(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", iface, ref);
+    TRACE("(%p) ref=%ld\n", iface, ref);
 
     if(!ref) {
         if(This->sa)
@@ -90,7 +90,7 @@ static HRESULT WINAPI safearray_iter_IEnumVARIANT_Next(IEnumVARIANT *iface,
     HRESULT hres;
     VARIANT *v;
 
-    TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched);
+    TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched);
 
     if(celt != 1) {
         FIXME("celt != 1\n");
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index d67a1831bbe..1c6f68255bd 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -237,7 +237,7 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern
             return hres;
         }
         default:
-            FIXME("flags %x\n", flags);
+            FIXME("flags %lx\n", flags);
             return DISP_E_MEMBERNOTFOUND;
         }
     }
@@ -317,7 +317,7 @@ static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface)
     vbdisp_t *This = impl_from_IDispatchEx(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -327,7 +327,7 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface)
     vbdisp_t *This = impl_from_IDispatchEx(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref && run_terminator(This)) {
         clean_props(This);
@@ -353,7 +353,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC
                                               ITypeInfo **ppTInfo)
 {
     vbdisp_t *This = impl_from_IDispatchEx(iface);
-    FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+    FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
     return E_NOTIMPL;
 }
 
@@ -362,7 +362,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid,
                                                 DISPID *rgDispId)
 {
     vbdisp_t *This = impl_from_IDispatchEx(iface);
-    FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+    FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
           lcid, rgDispId);
     return E_NOTIMPL;
 }
@@ -373,7 +373,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember,
 {
     vbdisp_t *This = impl_from_IDispatchEx(iface);
 
-    TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+    TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
           lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 
     return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL);
@@ -383,7 +383,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
 {
     vbdisp_t *This = impl_from_IDispatchEx(iface);
 
-    TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid);
+    TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid);
 
     grfdex &= ~FDEX_VERSION_MASK;
 
@@ -393,7 +393,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
     /* Tests show that fdexNameCaseSensitive is ignored */
 
     if(grfdex & ~(fdexNameEnsure|fdexNameCaseInsensitive|fdexNameCaseSensitive)) {
-        FIXME("unsupported flags %x\n", grfdex);
+        FIXME("unsupported flags %lx\n", grfdex);
         return E_NOTIMPL;
     }
 
@@ -405,7 +405,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
 {
     vbdisp_t *This = impl_from_IDispatchEx(iface);
 
-    TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
+    TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
 
     if(!This->desc)
         return E_UNEXPECTED;
@@ -419,35 +419,35 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
 static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)
 {
     vbdisp_t *This = impl_from_IDispatchEx(iface);
-    FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex);
+    FIXME("(%p)->(%s %lx)\n", This, debugstr_w(bstrName), grfdex);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id)
 {
     vbdisp_t *This = impl_from_IDispatchEx(iface);
-    FIXME("(%p)->(%x)\n", This, id);
+    FIXME("(%p)->(%lx)\n", This, id);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex)
 {
     vbdisp_t *This = impl_from_IDispatchEx(iface);
-    FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex);
+    FIXME("(%p)->(%lx %lx %p)\n", This, id, grfdexFetch, pgrfdex);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName)
 {
     vbdisp_t *This = impl_from_IDispatchEx(iface);
-    FIXME("(%p)->(%x %p)\n", This, id, pbstrName);
+    FIXME("(%p)->(%lx %p)\n", This, id, pbstrName);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid)
 {
     vbdisp_t *This = impl_from_IDispatchEx(iface);
-    FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid);
+    FIXME("(%p)->(%lx %lx %p)\n", This, grfdex, id, pid);
     return E_NOTIMPL;
 }
 
@@ -614,7 +614,7 @@ static ULONG WINAPI ScriptTypeInfo_AddRef(ITypeInfo *iface)
     ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -625,7 +625,7 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface)
     LONG ref = InterlockedDecrement(&This->ref);
     UINT i;
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref)
     {
@@ -745,7 +745,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid,
     HRESULT hr;
     UINT i = 0;
 
-    TRACE("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames);
+    TRACE("(%p)->(%ld %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames);
 
     if (!rgBstrNames || !pcNames) return E_INVALIDARG;
     if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND;
@@ -875,7 +875,7 @@ static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance,
     IDispatch *disp;
     HRESULT hr;
 
-    TRACE("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags,
+    TRACE("(%p)->(%p %ld %d %p %p %p %p)\n", This, pvInstance, memid, wFlags,
           pDispParams, pVarResult, pExcepInfo, puArgErr);
 
     if (!pvInstance) return E_INVALIDARG;
@@ -908,7 +908,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID
     function_t *func;
     HRESULT hr;
 
-    TRACE("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
+    TRACE("(%p)->(%ld %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
 
     if (pBstrDocString) *pBstrDocString = NULL;
     if (pdwHelpContext) *pdwHelpContext = 0;
@@ -953,7 +953,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memi
     ITypeInfo *disp_typeinfo;
     HRESULT hr;
 
-    TRACE("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
+    TRACE("(%p)->(%ld %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
 
     if (pBstrDllName) *pBstrDllName = NULL;
     if (pBstrName) *pBstrName = NULL;
@@ -974,7 +974,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE h
     ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface);
     HRESULT hr;
 
-    TRACE("(%p)->(%x %p)\n", This, hRefType, ppTInfo);
+    TRACE("(%p)->(%lx %p)\n", This, hRefType, ppTInfo);
 
     if (!ppTInfo || (INT)hRefType < 0) return E_INVALIDARG;
 
@@ -997,7 +997,7 @@ static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID
     ITypeInfo *disp_typeinfo;
     HRESULT hr;
 
-    TRACE("(%p)->(%d %d %p)\n", This, memid, invKind, ppv);
+    TRACE("(%p)->(%ld %d %p)\n", This, memid, invKind, ppv);
 
     if (!ppv) return E_INVALIDARG;
     *ppv = NULL;
@@ -1030,7 +1030,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, B
     ITypeInfo *disp_typeinfo;
     HRESULT hr;
 
-    TRACE("(%p)->(%d %p)\n", This, memid, pBstrMops);
+    TRACE("(%p)->(%ld %p)\n", This, memid, pBstrMops);
 
     if (!pBstrMops) return E_INVALIDARG;
 
@@ -1135,7 +1135,7 @@ static HRESULT WINAPI ScriptTypeComp_Bind(ITypeComp *iface, LPOLESTR szName, ULO
     HRESULT hr;
     UINT i;
 
-    TRACE("(%p)->(%s %08x %d %p %p %p)\n", This, debugstr_w(szName), lHashVal,
+    TRACE("(%p)->(%s %08lx %d %p %p %p)\n", This, debugstr_w(szName), lHashVal,
           wFlags, ppTInfo, pDescKind, pBindPtr);
 
     if (!szName || !ppTInfo || !pDescKind || !pBindPtr)
@@ -1189,7 +1189,7 @@ static HRESULT WINAPI ScriptTypeComp_BindType(ITypeComp *iface, LPOLESTR szName,
     ITypeComp *disp_typecomp;
     HRESULT hr;
 
-    TRACE("(%p)->(%s %08x %p %p)\n", This, debugstr_w(szName), lHashVal, ppTInfo, ppTComp);
+    TRACE("(%p)->(%s %08lx %p %p)\n", This, debugstr_w(szName), lHashVal, ppTInfo, ppTComp);
 
     if (!szName || !ppTInfo || !ppTComp)
         return E_INVALIDARG;
@@ -1247,7 +1247,7 @@ static ULONG WINAPI ScriptDisp_AddRef(IDispatchEx *iface)
     ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -1258,7 +1258,7 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface)
     LONG ref = InterlockedDecrement(&This->ref);
     unsigned i;
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref) {
         assert(!This->ctx);
@@ -1292,7 +1292,7 @@ static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC
     UINT num_funcs = 0;
     unsigned i, j;
 
-    TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ret);
+    TRACE("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ret);
 
     if(iTInfo)
         return DISP_E_BADINDEX;
@@ -1341,7 +1341,7 @@ static HRESULT WINAPI ScriptDisp_GetIDsOfNames(IDispatchEx *iface, REFIID riid,
     UINT i;
     HRESULT hres;
 
-    TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+    TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
           lcid, rgDispId);
 
     if(cNames == 0)
@@ -1366,7 +1366,7 @@ static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember,
 {
     ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
 
-    TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+    TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
           lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 
     return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags,
@@ -1378,7 +1378,7 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
     ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
     unsigned i;
 
-    TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid);
+    TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid);
 
     if(!This->ctx)
         return E_UNEXPECTED;
@@ -1407,7 +1407,7 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
     ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
     HRESULT hres;
 
-    TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
+    TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
 
     if (!This->ctx)
         return E_UNEXPECTED;
@@ -1447,35 +1447,35 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
 static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)
 {
     ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
-    FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex);
+    FIXME("(%p)->(%s %lx)\n", This, debugstr_w(bstrName), grfdex);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI ScriptDisp_DeleteMemberByDispID(IDispatchEx *iface, DISPID id)
 {
     ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
-    FIXME("(%p)->(%x)\n", This, id);
+    FIXME("(%p)->(%lx)\n", This, id);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI ScriptDisp_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex)
 {
     ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
-    FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex);
+    FIXME("(%p)->(%lx %lx %p)\n", This, id, grfdexFetch, pgrfdex);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI ScriptDisp_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName)
 {
     ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
-    FIXME("(%p)->(%x %p)\n", This, id, pbstrName);
+    FIXME("(%p)->(%lx %p)\n", This, id, pbstrName);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI ScriptDisp_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid)
 {
     ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
-    FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid);
+    FIXME("(%p)->(%lx %lx %p)\n", This, grfdex, id, pid);
     return E_NOTIMPL;
 }
 
diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c
index ddaadb0ce3f..24ce243c645 100644
--- a/dlls/vbscript/vbregexp.c
+++ b/dlls/vbscript/vbregexp.c
@@ -56,7 +56,7 @@ static HRESULT init_regexp_typeinfo(regexp_tid_t tid)
 
         hres = LoadTypeLib(L"vbscript.dll\\3", &tl);
         if(FAILED(hres)) {
-            ERR("LoadRegTypeLib failed: %08x\n", hres);
+            ERR("LoadRegTypeLib failed: %08lx\n", hres);
             return hres;
         }
 
@@ -69,7 +69,7 @@ static HRESULT init_regexp_typeinfo(regexp_tid_t tid)
 
         hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti);
         if(FAILED(hres)) {
-            ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres);
+            ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hres);
             return hres;
         }
 
@@ -170,7 +170,7 @@ static ULONG WINAPI SubMatches_AddRef(ISubMatches *iface)
     SubMatches *This = impl_from_ISubMatches(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -180,7 +180,7 @@ static ULONG WINAPI SubMatches_Release(ISubMatches *iface)
     SubMatches *This = impl_from_ISubMatches(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref) {
         heap_free(This->match);
@@ -205,7 +205,7 @@ static HRESULT WINAPI SubMatches_GetTypeInfo(ISubMatches *iface,
         UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
 {
     SubMatches *This = impl_from_ISubMatches(iface);
-    FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+    FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
     return E_NOTIMPL;
 }
 
@@ -214,7 +214,7 @@ static HRESULT WINAPI SubMatches_GetIDsOfNames(ISubMatches *iface,
 {
     SubMatches *This = impl_from_ISubMatches(iface);
 
-    TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid),
+    TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid),
             rgszNames, cNames, lcid, rgDispId);
 
     return ITypeInfo_GetIDsOfNames(typeinfos[SubMatches_tid], rgszNames, cNames, rgDispId);
@@ -226,7 +226,7 @@ static HRESULT WINAPI SubMatches_Invoke(ISubMatches *iface, DISPID dispIdMember,
 {
     SubMatches *This = impl_from_ISubMatches(iface);
 
-    TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+    TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
             lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 
     return ITypeInfo_Invoke(typeinfos[SubMatches_tid], iface, dispIdMember, wFlags,
@@ -238,7 +238,7 @@ static HRESULT WINAPI SubMatches_get_Item(ISubMatches *iface,
 {
     SubMatches *This = impl_from_ISubMatches(iface);
 
-    TRACE("(%p)->(%d %p)\n", This, index, pSubMatch);
+    TRACE("(%p)->(%ld %p)\n", This, index, pSubMatch);
 
     if(!pSubMatch)
         return E_POINTER;
@@ -377,7 +377,7 @@ static ULONG WINAPI Match2_AddRef(IMatch2 *iface)
     Match2 *This = impl_from_IMatch2(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -387,7 +387,7 @@ static ULONG WINAPI Match2_Release(IMatch2 *iface)
     Match2 *This = impl_from_IMatch2(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref) {
         ISubMatches_Release(&This->sub_matches->ISubMatches_iface);
@@ -411,7 +411,7 @@ static HRESULT WINAPI Match2_GetTypeInfo(IMatch2 *iface,
         UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
 {
     Match2 *This = impl_from_IMatch2(iface);
-    FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+    FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
     return E_NOTIMPL;
 }
 
@@ -420,7 +420,7 @@ static HRESULT WINAPI Match2_GetIDsOfNames(IMatch2 *iface,
 {
     Match2 *This = impl_from_IMatch2(iface);
 
-    TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid),
+    TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid),
             rgszNames, cNames, lcid, rgDispId);
 
     return ITypeInfo_GetIDsOfNames(typeinfos[Match2_tid], rgszNames, cNames, rgDispId);
@@ -432,7 +432,7 @@ static HRESULT WINAPI Match2_Invoke(IMatch2 *iface, DISPID dispIdMember,
 {
     Match2 *This = impl_from_IMatch2(iface);
 
-    TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+    TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
             lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 
     return ITypeInfo_Invoke(typeinfos[Match2_tid], iface, dispIdMember, wFlags,
@@ -657,7 +657,7 @@ static ULONG WINAPI MatchCollectionEnum_AddRef(IEnumVARIANT *iface)
     MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -667,7 +667,7 @@ static ULONG WINAPI MatchCollectionEnum_Release(IEnumVARIANT *iface)
     MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref) {
         IMatchCollection2_Release(This->mc);
@@ -684,7 +684,7 @@ static HRESULT WINAPI MatchCollectionEnum_Next(IEnumVARIANT *iface,
     DWORD i;
     HRESULT hres = S_OK;
 
-    TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched);
+    TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched);
 
     if(This->pos>=This->count) {
         if(pCeltFetched)
@@ -714,7 +714,7 @@ static HRESULT WINAPI MatchCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt)
 {
     MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface);
 
-    TRACE("(%p)->(%u)\n", This, celt);
+    TRACE("(%p)->(%lu)\n", This, celt);
 
     if(This->pos+celt <= This->count)
         This->pos += celt;
@@ -810,7 +810,7 @@ static ULONG WINAPI MatchCollection2_AddRef(IMatchCollection2 *iface)
     MatchCollection2 *This = impl_from_IMatchCollection2(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -820,7 +820,7 @@ static ULONG WINAPI MatchCollection2_Release(IMatchCollection2 *iface)
     MatchCollection2 *This = impl_from_IMatchCollection2(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref) {
         DWORD i;
@@ -849,7 +849,7 @@ static HRESULT WINAPI MatchCollection2_GetTypeInfo(IMatchCollection2 *iface,
         UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
 {
     MatchCollection2 *This = impl_from_IMatchCollection2(iface);
-    FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+    FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
     return E_NOTIMPL;
 }
 
@@ -858,7 +858,7 @@ static HRESULT WINAPI MatchCollection2_GetIDsOfNames(IMatchCollection2 *iface,
 {
     MatchCollection2 *This = impl_from_IMatchCollection2(iface);
 
-    TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid),
+    TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid),
             rgszNames, cNames, lcid, rgDispId);
 
     return ITypeInfo_GetIDsOfNames(typeinfos[MatchCollection2_tid], rgszNames, cNames, rgDispId);
@@ -870,7 +870,7 @@ static HRESULT WINAPI MatchCollection2_Invoke(IMatchCollection2 *iface, DISPID d
 {
     MatchCollection2 *This = impl_from_IMatchCollection2(iface);
 
-    TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+    TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
             lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 
     return ITypeInfo_Invoke(typeinfos[MatchCollection2_tid], iface, dispIdMember, wFlags,
@@ -1103,7 +1103,7 @@ static ULONG WINAPI RegExp2_AddRef(IRegExp2 *iface)
     RegExp2 *This = impl_from_IRegExp2(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -1113,7 +1113,7 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface)
     RegExp2 *This = impl_from_IRegExp2(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref) {
         heap_free(This->pattern);
@@ -1140,7 +1140,7 @@ static HRESULT WINAPI RegExp2_GetTypeInfo(IRegExp2 *iface,
         UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
 {
     RegExp2 *This = impl_from_IRegExp2(iface);
-    FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+    FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);
     return E_NOTIMPL;
 }
 
@@ -1149,7 +1149,7 @@ static HRESULT WINAPI RegExp2_GetIDsOfNames(IRegExp2 *iface, REFIID riid,
 {
     RegExp2 *This = impl_from_IRegExp2(iface);
 
-    TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid),
+    TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid),
             rgszNames, cNames, lcid, rgDispId);
 
     return ITypeInfo_GetIDsOfNames(typeinfos[RegExp2_tid], rgszNames, cNames, rgDispId);
@@ -1161,7 +1161,7 @@ static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember,
 {
     RegExp2 *This = impl_from_IRegExp2(iface);
 
-    TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+    TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
             lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 
     return ITypeInfo_Invoke(typeinfos[RegExp2_tid], iface, dispIdMember, wFlags,
diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c
index 4b57b4b2b93..9c5f92e0624 100644
--- a/dlls/vbscript/vbscript.c
+++ b/dlls/vbscript/vbscript.c
@@ -205,7 +205,7 @@ static HRESULT retrieve_named_item_disp(IActiveScriptSite *site, named_item_t *i
 
     hres = IActiveScriptSite_GetItemInfo(site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL);
     if(FAILED(hres)) {
-        WARN("GetItemInfo failed: %08x\n", hres);
+        WARN("GetItemInfo failed: %08lx\n", hres);
         return hres;
     }
 
@@ -396,7 +396,7 @@ static ULONG WINAPI VBScriptError_AddRef(IActiveScriptError *iface)
     VBScriptError *This = impl_from_IActiveScriptError(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -406,7 +406,7 @@ static ULONG WINAPI VBScriptError_Release(IActiveScriptError *iface)
     VBScriptError *This = impl_from_IActiveScriptError(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref) {
         heap_free(This);
@@ -531,7 +531,7 @@ static ULONG WINAPI VBScript_AddRef(IActiveScript *iface)
     VBScript *This = impl_from_IActiveScript(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -541,7 +541,7 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface)
     VBScript *This = impl_from_IActiveScript(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", iface, ref);
+    TRACE("(%p) ref=%ld\n", iface, ref);
 
     if(!ref) {
         decrease_state(This, SCRIPTSTATE_CLOSED);
@@ -690,7 +690,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr
     IDispatch *disp = NULL;
     HRESULT hres;
 
-    TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags);
+    TRACE("(%p)->(%s %lx)\n", This, debugstr_w(pstrName), dwFlags);
 
     if(This->thread_id != GetCurrentThreadId() || !This->ctx->site)
         return E_UNEXPECTED;
@@ -700,7 +700,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr
 
         hres = IActiveScriptSite_GetItemInfo(This->ctx->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL);
         if(FAILED(hres)) {
-            WARN("GetItemInfo failed: %08x\n", hres);
+            WARN("GetItemInfo failed: %08lx\n", hres);
             return hres;
         }
 
@@ -739,7 +739,7 @@ static HRESULT WINAPI VBScript_AddTypeLib(IActiveScript *iface, REFGUID rguidTyp
         DWORD dwMajor, DWORD dwMinor, DWORD dwFlags)
 {
     VBScript *This = impl_from_IActiveScript(iface);
-    FIXME("(%p)->(%s %d %d %d)\n", This, debugstr_guid(rguidTypeLib), dwMajor, dwMinor, dwFlags);
+    FIXME("(%p)->(%s %ld %ld %ld)\n", This, debugstr_guid(rguidTypeLib), dwMajor, dwMinor, dwFlags);
     return E_NOTIMPL;
 }
 
@@ -855,7 +855,7 @@ static HRESULT WINAPI VBScriptDebug_GetScriptTextAttributes(IActiveScriptDebug *
         LPCOLESTR code, ULONG len, LPCOLESTR delimiter, DWORD flags, SOURCE_TEXT_ATTR *attr)
 {
     VBScript *This = impl_from_IActiveScriptDebug(iface);
-    FIXME("(%p)->(%s %u %s %#x %p)\n", This, debugstr_w(code), len,
+    FIXME("(%p)->(%s %lu %s %#lx %p)\n", This, debugstr_w(code), len,
           debugstr_w(delimiter), flags, attr);
     return E_NOTIMPL;
 }
@@ -864,7 +864,7 @@ static HRESULT WINAPI VBScriptDebug_GetScriptletTextAttributes(IActiveScriptDebu
         LPCOLESTR code, ULONG len, LPCOLESTR delimiter, DWORD flags, SOURCE_TEXT_ATTR *attr)
 {
     VBScript *This = impl_from_IActiveScriptDebug(iface);
-    FIXME("(%p)->(%s %u %s %#x %p)\n", This, debugstr_w(code), len,
+    FIXME("(%p)->(%s %lu %s %#lx %p)\n", This, debugstr_w(code), len,
           debugstr_w(delimiter), flags, attr);
     return E_NOTIMPL;
 }
@@ -873,7 +873,7 @@ static HRESULT WINAPI VBScriptDebug_EnumCodeContextsOfPosition(IActiveScriptDebu
         CTXARG_T source, ULONG offset, ULONG len, IEnumDebugCodeContexts **ret)
 {
     VBScript *This = impl_from_IActiveScriptDebug(iface);
-    FIXME("(%p)->(%s %u %u %p)\n", This, wine_dbgstr_longlong(source), offset, len, ret);
+    FIXME("(%p)->(%s %lu %lu %p)\n", This, wine_dbgstr_longlong(source), offset, len, ret);
     return E_NOTIMPL;
 }
 
@@ -931,7 +931,7 @@ static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface,
         BSTR *pbstrName, EXCEPINFO *pexcepinfo)
 {
     VBScript *This = impl_from_IActiveScriptParse(iface);
-    FIXME("(%p)->(%s %s %s %s %s %s %s %u %x %p %p)\n", This, debugstr_w(pstrDefaultName),
+    FIXME("(%p)->(%s %s %s %s %s %s %s %lu %lx %p %p)\n", This, debugstr_w(pstrDefaultName),
           debugstr_w(pstrCode), debugstr_w(pstrItemName), debugstr_w(pstrSubItemName),
           debugstr_w(pstrEventName), debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie),
           ulStartingLineNumber, dwFlags, pbstrName, pexcepinfo);
@@ -947,7 +947,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface,
     vbscode_t *code;
     HRESULT hres;
 
-    TRACE("(%p)->(%s %s %p %s %s %u %x %p %p)\n", This, debugstr_w(pstrCode),
+    TRACE("(%p)->(%s %s %p %s %s %lu %lx %p %p)\n", This, debugstr_w(pstrCode),
           debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter),
           wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLine, dwFlags, pvarResult, pexcepinfo);
 
@@ -1009,7 +1009,7 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar
     vbdisp_t *vbdisp;
     HRESULT hres;
 
-    TRACE("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams),
+    TRACE("(%p)->(%s %s %s %s %p %s %s %lu %lx %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams),
           debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter),
           wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLineNumber, dwFlags, ppdisp);
 
@@ -1081,7 +1081,7 @@ static HRESULT WINAPI VBScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *if
 {
     VBScript *This = impl_from_IObjectSafety(iface);
 
-    TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions);
+    TRACE("(%p)->(%s %lx %lx)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions);
 
     if(dwOptionSetMask & ~SUPPORTED_OPTIONS)
         return E_FAIL;
@@ -1179,7 +1179,7 @@ static ULONG WINAPI AXSite_AddRef(IServiceProvider *iface)
     AXSite *This = impl_from_IServiceProvider(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -1189,7 +1189,7 @@ static ULONG WINAPI AXSite_Release(IServiceProvider *iface)
     AXSite *This = impl_from_IServiceProvider(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref)
         heap_free(This);
@@ -1222,7 +1222,7 @@ IUnknown *create_ax_site(script_ctx_t *ctx)
 
     hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IServiceProvider, (void**)&sp);
     if(FAILED(hres)) {
-        ERR("Could not get IServiceProvider iface: %08x\n", hres);
+        ERR("Could not get IServiceProvider iface: %08lx\n", hres);
         return NULL;
     }
 
diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c
index 087b387e0af..c7f63c791ae 100644
--- a/dlls/vbscript/vbscript_main.c
+++ b/dlls/vbscript/vbscript_main.c
@@ -268,7 +268,7 @@ static IClassFactory VBScriptRegExpFactory = { &VBScriptRegExpFactoryVtbl };
  */
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 {
-    TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv);
+    TRACE("(%p %ld %p)\n", hInstDLL, fdwReason, lpv);
 
     switch(fdwReason)
     {

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

[Eric Pouech]

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

---
 dlls/vcomp/Makefile.in    |    1 -
 dlls/vcomp/main.c         |    2 +-
 dlls/vcomp100/Makefile.in |    1 -
 dlls/vcomp110/Makefile.in |    1 -
 dlls/vcomp120/Makefile.in |    1 -
 dlls/vcomp140/Makefile.in |    1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/dlls/vcomp/Makefile.in b/dlls/vcomp/Makefile.in
index 201b855718a..a54a86f8eb6 100644
--- a/dlls/vcomp/Makefile.in
+++ b/dlls/vcomp/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE = vcomp.dll
 
 C_SRCS = \
diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c
index c4f2572c86a..374adf3991a 100644
--- a/dlls/vcomp/main.c
+++ b/dlls/vcomp/main.c
@@ -1951,7 +1951,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int
 
 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
 {
-    TRACE("(%p, %d, %p)\n", instance, reason, reserved);
+    TRACE("(%p, %ld, %p)\n", instance, reason, reserved);
 
     switch (reason)
     {
diff --git a/dlls/vcomp100/Makefile.in b/dlls/vcomp100/Makefile.in
index 6c4d19a9797..b087e894ad7 100644
--- a/dlls/vcomp100/Makefile.in
+++ b/dlls/vcomp100/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE = vcomp100.dll
 PARENTSRC = ../vcomp
 
diff --git a/dlls/vcomp110/Makefile.in b/dlls/vcomp110/Makefile.in
index c44f5eae8d8..abd3d465934 100644
--- a/dlls/vcomp110/Makefile.in
+++ b/dlls/vcomp110/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vcomp110.dll
 PARENTSRC = ../vcomp
 
diff --git a/dlls/vcomp120/Makefile.in b/dlls/vcomp120/Makefile.in
index c52812f4384..9a2f2428f6f 100644
--- a/dlls/vcomp120/Makefile.in
+++ b/dlls/vcomp120/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE = vcomp120.dll
 PARENTSRC = ../vcomp
 
diff --git a/dlls/vcomp140/Makefile.in b/dlls/vcomp140/Makefile.in
index 10263e2112f..644ac670af9 100644
--- a/dlls/vcomp140/Makefile.in
+++ b/dlls/vcomp140/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE = vcomp140.dll
 PARENTSRC = ../vcomp

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

[Eric Pouech]

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

---
 dlls/vcruntime140/Makefile.in |    1 -
 dlls/vcruntime140/misc.c      |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/vcruntime140/Makefile.in b/dlls/vcruntime140/Makefile.in
index af1b62c0b40..2b4d6af7c91 100644
--- a/dlls/vcruntime140/Makefile.in
+++ b/dlls/vcruntime140/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vcruntime140.dll
 
 C_SRCS = \
diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c
index cc641754389..cc0af902677 100644
--- a/dlls/vcruntime140/misc.c
+++ b/dlls/vcruntime140/misc.c
@@ -46,7 +46,7 @@ void CDECL __telemetry_main_return_trigger(HINSTANCE hinst)
 BOOL CDECL __vcrt_InitializeCriticalSectionEx(
         CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags)
 {
-    TRACE("(%p %x %x)\n", cs, spin_count, flags);
+    TRACE("(%p %lx %lx)\n", cs, spin_count, flags);
     return InitializeCriticalSectionEx(cs, spin_count, flags);
 }

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

[Piotr Caban]

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

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

[Eric Pouech]

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

---
 dlls/vcruntime140_1/Makefile.in     |    1 -
 dlls/vcruntime140_1/except_x86_64.c |   16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in
index 5770333edcd..31f15af2989 100644
--- a/dlls/vcruntime140_1/Makefile.in
+++ b/dlls/vcruntime140_1/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE = vcruntime140_1.dll
 
 C_SRCS = \
diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c
index b29a2baa696..ec6b06c69d6 100644
--- a/dlls/vcruntime140_1/except_x86_64.c
+++ b/dlls/vcruntime140_1/except_x86_64.c
@@ -546,7 +546,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec)
         }
         __EXCEPT_CTX(cxx_rethrow_filter, &ctx)
         {
-            TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode);
+            TRACE("detect rethrow: exception code: %lx\n", prev_rec->ExceptionCode);
             ctx.rethrow = TRUE;
             FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx.search_state);
 
@@ -567,8 +567,8 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec)
     __FINALLY_CTX(cxx_catch_cleanup, &ctx)
 
     FlsSetValue(fls_index, (void*)-2);
-    TRACE("handler returned %p, ret_addr[0] %p, ret_addr[1] %p.\n",
-            ret_addr, rec->ExceptionInformation[8], rec->ExceptionInformation[9]);
+    TRACE("handler returned %p, ret_addr[0] %#Ix, ret_addr[1] %#Ix.\n",
+          ret_addr, rec->ExceptionInformation[8], rec->ExceptionInformation[9]);
 
     if (rec->ExceptionInformation[9])
     {
@@ -690,7 +690,7 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c)
 
     if (rec->ExceptionCode != CXX_EXCEPTION)
     {
-        TRACE("non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode);
+        TRACE("non-c++ exception thrown in SEH handler: %lx\n", rec->ExceptionCode);
         terminate();
     }
 
@@ -730,7 +730,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame,
     {
         TRACE("nested exception detected\n");
         orig_frame = *(ULONG64*)rva_to_ptr(descr->frame, frame);
-        TRACE("setting orig_frame to %lx\n", orig_frame);
+        TRACE("setting orig_frame to %Ix\n", orig_frame);
     }
 
     if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND))
@@ -763,7 +763,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame,
 
         if (TRACE_ON(seh))
         {
-            TRACE("handling C++ exception rec %p frame %lx descr %p\n", rec, frame,  descr);
+            TRACE("handling C++ exception rec %p frame %Ix descr %p\n", rec, frame,  descr);
             dump_exception_type(exc_type, rec->ExceptionInformation[3]);
         }
     }
@@ -772,7 +772,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame,
         _se_translator_function se_translator = get_se_translator();
 
         exc_type = NULL;
-        TRACE("handling C exception code %x rec %p frame %lx descr %p\n",
+        TRACE("handling C exception code %lx rec %p frame %Ix descr %p\n",
                 rec->ExceptionCode, rec, frame, descr);
 
         if (se_translator) {
@@ -810,7 +810,7 @@ EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec,
     BYTE *p, *count, *count_end;
     int trylevel;
 
-    TRACE("%p %lx %p %p\n", rec, frame, context, dispatch);
+    TRACE("%p %Ix %p %p\n", rec, frame, context, dispatch);
 
     trylevel = (DWORD_PTR)FlsGetValue(fls_index);
     FlsSetValue(fls_index, (void*)-2);

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

[Piotr Caban]

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

[PATCH 09/25] dlls/vdhcp.vxd: enable compilation with long types

[Eric Pouech]

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

---
 dlls/vdhcp.vxd/Makefile.in |    1 -
 dlls/vdhcp.vxd/vdhcp.c     |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/vdhcp.vxd/Makefile.in b/dlls/vdhcp.vxd/Makefile.in
index 715a2acf6b0..b27d520f256 100644
--- a/dlls/vdhcp.vxd/Makefile.in
+++ b/dlls/vdhcp.vxd/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vdhcp.vxd
 
 C_SRCS = \
diff --git a/dlls/vdhcp.vxd/vdhcp.c b/dlls/vdhcp.vxd/vdhcp.c
index a7b97a338cb..b00d0380e7b 100644
--- a/dlls/vdhcp.vxd/vdhcp.c
+++ b/dlls/vdhcp.vxd/vdhcp.c
@@ -62,7 +62,7 @@ BOOL WINAPI VDHCP_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer,
         break;
 
     default:
-        FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n",
+        FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
                 dwIoControlCode,
                 lpvInBuffer,cbInBuffer,
                 lpvOutBuffer,cbOutBuffer,

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

[Eric Pouech]

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

---
 dlls/vdmdbg/Makefile.in |    1 -
 dlls/vdmdbg/vdmdbg.c    |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/vdmdbg/Makefile.in b/dlls/vdmdbg/Makefile.in
index 8b99c6ba891..63051c1c23c 100644
--- a/dlls/vdmdbg/Makefile.in
+++ b/dlls/vdmdbg/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vdmdbg.dll
 IMPORTLIB = vdmdbg
 
diff --git a/dlls/vdmdbg/vdmdbg.c b/dlls/vdmdbg/vdmdbg.c
index b56c62535ac..c988fd6461f 100644
--- a/dlls/vdmdbg/vdmdbg.c
+++ b/dlls/vdmdbg/vdmdbg.c
@@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vdmdbg);
  */
 INT WINAPI VDMEnumTaskWOW(DWORD dwProcessId, TASKENUMPROC fp, LPARAM lparam)
 {
-    FIXME("(%d, %p): stub!\n", dwProcessId, fp);
+    FIXME("(%ld, %p): stub!\n", dwProcessId, fp);
     return 0;
 }

[PATCH 11/25] dlls/ver.dll16: enable compilation with long types

[Eric Pouech]

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

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

diff --git a/dlls/ver.dll16/Makefile.in b/dlls/ver.dll16/Makefile.in
index ca72752ca4f..1c68dfc5035 100644
--- a/dlls/ver.dll16/Makefile.in
+++ b/dlls/ver.dll16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = ver.dll16
 IMPORTS   = version lz32
 
diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c
index dac9ff28ddf..6dfbc55c33b 100644
--- a/dlls/ver.dll16/version.c
+++ b/dlls/ver.dll16/version.c
@@ -436,7 +436,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType,
     OFSTRUCT ofs;
     DWORD reslen = dwResLen;
 
-    TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n",
+    TRACE("(%s,type=%p,id=%p,off=%ld,len=%ld,data=%p)\n",
 		debugstr_a(lpszFileName), lpszResType, lpszResId,
                 dwFileOffset, dwResLen, lpvData );
 
@@ -476,7 +476,7 @@ DWORD WINAPI GetFileVersionInfoSize16( LPCSTR filename, LPDWORD handle )
  */
 DWORD WINAPI GetFileVersionInfo16( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data )
 {
-    TRACE("(%s, %08x, %d, %p)\n", debugstr_a(filename), handle, datasize, data );
+    TRACE("(%s, %08lx, %ld, %p)\n", debugstr_a(filename), handle, datasize, data );
 
     return GetFileResource16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, 0, datasize, data );
 }

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

[Eric Pouech]

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

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

diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in
index 8bb38e37075..e26069e18c4 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = version.dll
 IMPORTLIB = version
 IMPORTS   = kernelbase
diff --git a/dlls/version/version.c b/dlls/version/version.c
index 5cb4fcd0457..61e79aef146 100644
--- a/dlls/version/version.c
+++ b/dlls/version/version.c
@@ -72,7 +72,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) {
 	    if ((*vffi)->dwSignature == 0x004f0049) /* hack to detect unicode */
 		*vffi = (VS_FIXEDFILEINFO*)(buf+0x28);
 	    if ((*vffi)->dwSignature != VS_FFI_SIGNATURE)
-                WARN("Bad VS_FIXEDFILEINFO signature 0x%08x\n",(*vffi)->dwSignature);
+                WARN("Bad VS_FIXEDFILEINFO signature 0x%08lx\n",(*vffi)->dwSignature);
 	    return buf;
 	}
     }
@@ -106,7 +106,7 @@ DWORD WINAPI VerInstallFileA(
     LPBYTE	buf1,buf2;
     OFSTRUCT	ofs;
 
-    TRACE("(%x,%s,%s,%s,%s,%s,%p,%d)\n",
+    TRACE("(%lx,%s,%s,%s,%s,%s,%p,%d)\n",
           flags,debugstr_a(srcfilename),debugstr_a(destfilename),
           debugstr_a(srcdir),debugstr_a(destdir),debugstr_a(curdir),
           tmpfile,*tmpfilelen);
@@ -174,7 +174,7 @@ DWORD WINAPI VerInstallFileA(
 		xret = VIF_OUTOFMEMORY;
 		break;
 	    default: /* unknown error, should not happen */
-		FIXME("Unknown LZCopy error %d, ignoring.\n", ret);
+		FIXME("Unknown LZCopy error %ld, ignoring.\n", ret);
 		xret = 0;
 		break;
 	    }

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

[Eric Pouech]

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

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

diff --git a/dlls/virtdisk/Makefile.in b/dlls/virtdisk/Makefile.in
index 0b224bd459b..949065907fc 100644
--- a/dlls/virtdisk/Makefile.in
+++ b/dlls/virtdisk/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = virtdisk.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c
index c4d13241698..bad01a31f46 100644
--- a/dlls/virtdisk/virtdisk_main.c
+++ b/dlls/virtdisk/virtdisk_main.c
@@ -30,7 +30,7 @@ DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_
 {
     ULONG temp_size = sizeof(STORAGE_DEPENDENCY_INFO);
 
-    FIXME("(%p, 0x%x, %u, %p, %p): stub\n", obj, flags, size, info, used);
+    FIXME("(%p, 0x%x, %lu, %p, %p): stub\n", obj, flags, size, info, used);
 
     if (used) *used = temp_size;
 
@@ -61,6 +61,6 @@ DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRT
 
 DWORD WINAPI DetachVirtualDisk(HANDLE handle, DETACH_VIRTUAL_DISK_FLAG flags, ULONG specific_flags)
 {
-    FIXME("(%p, 0x%x, %d): stub\n", handle, flags, specific_flags);
+    FIXME("(%p, 0x%x, %ld): stub\n", handle, flags, specific_flags);
     return ERROR_INVALID_PARAMETER;
 }

[PATCH 14/25] dlls/vmm.vxd: enable compilation with long types

[Eric Pouech]

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

---
 dlls/vmm.vxd/Makefile.in |    1 -
 dlls/vmm.vxd/vmm.c       |   20 ++++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dlls/vmm.vxd/Makefile.in b/dlls/vmm.vxd/Makefile.in
index 9d4818c1926..28a5302f532 100644
--- a/dlls/vmm.vxd/Makefile.in
+++ b/dlls/vmm.vxd/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vmm.vxd
 
 C_SRCS = \
diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c
index 373e826efe8..699f1444206 100644
--- a/dlls/vmm.vxd/vmm.c
+++ b/dlls/vmm.vxd/vmm.c
@@ -144,7 +144,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
         ULONG npages = stack32_pop( context );
         ULONG flags  = stack32_pop( context );
 
-        TRACE("PageReserve: page: %08x, npages: %08x, flags: %08x partial stub!\n",
+        TRACE("PageReserve: page: %08lx, npages: %08lx, flags: %08lx partial stub!\n",
               page, npages, flags );
 
         if ( page == PR_SYSTEM ) {
@@ -175,8 +175,8 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
         ULONG pagerdata   = stack32_pop( context );
         ULONG flags  = stack32_pop( context );
 
-        TRACE("PageCommit: page: %08x, npages: %08x, hpd: %08x pagerdata: "
-              "%08x, flags: %08x partial stub\n",
+        TRACE("PageCommit: page: %08lx, npages: %08lx, hpd: %08lx pagerdata: "
+              "%08lx, flags: %08lx partial stub\n",
               page, npages, hpd, pagerdata, flags );
 
         if ( flags & PC_USER )
@@ -202,7 +202,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
         ULONG npages = stack32_pop( context );
         ULONG flags = stack32_pop( context );
 
-        TRACE("PageDecommit: page: %08x, npages: %08x, flags: %08x partial stub\n",
+        TRACE("PageDecommit: page: %08lx, npages: %08lx, flags: %08lx partial stub\n",
               page, npages, flags );
         address = (LPVOID )( page * page_size );
         ret = VirtualFree ( address, npages * page_size, MEM_DECOMMIT );
@@ -223,7 +223,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
         ULONG permand = stack32_pop ( context );
         ULONG permor = stack32_pop ( context );
 
-        TRACE("PageModifyPermissions %08x %08x %08x %08x partial stub\n",
+        TRACE("PageModifyPermissions %08lx %08lx %08lx %08lx partial stub\n",
               page, npages, permand, permor );
         address = (LPVOID )( page * page_size );
 
@@ -264,7 +264,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
           ERR("Can't change page permissions for %p\n", address );
           return 0xffffffff;
         }
-        TRACE("Returning: %08x\n", pg_old_perm );
+        TRACE("Returning: %08lx\n", pg_old_perm );
         return pg_old_perm;
     }
 
@@ -274,7 +274,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
         LPVOID hmem = (LPVOID) stack32_pop( context );
         DWORD flags = stack32_pop( context );
 
-        TRACE("PageFree: hmem: %p, flags: %08x partial stub\n",
+        TRACE("PageFree: hmem: %p, flags: %08lx partial stub\n",
               hmem, flags );
 
         ret = VirtualFree ( hmem, 0, MEM_RELEASE );
@@ -413,7 +413,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
           * implementation of this.
           */
 
-         FIXME("GetDemandPageInfo(%08x %08x): stub!\n", dinfo, flags);
+         FIXME("GetDemandPageInfo(%08lx %08lx): stub!\n", dinfo, flags);
 
          return 0;
     }
@@ -462,10 +462,10 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
 
     default:
         if (LOWORD(service) < N_VMM_SERVICE)
-            FIXME( "Unimplemented service %s (%08x)\n",
+            FIXME( "Unimplemented service %s (%08lx)\n",
                    VMM_Service_Name[LOWORD(service)], service);
         else
-            FIXME( "Unknown service %08x\n", service);
+            FIXME( "Unknown service %08lx\n", service);
         return 0xffffffff;  /* FIXME */
     }
 }

[PATCH 15/25] dlls/vnbt.vxd: enable compilation with long types

[Eric Pouech]

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

---
 dlls/vnbt.vxd/Makefile.in |    1 -
 dlls/vnbt.vxd/vnbt.c      |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/vnbt.vxd/Makefile.in b/dlls/vnbt.vxd/Makefile.in
index 61d0c786c36..8fc6b3e4a73 100644
--- a/dlls/vnbt.vxd/Makefile.in
+++ b/dlls/vnbt.vxd/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vnbt.vxd
 IMPORTS   = iphlpapi ws2_32
 
diff --git a/dlls/vnbt.vxd/vnbt.c b/dlls/vnbt.vxd/vnbt.c
index fd1dbdcbe6a..ea9b48f7f06 100644
--- a/dlls/vnbt.vxd/vnbt.c
+++ b/dlls/vnbt.vxd/vnbt.c
@@ -149,7 +149,7 @@ BOOL WINAPI VNBT_DeviceIoControl(DWORD dwIoControlCode,
          * to unimplemented...
          */
     default:
-        FIXME( "Unimplemented control %d for VxD device VNB\n",
+        FIXME( "Unimplemented control %ld for VxD device VNB\n",
                dwIoControlCode );
         error = ERROR_NOT_SUPPORTED;
         break;

[PATCH 16/25] dlls/vnetbios.vxd: enable compilation with long types

[Eric Pouech]

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

---
 dlls/vnetbios.vxd/Makefile.in |    1 -
 dlls/vnetbios.vxd/vnetbios.c  |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/vnetbios.vxd/Makefile.in b/dlls/vnetbios.vxd/Makefile.in
index d1f77cb78e8..8e8cb60481c 100644
--- a/dlls/vnetbios.vxd/Makefile.in
+++ b/dlls/vnetbios.vxd/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vnetbios.vxd
 IMPORTS   = netapi32
 
diff --git a/dlls/vnetbios.vxd/vnetbios.c b/dlls/vnetbios.vxd/vnetbios.c
index 3bbd0f9d809..c3adf615395 100644
--- a/dlls/vnetbios.vxd/vnetbios.c
+++ b/dlls/vnetbios.vxd/vnetbios.c
@@ -39,7 +39,7 @@ BOOL WINAPI VNETBIOS_DeviceIoControl( DWORD code, LPVOID lpvInBuffer, DWORD cbIn
         Netbios(lpvInBuffer);
         return TRUE;
     default:
-        FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n",
+        FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
               code, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,
               lpcbBytesReturned, lpOverlapped);
         return FALSE;

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

[Eric Pouech]

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

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

diff --git a/dlls/vssapi/Makefile.in b/dlls/vssapi/Makefile.in
index 0df40af2830..867a56287a5 100644
--- a/dlls/vssapi/Makefile.in
+++ b/dlls/vssapi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vssapi.dll
 
 C_SRCS = \
diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c
index ce06ca23929..c6abead7850 100644
--- a/dlls/vssapi/main.c
+++ b/dlls/vssapi/main.c
@@ -61,7 +61,7 @@ HRESULT __thiscall VSSAPI_CVssWriter_Initialize( struct CVssWriter *writer, VSS_
     VSS_APPLICATION_LEVEL level, DWORD timeout, VSS_ALTERNATE_WRITER_STATE alt_writer_state,
     BOOL throttle, LPCWSTR instance )
 {
-    FIXME( "%p, %s, %s, %u, %u, %u, %u, %u, %d, %s\n", writer, debugstr_guid(&id),
+    FIXME( "%p, %s, %s, %u, %u, %u, %lu, %u, %d, %s\n", writer, debugstr_guid(&id),
            debugstr_w(name), usage_type, source_type, level, timeout, alt_writer_state,
            throttle, debugstr_w(instance) );
     return S_OK;
@@ -73,7 +73,7 @@ HRESULT __thiscall VSSAPI_CVssWriter_Initialize( struct CVssWriter *writer, VSS_
 DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Subscribe, 8 )
 HRESULT __thiscall VSSAPI_CVssWriter_Subscribe( struct CVssWriter *writer, DWORD flags )
 {
-    FIXME( "%p, %x\n", writer, flags );
+    FIXME( "%p, %lx\n", writer, flags );
     return S_OK;
 }

[PATCH 18/25] dlls/vtdapi.vxd: enable compilation with long types

[Eric Pouech]

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

---
 dlls/vtdapi.vxd/Makefile.in |    1 -
 dlls/vtdapi.vxd/vtdapi.c    |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/vtdapi.vxd/Makefile.in b/dlls/vtdapi.vxd/Makefile.in
index 043b4f7d2e3..685495e70e9 100644
--- a/dlls/vtdapi.vxd/Makefile.in
+++ b/dlls/vtdapi.vxd/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vtdapi.vxd
 
 C_SRCS = \
diff --git a/dlls/vtdapi.vxd/vtdapi.c b/dlls/vtdapi.vxd/vtdapi.c
index 7abc00a83f5..43e75f5ce17 100644
--- a/dlls/vtdapi.vxd/vtdapi.c
+++ b/dlls/vtdapi.vxd/vtdapi.c
@@ -42,7 +42,7 @@ BOOL WINAPI VTDAPI_DeviceIoControl( DWORD code, LPVOID lpvInBuffer, DWORD cbInBu
         return TRUE;
 
     default:
-        FIXME( "Control %d not implemented\n", code);
+        FIXME( "Control %ld not implemented\n", code);
         return FALSE;
     }
 }

[PATCH 19/25] dlls/vwin32.vxd: enable compilation with long types

[Eric Pouech]

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

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

diff --git a/dlls/vwin32.vxd/Makefile.in b/dlls/vwin32.vxd/Makefile.in
index 81282166549..6157900448c 100644
--- a/dlls/vwin32.vxd/Makefile.in
+++ b/dlls/vwin32.vxd/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = vwin32.vxd
 IMPORTS   = kernel
 
diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c
index 5a33f2ba665..63c440fdbe4 100644
--- a/dlls/vwin32.vxd/vwin32.c
+++ b/dlls/vwin32.vxd/vwin32.c
@@ -123,8 +123,8 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode,
             BYTE intnum = 0;
 
             TRACE( "Control '%s': "
-                   "eax=0x%08x, ebx=0x%08x, ecx=0x%08x, "
-                   "edx=0x%08x, esi=0x%08x, edi=0x%08x\n",
+                   "eax=0x%08lx, ebx=0x%08lx, ecx=0x%08lx, "
+                   "edx=0x%08lx, esi=0x%08lx, edi=0x%08lx\n",
                    (dwIoControlCode == VWIN32_DIOC_DOS_IOCTL)? "VWIN32_DIOC_DOS_IOCTL" :
                    (dwIoControlCode == VWIN32_DIOC_DOS_INT25)? "VWIN32_DIOC_DOS_INT25" :
                    (dwIoControlCode == VWIN32_DIOC_DOS_INT26)? "VWIN32_DIOC_DOS_INT26" :
@@ -165,7 +165,7 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode,
         return FALSE;
 
     default:
-        FIXME( "Unknown Control %d\n", dwIoControlCode);
+        FIXME( "Unknown Control %ld\n", dwIoControlCode);
         return FALSE;
     }
 }
@@ -191,7 +191,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT *context )
         {
             DWORD parm = stack32_pop(context);
 
-            FIXME("Get VMCPD Version(%08x): partial stub!\n", parm);
+            FIXME("Get VMCPD Version(%08lx): partial stub!\n", parm);
 
             /* FIXME: This is what Win98 returns, it may
              *        not be correct in all situations.
@@ -204,7 +204,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT *context )
             DWORD callnum = stack32_pop(context);
             DWORD parm    = stack32_pop(context);
 
-            TRACE("Int31/DPMI dispatch(%08x)\n", callnum);
+            TRACE("Int31/DPMI dispatch(%08lx)\n", callnum);
 
             context->Eax = callnum;
             context->Ecx = parm;
@@ -217,7 +217,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT *context )
             return callnum; /* FIXME: should really call INT_Int41Handler() */
         }
     default:
-        FIXME("Unknown service %08x\n", service);
+        FIXME("Unknown service %08lx\n", service);
         return 0xffffffff;
     }
 }

[PATCH 20/25] dlls/w32sys.dll16: enable compilation with long types

[Eric Pouech]

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

---
 dlls/w32sys.dll16/Makefile.in |    1 -
 dlls/w32sys.dll16/w32sys.c    |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/w32sys.dll16/Makefile.in b/dlls/w32sys.dll16/Makefile.in
index 08c67ad3ad4..73691b2fa5d 100644
--- a/dlls/w32sys.dll16/Makefile.in
+++ b/dlls/w32sys.dll16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = w32sys.dll16
 EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll
 
diff --git a/dlls/w32sys.dll16/w32sys.c b/dlls/w32sys.dll16/w32sys.c
index 43e9344474e..bab0a83604e 100644
--- a/dlls/w32sys.dll16/w32sys.c
+++ b/dlls/w32sys.dll16/w32sys.c
@@ -78,7 +78,7 @@ WORD WINAPI GetPEResourceTable16(
  *           LoadPeResource (W32SYS.11)
  */
 DWORD WINAPI LoadPeResource16(WORD x,SEGPTR y) {
-	FIXME("(0x%04x,0x%08x),stub!\n",x,y);
+	FIXME("(0x%04x,0x%08lx),stub!\n",x,y);
 	return 0;
 }

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

[Eric Pouech]

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

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

diff --git a/dlls/wer/Makefile.in b/dlls/wer/Makefile.in
index ac3d79bd59d..a422a934bc0 100644
--- a/dlls/wer/Makefile.in
+++ b/dlls/wer/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = wer.dll
 IMPORTLIB = wer
 IMPORTS   = advapi32
diff --git a/dlls/wer/main.c b/dlls/wer/main.c
index e54e6d6e0c9..44c6718f310 100644
--- a/dlls/wer/main.c
+++ b/dlls/wer/main.c
@@ -155,7 +155,7 @@ HRESULT WINAPI WerReportAddDump(HREPORT hReportHandle, HANDLE hProcess, HANDLE h
                                 WER_DUMP_TYPE dumpType, PWER_EXCEPTION_INFORMATION pExceptionParam,
                                 PWER_DUMP_CUSTOM_OPTIONS pDumpCustomOptions, DWORD dwFlags)
 {
-    FIXME("(%p, %p, %p, %d, %p, %p, %u) :stub\n", hReportHandle, hProcess, hThread, dumpType,
+    FIXME("(%p, %p, %p, %d, %p, %p, %lu) :stub\n", hReportHandle, hProcess, hThread, dumpType,
           pExceptionParam, pDumpCustomOptions, dwFlags);
 
     return E_NOTIMPL;
@@ -179,7 +179,7 @@ HRESULT WINAPI WerReportAddDump(HREPORT hReportHandle, HANDLE hProcess, HANDLE h
  */
 HRESULT WINAPI WerReportAddFile(HREPORT hreport, PCWSTR path, WER_FILE_TYPE type, DWORD flags)
 {
-    FIXME("(%p, %s, %d, 0x%x) :stub\n", hreport, debugstr_w(path), type, flags);
+    FIXME("(%p, %s, %d, 0x%lx) :stub\n", hreport, debugstr_w(path), type, flags);
 
     return S_OK;
 }
@@ -299,7 +299,7 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE
  */
 HRESULT WINAPI WerReportSetParameter(HREPORT hreport, DWORD id, PCWSTR name, PCWSTR value)
 {
-    FIXME("(%p, %d, %s, %s) :stub\n", hreport, id, debugstr_w(name), debugstr_w(value));
+    FIXME("(%p, %ld, %s, %s) :stub\n", hreport, id, debugstr_w(name), debugstr_w(value));
 
     return S_OK;
 }
@@ -323,7 +323,7 @@ HRESULT WINAPI WerReportSetParameter(HREPORT hreport, DWORD id, PCWSTR name, PCW
  */
 HRESULT WINAPI WerReportSubmit(HREPORT hreport, WER_CONSENT consent, DWORD flags, PWER_SUBMIT_RESULT presult)
 {
-    FIXME("(%p, %d, 0x%x, %p) :stub\n", hreport, consent, flags, presult);
+    FIXME("(%p, %d, 0x%lx, %p) :stub\n", hreport, consent, flags, presult);
 
     if(!presult)
         return E_INVALIDARG;

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

[Eric Pouech]

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

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

diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in
index b99c0527ab6..4b300799051 100644
--- a/dlls/wevtapi/Makefile.in
+++ b/dlls/wevtapi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = wevtapi.dll
 IMPORTLIB = wevtapi
 
diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c
index 3a2fd242284..f0db41ebf88 100644
--- a/dlls/wevtapi/main.c
+++ b/dlls/wevtapi/main.c
@@ -32,13 +32,13 @@ static const WCHAR log_pathW[] = L"C:\\windows\\temp\\evt.log";
 
 EVT_HANDLE WINAPI EvtOpenSession(EVT_LOGIN_CLASS login_class, void *login, DWORD timeout, DWORD flags)
 {
-    FIXME("(%u %p %u %u) stub\n", login_class, login, timeout, flags);
+    FIXME("(%u %p %lu %lu) stub\n", login_class, login, timeout, flags);
     return NULL;
 }
 
 EVT_HANDLE WINAPI EvtOpenLog(EVT_HANDLE session, const WCHAR *path, DWORD flags)
 {
-    FIXME("(%p %s %u) stub\n", session, debugstr_w(path), flags);
+    FIXME("(%p %s %lu) stub\n", session, debugstr_w(path), flags);
     return NULL;
 }
 
@@ -49,7 +49,7 @@ BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig,
                                         PEVT_VARIANT PropertyValueBuffer,
                                         DWORD *PropertyValueBufferUsed)
 {
-    FIXME("(%p %i %u %u %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize,
+    FIXME("(%p %i %lu %lu %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize,
           PropertyValueBuffer, PropertyValueBufferUsed);
 
     switch (PropertyId)
@@ -81,7 +81,7 @@ BOOL WINAPI EvtSetChannelConfigProperty(EVT_HANDLE ChannelConfig,
                                         DWORD Flags,
                                         PEVT_VARIANT PropertyValue)
 {
-    FIXME("(%p %i %u %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValue);
+    FIXME("(%p %i %lu %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValue);
     return TRUE;
 }
 
@@ -89,38 +89,38 @@ EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR C
                                LPCWSTR Query, EVT_HANDLE Bookmark, PVOID context,
                                EVT_SUBSCRIBE_CALLBACK Callback, DWORD Flags)
 {
-    FIXME("(%p %p %s %s %p %p %p %u) stub\n", Session, SignalEvent, debugstr_w(ChannelPath),
+    FIXME("(%p %p %s %s %p %p %p %lu) stub\n", Session, SignalEvent, debugstr_w(ChannelPath),
           debugstr_w(Query), Bookmark, context, Callback, Flags);
     return NULL;
 }
 
 EVT_HANDLE WINAPI EvtOpenChannelEnum(EVT_HANDLE session, DWORD flags)
 {
-    FIXME("(%p %u) stub\n", session, flags);
+    FIXME("(%p %lu) stub\n", session, flags);
     return NULL;
 }
 
 BOOL WINAPI EvtNextChannelPath(EVT_HANDLE channel_enum, DWORD buffer_len, WCHAR *buffer, DWORD *used)
 {
-    FIXME("(%p %u %p %p) stub\n", channel_enum, buffer_len, buffer, used);
+    FIXME("(%p %lu %p %p) stub\n", channel_enum, buffer_len, buffer, used);
     return FALSE;
 }
 
 EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags)
 {
-    FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags);
+    FIXME("(%p %s %lu) stub\n", Session, debugstr_w(ChannelPath), Flags);
     return (EVT_HANDLE)0xdeadbeef;
 }
 
 EVT_HANDLE WINAPI EvtQuery(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, DWORD flags)
 {
-    FIXME("(%p %s %s %u) stub\n", session, debugstr_w(path), debugstr_w(query), flags);
+    FIXME("(%p %s %s %lu) stub\n", session, debugstr_w(path), debugstr_w(query), flags);
     return NULL;
 }
 
 BOOL WINAPI EvtSaveChannelConfig(EVT_HANDLE channel, DWORD flags)
 {
-    FIXME("(%p,%08x) stub\n", channel, flags);
+    FIXME("(%p,%08lx) stub\n", channel, flags);
     return TRUE;
 }
 
@@ -132,14 +132,14 @@ BOOL WINAPI EvtClose(EVT_HANDLE handle)
 
 BOOL WINAPI EvtNext(EVT_HANDLE result_set, DWORD size, EVT_HANDLE *array, DWORD timeout, DWORD flags, DWORD *ret_count)
 {
-    FIXME("(%p %u %p %u %#x %p) stub!\n", result_set, size, array, timeout, flags, ret_count);
+    FIXME("(%p %lu %p %lu %#lx %p) stub!\n", result_set, size, array, timeout, flags, ret_count);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }
 
 BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags)
 {
-    FIXME("(%p %s %s %s %#x) stub!\n", session, debugstr_w(path), debugstr_w(query), debugstr_w(file), flags);
+    FIXME("(%p %s %s %s %#lx) stub!\n", session, debugstr_w(path), debugstr_w(query), debugstr_w(file), flags);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }

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

[Eric Pouech]

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

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

diff --git a/dlls/wevtsvc/Makefile.in b/dlls/wevtsvc/Makefile.in
index 6480c4ecdbf..729089463f9 100644
--- a/dlls/wevtsvc/Makefile.in
+++ b/dlls/wevtsvc/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = wevtsvc.dll
 IMPORTS   = rpcrt4 advapi32
 
diff --git a/dlls/wevtsvc/wevtsvc.c b/dlls/wevtsvc/wevtsvc.c
index 14c30791ff6..2e303045740 100644
--- a/dlls/wevtsvc/wevtsvc.c
+++ b/dlls/wevtsvc/wevtsvc.c
@@ -48,7 +48,7 @@ static void eventlog_update_status(DWORD state)
 
 static void WINAPI eventlog_handler(DWORD control)
 {
-    TRACE("%#x\n", control);
+    TRACE("%#lx\n", control);
 
     switch (control)
     {
@@ -71,7 +71,7 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv)
     svc_handle = RegisterServiceCtrlHandlerW(L"EventLog", eventlog_handler);
     if (!svc_handle)
     {
-        ERR("RegisterServiceCtrlHandler error %u\n", GetLastError());
+        ERR("RegisterServiceCtrlHandler error %lu\n", GetLastError());
         return;
     }

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

[Eric Pouech]

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

---
 dlls/ctapi32/Makefile.in |    1 -
 dlls/ctapi32/ctapi32.c   |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/ctapi32/Makefile.in b/dlls/ctapi32/Makefile.in
index 69e8728873b..fa13d24540c 100644
--- a/dlls/ctapi32/Makefile.in
+++ b/dlls/ctapi32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = ctapi32.dll
 UNIXLIB   = ctapi32.so
 IMPORTS   = advapi32
diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c
index 5d5060ace47..0f0ee399e1c 100644
--- a/dlls/ctapi32/ctapi32.c
+++ b/dlls/ctapi32/ctapi32.c
@@ -98,7 +98,7 @@ IS8 WINAPI CT_close(IU16 ctn)
  */
 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason)
     {

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

[Eric Pouech]

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

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

diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in
index 8fac9224923..2d3d98f69d0 100644
--- a/dlls/nsi/Makefile.in
+++ b/dlls/nsi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = nsi.dll
 IMPORTLIB = nsi
 
diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c
index 08aec49257a..efb10c0f615 100644
--- a/dlls/nsi/nsi.c
+++ b/dlls/nsi/nsi.c
@@ -44,7 +44,7 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR
     DWORD sizes[4] = { key_size, rw_size, dynamic_size, static_size };
     int i, attempt;
 
-    TRACE( "%d %p %d %p %d %p %d %p %d %p %d %p %d\n", unk, module, table, key_data, key_size,
+    TRACE( "%ld %p %ld %p %ld %p %ld %p %ld %p %ld %p %ld\n", unk, module, table, key_data, key_size,
            rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 );
 
     for (attempt = 0; attempt < 5; attempt++)
@@ -95,7 +95,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_
     struct nsi_enumerate_all_ex params;
     DWORD err;
 
-    TRACE( "%d %d %p %d %p %d %p %d %p %d %p %d %p\n", unk, unk2, module, table, key_data, key_size,
+    TRACE( "%ld %ld %p %ld %p %ld %p %ld %p %ld %p %ld %p\n", unk, unk2, module, table, key_data, key_size,
            rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count );
 
     params.unknown[0] = 0;
@@ -184,7 +184,7 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t
 {
     struct nsi_get_all_parameters_ex params;
 
-    TRACE( "%d %p %d %p %d %p %d %p %d %p %d\n", unk, module, table, key, key_size,
+    TRACE( "%ld %p %ld %p %ld %p %ld %p %ld %p %ld\n", unk, module, table, key, key_size,
            rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size );
 
     params.unknown[0] = 0;
@@ -257,7 +257,7 @@ DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table
 {
     struct nsi_get_parameter_ex params;
 
-    TRACE( "%d %p %d %p %d %d %p %d %d\n", unk, module, table, key, key_size,
+    TRACE( "%ld %p %ld %p %ld %ld %p %ld %ld\n", unk, module, table, key, key_size,
            param_type, data, data_size, data_offset );
 
     params.unknown[0] = 0;

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

[Huw Davies]

Signed-off-by: Huw Davies <huw(a)codeweavers.com>