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

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

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

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

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

Ziqing Hui : d2d1/tests: Test ID2D1BlendTransform.
by Alexandre Julliard 15 Jul '22

15 Jul '22

Module: wine Branch: master Commit: 27b64c75193443771dfc5570cbac125dbd4530e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/27b64c75193443771dfc5570cbac12… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 7 12:36:19 2022 +0800 d2d1/tests: Test ID2D1BlendTransform. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ea056ac017b..fbb35dd0e1b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12204,6 +12204,130 @@ done: release_test_context(&ctx); } +#define check_blend_desc(blend_desc, expected) check_blend_desc_(__LINE__, blend_desc, expected) +static void check_blend_desc_(unsigned int line, + const D2D1_BLEND_DESCRIPTION *blend_desc, const D2D1_BLEND_DESCRIPTION *expected) +{ + ok_(__FILE__, line)(blend_desc->sourceBlend == expected->sourceBlend, + "Got unexpected source blend %u, expected %u.\n", + blend_desc->sourceBlend, expected->sourceBlend); + ok_(__FILE__, line)(blend_desc->destinationBlend == expected->destinationBlend, + "Got unexpected destination blend %u, expected %u.\n", + blend_desc->destinationBlend, expected->destinationBlend); + ok_(__FILE__, line)(blend_desc->blendOperation == expected->blendOperation, + "Got unexpected blend operation %u, expected %u.\n", + blend_desc->blendOperation, expected->blendOperation); + ok_(__FILE__, line)(blend_desc->sourceBlendAlpha == expected->sourceBlendAlpha, + "Got unexpected source blend alpha %u, expected %u.\n", + blend_desc->sourceBlendAlpha, expected->sourceBlendAlpha); + ok_(__FILE__, line)(blend_desc->destinationBlendAlpha == expected->destinationBlendAlpha, + "Got unexpected destination blend alpha %u, expected %u.\n", + blend_desc->destinationBlendAlpha, expected->destinationBlendAlpha); + ok_(__FILE__, line)(blend_desc->blendOperationAlpha == expected->blendOperationAlpha, + "Got unexpected blend operation alpha %u, expected %u.\n", + blend_desc->blendOperationAlpha, expected->blendOperationAlpha); + ok_(__FILE__, line)(blend_desc->blendFactor[0] == expected->blendFactor[0], + "Got unexpected blendFactor[0] %.8e, expected %.8e.\n", + blend_desc->blendFactor[0], expected->blendFactor[0]); + ok_(__FILE__, line)(blend_desc->blendFactor[1] == expected->blendFactor[1], + "Got unexpected blendFactor[1] %.8e, expected %.8e.\n", + blend_desc->blendFactor[1], expected->blendFactor[1]); + ok_(__FILE__, line)(blend_desc->blendFactor[2] == expected->blendFactor[2], + "Got unexpected blendFactor[2] %.8e, expected %.8e.\n", + blend_desc->blendFactor[2], expected->blendFactor[2]); + ok_(__FILE__, line)(blend_desc->blendFactor[3] == expected->blendFactor[3], + "Got unexpected blendFactor[3] %.8e, expected %.8e.\n", + blend_desc->blendFactor[3], expected->blendFactor[3]); +} + +static void test_blend_transform(BOOL d3d11) +{ + D2D1_BLEND_DESCRIPTION blend_desc, expected= {0}; + ID2D1BlendTransform *transform = NULL; + ID2D1EffectContext *effect_context; + D2D1_PROPERTY_BINDING binding; + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + 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 */ + hr = ID2D1EffectContext_CreateBlendTransform(effect_context, 0, &expected, &transform); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_CreateBlendTransform(effect_context, 1, &expected, &transform); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + ID2D1BlendTransform_Release(transform); + hr = ID2D1EffectContext_CreateBlendTransform(effect_context, 4, &expected, &transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Get description */ + ID2D1BlendTransform_GetDescription(transform, &blend_desc); + check_blend_desc(&blend_desc, &expected); + + /* Input count */ + input_count = ID2D1BlendTransform_GetInputCount(transform); + ok(input_count == 4, "Got unexpected input count %u.\n", input_count); + + /* Set output buffer */ + hr = ID2D1BlendTransform_SetOutputBuffer(transform, 0xdeadbeef, D2D1_CHANNEL_DEPTH_DEFAULT); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1BlendTransform_SetOutputBuffer(transform, D2D1_BUFFER_PRECISION_UNKNOWN, 0xdeadbeef); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1BlendTransform_SetOutputBuffer(transform, D2D1_BUFFER_PRECISION_UNKNOWN, D2D1_CHANNEL_DEPTH_DEFAULT); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Set description */ + expected.sourceBlend = D2D1_BLEND_ZERO; + expected.destinationBlend = D2D1_BLEND_ZERO; + expected.blendOperation = D2D1_BLEND_OPERATION_ADD; + expected.sourceBlendAlpha = 0xdeadbeef; + expected.destinationBlendAlpha = 0; + expected.blendOperationAlpha = 12345678; + expected.blendFactor[0] = 0.0f; + expected.blendFactor[1] = 0.0f; + expected.blendFactor[2] = 0.0f; + expected.blendFactor[3] = 0.0f; + ID2D1BlendTransform_SetDescription(transform, &expected); + ID2D1BlendTransform_GetDescription(transform, &blend_desc); + check_blend_desc(&blend_desc, &expected); + +done: + if (transform) + ID2D1BlendTransform_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; @@ -13021,6 +13145,7 @@ START_TEST(d2d1) queue_test(test_registered_effects); queue_test(test_transform_graph); queue_test(test_offset_transform); + queue_test(test_blend_transform); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map);

1 0

Ziqing Hui : d2d1/tests: Test ID2D1BorderTransform.
by Alexandre Julliard 15 Jul '22

15 Jul '22

Module: wine Branch: master Commit: c850336cdbb4e07e64b5a0d2ff771729aad69438 URL: https://gitlab.winehq.org/wine/wine/-/commit/c850336cdbb4e07e64b5a0d2ff7717… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 7 12:53:37 2022 +0800 d2d1/tests: Test ID2D1BorderTransform. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index fbb35dd0e1b..bbca9139711 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12328,6 +12328,101 @@ done: release_test_context(&ctx); } +static void test_border_transform(BOOL d3d11) +{ + ID2D1BorderTransform *transform = NULL; + ID2D1EffectContext *effect_context; + D2D1_PROPERTY_BINDING binding; + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + D2D1_EXTEND_MODE mode; + 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 with invalid extend mode */ + hr = ID2D1EffectContext_CreateBorderTransform(effect_context, 0xdeadbeef, 0xdeadbeef, &transform); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + mode = ID2D1BorderTransform_GetExtendModeX(transform); + ok(mode == 0xdeadbeef, "Got unexpected extend mode %u.\n", mode); + mode = ID2D1BorderTransform_GetExtendModeY(transform); + ok(mode == 0xdeadbeef, "Got unexpected extend mode %u.\n", mode); + ID2D1BorderTransform_Release(transform); + + /* Create transform */ + hr = ID2D1EffectContext_CreateBorderTransform(effect_context, D2D1_EXTEND_MODE_CLAMP, D2D1_EXTEND_MODE_WRAP, &transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Get extend mode */ + mode = ID2D1BorderTransform_GetExtendModeX(transform); + ok(mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %u.\n", mode); + mode = ID2D1BorderTransform_GetExtendModeY(transform); + ok(mode == D2D1_EXTEND_MODE_WRAP, "Got unexpected extend mode %u.\n", mode); + + /* Input count */ + input_count = ID2D1BorderTransform_GetInputCount(transform); + ok(input_count == 1, "Got unexpected input count %u.\n", input_count); + + /* Set output buffer */ + hr = ID2D1BorderTransform_SetOutputBuffer(transform, 0xdeadbeef, D2D1_CHANNEL_DEPTH_DEFAULT); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1BorderTransform_SetOutputBuffer(transform, D2D1_BUFFER_PRECISION_UNKNOWN, 0xdeadbeef); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1BorderTransform_SetOutputBuffer(transform, D2D1_BUFFER_PRECISION_UNKNOWN, D2D1_CHANNEL_DEPTH_DEFAULT); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Set extend mode */ + ID2D1BorderTransform_SetExtendModeX(transform, D2D1_EXTEND_MODE_MIRROR); + mode = ID2D1BorderTransform_GetExtendModeX(transform); + ok(mode == D2D1_EXTEND_MODE_MIRROR, "Got unexpected extend mode %u.\n", mode); + ID2D1BorderTransform_SetExtendModeY(transform, D2D1_EXTEND_MODE_CLAMP); + mode = ID2D1BorderTransform_GetExtendModeY(transform); + ok(mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %u.\n", mode); + + /* Set extend mode with invalid value */ + ID2D1BorderTransform_SetExtendModeX(transform, 0xdeadbeef); + mode = ID2D1BorderTransform_GetExtendModeX(transform); + ok(mode == D2D1_EXTEND_MODE_MIRROR, "Got unexpected extend mode %u.\n", mode); + ID2D1BorderTransform_SetExtendModeY(transform, 0xdeadbeef); + mode = ID2D1BorderTransform_GetExtendModeY(transform); + ok(mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %u.\n", mode); + +done: + if (transform) + ID2D1BorderTransform_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; @@ -13146,6 +13241,7 @@ START_TEST(d2d1) queue_test(test_transform_graph); queue_test(test_offset_transform); queue_test(test_blend_transform); + queue_test(test_border_transform); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map);

1 0

Jacek Caban : imm32: Select default IME when creating its data.
by Alexandre Julliard 15 Jul '22

15 Jul '22

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

Jacek Caban : win32u: Move default window proc to IME window forwarding implementation from user32.
by Alexandre Julliard 15 Jul '22

15 Jul '22

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

Dmitry Timoshkov : winspool.drv: Implement OpenPrinter2.
by Alexandre Julliard 15 Jul '22

15 Jul '22

Module: wine Branch: master Commit: f81c82d49ecc0d98881cd22b02f11a76f501148c URL: https://gitlab.winehq.org/wine/wine/-/commit/f81c82d49ecc0d98881cd22b02f11a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 15 13:53:58 2022 +0300 winspool.drv: Implement OpenPrinter2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 96 ++++++++++++++++++++++++------------- dlls/winspool.drv/winspool.drv.spec | 2 + include/winspool.h | 29 ++++++++++- 3 files changed, 92 insertions(+), 35 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 482f70a2235..e1cd0338207 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1990,32 +1990,9 @@ BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size) * See OpenPrinterW. * */ -BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, - LPPRINTER_DEFAULTSA pDefault) +BOOL WINAPI OpenPrinterA(LPSTR name, HANDLE *printer, PRINTER_DEFAULTSA *defaults) { - UNICODE_STRING lpPrinterNameW; - UNICODE_STRING usBuffer; - PRINTER_DEFAULTSW DefaultW, *pDefaultW = NULL; - PWSTR pwstrPrinterNameW; - BOOL ret; - - TRACE("%s,%p,%p\n", debugstr_a(lpPrinterName), phPrinter, pDefault); - - pwstrPrinterNameW = asciitounicode(&lpPrinterNameW,lpPrinterName); - - if(pDefault) { - DefaultW.pDatatype = asciitounicode(&usBuffer,pDefault->pDatatype); - DefaultW.pDevMode = pDefault->pDevMode ? GdiConvertToDevmodeW(pDefault->pDevMode) : NULL; - DefaultW.DesiredAccess = pDefault->DesiredAccess; - pDefaultW = &DefaultW; - } - ret = OpenPrinterW(pwstrPrinterNameW, phPrinter, pDefaultW); - if(pDefault) { - RtlFreeUnicodeString(&usBuffer); - HeapFree(GetProcessHeap(), 0, DefaultW.pDevMode); - } - RtlFreeUnicodeString(&lpPrinterNameW); - return ret; + return OpenPrinter2A(name, printer, defaults, NULL); } /****************************************************************** @@ -2045,22 +2022,73 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, *| pDefaults is ignored * */ -BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault) +BOOL WINAPI OpenPrinterW(LPWSTR name, HANDLE *printer, PRINTER_DEFAULTSW *defaults) +{ + return OpenPrinter2W(name, printer, defaults, NULL); +} + +BOOL WINAPI OpenPrinter2A(LPSTR name, HANDLE *printer, + PRINTER_DEFAULTSA *defaults, PRINTER_OPTIONSA *options) +{ + UNICODE_STRING nameU; + UNICODE_STRING datatypeU; + PRINTER_DEFAULTSW defaultsW, *p_defaultsW = NULL; + PRINTER_OPTIONSW optionsW, *p_optionsW = NULL; + WCHAR *nameW; + BOOL ret; + + TRACE("(%s,%p,%p,%p)\n", debugstr_a(name), printer, defaults, options); + + nameW = asciitounicode(&nameU, name); + + if (options) + { + optionsW.cbSize = sizeof(optionsW); + optionsW.dwFlags = options->dwFlags; + p_optionsW = &optionsW; + } + + if (defaults) + { + defaultsW.pDatatype = asciitounicode(&datatypeU, defaults->pDatatype); + defaultsW.pDevMode = defaults->pDevMode ? GdiConvertToDevmodeW(defaults->pDevMode) : NULL; + defaultsW.DesiredAccess = defaults->DesiredAccess; + p_defaultsW = &defaultsW; + } + + ret = OpenPrinter2W(nameW, printer, p_defaultsW, p_optionsW); + + if (p_defaultsW) + { + RtlFreeUnicodeString(&datatypeU); + HeapFree(GetProcessHeap(), 0, defaultsW.pDevMode); + } + RtlFreeUnicodeString(&nameU); + + return ret; +} + +BOOL WINAPI OpenPrinter2W(LPWSTR name, HANDLE *printer, + PRINTER_DEFAULTSW *defaults, PRINTER_OPTIONSW *options) { HKEY key; - TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), phPrinter, pDefault); + TRACE("(%s,%p,%p,%p)\n", debugstr_w(name), printer, defaults, options); - if(!phPrinter) { + if (options) + FIXME("flags %08lx ignored\n", options->dwFlags); + + if(!printer) + { /* NT: FALSE with ERROR_INVALID_PARAMETER, 9x: TRUE */ - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } /* Get the unique handle of the printer or Printserver */ - *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); + *printer = get_opened_printer_entry( name, defaults ); - if (*phPrinter && WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ) == ERROR_SUCCESS) + if (*printer && WINSPOOL_GetOpenedPrinterRegKey( *printer, &key ) == ERROR_SUCCESS) { DWORD deleting = 0, size = sizeof( deleting ), type; DWORD status; @@ -2070,12 +2098,12 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU set_reg_DWORD( key, L"Status", status & ~PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); ReleaseMutex( init_mutex ); if (!deleting && (status & PRINTER_STATUS_DRIVER_UPDATE_NEEDED)) - update_driver( *phPrinter ); + update_driver( *printer ); RegCloseKey( key ); } - TRACE("returning %d with %lu and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter); - return (*phPrinter != 0); + TRACE("returning %d with %lu and %p\n", *printer != NULL, GetLastError(), *printer); + return (*printer != NULL); } /****************************************************************** diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index d7bb49bd34b..39c2613a4a0 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -149,6 +149,8 @@ @ stdcall IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) +@ stdcall OpenPrinter2A(str ptr ptr ptr) +@ stdcall OpenPrinter2W(wstr ptr ptr ptr) @ stdcall PerfClose() @ stdcall PerfCollect(wstr ptr ptr ptr) @ stdcall PerfOpen(wstr) diff --git a/include/winspool.h b/include/winspool.h index db8773ec418..ef39104ea30 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1143,6 +1143,30 @@ typedef struct _BIDI_RESPONSE_CONTAINER { BIDI_RESPONSE_DATA aData[1]; } BIDI_RESPONSE_CONTAINER, *LPBIDI_RESPONSE_CONTAINER, *PBIDI_RESPONSE_CONTAINER; +typedef enum _PRINTER_OPTION_FLAGS +{ + PRINTER_OPTION_NO_CACHE = 1 << 0, + PRINTER_OPTION_CACHE = 1 << 1, + PRINTER_OPTION_CLIENT_CHANGE = 1 << 2, + PRINTER_OPTION_NO_CLIENT_DATA = 1 << 3, +} PRINTER_OPTION_FLAGS; + +typedef struct _PRINTER_OPTIONSA +{ + UINT cbSize; + DWORD dwFlags; +} PRINTER_OPTIONSA, *PPRINTER_OPTIONSA, *LPPRINTER_OPTIONSA; + +typedef struct _PRINTER_OPTIONSW +{ + UINT cbSize; + DWORD dwFlags; +} PRINTER_OPTIONSW, *PPRINTER_OPTIONSW, *LPPRINTER_OPTIONSW; + +DECL_WINELIB_TYPE_AW(PRINTER_OPTIONS) +DECL_WINELIB_TYPE_AW(PPRINTER_OPTIONS) +DECL_WINELIB_TYPE_AW(LPPRINTER_OPTIONS) + /* string constants */ #define SPLREG_DEFAULT_SPOOL_DIRECTORYA "DefaultSpoolDirectory" @@ -1400,9 +1424,12 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSA pDefault); BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault); - #define OpenPrinter WINELIB_NAME_AW(OpenPrinter) +BOOL WINAPI OpenPrinter2A(LPSTR,HANDLE *,PRINTER_DEFAULTSA *,PRINTER_OPTIONSA *); +BOOL WINAPI OpenPrinter2W(LPWSTR,HANDLE *,PRINTER_DEFAULTSW *,PRINTER_OPTIONSW *); +#define OpenPrinter2 WINELIB_NAME_AW(OpenPrinter2) + BOOL WINAPI ResetPrinterA(HANDLE hPrinter, LPPRINTER_DEFAULTSA pDefault); BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault); #define ResetPrinter WINELIB_NAME_AW(ResetPrinter)

1 0

Zhiyi Zhang : shell32: Correctly check SVSI_EDIT.
by Alexandre Julliard 15 Jul '22

15 Jul '22

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