Alex Henrie : include: Rename Reserved1 to SystemStatusFlag in SYSTEM_POWER_STATUS.

Alexandre Julliard julliard at winehq.org
Mon Sep 23 15:22:33 CDT 2019


Module: wine
Branch: master
Commit: 7c5ea436af8a6b5a3d2b095bd4697f10b6f78acc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7c5ea436af8a6b5a3d2b095bd4697f10b6f78acc

Author: Alex Henrie <alexhenrie24 at gmail.com>
Date:   Sun Sep 22 15:12:09 2019 -0600

include: Rename Reserved1 to SystemStatusFlag in SYSTEM_POWER_STATUS.

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/powermgnt.c       |  2 +-
 dlls/kernel32/tests/generated.c | 12 ++++++------
 include/winbase.h               |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c
index 190dc016c3..7efd84d410 100644
--- a/dlls/kernel32/powermgnt.c
+++ b/dlls/kernel32/powermgnt.c
@@ -52,7 +52,7 @@ BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS ps)
         ps->ACLineStatus        = 255;
         ps->BatteryFlag         = 255;
         ps->BatteryLifePercent  = 255;
-        ps->Reserved1           = 0;
+        ps->SystemStatusFlag    = 0;
         ps->BatteryLifeTime     = ~0u;
         ps->BatteryFullLifeTime = ~0u;
         return TRUE;
diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c
index 36053b8491..ae1f96613a 100644
--- a/dlls/kernel32/tests/generated.c
+++ b/dlls/kernel32/tests/generated.c
@@ -1755,9 +1755,9 @@ static void test_pack_SYSTEM_POWER_STATUS(void)
     TEST_FIELD_SIZE  (SYSTEM_POWER_STATUS, BatteryLifePercent, 1)
     TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifePercent, 1)
     TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifePercent, 2)
-    TEST_FIELD_SIZE  (SYSTEM_POWER_STATUS, Reserved1, 1)
-    TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, Reserved1, 1)
-    TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, Reserved1, 3)
+    TEST_FIELD_SIZE  (SYSTEM_POWER_STATUS, SystemStatusFlag, 1)
+    TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, SystemStatusFlag, 1)
+    TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, SystemStatusFlag, 3)
     TEST_FIELD_SIZE  (SYSTEM_POWER_STATUS, BatteryLifeTime, 4)
     TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifeTime, 4)
     TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifeTime, 4)
@@ -3612,9 +3612,9 @@ static void test_pack_SYSTEM_POWER_STATUS(void)
     TEST_FIELD_SIZE  (SYSTEM_POWER_STATUS, BatteryLifePercent, 1)
     TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifePercent, 1)
     TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifePercent, 2)
-    TEST_FIELD_SIZE  (SYSTEM_POWER_STATUS, Reserved1, 1)
-    TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, Reserved1, 1)
-    TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, Reserved1, 3)
+    TEST_FIELD_SIZE  (SYSTEM_POWER_STATUS, SystemStatusFlag, 1)
+    TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, SystemStatusFlag, 1)
+    TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, SystemStatusFlag, 3)
     TEST_FIELD_SIZE  (SYSTEM_POWER_STATUS, BatteryLifeTime, 4)
     TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifeTime, 4)
     TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifeTime, 4)
diff --git a/include/winbase.h b/include/winbase.h
index 3a213df4e4..33a2f3e45a 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -961,7 +961,7 @@ typedef struct _SYSTEM_POWER_STATUS
   BYTE    ACLineStatus;
   BYTE    BatteryFlag;
   BYTE    BatteryLifePercent;
-  BYTE    Reserved1;
+  BYTE    SystemStatusFlag;
   DWORD   BatteryLifeTime;
   DWORD   BatteryFullLifeTime;
 } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS;




More information about the wine-cvs mailing list