- Wine-Commits - list.winehq.org

Alexandre Julliard : wintrust/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 42a861388a1a345684fb2ef12f638ad6fe1b4556 URL: https://gitlab.winehq.org/wine/wine/-/commit/42a861388a1a345684fb2ef12f638a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:38:07 2023 +0200 wintrust/tests: Use nameless unions/structs. --- dlls/wintrust/tests/asn.c | 46 +++++++++++++++++++++---------------------- dlls/wintrust/tests/softpub.c | 10 +++++----- 2 files changed, 28 insertions(+), 28 deletions(-)

1 0

Alexandre Julliard : winspool.drv/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 30ee1d1080c20db5b6e6122d57c99b8dddc6546c URL: https://gitlab.winehq.org/wine/wine/-/commit/30ee1d1080c20db5b6e6122d57c99b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:37:45 2023 +0200 winspool.drv/tests: Use nameless unions/structs. --- dlls/winspool.drv/tests/info.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 52849277c4c..b231a07b9cf 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -21,9 +21,6 @@ #include <stdarg.h> #include <assert.h> -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -2934,7 +2931,7 @@ static void test_OpenPrinter_defaults(void) pi = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetPrinterA( printer, 2, (BYTE *)pi, needed, &needed ); ok( ret, "GetPrinterA() failed le=%ld\n", GetLastError() ); - default_size = pi->pDevMode->u1.s1.dmPaperSize; + default_size = pi->pDevMode->dmPaperSize; HeapFree( GetProcessHeap(), 0, pi ); needed = 0; @@ -2962,8 +2959,8 @@ static void test_OpenPrinter_defaults(void) todo_wine ok( job_info->pDevMode != NULL, "got NULL DEVMODEA\n"); if (job_info->pDevMode) - ok( job_info->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", - job_info->pDevMode->u1.s1.dmPaperSize, default_size ); + ok( job_info->pDevMode->dmPaperSize == default_size, "got %d default %d\n", + job_info->pDevMode->dmPaperSize, default_size ); HeapFree( GetProcessHeap(), 0, job_info ); ScheduleJob( printer, add_job->JobId ); /* remove the empty job */ @@ -2975,7 +2972,7 @@ static void test_OpenPrinter_defaults(void) memset( &my_dm, 0, sizeof(my_dm) ); my_dm.dmSize = sizeof(my_dm); my_dm.dmFields = DM_PAPERSIZE; - my_dm.u1.s1.dmPaperSize = (default_size == DMPAPER_A4) ? DMPAPER_LETTER : DMPAPER_A4; + my_dm.dmPaperSize = (default_size == DMPAPER_A4) ? DMPAPER_LETTER : DMPAPER_A4; prn_def.pDatatype = NULL; prn_def.pDevMode = &my_dm; @@ -2990,8 +2987,8 @@ static void test_OpenPrinter_defaults(void) pi = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetPrinterA( printer, 2, (BYTE *)pi, needed, &needed ); ok( ret, "GetPrinterA() failed le=%ld\n", GetLastError() ); - ok( pi->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", - pi->pDevMode->u1.s1.dmPaperSize, default_size ); + ok( pi->pDevMode->dmPaperSize == default_size, "got %d default %d\n", + pi->pDevMode->dmPaperSize, default_size ); HeapFree( GetProcessHeap(), 0, pi ); @@ -3010,9 +3007,9 @@ static void test_OpenPrinter_defaults(void) ok( job_info->pDevMode->dmFields == DM_PAPERSIZE, "got %08lx\n", job_info->pDevMode->dmFields ); - ok( job_info->pDevMode->u1.s1.dmPaperSize == my_dm.u1.s1.dmPaperSize, + ok( job_info->pDevMode->dmPaperSize == my_dm.dmPaperSize, "got %d new size %d\n", - job_info->pDevMode->u1.s1.dmPaperSize, my_dm.u1.s1.dmPaperSize ); + job_info->pDevMode->dmPaperSize, my_dm.dmPaperSize ); HeapFree( GetProcessHeap(), 0, job_info ); ScheduleJob( printer, add_job->JobId ); /* remove the empty job */ @@ -3035,15 +3032,15 @@ static void test_IsValidDevmodeW(void) { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 3, FALSE }, { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 4, TRUE }, - { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 0, FALSE }, - { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 1, FALSE }, - { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 2, TRUE }, + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, dmOrientation) + 0, FALSE }, + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, dmOrientation) + 1, FALSE }, + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, dmOrientation) + 2, TRUE }, - { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 0, FALSE }, - { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 1, FALSE }, - { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 2, FALSE }, - { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 3, FALSE }, - { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 4, TRUE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, dmNup) + 0, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, dmNup) + 1, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, dmNup) + 2, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, dmNup) + 3, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, dmNup) + 4, TRUE }, }; static const struct

1 0

Alexandre Julliard : wininet/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: e12e7a3a10a3890c6272520940098d3e8481a07a URL: https://gitlab.winehq.org/wine/wine/-/commit/e12e7a3a10a3890c6272520940098d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:37:16 2023 +0200 wininet/tests: Use nameless unions/structs. --- dlls/wininet/tests/urlcache.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 777fab18640..1f690183afe 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -409,8 +406,8 @@ static void test_urlcacheA(void) broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08lx\n", lpCacheEntryInfo->CacheEntryType); - ok(!U(*lpCacheEntryInfo).dwExemptDelta, "expected dwExemptDelta 0, got %ld\n", - U(*lpCacheEntryInfo).dwExemptDelta); + ok(!lpCacheEntryInfo->dwExemptDelta, "expected dwExemptDelta 0, got %ld\n", + lpCacheEntryInfo->dwExemptDelta); /* Make sure there is a notable change in timestamps */ Sleep(1000); @@ -699,9 +696,9 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %ld (0x%08lx)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); - ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, + ok(lpCacheEntryInfo->dwExemptDelta == 86400, "expected dwExemptDelta 86400, got %ld\n", - U(*lpCacheEntryInfo).dwExemptDelta); + lpCacheEntryInfo->dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); if (pDeleteUrlCacheEntryA) { @@ -730,17 +727,17 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %ld (0x%08lx)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); - ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, + ok(lpCacheEntryInfo->dwExemptDelta == 86400, "expected dwExemptDelta 86400, got %ld\n", - U(*lpCacheEntryInfo).dwExemptDelta); - U(*lpCacheEntryInfo).dwExemptDelta = 0; + lpCacheEntryInfo->dwExemptDelta); + lpCacheEntryInfo->dwExemptDelta = 0; ret = SetUrlCacheEntryInfoA(test_url, lpCacheEntryInfo, CACHE_ENTRY_EXEMPT_DELTA_FC); ok(ret, "SetUrlCacheEntryInfo failed: %ld\n", GetLastError()); ret = GetUrlCacheEntryInfoA(test_url, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %ld\n", GetLastError()); - ok(!U(*lpCacheEntryInfo).dwExemptDelta, "expected dwExemptDelta 0, got %ld\n", - U(*lpCacheEntryInfo).dwExemptDelta); + ok(!lpCacheEntryInfo->dwExemptDelta, "expected dwExemptDelta 0, got %ld\n", + lpCacheEntryInfo->dwExemptDelta); /* See whether a sticky cache entry has the flag cleared once the exempt * delta is meaningless. */ @@ -749,7 +746,7 @@ static void test_urlcacheA(void) lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); /* Recommit of Url entry keeps dwExemptDelta */ - U(*lpCacheEntryInfo).dwExemptDelta = 8600; + lpCacheEntryInfo->dwExemptDelta = 8600; ret = SetUrlCacheEntryInfoA(test_url, lpCacheEntryInfo, CACHE_ENTRY_EXEMPT_DELTA_FC); ok(ret, "SetUrlCacheEntryInfo failed: %ld\n", GetLastError()); @@ -765,8 +762,8 @@ static void test_urlcacheA(void) ret = GetUrlCacheEntryInfoA(test_url, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %ld\n", GetLastError()); - ok(U(*lpCacheEntryInfo).dwExemptDelta == 8600 || (ie10_cache && U(*lpCacheEntryInfo).dwExemptDelta == 86400), - "expected dwExemptDelta 8600, got %ld\n", U(*lpCacheEntryInfo).dwExemptDelta); + ok(lpCacheEntryInfo->dwExemptDelta == 8600 || (ie10_cache && lpCacheEntryInfo->dwExemptDelta == 86400), + "expected dwExemptDelta 8600, got %ld\n", lpCacheEntryInfo->dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo);

1 0

Alexandre Julliard : windowscodecs/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 091aeca774ce2036c1e2e43a8dea9f6afce85183 URL: https://gitlab.winehq.org/wine/wine/-/commit/091aeca774ce2036c1e2e43a8dea9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:36:42 2023 +0200 windowscodecs/tests: Use nameless unions/structs. --- dlls/windowscodecs/tests/converter.c | 4 +- dlls/windowscodecs/tests/metadata.c | 144 +++++++++++++++++------------------ 2 files changed, 74 insertions(+), 74 deletions(-)

1 0

Alexandre Julliard : winmm/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: e7e43b45073dbf3388496917e39eade600ff5d48 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7e43b45073dbf3388496917e39ead… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:37:30 2023 +0200 winmm/tests: Use nameless unions/structs. --- dlls/winmm/tests/mixer.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)

1 0

Alexandre Julliard : wevtapi/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 534476a0aca582667ad4db475ca28183fc3f88b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/534476a0aca582667ad4db475ca281… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:36:22 2023 +0200 wevtapi/tests: Use nameless unions/structs. --- dlls/wevtapi/tests/wevtapi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wevtapi/tests/wevtapi.c b/dlls/wevtapi/tests/wevtapi.c index 51dbbd33970..f304ce988d1 100644 --- a/dlls/wevtapi/tests/wevtapi.c +++ b/dlls/wevtapi/tests/wevtapi.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include <stdarg.h> #include "windef.h" @@ -59,8 +57,8 @@ static void test_EvtGetChannelConfigProperty(void) ok(ret, "EvtGetChannelConfigProperty error %lu\n", GetLastError()); ok(path.var.Count == 0xdeadbeef, "got %lu\n", path.var.Count); ok(path.var.Type == EvtVarTypeString, "got %lu\n", path.var.Type); - ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %lu\n", size); - ok(path.var.u.StringVal == path.buf, "path.var.u.StringVal = %p, path.buf = %p\n", path.var.u.StringVal, path.buf); + ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.StringVal) + 1) * sizeof(WCHAR), "got %lu\n", size); + ok(path.var.StringVal == path.buf, "path.var.StringVal = %p, path.buf = %p\n", path.var.StringVal, path.buf); EvtClose(config);

1 0

Alexandre Julliard : urlmon/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: e9e7301b594b73a872b507d4c5116c388c337c80 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9e7301b594b73a872b507d4c5116c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:35:56 2023 +0200 urlmon/tests: Use nameless unions/structs. --- dlls/urlmon/tests/misc.c | 79 ++++++++++++++++++++++---------------------- dlls/urlmon/tests/protocol.c | 4 +-- dlls/urlmon/tests/stream.c | 6 ++-- dlls/urlmon/tests/uri.c | 18 +++++----- dlls/urlmon/tests/url.c | 25 +++++++------- 5 files changed, 65 insertions(+), 67 deletions(-)

1 0

Alexandre Julliard : user32/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: faf49ed39a7bb972ffec1c6ff7271b510eb01199 URL: https://gitlab.winehq.org/wine/wine/-/commit/faf49ed39a7bb972ffec1c6ff7271b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:36:11 2023 +0200 user32/tests: Use nameless unions/structs. --- dlls/user32/tests/input.c | 12 ++++++------ dlls/user32/tests/win.c | 12 ++++++------ dlls/user32/tests/winstation.c | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 2ce129dae45..f2f1c7ce5c0 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3713,13 +3713,13 @@ static void simulate_click(BOOL left, int x, int y) SetCursorPos(x, y); memset(input, 0, sizeof(input)); input[0].type = INPUT_MOUSE; - U(input[0]).mi.dx = x; - U(input[0]).mi.dy = y; - U(input[0]).mi.dwFlags = left ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_RIGHTDOWN; + input[0].mi.dx = x; + input[0].mi.dy = y; + input[0].mi.dwFlags = left ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_RIGHTDOWN; input[1].type = INPUT_MOUSE; - U(input[1]).mi.dx = x; - U(input[1]).mi.dy = y; - U(input[1]).mi.dwFlags = left ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_RIGHTUP; + input[1].mi.dx = x; + input[1].mi.dy = y; + input[1].mi.dwFlags = left ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_RIGHTUP; events_no = SendInput(2, input, sizeof(input[0])); ok(events_no == 2, "SendInput returned %d\n", events_no); } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a3216da9f46..cf5f0d932e8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -10201,13 +10201,13 @@ static void simulate_click(int x, int y) SetCursorPos(x, y); memset(input, 0, sizeof(input)); input[0].type = INPUT_MOUSE; - U(input[0]).mi.dx = x; - U(input[0]).mi.dy = y; - U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTDOWN; + input[0].mi.dx = x; + input[0].mi.dy = y; + input[0].mi.dwFlags = MOUSEEVENTF_LEFTDOWN; input[1].type = INPUT_MOUSE; - U(input[1]).mi.dx = x; - U(input[1]).mi.dy = y; - U(input[1]).mi.dwFlags = MOUSEEVENTF_LEFTUP; + input[1].mi.dx = x; + input[1].mi.dy = y; + input[1].mi.dwFlags = MOUSEEVENTF_LEFTUP; events_no = SendInput(2, input, sizeof(input[0])); ok(events_no == 2, "SendInput returned %d\n", events_no); SetCursorPos(pt.x, pt.y); diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 5f0925a7712..23b86443af0 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -595,9 +595,9 @@ static void test_inputdesktop(void) INPUT inputs[1]; inputs[0].type = INPUT_KEYBOARD; - U(inputs[0]).ki.wVk = 0; - U(inputs[0]).ki.wScan = 0x3c0; - U(inputs[0]).ki.dwFlags = KEYEVENTF_UNICODE; + inputs[0].ki.wVk = 0; + inputs[0].ki.wScan = 0x3c0; + inputs[0].ki.dwFlags = KEYEVENTF_UNICODE; /* OpenInputDesktop creates new handles for each calls */ old_input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS);

1 0

Alexandre Julliard : quartz/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 6474ceb31234978c2a815c55d7b92a67da34308e URL: https://gitlab.winehq.org/wine/wine/-/commit/6474ceb31234978c2a815c55d7b92a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:34:49 2023 +0200 quartz/tests: Use nameless unions/structs. --- dlls/quartz/tests/filtermapper.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 3c492845389..12b7f374659 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -139,8 +139,8 @@ static void test_fm2_enummatchingfilters(void) /* Test that a test renderer filter is returned when enumerating filters with bRender=FALSE */ rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S2(U(rgf2)).cPins2 = 1; - S2(U(rgf2)).rgPins2 = rgPins2; + rgf2.cPins2 = 1; + rgf2.rgPins2 = rgPins2; rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; rgPins2[0].cInstances = 1; @@ -174,7 +174,7 @@ static void test_fm2_enummatchingfilters(void) rgPins2[1].lpMedium = NULL; rgPins2[1].clsPinCategory = NULL; - S2(U(rgf2)).cPins2 = 2; + rgf2.cPins2 = 2; hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter2, L"Testfilter2", NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); @@ -398,8 +398,8 @@ static void test_register_filter_with_null_clsMinorType(void) ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 1; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins = 1; - S1(U(rgf2)).rgPins = &rgPins; + rgf2.cPins = 1; + rgf2.rgPins = &rgPins; rgPins.strName = wszPinName; rgPins.bRendered = 1; @@ -427,8 +427,8 @@ static void test_register_filter_with_null_clsMinorType(void) ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S2(U(rgf2)).cPins2 = 1; - S2(U(rgf2)).rgPins2 = &rgPins2; + rgf2.cPins2 = 1; + rgf2.rgPins2 = &rgPins2; rgPins2.dwFlags = REG_PINFLAG_B_RENDERER; rgPins2.cInstances = 1;

1 0

Alexandre Julliard : rpcrt4/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: a345f985c0ef46aac6e2a7a01b6950f39ba08a6a URL: https://gitlab.winehq.org/wine/wine/-/commit/a345f985c0ef46aac6e2a7a01b6950… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:35:03 2023 +0200 rpcrt4/tests: Use nameless unions/structs. --- dlls/rpcrt4/tests/ndr_marshall.c | 84 ++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 52e432e6436..1c684cd6f53 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2760,21 +2760,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == buffer + 15, + ok( umi.Level1.Buffer == buffer + 15, "umi.Level1.Buffer was %p instead of %p\n", - U1(umi).Level1.Buffer, buffer); - ok( U1(umi).Level1.BufferSize == 1, + umi.Level1.Buffer, buffer); + ok( umi.Level1.BufferSize == 1, "umi.Level1.BufferSize was %lu instead of 1\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer); /* buffer size */ @@ -2794,21 +2794,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == NULL, + ok( umi.Level1.Buffer == NULL, "umi.Level1.Buffer was %p instead of NULL\n", - U1(umi).Level1.Buffer); - ok( U1(umi).Level1.BufferSize == 0, + umi.Level1.Buffer); + ok( umi.Level1.BufferSize == 0, "umi.Level1.BufferSize was %lu instead of 0\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer); /* marshall */ @@ -2828,21 +2828,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == buffer + 15, + ok( umi.Level1.Buffer == buffer + 15, "umi.Level1.Buffer was %p instead of %p\n", - U1(umi).Level1.Buffer, buffer); - ok( U1(umi).Level1.BufferSize == 1, + umi.Level1.Buffer, buffer); + ok( umi.Level1.BufferSize == 1, "umi.Level1.BufferSize was %lu instead of 1\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer); /* free */ @@ -2862,21 +2862,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == NULL, + ok( umi.Level1.Buffer == NULL, "umi.Level1.Buffer was %p instead of NULL\n", - U1(umi).Level1.Buffer); - ok( U1(umi).Level1.BufferSize == 0, + umi.Level1.Buffer); + ok( umi.Level1.BufferSize == 0, "umi.Level1.BufferSize was %lu instead of 0\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer); /* boundary test */ @@ -2891,9 +2891,9 @@ static void test_NdrGetUserMarshalInfo(void) status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %ld\n", status); - ok( U1(umi).Level1.BufferSize == 0, + ok( umi.Level1.BufferSize == 0, "umi.Level1.BufferSize was %lu instead of 0\n", - U1(umi).Level1.BufferSize); + umi.Level1.BufferSize); /* error conditions */

1 0