https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64106410255d4c0a00b3ba...
commit 64106410255d4c0a00b3bae90a01d47f92d19573 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sun Nov 10 14:10:08 2019 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sun Nov 10 14:10:08 2019 +0100
[ODBCCP32] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/odbccp32/odbccp32.c | 13 ++++++------- media/doc/README.WINE | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dll/win32/odbccp32/odbccp32.c b/dll/win32/odbccp32/odbccp32.c index ae2fe9c35cf..5debf2d2307 100644 --- a/dll/win32/odbccp32/odbccp32.c +++ b/dll/win32/odbccp32/odbccp32.c @@ -30,7 +30,6 @@ #include "winreg.h" #include "winnls.h" #include "sqlext.h" -#include "wine/unicode.h" #ifdef __REACTOS__ #undef TRACE_ON #endif @@ -292,7 +291,7 @@ static HMODULE load_config_driver(const WCHAR *driver) if(ret != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, filename); - push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); return NULL; }
@@ -320,7 +319,7 @@ static BOOL write_config_value(const WCHAR *driver, const WCHAR *args) { WCHAR *divider, *value;
- name = heap_alloc( (strlenW(args) + 1) * sizeof(WCHAR)); + name = heap_alloc( (lstrlenW(args) + 1) * sizeof(WCHAR)); if(!name) { push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); @@ -328,7 +327,7 @@ static BOOL write_config_value(const WCHAR *driver, const WCHAR *args) } lstrcpyW(name, args);
- divider = strchrW(name,'='); + divider = wcschr(name,'='); if(!divider) { push_error(ODBC_ERROR_INVALID_KEYWORD_VALUE, odbc_error_invalid_keyword); @@ -340,7 +339,7 @@ static BOOL write_config_value(const WCHAR *driver, const WCHAR *args)
TRACE("Write pair: %s = %s\n", debugstr_w(name), debugstr_w(value)); if(RegSetValueExW(hkeydriver, name, 0, REG_SZ, (BYTE*)value, - (strlenW(value)+1) * sizeof(WCHAR)) != ERROR_SUCCESS) + (lstrlenW(value)+1) * sizeof(WCHAR)) != ERROR_SUCCESS) ERR("Failed to write registry installed key\n"); heap_free(name);
@@ -863,7 +862,7 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons
for (; *p; p += lstrlenW(p) + 1) { - WCHAR *divider = strchrW(p,'='); + WCHAR *divider = wcschr(p,'=');
if (divider) { @@ -1522,7 +1521,7 @@ BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN) clear_errors(); TRACE("%s\n", debugstr_w(lpszDSN));
- if(strlenW(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrkW(lpszDSN, invalid) != NULL) + if(lstrlenW(lpszDSN) > SQL_MAX_DSN_LENGTH || wcspbrk(lpszDSN, invalid) != NULL) { return FALSE; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 07846b56cd3..352ad732cf6 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -139,7 +139,7 @@ dll/win32/npptools # Synced to WineStaging-4.18 dll/win32/ntdsapi # Synced to WineStaging-4.18 dll/win32/objsel # Synced to WineStaging-4.18 dll/win32/odbc32 # Synced to WineStaging-4.18. Depends on port of Linux ODBC. -dll/win32/odbccp32 # Synced to WineStaging-4.0 +dll/win32/odbccp32 # Synced to WineStaging-4.18 dll/win32/ole32 # Synced to WineStaging-4.0 dll/win32/oleacc # Synced to WineStaging-4.0 dll/win32/oleaut32 # Synced to WineStaging-4.0
-
Amine Khaldi