October 2016 - Wine-Commits

Andrew Eikum : d2d1: Implement d2d_path_geometry_FillContainsPoint().
by Alexandre Julliard Oct. 26, 2016

Oct. 26, 2016

Module: wine Branch: master Commit: 2e08bc0ffca7ca425caf7c38afbe4503fad272dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e08bc0ffca7ca425caf7c38a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 26 15:20:22 2016 +0200 d2d1: Implement d2d_path_geometry_FillContainsPoint(). Signed-off-by: Andrew Eikum <aeikum(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 | 23 +++++++++++++++++++++++ dlls/d2d1/geometry.c | 22 +++++++++++++++++++--- dlls/d2d1/render_target.c | 6 ------ 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b49fce4..8497ea8 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -357,4 +357,27 @@ static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2 a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; } +/* Dst must be different from src. */ +static inline BOOL d2d_matrix_invert(D2D_MATRIX_3X2_F *dst, const D2D_MATRIX_3X2_F *src) +{ + float d = src->_11 * src->_22 - src->_21 * src->_12; + + if (d == 0.0f) + return FALSE; + dst->_11 = src->_22 / d; + dst->_21 = -src->_21 / d; + dst->_31 = (src->_21 * src->_32 - src->_31 * src->_22) / d; + dst->_12 = -src->_12 / d; + dst->_22 = src->_11 / d; + dst->_32 = -(src->_11 * src->_32 - src->_31 * src->_12) / d; + + return TRUE; +} + +static inline void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) +{ + dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; + dst->y = x * matrix->_12 + y * matrix->_22 + matrix->_32; +} + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 57dcce2..385e171 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1924,9 +1924,11 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac } done: - d2d_path_geometry_free_figures(geometry); if (FAILED(hr)) + { + d2d_path_geometry_free_figures(geometry); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; + } return hr; } @@ -2112,10 +2114,24 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1Path static HRESULT STDMETHODCALLTYPE d2d_path_geometry_FillContainsPoint(ID2D1PathGeometry *iface, D2D1_POINT_2F point, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains) { - FIXME("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p stub!\n", + struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface); + D2D1_MATRIX_3X2_F g_i; + + TRACE("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p.\n", iface, point.x, point.y, transform, tolerance, contains); - return E_NOTIMPL; + if (transform) + { + if (!d2d_matrix_invert(&g_i, transform)) + return D2DERR_UNSUPPORTED_OPERATION; + d2d_point_transform(&point, &g_i, point.x, point.y); + } + + *contains = !!d2d_path_geometry_point_inside(geometry, &point); + + TRACE("-> %#x.\n", *contains); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CompareWithGeometry(ID2D1PathGeometry *iface, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index bc31f4d..798dd0d 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -48,12 +48,6 @@ static void d2d_point_set(D2D1_POINT_2F *dst, float x, float y) dst->y = y; } -static void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) -{ - dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; - dst->y = x * matrix->_12 + y * matrix->_22 + matrix->_32; -} - static void d2d_rect_expand(D2D1_RECT_F *dst, const D2D1_POINT_2F *point) { if (point->x < dst->left)

1 0

Andrey Gusev : ext-ms-win-gdi-dc-create-l1-1-1: Add dll.
by Alexandre Julliard Oct. 26, 2016

Oct. 26, 2016

Module: wine Branch: master Commit: b80cd8fb3040f2c8fa12e090d4e99aad6b1d5134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b80cd8fb3040f2c8fa12e090d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Oct 26 12:08:33 2016 +0300 ext-ms-win-gdi-dc-create-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-dc-create-l1-1-1/Makefile.in | 1 + .../ext-ms-win-gdi-dc-create-l1-1-1.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index f36dbe6..02a5819 100755 --- a/configure +++ b/configure @@ -1162,6 +1162,7 @@ enable_dxva2 enable_esent enable_evr enable_explorerframe +enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_faultrep @@ -17918,6 +17919,7 @@ wine_fn_config_dll esent enable_esent wine_fn_config_dll evr enable_evr wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test +wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib diff --git a/configure.ac b/configure.ac index f7330ac..0ef6fc8 100644 --- a/configure.ac +++ b/configure.ac @@ -3004,6 +3004,7 @@ WINE_CONFIG_DLL(esent) WINE_CONFIG_DLL(evr) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) +WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) diff --git a/dlls/ext-ms-win-gdi-dc-create-l1-1-1/Makefile.in b/dlls/ext-ms-win-gdi-dc-create-l1-1-1/Makefile.in new file mode 100644 index 0000000..c692e3b --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-create-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-dc-create-l1-1-1.dll diff --git a/dlls/ext-ms-win-gdi-dc-create-l1-1-1/ext-ms-win-gdi-dc-create-l1-1-1.spec b/dlls/ext-ms-win-gdi-dc-create-l1-1-1/ext-ms-win-gdi-dc-create-l1-1-1.spec new file mode 100644 index 0000000..5f6b05c --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-create-l1-1-1/ext-ms-win-gdi-dc-create-l1-1-1.spec @@ -0,0 +1,4 @@ +@ stdcall CreateCompatibleDC(long) gdi32.CreateCompatibleDC +@ stdcall CreateDCW(wstr wstr wstr ptr) gdi32.CreateDCW +@ stdcall CreateICW(wstr wstr wstr ptr) gdi32.CreateICW +@ stdcall DeleteDC(long) gdi32.DeleteDC diff --git a/tools/make_specfiles b/tools/make_specfiles index 5faf8b2..a08cc5f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -284,6 +284,7 @@ my @dll_groups = ], [ "gdi32", + "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-devcaps-l1-1-0", ], [

1 0

Andrey Gusev : api-ms-win-core-psapi-obsolete-l1-1-0: Add dll.
by Alexandre Julliard Oct. 26, 2016

Oct. 26, 2016

Module: wine Branch: master Commit: 1ff4f043e30ac3f69575c03462091294148fd42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff4f043e30ac3f69575c0346… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Oct 25 21:22:36 2016 +0300 api-ms-win-core-psapi-obsolete-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-psapi-obsolete-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-psapi-obsolete-l1-1-0.spec | 7 +++++++ tools/make_specfiles | 1 + 5 files changed, 12 insertions(+) diff --git a/configure b/configure index c21bda3..f36dbe6 100755 --- a/configure +++ b/configure @@ -942,6 +942,7 @@ enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 +enable_api_ms_win_core_psapi_obsolete_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 enable_api_ms_win_core_registryuserspecific_l1_1_0 @@ -17632,6 +17633,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 +wine_fn_config_dll api-ms-win-core-psapi-obsolete-l1-1-0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 wine_fn_config_dll api-ms-win-core-registryuserspecific-l1-1-0 enable_api_ms_win_core_registryuserspecific_l1_1_0 diff --git a/configure.ac b/configure.ac index c624c9e..f7330ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2719,6 +2719,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-psapi-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0) diff --git a/dlls/api-ms-win-core-psapi-obsolete-l1-1-0/Makefile.in b/dlls/api-ms-win-core-psapi-obsolete-l1-1-0/Makefile.in new file mode 100644 index 0000000..fed826f --- /dev/null +++ b/dlls/api-ms-win-core-psapi-obsolete-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-psapi-obsolete-l1-1-0.dll diff --git a/dlls/api-ms-win-core-psapi-obsolete-l1-1-0/api-ms-win-core-psapi-obsolete-l1-1-0.spec b/dlls/api-ms-win-core-psapi-obsolete-l1-1-0/api-ms-win-core-psapi-obsolete-l1-1-0.spec new file mode 100644 index 0000000..444d8ea --- /dev/null +++ b/dlls/api-ms-win-core-psapi-obsolete-l1-1-0/api-ms-win-core-psapi-obsolete-l1-1-0.spec @@ -0,0 +1,7 @@ +@ stdcall K32EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules +@ stdcall K32EnumProcessModulesEx(long ptr long ptr long) kernel32.K32EnumProcessModulesEx +@ stdcall K32GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA +@ stdcall K32GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW +@ stdcall K32GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA +@ stdcall K32GetModuleFileNameExW(long long ptr long) kernel32.K32GetModuleFileNameExW +@ stdcall K32GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation diff --git a/tools/make_specfiles b/tools/make_specfiles index b7b5a7b..5faf8b2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -195,6 +195,7 @@ my @dll_groups = "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", "api-ms-win-core-psapi-l1-1-0", + "api-ms-win-core-psapi-obsolete-l1-1-0", "api-ms-win-core-threadpool-l1-1-0", "api-ms-win-core-threadpool-l1-2-0", "api-ms-win-core-threadpool-legacy-l1-1-0",

1 0

Nikolay Sivov : d3drm: Remove stub messages for implemented methods TRACEs.
by Alexandre Julliard Oct. 26, 2016

Oct. 26, 2016

Module: wine Branch: master Commit: bd592609e7b8ec59d270d7defca2dfd8d8cc985b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd592609e7b8ec59d270d7def… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 25 08:11:45 2016 +0300 d3drm: Remove stub messages for implemented methods TRACEs. 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/d3drm/device.c | 4 ++-- dlls/d3drm/frame.c | 2 +- dlls/d3drm/meshbuilder.c | 2 +- dlls/d3drm/texture.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 57fd7c0..ef83de0 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1146,7 +1146,7 @@ static D3DCOLORMODEL WINAPI d3drm_device1_GetColorModel(IDirect3DRMDevice *iface { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); - TRACE("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); return d3drm_device3_GetColorModel(&device->IDirect3DRMDevice3_iface); } @@ -1580,7 +1580,7 @@ static HRESULT WINAPI d3drm_device_win_GetName(IDirect3DRMWinDevice *iface, DWOR { struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); - TRACE("iface %p, size %p, name %p stub!\n", iface, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); return d3drm_device3_GetName(&device->IDirect3DRMDevice3_iface, size, name); } diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index d79a8e3..978b1d8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2002,7 +2002,7 @@ static HRESULT WINAPI d3drm_frame3_SetSceneBackgroundRGB(IDirect3DRMFrame3 *ifac { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - TRACE("iface %p, red %.8e, green %.8e, blue %.8e stub!\n", iface, red, green, blue); + TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); frame->scenebackground = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 72c4473..958e759 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2211,7 +2211,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetNormals(IDirect3DRMMeshBuilder3 *if struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); DWORD count = mesh_builder->nb_normals - start_idx; - TRACE("iface %p, start_idx %u, normal_count %p, normals %p stub!\n", + TRACE("iface %p, start_idx %u, normal_count %p, normals %p.\n", iface, start_idx, normal_count, normals); if (normal_count) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 83d07dc..6c622b6 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -222,7 +222,7 @@ static HRESULT WINAPI d3drm_texture1_SetDecalSize(IDirect3DRMTexture *iface, D3D { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); - TRACE("iface %p, width %.8e, height %.8e stub!\n", iface, width, height); + TRACE("iface %p, width %.8e, height %.8e.\n", iface, width, height); return IDirect3DRMTexture3_SetDecalSize(&texture->IDirect3DRMTexture3_iface, width, height); } @@ -522,7 +522,7 @@ static HRESULT WINAPI d3drm_texture2_SetDecalSize(IDirect3DRMTexture2 *iface, D3 { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - TRACE("iface %p, width %.8e, height %.8e stub!\n", iface, width, height); + TRACE("iface %p, width %.8e, height %.8e.\n", iface, width, height); return IDirect3DRMTexture3_SetDecalSize(&texture->IDirect3DRMTexture3_iface, width, height); }

1 0

Henri Verbeet : wined3d: Get rid of WINED3DFMT_FLAG_GETDC.
by Alexandre Julliard Oct. 26, 2016

Oct. 26, 2016

Module: wine Branch: master Commit: 6196e944a281f9e387535a8d070ab2a7ba605400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6196e944a281f9e387535a8d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 26 15:20:24 2016 +0200 wined3d: Get rid of WINED3DFMT_FLAG_GETDC. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e7bb88..c56558d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3637,7 +3637,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_RENDERTARGET 0x00000010 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 #define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080 -#define WINED3DFMT_FLAG_GETDC 0x00000100 #define WINED3DFMT_FLAG_FLOAT 0x00000200 #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 #define WINED3DFMT_FLAG_SRGB_READ 0x00000800

1 0

Andrew Eikum : d2d1: Implement d2d_transformed_geometry_FillContainsPoint( ).
by Alexandre Julliard Oct. 26, 2016

Oct. 26, 2016

Module: wine Branch: master Commit: 930dd951b3e0325f05a6e28c0ff37480b04c0aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=930dd951b3e0325f05a6e28c0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 26 15:20:21 2016 +0200 d2d1: Implement d2d_transformed_geometry_FillContainsPoint(). Signed-off-by: Andrew Eikum <aeikum(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 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 9fa1783..57dcce2 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2627,10 +2627,17 @@ static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_StrokeContainsPoint(ID static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_FillContainsPoint(ID2D1TransformedGeometry *iface, D2D1_POINT_2F point, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains) { - FIXME("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p stub!\n", + struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); + D2D1_MATRIX_3X2_F g; + + TRACE("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p.\n", iface, point.x, point.y, transform, tolerance, contains); - return E_NOTIMPL; + g = geometry->transform; + if (transform) + d2d_matrix_multiply(&g, transform); + + return ID2D1Geometry_FillContainsPoint(geometry->u.transformed.src_geometry, point, &g, tolerance, contains); } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_CompareWithGeometry(ID2D1TransformedGeometry *iface,

1 0

Andrey Gusev : ext-ms-win-ntuser-message-l1-1-1: Add dll.
by Alexandre Julliard Oct. 26, 2016

Oct. 26, 2016

Module: wine Branch: master Commit: a6c4c30ad190927ec89466a4ecbf2ef5976c6b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c4c30ad190927ec89466a4e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Oct 26 12:45:09 2016 +0300 ext-ms-win-ntuser-message-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-message-l1-1-1/Makefile.in | 1 + .../ext-ms-win-ntuser-message-l1-1-1.spec | 25 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 30 insertions(+) diff --git a/configure b/configure index 02a5819..61477ee 100755 --- a/configure +++ b/configure @@ -1165,6 +1165,7 @@ enable_explorerframe enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 +enable_ext_ms_win_ntuser_message_l1_1_1 enable_faultrep enable_fltlib enable_fltmgr_sys @@ -17922,6 +17923,7 @@ wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 +wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib diff --git a/configure.ac b/configure.ac index 0ef6fc8..8611740 100644 --- a/configure.ac +++ b/configure.ac @@ -3007,6 +3007,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) diff --git a/dlls/ext-ms-win-ntuser-message-l1-1-1/Makefile.in b/dlls/ext-ms-win-ntuser-message-l1-1-1/Makefile.in new file mode 100644 index 0000000..8b3e411 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-message-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-message-l1-1-1.dll diff --git a/dlls/ext-ms-win-ntuser-message-l1-1-1/ext-ms-win-ntuser-message-l1-1-1.spec b/dlls/ext-ms-win-ntuser-message-l1-1-1/ext-ms-win-ntuser-message-l1-1-1.spec new file mode 100644 index 0000000..5992b17 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-message-l1-1-1/ext-ms-win-ntuser-message-l1-1-1.spec @@ -0,0 +1,25 @@ +@ stdcall CallMsgFilterW(ptr long) user32.CallMsgFilterW +@ stdcall DispatchMessageA(ptr) user32.DispatchMessageA +@ stdcall DispatchMessageW(ptr) user32.DispatchMessageW +@ stdcall GetMessageA(ptr long long long) user32.GetMessageA +@ stdcall GetMessagePos() user32.GetMessagePos +@ stdcall GetMessageTime() user32.GetMessageTime +@ stdcall GetMessageW(ptr long long long) user32.GetMessageW +@ stdcall GetQueueStatus(long) user32.GetQueueStatus +@ stdcall InSendMessage() user32.InSendMessage +@ stdcall InSendMessageEx(ptr) user32.InSendMessageEx +@ stdcall PeekMessageA(ptr long long long long) user32.PeekMessageA +@ stdcall PeekMessageW(ptr long long long long) user32.PeekMessageW +@ stdcall PostMessageA(long long long long) user32.PostMessageA +@ stdcall PostMessageW(long long long long) user32.PostMessageW +@ stdcall PostQuitMessage(long) user32.PostQuitMessage +@ stdcall PostThreadMessageA(long long long long) user32.PostThreadMessageA +@ stdcall PostThreadMessageW(long long long long) user32.PostThreadMessageW +@ stdcall RegisterWindowMessageA(str) user32.RegisterWindowMessageA +@ stdcall RegisterWindowMessageW(wstr) user32.RegisterWindowMessageW +@ stdcall SendMessageA(long long long long) user32.SendMessageA +@ stdcall SendMessageTimeoutW(long long long long long long ptr) user32.SendMessageTimeoutW +@ stdcall SendMessageW(long long long long) user32.SendMessageW +@ stdcall SendNotifyMessageW(long long long long) user32.SendNotifyMessageW +@ stdcall SetMessageQueue(long) user32.SetMessageQueue +@ stdcall TranslateMessage(ptr) user32.TranslateMessage diff --git a/tools/make_specfiles b/tools/make_specfiles index a08cc5f..f99c6f5 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -266,6 +266,7 @@ my @dll_groups = "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", + "ext-ms-win-ntuser-message-l1-1-1", ], [ "version",

1 0

Piotr Caban : gdiplus: Fix GdipCreateLineBrushFromRectWithAngle implementation.
by Alexandre Julliard Oct. 25, 2016

Oct. 25, 2016

Module: wine Branch: master Commit: befb8603e2c31afe9ac8ca737469b78fd5432997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=befb8603e2c31afe9ac8ca737… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 20:46:14 2016 +0200 gdiplus: Fix GdipCreateLineBrushFromRectWithAngle implementation. The patch fixes isAngleScalable==TRUE argument handling. It also fixes a mistake when width was used instead of height. 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/brush.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ed29990..a184276 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -428,26 +428,43 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect { GpStatus stat; LinearGradientMode mode; - REAL width, height, exofs, eyofs; + REAL exofs, eyofs; REAL sin_angle, cos_angle, sin_cos_angle; TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); - sin_angle = sinf(deg2rad(angle)); - cos_angle = cosf(deg2rad(angle)); - sin_cos_angle = sin_angle * cos_angle; + if (!rect || !rect->Width || !rect->Height) + return InvalidParameter; + + angle = fmodf(angle, 360); + if (angle < 0) + angle += 360; if (isAngleScalable) { - width = height = 1.0; + float add_angle = 0; + + while(angle >= 90) { + angle -= 180; + add_angle += M_PI; + } + + if (angle != 90 && angle != -90) + angle = atan((rect->Width / rect->Height) * tan(deg2rad(angle))); + else + angle = deg2rad(angle); + angle += add_angle; } else { - width = rect->Width; - height = rect->Height; + angle = deg2rad(angle); } + sin_angle = sinf(angle); + cos_angle = cosf(angle); + sin_cos_angle = sin_angle * cos_angle; + if (sin_cos_angle >= 0) mode = LinearGradientModeForwardDiagonal; else @@ -459,19 +476,13 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect { if (sin_cos_angle >= 0) { - exofs = width * sin_cos_angle + height * cos_angle * cos_angle; - eyofs = width * sin_angle * sin_angle + height * sin_cos_angle; + exofs = rect->Height * sin_cos_angle + rect->Width * cos_angle * cos_angle; + eyofs = rect->Height * sin_angle * sin_angle + rect->Width * sin_cos_angle; } else { - exofs = width * sin_angle * sin_angle + height * sin_cos_angle; - eyofs = -width * sin_cos_angle + height * sin_angle * sin_angle; - } - - if (isAngleScalable) - { - exofs = exofs * rect->Width; - eyofs = eyofs * rect->Height; + exofs = rect->Width * sin_angle * sin_angle + rect->Height * sin_cos_angle; + eyofs = -rect->Width * sin_cos_angle + rect->Height * sin_angle * sin_angle; } if (sin_angle >= 0)

1 0

Hans Leidekker : webservices: Implement WsCall.
by Alexandre Julliard Oct. 25, 2016

Oct. 25, 2016

Module: wine Branch: master Commit: d91f985e220a2b2e8e6459434f4e001f64402f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91f985e220a2b2e8e6459434… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 25 13:03:23 2016 +0200 webservices: Implement WsCall. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 78 ++++++++++--- dlls/webservices/proxy.c | 154 +++++++++++++++++++++++- dlls/webservices/reader.c | 104 +++++++++++++++++ dlls/webservices/tests/proxy.c | 208 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 11 ++ dlls/webservices/writer.c | 42 ++++++- 6 files changed, 575 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d91f985e220a2b2e8e645…

1 0

Hans Leidekker : webservices: Add a stub implementation of WS_TYPE_ATTRIBUTE_FIELD_MAPPING in the reader.
by Alexandre Julliard Oct. 25, 2016

Oct. 25, 2016

Module: wine Branch: master Commit: 02ee6bda54e462c8fff4a1dc93b8cde2e68630f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ee6bda54e462c8fff4a1dc9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 25 13:03:21 2016 +0200 webservices: Add a stub implementation of WS_TYPE_ATTRIBUTE_FIELD_MAPPING in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7996cbe..169a0e1 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3791,6 +3791,9 @@ ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) case WS_STRUCT_TYPE: return desc->size; + case WS_DESCRIPTION_TYPE: + return sizeof(WS_STRUCT_DESCRIPTION *); + default: ERR( "unhandled type %u\n", type ); return 0; @@ -3829,6 +3832,7 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) return WS_READ_REQUIRED_VALUE; case WS_WSZ_TYPE: + case WS_DESCRIPTION_TYPE: if (options & WS_FIELD_NILLABLE) return WS_READ_NILLABLE_POINTER; if (options & WS_FIELD_OPTIONAL) return WS_READ_OPTIONAL_POINTER; return WS_READ_REQUIRED_POINTER; @@ -3940,6 +3944,10 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES ptr = buf + desc->offset; switch (desc->mapping) { + case WS_TYPE_ATTRIBUTE_FIELD_MAPPING: + FIXME( "WS_TYPE_ATTRIBUTE_FIELD_MAPPING not supported\n" ); + return S_OK; + case WS_ATTRIBUTE_FIELD_MAPPING: hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->localName, desc->ns, desc->typeDescription, option, heap, ptr, size );

1 0