wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Nikolay Sivov : comctl32/hotkey: Use HeapAlloc() wrappers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: fee6ec8cf3d2cad4d8d0896256794056e37379f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fee6ec8cf3d2cad4d8d08962… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:41 2018 +0300 comctl32/hotkey: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/hotkey.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index a6b3486..7c3bff7 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -38,6 +38,7 @@ #include "commctrl.h" #include "comctl32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(hotkey); @@ -241,7 +242,7 @@ HOTKEY_Destroy (HOTKEY_INFO *infoPtr) { /* free hotkey info data */ SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - Free (infoPtr); + heap_free (infoPtr); return 0; } @@ -410,7 +411,7 @@ HOTKEY_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) dwExStyle | WS_EX_CLIENTEDGE); /* allocate memory for info structure */ - infoPtr = Alloc (sizeof(HOTKEY_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); /* initialize info structure */

1 0

Nikolay Sivov : comctl32/header: Use HeapAlloc() wrappers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: ff1cd359f7150146babcc2e01704095d6832e0ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff1cd359f7150146babcc2e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:40 2018 +0300 comctl32/header: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/header.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index fcba262..a48530d 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -42,6 +42,7 @@ #include "vssym32.h" #include "uxtheme.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(header); @@ -141,7 +142,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDI if (mask & HDI_TEXT) { - Free(lpItem->pszText); + heap_free(lpItem->pszText); lpItem->pszText = NULL; if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ @@ -338,7 +339,7 @@ static HRGN create_sort_arrow( INT x, INT y, INT h, BOOL is_up ) if (size > sizeof(buffer)) { - data = HeapAlloc( GetProcessHeap(), 0, size ); + data = heap_alloc( size ); if (!data) return NULL; } data->rdh.dwSize = sizeof(data->rdh); @@ -364,7 +365,7 @@ static HRGN create_sort_arrow( INT x, INT y, INT h, BOOL is_up ) data->rdh.nCount++; } rgn = ExtCreateRegion( NULL, size, data ); - if (data != (RGNDATA *)buffer) HeapFree( GetProcessHeap(), 0, data ); + if (data != (RGNDATA *)buffer) heap_free( data ); return rgn; } @@ -985,7 +986,7 @@ HEADER_PrepareCallbackItems(const HEADER_INFO *infoPtr, INT iItem, INT reqMask) if (mask&HDI_TEXT && lpItem->pszText != NULL) { ERR("(): function called without a call to FreeCallbackItems\n"); - Free(lpItem->pszText); + heap_free(lpItem->pszText); lpItem->pszText = NULL; } @@ -996,13 +997,13 @@ HEADER_PrepareCallbackItems(const HEADER_INFO *infoPtr, INT iItem, INT reqMask) { dispInfo.hdr.code = HDN_GETDISPINFOW; if (mask & HDI_TEXT) - pvBuffer = Alloc(MAX_HEADER_TEXT_LEN * sizeof(WCHAR)); + pvBuffer = heap_alloc_zero(MAX_HEADER_TEXT_LEN * sizeof(WCHAR)); } else { dispInfo.hdr.code = HDN_GETDISPINFOA; if (mask & HDI_TEXT) - pvBuffer = Alloc(MAX_HEADER_TEXT_LEN * sizeof(CHAR)); + pvBuffer = heap_alloc_zero(MAX_HEADER_TEXT_LEN * sizeof(CHAR)); } dispInfo.pszText = pvBuffer; dispInfo.cchTextMax = (pvBuffer!=NULL?MAX_HEADER_TEXT_LEN:0); @@ -1033,7 +1034,7 @@ HEADER_PrepareCallbackItems(const HEADER_INFO *infoPtr, INT iItem, INT reqMask) else { Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)dispInfo.pszText); - Free(pvBuffer); + heap_free(pvBuffer); } } @@ -1059,7 +1060,7 @@ HEADER_FreeCallbackItems(HEADER_ITEM *lpItem) { if (lpItem->callbackMask&HDI_TEXT) { - Free(lpItem->pszText); + heap_free(lpItem->pszText); lpItem->pszText = NULL; } @@ -1181,15 +1182,15 @@ HEADER_DeleteItem (HEADER_INFO *infoPtr, INT iItem) TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); iOrder = infoPtr->items[iItem].iOrder; - Free(infoPtr->items[iItem].pszText); + heap_free(infoPtr->items[iItem].pszText); infoPtr->uNumItem--; memmove(&infoPtr->items[iItem], &infoPtr->items[iItem + 1], (infoPtr->uNumItem - iItem) * sizeof(HEADER_ITEM)); memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], (infoPtr->uNumItem - iOrder) * sizeof(INT)); - infoPtr->items = ReAlloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); - infoPtr->order = ReAlloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); + infoPtr->items = heap_realloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); + infoPtr->order = heap_realloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); /* Correct the orders */ for (i = 0; i < infoPtr->uNumItem; i++) @@ -1419,8 +1420,8 @@ HEADER_InsertItemT (HEADER_INFO *infoPtr, INT nItem, const HDITEMW *phdi, BOOL b iOrder = infoPtr->uNumItem; infoPtr->uNumItem++; - infoPtr->items = ReAlloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); - infoPtr->order = ReAlloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); + infoPtr->items = heap_realloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); + infoPtr->order = heap_realloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); /* make space for the new item */ memmove(&infoPtr->items[nItem + 1], &infoPtr->items[nItem], @@ -1539,8 +1540,8 @@ HEADER_SetItemT (HEADER_INFO *infoPtr, INT nItem, const HDITEMW *phdi, BOOL bUni HEADER_CopyHDItemForNotify(infoPtr, &hdNotify, phdi, bUnicode, &pvScratch); if (HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCHANGINGW, nItem, &hdNotify)) { - Free(pvScratch); - return FALSE; + heap_free(pvScratch); + return FALSE; } lpItem = &infoPtr->items[nItem]; @@ -1556,7 +1557,7 @@ HEADER_SetItemT (HEADER_INFO *infoPtr, INT nItem, const HDITEMW *phdi, BOOL bUni InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - Free(pvScratch); + heap_free(pvScratch); return TRUE; } @@ -1579,7 +1580,7 @@ HEADER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) HFONT hOldFont; HDC hdc; - infoPtr = Alloc (sizeof(HEADER_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); infoPtr->hwndSelf = hwnd; @@ -1633,16 +1634,15 @@ HEADER_NCDestroy (HEADER_INFO *infoPtr) if (infoPtr->items) { lpItem = infoPtr->items; - for (nItem = 0; nItem < infoPtr->uNumItem; nItem++, lpItem++) { - Free(lpItem->pszText); - } - Free (infoPtr->items); + for (nItem = 0; nItem < infoPtr->uNumItem; nItem++, lpItem++) + heap_free(lpItem->pszText); + heap_free(infoPtr->items); } - Free(infoPtr->order); + heap_free(infoPtr->order); SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - Free (infoPtr); + heap_free(infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32/treeview: Use HeapAlloc() wrappers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: d886eda2e8d6f202622e8da0004669ca3eaa0714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d886eda2e8d6f202622e8da0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:39 2018 +0300 comctl32/treeview: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 51 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 7713efb..56c53fc 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -64,6 +64,7 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "wine/exception.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(treeview); @@ -552,7 +553,7 @@ TREEVIEW_TVItemFromItem(const TREEVIEW_INFO *infoPtr, UINT mask, TVITEMW *tvItem if (!infoPtr->bNtfUnicode) { tvItem->cchTextMax = WideCharToMultiByte( CP_ACP, 0, item->pszText, -1, NULL, 0, NULL, NULL ); - tvItem->pszText = Alloc (tvItem->cchTextMax); + tvItem->pszText = heap_alloc (tvItem->cchTextMax); WideCharToMultiByte( CP_ACP, 0, item->pszText, -1, (LPSTR)tvItem->pszText, tvItem->cchTextMax, 0, 0 ); } else @@ -593,8 +594,8 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action ret = TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); if (!infoPtr->bNtfUnicode) { - Free(nmhdr.itemOld.pszText); - Free(nmhdr.itemNew.pszText); + heap_free(nmhdr.itemOld.pszText); + heap_free(nmhdr.itemNew.pszText); } return ret; } @@ -693,7 +694,7 @@ TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editI ret = TREEVIEW_SendRealNotify(infoPtr, TVN_BEGINLABELEDITW, &tvdi.hdr); if (!infoPtr->bNtfUnicode) - Free(tvdi.item.pszText); + heap_free(tvdi.item.pszText); return ret; } @@ -739,7 +740,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, (LPSTR)callback.item.pszText, -1, NULL, 0); buflen = max((len)*sizeof(WCHAR), TEXT_CALLBACK_SIZE); - newText = ReAlloc(item->pszText, buflen); + newText = heap_realloc(item->pszText, buflen); TRACE("returned str %s, len=%d, buflen=%d\n", debugstr_a((LPSTR)callback.item.pszText), len, buflen); @@ -752,12 +753,12 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, item->pszText, buflen/sizeof(WCHAR)); item->cchTextMax = buflen/sizeof(WCHAR); } - /* If ReAlloc fails we have nothing to do, but keep original text */ + /* If realloc fails we have nothing to do, but keep original text */ } else { int len = max(lstrlenW(callback.item.pszText) + 1, TEXT_CALLBACK_SIZE); - LPWSTR newText = ReAlloc(item->pszText, len); + LPWSTR newText = heap_realloc(item->pszText, len); TRACE("returned wstr %s, len=%d\n", debugstr_w(callback.item.pszText), len); @@ -768,7 +769,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, strcpyW(item->pszText, callback.item.pszText); item->cchTextMax = len; } - /* If ReAlloc fails we have nothing to do, but keep original text */ + /* If realloc fails we have nothing to do, but keep original text */ } } else if (mask & TVIF_TEXT) { @@ -780,7 +781,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, (LPSTR)callback.item.pszText, -1, NULL, 0); buflen = max((len)*sizeof(WCHAR), TEXT_CALLBACK_SIZE); - newText = Alloc(buflen); + newText = heap_alloc(buflen); TRACE("same buffer str %s, len=%d, buflen=%d\n", debugstr_a((LPSTR)callback.item.pszText), len, buflen); @@ -793,7 +794,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, (LPSTR)callback.item.pszText, -1, item->pszText, buflen/sizeof(WCHAR)); item->cchTextMax = buflen/sizeof(WCHAR); - Free(oldText); + heap_free(oldText); } } } @@ -1001,7 +1002,7 @@ TREEVIEW_UpdateSubTree(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *root) static TREEVIEW_ITEM * TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) { - TREEVIEW_ITEM *newItem = Alloc(sizeof(TREEVIEW_ITEM)); + TREEVIEW_ITEM *newItem = heap_alloc_zero(sizeof(*newItem)); if (!newItem) return NULL; @@ -1017,8 +1018,8 @@ TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) { - Free(newItem); - return NULL; + heap_free(newItem); + return NULL; } return newItem; @@ -1042,7 +1043,7 @@ TREEVIEW_FreeItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) infoPtr->dropItem = NULL; if (infoPtr->insertMarkItem == item) infoPtr->insertMarkItem = NULL; - Free(item); + heap_free(item); } @@ -1133,7 +1134,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, else len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)tvItem->pszText, -1, NULL, 0); - newText = ReAlloc(item->pszText, len * sizeof(WCHAR)); + newText = heap_realloc(item->pszText, len * sizeof(WCHAR)); if (newText == NULL) return FALSE; @@ -1151,10 +1152,8 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, } else { - callbackSet |= TVIF_TEXT; - - item->pszText = ReAlloc(item->pszText, - TEXT_CALLBACK_SIZE * sizeof(WCHAR)); + callbackSet |= TVIF_TEXT; + item->pszText = heap_realloc(item->pszText, TEXT_CALLBACK_SIZE * sizeof(WCHAR)); item->cchTextMax = TEXT_CALLBACK_SIZE; TRACE("setting callback, item %p\n", item); } @@ -1499,7 +1498,7 @@ TREEVIEW_RemoveItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) infoPtr->uNumItems--; if (item->pszText != LPSTR_TEXTCALLBACKW) - Free(item->pszText); + heap_free(item->pszText); TREEVIEW_FreeItem(infoPtr, item); } @@ -4031,18 +4030,18 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (!infoPtr->bNtfUnicode) { DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, NULL, 0 ); - newText = Alloc(len * sizeof(WCHAR)); + newText = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, newText, len ); iLength = len - 1; } if (strcmpW(newText, editedItem->pszText) != 0) { - WCHAR *ptr = ReAlloc(editedItem->pszText, sizeof(WCHAR)*(iLength + 1)); + WCHAR *ptr = heap_realloc(editedItem->pszText, sizeof(WCHAR)*(iLength + 1)); if (ptr == NULL) { ERR("OutOfMemory, cannot allocate space for label\n"); - if(newText != tmpText) Free(newText); + if (newText != tmpText) heap_free(newText); DestroyWindow(infoPtr->hwndEdit); infoPtr->hwndEdit = 0; infoPtr->editItem = NULL; @@ -4056,7 +4055,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) TREEVIEW_ComputeTextWidth(infoPtr, editedItem, 0); } } - if(newText != tmpText) Free(newText); + if (newText != tmpText) heap_free(newText); } ShowWindow(infoPtr->hwndEdit, SW_HIDE); @@ -5078,7 +5077,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) TRACE("wnd %p, style 0x%x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE)); - infoPtr = Alloc(sizeof(TREEVIEW_INFO)); + infoPtr = heap_alloc_zero(sizeof(TREEVIEW_INFO)); if (infoPtr == NULL) { @@ -5203,7 +5202,7 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) DeleteObject(infoPtr->hUnderlineFont); DeleteObject(infoPtr->hBoldUnderlineFont); DestroyWindow(infoPtr->hwndToolTip); - Free(infoPtr); + heap_free(infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32/updown: Use HeapAlloc() wrappers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: db261c31cec141be51826f4c4a9fdfe1a4499664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db261c31cec141be51826f4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:38 2018 +0300 comctl32/updown: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 67b646d..b75df4f 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;

1 0

Nikolay Sivov : comctl32/edit: Fix replacement text trace.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: e0883d8f3f5518e7fe2bd3216e978ab0488d6360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0883d8f3f5518e7fe2bd321… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:41:15 2018 +0300 comctl32/edit: Fix replacement text trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 5b6773e..a01b75b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2434,7 +2434,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r UINT bufl; TRACE("%s, can_undo %d, send_update %d\n", - debugstr_w(lpsz_replace), can_undo, send_update); + debugstr_wn(lpsz_replace, strl), can_undo, send_update); s = es->selection_start; e = es->selection_end;

1 0

Nikolay Sivov : comctl32/edit: Merge theming logic.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: a9d4b9870d4ff9d446ceba7f3fc1aedbefbe37e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9d4b9870d4ff9d446ceba7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:41:14 2018 +0300 comctl32/edit: 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/edit.c | 170 ++++++++++++++++++++++++++++++++------------- dlls/comctl32/theme_edit.c | 134 ----------------------------------- dlls/comctl32/theming.c | 3 - 4 files changed, 121 insertions(+), 187 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9d4b9870d4ff9d446ce…

1 0

Michael Stefaniuc : msvcrt: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: caf0d0f5fd09280711fd2367d849d88f2585839d URL: https://source.winehq.org/git/wine.git/?a=commit;h=caf0d0f5fd09280711fd2367… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:52 2018 +0100 msvcrt: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 1 + dlls/msvcrt/msvcrt.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index b8b8672..583e429 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "wine/heap.h" #include "msvcrt.h" #include "cppexcept.h" #include "mtdll.h" diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a380613..65ced6d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1429,20 +1429,5 @@ typedef struct { _FPIEEE_VALUE Result; } _FPIEEE_RECORD, *_PFPIEEE_RECORD; -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 BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #define INHERIT_THREAD_PRIORITY 0xF000 #endif /* __WINE_MSVCRT_H */

1 0

Michael Stefaniuc : oleacc: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: f9e47ff5e03ae568dea436f4c3305e6bc301d271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e47ff5e03ae568dea436f4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:57 2018 +0100 oleacc: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 ddaa89d..5b1f0ee 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 06e3ba6..32561ef 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 64d7167..32c19fd 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);

1 0

Michael Stefaniuc : ole32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: f38ddaec6fa9b5258a8dde5869893dfc6b7f4edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f38ddaec6fa9b5258a8dde58… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:56 2018 +0100 ole32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 0f10a7c..9e65c3e 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -30,6 +30,7 @@ #include <stdarg.h> #include "wine/list.h" +#include "wine/heap.h" #include "windef.h" #include "winbase.h" @@ -259,7 +260,7 @@ void leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; static inline struct oletls *COM_CurrentInfo(void) { if (!NtCurrentTeb()->ReservedForOle) - NtCurrentTeb()->ReservedForOle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct oletls)); + NtCurrentTeb()->ReservedForOle = heap_alloc_zero(sizeof(struct oletls)); return NtCurrentTeb()->ReservedForOle; } @@ -323,16 +324,6 @@ extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN; extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) { *dst = *src;

1 0

Michael Stefaniuc : odbccp32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 0c7863d9e985df1cacebce6de26dd53fed5f8f7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c7863d9e985df1cacebce6d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:55 2018 +0100 odbccp32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 fce3fcd..f9a2269 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;

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
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