[ros-diffs] [akhaldi] 55285: [ODBCCP32] * Sync to Wine 1.3.37.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Sat Jan 28 23:15:03 2012
New Revision: 55285

URL: http://svn.reactos.org/svn/reactos?rev=55285&view=rev
Log:
[ODBCCP32]
* Sync to Wine 1.3.37.

Modified:
    trunk/reactos/dll/win32/odbccp32/odbccp32.c
    trunk/reactos/dll/win32/odbccp32/odbccp32.spec
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp32.c?rev=55285&r1=55284&r2=55285&view=diff
==============================================================================
--- trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] Sat Jan 28 23:15:03 2012
@@ -522,8 +522,12 @@
     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);
 
@@ -545,8 +549,12 @@
     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 @@
                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)

Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp32.spec?rev=55285&r1=55284&r2=55285&view=diff
==============================================================================
--- trunk/reactos/dll/win32/odbccp32/odbccp32.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/odbccp32/odbccp32.spec [iso-8859-1] Sat Jan 28 23:15:03 2012
@@ -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)

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=55285&r1=55284&r2=55285&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jan 28 23:15:03 2012
@@ -121,7 +121,7 @@
 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