February 2018 - Wine-commits

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/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/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/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/imagelist: Use HeapAlloc() wrappers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 3b3c25e17d9bc04adec7a7db5800a4532f42bc3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b3c25e17d9bc04adec7a7db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:42 2018 +0300 comctl32/imagelist: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 53 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 71145ed..608d853 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -54,6 +54,7 @@ #include "commoncontrols.h" #include "wine/debug.h" #include "wine/exception.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(imagelist); @@ -274,7 +275,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, SelectObject( hdc, hbmImage ); mask_width = (bm.bmWidth + 31) / 32 * 4; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + if (!(info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = bm.bmWidth; info->bmiHeader.biHeight = -height; @@ -286,17 +287,17 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - if (!(bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; + if (!(bits = heap_alloc( info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmImage, 0, height, bits, info, DIB_RGB_COLORS )) goto done; if (hbmMask) { - if (!(mask_info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))) + if (!(mask_info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))) goto done; mask_info->bmiHeader = info->bmiHeader; mask_info->bmiHeader.biBitCount = 1; mask_info->bmiHeader.biSizeImage = mask_width * height; - if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mask_info->bmiHeader.biSizeImage ))) + if (!(mask_bits = heap_alloc_zero( mask_info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; } @@ -305,10 +306,10 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, ret = TRUE; done: - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, mask_info ); - HeapFree( GetProcessHeap(), 0, bits ); - HeapFree( GetProcessHeap(), 0, mask_bits ); + heap_free( info ); + heap_free( mask_info ); + heap_free( bits ); + heap_free( mask_bits ); return ret; } @@ -391,7 +392,7 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) if (new_alpha) himl->has_alpha = new_alpha; else { - HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + heap_free( himl->has_alpha ); himl->has_alpha = NULL; } } @@ -862,7 +863,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, himl->hbmMask = 0; if (ilc == ILC_COLOR32) - himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + himl->has_alpha = heap_alloc_zero( himl->cMaxImage ); else himl->has_alpha = NULL; @@ -1270,7 +1271,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des int i, j; if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + if (!(info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = cx; info->bmiHeader.biHeight = cy; @@ -1353,7 +1354,7 @@ done: DeleteDC( hdc ); if (bmp) DeleteObject( bmp ); if (mask) DeleteObject( mask ); - HeapFree( GetProcessHeap(), 0, info ); + heap_free( info ); return ret; } @@ -1971,11 +1972,11 @@ ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx, INT cGrow, uType, uFlags); len = MultiByteToWideChar(CP_ACP, 0, lpbmp, -1, NULL, 0); - lpbmpW = Alloc(len * sizeof(WCHAR)); + lpbmpW = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, lpbmp, -1, lpbmpW, len); himl = ImageList_LoadImageW(hi, lpbmpW, cx, cGrow, clrMask, uType, uFlags); - Free (lpbmpW); + heap_free (lpbmpW); return himl; } @@ -2216,12 +2217,12 @@ static void *read_bitmap(IStream *pstm, BITMAPINFO *bmi) if (palspace && FAILED(IStream_Read(pstm, bmi->bmiColors, palspace, NULL))) return NULL; - bits = Alloc(bmi->bmiHeader.biSizeImage); + bits = heap_alloc_zero(bmi->bmiHeader.biSizeImage); if (!bits) return NULL; if (FAILED(IStream_Read(pstm, bits, bmi->bmiHeader.biSizeImage, NULL))) { - Free(bits); + heap_free(bits); return NULL; } return bits; @@ -2333,8 +2334,8 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) 0, 0, mask_info->bmiHeader.biWidth, mask_info->bmiHeader.biHeight, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY); } - Free( image_bits ); - Free( mask_bits ); + heap_free( image_bits ); + heap_free( mask_bits ); himl->cCurImage = ilHead.cCurImage; himl->cMaxImage = ilHead.cMaxImage; @@ -2398,8 +2399,8 @@ ImageList_Remove (HIMAGELIST himl, INT i) if (himl->has_alpha) { - HeapFree( GetProcessHeap(), 0, himl->has_alpha ); - himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + heap_free( himl->has_alpha ); + himl->has_alpha = heap_alloc_zero( himl->cMaxImage ); } hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); @@ -2946,7 +2947,7 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) if (new_alpha) himl->has_alpha = new_alpha; else { - HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + heap_free( himl->has_alpha ); himl->has_alpha = NULL; } } @@ -3014,7 +3015,7 @@ static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm) offBits = totalSize; totalSize += sizeImage; - data = Alloc(totalSize); + data = heap_alloc_zero(totalSize); bmfh = (LPBITMAPFILEHEADER)data; bmih = (LPBITMAPINFOHEADER)(data + sizeof(BITMAPFILEHEADER)); lpBits = data + offBits; @@ -3055,7 +3056,7 @@ static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm) result = TRUE; failed: - Free(data); + heap_free(data); return result; } @@ -3292,8 +3293,8 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface) if (This->hbrBlend50) DeleteObject (This->hbrBlend50); This->IImageList2_iface.lpVtbl = NULL; - HeapFree(GetProcessHeap(), 0, This->has_alpha); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->has_alpha); + heap_free(This); } return ref; @@ -3822,7 +3823,7 @@ static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID ii if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct _IMAGELIST)); + This = heap_alloc_zero(sizeof(struct _IMAGELIST)); if (!This) return E_OUTOFMEMORY; This->IImageList2_iface.lpVtbl = &ImageListImpl_Vtbl;

1 0

Zebediah Figura : user32/tests: Flush events after test_ShowWindow().
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 0741d193ffef9e05668dd4a3eedcf55f063b7c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0741d193ffef9e05668dd4a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 1 18:36:54 2018 -0600 user32/tests: Flush events after test_ShowWindow(). 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f492ecc..9cf4ed3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6780,6 +6780,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) @@ -6834,8 +6836,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);

1 0

Alexandre Julliard : krnl386: Remove support for DOS devices and event handling.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 5ec544959632d63ad50175885503cc78f6ed6c58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec544959632d63ad5017588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 10:50:48 2018 +0100 krnl386: Remove support for DOS devices and event handling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 5 - dlls/krnl386.exe16/dosdev.c | 489 -------------------------------------- dlls/krnl386.exe16/dosexe.h | 126 ---------- dlls/krnl386.exe16/dosvm.c | 221 ----------------- dlls/krnl386.exe16/instr.c | 6 - dlls/krnl386.exe16/int09.c | 244 ------------------- dlls/krnl386.exe16/int16.c | 215 ----------------- dlls/krnl386.exe16/int21.c | 184 ++------------ dlls/krnl386.exe16/int2f.c | 57 ----- dlls/krnl386.exe16/int31.c | 119 +--------- dlls/krnl386.exe16/int33.c | 367 ---------------------------- dlls/krnl386.exe16/interrupts.c | 112 +-------- dlls/krnl386.exe16/ioports.c | 3 - dlls/krnl386.exe16/soundblaster.c | 6 +- dlls/krnl386.exe16/timer.c | 74 ------ dlls/krnl386.exe16/wowthunk.c | 113 --------- 16 files changed, 30 insertions(+), 2311 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ec544959632d63ad501…

1 0

Alexandre Julliard : krnl386: Remove support for VGA emulation.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 33b2d8521c916e1d5c9201adc8e52507bedb7d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33b2d8521c916e1d5c9201ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:43:25 2018 +0100 krnl386: Remove support for VGA emulation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 4 +- dlls/krnl386.exe16/dosexe.h | 4 - dlls/krnl386.exe16/int10.c | 1462 ---------------------------- dlls/krnl386.exe16/int21.c | 2 - dlls/krnl386.exe16/interrupts.c | 17 +- dlls/krnl386.exe16/ioports.c | 86 -- dlls/krnl386.exe16/vga.c | 1999 --------------------------------------- dlls/krnl386.exe16/vga.h | 97 -- 8 files changed, 3 insertions(+), 3668 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33b2d8521c916e1d5c92…

1 0

Alexandre Julliard : winedbg: Remove support for vm86 exceptions.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 39b1384e78e24d39e750ae74bee9e255a45633c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b1384e78e24d39e750ae74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:53:09 2018 +0100 winedbg: Remove support for vm86 exceptions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c1de158..83341c0 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -930,15 +930,6 @@ void info_win32_exception(void) case EXCEPTION_WINE_ASSERTION: dbg_printf("assertion failed"); break; - case EXCEPTION_VM86_INTx: - dbg_printf("interrupt %02lx in vm86 mode", rec->ExceptionInformation[0]); - break; - case EXCEPTION_VM86_STI: - dbg_printf("sti in vm86 mode"); - break; - case EXCEPTION_VM86_PICRETURN: - dbg_printf("PIC return in vm86 mode"); - break; case EXCEPTION_FLT_DENORMAL_OPERAND: dbg_printf("denormal float operand"); break;

1 0

Alexandre Julliard : kernel32: Remove support for vm86 exceptions.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: d8454f9231116f10b4e969d052c6ae6049b5c762 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8454f9231116f10b4e969d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:53:21 2018 +0100 kernel32: Remove support for vm86 exceptions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/except.c | 10 ---------- include/wine/exception.h | 7 ------- 2 files changed, 17 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 1a1521a..2a9f0f1 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -143,16 +143,6 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in case EXCEPTION_WINE_ASSERTION: len = snprintf( buffer, size, "Assertion failed" ); break; - case EXCEPTION_VM86_INTx: - len = snprintf( buffer, size, "Unhandled interrupt %02lx in vm86 mode", - rec->ExceptionInformation[0]); - break; - case EXCEPTION_VM86_STI: - len = snprintf( buffer, size, "Unhandled sti in vm86 mode"); - break; - case EXCEPTION_VM86_PICRETURN: - len = snprintf( buffer, size, "Unhandled PIC return in vm86 mode"); - break; default: len = snprintf( buffer, size, "Unhandled exception 0x%08x in thread %x", rec->ExceptionCode, GetCurrentThreadId()); break; diff --git a/include/wine/exception.h b/include/wine/exception.h index 3b1a3cf..e93968f 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -303,13 +303,6 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) #define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ #define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ -/* unhandled return status from vm86 mode */ -#define EXCEPTION_VM86_INTx 0x80000110 -#define EXCEPTION_VM86_STI 0x80000111 -#define EXCEPTION_VM86_PICRETURN 0x80000112 - -extern void __wine_enter_vm86( CONTEXT *context ); - #ifdef __cplusplus } #endif

1 0