wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Jonathan Doron : kernel32/tests: Test suspended process states.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 6a49f4d5f3896b5f56641bf1a75098972db1aa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a49f4d5f3896b5f56641bf1a… Author: Jonathan Doron <jond(a)wizery.com> Date: Thu Sep 14 11:49:36 2017 +0300 kernel32/tests: Test suspended process states. Signed-off-by: Jonathan Doron <jond(a)wizery.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 234 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a49f4d5f3896b5f56641…

1 0

Nikolay Sivov : shell32: Implement Application property for FolderItem.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: a1f7339137a2857674a1b2835ed9539bbbafe415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f7339137a2857674a1b2835… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 15 13:14:17 2017 +0300 shell32: Implement Application property for FolderItem. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 28 +++++++++++++++++----------- dlls/shell32/tests/shelldispatch.c | 25 +++++++++++++++++++++---- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index a225f45..ee6f340 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -77,6 +77,7 @@ typedef struct { typedef struct { FolderItem2 FolderItem2_iface; LONG ref; + FolderImpl *folder; VARIANT dir; } FolderItemImpl; @@ -646,6 +647,7 @@ static ULONG WINAPI FolderItemImpl_Release(FolderItem2 *iface) if (!ref) { VariantClear(&This->dir); + Folder3_Release(&This->folder->Folder3_iface); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -707,13 +709,13 @@ static HRESULT WINAPI FolderItemImpl_Invoke(FolderItem2 *iface, return hr; } -static HRESULT WINAPI FolderItemImpl_get_Application(FolderItem2 *iface, - IDispatch **ppid) +static HRESULT WINAPI FolderItemImpl_get_Application(FolderItem2 *iface, IDispatch **disp) { - FIXME("(%p,%p)\n", iface, ppid); + FolderItemImpl *This = impl_from_FolderItem(iface); - *ppid = NULL; - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, disp); + + return Folder3_get_Application(&This->folder->Folder3_iface, disp); } static HRESULT WINAPI FolderItemImpl_get_Parent(FolderItem2 *iface, @@ -928,7 +930,7 @@ static const FolderItem2Vtbl FolderItemImpl_Vtbl = { FolderItemImpl_ExtendedProperty }; -static HRESULT FolderItem_Constructor(VARIANT *dir, FolderItem **ppfi) +static HRESULT FolderItem_Constructor(FolderImpl *folder, VARIANT *dir, FolderItem **ppfi) { FolderItemImpl *This; HRESULT ret; @@ -950,7 +952,10 @@ static HRESULT FolderItem_Constructor(VARIANT *dir, FolderItem **ppfi) return E_OUTOFMEMORY; } - *ppfi = (FolderItem*)&This->FolderItem2_iface; + This->folder = folder; + Folder3_AddRef(&folder->Folder3_iface); + + *ppfi = (FolderItem *)&This->FolderItem2_iface; return ret; } @@ -1137,7 +1142,7 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F break; case VT_ERROR: - return FolderItem_Constructor(&This->folder->dir, ppid); + return FolderItem_Constructor(This->folder, &This->folder->dir, ppid); default: return E_NOTIMPL; @@ -1145,7 +1150,7 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F V_VT(&path_var) = VT_BSTR; V_BSTR(&path_var) = SysAllocString(path_str); - ret = FolderItem_Constructor(&path_var, ppid); + ret = FolderItem_Constructor(This->folder, &path_var, ppid); VariantClear(&path_var); return ret; } @@ -1451,6 +1456,7 @@ static HRESULT WINAPI FolderImpl_Items(Folder3 *iface, FolderItems **ppid) static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem **item) { + FolderImpl *This = impl_from_Folder(iface); FolderItem *self; BSTR str; WCHAR pathW[MAX_PATH]; @@ -1479,7 +1485,7 @@ static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(pathW); - hr = FolderItem_Constructor(&v, item); + hr = FolderItem_Constructor(This, &v, item); VariantClear(&v); return hr; } @@ -1523,7 +1529,7 @@ static HRESULT WINAPI FolderImpl_get_Self(Folder3 *iface, FolderItem **ppfi) TRACE("(%p,%p)\n", iface, ppfi); - return FolderItem_Constructor(&This->dir, ppfi); + return FolderItem_Constructor(This, &This->dir, ppfi); } static HRESULT WINAPI FolderImpl_get_OfflineStatus(Folder3 *iface, LONG *pul) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 831402a..eb8a8c7 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -483,7 +483,7 @@ static void test_items(void) if (item) FolderItem_Release(item); VariantClear(&var); - /* recreate the folder object */ + /* recreate the items object */ FolderItems_Release(items); items = NULL; r = Folder_Items(folder, &items); @@ -491,7 +491,11 @@ static void test_items(void) ok(!!items, "items is null\n"); r = FolderItems_QueryInterface(items, &IID_FolderItems2, (void**)&items2); ok(r == S_OK || broken(r == E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r); - if (r == S_OK) ok(!!items2, "items2 is null\n"); + if (r == S_OK) + { + ok(!!items2, "items2 is null\n"); + FolderItems2_Release(items2); + } r = FolderItems_QueryInterface(items, &IID_FolderItems3, (void**)&items3); ok(r == S_OK, "FolderItems::QueryInterface failed: %08x\n", r); ok(!!items3, "items3 is null\n"); @@ -510,11 +514,25 @@ static void test_items(void) V_VT(&var) = VT_I2; V_I2(&var) = 0; + + EXPECT_REF(folder, 2); + EXPECT_REF(items, 2); item = NULL; r = FolderItems_Item(items, var, &item); ok(r == S_OK, "FolderItems::Item failed: %08x\n", r); ok(!!item, "item is null\n"); - if (item) FolderItem_Release(item); + EXPECT_REF(folder, 3); + EXPECT_REF(items, 2); + + r = Folder_get_Application(folder, &disp); + ok(r == S_OK, "Failed to get application pointer %#x.\n", r); + r = FolderItem_get_Application(item, &disp2); + ok(r == S_OK, "Failed to get application pointer %#x.\n", r); + ok(disp == disp2, "Unexpected application pointer.\n"); + IDispatch_Release(disp2); + IDispatch_Release(disp); + + FolderItem_Release(item); V_VT(&var) = VT_I4; V_I4(&var) = 0; @@ -740,7 +758,6 @@ todo_wine FolderItems_Release(items); Folder_Release(folder); - if (items2) FolderItems2_Release(items2); if (items3) FolderItems3_Release(items3); IShellDispatch_Release(sd); }

1 0

Nikolay Sivov : shell32/tests: Remove workarounds that are no longer relevant.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 03cdddc08c80d1eb0370dd706ed85a0faedfe6cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cdddc08c80d1eb0370dd706… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 15 13:14:16 2017 +0300 shell32/tests: Remove workarounds that are no longer relevant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 164 ++++++++++++------------------------- 1 file changed, 53 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03cdddc08c80d1eb0370d…

1 0

Nikolay Sivov : d3d9: Ask for texture GetDC() capability GET_DC based on texture format instead of initial swapchain buffer format.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 67689049e2608e46761765eb8412e6ec423670c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67689049e2608e46761765eb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 15 08:14:34 2017 +0300 d3d9: Ask for texture GetDC() capability GET_DC based on texture format instead of initial swapchain buffer format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b4cb253..cd42cbc 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -239,8 +239,6 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); swapchain_desc->flags = (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; - if (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format)) - swapchain_desc->flags |= WINED3D_SWAPCHAIN_GDI_COMPATIBLE; swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; swapchain_desc->swap_interval = present_parameters->PresentationInterval; swapchain_desc->auto_restore_display_mode = TRUE; @@ -3922,6 +3920,9 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic if (container_parent == device_parent) container_parent = &device->IDirect3DDevice9Ex_iface; + if (is_gdi_compat_wined3dformat(desc->format)) + texture_flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture)))

1 0

Nikolay Sivov : d2d1: Implement GetBounds() for path geometries.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 00fea0298b26da525c9fbcd1a2b149ed216c823e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fea0298b26da525c9fbcd1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 14 15:10:57 2017 +0300 d2d1: Implement GetBounds() for path geometries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 + dlls/d2d1/geometry.c | 105 +++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00fea0298b26da525c9fb…

1 0

Nikolay Sivov : d2d1: Use better bezier segment bounds approximation when updating figure bounds.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: dcccaaf7f3517e12e34a81925be59a54a2c9906c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcccaaf7f3517e12e34a81925… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 14 15:10:56 2017 +0300 d2d1: Use better bezier segment bounds approximation when updating figure bounds. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 8c66881..e38ac34 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -503,6 +503,14 @@ static float d2d_point_ccw(const D2D1_POINT_2F *a, const D2D1_POINT_2F *b, const return det_d[det_d_len - 1]; } +static void d2d_rect_union(D2D1_RECT_F *l, const D2D1_RECT_F *r) +{ + l->left = min(l->left, r->left); + l->top = min(l->top, r->top); + l->right = max(l->right, r->right); + l->bottom = max(l->bottom, r->bottom); +} + static BOOL d2d_rect_check_overlap(const D2D_RECT_F *p, const D2D_RECT_F *q) { return p->left < q->right && p->top < q->bottom && p->right > q->left && p->bottom > q->top; @@ -2527,6 +2535,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if for (i = 0; i < count; ++i) { + D2D1_RECT_F bezier_bounds; + /* FIXME: This tries to approximate a cubic bezier with a quadratic one. */ p.x = (beziers[i].point1.x + beziers[i].point2.x) * 0.75f; p.y = (beziers[i].point1.y + beziers[i].point2.y) * 0.75f; @@ -2534,6 +2544,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if p.y -= (figure->vertices[figure->vertex_count - 1].y + beziers[i].point3.y) * 0.25f; figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_BEZIER; + d2d_rect_get_bezier_bounds(&bezier_bounds, &figure->vertices[figure->vertex_count - 1], + &p, &beziers[i].point3); + if (!d2d_figure_add_bezier_control(figure, &p)) { ERR("Failed to add bezier control.\n"); @@ -2547,6 +2560,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; return; } + + d2d_rect_union(&figure->bounds, &bezier_bounds); } geometry->u.path.segment_count += count;

1 0

Zebediah Figura : ieframe: Parse multiple command-line arguments.
by Alexandre Julliard 15 Sep '17

15 Sep '17

Module: wine Branch: master Commit: 1068f754a27ccef5b12c2542b6282efe45b468e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1068f754a27ccef5b12c2542b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 15 00:43:06 2017 -0500 ieframe: Parse multiple command-line arguments. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/iexplore.c | 53 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 11b79ad..378f736 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -845,7 +845,7 @@ void released_obj(void) PostQuitMessage(0); } -static BOOL create_ie_window(const WCHAR *cmdline) +static BOOL create_ie_window(BOOL nohome, const WCHAR *cmdline) { InternetExplorer *ie; HRESULT hres; @@ -858,33 +858,27 @@ static BOOL create_ie_window(const WCHAR *cmdline) IWebBrowser2_put_MenuBar(&ie->IWebBrowser2_iface, VARIANT_TRUE); if(!*cmdline) { - IWebBrowser2_GoHome(&ie->IWebBrowser2_iface); + if (nohome) + ie->nohome = TRUE; + else + IWebBrowser2_GoHome(&ie->IWebBrowser2_iface); }else { VARIANT var_url; int cmdlen; - static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e'}; - - while(*cmdline == ' ' || *cmdline == '\t') - cmdline++; cmdlen = strlenW(cmdline); if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { cmdline++; cmdlen -= 2; } - if(cmdlen == sizeof(nohomeW)/sizeof(*nohomeW) && !memcmp(cmdline, nohomeW, sizeof(nohomeW))) { - ie->nohome = TRUE; - }else { - V_VT(&var_url) = VT_BSTR; - - V_BSTR(&var_url) = SysAllocStringLen(cmdline, cmdlen); + V_VT(&var_url) = VT_BSTR; + V_BSTR(&var_url) = SysAllocStringLen(cmdline, cmdlen); - /* navigate to the first page */ - IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); + /* navigate to the first page */ + IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); - SysFreeString(V_BSTR(&var_url)); - } + SysFreeString(V_BSTR(&var_url)); } IWebBrowser2_Release(&ie->IWebBrowser2_iface); @@ -1042,8 +1036,10 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) { MSG msg; HRESULT hres; + BOOL embedding = FALSE, nohome = FALSE; static const WCHAR embeddingW[] = {'-','e','m','b','e','d','d','i','n','g',0}; + static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; TRACE("%s %d\n", debugstr_w(cmdline), nShowWindow); @@ -1057,8 +1053,29 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) init_dde(); - if(strcmpiW(cmdline, embeddingW)) { - if(!create_ie_window(cmdline)) { + while (*cmdline) + { + int length = 0; + + while (*cmdline == ' ' || *cmdline == '\t') cmdline++; + if (!*cmdline) break; + + while (cmdline[length] && cmdline[length] != ' ' && cmdline[length] != '\t') length++; + + if (!strncmpiW(cmdline, embeddingW, length)) + embedding = TRUE; + else if (!strncmpiW(cmdline, nohomeW, length)) + nohome = TRUE; + else + break; + + cmdline += length; + } + + if (!embedding) + { + if(!create_ie_window(nohome, cmdline)) + { CoUninitialize(); ExitProcess(1); }

1 0

Andrey Gusev : unicows: Fix CreateDialogParamW spec file entry.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 218286bb87f8a38a48b4717247e578e02f6a051f URL: http://source.winehq.org/git/wine.git/?a=commit;h=218286bb87f8a38a48b471724… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Sep 14 15:17:42 2017 +0300 unicows: Fix CreateDialogParamW spec file entry. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/unicows/unicows.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/unicows/unicows.spec b/dlls/unicows/unicows.spec index c008ea7..4867eb8 100644 --- a/dlls/unicows/unicows.spec +++ b/dlls/unicows/unicows.spec @@ -44,7 +44,7 @@ @ stdcall CreateColorSpaceW(ptr) @ stdcall CreateDCW(wstr wstr wstr ptr) @ stdcall CreateDialogIndirectParamW(long ptr long ptr long) -@ stdcall CreateDialogParamW(long ptr long ptr long) +@ stdcall CreateDialogParamW(long wstr long ptr long) @ stdcall CreateDirectoryExW(wstr wstr ptr) @ stdcall CreateDirectoryW(wstr ptr) @ stdcall CreateEnhMetaFileW(long wstr ptr wstr)

1 0

Jacek Caban : mshtml: Fixed getElementsByTagName for comment elements.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: d3ed68aff928bfad16280cb8adbc4ae8a21a4ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ed68aff928bfad16280cb8a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 14 14:15:13 2017 +0200 mshtml: Fixed getElementsByTagName for comment elements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 5 +++++ dlls/mshtml/tests/dom.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 782a632..a87bdf0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3101,6 +3101,11 @@ static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BS TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); + if(!This->nselem) { + *pelColl = create_collection_from_htmlcol(This->node.doc, NULL); + return S_OK; + } + nsAString_InitDepend(&tag_str, v); nsres = nsIDOMHTMLElement_GetElementsByTagName(This->nselem, &tag_str, &nscol); nsAString_Finish(&tag_str); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index aca64c1..d7cfedd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -9468,6 +9468,8 @@ static void test_create_elems(IHTMLDocument2 *doc) test_comment_text((IUnknown*)node2, ""); IHTMLDOMNode_Release(node2); + test_elem_getelembytag((IUnknown*)comment, ET_COMMENT, 0, NULL); + IHTMLDOMNode_Release(comment); }

1 0

Huw Davies : riched20: Don't scale the picture size with dpi.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 7020f47e0d4e1f78457d007c7c8b2207e76dd81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7020f47e0d4e1f78457d007c7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 14 12:51:04 2017 +0100 riched20: Don't scale the picture size with dpi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 0a8a32a..120bcf8 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5294,6 +5294,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) SIZE sz; BOOL has_size; HBITMAP old_bm; + RECT rc; assert(run->nFlags & MERF_GRAPHICS); assert(run->ole_obj); @@ -5331,8 +5332,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) { convert_sizel(c, &run->ole_obj->sizel, &sz); } else { - sz.cx = MulDiv(dibsect.dsBm.bmWidth, c->dpi.cx, 96); - sz.cy = MulDiv(dibsect.dsBm.bmHeight, c->dpi.cy, 96); + sz.cx = dibsect.dsBm.bmWidth; + sz.cy = dibsect.dsBm.bmHeight; } if (c->editor->nZoomNumerator != 0) { @@ -5351,8 +5352,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) { convert_sizel(c, &run->ole_obj->sizel, &sz); } else { - sz.cy = MulDiv(emh.rclBounds.bottom - emh.rclBounds.top, c->dpi.cx, 96); - sz.cx = MulDiv(emh.rclBounds.right - emh.rclBounds.left, c->dpi.cy, 96); + sz.cx = emh.rclBounds.right - emh.rclBounds.left; + sz.cy = emh.rclBounds.bottom - emh.rclBounds.top; } if (c->editor->nZoomNumerator != 0) { @@ -5360,15 +5361,11 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } - { - RECT rc; - - rc.left = x; - rc.top = y - sz.cy; - rc.right = x + sz.cx; - rc.bottom = y; - PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); - } + rc.left = x; + rc.top = y - sz.cy; + rc.right = x + sz.cx; + rc.bottom = y; + PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); break; default: FIXME("Unsupported tymed %d\n", stgm.tymed);

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2017