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

Zhiyi Zhang : shell32: Implement SHOpenFolderAndSelectItems().
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: c03409e9d782ccd96ce4f14913814acc0184ee43 URL: https://gitlab.winehq.org/wine/wine/-/commit/c03409e9d782ccd96ce4f14913814a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 8 17:13:49 2022 +0800 shell32: Implement SHOpenFolderAndSelectItems(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39987 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/shell32/shlfolder.c | 138 ++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlfolder.c | 11 ---- programs/explorer/explorer.c | 39 ++++++++++++ 3 files changed, 175 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 7308f49c7d5..ab99ed6b4c9 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -618,8 +618,142 @@ HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, LPDATAOBJECT lpDataObje HRESULT WINAPI SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD flags) { - FIXME("%p %u %p 0x%lx: stub\n", pidlFolder, cidl, apidl, flags); - return E_NOTIMPL; + static const unsigned int magic = 0xe32ee32e; + unsigned int i, uint_flags, size, child_count = 0; + const ITEMIDLIST *pidl_parent, *pidl_child; + VARIANT var_parent, var_empty; + ITEMIDLIST *pidl_tmp = NULL; + SHELLEXECUTEINFOW sei = {0}; + COPYDATASTRUCT cds = {0}; + IDispatch *dispatch; + int timeout = 1000; + unsigned char *ptr; + IShellWindows *sw; + BOOL ret = FALSE; + HRESULT hr; + LONG hwnd; + + TRACE("%p %u %p 0x%lx\n", pidlFolder, cidl, apidl, flags); + + if (!pidlFolder) + return E_INVALIDARG; + + if (flags & OFASI_OPENDESKTOP) + FIXME("Ignoring unsupported OFASI_OPENDESKTOP flag.\n"); + + if (flags & OFASI_EDIT && cidl > 1) + flags &= ~OFASI_EDIT; + + hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, + (void **)&sw); + if (FAILED(hr)) + return hr; + + if (!cidl) + { + pidl_tmp = ILClone(pidlFolder); + ILRemoveLastID(pidl_tmp); + pidl_parent = pidl_tmp; + + pidl_child = ILFindLastID(pidlFolder); + apidl = &pidl_child; + cidl = 1; + } + else + { + pidl_parent = pidlFolder; + } + + /* Find the existing explorer window for the parent path. Create a new one if not present. */ + VariantInit(&var_empty); + VariantInit(&var_parent); + size = ILGetSize(pidl_parent); + V_VT(&var_parent) = VT_ARRAY | VT_UI1; + V_ARRAY(&var_parent) = SafeArrayCreateVector(VT_UI1, 0, size); + memcpy(V_ARRAY(&var_parent)->pvData, pidl_parent, size); + hr = IShellWindows_FindWindowSW(sw, &var_parent, &var_empty, SWC_EXPLORER, &hwnd, 0, &dispatch); + if (hr != S_OK) + { + sei.cbSize = sizeof(sei); + sei.fMask = SEE_MASK_FLAG_NO_UI | SEE_MASK_IDLIST | SEE_MASK_NOASYNC | SEE_MASK_WAITFORINPUTIDLE; + sei.lpVerb = L"explore"; + sei.lpIDList = (void *)pidl_parent; + sei.nShow = SW_NORMAL; + if (!ShellExecuteExW(&sei)) + { + WARN("Failed to create a explorer window.\n"); + goto done; + } + + while (timeout > 0) + { + hr = IShellWindows_FindWindowSW(sw, &var_parent, &var_empty, SWC_EXPLORER, &hwnd, 0, + &dispatch); + if (hr == S_OK) + break; + + timeout -= 100; + Sleep(100); + } + + if (hr != S_OK) + { + WARN("Failed to find the explorer window.\n"); + goto done; + } + } + + /* Send WM_COPYDATA to tell explorer.exe to open windows */ + size = sizeof(cidl) + sizeof(uint_flags); + for (i = 0; i < cidl; ++i) + size += ILGetSize(apidl[i]); + + cds.dwData = magic; + cds.cbData = size; + cds.lpData = malloc(size); + if (!cds.lpData) + { + hr = E_OUTOFMEMORY; + goto done; + } + + /* Add the count of child ITEMIDLIST, set its value at the end */ + ptr = (unsigned char *)cds.lpData + sizeof(cidl); + + /* Add flags. Have to use unsigned int because DWORD may have a different size */ + uint_flags = flags; + memcpy(ptr, &uint_flags, sizeof(uint_flags)); + ptr += sizeof(uint_flags); + + /* Add child ITEMIDLIST */ + for (i = 0; i < cidl; ++i) + { + if (apidl != &pidl_child) + pidl_child = ILFindChild(pidl_parent, apidl[i]); + + if (pidl_child) + { + size = ILGetSize(pidl_child); + memcpy(ptr, pidl_child, size); + ptr += size; + ++child_count; + } + } + + /* Set the count of child ITEMIDLIST */ + memcpy(cds.lpData, &child_count, sizeof(child_count)); + + SetForegroundWindow(GetAncestor((HWND)(LONG_PTR)hwnd, GA_ROOT)); + ret = SendMessageW((HWND)(LONG_PTR)hwnd, WM_COPYDATA, 0, (LPARAM)&cds); + hr = ret ? S_OK : E_FAIL; + +done: + free(cds.lpData); + VariantClear(&var_parent); + if (pidl_tmp) + ILFree(pidl_tmp); + IShellWindows_Release(sw); + return hr; } /*********************************************************************** diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 10a989e9ca4..267c81a0ec5 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5448,15 +5448,12 @@ static void test_SHOpenFolderAndSelectItems(void) /* NULL folder */ hr = SHOpenFolderAndSelectItems(NULL, 0, NULL, 0); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); /* Open and select folder without child items */ folder = ILCreateFromPathW(L"C:\\Windows\\System32"); hr = SHOpenFolderAndSelectItems(folder, 0, NULL, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(check_window_exists("Windows"), "Failed to create window.\n"); ILFree(folder); @@ -5464,9 +5461,7 @@ static void test_SHOpenFolderAndSelectItems(void) folder = ILCreateFromPathW(L"C:\\Windows"); items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); hr = SHOpenFolderAndSelectItems(folder, 1, (PCUITEMID_CHILD_ARRAY)items, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(check_window_exists("Windows"), "Failed to create window.\n"); ILFree(items[0]); ILFree(folder); @@ -5476,9 +5471,7 @@ static void test_SHOpenFolderAndSelectItems(void) items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); items[1] = ILCreateFromPathW(L"C:\\Windows\\Resources"); hr = SHOpenFolderAndSelectItems(folder, 2, (PCUITEMID_CHILD_ARRAY)items, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(check_window_exists("Windows"), "Failed to create window.\n"); ILFree(items[1]); ILFree(items[0]); @@ -5488,9 +5481,7 @@ static void test_SHOpenFolderAndSelectItems(void) folder = ILCreateFromPathW(L"C:\\Windows"); items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); hr = SHOpenFolderAndSelectItems(folder, 1, (PCUITEMID_CHILD_ARRAY)items, OFASI_EDIT); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(check_window_exists("Windows"), "Failed to create window.\n"); ILFree(items[0]); ILFree(folder); @@ -5500,9 +5491,7 @@ static void test_SHOpenFolderAndSelectItems(void) items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); items[1] = ILCreateFromPathW(L"C:\\Windows\\Resources"); hr = SHOpenFolderAndSelectItems(folder, 2, (PCUITEMID_CHILD_ARRAY)items, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(check_window_exists("Windows"), "Failed to create window.\n"); ILFree(items[1]); ILFree(items[0]); diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 26928912649..7924991383f 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -667,6 +667,43 @@ static LRESULT explorer_on_notify(explorer_info* info,NMHDR* notification) return 0; } +static BOOL handle_copydata(const explorer_info *info, const COPYDATASTRUCT *cds) +{ + static const unsigned int magic = 0xe32ee32e; + unsigned int i, flags, count; + const ITEMIDLIST *child; + unsigned char *ptr; + IShellView *sv; + SVSIF sv_flags; + + TRACE("\n"); + + /* For SHOpenFolderAndSelectItems() */ + if (cds->dwData != magic) + return FALSE; + + ptr = cds->lpData; + memcpy(&count, ptr, sizeof(count)); + ptr += sizeof(count); + memcpy(&flags, ptr, sizeof(flags)); + ptr += sizeof(flags); + + sv_flags = flags & OFASI_EDIT ? SVSI_EDIT : SVSI_SELECT; + + IExplorerBrowser_GetCurrentView(info->browser, &IID_IShellView, (void **)&sv); + for (i = 0; i < count; ++i) + { + child = (const ITEMIDLIST *)ptr; + if (i == 0) + IShellView_SelectItem(sv, child, sv_flags | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_DESELECTOTHERS); + else + IShellView_SelectItem(sv, child, sv_flags); + ptr += ILGetSize(child); + } + IShellView_Release(sv); + return TRUE; +} + static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { explorer_info *info @@ -718,6 +755,8 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L case WM_SIZE: update_window_size(info,HIWORD(lParam),LOWORD(lParam)); break; + case WM_COPYDATA: + return handle_copydata(info, (const COPYDATASTRUCT *)lParam); default: return DefWindowProcW(hwnd,uMsg,wParam,lParam); }

1 0

Zhiyi Zhang : shell32/tests: Add SHOpenFolderAndSelectItems() tests.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 7c60e6233aa7ff1bef8e2db69e685f40547a1bbf URL: https://gitlab.winehq.org/wine/wine/-/commit/7c60e6233aa7ff1bef8e2db69e685f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 11 12:19:52 2022 +0800 shell32/tests: Add SHOpenFolderAndSelectItems() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/shell32/tests/shlfolder.c | 100 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index da606a9e707..10a989e9ca4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -81,6 +81,37 @@ static WCHAR *make_wstr(const char *str) return ret; } +static BOOL check_window_exists(const char *name) +{ + HWND window = NULL; + int i; + + for (i = 0; i < 10; i++) + { + if ((window = FindWindowA("ExplorerWClass", name)) + || (window = FindWindowA("CabinetWClass", name))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + + Sleep(100); + } + + if (!window) + return FALSE; + + for (i = 0; i < 10; i++) + { + if (!IsWindow(window)) + break; + + Sleep(100); + } + + return TRUE; +} + static void init_function_pointers(void) { HMODULE hmod; @@ -5410,6 +5441,74 @@ static void test_SHGetSetFolderCustomSettings(void) RemoveDirectoryW(pathW); } +static void test_SHOpenFolderAndSelectItems(void) +{ + PIDLIST_ABSOLUTE folder, items[2]; + HRESULT hr; + + /* NULL folder */ + hr = SHOpenFolderAndSelectItems(NULL, 0, NULL, 0); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + /* Open and select folder without child items */ + folder = ILCreateFromPathW(L"C:\\Windows\\System32"); + hr = SHOpenFolderAndSelectItems(folder, 0, NULL, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(folder); + + /* Open folder and select one child item */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + hr = SHOpenFolderAndSelectItems(folder, 1, (PCUITEMID_CHILD_ARRAY)items, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[0]); + ILFree(folder); + + /* Open folder and select two child items */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + items[1] = ILCreateFromPathW(L"C:\\Windows\\Resources"); + hr = SHOpenFolderAndSelectItems(folder, 2, (PCUITEMID_CHILD_ARRAY)items, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[1]); + ILFree(items[0]); + ILFree(folder); + + /* Open folder and select one child item with OFASI_EDIT */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + hr = SHOpenFolderAndSelectItems(folder, 1, (PCUITEMID_CHILD_ARRAY)items, OFASI_EDIT); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[0]); + ILFree(folder); + + /* Open folder and select two child items and OFASI_EDIT */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + items[1] = ILCreateFromPathW(L"C:\\Windows\\Resources"); + hr = SHOpenFolderAndSelectItems(folder, 2, (PCUITEMID_CHILD_ARRAY)items, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[1]); + ILFree(items[0]); + ILFree(folder); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5455,6 +5554,7 @@ START_TEST(shlfolder) test_GetDefaultSearchGUID(); test_SHLimitInputEdit(); test_SHGetSetFolderCustomSettings(); + test_SHOpenFolderAndSelectItems(); OleUninitialize(); }

1 0

Jacek Caban : win32u: Move default window proc to IME window forwarding implementation from user32.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 70ad65d8d19fa354e3bdfdab362cb7a154f75f75 URL: https://gitlab.winehq.org/wine/wine/-/commit/70ad65d8d19fa354e3bdfdab362cb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 13:00:51 2022 +0200 win32u: Move default window proc to IME window forwarding implementation from user32. --- dlls/user32/defwnd.c | 35 ----------------------------------- dlls/win32u/defwnd.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 70d62c4f718..9e258e5d3c0 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -147,23 +147,6 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } } /* fall through */ - case WM_IME_STARTCOMPOSITION: - case WM_IME_ENDCOMPOSITION: - case WM_IME_SELECT: - case WM_IME_NOTIFY: - case WM_IME_CONTROL: - { - HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); - if (hwndIME) - result = SendMessageA( hwndIME, msg, wParam, lParam ); - } - break; - case WM_IME_SETCONTEXT: - { - HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); - if (hwndIME) result = ImmIsUIMessageA( hwndIME, msg, wParam, lParam ); - } - break; default: result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE ); @@ -220,13 +203,6 @@ LRESULT WINAPI DefWindowProcW( result = PostMessageW( hwnd, WM_KEYUP, wParam, lParam ); break; - case WM_IME_SETCONTEXT: - { - HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); - if (hwndIME) result = ImmIsUIMessageW( hwndIME, msg, wParam, lParam ); - } - break; - case WM_IME_COMPOSITION: if (lParam & GCS_RESULTSTR) { @@ -249,17 +225,6 @@ LRESULT WINAPI DefWindowProcW( } } /* fall through */ - case WM_IME_STARTCOMPOSITION: - case WM_IME_ENDCOMPOSITION: - case WM_IME_SELECT: - case WM_IME_NOTIFY: - case WM_IME_CONTROL: - { - HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); - if (hwndIME) - result = SendMessageW( hwndIME, msg, wParam, lParam ); - } - break; default: result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 3e42e3b1e22..d271b5b9670 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2901,6 +2901,21 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, free( win_array ); break; } + + case WM_IME_SETCONTEXT: + case WM_IME_COMPOSITION: + case WM_IME_STARTCOMPOSITION: + case WM_IME_ENDCOMPOSITION: + case WM_IME_SELECT: + case WM_IME_NOTIFY: + case WM_IME_CONTROL: + { + HWND ime_hwnd = get_default_ime_window( hwnd ); + if (ime_hwnd) + result = NtUserMessageCall( ime_hwnd, msg, wparam, lparam, + 0, NtUserSendMessage, ansi ); + } + break; } return result;

1 0

Jacek Caban : imm32: Select default IME when creating its data.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 51f414bdc2dcb07b97570ebffec96369e9e2086f URL: https://gitlab.winehq.org/wine/wine/-/commit/51f414bdc2dcb07b97570ebffec963… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 12:50:30 2022 +0200 imm32: Select default IME when creating its data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53348 --- dlls/imm32/imm.c | 55 +++++++++++++++++++++++++------------------------------ 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 89541612ea2..bfbf3b2ad78 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -806,7 +806,7 @@ BOOL WINAPI ImmConfigureIMEW( return FALSE; } -static InputContextData *alloc_input_context_data(void) +static InputContextData *create_input_context(HIMC default_imc) { InputContextData *new_context; LPGUIDELINE gl; @@ -816,6 +816,7 @@ static InputContextData *alloc_input_context_data(void) new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); /* Load the IME */ + new_context->threadDefault = !!default_imc; new_context->immKbd = IMM_GetImmHkl(GetKeyboardLayout(0)); if (!new_context->immKbd->hIME) @@ -848,6 +849,27 @@ static InputContextData *alloc_input_context_data(void) new_context->IMC.fdwConversion = new_context->immKbd->imeInfo.fdwConversionCaps; new_context->IMC.fdwSentence = new_context->immKbd->imeInfo.fdwSentenceCaps; + if (!default_imc) + new_context->handle = NtUserCreateInputContext((UINT_PTR)new_context); + else if (NtUserUpdateInputContext(default_imc, NtUserInputContextClientPtr, (UINT_PTR)new_context)) + new_context->handle = default_imc; + if (!new_context->handle) + { + free_input_context_data(new_context); + return 0; + } + + if (!new_context->immKbd->pImeSelect(new_context->handle, TRUE)) + { + TRACE("Selection of IME failed\n"); + IMM_DestroyContext(new_context); + return 0; + } + new_context->threadID = GetCurrentThreadId(); + SendMessageW(GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)new_context->immKbd); + + new_context->immKbd->uSelected++; + TRACE("Created context %p\n", new_context); return new_context; } @@ -856,16 +878,7 @@ static InputContextData* get_imc_data(HIMC handle) InputContextData *ret; if ((ret = query_imc_data(handle)) || !handle) return ret; - if (!(ret = alloc_input_context_data())) return NULL; - ret->threadID = NtUserQueryInputContext(handle, NtUserInputContextThreadId); - ret->handle = handle; - ret->threadDefault = TRUE; - if (!NtUserUpdateInputContext(handle, NtUserInputContextClientPtr, (UINT_PTR)ret)) - { - free_input_context_data(ret); - return NULL; - } - return ret; + return create_input_context(handle); } /*********************************************************************** @@ -875,25 +888,7 @@ HIMC WINAPI ImmCreateContext(void) { InputContextData *new_context; - if (!(new_context = alloc_input_context_data())) return 0; - if (!(new_context->handle = NtUserCreateInputContext((UINT_PTR)new_context))) - { - free_input_context_data(new_context); - return 0; - } - - if (!new_context->immKbd->pImeSelect(new_context->handle, TRUE)) - { - TRACE("Selection of IME failed\n"); - IMM_DestroyContext(new_context); - return 0; - } - new_context->threadID = GetCurrentThreadId(); - SendMessageW(GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)new_context->immKbd); - - new_context->immKbd->uSelected++; - TRACE("Created context %p\n",new_context); - + if (!(new_context = create_input_context(0))) return 0; return new_context->handle; }

1 0

Zhiyi Zhang : include: Add SHOpenFolderAndSelectItems() declaration and flags.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: f6206bccde6be70e10a6d77fb0b7605056ff18e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6206bccde6be70e10a6d77fb0b760… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 11 12:19:07 2022 +0800 include: Add SHOpenFolderAndSelectItems() declaration and flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/shlobj.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/shlobj.h b/include/shlobj.h index d30944662f7..8d6eab85eb6 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -96,6 +96,7 @@ BOOL WINAPI SHGetPathFromIDListEx(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_ INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST); HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*); HRESULT WINAPI SHLoadOLE(LPARAM); +HRESULT WINAPI SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE,UINT,PCUITEMID_CHILD_ARRAY,DWORD); HRESULT WINAPI SHParseDisplayName(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); HRESULT WINAPI SHPathPrepareForWriteA(HWND,IUnknown*,LPCSTR,DWORD); HRESULT WINAPI SHPathPrepareForWriteW(HWND,IUnknown*,LPCWSTR,DWORD); @@ -142,6 +143,10 @@ BOOL WINAPI ImportPrivacySettings(LPCWSTR, BOOL*, BOOL*); #define SHOP_FILEPATH 0x02 #define SHOP_VOLUMEGUID 0x04 +/* SHOpenFolderAndSelectItems flags */ +#define OFASI_EDIT 0x0001 +#define OFASI_OPENDESKTOP 0x0002 + BOOL WINAPI SHObjectProperties(HWND,DWORD,LPCWSTR,LPCWSTR); #define PCS_FATAL 0x80000000

1 0

Zhiyi Zhang : shell32: Correctly check SVSI_EDIT.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 1ee38eafd88db8d396195dee81bf3cf9d54ef013 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ee38eafd88db8d396195dee81bf3c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 8 16:59:17 2022 +0800 shell32: Correctly check SVSI_EDIT. The value of SVSI_EDIT is 0x3. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/shell32/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2e557d79622..e2b4ae4c9ca 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2873,7 +2873,7 @@ static HRESULT WINAPI FolderView_SelectItem(IFolderView2 *iface, int item, DWORD SendMessageW(This->hWndList, LVM_SETITEMSTATE, item, (LPARAM)&lvItem); - if (flags & SVSI_EDIT) + if ((flags & SVSI_EDIT) == SVSI_EDIT) SendMessageW(This->hWndList, LVM_EDITLABELW, item, 0); return S_OK;

1 0

Ziqing Hui : d2d1/tests: Add tests for ID2D1OffsetTransform.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 60118154d07136c07d475e185101081d5b920495 URL: https://gitlab.winehq.org/wine/wine/-/commit/60118154d07136c07d475e18510108… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 6 15:44:01 2022 +0800 d2d1/tests: Add tests for ID2D1OffsetTransform. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5be8cdb707d..ea056ac017b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12137,6 +12137,73 @@ done: release_test_context(&ctx); } +static void test_offset_transform(BOOL d3d11) +{ + ID2D1OffsetTransform *transform = NULL; + ID2D1EffectContext *effect_context; + D2D1_PROPERTY_BINDING binding; + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + D2D1_POINT_2L offset; + ID2D1Effect *effect; + UINT input_count; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + if (!factory) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + binding.propertyName = L"Context"; + binding.setFunction = NULL; + binding.getFunction = effect_impl_get_context; + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_b, &binding, 1, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Create transform */ + offset.x = 1; + offset.y = 2; + hr = ID2D1EffectContext_CreateOffsetTransform(effect_context, offset, &transform); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + offset = ID2D1OffsetTransform_GetOffset(transform); + ok(offset.x == 1 && offset.y == 2, "Got unexpected offset {%ld, %ld}.\n", offset.x, offset.y); + + /* Input count */ + input_count = ID2D1OffsetTransform_GetInputCount(transform); + ok(input_count == 1, "Got unexpected input count %u.\n", input_count); + + /* Set offset */ + offset.x = -10; + offset.y = 20; + ID2D1OffsetTransform_SetOffset(transform, offset); + offset = ID2D1OffsetTransform_GetOffset(transform); + ok(offset.x == -10 && offset.y == 20, "Got unexpected offset {%ld, %ld}.\n", offset.x, offset.y); + +done: + if (transform) + ID2D1OffsetTransform_Release(transform); + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + release_test_context(&ctx); +} + static void test_stroke_contains_point(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; @@ -12953,6 +13020,7 @@ START_TEST(d2d1) queue_test(test_effect_grayscale); queue_test(test_registered_effects); queue_test(test_transform_graph); + queue_test(test_offset_transform); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map);

1 0

Zhiyi Zhang : winefile: Use 10 DLUs for check box height.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 975b11be9cbcef3e65009bc10df9febf791fa6db URL: https://gitlab.winehq.org/wine/wine/-/commit/975b11be9cbcef3e65009bc10df9fe… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 15 15:59:02 2022 +0800 winefile: Use 10 DLUs for check box height. 10 DLUs is the recommended height for check boxes on Windows. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winefile/winefile.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc index 8d0f9940787..30760e5ab81 100644 --- a/programs/winefile/winefile.rc +++ b/programs/winefile/winefile.rc @@ -145,7 +145,7 @@ BEGIN CONTROL "&Other files",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,70,70,10 CONTROL "Show Hidden/&System Files",IDC_VIEW_TYPE_HIDDEN, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,140,9 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,140,10 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 END @@ -168,11 +168,11 @@ BEGIN LTEXT "Size:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,170,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Attributes",-1,7,79,158,46 - CONTROL "&Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 - CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 - CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 - CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 - CONTROL "&Compressed",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + CONTROL "&Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,10 + CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,10 + CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,10 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,10 + CONTROL "&Compressed",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,10 GROUPBOX "Version information",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL

1 0

Zhiyi Zhang : winecfg: Use 10 DLUs for check box height.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 24836f73b403ddad61424efef97862a2097d853f URL: https://gitlab.winehq.org/wine/wine/-/commit/24836f73b403ddad61424efef97862… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 15 15:50:36 2022 +0800 winecfg: Use 10 DLUs for check box height. 10 DLUs is the recommended height for check boxes on Windows. 8 DLUs is not enough and may cause shrinking in HiDPI settings. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winecfg/winecfg.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 1faa0a60b55..8775b3b691b 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -165,11 +165,11 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Window settings",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 - CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Allow the &window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,10 + CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,10 + CONTROL "Allow the &window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,10 CONTROL "&Emulate a virtual desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 + BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,10 LTEXT "Desktop &size:",IDC_DESKTOP_SIZE,15,70,64,16,WS_DISABLED LTEXT "#msgctxt#do not translate#X",IDC_DESKTOP_BY,129,70,8,8,WS_DISABLED EDITTEXT IDC_DESKTOP_WIDTH,84,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED @@ -252,7 +252,7 @@ BEGIN LTEXT "S&erial:",IDC_STATIC_SERIAL,15,183,42,12 EDITTEXT IDC_EDIT_SERIAL,59,180,78,13,ES_AUTOHSCROLL | WS_TABSTOP - CONTROL "&Show dot files",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,205,230,8 + CONTROL "&Show dot files",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,205,230,10 END IDD_AUDIOCFG DIALOG 0, 0, 260, 220 @@ -299,7 +299,7 @@ BEGIN CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | WS_DISABLED, 185,75,15,13 GROUPBOX "MIME types",IDC_STATIC,8,95,244,23 - CONTROL "Manage file &associations",IDC_ENABLE_FILE_ASSOCIATIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,105,230,8 + CONTROL "Manage file &associations",IDC_ENABLE_FILE_ASSOCIATIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,105,230,10 PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,190,75,55,13,WS_DISABLED GROUPBOX "Folders",IDC_STATIC,8,120,244,94

1 0

Ziqing Hui : d2d1/tests: Add tests for ID2D1TransformGraph.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: ccf8c01804c7b9a485b2ce2e33c1995d9a2c6fb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/ccf8c01804c7b9a485b2ce2e33c199… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 6 14:51:18 2022 +0800 d2d1/tests: Add tests for ID2D1TransformGraph. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3a38d593625..5be8cdb707d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -132,6 +132,9 @@ L"<?xml version='1.0'?> \ <Property name='Integer' type='uint32'> \ <Property name='DisplayName' type='string' value='Integer'/> \ </Property> \ + <Property name='Graph' type='iunknown'> \ + <Property name='DisplayName' type='string' value='Graph'/> \ + </Property> \ </Effect> \ "; @@ -350,6 +353,7 @@ struct effect_impl LONG refcount; UINT integer; ID2D1EffectContext *effect_context; + ID2D1TransformGraph *transform_graph; }; static void queue_d3d1x_test(void (*test)(BOOL d3d11), BOOL d3d11) @@ -10690,6 +10694,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_Initialize(ID2D1EffectImpl *iface, { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); ID2D1EffectContext_AddRef(effect_impl->effect_context = context); + ID2D1TransformGraph_AddRef(effect_impl->transform_graph = graph); return S_OK; } @@ -10724,6 +10729,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_create(IUnknown **effect_impl) object->refcount = 1; object->integer = 10; object->effect_context = NULL; + object->transform_graph = NULL; *effect_impl = (IUnknown *)&object->ID2D1EffectImpl_iface; return S_OK; @@ -10771,6 +10777,21 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, return S_OK; } +static HRESULT STDMETHODCALLTYPE effect_impl_get_graph(const IUnknown *iface, + BYTE *data, UINT32 data_size, UINT32 *actual_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data) + return E_INVALIDARG; + + *((ID2D1TransformGraph **)data) = effect_impl->transform_graph; + if (actual_size) + *actual_size = sizeof(effect_impl->transform_graph); + + return S_OK; +} + static void test_effect_register(BOOL d3d11) { ID2D1DeviceContext *device_context; @@ -11400,7 +11421,7 @@ static void test_effect_properties(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); count = ID2D1Effect_GetPropertyCount(effect); - ok(count == 2, "Got unexpected property count %u.\n", count); + ok(count == 3, "Got unexpected property count %u.\n", count); index = ID2D1Effect_GetPropertyIndex(effect, L"Context"); ok(index == 0, "Got unexpected index %u.\n", index); @@ -11997,6 +12018,125 @@ static void test_registered_effects(BOOL d3d11) release_test_context(&ctx); } +static void test_transform_graph(BOOL d3d11) +{ + ID2D1OffsetTransform *offset_transform = NULL; + ID2D1BlendTransform *blend_transform = NULL; + D2D1_BLEND_DESCRIPTION blend_desc = {0}; + ID2D1EffectContext *effect_context; + struct d2d1_test_context ctx; + ID2D1TransformGraph *graph; + ID2D1Factory1 *factory; + POINT point = {0 ,0}; + ID2D1Effect *effect; + UINT i, count; + HRESULT hr; + + const D2D1_PROPERTY_BINDING binding[] = + { + {L"Context", NULL, effect_impl_get_context}, + {L"Graph", NULL, effect_impl_get_graph}, + }; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + if (!factory) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_c, binding, ARRAY_SIZE(binding), effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Effect_GetValueByName(effect, L"Graph", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&graph, sizeof(graph)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Create transforms */ + hr = ID2D1EffectContext_CreateOffsetTransform(effect_context, point, &offset_transform); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_CreateBlendTransform(effect_context, 2, &blend_desc, &blend_transform); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (!offset_transform || !blend_transform) + goto done; + + /* Add nodes */ + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)blend_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Remove nodes */ + hr = ID2D1TransformGraph_RemoveNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_RemoveNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_RemoveNode(graph, (ID2D1TransformNode *)blend_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Connect nodes which are both un-added */ + ID2D1TransformGraph_Clear(graph); + hr = ID2D1TransformGraph_ConnectNode(graph, + (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); + + /* Connect added node to un-added node */ + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_ConnectNode(graph, + (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); + + /* Connect un-added node to added node */ + ID2D1TransformGraph_Clear(graph); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)blend_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_ConnectNode(graph, + (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); + + /* Connect nodes */ + ID2D1TransformGraph_Clear(graph); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)blend_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + count = ID2D1BlendTransform_GetInputCount(blend_transform); + for (i = 0; i < count; ++i) + { + hr = ID2D1TransformGraph_ConnectNode(graph, + (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, i); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + } + + /* Connect node to out-of-bounds index */ + hr = ID2D1TransformGraph_ConnectNode(graph, + (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, count); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + +done: + if (blend_transform) + ID2D1BlendTransform_Release(blend_transform); + if (offset_transform) + ID2D1OffsetTransform_Release(offset_transform); + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + release_test_context(&ctx); +} + static void test_stroke_contains_point(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; @@ -12812,6 +12952,7 @@ START_TEST(d2d1) queue_test(test_effect_crop); queue_test(test_effect_grayscale); queue_test(test_registered_effects); + queue_test(test_transform_graph); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map);

1 0