Commit f2eac52c authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

twain_32: Enable compilation with long types.

parent 56f0485d
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = twain_32.dll MODULE = twain_32.dll
IMPORTS = user32 IMPORTS = user32
......
...@@ -427,7 +427,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) ...@@ -427,7 +427,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData)
userselect_data param = {pOrigin, pData}; userselect_data param = {pOrigin, pData};
HWND parent = DSM_parent; 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)); pOrigin->SupportedGroups, wine_dbgstr_a(param.result->ProductName));
twain_autodetect(); twain_autodetect();
......
...@@ -35,7 +35,7 @@ HINSTANCE DSM_hinstance; ...@@ -35,7 +35,7 @@ HINSTANCE DSM_hinstance;
BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) 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) switch (reason)
{ {
...@@ -158,7 +158,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, ...@@ -158,7 +158,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
{ {
TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ 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) if (DG == DG_CONTROL && DAT == DAT_NULL)
{ {
...@@ -199,7 +199,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, ...@@ -199,7 +199,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
} }
DSM_twCC = TWCC_SUCCESS; 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); twRC = pSource->dsEntry(pOrigin, DG, DAT, MSG, pData);
TRACE("return value is %d\n", twRC); TRACE("return value is %d\n", twRC);
return twRC; return twRC;
...@@ -210,7 +210,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, ...@@ -210,7 +210,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
twRC = TWAIN_SourceManagerHandler (pOrigin, DAT, MSG, pData); twRC = TWAIN_SourceManagerHandler (pOrigin, DAT, MSG, pData);
break; break;
default: 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; DSM_twCC = TWCC_BADPROTOCOL;
twRC = TWRC_FAILURE; twRC = TWRC_FAILURE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment