From 93e3e8cf843b9bdc15a3a1b7327498ab11041d49 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 28 Jan 2012 23:15:03 +0000
Subject: [PATCH] [ODBCCP32] * Sync to Wine 1.3.37.

svn path=/trunk/; revision=55285
---
 reactos/dll/win32/odbccp32/odbccp32.c    | 30 +++++++++++++++---------
 reactos/dll/win32/odbccp32/odbccp32.spec |  4 ++--
 reactos/media/doc/README.WINE            |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/reactos/dll/win32/odbccp32/odbccp32.c b/reactos/dll/win32/odbccp32/odbccp32.c
index 0d4662bb724..fb4ea2c7ea1 100644
--- a/reactos/dll/win32/odbccp32/odbccp32.c
+++ b/reactos/dll/win32/odbccp32/odbccp32.c
@@ -522,9 +522,13 @@ BOOL WINAPI SQLInstallDriverManagerW(LPWSTR lpszPath, WORD cbPathMax,
     UINT len;
     WCHAR path[MAX_PATH];
 
-    clear_errors();
     TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut);
 
+    if (cbPathMax < MAX_PATH)
+        return FALSE;
+
+    clear_errors();
+
     len = GetSystemDirectoryW(path, MAX_PATH);
 
     if (pcbPathOut)
@@ -545,9 +549,13 @@ BOOL WINAPI SQLInstallDriverManager(LPSTR lpszPath, WORD cbPathMax,
     WORD len, cbOut = 0;
     WCHAR path[MAX_PATH];
 
-    clear_errors();
     TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut);
 
+    if (cbPathMax < MAX_PATH)
+        return FALSE;
+
+    clear_errors();
+
     ret = SQLInstallDriverManagerW(path, MAX_PATH, &cbOut);
     if (ret)
     {
@@ -836,26 +844,26 @@ BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN,
                LPDWORD lpdwUsageCount)
 {
     clear_errors();
-    FIXME("\n");
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
+    FIXME("stub\n");
+    if (lpdwUsageCount) *lpdwUsageCount = 1;
+    return TRUE;
 }
 
 BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN,
                LPDWORD lpdwUsageCount)
 {
     clear_errors();
-    FIXME("\n");
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
+    FIXME("stub\n");
+    if (lpdwUsageCount) *lpdwUsageCount = 1;
+    return TRUE;
 }
 
 BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount)
 {
     clear_errors();
-    FIXME("\n");
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
+    FIXME("stub\n");
+    if (pdwUsageCount) *pdwUsageCount = 1;
+    return TRUE;
 }
 
 BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN)
diff --git a/reactos/dll/win32/odbccp32/odbccp32.spec b/reactos/dll/win32/odbccp32/odbccp32.spec
index e01da6ae661..3d85d758b9d 100644
--- a/reactos/dll/win32/odbccp32/odbccp32.spec
+++ b/reactos/dll/win32/odbccp32/odbccp32.spec
@@ -1,6 +1,6 @@
 @ stdcall ODBCCPlApplet( long long ptr ptr)
-@ stdcall SQLConfigDataSource(ptr long wstr wstr)
-@ stdcall SQLConfigDataSourceW(ptr long str str)
+@ stdcall SQLConfigDataSource(ptr long str str)
+@ stdcall SQLConfigDataSourceW(ptr long wstr wstr)
 @ stdcall SQLConfigDriver(ptr long str str ptr long ptr)
 @ stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr)
 @ stdcall SQLCreateDataSource(ptr str)
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 3d6b0df06b9..c9e5ba9280f 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -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/objsel          # Synced to Wine-1.3.37
 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/oleacc          # Autosync
 reactos/dll/win32/oleaut32        # Autosync