system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 05:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

include: Change twain.h to use LONG/ULONG for Win64 compatibility.

Browse source 
Also fix the compiler warnings introduced by this change.
This commit is contained in:
Michael Stefaniuc 2009-01-06 00:09:48 +01:00 committed by Alexandre Julliard
parent 9896cb4ea6
commit 54b6a42a0a
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/gphoto2.ds/capability.c
View file

@ -195,7 +195,7 @@ static TW_BOOL GPHOTO2_OneValueSet32 (pTW_CAPABILITY pCapability, TW_UINT32 valu
{ {
pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE));
TRACE("-> %ld\n", value); TRACE("-> %d\n", value);
if (pCapability->hContainer) if (pCapability->hContainer)
{ {
@ -258,7 +258,7 @@ static TW_BOOL GPHOTO2_EnumGet16 (pTW_CAPABILITY pCapability, int *nrofvalues, T
*nrofvalues = pVal->NumItems; *nrofvalues = pVal->NumItems;
*values = HeapAlloc( GetProcessHeap(), 0, sizeof(TW_UINT16)*pVal->NumItems); *values = HeapAlloc( GetProcessHeap(), 0, sizeof(TW_UINT16)*pVal->NumItems);
memcpy (*values, pVal->ItemList, sizeof(TW_UINT16)*(*nrofvalues)); memcpy (*values, pVal->ItemList, sizeof(TW_UINT16)*(*nrofvalues));
FIXME("Current Index %ld, Default Index %ld\n", pVal->CurrentIndex, pVal->DefaultIndex); FIXME("Current Index %d, Default Index %d\n", pVal->CurrentIndex, pVal->DefaultIndex);
GlobalUnlock (pCapability->hContainer); GlobalUnlock (pCapability->hContainer);
return TRUE; return TRUE;
} }
@ -310,7 +310,7 @@ static TW_UINT16 GPHOTO2_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 act
if (!GPHOTO2_OneValueGet32 (pCapability, &xfermechtemp)) if (!GPHOTO2_OneValueGet32 (pCapability, &xfermechtemp))
return TWCC_LOWMEMORY; return TWCC_LOWMEMORY;
activeDS.capXferMech = xfermechtemp; activeDS.capXferMech = xfermechtemp;
TRACE("xfermech is %ld\n", xfermechtemp); TRACE("xfermech is %d\n", xfermechtemp);
return TWCC_SUCCESS; return TWCC_SUCCESS;
} }
else if (pCapability->ConType == TWON_ENUMERATION) else if (pCapability->ConType == TWON_ENUMERATION)

6
dlls/gphoto2.ds/gphoto2_main.c
View file

@ -343,7 +343,7 @@ static TW_UINT16 GPHOTO2_PendingXfersEndXfer (pTW_IDENTITY pOrigin,
if (file->download) if (file->download)
count++; count++;
} }
TRACE("count = %ld\n", count); TRACE("count = %d\n", count);
pPendingXfers->Count = count; pPendingXfers->Count = count;
if (pPendingXfers->Count != 0) { if (pPendingXfers->Count != 0) {
activeDS.currentState = 6; activeDS.currentState = 6;
@ -379,7 +379,7 @@ static TW_UINT16 GPHOTO2_PendingXfersGet (pTW_IDENTITY pOrigin,
if (file->download) if (file->download)
count++; count++;
} }
TRACE("count = %ld\n", count); TRACE("count = %d\n", count);
pPendingXfers->Count = count; pPendingXfers->Count = count;
activeDS.twCC = TWCC_SUCCESS; activeDS.twCC = TWCC_SUCCESS;
return TWRC_SUCCESS; return TWRC_SUCCESS;
@ -1002,7 +1002,7 @@ DS_Entry ( pTW_IDENTITY pOrigin,
{ {
TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */
TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG);
switch (DG) switch (DG)
{ {

2
dlls/sane.ds/sane_main.c
View file

@ -543,7 +543,7 @@ DS_Entry ( pTW_IDENTITY pOrigin,
{ {
TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */
TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG);
switch (DG) switch (DG)
{ {

6
dlls/twain_32/twain32_main.c
View file

@ -159,7 +159,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
{ {
TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */
TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG);
if (pDest) if (pDest)
{ {
@ -172,7 +172,7 @@ DSM_Entry (pTW_IDENTITY pOrigin,
return TWRC_FAILURE; return TWRC_FAILURE;
} }
DSM_twCC = TWCC_SUCCESS; DSM_twCC = TWCC_SUCCESS;
TRACE("Forwarding %ld/%d/%d/%p to DS.\n", DG, DAT, MSG, pData); TRACE("Forwarding %d/%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;
@ -183,7 +183,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 %ld\n", DG); FIXME("The DSM does not handle DG %d\n", DG);
DSM_twCC = TWCC_BADPROTOCOL; DSM_twCC = TWCC_BADPROTOCOL;
twRC = TWRC_FAILURE; twRC = TWRC_FAILURE;
} }

4
include/twain.h
View file

@ -127,10 +127,10 @@ typedef char TW_STR255[256], FAR *pTW_STR255;
/* Numeric types. */ /* Numeric types. */
typedef char TW_INT8, FAR *pTW_INT8; typedef char TW_INT8, FAR *pTW_INT8;
typedef short TW_INT16, FAR *pTW_INT16; typedef short TW_INT16, FAR *pTW_INT16;
typedef long TW_INT32, FAR *pTW_INT32; typedef LONG TW_INT32, FAR *pTW_INT32;
typedef unsigned char TW_UINT8, FAR *pTW_UINT8; typedef unsigned char TW_UINT8, FAR *pTW_UINT8;
typedef unsigned short TW_UINT16, FAR *pTW_UINT16; typedef unsigned short TW_UINT16, FAR *pTW_UINT16;
typedef unsigned long TW_UINT32, FAR *pTW_UINT32; typedef ULONG TW_UINT32, FAR *pTW_UINT32;
typedef unsigned short TW_BOOL, FAR *pTW_BOOL; typedef unsigned short TW_BOOL, FAR *pTW_BOOL;
/* Fixed point structure type. */ /* Fixed point structure type. */