March 2022 - Wine-commits - list.winehq.org

Eric Pouech : msdmo/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 1458494d7e62c25c0b22c29c8cb0eba864d71705 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1458494d7e62c25c0b22c29c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:01 2022 +0100 msdmo/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/tests/Makefile.in | 1 - dlls/msdmo/tests/msdmo.c | 76 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/msdmo/tests/Makefile.in b/dlls/msdmo/tests/Makefile.in index 2a9a1d779c6..22a8e359643 100644 --- a/dlls/msdmo/tests/Makefile.in +++ b/dlls/msdmo/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msdmo.dll IMPORTS = advapi32 dmoguids msdmo uuid diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 9b261d369fc..d84617fc657 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -44,14 +44,14 @@ static void test_DMOUnregister(void) HRESULT hr; hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "got 0x%08lx\n", hr); hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "got 0x%08lx\n", hr); /* can't register for all categories */ hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_NULL, 0, 0, NULL, 0, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08lx\n", hr); hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, 0, NULL, 0, NULL); if (hr != S_OK) { @@ -60,10 +60,10 @@ static void test_DMOUnregister(void) } hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "got 0x%08lx\n", hr); /* clean up category since Windows doesn't */ sprintf(buffer, "DirectShow\\MediaObjects\\Categories\\%s", guid_to_string(&GUID_unknowncategory)); @@ -76,12 +76,12 @@ static void test_DMOGetName(void) HRESULT hr; hr = DMOGetName(&GUID_unknowndmo, NULL); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08lx\n", hr); /* no such DMO */ name[0] = 'a'; hr = DMOGetName(&GUID_wmp1, name); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08lx\n", hr); ok(name[0] == 'a', "got %x\n", name[0]); } @@ -97,24 +97,24 @@ static void test_DMOEnum(void) DWORD count; hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); - ok(hr == S_OK, "DMOEnum() failed with %#x\n", hr); + ok(hr == S_OK, "DMOEnum() failed with %#lx\n", hr); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(hr == S_FALSE, "expected S_FALSE, got %#lx\n", hr); hr = IEnumDMO_Next(enum_dmo, 2, &clsid, &name, NULL); - ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#lx\n", hr); hr = IEnumDMO_Next(enum_dmo, 2, &clsid, &name, &count); - ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); - ok(count == 0, "expected 0, got %d\n", count); + ok(hr == S_FALSE, "expected S_FALSE, got %#lx\n", hr); + ok(count == 0, "expected 0, got %ld\n", count); hr = IEnumDMO_Next(enum_dmo, 2, NULL, &name, &count); - ok(hr == E_POINTER, "expected S_FALSE, got %#x\n", hr); + ok(hr == E_POINTER, "expected S_FALSE, got %#lx\n", hr); hr = IEnumDMO_Next(enum_dmo, 2, &clsid, NULL, &count); - ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); - ok(count == 0, "expected 0, got %d\n", count); + ok(hr == S_FALSE, "expected S_FALSE, got %#lx\n", hr); + ok(count == 0, "expected 0, got %ld\n", count); IEnumDMO_Release(enum_dmo); @@ -123,41 +123,41 @@ static void test_DMOEnum(void) return; hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumDMO_Release(enum_dmo); hr = DMOEnum(&GUID_unknowncategory, 0, 1, &input_type, 0, NULL, &enum_dmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumDMO_Release(enum_dmo); hr = DMOEnum(&GUID_unknowncategory, 0, 1, &wrong_type, 0, NULL, &enum_dmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumDMO_Release(enum_dmo); hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_DMOGetTypes(void) @@ -172,7 +172,7 @@ static void test_DMOGetTypes(void) HRESULT hr; hr = DMOGetTypes(&GUID_unknowndmo, 0, &input_count, types, 0, &output_count, NULL); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(hr == E_FAIL, "Got hr %#lx.\n", hr); hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, ARRAY_SIZE(input_types), input_types, 0, NULL); @@ -180,33 +180,33 @@ static void test_DMOGetTypes(void) return; hr = DMOGetTypes(&GUID_unknowndmo, 0, &input_count, types, 0, &output_count, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!input_count, "Got input count %u.\n", input_count); - ok(!output_count, "Got output count %u.\n", output_count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!input_count, "Got input count %lu.\n", input_count); + ok(!output_count, "Got output count %lu.\n", output_count); memset(types, 0, sizeof(types)); hr = DMOGetTypes(&GUID_unknowndmo, 1, &input_count, types, 0, &output_count, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(input_count == 1, "Got input count %u.\n", input_count); - ok(!output_count, "Got output count %u.\n", output_count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(input_count == 1, "Got input count %lu.\n", input_count); + ok(!output_count, "Got output count %lu.\n", output_count); todo_wine ok(!memcmp(types, input_types, sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); memset(types, 0, sizeof(types)); hr = DMOGetTypes(&GUID_unknowndmo, 2, &input_count, types, 0, &output_count, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(input_count == 2, "Got input count %u.\n", input_count); - ok(!output_count, "Got output count %u.\n", output_count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(input_count == 2, "Got input count %lu.\n", input_count); + ok(!output_count, "Got output count %lu.\n", output_count); ok(!memcmp(types, input_types, 2 * sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); memset(types, 0, sizeof(types)); hr = DMOGetTypes(&GUID_unknowndmo, 2, &input_count, types, 0, &output_count, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(input_count == 2, "Got input count %u.\n", input_count); - ok(!output_count, "Got output count %u.\n", output_count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(input_count == 2, "Got input count %lu.\n", input_count); + ok(!output_count, "Got output count %lu.\n", output_count); ok(!memcmp(types, input_types, 2 * sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } START_TEST(msdmo)

1 0

Eric Pouech : mspatcha/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 184f4b59e3291443dad9aeea5d93cb351073c22a URL: https://source.winehq.org/git/wine.git/?a=commit;h=184f4b59e3291443dad9aeea… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:19 2022 +0100 mspatcha/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/tests/Makefile.in | 1 - dlls/mspatcha/tests/apply_patch.c | 90 +++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=184f4b59e3291443dad9…

1 0

Eric Pouech : msrle32/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: b1400fd9fd2e1e9958f0208a700a60995ab57aa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1400fd9fd2e1e9958f0208a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:25 2022 +0100 msrle32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/tests/Makefile.in | 1 - dlls/msrle32/tests/msrle.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/msrle32/tests/Makefile.in b/dlls/msrle32/tests/Makefile.in index b0d99b5de8f..5fe929a6ded 100644 --- a/dlls/msrle32/tests/Makefile.in +++ b/dlls/msrle32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msrle32.dll IMPORTS = msvfw32 diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 84c5c215108..c4dec7a8af7 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -62,37 +62,37 @@ static void test_encode(void) ok(hic != NULL, "ICOpen failed\n"); res = ICGetInfo(hic, &info, sizeof(info)); - ok(res == sizeof(info), "res = %ld\n", res); - ok(info.dwSize == sizeof(info), "dwSize = %d\n", info.dwSize); - ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %x\n", info.fccHandler); - ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); - ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); + ok(res == sizeof(info), "res = %Id\n", res); + ok(info.dwSize == sizeof(info), "dwSize = %ld\n", info.dwSize); + ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %lx\n", info.fccHandler); + ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %lx\n", info.dwFlags); + ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %ld\n", info.dwVersionICM); quality = 0xdeadbeef; res = ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)&quality, 0); - ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %ld\n", res); - ok(quality == 8500, "quality = %d\n", quality); + ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %Id\n", res); + ok(quality == 8500, "quality = %ld\n", quality); quality = 0xdeadbeef; res = ICSendMessage(hic, ICM_GETQUALITY, (DWORD_PTR)&quality, 0); - ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_GETQUALITY) failed: %ld\n", res); - ok(quality == 0xdeadbeef, "quality = %d\n", quality); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_GETQUALITY) failed: %Id\n", res); + ok(quality == 0xdeadbeef, "quality = %ld\n", quality); quality = ICQUALITY_HIGH; res = ICSendMessage(hic, ICM_SETQUALITY, (DWORD_PTR)&quality, 0); - ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %ld\n", res); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %Id\n", res); output_size = ICCompressGetFormatSize(hic, &input_header.header); - ok(output_size == 1064, "output_size = %d\n", output_size); + ok(output_size == 1064, "output_size = %ld\n", output_size); output_header = HeapAlloc(GetProcessHeap(), 0, output_size); ICCompressGetFormat(hic, &input_header.header, output_header); flags = 0; res = ICCompress(hic, ICCOMPRESS_KEYFRAME, output_header, buf, &input_header.header, input1, 0, &flags, 0, 0, 0, NULL, NULL); - ok(res == ICERR_OK, "ICCompress failed: %ld\n", res); + ok(res == ICERR_OK, "ICCompress failed: %Id\n", res); test_output(buf, output_header->biSizeImage, output1, sizeof(output1)); - ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); + ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %lx\n", flags); HeapFree(GetProcessHeap(), 0, output_header); @@ -135,25 +135,25 @@ static void test_raw_decompress(void) /* Check which codec is able to decompress uncompressed data */ hic = ICLocate(FCC('V', 'I', 'D', 'C'), codecs[i], bih, NULL, ICMODE_DECOMPRESS); - ok(hic != NULL, "Test[%d]: Expected non-NULL return\n", i); + ok(hic != NULL, "Test[%ld]: Expected non-NULL return\n", i); /* Now which is this codec? Windows returns MRLE for uncompressed cases */ memset(&codec_info, 0, sizeof(codec_info)); hr = ICGetInfo(hic, &codec_info, sizeof(codec_info)); - ok(hr == sizeof(codec_info), "Test[%d]: Incorrect amount of data returned\n", i); + ok(hr == sizeof(codec_info), "Test[%ld]: Incorrect amount of data returned\n", i); ok(codec_info.fccType == FCC('v', 'i', 'd', 'c'), - "Test[%d]: Expected a video type, got 0x%x\n", i, codec_info.fccType); + "Test[%ld]: Expected a video type, got 0x%lx\n", i, codec_info.fccType); ok(codec_info.fccHandler == FCC('M', 'R', 'L', 'E'), - "Test[%d]: Expected MRLE, got 0x%x\n", i, codec_info.fccHandler); + "Test[%ld]: Expected MRLE, got 0x%lx\n", i, codec_info.fccHandler); /* Decompress the frame and check if we get the same output */ memset(outbits, 0, bih->biSizeImage); hr = ICDecompress(hic, 0, bih, bits, &biho, outbits); - ok(hr == ICERR_OK, "Test[%d]: Expected ICERR_OK, got %d\n", i, hr); - ok(!memcmp(bits, outbits, bih->biSizeImage), "Test[%d]: Image contents do not match!\n", i); + ok(hr == ICERR_OK, "Test[%ld]: Expected ICERR_OK, got %ld\n", i, hr); + ok(!memcmp(bits, outbits, bih->biSizeImage), "Test[%ld]: Image contents do not match!\n", i); hr = ICClose(hic); - ok(hr == ICERR_OK, "Test[%d]: Expected ICERR_OK, got %d\n", i, hr); + ok(hr == ICERR_OK, "Test[%ld]: Expected ICERR_OK, got %ld\n", i, hr); } HeapFree(GetProcessHeap(), 0, bits); HeapFree(GetProcessHeap(), 0, outbits);

1 0

Eric Pouech : msscript.ocx/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: d25ee94f0b60828e1b81f693054a749f12401f1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25ee94f0b60828e1b81f693… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:31 2022 +0100 msscript.ocx/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/Makefile.in | 1 - dlls/msscript.ocx/tests/msscript.c | 1170 +++++++++++++++++------------------ 2 files changed, 585 insertions(+), 586 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d25ee94f0b60828e1b81…

1 0

Eric Pouech : mstask/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: c601c7019b62f5279c5214e807be4f7bc937e334 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c601c7019b62f5279c5214e8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:37 2022 +0100 mstask/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/Makefile.in | 1 - dlls/mstask/tests/task.c | 214 ++++++++++++++++++------------------ dlls/mstask/tests/task_scheduler.c | 132 +++++++++++----------- dlls/mstask/tests/task_trigger.c | 220 ++++++++++++++++++------------------- 4 files changed, 283 insertions(+), 284 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c601c7019b62f5279c52…

1 0

Eric Pouech : msvfw32/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: ce19b2f3c16b270a9b447308908d46c837c27034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce19b2f3c16b270a9b447308… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:43 2022 +0100 msvfw32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/Makefile.in | 1 - dlls/msvfw32/tests/mciwnd.c | 12 +-- dlls/msvfw32/tests/msvfw.c | 178 ++++++++++++++++++++--------------------- 3 files changed, 95 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce19b2f3c16b270a9b44…

1 0

Saulius Krasuckas : ntdll: Check __WINE_PE_BUILD instead of compiler macros.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: f72978ad0751159c00283406856b0c02d2b3cfca URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72978ad0751159c00283406… Author: Saulius Krasuckas <saulius2(a)ar-fi.lt> Date: Tue Mar 1 02:42:05 2022 +0200 ntdll: Check __WINE_PE_BUILD instead of compiler macros. Fixes compilation on Cygwin, undeclared identifiers: _alldiv, _allmul, _allrem, _aulldiv, _aullrem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52607 Signed-off-by: Saulius Krasuckas <saulius2(a)ar-fi.lt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/large_int.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 20ffd646a3e..b38074158c8 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -520,7 +520,7 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( #ifdef __i386__ /* those builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations */ -#if defined(__MINGW32__) || defined(_MSC_VER) +#ifdef __WINE_PE_BUILD LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_alldiv")); LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allmul")); LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allrem"));

1 0

Zhiyi Zhang : comctl32/tests: Fix a test failure when theming is active.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 7f54c4c014782818785aa83f5bba55fdc31a17b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f54c4c014782818785aa83f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 1 15:00:39 2022 +0800 comctl32/tests: Fix a test failure when theming is active. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 0443a36718b..cfcdb44019c 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2359,7 +2359,7 @@ static void test_visual(void) SelectObject(mem_dc2, mem_bitmap2); BitBlt(mem_dc2, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); - todo_wine_if(type == BS_PUSHBOX || (is_theme_active && type == BS_GROUPBOX)) + todo_wine_if(type == BS_PUSHBOX) ok(equal_dc(mem_dc1, mem_dc2, width, height), "Type %#lx: Expected content unchanged.\n", type); DeleteObject(mem_bitmap2);

1 0

Henri Verbeet : include: Reintroduce hidden visibility for GUID definitions.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: vkd3d Branch: master Commit: 9a2d9d4f5cc567665fccbd22e7d82bb251c56323 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a2d9d4f5cc567665fccbd2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 13:21:30 2022 +0100 include: Reintroduce hidden visibility for GUID definitions. This was dropped by d27fee64ab51c60078215f461a797edd32bc8871, presumably because the default visibility was switched to "hidden". However, this is part of a public header, and external users may not share our symbol visibility defaults. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_windows.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index c1aa9f2..8398d40 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -127,18 +127,18 @@ typedef GUID IID; # ifdef INITGUID # ifndef __cplusplus # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const GUID name; \ + const GUID name DECLSPEC_HIDDEN; \ const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 }} # else # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name; \ + EXTERN_C const GUID name DECLSPEC_HIDDEN; \ EXTERN_C const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 }} # endif # else # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name; + EXTERN_C const GUID name DECLSPEC_HIDDEN; # endif /* INITGUID */ /* __uuidof emulation */ @@ -239,6 +239,17 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; #endif /* _WIN32 */ +/* Define DECLSPEC_HIDDEN */ +#ifndef DECLSPEC_HIDDEN +# if defined(__MINGW32__) +# define DECLSPEC_HIDDEN +# elif defined(__GNUC__) +# define DECLSPEC_HIDDEN __attribute__((visibility("hidden"))) +# else +# define DECLSPEC_HIDDEN +# endif +#endif /* DECLSPEC_HIDDEN */ + /* Define min() & max() macros */ #ifndef NOMINMAX # ifndef min

1 0

Henri Verbeet : vkd3d-shader/sm4: Make the "reg" parameter to shader_sm4_set_descriptor_register_range() const.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: vkd3d Branch: master Commit: 273316a742f70d9f5283459c400b9c22fdc4e022 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=273316a742f70d9f5283459… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 13:21:31 2022 +0100 vkd3d-shader/sm4: Make the "reg" parameter to shader_sm4_set_descriptor_register_range() const. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 27993c7..1ab71ca 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -235,7 +235,7 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, ui } static void shader_sm4_set_descriptor_register_range(struct vkd3d_shader_sm4_parser *sm4, - struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) + const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) { range->first = reg->idx[1].offset; range->last = reg->idx[shader_is_sm_5_1(sm4) ? 2 : 1].offset;

1 0