January 2018 - Wine-commits

Zebediah Figura : hlink: Directly check for S_OK from IHlinkBrowseContext_GetObject().
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 13e06719591bad61d23d496f87f4b82122bd6529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e06719591bad61d23d496f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 27 15:30:32 2018 -0600 hlink: Directly check for S_OK from IHlinkBrowseContext_GetObject(). Fixes a regression introduced by 00aca1476efd573cbf9d31a45c3d484f6fa6055b Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/link.c | 2 +- dlls/hlink/tests/hlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 983765c..25ee45d 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -493,7 +493,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (phbc) { r = IHlinkBrowseContext_GetObject(phbc, mon, TRUE, &unk); - if (r == S_FALSE) + if (r != S_OK) { CreateBindCtx(0, &bcxt); RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index e40807c..3525c44 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -891,7 +891,7 @@ static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); *ppiunk = HBC_object; - return HBC_object ? S_OK : S_FALSE; + return HBC_object ? S_OK : 0xdeadbeef; } static HRESULT WINAPI HlinkBrowseContext_Revoke(IHlinkBrowseContext *iface, DWORD dwRegister)

1 0

Józef Kucia : widl: Increase max import depth.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: ba6b020b9f792539f4004ec93932231715e90051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba6b020b9f792539f4004ec9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 26 22:09:03 2018 +0100 widl: Increase max import depth. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6520ce7..6afc3e7 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -78,7 +78,7 @@ static int attr_token(const char *kw); static warning_list_t *disabled_warnings = NULL; -#define MAX_IMPORT_DEPTH 10 +#define MAX_IMPORT_DEPTH 20 struct { YY_BUFFER_STATE state; char *input_name; @@ -524,6 +524,9 @@ int do_import(char *fname) else if (!(path = wpp_find_include( fname, input_name ))) error_loc("Unable to open include file %s\n", fname); + if (import_stack_ptr == MAX_IMPORT_DEPTH) + error_loc("Exceeded max import depth\n"); + import_stack[ptr].temp_name = temp_name; import_stack[ptr].input_name = input_name; import_stack[ptr].line_number = line_number;

1 0

Józef Kucia : widl: Reformat do_import().
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 1d0ba302d9e03f6bf5503198f7765c445214f825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d0ba302d9e03f6bf5503198… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 26 22:09:04 2018 +0100 widl: Reformat do_import(). Use 4-space indents. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 88 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6afc3e7..a57ac64 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -495,63 +495,63 @@ void pop_import(void) } struct imports { - char *name; - struct imports *next; + char *name; + struct imports *next; } *first_import; int do_import(char *fname) { - FILE *f; - char *path, *name; - struct imports *import; - int ptr = import_stack_ptr; - int ret, fd; - - import = first_import; - while (import && strcmp(import->name, fname)) - import = import->next; - if (import) return 0; /* already imported */ - - import = xmalloc(sizeof(struct imports)); - import->name = xstrdup(fname); - import->next = first_import; - first_import = import; - - /* don't search for a file name with a path in the include directories, - * for compatibility with MIDL */ - if (strchr( fname, '/' ) || strchr( fname, '\\' )) - path = xstrdup( fname ); - else if (!(path = wpp_find_include( fname, input_name ))) - error_loc("Unable to open include file %s\n", fname); + FILE *f; + char *path, *name; + struct imports *import; + int ptr = import_stack_ptr; + int ret, fd; + + import = first_import; + while (import && strcmp(import->name, fname)) + import = import->next; + if (import) return 0; /* already imported */ + + import = xmalloc(sizeof(struct imports)); + import->name = xstrdup(fname); + import->next = first_import; + first_import = import; + + /* don't search for a file name with a path in the include directories, + * for compatibility with MIDL */ + if (strchr( fname, '/' ) || strchr( fname, '\\' )) + path = xstrdup( fname ); + else if (!(path = wpp_find_include( fname, input_name ))) + error_loc("Unable to open include file %s\n", fname); if (import_stack_ptr == MAX_IMPORT_DEPTH) error_loc("Exceeded max import depth\n"); - import_stack[ptr].temp_name = temp_name; - import_stack[ptr].input_name = input_name; - import_stack[ptr].line_number = line_number; - import_stack_ptr++; - input_name = path; - line_number = 1; + import_stack[ptr].temp_name = temp_name; + import_stack[ptr].input_name = input_name; + import_stack[ptr].line_number = line_number; + import_stack_ptr++; + input_name = path; + line_number = 1; - name = xstrdup( "widl.XXXXXX" ); - if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + name = xstrdup( "widl.XXXXXX" ); + if((fd = mkstemps( name, 0 )) == -1) + error("Could not generate a temp name from %s\n", name); - temp_name = name; - if (!(f = fdopen(fd, "wt"))) - error("Could not open fd %s for writing\n", name); + temp_name = name; + if (!(f = fdopen(fd, "wt"))) + error("Could not open fd %s for writing\n", name); - ret = wpp_parse( path, f ); - fclose( f ); - if (ret) exit(1); + ret = wpp_parse( path, f ); + fclose( f ); + if (ret) exit(1); - if((f = fopen(temp_name, "r")) == NULL) - error_loc("Unable to open %s\n", temp_name); + if((f = fopen(temp_name, "r")) == NULL) + error_loc("Unable to open %s\n", temp_name); - import_stack[ptr].state = YY_CURRENT_BUFFER; - yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); - return 1; + import_stack[ptr].state = YY_CURRENT_BUFFER; + yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); + return 1; } void abort_import(void)

1 0

Józef Kucia : dxgi: Allow wrapping adapter objects.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: de28d86057764efa2d8eaf35552449e734f2cd7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=de28d86057764efa2d8eaf35… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 26 22:09:02 2018 +0100 dxgi: Allow wrapping adapter objects. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 18 +++++++++++++++--- include/wine/winedxgi.idl | 9 +++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 5440f2a..2ebf24e 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -33,7 +33,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter1 *ifac { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_IDXGIAdapter1) + if (IsEqualGUID(iid, &IID_IWineDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIAdapter1) || IsEqualGUID(iid, &IID_IDXGIAdapter) || IsEqualGUID(iid, &IID_IDXGIObject) || IsEqualGUID(iid, &IID_IUnknown)) @@ -260,10 +261,21 @@ static const struct IDXGIAdapter1Vtbl dxgi_adapter_vtbl = struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter1(IDXGIAdapter1 *iface) { + IWineDXGIAdapter *wine_adapter; + struct dxgi_adapter *adapter; + HRESULT hr; + if (!iface) return NULL; - assert(iface->lpVtbl == &dxgi_adapter_vtbl); - return CONTAINING_RECORD(iface, struct dxgi_adapter, IDXGIAdapter1_iface); + if (FAILED(hr = IDXGIAdapter1_QueryInterface(iface, &IID_IWineDXGIAdapter, (void **)&wine_adapter))) + { + ERR("Failed to get IWineDXGIAdapter interface, hr %#x.\n", hr); + return NULL; + } + assert(wine_adapter->lpVtbl == (void *)&dxgi_adapter_vtbl); + adapter = CONTAINING_RECORD(wine_adapter, struct dxgi_adapter, IDXGIAdapter1_iface); + IWineDXGIAdapter_Release(wine_adapter); + return adapter; } static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory *factory, UINT ordinal) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index a4f715b..983cdba 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -50,3 +50,12 @@ interface IWineDXGIDeviceParent : IUnknown { struct wined3d_device_parent *get_wined3d_device_parent(); } + +[ + object, + local, + uuid(17399d75-964e-4c03-99f8-9d4fd196dd62) +] +interface IWineDXGIAdapter : IDXGIAdapter1 +{ +}

1 0

Martin Storsjo : msvcrt: Optimize the aarch64 setjmp/longjmp using stp/ ldp.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: 85635db0ea7c4a8fee6612fe10c9d4aacf45e659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85635db0ea7c4a8fee6612fe… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 22 00:04:29 2018 +0200 msvcrt: Optimize the aarch64 setjmp/longjmp using stp/ldp. stp/ldp don't require any more alignment than the normal str/ldr. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm64.c | 74 +++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 904d006..2576928 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -141,65 +141,45 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, * _setjmpex (MSVCRT.@) */ __ASM_GLOBAL_FUNC(MSVCRT__setjmpex, - "str x1, [x0]\n\t" /* jmp_buf->Frame */ - "str x19, [x0, #0x10]\n\t" /* jmp_buf->X19 */ - "str x20, [x0, #0x18]\n\t" /* jmp_buf->X20 */ - "str x21, [x0, #0x20]\n\t" /* jmp_buf->X21 */ - "str x22, [x0, #0x28]\n\t" /* jmp_buf->X22 */ - "str x23, [x0, #0x30]\n\t" /* jmp_buf->X23 */ - "str x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ - "str x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ - "str x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "str x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ - "str x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ - "str x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ - "str x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */ + "str x1, [x0]\n\t" /* jmp_buf->Frame */ + "stp x19, x20, [x0, #0x10]\n\t" /* jmp_buf->X19, X20 */ + "stp x21, x22, [x0, #0x20]\n\t" /* jmp_buf->X21, X22 */ + "stp x23, x24, [x0, #0x30]\n\t" /* jmp_buf->X23, X24 */ + "stp x25, x26, [x0, #0x40]\n\t" /* jmp_buf->X25, X26 */ + "stp x27, x28, [x0, #0x50]\n\t" /* jmp_buf->X27, X28 */ + "stp x29, x30, [x0, #0x60]\n\t" /* jmp_buf->Fp, Lr */ "mov x2, sp\n\t" - "str x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ + "str x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ "mrs x2, fpcr\n\t" - "str w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ + "str w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ "mrs x2, fpsr\n\t" - "str w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ - "str d8, [x0, #0x80]\n\t" /* jmp_buf->D[0] */ - "str d9, [x0, #0x88]\n\t" /* jmp_buf->D[1] */ - "str d10, [x0, #0x90]\n\t" /* jmp_buf->D[2] */ - "str d11, [x0, #0x98]\n\t" /* jmp_buf->D[3] */ - "str d12, [x0, #0xa0]\n\t" /* jmp_buf->D[4] */ - "str d13, [x0, #0xa8]\n\t" /* jmp_buf->D[5] */ - "str d14, [x0, #0xb0]\n\t" /* jmp_buf->D[6] */ - "str d15, [x0, #0xb8]\n\t" /* jmp_buf->D[7] */ + "str w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ + "stp d8, d9, [x0, #0x80]\n\t" /* jmp_buf->D[0-1] */ + "stp d10, d11, [x0, #0x90]\n\t" /* jmp_buf->D[2-3] */ + "stp d12, d13, [x0, #0xa0]\n\t" /* jmp_buf->D[4-5] */ + "stp d14, d15, [x0, #0xb0]\n\t" /* jmp_buf->D[6-7] */ "mov x0, #0\n\t" "ret"); extern void DECLSPEC_NORETURN CDECL longjmp_set_regs(struct MSVCRT___JUMP_BUFFER *jmp, int retval); __ASM_GLOBAL_FUNC(longjmp_set_regs, - "ldr x19, [x0, #0x10]\n\t" /* jmp_buf->X19 */ - "ldr x20, [x0, #0x18]\n\t" /* jmp_buf->X20 */ - "ldr x21, [x0, #0x20]\n\t" /* jmp_buf->X21 */ - "ldr x22, [x0, #0x28]\n\t" /* jmp_buf->X22 */ - "ldr x23, [x0, #0x30]\n\t" /* jmp_buf->X23 */ - "ldr x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ - "ldr x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ - "ldr x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "ldr x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ - "ldr x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ - "ldr x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ - "ldr x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */ - "ldr x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ + "ldp x19, x20, [x0, #0x10]\n\t" /* jmp_buf->X19, X20 */ + "ldp x21, x22, [x0, #0x20]\n\t" /* jmp_buf->X21, X22 */ + "ldp x23, x24, [x0, #0x30]\n\t" /* jmp_buf->X23, X24 */ + "ldp x25, x26, [x0, #0x40]\n\t" /* jmp_buf->X25, X26 */ + "ldp x27, x28, [x0, #0x50]\n\t" /* jmp_buf->X27, X28 */ + "ldp x29, x30, [x0, #0x60]\n\t" /* jmp_buf->Fp, Lr */ + "ldr x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ "mov sp, x2\n\t" - "ldr w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ + "ldr w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ "msr fpcr, x2\n\t" - "ldr w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ + "ldr w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ "msr fpsr, x2\n\t" - "ldr d8, [x0, #0x80]\n\t" /* jmp_buf->D[0] */ - "ldr d9, [x0, #0x88]\n\t" /* jmp_buf->D[1] */ - "ldr d10, [x0, #0x90]\n\t" /* jmp_buf->D[2] */ - "ldr d11, [x0, #0x98]\n\t" /* jmp_buf->D[3] */ - "ldr d12, [x0, #0xa0]\n\t" /* jmp_buf->D[4] */ - "ldr d13, [x0, #0xa8]\n\t" /* jmp_buf->D[5] */ - "ldr d14, [x0, #0xb0]\n\t" /* jmp_buf->D[6] */ - "ldr d15, [x0, #0xb8]\n\t" /* jmp_buf->D[7] */ + "ldp d8, d9, [x0, #0x80]\n\t" /* jmp_buf->D[0-1] */ + "ldp d10, d11, [x0, #0x90]\n\t" /* jmp_buf->D[2-3] */ + "ldp d12, d13, [x0, #0xa0]\n\t" /* jmp_buf->D[4-5] */ + "ldp d14, d15, [x0, #0xb0]\n\t" /* jmp_buf->D[6-7] */ "mov x0, x1\n\t" /* retval */ "ret");

1 0

Alexandre Julliard : winex11: Use the correct colormap for the OpenGL parent window.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: d6332e0e57a7206e0caf5cf15b509c1ab4769a40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6332e0e57a7206e0caf5cf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:35:38 2018 +0100 winex11: Use the correct colormap for the OpenGL parent window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e976ad7..7401288 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1370,10 +1370,13 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) XSetWindowAttributes attrib; attrib.override_redirect = True; + attrib.border_pixel = 0; if (!dummy_parent) { + attrib.colormap = default_colormap; dummy_parent = XCreateWindow( gdi_display, root_window, -1, -1, 1, 1, 0, default_visual.depth, - InputOutput, default_visual.visual, CWOverrideRedirect, &attrib ); + InputOutput, default_visual.visual, + CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); XMapWindow( gdi_display, dummy_parent ); } gl->colormap = XCreateColormap(gdi_display, dummy_parent, gl->visual->visual, @@ -1388,7 +1391,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) gl->window = XCreateWindow( gdi_display, dummy_parent, 0, 0, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, 0, gl->visual->depth, InputOutput, gl->visual->visual, - CWColormap | CWOverrideRedirect, &attrib ); + CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); if (gl->window) { gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL );

1 0

Alexandre Julliard : winex11: Use a separate XRender format for the root window.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: a2a2b5bc885b96748c4e0df5f54a9341b5e8d19c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2a2b5bc885b96748c4e0df5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:36:21 2018 +0100 winex11: Use a separate XRender format for the root window. When using a custom visual, the default format may not work with the root window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrender.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cefbd22..b9b7c4f 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -68,6 +68,7 @@ enum wxr_format WXR_FORMAT_B8G8R8A8, WXR_FORMAT_X8R8G8B8, WXR_FORMAT_B8G8R8X8, + WXR_FORMAT_ROOT, /* placeholder for the format to use on the root window */ WXR_NB_FORMATS, WXR_INVALID_FORMAT = WXR_NB_FORMATS }; @@ -273,6 +274,13 @@ static int load_xrender_formats(void) { XRenderPictFormat templ; + if (i == WXR_FORMAT_ROOT) + { + pict_formats[i] = pXRenderFindVisualFormat(gdi_display, + DefaultVisual( gdi_display, DefaultScreen(gdi_display) )); + TRACE( "Loaded root pict_format with id=%#lx\n", pict_formats[i]->id ); + continue; + } if(is_wxrformat_compatible_with_default_visual(&wxr_formats_template[i])) { pict_formats[i] = pXRenderFindVisualFormat(gdi_display, default_visual.visual); @@ -875,6 +883,16 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) return ret; } +static void set_physdev_format( struct xrender_physdev *physdev, enum wxr_format format ) +{ + if (physdev->x11dev->drawable == DefaultRootWindow( gdi_display )) + physdev->format = WXR_FORMAT_ROOT; + else + physdev->format = format; + + physdev->pict_format = pict_formats[physdev->format]; +} + static BOOL create_xrender_dc( PHYSDEV *pdev, enum wxr_format format ) { X11DRV_PDEVICE *x11dev = get_x11drv_dev( *pdev ); @@ -883,8 +901,7 @@ static BOOL create_xrender_dc( PHYSDEV *pdev, enum wxr_format format ) if (!physdev) return FALSE; physdev->x11dev = x11dev; physdev->cache_index = -1; - physdev->format = format; - physdev->pict_format = pict_formats[format]; + set_physdev_format( physdev, format ); push_dc_driver( pdev, &physdev->dev, &xrender_funcs ); return TRUE; } @@ -974,7 +991,11 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID if (*(const enum x11drv_escape_codes *)in_data == X11DRV_SET_DRAWABLE) { BOOL ret = dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); - if (ret) free_xrender_picture( physdev ); /* pict format doesn't change, only drawable */ + if (ret) + { + free_xrender_picture( physdev ); + set_physdev_format( physdev, default_format ); + } return ret; } }

1 0

Alexandre Julliard : winex11: Force the alpha bits in the window surface for 32-bit visuals.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: dcf526b5b1d1929af58a83254b6b54437bbc794e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcf526b5b1d1929af58a8325… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:37:44 2018 +0100 winex11: Force the alpha bits in the window surface for 32-bit visuals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 80256dc..6a858c1 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1067,8 +1067,8 @@ static inline BOOL image_needs_byteswap( XImage *image, BOOL is_r8g8b8, int bit_ /* copy image bits with byte swapping and/or pixel mapping */ static void copy_image_byteswap( BITMAPINFO *info, const unsigned char *src, unsigned char *dst, - int src_stride, int dst_stride, int height, - BOOL byteswap, const int *mapping, unsigned int zeropad_mask ) + int src_stride, int dst_stride, int height, BOOL byteswap, + const int *mapping, unsigned int zeropad_mask, unsigned int alpha_bits ) { int x, y, padding_pos = abs(dst_stride) / sizeof(unsigned int) - 1; @@ -1148,7 +1148,7 @@ static void copy_image_byteswap( BITMAPINFO *info, const unsigned char *src, uns case 32: for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) for (x = 0; x < info->bmiHeader.biWidth; x++) - ((ULONG *)dst)[x] = RtlUlongByteSwap( ((const ULONG *)src)[x] ); + ((ULONG *)dst)[x] = RtlUlongByteSwap( ((const ULONG *)src)[x] | alpha_bits ); break; } } @@ -1200,7 +1200,7 @@ DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, } copy_image_byteswap( info, src, dst, image->bytes_per_line, width_bytes, height, - need_byteswap, mapping, zeropad_mask ); + need_byteswap, mapping, zeropad_mask, 0 ); return ERROR_SUCCESS; } @@ -1565,6 +1565,7 @@ struct x11drv_window_surface RECT bounds; BOOL byteswap; BOOL is_argb; + DWORD alpha_bits; COLORREF color_key; HRGN region; void *bits; @@ -1918,7 +1919,16 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) dst += coords.visrect.top * width_bytes; copy_image_byteswap( &surface->info, src, dst, width_bytes, width_bytes, coords.visrect.bottom - coords.visrect.top, - surface->byteswap, mapping, ~0u ); + surface->byteswap, mapping, ~0u, surface->alpha_bits ); + } + else if (surface->alpha_bits) + { + int x, y, stride = surface->image->bytes_per_line / sizeof(ULONG); + ULONG *ptr = (ULONG *)dst + coords.visrect.top * stride; + + for (y = coords.visrect.top; y < coords.visrect.bottom; y++, ptr += stride) + for (x = coords.visrect.left; x < coords.visrect.right; x++) + ptr[x] |= surface->alpha_bits; } #ifdef HAVE_LIBXXSHM @@ -2033,6 +2043,9 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co XSetSubwindowMode( gdi_display, surface->gc, IncludeInferiors ); surface->byteswap = image_needs_byteswap( surface->image, is_r8g8b8(vis), format->bits_per_pixel ); + if (vis->depth == 32 && !surface->is_argb) + surface->alpha_bits = ~(vis->red_mask | vis->green_mask | vis->blue_mask); + if (surface->byteswap || format->bits_per_pixel == 4 || format->bits_per_pixel == 8) { /* allocate separate surface bits if byte swapping or palette mapping is required */

1 0

Alexandre Julliard : winex11: Support using an ARGB visual as default visual.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: e40ff92e7c80082c449c480e457cba7525e0bbcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e40ff92e7c80082c449c480e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:39:03 2018 +0100 winex11: Support using an ARGB visual as default visual. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 4 ++-- dlls/winex11.drv/window.c | 17 ++++++++++------- dlls/winex11.drv/x11drv.h | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 815e554..da322e0 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -644,14 +644,14 @@ static void dock_systray_icon( Display *display, struct tray_icon *icon, Window get_systray_visual_info( display, systray_window, &visual ); - icon->layered = (visual.visualid != default_visual.visualid); + icon->layered = (visual.depth == 32); icon->window = CreateWindowExW( icon->layered ? WS_EX_LAYERED : 0, icon_classname, NULL, WS_CLIPSIBLINGS | WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, icon_cx, icon_cy, NULL, NULL, NULL, icon ); if (!(data = get_win_data( icon->window ))) return; - if (icon->layered) set_window_visual( data, &visual ); + if (icon->layered) set_window_visual( data, &visual, TRUE ); make_window_embedded( data ); window = data->whole_window; release_win_data( data ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a7651fb..a6101ad 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1557,16 +1557,19 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des * * Change the visual by destroying and recreating the X window if needed. */ -void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis ) +void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ) { Window client_window = data->client_window; Window whole_window = data->whole_window; + if (!data->use_alpha == !use_alpha) return; + if (data->surface) window_surface_release( data->surface ); + data->surface = NULL; + data->use_alpha = use_alpha; + if (data->vis.visualid == vis->visualid) return; data->client_window = 0; destroy_whole_window( data, client_window != 0 /* don't destroy whole_window until reparented */ ); - if (data->surface) window_surface_release( data->surface ); - data->surface = NULL; data->vis = *vis; create_whole_window( data ); if (!client_window) return; @@ -1613,7 +1616,7 @@ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) /* changing WS_EX_LAYERED resets attributes */ { data->layered = FALSE; - set_window_visual( data, &default_visual ); + set_window_visual( data, &default_visual, FALSE ); sync_window_opacity( data->display, data->whole_window, 0, 0, 0 ); if (data->surface) set_surface_color_key( data->surface, CLR_INVALID ); } @@ -2197,7 +2200,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!data->whole_window && !data->embedded) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; - if (data->vis.visualid != default_visual.visualid) goto done; + if (data->use_alpha) goto done; if (!get_surface_rect( visible_rect, &surface_rect )) goto done; if (*surface) window_surface_release( *surface ); @@ -2502,7 +2505,7 @@ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph if (data) { - set_window_visual( data, &default_visual ); + set_window_visual( data, &default_visual, FALSE ); if (data->whole_window) sync_window_opacity( data->display, data->whole_window, key, alpha, flags ); @@ -2558,7 +2561,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO if (!(data = get_win_data( hwnd ))) return FALSE; data->layered = TRUE; - if (!data->embedded && argb_visual.visualid) set_window_visual( data, &argb_visual ); + if (!data->embedded && argb_visual.visualid) set_window_visual( data, &argb_visual, TRUE ); rect = *window_rect; OffsetRect( &rect, -window_rect->left, -window_rect->top ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 938ff22..eca0dc5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -562,6 +562,7 @@ struct x11drv_win_data BOOL embedded : 1; /* is window an XEMBED client? */ BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ + BOOL use_alpha : 1; /* does window use an alpha channel? */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ @@ -589,7 +590,7 @@ extern void read_net_wm_states( Display *display, struct x11drv_win_data *data ) extern void update_net_wm_states( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern void make_window_embedded( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *visual ) DECLSPEC_HIDDEN; -extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis ) DECLSPEC_HIDDEN; +extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ) DECLSPEC_HIDDEN; extern void change_systray_owner( Display *display, Window systray_window ) DECLSPEC_HIDDEN; extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Default to an ARGB visual when depth is set to 32.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: 31c7a7157d991d3d60ff8985fa1061c9eb97142a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31c7a7157d991d3d60ff8985… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:39:22 2018 +0100 winex11: Default to an ARGB visual when depth is set to 32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index a2ec18b..e67a3c0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -484,11 +484,29 @@ static void init_visuals( Display *display, int screen ) int count; XVisualInfo *info; + argb_visual.screen = screen; + argb_visual.class = TrueColor; + argb_visual.depth = 32; + argb_visual.red_mask = 0xff0000; + argb_visual.green_mask = 0x00ff00; + argb_visual.blue_mask = 0x0000ff; + + if ((info = XGetVisualInfo( display, VisualScreenMask | VisualDepthMask | VisualClassMask | + VisualRedMaskMask | VisualGreenMaskMask | VisualBlueMaskMask, + &argb_visual, &count ))) + { + argb_visual = *info; + XFree( info ); + } + default_visual.screen = screen; if (default_visual.depth) /* depth specified */ { - info = XGetVisualInfo( display, VisualScreenMask | VisualDepthMask, &default_visual, &count ); - if (info) + if (default_visual.depth == 32 && argb_visual.visual) + { + default_visual = argb_visual; + } + else if ((info = XGetVisualInfo( display, VisualScreenMask | VisualDepthMask, &default_visual, &count ))) { default_visual = *info; XFree( info ); @@ -510,20 +528,6 @@ static void init_visuals( Display *display, int screen ) } default_colormap = XCreateColormap( display, root_window, default_visual.visual, AllocNone ); - argb_visual.screen = screen; - argb_visual.class = TrueColor; - argb_visual.depth = 32; - argb_visual.red_mask = 0xff0000; - argb_visual.green_mask = 0x00ff00; - argb_visual.blue_mask = 0x0000ff; - - if ((info = XGetVisualInfo( display, VisualScreenMask | VisualDepthMask | VisualClassMask | - VisualRedMaskMask | VisualGreenMaskMask | VisualBlueMaskMask, - &argb_visual, &count ))) - { - argb_visual = *info; - XFree( info ); - } TRACE( "default visual %lx class %u argb %lx\n", default_visual.visualid, default_visual.class, argb_visual.visualid ); }

1 0