From 773bdcf7decd0bbbafa9b117535917def5732d91 Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Wed, 16 Feb 2022 08:11:52 +0100 Subject: [PATCH] odbc32: Enable compilation with long types. Signed-off-by: Eric Pouech Signed-off-by: Alexandre Julliard --- dlls/odbc32/Makefile.in | 1 - dlls/odbc32/proxyodbc.c | 34 +++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index 75ac6d1f309..def7b4b5d67 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = odbc32.dll UNIXLIB = odbc32.so IMPORTLIB = odbc32 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 573a5b280a2..c1cb44c29fc 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -107,14 +107,14 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) if ((reg_ret = RegSetValueExA (hDrivers, desc, 0, REG_SZ, (const BYTE *)"Installed", 10)) != ERROR_SUCCESS) { - TRACE ("Error %d replicating driver %s\n", + TRACE ("Error %ld replicating driver %s\n", reg_ret, desc); success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { - TRACE ("Error %d checking for %s in drivers\n", + TRACE ("Error %ld checking for %s in drivers\n", reg_ret, desc); success = FALSE; } @@ -131,12 +131,12 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) */ if ((reg_ret = RegCloseKey (hThis)) != ERROR_SUCCESS) - TRACE ("Error %d closing %s key\n", reg_ret, + TRACE ("Error %ld closing %s key\n", reg_ret, desc); } else { - TRACE ("Error %d ensuring driver key %s\n", + TRACE ("Error %ld ensuring driver key %s\n", reg_ret, desc); success = FALSE; } @@ -155,21 +155,21 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) } if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) { - TRACE ("Error %d closing hDrivers\n", reg_ret); + TRACE ("Error %ld closing hDrivers\n", reg_ret); } } else { - TRACE ("Error %d opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret); + TRACE ("Error %ld opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret); } if ((reg_ret = RegCloseKey (hODBCInst)) != ERROR_SUCCESS) { - TRACE ("Error %d closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + TRACE ("Error %ld closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); } } else { - TRACE ("Error %d opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + TRACE ("Error %ld opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); } if (!success) { @@ -242,26 +242,26 @@ static void ODBC_ReplicateODBCToRegistry (BOOL is_user, SQLHENV hEnv) if ((reg_ret = RegSetValueExA (hDSN, DRIVERKEY, 0, REG_SZ, (LPBYTE)desc, sizedesc)) != ERROR_SUCCESS) { - TRACE ("Error %d replicating description of " + TRACE ("Error %ld replicating description of " "%s(%s)\n", reg_ret, dsn, desc); success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { - TRACE ("Error %d checking for description of %s\n", + TRACE ("Error %ld checking for description of %s\n", reg_ret, dsn); success = FALSE; } if ((reg_ret = RegCloseKey (hDSN)) != ERROR_SUCCESS) { - TRACE ("Error %d closing %s DSN key %s\n", + TRACE ("Error %ld closing %s DSN key %s\n", reg_ret, which, dsn); } } else { - TRACE ("Error %d opening %s DSN key %s\n", + TRACE ("Error %ld opening %s DSN key %s\n", reg_ret, which, dsn); success = FALSE; } @@ -281,13 +281,13 @@ static void ODBC_ReplicateODBCToRegistry (BOOL is_user, SQLHENV hEnv) } if ((reg_ret = RegCloseKey (hODBC)) != ERROR_SUCCESS) { - TRACE ("Error %d closing %s ODBC.INI registry key\n", reg_ret, + TRACE ("Error %ld closing %s ODBC.INI registry key\n", reg_ret, which); } } else { - TRACE ("Error %d creating/opening %s ODBC.INI registry key\n", + TRACE ("Error %ld creating/opening %s ODBC.INI registry key\n", reg_ret, which); } if (!success) @@ -421,7 +421,7 @@ SQLRETURN WINAPI SQLAllocHandleStd(SQLSMALLINT HandleType, SQLHANDLE InputHandle static const char *debugstr_sqllen( SQLLEN len ) { #ifdef _WIN64 - return wine_dbg_sprintf( "%ld", len ); + return wine_dbg_sprintf( "%Id", len ); #else return wine_dbg_sprintf( "%d", len ); #endif @@ -448,7 +448,7 @@ SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, static const char *debugstr_sqlulen( SQLULEN len ) { #ifdef _WIN64 - return wine_dbg_sprintf( "%lu", len ); + return wine_dbg_sprintf( "%Iu", len ); #else return wine_dbg_sprintf( "%u", len ); #endif @@ -2648,7 +2648,7 @@ SQLRETURN WINAPI SQLGetDiagRecA(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { - TRACE("proxy ODBC: %p,%x,%p\n", hinstDLL, reason, reserved); + TRACE("proxy ODBC: %p,%lx,%p\n", hinstDLL, reason, reserved); switch (reason) {