Alistair Leslie-Hughes : odbccp32: Implement SQLValidDSN/W.
Alexandre Julliard
julliard at winehq.org
Tue Aug 21 16:49:02 CDT 2018
Module: wine
Branch: master
Commit: 990f08dc73ef2c52d097f628581cd32213d0847e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=990f08dc73ef2c52d097f628581cd32213d0847e
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Tue Aug 21 04:00:52 2018 +0000
odbccp32: Implement SQLValidDSN/W.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/odbccp32/odbccp32.c | 25 ++++++++++++++-----
dlls/odbccp32/tests/misc.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+), 6 deletions(-)
diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c
index a253035..60254d0 100644
--- a/dlls/odbccp32/odbccp32.c
+++ b/dlls/odbccp32/odbccp32.c
@@ -29,6 +29,7 @@
#include "winbase.h"
#include "winreg.h"
#include "winnls.h"
+#include "sqlext.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include "wine/heap.h"
@@ -1514,18 +1515,30 @@ BOOL WINAPI SQLSetConfigMode(UWORD wConfigMode)
BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN)
{
+ static const WCHAR invalid[] = {'[',']','{','}','(',')',',',';','?','*','=','!','@','\\',0};
clear_errors();
- FIXME("%s\n", debugstr_w(lpszDSN));
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+ TRACE("%s\n", debugstr_w(lpszDSN));
+
+ if(strlenW(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrkW(lpszDSN, invalid) != NULL)
+ {
+ return FALSE;
+ }
+
+ return TRUE;
}
BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN)
{
+ static const char *invalid = "[]{}(),;?*=!@\\";
clear_errors();
- FIXME("%s\n", debugstr_a(lpszDSN));
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+ TRACE("%s\n", debugstr_a(lpszDSN));
+
+ if(strlen(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrk(lpszDSN, invalid) != NULL)
+ {
+ return FALSE;
+ }
+
+ return TRUE;
}
BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver)
diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c
index be3873ac..dc65bdf 100644
--- a/dlls/odbccp32/tests/misc.c
+++ b/dlls/odbccp32/tests/misc.c
@@ -682,6 +682,65 @@ static void test_SQLGetInstalledDrivers(void)
SQLRemoveDriver("Wine test", TRUE, NULL);
}
+static void test_SQLValidDSN(void)
+{
+ static const char *invalid = "[]{}(),;?*=!@\\";
+ char str[10];
+ int i;
+ BOOL ret;
+
+ strcpy(str, "wine10");
+ for(i = 0; i < strlen(invalid); i++)
+ {
+ str[4] = invalid[i];
+ ret = SQLValidDSN(str);
+ ok(!ret, "got %d\n", ret);
+ }
+
+ /* Too large */
+ ret = SQLValidDSN("Wine123456789012345678901234567890");
+ ok(!ret, "got %d\n", ret);
+
+ /* Valid with a space */
+ ret = SQLValidDSN("Wine Vinegar");
+ ok(ret, "got %d\n", ret);
+
+ /* Max DSN name value */
+ ret = SQLValidDSN("12345678901234567890123456789012");
+ ok(ret, "got %d\n", ret);
+}
+
+static void test_SQLValidDSNW(void)
+{
+ static const WCHAR invalid[] = {'[',']','{','}','(',')',',',';','?','*','=','!','@','\\',0};
+ static const WCHAR value[] = { 'w','i','n','e','1','0',0};
+ static const WCHAR too_large[] = { 'W','i','n','e','1','2','3','4','5','6','7','8','9','0','1','2','3','4','5',
+ '6','7','8','9','0','1','2','3','4','5','6','7','8','9','0', 0};
+ static const WCHAR with_space[] = { 'W','i','n','e',' ','V','i','n','e','g','a','r', 0};
+ static const WCHAR max_dsn[] = { '1','2','3','4','5','6','7','8','9','0','1','2','3','4','5','6','7','8','9','0',
+ '1','2','3','4','5','6','7','8','9','0','1','2', 0};
+ WCHAR str[10];
+ int i;
+ BOOL ret;
+
+ lstrcpyW(str, value);
+ for(i = 0; i < lstrlenW(invalid); i++)
+ {
+ str[4] = invalid[i];
+ ret = SQLValidDSNW(str);
+ ok(!ret, "got %d\n", ret);
+ }
+
+ ret = SQLValidDSNW(too_large);
+ ok(!ret, "got %d\n", ret);
+
+ ret = SQLValidDSNW(with_space);
+ ok(ret, "got %d\n", ret);
+
+ ret = SQLValidDSNW(max_dsn);
+ ok(ret, "got %d\n", ret);
+}
+
START_TEST(misc)
{
test_SQLConfigMode();
@@ -693,4 +752,6 @@ START_TEST(misc)
test_SQLInstallDriverEx();
test_SQLInstallTranslatorEx();
test_SQLGetInstalledDrivers();
+ test_SQLValidDSN();
+ test_SQLValidDSNW();
}
More information about the wine-cvs
mailing list