wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Gabriel Ivăncescu : mshtml: Parse X-UA-Compatible correctly.
by Alexandre Julliard 15 Jul '22

15 Jul '22

Module: wine Branch: master Commit: efdfd328067225134bf7263928fa0a4fd58e1a40 URL: https://gitlab.winehq.org/wine/wine/-/commit/efdfd328067225134bf7263928fa0a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 14 21:18:07 2022 +0300 mshtml: Parse X-UA-Compatible correctly. There can be multiple compat modes defined, separated by commas, but also surrounded by whitespace. The highest mode in the list is picked as the document mode, with 'edge' being the highest mode available. It stops as soon as an invalid mode is found in the list and returns whatever highest mode was found until then. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/main.c | 2 +- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/mutation.c | 37 +++++++++++++++++++++++++------------ dlls/mshtml/tests/dom.c | 37 ++++++++++++++++++++++++++++--------- 4 files changed, 56 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index bbaed1f1967..1a64bdb9b7d 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -154,7 +154,7 @@ static BOOL read_compat_mode(HKEY key, compat_mode_t *r) if(status != ERROR_SUCCESS || type != REG_SZ) return FALSE; - return parse_compat_version(version, r); + return parse_compat_version(version, r) != NULL; } static BOOL WINAPI load_compat_settings(INIT_ONCE *once, void *param, void **context) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d8b4ddef249..2e30210db2e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -297,6 +297,7 @@ PRIVATE_TID_LIST } tid_t; typedef enum { + COMPAT_MODE_INVALID = -1, COMPAT_MODE_QUIRKS, COMPAT_MODE_IE5, COMPAT_MODE_IE7, @@ -1253,7 +1254,7 @@ HRESULT set_task_timer(HTMLInnerWindow*,LONG,enum timer_type,IDispatch*,LONG*) D HRESULT clear_task_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; HRESULT clear_animation_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; -BOOL parse_compat_version(const WCHAR*,compat_mode_t*) DECLSPEC_HIDDEN; +const WCHAR *parse_compat_version(const WCHAR*,compat_mode_t*) DECLSPEC_HIDDEN; const char *debugstr_mshtml_guid(const GUID*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 79918278b3d..02b511e309e 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -412,15 +412,20 @@ static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode lock_document_mode(doc); } -BOOL parse_compat_version(const WCHAR *version_string, compat_mode_t *r) +static BOOL is_ua_compatible_delimiter(WCHAR c) +{ + return !c || c == ';' || c == ',' || iswspace(c); +} + +const WCHAR *parse_compat_version(const WCHAR *version_string, compat_mode_t *r) { DWORD version = 0; const WCHAR *p; for(p = version_string; '0' <= *p && *p <= '9'; p++) version = version * 10 + *p-'0'; - if((*p && *p != ';') || p == version_string) - return FALSE; + if(!is_ua_compatible_delimiter(*p) || p == version_string) + return NULL; switch(version){ case 5: @@ -442,13 +447,14 @@ BOOL parse_compat_version(const WCHAR *version_string, compat_mode_t *r) default: *r = version < 5 ? COMPAT_MODE_QUIRKS : COMPAT_MODE_IE11; } - return TRUE; + return p; } static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) { static const WCHAR ie_eqW[] = {'I','E','='}; static const WCHAR edgeW[] = {'e','d','g','e'}; + compat_mode_t mode = COMPAT_MODE_INVALID; TRACE("%s\n", debugstr_w(p)); @@ -456,15 +462,22 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) return FALSE; p += 3; - if(!wcsnicmp(p, edgeW, ARRAY_SIZE(edgeW))) { - p += ARRAY_SIZE(edgeW); - if(*p && *p != ';') - return FALSE; - *r = COMPAT_MODE_IE11; - return TRUE; - } + do { + while(iswspace(*p)) p++; + if(!wcsnicmp(p, edgeW, ARRAY_SIZE(edgeW))) { + p += ARRAY_SIZE(edgeW); + if(is_ua_compatible_delimiter(*p)) + mode = COMPAT_MODE_IE11; + break; + }else if(!(p = parse_compat_version(p, r))) + break; + if(mode < *r) + mode = *r; + while(iswspace(*p)) p++; + } while(*p++ == ','); - return parse_compat_version(p, r); + *r = mode; + return mode != COMPAT_MODE_INVALID; } void process_document_response_headers(HTMLDocumentNode *doc, IBinding *binding) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cd4daa84e0a..d25c7ac0df8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -11441,6 +11441,26 @@ static void test_document_mode(IHTMLDocument2 *doc2) static void test_quirks_mode(void) { + static const struct { + const char *str; + unsigned expected_mode; + } tests[] = { + { "9", 9 }, + { " \t9 ", 9 }, + { " 5 , 8 , 7", 8 }, + { " 8 , 7 , 5", 8 }, + { " 5 , 5 , 7", 7 }, + { " 5 , 9 , 7", 9 }, + { " 5, 7,9", 9 }, + { " 5, 7;9", 7 }, + { " 5, edge,8", 11 }, + { " 5, foo,8", 5 }, + { " 5, 8,foo", 8 }, + { " 5, ,,7", 5 }, + { " 5, , ,7", 5 }, + }; + unsigned i; + run_domtest("<html></html>", check_quirks_mode); run_domtest("<!DOCTYPE html>\n<html></html>", check_strict_mode); run_domtest("<!DOCTYPE html>\n<html></html>", check_quirks_mode); @@ -11455,15 +11475,14 @@ static void test_quirks_mode(void) if(!is_ie9plus) return; - expected_document_mode = 9; - run_domtest("<!DOCTYPE html>\n" - "<html>" - " <head>" - " <meta http-equiv=\"x-ua-compatible\" content=\"IE=9\" />" - " </head>" - " <body>" - " </body>" - "</html>", test_document_mode); + for(i = 0; i < ARRAY_SIZE(tests); i++) { + char buf[128]; + expected_document_mode = tests[i].expected_mode; + sprintf(buf, "<!DOCTYPE html>\n<html><head>" + " <meta http-equiv=\"x-ua-compatible\" content=\"IE=%s\" />" + "</head><body></body></html>", tests[i].str); + run_domtest(buf, test_document_mode); + } expected_document_mode = 8; run_domtest("<!DOCTYPE html>\n"

1 0

Gabriel Ivăncescu : mshtml: Only default to IE11 mode for Internet URL Zones when the app is IE.
by Alexandre Julliard 15 Jul '22

15 Jul '22

Module: wine Branch: master Commit: 3301a8e3128b1828493b450207fa6a2a2125807e URL: https://gitlab.winehq.org/wine/wine/-/commit/3301a8e3128b1828493b450207fa6a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 14 21:18:06 2022 +0300 mshtml: Only default to IE11 mode for Internet URL Zones when the app is IE. For documents exposing a <!DOCTYPE> node but no specific X-UA-Compatible, mshtml defaults to IE7 compat mode, unless the app is Internet Explorer and is in Internet URL Zone. This checking for the `iexplore.exe` app name seems hardcoded into mshtml; the FeatureControl registry keys do not affect this directly, and none are set by default for iexplore.exe that would affect this, anyway. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mutation.c | 23 ++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 3 +++ dlls/mshtml/tests/script.c | 23 +++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3355139ad31..79918278b3d 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "shlguid.h" #include "wininet.h" +#include "winternl.h" #include "mshtml_private.h" #include "htmlscript.h" @@ -52,6 +53,20 @@ static const IID NS_ICONTENTUTILS_CID = static nsIContentUtils *content_utils; +static BOOL is_iexplore(void) +{ + static volatile char cache = -1; + BOOL ret = cache; + if(ret == -1) { + const WCHAR *p, *name = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + if((p = wcsrchr(name, '/'))) name = p + 1; + if((p = wcsrchr(name, '\\'))) name = p + 1; + ret = !wcsicmp(name, L"iexplore.exe"); + cache = ret; + } + return ret; +} + static PRUnichar *handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *comment) { unsigned majorv = 0, minorv = 0, compat_version; @@ -823,7 +838,13 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, TRACE("doctype node\n"); - if(This->window && This->window->base.outer_window) { + /* Native mshtml hardcodes special behavior for iexplore.exe here. The feature control registry + keys under HKLM or HKCU\Software\Microsoft\Internet Explorer\Main\FeatureControl are not used + in this case (neither in Wow6432Node), although FEATURE_BROWSER_EMULATION does override this, + but it is not set by default on native, and the behavior is still different. This was tested + by removing all iexplore.exe values from any FeatureControl subkeys, and renaming the test + executable to iexplore.exe, which changed its default compat mode in such cases. */ + if(This->window && This->window->base.outer_window && is_iexplore()) { HTMLOuterWindow *window = This->window->base.outer_window; DWORD zone; HRESULT hres; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8f78c8da17f..cd4daa84e0a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -11449,6 +11449,9 @@ static void test_quirks_mode(void) expected_document_mode = 5; run_domtest("<html><body></body></html>", test_document_mode); + expected_document_mode = 7; + run_domtest("<!DOCTYPE html>\n<html></html>", test_document_mode); + if(!is_ie9plus) return; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index a92d18fb454..660f62759c9 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3734,6 +3734,28 @@ static void run_script_as_http_with_mode(const char *script, const char *opt, co run_from_path(L"/index.html", opt ? opt : script); } +static void test_strict_mode(void) +{ + sprintf(index_html_data, + "<!DOCTYPE html>\n" + "<html>\n" + " <head>\n" + " <script src=\"winetest.js\" type=\"text/javascript\"></script>\n" + " <script type=\"text/javascript\">\n" + " function test() {\n" + " ok(document.documentMode === 7, 'document mode = ' + document.documentMode);\n" + " next_test();\n" + " }\n" + " var tests = [ test ];\n" + " </script>\n" + " </head>\n" + " <body onload=\"run_tests();\">\n" + " </body>\n" + "</html>\n"); + + run_from_path(L"/index.html", "test_strict_mode"); +} + static void init_protocol_handler(void) { IInternetSession *internet_session; @@ -3767,6 +3789,7 @@ static void run_js_tests(void) init_protocol_handler(); + test_strict_mode(); run_script_as_http_with_mode("xhr.js", NULL, "9"); run_script_as_http_with_mode("xhr.js", NULL, "10"); run_script_as_http_with_mode("xhr.js", NULL, "11");

1 0

Jacek Caban : wined3d: Don't use __wine_get_wgl_driver.
by Alexandre Julliard 15 Jul '22

15 Jul '22

Module: wine Branch: master Commit: 46bbcd678939323ac03acfd0b1f8f17f52cb2b6b URL: https://gitlab.winehq.org/wine/wine/-/commit/46bbcd678939323ac03acfd0b1f8f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 13:49:23 2022 +0200 wined3d: Don't use __wine_get_wgl_driver. --- dlls/wined3d/Makefile.in | 2 +- dlls/wined3d/adapter_gl.c | 18 ------------------ dlls/wined3d/wined3d_private.h | 6 ------ 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index c7c87865405..23051f2a58b 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wined3d.dll IMPORTLIB = wined3d -IMPORTS = $(VKD3D_PE_LIBS) dxguid opengl32 user32 gdi32 advapi32 win32u +IMPORTS = $(VKD3D_PE_LIBS) dxguid opengl32 user32 gdi32 advapi32 EXTRAINCL = $(VKD3D_PE_CFLAGS) C_SRCS = \ diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index d341668b808..60a168b5cef 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -2756,12 +2756,6 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexAttribPointer) /* OpenGL 2.0 */ #undef USE_GL_FUNC -#ifndef USE_WIN32_OPENGL - /* hack: use the functions directly from the TEB table to bypass the thunks */ - /* note that we still need the above wglGetProcAddress calls to initialize the table */ - gl_info->gl_ops.ext = ((struct opengl_funcs *)NtCurrentTeb()->glTable)->ext; -#endif - #define MAP_GL_FUNCTION(core_func, ext_func) \ do \ { \ @@ -5312,7 +5306,6 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, return FALSE; /* Dynamically load all GL core functions */ -#ifdef USE_WIN32_OPENGL { HMODULE mod_gl = GetModuleHandleA("opengl32.dll"); #define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f); @@ -5321,17 +5314,6 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers"); gl_info->gl_ops.wgl.p_wglGetPixelFormat = (void *)GetProcAddress(mod_gl, "wglGetPixelFormat"); } -#else - /* To bypass the opengl32 thunks retrieve functions from the WGL driver instead of opengl32 */ - { - HDC hdc = GetDC( 0 ); - const struct opengl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); - ReleaseDC( 0, hdc ); - if (!wgl_driver || wgl_driver == (void *)-1) return FALSE; - gl_info->gl_ops.wgl = wgl_driver->wgl; - gl_info->gl_ops.gl = wgl_driver->gl; - } -#endif gl_info->p_glEnableWINE = gl_info->gl_ops.gl.p_glEnable; gl_info->p_glDisableWINE = gl_info->gl_ops.gl.p_glDisable; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09ba3487616..4e0879a3985 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -25,13 +25,7 @@ #ifndef __WINE_WINED3D_PRIVATE_H #define __WINE_WINED3D_PRIVATE_H -#define USE_WIN32_OPENGL - -#ifdef USE_WIN32_OPENGL #define WINE_GLAPI __stdcall -#else -#define WINE_GLAPI -#endif #include <assert.h> #include <stdarg.h>

1 0

Jacek Caban : wined3d: Don't use vulkan_driver.h.
by Alexandre Julliard 15 Jul '22

15 Jul '22

Module: wine Branch: master Commit: 89e7dc3a29fac3f74c9996d317a77e72b88dbd88 URL: https://gitlab.winehq.org/wine/wine/-/commit/89e7dc3a29fac3f74c9996d317a77e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 13:46:38 2022 +0200 wined3d: Don't use vulkan_driver.h. --- dlls/wined3d/adapter_vk.c | 20 -------------------- dlls/wined3d/wined3d_private.h | 1 - dlls/wined3d/wined3d_vk.h | 5 ----- 3 files changed, 26 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3b87ab63ee5..81248d40f46 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -18,8 +18,6 @@ #include "wined3d_private.h" -#include "wine/vulkan_driver.h" - WINE_DEFAULT_DEBUG_CHANNEL(d3d); static const struct wined3d_state_entry_template misc_state_template_vk[] = @@ -214,7 +212,6 @@ static HRESULT hresult_from_vk_result(VkResult vr) } } -#ifdef USE_WIN32_VULKAN static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; @@ -244,23 +241,6 @@ static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) vk_info->vulkan_lib = NULL; } } -#else -static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) -{ - struct vulkan_ops *vk_ops = &vk_info->vk_ops; - const struct vulkan_funcs *vk_funcs; - - vk_funcs = __wine_get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); - - if (!vk_funcs) - return FALSE; - - vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr; - return TRUE; -} - -static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) {} -#endif static void adapter_vk_destroy(struct wined3d_adapter *adapter) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 72732df7b4d..09ba3487616 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -25,7 +25,6 @@ #ifndef __WINE_WINED3D_PRIVATE_H #define __WINE_WINED3D_PRIVATE_H -#define USE_WIN32_VULKAN #define USE_WIN32_OPENGL #ifdef USE_WIN32_OPENGL diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 91ef8c816cd..00818f98b81 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -20,9 +20,6 @@ #define __WINE_WINED3D_VK_H #define VK_NO_PROTOTYPES -#ifndef USE_WIN32_VULKAN -#define WINE_VK_HOST -#endif #include "wine/vulkan.h" #define VK_INSTANCE_FUNCS() \ @@ -225,9 +222,7 @@ struct wined3d_vk_info unsigned int api_version; BOOL supported[WINED3D_VK_EXT_COUNT]; -#ifdef USE_WIN32_VULKAN HMODULE vulkan_lib; -#endif }; #define VK_CALL(f) (vk_info->vk_ops.f)

1 0

Zhiyi Zhang : shell32: Implement SHOpenFolderAndSelectItems().
by Alexandre Julliard 15 Jul '22

15 Jul '22

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 15 Jul '22

15 Jul '22

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

Zhiyi Zhang : include: Add SHOpenFolderAndSelectItems() declaration and flags.
by Alexandre Julliard 15 Jul '22

15 Jul '22

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: Correct SHOpenFolderAndSelectItems() prototype.
by Alexandre Julliard 15 Jul '22

15 Jul '22

Module: wine Branch: master Commit: 7884c142420f96e54b33f8b5cf28ea2ec6ec619b URL: https://gitlab.winehq.org/wine/wine/-/commit/7884c142420f96e54b33f8b5cf28ea… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 11 12:17:51 2022 +0800 shell32: Correct SHOpenFolderAndSelectItems() prototype. The third parameter is of type PCUITEMID_CHILD_ARRAY, not PCUITEMID_CHILD_ARRAY *. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/shell32/shlfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 120376ba82c..7308f49c7d5 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -615,8 +615,8 @@ HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, LPDATAOBJECT lpDataObje * * Added in XP. */ -HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, - PCUITEMID_CHILD_ARRAY *apidl, DWORD flags ) +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;

1 0

Zhiyi Zhang : shell32: Add LVS_SHOWSELALWAYS to the list view in shell views.
by Alexandre Julliard 15 Jul '22

15 Jul '22

Module: wine Branch: master Commit: 616539a070e9896bdfe525998415cd191bdbb5c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/616539a070e9896bdfe525998415cd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 8 17:05:16 2022 +0800 shell32: Add LVS_SHOWSELALWAYS to the list view in shell views. FWF_SHOWSELALWAYS is deprecated and has no effect. Manual tests show that LVS_SHOWSELALWAYS is always used. 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 1b4ba304dc1..40a7d76c359 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -358,7 +358,7 @@ static BOOL ShellView_CreateList (IShellViewImpl * This) TRACE("%p\n",This); dwStyle = WS_TABSTOP | WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | - LVS_SHAREIMAGELISTS | LVS_EDITLABELS | LVS_ALIGNLEFT | LVS_AUTOARRANGE; + LVS_SHAREIMAGELISTS | LVS_EDITLABELS | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SHOWSELALWAYS; dwExStyle = WS_EX_CLIENTEDGE; dwStyle |= ViewModeToListStyle(This->FolderSettings.ViewMode);

1 0

Zhiyi Zhang : shell32: Correctly apply SVSI_FOCUSED.
by Alexandre Julliard 15 Jul '22

15 Jul '22

Module: wine Branch: master Commit: a5820275e81b5c86dfd6c5b75f389145ebd0e79c URL: https://gitlab.winehq.org/wine/wine/-/commit/a5820275e81b5c86dfd6c5b75f3891… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 8 17:02:57 2022 +0800 shell32: Correctly apply SVSI_FOCUSED. LVIS_FOCUSED has to be added to both stateMask and state to set focused state for list views. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/shell32/shlview.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index e2b4ae4c9ca..1b4ba304dc1 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2869,7 +2869,10 @@ static HRESULT WINAPI FolderView_SelectItem(IFolderView2 *iface, int item, DWORD lvItem.state |= LVIS_SELECTED; if (flags & SVSI_FOCUSED) + { lvItem.stateMask |= LVIS_FOCUSED; + lvItem.state |= LVIS_FOCUSED; + } SendMessageW(This->hWndList, LVM_SETITEMSTATE, item, (LPARAM)&lvItem);

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022