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

Piotr Caban : gdiplus: Support GdipSetSmoothingMode in metafiles.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 910975a944ca90701381e4acd5eb02b1b345be13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910975a944ca90701381e4acd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 17:51:03 2017 +0200 gdiplus: Support GdipSetSmoothingMode in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f20178a..277bbd2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5972,6 +5972,20 @@ GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mod if(graphics->busy) return ObjectBusy; + if(graphics->smoothing == mode) + return Ok; + + if(graphics->image && graphics->image->type == ImageTypeMetafile) { + GpStatus stat; + BOOL antialias = (mode != SmoothingModeDefault && + mode != SmoothingModeNone && mode != SmoothingModeHighSpeed); + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetAntiAliasMode, (mode << 1) + antialias); + if(stat != Ok) + return stat; + } + graphics->smoothing = mode; return Ok;

1 0

Hugh McMaster : regedit: Remove the listview' s sub-class and move its messages to childwnd.c.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 683b9992f6217e5e4f535dffdd5ba60a47b555cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=683b9992f6217e5e4f535dffd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:09:49 2017 +0000 regedit: Remove the listview's sub-class and move its messages to childwnd.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 130 ++++++++++++++++++++++++++++++++++++++++---- programs/regedit/listview.c | 127 +++---------------------------------------- programs/regedit/main.h | 17 +++++- 3 files changed, 143 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=683b9992f6217e5e4f535…

1 0

Hugh McMaster : regedit: Move treeview notify messages to a separate function.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: aa42d81e6da9d114bdcdab6a099db510c5e17d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa42d81e6da9d114bdcdab6a0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:09:38 2017 +0000 regedit: Move treeview notify messages to a separate function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 114 +++++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 50 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 2a646ef..0a89647 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -293,6 +293,67 @@ static void set_last_key(HWND hwndTV) } } +static int treeview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (((NMHDR *)lParam)->code) + { + case NM_SETFOCUS: + g_pChildWnd->nFocusPanel = 0; + break; + case TVN_BEGINLABELEDITW: + { + HKEY hRootKey; + WCHAR *path; + + if (!GetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA)) + return 1; + + path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + if (!path || !*path) + return 1; + return 0; + } + case TVN_ENDLABELEDITW: + { + HKEY hRootKey; + NMTVDISPINFOW *dispInfo = (NMTVDISPINFOW *)lParam; + WCHAR *path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); + + HeapFree(GetProcessHeap(), 0, path); + + if (res) + { + TVITEMW item; + WCHAR *fullPath; + + item.mask = TVIF_HANDLE | TVIF_TEXT; + item.hItem = dispInfo->item.hItem; + item.pszText = dispInfo->item.pszText; + SendMessageW(g_pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item); + + path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + update_listview_path(path); + + fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path); + SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); + HeapFree(GetProcessHeap(), 0, fullPath); + HeapFree(GetProcessHeap(), 0, path); + } + + SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0); + return res; + } + case TVN_ITEMEXPANDINGW: + return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEWW *)lParam); + case TVN_SELCHANGEDW: + OnTreeSelectionChanged(g_pChildWnd->hTreeWnd, g_pChildWnd->hListWnd, + ((NMTREEVIEWW *)lParam)->itemNew.hItem, TRUE); + break; + } + return 0; +} + #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) @@ -427,57 +488,10 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa break; case WM_NOTIFY: - if (((int)wParam == TREE_WINDOW) && (g_pChildWnd != NULL)) { - switch (((LPNMHDR)lParam)->code) { - case TVN_ITEMEXPANDINGW: - return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEWW*)lParam); - case TVN_SELCHANGEDW: - OnTreeSelectionChanged(g_pChildWnd->hTreeWnd, g_pChildWnd->hListWnd, - ((NMTREEVIEWW *)lParam)->itemNew.hItem, TRUE); - break; - case NM_SETFOCUS: - g_pChildWnd->nFocusPanel = 0; - break; - case TVN_BEGINLABELEDITW: { - HKEY hRootKey; - LPWSTR path; - - if (!GetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA)) - return 1; - - path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - if (!path || !*path) return 1; - return 0; - } - case TVN_ENDLABELEDITW: { - HKEY hRootKey; - LPNMTVDISPINFOW dispInfo = (LPNMTVDISPINFOW)lParam; - LPWSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); - HeapFree(GetProcessHeap(), 0, path); - if (res) { - TVITEMW item; - WCHAR *fullPath; - item.mask = TVIF_HANDLE | TVIF_TEXT; - item.hItem = dispInfo->item.hItem; - item.pszText = dispInfo->item.pszText; - SendMessageW( g_pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); - path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path); - SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); - HeapFree(GetProcessHeap(), 0, fullPath); - update_listview_path(path); - HeapFree(GetProcessHeap(), 0, path); - } - SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0); - return res; - } - default: - return 0; /* goto def; */ - } - } else if ((int)wParam == LIST_WINDOW && g_pChildWnd != NULL) { + if (wParam == TREE_WINDOW && g_pChildWnd) + return treeview_notify(hWnd, message, wParam, lParam); + else if (wParam == LIST_WINDOW && g_pChildWnd) return SendMessageW(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam); - } break; case WM_SIZE:

1 0

Hugh McMaster : regedit: Update string resources associated with key deletion.
by Alexandre Julliard July 12, 2017

July 12, 2017

1 0

Piotr Caban : gdiplus: Add EMF+ properties records tests.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 9d40addbebd4a8d9bce2bb924562a8b8d503de94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d40addbebd4a8d9bce2bb924… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 11:42:14 2017 +0200 gdiplus: Add EMF+ properties records tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index cbf63a6..2ed8355 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2406,6 +2406,83 @@ static void test_drawimage(void) expect(Ok, stat); } +static const emfplus_record properties_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeSetTextRenderingHint}, + {0, EmfPlusRecordTypeSetPixelOffsetMode}, + {0, EmfPlusRecordTypeSetAntiAliasMode}, + {0, EmfPlusRecordTypeSetCompositingMode}, + {0, EmfPlusRecordTypeSetCompositingQuality}, + {0, EmfPlusRecordTypeSetInterpolationMode}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_properties(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipSetTextRenderingHint(graphics, TextRenderingHintSystemDefault); + expect(Ok, stat); + stat = GdipSetTextRenderingHint(graphics, TextRenderingHintAntiAlias); + expect(Ok, stat); + + stat = GdipSetPixelOffsetMode(graphics, PixelOffsetModeHighQuality); + expect(Ok, stat); + stat = GdipSetPixelOffsetMode(graphics, PixelOffsetModeHighQuality); + expect(Ok, stat); + + stat = GdipSetSmoothingMode(graphics, SmoothingModeAntiAlias); + expect(Ok, stat); + stat = GdipSetSmoothingMode(graphics, SmoothingModeAntiAlias); + expect(Ok, stat); + + stat = GdipSetCompositingMode(graphics, CompositingModeSourceOver); + expect(Ok, stat); + stat = GdipSetCompositingMode(graphics, CompositingModeSourceCopy); + expect(Ok, stat); + + stat = GdipSetCompositingQuality(graphics, CompositingQualityHighQuality); + expect(Ok, stat); + stat = GdipSetCompositingQuality(graphics, CompositingQualityHighQuality); + expect(Ok, stat); + + stat = GdipSetInterpolationMode(graphics, InterpolationModeDefault); + expect(Ok, stat); + stat = GdipSetInterpolationMode(graphics, InterpolationModeHighQuality); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "properties.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, properties_records, "properties"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2444,6 +2521,7 @@ START_TEST(metafile) test_clipping(); test_gditransform(); test_drawimage(); + test_properties(); GdiplusShutdown(gdiplusToken); }

1 0

Henri Verbeet : d3drm/tests: Simplify a conditional expression.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 7227889496cf9e1f057c5ee6769d1f70fd56d28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7227889496cf9e1f057c5ee67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 12 18:42:28 2017 +0200 d3drm/tests: Simplify a conditional expression. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c59763d..1ab81e4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -109,7 +109,7 @@ static void test_class_name_(unsigned int line, IDirect3DRMObject *object, const ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#x.\n", hr); ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size); - size = size2 = !!*name ? 1 : 0; + size = size2 = !!*name; hr = IDirect3DRMObject_GetClassName(object, &size, cname); ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok_(__FILE__, line)(size == size2, "Got size %u.\n", size);

1 0

Hugh McMaster : regedit: Remove the unused _CmdWndProc callback function from listview.c.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 9e1278dd47ef785ce6dcfbc81760cfbdcba23c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1278dd47ef785ce6dcfbc81… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:09:30 2017 +0000 regedit: Remove the unused _CmdWndProc callback function from listview.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 9e271ad..aaec88f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -362,25 +362,9 @@ HWND StartValueRename(HWND hwndLV) return (HWND)SendMessageW(hwndLV, LVM_EDITLABELW, item, 0); } -static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch (LOWORD(wParam)) { - /* case ID_FILE_OPEN: */ - /* break; */ - default: - return FALSE; - } - return TRUE; -} - static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { - case WM_COMMAND: - if (!_CmdWndProc(hWnd, message, wParam, lParam)) { - return CallWindowProcW(g_orgListWndProc, hWnd, message, wParam, lParam); - } - break; case WM_NOTIFY_REFLECT: switch (((LPNMHDR)lParam)->code) {

1 0

Hugh McMaster : regedit: Update the status bar text when a treeview node is renamed.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 182b6fb545f49ca52200e199a2f947452c70f5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=182b6fb545f49ca52200e199a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:08:46 2017 +0000 regedit: Update the status bar text when a treeview node is renamed. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 0e4ed57..37f4261 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -454,18 +454,20 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa LPNMTVDISPINFOW dispInfo = (LPNMTVDISPINFOW)lParam; LPWSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); + HeapFree(GetProcessHeap(), 0, path); if (res) { - TVITEMEXW item; - LPWSTR fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, - dispInfo->item.pszText); + TVITEMW item; + WCHAR *fullPath; item.mask = TVIF_HANDLE | TVIF_TEXT; - item.hItem = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); + item.hItem = dispInfo->item.hItem; item.pszText = dispInfo->item.pszText; SendMessageW( g_pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); + path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); + HeapFree(GetProcessHeap(), 0, path); } - HeapFree(GetProcessHeap(), 0, path); SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0); return res; }

1 0

Sebastian Lackner : webservices: Remove dead code in read_attribute_value_bin.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: f53b6bfde09f5f0d7893fe788f2556b1697702d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53b6bfde09f5f0d7893fe788… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 12 15:02:43 2017 +0200 webservices: Remove dead code in read_attribute_value_bin. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 63de1ad..6d1d68f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1582,11 +1582,6 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE return WS_E_NOT_SUPPORTED; } - if (type >= RECORD_INT8_TEXT && type <= RECORD_INT64_TEXT) - { - attr->value = &text_int64->text; - return S_OK; - } if (type >= RECORD_BYTES8_TEXT && type <= RECORD_BYTES32_TEXT) { attr->value = &text_base64->text;

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 35de20a8b3d48debf5753999021758a2fc040ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35de20a8b3d48debf57539990… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:38 2017 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 520 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 520 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35de20a8b3d48debf5753…

1 0