Changeset 5393 for trunk/src/kernel32

Timestamp:

Mar 28, 2001, 6:21:41 PM (24 years ago)

Author:

sandervl

Message:

GetSystemPowerStatus fix

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (2 diffs)
• oslibdos.cpp (modified) (2 diffs)
• winimgres.cpp (modified) (7 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.60 2001-03-22 18:16:40 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.61 2001-03-28 16:21:40 sandervl Exp $ */
 
 /*
@@ -456 +456 @@
         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
+  lpSystemPowerStatus->ACLineStatus       = AC_LINE_ONLINE;
+  lpSystemPowerStatus->BatteryFlag        = BATTERY_FLAG_HIGH;
+  lpSystemPowerStatus->BatteryLifePercent = BATTERY_PERCENTAGE_UNKNOWN;
+  lpSystemPowerStatus->Reserved1          = 0;
+  lpSystemPowerStatus->BatteryLifeTime    = BATTERY_LIFE_UNKNOWN;
+  lpSystemPowerStatus->BatteryFullLifeTime= BATTERY_LIFE_UNKNOWN;
 
   return TRUE;

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.59 2001-02-19 22:07:21 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.60 2001-03-28 16:21:41 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -141 +141 @@
         return ERROR_WRITE_PROTECT_W;
 
+    case ERROR_NOT_READY: //21
+        return ERROR_NOT_READY_W;
+
     case ERROR_NOT_DOS_DISK: //26
         return ERROR_NOT_DOS_DISK_W;

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.49 2000-10-09 18:35:27 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.50 2001-03-28 16:21:41 sandervl Exp $ */
 
 /*
@@ -142 +142 @@
     pResDirRet = getResSubDirA(pResRootDir, lpszType);
     if(!pResDirRet) {
+        dprintf2(("FindResourceA %s: resource %x (type %x, lang %x) TYPE NOT FOUND", szModule, lpszName, lpszType, lang));
         SetLastError(ERROR_RESOURCE_TYPE_NOT_FOUND);
         return NULL;
@@ -147 +148 @@
     pResDirRet = getResSubDirA(pResDirRet, lpszName);
     if(!pResDirRet) {
+        dprintf2(("FindResourceA %s: resource %x (type %x, lang %x) NAME NOT FOUND", szModule, lpszName, lpszType, lang));
         SetLastError(ERROR_RESOURCE_NAME_NOT_FOUND);
         return NULL;
@@ -162 +164 @@
 
     if((ULONG)lpszName != ID_GETFIRST && HIWORD(lpszName)) {
-            dprintf(("FindResource %s: resource %s (type %x, lang %x)", szModule, lpszName, lpszType, lang));
-    }
-    else    dprintf(("FindResource %s: resource %x (type %x, lang %x)", szModule, lpszName, lpszType, lang));
+            dprintf(("FindResourceA %s: resource %s (type %x, lang %x)", szModule, lpszName, lpszType, lang));
+    }
+    else    dprintf(("FindResourceA %s: resource %x (type %x, lang %x)", szModule, lpszName, lpszType, lang));
 
     SetLastError(ERROR_SUCCESS);
@@ -196 +198 @@
     pResDirRet = getResSubDirW(pResRootDir, lpszType);
     if(!pResDirRet) {
+        dprintf2(("FindResourceW %s: resource %x (type %x, lang %x) TYPE NOT FOUND", szModule, lpszName, lpszType, lang));
         SetLastError(ERROR_RESOURCE_TYPE_NOT_FOUND);
         return NULL;
@@ -201 +204 @@
     pResDirRet = getResSubDirW(pResDirRet, lpszName);
     if(!pResDirRet) {
+        dprintf2(("FindResourceW %s: resource %x (type %x, lang %x) NAME NOT FOUND", szModule, lpszName, lpszType, lang));
         SetLastError(ERROR_RESOURCE_NAME_NOT_FOUND);
         return NULL;
@@ -214 +218 @@
     }
     else hRes = getResourceLangEx(pResDirRet, lang);
+
+    if((ULONG)lpszName != ID_GETFIRST && HIWORD(lpszName)) {
+            dprintf(("FindResourceW %s: resource %ls (type %x, lang %x)", szModule, lpszName, lpszType, lang));
+    }
+    else    dprintf(("FindResourceW %s: resource %x (type %x, lang %x)", szModule, lpszName, lpszType, lang));
 
     SetLastError(ERROR_SUCCESS);