--- mstools/h/winreg.h	2018/08/09 18:20:26	1.1
+++ mstools/h/winreg.h	2018/08/09 18:22:56	1.1.1.3
@@ -20,6 +20,10 @@ Author:
 #ifndef _WINREG_
 #define _WINREG_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //
 // Requested Key access mask type.
 //
@@ -30,7 +34,8 @@ typedef ACCESS_MASK REGSAM;
 // Type definitions.
 //
 
-typedef HANDLE      HKEY, *PHKEY;
+DECLARE_HANDLE(HKEY);
+typedef HKEY *PHKEY;
 
 //
 // Reserved Key Handles.
@@ -75,36 +80,36 @@ RegConnectRegistryW (
     PHKEY phkResult
     );
 #ifdef UNICODE
-#define RegConnectRegistry RegConnectRegistryW
+#define RegConnectRegistry  RegConnectRegistryW
 #else
-#define RegConnectRegistry RegConnectRegistryA
+#define RegConnectRegistry  RegConnectRegistryA
 #endif // !UNICODE
 
 LONG
 APIENTRY
 RegCreateKeyA (
     HKEY hKey,
-    LPSTR lpSubKey,
+    LPCSTR lpSubKey,
     PHKEY phkResult
     );
 LONG
 APIENTRY
 RegCreateKeyW (
     HKEY hKey,
-    LPWSTR lpSubKey,
+    LPCWSTR lpSubKey,
     PHKEY phkResult
     );
 #ifdef UNICODE
-#define RegCreateKey RegCreateKeyW
+#define RegCreateKey  RegCreateKeyW
 #else
-#define RegCreateKey RegCreateKeyA
+#define RegCreateKey  RegCreateKeyA
 #endif // !UNICODE
 
 LONG
 APIENTRY
 RegCreateKeyExA (
     HKEY hKey,
-    LPSTR lpSubKey,
+    LPCSTR lpSubKey,
     DWORD Reserved,
     LPSTR lpClass,
     DWORD dwOptions,
@@ -117,7 +122,7 @@ LONG
 APIENTRY
 RegCreateKeyExW (
     HKEY hKey,
-    LPWSTR lpSubKey,
+    LPCWSTR lpSubKey,
     DWORD Reserved,
     LPWSTR lpClass,
     DWORD dwOptions,
@@ -127,27 +132,27 @@ RegCreateKeyExW (
     LPDWORD lpdwDisposition
     );
 #ifdef UNICODE
-#define RegCreateKeyEx RegCreateKeyExW
+#define RegCreateKeyEx  RegCreateKeyExW
 #else
-#define RegCreateKeyEx RegCreateKeyExA
+#define RegCreateKeyEx  RegCreateKeyExA
 #endif // !UNICODE
 
 LONG
 APIENTRY
 RegDeleteKeyA (
     HKEY hKey,
-    LPSTR lpSubKey
+    LPCSTR lpSubKey
     );
 LONG
 APIENTRY
 RegDeleteKeyW (
     HKEY hKey,
-    LPWSTR lpSubKey
+    LPCWSTR lpSubKey
     );
 #ifdef UNICODE
-#define RegDeleteKey RegDeleteKeyW
+#define RegDeleteKey  RegDeleteKeyW
 #else
-#define RegDeleteKey RegDeleteKeyA
+#define RegDeleteKey  RegDeleteKeyA
 #endif // !UNICODE
 
 LONG
@@ -163,9 +168,9 @@ RegDeleteValueW (
     LPWSTR lpValueName
     );
 #ifdef UNICODE
-#define RegDeleteValue RegDeleteValueW
+#define RegDeleteValue  RegDeleteValueW
 #else
-#define RegDeleteValue RegDeleteValueA
+#define RegDeleteValue  RegDeleteValueA
 #endif // !UNICODE
 
 LONG
@@ -185,9 +190,9 @@ RegEnumKeyW (
     DWORD cbName
     );
 #ifdef UNICODE
-#define RegEnumKey RegEnumKeyW
+#define RegEnumKey  RegEnumKeyW
 #else
-#define RegEnumKey RegEnumKeyA
+#define RegEnumKey  RegEnumKeyA
 #endif // !UNICODE
 
 LONG
@@ -215,9 +220,9 @@ RegEnumKeyExW (
     PFILETIME lpftLastWriteTime
     );
 #ifdef UNICODE
-#define RegEnumKeyEx RegEnumKeyExW
+#define RegEnumKeyEx  RegEnumKeyExW
 #else
-#define RegEnumKeyEx RegEnumKeyExA
+#define RegEnumKeyEx  RegEnumKeyExA
 #endif // !UNICODE
 
 LONG
@@ -245,9 +250,9 @@ RegEnumValueW (
     LPDWORD lpcbData
     );
 #ifdef UNICODE
-#define RegEnumValue RegEnumValueW
+#define RegEnumValue  RegEnumValueW
 #else
-#define RegEnumValue RegEnumValueA
+#define RegEnumValue  RegEnumValueA
 #endif // !UNICODE
 
 LONG
@@ -269,20 +274,20 @@ LONG
 APIENTRY
 RegLoadKeyA (
     HKEY    hKey,
-    LPSTR  lpSubKey,
-    LPSTR  lpFile
+    LPCSTR  lpSubKey,
+    LPCSTR  lpFile
     );
 LONG
 APIENTRY
 RegLoadKeyW (
     HKEY    hKey,
-    LPWSTR  lpSubKey,
-    LPWSTR  lpFile
+    LPCWSTR  lpSubKey,
+    LPCWSTR  lpFile
     );
 #ifdef UNICODE
-#define RegLoadKey RegLoadKeyW
+#define RegLoadKey  RegLoadKeyW
 #else
-#define RegLoadKey RegLoadKeyA
+#define RegLoadKey  RegLoadKeyA
 #endif // !UNICODE
 
 LONG
@@ -299,27 +304,27 @@ LONG
 APIENTRY
 RegOpenKeyA (
     HKEY hKey,
-    LPSTR lpSubKey,
+    LPCSTR lpSubKey,
     PHKEY phkResult
     );
 LONG
 APIENTRY
 RegOpenKeyW (
     HKEY hKey,
-    LPWSTR lpSubKey,
+    LPCWSTR lpSubKey,
     PHKEY phkResult
     );
 #ifdef UNICODE
-#define RegOpenKey RegOpenKeyW
+#define RegOpenKey  RegOpenKeyW
 #else
-#define RegOpenKey RegOpenKeyA
+#define RegOpenKey  RegOpenKeyA
 #endif // !UNICODE
 
 LONG
 APIENTRY
 RegOpenKeyExA (
     HKEY hKey,
-    LPSTR lpSubKey,
+    LPCSTR lpSubKey,
     DWORD ulOptions,
     REGSAM samDesired,
     PHKEY phkResult
@@ -328,15 +333,15 @@ LONG
 APIENTRY
 RegOpenKeyExW (
     HKEY hKey,
-    LPWSTR lpSubKey,
+    LPCWSTR lpSubKey,
     DWORD ulOptions,
     REGSAM samDesired,
     PHKEY phkResult
     );
 #ifdef UNICODE
-#define RegOpenKeyEx RegOpenKeyExW
+#define RegOpenKeyEx  RegOpenKeyExW
 #else
-#define RegOpenKeyEx RegOpenKeyExA
+#define RegOpenKeyEx  RegOpenKeyExA
 #endif // !UNICODE
 
 LONG
@@ -372,31 +377,31 @@ RegQueryInfoKeyW (
     PFILETIME lpftLastWriteTime
     );
 #ifdef UNICODE
-#define RegQueryInfoKey RegQueryInfoKeyW
+#define RegQueryInfoKey  RegQueryInfoKeyW
 #else
-#define RegQueryInfoKey RegQueryInfoKeyA
+#define RegQueryInfoKey  RegQueryInfoKeyA
 #endif // !UNICODE
 
 LONG
 APIENTRY
 RegQueryValueA (
     HKEY hKey,
-    LPSTR lpSubKey,
+    LPCSTR lpSubKey,
     LPSTR lpValue,
-    LPDWORD lpcbValue
+    PLONG   lpcbValue
     );
 LONG
 APIENTRY
 RegQueryValueW (
     HKEY hKey,
-    LPWSTR lpSubKey,
-    LPSTR lpValue,
-    LPDWORD lpcbValue
+    LPCWSTR lpSubKey,
+    LPWSTR lpValue,
+    PLONG   lpcbValue
     );
 #ifdef UNICODE
-#define RegQueryValue RegQueryValueW
+#define RegQueryValue  RegQueryValueW
 #else
-#define RegQueryValue RegQueryValueA
+#define RegQueryValue  RegQueryValueA
 #endif // !UNICODE
 
 LONG
@@ -420,71 +425,71 @@ RegQueryValueExW (
     LPDWORD lpcbData
     );
 #ifdef UNICODE
-#define RegQueryValueEx RegQueryValueExW
+#define RegQueryValueEx  RegQueryValueExW
 #else
-#define RegQueryValueEx RegQueryValueExA
+#define RegQueryValueEx  RegQueryValueExA
 #endif // !UNICODE
 
 LONG
 APIENTRY
 RegReplaceKeyA (
     HKEY     hKey,
-    LPSTR  lpSubKey,
-    LPSTR  lpNewFile,
-    LPSTR  lpOldFile
+    LPCSTR  lpSubKey,
+    LPCSTR  lpNewFile,
+    LPCSTR  lpOldFile
     );
 LONG
 APIENTRY
 RegReplaceKeyW (
     HKEY     hKey,
-    LPWSTR  lpSubKey,
-    LPWSTR  lpNewFile,
-    LPWSTR  lpOldFile
+    LPCWSTR  lpSubKey,
+    LPCWSTR  lpNewFile,
+    LPCWSTR  lpOldFile
     );
 #ifdef UNICODE
-#define RegReplaceKey RegReplaceKeyW
+#define RegReplaceKey  RegReplaceKeyW
 #else
-#define RegReplaceKey RegReplaceKeyA
+#define RegReplaceKey  RegReplaceKeyA
 #endif // !UNICODE
 
 LONG
 APIENTRY
 RegRestoreKeyA (
     HKEY hKey,
-    LPSTR lpFile,
+    LPCSTR lpFile,
     DWORD   dwFlags
     );
 LONG
 APIENTRY
 RegRestoreKeyW (
     HKEY hKey,
-    LPWSTR lpFile,
+    LPCWSTR lpFile,
     DWORD   dwFlags
     );
 #ifdef UNICODE
-#define RegRestoreKey RegRestoreKeyW
+#define RegRestoreKey  RegRestoreKeyW
 #else
-#define RegRestoreKey RegRestoreKeyA
+#define RegRestoreKey  RegRestoreKeyA
 #endif // !UNICODE
 
 LONG
 APIENTRY
 RegSaveKeyA (
     HKEY hKey,
-    LPSTR lpFile,
+    LPCSTR lpFile,
     LPSECURITY_ATTRIBUTES lpSecurityAttributes
     );
 LONG
 APIENTRY
 RegSaveKeyW (
     HKEY hKey,
-    LPWSTR lpFile,
+    LPCWSTR lpFile,
     LPSECURITY_ATTRIBUTES lpSecurityAttributes
     );
 #ifdef UNICODE
-#define RegSaveKey RegSaveKeyW
+#define RegSaveKey  RegSaveKeyW
 #else
-#define RegSaveKey RegSaveKeyA
+#define RegSaveKey  RegSaveKeyA
 #endif // !UNICODE
 
 LONG
@@ -499,24 +504,24 @@ LONG
 APIENTRY
 RegSetValueA (
     HKEY hKey,
-    LPSTR lpSubKey,
+    LPCSTR lpSubKey,
     DWORD dwType,
-    LPSTR lpData,
+    LPCSTR lpData,
     DWORD cbData
     );
 LONG
 APIENTRY
 RegSetValueW (
     HKEY hKey,
-    LPWSTR lpSubKey,
+    LPCWSTR lpSubKey,
     DWORD dwType,
-    LPSTR lpData,
+    LPCWSTR lpData,
     DWORD cbData
     );
 #ifdef UNICODE
-#define RegSetValue RegSetValueW
+#define RegSetValue  RegSetValueW
 #else
-#define RegSetValue RegSetValueA
+#define RegSetValue  RegSetValueA
 #endif // !UNICODE
 
 
@@ -524,44 +529,44 @@ LONG
 APIENTRY
 RegSetValueExA (
     HKEY hKey,
-    LPSTR lpValueName,
+    LPCSTR lpValueName,
     DWORD Reserved,
     DWORD dwType,
-    LPBYTE lpData,
+    CONST BYTE* lpData,
     DWORD cbData
     );
 LONG
 APIENTRY
 RegSetValueExW (
     HKEY hKey,
-    LPWSTR lpValueName,
+    LPCWSTR lpValueName,
     DWORD Reserved,
     DWORD dwType,
-    LPBYTE lpData,
+    CONST BYTE* lpData,
     DWORD cbData
     );
 #ifdef UNICODE
-#define RegSetValueEx RegSetValueExW
+#define RegSetValueEx  RegSetValueExW
 #else
-#define RegSetValueEx RegSetValueExA
+#define RegSetValueEx  RegSetValueExA
 #endif // !UNICODE
 
 LONG
 APIENTRY
 RegUnLoadKeyA (
     HKEY    hKey,
-    LPSTR lpSubKey
+    LPCSTR lpSubKey
     );
 LONG
 APIENTRY
 RegUnLoadKeyW (
     HKEY    hKey,
-    LPWSTR lpSubKey
+    LPCWSTR lpSubKey
     );
 #ifdef UNICODE
-#define RegUnLoadKey RegUnLoadKeyW
+#define RegUnLoadKey  RegUnLoadKeyW
 #else
-#define RegUnLoadKey RegUnLoadKeyA
+#define RegUnLoadKey  RegUnLoadKeyA
 #endif // !UNICODE
 
 //
@@ -587,9 +592,9 @@ InitiateSystemShutdownW(
     BOOL bRebootAfterShutdown
     );
 #ifdef UNICODE
-#define InitiateSystemShutdown InitiateSystemShutdownW
+#define InitiateSystemShutdown  InitiateSystemShutdownW
 #else
-#define InitiateSystemShutdown InitiateSystemShutdownA
+#define InitiateSystemShutdown  InitiateSystemShutdownA
 #endif // !UNICODE
 
 
@@ -604,10 +609,13 @@ AbortSystemShutdownW(
     LPWSTR lpMachineName
     );
 #ifdef UNICODE
-#define AbortSystemShutdown AbortSystemShutdownW
+#define AbortSystemShutdown  AbortSystemShutdownW
 #else
-#define AbortSystemShutdown AbortSystemShutdownA
+#define AbortSystemShutdown  AbortSystemShutdownA
 #endif // !UNICODE
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif // _WINREG_