Module: wine Branch: master Commit: 7a82d78b171873c45e7aca211ae07a92df5aac4f URL: https://gitlab.winehq.org/wine/wine/-/commit/7a82d78b171873c45e7aca211ae07a9...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jul 18 19:56:11 2023 +0200
krnl386: Use nameless unions/structs.
---
dlls/krnl386.exe16/int2f.c | 1 - dlls/krnl386.exe16/local.c | 7 +++---- dlls/krnl386.exe16/vxd.c | 1 - 3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/krnl386.exe16/int2f.c b/dlls/krnl386.exe16/int2f.c index 7114a46e455..fcb9ebd7d79 100644 --- a/dlls/krnl386.exe16/int2f.c +++ b/dlls/krnl386.exe16/int2f.c @@ -25,7 +25,6 @@
#include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION #include "wine/winbase16.h" #include "wine/debug.h" #include "winternl.h" diff --git a/dlls/krnl386.exe16/local.c b/dlls/krnl386.exe16/local.c index 672f1c22a19..1f75d8ef00f 100644 --- a/dlls/krnl386.exe16/local.c +++ b/dlls/krnl386.exe16/local.c @@ -27,7 +27,6 @@ * parameter than usual. */
-#define NONAMELESSUNION #include <stdlib.h> #include <string.h> #include "wine/winbase16.h" @@ -2160,9 +2159,9 @@ BOOL16 WINAPI Local32Info16( LOCAL32INFO *pLocal32Info, HGLOBAL16 handle ) { if (entry.wFlags & PROCESS_HEAP_REGION) { - pLocal32Info->dwMemReserved += entry.u.Region.dwCommittedSize - + entry.u.Region.dwUnCommittedSize; - pLocal32Info->dwMemCommitted = entry.u.Region.dwCommittedSize; + pLocal32Info->dwMemReserved += entry.Region.dwCommittedSize + + entry.Region.dwUnCommittedSize; + pLocal32Info->dwMemCommitted = entry.Region.dwCommittedSize; } else if (!(entry.wFlags & PROCESS_HEAP_ENTRY_BUSY)) { diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index a707fc36043..9ac1ea0bbb5 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -27,7 +27,6 @@
#include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h"