February 2022 - Wine-commits

Eric Pouech : version: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: ad8fbedad1f9506810c8ff9d3483124e8d413591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8fbedad1f9506810c8ff9d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:38 2022 +0100 version: 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/version/Makefile.in | 1 - dlls/version/version.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index 8bb38e37075..e26069e18c4 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = version.dll IMPORTLIB = version IMPORTS = kernelbase diff --git a/dlls/version/version.c b/dlls/version/version.c index 5cb4fcd0457..61e79aef146 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -72,7 +72,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) { if ((*vffi)->dwSignature == 0x004f0049) /* hack to detect unicode */ *vffi = (VS_FIXEDFILEINFO*)(buf+0x28); if ((*vffi)->dwSignature != VS_FFI_SIGNATURE) - WARN("Bad VS_FIXEDFILEINFO signature 0x%08x\n",(*vffi)->dwSignature); + WARN("Bad VS_FIXEDFILEINFO signature 0x%08lx\n",(*vffi)->dwSignature); return buf; } } @@ -106,7 +106,7 @@ DWORD WINAPI VerInstallFileA( LPBYTE buf1,buf2; OFSTRUCT ofs; - TRACE("(%x,%s,%s,%s,%s,%s,%p,%d)\n", + TRACE("(%lx,%s,%s,%s,%s,%s,%p,%d)\n", flags,debugstr_a(srcfilename),debugstr_a(destfilename), debugstr_a(srcdir),debugstr_a(destdir),debugstr_a(curdir), tmpfile,*tmpfilelen); @@ -174,7 +174,7 @@ DWORD WINAPI VerInstallFileA( xret = VIF_OUTOFMEMORY; break; default: /* unknown error, should not happen */ - FIXME("Unknown LZCopy error %d, ignoring.\n", ret); + FIXME("Unknown LZCopy error %ld, ignoring.\n", ret); xret = 0; break; }

1 0

Dmitry Timoshkov : comctl32/tests: Add more LVM_INSERTITEM tests.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 915ff829044c64937e08f0ce93fbb291cc0b251b URL: https://source.winehq.org/git/wine.git/?a=commit;h=915ff829044c64937e08f0ce… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 11 17:24:42 2022 +0300 comctl32/tests: Add more LVM_INSERTITEM tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 182 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 169 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index bc89e8938be..4c2dd534dbd 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -413,15 +413,6 @@ static const struct message listview_header_set_imagelist[] = { { 0 } }; -static const struct message parent_insert_focused_seq[] = { - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, - { 0 } -}; - static const struct message parent_report_cd_seq[] = { { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, @@ -5920,6 +5911,136 @@ static void test_deleteitem(void) DestroyWindow(hwnd); } +static const struct message parent_insert_focused0_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_focused1_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 1, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam|lparam, 1, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_item_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_selected_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 3, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 3, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +#define LVIS_ALL (LVIS_FOCUSED | LVIS_SELECTED | LVIS_CUT | LVIS_DROPHILITED | LVIS_ACTIVATING) + +static void test_LVM_INSERTITEM(void) +{ + static const struct + { + UINT mask, state, stateMask; + } insert_item[] = + { + { LVIF_STATE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE, LVIS_FOCUSED, 0 }, + { LVIF_STATE, 0, LVIS_FOCUSED }, + + { LVIF_STATE, LVIS_SELECTED, LVIS_SELECTED }, + { LVIF_STATE, LVIS_SELECTED, 0 }, + { LVIF_STATE, 0, LVIS_SELECTED }, + + { LVIF_STATE, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED }, + { LVIF_STATE, LVIS_FOCUSED | LVIS_SELECTED, 0 }, + { LVIF_STATE, 0, LVIS_FOCUSED | LVIS_SELECTED }, + + { LVIF_STATE, LVIS_FOCUSED, LVIS_ALL }, + { LVIF_STATE, LVIS_SELECTED, LVIS_ALL }, + { LVIF_STATE, LVIS_CUT, LVIS_ALL }, + { LVIF_STATE, LVIS_DROPHILITED, LVIS_ALL }, + { LVIF_STATE, LVIS_ACTIVATING, LVIS_ALL }, + + { LVIF_STATE, LVIS_ALL, LVIS_ALL }, + { LVIF_STATE, LVIS_ALL, 0 }, + { LVIF_STATE, 0, LVIS_ALL }, + + { LVIF_STATE | LVIF_PARAM, 0, 0 }, + { LVIF_STATE | LVIF_PARAM, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE | LVIF_PARAM, LVIS_FOCUSED, 0 }, + { LVIF_STATE | LVIF_PARAM, 0, LVIS_FOCUSED }, + + { LVIF_STATE | LVIF_PARAM, LVIS_SELECTED, LVIS_SELECTED }, + { LVIF_STATE | LVIF_PARAM, LVIS_SELECTED, 0 }, + { LVIF_STATE | LVIF_PARAM, 0, LVIS_SELECTED }, + + { LVIF_STATE, 0, 0 }, + { LVIF_PARAM, 0, 0 }, + + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, 0 }, + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, 0 }, + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, LVIS_FOCUSED }, + + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, LVIS_FOCUSED }, + + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_ALL, LVIS_ALL }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_ALL, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, LVIS_ALL }, + }; + LVITEMA item; + UINT state; + HWND hwnd; + INT ret, i; + char buf[256]; + + for (i = 0; i < ARRAYSIZE(insert_item); i++) + { + hwnd = create_listview_control(LVS_REPORT); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.mask = insert_item[i].mask; + item.state = insert_item[i].state; + item.stateMask = insert_item[i].stateMask; + item.pszText = (LPSTR)"Hello World!"; + item.iImage = I_IMAGECALLBACK; + item.iItem = 0; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 0, "%d: got %d\n", i, ret); + + if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) + { + sprintf(buf, "%d: insert focused", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + } + else + { + sprintf(buf, "%d: insert item", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, buf, FALSE); + } + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_ALL); + if ((insert_item[i].mask & LVIF_STATE) && insert_item[i].state) + ok(state == insert_item[i].state, "%d: expected %#x, got %#x\n", i, insert_item[i].state, state); + else + ok(state == 0, "%d: expected 0, got %#x\n", i, state); + + DestroyWindow(hwnd); + } +} + static void test_insertitem(void) { LVITEMA item; @@ -5929,6 +6050,8 @@ static void test_insertitem(void) hwnd = create_listview_control(LVS_REPORT); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* insert item 0 focused */ item.mask = LVIF_STATE; item.state = LVIS_FOCUSED; @@ -5937,12 +6060,11 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); - flush_sequences(sequences, NUM_MSG_SEQUENCES); - /* insert item 1, focus shift */ item.mask = LVIF_STATE; item.state = LVIS_FOCUSED; @@ -5951,8 +6073,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -5965,10 +6086,44 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 2, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert focused 2", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); + /* insert item 3 */ + item.mask = LVIF_STATE | LVIF_PARAM; + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + item.iItem = 3; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 3, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + + /* insert item 4 */ + item.mask = LVIF_PARAM; + item.state = 0; + item.stateMask = 0; + item.iItem = 4; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 4, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert param", FALSE); + + /* insert item 5 */ + item.mask = LVIF_STATE; + item.state = 0; + item.stateMask = 0; + item.iItem = 5; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 5, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert state", FALSE); + DestroyWindow(hwnd); } @@ -6718,6 +6873,7 @@ START_TEST(listview) test_imagelists(); test_deleteitem(); test_insertitem(); + test_LVM_INSERTITEM(); test_header_proc(); test_oneclickactivate(); test_callback_mask();

1 0

Eric Pouech : wusa: Set subsystem to GUI.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: fd63983e81b3f42338ced314458b9cf0a4f39431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd63983e81b3f42338ced314… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 10:10:13 2022 +0100 wusa: Set subsystem to GUI. As it's on native. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index 171377bc2f2..c512d3e63db 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,7 +1,7 @@ MODULE = wusa.exe IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 -EXTRADLLFLAGS = -mconsole -municode +EXTRADLLFLAGS = -mwindows -municode C_SRCS = \ main.c \

1 0

Eric Pouech : uninstaller: Set subsystem to GUI.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: e54f91c80c418036db200eaca83ba20597d29d3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e54f91c80c418036db200eac… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 10:10:19 2022 +0100 uninstaller: Set subsystem to GUI. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index f7fef51a51c..5cc35b19dc3 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -2,7 +2,7 @@ MODULE = uninstaller.exe IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 user32 gdi32 comctl32 -EXTRADLLFLAGS = -mconsole -municode +EXTRADLLFLAGS = -mwindows -municode C_SRCS = \ main.c

1 0

Rémi Bernon : mf/tests: Add some H264 decoder creation tests.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: bc6eeb7d24dc9daa628fb9087c0220a90cb52ff8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc6eeb7d24dc9daa628fb908… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 17 11:38:45 2022 +0100 mf/tests: Add some H264 decoder creation tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 63df50cf3b8..814ac463da8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6363,6 +6363,65 @@ failed: CoUninitialize(); } +static void test_h264_decoder(void) +{ + static const media_type_desc transform_inputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264_ES), + }, + }; + static const media_type_desc transform_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), + }, + }; + + MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; + IMFTransform *transform; + GUID class_id; + HRESULT hr; + ULONG ret; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + if (!create_transform(MFT_CATEGORY_VIDEO_DECODER, &input_type, &output_type, L"Microsoft H264 Video Decoder MFT", + transform_inputs, ARRAY_SIZE(transform_inputs), transform_outputs, ARRAY_SIZE(transform_outputs), + &transform, &class_id)) + goto failed; + + ret = IMFTransform_Release(transform); + ok(ret == 0, "Release returned %u\n", ret); + +failed: + CoUninitialize(); +} + START_TEST(mf) { init_functions(); @@ -6398,4 +6457,5 @@ START_TEST(mf) test_MFRequireProtectedEnvironment(); test_wma_encoder(); test_wma_decoder(); + test_h264_decoder(); }

1 0

Rémi Bernon : mf/tests: Add some H264 decoder GetInputAvailableType tests.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 075be1b84cdcf8e393deef5a105968fea3ee374d URL: https://source.winehq.org/git/wine.git/?a=commit;h=075be1b84cdcf8e393deef5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 17 11:38:46 2022 +0100 mf/tests: Add some H264 decoder GetInputAvailableType tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 814ac463da8..5ec6e0dd5ea 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -105,12 +105,15 @@ struct attribute_desc const GUID *key; const char *name; PROPVARIANT value; + BOOL ratio; }; typedef struct attribute_desc media_type_desc[32]; #define ATTR_GUID(k, g) {.key = &k, .name = #k, {.vt = VT_CLSID, .puuid = (GUID *)&g}} #define ATTR_UINT32(k, v) {.key = &k, .name = #k, {.vt = VT_UI4, .ulVal = v}} #define ATTR_BLOB(k, p, n) {.key = &k, .name = #k, {.vt = VT_VECTOR | VT_UI1, .caub = {.pElems = (void *)p, .cElems = n}}} +#define ATTR_RATIO(k, n, d) {.key = &k, .name = #k, {.vt = VT_UI8, .uhVal = {.HighPart = n, .LowPart = d}}, .ratio = TRUE} +#define ATTR_UINT64(k, v) {.key = &k, .name = #k, {.vt = VT_UI8, .uhVal = {.QuadPart = v}}} #define check_media_type(a, b, c) check_attributes_(__LINE__, (IMFAttributes *)a, b, c) #define check_attributes(a, b, c) check_attributes_(__LINE__, a, b, c) @@ -132,6 +135,12 @@ static void check_attributes_(int line, IMFAttributes *attributes, const struct default: sprintf(buffer, "??"); break; case VT_CLSID: sprintf(buffer, "%s", debugstr_guid(value.puuid)); break; case VT_UI4: sprintf(buffer, "%u", value.ulVal); break; + case VT_UI8: + if (desc[i].ratio) + sprintf(buffer, "%u:%u", value.uhVal.HighPart, value.uhVal.LowPart); + else + sprintf(buffer, "%I64u", value.uhVal.QuadPart); + break; case VT_VECTOR | VT_UI1: buf += sprintf(buf, "size %u, data {", value.caub.cElems); for (j = 0; j < 16 && j < value.caub.cElems; ++j) @@ -6402,10 +6411,11 @@ static void test_h264_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; + IMFMediaType *media_type; IMFTransform *transform; GUID class_id; + ULONG i, ret; HRESULT hr; - ULONG ret; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); @@ -6415,6 +6425,23 @@ static void test_h264_decoder(void) &transform, &class_id)) goto failed; + /* check available input types */ + + i = -1; + while (SUCCEEDED(hr = IMFTransform_GetInputAvailableType(transform, 0, ++i, &media_type))) + { + winetest_push_context("in %u", i); + ok(hr == S_OK, "GetInputAvailableType returned %#x\n", hr); + check_media_type(media_type, transform_inputs[i], -1); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + winetest_pop_context(); + } + todo_wine + ok(hr == MF_E_NO_MORE_TYPES, "GetInputAvailableType returned %#x\n", hr); + todo_wine + ok(i == 2 || broken(i == 1) /* Win7 */, "%u input media types\n", i); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Rémi Bernon : mf/tests: Add some H264 decoder SetInputType tests.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 1d11c63331070a7c2c47b3e17c071fc53c8a5fd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d11c63331070a7c2c47b3e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 17 11:38:47 2022 +0100 mf/tests: Add some H264 decoder SetInputType tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5ec6e0dd5ea..527241b067e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6408,6 +6408,12 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), }, }; + static const struct attribute_desc input_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264), + {0}, + }; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; @@ -6442,6 +6448,25 @@ static void test_h264_decoder(void) todo_wine ok(i == 2 || broken(i == 1) /* Win7 */, "%u input media types\n", i); + /* check required input media type attributes */ + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + todo_wine + ok(hr == E_INVALIDARG, "SetInputType returned %#x.\n", hr); + init_media_type(media_type, input_type_desc, 1); + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + todo_wine + ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#x.\n", hr); + init_media_type(media_type, input_type_desc, 2); + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + todo_wine + ok(hr == S_OK, "SetInputType returned %#x.\n", hr); + ret = IMFMediaType_Release(media_type); + todo_wine + ok(ret == 1, "Release returned %u\n", ret); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Rémi Bernon : mf/tests: Add some H264 decoder GetOutputAvailableType tests.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 67ed1f8835b960d777826e13d964f6baaad885e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67ed1f8835b960d777826e13… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 17 11:38:48 2022 +0100 mf/tests: Add some H264 decoder GetOutputAvailableType tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 527241b067e..dc19efc4ae6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6408,6 +6408,110 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), }, }; + static const media_type_desc default_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 1920), + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 1920), + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 1920), + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 1920), + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 3840), + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + }, + }; + static const media_type_desc default_outputs_extra[] = + { + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1080), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 3110400), + ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), + }, + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1080), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 3110400), + ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), + }, + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1080), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 3110400), + ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), + }, + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1080), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 3110400), + ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), + }, + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1080), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 4147200), + ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), + }, + }; + static const media_type_desc default_outputs_win7[] = + { + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1088), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 3133440), + }, + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1088), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 3133440), + }, + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1088), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 3133440), + }, + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1088), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 3133440), + }, + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1088), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 4177920), + }, + }; static const struct attribute_desc input_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), @@ -6431,6 +6535,12 @@ static void test_h264_decoder(void) &transform, &class_id)) goto failed; + /* no output type is available before an input type is set */ + + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#x\n", hr); + /* check available input types */ i = -1; @@ -6467,6 +6577,27 @@ static void test_h264_decoder(void) todo_wine ok(ret == 1, "Release returned %u\n", ret); + /* output types can now be enumerated (though they are actually the same for all input types) */ + + i = -1; + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(transform, 0, ++i, &media_type))) + { + winetest_push_context("out %u", i); + ok(hr == S_OK, "GetOutputAvailableType returned %#x\n", hr); + check_media_type(media_type, default_outputs[i], -1); + if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL))) + check_media_type(media_type, default_outputs_win7[i], -1); + else + check_media_type(media_type, default_outputs_extra[i], -1); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + winetest_pop_context(); + } + todo_wine + ok(hr == MF_E_NO_MORE_TYPES, "GetOutputAvailableType returned %#x\n", hr); + todo_wine + ok(i == 5, "%u output media types\n", i); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Rémi Bernon : mf/tests: Add some H264 decoder SetOutputType tests.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: f1ea8a4a503f9eff388e8baa78a5053b7cf00bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ea8a4a503f9eff388e8baa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 17 11:38:49 2022 +0100 mf/tests: Add some H264 decoder SetOutputType tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dc19efc4ae6..07f4c28052d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6518,6 +6518,20 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264), {0}, }; + static const struct attribute_desc output_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1080), + {0}, + }; + static const struct attribute_desc output_type_desc_win7[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1088), + {0}, + }; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; @@ -6541,6 +6555,17 @@ static void test_h264_decoder(void) todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#x\n", hr); + /* setting output media type first doesn't work */ + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); + init_media_type(media_type, default_outputs[0], -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "SetOutputType returned %#x.\n", hr); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + /* check available input types */ i = -1; @@ -6598,6 +6623,37 @@ static void test_h264_decoder(void) todo_wine ok(i == 5, "%u output media types\n", i); + /* check required output media type attributes */ + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + todo_wine + ok(hr == E_INVALIDARG, "SetOutputType returned %#x.\n", hr); + init_media_type(media_type, output_type_desc, 1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + todo_wine + ok(hr == MF_E_INVALIDMEDIATYPE, "SetOutputType returned %#x.\n", hr); + init_media_type(media_type, output_type_desc, 2); + for (i = 2; i < ARRAY_SIZE(output_type_desc) - 1; ++i) + { + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + todo_wine + ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetOutputType returned %#x.\n", hr); + init_media_type(media_type, output_type_desc, i + 1); + } + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + if (broken(hr == MF_E_INVALIDMEDIATYPE)) + { + init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + } + todo_wine + ok(hr == S_OK, "SetOutputType returned %#x.\n", hr); + ret = IMFMediaType_Release(media_type); + todo_wine + ok(ret == 1, "Release returned %u\n", ret); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Dmitry Timoshkov : comctl32/tests: Print id value as decimal.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: a99c1ee76401ac25142b0eb1a9590a7391c4f1e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a99c1ee76401ac25142b0eb1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 11 17:24:31 2022 +0300 comctl32/tests: Print id value as decimal. All the notification codes (printed as an id) have negative base value (SBN_, UDN_, HDN_, BCN_, TBN_, TTN_, RBN_, TRBN_, PGN_, TVN_, LVN_, TCN_, CBEN_, IPN_, MCN_, DTN_), and printing them as decimal helps to quickly identify the corresponding notification value in cases when an id in the message sequence doesn't match. Custom ids in the message sequences have small numbers (0, 1, 2, ...), so they also get printed correctly. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/msg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 7337c724a5c..8ba2efddb0a 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -261,14 +261,14 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, failcount++; dump++; ok_(file, line) (FALSE, - "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + "%s: in msg 0x%04x expecting id %d got %d\n", context, expected->message, expected->id, actual->id); } } else { ok_(file, line) (expected->id == actual->id, - "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + "%s: in msg 0x%04x expecting id %d got %d\n", context, expected->message, expected->id, actual->id); if (expected->id != actual->id) dump++; }

1 0