[PATCH 00/14] Migration to long types

[Eric Pouech]

The first two patches are not per se migration patches.
The first one adds -Wformat warnings for Wine's stdio APIs (printf & scanf
families), while the second fixes HandleToU?Long to return long.

The rest of the patches fixes int/long mismatch across some modules.

A+
---

Eric Pouech (14):
      include/msvcrt: add attribute((format)) to printf and scanf -like APIs
      include/basestd.h: define HandleToU?Long return a long (as SDK does)
      programs/winedbg: use correct integral type
      dlls/dbgeng: use correct integral type
      dlls/devenum: use correct integral type
      dlls/dsound: use correct integral type
      dlls/dwrite: use correct integral type
      dlls/evr: use correct integral type
      dlls/gdi32: use correct integral type
      dlls/gdiplus: use correct integral type
      dlls/itss: use correct integral type
      dlls/joy.cpl: use correct integral type
      dlls/msxml3: use correct integral type
      dlls/ntdll: use correct integral type


 dlls/compobj.dll16/compobj.c   |  2 +-
 dlls/crypt32/sip.c             |  2 +-
 dlls/dbgeng/dbgeng.c           |  5 +-
 dlls/devenum/mediacatenum.c    |  3 +-
 dlls/dsound/mixer.c            |  3 +-
 dlls/dwrite/font.c             |  2 +-
 dlls/dwrite/main.c             |  3 +-
 dlls/dwrite/opentype.c         |  5 +-
 dlls/dwrite/shape.c            |  4 +-
 dlls/evr/mixer.c               |  5 +-
 dlls/evr/presenter.c           |  8 +--
 dlls/gdi32/dc.c                |  8 +--
 dlls/gdiplus/image.c           | 21 ++++----
 dlls/iphlpapi/iphlpapi_main.c  |  2 +-
 dlls/iphlpapi/tests/iphlpapi.c |  4 +-
 dlls/itss/chm_lib.c            |  6 +--
 dlls/joy.cpl/main.c            |  2 +-
 dlls/msdmo/tests/msdmo.c       |  2 +-
 dlls/mshtml/main.c             |  2 +-
 dlls/msxml3/httprequest.c      |  2 +-
 dlls/msxml3/mxwriter.c         |  2 +-
 dlls/ntdll/actctx.c            |  2 +-
 dlls/ntdll/loader.c            |  8 +--
 dlls/ntdll/sync.c              | 12 ++---
 dlls/oleaut32/oleaut.c         |  2 +-
 dlls/oleaut32/typelib.c        |  2 +-
 dlls/rpcrt4/rpcrt4_main.c      |  4 +-
 dlls/shell32/classes.c         |  2 +-
 dlls/shell32/debughlp.c        |  2 +-
 dlls/shell32/shfldr.h          |  2 +-
 dlls/shlwapi/ordinal.c         |  2 +-
 dlls/typelib.dll16/typelib.c   |  2 +-
 dlls/webservices/writer.c      |  4 +-
 include/basetsd.h              | 24 +++++++--
 include/msvcrt/corecrt.h       |  8 +++
 include/msvcrt/crtdbg.h        |  2 +-
 include/msvcrt/stdio.h         | 90 ++++++++++++++++++++++------------
 programs/winedbg/debugger.h    |  2 +-
 programs/winetest/main.c       |  2 +-
 39 files changed, 164 insertions(+), 101 deletions(-)

[PATCH 01/14] include/msvcrt: add attribute((format)) to printf and scanf -like APIs

[Eric Pouech]

fix a bunch of warnings generated by this patch and the migration of
GUID.Data1 to long in ae2693e2c4079edcc719c08abed5ad58ba7aace7

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

---
 dlls/compobj.dll16/compobj.c   |    2 -
 dlls/crypt32/sip.c             |    2 -
 dlls/iphlpapi/iphlpapi_main.c  |    2 -
 dlls/iphlpapi/tests/iphlpapi.c |    4 +-
 dlls/msdmo/tests/msdmo.c       |    2 -
 dlls/mshtml/main.c             |    2 -
 dlls/oleaut32/oleaut.c         |    2 -
 dlls/oleaut32/typelib.c        |    2 -
 dlls/rpcrt4/rpcrt4_main.c      |    4 +-
 dlls/shell32/classes.c         |    2 -
 dlls/shell32/debughlp.c        |    2 -
 dlls/shell32/shfldr.h          |    2 -
 dlls/shlwapi/ordinal.c         |    2 -
 dlls/typelib.dll16/typelib.c   |    2 -
 dlls/webservices/writer.c      |    4 +-
 include/msvcrt/corecrt.h       |    8 ++++
 include/msvcrt/crtdbg.h        |    2 -
 include/msvcrt/stdio.h         |   90 +++++++++++++++++++++++++++-------------
 programs/winetest/main.c       |    2 -
 19 files changed, 88 insertions(+), 50 deletions(-)

diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c
index a634ebe6374..831d62d25ee 100644
--- a/dlls/compobj.dll16/compobj.c
+++ b/dlls/compobj.dll16/compobj.c
@@ -657,7 +657,7 @@ HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid)
  */
 INT16 WINAPI StringFromGUID216(REFGUID id, char *str, INT16 cmax)
 {
-    static const char format[] = "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}";
+    static const char format[] = "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}";
     if (!id || cmax < CHARS_IN_GUID) return 0;
     sprintf( str, format, id->Data1, id->Data2, id->Data3,
              id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],
diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c
index 3642e94e799..82eb87c16bf 100644
--- a/dlls/crypt32/sip.c
+++ b/dlls/crypt32/sip.c
@@ -40,7 +40,7 @@ static void CRYPT_guid2wstr( const GUID *guid, LPWSTR wstr )
 {
     char str[40];
 
-    sprintf(str, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+    sprintf(str, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
            guid->Data1, guid->Data2, guid->Data3,
            guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
            guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] );
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 387589cc03d..f96a5dc5fd1 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -59,7 +59,7 @@ static const NPI_MODULEID *ip_module_id( USHORT family )
 DWORD WINAPI ConvertGuidToStringA( const GUID *guid, char *str, DWORD len )
 {
     if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER;
-    sprintf( str, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+    sprintf( str, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
              guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2],
              guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] );
     return ERROR_SUCCESS;
diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index c725730c063..be50cc0b476 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -1409,7 +1409,7 @@ static void testGetAdaptersInfo(void)
         GetIfEntry( &row );
         ConvertInterfaceIndexToLuid( ptr->Index, &luid );
         ConvertInterfaceLuidToGuid( &luid, &guid );
-        sprintf( name, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+        sprintf( name, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
                  guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1],
                  guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5],
                  guid.Data4[6], guid.Data4[7] );
@@ -1671,7 +1671,7 @@ static void test_GetAdaptersAddresses(void)
 
         status = ConvertInterfaceLuidToGuid(&aa->Luid, &guid);
         ok(!status, "got %u\n", status);
-        sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+        sprintf(buf, "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
                 guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1],
                 guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5],
                 guid.Data4[6], guid.Data4[7]);
diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c
index 41e6d57d2eb..9b261d369fc 100644
--- a/dlls/msdmo/tests/msdmo.c
+++ b/dlls/msdmo/tests/msdmo.c
@@ -31,7 +31,7 @@ static const GUID GUID_wmp1 = {0x13a7995e,0x7d8f,0x45b4,{0x9c,0x77,0x81,0x92,0x6
 static const char *guid_to_string(const GUID *guid)
 {
     static char buffer[50];
-    sprintf(buffer, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+    sprintf(buffer, "%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
             guid->Data1, guid->Data2, guid->Data3,
             guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
             guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);
diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index 959d2d66214..f2a255d265a 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -627,7 +627,7 @@ static HRESULT register_server(BOOL do_register)
 
     for(i=0; i < ARRAY_SIZE(pse); i++) {
         pse[i].pszValue = heap_alloc(39);
-        sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+        sprintf(pse[i].pszValue, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
                 clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0],
                 clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4],
                 clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]);
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index 043face3459..c29e64a4091 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -832,7 +832,7 @@ static HRESULT reg_get_typelib_module(REFIID iid, WCHAR *module, DWORD len)
     BOOL is_wow64;
     HKEY ikey;
 
-    sprintf( interfacekey, "Interface\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\Typelib",
+    sprintf( interfacekey, "Interface\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\Typelib",
         iid->Data1, iid->Data2, iid->Data3,
         iid->Data4[0], iid->Data4[1], iid->Data4[2], iid->Data4[3],
         iid->Data4[4], iid->Data4[5], iid->Data4[6], iid->Data4[7]
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 97b6786feff..7dcc8d815a3 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -3660,7 +3660,7 @@ static BOOL TLB_GUIDFromString(const char *str, GUID *guid)
   int i;
   short s;
 
-  if(sscanf(str, "%x-%hx-%hx-%hx", &guid->Data1, &guid->Data2, &guid->Data3, &s) != 4) {
+  if(sscanf(str, "%lx-%hx-%hx-%hx", &guid->Data1, &guid->Data2, &guid->Data3, &s) != 4) {
     FIXME("Can't parse guid %s\n", debugstr_guid(guid));
     return FALSE;
   }
diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index d5ba8c82c05..a1848ef28e5 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -543,7 +543,7 @@ RPC_STATUS WINAPI UuidToStringA(UUID *Uuid, RPC_CSTR* StringUuid)
 
   if (!Uuid) Uuid = &uuid_nil;
 
-  sprintf( (char*)*StringUuid, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+  sprintf( (char*)*StringUuid, "%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                  Uuid->Data1, Uuid->Data2, Uuid->Data3,
                  Uuid->Data4[0], Uuid->Data4[1], Uuid->Data4[2],
                  Uuid->Data4[3], Uuid->Data4[4], Uuid->Data4[5],
@@ -566,7 +566,7 @@ RPC_STATUS WINAPI UuidToStringW(UUID *Uuid, RPC_WSTR* StringUuid)
 
   if (!Uuid) Uuid = &uuid_nil;
 
-  sprintf(buf, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+  sprintf(buf, "%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                Uuid->Data1, Uuid->Data2, Uuid->Data3,
                Uuid->Data4[0], Uuid->Data4[1], Uuid->Data4[2],
                Uuid->Data4[3], Uuid->Data4[4], Uuid->Data4[5],
diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c
index 84784733853..10870b70ab9 100644
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -200,7 +200,7 @@ BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LP
 static BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey)
 {
 	char	xriid[50];
-    sprintf( xriid, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+    sprintf( xriid, "CLSID\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
                  riid->Data1, riid->Data2, riid->Data3,
                  riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3],
                  riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] );
diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c
index a7ae616923a..c988bab481b 100644
--- a/dlls/shell32/debughlp.c
+++ b/dlls/shell32/debughlp.c
@@ -247,7 +247,7 @@ void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize)
 	else if (( riid = _dbg_ILGetGUIDPointer(pidl) ))
 	{
 	  if (szOut)
-            sprintf( szOut, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+            sprintf( szOut, "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
                  riid->Data1, riid->Data2, riid->Data3,
                  riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3],
                  riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] );
diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h
index e176d82de2f..163bf0517d3 100644
--- a/dlls/shell32/shfldr.h
+++ b/dlls/shell32/shfldr.h
@@ -61,7 +61,7 @@ BOOL trash_file( const WCHAR *path ) DECLSPEC_HIDDEN;
 
 static inline int SHELL32_GUIDToStringA (REFGUID guid, LPSTR str)
 {
-    return sprintf(str, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+    return sprintf(str, "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
             guid->Data1, guid->Data2, guid->Data3,
             guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
             guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index bdd9da0c67b..e35ecd77644 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -461,7 +461,7 @@ INT WINAPI SHStringFromGUIDA(REFGUID guid, LPSTR lpszDest, INT cchMax)
 
   TRACE("(%s,%p,%d)\n", debugstr_guid(guid), lpszDest, cchMax);
 
-  sprintf(xguid, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+  sprintf(xguid, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
           guid->Data1, guid->Data2, guid->Data3,
           guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
           guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);
diff --git a/dlls/typelib.dll16/typelib.c b/dlls/typelib.dll16/typelib.c
index 50354a51de2..4787010354c 100644
--- a/dlls/typelib.dll16/typelib.c
+++ b/dlls/typelib.dll16/typelib.c
@@ -82,7 +82,7 @@ QueryPathOfRegTypeLib16(
 	TRACE("\n");
 
 	if (HIWORD(guid)) {
-            sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16",
+            sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16",
                      guid->Data1, guid->Data2, guid->Data3,
                      guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
                      guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7],
diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c
index c9e443b0e80..044351f6094 100644
--- a/dlls/webservices/writer.c
+++ b/dlls/webservices/writer.c
@@ -1041,7 +1041,7 @@ static ULONG format_datetime( const WS_DATETIME *ptr, unsigned char *buf )
 
 static ULONG format_guid( const GUID *ptr, unsigned char *buf )
 {
-    static const char fmt[] = "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x";
+    static const char fmt[] = "%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x";
     return sprintf( (char *)buf, fmt, ptr->Data1, ptr->Data2, ptr->Data3,
                     ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], ptr->Data4[3],
                     ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] );
@@ -1049,7 +1049,7 @@ static ULONG format_guid( const GUID *ptr, unsigned char *buf )
 
 static ULONG format_urn( const GUID *ptr, unsigned char *buf )
 {
-    static const char fmt[] = "urn:uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x";
+    static const char fmt[] = "urn:uuid:%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x";
     return sprintf( (char *)buf, fmt, ptr->Data1, ptr->Data2, ptr->Data3,
                     ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], ptr->Data4[3],
                     ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] );
diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
index e61a22dccd7..aba9bc9422e 100644
--- a/include/msvcrt/corecrt.h
+++ b/include/msvcrt/corecrt.h
@@ -334,4 +334,12 @@ typedef struct threadlocaleinfostruct {
 #define _THREADLOCALEINFO
 #endif
 
+#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__)
+#define __WINE_CRT_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args)))
+#define __WINE_CRT_SCANF_ATTR(fmt,args)  __attribute__((format (scanf,fmt,args)))
+#else
+#define __WINE_CRT_PRINTF_ATTR(fmt,args)
+#define __WINE_CRT_SCANF_ATTR(fmt,args)
+#endif
+
 #endif /* __WINE_CORECRT_H */
diff --git a/include/msvcrt/crtdbg.h b/include/msvcrt/crtdbg.h
index dc56eb883f5..a8cf739cc53 100644
--- a/include/msvcrt/crtdbg.h
+++ b/include/msvcrt/crtdbg.h
@@ -88,7 +88,7 @@ extern int _crtDbgFlag;
 
 _ACRTIMP int   __cdecl _CrtCheckMemory(void);
 _ACRTIMP int   WINAPIV _CrtDbgReport(int reportType, const char *filename, int linenumber,
-                                     const char *moduleName, const char *format, ...);
+                                     const char *moduleName, const char *format, ...) __WINE_CRT_PRINTF_ATTR(5, 6);
 _ACRTIMP int   __cdecl _CrtDumpMemoryLeaks(void);
 _ACRTIMP int   __cdecl _CrtSetBreakAlloc(int);
 _ACRTIMP int   __cdecl _CrtSetDbgFlag(int);
diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index daefcd03a74..e53929b94bc 100644
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -161,6 +161,7 @@ _ACRTIMP int __cdecl __stdio_common_vsscanf(unsigned __int64,char const*,size_t,
 
 #if defined(_UCRT) && !defined(_NO_CRT_STDIO_INLINE)
 
+static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(3, 0);
 static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, va_list args)
 {
     int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,
@@ -168,6 +169,7 @@ static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *forma
     return ret < 0 ? -1 : ret;
 }
 
+static inline int __cdecl _vsnprintf(char *buffer, size_t size, const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(3, 0);
 static inline int __cdecl _vsnprintf(char *buffer, size_t size, const char *format, va_list args)
 {
     int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION,
@@ -175,12 +177,14 @@ static inline int __cdecl _vsnprintf(char *buffer, size_t size, const char *form
     return ret < 0 ? -1 : ret;
 }
 
+static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(4, 0);
 static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, const char *format, va_list args)
 {
     int ret = __stdio_common_vsnprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args);
     return ret < 0 ? -1 : ret;
 }
 
+static inline int WINAPIV _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) __WINE_CRT_PRINTF_ATTR(4, 5);
 static inline int WINAPIV _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...)
 {
     int ret;
@@ -192,6 +196,7 @@ static inline int WINAPIV _snprintf_s(char *buffer, size_t size, size_t count, c
     return ret;
 }
 
+static inline int __cdecl _vscprintf(const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(1, 0);
 static inline int __cdecl _vscprintf(const char *format, va_list args)
 {
     int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,
@@ -199,6 +204,7 @@ static inline int __cdecl _vscprintf(const char *format, va_list args)
     return ret < 0 ? -1 : ret;
 }
 
+static inline int WINAPIV _scprintf(const char *format, ...) __WINE_CRT_PRINTF_ATTR(1, 2);
 static inline int WINAPIV _scprintf(const char *format, ...)
 {
     int ret;
@@ -211,6 +217,7 @@ static inline int WINAPIV _scprintf(const char *format, ...)
     return ret;
 }
 
+static inline int __cdecl vsprintf(char *buffer, const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(2, 0);
 static inline int __cdecl vsprintf(char *buffer, const char *format, va_list args)
 {
     int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION,
@@ -218,12 +225,14 @@ static inline int __cdecl vsprintf(char *buffer, const char *format, va_list arg
     return ret < 0 ? -1 : ret;
 }
 
+static inline int __cdecl vsprintf_s(char *buffer, size_t size, const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(3, 0);
 static inline int __cdecl vsprintf_s(char *buffer, size_t size, const char *format, va_list args)
 {
     int ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args);
     return ret < 0 ? -1 : ret;
 }
 
+static inline int WINAPIV sprintf_s(char *buffer, size_t size, const char *format, ...) __WINE_CRT_PRINTF_ATTR(3, 4);
 static inline int WINAPIV sprintf_s(char *buffer, size_t size, const char *format, ...)
 {
     int ret;
@@ -235,17 +244,20 @@ static inline int WINAPIV sprintf_s(char *buffer, size_t size, const char *forma
     return ret;
 }
 
+static inline int __cdecl _vsprintf_p_l(char *buffer, size_t size, const char *format, _locale_t locale, va_list args) __WINE_CRT_PRINTF_ATTR(3, 0);
 static inline int __cdecl _vsprintf_p_l(char *buffer, size_t size, const char *format, _locale_t locale, va_list args)
 {
     int ret = __stdio_common_vsprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args);
     return ret < 0 ? -1 : ret;
 }
 
+static inline int __cdecl vfprintf(FILE *file, const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(2, 0);
 static inline int __cdecl vfprintf(FILE *file, const char *format, va_list args)
 {
     return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args);
 }
 
+static inline int WINAPIV fprintf(FILE *file, const char *format, ...) __WINE_CRT_PRINTF_ATTR(2, 3);
 static inline int WINAPIV fprintf(FILE *file, const char *format, ...)
 {
     int ret;
@@ -257,11 +269,13 @@ static inline int WINAPIV fprintf(FILE *file, const char *format, ...)
     return ret;
 }
 
+static inline int __cdecl vfprintf_s(FILE *file, const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(2, 0);
 static inline int __cdecl vfprintf_s(FILE *file, const char *format, va_list args)
 {
     return __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args);
 }
 
+static inline int WINAPIV fprintf_s(FILE *file, const char *format, ...) __WINE_CRT_PRINTF_ATTR(2, 3);
 static inline int WINAPIV fprintf_s(FILE *file, const char *format, ...)
 {
     int ret;
@@ -273,11 +287,13 @@ static inline int WINAPIV fprintf_s(FILE *file, const char *format, ...)
     return ret;
 }
 
+static inline int vprintf(const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(1, 0);
 static inline int vprintf(const char *format, va_list args)
 {
     return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args);
 }
 
+static inline int WINAPIV printf(const char *format, ...) __WINE_CRT_PRINTF_ATTR(1, 2);
 static inline int WINAPIV printf(const char *format, ...)
 {
     int ret;
@@ -289,11 +305,13 @@ static inline int WINAPIV printf(const char *format, ...)
     return ret;
 }
 
+static inline int vprintf_s(const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(1, 0);
 static inline int vprintf_s(const char *format, va_list args)
 {
     return __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args);
 }
 
+static inline int WINAPIV printf_s(const char *format, ...) __WINE_CRT_PRINTF_ATTR(1, 2);
 static inline int WINAPIV printf_s(const char *format, ...)
 {
     int ret;
@@ -305,6 +323,7 @@ static inline int WINAPIV printf_s(const char *format, ...)
     return ret;
 }
 
+static inline int WINAPIV sscanf(const char *buffer, const char *format, ...) __WINE_CRT_SCANF_ATTR(2, 3);
 static inline int WINAPIV sscanf(const char *buffer, const char *format, ...)
 {
     int ret;
@@ -316,6 +335,7 @@ static inline int WINAPIV sscanf(const char *buffer, const char *format, ...)
     return ret;
 }
 
+static inline int WINAPIV sscanf_s(const char *buffer, const char *format, ...) __WINE_CRT_SCANF_ATTR(2, 3);
 static inline int WINAPIV sscanf_s(const char *buffer, const char *format, ...)
 {
     int ret;
@@ -327,6 +347,7 @@ static inline int WINAPIV sscanf_s(const char *buffer, const char *format, ...)
     return ret;
 }
 
+static inline int WINAPIV _snscanf_l(const char *buffer, size_t size, const char *format, _locale_t locale, ...) __WINE_CRT_SCANF_ATTR(3, 5);
 static inline int WINAPIV _snscanf_l(const char *buffer, size_t size, const char *format, _locale_t locale, ...)
 {
     int ret;
@@ -338,6 +359,7 @@ static inline int WINAPIV _snscanf_l(const char *buffer, size_t size, const char
     return ret;
 }
 
+static inline int WINAPIV fscanf(FILE *file, const char *format, ...) __WINE_CRT_SCANF_ATTR(2, 3);
 static inline int WINAPIV fscanf(FILE *file, const char *format, ...)
 {
     int ret;
@@ -349,6 +371,7 @@ static inline int WINAPIV fscanf(FILE *file, const char *format, ...)
     return ret;
 }
 
+static inline int WINAPIV fscanf_s(FILE *file, const char *format, ...) __WINE_CRT_SCANF_ATTR(2, 3);
 static inline int WINAPIV fscanf_s(FILE *file, const char *format, ...)
 {
     int ret;
@@ -360,6 +383,7 @@ static inline int WINAPIV fscanf_s(FILE *file, const char *format, ...)
     return ret;
 }
 
+static inline int WINAPIV scanf(const char *format, ...) __WINE_CRT_SCANF_ATTR(1, 2);
 static inline int WINAPIV scanf(const char *format, ...)
 {
     int ret;
@@ -371,6 +395,7 @@ static inline int WINAPIV scanf(const char *format, ...)
     return ret;
 }
 
+static inline int WINAPIV scanf_s(const char *format, ...) __WINE_CRT_SCANF_ATTR(1, 2);
 static inline int WINAPIV scanf_s(const char *format, ...)
 {
     int ret;
@@ -384,33 +409,35 @@ static inline int WINAPIV scanf_s(const char *format, ...)
 
 #else /* _UCRT && !_NO_CRT_STDIO_INLINE */
 
-_ACRTIMP int WINAPIV _scprintf(const char *,...);
-_ACRTIMP int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...);
-_ACRTIMP int __cdecl _vscprintf(const char*,va_list);
-_ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,va_list);
-_ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,va_list);
-_ACRTIMP int WINAPIV fprintf(FILE*,const char*,...);
-_ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...);
-_ACRTIMP int WINAPIV printf(const char*,...);
-_ACRTIMP int WINAPIV printf_s(const char*,...);
-_ACRTIMP int WINAPIV sprintf_s(char*,size_t,const char*,...);
-_ACRTIMP int __cdecl vfprintf(FILE*,const char*,va_list);
-_ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,va_list);
-_ACRTIMP int __cdecl vprintf(const char*,va_list);
-_ACRTIMP int __cdecl vprintf_s(const char*,va_list);
-_ACRTIMP int __cdecl vsprintf(char*,const char*,va_list);
-_ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,va_list);
-
-_ACRTIMP int __cdecl _vsnprintf(char*,size_t,const char*,va_list);
-static inline int vsnprintf(char *buffer, size_t size, const char *format, va_list args) { return _vsnprintf(buffer,size,format,args); }
-
-_ACRTIMP int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...);
-_ACRTIMP int WINAPIV fscanf(FILE*,const char*,...);
-_ACRTIMP int WINAPIV fscanf_s(FILE*,const char*,...);
-_ACRTIMP int WINAPIV scanf(const char*,...);
-_ACRTIMP int WINAPIV scanf_s(const char*,...);
-_ACRTIMP int WINAPIV sscanf(const char*,const char*,...);
-_ACRTIMP int WINAPIV sscanf_s(const char*,const char*,...);
+_ACRTIMP int WINAPIV _scprintf(const char *,...) __WINE_CRT_PRINTF_ATTR(1, 2);
+_ACRTIMP int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...) __WINE_CRT_PRINTF_ATTR(4, 5);
+_ACRTIMP int __cdecl _vscprintf(const char*,va_list) __WINE_CRT_PRINTF_ATTR(1, 0);
+_ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,va_list) __WINE_CRT_PRINTF_ATTR(4, 0);
+_ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,va_list) __WINE_CRT_PRINTF_ATTR(3, 0);
+_ACRTIMP int WINAPIV fprintf(FILE*,const char*,...) __WINE_CRT_PRINTF_ATTR(2, 3);
+_ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...) __WINE_CRT_PRINTF_ATTR(2, 3);
+_ACRTIMP int WINAPIV printf(const char*,...) __WINE_CRT_PRINTF_ATTR(1, 2);
+_ACRTIMP int WINAPIV printf_s(const char*,...) __WINE_CRT_PRINTF_ATTR(1, 2);
+_ACRTIMP int WINAPIV sprintf_s(char*,size_t,const char*,...) __WINE_CRT_PRINTF_ATTR(3, 4);
+_ACRTIMP int __cdecl vfprintf(FILE*,const char*,va_list) __WINE_CRT_PRINTF_ATTR(2, 0);
+_ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,va_list) __WINE_CRT_PRINTF_ATTR(2, 0);
+_ACRTIMP int __cdecl vprintf(const char*,va_list) __WINE_CRT_PRINTF_ATTR(1, 0);
+_ACRTIMP int __cdecl vprintf_s(const char*,va_list) __WINE_CRT_PRINTF_ATTR(1, 0);
+_ACRTIMP int __cdecl vsprintf(char*,const char*,va_list) __WINE_CRT_PRINTF_ATTR(2, 0);
+_ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,va_list) __WINE_CRT_PRINTF_ATTR(3, 0);
+
+_ACRTIMP int __cdecl _vsnprintf(char*,size_t,const char*,va_list) __WINE_CRT_PRINTF_ATTR(3, 0);
+static inline int vsnprintf(char *buffer, size_t size, const char *format, va_list args) __WINE_CRT_PRINTF_ATTR(3, 0);
+static inline int vsnprintf(char *buffer, size_t size, const char *format, va_list args)
+{ return _vsnprintf(buffer,size,format,args); }
+
+_ACRTIMP int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...) __WINE_CRT_SCANF_ATTR(3, 5);
+_ACRTIMP int WINAPIV fscanf(FILE*,const char*,...) __WINE_CRT_SCANF_ATTR(2, 3);
+_ACRTIMP int WINAPIV fscanf_s(FILE*,const char*,...) __WINE_CRT_SCANF_ATTR(2, 3);
+_ACRTIMP int WINAPIV scanf(const char*,...) __WINE_CRT_SCANF_ATTR(1, 2);
+_ACRTIMP int WINAPIV scanf_s(const char*,...) __WINE_CRT_SCANF_ATTR(1, 2);
+_ACRTIMP int WINAPIV sscanf(const char*,const char*,...) __WINE_CRT_SCANF_ATTR(2, 3);
+_ACRTIMP int WINAPIV sscanf_s(const char*,const char*,...) __WINE_CRT_SCANF_ATTR(2, 3);
 
 #endif /* _UCRT && !_NO_CRT_STDIO_INLINE */
 
@@ -435,6 +462,7 @@ static inline int unlink(const char* path) { return _unlink(path); }
 
 #if !defined(_NO_CRT_STDIO_INLINE)
 
+static inline int WINAPIV snprintf(char *buffer, size_t size, const char *format, ...) __WINE_CRT_PRINTF_ATTR(3, 4);
 static inline int WINAPIV snprintf(char *buffer, size_t size, const char *format, ...)
 {
     int ret;
@@ -446,6 +474,7 @@ static inline int WINAPIV snprintf(char *buffer, size_t size, const char *format
     return ret;
 }
 
+static inline int WINAPIV _snprintf(char *buffer, size_t size, const char *format, ...) __WINE_CRT_PRINTF_ATTR(3, 4);
 static inline int WINAPIV _snprintf(char *buffer, size_t size, const char *format, ...)
 {
     int ret;
@@ -457,6 +486,7 @@ static inline int WINAPIV _snprintf(char *buffer, size_t size, const char *forma
     return ret;
 }
 
+static inline int WINAPIV sprintf(char *buffer, const char *format, ...) __WINE_CRT_PRINTF_ATTR(2, 3);
 static inline int WINAPIV sprintf(char *buffer, const char *format, ...)
 {
     int ret;
@@ -470,9 +500,9 @@ static inline int WINAPIV sprintf(char *buffer, const char *format, ...)
 
 #else /* !_NO_CRT_STDIO_INLINE */
 
-_ACRTIMP int WINAPIV snprintf(char*,size_t,const char*,...);
-_ACRTIMP int WINAPIV _snprintf(char*,size_t,const char*,...);
-_ACRTIMP int WINAPIV sprintf(char*,const char*,...);
+_ACRTIMP int WINAPIV snprintf(char*,size_t,const char*,...) __WINE_CRT_PRINTF_ATTR(3, 4);
+_ACRTIMP int WINAPIV _snprintf(char*,size_t,const char*,...) __WINE_CRT_PRINTF_ATTR(3, 4);
+_ACRTIMP int WINAPIV sprintf(char*,const char*,...) __WINE_CRT_PRINTF_ATTR(2, 3);
 
 #endif /* !_NO_CRT_STDIO_INLINE */
 
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index 3ed514f73e2..3ffb0185052 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -865,7 +865,7 @@ static HMODULE load_com_dll(const char *name, char **path, char *filename)
 
     if(!get_main_clsid(name, &clsid)) return NULL;
 
-    sprintf(keyname, "CLSID\\{%08x-%04x-%04x-%02x%2x-%02x%2x%02x%2x%02x%2x}\\InprocServer32",
+    sprintf(keyname, "CLSID\\{%08lx-%04x-%04x-%02x%2x-%02x%2x%02x%2x%02x%2x}\\InprocServer32",
             clsid.Data1, clsid.Data2, clsid.Data3, clsid.Data4[0], clsid.Data4[1],
             clsid.Data4[2], clsid.Data4[3], clsid.Data4[4], clsid.Data4[5],
             clsid.Data4[6], clsid.Data4[7]);

[PATCH 02/14] include/basestd.h: define HandleToU?Long return a long (as SDK does)

[Eric Pouech]

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

---
 include/basetsd.h |   24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/include/basetsd.h b/include/basetsd.h
index a46172403ef..329db66c8f0 100644
--- a/include/basetsd.h
+++ b/include/basetsd.h
@@ -153,16 +153,32 @@ typedef unsigned int UHALF_PTR, *PUHALF_PTR;
 
 #if !defined(__midl) && !defined(__WIDL__)
 
-static inline ULONG32 HandleToULong(const void *h)
+#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES)
+
+static inline unsigned long HandleToULong(const void *h)
+{
+    return (unsigned long)(ULONG_PTR)h;
+}
+
+static inline long HandleToLong(const void *h)
+{
+    return (long)(LONG_PTR)h;
+}
+
+#else
+
+static inline unsigned HandleToULong(const void *h)
 {
-    return (ULONG32)(ULONG_PTR)h;
+    return (unsigned)(ULONG_PTR)h;
 }
 
-static inline LONG32 HandleToLong(const void *h)
+static inline int HandleToLong(const void *h)
 {
-    return (LONG32)(LONG_PTR)h;
+    return (int)(LONG_PTR)h;
 }
 
+#endif /* !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) */
+
 static inline void *ULongToHandle(ULONG32 ul)
 {
     return (void *)(ULONG_PTR)ul;

[PATCH 03/14] programs/winedbg: use correct integral type

[Eric Pouech]

(* as width or precision specifier in printf requires an int not a long)

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

---
 programs/winedbg/debugger.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h
index b676bc8d955..0cc2f8b7a6c 100644
--- a/programs/winedbg/debugger.h
+++ b/programs/winedbg/debugger.h
@@ -39,7 +39,7 @@
 #include "oaidl.h"
 #include <wine/list.h>
 
-#define ADDRSIZE        (dbg_curr_process ? dbg_curr_process->be_cpu->pointer_size : (int)sizeof(void*))
+#define ADDRSIZE        ((int)(dbg_curr_process ? dbg_curr_process->be_cpu->pointer_size : sizeof(void*)))
 #define ADDRWIDTH       (ADDRSIZE * 2)
 
 /* the debugger uses these exceptions for its internal use */

[PATCH 04/14] dlls/dbgeng: use correct integral type

[Eric Pouech]

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

---
 dlls/dbgeng/dbgeng.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c
index 014f723981b..5ffde0e3c80 100644
--- a/dlls/dbgeng/dbgeng.c
+++ b/dlls/dbgeng/dbgeng.c
@@ -81,7 +81,7 @@ static struct target_process *debug_client_get_target(struct debug_client *debug
 }
 
 static HRESULT debug_target_return_string(const char *str, char *buffer, unsigned int buffer_size,
-        unsigned int *size)
+                                          ULONG *size)
 {
     unsigned int len = strlen(str), dst_len;
 
@@ -1877,7 +1877,8 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug
     struct target_process *target;
     void *version_info, *ptr;
     HRESULT hr = E_FAIL;
-    DWORD handle, size;
+    DWORD handle;
+    UINT size;
 
     TRACE("%p, %u, %s, %s, %p, %u, %p.\n", iface, index, wine_dbgstr_longlong(base), debugstr_a(item), buffer,
             buffer_size, info_size);

[PATCH 05/14] dlls/devenum: use correct integral type

[Eric Pouech]

Note: I voluntarly used 'unsigned long' and not ULONG as SDK and MSDN
state that unsigned long is the type to be used in the API.
Even if Wine's headers declare the prototype with ULONG instead.
Wine's headers are potentially to be fixed accordingly.

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

---
 dlls/devenum/mediacatenum.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c
index 9d8069a3aa2..b1f81ec8476 100644
--- a/dlls/devenum/mediacatenum.c
+++ b/dlls/devenum/mediacatenum.c
@@ -137,7 +137,8 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface,
         }
         else if (!wcscmp(name, L"FilterData"))
         {
-            unsigned int count = 1, input_count, output_count, i;
+            unsigned int count = 1, i;
+            unsigned long input_count, output_count;
             DMO_PARTIAL_MEDIATYPE *types = NULL, *new_array;
             REGFILTERPINS2 reg_pins[2] = {{0}};
             REGFILTER2 reg_filter = {0};

[PATCH 05/14] dlls/devenum: use correct integral type

[Zebediah Figura]

On 1/31/22 07:14, Eric Pouech wrote:
> Note: I voluntarly used 'unsigned long' and not ULONG as SDK and MSDN
> state that unsigned long is the type to be used in the API.
> Even if Wine's headers declare the prototype with ULONG instead.
> Wine's headers are potentially to be fixed accordingly.

This would break the build without MinGW, though. I was under the 
impression it wasn't officially unsupported yet. If that's changed by 
now I'd have expected it to be more clearly announced.

[PATCH 05/14] dlls/devenum: use correct integral type

[Alexandre Julliard]

Zebediah Figura <zfigura(a)codeweavers.com> writes:
> On 1/31/22 07:14, Eric Pouech wrote:
> > Note: I voluntarly used 'unsigned long' and not ULONG as SDK and MSDN
> > state that unsigned long is the type to be used in the API.
> > Even if Wine's headers declare the prototype with ULONG instead.
> > Wine's headers are potentially to be fixed accordingly.
>
> This would break the build without MinGW, though. I was under the
> impression it wasn't officially unsupported yet. If that's changed by 
> now I'd have expected it to be more clearly announced.

It hasn't changed. Any direct use of 'long' in Wine code is basically a bug.

-- 
Alexandre Julliard
julliard(a)winehq.org

[PATCH 06/14] dlls/dsound: use correct integral type

[Eric Pouech]

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

---
 dlls/dsound/mixer.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index d28cc8dc5aa..1f91bc4dc0e 100644
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -694,7 +694,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes)
  */
 static void DSOUND_PerformMix(DirectSoundDevice *device)
 {
-	DWORD block, pad_frames, pad_bytes, frames;
+	DWORD block, pad_bytes, frames;
+	UINT32 pad_frames;
 	HRESULT hr;
 
 	TRACE("(%p)\n", device);

[PATCH 06/14] dlls/dsound: use correct integral type

[Andrew Eikum]

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com>

On Mon, Jan 31, 2022 at 02:15:17PM +0100, Eric Pouech wrote:
> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
>
> ---
>  dlls/dsound/mixer.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
> index d28cc8dc5aa..1f91bc4dc0e 100644
> --- a/dlls/dsound/mixer.c
> +++ b/dlls/dsound/mixer.c
> @@ -694,7 +694,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes)
>   */
>  static void DSOUND_PerformMix(DirectSoundDevice *device)
>  {
> -	DWORD block, pad_frames, pad_bytes, frames;
> +	DWORD block, pad_bytes, frames;
> +	UINT32 pad_frames;
>   HRESULT hr;
>
> TRACE("(%p)\n", device);

[PATCH 07/14] dlls/dwrite: use correct integral type

[Eric Pouech]

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

---
 dlls/dwrite/font.c     |    2 +-
 dlls/dwrite/main.c     |    3 ++-
 dlls/dwrite/opentype.c |    5 +++--
 dlls/dwrite/shape.c    |    4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index cbc0434b72d..4b32bf1e0de 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -5084,7 +5084,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3
     struct dwrite_fontcollection *collection;
     WCHAR eudckeypathW[16];
     HKEY eudckey;
-    DWORD index;
+    UINT32 index;
     BOOL exists;
     LONG retval;
     HRESULT hr;
diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c
index ab53d5cb80d..967aa10e9c2 100644
--- a/dlls/dwrite/main.c
+++ b/dlls/dwrite/main.c
@@ -1515,7 +1515,8 @@ static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory7 *if
 
 static HRESULT create_system_path_list(WCHAR ***ret, unsigned int *ret_count)
 {
-    unsigned int index = 0, value_size, name_count, max_name_count, type, data_size;
+    unsigned int index = 0, value_size, max_name_count;
+    DWORD name_count, type, data_size;
     WCHAR **paths = NULL, *name, *value = NULL;
     size_t capacity = 0, count = 0;
     HKEY hkey;
diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index 452b00240b8..5b681609f23 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -4607,7 +4607,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex
     next_bit = global_bit_shift + 1;
     for (i = 0; i < features->count; ++i)
     {
-        unsigned int bits_needed;
+        DWORD bits_needed;
         BOOL found = FALSE;
 
         feature = &features->features[i];
@@ -5077,7 +5077,8 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con
     if (format == 1)
     {
         const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1));
-        unsigned int shift, alt_index;
+        DWORD shift;
+        unsigned int alt_index;
         UINT16 set_offset;
 
         coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage));
diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c
index 177ad1d06fe..84d04fe3a80 100644
--- a/dlls/dwrite/shape.c
+++ b/dlls/dwrite/shape.c
@@ -67,10 +67,10 @@ void release_scriptshaping_cache(struct scriptshaping_cache *cache)
     free(cache);
 }
 
-static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts,
+static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const unsigned int *scripts,
         unsigned int *script_index)
 {
-    static const DWORD fallback_scripts[] =
+    static const unsigned fallback_scripts[] =
     {
         DWRITE_MAKE_OPENTYPE_TAG('D','F','L','T'),
         DWRITE_MAKE_OPENTYPE_TAG('d','f','l','t'),

[PATCH 08/14] dlls/evr: use correct integral type

[Eric Pouech]

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

---
 dlls/evr/mixer.c     |    5 +++--
 dlls/evr/presenter.c |    8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c
index 5af5b2861b3..9e00c231345 100644
--- a/dlls/evr/mixer.c
+++ b/dlls/evr/mixer.c
@@ -906,7 +906,8 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D
     const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES;
     struct video_mixer *mixer = impl_from_IMFTransform(iface);
     HRESULT hr = MF_E_INVALIDMEDIATYPE;
-    unsigned int i, compare_flags;
+    unsigned int i;
+    DWORD compare_flags;
     BOOL is_compressed = TRUE;
 
     TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags);
@@ -1557,7 +1558,7 @@ static HRESULT WINAPI video_mixer_service_client_InitServicePointers(IMFTopology
         IMFTopologyServiceLookup *service_lookup)
 {
     struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface);
-    unsigned int count;
+    DWORD count;
     HRESULT hr;
 
     TRACE("%p, %p.\n", iface, service_lookup);
diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c
index fd02404b7af..a656eab6805 100644
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -282,7 +282,7 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter)
 
 static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type)
 {
-    unsigned int flags;
+    DWORD flags;
     HRESULT hr;
 
     if (!media_type)
@@ -328,7 +328,7 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter,
 static HRESULT video_presenter_configure_output_type(struct video_presenter *presenter, const MFVideoArea *aperture,
         IMFMediaType *media_type)
 {
-    unsigned int size;
+    DWORD size;
     GUID subtype;
     LONG stride;
     HRESULT hr;
@@ -1104,7 +1104,7 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter)
 static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup)
 {
     IMFVideoDeviceID *device_id;
-    unsigned int count;
+    DWORD count;
     GUID id = { 0 };
     HRESULT hr;
 
@@ -1143,7 +1143,7 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo
         IMFTopologyServiceLookup *service_lookup)
 {
     struct video_presenter *presenter = impl_from_IMFTopologyServiceLookupClient(iface);
-    unsigned int count;
+    DWORD count;
     HRESULT hr = S_OK;
 
     TRACE("%p, %p.\n", iface, service_lookup);

[PATCH 09/14] dlls/gdi32: use correct integral type

[Eric Pouech]

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

---
 dlls/gdi32/dc.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index ea8047a4285..6023b930f58 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -1482,7 +1482,7 @@ BOOL WINAPI PolyPolyline( HDC hdc, const POINT *points, const DWORD *counts, DWO
 
     if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
     if (dc_attr->emf && !EMFDC_PolyPolyline( dc_attr, points, counts, polylines )) return FALSE;
-    return NtGdiPolyPolyDraw( hdc, points, counts, polylines, NtGdiPolyPolyline );
+    return NtGdiPolyPolyDraw( hdc, points, (const UINT *)counts, polylines, NtGdiPolyPolyline );
 }
 
 /******************************************************************************
@@ -1496,7 +1496,7 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT *points, DWORD count )
 
     if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
     if (dc_attr->emf && !EMFDC_PolyBezier( dc_attr, points, count )) return FALSE;
-    return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyBezier );
+    return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolyBezier );
 }
 
 /******************************************************************************
@@ -1510,7 +1510,7 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT *points, DWORD count )
 
     if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
     if (dc_attr->emf && !EMFDC_PolyBezierTo( dc_attr, points, count )) return FALSE;
-    return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyBezierTo );
+    return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolyBezierTo );
 }
 
 /**********************************************************************
@@ -1524,7 +1524,7 @@ BOOL WINAPI PolylineTo( HDC hdc, const POINT *points, DWORD count )
 
     if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
     if (dc_attr->emf && !EMFDC_PolylineTo( dc_attr, points, count )) return FALSE;
-    return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolylineTo );
+    return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolylineTo );
 }
 
 /***********************************************************************

[PATCH 09/14] dlls/gdi32: use correct integral type

[Nikolay Sivov]

Maybe we could adjust NtGdi prototypes instead. I see a number of casts 
like that in existing code already, that would be unnecessary if DWORD 
was used for the prototype.

[PATCH 09/14] dlls/gdi32: use correct integral type

[Eric Pouech]

Le 31/01/2022 à 14:24, Nikolay Sivov a écrit :
> Maybe we could adjust NtGdi prototypes instead. I see a number of 
> casts like that in existing code already, that would be unnecessary if 
> DWORD was used for the prototype.

I'm in for avoiding the casts !

but, these APIs are not documented on MS web servers

and I don't have a ddk handy to check the prototypes

reactos and drmemory both define ntgdipolypolydraw with a PULONG 
instead, which could be a hint, not an absolute confirmation though

A+

[PATCH 09/14] dlls/gdi32: use correct integral type

[Jacek Caban]

On 1/31/22 14:44, Eric Pouech wrote:
> Le 31/01/2022 à 14:24, Nikolay Sivov a écrit :
> > Maybe we could adjust NtGdi prototypes instead. I see a number of 
> > casts like that in existing code already, that would be unnecessary 
> > if DWORD was used for the prototype.
>
> I'm in for avoiding the casts !
>
> but, these APIs are not documented on MS web servers
>
> and I don't have a ddk handy to check the prototypes
>
> reactos and drmemory both define ntgdipolypolydraw with a PULONG 
> instead, which could be a hint, not an absolute confirmation though

I think that, since it's not documented anyway, we may pick the type 
that works best, as long as it's binary compatible. Note that some 
callers already have casts, because it's sometimes used on INT*, 
sometimes on DWORD*, depending on the function. We could avoid new casts 
by simply using DWORD or ULONG for NtGdiPolyPolyDraw.


Thanks,

Jacek

[PATCH 10/14] dlls/gdiplus: use correct integral type

[Eric Pouech]

Note to Esme:
- in GdipGetPropertyIdList, for the call to IWICEnumMetadataItem_Next(),
  MSDN states that the last parameter (items_returned) is optional.
- Wine's implementation doesn't support optional parameter here.
- I leave it to you if of any importance.

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

---
 dlls/gdiplus/image.c |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 59e3d038c4d..280a2c77da8 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -95,7 +95,7 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT
 
             IWICPalette_GetColorCount(wic_palette, &count);
             palette = heap_alloc(2 * sizeof(UINT) + count * sizeof(ARGB));
-            IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count);
+            IWICPalette_GetColors(wic_palette, count, (UINT *)palette->Entries, &palette->Count);
 
             IWICPalette_GetType(wic_palette, &type);
             switch(type) {
@@ -140,7 +140,7 @@ static HRESULT set_palette(IWICBitmapFrameEncode *frame, ColorPalette *palette)
     IWICImagingFactory_Release(factory);
     if (SUCCEEDED(hr))
     {
-        hr = IWICPalette_InitializeCustom(wic_palette, palette->Entries, palette->Count);
+        hr = IWICPalette_InitializeCustom(wic_palette, (UINT *)palette->Entries, palette->Count);
 
         if (SUCCEEDED(hr))
             hr = IWICBitmapFrameEncode_SetPalette(frame, wic_palette);
@@ -2437,7 +2437,8 @@ GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID *list
     HRESULT hr;
     IWICMetadataReader *reader;
     IWICEnumMetadataItem *enumerator;
-    UINT prop_count, i, items_returned;
+    UINT prop_count, i;
+    ULONG items_returned;
 
     TRACE("(%p, %u, %p)\n", image, num, list);
 
@@ -2781,7 +2782,8 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT *size, UINT *count)
 
     for (i = 0; i < prop_count; i++)
     {
-        UINT items_returned, item_size;
+        ULONG items_returned;
+        UINT item_size;
 
         hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, &value, &items_returned);
         if (hr != S_OK) break;
@@ -2859,7 +2861,8 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size,
     for (i = 0; i < prop_count; i++)
     {
         PropertyItem *item;
-        UINT items_returned, item_size;
+        ULONG items_returned;
+        UINT item_size;
 
         hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, &value, &items_returned);
         if (hr != S_OK) break;
@@ -4114,7 +4117,7 @@ static GpStatus load_wmf(IStream *stream, GpMetafile **metafile)
     METAHEADER mh;
     HMETAFILE hmf;
     HRESULT hr;
-    UINT size;
+    ULONG size;
     void *buf;
 
     hr = IStream_Read(stream, &key, sizeof(key), &size);
@@ -4192,7 +4195,7 @@ static GpStatus load_emf(IStream *stream, GpMetafile **metafile)
     HENHMETAFILE hemf;
     GpStatus status;
     HRESULT hr;
-    UINT size;
+    ULONG size;
     void *buf;
 
     hr = IStream_Read(stream, &emh, sizeof(emh), &size);
@@ -4281,7 +4284,7 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res
     const BYTE *pattern, *mask;
     LARGE_INTEGER seek;
     HRESULT hr;
-    UINT bytesread;
+    ULONG bytesread;
     int i;
     DWORD j, sig;
 
@@ -5839,7 +5842,7 @@ static GpStatus create_optimal_palette(ColorPalette *palette, INT desired,
             {
                 palette->Flags = 0;
                 IWICPalette_GetColorCount(wic_palette, &palette->Count);
-                IWICPalette_GetColors(wic_palette, palette->Count, palette->Entries, &palette->Count);
+                IWICPalette_GetColors(wic_palette, palette->Count, (UINT *)palette->Entries, &palette->Count);
             }
 
             IWICBitmap_Release(bitmap);

[PATCH 10/14] dlls/gdiplus: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106621

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/compobj.dll16/compobj.c:657
error: patch failed: dlls/crypt32/sip.c:40
error: patch failed: dlls/iphlpapi/iphlpapi_main.c:59
error: patch failed: dlls/iphlpapi/tests/iphlpapi.c:1409
error: patch failed: dlls/msdmo/tests/msdmo.c:31
error: patch failed: dlls/mshtml/main.c:627
error: patch failed: dlls/oleaut32/oleaut.c:832
error: patch failed: dlls/oleaut32/typelib.c:3660
error: patch failed: dlls/rpcrt4/rpcrt4_main.c:543
error: patch failed: dlls/shell32/classes.c:200
error: patch failed: dlls/shell32/debughlp.c:247
error: patch failed: dlls/shell32/shfldr.h:61
error: patch failed: dlls/shlwapi/ordinal.c:461
error: patch failed: dlls/typelib.dll16/typelib.c:82
error: patch failed: dlls/webservices/writer.c:1041
error: patch failed: include/msvcrt/corecrt.h:334
error: patch failed: include/msvcrt/crtdbg.h:88
error: patch failed: include/msvcrt/stdio.h:161
error: patch failed: programs/winetest/main.c:865
error: patch failed: include/basetsd.h:153
error: patch failed: programs/winedbg/debugger.h:39
error: patch failed: dlls/dbgeng/dbgeng.c:81
error: patch failed: dlls/dsound/mixer.c:694
error: patch failed: dlls/evr/mixer.c:906
error: patch failed: dlls/evr/presenter.c:282
error: patch failed: dlls/gdiplus/image.c:4114
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/compobj.dll16/compobj.c:657
error: patch failed: dlls/crypt32/sip.c:40
error: patch failed: dlls/iphlpapi/iphlpapi_main.c:59
error: patch failed: dlls/iphlpapi/tests/iphlpapi.c:1409
error: patch failed: dlls/msdmo/tests/msdmo.c:31
error: patch failed: dlls/mshtml/main.c:627
error: patch failed: dlls/oleaut32/oleaut.c:832
error: patch failed: dlls/oleaut32/typelib.c:3660
error: patch failed: dlls/rpcrt4/rpcrt4_main.c:543
error: patch failed: dlls/shell32/classes.c:200
error: patch failed: dlls/shell32/debughlp.c:247
error: patch failed: dlls/shell32/shfldr.h:61
error: patch failed: dlls/shlwapi/ordinal.c:461
error: patch failed: dlls/typelib.dll16/typelib.c:82
error: patch failed: dlls/webservices/writer.c:1041
error: patch failed: include/msvcrt/corecrt.h:334
error: patch failed: include/msvcrt/crtdbg.h:88
error: patch failed: include/msvcrt/stdio.h:161
error: patch failed: programs/winetest/main.c:865
error: patch failed: include/basetsd.h:153
error: patch failed: programs/winedbg/debugger.h:39
error: patch failed: dlls/dbgeng/dbgeng.c:81
error: patch failed: dlls/dsound/mixer.c:694
error: patch failed: dlls/evr/mixer.c:906
error: patch failed: dlls/evr/presenter.c:282
error: patch failed: dlls/gdiplus/image.c:4114
Task: Patch failed to apply

[PATCH 10/14] dlls/gdiplus: use correct integral type

[Esme Povirk (she/they)]

git-am is saying the patch doesn't apply, not sure what the problem is.

[PATCH 11/14] dlls/itss: use correct integral type

[Eric Pouech]

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

---
 dlls/itss/chm_lib.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c
index 91e3fa3d811..f2665cae529 100644
--- a/dlls/itss/chm_lib.c
+++ b/dlls/itss/chm_lib.c
@@ -941,7 +941,7 @@ static UChar *_chm_find_in_PMGL(UChar *page_buf,
      *      that is provided for us.
      */
     struct chmPmglHeader header;
-    UInt32 hremain;
+    unsigned int hremain;
     UChar *end;
     UChar *cur;
     UChar *temp;
@@ -983,7 +983,7 @@ static Int32 _chm_find_in_PMGI(UChar *page_buf,
      *      that is provided for us
      */
     struct chmPmgiHeader header;
-    UInt32 hremain;
+    unsigned int hremain;
     int page=-1;
     UChar *end;
     UChar *cur;
@@ -1093,7 +1093,7 @@ static BOOL _chm_get_cmpblock_bounds(struct chmFile *h,
                                      Int64 *len)
 {
     UChar buffer[8], *dummy;
-    UInt32 remain;
+    unsigned int remain;
 
     /* for all but the last block, use the reset table */
     if (block < h->reset_table.block_count-1)

[PATCH 11/14] dlls/itss: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106622

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/compobj.dll16/compobj.c:657
error: patch failed: dlls/crypt32/sip.c:40
error: patch failed: dlls/iphlpapi/iphlpapi_main.c:59
error: patch failed: dlls/iphlpapi/tests/iphlpapi.c:1409
error: patch failed: dlls/msdmo/tests/msdmo.c:31
error: patch failed: dlls/mshtml/main.c:627
error: patch failed: dlls/oleaut32/oleaut.c:832
error: patch failed: dlls/oleaut32/typelib.c:3660
error: patch failed: dlls/rpcrt4/rpcrt4_main.c:543
error: patch failed: dlls/shell32/classes.c:200
error: patch failed: dlls/shell32/debughlp.c:247
error: patch failed: dlls/shell32/shfldr.h:61
error: patch failed: dlls/shlwapi/ordinal.c:461
error: patch failed: dlls/typelib.dll16/typelib.c:82
error: patch failed: dlls/webservices/writer.c:1041
error: patch failed: include/msvcrt/corecrt.h:334
error: patch failed: include/msvcrt/crtdbg.h:88
error: patch failed: include/msvcrt/stdio.h:161
error: patch failed: programs/winetest/main.c:865
error: patch failed: include/basetsd.h:153
error: patch failed: programs/winedbg/debugger.h:39
error: patch failed: dlls/dbgeng/dbgeng.c:81
error: patch failed: dlls/dsound/mixer.c:694
error: patch failed: dlls/evr/mixer.c:906
error: patch failed: dlls/evr/presenter.c:282
error: patch failed: dlls/gdiplus/image.c:4114
error: patch failed: dlls/itss/chm_lib.c:941
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/compobj.dll16/compobj.c:657
error: patch failed: dlls/crypt32/sip.c:40
error: patch failed: dlls/iphlpapi/iphlpapi_main.c:59
error: patch failed: dlls/iphlpapi/tests/iphlpapi.c:1409
error: patch failed: dlls/msdmo/tests/msdmo.c:31
error: patch failed: dlls/mshtml/main.c:627
error: patch failed: dlls/oleaut32/oleaut.c:832
error: patch failed: dlls/oleaut32/typelib.c:3660
error: patch failed: dlls/rpcrt4/rpcrt4_main.c:543
error: patch failed: dlls/shell32/classes.c:200
error: patch failed: dlls/shell32/debughlp.c:247
error: patch failed: dlls/shell32/shfldr.h:61
error: patch failed: dlls/shlwapi/ordinal.c:461
error: patch failed: dlls/typelib.dll16/typelib.c:82
error: patch failed: dlls/webservices/writer.c:1041
error: patch failed: include/msvcrt/corecrt.h:334
error: patch failed: include/msvcrt/crtdbg.h:88
error: patch failed: include/msvcrt/stdio.h:161
error: patch failed: programs/winetest/main.c:865
error: patch failed: include/basetsd.h:153
error: patch failed: programs/winedbg/debugger.h:39
error: patch failed: dlls/dbgeng/dbgeng.c:81
error: patch failed: dlls/dsound/mixer.c:694
error: patch failed: dlls/evr/mixer.c:906
error: patch failed: dlls/evr/presenter.c:282
error: patch failed: dlls/gdiplus/image.c:4114
error: patch failed: dlls/itss/chm_lib.c:941
Task: Patch failed to apply

[PATCH 12/14] dlls/joy.cpl: use correct integral type

[Eric Pouech]

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

---
 dlls/joy.cpl/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index 081dcf2dc74..8ea3892b750 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -789,7 +789,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef)
     HRESULT hr;
     DIEFFECT dieffect;
     DWORD axes[2] = {DIJOFS_X, DIJOFS_Y};
-    int direction[2] = {0, 0};
+    LONG direction[2] = {0, 0};
     int num_axes = 2;
     struct Joystick *joystick = pvRef;
     DIRAMPFORCE rforce;

[PATCH 12/14] dlls/joy.cpl: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106623

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/compobj.dll16/compobj.c:657
error: patch failed: dlls/crypt32/sip.c:40
error: patch failed: dlls/iphlpapi/iphlpapi_main.c:59
error: patch failed: dlls/iphlpapi/tests/iphlpapi.c:1409
error: patch failed: dlls/msdmo/tests/msdmo.c:31
error: patch failed: dlls/mshtml/main.c:627
error: patch failed: dlls/oleaut32/oleaut.c:832
error: patch failed: dlls/oleaut32/typelib.c:3660
error: patch failed: dlls/rpcrt4/rpcrt4_main.c:543
error: patch failed: dlls/shell32/classes.c:200
error: patch failed: dlls/shell32/debughlp.c:247
error: patch failed: dlls/shell32/shfldr.h:61
error: patch failed: dlls/shlwapi/ordinal.c:461
error: patch failed: dlls/typelib.dll16/typelib.c:82
error: patch failed: dlls/webservices/writer.c:1041
error: patch failed: include/msvcrt/corecrt.h:334
error: patch failed: include/msvcrt/crtdbg.h:88
error: patch failed: include/msvcrt/stdio.h:161
error: patch failed: programs/winetest/main.c:865
error: patch failed: include/basetsd.h:153
error: patch failed: programs/winedbg/debugger.h:39
error: patch failed: dlls/dbgeng/dbgeng.c:81
error: patch failed: dlls/dsound/mixer.c:694
error: patch failed: dlls/evr/mixer.c:906
error: patch failed: dlls/evr/presenter.c:282
error: patch failed: dlls/gdiplus/image.c:4114
error: patch failed: dlls/itss/chm_lib.c:941
error: patch failed: dlls/joy.cpl/main.c:789
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/compobj.dll16/compobj.c:657
error: patch failed: dlls/crypt32/sip.c:40
error: patch failed: dlls/iphlpapi/iphlpapi_main.c:59
error: patch failed: dlls/iphlpapi/tests/iphlpapi.c:1409
error: patch failed: dlls/msdmo/tests/msdmo.c:31
error: patch failed: dlls/mshtml/main.c:627
error: patch failed: dlls/oleaut32/oleaut.c:832
error: patch failed: dlls/oleaut32/typelib.c:3660
error: patch failed: dlls/rpcrt4/rpcrt4_main.c:543
error: patch failed: dlls/shell32/classes.c:200
error: patch failed: dlls/shell32/debughlp.c:247
error: patch failed: dlls/shell32/shfldr.h:61
error: patch failed: dlls/shlwapi/ordinal.c:461
error: patch failed: dlls/typelib.dll16/typelib.c:82
error: patch failed: dlls/webservices/writer.c:1041
error: patch failed: include/msvcrt/corecrt.h:334
error: patch failed: include/msvcrt/crtdbg.h:88
error: patch failed: include/msvcrt/stdio.h:161
error: patch failed: programs/winetest/main.c:865
error: patch failed: include/basetsd.h:153
error: patch failed: programs/winedbg/debugger.h:39
error: patch failed: dlls/dbgeng/dbgeng.c:81
error: patch failed: dlls/dsound/mixer.c:694
error: patch failed: dlls/evr/mixer.c:906
error: patch failed: dlls/evr/presenter.c:282
error: patch failed: dlls/gdiplus/image.c:4114
error: patch failed: dlls/itss/chm_lib.c:941
error: patch failed: dlls/joy.cpl/main.c:789
Task: Patch failed to apply

[PATCH 13/14] dlls/msxml3: use correct integral type

[Eric Pouech]

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

---
 dlls/msxml3/httprequest.c |    2 +-
 dlls/msxml3/mxwriter.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
index 934d580064f..86e569f5dd8 100644
--- a/dlls/msxml3/httprequest.c
+++ b/dlls/msxml3/httprequest.c
@@ -687,7 +687,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback *
     BindStatusCallback *bsc;
     IBindCtx *pbc;
     HRESULT hr;
-    int size;
+    LONG size;
 
     hr = CreateBindCtx(0, &pbc);
     if (hr != S_OK) return hr;
diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c
index e0dd0e3c6e0..084324797c7 100644
--- a/dlls/msxml3/mxwriter.c
+++ b/dlls/msxml3/mxwriter.c
@@ -336,7 +336,7 @@ static HRESULT write_output_buffer(mxwriter *writer, const WCHAR *data, int len)
 {
     output_buffer *buffer = &writer->buffer;
     encoded_buffer *buff;
-    unsigned int written;
+    ULONG written;
     int src_len;
 
     if (!len || !*data)

[PATCH 13/14] dlls/msxml3: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106624

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/compobj.dll16/compobj.c:657
error: patch failed: dlls/crypt32/sip.c:40
error: patch failed: dlls/iphlpapi/iphlpapi_main.c:59
error: patch failed: dlls/iphlpapi/tests/iphlpapi.c:1409
error: patch failed: dlls/msdmo/tests/msdmo.c:31
error: patch failed: dlls/mshtml/main.c:627
error: patch failed: dlls/oleaut32/oleaut.c:832
error: patch failed: dlls/oleaut32/typelib.c:3660
error: patch failed: dlls/rpcrt4/rpcrt4_main.c:543
error: patch failed: dlls/shell32/classes.c:200
error: patch failed: dlls/shell32/debughlp.c:247
error: patch failed: dlls/shell32/shfldr.h:61
error: patch failed: dlls/shlwapi/ordinal.c:461
error: patch failed: dlls/typelib.dll16/typelib.c:82
error: patch failed: dlls/webservices/writer.c:1041
error: patch failed: include/msvcrt/corecrt.h:334
error: patch failed: include/msvcrt/crtdbg.h:88
error: patch failed: include/msvcrt/stdio.h:161
error: patch failed: programs/winetest/main.c:865
error: patch failed: include/basetsd.h:153
error: patch failed: programs/winedbg/debugger.h:39
error: patch failed: dlls/dbgeng/dbgeng.c:81
error: patch failed: dlls/dsound/mixer.c:694
error: patch failed: dlls/evr/mixer.c:906
error: patch failed: dlls/evr/presenter.c:282
error: patch failed: dlls/gdiplus/image.c:4114
error: patch failed: dlls/itss/chm_lib.c:941
error: patch failed: dlls/joy.cpl/main.c:789
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/compobj.dll16/compobj.c:657
error: patch failed: dlls/crypt32/sip.c:40
error: patch failed: dlls/iphlpapi/iphlpapi_main.c:59
error: patch failed: dlls/iphlpapi/tests/iphlpapi.c:1409
error: patch failed: dlls/msdmo/tests/msdmo.c:31
error: patch failed: dlls/mshtml/main.c:627
error: patch failed: dlls/oleaut32/oleaut.c:832
error: patch failed: dlls/oleaut32/typelib.c:3660
error: patch failed: dlls/rpcrt4/rpcrt4_main.c:543
error: patch failed: dlls/shell32/classes.c:200
error: patch failed: dlls/shell32/debughlp.c:247
error: patch failed: dlls/shell32/shfldr.h:61
error: patch failed: dlls/shlwapi/ordinal.c:461
error: patch failed: dlls/typelib.dll16/typelib.c:82
error: patch failed: dlls/webservices/writer.c:1041
error: patch failed: include/msvcrt/corecrt.h:334
error: patch failed: include/msvcrt/crtdbg.h:88
error: patch failed: include/msvcrt/stdio.h:161
error: patch failed: programs/winetest/main.c:865
error: patch failed: include/basetsd.h:153
error: patch failed: programs/winedbg/debugger.h:39
error: patch failed: dlls/dbgeng/dbgeng.c:81
error: patch failed: dlls/dsound/mixer.c:694
error: patch failed: dlls/evr/mixer.c:906
error: patch failed: dlls/evr/presenter.c:282
error: patch failed: dlls/gdiplus/image.c:4114
error: patch failed: dlls/itss/chm_lib.c:941
error: patch failed: dlls/joy.cpl/main.c:789
Task: Patch failed to apply

[PATCH 13/14] dlls/msxml3: use correct integral type

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

[PATCH 14/14] dlls/ntdll: use correct integral type

[Eric Pouech]

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

---
 dlls/ntdll/actctx.c |    2 +-
 dlls/ntdll/loader.c |    8 ++++----
 dlls/ntdll/sync.c   |   12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index ca38f37e673..9fa93a3b5e3 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -532,7 +532,7 @@ enum context_sections
 typedef struct _ACTIVATION_CONTEXT
 {
     ULONG               magic;
-    int                 ref_count;
+    LONG                ref_count;
     struct file_info    config;
     struct file_info    appdir;
     struct assembly    *assemblies;
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index b50b9e61bbc..3a3cc82582a 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -250,8 +250,8 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void)
  */
 void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace)
 {
-    static unsigned int element_size = sizeof(*unload_traces);
-    static unsigned int element_count = ARRAY_SIZE(unload_traces);
+    static ULONG element_size = sizeof(*unload_traces);
+    static ULONG element_count = ARRAY_SIZE(unload_traces);
 
     *size = &element_size;
     *count = &element_count;
@@ -4369,7 +4369,7 @@ NTSTATUS WINAPI RtlSetSearchPathMode( ULONG flags )
         val = 0;
         break;
     case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT:
-        InterlockedExchange( (int *)&path_safe_mode, 2 );
+        InterlockedExchange( (LONG *)&path_safe_mode, 2 );
         return STATUS_SUCCESS;
     default:
         return STATUS_INVALID_PARAMETER;
@@ -4379,7 +4379,7 @@ NTSTATUS WINAPI RtlSetSearchPathMode( ULONG flags )
     {
         int prev = path_safe_mode;
         if (prev == 2) break;  /* permanently set */
-        if (InterlockedCompareExchange( (int *)&path_safe_mode, val, prev ) == prev) return STATUS_SUCCESS;
+        if (InterlockedCompareExchange( (LONG *)&path_safe_mode, val, prev ) == prev) return STATUS_SUCCESS;
     }
     return STATUS_ACCESS_DENIED;
 }
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index bdb39e59d6d..06b594c633f 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -182,12 +182,12 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout )
     }
     else
     {
-        int *lock = (int *)&crit->LockSemaphore;
+        LONG *lock = (LONG *)&crit->LockSemaphore;
         while (!InterlockedCompareExchange( lock, 0, 1 ))
         {
-            static const int zero;
+            static const LONG zero;
             /* this may wait longer than specified in case of multiple wake-ups */
-            if (RtlWaitOnAddress( lock, &zero, sizeof(int), &time ) == STATUS_TIMEOUT)
+            if (RtlWaitOnAddress( lock, &zero, sizeof(LONG), &time ) == STATUS_TIMEOUT)
                 return STATUS_TIMEOUT;
         }
         return STATUS_WAIT_0;
@@ -363,7 +363,7 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit )
     }
     else
     {
-        int *lock = (int *)&crit->LockSemaphore;
+        LONG *lock = (LONG *)&crit->LockSemaphore;
         InterlockedExchange( lock, 1 );
         RtlWakeAddressSingle( lock );
         ret = STATUS_SUCCESS;
@@ -761,7 +761,7 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable )
  */
 void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable )
 {
-    InterlockedIncrement( (int *)&variable->Ptr );
+    InterlockedIncrement( (LONG *)&variable->Ptr );
     RtlWakeAddressSingle( variable );
 }
 
@@ -772,7 +772,7 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable )
  */
 void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable )
 {
-    InterlockedIncrement( (int *)&variable->Ptr );
+    InterlockedIncrement( (LONG *)&variable->Ptr );
     RtlWakeAddressAll( variable );
 }

[PATCH 14/14] dlls/ntdll: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106625

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/compobj.dll16/compobj.c:657
error: patch failed: dlls/crypt32/sip.c:40
error: patch failed: dlls/iphlpapi/iphlpapi_main.c:59
error: patch failed: dlls/iphlpapi/tests/iphlpapi.c:1409
error: patch failed: dlls/msdmo/tests/msdmo.c:31
error: patch failed: dlls/mshtml/main.c:627
error: patch failed: dlls/oleaut32/oleaut.c:832
error: patch failed: dlls/oleaut32/typelib.c:3660
error: patch failed: dlls/rpcrt4/rpcrt4_main.c:543
error: patch failed: dlls/shell32/classes.c:200
error: patch failed: dlls/shell32/debughlp.c:247
error: patch failed: dlls/shell32/shfldr.h:61
error: patch failed: dlls/shlwapi/ordinal.c:461
error: patch failed: dlls/typelib.dll16/typelib.c:82
error: patch failed: dlls/webservices/writer.c:1041
error: patch failed: include/msvcrt/corecrt.h:334
error: patch failed: include/msvcrt/crtdbg.h:88
error: patch failed: include/msvcrt/stdio.h:161
error: patch failed: programs/winetest/main.c:865
error: patch failed: include/basetsd.h:153
error: patch failed: programs/winedbg/debugger.h:39
error: patch failed: dlls/dbgeng/dbgeng.c:81
error: patch failed: dlls/dsound/mixer.c:694
error: patch failed: dlls/evr/mixer.c:906
error: patch failed: dlls/evr/presenter.c:282
error: patch failed: dlls/gdiplus/image.c:4114
error: patch failed: dlls/itss/chm_lib.c:941
error: patch failed: dlls/joy.cpl/main.c:789
error: patch failed: dlls/ntdll/actctx.c:532
error: patch failed: dlls/ntdll/loader.c:250
error: patch failed: dlls/ntdll/sync.c:182
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/compobj.dll16/compobj.c:657
error: patch failed: dlls/crypt32/sip.c:40
error: patch failed: dlls/iphlpapi/iphlpapi_main.c:59
error: patch failed: dlls/iphlpapi/tests/iphlpapi.c:1409
error: patch failed: dlls/msdmo/tests/msdmo.c:31
error: patch failed: dlls/mshtml/main.c:627
error: patch failed: dlls/oleaut32/oleaut.c:832
error: patch failed: dlls/oleaut32/typelib.c:3660
error: patch failed: dlls/rpcrt4/rpcrt4_main.c:543
error: patch failed: dlls/shell32/classes.c:200
error: patch failed: dlls/shell32/debughlp.c:247
error: patch failed: dlls/shell32/shfldr.h:61
error: patch failed: dlls/shlwapi/ordinal.c:461
error: patch failed: dlls/typelib.dll16/typelib.c:82
error: patch failed: dlls/webservices/writer.c:1041
error: patch failed: include/msvcrt/corecrt.h:334
error: patch failed: include/msvcrt/crtdbg.h:88
error: patch failed: include/msvcrt/stdio.h:161
error: patch failed: programs/winetest/main.c:865
error: patch failed: include/basetsd.h:153
error: patch failed: programs/winedbg/debugger.h:39
error: patch failed: dlls/dbgeng/dbgeng.c:81
error: patch failed: dlls/dsound/mixer.c:694
error: patch failed: dlls/evr/mixer.c:906
error: patch failed: dlls/evr/presenter.c:282
error: patch failed: dlls/gdiplus/image.c:4114
error: patch failed: dlls/itss/chm_lib.c:941
error: patch failed: dlls/joy.cpl/main.c:789
error: patch failed: dlls/ntdll/actctx.c:532
error: patch failed: dlls/ntdll/loader.c:250
error: patch failed: dlls/ntdll/sync.c:182
Task: Patch failed to apply