- Wine-Devel - list.winehq.org

[PATCH 09/12] user32: Simplify icon delay handling.
by Jacek Caban Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)

2 1

[PATCH 08/12] user32: Use create_cursoricon_object in CURSORICON_CreateIconFromANI.
by Jacek Caban Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 122 ++++++++------------------------------- 1 file changed, 24 insertions(+), 98 deletions(-)

3 2

[PATCH 07/12] user32: Use create_cursoricon_object in CreateIconIndirect.
by Jacek Caban Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 73 +++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 42 deletions(-)

3 2

[PATCH 06/12] user32: Introduce NtUserSetCursorIconData.
by Jacek Caban Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 196 ++++++++++++++++++++++++++++++--------- include/ntuser.h | 15 +++ 2 files changed, 168 insertions(+), 43 deletions(-)

2 1

[PATCH 05/12] user32: Factor out create_icon_frame.
by Jacek Caban Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 134 +++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 70 deletions(-)

2 1

[PATCH 04/12] user32: Simplify cursor hotspot handling.
by Jacek Caban Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)

2 1

[PATCH 03/12] user32: Use ntuser object type constants.
by Jacek Caban Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 10 +++++----- dlls/user32/menu.c | 8 ++++---- dlls/user32/resource.c | 10 +++++----- dlls/user32/user_private.h | 19 +++++-------------- dlls/user32/win.c | 14 +++++++------- dlls/user32/winpos.c | 6 +++--- include/ntuser.h | 8 ++++++++ 7 files changed, 37 insertions(+), 38 deletions(-)

2 1

[PATCH 02/12] user32: Store module as unicode string in cursoricon_object.
by Jacek Caban Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 51 +++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 16 deletions(-)

3 2

[PATCH 01/12] user32: Use a single struct for static and animated cursor icons.
by Jacek Caban Feb. 22, 2022

Feb. 22, 2022

Handle allocation should use a separate from data initialization, so its object layout needs to be independent on data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Most of the series is refactoring cursoricon.c to allow moving handle allocation in the last patch. dlls/user32/cursoricon.c | 117 +++++++++++++++------------------------ 1 file changed, 45 insertions(+), 72 deletions(-)

2 1

[PATCH v2 8/8] combase: Start surrogate local server when required.
by Dmitry Timoshkov Feb. 22, 2022

Feb. 22, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20296 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/combase/rpc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 0a86183030a..79f9b0d9c41 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -522,6 +522,50 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) return S_OK; } +static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) +{ + HKEY key; + HRESULT hr; + WCHAR command[MAX_PATH + CHARS_IN_GUID]; + DWORD size; + STARTUPINFOW sinfo; + PROCESS_INFORMATION pinfo; + LONG ret; + + TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); + + hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); + if (FAILED(hr)) + return hr; + + size = (MAX_PATH + 1) * sizeof(WCHAR); + ret = RegQueryValueExW(key, L"DllSurrogate", NULL, NULL, (LPBYTE)command, &size); + RegCloseKey(key); + if (ret || !size || !command[0]) + { + TRACE("No value for DllSurrogate key\n"); + wcscpy(command, L"dllhost.exe "); + } + + /* Surrogate EXE servers are started with the {GUID} switch. */ + StringFromGUID2(rclsid, command + wcslen(command), CHARS_IN_GUID); + + memset(&sinfo, 0, sizeof(sinfo)); + sinfo.cb = sizeof(sinfo); + + TRACE("Activating surrogate local server %s\n", debugstr_w(command)); + + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + { + WARN("failed to run surrogate local server %s\n", debugstr_w(command)); + return HRESULT_FROM_WIN32(GetLastError()); + } + *process = pinfo.hProcess; + CloseHandle(pinfo.hThread); + + return S_OK; +} + HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) { PMInterfacePointer objref = NULL; @@ -546,7 +590,8 @@ HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) if (tries == 1) { - if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) ) + if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) && + (hr = create_surrogate_server(rclsid, &process)) ) return hr; } -- 2.35.1

1 0