Eric Pouech : twain_32: Enable compilation with long types.

[Alexandre Julliard]

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

Author: Eric Pouech 
Date:   Fri Feb 18 09:17:40 2022 +0100

twain_32: Enable compilation with long types.

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

---

dlls/twain_32/Makefile.in    | 1 -
 dlls/twain_32/dsm_ctrl.c     | 2 +-
 dlls/twain_32/twain32_main.c | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in
index 8919b82000a..c82b5a74453 100644
--- a/dlls/twain_32/Makefile.in
+++ b/dlls/twain_32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = twain_32.dll
 IMPORTS   = user32

diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c
index f8ec539ba85..6854093017a 100644
--- a/dlls/twain_32/dsm_ctrl.c
+++ b/dlls/twain_32/dsm_ctrl.c
@@ -427,7 +427,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData)
     userselect_data param = {pOrigin, pData};
     HWND parent = DSM_parent;

-    TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n",
+    TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%lx ProductName=%s\n",
         pOrigin->SupportedGroups, wine_dbgstr_a(param.result->ProductName));

twain_autodetect();
diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c
index 0f8ee144306..a8b11a9bbfe 100644
--- a/dlls/twain_32/twain32_main.c
+++ b/dlls/twain_32/twain32_main.c
@@ -35,7 +35,7 @@ HINSTANCE DSM_hinstance;

BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved)
 {
-    TRACE("%p,%x,%p\n", hinstance, reason, reserved);
+    TRACE("%p,%lx,%p\n", hinstance, reason, reserved);

switch (reason)
     {
@@ -158,7 +158,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
 {
     TW_UINT16 twRC = TWRC_SUCCESS;  /* Return Code */

-    TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG);
+    TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG);

if (DG == DG_CONTROL && DAT == DAT_NULL)
     {
@@ -199,7 +199,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
         }

DSM_twCC = TWCC_SUCCESS;
-        TRACE("Forwarding %d/%d/%d/%p to DS.\n", DG, DAT, MSG, pData);
+        TRACE("Forwarding %ld/%d/%d/%p to DS.\n", DG, DAT, MSG, pData);
    twRC = pSource->dsEntry(pOrigin, DG, DAT, MSG, pData);
    TRACE("return value is %d\n", twRC);
    return twRC;
@@ -210,7 +210,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
             twRC = TWAIN_SourceManagerHandler (pOrigin, DAT, MSG, pData);
             break;
         default:
-            FIXME("The DSM does not handle DG %d\n", DG);
+            FIXME("The DSM does not handle DG %ld\n", DG);
             DSM_twCC = TWCC_BADPROTOCOL;
             twRC = TWRC_FAILURE;
     }