Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 15:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADVAPI32]

Browse source 
- Centralize RegDeleteKey[Ex]{A,W} implementation into RegDeleteKeyExW
 - Update the HKCR wrapper accordingly.
CORE-8582

svn path=/trunk/; revision=64427
This commit is contained in:
Jérôme Gardou 2014-09-30 22:05:50 +00:00
parent c9143ec6b0
commit 89722b00b4
3 changed files with 64 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/advapi32/reg/hkcr.c
View file

@ -272,7 +272,9 @@ LONG
WINAPI
DeleteHKCRKey(
_In_ HKEY hKey,
_In_ LPCWSTR lpSubKey)
_In_ LPCWSTR lpSubKey,
_In_ REGSAM RegSam,
_In_ DWORD Reserved)
{
HKEY QueriedKey;
LONG ErrorCode;
@ -287,7 +289,7 @@ DeleteHKCRKey(
if (ErrorCode == ERROR_FILE_NOT_FOUND)
{
/* The key doesn't exist on HKCU side, no chance for a subkey */
return RegDeleteKeyW(hKey, lpSubKey);
return RegDeleteKeyExW(hKey, lpSubKey, RegSam, Reserved);
}
if (ErrorCode != ERROR_SUCCESS)
@ -296,7 +298,7 @@ DeleteHKCRKey(
return ErrorCode;
}
ErrorCode = RegDeleteKeyW(QueriedKey, lpSubKey);
ErrorCode = RegDeleteKeyExW(QueriedKey, lpSubKey, RegSam, Reserved);
/* Close it if we must */
if (QueriedKey != hKey)
@ -317,7 +319,7 @@ DeleteHKCRKey(
return ErrorCode;
}
ErrorCode = RegDeleteKeyW(QueriedKey, lpSubKey);
ErrorCode = RegDeleteKeyExW(QueriedKey, lpSubKey, RegSam, Reserved);
/* Close it if we must */
if (QueriedKey != hKey)

204
reactos/dll/win32/advapi32/reg/reg.c
View file

@ -1181,20 +1181,13 @@ RegCreateKeyW(HKEY hKey,
*
* @implemented
*/
LONG WINAPI
RegDeleteKeyA(HKEY hKey,
LPCSTR lpSubKey)
LONG
WINAPI
RegDeleteKeyA(
_In_ HKEY hKey,
_In_ LPCSTR lpSubKey)
{
LONG ErrorCode;
UNICODE_STRING SubKeyName;
RtlCreateUnicodeStringFromAsciiz(&SubKeyName, (LPSTR)lpSubKey);
ErrorCode = RegDeleteKeyW(hKey, SubKeyName.Buffer);
RtlFreeUnicodeString(&SubKeyName);
return ErrorCode;
return RegDeleteKeyExA(hKey, lpSubKey, 0, 0);
}
@ -1203,9 +1196,54 @@ RegDeleteKeyA(HKEY hKey,
*
* @implemented
*/
LONG WINAPI
RegDeleteKeyW(HKEY hKey,
LPCWSTR lpSubKey)
LONG
WINAPI
RegDeleteKeyW(
_In_ HKEY hKey,
_In_ LPCWSTR lpSubKey)
{
return RegDeleteKeyExW(hKey, lpSubKey, 0, 0);
}
/************************************************************************
* RegDeleteKeyExA
*
* @implemented
*/
LONG
WINAPI
RegDeleteKeyExA(
_In_ HKEY hKey,
_In_ LPCSTR lpSubKey,
_In_ REGSAM samDesired,
_In_ DWORD Reserved)
{
LONG ErrorCode;
UNICODE_STRING SubKeyName;
RtlCreateUnicodeStringFromAsciiz(&SubKeyName, (LPSTR)lpSubKey);
ErrorCode = RegDeleteKeyExW(hKey, SubKeyName.Buffer, samDesired, Reserved);
RtlFreeUnicodeString(&SubKeyName);
return ErrorCode;
}
/************************************************************************
* RegDeleteKeyExW
*
* @implemented
*/
LONG
WINAPI
RegDeleteKeyExW(
_In_ HKEY hKey,
_In_ LPCWSTR lpSubKey,
_In_ REGSAM samDesired,
_In_ DWORD Reserved)
{
OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING SubKeyName;
@ -1228,139 +1266,7 @@ RegDeleteKeyW(HKEY hKey,
}
if (IsHKCRKey(ParentKey))
return DeleteHKCRKey(ParentKey, lpSubKey);
RtlInitUnicodeString(&SubKeyName,
(LPWSTR)lpSubKey);
InitializeObjectAttributes(&ObjectAttributes,
&SubKeyName,
OBJ_CASE_INSENSITIVE,
ParentKey,
NULL);
Status = NtOpenKey(&TargetKey,
DELETE,
&ObjectAttributes);
if (!NT_SUCCESS(Status))
{
goto Cleanup;
}
Status = NtDeleteKey(TargetKey);
NtClose(TargetKey);
Cleanup:
ClosePredefKey(ParentKey);
if (!NT_SUCCESS(Status))
{
return RtlNtStatusToDosError(Status);
}
return ERROR_SUCCESS;
}
/************************************************************************
* RegDeleteKeyExA
*
* @implemented
*/
LONG
WINAPI
RegDeleteKeyExA(HKEY hKey,
LPCSTR lpSubKey,
REGSAM samDesired,
DWORD Reserved)
{
OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING SubKeyName;
HANDLE ParentKey;
HANDLE TargetKey;
NTSTATUS Status;
/* Make sure we got a subkey */
if (!lpSubKey)
{
/* Fail */
return ERROR_INVALID_PARAMETER;
}
Status = MapDefaultKey(&ParentKey,
hKey);
if (!NT_SUCCESS(Status))
{
return RtlNtStatusToDosError(Status);
}
if (samDesired & KEY_WOW64_32KEY)
ERR("Wow64 not yet supported!\n");
if (samDesired & KEY_WOW64_64KEY)
ERR("Wow64 not yet supported!\n");
RtlCreateUnicodeStringFromAsciiz(&SubKeyName,
(LPSTR)lpSubKey);
InitializeObjectAttributes(&ObjectAttributes,
&SubKeyName,
OBJ_CASE_INSENSITIVE,
ParentKey,
NULL);
Status = NtOpenKey(&TargetKey,
DELETE,
&ObjectAttributes);
RtlFreeUnicodeString(&SubKeyName);
if (!NT_SUCCESS(Status))
{
goto Cleanup;
}
Status = NtDeleteKey(TargetKey);
NtClose (TargetKey);
Cleanup:
ClosePredefKey(ParentKey);
if (!NT_SUCCESS(Status))
{
return RtlNtStatusToDosError(Status);
}
return ERROR_SUCCESS;
}
/************************************************************************
* RegDeleteKeyExW
*
* @implemented
*/
LONG
WINAPI
RegDeleteKeyExW(HKEY hKey,
LPCWSTR lpSubKey,
REGSAM samDesired,
DWORD Reserved)
{
OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING SubKeyName;
HANDLE ParentKey;
HANDLE TargetKey;
NTSTATUS Status;
/* Make sure we got a subkey */
if (!lpSubKey)
{
/* Fail */
return ERROR_INVALID_PARAMETER;
}
Status = MapDefaultKey(&ParentKey,
hKey);
if (!NT_SUCCESS(Status))
{
return RtlNtStatusToDosError(Status);
}
return DeleteHKCRKey(ParentKey, lpSubKey, samDesired, Reserved);
if (samDesired & KEY_WOW64_32KEY)
ERR("Wow64 not yet supported!\n");

4
reactos/dll/win32/advapi32/reg/reg.h
View file

@ -35,5 +35,7 @@ LONG
WINAPI
DeleteHKCRKey(
_In_ HKEY hKey,
_In_ LPCWSTR lpSubKey);
_In_ LPCWSTR lpSubKey,
_In_ REGSAM RegSam,
_In_ DWORD Reserved);