Skip to content

W
wine-winehq
Commit 773bdcf7 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

odbc32: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 06111f34
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 18 deletions
dlls/odbc32/Makefile.in
View file @ 773bdcf7
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = odbc32.dll
UNIXLIB = odbc32.so
IMPORTLIB = odbc32
......
dlls/odbc32/proxyodbc.c
View file @ 773bdcf7
......@@ -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)
{
......
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