Eric Pouech : gdi.exe16: Enable compilation with long types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e7857fb5209508647b06989ba0a42ef4dfb6ce43
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e7857fb5209508647b06989ba...

Author: Eric Pouech 
Date:   Thu Feb 10 08:43:07 2022 +0100

gdi.exe16: Enable compilation with long types.

Signed-off-by: Eric Pouech 
Signed-off-by: Alexandre Julliard

---

dlls/gdi.exe16/Makefile.in |  1 -
 dlls/gdi.exe16/gdi.c       | 10 +++++-----
 dlls/gdi.exe16/printdrv.c  |  4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in
index 25a39a42cf0..21850e2e660 100644
--- a/dlls/gdi.exe16/Makefile.in
+++ b/dlls/gdi.exe16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = gdi.exe16
 IMPORTS   = user32 advapi32 gdi32 win32u

diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c
index 9afa4532fde..b4bcd1c2228 100644
--- a/dlls/gdi.exe16/gdi.c
+++ b/dlls/gdi.exe16/gdi.c
@@ -548,7 +548,7 @@ static struct window_surface *create_surface( const BITMAPINFO *info )
     surface->bits               = (char *)info + surface->info_size;
     memcpy( &surface->info, info, surface->info_size );

-    TRACE( "created %p %ux%u for info %p bits %p\n",
+    TRACE( "created %p %lux%lu for info %p bits %p\n",
            surface, surface->header.rect.right, surface->header.rect.bottom, info, surface->bits );
     return &surface->header;
 }
@@ -2138,7 +2138,7 @@ void WINAPI PlayMetaFileRecord16( HDC16 hdc, HANDLETABLE16 *ht, METARECORD *mr,
  */
 BOOL16 WINAPI SetDCHook16( HDC16 hdc16, FARPROC16 hookProc, DWORD dwHookData )
 {
-    FIXME( "%04x %p %x: not supported\n", hdc16, hookProc, dwHookData );
+    FIXME( "%04x %p %lx: not supported\n", hdc16, hookProc, dwHookData );
     return FALSE;
 }

@@ -2204,7 +2204,7 @@ UINT16 WINAPI GetBoundsRect16( HDC16 hdc, LPRECT16 rect, UINT16 flags)
  */
 WORD WINAPI EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data )
 {
-    FIXME("(%s,%p,%x),stub\n",fontname,proc,data);
+    FIXME("(%s,%p,%lx),stub\n",fontname,proc,data);
     return 0;
 }

@@ -2251,7 +2251,7 @@ WORD WINAPI EngineRealizeFont16(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform
  */
 WORD WINAPI EngineRealizeFontExt16(LONG l1, LONG l2, LONG l3, LONG l4)
 {
-    FIXME("(%08x,%08x,%08x,%08x),stub\n",l1,l2,l3,l4);
+    FIXME("(%08lx,%08lx,%08lx,%08lx),stub\n",l1,l2,l3,l4);

return 0;
 }
@@ -3668,7 +3668,7 @@ BOOL16 WINAPI SetLayout16( HDC16 hdc, DWORD layout )
  */
 BOOL16 WINAPI SetSolidBrush16(HBRUSH16 hBrush, COLORREF newColor )
 {
-    FIXME( "%04x %08x no longer supported\n", hBrush, newColor );
+    FIXME( "%04x %08lx no longer supported\n", hBrush, newColor );
     return FALSE;
 }

diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c
index b0e1e316008..b7c09b31821 100644
--- a/dlls/gdi.exe16/printdrv.c
+++ b/dlls/gdi.exe16/printdrv.c
@@ -355,7 +355,7 @@ INT16 WINAPI EndSpoolPage16(HPJOB16 hJob)
  */
 DWORD WINAPI GetSpoolJob16(int nOption, LONG param)
 {
-    TRACE("In GetSpoolJob param 0x%x noption %d\n",param, nOption);
+    TRACE("In GetSpoolJob param 0x%lx noption %d\n",param, nOption);
     return 0;
 }

@@ -509,7 +509,7 @@ DWORD WINAPI DrvSetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
             TRACE("profile %s\n",lpProfile);
     else
             TRACE("profile %p\n",lpProfile);
-    TRACE("lpType %08x\n",lpType);
+    TRACE("lpType %08lx\n",lpType);

if ((!lpPrinter) || (!lpProfile) ||
     (PtrToUlong(lpProfile) == INT_PD_DEFAULT_MODEL) || (HIWORD(lpProfile) &&