[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 50d379b..dd8ac45 100644 (file)
--- a/reactos/tools/mkhive/reginf.c
+++ b/reactos/tools/mkhive/reginf.c
@@ -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) ||
            (Type == REG_DWORD && InfHostGetFieldCount (Context) == 5))
        {
        if (!(Flags & FLG_ADDREG_BINVALUETYPE) ||
            (Type == REG_DWORD && InfHostGetFieldCount (Context) == 5))
        {

-               CHAR *Str = NULL;
+               PCHAR Str = NULL;

 
                if (Type == REG_MULTI_SZ)
                {
 
                if (Type == REG_MULTI_SZ)
                {

diff --git a/reactos/tools/mkhive/registry.c b/reactos/tools/mkhive/registry.c
index e182596..3bd2c9e 100644 (file)
--- a/reactos/tools/mkhive/registry.c
+++ b/reactos/tools/mkhive/registry.c
@@ -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,
-             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
 }
 
 LONG WINAPI