Eric Pouech : mspatcha: Enable compilation with long types.

[Alexandre Julliard]

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

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Tue Feb 15 07:30:11 2022 +0100

mspatcha: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mspatcha/Makefile.in     |  1 -
 dlls/mspatcha/mspatcha_main.c | 10 +++++-----
 dlls/mspatcha/pa19.c          |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in
index 7c09b4c17c3..89d6367b39d 100644
--- a/dlls/mspatcha/Makefile.in
+++ b/dlls/mspatcha/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = mspatcha.dll
 IMPORTLIB = mspatcha
 
diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c
index c96cb01b549..1f6653da161 100644
--- a/dlls/mspatcha/mspatcha_main.c
+++ b/dlls/mspatcha/mspatcha_main.c
@@ -212,7 +212,7 @@ BOOL WINAPI GetFilePatchSignatureA(LPCSTR filename, ULONG flags, PVOID data, ULO
     PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count,
     PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer)
 {
-    FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_a(filename), flags, data,
+    FIXME("stub - %s, %lx, %p, %lu, %p, %lu, %p, %lu, %p\n", debugstr_a(filename), flags, data,
         ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
@@ -225,7 +225,7 @@ BOOL WINAPI GetFilePatchSignatureW(LPCWSTR filename, ULONG flags, PVOID data, UL
     PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count,
     PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPWSTR buffer)
 {
-    FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_w(filename), flags, data,
+    FIXME("stub - %s, %lx, %p, %lu, %p, %lu, %p, %lu, %p\n", debugstr_w(filename), flags, data,
         ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
@@ -238,7 +238,7 @@ BOOL WINAPI GetFilePatchSignatureByHandle(HANDLE handle, ULONG flags, PVOID opti
     PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count,
     PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer)
 {
-    FIXME("stub - %p, %x, %p, %u, %p, %u, %p, %u, %p\n", handle, flags, options,
+    FIXME("stub - %p, %lx, %p, %lu, %p, %lu, %p, %lu, %p\n", handle, flags, options,
         ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
@@ -252,7 +252,7 @@ BOOL WINAPI GetFilePatchSignatureByBuffer(PBYTE file_buf, ULONG file_size, ULONG
     ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range,
     ULONG bufsize, LPSTR buffer)
 {
-    FIXME("stub - %p, %u, %x, %p, %u, %p, %u, %p, %u, %p\n", file_buf, file_size, flags, options,
+    FIXME("stub - %p, %lu, %lx, %p, %lu, %p, %lu, %p, %lu, %p\n", file_buf, file_size, flags, options,
         ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
@@ -265,7 +265,7 @@ INT WINAPI NormalizeFileForPatchSignature(PVOID file_buffer, ULONG file_size, UL
     ULONG new_coff_base, ULONG new_coff_time, ULONG ignore_range_count, PPATCH_IGNORE_RANGE ignore_range,
     ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range)
 {
-    FIXME("stub - %p, %u, %x, %p, %u, %u, %u, %p, %u, %p\n", file_buffer, file_size, flags, options, new_coff_base,
+    FIXME("stub - %p, %lu, %lx, %p, %lu, %lu, %lu, %p, %lu, %p\n", file_buffer, file_size, flags, options, new_coff_base,
         new_coff_time, ignore_range_count, ignore_range, retain_range_count, retain_range);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return 0;
diff --git a/dlls/mspatcha/pa19.c b/dlls/mspatcha/pa19.c
index 0ed60f49815..dc6ef79e2b2 100644
--- a/dlls/mspatcha/pa19.c
+++ b/dlls/mspatcha/pa19.c
@@ -278,7 +278,7 @@ static int read_header(struct patch_file_header *ph, const BYTE *buf, size_t siz
     ph->flags = read_raw_uint32(ph);
     if ((ph->flags & PATCH_OPTION_SUPPORTED_FLAGS) != ph->flags)
     {
-        FIXME("unsupported option flag(s): 0x%08x\n", ph->flags & ~PATCH_OPTION_SUPPORTED_FLAGS);
+        FIXME("unsupported option flag(s): 0x%08lx\n", ph->flags & ~PATCH_OPTION_SUPPORTED_FLAGS);
         ph->err = ERROR_PATCH_PACKAGE_UNSUPPORTED;
         return -1;
     }