Eric Pouech : capi2032: Enable compilation with long types.
Alexandre Julliard
julliard at winehq.org
Thu May 12 15:55:50 CDT 2022
Module: wine
Branch: master
Commit: f8733138bd58871b2456ad6ee181143da9664f52
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8733138bd58871b2456ad6ee181143da9664f52
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Thu May 12 08:54:36 2022 +0200
capi2032: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/capi2032/Makefile.in | 1 -
dlls/capi2032/cap20wxx.c | 20 ++++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in
index cf9bf97ce5c..9e9ba285498 100644
--- a/dlls/capi2032/Makefile.in
+++ b/dlls/capi2032/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = capi2032.dll
UNIXLIB = capi2032.so
IMPORTLIB = capi2032
diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c
index 4983dc0e480..96007f51e96 100644
--- a/dlls/capi2032/cap20wxx.c
+++ b/dlls/capi2032/cap20wxx.c
@@ -55,7 +55,7 @@ DWORD WINAPI CAPI_REGISTER (DWORD MessageBufferSize, DWORD maxLogicalConnection,
DWORD fret;
fret = CAPI_CALL( register, ¶ms );
- TRACE ( "(%x) -> %x\n", *pApplID, fret);
+ TRACE ( "(%lx) -> %lx\n", *pApplID, fret);
return fret;
}
@@ -66,7 +66,7 @@ DWORD WINAPI CAPI_RELEASE (DWORD ApplID) {
DWORD fret;
fret = CAPI_CALL( release, ¶ms );
- TRACE ("(%x) -> %x\n", ApplID, fret);
+ TRACE ("(%lx) -> %lx\n", ApplID, fret);
return fret;
}
@@ -77,7 +77,7 @@ DWORD WINAPI CAPI_PUT_MESSAGE (DWORD ApplID, PVOID pCAPIMessage) {
DWORD fret;
fret = CAPI_CALL( put_message, ¶ms );
- TRACE ("(%x) -> %x\n", ApplID, fret);
+ TRACE ("(%lx) -> %lx\n", ApplID, fret);
return fret;
}
@@ -88,7 +88,7 @@ DWORD WINAPI CAPI_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage) {
DWORD fret;
fret = CAPI_CALL( get_message, ¶ms );
- TRACE ("(%x) -> %x\n", ApplID, fret);
+ TRACE ("(%lx) -> %lx\n", ApplID, fret);
return fret;
}
@@ -96,7 +96,7 @@ DWORD WINAPI CAPI_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage) {
\*---------------------------------------------------------------------------*/
DWORD WINAPI CAPI_WAIT_FOR_SIGNAL (DWORD ApplID) {
struct waitformessage_params params = { ApplID };
- TRACE ("(%x)\n", ApplID);
+ TRACE ("(%lx)\n", ApplID);
return CAPI_CALL( waitformessage, ¶ms );
}
@@ -111,7 +111,7 @@ DWORD WINAPI CAPI_GET_MANUFACTURER (char *SzBuffer) {
if (!strncmp (SzBuffer, "AVM", 3)) {
strcpy (SzBuffer, "AVM-GmbH");
}
- TRACE ("(%s) -> %x\n", SzBuffer, fret);
+ TRACE ("(%s) -> %lx\n", SzBuffer, fret);
return fret;
}
@@ -122,7 +122,7 @@ DWORD WINAPI CAPI_GET_VERSION (DWORD *pCAPIMajor, DWORD *pCAPIMinor, DWORD *pMan
DWORD fret;
fret = CAPI_CALL( get_version, ¶ms );
- TRACE ("(%x.%x,%x.%x) -> %x\n", *pCAPIMajor, *pCAPIMinor, *pManufacturerMajor,
+ TRACE ("(%lx.%lx,%lx.%lx) -> %lx\n", *pCAPIMajor, *pCAPIMinor, *pManufacturerMajor,
*pManufacturerMinor, fret);
return fret;
}
@@ -134,7 +134,7 @@ DWORD WINAPI CAPI_GET_SERIAL_NUMBER (char *SzBuffer) {
DWORD fret;
fret = CAPI_CALL( get_serial_number, ¶ms );
- TRACE ("(%s) -> %x\n", SzBuffer, fret);
+ TRACE ("(%s) -> %lx\n", SzBuffer, fret);
return fret;
}
@@ -145,7 +145,7 @@ DWORD WINAPI CAPI_GET_PROFILE (PVOID SzBuffer, DWORD CtlrNr) {
DWORD fret;
fret = CAPI_CALL( get_profile, ¶ms );
- TRACE ("(%x,%x) -> %x\n", CtlrNr, *(unsigned short *)SzBuffer, fret);
+ TRACE ("(%lx,%x) -> %lx\n", CtlrNr, *(unsigned short *)SzBuffer, fret);
return fret;
}
@@ -155,7 +155,7 @@ DWORD WINAPI CAPI_INSTALLED (void) {
DWORD fret;
fret = CAPI_CALL( isinstalled, NULL );
- TRACE ("() -> %x\n", fret);
+ TRACE ("() -> %lx\n", fret);
return fret;
}
More information about the wine-cvs
mailing list