Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 06:43:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MKHIVE]

Browse source 
Revert remaining changes of r47019.

svn path=/trunk/; revision=47040
This commit is contained in:
Eric Kohl 2010-04-26 16:06:17 +00:00
parent cc87229eb8
commit 93b98b3f84
2 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/tools/mkhive/reginf.c
View file

@ -188,7 +188,7 @@ do_reg_operation(
{ {
if (ValueName) if (ValueName)
{ {
RegDeleteValueA (KeyHandle, ValueName); RegDeleteValueA (KeyHandle, ValueName);
} }
else else
{ {
@ -253,7 +253,7 @@ do_reg_operation(
if (!(Flags & FLG_ADDREG_BINVALUETYPE) || if (!(Flags & FLG_ADDREG_BINVALUETYPE) ||
(Type == REG_DWORD && InfHostGetFieldCount (Context) == 5)) (Type == REG_DWORD && InfHostGetFieldCount (Context) == 5))
{ {
CHAR *Str = NULL; PCHAR Str = NULL;
if (Type == REG_MULTI_SZ) if (Type == REG_MULTI_SZ)
{ {

35
reactos/tools/mkhive/registry.c
View file

@ -25,9 +25,9 @@
/* /*
* TODO: * TODO:
* - Implement RegDeleteKeyW() * - Implement RegDeleteKey()
* - Implement RegEnumValue() * - Implement RegEnumValue()
* - Implement RegQueryValueExW() * - Implement RegQueryValueExA()
*/ */
#include <stdlib.h> #include <stdlib.h>
@ -246,34 +246,15 @@ RegCreateKeyA(
} }
LONG WINAPI LONG WINAPI
RegDeleteKeyW(IN HKEY hKey, RegDeleteKeyA(HKEY Key,
IN LPCWSTR lpSubKey) LPCSTR Name)
{ {
if (lpSubKey != NULL && wcschr(lpSubKey, L'\\') != NULL) if (Name != NULL && strchr(Name, '\\') != NULL)
return(ERROR_INVALID_PARAMETER); return(ERROR_INVALID_PARAMETER);
DPRINT1("RegDeleteKeyW: FIXME!\n"); DPRINT1("FIXME!\n");
return(ERROR_SUCCESS); return(ERROR_SUCCESS);
}
LONG WINAPI
RegDeleteKeyA(IN HKEY hKey,
IN LPCSTR lpSubKey)
{
PWSTR lpSubKeyW;
LONG rc;
if (lpSubKey != NULL && strchr(lpSubKey, '\\') != NULL)
return(ERROR_INVALID_PARAMETER);
lpSubKeyW = MultiByteToWideChar(lpSubKey);
if (!lpSubKeyW)
return ERROR_OUTOFMEMORY;
rc = RegDeleteKeyW(hKey, lpSubKeyW);
free(lpSubKeyW);
return rc;
} }
LONG WINAPI LONG WINAPI