From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 26 Apr 2010 16:06:17 +0000 (+0000)
Subject: [MKHIVE]
X-Git-Tag: backups/header-work@57446~33^2~45
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=93b98b3f84a9b6e3111a1fb4d9fdda402951c0a5;ds=sidebyside

[MKHIVE]
Revert remaining changes of r47019.

svn path=/trunk/; revision=47040
---

diff --git a/reactos/tools/mkhive/reginf.c b/reactos/tools/mkhive/reginf.c
index 50d379b0ffe..dd8ac4596e0 100644
--- a/reactos/tools/mkhive/reginf.c
+++ b/reactos/tools/mkhive/reginf.c
@@ -188,7 +188,7 @@ do_reg_operation(
 	{
 		if (ValueName)
 		{
-			RegDeleteValueA (KeyHandle, ValueName);
+				RegDeleteValueA (KeyHandle, ValueName);
 		}
 		else
 		{
@@ -253,7 +253,7 @@ do_reg_operation(
 	if (!(Flags & FLG_ADDREG_BINVALUETYPE) ||
 	    (Type == REG_DWORD && InfHostGetFieldCount (Context) == 5))
 	{
-		CHAR *Str = NULL;
+		PCHAR Str = NULL;
 
 		if (Type == REG_MULTI_SZ)
 		{
diff --git a/reactos/tools/mkhive/registry.c b/reactos/tools/mkhive/registry.c
index e182596e23b..3bd2c9efe60 100644
--- a/reactos/tools/mkhive/registry.c
+++ b/reactos/tools/mkhive/registry.c
@@ -25,9 +25,9 @@
 
 /*
  * TODO:
- *	- Implement RegDeleteKeyW()
+ *	- Implement RegDeleteKey()
  *	- Implement RegEnumValue()
- *	- Implement RegQueryValueExW()
+ *	- Implement RegQueryValueExA()
  */
 
 #include <stdlib.h>
@@ -246,34 +246,15 @@ RegCreateKeyA(
 }
 
 LONG WINAPI
-RegDeleteKeyW(IN HKEY hKey,
-	      IN LPCWSTR lpSubKey)
+RegDeleteKeyA(HKEY Key,
+	     LPCSTR Name)
 {
-	if (lpSubKey != NULL && wcschr(lpSubKey, L'\\') != NULL)
-		return(ERROR_INVALID_PARAMETER);
+  if (Name != NULL && strchr(Name, '\\') != NULL)
+    return(ERROR_INVALID_PARAMETER);
 
-	DPRINT1("RegDeleteKeyW: FIXME!\n");
+  DPRINT1("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;
+  return(ERROR_SUCCESS);
 }
 
 LONG WINAPI