From 66845c62b18a89e2dd2f336a29cee9073e4fe3cd Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Thu, 5 Oct 2006 07:36:06 +0000 Subject: [PATCH] * include/winreg.h (RegDeleteKeyEx{A|W}): Add prototype and UNICODE mappings. (KEY_WOW64_32KEY, KEY_WOW64_64KEY): Define. * lib/advapi.def (RegDeleteKeyEx{A|W}): Export. --- winsup/w32api/ChangeLog | 7 +++++++ winsup/w32api/include/winreg.h | 15 +++++++++++++++ winsup/w32api/lib/advapi32.def | 2 ++ 3 files changed, 24 insertions(+) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index dc863fb23..529a4e051 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2006-10-05 Danny Smith + + * include/winreg.h (RegDeleteKeyEx{A|W}): Add prototype and UNICODE + mappings. + (KEY_WOW64_32KEY, KEY_WOW64_64KEY): Define. + * lib/advapi.def (RegDeleteKeyEx{A|W}): Export. + 2006-10-04 Danny Smith * include/rpc.h: Add whitespace. diff --git a/winsup/w32api/include/winreg.h b/winsup/w32api/include/winreg.h index 35218f6e7..0e5fbf118 100644 --- a/winsup/w32api/include/winreg.h +++ b/winsup/w32api/include/winreg.h @@ -41,6 +41,11 @@ extern "C" { #define REG_NOTIFY_CHANGE_LAST_SET 4 #define REG_NOTIFY_CHANGE_SECURITY 8 +#if (WINVER >= 0x0502) +#define KEY_WOW64_32KEY 0x0200 +#define KEY_WOW64_64KEY 0x0100 +#endif + #ifndef RC_INVOKED typedef ACCESS_MASK REGSAM; typedef struct value_entA { @@ -68,6 +73,10 @@ WINADVAPI LONG WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,LPS WINADVAPI LONG WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY); WINADVAPI LONG WINAPI RegDeleteKeyA(HKEY,LPCSTR); WINADVAPI LONG WINAPI RegDeleteKeyW(HKEY,LPCWSTR); +#if (WINVER >= 0x0502) +WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD); +WINADVAPI LONG WINAPI RegDeleteKeyExW(HKEY,LPCWSTR,REGSAM,DWORD); +#endif WINADVAPI LONG WINAPI RegDeleteValueA(HKEY,LPCSTR); WINADVAPI LONG WINAPI RegDeleteValueW(HKEY,LPCWSTR); WINADVAPI LONG WINAPI RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD); @@ -115,6 +124,9 @@ typedef VALENTW VALENT,*PVALENT; #define RegCreateKey RegCreateKeyW #define RegCreateKeyEx RegCreateKeyExW #define RegDeleteKey RegDeleteKeyW +#if (WINVER >= 0x0502) +#define RegDeleteKeyEx RegDeleteKeyExW +#endif #define RegDeleteValue RegDeleteValueW #define RegEnumKey RegEnumKeyW #define RegEnumKeyEx RegEnumKeyExW @@ -140,6 +152,9 @@ typedef VALENTA VALENT,*PVALENT; #define RegCreateKey RegCreateKeyA #define RegCreateKeyEx RegCreateKeyExA #define RegDeleteKey RegDeleteKeyA +#if (WINVER >= 0x0502) +#define RegDeleteKeyEx RegDeleteKeyExA +#endif #define RegDeleteValue RegDeleteValueA #define RegEnumKey RegEnumKeyA #define RegEnumKeyEx RegEnumKeyExA diff --git a/winsup/w32api/lib/advapi32.def b/winsup/w32api/lib/advapi32.def index 99fc62bad..dd358d4e1 100644 --- a/winsup/w32api/lib/advapi32.def +++ b/winsup/w32api/lib/advapi32.def @@ -395,6 +395,8 @@ RegCreateKeyExW@36 RegCreateKeyW@12 RegDeleteKeyA@8 RegDeleteKeyW@8 +RegDeleteKeyExA@16 +RegDeleteKeyExW@16 RegDeleteValueA@8 RegDeleteValueW@8 RegDisablePredefinedCache@0