February 2022 - Wine-Commits

Eric Pouech : atl100/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 0c88eeee745f8ae79fdbddcca10d228c0fc7d695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c88eeee745f8ae79fdbddcc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:17 2022 +0100 atl100/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/atl100/tests/Makefile.in | 2 +- dlls/atl100/tests/atl.c | 120 +++++++++++++++++++++--------------------- 2 files changed, 61 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c88eeee745f8ae79fdb…

1 0

Eric Pouech : cabinet/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 8c7d53a5b0766de6a56ca52b382898f4e952766c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7d53a5b0766de6a56ca52b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:35 2022 +0100 cabinet/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/cabinet/tests/Makefile.in | 1 - dlls/cabinet/tests/extract.c | 22 ++++++++--------- dlls/cabinet/tests/fdi.c | 54 +++++++++++++++++++++--------------------- 3 files changed, 38 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c7d53a5b0766de6a56c…

1 0

Eric Pouech : avifil32/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: ab27b548a502cd42a2399403ec05f27b7ca603d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab27b548a502cd42a2399403… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:29 2022 +0100 avifil32/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/avifil32/tests/Makefile.in | 1 - dlls/avifil32/tests/api.c | 188 ++++++++++++++++++++-------------------- 2 files changed, 94 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab27b548a502cd42a239…

1 0

Eric Pouech : activeds/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 45399c9c3853bb9b50eb29b5ccafe12d20c4d3c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45399c9c3853bb9b50eb29b5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:39 2022 +0100 activeds/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/activeds/tests/Makefile.in | 1 - dlls/activeds/tests/activeds.c | 62 ++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/activeds/tests/Makefile.in b/dlls/activeds/tests/Makefile.in index 340336d4c0a..25ae2a9bfd2 100644 --- a/dlls/activeds/tests/Makefile.in +++ b/dlls/activeds/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = activeds.dll IMPORTS = ole32 oleaut32 activeds diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index c2dc3d58c4b..bc6a6bfc568 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -41,46 +41,46 @@ static void test_ADsBuildVarArrayStr(void) LONG start, end, idx; hr = ADsBuildVarArrayStr(NULL, 0, NULL); - ok(hr == E_ADS_BAD_PARAMETER || hr == E_FAIL /* XP */, "got %#x\n", hr); + ok(hr == E_ADS_BAD_PARAMETER || hr == E_FAIL /* XP */, "got %#lx\n", hr); hr = ADsBuildVarArrayStr(NULL, 0, &var); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(V_VT(&var) == (VT_ARRAY | VT_VARIANT), "got %d\n", V_VT(&var)); start = 0xdeadbeef; hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); - ok(hr == S_OK, "got %#x\n", hr); - ok(start == 0, "got %d\n", start); + ok(hr == S_OK, "got %#lx\n", hr); + ok(start == 0, "got %ld\n", start); end = 0xdeadbeef; hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); - ok(hr == S_OK, "got %#x\n", hr); - ok(end == -1, "got %d\n", end); + ok(hr == S_OK, "got %#lx\n", hr); + ok(end == -1, "got %ld\n", end); VariantClear(&var); hr = ADsBuildVarArrayStr((LPWSTR *)props, ARRAY_SIZE(props), &var); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(V_VT(&var) == (VT_ARRAY | VT_VARIANT), "got %d\n", V_VT(&var)); start = 0xdeadbeef; hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); - ok(hr == S_OK, "got %#x\n", hr); - ok(start == 0, "got %d\n", start); + ok(hr == S_OK, "got %#lx\n", hr); + ok(start == 0, "got %ld\n", start); end = 0xdeadbeef; hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); - ok(hr == S_OK, "got %#x\n", hr); - ok(end == 1, "got %d\n", end); + ok(hr == S_OK, "got %#lx\n", hr); + ok(end == 1, "got %ld\n", end); idx = 0; hr = SafeArrayGetElement(V_ARRAY(&var), &idx, &item); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(V_VT(&item) == VT_BSTR, "got %d\n", V_VT(&item)); ok(!lstrcmpW(V_BSTR(&item), L"prop1"), "got %s\n", wine_dbgstr_w(V_BSTR(&item))); VariantClear(&item); hr = SafeArrayAccessData(V_ARRAY(&var), (void *)&data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(V_VT(&data[0]) == VT_BSTR, "got %d\n", V_VT(&data[0])); ok(!lstrcmpW(V_BSTR(&data[0]), L"prop1"), "got %s\n", wine_dbgstr_w(V_BSTR(&data[0]))); ok(V_VT(&data[0]) == VT_BSTR, "got %d\n", V_VT(&data[0])); ok(!lstrcmpW(V_BSTR(&data[1]), L"prop2"), "got %s\n", wine_dbgstr_w(V_BSTR(&data[1]))); hr = SafeArrayUnaccessData(V_ARRAY(&var)); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); VariantClear(&var); } @@ -93,68 +93,68 @@ static void test_Pathname(void) LONG count, i; hr = CoCreateInstance(&CLSID_Pathname, 0, CLSCTX_INPROC_SERVER, &IID_IADsPathname, (void **)&path); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); count = 0xdeadbeef; hr = IADsPathname_GetNumElements(path, &count); - ok(hr == S_OK, "got %#x\n", hr); - ok(count == 0, "got %d\n", count); + ok(hr == S_OK, "got %#lx\n", hr); + ok(count == 0, "got %ld\n", count); bstr = NULL; hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(bstr && !wcscmp(bstr, L"LDAP://"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); bstr = SysAllocString(L"LDAP://sample"); hr = IADsPathname_Set(path, bstr, ADS_SETTYPE_FULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); SysFreeString(bstr); count = 0xdeadbeef; hr = IADsPathname_GetNumElements(path, &count); - ok(hr == S_OK, "got %#x\n", hr); - ok(count == 0, "got %d\n", count); + ok(hr == S_OK, "got %#lx\n", hr); + ok(count == 0, "got %ld\n", count); hr = IADsPathname_GetElement(path, 0, &bstr); - ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_INDEX), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_INDEX), "got %#lx\n", hr); SysFreeString(bstr); bstr = SysAllocString(L"LDAP://sample:123/a=b,c=d,e=f"); hr = IADsPathname_Set(path, bstr, ADS_SETTYPE_FULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); SysFreeString(bstr); count = 0xdeadbeef; hr = IADsPathname_GetNumElements(path, &count); - ok(hr == S_OK, "got %#x\n", hr); - ok(count == 3, "got %d\n", count); + ok(hr == S_OK, "got %#lx\n", hr); + ok(count == 3, "got %ld\n", count); for (i = 0; i < count; i++) { hr = IADsPathname_GetElement(path, i, &bstr); - ok(hr == S_OK, "got %#x\n", hr); - ok(!wcscmp(bstr, elem[i]), "%u: %s\n", i, wine_dbgstr_w(bstr)); + ok(hr == S_OK, "got %#lx\n", hr); + ok(!wcscmp(bstr, elem[i]), "%lu: %s\n", i, wine_dbgstr_w(bstr)); SysFreeString(bstr); } hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(bstr, L"LDAP://sample:123/a=b,c=d,e=f"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_PROVIDER, &bstr); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(bstr, L"LDAP"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_SERVER, &bstr); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(bstr, L"sample:123"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_LEAF, &bstr); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(bstr, L"a=b"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr);

1 0

Rémi Bernon : mf/tests: Add some H264 decoder Process(Input|Output) tests.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: a419ff8b6fcb53abf258129c9647ecff1626b01c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a419ff8b6fcb53abf258129c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 16:47:21 2022 +0100 mf/tests: Add some H264 decoder Process(Input|Output) tests. The h264data.bin resource has been generated with: gst-launch-1.0 videotestsrc num-buffers=60 ! \ video/x-raw,format=I420,width=78,height=74,framerate=30000/1001 ! \ videoconvert ! x264enc ! filesink location=dlls/mf/tests/h264data.bin 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/h264data.bin | Bin 0 -> 49137 bytes dlls/mf/tests/mf.c | 95 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/resource.rc | 3 ++ 3 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/h264data.bin b/dlls/mf/tests/h264data.bin new file mode 100644 index 00000000000..d014052ca49 Binary files /dev/null and b/dlls/mf/tests/h264data.bin differ diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6dabae1deb0..e0793152d74 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6369,6 +6369,27 @@ failed: CoUninitialize(); } +#define next_h264_sample(a, b) next_h264_sample_(__LINE__, a, b) +static IMFSample *next_h264_sample_(int line, const BYTE **h264_buf, ULONG *h264_len) +{ + const BYTE *sample_data; + + ok_(__FILE__, line)(*h264_len > 4, "invalid h264 length\n"); + ok_(__FILE__, line)(*(UINT32 *)*h264_buf == 0x01000000, "invalid h264 buffer\n"); + sample_data = *h264_buf; + + (*h264_len) -= 4; + (*h264_buf) += 4; + + while (*h264_len >= 4 && *(UINT32 *)*h264_buf != 0x01000000) + { + (*h264_len)--; + (*h264_buf)++; + } + + return create_sample(sample_data, *h264_buf - sample_data); +} + static void test_h264_decoder(void) { static const media_type_desc transform_inputs[] = @@ -6534,10 +6555,16 @@ static void test_h264_decoder(void) MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; + MFT_OUTPUT_DATA_BUFFER output; + const BYTE *h264_encoded_data; + ULONG h264_encoded_data_len; IMFMediaType *media_type; IMFTransform *transform; - ULONG flags, i, ret; + ULONG i, ret, flags; + IMFSample *sample; + HRSRC resource; GUID class_id; + DWORD status; HRESULT hr; hr = CoInitialize(NULL); @@ -6723,8 +6750,74 @@ static void test_h264_decoder(void) todo_wine ok(output_info.cbAlignment == 0, "got cbAlignment %#x\n", output_info.cbAlignment); + resource = FindResourceW(NULL, L"h264data.bin", (const WCHAR *)RT_RCDATA); + ok(resource != 0, "FindResourceW failed, error %u\n", GetLastError()); + h264_encoded_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); + h264_encoded_data_len = SizeofResource(GetModuleHandleW(NULL), resource); + + /* As output_info.dwFlags doesn't have MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES + * IMFTransform_ProcessOutput needs a sample or returns an error */ + + status = 0; + memset(&output, 0, sizeof(output)); + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + todo_wine + ok(hr == E_INVALIDARG || hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); + ok(!output.pSample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); + ok(!output.pEvents, "got pEvents %p\n", output.pEvents); + ok(status == 0, "got status %#x\n", status); + + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + while (1) + { + status = 0; + memset(&output, 0, sizeof(output)); + output.pSample = create_sample(NULL, output_info.cbSize); + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + if (hr != MF_E_TRANSFORM_NEED_MORE_INPUT) break; + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); + ok(!!output.pSample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); + ok(!output.pEvents, "got pEvents %p\n", output.pEvents); + ok(status == 0, "got status %#x\n", status); + check_sample(output.pSample, NULL, 0, NULL); + ret = IMFSample_Release(output.pSample); + ok(ret == 0, "Release returned %u\n", ret); + + while (h264_encoded_data_len > 4) + { + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + if (FAILED(hr)) break; + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret <= 1, "Release returned %u\n", ret); + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + } + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); + EXPECT_REF(sample, 1); + } + todo_wine + ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#x\n", hr); + ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); + ok(!!output.pSample, "got pSample %p\n", output.pSample); + todo_wine + ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE, + "got dwStatus %#x\n", output.dwStatus); + ok(!output.pEvents, "got pEvents %p\n", output.pEvents); + todo_wine + ok(status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS, + "got status %#x\n", status); + check_sample(output.pSample, NULL, 0, NULL); + ret = IMFSample_Release(output.pSample); + ok(ret == 0, "Release returned %u\n", ret); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); failed: CoUninitialize(); diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index 931139c741a..17adc3ed46c 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -22,3 +22,6 @@ /* @makedep: wmadata.bin */ wmadata.bin RCDATA wmadata.bin + +/* @makedep: h264data.bin */ +h264data.bin RCDATA h264data.bin

1 0

Rémi Bernon : mf/tests: Always initialize sample data in create_sample helper.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 07cf1313c33c329c0b3201ee1be0e0c3fe0d20c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07cf1313c33c329c0b3201ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 16:47:20 2022 +0100 mf/tests: Always initialize sample data in create_sample helper. 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 | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index be8505eb2d3..6dabae1deb0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5692,18 +5692,15 @@ static IMFSample *create_sample(const BYTE *data, ULONG size) ok(hr == S_OK, "MFCreateSample returned %#x\n", hr); hr = MFCreateMemoryBuffer(size, &media_buffer); ok(hr == S_OK, "MFCreateMemoryBuffer returned %#x\n", hr); - if (data) - { - hr = IMFMediaBuffer_SetCurrentLength(media_buffer, size); - ok(hr == S_OK, "SetCurrentLength returned %#x\n", hr); - hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length); - ok(hr == S_OK, "Lock returned %#x\n", hr); - ok(length == size, "got size %u\n", length); - if (!data) memset(buffer, 0xcd, length); - else memcpy(buffer, data, length); - hr = IMFMediaBuffer_Unlock(media_buffer); - ok(hr == S_OK, "Unlock returned %#x\n", hr); - } + hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length); + ok(hr == S_OK, "Lock returned %#x\n", hr); + ok(length == 0, "got length %u\n", length); + if (!data) memset(buffer, 0xcd, size); + else memcpy(buffer, data, size); + hr = IMFMediaBuffer_Unlock(media_buffer); + ok(hr == S_OK, "Unlock returned %#x\n", hr); + hr = IMFMediaBuffer_SetCurrentLength(media_buffer, data ? size : 0); + ok(hr == S_OK, "SetCurrentLength returned %#x\n", hr); hr = IMFSample_AddBuffer(sample, media_buffer); ok(hr == S_OK, "AddBuffer returned %#x\n", hr); ret = IMFMediaBuffer_Release(media_buffer);

1 0

Rémi Bernon : mf/tests: Add some H264 decoder GetOutputStreamInfo tests.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 1d99367ed59a24fced9b1d3228e8a0210dd9c907 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d99367ed59a24fced9b1d32… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 16:47:19 2022 +0100 mf/tests: Add some H264 decoder GetOutputStreamInfo 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 | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a62b8837fd6..be8505eb2d3 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6535,6 +6535,7 @@ 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}; + MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; IMFMediaType *media_type; IMFTransform *transform; @@ -6585,6 +6586,18 @@ static void test_h264_decoder(void) todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#x\n", input_info.cbAlignment); + flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + todo_wine + ok(output_info.dwFlags == flags, "got dwFlags %#x\n", output_info.dwFlags); + todo_wine + ok(output_info.cbSize == 0x3fc000, "got cbSize %#x\n", output_info.cbSize); + todo_wine + ok(output_info.cbAlignment == 0, "got cbAlignment %#x\n", output_info.cbAlignment); + i = -1; while (SUCCEEDED(hr = IMFTransform_GetInputAvailableType(transform, 0, ++i, &media_type))) { @@ -6619,6 +6632,19 @@ static void test_h264_decoder(void) todo_wine ok(ret == 1, "Release returned %u\n", ret); + flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + todo_wine + ok(output_info.dwFlags == flags, "got dwFlags %#x\n", output_info.dwFlags); + todo_wine + ok(output_info.cbSize == 0x3f4800 || broken(output_info.cbSize == 0x3fc000) /* Win7 */, + "got cbSize %#x\n", output_info.cbSize); + todo_wine + ok(output_info.cbAlignment == 0, "got cbAlignment %#x\n", output_info.cbAlignment); + /* output types can now be enumerated (though they are actually the same for all input types) */ i = -1; @@ -6687,6 +6713,19 @@ static void test_h264_decoder(void) todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#x\n", input_info.cbAlignment); + flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + todo_wine + ok(output_info.dwFlags == flags, "got dwFlags %#x\n", output_info.dwFlags); + todo_wine + ok(output_info.cbSize == 0x3f4800 || broken(output_info.cbSize == 0x3fc000) /* Win7 */, + "got cbSize %#x\n", output_info.cbSize); + todo_wine + ok(output_info.cbAlignment == 0, "got cbAlignment %#x\n", output_info.cbAlignment); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Rémi Bernon : mf/tests: Add some H264 decoder GetInputStreamInfo tests.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 65cb088386bb90840ea2535c01079d83cc74eb65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65cb088386bb90840ea2535c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 16:47:18 2022 +0100 mf/tests: Add some H264 decoder GetInputStreamInfo 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 | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 07f4c28052d..a62b8837fd6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6535,10 +6535,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}; + MFT_INPUT_STREAM_INFO input_info; IMFMediaType *media_type; IMFTransform *transform; + ULONG flags, i, ret; GUID class_id; - ULONG i, ret; HRESULT hr; hr = CoInitialize(NULL); @@ -6568,6 +6569,22 @@ static void test_h264_decoder(void) /* check available input types */ + flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); + todo_wine + ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); + todo_wine + ok(input_info.dwFlags == flags, "got dwFlags %#x\n", input_info.dwFlags); + todo_wine + ok(input_info.cbSize == 0x1000, "got cbSize %u\n", input_info.cbSize); + todo_wine + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); + todo_wine + ok(input_info.cbAlignment == 0, "got cbAlignment %#x\n", input_info.cbAlignment); + i = -1; while (SUCCEEDED(hr = IMFTransform_GetInputAvailableType(transform, 0, ++i, &media_type))) { @@ -6654,6 +6671,22 @@ static void test_h264_decoder(void) todo_wine ok(ret == 1, "Release returned %u\n", ret); + flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); + todo_wine + ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); + todo_wine + ok(input_info.dwFlags == flags, "got dwFlags %#x\n", input_info.dwFlags); + todo_wine + ok(input_info.cbSize == 0x1000, "got cbSize %u\n", input_info.cbSize); + todo_wine + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); + todo_wine + ok(input_info.cbAlignment == 0, "got cbAlignment %#x\n", input_info.cbAlignment); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Eric Pouech : oleacc: Enable compilation with long types.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 24bb3b690dc59945cb9ea9c1c2f33d4049eadd3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=24bb3b690dc59945cb9ea9c1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:09 2022 +0100 oleacc: 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/oleacc/Makefile.in | 1 - dlls/oleacc/client.c | 20 ++++++++++---------- dlls/oleacc/main.c | 32 ++++++++++++++++---------------- dlls/oleacc/propservice.c | 30 +++++++++++++++--------------- dlls/oleacc/window.c | 20 ++++++++++---------- 5 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24bb3b690dc59945cb9e…

1 0

Nikolay Sivov : msxml3/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: aebd8cd514c3bd386a98e4ecc8d1aa1de7a9df4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aebd8cd514c3bd386a98e4ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 09:46:35 2022 +0300 msxml3/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/Makefile.in | 1 - dlls/msxml3/tests/domdoc.c | 4870 +++++++++++++++++++++-------------------- dlls/msxml3/tests/httpreq.c | 173 +- dlls/msxml3/tests/saxreader.c | 1181 +++++----- dlls/msxml3/tests/schema.c | 718 +++--- dlls/msxml3/tests/xmldoc.c | 408 ++-- dlls/msxml3/tests/xmlparser.c | 24 +- dlls/msxml3/tests/xmlview.c | 36 +- 8 files changed, 3845 insertions(+), 3566 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aebd8cd514c3bd386a98…

1 0