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

David Kahurani : xmllite/writer: Fix typo in a comment.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: 796aa0ae887c44d78a3437039fd03a66480dcd05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=796aa0ae887c44d78a343703… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Jun 20 12:55:52 2022 +0300 xmllite/writer: Fix typo in a comment. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 3f5b3527f23..6f455ffcb19 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -949,7 +949,7 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR return S_OK; } - /* Ignore prefix is URI wasn't specified. */ + /* Ignore prefix if URI wasn't specified. */ if (is_xmlns_local && is_empty_string(uri)) { write_output_attribute(This, NULL, 0, L"xmlns", 5, value);

1 0

Paul Gofman : winex11.drv: Store wgl_drawable instead of GLX drawable in wgl_pbuffer.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: 2299d400260d0bfaf3218a023262bff13768713e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2299d400260d0bfaf3218a02… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 14 11:10:14 2022 -0500 winex11.drv: Store wgl_drawable instead of GLX drawable in wgl_pbuffer. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 84 ++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 017a8813caa..468d10fbbae 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -209,26 +209,6 @@ struct wgl_context struct list entry; }; -struct wgl_pbuffer -{ - Drawable drawable; - const struct wgl_pixel_format* fmt; - int width; - int height; - int* attribList; - int use_render_texture; /* This is also the internal texture format */ - int texture_bind_target; - int texture_bpp; - GLint texture_format; - GLuint texture_target; - GLenum texture_type; - GLuint texture; - int texture_level; - GLXContext tmp_context; - GLXContext prev_context; - struct list entry; -}; - enum dc_gl_type { DC_GL_NONE, /* no GL support (pixel format not set yet) */ @@ -252,6 +232,26 @@ struct gl_drawable BOOL mutable_pf; }; +struct wgl_pbuffer +{ + struct gl_drawable *gl; + const struct wgl_pixel_format* fmt; + int width; + int height; + int* attribList; + int use_render_texture; /* This is also the internal texture format */ + int texture_bind_target; + int texture_bpp; + GLint texture_format; + GLuint texture_target; + GLenum texture_type; + GLuint texture; + int texture_level; + GLXContext tmp_context; + GLXContext prev_context; + struct list entry; +}; + enum glx_swap_control_method { GLX_SWAP_CONTROL_NONE, @@ -2276,9 +2276,19 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat } PUSH1(attribs, None); - object->drawable = pglXCreatePbuffer(gdi_display, fmt->fbconfig, attribs); - TRACE("new Pbuffer drawable as %lx\n", object->drawable); - if (!object->drawable) { + if (!(object->gl = calloc( 1, sizeof(*object->gl) ))) + { + SetLastError(ERROR_NO_SYSTEM_RESOURCES); + goto create_failed; + } + object->gl->type = DC_GL_PBUFFER; + object->gl->format = object->fmt; + object->gl->ref = 1; + + object->gl->drawable = pglXCreatePbuffer(gdi_display, fmt->fbconfig, attribs); + TRACE("new Pbuffer drawable as %p (%lx)\n", object->gl, object->gl->drawable); + if (!object->gl->drawable) { + free( object->gl ); SetLastError(ERROR_NO_SYSTEM_RESOURCES); goto create_failed; /* unexpected error */ } @@ -2306,7 +2316,8 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) pthread_mutex_lock( &context_mutex ); list_remove( &object->entry ); pthread_mutex_unlock( &context_mutex ); - pglXDestroyPbuffer(gdi_display, object->drawable); + pglXDestroyPbuffer(gdi_display, object->gl->drawable); + release_gl_drawable( object->gl ); if (object->tmp_context) pglXDestroyContext(gdi_display, object->tmp_context); free( object ); @@ -2321,30 +2332,21 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) static HDC X11DRV_wglGetPbufferDCARB( struct wgl_pbuffer *object ) { struct x11drv_escape_set_drawable escape; - struct gl_drawable *gl, *prev; + struct gl_drawable *prev; HDC hdc; hdc = NtGdiOpenDCW( NULL, NULL, NULL, 0, TRUE, NULL, NULL, NULL ); if (!hdc) return 0; - if (!(gl = calloc( 1, sizeof(*gl) ))) - { - NtGdiDeleteObjectApp( hdc ); - return 0; - } - gl->type = DC_GL_PBUFFER; - gl->drawable = object->drawable; - gl->format = object->fmt; - gl->ref = 1; - pthread_mutex_lock( &context_mutex ); if (!XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&prev )) release_gl_drawable( prev ); - XSaveContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char *)gl ); + grab_gl_drawable( object->gl ); + XSaveContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char *)object->gl ); pthread_mutex_unlock( &context_mutex ); escape.code = X11DRV_SET_DRAWABLE; - escape.drawable = object->drawable; + escape.drawable = object->gl->drawable; escape.mode = IncludeInferiors; SetRect( &escape.dc_rect, 0, 0, object->width, object->height ); NtGdiExtEscape( hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); @@ -2364,10 +2366,10 @@ static BOOL X11DRV_wglQueryPbufferARB( struct wgl_pbuffer *object, int iAttribut switch (iAttribute) { case WGL_PBUFFER_WIDTH_ARB: - pglXQueryDrawable(gdi_display, object->drawable, GLX_WIDTH, (unsigned int*) piValue); + pglXQueryDrawable(gdi_display, object->gl->drawable, GLX_WIDTH, (unsigned int*) piValue); break; case WGL_PBUFFER_HEIGHT_ARB: - pglXQueryDrawable(gdi_display, object->drawable, GLX_HEIGHT, (unsigned int*) piValue); + pglXQueryDrawable(gdi_display, object->gl->drawable, GLX_HEIGHT, (unsigned int*) piValue); break; case WGL_PBUFFER_LOST_ARB: @@ -2981,7 +2983,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) FIXME("partial stub!\n"); } - TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); + TRACE("drawable=%p (%lx), context=%p\n", object->gl, object->gl->drawable, prev_context); if (!object->tmp_context || object->prev_context != prev_context) { if (object->tmp_context) pglXDestroyContext(gdi_display, object->tmp_context); @@ -2992,7 +2994,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) opengl_funcs.gl.p_glGetIntegerv(object->texture_bind_target, &prev_binded_texture); /* Switch to our pbuffer */ - pglXMakeCurrent(gdi_display, object->drawable, object->tmp_context); + pglXMakeCurrent(gdi_display, object->gl->drawable, object->tmp_context); /* Make sure that the prev_binded_texture is set as the current texture state isn't shared between contexts. * After that copy the pbuffer texture data. */

1 0

Paul Gofman : winex11.drv: Destroy GLX pbuffer when destroying drawable.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: e68b27b14fa66ad61656195f5e68b03eafbbce7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68b27b14fa66ad61656195f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 14 11:19:56 2022 -0500 winex11.drv: Destroy GLX pbuffer when destroying drawable. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 468d10fbbae..8d6afba9a6f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1165,6 +1165,10 @@ static void release_gl_drawable( struct gl_drawable *gl ) pglXDestroyPixmap( gdi_display, gl->drawable ); XFreePixmap( gdi_display, gl->pixmap ); break; + case DC_GL_PBUFFER: + TRACE( "destroying pbuffer drawable %lx\n", gl->drawable ); + pglXDestroyPbuffer( gdi_display, gl->drawable ); + break; default: break; } @@ -2316,7 +2320,6 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) pthread_mutex_lock( &context_mutex ); list_remove( &object->entry ); pthread_mutex_unlock( &context_mutex ); - pglXDestroyPbuffer(gdi_display, object->gl->drawable); release_gl_drawable( object->gl ); if (object->tmp_context) pglXDestroyContext(gdi_display, object->tmp_context);

1 0

Alistair Leslie-Hughes : d3drm: Return S_OK from IDirect3DRMMeshBuilder3::Optimize().
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: b581165950cc117ae5006dc5cfc1d6d02979d142 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b581165950cc117ae5006dc5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 13 18:11:05 2022 +1000 d3drm: Return S_OK from IDirect3DRMMeshBuilder3::Optimize(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3drm/meshbuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 2867ea14ebe..a897941c81e 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2134,7 +2134,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Optimize(IDirect3DRMMeshBuilder3 *ifac { FIXME("iface %p, flags %#lx stub!\n", iface, flags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI d3drm_mesh_builder3_AddFacesIndexed(IDirect3DRMMeshBuilder3 *iface,

1 0

Nikolay Sivov : d3d11: Remove null dxgi object checks.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: f6f66661b3fabdcd6cf2f4999b3029e72d492fa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f66661b3fabdcd6cf2f499… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 16 14:53:19 2022 +0300 d3d11: Remove null dxgi object checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/texture.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 7be689d1f0f..64e78702fd7 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -32,6 +32,7 @@ static inline struct d3d_texture1d *impl_from_ID3D11Texture1D(ID3D11Texture1D *i static HRESULT STDMETHODCALLTYPE d3d11_texture1d_QueryInterface(ID3D11Texture1D *iface, REFIID iid, void **out) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + HRESULT hr; TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -54,16 +55,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture1d_QueryInterface(ID3D11Texture1D return S_OK; } - if (texture->dxgi_resource) + TRACE("Forwarding to dxgi resource.\n"); + + if (FAILED(hr = IUnknown_QueryInterface(texture->dxgi_resource, iid, out))) { - TRACE("Forwarding to dxgi resource.\n"); - return IUnknown_QueryInterface(texture->dxgi_resource, iid, out); + WARN("%s not implemented, returning %#lx.\n", debugstr_guid(iid), hr); + *out = NULL; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - - *out = NULL; - return E_NOINTERFACE; + return hr; } static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface) @@ -514,6 +514,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); + HRESULT hr; TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -535,16 +536,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D return S_OK; } - if (texture->dxgi_resource) + TRACE("Forwarding to dxgi resource.\n"); + + if (FAILED(hr = IUnknown_QueryInterface(texture->dxgi_resource, riid, object))) { - TRACE("Forwarding to dxgi resource.\n"); - return IUnknown_QueryInterface(texture->dxgi_resource, riid, object); + WARN("%s not implemented, returning %#lx.\n", debugstr_guid(riid), hr); + *object = NULL; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - - *object = NULL; - return E_NOINTERFACE; + return hr; } static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface)

1 0

Nikolay Sivov : d2d1/effect: Move effect instance creation to the device context.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: a2935a518bfd3d6180a4d4d12851181e0278f6a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2935a518bfd3d6180a4d4d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 19 21:39:07 2022 +0300 d2d1/effect: Move effect instance creation to the device context. Creating new effects from effect context does not reuse calling context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 23 ++++++++++++++++++++--- dlls/d2d1/effect.c | 18 ++---------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 62eb98a94a1..be7b8f9f8e2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1947,18 +1947,35 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_effect_context *effect_context; + struct d2d_effect *object; HRESULT hr; - FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); + TRACE("iface %p, effect_id %s, effect %p.\n", iface, debugstr_guid(effect_id), effect); if (!(effect_context = calloc(1, sizeof(*effect_context)))) return E_OUTOFMEMORY; d2d_effect_context_init(effect_context, context); - hr = ID2D1EffectContext_CreateEffect(&effect_context->ID2D1EffectContext_iface, effect_id, effect); + if (!(object = calloc(1, sizeof(*object)))) + { + ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); + return E_OUTOFMEMORY; + } + hr = d2d_effect_init(object, effect_context, effect_id); ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); - return hr; + if (FAILED(hr)) + { + WARN("Failed to initialise effect, hr %#lx.\n", hr); + free(object); + return hr; + } + + *effect = &object->ID2D1Effect_iface; + + TRACE("Created effect %p.\n", *effect); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateGradientStopCollection( diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 78db9489be9..f5d5494c67a 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -123,25 +123,11 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectCont REFCLSID clsid, ID2D1Effect **effect) { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); - struct d2d_effect *object; - HRESULT hr; TRACE("iface %p, clsid %s, effect %p.\n", iface, debugstr_guid(clsid), effect); - if (!(object = calloc(1, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d2d_effect_init(object, effect_context, clsid))) - { - WARN("Failed to initialise effect, hr %#lx.\n", hr); - free(object); - return hr; - } - - TRACE("Created effect %p.\n", object); - *effect = &object->ID2D1Effect_iface; - - return S_OK; + return ID2D1DeviceContext1_CreateEffect(&effect_context->device_context->ID2D1DeviceContext1_iface, + clsid, effect); } static HRESULT STDMETHODCALLTYPE d2d_effect_context_GetMaximumSupportedFeatureLevel(ID2D1EffectContext *iface,

1 0

Alex Henrie : shell32/tests: Add tests for Program Manager name sanitization.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: 33f65267b5c7569ece08b3c6dd2a5344db0c9ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33f65267b5c7569ece08b3c6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 17 12:33:13 2022 -0600 shell32/tests: Add tests for Program Manager name sanitization. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/progman_dde.c | 72 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 5d532f9222f..cb1ff8ddb9f 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -23,7 +23,7 @@ * functionality * - Todo: Handle CommonGroupFlag * Better AddItem Tests (Lots of parameters to test) - * Tests for Invalid Characters in Names / Invalid Parameters + * Tests for invalid parameters */ #include <stdio.h> @@ -425,6 +425,75 @@ static void test_request_groups(DWORD instance, HCONV hconv) FindClose(hfind); } +static void test_name_sanitization(DWORD instance, HCONV hConv) +{ + static const char original_name[] = "\x01\x1F !#$%&'*+,-./:;<=>?@[\\]^`{|}~\x7F\xFF"; + static const char sanitized_name[] = "__ !#$%&'_+,-.__;_=__@[_]^`{_}~\x7F\xFF"; + char buf[128]; + UINT error; + + if (0) /* the directory isn't deleted on windows < 7 */ + { + error = dde_execute(instance, hConv, "[CreateGroup(\" \")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(check_exists(" "), "directory not created\n"); + ok(!check_window_exists(" "), "window should not exist\n"); + + error = dde_execute(instance, hConv, "[DeleteGroup(\" \")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(!check_exists(" "), "directory should not exist\n"); + } + + if (0) /* these calls will actually delete the start menu */ + { + error = dde_execute(instance, hConv, "[DeleteGroup(\"\")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(!check_exists("../Programs"), "directory should not exist\n"); + + error = dde_execute(instance, hConv, "[DeleteGroup(\"..\")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(!check_exists("../../Start Menu"), "directory should not exist\n"); + } + + sprintf(buf, "[CreateGroup(\"Group%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s", sanitized_name); + todo_wine ok(check_exists(buf), "directory not created\n"); + if (!check_exists(buf)) return; + ok(check_window_exists(buf), "window not created\n"); + + sprintf(buf, "[ShowGroup(\"Group%s\", 0)]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s", sanitized_name); + ok(check_window_exists(buf), "window not created\n"); + + sprintf(buf, "[AddItem(notepad,\"Notepad%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s/Notepad%s.lnk", sanitized_name, sanitized_name); + ok(check_exists(buf), "link not created\n"); + + sprintf(buf, "[ReplaceItem(\"Notepad%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %#x\n", error); + sprintf(buf, "Group%s/Notepad%s.lnk", sanitized_name, sanitized_name); + ok(check_exists(buf), "link should still exist\n"); + + sprintf(buf, "[DeleteItem(\"Notepad%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %#x\n", error); + sprintf(buf, "Group%s/Notepad%s.lnk", sanitized_name, sanitized_name); + ok(check_exists(buf), "link should still exist\n"); + + sprintf(buf, "[DeleteGroup(\"Group%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s", sanitized_name); + ok(!check_exists(buf), "directory should not exist\n"); +} + START_TEST(progman_dde) { DWORD instance = 0; @@ -479,6 +548,7 @@ START_TEST(progman_dde) /* Run Tests */ test_progman_dde2(instance, hConv); + test_name_sanitization(instance, hConv); /* Cleanup & Exit */ ret = DdeDisconnect(hConv);

1 0

Jactry Zeng : include: Add definition of ScriptPlaceOpenType().
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: 039598805282a26327421ce1be42cb003bd988a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=039598805282a26327421ce1… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jun 20 02:31:25 2022 -0500 include: Add definition of ScriptPlaceOpenType(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/usp10.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/usp10.h b/include/usp10.h index db18a5b409e..00f2fc2f2d4 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -285,6 +285,11 @@ HRESULT WINAPI ScriptShapeOpenType(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS * int *pcGlyphs); HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva, SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ); +HRESULT WINAPI ScriptPlaceOpenType(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, OPENTYPE_TAG tagScript, + OPENTYPE_TAG tagLangSys, int *rcRangeChars, TEXTRANGE_PROPERTIES **rpRangeProperties, + int cRanges, const WCHAR *pwcChars, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProps, + int cChars, const WORD *pwGlyphs, const SCRIPT_GLYPHPROP *pGlyphProps, int cGlyphs, + int *piAdvance, GOFFSET *pGoffset, ABC *pABC); HRESULT WINAPI ScriptBreak(const WCHAR *pwcChars, int cChars, const SCRIPT_ANALYSIS *psa, SCRIPT_LOGATTR *psla); HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *tmHeight); HRESULT WINAPI ScriptCPtoX(int iCP, BOOL fTrailing, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva,

1 0

Jacek Caban : win32u: Move default key messages implementation from user32.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: 749e1b05d7e68de4dccef77b4a2a379fe9345c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=749e1b05d7e68de4dccef77b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 22:42:40 2022 +0200 win32u: Move default key messages implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 90 +--------------------------------------------------- dlls/win32u/defwnd.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 89 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 45f1842714f..2cfc0b14ff5 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -36,15 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); - /* bits in the dwKeyData */ -#define KEYDATA_ALT 0x2000 -#define KEYDATA_PREVSTATE 0x4000 - #define DRAG_FILE 0x454C4946 -static short iF10Key = 0; -static short iMenuSysKey = 0; - /*********************************************************************** * DEFWND_HandleWindowPosChanged * @@ -169,12 +162,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa DEFWND_HandleWindowPosChanged( hwnd, (const WINDOWPOS *)lParam ); break; - case WM_LBUTTONDOWN: - case WM_RBUTTONDOWN: - case WM_MBUTTONDOWN: - iF10Key = iMenuSysKey = 0; - break; - case WM_RBUTTONUP: { POINT pt; @@ -222,69 +209,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_SYSCOMMAND: return NC_HandleSysCommand( hwnd, wParam, lParam ); - case WM_KEYDOWN: - if(wParam == VK_F10) iF10Key = VK_F10; - break; - - case WM_SYSKEYDOWN: - if( HIWORD(lParam) & KEYDATA_ALT ) - { - /* if( HIWORD(lParam) & ~KEYDATA_PREVSTATE ) */ - if ( (wParam == VK_MENU || wParam == VK_LMENU - || wParam == VK_RMENU) && !iMenuSysKey ) - iMenuSysKey = 1; - else - iMenuSysKey = 0; - - iF10Key = 0; - - if( wParam == VK_F4 ) /* try to close the window */ - { - HWND top = NtUserGetAncestor( hwnd, GA_ROOT ); - if (!(GetClassLongW( top, GCL_STYLE ) & CS_NOCLOSE)) - PostMessageW( top, WM_SYSCOMMAND, SC_CLOSE, 0 ); - } - } - else if( wParam == VK_F10 ) - { - if (NtUserGetKeyState(VK_SHIFT) & 0x8000) - SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, -1 ); - iF10Key = 1; - } - else if (wParam == VK_ESCAPE && (NtUserGetKeyState(VK_SHIFT) & 0x8000)) - SendMessageW( hwnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); - break; - - case WM_KEYUP: - case WM_SYSKEYUP: - /* Press and release F10 or ALT */ - if (((wParam == VK_MENU || wParam == VK_LMENU || wParam == VK_RMENU) - && iMenuSysKey) || ((wParam == VK_F10) && iF10Key)) - SendMessageW( NtUserGetAncestor( hwnd, GA_ROOT ), WM_SYSCOMMAND, SC_KEYMENU, 0L ); - iMenuSysKey = iF10Key = 0; - break; - - case WM_SYSCHAR: - { - iMenuSysKey = 0; - if (wParam == '\r' && IsIconic(hwnd)) - { - PostMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0L ); - break; - } - if ((HIWORD(lParam) & KEYDATA_ALT) && wParam) - { - if (wParam == '\t' || wParam == '\x1b') break; - if (wParam == ' ' && (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)) - SendMessageW( GetParent(hwnd), msg, wParam, lParam ); - else - SendMessageW( hwnd, WM_SYSCOMMAND, SC_KEYMENU, wParam ); - } - else /* check for Ctrl-Esc */ - if (wParam != '\x1b') MessageBeep(0); - break; - } - case WM_SHOWWINDOW: { LONG style = GetWindowLongW( hwnd, GWL_STYLE ); @@ -310,11 +234,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; } - case WM_CANCELMODE: - iMenuSysKey = 0; - NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); - break; - case WM_VKEYTOITEM: case WM_CHARTOITEM: return -1; @@ -485,6 +404,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam break; case WM_SETTEXT: + case WM_SYSCHAR: result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE ); break; @@ -556,14 +476,6 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } break; - case WM_SYSCHAR: - { - CHAR ch = LOWORD(wParam); - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &ch, 1, &wch, 1); - wParam = MAKEWPARAM( wch, HIWORD(wParam) ); - } - /* fall through */ default: result = DEFWND_DefWinProc( hwnd, msg, wParam, lParam ); break; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index b67f4de2dd9..71429884b2f 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -31,6 +31,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +/* bits in the dwKeyData */ +#define KEYDATA_ALT 0x2000 +#define KEYDATA_PREVSTATE 0x4000 + +static short f10_key = 0; +static short menu_sys_key = 0; + static BOOL has_dialog_frame( UINT style, UINT ex_style ) { return (ex_style & WS_EX_DLGMODALFRAME) || ((style & WS_DLGFRAME) && !(style & WS_THICKFRAME)); @@ -2404,6 +2411,7 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, break; case WM_CANCELMODE: + menu_sys_key = 0; end_menu( hwnd ); if (get_capture() == hwnd) release_capture(); break; @@ -2443,6 +2451,78 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, result = handle_sys_command( hwnd, wparam, lparam ); break; + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_MBUTTONDOWN: + f10_key = menu_sys_key = 0; + break; + + case WM_KEYDOWN: + if (wparam == VK_F10) f10_key = VK_F10; + break; + + case WM_SYSKEYDOWN: + if (HIWORD( lparam ) & KEYDATA_ALT) + { + if ((wparam == VK_MENU || wparam == VK_LMENU || wparam == VK_RMENU) && !menu_sys_key) + menu_sys_key = 1; + else + menu_sys_key = 0; + + f10_key = 0; + + if (wparam == VK_F4) /* try to close the window */ + { + HWND top = NtUserGetAncestor( hwnd, GA_ROOT ); + if (!(get_class_long( top, GCL_STYLE, FALSE ) & CS_NOCLOSE)) + NtUserPostMessage( top, WM_SYSCOMMAND, SC_CLOSE, 0 ); + } + } + else if (wparam == VK_F10) + { + if (NtUserGetKeyState(VK_SHIFT) & 0x8000) + send_message( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, -1 ); + f10_key = 1; + } + else if (wparam == VK_ESCAPE && (NtUserGetKeyState( VK_SHIFT ) & 0x8000)) + send_message( hwnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); + break; + + case WM_KEYUP: + case WM_SYSKEYUP: + /* Press and release F10 or ALT */ + if (((wparam == VK_MENU || wparam == VK_LMENU || wparam == VK_RMENU) && menu_sys_key) || + (wparam == VK_F10 && f10_key)) + send_message( NtUserGetAncestor( hwnd, GA_ROOT ), WM_SYSCOMMAND, SC_KEYMENU, 0 ); + menu_sys_key = f10_key = 0; + break; + + case WM_SYSCHAR: + menu_sys_key = 0; + if (wparam == '\r' && is_iconic( hwnd )) + { + NtUserPostMessage( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + break; + } + if ((HIWORD( lparam ) & KEYDATA_ALT) && wparam) + { + WCHAR wch; + if (ansi) + { + char ch = wparam; + win32u_mbtowc( &ansi_cp, &wch, 1, &ch, 1 ); + } + else wch = wparam; + if (wch == '\t' || wch == '\x1b') break; + if (wch == ' ' && (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD)) + send_message( get_parent( hwnd ), msg, wch, lparam ); + else + send_message( hwnd, WM_SYSCOMMAND, SC_KEYMENU, wch ); + } + else if (wparam != '\x1b') /* Ctrl-Esc */ + message_beep(0); + break; + case WM_KEYF1: { HELPINFO hi;

1 0

Jacek Caban : win32u: Move WM_APPCOMMAND implementation from user32.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: 3ec9c2990b9a5370f9657dbcd8ccee915d234c02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ec9c2990b9a5370f9657dbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 22:46:07 2022 +0200 win32u: Move WM_APPCOMMAND implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 10 ---------- dlls/user32/hook.c | 15 --------------- dlls/user32/win.h | 2 -- dlls/win32u/defwnd.c | 10 ++++++++++ dlls/win32u/sysparams.c | 7 ------- include/ntuser.h | 1 - 6 files changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 2cfc0b14ff5..3eebc952ee1 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -283,16 +283,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } break; - case WM_APPCOMMAND: - { - HWND parent = GetParent(hwnd); - if(!parent) - HOOK_CallHooks(WH_SHELL, HSHELL_APPCOMMAND, wParam, lParam, TRUE); - else - SendMessageW( parent, msg, wParam, lParam ); - break; - } - case WM_INPUTLANGCHANGEREQUEST: NtUserActivateKeyboardLayout( (HKL)lParam, 0 ); break; diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 7dddfb02638..4ef1e029609 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -334,21 +334,6 @@ void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) } -/*********************************************************************** - * HOOK_CallHooks - */ -LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) -{ - struct win_hook_params params; - params.id = id; - params.code = code; - params.wparam = wparam; - params.lparam = lparam; - params.next_unicode = unicode; - return NtUserCallOneParam( (UINT_PTR)&params, NtUserCallHooks ); -} - - /*********************************************************************** * SetWindowsHookA (USER32.@) */ diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 1dfc8eb0ad1..5e4ac056c60 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -54,8 +54,6 @@ static inline void WIN_ReleasePtr( WND *ptr ) release_user_handle_ptr( ptr ); } -extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN; - extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 71429884b2f..b3726bf8e88 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2549,6 +2549,16 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, send_message( hwnd, WM_HELP, 0, (LPARAM)&hi ); break; } + + case WM_APPCOMMAND: + { + HWND parent = get_parent( hwnd ); + if (!parent) + call_hooks( WH_SHELL, HSHELL_APPCOMMAND, wparam, lparam, TRUE ); + else + send_message( parent, msg, wparam, lparam ); + break; + } } return result; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 01469c345c2..a8c1d977c7d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4814,13 +4814,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return TRUE; /* temporary exports */ - case NtUserCallHooks: - { - const struct win_hook_params *params = (struct win_hook_params *)arg; - return call_hooks( params->id, params->code, params->wparam, params->lparam, - params->next_unicode ); - } - case NtUserGetDeskPattern: return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); diff --git a/include/ntuser.h b/include/ntuser.h index 679179851a9..6e6819038ac 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -797,7 +797,6 @@ enum NtUserCallOneParam_SetCaretBlinkTime, NtUserCallOneParam_SetProcessDefaultLayout, /* temporary exports */ - NtUserCallHooks, NtUserGetDeskPattern, NtUserGetWinProcPtr, NtUserLock,

1 0