1 files changed, 26 insertions, 12 deletions

diff --git a/Windows/Registry.h b/Windows/Registry.h
index a020900c..435717bd 100755
--- a/Windows/Registry.h
+++ b/Windows/Registry.h
@@ -5,14 +5,14 @@
 
 #include "Common/Buffer.h"
 #include "Common/String.h"
+#include "Common/Types.h"
 
 namespace NWindows {
 namespace NRegistry {
 
 const TCHAR kKeyNameDelimiter = TEXT('\\');
 
-LONG SetValue(HKEY parentKey, LPCTSTR keyName, 
-    LPCTSTR valueName, LPCTSTR value);
+LONG SetValue(HKEY parentKey, LPCTSTR keyName, LPCTSTR valueName, LPCTSTR value);
 
 class CKey
 {
@@ -38,22 +38,36 @@ public:
   LONG DeleteSubKey(LPCTSTR subKeyName);
   LONG RecurseDeleteKey(LPCTSTR subKeyName);
 
-  LONG DeleteValue(LPCTSTR value);
-  LONG SetValue(LPCTSTR valueName, UINT32 value);
+  LONG DeleteValue(LPCTSTR name);
+  #ifndef _UNICODE
+  LONG DeleteValue(LPCWSTR name);
+  #endif
+
+  LONG SetValue(LPCTSTR valueName, UInt32 value);
   LONG SetValue(LPCTSTR valueName, bool value);
   LONG SetValue(LPCTSTR valueName, LPCTSTR value);
-  LONG SetValue(LPCTSTR valueName, const CSysString &value);
-  LONG SetValue(LPCTSTR valueName, const void *value, UINT32 size);
+  // LONG SetValue(LPCTSTR valueName, const CSysString &value);
+  #ifndef _UNICODE
+  LONG SetValue(LPCWSTR name, LPCWSTR value);
+  // LONG SetValue(LPCWSTR name, const UString &value);
+  #endif
+
+  LONG SetValue(LPCTSTR name, const void *value, UInt32 size);
 
   LONG SetKeyValue(LPCTSTR keyName, LPCTSTR valueName, LPCTSTR value);
 
-  LONG QueryValue(LPCTSTR valueName, UINT32 &value);
-  LONG QueryValue(LPCTSTR valueName, bool &value);
-  LONG QueryValue(LPCTSTR valueName, LPTSTR value, UINT32 &dataSize);
-  LONG QueryValue(LPCTSTR valueName, CSysString &value);
+  LONG QueryValue(LPCTSTR name, UInt32 &value);
+  LONG QueryValue(LPCTSTR name, bool &value);
+  LONG QueryValue(LPCTSTR name, LPTSTR value, UInt32 &dataSize);
+  LONG QueryValue(LPCTSTR name, CSysString &value);
+
+  #ifndef _UNICODE
+  LONG QueryValue(LPCWSTR name, LPWSTR value, UInt32 &dataSize);
+  LONG QueryValue(LPCWSTR name, UString &value);
+  #endif
 
-  LONG QueryValue(LPCTSTR valueName, void *value, UINT32 &dataSize);
-  LONG QueryValue(LPCTSTR valueName, CByteBuffer &value, UINT32 &dataSize);
+  LONG QueryValue(LPCTSTR name, void *value, UInt32 &dataSize);
+  LONG QueryValue(LPCTSTR name, CByteBuffer &value, UInt32 &dataSize);
 
   LONG EnumKeys(CSysStringVector &keyNames);
 };