Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/sane.ds/Makefile.in | 1 - dlls/sane.ds/capability.c | 12 ++++++------ dlls/sane.ds/ds_ctrl.c | 2 +- dlls/sane.ds/sane_main.c | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index 9c4931a0b54..59ceeda3fac 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sane.ds UNIXLIB = sane.so IMPORTS = comctl32 user32 gdi32 diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 8c0922ca176..15ca4ea740a 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -198,7 +198,7 @@ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action if (twCC == TWCC_SUCCESS) { 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;
@@ -242,7 +242,7 @@ static TW_UINT16 SANE_CAPXferCount (pTW_CAPABILITY pCapability, TW_UINT16 action case MSG_SET: twCC = msg_set(pCapability, &val); 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;
case MSG_GETDEFAULT: @@ -326,7 +326,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio twCC = msg_set(pCapability, &val); 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))) return TWCC_BADVALUE;
@@ -493,7 +493,7 @@ static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 act case MSG_SET: twCC = msg_set(pCapability, &val); 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;
case MSG_GETDEFAULT: @@ -659,7 +659,7 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act twCC = msg_set(pCapability, &val); 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;
@@ -822,7 +822,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 if (supported_sizes[i].size == val) 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; break;
diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 915f085a481..79c268a36ae 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -176,7 +176,7 @@ TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin, pTW_EVENT pEvent = (pTW_EVENT) pData; 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; pEvent->TWMessage = MSG_NULL; /* no message to the application */ diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 48972bd4b8c..832c333ae57 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -34,7 +34,7 @@ unixlib_handle_t sane_handle = 0;
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) { @@ -333,7 +333,7 @@ DS_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);
switch (DG) {