https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbfd511ecd125565bd5c4…
commit dbfd511ecd125565bd5c4a19a35786176eb0deb3
Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com>
AuthorDate: Fri Mar 13 18:14:16 2020 +0100
Commit: GitHub <noreply(a)github.com>
CommitDate: Fri Mar 13 18:14:16 2020 +0100
[PSDK] SYSTEM_POWER_STATUS: Rename Reserved1 to SystemStatusFlag (#2419)
As on Win10.
Cherry pick
https://source.winehq.org/git/wine.git/commit/7c5ea436af8a6b5a3d2b095bd4697…
---
modules/rostests/winetests/kernel32/generated.c | 12 ++++++------
sdk/include/psdk/winbase.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/rostests/winetests/kernel32/generated.c
b/modules/rostests/winetests/kernel32/generated.c
index 45b95922e11..2f0126edb35 100644
--- a/modules/rostests/winetests/kernel32/generated.c
+++ b/modules/rostests/winetests/kernel32/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/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h
index 9128d36d752..f5d79a04e93 100644
--- a/sdk/include/psdk/winbase.h
+++ b/sdk/include/psdk/winbase.h
@@ -1151,7 +1151,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;