Eric Pouech : reg: Enable compilation with long types.

[Alexandre Julliard]

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

Author: Eric Pouech 
Date:   Fri Feb  4 09:57:29 2022 +0100

reg: Enable compilation with long types.

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

---

programs/reg/Makefile.in | 1 -
 programs/reg/import.c    | 2 +-
 programs/reg/reg.c       | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in
index 635ac7751a4..d7e4e4b65ce 100644
--- a/programs/reg/Makefile.in
+++ b/programs/reg/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = reg.exe
 IMPORTS   = advapi32
 DELAYIMPORTS = user32
diff --git a/programs/reg/import.c b/programs/reg/import.c
index 36d148ca395..6da0148ba3e 100644
--- a/programs/reg/import.c
+++ b/programs/reg/import.c
@@ -838,7 +838,7 @@ invalid:
 /* handler for parser UNKNOWN_DATA state */
 static WCHAR *unknown_data_state(struct parser *parser, WCHAR *pos)
 {
-    FIXME("Unknown registry data type [0x%x]\n", parser->data_type);
+    FIXME("Unknown registry data type [0x%lx]\n", parser->data_type);

set_state(parser, LINE_START);
     return pos;
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 1af63498b05..16c05f958c7 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -81,7 +81,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args)
                          fmt, 0, 0, (WCHAR *)&str, 0, &va_args);
     if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE)
     {
-        WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt));
+        WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt));
         return;
     }
     output_writeconsole(str, len);
@@ -96,7 +96,7 @@ void WINAPIV output_message(unsigned int id, ...)

if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0)))
     {
-        WINE_FIXME("LoadString failed with %d\n", GetLastError());
+        WINE_FIXME("LoadString failed with %ld\n", GetLastError());
         return;
     }