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

Marcus Meissner : hid: Increase buffer size to allow 16bit value + space + NUL (GCC7).
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 0a2e48933d02131115f139765c6e9b0d2908719e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2e48933d02131115f139765… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jun 2 10:47:03 2017 +0200 hid: Increase buffer size to allow 16bit value + space + NUL (GCC7). Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index a4c12ce..ef2f729 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -183,7 +183,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D { for (j=count; j < count+15 && j < usage_length; j++) { - CHAR btn[5]; + CHAR btn[7]; sprintf(btn, "%i ", button_pages[j]); strcat(report, btn); }

1 0

Hugh McMaster : regedit: Update handling of the 'Modify' menu item.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: b332c1a6d59f4efa4a306b3aa1d9b6ef0e6de1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b332c1a6d59f4efa4a306b3aa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 2 10:57:58 2017 +0000 regedit: Update handling of the 'Modify' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c46dee3..cd7dad0 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -132,7 +132,17 @@ update: SetMenuItemInfoW(hMenu, ID_TREE_EXPAND_COLLAPSE, FALSE, &info); } -static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) +static void update_modify_items(HMENU hMenu, int index) +{ + unsigned int state = MF_ENABLED; + + if (!g_pChildWnd->nFocusPanel || index == -1) + state = MF_GRAYED; + + EnableMenuItem(hMenu, ID_EDIT_MODIFY, state | MF_BYCOMMAND); +} + +static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName, int index) { unsigned int state_d = MF_ENABLED, state_r = MF_ENABLED; @@ -141,13 +151,10 @@ static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) if (!keyName || !*keyName) state_d = state_r = MF_GRAYED; } - else + else if (index < 1) { - int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); - + state_r = MF_GRAYED; if (index == -1) state_d = MF_GRAYED; - if (index < 1) state_r = MF_GRAYED; } EnableMenuItem(hMenu, ID_EDIT_DELETE, state_d | MF_BYCOMMAND); @@ -170,20 +177,19 @@ static void update_new_items_and_copy_keyname(HMENU hMenu, WCHAR *keyName) static void UpdateMenuItems(HMENU hMenu) { HWND hwndTV = g_pChildWnd->hTreeWnd; - BOOL bAllowEdit = FALSE; HKEY hRootKey = NULL; LPWSTR keyName; HTREEITEM selection; + int index; selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); keyName = GetItemPath(hwndTV, selection, &hRootKey); - if (GetFocus() != hwndTV || (keyName && *keyName)) { /* can't modify root keys, but allow for their values */ - bAllowEdit = TRUE; - } + index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, + MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); update_expand_or_collapse_item(hwndTV, selection, hMenu); - EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); - update_delete_and_rename_items(hMenu, keyName); + update_modify_items(hMenu, index); + update_delete_and_rename_items(hMenu, keyName, index); update_new_items_and_copy_keyname(hMenu, keyName); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateLayer().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 6d638b9e287b3240bbfd37a08d1da0ac9d3e6bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d638b9e287b3240bbfd37a08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:31 2017 +0200 d2d1: Implement d2d_d3d_render_target_CreateLayer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 10 ++++ dlls/d2d1/layer.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/render_target.c | 11 ++++- dlls/d2d1/tests/d2d1.c | 45 ++++++++++++++++++ 5 files changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 68e9268..51b9627 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ factory.c \ geometry.c \ hwnd_render_target.c \ + layer.c \ mesh.c \ render_target.c \ state_block.c \ diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 7d8027b..12a230b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -236,6 +236,16 @@ struct d2d_stroke_style HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; +struct d2d_layer +{ + ID2D1Layer ID2D1Layer_iface; + LONG refcount; + + ID2D1Factory *factory; +}; + +HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) DECLSPEC_HIDDEN; + struct d2d_mesh { ID2D1Mesh ID2D1Mesh_iface; diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c new file mode 100644 index 0000000..0fcd185 --- /dev/null +++ b/dlls/d2d1/layer.c @@ -0,0 +1,115 @@ +/* + * Copyright 2017 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_layer *impl_from_ID2D1Layer(ID2D1Layer *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_layer, ID2D1Layer_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_layer_QueryInterface(ID2D1Layer *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Layer) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Layer_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_layer_AddRef(ID2D1Layer *iface) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + ULONG refcount = InterlockedIncrement(&layer->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + ULONG refcount = InterlockedDecrement(&layer->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + ID2D1Factory_Release(layer->factory); + HeapFree(GetProcessHeap(), 0, layer); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_layer_GetFactory(ID2D1Layer *iface, ID2D1Factory **factory) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = layer->factory); +} + +static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_layer_GetSize(ID2D1Layer *iface, D2D1_SIZE_F *size) +{ + FIXME("iface %p, size %p stub!\n", iface, size); + + size->width = 0; + size->height = 0; + return size; +} + +static const struct ID2D1LayerVtbl d2d_layer_vtbl = +{ + d2d_layer_QueryInterface, + d2d_layer_AddRef, + d2d_layer_Release, + d2d_layer_GetFactory, + d2d_layer_GetSize, +}; + +HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) +{ + if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) + return E_OUTOFMEMORY; + + (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; + (*layer)->refcount = 1; + ID2D1Factory_AddRef((*layer)->factory = factory); + + TRACE("Created layer %p.\n", *layer); + + return S_OK; +} diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c55401a..ecab51f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -458,9 +458,16 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTar static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTarget *iface, const D2D1_SIZE_F *size, ID2D1Layer **layer) { - FIXME("iface %p, size %p, layer %p stub!\n", iface, size, layer); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_layer *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, size %p, layer %p.\n", iface, size, layer); + + if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, &object))) + *layer = &object->ID2D1Layer_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b26b7b1..72903ef 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4528,6 +4528,50 @@ todo_wine ID2D1Factory_Release(factory); } +static void test_layer(void) +{ + ID2D1Factory *factory, *layer_factory; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Layer *layer; + ULONG refcount; + HWND window; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = create_window(); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + ID2D1RenderTarget_GetFactory(rt, &factory); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + hr = ID2D1RenderTarget_CreateLayer(rt, NULL, &layer); + ok(SUCCEEDED(hr), "Failed to create layer, hr %#x.\n", hr); + ID2D1Layer_GetFactory(layer, &layer_factory); + ok(layer_factory == factory, "Got unexpected layer factory %p, expected %p.\n", layer_factory, factory); + ID2D1Factory_Release(layer_factory); + ID2D1Layer_Release(layer); + + ID2D1RenderTarget_Release(rt); + refcount = ID2D1Factory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -4552,4 +4596,5 @@ START_TEST(d2d1) test_gradient(); test_draw_geometry(); test_gdi_interop(); + test_layer(); }

1 0

Henri Verbeet : d2d1: Implement d2d_layer_GetSize().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: bc47dc3f41bc0614a824439d77ba74963a7e2f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc47dc3f41bc0614a824439d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:32 2017 +0200 d2d1: Implement d2d_layer_GetSize(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/layer.c | 11 +++++++---- dlls/d2d1/render_target.c | 2 +- dlls/d2d1/tests/d2d1.c | 12 ++++++++++++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 12a230b..377adf6 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -242,9 +242,10 @@ struct d2d_layer LONG refcount; ID2D1Factory *factory; + D2D1_SIZE_F size; }; -HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) DECLSPEC_HIDDEN; +HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) DECLSPEC_HIDDEN; struct d2d_mesh { diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c index 0fcd185..25a331b 100644 --- a/dlls/d2d1/layer.c +++ b/dlls/d2d1/layer.c @@ -84,10 +84,11 @@ static void STDMETHODCALLTYPE d2d_layer_GetFactory(ID2D1Layer *iface, ID2D1Facto static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_layer_GetSize(ID2D1Layer *iface, D2D1_SIZE_F *size) { - FIXME("iface %p, size %p stub!\n", iface, size); + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + + TRACE("iface %p, size %p.\n", iface, size); - size->width = 0; - size->height = 0; + *size = layer->size; return size; } @@ -100,7 +101,7 @@ static const struct ID2D1LayerVtbl d2d_layer_vtbl = d2d_layer_GetSize, }; -HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) +HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) { if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) return E_OUTOFMEMORY; @@ -108,6 +109,8 @@ HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; (*layer)->refcount = 1; ID2D1Factory_AddRef((*layer)->factory = factory); + if (size) + (*layer)->size = *size; TRACE("Created layer %p.\n", *layer); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ecab51f..ec8e4d0 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -464,7 +464,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa TRACE("iface %p, size %p, layer %p.\n", iface, size, layer); - if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, &object))) + if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, size, &object))) *layer = &object->ID2D1Layer_iface; return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 72903ef..6993dc6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4536,6 +4536,7 @@ static void test_layer(void) ID3D10Device1 *device; IDXGISurface *surface; ID2D1Layer *layer; + D2D1_SIZE_F size; ULONG refcount; HWND window; HRESULT hr; @@ -4561,6 +4562,17 @@ static void test_layer(void) ID2D1Layer_GetFactory(layer, &layer_factory); ok(layer_factory == factory, "Got unexpected layer factory %p, expected %p.\n", layer_factory, factory); ID2D1Factory_Release(layer_factory); + size = ID2D1Layer_GetSize(layer); + ok(size.width == 0.0f, "Got unexpected width %.8e.\n", size.width); + ok(size.height == 0.0f, "Got unexpected height %.8e.\n", size.height); + ID2D1Layer_Release(layer); + + set_size_f(&size, 800.0f, 600.0f); + hr = ID2D1RenderTarget_CreateLayer(rt, &size, &layer); + ok(SUCCEEDED(hr), "Failed to create layer, hr %#x.\n", hr); + size = ID2D1Layer_GetSize(layer); + ok(size.width == 800.0f, "Got unexpected width %.8e.\n", size.width); + ok(size.height == 600.0f, "Got unexpected height %.8e.\n", size.height); ID2D1Layer_Release(layer); ID2D1RenderTarget_Release(rt);

1 0

Henri Verbeet : d2d1: Implement d2d_rectangle_geometry_GetBounds().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 2485305b55a295662162d62f44ac947ae48a0b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2485305b55a295662162d62f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:33 2017 +0200 d2d1: Implement d2d_rectangle_geometry_GetBounds(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 12 ++++++++++ dlls/d2d1/geometry.c | 45 ++++++++++++++++++++++++------------- dlls/d2d1/render_target.c | 12 ---------- dlls/d2d1/tests/d2d1.c | 57 +++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 94 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2485305b55a295662162d…

1 0

Henri Verbeet : d2d1: Implement d2d_transformed_geometry_GetBounds().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 828e62c8e257e2741f3d6354a175e0ad87672d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828e62c8e257e2741f3d6354a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:34 2017 +0200 d2d1: Implement d2d_transformed_geometry_GetBounds(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 11 +++++++++-- dlls/d2d1/tests/d2d1.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index d367f67..d07f68e 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3066,9 +3066,16 @@ static void STDMETHODCALLTYPE d2d_transformed_geometry_GetFactory(ID2D1Transform static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetBounds(ID2D1TransformedGeometry *iface, const D2D1_MATRIX_3X2_F *transform, D2D1_RECT_F *bounds) { - FIXME("iface %p, transform %p, bounds %p stub!\n", iface, transform, bounds); + struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); + D2D1_MATRIX_3X2_F g; - return E_NOTIMPL; + TRACE("iface %p, transform %p, bounds %p.\n", iface, transform, bounds); + + g = geometry->transform; + if (transform) + d2d_matrix_multiply(&g, transform); + + return ID2D1Geometry_GetBounds(geometry->u.transformed.src_geometry, &g, bounds); } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetWidenedBounds(ID2D1TransformedGeometry *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f421b18..1387a05 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1838,6 +1838,7 @@ static void test_path_geometry(void) static void test_rectangle_geometry(void) { + ID2D1TransformedGeometry *transformed_geometry; ID2D1RectangleGeometry *geometry; D2D1_MATRIX_3X2_F matrix; D2D1_RECT_F rect, rect2; @@ -1964,8 +1965,46 @@ static void test_rectangle_geometry(void) ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); - ID2D1RectangleGeometry_Release(geometry); + set_matrix_identity(&matrix); + scale_matrix(&matrix, 4.0f, 5.0f); + rotate_matrix(&matrix, M_PI / 3.0f); + translate_matrix(&matrix, 30.0f, 20.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry); + ok(SUCCEEDED(hr), "Failed to create transformed geometry, hr %#x.\n", hr); + + ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, -7.85640717e+01f, 1.79903809e+02f, 1.07179594e+01f, 2.73205078e+02f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + rotate_matrix(&matrix, M_PI / -3.0f); + scale_matrix(&matrix, 0.25f, 0.2f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, 30.0f, 20.0f, 40.0f, 40.0f, 2); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + set_matrix_identity(&matrix); + scale_matrix(&matrix, 2.0f, 0.0f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, -1.57128143e+02f, 0.00000000e+00f, 2.14359188e+01f, 0.00000000e+00f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.0f, 0.5f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, 0.00000000e+00f, 8.99519043e+01f, 0.00000000e+00, 1.36602539e+02f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + ID2D1TransformedGeometry_Release(transformed_geometry); + ID2D1RectangleGeometry_Release(geometry); ID2D1Factory_Release(factory); }

1 0

Henri Verbeet : d2d1: Implement d2d_rectangle_geometry_Simplify().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: e5733e7cd40b41bb4d8c0409e9ed5be8fe6d5618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5733e7cd40b41bb4d8c0409e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:35 2017 +0200 d2d1: Implement d2d_rectangle_geometry_Simplify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 4 + dlls/d2d1/geometry.c | 27 +++- dlls/d2d1/tests/d2d1.c | 347 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 375 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5733e7cd40b41bb4d8c0…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: ebeefff87f48ceb4c6467376d9b32c971de158ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebeefff87f48ceb4c6467376d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 2 09:07:59 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/po/ru.po b/po/ru.po index ed60d7a..03a2543 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-05-25 02:24+0300\n" +"PO-Revision-Date: 2017-06-02 09:06+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11868,10 +11868,6 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Содержит команды для доступа к часто используемым разделам" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" @@ -12113,8 +12109,6 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: некорректный формат строки.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Выход из редактора реестра" @@ -12131,10 +12125,8 @@ msgid "Shows or hides the status bar" msgstr "Показывает/скрывает строку состояния" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Перемещает разделитель между двумя панелями" +msgstr "Перемещение разделителя панелей" #: regedit.rc:194 msgid "Refreshes the window" @@ -12166,21 +12158,19 @@ msgstr "Изменяет значение параметра" #: regedit.rc:173 msgid "Adds a new key" -msgstr "Добавляет новый раздел" +msgstr "Добавление нового раздела" #: regedit.rc:174 msgid "Adds a new string value" -msgstr "Добавляет новый строковый параметр" +msgstr "Добавление строкового параметра" #: regedit.rc:175 msgid "Adds a new binary value" -msgstr "Добавляет новый двоичный параметр" +msgstr "Добавление двоичного параметра" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Добавляет новый двоичный параметр" +msgstr "Добавление 32-битного параметра" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12195,10 +12185,8 @@ msgid "Prints all or part of the registry" msgstr "Печатает весь реестр или его часть" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Редактор реестра" +msgstr "Отображение справки по редактору реестра" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12241,26 +12229,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Не удалось прочитать ключ реестра «%1»." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Изменяет значение параметра" +msgstr "Изменение значения параметра в двоичном виде" #: regedit.rc:177 msgid "Adds a new multi-string value" -msgstr "Добавляет новое многостроковое значение" +msgstr "Добавление многострочного параметра" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" -msgstr "Экспортирует выделенную ветку реестра в текстовый файл" +msgstr "Экспортирует выбранную ветку реестра в текстовый файл" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Добавляет новый строковый параметр" +msgstr "Добавление расширяемого строкового параметра" #: regedit.rc:213 msgid "Confirm Key Delete"

1 0

Ken Thomases : ntdll: On macOS, don't use clock_gettime() even if it' s available.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 27c71e09ad51ba6aa672a46379efd10b5959863f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c71e09ad51ba6aa672a4637… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 1 14:48:05 2017 -0500 ntdll: On macOS, don't use clock_gettime() even if it's available. The problem is building against the 10.12 or later SDK but deploying to 10.11 or earlier. Support for clock_gettime() is new with 10.12 so configure finds it and the code uses it, but the symbol is weak linked and resolves to NULL when running on earlier versions. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 3ba3c68..12dbdc3 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -101,7 +101,12 @@ static ULONGLONG monotonic_counter(void) { struct timeval now; -#ifdef HAVE_CLOCK_GETTIME +#ifdef __APPLE__ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 100; +#elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; #ifdef CLOCK_MONOTONIC_RAW if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) @@ -109,11 +114,6 @@ static ULONGLONG monotonic_counter(void) #endif if (!clock_gettime( CLOCK_MONOTONIC, &ts )) return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; -#elif defined(__APPLE__) - static mach_timebase_info_data_t timebase; - - if (!timebase.denom) mach_timebase_info( &timebase ); - return mach_absolute_time() * timebase.numer / timebase.denom / 100; #endif gettimeofday( &now, 0 );

1 0

Ken Thomases : server: On macOS, don't use clock_gettime() even if it' s available.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 1984e86b44343c8f1cdb163b8481ab84ca9cd16a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1984e86b44343c8f1cdb163b8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 1 14:48:06 2017 -0500 server: On macOS, don't use clock_gettime() even if it's available. The problem is building against the 10.12 or later SDK but deploying to 10.11 or earlier. Support for clock_gettime() is new with 10.12 so configure finds it and the code uses it, but the symbol is weak linked and resolves to NULL when running on earlier versions. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/request.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/request.c b/server/request.c index 781889c..6120bc5 100644 --- a/server/request.c +++ b/server/request.c @@ -518,7 +518,12 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) /* get current tick count to return to client */ unsigned int get_tick_count(void) { -#ifdef HAVE_CLOCK_GETTIME +#ifdef __APPLE__ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; +#elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; #ifdef CLOCK_MONOTONIC_RAW if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) @@ -526,11 +531,6 @@ unsigned int get_tick_count(void) #endif if (!clock_gettime( CLOCK_MONOTONIC, &ts )) return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; -#elif defined(__APPLE__) - static mach_timebase_info_data_t timebase; - - if (!timebase.denom) mach_timebase_info( &timebase ); - return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; #endif return (current_time - server_start_time) / 10000; }

1 0