Remove CrossCall from odbccp32.c
Bill Medland
billmedland at shaw.ca
Fri Jan 12 09:12:57 CST 2007
Index: wine/dlls/odbccp32/odbccp32.c
===================================================================
RCS file: /home/wine/wine/dlls/odbccp32/odbccp32.c,v
retrieving revision 1.9
diff -u -r1.9 odbccp32.c
--- wine/dlls/odbccp32/odbccp32.c 12 Jan 2007 11:41:12 -0000 1.9
+++ wine/dlls/odbccp32/odbccp32.c 12 Jan 2007 15:10:22 -0000
@@ -36,6 +36,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(odbc);
+/* Registry key namess */
+static const WCHAR drivers_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\','O','D','B','C',' ','D','r','i','v','e','r','s',0};
+
/* MSDN documentation suggests that the error subsystem handles errors 1 to 8
* only and experimentation (Windows 2000) shows that the errors are process-
* wide so go for the simple solution; static arrays.
@@ -282,8 +285,8 @@
{
push_error(ODBC_ERROR_INVALID_BUFF_LEN, odbc_error_invalid_buff_len);
}
- else if ((reg_ret = RegOpenKeyExA (HKEY_LOCAL_MACHINE /* The drivers does not depend on the config mode */,
- "Software\\ODBC\\ODBCINST.INI\\ODBC Drivers", 0, KEY_READ /* Maybe overkill */,
+ else if ((reg_ret = RegOpenKeyExW (HKEY_LOCAL_MACHINE /* The drivers does not depend on the config mode */,
+ drivers_key, 0, KEY_READ /* Maybe overkill */,
&hDrivers)) == ERROR_SUCCESS)
{
DWORD index = 0;
More information about the wine-patches
mailing list