Changeset 2984 for trunk/src/kernel32/initsystem.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/initsystem.cpp (modified) (5 diffs)

trunk/src/kernel32/initsystem.cpp

@@ -1 @@
-/* $Id: initsystem.cpp,v 1.5 2000-03-02 19:17:21 sandervl Exp $ */
+/* $Id: initsystem.cpp,v 1.6 2000-03-03 11:15:57 sandervl Exp $ */
 /*
  * Odin system initialization (registry & directories)
@@ -27 +27 @@
 #include "dbglocal.h"
 
-static HINSTANCE hInstance = 0;
-
 BOOL InitRegistry();
-
-LONG (WIN32API *ADVAPI32_RegCloseKey)(HKEY) = 0;
-LONG (WIN32API *ADVAPI32_RegOpenKeyA)(HKEY,LPCSTR,LPHKEY) = 0;
-LONG (WIN32API *ADVAPI32_RegCreateKeyA)(HKEY,LPCSTR,LPHKEY) = 0;
-LONG (WIN32API *ADVAPI32_RegSetValueExA)(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD) = 0;
 
 //******************************************************************************
@@ -40 +33 @@
 BOOL InitSystemEnvironment(ULONG nrCPUs)
 {
-   hInstance = LoadLibraryA("ADVAPI32.DLL");
-   if(hInstance) {
-        *(VOID **)&ADVAPI32_RegCloseKey=(void*)GetProcAddress(hInstance, (LPCSTR)"RegCloseKey");
-        *(VOID **)&ADVAPI32_RegOpenKeyA=(void*)GetProcAddress(hInstance, (LPCSTR)"RegOpenKeyA");
-        *(VOID **)&ADVAPI32_RegCreateKeyA=(void*)GetProcAddress(hInstance, (LPCSTR)"RegCreateKeyA");
-        *(VOID **)&ADVAPI32_RegSetValueExA=(void*)GetProcAddress(hInstance, (LPCSTR)"RegSetValueExA");
-   }
    InitSystemInfo(nrCPUs);
    return InitRegistry();
@@ -67 +53 @@
  char  digbuf[16];
 
-   if(ADVAPI32_RegCreateKeyA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Control\\Windows",&hkey)!=ERROR_SUCCESS) {
+   if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Control\\Windows",&hkey)!=ERROR_SUCCESS) {
         dprintf(("InitRegistry: Unable to register system information\n"));
         return FALSE;
    }
    buf = InternalGetWindowsDirectoryA();
-   ADVAPI32_RegSetValueExA(hkey,"Directory",0,REG_BINARY, (LPBYTE)buf, strlen(buf)+1);
+   RegSetValueExA(hkey,"Directory",0,REG_BINARY, (LPBYTE)buf, strlen(buf)+1);
    buf = InternalGetSystemDirectoryA();
-   ADVAPI32_RegSetValueExA(hkey,"SystemDirectory",0,REG_BINARY, (LPBYTE)buf, strlen(buf)+1);
+   RegSetValueExA(hkey,"SystemDirectory",0,REG_BINARY, (LPBYTE)buf, strlen(buf)+1);
    val = 0;
-   ADVAPI32_RegSetValueExA(hkey,"ErrorMode",0,REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
+   RegSetValueExA(hkey,"ErrorMode",0,REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
    val = 0;
-   ADVAPI32_RegSetValueExA(hkey,"NoInteractiveServices",0,REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
+   RegSetValueExA(hkey,"NoInteractiveServices",0,REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
    val = ODINNT_BUILD_NR;
-   ADVAPI32_RegSetValueExA(hkey,"CSDVersion",0,REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
-   ADVAPI32_RegSetValueExA(hkey,"ShutdownTime",0,REG_DWORD, (LPBYTE)ShutdownTime, sizeof(ShutdownTime));
-   ADVAPI32_RegCloseKey(hkey);
+   RegSetValueExA(hkey,"CSDVersion",0,REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
+   RegSetValueExA(hkey,"ShutdownTime",0,REG_DWORD, (LPBYTE)ShutdownTime, sizeof(ShutdownTime));
+   RegCloseKey(hkey);
 
-   if(ADVAPI32_RegCreateKeyA(HKEY_LOCAL_MACHINE,"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",&hkey)!=ERROR_SUCCESS) {
+   if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",&hkey)!=ERROR_SUCCESS) {
         dprintf(("InitRegistry: Unable to register system information (2)"));
         return FALSE;
    }
    buf = InternalGetSystemDirectoryA();
-   ADVAPI32_RegSetValueExA(hkey,"SystemRoot",0,REG_SZ, (LPBYTE)buf, strlen(buf)+1);
-   ADVAPI32_RegSetValueExA(hkey,"PathName",0,REG_SZ, (LPBYTE)buf, strlen(buf)+1);
+   RegSetValueExA(hkey,"SystemRoot",0,REG_SZ, (LPBYTE)buf, strlen(buf)+1);
+   RegSetValueExA(hkey,"PathName",0,REG_SZ, (LPBYTE)buf, strlen(buf)+1);
    sprintf(digbuf, "%d", ODINNT_BUILD_NR);
-   ADVAPI32_RegSetValueExA(hkey,"CurrentBuildNumber",0,REG_SZ, (LPBYTE)digbuf, strlen(digbuf)+1);
-   ADVAPI32_RegSetValueExA(hkey,"CurrentType",0,REG_SZ, (LPBYTE)ODINNT_OSTYPE_UNI, sizeof(ODINNT_OSTYPE_UNI));
-   ADVAPI32_RegSetValueExA(hkey,"CSDVersion",0,REG_SZ, (LPBYTE)ODINNT_CSDVERSION, sizeof(ODINNT_CSDVERSION));
-   ADVAPI32_RegSetValueExA(hkey,"SoftwareType",0,REG_SZ, (LPBYTE)ODINNT_SOFTWARE_TYPE, sizeof(ODINNT_SOFTWARE_TYPE));
+   RegSetValueExA(hkey,"CurrentBuildNumber",0,REG_SZ, (LPBYTE)digbuf, strlen(digbuf)+1);
+   RegSetValueExA(hkey,"CurrentType",0,REG_SZ, (LPBYTE)ODINNT_OSTYPE_UNI, sizeof(ODINNT_OSTYPE_UNI));
+   RegSetValueExA(hkey,"CSDVersion",0,REG_SZ, (LPBYTE)ODINNT_CSDVERSION, sizeof(ODINNT_CSDVERSION));
+   RegSetValueExA(hkey,"SoftwareType",0,REG_SZ, (LPBYTE)ODINNT_SOFTWARE_TYPE, sizeof(ODINNT_SOFTWARE_TYPE));
 
    sprintf(digbuf, "%d.%d", ODINNT_MAJOR_VERSION, ODINNT_MINOR_VERSION);
-   ADVAPI32_RegSetValueExA(hkey,"CurrentVersion",0,REG_SZ, (LPBYTE)digbuf, strlen(digbuf)+1);
+   RegSetValueExA(hkey,"CurrentVersion",0,REG_SZ, (LPBYTE)digbuf, strlen(digbuf)+1);
 
    val = (DWORD)time(NULL); //todo: Correct format???
-   ADVAPI32_RegSetValueExA(hkey,"InstallDate",0,REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
+   RegSetValueExA(hkey,"InstallDate",0,REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
    
-   ADVAPI32_RegCloseKey(hkey);
+   RegCloseKey(hkey);
    //todo: productid, registered org/owner, sourcepath,    
 
@@ -121 +107 @@
    char shellpath[260];
 
-   if(ADVAPI32_RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &hkey) != ERROR_SUCCESS) 
-   {
-        if(ADVAPI32_RegCreateKeyA(HKEY_CURRENT_USER,"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",&hkey)!=ERROR_SUCCESS) {
-                dprintf(("InitRegistry: Unable to register system information (3)"));
-                return FALSE;
-        }
+   if(RegCreateKeyA(HKEY_CURRENT_USER,"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",&hkey)!=ERROR_SUCCESS) {
+        dprintf(("InitRegistry: Unable to register system information (3)"));
+        return FALSE;
+   }
+//   if(RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &hkey) != ERROR_SUCCESS) 
+//   {
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\Favorites");
+        strcat(shellpath, "\\WIN\\Favorites");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"Favorites",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+        RegSetValueExA(hkey,"Favorites",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\Programs\\Startup");
+        strcat(shellpath, "\\WIN\\Programs\\Startup");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"Startup",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+        RegSetValueExA(hkey,"Startup",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\Desktop");
+        strcat(shellpath, "\\WIN\\Desktop");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"Desktop",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+        RegSetValueExA(hkey,"Desktop",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\Start Menu\\Programs");
+        strcat(shellpath, "\\WIN\\Start Menu\\Programs");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"Programs",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+        RegSetValueExA(hkey,"Programs",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\Fonts");
+        strcat(shellpath, "\\WIN\\Fonts");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"Fonts",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+        RegSetValueExA(hkey,"Fonts",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\SendTo");
+        strcat(shellpath, "\\WIN\\SendTo");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"SendTo",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+        RegSetValueExA(hkey,"SendTo",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\Start Menu");
+        strcat(shellpath, "\\WIN\\Start Menu");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"Start Menu",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+        RegSetValueExA(hkey,"Start Menu",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\ShellNew");
+        strcat(shellpath, "\\WIN\\ShellNew");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"Templates",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+        RegSetValueExA(hkey,"Templates",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\Recent");
+        strcat(shellpath, "\\WIN\\Recent");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"Recent",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+        RegSetValueExA(hkey,"Recent",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\NetHood");
+        strcat(shellpath, "\\WIN\\NetHood");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"NetHood",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+        RegSetValueExA(hkey,"NetHood",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
         strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\My Documents");
+        strcat(shellpath, "\\WIN\\My Documents");
         CreateDirectoryA(shellpath, NULL);
-        ADVAPI32_RegSetValueExA(hkey,"Personal",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-   }
-   ADVAPI32_RegCloseKey(hkey);
+        RegSetValueExA(hkey,"Personal",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+//   }
+   RegCloseKey(hkey);
    return TRUE;
 }