[ODBCCP32]

* Sync to Wine 1.3.37.

svn path=/trunk/; revision=55285
This commit is contained in:
Amine Khaldi 2012-01-28 23:15:03 +00:00
parent 9beddcf6f5
commit 93e3e8cf84
3 changed files with 22 additions and 14 deletions

View file

@ -522,9 +522,13 @@ BOOL WINAPI SQLInstallDriverManagerW(LPWSTR lpszPath, WORD cbPathMax,
UINT len; UINT len;
WCHAR path[MAX_PATH]; WCHAR path[MAX_PATH];
clear_errors();
TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut);
if (cbPathMax < MAX_PATH)
return FALSE;
clear_errors();
len = GetSystemDirectoryW(path, MAX_PATH); len = GetSystemDirectoryW(path, MAX_PATH);
if (pcbPathOut) if (pcbPathOut)
@ -545,9 +549,13 @@ BOOL WINAPI SQLInstallDriverManager(LPSTR lpszPath, WORD cbPathMax,
WORD len, cbOut = 0; WORD len, cbOut = 0;
WCHAR path[MAX_PATH]; WCHAR path[MAX_PATH];
clear_errors();
TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut);
if (cbPathMax < MAX_PATH)
return FALSE;
clear_errors();
ret = SQLInstallDriverManagerW(path, MAX_PATH, &cbOut); ret = SQLInstallDriverManagerW(path, MAX_PATH, &cbOut);
if (ret) if (ret)
{ {
@ -836,26 +844,26 @@ BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN,
LPDWORD lpdwUsageCount) LPDWORD lpdwUsageCount)
{ {
clear_errors(); clear_errors();
FIXME("\n"); FIXME("stub\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); if (lpdwUsageCount) *lpdwUsageCount = 1;
return FALSE; return TRUE;
} }
BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN, BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN,
LPDWORD lpdwUsageCount) LPDWORD lpdwUsageCount)
{ {
clear_errors(); clear_errors();
FIXME("\n"); FIXME("stub\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); if (lpdwUsageCount) *lpdwUsageCount = 1;
return FALSE; return TRUE;
} }
BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount)
{ {
clear_errors(); clear_errors();
FIXME("\n"); FIXME("stub\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); if (pdwUsageCount) *pdwUsageCount = 1;
return FALSE; return TRUE;
} }
BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN) BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN)

View file

@ -1,6 +1,6 @@
@ stdcall ODBCCPlApplet( long long ptr ptr) @ stdcall ODBCCPlApplet( long long ptr ptr)
@ stdcall SQLConfigDataSource(ptr long wstr wstr) @ stdcall SQLConfigDataSource(ptr long str str)
@ stdcall SQLConfigDataSourceW(ptr long str str) @ stdcall SQLConfigDataSourceW(ptr long wstr wstr)
@ stdcall SQLConfigDriver(ptr long str str ptr long ptr) @ stdcall SQLConfigDriver(ptr long str str ptr long ptr)
@ stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr) @ stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr)
@ stdcall SQLCreateDataSource(ptr str) @ stdcall SQLCreateDataSource(ptr str)

View file

@ -121,7 +121,7 @@ reactos/dll/win32/ntdsapi # Synced to Wine-1.3.37
reactos/dll/win32/ntprint # Synced to Wine-1.3.37 reactos/dll/win32/ntprint # Synced to Wine-1.3.37
reactos/dll/win32/objsel # Synced to Wine-1.3.37 reactos/dll/win32/objsel # Synced to Wine-1.3.37
reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC.
reactos/dll/win32/odbccp32 # Autosync reactos/dll/win32/odbccp32 # Synced to Wine-1.3.37
reactos/dll/win32/ole32 # Autosync reactos/dll/win32/ole32 # Autosync
reactos/dll/win32/oleacc # Autosync reactos/dll/win32/oleacc # Autosync
reactos/dll/win32/oleaut32 # Autosync reactos/dll/win32/oleaut32 # Autosync