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:
parent
6714a290de
commit
6b6e863c52
|
@ -1,4 +1,3 @@
|
|||
EXTRADEFS = -DWINE_NO_LONG_TYPES
|
||||
MODULE = sane.ds
|
||||
UNIXLIB = sane.so
|
||||
IMPORTS = comctl32 user32 gdi32
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue