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

Dmitry Timoshkov : d2d1/tests: Add some tests for ID2D1DeviceContext::CreateImageBrush().
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 8151e695e31d52c9a739d9648afd9a27265e1f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8151e695e31d52c9a739d964… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 16 08:22:13 2022 +0300 d2d1/tests: Add some tests for ID2D1DeviceContext::CreateImageBrush(). 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/d2d1/tests/d2d1.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ca80a8e946b..035915491fd 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2291,6 +2291,120 @@ static void test_bitmap_brush(BOOL d3d11) release_test_context(&ctx); } +static void test_image_brush(BOOL d3d11) +{ + D2D1_IMAGE_BRUSH_PROPERTIES image_brush_desc; + D2D1_INTERPOLATION_MODE interp_mode; + ID2D1DeviceContext *device_context; + D2D1_BITMAP_PROPERTIES bitmap_desc; + D2D1_BRUSH_PROPERTIES brush_desc; + ID2D1Image *image, *tmp_image; + struct d2d1_test_context ctx; + D2D1_EXTEND_MODE extend_mode; + D2D1_MATRIX_3X2_F matrix; + ID2D1ImageBrush *brush; + ID2D1Bitmap *bitmap; + D2D1_SIZE_U size; + D2D1_RECT_F rect; + ULONG refcount; + float opacity; + HRESULT hr; + BOOL match; + + static const DWORD bitmap_data[] = + { + 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, + 0xff0000ff, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + static const D2D1_MATRIX_3X2_F identity = + {{{ + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }}}; + + if (!init_test_context(&ctx, d3d11)) + return; + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(ctx.rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Only image brush description is required. */ + set_rect(&image_brush_desc.sourceRectangle, 1.0f, 2.0f, 3.0f, 4.0f); + image_brush_desc.extendModeX = D2D1_EXTEND_MODE_WRAP; + image_brush_desc.extendModeY = D2D1_EXTEND_MODE_MIRROR; + image_brush_desc.interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR; + + hr = ID2D1DeviceContext_CreateImageBrush(device_context, NULL, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + tmp_image = (void *)0xdeadbeef; + ID2D1ImageBrush_GetImage(brush, &tmp_image); + ok(!tmp_image, "Unexpected image %p.\n", image); + + opacity = ID2D1ImageBrush_GetOpacity(brush); + ok(opacity == 1.0f, "Unexpected opacity %.8e.\n", opacity); + ID2D1ImageBrush_GetTransform(brush, &matrix); + ok(!memcmp(&matrix, &identity, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + matrix._11, matrix._12, matrix._21, matrix._22, matrix._31, matrix._32); + + ID2D1ImageBrush_GetSourceRectangle(brush, &rect); + match = compare_rect(&rect, 1.0f, 2.0f, 3.0f, 4.0f, 0); + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + extend_mode = ID2D1ImageBrush_GetExtendModeX(brush); + ok(extend_mode == D2D1_EXTEND_MODE_WRAP, "Unexpected extend mode %u.\n", extend_mode); + extend_mode = ID2D1ImageBrush_GetExtendModeY(brush); + ok(extend_mode == D2D1_EXTEND_MODE_MIRROR, "Unexpected extend mode %u.\n", extend_mode); + interp_mode = ID2D1ImageBrush_GetInterpolationMode(brush); + ok(interp_mode == D2D1_INTERPOLATION_MODE_LINEAR, "Unexpected interpolation mode %u.\n", interp_mode); + + ID2D1ImageBrush_Release(brush); + + /* Custom brush description and image pointer. */ + brush_desc.opacity = 2.0f; + set_matrix_identity(&brush_desc.transform); + scale_matrix(&brush_desc.transform, 2.0f, 3.0f); + + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, &brush_desc, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_GetImage(brush, &tmp_image); + ok(tmp_image == image, "Got unexpected image %p, expected %p.\n", tmp_image, image); + ID2D1Image_Release(tmp_image); + + opacity = ID2D1ImageBrush_GetOpacity(brush); + ok(opacity == 2.0f, "Unexpected opacity %.8e.\n", opacity); + ID2D1ImageBrush_GetTransform(brush, &matrix); + ok(!memcmp(&matrix, &brush_desc.transform, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + matrix._11, matrix._12, matrix._21, matrix._22, matrix._31, matrix._32); + + ID2D1ImageBrush_Release(brush); + + ID2D1Image_Release(image); + refcount = ID2D1Bitmap_Release(bitmap); + ok(!refcount, "Bitmap has %lu references left.\n", refcount); + + ID2D1DeviceContext_Release(device_context); + release_test_context(&ctx); +} + static void test_linear_brush(BOOL d3d11) { D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES gradient_properties; @@ -10919,6 +11033,7 @@ START_TEST(d2d1) queue_test(test_state_block); queue_test(test_color_brush); queue_test(test_bitmap_brush); + queue_test(test_image_brush); queue_test(test_linear_brush); queue_test(test_radial_brush); queue_test(test_path_geometry);

1 0

Hans Leidekker : msi/tests: Fix an intermittent test failure.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 7bf7340eb6e7135d45c7f233649cfe4989eaf3d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bf7340eb6e7135d45c7f233… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat May 14 12:16:46 2022 +0200 msi/tests: Fix an intermittent test failure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52993 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 224637eb286..e5c862e206c 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3690,9 +3690,10 @@ static void test_publish(void) LONG res; HKEY uninstall, prodkey, uninstall_32node = NULL; INSTALLSTATE state; - char date[MAX_PATH], temp[MAX_PATH], prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; + char date[MAX_PATH], date2[MAX_PATH], temp[MAX_PATH], buf[MAX_PATH]; + const char prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; REGSAM access = KEY_ALL_ACCESS; - DWORD error; + DWORD error, type, size; if (!pMsiQueryFeatureStateExA) { @@ -4216,7 +4217,15 @@ static void test_publish(void) CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayVersion", "1.1.1"); - CHECK_REG_STR(prodkey, "InstallDate", date); + + get_date_str(date2); + size = ARRAY_SIZE(buf); + buf[0] = '\0'; + res = RegQueryValueExA(prodkey, "InstallDate", NULL, &type, (BYTE *)buf, &size); + ok(!res, "Failed to query value, error %ld\n", res); + ok(type == REG_SZ, "Got wrong type %lu\n", type); + ok(!strcmp(buf, date) || !strcmp(buf, date2), "got %s\n", debugstr_a(buf)); + CHECK_REG_STR(prodkey, "InstallSource", temp); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_STR(prodkey, "Publisher", "Wine");

1 0

Bernhard Kölbl : windows.media.speech: Add a missing trace to async_operation_create.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: fc6857c4321f4c002121b1e387b6aba1547d3d30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc6857c4321f4c002121b1e3… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Apr 25 12:18:14 2022 +0200 windows.media.speech: Add a missing trace to async_operation_create. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 64a095a0134..e7547225c1c 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -367,6 +367,8 @@ HRESULT async_operation_create( const GUID *iid, IInspectable *invoker, async_op { struct async_operation *impl; + TRACE("iid %s, invoker %p, callback %p, out %p.\n", debugstr_guid(iid), invoker, callback, out); + *out = NULL; if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; impl->IAsyncOperation_IInspectable_iface.lpVtbl = &async_operation_vtbl;

1 0

Bernhard Kölbl : windows.media.speech/tests: Make the IAsyncInfo_Close block test more consistent.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 01d531f16f0374fd6da1dac85e9356f6fd81bdf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d531f16f0374fd6da1dac8… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri May 13 22:24:04 2022 +0200 windows.media.speech/tests: Make the IAsyncInfo_Close block test more consistent. And do some minor naming changes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 9ef49b160cd..5ae3ac27d8d 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -815,15 +815,15 @@ static void test_VoiceInformation(void) RoUninitialize(); } -struct async_operation_block_param +struct put_completed_thread_param { IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult *handler; IAsyncOperation_SpeechRecognitionCompilationResult *operation; }; -static DWORD WINAPI async_operation_block_thread(void *arg) +static DWORD WINAPI put_completed_thread(void *arg) { - struct async_operation_block_param *param = arg; + struct put_completed_thread_param *param = arg; HRESULT hr; hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(param->operation, param->handler); @@ -849,15 +849,15 @@ static void test_SpeechRecognizer(void) IInspectable *inspectable = NULL; ILanguage *language = NULL; IAsyncInfo *info = NULL; + struct put_completed_thread_param put_completed_param; struct completed_event_handler completed_handler; struct recognition_result_handler result_handler; - struct async_operation_block_param block_param; struct compilation_handler compilation_handler; SpeechRecognitionResultStatus result_status; EventRegistrationToken token = { .value = 0 }; AsyncStatus async_status; HSTRING hstr, hstr_lang; - HANDLE blocked_thread; + HANDLE put_thread; HRESULT hr, error_code; UINT32 id; LONG ref; @@ -1125,19 +1125,18 @@ static void test_SpeechRecognizer(void) compilation_handler.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); compilation_handler.thread_id = GetCurrentThreadId(); - ok(compilation_handler.event_finished != NULL, "Finished event wasn't created.\n"); + ok(!!compilation_handler.event_block, "event_block wasn't created.\n"); + ok(!!compilation_handler.event_finished, "event_finished wasn't created.\n"); hr = ISpeechRecognizer_CompileConstraintsAsync(recognizer, &operation); ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr); - block_param.handler = &compilation_handler.IAsyncHandler_Compilation_iface; - block_param.operation = operation; - blocked_thread = CreateThread(NULL, 0, async_operation_block_thread, &block_param, 0, NULL); + put_completed_param.handler = &compilation_handler.IAsyncHandler_Compilation_iface; + put_completed_param.operation = operation; + put_thread = CreateThread(NULL, 0, put_completed_thread, &put_completed_param, 0, NULL); ok(!WaitForSingleObject(compilation_handler.event_finished, 5000), "Wait for event_finished failed.\n"); - ok(WaitForSingleObject(blocked_thread, 100) == WAIT_TIMEOUT, "Wait for block_thread didn't time out.\n"); - todo_wine ok(compilation_handler.ref == 3, "Got unexpected ref %lu.\n", compilation_handler.ref); todo_wine check_refcount(operation, 3); @@ -1148,9 +1147,9 @@ static void test_SpeechRecognizer(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); SetEvent(compilation_handler.event_block); - ok(!WaitForSingleObject(blocked_thread, 1000), "Wait for block_thread failed.\n"); + ok(!WaitForSingleObject(put_thread, 1000), "Wait for block_thread failed.\n"); - CloseHandle(blocked_thread); + CloseHandle(put_thread); CloseHandle(compilation_handler.event_block); CloseHandle(compilation_handler.event_finished);

1 0

Bernhard Kölbl : windows.media.speech/tests: Remove some unreliable ref checks.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 44cee36ca9b81fe897bbbbeebe5e6f10f0daf04f URL: https://source.winehq.org/git/wine.git/?a=commit;h=44cee36ca9b81fe897bbbbee… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri May 13 14:08:04 2022 +0200 windows.media.speech/tests: Remove some unreliable ref checks. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 5ae3ac27d8d..827596bbfb6 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1060,8 +1060,7 @@ static void test_SpeechRecognizer(void) ok(hr == E_ILLEGAL_METHOD_CALL, "IAsyncInfo_get_ErrorCode failed, hr %#lx.\n", hr); ok(error_code == E_ILLEGAL_METHOD_CALL, "ErrorCode was %#lx.\n", error_code); - ref = IAsyncInfo_Release(info); - ok(ref == 1, "Got unexpected ref %lu.\n", ref); + IAsyncInfo_Release(info); hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, NULL); ok(hr == E_ILLEGAL_METHOD_CALL, "Got unexpected hr %#lx.\n", hr); @@ -1102,10 +1101,8 @@ static void test_SpeechRecognizer(void) ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); ok(async_status == Completed, "Status was %#x.\n", async_status); - ref = IAsyncInfo_Release(info); - ok(ref >= 1, "Got unexpected ref %lu.\n", ref); - ref = IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); - ok(ref >= 0, "Got unexpected ref %lu.\n", ref); + IAsyncInfo_Release(info); + IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); ref = ISpeechRecognizer_Release(recognizer); ok(ref == 1, "Got unexpected ref %lu.\n", ref); @@ -1153,12 +1150,10 @@ static void test_SpeechRecognizer(void) CloseHandle(compilation_handler.event_block); CloseHandle(compilation_handler.event_finished); - ref = IAsyncInfo_Release(info); - ok(ref == 1, "Got unexpected ref %lu.\n", ref); + IAsyncInfo_Release(info); skip_operation: - ref = IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); - ok(!ref, "Got unexpected ref %lu.\n", ref); + IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); ref = ISpeechRecognizer_Release(recognizer); ok(ref == 1, "Got unexpected ref %lu.\n", ref);

1 0

Bernhard Kölbl : windows.media.speech/tests: Add a test for IAsyncOperation_get_Completed.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 0636cf580868ce870b4024e78766bf83fabe9dda URL: https://source.winehq.org/git/wine.git/?a=commit;h=0636cf580868ce870b4024e7… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Apr 27 19:12:46 2022 +0200 windows.media.speech/tests: Add a test for IAsyncOperation_get_Completed. This one actually retrieves a handler. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 827596bbfb6..33da6828dc2 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -860,7 +860,7 @@ static void test_SpeechRecognizer(void) HANDLE put_thread; HRESULT hr, error_code; UINT32 id; - LONG ref; + LONG ref, old_ref; hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#lx.\n", hr); @@ -1137,6 +1137,16 @@ static void test_SpeechRecognizer(void) todo_wine ok(compilation_handler.ref == 3, "Got unexpected ref %lu.\n", compilation_handler.ref); todo_wine check_refcount(operation, 3); + handler = (void*)0xdeadbeef; + old_ref = compilation_handler.ref; + hr = IAsyncOperation_SpeechRecognitionCompilationResult_get_Completed(operation, &handler); + ok(hr == S_OK, "IAsyncOperation_SpeechRecognitionCompilationResult_get_Completed failed, hr %#lx.\n", hr); + todo_wine ok(handler == &compilation_handler.IAsyncHandler_Compilation_iface, "Handler was %p.\n", handler); + + ref = compilation_handler.ref - old_ref; + todo_wine ok(ref == 1, "The ref was increased by %lu.\n", ref); + if (handler) IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult_Release(handler); + hr = IAsyncOperation_SpeechRecognitionCompilationResult_QueryInterface(operation, &IID_IAsyncInfo, (void **)&info); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Bernhard Kölbl : windows.media.speech: Rename async_operation to async_inspectable.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 61a4cb972e5f4657caed10794dd291dc13d68ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61a4cb972e5f4657caed1079… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue May 3 13:15:08 2022 +0200 windows.media.speech: Rename async_operation to async_inspectable. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 125 +++++++++++++++++---------------- dlls/windows.media.speech/private.h | 5 +- dlls/windows.media.speech/recognizer.c | 2 +- 3 files changed, 68 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61a4cb972e5f4657caed…

1 0

Gijs Vermeulen : shell32/tests: Use 'shellpath' as tmpfile name in PathResolve tests.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 8ee96cff6c13c92b0a9cba0a805ddf47084ef766 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ee96cff6c13c92b0a9cba0a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 13 16:53:37 2022 +0200 shell32/tests: Use 'shellpath' as tmpfile name in PathResolve tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52995 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 91ecf6b9a80..29b47ac8706 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2954,14 +2954,14 @@ static void test_PathResolve(void) const WCHAR *expected_path; } tests[] = { /* no flags */ - { L"test", 0, FALSE, L"test" }, - { L"C:\\test", 0, TRUE, L"C:\\test" }, + { L"shellpath", 0, FALSE, L"shellpath" }, + { L"C:\\shellpath", 0, TRUE, L"C:\\shellpath" }, { L"regedit", 0, FALSE, L"regedit" }, { testfile, 0, TRUE, testfile }, /* PRF_VERIFYEXISTS */ - { L"test", PRF_VERIFYEXISTS, TRUE, testfile_lnk }, - { L"C:\\test", PRF_VERIFYEXISTS, FALSE, L"C:\\test" }, + { L"shellpath", PRF_VERIFYEXISTS, TRUE, testfile_lnk }, + { L"C:\\shellpath", PRF_VERIFYEXISTS, FALSE, L"C:\\shellpath" }, /* common extensions are tried even if PRF_TRYPROGRAMEXTENSIONS isn't passed */ /* directories in dirs parameter are always searched first even if PRF_FIRSTDIRDEF isn't passed */ { L"regedit", PRF_VERIFYEXISTS, TRUE, regedit_cmd }, @@ -2987,14 +2987,14 @@ static void test_PathResolve(void) /* PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE */ /* only PRF_VERIFYEXISTS matters*/ - { L"test", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, TRUE, testfile_lnk }, - { L"C:\\test", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, FALSE, L"C:\\test" }, + { L"shellpath", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, TRUE, testfile_lnk }, + { L"C:\\shellpath", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, FALSE, L"C:\\shellpath" }, { L"regedit", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, TRUE, regedit_cmd }, { testfile, PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, TRUE, testfile_lnk }, /* PRF_TRYPROGRAMEXTENSIONS */ - { L"test", PRF_TRYPROGRAMEXTENSIONS, TRUE, testfile_lnk}, - { L"C:\\test", PRF_TRYPROGRAMEXTENSIONS, FALSE, L"C:\\test" }, + { L"shellpath", PRF_TRYPROGRAMEXTENSIONS, TRUE, testfile_lnk}, + { L"C:\\shellpath", PRF_TRYPROGRAMEXTENSIONS, FALSE, L"C:\\shellpath" }, { L"regedit", PRF_TRYPROGRAMEXTENSIONS, TRUE, regedit_cmd }, /* .dll is not tried */ { L"bcrypt", PRF_TRYPROGRAMEXTENSIONS, FALSE, L"bcrypt" }, @@ -3016,7 +3016,7 @@ static void test_PathResolve(void) GetTempPathW(MAX_PATH, tempdir); lstrcpyW(testfile, tempdir); - lstrcatW(testfile, L"test"); + lstrcatW(testfile, L"shellpath"); lstrcpyW(testfile_lnk, testfile); lstrcatW(testfile_lnk, L".lnk");

1 0

Rémi Bernon : dinput/tests: Increase async bool handler wait timeout.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 5097e67f5543a702642c84e7060ef12584565a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5097e67f5543a702642c84e7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 13 09:49:51 2022 +0200 dinput/tests: Increase async bool handler wait timeout. We waited on the driver-side buffers to be sent, but sometimes the async completion needs a bit more time to complete itself. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index a1e41dedf44..806212d966d 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5537,7 +5537,7 @@ static void test_windows_gaming_input(void) IAsyncInfo_Release( async_info ); wait_hid_pending( file, 100 ); - ret = WaitForSingleObject( bool_async_handler.event, 100 ); + ret = WaitForSingleObject( bool_async_handler.event, 500 ); ok( ret == 0, "WaitForSingleObject returned %#lx\n", ret ); CloseHandle( bool_async_handler.event ); check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); @@ -5582,7 +5582,7 @@ static void test_windows_gaming_input(void) IAsyncInfo_Release( async_info ); wait_hid_pending( file, 100 ); - ret = WaitForSingleObject( bool_async_handler.event, 100 ); + ret = WaitForSingleObject( bool_async_handler.event, 500 ); ok( ret == 0, "WaitForSingleObject returned %#lx\n", ret ); CloseHandle( bool_async_handler.event ); check_bool_async( bool_async, 1, 4, S_OK, FALSE );

1 0

Rémi Bernon : windows.gaming.input: Implement and instantiate ConstantForceEffect runtimeclass stubs.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: aa37aad2c894972ba1f1e6cfb932ceb63ed52450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa37aad2c894972ba1f1e6cf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 12:15:58 2022 +0200 windows.gaming.input: Implement and instantiate ConstantForceEffect runtimeclass stubs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 3 +- dlls/windows.gaming.input/constant_effect.c | 117 +++++++++++++++++++++++++++- dlls/windows.gaming.input/private.h | 8 ++ 3 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 806212d966d..e688f575704 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5624,15 +5624,14 @@ static void test_windows_gaming_input(void) pWindowsDeleteString( str ); hr = IActivationFactory_ActivateInstance( activation_factory, &tmp_inspectable ); - todo_wine ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); IActivationFactory_Release( activation_factory ); - if (hr != S_OK) goto skip_tests; hr = IInspectable_QueryInterface( tmp_inspectable, &IID_IForceFeedbackEffect, (void **)&effect ); todo_wine ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); IInspectable_Release( tmp_inspectable ); + if (hr != S_OK) goto skip_tests; hr = IForceFeedbackEffect_QueryInterface( effect, &IID_IConstantForceEffect, (void **)&constant_effect ); ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); diff --git a/dlls/windows.gaming.input/constant_effect.c b/dlls/windows.gaming.input/constant_effect.c index a27258dd9bf..a491d49c18c 100644 --- a/dlls/windows.gaming.input/constant_effect.c +++ b/dlls/windows.gaming.input/constant_effect.c @@ -20,10 +20,110 @@ #include "private.h" #include "provider.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(input); +struct constant_effect +{ + IConstantForceEffect IConstantForceEffect_iface; + LONG ref; +}; + +static inline struct constant_effect *impl_from_IConstantForceEffect( IConstantForceEffect *iface ) +{ + return CONTAINING_RECORD( iface, struct constant_effect, IConstantForceEffect_iface ); +} + +static HRESULT WINAPI effect_QueryInterface( IConstantForceEffect *iface, REFIID iid, void **out ) +{ + struct constant_effect *impl = impl_from_IConstantForceEffect( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IConstantForceEffect )) + { + IInspectable_AddRef( (*out = &impl->IConstantForceEffect_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI effect_AddRef( IConstantForceEffect *iface ) +{ + struct constant_effect *impl = impl_from_IConstantForceEffect( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI effect_Release( IConstantForceEffect *iface ) +{ + struct constant_effect *impl = impl_from_IConstantForceEffect( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) free( impl ); + + return ref; +} + +static HRESULT WINAPI effect_GetIids( IConstantForceEffect *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_GetRuntimeClassName( IConstantForceEffect *iface, HSTRING *class_name ) +{ + return WindowsCreateString( RuntimeClass_Windows_Gaming_Input_ForceFeedback_ConstantForceEffect, + ARRAY_SIZE(RuntimeClass_Windows_Gaming_Input_ForceFeedback_ConstantForceEffect), + class_name ); +} + +static HRESULT WINAPI effect_GetTrustLevel( IConstantForceEffect *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetParameters( IConstantForceEffect *iface, Vector3 direction, TimeSpan duration ) +{ + FIXME( "iface %p, direction %s, duration %I64u stub!\n", iface, debugstr_vector3( &direction ), duration.Duration ); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_SetParametersWithEnvelope( IConstantForceEffect *iface, Vector3 direction, FLOAT attack_gain, + FLOAT sustain_gain, FLOAT release_gain, TimeSpan start_delay, + TimeSpan attack_duration, TimeSpan sustain_duration, + TimeSpan release_duration, UINT32 repeat_count ) +{ + FIXME( "iface %p, direction %s, attack_gain %f, sustain_gain %f, release_gain %f, start_delay %I64u, attack_duration %I64u, " + "sustain_duration %I64u, release_duration %I64u, repeat_count %u stub!\n", iface, debugstr_vector3( &direction ), + attack_gain, sustain_gain, release_gain, start_delay.Duration, attack_duration.Duration, sustain_duration.Duration, + release_duration.Duration, repeat_count ); + return E_NOTIMPL; +} + +static const struct IConstantForceEffectVtbl effect_vtbl = +{ + effect_QueryInterface, + effect_AddRef, + effect_Release, + /* IInspectable methods */ + effect_GetIids, + effect_GetRuntimeClassName, + effect_GetTrustLevel, + /* IConstantForceEffect methods */ + effect_SetParameters, + effect_SetParametersWithEnvelope, +}; + struct constant_factory { IActivationFactory IActivationFactory_iface; @@ -91,8 +191,17 @@ static HRESULT WINAPI activation_GetTrustLevel( IActivationFactory *iface, Trust static HRESULT WINAPI activation_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { - FIXME( "iface %p, instance %p stub!\n", iface, instance ); - return E_NOTIMPL; + struct constant_effect *impl; + + TRACE( "iface %p, instance %p.\n", iface, instance ); + + if (!(impl = calloc( 1, sizeof(struct constant_effect) ))) return E_OUTOFMEMORY; + impl->IConstantForceEffect_iface.lpVtbl = &effect_vtbl; + impl->ref = 1; + + *instance = (IInspectable *)&impl->IConstantForceEffect_iface; + TRACE( "created ConstantForceEffect %p\n", *instance ); + return S_OK; } static const struct IActivationFactoryVtbl activation_vtbl = diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 2e97f182e78..9bbaae5554b 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -31,6 +31,7 @@ #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections +#define WIDL_using_Windows_Foundation_Numerics #include "windows.foundation.h" #define WIDL_using_Windows_Devices_Power #define WIDL_using_Windows_Gaming_Input @@ -38,6 +39,7 @@ #define WIDL_using_Windows_Gaming_Input_ForceFeedback #include "windows.gaming.input.custom.h" +#include "wine/debug.h" #include "wine/list.h" extern HINSTANCE windows_gaming_input; @@ -111,3 +113,9 @@ extern HRESULT async_operation_boolean_create( IUnknown *invoker, IUnknown *para DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) #define DEFINE_IINSPECTABLE_OUTER( pfx, iface_type, impl_type, outer_iface ) \ DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, impl->outer_iface ) + +static inline const char *debugstr_vector3( const Vector3 *vector ) +{ + if (!vector) return "(null)"; + return wine_dbg_sprintf( "[%f, %f, %f]", vector->X, vector->Y, vector->Z ); +}

1 0