#include "winreg.h"
#include "winnls.h"
#include "sqlext.h"
-#include "wine/unicode.h"
#ifdef __REACTOS__
#undef TRACE_ON
#endif
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;
}
{
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);
}
lstrcpyW(name, args);
- divider = strchrW(name,'=');
+ divider = wcschr(name,'=');
if(!divider)
{
push_error(ODBC_ERROR_INVALID_KEYWORD_VALUE, odbc_error_invalid_keyword);
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);
for (; *p; p += lstrlenW(p) + 1)
{
- WCHAR *divider = strchrW(p,'=');
+ WCHAR *divider = wcschr(p,'=');
if (divider)
{
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;
}
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