July 2023 - Wine-Commits - list.winehq.org

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

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

July 21, 2023

Module: wine Branch: master Commit: 3d52c87d013225bf35f1de503a01b30afcfe1957 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d52c87d013225bf35f1de503a01b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:35:18 2023 +0200 shlwapi/tests: Use nameless unions/structs. --- dlls/shlwapi/tests/istream.c | 18 +++++++++--------- dlls/shlwapi/tests/string.c | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 8ccb3775fa0..0b8a2ab590a 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -39,12 +39,12 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) ULONG count; char data[256]; - U(uzero).HighPart = 0; - U(uzero).LowPart = 0; - U(uret).HighPart = 0; - U(uret).LowPart = 0; - U(zero).HighPart = 0; - U(zero).LowPart = 0; + uzero.HighPart = 0; + uzero.LowPart = 0; + uret.HighPart = 0; + uret.LowPart = 0; + zero.HighPart = 0; + zero.LowPart = 0; /* IStream::Read */ @@ -707,7 +707,7 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) ok(SUCCEEDED(ret), "SHCreateStreamOnFileEx failed with ret=0x%08lx\n", ret); written.QuadPart = 0; - ret = IStream_Write(src, srcContents, sizeof(srcContents), &U(written).LowPart); + ret = IStream_Write(src, srcContents, sizeof(srcContents), &written.LowPart); ok(SUCCEEDED(ret), "ISequentialStream_Write failed with ret=0x%08lx\n", ret); distance.QuadPart = 0; @@ -723,8 +723,8 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) ret = IStream_CopyTo(src, dst, count, &read, &written); ok(SUCCEEDED(ret), "CopyTo failed with ret=0x%08lx\n", ret); - ok(read.QuadPart == 1, "read does not match size: %ld != 1\n", U(read).LowPart); - ok(written.QuadPart == 1, "written does not match size: %ld != 1\n", U(written).LowPart); + ok(read.QuadPart == 1, "read does not match size: %ld != 1\n", read.LowPart); + ok(written.QuadPart == 1, "written does not match size: %ld != 1\n", written.LowPart); IStream_Release(dst); IStream_Release(src); diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 6939063a306..8379a523733 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -896,7 +896,7 @@ static void test_StrRetToBSTR(void) } strret.uType = STRRET_WSTR; - U(strret).pOleStr = CoDupStrW("Test"); + strret.pOleStr = CoDupStrW("Test"); bstr = 0; ret = pStrRetToBSTR(&strret, NULL, &bstr); ok(ret == S_OK && bstr && !wcscmp(bstr, szTestW), @@ -904,14 +904,14 @@ static void test_StrRetToBSTR(void) SysFreeString(bstr); strret.uType = STRRET_CSTR; - lstrcpyA(U(strret).cStr, "Test"); + lstrcpyA(strret.cStr, "Test"); ret = pStrRetToBSTR(&strret, NULL, &bstr); ok(ret == S_OK && bstr && !wcscmp(bstr, szTestW), "STRRET_CSTR: dup failed, ret=0x%08lx, bstr %p\n", ret, bstr); SysFreeString(bstr); strret.uType = STRRET_OFFSET; - U(strret).uOffset = 1; + strret.uOffset = 1; strcpy((char*)&iidl, " Test"); ret = pStrRetToBSTR(&strret, iidl, &bstr); ok(ret == S_OK && bstr && !wcscmp(bstr, szTestW), @@ -1128,7 +1128,7 @@ if (0) { memset(wbuf, 0xbf, sizeof(wbuf)); strret.uType = STRRET_WSTR; - U(strret).pOleStr = StrDupW(wstr1); + strret.pOleStr = StrDupW(wstr1); hres = pStrRetToBufW(&strret, NULL, wbuf, 10); ok(hres == E_NOT_SUFFICIENT_BUFFER || broken(hres == S_OK) /* winxp */, "StrRetToBufW returned %08lx\n", hres); @@ -1139,14 +1139,14 @@ if (0) memset(wbuf, 0xbf, sizeof(wbuf)); strret.uType = STRRET_CSTR; - StrCpyNA(U(strret).cStr, str1, MAX_PATH); + StrCpyNA(strret.cStr, str1, MAX_PATH); hres = pStrRetToBufW(&strret, NULL, wbuf, 10); ok(hres == S_OK, "StrRetToBufW returned %08lx\n", hres); ok(!memcmp(wbuf, wstr1, 9*sizeof(WCHAR)) && !wbuf[9], "StrRetToBuf returned %s\n", wine_dbgstr_w(wbuf)); memset(wbuf, 0xbf, sizeof(wbuf)); strret.uType = STRRET_WSTR; - U(strret).pOleStr = NULL; + strret.pOleStr = NULL; hres = pStrRetToBufW(&strret, NULL, wbuf, 10); ok(hres == E_FAIL, "StrRetToBufW returned %08lx\n", hres); ok(!wbuf[0], "StrRetToBuf returned %s\n", wine_dbgstr_w(wbuf)); @@ -1158,7 +1158,7 @@ if (0) { memset(buf, 0xbf, sizeof(buf)); strret.uType = STRRET_CSTR; - StrCpyNA(U(strret).cStr, str1, MAX_PATH); + StrCpyNA(strret.cStr, str1, MAX_PATH); expect_eq2(pStrRetToBufA(&strret, NULL, buf, 10), S_OK, E_NOT_SUFFICIENT_BUFFER /* Vista */, HRESULT, "%lx"); expect_eq(buf[9], 0, CHAR, "%x"); expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x");

1 0

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

July 21, 2023

Module: wine Branch: master Commit: 86721b874bee78b4163ceb57d359d1c02b9aca4a URL: https://gitlab.winehq.org/wine/wine/-/commit/86721b874bee78b4163ceb57d359d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:34:19 2023 +0200 oledb32/tests: Use nameless unions/structs. --- dlls/oledb32/tests/convert.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index fe34657b779..a019ff4042e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -20,9 +20,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "windef.h" #include "winbase.h" #include "ole2.h" @@ -464,7 +461,7 @@ static void test_converttoi1(void) dst_len = dst = 0x12; memset(src, 0, sizeof(DECIMAL)); - ((DECIMAL*)src)->u1.Lo64 = 0x43; + ((DECIMAL*)src)->Lo64 = 0x43; hr = IDataConvert_DataConvert(convert, DBTYPE_DECIMAL, DBTYPE_I1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); @@ -775,7 +772,7 @@ static void test_converttoi2(void) dst_len = dst = 0x1234; memset(src, 0, sizeof(DECIMAL)); - ((DECIMAL*)src)->u1.Lo64 = 0x4321; + ((DECIMAL*)src)->Lo64 = 0x4321; hr = IDataConvert_DataConvert(convert, DBTYPE_DECIMAL, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); @@ -1091,7 +1088,7 @@ static void test_converttoi4(void) i4 = 0x12345678; memset(src, 0, sizeof(DECIMAL)); - ((DECIMAL*)src)->u1.Lo64 = 0x1234; + ((DECIMAL*)src)->Lo64 = 0x1234; dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_DECIMAL, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08lx\n", hr); @@ -3016,7 +3013,7 @@ static void test_converttocy(void) ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); ok(dst_len == sizeof(CY), "got %Id\n", dst_len); - ok(dst.int64 == 12340000, "got %ld\n", dst.s.Lo); + ok(dst.int64 == 12340000, "got %ld\n", dst.Lo); dst.int64 = 0xcc; ((CY*)src)->int64 = 1234; @@ -3025,7 +3022,7 @@ static void test_converttocy(void) ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); ok(dst_len == sizeof(CY), "got %Id\n", dst_len); - ok(dst.int64 == 1234, "got %ld\n", dst.s.Lo); + ok(dst.int64 == 1234, "got %ld\n", dst.Lo); dst_len = 44; V_VT(&v) = VT_NULL; @@ -3784,8 +3781,8 @@ static void test_converttovar(void) ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); ok(dst_len == sizeof(dst), "got %Id\n", dst_len); ok(V_VT(&dst) == VT_DECIMAL, "got %d\n", V_VT(&dst)); - ok(S(U(V_DECIMAL(&dst))).scale == 0 && S(U(V_DECIMAL(&dst))).sign == 0 && - V_DECIMAL(&dst).Hi32 == 0 && U1(V_DECIMAL(&dst)).Lo64 == 12345, "Not Equal\n"); + ok(V_DECIMAL(&dst).scale == 0 && V_DECIMAL(&dst).sign == 0 && + V_DECIMAL(&dst).Hi32 == 0 && V_DECIMAL(&dst).Lo64 == 12345, "Not Equal\n"); V_VT(&dst) = VT_EMPTY; dst_len = 0; @@ -3853,8 +3850,8 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; - S(cy).Lo = 1; - S(cy).Hi = 2; + cy.Lo = 1; + cy.Hi = 2; hr = IDataConvert_DataConvert(convert, DBTYPE_CY, DBTYPE_VARIANT, sizeof(cy), &dst_len, &cy, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); @@ -3862,7 +3859,7 @@ static void test_converttovar(void) ok(V_VT(&dst) == VT_CY, "got %d\n", V_VT(&dst)); cy2 = V_CY(&dst); - ok(S(cy2).Lo == S(cy).Lo && S(cy2).Hi == S(cy).Hi, "got %ld,%ld\n", S(cy2).Lo, S(cy2).Hi); + ok(cy2.Lo == cy.Lo && cy2.Hi == cy.Hi, "got %ld,%ld\n", cy2.Lo, cy2.Hi); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_VARIANT, sizeof(byte_src), &dst_len, &byte_src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);

1 0

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

July 21, 2023

Module: wine Branch: master Commit: 679b57f1ceb7752bd3ad2784db9a1a00cfa2741e URL: https://gitlab.winehq.org/wine/wine/-/commit/679b57f1ceb7752bd3ad2784db9a1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:34:38 2023 +0200 pdh/tests: Use nameless unions/structs. --- dlls/pdh/tests/pdh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index e5d6fa8205e..5408e4cc3f3 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -884,7 +884,7 @@ static void test_PdhCollectQueryDataEx(void) status = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE, NULL, &value ); ok(status == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08lx\n", status); - trace( "uptime %s\n", wine_dbgstr_longlong(U(value).largeValue) ); + trace( "uptime %s\n", wine_dbgstr_longlong(value.largeValue) ); } }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 35f7ebfef812417fea04295ea7d63439d05342c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/35f7ebfef812417fea04295ea7d634… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jul 21 00:09:58 2023 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index f9a24586dae..47543a3b0cb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-06-01 00:23+0300\n" +"PO-Revision-Date: 2023-07-21 00:09+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -4084,10 +4084,8 @@ msgid "'this' is not a | object" msgstr "„Šis“ nėra | objektas" #: dlls/jscript/jscript.rc:81 -#, fuzzy -#| msgid "'this' is not a | object" msgid "'key' is not an object" -msgstr "„Šis“ nėra | objektas" +msgstr "„raktas“ nėra objektas" #: dlls/jscript/jscript.rc:82 msgid "Property cannot have both accessors and a value"

1 0

Gabriel Ivăncescu : jscript: Implement WeakMap.has().
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 1b14d7b46d114eab1e2139c2fc57a996ff97b931 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b14d7b46d114eab1e2139c2fc57a9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:47 2023 +0300 jscript: Implement WeakMap.has(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 1730abb0328..ac9efbb4da0 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -796,8 +796,18 @@ static HRESULT WeakMap_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne static HRESULT WeakMap_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsdisp_t *key = (argc >= 1 && is_object_instance(argv[0])) ? to_jsdisp(get_object(argv[0])) : NULL; + WeakMapInstance *weakmap; + HRESULT hres; + + hres = get_weakmap_this(ctx, vthis, &weakmap); + if(FAILED(hres)) + return hres; + + TRACE("%p (%p)\n", weakmap, key); + + if(r) *r = jsval_bool(!!get_weakmap_entry(weakmap, key)); + return S_OK; } static HRESULT WeakMap_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,

1 0