February 2022 - Wine-commits

Eric Pouech : comdlg32/tests: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: e240aeb757e3d70285eac7bc13a4a46f62210896 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e240aeb757e3d70285eac7bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:47 2022 +0100 comdlg32/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/comdlg32/tests/Makefile.in | 1 - dlls/comdlg32/tests/filedlg.c | 126 +++--- dlls/comdlg32/tests/finddlg.c | 2 +- dlls/comdlg32/tests/fontdlg.c | 8 +- dlls/comdlg32/tests/itemdlg.c | 936 ++++++++++++++++++++-------------------- dlls/comdlg32/tests/printdlg.c | 56 +-- 6 files changed, 564 insertions(+), 565 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e240aeb757e3d70285ea…

1 0

Eric Pouech : comsvcs/tests: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 2021c98bad5f77302dd23aadadf0a1c406e31594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2021c98bad5f77302dd23aad… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:53 2022 +0100 comsvcs/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/comsvcs/tests/Makefile.in | 1 - dlls/comsvcs/tests/comsvcs.c | 126 ++++++++++++++++++++--------------------- dlls/comsvcs/tests/property.c | 20 +++---- 3 files changed, 73 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2021c98bad5f77302dd2…

1 0

Eric Pouech : credui/tests: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: cdc92a7bcb254619c1b594d6933f3036a754cabf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdc92a7bcb254619c1b594d6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:59 2022 +0100 credui/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/credui/tests/Makefile.in | 1 - dlls/credui/tests/credui.c | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/credui/tests/Makefile.in b/dlls/credui/tests/Makefile.in index b2a8c778df4..4442837ed11 100644 --- a/dlls/credui/tests/Makefile.in +++ b/dlls/credui/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = credui.dll IMPORTS = credui diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c index f2b71d603cc..715ae35b130 100644 --- a/dlls/credui/tests/credui.c +++ b/dlls/credui/tests/credui.c @@ -50,10 +50,10 @@ static void test_CredUIPromptForCredentials(void) ret = CredUIConfirmCredentialsW(NULL, TRUE); ok(ret == ERROR_INVALID_PARAMETER /* 2003 + */ || ret == ERROR_NOT_FOUND /* XP */, - "CredUIConfirmCredentials should have returned ERROR_INVALID_PARAMETER or ERROR_NOT_FOUND instead of %d\n", ret); + "CredUIConfirmCredentials should have returned ERROR_INVALID_PARAMETER or ERROR_NOT_FOUND instead of %ld\n", ret); ret = CredUIConfirmCredentialsW(wszServerName, TRUE); - ok(ret == ERROR_NOT_FOUND, "CredUIConfirmCredentials should have returned ERROR_NOT_FOUND instead of %d\n", ret); + ok(ret == ERROR_NOT_FOUND, "CredUIConfirmCredentials should have returned ERROR_NOT_FOUND instead of %ld\n", ret); username[0] = '\0'; password[0] = '\0'; @@ -61,19 +61,19 @@ static void test_CredUIPromptForCredentials(void) ARRAY_SIZE(username), password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_ALWAYS_SHOW_UI); - ok(ret == ERROR_INVALID_FLAGS, "CredUIPromptForCredentials should have returned ERROR_INVALID_FLAGS instead of %d\n", ret); + ok(ret == ERROR_INVALID_FLAGS, "CredUIPromptForCredentials should have returned ERROR_INVALID_FLAGS instead of %ld\n", ret); ret = CredUIPromptForCredentialsW(NULL, NULL, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_ALWAYS_SHOW_UI | CREDUI_FLAGS_GENERIC_CREDENTIALS); - ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %ld\n", ret); ret = CredUIPromptForCredentialsW(NULL, wszServerName, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX); - ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %ld\n", ret); if (winetest_interactive) { @@ -81,11 +81,11 @@ static void test_CredUIPromptForCredentials(void) ARRAY_SIZE(username), password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); - ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %ld\n", ret); if (ret == ERROR_SUCCESS) { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); - ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %ld\n", ret); } credui_info.pszCaptionText = L"CREDUI_FLAGS_EXPECT_CONFIRMATION"; @@ -93,11 +93,11 @@ static void test_CredUIPromptForCredentials(void) username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); - ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %ld\n", ret); if (ret == ERROR_SUCCESS) { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); - ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %ld\n", ret); } credui_info.pszCaptionText = L"CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION"; @@ -105,11 +105,11 @@ static void test_CredUIPromptForCredentials(void) username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION); - ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %ld\n", ret); if (ret == ERROR_SUCCESS) { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); - ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %ld\n", ret); } @@ -119,7 +119,7 @@ static void test_CredUIPromptForCredentials(void) username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION); - ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %ld\n", ret); ok(save, "save flag should have been untouched\n"); save = FALSE; @@ -128,12 +128,12 @@ static void test_CredUIPromptForCredentials(void) username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION); - ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %ld\n", ret); ok(!save, "save flag should have been untouched\n"); if (ret == ERROR_SUCCESS) { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); - ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %ld\n", ret); } } @@ -160,17 +160,17 @@ static void test_SspiPromptForCredentials(void) info.pszCaptionText = L"basic"; info.hbmBanner = NULL; ret = pSspiPromptForCredentialsW( NULL, &info, 0, L"basic", NULL, &id, &save, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret ); ret = pSspiPromptForCredentialsW( L"SspiTest", &info, 0, NULL, NULL, &id, &save, 0 ); - ok( ret == ERROR_NO_SUCH_PACKAGE, "got %u\n", ret ); + ok( ret == ERROR_NO_SUCH_PACKAGE, "got %lu\n", ret ); if (winetest_interactive) { id = NULL; save = -1; ret = pSspiPromptForCredentialsW( L"SspiTest", &info, 0, L"basic", NULL, &id, &save, 0 ); - ok( ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "got %u\n", ret ); + ok( ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "got %lu\n", ret ); if (ret == ERROR_SUCCESS) { ok( id != NULL, "id not set\n" ); @@ -179,7 +179,7 @@ static void test_SspiPromptForCredentials(void) username = creds = NULL; domain = (const WCHAR *)0xdeadbeef; status = pSspiEncodeAuthIdentityAsStrings( id, &username, &domain, &creds ); - ok( status == SEC_E_OK, "got %u\n", status ); + ok( status == SEC_E_OK, "got %lu\n", status ); ok( username != NULL, "username not set\n" ); ok( domain == NULL, "domain not set\n" ); ok( creds != NULL, "creds not set\n" );

1 0

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

23 Feb '22

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

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

23 Feb '22

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: Always initialize sample data in create_sample helper.
by Alexandre Julliard 23 Feb '22

23 Feb '22

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 Process(Input|Output) tests.
by Alexandre Julliard 23 Feb '22

23 Feb '22

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

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

23 Feb '22

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

Eric Pouech : oleacc: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

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

Eric Pouech : wsdapi: Enable compilation with long types.
by Alexandre Julliard 23 Feb '22

23 Feb '22

Module: wine Branch: master Commit: 39f732c8c1549ad579107bc73800d3d6d05efeb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f732c8c1549ad579107bc7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:15 2022 +0100 wsdapi: 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/wsdapi/Makefile.in | 1 - dlls/wsdapi/address.c | 8 ++++---- dlls/wsdapi/discovery.c | 6 +++--- dlls/wsdapi/memory.c | 2 +- dlls/wsdapi/msgparams.c | 4 ++-- dlls/wsdapi/network.c | 12 ++++++------ dlls/wsdapi/xml.c | 6 +++--- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index cb477fd5f44..dd7b350d80b 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wsdapi.dll IMPORTLIB = wsdapi IMPORTS = bcrypt iphlpapi rpcrt4 user32 webservices ws2_32 diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index 7f11f48ce7c..bb8f54ef93c 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -78,7 +78,7 @@ static ULONG WINAPI IWSDUdpAddressImpl_AddRef(IWSDUdpAddress *iface) IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -87,7 +87,7 @@ static ULONG WINAPI IWSDUdpAddressImpl_Release(IWSDUdpAddress *iface) IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (ref == 0) { @@ -99,7 +99,7 @@ static ULONG WINAPI IWSDUdpAddressImpl_Release(IWSDUdpAddress *iface) static HRESULT WINAPI IWSDUdpAddressImpl_Serialize(IWSDUdpAddress *This, LPWSTR pszBuffer, DWORD cchLength, BOOL fSafe) { - FIXME("(%p, %p, %d, %d)\n", This, pszBuffer, cchLength, fSafe); + FIXME("(%p, %p, %ld, %d)\n", This, pszBuffer, cchLength, fSafe); return E_NOTIMPL; } @@ -294,7 +294,7 @@ static HRESULT WINAPI IWSDUdpAddressImpl_GetMessageType(IWSDUdpAddress *This, WS static HRESULT WINAPI IWSDUdpAddressImpl_SetTTL(IWSDUdpAddress *This, DWORD dwTTL) { - FIXME("(%p, %d)\n", This, dwTTL); + FIXME("(%p, %ld)\n", This, dwTTL); return E_NOTIMPL; } diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index 708cb803d03..9341eec7b78 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -69,7 +69,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_AddRef(IWSDiscoveryPublisher *ifac IWSDiscoveryPublisherImpl *This = impl_from_IWSDiscoveryPublisher(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -80,7 +80,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa struct notificationSink *sink, *cursor; struct message_id *msg_id, *msg_id_cursor; - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (ref == 0) { @@ -118,7 +118,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_SetAddressFamily(IWSDiscoveryPub { IWSDiscoveryPublisherImpl *impl = impl_from_IWSDiscoveryPublisher(This); - TRACE("(%p, %d)\n", This, dwAddressFamily); + TRACE("(%p, %ld)\n", This, dwAddressFamily); /* Has the address family already been set? */ if (impl->addressFamily != 0) diff --git a/dlls/wsdapi/memory.c b/dlls/wsdapi/memory.c index 89a6d2dc47d..83261623aee 100644 --- a/dlls/wsdapi/memory.c +++ b/dlls/wsdapi/memory.c @@ -82,7 +82,7 @@ void * WINAPI WSDAllocateLinkedMemory(void *pParent, SIZE_T cbSize) struct memory_allocation *allocation, *parent; void *ptr; - TRACE("(%p, %lu)\n", pParent, cbSize); + TRACE("(%p, %Iu)\n", pParent, cbSize); ptr = HeapAlloc(GetProcessHeap(), 0, MEMORY_ALLOCATION_SIZE + cbSize); diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c index dd07a5bf652..139fc734a2e 100644 --- a/dlls/wsdapi/msgparams.c +++ b/dlls/wsdapi/msgparams.c @@ -58,7 +58,7 @@ static ULONG IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *iface) IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -67,7 +67,7 @@ static ULONG IWSDMessageParametersImpl_Release(IWSDMessageParameters *iface) IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (ref == 0) { diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index ab290845834..4a9a706b747 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -116,7 +116,7 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d if (retval != ERROR_BUFFER_OVERFLOW) { - WARN("GetAdaptorsAddresses failed with error %08x\n", retval); + WARN("GetAdaptorsAddresses failed with error %08lx\n", retval); goto cleanup; } @@ -133,7 +133,7 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d if (retval != ERROR_SUCCESS) { - WARN("GetAdaptorsAddresses failed with error %08x\n", retval); + WARN("GetAdaptorsAddresses failed with error %08lx\n", retval); goto cleanup; } @@ -200,7 +200,7 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d if (thread_handle == NULL) { - WARN("CreateThread failed (error %d)\n", GetLastError()); + WARN("CreateThread failed (error %ld)\n", GetLastError()); closesocket(s); heap_free(send_params->data); @@ -487,7 +487,7 @@ static int start_listening(IWSDiscoveryPublisherImpl *impl, SOCKADDR_STORAGE *bi if (thread_handle == NULL) { - WARN("CreateThread failed (error %d)\n", GetLastError()); + WARN("CreateThread failed (error %ld)\n", GetLastError()); goto cleanup; } @@ -514,7 +514,7 @@ static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, UL if (ret != ERROR_BUFFER_OVERFLOW) { - WARN("GetAdaptorsAddresses failed with error %08x\n", ret); + WARN("GetAdaptorsAddresses failed with error %08lx\n", ret); return FALSE; } @@ -532,7 +532,7 @@ static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, UL if (ret != ERROR_SUCCESS) { - WARN("GetAdaptorsAddresses failed with error %08x\n", ret); + WARN("GetAdaptorsAddresses failed with error %08lx\n", ret); goto cleanup; } diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index ca47583da64..d92582718dd 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -466,7 +466,7 @@ static ULONG WINAPI IWSDXMLContextImpl_AddRef(IWSDXMLContext *iface) IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -475,7 +475,7 @@ static ULONG WINAPI IWSDXMLContextImpl_Release(IWSDXMLContext *iface) IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (ref == 0) { @@ -617,7 +617,7 @@ static HRESULT WINAPI IWSDXMLContextImpl_SetNamespaces(IWSDXMLContext *iface, co static HRESULT WINAPI IWSDXMLContextImpl_SetTypes(IWSDXMLContext *iface, const PCWSDXML_TYPE *pTypes, DWORD dwTypesCount, BYTE bLayerNumber) { - FIXME("(%p, %p, %d, %d)\n", iface, pTypes, dwTypesCount, bLayerNumber); + FIXME("(%p, %p, %ld, %d)\n", iface, pTypes, dwTypesCount, bLayerNumber); return E_NOTIMPL; }

1 0