Author: ekohl
Date: Mon Apr 26 18:06:17 2010
New Revision: 47040
URL:
http://svn.reactos.org/svn/reactos?rev=47040&view=rev
Log:
[MKHIVE]
Revert remaining changes of r47019.
Modified:
trunk/reactos/tools/mkhive/reginf.c
trunk/reactos/tools/mkhive/registry.c
Modified: trunk/reactos/tools/mkhive/reginf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=…
==============================================================================
--- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original)
+++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Mon Apr 26 18:06:17 2010
@@ -188,7 +188,7 @@
{
if (ValueName)
{
- RegDeleteValueA (KeyHandle, ValueName);
+ RegDeleteValueA (KeyHandle, ValueName);
}
else
{
@@ -253,7 +253,7 @@
if (!(Flags & FLG_ADDREG_BINVALUETYPE) ||
(Type == REG_DWORD && InfHostGetFieldCount (Context) == 5))
{
- CHAR *Str = NULL;
+ PCHAR Str = NULL;
if (Type == REG_MULTI_SZ)
{
Modified: trunk/reactos/tools/mkhive/registry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re…
==============================================================================
--- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original)
+++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Mon Apr 26 18:06:17 2010
@@ -25,9 +25,9 @@
/*
* TODO:
- * - Implement RegDeleteKeyW()
+ * - Implement RegDeleteKey()
* - Implement RegEnumValue()
- * - Implement RegQueryValueExW()
+ * - Implement RegQueryValueExA()
*/
#include <stdlib.h>
@@ -246,34 +246,15 @@
}
LONG WINAPI
-RegDeleteKeyW(IN HKEY hKey,
- IN LPCWSTR lpSubKey)
-{
- if (lpSubKey != NULL && wcschr(lpSubKey, L'\\') != NULL)
- return(ERROR_INVALID_PARAMETER);
-
- DPRINT1("RegDeleteKeyW: FIXME!\n");
-
- 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;
+RegDeleteKeyA(HKEY Key,
+ LPCSTR Name)
+{
+ if (Name != NULL && strchr(Name, '\\') != NULL)
+ return(ERROR_INVALID_PARAMETER);
+
+ DPRINT1("FIXME!\n");
+
+ return(ERROR_SUCCESS);
}
LONG WINAPI