Changeset 2229 for trunk/src

Timestamp:

Dec 28, 1999, 8:16:35 PM (26 years ago)

Author:

sandervl

Message:

registry tree added + getsystempowerstatus implemented

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (6 diffs)
• initsystem.cpp (modified) (4 diffs)
• makefile (modified) (3 diffs)
• stubs.cpp (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.39 1999-12-24 18:40:08 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.40 1999-12-28 19:16:34 sandervl Exp $ */
 
 /*
@@ -35 +35 @@
 #include "handlemanager.h"
 #include "wprocess.h"
-
+#include <versionos2.h>
 
 /*****************************************************************************
@@ -559 +559 @@
         return(FALSE);
 
-   lpVersionInformation->dwMajorVersion = 4;    //pretend we're NT 4.0
-   lpVersionInformation->dwMinorVersion = 0;
-   lpVersionInformation->dwBuildNumber  = 0x565;
+   lpVersionInformation->dwMajorVersion = ODINNT_MAJOR_VERSION;    //pretend we're NT 4.0
+   lpVersionInformation->dwMinorVersion = ODINNT_MINOR_VERSION;
+   lpVersionInformation->dwBuildNumber  = ODINNT_BUILD_NR;
    lpVersionInformation->dwPlatformId   = VER_PLATFORM_WIN32_NT;
-   strcpy(lpVersionInformation->szCSDVersion, "Service Pack 3");
+   strcpy(lpVersionInformation->szCSDVersion, ODINNT_CSDVERSION);
    return(TRUE);
 }
@@ -575 +575 @@
         return(FALSE);
 
-   lpVersionInformation->dwMajorVersion = 4;    //pretend we're NT 4.0
-   lpVersionInformation->dwMinorVersion = 0;
-   lpVersionInformation->dwBuildNumber  = 0x565;
+   lpVersionInformation->dwMajorVersion = ODINNT_MAJOR_VERSION;    //pretend we're NT 4.0
+   lpVersionInformation->dwMinorVersion = ODINNT_MINOR_VERSION;
+   lpVersionInformation->dwBuildNumber  = ODINNT_BUILD_NR;
    lpVersionInformation->dwPlatformId   = VER_PLATFORM_WIN32_NT;
-   lstrcpyW(lpVersionInformation->szCSDVersion, (LPWSTR)L"Service Pack 3");
+   lstrcpyW(lpVersionInformation->szCSDVersion, ODINNT_CSDVERSION_W);
    return(TRUE);
 }
@@ -591 +591 @@
 /*                structures that lead to crashes if we don't identify as NT */
 
-//  return(WIN32OS2_VERSION);
-  return (0x0000004);
+  return ODINNT_VERSION;
 }
 //******************************************************************************
@@ -749 +748 @@
 
 
+/*****************************************************************************
+ * Name      : BOOL GetSystemPowerStatus
+ * Purpose   : The GetSystemPowerStatus function retrieves the power status of
+ *             the system. The status indicates whether the system is running
+ *             on AC or DC power, whether the battery is currently charging,
+ *             and how much battery life currently remains.
+ * Parameters: LPSYSTEM_POWER_STATUS lpSystemPowerStatus
+ * Variables :
+ * Result    : TRUE / FALSE
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
+ *****************************************************************************/
+
+BOOL WIN32API GetSystemPowerStatus(LPSYSTEM_POWER_STATUS lpSystemPowerStatus)
+{
+  dprintf(("Kernel32: GetSystemPowerStatus(%08xh) not properly implemented.\n",
+           lpSystemPowerStatus));
+
+  if(lpSystemPowerStatus == NULL) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+  }
+  lpSystemPowerStatus->ACLineStatus       = 1; //online
+  lpSystemPowerStatus->BatteryFlag        = 128; //no system battery
+  lpSystemPowerStatus->BatteryLifePercent = 255; //unknown
+  lpSystemPowerStatus->reserved           = 0;
+  lpSystemPowerStatus->BatteryLifeTime    = -1; //unknown
+  lpSystemPowerStatus->BatteryFullLifeTime= -1; //unknown
+
+  return TRUE;
+}

trunk/src/kernel32/initsystem.cpp

@@ -1 @@
-/* $Id: initsystem.cpp,v 1.1 1999-12-09 11:59:28 sandervl Exp $ */
+/* $Id: initsystem.cpp,v 1.2 1999-12-28 19:16:34 sandervl Exp $ */
 /*
  * Odin system initialization (registry & directories)
@@ -19 +19 @@
 #include "initsystem.h"
 #include "directory.h"
+#include <versionos2.h>
 
 static HINSTANCE hInstance = 0;
@@ -56 +57 @@
  char *buf;
  DWORD val;
+ char  digbuf[16];
 
    if(ADVAPI32_RegCreateKeyA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Control\\Windows",&hkey)!=ERROR_SUCCESS) {
@@ -69 +71 @@
    val = 0;
    ADVAPI32_RegSetValueExA(hkey,"NoInteractiveServices",0,REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
-   val = 0x300;
+   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);
- 
+
+   if(ADVAPI32_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);
+   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));
+
+   sprintf(digbuf, "%d.%d", ODINNT_MAJOR_VERSION, ODINNT_MINOR_VERSION);
+   ADVAPI32_RegSetValueExA(hkey,"CurrentVersion",0,REG_SZ, (LPBYTE)digbuf, strlen(digbuf)+1);
+
+   val = GetCurrentTime(); //TODO: Correct format?
+   ADVAPI32_RegSetValueExA(hkey,"InstallDate",0,REG_DWORD, (LPBYTE)&val, sizeof(DWORD));
+   
+   ADVAPI32_RegCloseKey(hkey);
+   //todo: productid, registered org/owner, sourcepath,    
    return TRUE;
 }

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.73 1999-12-27 21:20:48 sandervl Exp $
+# $Id: makefile,v 1.74 1999-12-28 19:16:34 sandervl Exp $
 
 #
@@ -93 +93 @@
     $(PDWIN32_INCLUDE)\unicode.h \
     $(PDWIN32_INCLUDE)\heap.h \
+    $(PDWIN32_INCLUDE)\versionos2.h \
     $(PDWIN32_INCLUDE)\wprocess.h
 
@@ -152 +153 @@
 
 initterm.OBJ: .\initterm.cpp initterm.h  $(PDWIN32_INCLUDE)\heapshared.h  mmap.h directory.h hmdevio.h initsystem.h $(PDWIN32_INCLUDE)\heapcode.h
-initsystem.obj: initsystem.cpp cpuhlp.h initsystem.h $(PDWIN32_INCLUDE)\misc.h directory.h
+initsystem.obj: initsystem.cpp cpuhlp.h initsystem.h $(PDWIN32_INCLUDE)\misc.h directory.h $(PDWIN32_INCLUDE)\versionos2.h
+
 
 thunk.OBJ: \

trunk/src/kernel32/stubs.cpp

@@ -1 @@
-/* $Id: stubs.cpp,v 1.15 1999-12-19 19:54:31 sandervl Exp $ */
+/* $Id: stubs.cpp,v 1.16 1999-12-28 19:16:35 sandervl Exp $ */
 
 /*
@@ -2062 +2062 @@
 
 
-/*****************************************************************************
- * Name      : BOOL GetSystemPowerStatus
- * Purpose   : The GetSystemPowerStatus function retrieves the power status of
- *             the system. The status indicates whether the system is running
- *             on AC or DC power, whether the battery is currently charging,
- *             and how much battery life currently remains.
- * Parameters: LPSYSTEM_POWER_STATUS lpSystemPowerStatus
- * Variables :
- * Result    : TRUE / FALSE
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
- *****************************************************************************/
-
-BOOL WIN32API GetSystemPowerStatus(LPSYSTEM_POWER_STATUS lpSystemPowerStatus)
-{
-  dprintf(("Kernel32: GetSystemPowerStatus(%08xh) not implemented.\n",
-           lpSystemPowerStatus));
-
-  return (FALSE);
-}
-
 
 /*****************************************************************************