Eric Pouech : commdlg.dll16: Enable compilation with long types.

[Alexandre Julliard]

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

Author: Eric Pouech 
Date:   Wed Feb  9 09:25:32 2022 +0100

commdlg.dll16: Enable compilation with long types.

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

---

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

diff --git a/dlls/commdlg.dll16/Makefile.in b/dlls/commdlg.dll16/Makefile.in
index 1b2e19d09e3..69731147d07 100644
--- a/dlls/commdlg.dll16/Makefile.in
+++ b/dlls/commdlg.dll16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = commdlg.dll16
 IMPORTS   = comdlg32 user32 gdi32
 EXTRADLLFLAGS = -m16 -Wb,--main-module,comdlg32.dll
diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c
index 0a4dad4a37a..5ad67a4a91f 100644
--- a/dlls/commdlg.dll16/filedlg.c
+++ b/dlls/commdlg.dll16/filedlg.c
@@ -218,7 +218,7 @@ static LRESULT call_hook16( WNDPROC16 hook, HWND hwnd, UINT msg, WPARAM wp, LPAR
     CONTEXT context;
     WORD params[5];

-    TRACE( "%p: %p %08x %lx %lx: stub\n", hook, hwnd, msg, wp, lp );
+    TRACE( "%p: %p %08x %x %lx: stub\n", hook, hwnd, msg, wp, lp );

memset( &context, 0, sizeof(context) );
     context.SegDs = context.SegEs = CURRENT_SS;
diff --git a/dlls/commdlg.dll16/fontdlg.c b/dlls/commdlg.dll16/fontdlg.c
index b7c87fd7361..79efb3a292f 100644
--- a/dlls/commdlg.dll16/fontdlg.c
+++ b/dlls/commdlg.dll16/fontdlg.c
@@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics,
                                    UINT16 nFontType, LPARAM lParam )
 {
-    FIXME( "%08x %08x %u %lx\n", logfont, metrics, nFontType, lParam );
+    FIXME( "%08lx %08lx %u %lx\n", logfont, metrics, nFontType, lParam );
     return 0;
 }

@@ -53,7 +53,7 @@ INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics,
 INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics,
                                   UINT16 nFontType, LPARAM lParam )
 {
-    FIXME( "%08x %08x %u %lx\n", logfont, metrics, nFontType, lParam );
+    FIXME( "%08lx %08lx %u %lx\n", logfont, metrics, nFontType, lParam );
     return 0;
 }