ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sane.ds: Enable compilation with long types. 

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-17 07:12:15 +01:00 committed by Alexandre Julliard
parent 6714a290de
commit 6b6e863c52
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/sane.ds/Makefile.in
View File

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = sane.ds MODULE = sane.ds
UNIXLIB = sane.so UNIXLIB = sane.so
IMPORTS = comctl32 user32 gdi32 IMPORTS = comctl32 user32 gdi32

12
dlls/sane.ds/capability.c
View File

@ -198,7 +198,7 @@ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action
if (twCC == TWCC_SUCCESS) if (twCC == TWCC_SUCCESS)
{ {
activeDS.capXferMech = (TW_UINT16) val; activeDS.capXferMech = (TW_UINT16) val;
FIXME("Partial Stub: XFERMECH set to %d, but ignored\n", val); FIXME("Partial Stub: XFERMECH set to %ld, but ignored\n", val);
} }
break; break;
@ -242,7 +242,7 @@ static TW_UINT16 SANE_CAPXferCount (pTW_CAPABILITY pCapability, TW_UINT16 action
case MSG_SET: case MSG_SET:
twCC = msg_set(pCapability, &val); twCC = msg_set(pCapability, &val);
if (twCC == TWCC_SUCCESS) if (twCC == TWCC_SUCCESS)
FIXME("Partial Stub: XFERCOUNT set to %d, but ignored\n", val); FIXME("Partial Stub: XFERCOUNT set to %ld, but ignored\n", val);
break; break;
case MSG_GETDEFAULT: case MSG_GETDEFAULT:
@ -326,7 +326,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio
twCC = msg_set(pCapability, &val); twCC = msg_set(pCapability, &val);
if (twCC == TWCC_SUCCESS) if (twCC == TWCC_SUCCESS)
{ {
TRACE("Setting pixeltype to %d\n", val); TRACE("Setting pixeltype to %ld\n", val);
if (! pixeltype_to_sane_mode(val, mode, sizeof(mode))) if (! pixeltype_to_sane_mode(val, mode, sizeof(mode)))
return TWCC_BADVALUE; return TWCC_BADVALUE;
@ -493,7 +493,7 @@ static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 act
case MSG_SET: case MSG_SET:
twCC = msg_set(pCapability, &val); twCC = msg_set(pCapability, &val);
if (twCC == TWCC_SUCCESS) if (twCC == TWCC_SUCCESS)
FIXME("Partial Stub: COMPRESSION set to %d, but ignored\n", val); FIXME("Partial Stub: COMPRESSION set to %ld, but ignored\n", val);
break; break;
case MSG_GETDEFAULT: case MSG_GETDEFAULT:
@ -659,7 +659,7 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act
twCC = msg_set(pCapability, &val); twCC = msg_set(pCapability, &val);
if (twCC == TWCC_SUCCESS) if (twCC == TWCC_SUCCESS)
{ {
FIXME("Stub: PIXELFLAVOR set to %d, but ignored\n", val); FIXME("Stub: PIXELFLAVOR set to %ld, but ignored\n", val);
} }
break; break;
@ -822,7 +822,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16
if (supported_sizes[i].size == val) if (supported_sizes[i].size == val)
return set_width_height(supported_sizes[i].x, supported_sizes[i].y); return set_width_height(supported_sizes[i].x, supported_sizes[i].y);
ERR("Unsupported size %d\n", val); ERR("Unsupported size %ld\n", val);
twCC = TWCC_BADCAP; twCC = TWCC_BADCAP;
break; break;

2
dlls/sane.ds/ds_ctrl.c
View File

@ -176,7 +176,7 @@ TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin,
pTW_EVENT pEvent = (pTW_EVENT) pData; pTW_EVENT pEvent = (pTW_EVENT) pData;
MSG *pMsg = pEvent->pEvent; MSG *pMsg = pEvent->pEvent;
TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%lx\n", pMsg->message, pMsg->wParam); TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%Ix\n", pMsg->message, pMsg->wParam);
activeDS.twCC = TWCC_SUCCESS; activeDS.twCC = TWCC_SUCCESS;
pEvent->TWMessage = MSG_NULL; /* no message to the application */ pEvent->TWMessage = MSG_NULL; /* no message to the application */

4
dlls/sane.ds/sane_main.c
View File

@ -34,7 +34,7 @@ unixlib_handle_t sane_handle = 0;
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) switch (fdwReason)
{ {
@ -333,7 +333,7 @@ DS_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);
switch (DG) switch (DG)
{ {