Author: akhaldi Date: Wed Apr 23 14:53:41 2014 New Revision: 62921
URL: http://svn.reactos.org/svn/reactos?rev=62921&view=rev Log: [ODBC32] * Sync with Wine 1.7.17. CORE-8080
Modified: trunk/reactos/dll/win32/odbc32/proxyodbc.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/odbc32/proxyodbc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/proxyodbc.... ============================================================================== --- trunk/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] Wed Apr 23 14:53:41 2014 @@ -199,9 +199,9 @@ { HKEY hODBCInst; LONG reg_ret; - int success; - - success = 0; + BOOL success; + + success = FALSE; TRACE ("Driver settings are not currently replicated to the registry\n"); if ((reg_ret = RegCreateKeyExA (HKEY_LOCAL_MACHINE, "Software\ODBC\ODBCINST.INI", 0, NULL, @@ -220,7 +220,7 @@ CHAR desc [256]; SQLSMALLINT sizedesc;
- success = 1; + success = TRUE; dirn = SQL_FETCH_FIRST; while ((sql_ret = SQLDrivers (hEnv, dirn, (SQLCHAR*)desc, sizeof(desc), &sizedesc, NULL, 0, NULL)) == SQL_SUCCESS || @@ -239,14 +239,14 @@ { TRACE ("Error %d replicating driver %s\n", reg_ret, desc); - success = 0; + success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { TRACE ("Error %d checking for %s in drivers\n", reg_ret, desc); - success = 0; + success = FALSE; } if ((reg_ret = RegCreateKeyExA (hODBCInst, desc, 0, NULL, REG_OPTION_NON_VOLATILE, @@ -268,20 +268,20 @@ { TRACE ("Error %d ensuring driver key %s\n", reg_ret, desc); - success = 0; + success = FALSE; } } else { WARN ("Unusually long driver name %s not replicated\n", desc); - success = 0; + success = FALSE; } } if (sql_ret != SQL_NO_DATA) { TRACE ("Error %d enumerating drivers\n", (int)sql_ret); - success = 0; + success = FALSE; } if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) { @@ -327,7 +327,7 @@ * that this will add a requirement that this function be called after * ODBC_ReplicateODBCInstToRegistry) */ -static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) +static void ODBC_ReplicateODBCToRegistry (BOOL is_user, SQLHENV hEnv) { HKEY hODBC; LONG reg_ret; @@ -337,17 +337,17 @@ SQLSMALLINT sizedsn; CHAR desc [256]; SQLSMALLINT sizedesc; - int success; + BOOL success; const char *which = is_user ? "user" : "system";
- success = 0; + success = FALSE; if ((reg_ret = RegCreateKeyExA ( is_user ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, "Software\ODBC\ODBC.INI", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS /* a couple more than we need */, NULL, &hODBC, NULL)) == ERROR_SUCCESS) { - success = 1; + success = TRUE; dirn = is_user ? SQL_FETCH_FIRST_USER : SQL_FETCH_FIRST_SYSTEM; while ((sql_ret = SQLDataSources (hEnv, dirn, (SQLCHAR*)dsn, sizeof(dsn), &sizedsn, @@ -374,14 +374,14 @@ { TRACE ("Error %d replicating description of " "%s(%s)\n", reg_ret, dsn, desc); - success = 0; + success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { TRACE ("Error %d checking for description of %s\n", reg_ret, dsn); - success = 0; + success = FALSE; } if ((reg_ret = RegCloseKey (hDSN)) != ERROR_SUCCESS) { @@ -393,21 +393,21 @@ { TRACE ("Error %d opening %s DSN key %s\n", reg_ret, which, dsn); - success = 0; + success = FALSE; } } else { WARN ("Unusually long %s data source name %s (%s) not " "replicated\n", which, dsn, desc); - success = 0; + success = FALSE; } } if (sql_ret != SQL_NO_DATA) { TRACE ("Error %d enumerating %s datasources\n", (int)sql_ret, which); - success = 0; + success = FALSE; } if ((reg_ret = RegCloseKey (hODBC)) != ERROR_SUCCESS) { @@ -452,8 +452,8 @@ if ((sql_ret = SQLAllocEnv (&hEnv)) == SQL_SUCCESS) { ODBC_ReplicateODBCInstToRegistry (hEnv); - ODBC_ReplicateODBCToRegistry (0 /* system dsns */, hEnv); - ODBC_ReplicateODBCToRegistry (1 /* user dsns */, hEnv); + ODBC_ReplicateODBCToRegistry (FALSE /* system dsns */, hEnv); + ODBC_ReplicateODBCToRegistry (TRUE /* user dsns */, hEnv);
if ((sql_ret = SQLFreeEnv (hEnv)) != SQL_SUCCESS) { @@ -1986,7 +1986,7 @@ return pSQLSetScrollOptions(statement_handle, f_concurrency, crow_keyset, crow_rowset); }
-static int SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) +static BOOL SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) { static const SQLUSMALLINT attrList[] = { @@ -2011,9 +2011,9 @@ unsigned int i;
for (i = 0; i < sizeof(attrList) / sizeof(SQLUSMALLINT); i++) { - if (attrList[i] == fDescType) return 1; + if (attrList[i] == fDescType) return TRUE; } - return 0; + return FALSE; }
/*************************************************************************
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 23 14:53:41 2014 @@ -143,7 +143,7 @@ reactos/dll/win32/ntdsapi # Synced to Wine-1.7.1 reactos/dll/win32/ntprint # Synced to Wine-1.7.1 reactos/dll/win32/objsel # Synced to Wine-1.7.1 -reactos/dll/win32/odbc32 # Synced to Wine-1.7.1. Depends on port of Linux ODBC. +reactos/dll/win32/odbc32 # Synced to Wine-1.7.17. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to Wine-1.7.1 reactos/dll/win32/ole32 # Synced to Wine-1.7.1 reactos/dll/win32/oleacc # Synced to Wine-1.7.1