Commit 1bd306c8 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

gphoto2.ds: Enable compilation with long types.

parent e7857fb5
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = gphoto2.ds MODULE = gphoto2.ds
UNIXLIB = gphoto2.so UNIXLIB = gphoto2.so
IMPORTS = $(JPEG_PE_LIBS) comctl32 user32 gdi32 advapi32 IMPORTS = $(JPEG_PE_LIBS) comctl32 user32 gdi32 advapi32
......
...@@ -187,7 +187,7 @@ static TW_BOOL GPHOTO2_OneValueSet32 (pTW_CAPABILITY pCapability, TW_UINT32 valu ...@@ -187,7 +187,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("-> %d\n", value); TRACE("-> %ld\n", value);
if (pCapability->hContainer) if (pCapability->hContainer)
{ {
...@@ -250,7 +250,7 @@ static TW_BOOL GPHOTO2_EnumGet16 (pTW_CAPABILITY pCapability, int *nrofvalues, T ...@@ -250,7 +250,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 %d, Default Index %d\n", pVal->CurrentIndex, pVal->DefaultIndex); FIXME("Current Index %ld, Default Index %ld\n", pVal->CurrentIndex, pVal->DefaultIndex);
GlobalUnlock (pCapability->hContainer); GlobalUnlock (pCapability->hContainer);
return TRUE; return TRUE;
} }
...@@ -302,7 +302,7 @@ static TW_UINT16 GPHOTO2_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 act ...@@ -302,7 +302,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 %d\n", xfermechtemp); TRACE("xfermech is %ld\n", xfermechtemp);
return TWCC_SUCCESS; return TWCC_SUCCESS;
} }
else if (pCapability->ConType == TWON_ENUMERATION) else if (pCapability->ConType == TWON_ENUMERATION)
......
...@@ -481,7 +481,7 @@ unixlib_handle_t gphoto2_handle = 0; ...@@ -481,7 +481,7 @@ unixlib_handle_t gphoto2_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)
{ {
...@@ -943,7 +943,7 @@ DS_Entry ( pTW_IDENTITY pOrigin, ...@@ -943,7 +943,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)
{ {
......
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