July 2017 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Scale cursors for Retina mode, now that user32 scales them with DPI.
by Alexandre Julliard 31 Jul '17

31 Jul '17

Module: wine Branch: master Commit: 611c15953e8297ac1762abfb5aeca6665985fc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=611c15953e8297ac1762abfb5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 31 14:44:08 2017 -0500 winemac: Scale cursors for Retina mode, now that user32 scales them with DPI. When they were always 32x32, treating that size as though it were in Cocoa's virtual "points" rather than pixels produced good results even though it wasn't really correct. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2cf67f1..46176f7 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -992,12 +992,14 @@ static NSString* WineLocalizedString(unsigned int stringID) { NSDictionary* frame = [cursorFrames objectAtIndex:cursorFrame]; CGImageRef cgimage = (CGImageRef)[frame objectForKey:@"image"]; - NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSZeroSize]; + CGSize size = CGSizeMake(CGImageGetWidth(cgimage), CGImageGetHeight(cgimage)); + NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSSizeFromCGSize(cgsize_mac_from_win(size))]; CFDictionaryRef hotSpotDict = (CFDictionaryRef)[frame objectForKey:@"hotSpot"]; CGPoint hotSpot; if (!CGPointMakeWithDictionaryRepresentation(hotSpotDict, &hotSpot)) hotSpot = CGPointZero; + hotSpot = cgpoint_mac_from_win(hotSpot); self.cursor = [[[NSCursor alloc] initWithImage:image hotSpot:NSPointFromCGPoint(hotSpot)] autorelease]; [image release]; [self unhideCursor];

1 0

Hugh McMaster : regedit: Use the heap_*() functions in listview.c where possible.
by Alexandre Julliard 28 Jul '17

28 Jul '17

Module: wine Branch: master Commit: e0a527ab43e02596ad17be2407aa7232ceadbd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a527ab43e02596ad17be240… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 28 13:22:10 2017 +0000 regedit: Use the heap_*() functions in listview.c where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 72ab464..238a2c7 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -26,6 +26,7 @@ #include <stdio.h> #include "main.h" +#include "regproc.h" #include "wine/unicode.h" static INT Image_String; @@ -48,21 +49,18 @@ static int column_alignment[MAX_LIST_COLUMNS] = { LVCFMT_LEFT, LVCFMT_LEFT, LVCF LPWSTR GetItemText(HWND hwndLV, UINT item) { - LPWSTR newStr, curStr; + WCHAR *curStr; unsigned int maxLen = 128; if (item == 0) return NULL; /* first item is ALWAYS a default */ - curStr = HeapAlloc(GetProcessHeap(), 0, maxLen * sizeof(WCHAR)); - if (!curStr) return NULL; + curStr = heap_xalloc(maxLen * sizeof(WCHAR)); do { ListView_GetItemTextW(hwndLV, item, 0, curStr, maxLen); if (lstrlenW(curStr) < maxLen - 1) return curStr; maxLen *= 2; - newStr = HeapReAlloc(GetProcessHeap(), 0, curStr, maxLen * sizeof(WCHAR)); - if (!newStr) break; - curStr = newStr; + curStr = heap_xrealloc(curStr, maxLen * sizeof(WCHAR)); } while (TRUE); - HeapFree(GetProcessHeap(), 0, curStr); + heap_free(curStr); return NULL; } @@ -71,7 +69,7 @@ LPCWSTR GetValueName(HWND hwndLV) INT item; if (g_valueName != LPSTR_TEXTCALLBACKW) - HeapFree(GetProcessHeap(), 0, g_valueName); + heap_free(g_valueName); g_valueName = NULL; item = SendMessageW(hwndLV, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED, 0)); @@ -84,10 +82,9 @@ LPCWSTR GetValueName(HWND hwndLV) BOOL update_listview_path(const WCHAR *path) { - HeapFree(GetProcessHeap(), 0, g_currentPath); + heap_free(g_currentPath); - g_currentPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(path) + 1) * sizeof(WCHAR)); - if (!g_currentPath) return FALSE; + g_currentPath = heap_xalloc((lstrlenW(path) + 1) * sizeof(WCHAR)); lstrcpyW(g_currentPath, path); return TRUE; @@ -141,13 +138,13 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz { unsigned int i; BYTE *pData = data; - WCHAR *strBinary = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR) * 3 + sizeof(WCHAR)); + WCHAR *strBinary = heap_xalloc(size * sizeof(WCHAR) * 3 + sizeof(WCHAR)); WCHAR format[] = {'%','0','2','X',' ',0}; for (i = 0; i < size; i++) wsprintfW( strBinary + i*3, format, pData[i] ); strBinary[size * 3] = 0; ListView_SetItemTextW(hwndLV, index, 2, strBinary); - HeapFree(GetProcessHeap(), 0, strBinary); + heap_free(strBinary); break; } } @@ -166,7 +163,7 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR if (Name) { - linfo->name = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(Name) + 1) * sizeof(WCHAR)); + linfo->name = heap_xalloc((lstrlenW(Name) + 1) * sizeof(WCHAR)); lstrcpyW(linfo->name, Name); } else { @@ -412,12 +409,8 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli max_val_name_len++; max_val_size++; - valName = HeapAlloc(GetProcessHeap(), 0, max_val_name_len * sizeof(WCHAR)); - if (!valName) - goto done; - valBuf = HeapAlloc(GetProcessHeap(), 0, max_val_size); - if (!valBuf) - goto done; + valName = heap_xalloc(max_val_name_len * sizeof(WCHAR)); + valBuf = heap_xalloc(max_val_size); valSize = max_val_size; if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { @@ -449,8 +442,8 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli result = TRUE; done: - HeapFree(GetProcessHeap(), 0, valBuf); - HeapFree(GetProcessHeap(), 0, valName); + heap_free(valBuf); + heap_free(valName); SendMessageW(hwndLV, WM_SETREDRAW, TRUE, 0); if (hKey) RegCloseKey(hKey);

1 0

Hugh McMaster : regedit: Use the heap_*() functions in treeview.c where possible.
by Alexandre Julliard 28 Jul '17

28 Jul '17

Module: wine Branch: master Commit: 793ddc992ce494f96631dc8bc21398d995dd04e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=793ddc992ce494f96631dc8bc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 28 13:22:18 2017 +0000 regedit: Use the heap_*() functions in treeview.c where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 70 ++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index d11793c..77befb5 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -51,7 +51,6 @@ static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPWSTR* pKe { TVITEMW item; int maxChars, chars; - LPWSTR newStr; HTREEITEM hParent; item.mask = TVIF_PARAM; @@ -82,10 +81,9 @@ static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPWSTR* pKe *pPathLen += chars; break; } - newStr = HeapReAlloc(GetProcessHeap(), 0, *pKeyPath, *pMaxChars * 2); - if (!newStr) return FALSE; - *pKeyPath = newStr; + *pMaxChars *= 2; + *pKeyPath = heap_xrealloc(*pKeyPath, *pMaxChars); } while(TRUE); return TRUE; @@ -101,7 +99,7 @@ LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey) if (!hItem) return NULL; } - pathBuffer = HeapAlloc(GetProcessHeap(), 0, maxLen*sizeof(WCHAR)); + pathBuffer = heap_xalloc(maxLen * sizeof(WCHAR)); if (!pathBuffer) return NULL; *pathBuffer = 0; if (!get_item_path(hwndTV, hItem, phRootKey, &pathBuffer, &pathLen, &maxLen)) return NULL; @@ -118,10 +116,10 @@ static LPWSTR get_path_component(LPCWSTR *lplpKeyName) { lpPos++; if (*lpPos && lpPos == *lplpKeyName) return NULL; + len = lpPos+1-(*lplpKeyName); - lpResult = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpResult) /* that would be very odd */ - return NULL; + lpResult = heap_xalloc(len * sizeof(WCHAR)); + lstrcpynW(lpResult, *lplpKeyName, len); *lplpKeyName = *lpPos ? lpPos+1 : NULL; return lpResult; @@ -155,7 +153,7 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!lpKeyName) { - HeapFree(GetProcessHeap(), 0, lpItemName); + heap_free(lpItemName); return hItem; } hOldItem = hItem; @@ -164,7 +162,7 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { } hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hItem); } - HeapFree(GetProcessHeap(), 0, lpItemName); + heap_free(lpItemName); if (!hItem) return valid_path ? hOldItem : hRoot; } @@ -239,20 +237,20 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, return FALSE; if (RegOpenKeyExW(hRoot, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, KeyPath); + heap_free(KeyPath); return FALSE; } - HeapFree(GetProcessHeap(), 0, KeyPath); + heap_free(KeyPath); if (ERROR_SUCCESS != RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &lenNameMax, &lenValueMax, NULL, NULL)) return FALSE; lenName = ++lenNameMax; - if (!(valName = HeapAlloc(GetProcessHeap(), 0, lenName * sizeof(valName[0]) ))) - return FALSE; + valName = heap_xalloc(lenName * sizeof(WCHAR)); adjust = 0; + /* RegEnumValue won't return empty default value, so fake it when dealing with *row, which corresponds to list view rows, not value ids */ if (ERROR_SUCCESS == RegEnumValueW(hKey, 0, valName, &lenName, NULL, NULL, NULL, NULL) && *valName) @@ -270,8 +268,8 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, if (mode & SEARCH_VALUES) { if (match_string(valName, sstring, mode)) { - HeapFree(GetProcessHeap(), 0, valName); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(valName); + heap_free(buffer); RegCloseKey(hKey); *row = i+adjust; return TRUE; @@ -280,16 +278,15 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, if ((mode & SEARCH_CONTENT) && (type == REG_EXPAND_SZ || type == REG_SZ)) { if (!buffer) - buffer = HeapAlloc(GetProcessHeap(), 0, lenValueMax); - if (!buffer) - break; + buffer = heap_xalloc(lenValueMax); + lenName = lenNameMax; lenValue = lenValueMax; if (ERROR_SUCCESS != RegEnumValueW(hKey, i, valName, &lenName, NULL, &type, (LPBYTE)buffer, &lenValue)) break; if (match_string(buffer, sstring, mode)) { - HeapFree(GetProcessHeap(), 0, valName); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(valName); + heap_free(buffer); RegCloseKey(hKey); *row = i+adjust; return TRUE; @@ -298,8 +295,8 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, i++; } - HeapFree(GetProcessHeap(), 0, valName); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(valName); + heap_free(buffer); RegCloseKey(hKey); } return FALSE; @@ -375,7 +372,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) } else { hKey = hRoot; } - HeapFree(GetProcessHeap(), 0, KeyPath); + heap_free(KeyPath); if (RegQueryInfoKeyW(hKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { return FALSE; @@ -396,14 +393,10 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) } dwMaxSubKeyLen++; /* account for the \0 terminator */ - if (!(Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(WCHAR)))) { - return FALSE; - } + Name = heap_xalloc(dwMaxSubKeyLen * sizeof(WCHAR)); + tvItem.cchTextMax = dwMaxSubKeyLen; - if (!(tvItem.pszText = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(WCHAR)))) { - HeapFree(GetProcessHeap(), 0, Name); - return FALSE; - } + tvItem.pszText = heap_xalloc(dwMaxSubKeyLen * sizeof(WCHAR)); /* Now go through all the children in the registry, and check if any have to be added. */ for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { @@ -430,8 +423,8 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) tvItem.mask = TVIF_TEXT; tvItem.hItem = childItem; if (!TreeView_GetItemW(hwndTV, &tvItem)) { - HeapFree(GetProcessHeap(), 0, Name); - HeapFree(GetProcessHeap(), 0, tvItem.pszText); + heap_free(Name); + heap_free(tvItem.pszText); return FALSE; } @@ -446,8 +439,8 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) AddEntryToTree(hwndTV, hItem, Name, NULL, dwSubCount); } } - HeapFree(GetProcessHeap(), 0, Name); - HeapFree(GetProcessHeap(), 0, tvItem.pszText); + heap_free(Name); + heap_free(tvItem.pszText); RegCloseKey(hKey); /* Now go through all the children in the tree, and check if any have to be removed. */ @@ -658,8 +651,7 @@ BOOL UpdateExpandingTree(HWND hwndTV, HTREEITEM hItem, int state) errCode = RegQueryInfoKeyW(hNewKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0); if (errCode != ERROR_SUCCESS) goto done; dwMaxSubKeyLen++; /* account for the \0 terminator */ - Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(WCHAR)); - if (!Name) goto done; + Name = heap_xalloc(dwMaxSubKeyLen * sizeof(WCHAR)); for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; @@ -675,7 +667,7 @@ BOOL UpdateExpandingTree(HWND hwndTV, HTREEITEM hItem, int state) AddEntryToTree(hwndTV, hItem, Name, NULL, dwSubCount); } RegCloseKey(hNewKey); - HeapFree(GetProcessHeap(), 0, Name); + heap_free(Name); done: item.mask = TVIF_STATE; @@ -686,7 +678,7 @@ done: SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); SetCursor(hcursorOld); expanding = FALSE; - HeapFree(GetProcessHeap(), 0, keyPath); + heap_free(keyPath); return TRUE; }

1 0

Hugh McMaster : regedit: Store the data from a listview subitem in a valid memory address.
by Alexandre Julliard 28 Jul '17

28 Jul '17

Module: wine Branch: master Commit: 5d9a4c4dbd85cd97acae0d9f0191415bf4b30673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9a4c4dbd85cd97acae0d9f0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 28 13:22:27 2017 +0000 regedit: Store the data from a listview subitem in a valid memory address. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 1 + programs/regedit/listview.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index d6a7d51..7a5633f 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -397,6 +397,7 @@ static int listview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam LINE_INFO *info = (LINE_INFO *)nmlv->lParam; heap_free(info->name); + heap_free(info->val); heap_free(info); break; } diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 238a2c7..e1e8c7f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -152,23 +152,27 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos) { + LINE_INFO *linfo; LVITEMW item = { 0 }; - LINE_INFO* linfo; int index; - linfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINE_INFO) + dwCount); + linfo = heap_xalloc(sizeof(LINE_INFO)); linfo->dwValType = dwValType; linfo->val_len = dwCount; - CopyMemory(&linfo[1], ValBuf, dwCount); - + if (Name) { linfo->name = heap_xalloc((lstrlenW(Name) + 1) * sizeof(WCHAR)); lstrcpyW(linfo->name, Name); - } else + } + else linfo->name = NULL; + + if (ValBuf && dwCount) { - linfo->name = NULL; + linfo->val = heap_xalloc(dwCount); + memcpy(&linfo->val, ValBuf, dwCount); } + else linfo->val = NULL; item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; item.iItem = (pos == -1) ? SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0) : pos;

1 0

Andrew Eikum : gdiplus: Implement stub for GdipGraphicsSetAbort.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: 1744277bee3c3c77ae657f42d8fac466cfac7924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1744277bee3c3c77ae657f42d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jul 27 08:35:33 2017 -0500 gdiplus: Implement stub for GdipGraphicsSetAbort. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 13 +++++++++++++ dlls/gdiplus/tests/graphics.c | 34 ++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index dd8d909..25b27e7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -622,7 +622,7 @@ 622 stdcall GdipBitmapGetHistogramSize(long ptr) 623 stdcall GdipBitmapConvertFormat(ptr long long long ptr float) 624 stdcall GdipImageSetAbort(ptr ptr) -625 stub GdipGraphicsSetAbort +625 stdcall GdipGraphicsSetAbort(ptr ptr) 626 stub GdipDrawImageFX 627 stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) 628 stdcall GdipConvertToEmfPlusToFile(ptr ptr ptr ptr long ptr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 543593e..4b2ae49 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7147,3 +7147,16 @@ GpStatus WINGDIPAPI GdipResetPageTransform(GpGraphics *graphics) return NotImplemented; } + +GpStatus WINGDIPAPI GdipGraphicsSetAbort(GpGraphics *graphics, GdiplusAbort *pabort) +{ + TRACE("(%p, %p)\n", graphics, pabort); + + if (!graphics) + return InvalidParameter; + + if (pabort) + FIXME("Abort callback is not supported.\n"); + + return Ok; +} diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 4dcfac8..6802184 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -29,6 +29,8 @@ #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) +static GpStatus (WINAPI *pGdipGraphicsSetAbort)(GpGraphics*,GdiplusAbort*); + static const REAL mm_per_inch = 25.4; static const REAL point_per_inch = 72.0; static HWND hwnd; @@ -6149,11 +6151,40 @@ static void test_container_rects(void) ReleaseDC(hwnd, hdc); } +static void test_GdipGraphicsSetAbort(void) +{ + HDC hdc; + GpStatus status; + GpGraphics *graphics; + + if (!pGdipGraphicsSetAbort) + { + win_skip("GdipGraphicsSetAbort() is not supported.\n"); + return; + } + + hdc = GetDC(hwnd); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = pGdipGraphicsSetAbort(NULL, NULL); + expect(InvalidParameter, status); + + status = pGdipGraphicsSetAbort(graphics, NULL); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; WNDCLASSA class; + HMODULE gdiplus_mod = GetModuleHandleA("gdiplus.dll"); HMODULE hmsvcrt; int (CDECL * _controlfp_s)(unsigned int *cur, unsigned int newval, unsigned int mask); @@ -6162,6 +6193,8 @@ START_TEST(graphics) _controlfp_s = (void*)GetProcAddress(hmsvcrt, "_controlfp_s"); if (_controlfp_s) _controlfp_s(0, 0, 0x0008001e); + pGdipGraphicsSetAbort = (void*)GetProcAddress(gdiplus_mod, "GdipGraphicsSetAbort"); + memset( &class, 0, sizeof(class) ); class.lpszClassName = "gdiplus_test"; class.style = CS_HREDRAW | CS_VREDRAW; @@ -6230,6 +6263,7 @@ START_TEST(graphics) test_GdipFillRectangles(); test_GdipGetVisibleClipBounds_memoryDC(); test_container_rects(); + test_GdipGraphicsSetAbort(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd ); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 6e5b23f..10d537a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -263,6 +263,7 @@ GpStatus WINGDIPAPI GdipGetTextContrast(GpGraphics*,UINT*); GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*); GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB); +GpStatus WINGDIPAPI GdipGraphicsSetAbort(GpGraphics*,GdiplusAbort*); GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*); GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*); GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics*, BOOL*);

1 0

Alex Henrie : msvcr120: Don't double-check error conditions in log2f.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: 417b2a4f52ff1d416621c41fd21f52c505ea245a URL: http://source.winehq.org/git/wine.git/?a=commit;h=417b2a4f52ff1d416621c41fd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 27 02:26:22 2017 -0600 msvcr120: Don't double-check error conditions in log2f. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 079446d..1d61396 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2510,9 +2510,9 @@ double CDECL MSVCR120_log2(double x) */ float CDECL MSVCR120_log2f(float x) { +#ifdef HAVE_LOG2F if (x < 0) *MSVCRT__errno() = MSVCRT_EDOM; else if (x == 0) *MSVCRT__errno() = MSVCRT_ERANGE; -#ifdef HAVE_LOG2F return log2f(x); #else return MSVCR120_log2(x);

1 0

Hugh McMaster : regedit: Use heap_xrealloc() for consistency.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: 1b3afb27c72c2c5ba21a7b334187a0c8f4e604ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3afb27c72c2c5ba21a7b334… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:25:07 2017 +0000 regedit: Use heap_xrealloc() for consistency. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b686714..6f94c0f 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -55,6 +55,24 @@ static void *heap_xalloc(size_t size) return buf; } +static void *heap_xrealloc(void *buf, size_t size) +{ + void *new_buf; + + if (buf) + new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size); + else + new_buf = HeapAlloc(GetProcessHeap(), 0, size); + + if (!new_buf) + { + ERR("Out of memory!\n"); + exit(1); + } + + return new_buf; +} + static BOOL heap_free(void *buf) { return HeapFree(GetProcessHeap(), 0, buf); @@ -226,19 +244,6 @@ static inline enum parser_state set_state(struct parser *parser, enum parser_sta return ret; } -static void *resize_buffer(void *buf, size_t count) -{ - void *new_buf; - - if (buf) - new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, count); - else - new_buf = HeapAlloc(GetProcessHeap(), 0, count); - - CHECK_ENOUGH_MEMORY(new_buf); - return new_buf; -} - /****************************************************************************** * Converts a hex representation of a DWORD into a DWORD. */ @@ -286,7 +291,7 @@ static BOOL convert_hex_csv_to_hex(struct parser *parser, WCHAR **str) /* The worst case is 1 digit + 1 comma per byte */ size = ((lstrlenW(*str) + 1) / 2) + parser->data_size; - parser->data = resize_buffer(parser->data, size); + parser->data = heap_xrealloc(parser->data, size); s = *str; d = (BYTE *)parser->data + parser->data_size; @@ -985,10 +990,8 @@ static WCHAR *get_lineA(FILE *fp) memmove(buf, next, len + 1); if (size - len < 3) { - char *new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size * 2); - CHECK_ENOUGH_MEMORY(new_buf); - buf = new_buf; size *= 2; + buf = heap_xrealloc(buf, size); } if (!(count = fread(buf + len, 1, size - len - 1, fp))) { @@ -1043,10 +1046,8 @@ static WCHAR *get_lineW(FILE *fp) memmove(buf, next, (len + 1) * sizeof(WCHAR)); if (size - len < 3) { - WCHAR *new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, (size * 2) * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(new_buf); - buf = new_buf; size *= 2; + buf = heap_xrealloc(buf, size * sizeof(WCHAR)); } if (!(count = fread(buf + len, sizeof(WCHAR), size - len - 1, fp))) { @@ -1396,12 +1397,12 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) if (data_size > max_data_bytes) { max_data_bytes = data_size; - data = resize_buffer(data, max_data_bytes); + data = heap_xrealloc(data, max_data_bytes); } else { max_value_len *= 2; - value_name = resize_buffer(value_name, max_value_len * sizeof(WCHAR)); + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); } } else break;

1 0

Hugh McMaster : regedit: Use the heap_*() functions in childwnd.c where possible.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: c193bffb3e1210e5575544f5f045b95560fbf950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c193bffb3e1210e5575544f5f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:25:17 2017 +0000 regedit: Use the heap_*() functions in childwnd.c where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 26 +++++++++++++------------- programs/regedit/regproc.c | 4 ++-- programs/regedit/regproc.h | 8 +++++--- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index f2359c4..d6a7d51 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -109,7 +109,7 @@ static LPWSTR CombinePaths(LPCWSTR pPaths[], int nPaths) { len += lstrlenW(pPaths[i])+1; } } - combined = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + combined = heap_xalloc(len * sizeof(WCHAR)); *combined = '\0'; for (i=0, pos=0; i<nPaths; i++) { if (pPaths[i] && *pPaths[i]) { @@ -132,7 +132,7 @@ static LPWSTR GetPathRoot(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { HKEY hRootKey = NULL; if (!hItem) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); - HeapFree(GetProcessHeap(), 0, GetItemPath(hwndTV, hItem, &hRootKey)); + heap_free(GetItemPath(hwndTV, hItem, &hRootKey)); if (!bFull && !hRootKey) return NULL; if (hRootKey) @@ -153,8 +153,8 @@ LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { parts[0] = GetPathRoot(hwndTV, hItem, bFull); parts[1] = GetItemPath(hwndTV, hItem, &hRootKey); ret = CombinePaths((LPCWSTR *)parts, 2); - HeapFree(GetProcessHeap(), 0, parts[0]); - HeapFree(GetProcessHeap(), 0, parts[1]); + heap_free(parts[0]); + heap_free(parts[1]); return ret; } @@ -175,7 +175,7 @@ static void OnTreeSelectionChanged(HWND hwndTV, HWND hwndLV, HTREEITEM hItem, BO keyPath = GetItemPath(hwndTV, hItem, &hRootKey); RefreshListView(hwndLV, hRootKey, keyPath, NULL); - HeapFree(GetProcessHeap(), 0, keyPath); + heap_free(keyPath); } UpdateStatusBar(); } @@ -277,7 +277,7 @@ static void set_last_key(HWND hwndTV) value = GetItemFullPath(g_pChildWnd->hTreeWnd, selection, FALSE); RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)value, (lstrlenW(value) + 1) * sizeof(WCHAR)); if (selection != root) - HeapFree(GetProcessHeap(), 0, value); + heap_free(value); RegCloseKey(hkey); } } @@ -309,7 +309,7 @@ static int treeview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam WCHAR *path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); - HeapFree(GetProcessHeap(), 0, path); + heap_free(path); if (res) { @@ -322,7 +322,7 @@ static int treeview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); update_listview_path(path); - HeapFree(GetProcessHeap(), 0, path); + heap_free(path); UpdateStatusBar(); } @@ -396,8 +396,8 @@ static int listview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; LINE_INFO *info = (LINE_INFO *)nmlv->lParam; - HeapFree(GetProcessHeap(), 0, info->name); - HeapFree(GetProcessHeap(), 0, info); + heap_free(info->name); + heap_free(info); break; } case LVN_ENDLABELEDITW: @@ -416,7 +416,7 @@ static int listview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam dispInfo->item.iItem, (LPARAM)&dispInfo->item); } - HeapFree(GetProcessHeap(), 0, oldName); + heap_free(oldName); return 0; } case LVN_GETDISPINFOW: @@ -444,7 +444,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa { switch (message) { case WM_CREATE: - g_pChildWnd = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); + g_pChildWnd = heap_xalloc(sizeof(ChildWnd)); if (!g_pChildWnd) return 0; LoadStringW(hInst, IDS_REGISTRY_ROOT_NAME, g_pChildWnd->szPath, MAX_PATH); g_pChildWnd->nSplitPos = 250; @@ -476,7 +476,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa goto def; case WM_DESTROY: set_last_key(g_pChildWnd->hTreeWnd); - HeapFree(GetProcessHeap(), 0, g_pChildWnd); + heap_free(g_pChildWnd); g_pChildWnd = NULL; PostQuitMessage(0); break; diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 6f94c0f..aae7738 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -44,7 +44,7 @@ static HKEY reg_class_keys[] = { #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) -static void *heap_xalloc(size_t size) +void *heap_xalloc(size_t size) { void *buf = HeapAlloc(GetProcessHeap(), 0, size); if (!buf) @@ -73,7 +73,7 @@ static void *heap_xrealloc(void *buf, size_t size) return new_buf; } -static BOOL heap_free(void *buf) +BOOL heap_free(void *buf) { return HeapFree(GetProcessHeap(), 0, buf); } diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 81ac3e3..a0ed438 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -36,7 +36,9 @@ if (!(p)) \ void __cdecl output_message(unsigned int id, ...); void __cdecl error_exit(unsigned int id, ...); -BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format); -BOOL import_registry_file(FILE *in); +char *GetMultiByteString(const WCHAR *strW); +void *heap_xalloc(size_t size); +BOOL heap_free(void *buf); +BOOL import_registry_file(FILE *reg_file); void delete_registry_key(WCHAR *reg_key_name); -CHAR* GetMultiByteString(const WCHAR* strW); +BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format);

1 0

Hugh McMaster : regedit: Use the heap_*() functions in edit.c where possible.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: 6238cd46f21c99a95825240b693565c6a7d63b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6238cd46f21c99a95825240b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:25:26 2017 +0000 regedit: Use the heap_*() functions in edit.c where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 44 ++++++++++++++++++-------------------------- programs/regedit/regproc.c | 2 +- programs/regedit/regproc.h | 1 + 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 038a37a..c72f39d 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -101,7 +101,6 @@ static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - WCHAR* valueData; HWND hwndValue; int len; @@ -122,12 +121,10 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L case IDOK: if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) { len = GetWindowTextLengthW(hwndValue); - if ((valueData = HeapReAlloc(GetProcessHeap(), 0, stringValueData, (len + 1) * sizeof(WCHAR)))) { - stringValueData = valueData; - if (!GetWindowTextW(hwndValue, stringValueData, len + 1)) - *stringValueData = 0; + stringValueData = heap_xrealloc(stringValueData, (len + 1) * sizeof(WCHAR)); + if (!GetWindowTextW(hwndValue, stringValueData, len + 1)) + *stringValueData = 0; } - } /* Fall through */ case IDCANCEL: EndDialog(hwndDlg, wParam); @@ -159,13 +156,13 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); - pData = HeapAlloc(GetProcessHeap(), 0, cbData); + pData = heap_xalloc(cbData); if (pData) { SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); - HeapFree(GetProcessHeap(), 0, pData); + heap_free(pData); } else lRet = ERROR_OUTOFMEMORY; @@ -206,7 +203,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ if (len) *len = 1; if (lpType) *lpType = REG_SZ; - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)); + buffer = heap_xalloc(sizeof(WCHAR)); *buffer = '\0'; return buffer; } @@ -214,10 +211,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, goto done; } if ( *lpType == REG_DWORD ) valueDataLen = sizeof(DWORD); - if (!(buffer = HeapAlloc(GetProcessHeap(), 0, valueDataLen+sizeof(WCHAR)))) { - error_code_messagebox(hwnd, IDS_TOO_BIG_VALUE, valueDataLen); - goto done; - } + buffer = heap_xalloc(valueDataLen + sizeof(WCHAR)); lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen); if (lRet != ERROR_SUCCESS) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); @@ -229,7 +223,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, return buffer; done: - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); return NULL; } @@ -307,7 +301,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); } - HeapFree(GetProcessHeap(), 0, valueA); + heap_free(valueA); } } else if ( type == REG_BINARY ) { struct edit_params params; @@ -325,8 +319,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) for ( i = 0, count = 0; i < len - 1; i++) if ( !stringValueData[i] && stringValueData[i + 1] ) count++; - tmpValueData = HeapAlloc( GetProcessHeap(), 0, ( len + count ) * sizeof(WCHAR)); - if ( !tmpValueData ) goto done; + tmpValueData = heap_xalloc((len + count) * sizeof(WCHAR)); for ( i = 0, j = 0; i < len - 1; i++) { @@ -339,15 +332,14 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) tmpValueData[j++] = stringValueData[i]; } tmpValueData[j] = stringValueData[i]; - HeapFree( GetProcessHeap(), 0, stringValueData); + heap_free(stringValueData); stringValueData = tmpValueData; tmpValueData = NULL; if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_MULTI_STRING), hwnd, modify_dlgproc) == IDOK) { len = lstrlenW( stringValueData ); - tmpValueData = HeapAlloc( GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); - if ( !tmpValueData ) goto done; + tmpValueData = heap_xalloc((len + 2) * sizeof(WCHAR)); for ( i = 0, j = 0; i < len - 1; i++) { @@ -363,7 +355,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) tmpValueData[j++] = stringValueData[i]; tmpValueData[j++] = 0; tmpValueData[j++] = 0; - HeapFree( GetProcessHeap(), 0, stringValueData); + heap_free(stringValueData); stringValueData = tmpValueData; lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, j * sizeof(WCHAR)); @@ -379,13 +371,13 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); - HeapFree(GetProcessHeap(), 0, stringValueData); + heap_free(stringValueData); stringValueData = read_value(hwnd, hKey, valueName, &type, &len); format_value_data(g_pChildWnd->hListWnd, index, type, stringValueData, len); } done: - HeapFree(GetProcessHeap(), 0, stringValueData); + heap_free(stringValueData); stringValueData = NULL; RegCloseKey(hKey); return result; @@ -535,7 +527,7 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC result = TRUE; done: - HeapFree(GetProcessHeap(), 0, value); + heap_free(value); RegCloseKey(hKey); return result; } @@ -559,7 +551,7 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) } else { LPWSTR srcSubKey_copy; - parentPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(keyPath)+1)*sizeof(WCHAR)); + parentPath = heap_xalloc((lstrlenW(keyPath) + 1) * sizeof(WCHAR)); lstrcpyW(parentPath, keyPath); srcSubKey_copy = strrchrW(parentPath, '\\'); *srcSubKey_copy = 0; @@ -604,7 +596,7 @@ done: RegCloseKey(destKey); if (parentKey) { RegCloseKey(parentKey); - HeapFree(GetProcessHeap(), 0, parentPath); + heap_free(parentPath); } return result; } diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index aae7738..3f055b6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -55,7 +55,7 @@ void *heap_xalloc(size_t size) return buf; } -static void *heap_xrealloc(void *buf, size_t size) +void *heap_xrealloc(void *buf, size_t size) { void *new_buf; diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index a0ed438..469e988 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -38,6 +38,7 @@ void __cdecl error_exit(unsigned int id, ...); char *GetMultiByteString(const WCHAR *strW); void *heap_xalloc(size_t size); +void *heap_xrealloc(void *buf, size_t size); BOOL heap_free(void *buf); BOOL import_registry_file(FILE *reg_file); void delete_registry_key(WCHAR *reg_key_name);

1 0

Hugh McMaster : regedit: Use the heap_*() functions in framewnd.c where possible.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: a3e043b82e53b525bf171689d3a3497b8184cab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e043b82e53b525bf171689d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:25:35 2017 +0000 regedit: Use the heap_*() functions in framewnd.c where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 41 ++++++++++++++++++++--------------------- programs/regedit/regproc.h | 9 --------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 361da7e..c3cc996 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -197,7 +197,7 @@ static void UpdateMenuItems(HMENU hMenu) { EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE, (GetMenuItemCount(hMenu)>2 ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); - HeapFree(GetProcessHeap(), 0, keyName); + heap_free(keyName); } static void add_remove_modify_menu_items(HMENU hMenu) @@ -236,8 +236,7 @@ static int add_favourite_key_items(HMENU hMenu, HWND hList) if (!num_values) goto exit; max_value_len++; - value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(value_name); + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); if (hMenu) AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); @@ -254,7 +253,7 @@ static int add_favourite_key_items(HMENU hMenu, HWND hList) } } - HeapFree(GetProcessHeap(), 0, value_name); + heap_free(value_name); exit: RegCloseKey(hkey); return i; @@ -313,7 +312,7 @@ void UpdateStatusBar(void) { LPWSTR fullPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, TRUE); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); - HeapFree(GetProcessHeap(), 0, fullPath); + heap_free(fullPath); } static void toggle_child(HWND hWnd, UINT cmd, HWND hchild) @@ -371,7 +370,7 @@ static void ExportRegistryFile_StoreSelection(HWND hdlg, OPENFILENAMEW *pOpenFil if (IsDlgButtonChecked(hdlg, IDC_EXPORT_SELECTED)) { INT len = SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_GETTEXTLENGTH, 0, 0); - pOpenFileName->lCustData = (LPARAM)HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + pOpenFileName->lCustData = (LPARAM)heap_xalloc((len + 1) * sizeof(WCHAR)); SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_GETTEXT, len+1, pOpenFileName->lCustData); } else @@ -402,7 +401,7 @@ static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, W SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_SETTEXT, 0, (LPARAM)path); if (path && path[0]) export_branch = TRUE; - HeapFree(GetProcessHeap(), 0, path); + heap_free(path); CheckRadioButton(hdlg, IDC_EXPORT_ALL, IDC_EXPORT_SELECTED, export_branch ? IDC_EXPORT_SELECTED : IDC_EXPORT_ALL); break; } @@ -490,7 +489,7 @@ static BOOL ImportRegistryFile(HWND hWnd) key_path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &root_key); RefreshListView(g_pChildWnd->hListWnd, root_key, key_path, NULL); - HeapFree(GetProcessHeap(), 0, key_path); + heap_free(key_path); return TRUE; } @@ -733,13 +732,13 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w int pos = SendMessageW(hwndList, LB_GETCURSEL, 0, 0); int len = SendMessageW(hwndList, LB_GETTEXTLEN, pos, 0); if (len>0) { - LPWSTR lpName = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(len+1)); + WCHAR *lpName = heap_xalloc((len + 1) * sizeof(WCHAR)); SendMessageW(hwndList, LB_GETTEXT, pos, (LPARAM)lpName); if (len>127) lpName[127] = '\0'; lstrcpyW(favoriteName, lpName); EndDialog(hwndDlg, IDOK); - HeapFree(GetProcessHeap(), 0, lpName); + heap_free(lpName); } return TRUE; } @@ -804,7 +803,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } else if (DeleteKey(hWnd, hKeyRoot, keyPath)) { DeleteNode(g_pChildWnd->hTreeWnd, 0); } - HeapFree(GetProcessHeap(), 0, keyPath); + heap_free(keyPath); } else if (hWndDelete == g_pChildWnd->hListWnd) { unsigned int num_selected, index, focus_idx; WCHAR *keyPath; @@ -829,10 +828,10 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) WCHAR *valueName = GetItemText(g_pChildWnd->hListWnd, index); if (!DeleteValue(hWnd, hKeyRoot, keyPath, valueName, num_selected == 1)) { - HeapFree(GetProcessHeap(), 0, valueName); + heap_free(valueName); break; } - HeapFree(GetProcessHeap(), 0, valueName); + heap_free(valueName); SendMessageW(g_pChildWnd->hListWnd, LVM_DELETEITEM, index, 0L); /* the default value item is always visible, so add it back in */ if (!index) @@ -847,7 +846,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); } - HeapFree(GetProcessHeap(), 0, keyPath); + heap_free(keyPath); } else if (IsChild(g_pChildWnd->hTreeWnd, hWndDelete) || IsChild(g_pChildWnd->hListWnd, hWndDelete)) { SendMessageW(hWndDelete, WM_KEYDOWN, VK_DELETE, 0); @@ -860,7 +859,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) LPCWSTR valueName = GetValueName(g_pChildWnd->hListWnd); WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); ModifyValue(hWnd, hKeyRoot, keyPath, valueName); - HeapFree(GetProcessHeap(), 0, keyPath); + heap_free(keyPath); break; } case ID_EDIT_FIND: @@ -907,7 +906,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) LPWSTR fullPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); if (fullPath) { CopyKeyName(hWnd, fullPath); - HeapFree(GetProcessHeap(), 0, fullPath); + heap_free(fullPath); } break; } @@ -919,7 +918,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) if (InsertNode(g_pChildWnd->hTreeWnd, 0, newKeyW)) StartKeyRename(g_pChildWnd->hTreeWnd); } - HeapFree(GetProcessHeap(), 0, keyPath); + heap_free(keyPath); } break; case ID_EDIT_NEW_STRINGVALUE: @@ -943,7 +942,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) WCHAR newKey[MAX_NEW_KEY_LEN]; if (CreateValue(hWnd, hKeyRoot, keyPath, valueType, newKey)) StartValueRename(g_pChildWnd->hListWnd); - HeapFree(GetProcessHeap(), 0, keyPath); + heap_free(keyPath); } break; case ID_EDIT_RENAME: @@ -956,7 +955,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } else if (GetFocus() == g_pChildWnd->hListWnd) { StartValueRename(g_pChildWnd->hListWnd); } - HeapFree(GetProcessHeap(), 0, keyPath); + heap_free(keyPath); break; } case ID_TREE_EXPAND_COLLAPSE: @@ -989,7 +988,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) RegCloseKey(hKey); } } - HeapFree(GetProcessHeap(), 0, lpKeyPath); + heap_free(lpKeyPath); } break; } @@ -1010,7 +1009,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); RefreshTreeView(g_pChildWnd->hTreeWnd); RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); - HeapFree(GetProcessHeap(), 0, keyPath); + heap_free(keyPath); } break; /*case ID_OPTIONS_TOOLBAR:*/ diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 469e988..4031255 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,15 +24,6 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 -#define NOT_ENOUGH_MEMORY 1 - -#define CHECK_ENOUGH_MEMORY(p) \ -if (!(p)) \ -{ \ - output_message(STRING_OUT_OF_MEMORY, __FILE__, __LINE__); \ - exit(NOT_ENOUGH_MEMORY); \ -} - void __cdecl output_message(unsigned int id, ...); void __cdecl error_exit(unsigned int id, ...);

1 0