Changeset 2984 for trunk/src/kernel32/conprop2.cpp

Timestamp:

Mar 3, 2000, 12:16:00 PM (25 years ago)

Author:

sandervl

Message:

moved registry apis into kernel32 + cleanup

File:

• trunk/src/kernel32/conprop2.cpp (modified) (14 diffs)

trunk/src/kernel32/conprop2.cpp

@@ -1 @@
-/* $Id: conprop2.cpp,v 1.5 2000-03-03 09:06:19 sandervl Exp $ */
+/* $Id: conprop2.cpp,v 1.6 2000-03-03 11:15:57 sandervl Exp $ */
 
 /*
@@ -40 +40 @@
 
 #include <win32type.h>
+#include <win32api.h>
 #include <misc.h>
 #include <stdio.h>
@@ -56 +57 @@
  * Defines                                                                   *
  *****************************************************************************/
-
-#define ERROR_SUCCESS 0
-
-#define REG_NONE                         0  /* no type */
-#define REG_SZ                           1  /* string type (ASCII) */
-#define REG_EXPAND_SZ                    2  /* string, includes %ENVVAR% (expanded by caller) (ASCII) */
-#define REG_BINARY                       3  /* binary format, callerspecific */
-                                /* YES, REG_DWORD == REG_DWORD_LITTLE_ENDIAN */
-#define REG_DWORD                        4  /* DWORD in little endian format */
-#define REG_DWORD_LITTLE_ENDIAN          4  /* DWORD in little endian format */
-#define REG_DWORD_BIG_ENDIAN             5  /* DWORD in big endian format  */
-#define REG_LINK                         6  /* symbolic link (UNICODE) */
-#define REG_MULTI_SZ                     7  /* multiple strings, delimited by \0, terminated by \0\0 (ASCII) */
-#define REG_RESOURCE_LIST                8  /* resource list? huh? */
-#define REG_FULL_RESOURCE_DESCRIPTOR     9  /* full resource descriptor? huh? */
-
-#define HKEY_LOCAL_MACHINE_O32      0xFFFFFFEFL
-#define HKEY_CURRENT_USER_O32       0xFFFFFFEEL
-#define HKEY_USERS_O32              0xFFFFFFEDL
-#define HKEY_CLASSES_ROOT_O32       0xFFFFFFECL
-
-#define KEY_ALL_ACCESS 0x0000003f
-
-typedef unsigned long HKEY;
-typedef HKEY* LPHKEY;
-typedef DWORD REGSAM;
-
-LONG  _System _O32_RegOpenKeyEx(HKEY,LPCSTR,DWORD,REGSAM,LPHKEY);
-LONG  _System _O32_RegCreateKeyEx(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,
-                              LPSECURITY_ATTRIBUTES,LPHKEY,LPDWORD);
-LONG  _System _O32_RegQueryValueEx(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-LONG  _System _O32_RegCloseKey(HKEY);
-LONG  _System _O32_RegSetValueEx( HKEY, LPCSTR, DWORD, DWORD, LPBYTE, DWORD );
-
-DWORD WIN32API GetModuleFileNameA(HMODULE,LPSTR,DWORD);
-
 
 /*****************************************************************************
@@ -175 +140 @@
 
   // HKEY_CURRENT_USER/SOFTWARE/ODIN/ConsoleProperties/<process name>/<option name>
-  LONG  lRes = ERROR_SUCCESS;
+  LONG  lRes = ERROR_SUCCESS_W;
   HKEY  hkConsole;
   char  szKey[256];
@@ -198 +163 @@
              szProcessName);
 
-    lRes = _O32_RegOpenKeyEx(HKEY_CURRENT_USER_O32,
+    lRes = RegOpenKeyExA(HKEY_CURRENT_USER,
                          szKey,
                          0,
@@ -206 +171 @@
 
   // try to open DEFAULT
-  if (lRes != ERROR_SUCCESS)
-    lRes = _O32_RegOpenKeyEx(HKEY_CURRENT_USER_O32,
+  if (lRes != ERROR_SUCCESS_W)
+    lRes = RegOpenKeyExA(HKEY_CURRENT_USER,
                          "Software\\ODIN\\ConsoleProperties\\DEFAULT",
                          0,
@@ -214 +179 @@
 
   // now it's time to retrieve information
-  if (lRes != ERROR_SUCCESS)
+  if (lRes != ERROR_SUCCESS_W)
   {
     // load hardcoded defaults instead
@@ -225 +190 @@
 #define REGQUERYVALUE(name,var)              \
   dwSize = sizeof(pConsoleOptions->var);             \
-  lRes = _O32_RegQueryValueEx(hkConsole, name, NULL, &dwType, \
+  lRes = RegQueryValueExA(hkConsole, name, NULL, &dwType, \
            (LPBYTE)&pConsoleOptions->var, &dwSize);
 
@@ -253 +218 @@
 #undef REGQUERYVALUE
 
-  _O32_RegCloseKey(hkConsole);
+  RegCloseKey(hkConsole);
 
   return (NO_ERROR);
@@ -277 +242 @@
 
   // HKEY_CURRENT_USER/SOFTWARE/ODIN/ConsoleProperties/<process name>/<option name>
-  LONG  lRes = ERROR_SUCCESS;
+  LONG  lRes = ERROR_SUCCESS_W;
   HKEY  hkConsole;
   char  szKey[256];
@@ -301 +266 @@
              szProcessName);
 
-    lRes = _O32_RegCreateKeyEx(HKEY_CURRENT_USER_O32,
+    lRes = RegCreateKeyExA(HKEY_CURRENT_USER,
                                szKey,
                                0,
@@ -310 +275 @@
                                &hkConsole,
                                &dwDisposition);
-    if (lRes != ERROR_SUCCESS)
+    if (lRes != ERROR_SUCCESS_W)
        return lRes;
   }
@@ -316 +281 @@
 
 #define REGSAVEVALUE(name,var) \
-  lRes = _O32_RegSetValueEx(hkConsole, name, 0, REG_DWORD, \
+  lRes = RegSetValueExA(hkConsole, name, 0, REG_DWORD, \
                  (LPBYTE)&pConsoleOptions->var, sizeof(pConsoleOptions->var));
 
@@ -344 +309 @@
 #undef REGSAVEVALUE
 
-  _O32_RegCloseKey(hkConsole);
+  RegCloseKey(hkConsole);
 
   return (NO_ERROR);