February 2018 - Wine-Devel - list.winehq.org

[PATCH 1/2] comctl32/edit: Merge theming logic
by Nikolay Sivov Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/edit.c | 170 ++++++++++++++++++++++++++++++++------------- dlls/comctl32/theme_edit.c | 134 ----------------------------------- dlls/comctl32/theming.c | 3 - 4 files changed, 121 insertions(+), 187 deletions(-) delete mode 100644 dlls/comctl32/theme_edit.c diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 438da91ca0..db65bbc400 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -35,7 +35,6 @@ C_SRCS = \ theme_button.c \ theme_combo.c \ theme_dialog.c \ - theme_edit.c \ theme_listbox.c \ theme_scrollbar.c \ theming.c \ diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f32537e6a4..5b6773e7a7 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4,6 +4,7 @@ * Copyright David W. Metcalfe, 1994 * Copyright William Magro, 1995, 1996 * Copyright Frans van Dorsselaer, 1996, 1997 + * Copyright Frank Richter, 2005 * * * This library is free software; you can redistribute it and/or @@ -54,6 +55,8 @@ #include "imm.h" #include "usp10.h" #include "commctrl.h" +#include "uxtheme.h" +#include "vsstyle.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -3596,6 +3599,50 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) EndPaint(es->hwndSelf, &ps); } +static void EDIT_WM_NCPaint(HWND hwnd, HRGN region) +{ + DWORD exStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); + HTHEME theme = GetWindowTheme(hwnd); + HRGN cliprgn = region; + + if (theme && exStyle & WS_EX_CLIENTEDGE) + { + HDC dc; + RECT r; + int cxEdge = GetSystemMetrics(SM_CXEDGE), + cyEdge = GetSystemMetrics(SM_CYEDGE); + const int part = EP_EDITTEXT; + int state = ETS_NORMAL; + DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + + if (!IsWindowEnabled(hwnd)) + state = ETS_DISABLED; + else if (dwStyle & ES_READONLY) + state = ETS_READONLY; + else if (GetFocus() == hwnd) + state = ETS_FOCUSED; + + 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, part, state)) + DrawThemeParentBackground(hwnd, dc, &r); + DrawThemeBackground(theme, dc, part, state, &r, 0); + ReleaseDC(hwnd, dc); + } + + /* Call default proc to get the scrollbars etc. also painted */ + DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); +} /********************************************************************* * @@ -4356,48 +4403,53 @@ cleanup: * WM_CREATE * */ -static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name) +static LRESULT EDIT_WM_Create(EDITSTATE *es, const WCHAR *name) { - RECT clientRect; + RECT clientRect; - TRACE("%s\n", debugstr_w(name)); - /* - * To initialize some final structure members, we call some helper - * functions. However, since the EDITSTATE is not consistent (i.e. - * not fully initialized), we should be very careful which - * functions can be called, and in what order. - */ - EDIT_WM_SetFont(es, 0, FALSE); - EDIT_EM_EmptyUndoBuffer(es); + TRACE("%s\n", debugstr_w(name)); - /* We need to calculate the format rect - (applications may send EM_SETMARGINS before the control gets visible) */ - GetClientRect(es->hwndSelf, &clientRect); - EDIT_SetRectNP(es, &clientRect); - - if (name && *name) { - EDIT_EM_ReplaceSel(es, FALSE, name, strlenW(name), FALSE, FALSE); - /* if we insert text to the editline, the text scrolls out - * of the window, as the caret is placed after the insert - * pos normally; thus we reset es->selection... to 0 and - * update caret - */ - es->selection_start = es->selection_end = 0; - /* Adobe Photoshop does NOT like this. and MSDN says that EN_CHANGE - * Messages are only to be sent when the USER does something to - * change the contents. So I am removing this EN_CHANGE - * - * EDIT_NOTIFY_PARENT(es, EN_CHANGE); - */ - EDIT_EM_ScrollCaret(es); - } - /* force scroll info update */ - EDIT_UpdateScrollInfo(es); - /* The rule seems to return 1 here for success */ - /* Power Builder masked edit controls will crash */ - /* if not. */ - /* FIXME: is that in all cases so ? */ - return 1; + /* + * To initialize some final structure members, we call some helper + * functions. However, since the EDITSTATE is not consistent (i.e. + * not fully initialized), we should be very careful which + * functions can be called, and in what order. + */ + EDIT_WM_SetFont(es, 0, FALSE); + EDIT_EM_EmptyUndoBuffer(es); + + /* We need to calculate the format rect + (applications may send EM_SETMARGINS before the control gets visible) */ + GetClientRect(es->hwndSelf, &clientRect); + EDIT_SetRectNP(es, &clientRect); + + if (name && *name) + { + EDIT_EM_ReplaceSel(es, FALSE, name, strlenW(name), FALSE, FALSE); + /* if we insert text to the editline, the text scrolls out + * of the window, as the caret is placed after the insert + * pos normally; thus we reset es->selection... to 0 and + * update caret + */ + es->selection_start = es->selection_end = 0; + /* Adobe Photoshop does NOT like this. and MSDN says that EN_CHANGE + * Messages are only to be sent when the USER does something to + * change the contents. So I am removing this EN_CHANGE + * + * EDIT_NOTIFY_PARENT(es, EN_CHANGE); + */ + EDIT_EM_ScrollCaret(es); + } + + /* force scroll info update */ + EDIT_UpdateScrollInfo(es); + OpenThemeData(es->hwndSelf, WC_EDITW); + + /* The rule seems to return 1 here for success */ + /* Power Builder masked edit controls will crash */ + /* if not. */ + /* FIXME: is that in all cases so ? */ + return 1; } @@ -4409,6 +4461,10 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name) static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) { LINEDEF *pc, *pp; + HTHEME theme; + + theme = GetWindowTheme(es->hwndSelf); + CloseThemeData(theme); /* The app can own the text buffer handle */ if (es->hloc32W && (es->hloc32W != es->hlocapp)) @@ -4417,23 +4473,24 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) EDIT_InvalidateUniscribeData(es); pc = es->first_line_def; - while (pc) - { - pp = pc->next; - HeapFree(GetProcessHeap(), 0, pc); - pc = pp; - } + while (pc) + { + pp = pc->next; + HeapFree(GetProcessHeap(), 0, pc); + pc = pp; + } - SetWindowLongPtrW( es->hwndSelf, 0, 0 ); - HeapFree(GetProcessHeap(), 0, es->undo_text); - HeapFree(GetProcessHeap(), 0, es); + SetWindowLongPtrW( es->hwndSelf, 0, 0 ); + HeapFree(GetProcessHeap(), 0, es->undo_text); + HeapFree(GetProcessHeap(), 0, es); - return 0; + return 0; } static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW(hwnd, 0); + HTHEME theme = GetWindowTheme(hwnd); LRESULT result = 0; RECT *rect; @@ -4733,6 +4790,8 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_ENABLE: es->bEnableState = (BOOL) wParam; EDIT_UpdateText(es, NULL, TRUE); + if (theme) + RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); break; case WM_ERASEBKGND: @@ -4762,6 +4821,8 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_KILLFOCUS: result = EDIT_WM_KillFocus(es); + if (theme) + RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); break; case WM_LBUTTONDBLCLK: @@ -4789,12 +4850,18 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR EDIT_WM_Paint(es, (HDC)wParam); break; + case WM_NCPAINT: + EDIT_WM_NCPaint(hwnd, (HRGN)wParam); + break; + case WM_PASTE: EDIT_WM_Paste(es); break; case WM_SETFOCUS: EDIT_WM_SetFocus(es); + if (theme) + RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); break; case WM_SETFONT: @@ -4917,6 +4984,11 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR } break; + case WM_THEMECHANGED: + CloseThemeData (theme); + OpenThemeData(hwnd, WC_EDITW); + break; + default: result = DefWindowProcW(hwnd, msg, wParam, lParam); break; diff --git a/dlls/comctl32/theme_edit.c b/dlls/comctl32/theme_edit.c deleted file mode 100644 index ff4e56c069..0000000000 --- a/dlls/comctl32/theme_edit.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Theming - Edit 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); - int part = EP_EDITTEXT; - int state = ETS_NORMAL; - DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); - - if (!IsWindowEnabled (hwnd)) - state = ETS_DISABLED; - else if (dwStyle & ES_READONLY) - state = ETS_READONLY; - else if (GetFocus() == hwnd) - state = ETS_FOCUSED; - - 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, part, state)) - DrawThemeParentBackground(hwnd, dc, &r); - DrawThemeBackground (theme, dc, part, state, &r, 0); - ReleaseDC(hwnd, dc); - } - - /* Call default proc to get the scrollbars etc. also painted */ - DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); -} - -/********************************************************************** - * The edit control subclass window proc. - */ -LRESULT CALLBACK THEMING_EditSubclassProc (HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, - ULONG_PTR dwRefData) -{ - const WCHAR* themeClass = WC_EDITW; - 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; - - case WM_ENABLE: - case WM_KILLFOCUS: - case WM_SETFOCUS: - theme = GetWindowTheme( hwnd ); - if (theme) RedrawWindow (hwnd, NULL, NULL, - RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - - 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 93d6fe61f4..0f722fddce 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -60,7 +60,6 @@ static const struct ThemingSubclass {WC_BUTTONW, THEMING_ButtonSubclassProc}, {WC_COMBOBOXW, THEMING_ComboSubclassProc}, {comboLboxClass, THEMING_ListBoxSubclassProc}, - {WC_EDITW, THEMING_EditSubclassProc}, {WC_LISTBOXW, THEMING_ListBoxSubclassProc}, {WC_SCROLLBARW, THEMING_ScrollbarSubclassProc} }; @@ -98,7 +97,6 @@ MAKE_SUBCLASS_PROC(2) MAKE_SUBCLASS_PROC(3) MAKE_SUBCLASS_PROC(4) MAKE_SUBCLASS_PROC(5) -MAKE_SUBCLASS_PROC(6) static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, @@ -107,7 +105,6 @@ static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc3, subclass_proc4, subclass_proc5, - subclass_proc6 }; /*********************************************************************** -- 2.15.1

1 1

[PATCH 1/5] comctl32/updown: Use HeapAlloc() wrappers
by Nikolay Sivov Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/updown.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 67b646da0e..b75df4f22a 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -42,6 +42,7 @@ #include "comctl32.h" #include "uxtheme.h" #include "vssym32.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -920,7 +921,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L { CREATESTRUCTW *pcs = (CREATESTRUCTW*)lParam; - infoPtr = Alloc (sizeof(UPDOWN_INFO)); + infoPtr = heap_alloc_zero(sizeof(*infoPtr)); SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize the info struct */ @@ -953,9 +954,9 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L break; case WM_DESTROY: - Free (infoPtr->AccelVect); + heap_free (infoPtr->AccelVect); UPDOWN_ResetSubclass (infoPtr); - Free (infoPtr); + heap_free (infoPtr); SetWindowLongPtrW (hwnd, 0, 0); theme = GetWindowTheme (hwnd); CloseThemeData (theme); @@ -1080,13 +1081,13 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L TRACE("UDM_SETACCEL\n"); if(infoPtr->AccelVect) { - Free (infoPtr->AccelVect); + heap_free (infoPtr->AccelVect); infoPtr->AccelCount = 0; infoPtr->AccelVect = 0; } if(wParam==0) return TRUE; - infoPtr->AccelVect = Alloc (wParam*sizeof(UDACCEL)); - if(infoPtr->AccelVect == 0) return FALSE; + infoPtr->AccelVect = heap_alloc(wParam*sizeof(UDACCEL)); + if(!infoPtr->AccelVect) return FALSE; memcpy(infoPtr->AccelVect, (void*)lParam, wParam*sizeof(UDACCEL)); infoPtr->AccelCount = wParam; -- 2.15.1

1 4

[PATCH] testbot: Don't rely on the DBI defaults.
by Francois Gouget Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 3 +++ testbot/lib/WineTestBot/Config.pm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index b5bb485e..5567203b 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -608,6 +608,9 @@ sub UseDBIBackEnd($$$$$$) { my ($class, $DbSelector, $DbSource, $DbUser, $DbPassword, $DbArgs) = @_; + # The implementation assumes AutoCommit is on. + $DbArgs->{AutoCommit} = 1; + my $BackEnd = $class->new(); $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; AddDBBackEnd($DbSelector, $BackEnd); diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b1024b5c..9d7e2009 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -122,7 +122,7 @@ if (!$::BuildEnv) require ObjectModel::DBIBackEnd; ObjectModel::DBIBackEnd->UseDBIBackEnd('WineTestBot', $DbDataSource, $DbUsername, $DbPassword, - { RaiseError => 1 }); + { PrintError => 1, RaiseError => 1}); } umask 002; -- 2.15.1

1 0

Re: fix compilation warning (enum out of range) in winedbg
by Alex Henrie Feb. 2, 2018

Feb. 2, 2018

Hi Vlad, This patch looks good to me, but all patches submitted to Wine must include a Signed-off-by line. Please read through https://wiki.winehq.org/Submitting_Patches and try again. -Alex

1 0

[PATCH] user32/tests: Flush events after test_ShowWindow().
by Zebediah Figura Feb. 2, 2018

Feb. 2, 2018

The test minimizes windows, which triggers most window managers to generate focus events on other windows. These events aren't processed until halfway through the next test, test_EnableWindow(), when a message loop is run, and as a result an unexpected window (usually hwndMain) is activated, causing the test to fail. The testbot uses focus-follows-mouse mode, so these focus events were not triggered, thereby causing a success inside the todo block. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 917ab61..7be83571 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6779,6 +6779,8 @@ static void test_ShowWindow(void) ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); + + flush_events(TRUE); } static DWORD CALLBACK enablewindow_thread(LPVOID arg) @@ -6833,8 +6835,7 @@ static void test_EnableWindow(void) } ok(!IsWindowEnabled(hwnd), "window should not be enabled\n"); - todo_wine - check_active_state(hwnd, hwnd, hwnd); + check_active_state(hwnd, hwnd, hwnd); ok(0 == GetCapture(), "GetCapture() = %p\n", GetCapture()); CloseHandle(hthread); -- 2.7.4

1 0

[PATCH] oleacc: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleacc/client.c | 1 + dlls/oleacc/oleacc_private.h | 10 ---------- dlls/oleacc/window.c | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index ddaa89dd66..5b1f0eee5f 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -22,6 +22,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oleacc); diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index 06e3ba6937..32561ef3d2 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -23,13 +23,3 @@ HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN; int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 64d71677f5..32c19fd7c2 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -22,6 +22,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oleacc); -- 2.14.3

1 0

[PATCH] odbccp32: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index fce3fcd6c1..f9a2269345 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -31,6 +31,7 @@ #include "winnls.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "odbcinst.h" @@ -84,16 +85,6 @@ static void clear_errors(void) num_errors = 0; } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupAtoW(const char *str) { LPWSTR ret = NULL; -- 2.14.3

1 0

[PATCH] netprofm: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/netprofm/list.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index e28be12f2d..f6823f09cf 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -38,21 +38,12 @@ #include "olectl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "netprofm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(netprofm); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - struct network { INetwork INetwork_iface; -- 2.14.3

1 0

[PATCH 4/5] d2d1: Replace d2d_calloc() with a global heap_calloc() helper.
by Henri Verbeet Feb. 1, 2018

Feb. 1, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 2 +- dlls/d2d1/brush.c | 4 ++-- dlls/d2d1/d2d1_private.h | 9 --------- dlls/d2d1/geometry.c | 4 ++-- dlls/d2d1/render_target.c | 2 +- dlls/d2d1/stroke.c | 2 +- include/wine/heap.h | 9 +++++++++ 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 028fab3..0d4098f 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -511,7 +511,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d pitch = ((bpp * size.width) + 15) & ~15; if (pitch / bpp < size.width) return E_OUTOFMEMORY; - if (!(data = d2d_calloc(size.height, pitch))) + if (!(data = heap_calloc(size.height, pitch))) return E_OUTOFMEMORY; data_size = size.height * pitch; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 0531a3a..c46d940 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -142,7 +142,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D unsigned int i; HRESULT hr; - if (!(data = d2d_calloc(stop_count, 2 * sizeof(*data)))) + if (!(data = heap_calloc(stop_count, 2 * sizeof(*data)))) { ERR("Failed to allocate data.\n"); return E_OUTOFMEMORY; @@ -205,7 +205,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D (*gradient)->view = view; (*gradient)->stop_count = stop_count; - if (!((*gradient)->stops = d2d_calloc(stop_count, sizeof(*stops)))) + if (!((*gradient)->stops = heap_calloc(stop_count, sizeof(*stops)))) { ID3D10ShaderResourceView_Release(view); heap_free(*gradient); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 07f71a0..dbfb83c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,15 +477,6 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; -static inline void *d2d_calloc(size_t count, size_t size) -{ - SIZE_T s = count * size; - - if (size && s / size != count) - return NULL; - return heap_alloc(s); -} - static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { size_t new_capacity, max_capacity; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4a2f7d7..5b5a75b 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2025,7 +2025,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) return S_OK; } - if (!(vertices = d2d_calloc(vertex_count, sizeof(*vertices)))) + if (!(vertices = heap_calloc(vertex_count, sizeof(*vertices)))) return E_OUTOFMEMORY; for (i = 0, j = 0; i < geometry->u.path.figure_count; ++i) @@ -2792,7 +2792,7 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } - if (!(geometry->fill.bezier_vertices = d2d_calloc(geometry->fill.bezier_vertex_count, + if (!(geometry->fill.bezier_vertices = heap_calloc(geometry->fill.bezier_vertex_count, sizeof(*geometry->fill.bezier_vertices)))) { ERR("Failed to allocate bezier vertices array.\n"); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a202279..7afbc84 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1162,7 +1162,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta if (texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) bitmap_size.width *= 3; - if (!(opacity_values = d2d_calloc(bitmap_size.height, bitmap_size.width))) + if (!(opacity_values = heap_calloc(bitmap_size.height, bitmap_size.width))) { ERR("Failed to allocate opacity values.\n"); goto done; diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 63f88c7..511c134 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -212,7 +212,7 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact if (!dashes || !dash_count) return E_INVALIDARG; - if (!(style->dashes = d2d_calloc(dash_count, sizeof(*style->dashes)))) + if (!(style->dashes = heap_calloc(dash_count, sizeof(*style->dashes)))) return E_OUTOFMEMORY; memcpy(style->dashes, dashes, dash_count * sizeof(*style->dashes)); style->dash_count = dash_count; diff --git a/include/wine/heap.h b/include/wine/heap.h index 681887b..97d3a56 100644 --- a/include/wine/heap.h +++ b/include/wine/heap.h @@ -46,4 +46,13 @@ static inline void heap_free(void *mem) HeapFree(GetProcessHeap(), 0, mem); } +static inline void *heap_calloc(SIZE_T count, SIZE_T size) +{ + SIZE_T len = count * size; + + if (size && len / size != count) + return NULL; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + #endif /* __WINE_WINE_HEAP_H */ -- 2.1.4

2 1

[PATCH] mshtml: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Feb. 1, 2018

Feb. 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 51a1addaf2..ea38a66f24 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -30,6 +30,7 @@ #include "tlogstg.h" #include "shdeprecated.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/rbtree.h" #include "wine/unicode.h" @@ -1176,31 +1177,11 @@ DEFINE_GUID(IID_IDispatchJS,0x719c3050,0xf9d3,0x11cf,0xa4,0x93,0x00,0x40,0x05,0x /* memory allocation functions */ -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

2 1