Changeset 6565 for trunk/tools/regedit/regapi.c

Timestamp:

Aug 19, 2001, 4:04:44 PM (24 years ago)

Author:

sandervl

Message:

updates

File:

• trunk/tools/regedit/regapi.c (modified) (18 diffs)

trunk/tools/regedit/regapi.c

@@ -9 +9 @@
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <windows.h>
 #include <winreg.h>
@@ -15 +15 @@
 #include <winnt.h>
 #include <string.h>
-#include <shell.h>
 
 #ifdef __WIN32OS2__
@@ -26 +25 @@
 {
   char *ret = strchr(*string, *token);
+  char *ret1;
 
    if(ret) {
@@ -31 +31 @@
         ret++;
         (*string) = ret;
+        ret1 = strchr(ret, *token);
+        if(ret1) *ret1 = 0;
    }
    return ret;
@@ -121 +123 @@
 
 /*
- * current supported api
+ * Currently supported api
  */
 static const char* commandNames[COMMAND_COUNT] = {
@@ -160 +162 @@
 
 /* 
- * Generic prototyes
- */
-static HKEY    getDataType(LPSTR *lpValue);
+ * Generic prototypes
+ */
+static DWORD   getDataType(LPSTR *lpValue);
 static LPSTR   getRegKeyName(LPSTR lpLine);
 static HKEY    getRegClass(LPSTR lpLine);
@@ -190 +192 @@
 static char helpText[] =
 "NAME\n"
-"          regapi - provide a command line interface to the wine registry.\n"
+"          regapi - perform certain actions on the wine registry.\n"
 "\n"
 "SYNOPSIS\n"
@@ -196 +198 @@
 "\n"
 "DESCRIPTION\n"
-"          regapi allows editing the wine registry.  It processes the given\n"
-"          commandName for every line in the stdin data stream.  Input data\n"
-"          format may vary depending on the commandName see INPUT FILE FORMAT.\n"
+"          regapi modifies settings in the wine registry.  It processes\n"
+"          the given commandName for every line in the stdin data stream.\n"
+"          Input data format may vary depending on the commandName\n"
+"          (see INPUT FILE FORMAT).\n"
 "\n"
 "OPTIONS\n"
@@ -251 +254 @@
 /******************************************************************************
  * This function returns the HKEY associated with the data type encoded in the 
- * value.  It modify the input parameter (key value) in order to skip this 
+ * value.  It modifies the input parameter (key value) in order to skip this 
  * "now useless" data type information.
  */
-HKEY getDataType(LPSTR *lpValue) 
+DWORD getDataType(LPSTR *lpValue) 
 {
   INT   counter  = 0;
@@ -305 +308 @@
 /******************************************************************************
  * Extracts from a [HKEY/some/key/path] type of line the key class (what 
- * starts after the '[' and end before the first '\'
+ * starts after the '[' and ends before the first '\'
  */
 static HKEY getRegClass(LPSTR lpClass) 
@@ -315 +318 @@
   
   if (lpClass == NULL)
-    return ERROR_INVALID_PARAMETER;
+    return (HKEY)ERROR_INVALID_PARAMETER;
 
   strcpy(lpClassCopy, lpClass);
 
   classNameEnd  = strstr(lpClassCopy, "\\");  /* The class name end by '\' */
-  if(classNameEnd) 
-        *classNameEnd = '\0';                       /* Isolate the class name */
-
+  *classNameEnd = '\0';                       /* Isolate the class name */
   classNameBeg  = &lpClassCopy[1];            /* Skip the '[' */
   
@@ -336 +337 @@
     return  HKEY_CURRENT_USER;
   else
-    return ERROR_INVALID_PARAMETER;
+    return (HKEY)ERROR_INVALID_PARAMETER;
 }
 
@@ -615 +616 @@
   /* Get the registry class */
   currentKeyClass = getRegClass(stdInput); /* Sets global variable */
-  if (currentKeyClass == ERROR_INVALID_PARAMETER)
-    return ERROR_INVALID_PARAMETER;
+  if (currentKeyClass == (HKEY)ERROR_INVALID_PARAMETER)
+    return (HRESULT)ERROR_INVALID_PARAMETER;
 
   /* Get the key name */
@@ -642 +643 @@
 }
 /******************************************************************************
- * This function is a wrapper arround the setValue function.  It prepares the 
+ * This function is a wrapper for the setValue function.  It prepares the 
  * land and clean the area once completed.
  */
@@ -660 +661 @@
     argv[counter]=NULL;
 
-#ifdef __WIN32OS2__
-  if(*cmdline == '"') cmdline++; 
-  argv[0] = cmdline;
-  token = strsep(&cmdline, setValueDelim[argCounter]);
-  if(token && *(token-2) == '"') {
-        *(token-2) = 0;
-  }
-  argv[1] = getArg(token);
-#else
   while( (token = strsep(&cmdline, setValueDelim[argCounter])) != NULL ) 
   {
@@ -676 +668 @@
       break;  /* Stop processing args no matter what */
   }
-#endif
 
   hRes = setValue(argv);
@@ -708 +699 @@
 
 /******************************************************************************
- * This function is a wrapper arround the queryValue function.  It prepares the 
+ * This function is a wrapper for the queryValue function.  It prepares the 
  * land and clean the area once completed.
  */
@@ -1030 +1021 @@
 
 /******************************************************************************
- * MAIN - The main simply validate the first parameter (command to perform)
- *        It then read the STDIN lines by lines forwarding their processing
+ * MAIN - WinMain simply validates the first parameter (command to perform)
+ *        It then reads the STDIN lines by lines forwarding their processing
  *        to the appropriate method.
  */
-int PASCAL WinMain (HANDLE inst, HANDLE prev, LPSTR cmdline, int show)
+int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 {
   LPSTR  token          = NULL;  /* current token analized */