wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Henri Verbeet : wined3d: Use the global memory allocation helpers.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: f08342f5737c2bb3f965059f930e5d9a25ff6268 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f08342f5737c2bb3f965059f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 14 10:27:59 2018 +0330 wined3d: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 136 ++++++++++++++++++----------------- dlls/wined3d/ati_fragment_shader.c | 18 ++--- dlls/wined3d/buffer.c | 29 ++++---- dlls/wined3d/context.c | 68 +++++++++--------- dlls/wined3d/cs.c | 32 ++++----- dlls/wined3d/device.c | 42 +++++------ dlls/wined3d/directx.c | 37 +++++----- dlls/wined3d/glsl_shader.c | 144 ++++++++++++++++++------------------- dlls/wined3d/palette.c | 7 +- dlls/wined3d/query.c | 32 ++++----- dlls/wined3d/resource.c | 4 +- dlls/wined3d/sampler.c | 4 +- dlls/wined3d/shader.c | 138 ++++++++++++++++++----------------- dlls/wined3d/shader_sm1.c | 6 +- dlls/wined3d/shader_sm4.c | 8 +-- dlls/wined3d/state.c | 23 +++--- dlls/wined3d/stateblock.c | 11 ++- dlls/wined3d/surface.c | 36 +++++----- dlls/wined3d/swapchain.c | 22 +++--- dlls/wined3d/texture.c | 26 +++---- dlls/wined3d/utils.c | 8 +-- dlls/wined3d/vertexdeclaration.c | 19 +++-- dlls/wined3d/view.c | 18 ++--- dlls/wined3d/wined3d_main.c | 16 ++--- dlls/wined3d/wined3d_private.h | 8 +-- 25 files changed, 439 insertions(+), 453 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f08342f5737c2bb3f965…

1 0

Henri Verbeet : wined3d: Rename WINED3D_SWAP_EFFECT_FLIP to WINED3D_SWAP_EFFECT_SEQUENTIAL.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: 4e37d1c01d8c4161f6081ee022ca32b0f44514b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e37d1c01d8c4161f6081ee0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 14 10:27:58 2018 +0330 wined3d: Rename WINED3D_SWAP_EFFECT_FLIP to WINED3D_SWAP_EFFECT_SEQUENTIAL. For consistency with DXGI. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wined3d.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ed7445e..70b94f5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -506,7 +506,7 @@ enum wined3d_patch_edge_style enum wined3d_swap_effect { WINED3D_SWAP_EFFECT_DISCARD = 1, - WINED3D_SWAP_EFFECT_FLIP = 2, + WINED3D_SWAP_EFFECT_SEQUENTIAL = 2, WINED3D_SWAP_EFFECT_COPY = 3, WINED3D_SWAP_EFFECT_COPY_VSYNC = 4, };

1 0

Henri Verbeet : wined3d: Get rid of the WINED3D_SWAP_EFFECT_FLIP fixme in swapchain_gl_present().
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: 16e54c80c8e9eb4f1eb4fcfca04faf187d97acd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16e54c80c8e9eb4f1eb4fcfc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 14 10:27:57 2018 +0330 wined3d: Get rid of the WINED3D_SWAP_EFFECT_FLIP fixme in swapchain_gl_present(). I think this works about as well as it's going to. There may be a theoretical issue that GDI draws to the window should end up in the backbuffer after a flip, but I don't think we have tests showing that to actually be the case, and generally speaking I'm not all that worried about it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 60b8613..fb89099 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -469,14 +469,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, } if (swapchain->render_to_fbo) - { - static unsigned int once; - - if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP && !once++) - FIXME("WINED3D_SWAP_EFFECT_FLIP not implemented.\n"); - swapchain_blit(swapchain, context, src_rect, dst_rect); - } if (swapchain->num_contexts > 1) gl_info->gl_ops.gl.p_glFinish();

1 0

Henri Verbeet : wined3d: Do not implicitly set WINED3D_RESOURCE_ACCESS_MAP for dynamic resources.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: 02dc04bcc94306f06c6eb2915bef795efa32d7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02dc04bcc94306f06c6eb291… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 14 10:27:56 2018 +0330 wined3d: Do not implicitly set WINED3D_RESOURCE_ACCESS_MAP for dynamic resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 4 +++- dlls/d3d8/device.c | 6 +++--- dlls/d3d8/texture.c | 6 +++--- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/d3d9_private.h | 4 +++- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/texture.c | 6 +++--- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/executebuffer.c | 2 +- dlls/wined3d/resource.c | 2 -- 11 files changed, 25 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02dc04bcc94306f06c6e…

1 0

Henri Verbeet : wined3d: Enforce map access on all resources.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: 7772c4fdbf33507b2262da375b465d4c2cbc316d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7772c4fdbf33507b2262da37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 14 10:27:55 2018 +0330 wined3d: Enforce map access on all resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 6 ++++++ dlls/wined3d/texture.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index e318888..3b07e0c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -346,6 +346,12 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); + if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP)) + { + WARN("Resource is not mappable.\n"); + return WINED3DERR_INVALIDCALL; + } + flags = wined3d_resource_sanitise_map_flags(resource, flags); wined3d_resource_wait_idle(resource); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c9210cb..dd6a2dd 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1897,12 +1897,6 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return WINED3DERR_INVALIDCALL; } - if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP)) - { - WARN("Trying to map unmappable texture.\n"); - return WINED3DERR_INVALIDCALL; - } - if (texture->flags & WINED3D_TEXTURE_DC_IN_USE) { WARN("DC is in use.\n");

1 0

Nikolay Sivov : uxtheme: Properly initialize text drawing options.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: ce50a7ff4df919aedd037cecf15c484c14f10d41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce50a7ff4df919aedd037cec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:39:21 2018 +0300 uxtheme: Properly initialize text drawing options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index e917dd1..d07d075 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1636,7 +1636,7 @@ HRESULT WINAPI DrawThemeText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, LPCWSTR pszText, int iCharCount, DWORD flags, DWORD flags2, const RECT *pRect) { - DTTOPTS opts; + DTTOPTS opts = { 0 }; RECT rt; TRACE("%d %d\n", iPartId, iStateId);

1 0

Nikolay Sivov : comctl32/listbox: Merge theming logic.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: 0f98b0bb298e033ba5db3f883f1bd05f0dc11102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f98b0bb298e033ba5db3f88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:35:19 2018 +0300 comctl32/listbox: Merge theming logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/listbox.c | 53 ++++++++++++++++++- dlls/comctl32/theme_listbox.c | 116 ------------------------------------------ dlls/comctl32/theming.c | 9 ---- 4 files changed, 52 insertions(+), 127 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 25d5e67..4816784 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -37,7 +37,6 @@ C_SRCS = \ tab.c \ taskdialog.c \ theme_dialog.c \ - theme_listbox.c \ theme_scrollbar.c \ theming.c \ toolbar.c \ diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 7a16500..3184e20 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2,6 +2,7 @@ * Listbox controls * * Copyright 1996 Alexandre Julliard + * Copyright 2005 Frank Richter * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,8 @@ #include "wingdi.h" #include "winuser.h" #include "commctrl.h" +#include "uxtheme.h" +#include "vssym32.h" #include "wine/unicode.h" #include "wine/exception.h" #include "wine/debug.h" @@ -1072,6 +1075,38 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) return 0; } +static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) +{ + DWORD exstyle = GetWindowLongW( descr->self, GWL_EXSTYLE); + HTHEME theme = GetWindowTheme( descr->self ); + HRGN cliprgn = region; + int cxEdge, cyEdge; + HDC hdc; + RECT r; + + if (!theme || !(exstyle & WS_EX_CLIENTEDGE)) + return; + + cxEdge = GetSystemMetrics(SM_CXEDGE), + cyEdge = GetSystemMetrics(SM_CYEDGE); + + GetWindowRect(descr->self, &r); + + /* New clipping region passed to default proc to exclude border */ + cliprgn = CreateRectRgn(r.left + cxEdge, r.top + cyEdge, + r.right - cxEdge, r.bottom - cyEdge); + if (region != (HRGN)1) + CombineRgn(cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + + hdc = GetDCEx(descr->self, region, DCX_WINDOW|DCX_INTERSECTRGN); + OffsetRect(&r, -r.left, -r.top); + + if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) + DrawThemeParentBackground(descr->self, hdc, &r); + DrawThemeBackground (theme, hdc, 0, 0, &r, 0); + ReleaseDC(descr->self, hdc); +} /*********************************************************************** * LISTBOX_InvalidateItems @@ -2500,6 +2535,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) } } + OpenThemeData( descr->self, WC_LISTBOXW ); + TRACE("owner: %p, style: %08x, width: %d, height: %d\n", descr->owner, descr->style, descr->width, descr->height); return TRUE; } @@ -2510,6 +2547,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) */ static BOOL LISTBOX_Destroy( LB_DESCR *descr ) { + HTHEME theme = GetWindowTheme( descr->self ); + CloseThemeData( theme ); LISTBOX_ResetContent( descr ); SetWindowLongPtrW( descr->self, 0, 0 ); HeapFree( GetProcessHeap(), 0, descr ); @@ -2523,7 +2562,8 @@ static BOOL LISTBOX_Destroy( LB_DESCR *descr ) static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 ); - LPHEADCOMBO lphc = 0; + HEADCOMBO *lphc = NULL; + HTHEME theme; LRESULT ret; if (!descr) @@ -2833,6 +2873,11 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, if( !wParam ) EndPaint( descr->self, &ps ); } return ret; + + case WM_NCPAINT: + LISTBOX_NCPaint( descr, (HRGN)wParam ); + break; + case WM_SIZE: LISTBOX_UpdateSize( descr ); return 0; @@ -2983,6 +3028,12 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, if (lphc) return 0; break; + case WM_THEMECHANGED: + theme = GetWindowTheme( hwnd ); + CloseThemeData( theme ); + OpenThemeData( hwnd, WC_LISTBOXW ); + break; + default: if ((msg >= WM_USER) && (msg < 0xc000)) WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n", diff --git a/dlls/comctl32/theme_listbox.c b/dlls/comctl32/theme_listbox.c deleted file mode 100644 index 9177214..0000000 --- a/dlls/comctl32/theme_listbox.c +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Theming - List box control - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "comctl32.h" -#include "wine/debug.h" - -/* Draw themed border */ -static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) -{ - HRGN cliprgn = region; - DWORD exStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); - if (exStyle & WS_EX_CLIENTEDGE) - { - HDC dc; - RECT r; - int cxEdge = GetSystemMetrics (SM_CXEDGE), - cyEdge = GetSystemMetrics (SM_CYEDGE); - - GetWindowRect(hwnd, &r); - - /* New clipping region passed to default proc to exclude border */ - cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, - r.right - cxEdge, r.bottom - cyEdge); - if (region != (HRGN)1) - CombineRgn (cliprgn, cliprgn, region, RGN_AND); - OffsetRect(&r, -r.left, -r.top); - - dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); - - if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) - DrawThemeParentBackground(hwnd, dc, &r); - DrawThemeBackground (theme, dc, 0, 0, &r, 0); - ReleaseDC(hwnd, dc); - } - - /* Call default proc to get the scrollbars etc. painted */ - DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); -} - -/********************************************************************** - * The list control subclass window proc. - */ -LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, - ULONG_PTR dwRefData) -{ - const WCHAR* themeClass = WC_LISTBOXW; - HTHEME theme; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - OpenThemeData( hwnd, themeClass ); - return result; - - case WM_DESTROY: - theme = GetWindowTheme( hwnd ); - CloseThemeData ( theme ); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - - case WM_THEMECHANGED: - theme = GetWindowTheme( hwnd ); - CloseThemeData ( theme ); - OpenThemeData( hwnd, themeClass ); - break; - - case WM_SYSCOLORCHANGE: - theme = GetWindowTheme( hwnd ); - if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - - case WM_NCPAINT: - theme = GetWindowTheme( hwnd ); - if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - nc_paint (theme, hwnd, (HRGN)wParam); - break; - - default: - /* Call old proc */ - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - } - return 0; -} diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index 0d47489..e9305cc 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -36,13 +36,10 @@ typedef LRESULT (CALLBACK* THEMING_SUBCLASSPROC)(HWND, UINT, WPARAM, LPARAM, extern LRESULT CALLBACK THEMING_DialogSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; -extern LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND, UINT, WPARAM, LPARAM, - ULONG_PTR) DECLSPEC_HIDDEN; extern LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; static const WCHAR dialogClass[] = {'#','3','2','7','7','0',0}; -static const WCHAR comboLboxClass[] = {'C','o','m','b','o','L','b','o','x',0}; static const struct ThemingSubclass { @@ -51,8 +48,6 @@ static const struct ThemingSubclass } subclasses[] = { /* Note: list must be sorted by class name */ {dialogClass, THEMING_DialogSubclassProc}, - {comboLboxClass, THEMING_ListBoxSubclassProc}, - {WC_LISTBOXW, THEMING_ListBoxSubclassProc}, {WC_SCROLLBARW, THEMING_ScrollbarSubclassProc} }; @@ -85,14 +80,10 @@ static LRESULT CALLBACK subclass_proc ## N (HWND wnd, UINT msg, \ MAKE_SUBCLASS_PROC(0) MAKE_SUBCLASS_PROC(1) -MAKE_SUBCLASS_PROC(2) -MAKE_SUBCLASS_PROC(3) static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, subclass_proc1, - subclass_proc2, - subclass_proc3, }; /***********************************************************************

1 0

Nikolay Sivov : comctl32: Introduce ListBox control.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: 04fe481d2b080aa156eeb22f2a82f6c329e19c07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04fe481d2b080aa156eeb22f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:35:18 2018 +0300 comctl32: Introduce ListBox control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/combo.c | 35 - dlls/comctl32/comctl32.h | 44 + dlls/comctl32/commctrl.c | 4 + dlls/comctl32/listbox.c | 3024 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/misc.c | 4 +- dlls/user32/class.c | 2 - 7 files changed, 3076 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04fe481d2b080aa156ee…

1 0

Nikolay Sivov : comctl32/comboex: Remove child windows subclass on window destruction.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: 6204bbc389dbf762bb7377faae63f8b1dc51c5af URL: https://source.winehq.org/git/wine.git/?a=commit;h=6204bbc389dbf762bb7377fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:34:17 2018 +0300 comctl32/comboex: Remove child windows subclass on window destruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comboex.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 076a552..3c3714a 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1502,10 +1502,10 @@ static void COMBOEX_ResetContent (COMBOEX_INFO *infoPtr) static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) { if (infoPtr->hwndCombo) - RemoveWindowSubclass(infoPtr->hwndCombo, COMBOEX_ComboWndProc, COMBO_SUBCLASSID); + SetWindowSubclass(infoPtr->hwndCombo, COMBOEX_ComboWndProc, COMBO_SUBCLASSID, 0); if (infoPtr->hwndEdit) - RemoveWindowSubclass(infoPtr->hwndEdit, COMBOEX_EditWndProc, EDIT_SUBCLASSID); + SetWindowSubclass(infoPtr->hwndEdit, COMBOEX_EditWndProc, EDIT_SUBCLASSID, 0); COMBOEX_FreeText (&infoPtr->edit); COMBOEX_ResetContent (infoPtr); @@ -1668,7 +1668,11 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n", hwnd, uMsg, wParam, lParam, infoPtr); - if (!infoPtr) return 0; + if (uMsg == WM_NCDESTROY) + RemoveWindowSubclass(hwnd, COMBOEX_EditWndProc, EDIT_SUBCLASSID); + + if (!infoPtr) + return DefSubclassProc(hwnd, uMsg, wParam, lParam); switch (uMsg) { @@ -1823,11 +1827,14 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n", hwnd, uMsg, wParam, lParam, infoPtr); - if (!infoPtr) return 0; + if (uMsg == WM_NCDESTROY) + RemoveWindowSubclass(hwnd, COMBOEX_ComboWndProc, COMBO_SUBCLASSID); + + if (!infoPtr) + return DefSubclassProc(hwnd, uMsg, wParam, lParam); switch (uMsg) { - case WM_DRAWITEM: /* * The only way this message should come is from the @@ -1835,7 +1842,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, * that ComboEx knows this is listbox. */ ((DRAWITEMSTRUCT *)lParam)->itemState |= ODS_COMBOEXLBOX; - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; case WM_ERASEBKGND: hDC = (HDC) wParam; @@ -1844,7 +1851,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, TRACE("erasing (%s)\n", wine_dbgstr_rect(&rect)); ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0); SetBkColor (hDC, obkc); - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; case WM_SETCURSOR: /* @@ -1858,7 +1865,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, nmmse.pt.y = 0; nmmse.dwHitInfo = lParam; COMBOEX_Notify (infoPtr, NM_SETCURSOR, (NMHDR *)&nmmse); - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; case WM_LBUTTONDOWN: GetClientRect (hwnd, &rect); @@ -1868,15 +1875,15 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); if (PtInRect(&rect, pt)) - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; infoPtr->flags |= WCBE_MOUSECAPTURED; SetCapture(hwnd); - break; + return 0; case WM_LBUTTONUP: if (!(infoPtr->flags & WCBE_MOUSECAPTURED)) - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; ReleaseCapture(); infoPtr->flags &= ~WCBE_MOUSECAPTURED; @@ -1885,7 +1892,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, } else { SendMessageW(hwnd, CB_SHOWDROPDOWN, TRUE, 0); } - break; + return 0; case WM_MOUSEMOVE: if ( (infoPtr->flags & WCBE_MOUSECAPTURED) && @@ -1894,7 +1901,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, COMBOEX_NotifyDragBegin(infoPtr, edit_text); infoPtr->flags |= WCBE_MOUSEDRAGGED; } - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; case WM_COMMAND: switch (HIWORD(wParam)) { @@ -1975,9 +1982,10 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, break; }/* fall through */ default: - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + ; } - return 0; + + return DefSubclassProc(hwnd, uMsg, wParam, lParam); }

1 0

Nikolay Sivov : comctl32/tests: Use existing macros for control class names.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: 69d90522065ecc34ef2244ca00d57eece7952375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69d90522065ecc34ef2244ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:33:50 2018 +0300 comctl32/tests: Use existing macros for control class names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 2 +- dlls/comctl32/tests/combo.c | 6 +++--- dlls/comctl32/tests/static.c | 3 ++- dlls/comctl32/tests/status.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 96b8bea..47aee3f 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -454,7 +454,7 @@ static HWND create_button(DWORD style, HWND parent) style |= WS_CHILD|BS_NOTIFY; menuid = (HMENU)ID_BUTTON; } - hwnd = CreateWindowExA(0, "Button", "test", style, 0, 0, 50, 14, parent, menuid, 0, NULL); + hwnd = CreateWindowExA(0, WC_BUTTONA, "test", style, 0, 0, 50, 14, parent, menuid, 0, NULL); ok(hwnd != NULL, "failed to create a button, 0x%08x, %p\n", style, parent); pSetWindowSubclass(hwnd, button_subclass_proc, 0, 0); return hwnd; diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index da2ded2..b045739 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -507,7 +507,7 @@ static BOOL init(void) wc.lpfnWndProc = ComboExTestWndProc; RegisterClassA(&wc); - hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); + hMainWnd = CreateWindowA(WC_STATICA, "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); hComboExParentWnd = CreateWindowExA(0, ComboExTestClass, "ComboEx test", WS_OVERLAPPEDWINDOW|WS_VISIBLE, @@ -606,7 +606,7 @@ static void test_comboex_get_set_item(void) static HWND create_combobox(DWORD style) { - return CreateWindowA("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + return CreateWindowA(WC_COMBOBOXA, "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)COMBO_ID, NULL, 0); } static int font_height(HFONT hFont) @@ -1035,7 +1035,7 @@ static void test_combo_editselection_focus(DWORD style) get_combobox_info(hCombo, &cbInfo); hEdit = cbInfo.hwndItem; - hButton = CreateWindowA("Button", "OK", WS_VISIBLE|WS_CHILD|BS_DEFPUSHBUTTON, + hButton = CreateWindowA(WC_BUTTONA, "OK", WS_VISIBLE|WS_CHILD|BS_DEFPUSHBUTTON, 5, 50, 100, 20, hMainWnd, NULL, (HINSTANCE)GetWindowLongPtrA(hMainWnd, GWLP_HINSTANCE), NULL); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 890fcf5..a65e352 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -23,6 +23,7 @@ #define STRICT #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include "commctrl.h" #include "wine/test.h" @@ -53,7 +54,7 @@ static void flush_events(void) static HWND create_static(DWORD style) { - return CreateWindowA("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); + return CreateWindowA(WC_STATICA, "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); } static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index f2fe1ab..2308974 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -607,7 +607,7 @@ START_TEST(status) iccex.dwICC = ICC_BAR_CLASSES; pInitCommonControlsEx(&iccex); - g_hMainWnd = CreateWindowExA(0, "static", "", WS_OVERLAPPEDWINDOW, + g_hMainWnd = CreateWindowExA(0, WC_STATICA, "", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 672+2*GetSystemMetrics(SM_CXSIZEFRAME), 226+GetSystemMetrics(SM_CYCAPTION)+2*GetSystemMetrics(SM_CYSIZEFRAME), NULL, NULL, GetModuleHandleA(NULL), 0);

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2018