odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString
Nikolay Sivov
nsivov at codeweavers.com
Sun Jul 19 06:10:28 CDT 2015
Based on patch by Alistair Leslie-Hughes
-------------- next part --------------
From 142ac761b07c49134071ce9cb804dcd77dd19ae3 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sun, 19 Jul 2015 14:05:53 +0300
Subject: [PATCH] odbccp32: Implement
SQLGetPrivateProfileStringW/SQLGetPrivateProfileString
---
dlls/odbccp32/odbccp32.c | 128 +++++++++++++++++++++++++++++++++++++++------
dlls/odbccp32/tests/misc.c | 81 +++++++++++++++++++++++++++-
include/odbcinst.h | 4 +-
3 files changed, 193 insertions(+), 20 deletions(-)
diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c
index ddb0598..75c9c73 100644
--- a/dlls/odbccp32/odbccp32.c
+++ b/dlls/odbccp32/odbccp32.c
@@ -399,28 +399,124 @@ BOOL WINAPI SQLGetInstalledDrivers(LPSTR lpszBuf, WORD cbBufMax,
return ret;
}
-int WINAPI SQLGetPrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry,
- LPCWSTR lpszDefault, LPCWSTR RetBuffer, int cbRetBuffer,
- LPCWSTR lpszFilename)
+static HKEY get_privateprofile_sectionkey(LPCWSTR section, LPCWSTR filename)
{
+ static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\',0};
+ HKEY hkey, hkeyfilename, hkeysection;
+ LONG ret;
+
+ if (RegOpenKeyW(HKEY_CURRENT_USER, odbcW, &hkey))
+ return NULL;
+
+ ret = RegOpenKeyW(hkey, filename, &hkeyfilename);
+ RegCloseKey(hkey);
+ if (ret)
+ return NULL;
+
+ ret = RegOpenKeyW(hkeyfilename, section, &hkeysection);
+ RegCloseKey(hkeyfilename);
+ if (ret)
+ return NULL;
+
+ return ret ? NULL : hkeysection;
+}
+
+int WINAPI SQLGetPrivateProfileStringW(LPCWSTR section, LPCWSTR entry,
+ LPCWSTR defvalue, LPWSTR buff, int buff_len, LPCWSTR filename)
+{
+ BOOL usedefault = TRUE;
+ HKEY sectionkey;
+ LONG ret = 0;
+
+ TRACE("%s %s %s %p %d %s\n", debugstr_w(section), debugstr_w(entry),
+ debugstr_w(defvalue), buff, buff_len, debugstr_w(filename));
+
clear_errors();
- FIXME("%s %s %s %p %d %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry),
- debugstr_w(lpszDefault), RetBuffer, cbRetBuffer,
- debugstr_w(lpszFilename));
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+
+ if (!buff_len)
+ return 0;
+
+ if (buff)
+ buff[0] = 0;
+
+ if (!section || !entry || !defvalue || !buff)
+ return 0;
+
+ sectionkey = get_privateprofile_sectionkey(section, filename);
+ if (sectionkey)
+ {
+ DWORD type, size;
+
+ size = buff_len * sizeof(*buff);
+ if (!RegGetValueW(sectionkey, NULL, entry, RRF_RT_REG_SZ, &type, buff, &size))
+ {
+ usedefault = FALSE;
+ ret = (size / sizeof(*buff)) - 1;
+ }
+
+ RegCloseKey(sectionkey);
+ }
+
+ if (usedefault)
+ {
+ lstrcpynW(buff, defvalue, buff_len);
+ ret = lstrlenW(buff);
+ }
+
+ return ret;
}
-int WINAPI SQLGetPrivateProfileString(LPCSTR lpszSection, LPCSTR lpszEntry,
- LPCSTR lpszDefault, LPCSTR RetBuffer, int cbRetBuffer,
- LPCSTR lpszFilename)
+int WINAPI SQLGetPrivateProfileString(LPCSTR section, LPCSTR entry,
+ LPCSTR defvalue, LPSTR buff, int buff_len, LPCSTR filename)
{
+ WCHAR *sectionW, *filenameW;
+ BOOL usedefault = TRUE;
+ HKEY sectionkey;
+ LONG ret = 0;
+
+ TRACE("%s %s %s %p %d %s\n", debugstr_a(section), debugstr_a(entry),
+ debugstr_a(defvalue), buff, buff_len, debugstr_a(filename));
+
clear_errors();
- FIXME("%s %s %s %p %d %s\n", debugstr_a(lpszSection), debugstr_a(lpszEntry),
- debugstr_a(lpszDefault), RetBuffer, cbRetBuffer,
- debugstr_a(lpszFilename));
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+
+ if (!buff_len)
+ return 0;
+
+ if (buff)
+ buff[0] = 0;
+
+ if (!section || !entry || !defvalue || !buff)
+ return 0;
+
+ sectionW = heap_strdupAtoW(section);
+ filenameW = heap_strdupAtoW(filename);
+
+ sectionkey = get_privateprofile_sectionkey(sectionW, filenameW);
+
+ heap_free(sectionW);
+ heap_free(filenameW);
+
+ if (sectionkey)
+ {
+ DWORD type, size;
+
+ size = buff_len * sizeof(*buff);
+ if (!RegGetValueA(sectionkey, NULL, entry, RRF_RT_REG_SZ, &type, buff, &size))
+ {
+ usedefault = FALSE;
+ ret = (size / sizeof(*buff)) - 1;
+ }
+
+ RegCloseKey(sectionkey);
+ }
+
+ if (usedefault)
+ {
+ lstrcpynA(buff, defvalue, buff_len);
+ ret = strlen(buff);
+ }
+
+ return ret;
}
BOOL WINAPI SQLGetTranslatorW(HWND hwndParent, LPWSTR lpszName, WORD cbNameMax,
diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c
index f1f3f00..324b113 100644
--- a/dlls/odbccp32/tests/misc.c
+++ b/dlls/odbccp32/tests/misc.c
@@ -24,6 +24,10 @@
#include "winreg.h"
#include "odbcinst.h"
+static const WCHAR abcd_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I','\\','w','i','n','e','o','d','b','c',0};
+static const WCHAR abcdini_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I',0 };
+
+
static void test_SQLConfigMode(void)
{
BOOL bool_ret;
@@ -133,8 +137,6 @@ static void test_SQLInstallDriverManager(void)
static void test_SQLWritePrivateProfileString(void)
{
static const WCHAR odbc_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','.','I','N','I','\\','w','i','n','e','o','d','b','c',0};
- static const WCHAR abcd_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I','\\','w','i','n','e','o','d','b','c',0};
- static const WCHAR abcdini_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I',0 };
BOOL ret;
LONG reg_ret;
DWORD error_code;
@@ -188,10 +190,85 @@ static void test_SQLWritePrivateProfileString(void)
}
}
+static void test_SQLGetPrivateProfileString(void)
+{
+ int ret;
+ char buffer[256] = {0};
+ LONG reg_ret;
+
+ strcpy(buffer, "wine");
+ ret = SQLGetPrivateProfileString(NULL, "testing" , "default", buffer, 256, "ODBC.INI");
+ ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret);
+ ok(!strcmp(buffer, ""), "incorrect string '%s'\n", buffer);
+
+ strcpy(buffer, "wine");
+ ret = SQLGetPrivateProfileString("wineodbc", NULL , "default", buffer, 256, "ODBC.INI");
+ ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret);
+ ok(!strcmp(buffer, ""), "incorrect string '%s'\n", buffer);
+
+ strcpy(buffer, "value");
+ ret = SQLGetPrivateProfileString("wineodbc", "testing" , NULL, buffer, 256, "ODBC.INI");
+ ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret);
+ ok(!strcmp(buffer, ""), "incorrect string '%s'\n", buffer);
+
+ ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 256, "ODBC.INI");
+ ok(ret == 8, "SQLGetPrivateProfileString returned %d\n", ret);
+ ok(!strcmp(buffer, "defaultX"), "incorrect string '%s'\n", buffer);
+
+ ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 4, "ODBC.INI");
+ ok(ret == 3, "SQLGetPrivateProfileString returned %d\n", ret);
+ ok(!strcmp(buffer, "def"), "incorrect string '%s'\n", buffer);
+
+ ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 8, "ODBC.INI");
+ ok(ret == 7, "SQLGetPrivateProfileString returned %d\n", ret);
+ ok(!strcmp(buffer, "default"), "incorrect string '%s'\n", buffer);
+
+ ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", NULL, 256, "ODBC.INI");
+ ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret);
+
+ strcpy(buffer, "value");
+ ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 0, "ODBC.INI");
+ ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret);
+ ok(!strcmp(buffer, "value"), "incorrect string '%s'\n", buffer);
+
+ ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value0123456789", "abcd.ini");
+ ok(ret, "SQLWritePrivateProfileString failed\n");
+ if(ret)
+ {
+ HKEY hkey;
+
+ ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultY", buffer, 256, "abcd.ini");
+ ok(ret == 15, "SQLGetPrivateProfileString returned %d\n", ret);
+ ok(!strcmp(buffer, "value0123456789"), "incorrect string '%s'\n", buffer);
+
+ ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultY", NULL, 0, "abcd.ini");
+ ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret);
+
+ ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultY", buffer, 7, "abcd.ini");
+ ok(ret == 6, "SQLGetPrivateProfileString returned %d\n", ret);
+
+ reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, abcd_key, 0, KEY_READ, &hkey);
+ ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n");
+ if(reg_ret == ERROR_SUCCESS)
+ {
+ reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcd_key);
+ ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n");
+
+ RegCloseKey(hkey);
+ }
+
+ /* Cleanup key */
+ reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcdini_key);
+ ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n");
+ }
+
+}
+
START_TEST(misc)
{
test_SQLConfigMode();
test_SQLInstallerError();
test_SQLInstallDriverManager();
test_SQLWritePrivateProfileString();
+ test_SQLGetPrivateProfileString();
}
diff --git a/include/odbcinst.h b/include/odbcinst.h
index a1109d5..7395cb5 100644
--- a/include/odbcinst.h
+++ b/include/odbcinst.h
@@ -84,8 +84,8 @@ BOOL WINAPI SQLGetAvailableDriversW(LPCWSTR,LPWSTR,WORD,WORD*);
BOOL WINAPI SQLGetConfigMode(UWORD*);
BOOL WINAPI SQLGetInstalledDrivers(LPSTR,WORD,WORD*);
BOOL WINAPI SQLGetInstalledDriversW(LPWSTR,WORD,WORD*);
-int WINAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPCSTR,int,LPCSTR);
-int WINAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,int,LPCWSTR);
+int WINAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPSTR,int,LPCSTR);
+int WINAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,int,LPCWSTR);
BOOL WINAPI SQLGetTranslator(HWND,LPSTR,WORD,WORD*,LPSTR,WORD,WORD*,DWORD*);
BOOL WINAPI SQLGetTranslatorW(HWND,LPWSTR,WORD,WORD*,LPWSTR,WORD,WORD*,DWORD*);
BOOL WINAPI SQLInstallDriver(LPCSTR,LPCSTR,LPSTR,WORD,WORD*);
--
2.1.4
More information about the wine-patches
mailing list