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

Eric Pouech : msrle32/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

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 March 1, 2022

March 1, 2022

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 March 1, 2022

March 1, 2022

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

Zhiyi Zhang : uxtheme: Search parts of any state in IsThemePartDefined().
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: f11129d9c47b6ad0f52e4d2e88d17d9a0c2fe552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f11129d9c47b6ad0f52e4d2e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 1 15:06:38 2022 +0800 uxtheme: Search parts of any state in IsThemePartDefined(). Tests show that IsThemePartDefined() doesn't use state ID to search parts. If a part of any state is present, the part is considered as defined. For example, disabled state of part EditText of class Edit is present in theme files but there is no default state for part EditText. So IsThemePartDefined(theme, EP_EDITTEXT, 0) failed previously and it should succeed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52581 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/msstyles.c | 30 ++++++++++++++++++++++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/system.c | 6 +++--- dlls/uxtheme/tests/system.c | 13 +++---------- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 7d3ee72efe8..9e5a79a1c69 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -452,6 +452,36 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST return cur; } +/*********************************************************************** + * MSSTYLES_FindPart + * + * Find a part + * + * PARAMS + * tc Class to search + * iPartId Part ID to find + * + * RETURNS + * The part found, or NULL + */ +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) +{ + PTHEME_PARTSTATE cur = tc->partstate; + + while (cur) + { + if (cur->iPartId == iPartId) + return cur; + + cur = cur->next; + } + + if (tc->overrides) + return MSSTYLES_FindPart(tc->overrides, iPartId); + + return NULL; +} + /*********************************************************************** * MSSTYLES_FindPartState * diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 12292cefae4..67f81315d7a 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -95,6 +95,7 @@ BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPE BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) DECLSPEC_HIDDEN; +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) DECLSPEC_HIDDEN; PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 8333d6b99ce..908451f0fe8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -809,9 +809,9 @@ BOOL WINAPI IsThemePartDefined(HTHEME hTheme, int iPartId, int iStateId) SetLastError(E_HANDLE); return FALSE; } - if(MSSTYLES_FindPartState(hTheme, iPartId, iStateId, NULL)) - return TRUE; - return FALSE; + + SetLastError(NO_ERROR); + return !iStateId && MSSTYLES_FindPart(hTheme, iPartId); } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 59631f01fe9..dd118f5ab37 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -300,7 +300,6 @@ static void test_IsThemePartDefined(void) int state; BOOL defined; DWORD error; - BOOL todo; } tests[] = { @@ -311,7 +310,7 @@ static void test_IsThemePartDefined(void) {L"Button", BP_PUSHBUTTON, PBS_NORMAL, FALSE, NO_ERROR}, {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, FALSE, NO_ERROR}, {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, FALSE, NO_ERROR}, - {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR, TRUE}, + {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, }; @@ -337,9 +336,7 @@ static void test_IsThemePartDefined(void) SetLastError(0xdeadbeef); ret = IsThemePartDefined(theme, tests[i].part, tests[i].state); error = GetLastError(); - todo_wine_if(tests[i].todo) ok(ret == tests[i].defined, "Expected %d.\n", tests[i].defined); - todo_wine_if(error == 0xdeadbeef && tests[i].error == NO_ERROR) ok(error == tests[i].error, "Expected %#x, got %#x.\n", tests[i].error, error); if (theme) @@ -589,12 +586,8 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); bTPDefined = IsThemePartDefined(hTheme, 0 , 0); todo_wine - { - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); - } + ok( bTPDefined == FALSE, "Expected FALSE\n" ); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); DestroyWindow(hWnd); }

1 0

Eric Pouech : msdmo/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

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 : msftedit/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 45062af4287022f58a2694743fe410de4b319542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45062af4287022f58a269474… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:07 2022 +0100 msftedit/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msftedit/tests/Makefile.in | 1 - dlls/msftedit/tests/richole.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/msftedit/tests/Makefile.in b/dlls/msftedit/tests/Makefile.in index 6609c363f22..99cc46a0076 100644 --- a/dlls/msftedit/tests/Makefile.in +++ b/dlls/msftedit/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msftedit.dll IMPORTS = ole32 oleaut32 user32 diff --git a/dlls/msftedit/tests/richole.c b/dlls/msftedit/tests/richole.c index f7347a22348..a7fbb4d103d 100644 --- a/dlls/msftedit/tests/richole.c +++ b/dlls/msftedit/tests/richole.c @@ -40,7 +40,7 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ULONG rc; IUnknown_AddRef(obj); rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d.\n", ref, rc); + ok_(__FILE__,line)(rc == ref, "expected refcount %ld, got %ld.\n", ref, rc); } static HWND new_window(LPCWSTR classname, DWORD dwstyle, HWND parent) @@ -83,22 +83,22 @@ static void test_Interfaces(void) EXPECT_REF(reole, 3); hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument, (void **)&txtdoc); - ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08lx.\n", hres); ok(txtdoc != NULL, "IRichEditOle_QueryInterface\n"); hres = ITextDocument_GetSelection(txtdoc, NULL); - ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%08x.\n", hres); + ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%08lx.\n", hres); EXPECT_REF(txtdoc, 4); hres = ITextDocument_GetSelection(txtdoc, &txtsel); - ok(hres == S_OK, "ITextDocument_GetSelection failed 0x%08x.\n", hres); + ok(hres == S_OK, "ITextDocument_GetSelection failed 0x%08lx.\n", hres); EXPECT_REF(txtdoc, 4); EXPECT_REF(txtsel, 2); hres = ITextDocument_GetSelection(txtdoc, &txtsel2); - ok(hres == S_OK, "ITextDocument_GetSelection failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextDocument_GetSelection failed: 0x%08lx.\n", hres); ok(txtsel2 == txtsel, "got %p, %p\n", txtsel, txtsel2); EXPECT_REF(txtdoc, 4); @@ -108,38 +108,38 @@ static void test_Interfaces(void) punk = NULL; hres = ITextSelection_QueryInterface(txtsel, &IID_ITextSelection, (void **)&punk); - ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08lx.\n", hres); ok(punk != NULL, "ITextSelection_QueryInterface\n"); IUnknown_Release(punk); punk = NULL; hres = ITextSelection_QueryInterface(txtsel, &IID_ITextRange, (void **)&punk); - ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08lx.\n", hres); ok(punk != NULL, "ITextSelection_QueryInterface\n"); IUnknown_Release(punk); punk = NULL; hres = ITextSelection_QueryInterface(txtsel, &IID_IDispatch, (void **)&punk); - ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08lx.\n", hres); ok(punk != NULL, "ITextSelection_QueryInterface\n"); IUnknown_Release(punk); punk = NULL; hres = IRichEditOle_QueryInterface(reole, &IID_IOleClientSite, (void **)&punk); - ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); punk = NULL; hres = IRichEditOle_QueryInterface(reole, &IID_IOleWindow, (void **)&punk); - ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); punk = NULL; hres = IRichEditOle_QueryInterface(reole, &IID_IOleInPlaceSite, (void **)&punk); - ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); /* ITextDocument2 is implemented on msftedit after win8 for superseding ITextDocument2Old */ hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2, (void **)&txtdoc2); ok(hres == S_OK || - hres == E_NOINTERFACE /* before win8 */, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + hres == E_NOINTERFACE /* before win8 */, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); if (hres != E_NOINTERFACE) { ok(txtdoc2 != NULL, "IRichEditOle_QueryInterface\n"); @@ -148,7 +148,7 @@ static void test_Interfaces(void) EXPECT_REF(reole, 5); hres = ITextDocument2_QueryInterface(txtdoc2, &IID_ITextDocument2Old, (void **)&txtdoc2old); - ok(hres == S_OK, "ITextDocument2_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextDocument2_QueryInterface failed: 0x%08lx.\n", hres); ok((ITextDocument *)txtdoc2old != txtdoc, "Interface pointer is equal.\n"); EXPECT_REF(txtdoc2, 5); EXPECT_REF(reole, 5); @@ -159,7 +159,7 @@ static void test_Interfaces(void) else { hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); - ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08lx.\n", hres); ok(txtdoc2old != NULL, "IRichEditOle_QueryInterface\n"); ok((ITextDocument *)txtdoc2old == txtdoc, "Interface pointer is equal.\n"); EXPECT_REF(txtdoc2old, 5); @@ -170,7 +170,7 @@ static void test_Interfaces(void) ITextDocument_Release(txtdoc); IRichEditOle_Release(reole); refcount = IRichEditOle_Release(reole); - ok(refcount == 1, "Got wrong ref count: %d.\n", refcount); + ok(refcount == 1, "Got wrong ref count: %ld.\n", refcount); DestroyWindow(hwnd); /* Methods should return CO_E_RELEASED if the backing document has

1 0

Zhiyi Zhang : comctl32/tests: Fix a test failure when theming is active.
by Alexandre Julliard March 1, 2022

March 1, 2022

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

Saulius Krasuckas : ntdll: Check __WINE_PE_BUILD instead of compiler macros.
by Alexandre Julliard March 1, 2022

March 1, 2022

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

Henri Verbeet : vkd3d-shader/d3d-asm: Add an l-suffix on double literals.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: vkd3d Branch: master Commit: 8547174397261c84ea349fd8f5623a617dbbfcbc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8547174397261c84ea349fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 13:21:35 2022 +0100 vkd3d-shader/d3d-asm: Add an l-suffix on double literals. Like fxc/d3dcompiler does. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index fde704a..c292c84 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -775,7 +775,7 @@ static void shader_print_double_literal(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%s", prefix, sign, compiler->colours.literal); vkd3d_string_buffer_print_f64(&compiler->buffer, d); - vkd3d_string_buffer_printf(&compiler->buffer, "%s%s", compiler->colours.reset, suffix); + vkd3d_string_buffer_printf(&compiler->buffer, "l%s%s", compiler->colours.reset, suffix); } static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler,

1 0

Henri Verbeet : include: Introduce a common macro for defining tags.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: vkd3d Branch: master Commit: 4728cf128671feb899961ff620504909ec5d3785 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4728cf128671feb899961ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 13:21:32 2022 +0100 include: Introduce a common macro for defining tags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 4 ++++ libs/vkd3d-shader/hlsl_sm1.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 35 +++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 14 ++++++------- programs/vkd3d-compiler/main.c | 5 +---- 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index ac55685..ebf0521 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -42,6 +42,10 @@ #define MEMBER_SIZE(t, m) sizeof(((t *)0)->m) +#define VKD3D_MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((uint32_t)(ch0) | ((uint32_t)(ch1) << 8) \ + | ((uint32_t)(ch2) << 16) | ((uint32_t)(ch3) << 24)) + static inline size_t align(size_t addr, size_t alignment) { return (addr + (alignment - 1)) & ~(alignment - 1); diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 1868bb7..90ec605 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -335,7 +335,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe sm1_sort_externs(ctx); size_offset = put_u32(buffer, 0); - ctab_offset = put_u32(buffer, MAKEFOURCC('C','T','A','B')); + ctab_offset = put_u32(buffer, VKD3D_MAKE_TAG('C','T','A','B')); ctab_start = put_u32(buffer, sizeof(D3DXSHADER_CONSTANTTABLE)); creator_offset = put_u32(buffer, 0); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2deaa46..60c8615 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1232,25 +1232,22 @@ static inline void *vkd3d_find_struct_(const struct vkd3d_struct *chain, #define VKD3D_DXBC_MAX_SOURCE_COUNT 6 #define VKD3D_DXBC_HEADER_SIZE (8 * sizeof(uint32_t)) -#define MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ - ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) -#define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') -#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') -#define TAG_DXIL MAKE_TAG('D', 'X', 'I', 'L') -#define TAG_ISG1 MAKE_TAG('I', 'S', 'G', '1') -#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') -#define TAG_OSG1 MAKE_TAG('O', 'S', 'G', '1') -#define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5') -#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') -#define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') -#define TAG_PSG1 MAKE_TAG('P', 'S', 'G', '1') -#define TAG_RD11 MAKE_TAG('R', 'D', '1', '1') -#define TAG_RDEF MAKE_TAG('R', 'D', 'E', 'F') -#define TAG_RTS0 MAKE_TAG('R', 'T', 'S', '0') -#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') -#define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') -#define TAG_TEXT MAKE_TAG('T', 'E', 'X', 'T') +#define TAG_AON9 VKD3D_MAKE_TAG('A', 'o', 'n', '9') +#define TAG_DXBC VKD3D_MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_DXIL VKD3D_MAKE_TAG('D', 'X', 'I', 'L') +#define TAG_ISG1 VKD3D_MAKE_TAG('I', 'S', 'G', '1') +#define TAG_ISGN VKD3D_MAKE_TAG('I', 'S', 'G', 'N') +#define TAG_OSG1 VKD3D_MAKE_TAG('O', 'S', 'G', '1') +#define TAG_OSG5 VKD3D_MAKE_TAG('O', 'S', 'G', '5') +#define TAG_OSGN VKD3D_MAKE_TAG('O', 'S', 'G', 'N') +#define TAG_PCSG VKD3D_MAKE_TAG('P', 'C', 'S', 'G') +#define TAG_PSG1 VKD3D_MAKE_TAG('P', 'S', 'G', '1') +#define TAG_RD11 VKD3D_MAKE_TAG('R', 'D', '1', '1') +#define TAG_RDEF VKD3D_MAKE_TAG('R', 'D', 'E', 'F') +#define TAG_RTS0 VKD3D_MAKE_TAG('R', 'T', 'S', '0') +#define TAG_SHDR VKD3D_MAKE_TAG('S', 'H', 'D', 'R') +#define TAG_SHEX VKD3D_MAKE_TAG('S', 'H', 'E', 'X') +#define TAG_TEXT VKD3D_MAKE_TAG('T', 'E', 'X', 'T') struct dxbc_writer_section { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index ca7a3f2..ac0d5ce 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -44,17 +44,15 @@ #define VK_CALL(f) (vk_procs->f) -#define MAKE_MAGIC(a,b,c,f) (((uint32_t)a) | (((uint32_t)b) << 8) | (((uint32_t)c) << 16) | f) - #define VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW 0x01000000u #define VKD3D_DESCRIPTOR_MAGIC_FREE 0x00000000u -#define VKD3D_DESCRIPTOR_MAGIC_CBV MAKE_MAGIC('C', 'B', 'V', 0) -#define VKD3D_DESCRIPTOR_MAGIC_SRV MAKE_MAGIC('S', 'R', 'V', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) -#define VKD3D_DESCRIPTOR_MAGIC_UAV MAKE_MAGIC('U', 'A', 'V', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) -#define VKD3D_DESCRIPTOR_MAGIC_SAMPLER MAKE_MAGIC('S', 'M', 'P', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) -#define VKD3D_DESCRIPTOR_MAGIC_DSV MAKE_MAGIC('D', 'S', 'V', 0) -#define VKD3D_DESCRIPTOR_MAGIC_RTV MAKE_MAGIC('R', 'T', 'V', 0) +#define VKD3D_DESCRIPTOR_MAGIC_CBV VKD3D_MAKE_TAG('C', 'B', 'V', 0) +#define VKD3D_DESCRIPTOR_MAGIC_SRV VKD3D_MAKE_TAG('S', 'R', 'V', 1) +#define VKD3D_DESCRIPTOR_MAGIC_UAV VKD3D_MAKE_TAG('U', 'A', 'V', 1) +#define VKD3D_DESCRIPTOR_MAGIC_SAMPLER VKD3D_MAKE_TAG('S', 'M', 'P', 1) +#define VKD3D_DESCRIPTOR_MAGIC_DSV VKD3D_MAKE_TAG('D', 'S', 'V', 0) +#define VKD3D_DESCRIPTOR_MAGIC_RTV VKD3D_MAKE_TAG('R', 'T', 'V', 0) #define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u #define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 2f330f6..ab47561 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -50,10 +50,7 @@ enum OPTION_TEXT_FORMATTING, }; -#define MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ - ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) -#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_DXBC VKD3D_MAKE_TAG('D', 'X', 'B', 'C') static const struct source_type_info {

1 0