From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 18 Oct 2008 05:12:35 +0000 (+0000)
Subject: DEVEL15-windows-shell-extension-20081017
X-Git-Tag: openafs-devel-1_5_55~46
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0e190781edcc35db873e01e589548db78d0af92d;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-shell-extension-20081017

LICENSE MIT

windows-afsreg-20081017 wraps strings for wide char usage.
use the wide char versions of win32 apis to match.


(cherry picked from commit 4c79498bc3dd87cb45d1827133aff3c93c2caff8)
---

diff --git a/src/WINNT/client_exp/gui2fs.cpp b/src/WINNT/client_exp/gui2fs.cpp
index 9354fdf06..332edd50f 100644
--- a/src/WINNT/client_exp/gui2fs.cpp
+++ b/src/WINNT/client_exp/gui2fs.cpp
@@ -1200,7 +1200,7 @@ static const char * NetbiosName(void)
     DWORD dummyLen;
     DWORD enabled = 0;
 
-    code = RegOpenKeyExA(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
+    code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
                          0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &parmKey);
     if (code == ERROR_SUCCESS) {
         dummyLen = sizeof(buffer);
diff --git a/src/WINNT/client_exp/shell_ext.cpp b/src/WINNT/client_exp/shell_ext.cpp
index 50666e00c..219275392 100644
--- a/src/WINNT/client_exp/shell_ext.cpp
+++ b/src/WINNT/client_exp/shell_ext.cpp
@@ -76,7 +76,7 @@ CShellExt::CShellExt()
     m_bIsOverlayEnabled=FALSE;
     if (FAILED(hr))
 	m_pAlloc = NULL;
-    RegOpenKeyExA(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &NPKey);
+    RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &NPKey);
     LSPsize=sizeof(ShellOption);
     code=RegQueryValueEx(NPKey, _T("ShellOption"), NULL,
 			  &LSPtype, (LPBYTE)&ShellOption, &LSPsize);
diff --git a/src/WINNT/client_exp/submounts_dlg.cpp b/src/WINNT/client_exp/submounts_dlg.cpp
index ed09c292b..8269f4df0 100644
--- a/src/WINNT/client_exp/submounts_dlg.cpp
+++ b/src/WINNT/client_exp/submounts_dlg.cpp
@@ -45,10 +45,10 @@ static CSubmountInfo *ReadSubmtInfo(const CString& strShareName)
 	TCHAR pathName[1024];
 
     HKEY hkSubmounts;
-    RegCreateKeyExA( HKEY_LOCAL_MACHINE, 
-                    AFSREG_CLT_OPENAFS_SUBKEY "\\Submounts",
+    RegCreateKeyEx( HKEY_LOCAL_MACHINE, 
+                    AFSREG_CLT_OPENAFS_SUBKEY TEXT("\\Submounts"),
                     0, 
-                    "AFS", 
+                    TEXT("AFS"), 
                     REG_OPTION_NON_VOLATILE,
                     (IsWow64()?KEY_WOW64_64KEY:0)|KEY_READ,
                     NULL, 
@@ -166,10 +166,10 @@ BOOL CSubmountsDlg::FillSubmtList()
     DWORD dwIndex;
     DWORD dwSubmounts;
 
-    RegCreateKeyExA( HKEY_LOCAL_MACHINE, 
-                    AFSREG_CLT_OPENAFS_SUBKEY "\\Submounts",
+    RegCreateKeyEx( HKEY_LOCAL_MACHINE, 
+                    AFSREG_CLT_OPENAFS_SUBKEY TEXT("\\Submounts"),
                     0, 
-                    "AFS", 
+                    TEXT("AFS"), 
                     REG_OPTION_NON_VOLATILE,
                     (IsWow64()?KEY_WOW64_64KEY:0)|KEY_READ|KEY_WRITE|KEY_QUERY_VALUE,
                     NULL, 
@@ -248,10 +248,10 @@ static BOOL AddSubmt(CSubmountInfo *pInfo)
 	HOURGLASS hourglass;
 
     HKEY hkSubmounts;
-    RegCreateKeyExA( HKEY_LOCAL_MACHINE, 
-                    AFSREG_CLT_OPENAFS_SUBKEY "\\Submounts",
+    RegCreateKeyEx( HKEY_LOCAL_MACHINE, 
+                    AFSREG_CLT_OPENAFS_SUBKEY TEXT("\\Submounts"),
                     0, 
-                    "AFS", 
+                    TEXT("AFS"), 
                     REG_OPTION_NON_VOLATILE,
                     (IsWow64()?KEY_WOW64_64KEY:0)|KEY_WRITE,
                     NULL, 
@@ -271,10 +271,10 @@ static BOOL DeleteSubmt(CSubmountInfo *pInfo)
 	HOURGLASS hourglass;
 
     HKEY hkSubmounts;
-    RegCreateKeyExA( HKEY_LOCAL_MACHINE, 
-                    AFSREG_CLT_OPENAFS_SUBKEY "\\Submounts",
+    RegCreateKeyEx( HKEY_LOCAL_MACHINE, 
+                    AFSREG_CLT_OPENAFS_SUBKEY TEXT("\\Submounts"),
                     0, 
-                    "AFS", 
+                    TEXT("AFS"), 
                     REG_OPTION_NON_VOLATILE,
                     (IsWow64()?KEY_WOW64_64KEY:0)|KEY_WRITE,
                     NULL,