June 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Move NtSetContextThread() implementation to the Unix library.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: ac90898f72b02bbc226a95deb40555c1fb8ac3a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac90898f72b02bbc226a95de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 13:11:54 2020 +0200 ntdll: Move NtSetContextThread() implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/signal_arm.c | 72 --------------- dlls/ntdll/signal_arm64.c | 72 --------------- dlls/ntdll/signal_i386.c | 102 --------------------- dlls/ntdll/signal_powerpc.c | 130 -------------------------- dlls/ntdll/signal_x86_64.c | 96 -------------------- dlls/ntdll/thread.c | 10 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/signal_arm.c | 38 ++++++++ dlls/ntdll/unix/signal_arm64.c | 48 ++++++++++ dlls/ntdll/unix/signal_i386.c | 191 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 28 ++++++ dlls/ntdll/unix/signal_x86_64.c | 135 +++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 20 ++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 3 +- 16 files changed, 474 insertions(+), 474 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac90898f72b02bbc226a…

1 0

Biswapriyo Nath : include: Add missing structures in dcommon.idl.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 48020f4846cca1a02f4e1dc037e2cc2068df5e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=48020f4846cca1a02f4e1dc0… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri May 15 19:10:41 2020 +0530 include: Add missing structures in dcommon.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 4 +-- dlls/d2d1/device.c | 4 +-- dlls/d2d1/geometry.c | 4 +-- dlls/d2d1/state_block.c | 4 +-- dlls/d2d1/tests/d2d1.c | 64 +++++++++++++++++------------------ include/d2dbasetypes.h | 10 ------ include/dcommon.idl | 89 ++++++++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 128 insertions(+), 51 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 1f455897f6..07d2e26a14 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -237,11 +237,11 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, enum d2d_brush_type type, const D2D1_BRUSH_PROPERTIES *desc, const struct ID2D1BrushVtbl *vtbl) { static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; brush->ID2D1Brush_iface.lpVtbl = vtbl; brush->refcount = 1; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index acecb2058a..3c8431ce8f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -23,11 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); #define INITIAL_CLIP_STACK_SIZE 4 static const D2D1_MATRIX_3X2_F identity = -{ +{{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, -}; +}}}; struct d2d_draw_text_layout_ctx { diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 9c5e653f56..c32de31035 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -30,11 +30,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); #define D2D_FP_EPS (1.0f / (1 << FLT_MANT_DIG)) static const D2D1_MATRIX_3X2_F identity = -{ +{{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, -}; +}}}; enum d2d_cdt_edge_next { diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index e3175146a6..501d94ae3e 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -165,11 +165,11 @@ void d2d_state_block_init(struct d2d_state_block *state_block, ID2D1Factory *fac const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params) { static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; state_block->ID2D1DrawingStateBlock1_iface.lpVtbl = &d2d_state_block_vtbl; state_block->refcount = 1; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7c0ee91099..87c87324f3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1096,11 +1096,11 @@ static void test_clip(void) HRESULT hr; BOOL match; static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; if (!(device = create_device())) { @@ -1302,23 +1302,23 @@ static void test_state_block(void) HWND window; HRESULT hr; static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; static const D2D1_MATRIX_3X2_F transform1 = - { + {{{ 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, - }; + }}}; static const D2D1_MATRIX_3X2_F transform2 = - { + {{{ 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, - }; + }}}; if (!(device = create_device())) { @@ -8613,57 +8613,57 @@ static void test_invert_matrix(void) } invert_tests[] = { - { { 0 }, { 0 }, FALSE }, + { {{{ 0 }}}, {{{ 0 }}}, FALSE }, { - { + {{{ 1.0f, 2.0f, 1.0f, 2.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ 1.0f, 2.0f, 1.0f, 2.0f, 4.0f, 8.0f - }, + }}}, FALSE }, { - { + {{{ 2.0f, 0.0f, 0.0f, 2.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ 0.5f, -0.0f, -0.0f, 0.5f, -2.0f, -4.0f - }, + }}}, TRUE }, { - { + {{{ 2.0f, 1.0f, 2.0f, 2.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ 1.0f, -0.5f, -1.0f, 1.0f, 4.0f, -6.0f - }, + }}}, TRUE }, { - { + {{{ 2.0f, 1.0f, 3.0f, 1.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ -1.0f, 1.0f, 3.0f, -2.0f, -20.0f, 12.0f - }, + }}}, TRUE }, }; @@ -8697,13 +8697,13 @@ static void test_skew_matrix(void) } skew_tests[] = { - { 0.0f, 0.0f, { 0.0f, 0.0f }, { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f } }, - { 45.0f, 0.0f, { 0.0f, 0.0f }, { 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f } }, - { 0.0f, 0.0f, { 10.0f, -3.0f }, { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f } }, - { -45.0f, 45.0f, { 0.1f, 0.5f }, { 1.0f, 1.0f, -1.0f, 1.0f, 0.5f, -0.1f } }, - { -45.0f, 45.0f, { 1.0f, 2.0f }, { 1.0f, 1.0f, -1.0f, 1.0f, 2.0f, -1.0f } }, - { 45.0f, -45.0f, { 1.0f, 2.0f }, { 1.0f, -1.0f, 1.0f, 1.0f, -2.0f, 1.0f } }, - { 30.0f, -60.0f, { 12.0f, -5.0f }, { 1.0f, -1.7320509f, 0.577350259f, 1.0f, 2.88675117f, 20.7846107f } }, + { 0.0f, 0.0f, { 0.0f, 0.0f }, {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }}} }, + { 45.0f, 0.0f, { 0.0f, 0.0f }, {{{ 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f }}} }, + { 0.0f, 0.0f, { 10.0f, -3.0f }, {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }}} }, + { -45.0f, 45.0f, { 0.1f, 0.5f }, {{{ 1.0f, 1.0f, -1.0f, 1.0f, 0.5f, -0.1f }}} }, + { -45.0f, 45.0f, { 1.0f, 2.0f }, {{{ 1.0f, 1.0f, -1.0f, 1.0f, 2.0f, -1.0f }}} }, + { 45.0f, -45.0f, { 1.0f, 2.0f }, {{{ 1.0f, -1.0f, 1.0f, 1.0f, -2.0f, 1.0f }}} }, + { 30.0f, -60.0f, { 12.0f, -5.0f }, {{{ 1.0f, -1.7320509f, 0.577350259f, 1.0f, 2.88675117f, 20.7846107f }}} }, }; unsigned int i; diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index b231081647..a160a89021 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -29,16 +29,6 @@ typedef struct D3DCOLORVALUE typedef D3DCOLORVALUE D2D_COLOR_F; -typedef struct D2D_MATRIX_3X2_F -{ - float _11; - float _12; - float _21; - float _22; - float _31; - float _32; -} D2D_MATRIX_3X2_F; - typedef struct D2D_RECT_F { float left; diff --git a/include/dcommon.idl b/include/dcommon.idl index 53281bd487..43c82eb8a7 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -23,6 +23,12 @@ typedef struct { long x, y; } POINT; + +typedef struct +{ + long left, top, right, bottom; +} RECT; + typedef unsigned int UINT32; cpp_quote("#endif") @@ -52,7 +58,7 @@ typedef enum D2D1_ALPHA_MODE D2D1_ALPHA_MODE_PREMULTIPLIED = 1, D2D1_ALPHA_MODE_STRAIGHT = 2, D2D1_ALPHA_MODE_IGNORE = 3, - D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff, + D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff } D2D1_ALPHA_MODE; typedef struct D2D1_PIXEL_FORMAT @@ -69,12 +75,76 @@ typedef struct D2D_POINT_2F typedef POINT D2D_POINT_2L, D2D1_POINT_2L; +typedef struct D2D_VECTOR_2F +{ + float x; + float y; +} D2D_VECTOR_2F; + +typedef struct D2D_VECTOR_3F +{ + float x; + float y; + float z; +} D2D_VECTOR_3F; + +typedef struct D2D_VECTOR_4F +{ + float x; + float y; + float z; + float w; +} D2D_VECTOR_4F; + +typedef RECT D2D_RECT_L, D2D1_RECT_L; + typedef struct D2D_SIZE_U { UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; +typedef struct D2D_MATRIX_3X2_F +{ + union + { + struct + { + float m11; + float m12; + float m21; + float m22; + float dx; + float dy; + }; + + struct + { + float _11, _12; + float _21, _22; + float _31, _32; + }; + + float m[3][2]; + }; +} D2D_MATRIX_3X2_F; + +typedef struct D2D_MATRIX_4X3_F +{ + union + { + struct + { + float _11, _12, _13; + float _21, _22, _23; + float _31, _32, _33; + float _41, _42, _43; + }; + + float m[4][3]; + }; +} D2D_MATRIX_4X3_F; + typedef struct D2D_MATRIX_4X4_F { union @@ -90,3 +160,20 @@ typedef struct D2D_MATRIX_4X4_F float m[4][4]; }; } D2D_MATRIX_4X4_F; + +typedef struct D2D_MATRIX_5X4_F +{ + union + { + struct + { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + float _51, _52, _53, _54; + }; + + float m[5][4]; + }; +} D2D_MATRIX_5X4_F;

1 0

Vijay Kiran Kamuju : ole2.dll16: Add stub OleIsCurrentClipboard function.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 9c95434095630aa1ed4f1ae3763424f09f423575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c95434095630aa1ed4f1ae3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Jun 2 18:02:50 2020 +0200 ole2.dll16: Add stub OleIsCurrentClipboard function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=7102 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2.dll16/ole2.c | 9 +++++++++ dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 5e6142fc96..04b40b0863 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -272,6 +272,15 @@ HRESULT WINAPI OleFlushClipboard16(void) return OleFlushClipboard(); } +/*********************************************************************** + * OleIsCurrentClipboard [OLE2.77] + */ +HRESULT WINAPI OleIsCurrentClipboard16(IDataObject* pDataObj) +{ + FIXME("(%p): stub\n", pDataObj); + return S_OK; +} + #define GET_SEGPTR_METHOD_ADDR(ifacename,segptr,methodname) \ ((SEGPTR)((const ifacename##Vtbl*)MapSL((SEGPTR)((ifacename*)MapSL(segptr))->lpVtbl))->methodname) diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index 108c3ee8f3..7aac6864e5 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -72,7 +72,7 @@ 74 stub READFMTUSERTYPESTG 75 stub WRITEFMTUSERTYPESTG 76 pascal -ret16 OleFlushClipboard() OleFlushClipboard16 -77 stub OLEISCURRENTCLIPBOARD +77 pascal OleIsCurrentClipboard(ptr) OleIsCurrentClipboard16 78 stub OLETRANSLATEACCELERATOR 79 pascal OleDoAutoConvert(ptr ptr) OleDoAutoConvert16 80 stub OLEGETAUTOCONVERT

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.142.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: b4310a19e96283e114fad13f7565f912a39640de URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4310a19e96283e114fad13f… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Jun 1 12:19:58 2020 -0700 winevulkan: Update to VK spec version 1.2.142. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 16 ++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 6 ++++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 241686122c..1dee769836 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.140" +VK_XML_VERSION = "1.2.142" WINE_VK_VERSION = (1, 2) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index a7480bf2da..8811fbbb8a 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1569,6 +1569,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT: + { + const VkDevicePrivateDataCreateInfoEXT *in = (const VkDevicePrivateDataCreateInfoEXT *)in_header; + VkDevicePrivateDataCreateInfoEXT *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->privateDataSlotRequestCount = in->privateDataSlotRequestCount; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2: { const VkPhysicalDeviceFeatures2 *in = (const VkPhysicalDeviceFeatures2 *)in_header; diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 60f2a2fac9..84b47bb610 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.140" + "api_version": "1.2.142" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 513b5ffa85..d419d3f8e4 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -399,14 +399,14 @@ #define VK_QCOM_render_pass_store_ops_EXTENSION_NAME "VK_QCOM_render_pass_store_ops" #define VK_MAKE_VERSION(major, minor, patch) \ - (((major) << 22) | ((minor) << 12) | (patch)) + ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch))) #define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22) #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff) #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0) -#define VK_HEADER_VERSION 140 +#define VK_HEADER_VERSION 142 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; @@ -1135,6 +1135,7 @@ typedef enum VkDriverId VK_DRIVER_ID_GOOGLE_SWIFTSHADER = 10, VK_DRIVER_ID_GGP_PROPRIETARY = 11, VK_DRIVER_ID_BROADCOM_PROPRIETARY = 12, + VK_DRIVER_ID_MESA_LLVMPIPE = 13, VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY, VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE, VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV, @@ -3087,6 +3088,7 @@ typedef enum VkVendorId VK_VENDOR_ID_VSI = 0x00010002, VK_VENDOR_ID_KAZAN = 0x00010003, VK_VENDOR_ID_CODEPLAY = 0x00010004, + VK_VENDOR_ID_MESA = 0x00010005, VK_VENDOR_ID_MAX_ENUM = 0x7fffffff, } VkVendorId;

1 0

Nikolay Sivov : dwrite: Partially implement GetBaseline().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: c44a0e865b00110f0c490dabe26f2109ed787f47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44a0e865b00110f0c490dab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:53 2020 +0300 dwrite: Partially implement GetBaseline(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 58 +++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/analyzer.c | 67 +++++++++++++++++++++++++------------------- 2 files changed, 92 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index cb58f36299..a8a3e7c359 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1539,13 +1539,63 @@ static HRESULT WINAPI dwritetextanalyzer1_ApplyCharacterSpacing(IDWriteTextAnaly return S_OK; } -static HRESULT WINAPI dwritetextanalyzer1_GetBaseline(IDWriteTextAnalyzer2 *iface, IDWriteFontFace *face, +static HRESULT WINAPI dwritetextanalyzer1_GetBaseline(IDWriteTextAnalyzer2 *iface, IDWriteFontFace *fontface, DWRITE_BASELINE baseline, BOOL vertical, BOOL is_simulation_allowed, DWRITE_SCRIPT_ANALYSIS sa, const WCHAR *localeName, INT32 *baseline_coord, BOOL *exists) { - FIXME("(%p %d %d %u %s %p %p): stub\n", face, vertical, is_simulation_allowed, sa.script, debugstr_w(localeName), - baseline_coord, exists); - return E_NOTIMPL; + struct dwrite_fontface *font_obj; + const DWRITE_FONT_METRICS1 *metrics; + + TRACE("%p, %d, %d, %u, %s, %p, %p.\n", fontface, vertical, is_simulation_allowed, sa.script, debugstr_w(localeName), + baseline_coord, exists); + + *exists = FALSE; + *baseline_coord = 0; + + if (baseline == DWRITE_BASELINE_DEFAULT) + baseline = vertical ? DWRITE_BASELINE_CENTRAL : DWRITE_BASELINE_ROMAN; + + if ((unsigned int)baseline > DWRITE_BASELINE_MAXIMUM) + return E_INVALIDARG; + + /* TODO: fetch BASE table data if available. */ + + if (!*exists && is_simulation_allowed) + { + font_obj = unsafe_impl_from_IDWriteFontFace(fontface); + metrics = &font_obj->metrics; + + switch (baseline) + { + case DWRITE_BASELINE_ROMAN: + *baseline_coord = vertical ? metrics->descent : 0; + break; + case DWRITE_BASELINE_CENTRAL: + *baseline_coord = vertical ? (metrics->ascent + metrics->descent) / 2 : + -(metrics->ascent - metrics->descent) / 2; + break; + case DWRITE_BASELINE_MATH: + *baseline_coord = vertical ? (metrics->ascent + metrics->descent) / 2 : + -(metrics->ascent + metrics->descent) / 2; + break; + case DWRITE_BASELINE_HANGING: + /* FIXME: this one isn't accurate, but close. */ + *baseline_coord = vertical ? metrics->capHeight * 6 / 7 + metrics->descent : metrics->capHeight * 6 / 7; + break; + case DWRITE_BASELINE_IDEOGRAPHIC_BOTTOM: + case DWRITE_BASELINE_MINIMUM: + *baseline_coord = vertical ? 0 : metrics->descent; + break; + case DWRITE_BASELINE_IDEOGRAPHIC_TOP: + case DWRITE_BASELINE_MAXIMUM: + *baseline_coord = vertical ? metrics->ascent + metrics->descent : -metrics->ascent; + break; + default: + ; + } + } + + return S_OK; } static HRESULT WINAPI dwritetextanalyzer1_AnalyzeVerticalGlyphOrientation(IDWriteTextAnalyzer2 *iface, diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index c5cf0954fe..70becb55ee 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -2484,39 +2484,48 @@ static void test_GetBaseline(void) fontface = create_fontface(); - /* Tahoma doesn't have BASE table, it doesn't work even with simulation enabled */ + /* Tahoma does not have a BASE table. */ + exists = TRUE; baseline = 456; - hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, - fontface, - DWRITE_BASELINE_DEFAULT, - FALSE, - TRUE, - sa, - NULL, - &baseline, - &exists); -todo_wine { - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(baseline == 0, "got %d\n", baseline); - ok(exists == FALSE, "got %d\n", exists); -} + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_DEFAULT, FALSE, + TRUE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + exists = TRUE; baseline = 456; - hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, - fontface, - DWRITE_BASELINE_ROMAN, - FALSE, - TRUE, - sa, - NULL, - &baseline, - &exists); -todo_wine { - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(baseline == 0, "got %d\n", baseline); - ok(exists == FALSE, "got %d\n", exists); -} + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_DEFAULT, FALSE, + FALSE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + + exists = TRUE; + baseline = 0; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_CENTRAL, FALSE, + TRUE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(baseline != 0, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + + exists = TRUE; + baseline = 0; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_CENTRAL, FALSE, + FALSE, sa, NULL, &baseline, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + + exists = TRUE; + baseline = 456; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, fontface, DWRITE_BASELINE_DEFAULT + 100, FALSE, + TRUE, sa, NULL, &baseline, &exists); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!baseline, "Unexpected baseline %d.\n", baseline); + ok(!exists, "Unexpected flag %d.\n", exists); + IDWriteFontFace_Release(fontface); IDWriteTextAnalyzer1_Release(analyzer1); }

1 0

Nikolay Sivov : dwrite: Enable lookups from non-global features too.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 4f7f3b7b8b007dd3e73b52b085109b223cbd5bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f7f3b7b8b007dd3e73b52b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:52 2020 +0300 dwrite: Enable lookups from non-global features too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 629bc7f407..64fba56202 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4369,10 +4369,6 @@ static void opentype_layout_add_lookups(const struct ot_feature_list *feature_li if (feature->index == 0xffff) return; - /* FIXME: skip non-global ones for now. */ - if (!(feature->flags & FEATURE_GLOBAL)) - return; - feature_offset = GET_BE_WORD(feature_list->features[feature->index].offset); lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset +

1 0

Nikolay Sivov : mfmediaengine: Send "volumechange" event on muted state change.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: daa119581a5a7f739242764c158944bfabc680ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa119581a5a7f739242764c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:41:05 2020 +0300 mfmediaengine: Send "volumechange" event on muted state change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 29 +++++++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index b9bf3c7027..731bccb581 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -63,6 +63,7 @@ enum media_engine_flags FLAGS_ENGINE_LOOP = 0x80, FLAGS_ENGINE_PAUSED = 0x100, FLAGS_ENGINE_WAITING = 0x200, + FLAGS_ENGINE_MUTED = 0x400, }; struct media_engine @@ -542,16 +543,36 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) static BOOL WINAPI media_engine_GetMuted(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + BOOL ret; - return FALSE; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + ret = !!(engine->flags & FLAGS_ENGINE_MUTED); + LeaveCriticalSection(&engine->cs); + + return ret; } static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngine *iface, BOOL muted) { - FIXME("(%p, %d): stub.\n", iface, muted); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, muted); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!!(engine->flags & FLAGS_ENGINE_MUTED) ^ !!muted) + { + media_engine_set_flag(engine, FLAGS_ENGINE_MUTED, muted); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_VOLUMECHANGE, 0, 0); + } + LeaveCriticalSection(&engine->cs); + + return hr; } static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 4079e9aa70..0839d1d445 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -361,14 +361,13 @@ todo_wine ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetMuted(media_engine, TRUE); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); val = IMFMediaEngine_GetVolume(media_engine); todo_wine ok(val == 1.0, "Unexpected value %f.\n", val); - val = IMFMediaEngine_SetVolume(media_engine, 2.0); + hr = IMFMediaEngine_SetVolume(media_engine, 2.0); todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -465,6 +464,34 @@ static void test_playback_rate(void) IMFMediaEngine_Release(media_engine); } +static void test_mute(void) +{ + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine; + HRESULT hr; + BOOL ret; + + media_engine = create_media_engine(callback); + + ret = IMFMediaEngine_GetMuted(media_engine); + ok(!ret, "Unexpected state.\n"); + + hr = IMFMediaEngine_SetMuted(media_engine, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_GetMuted(media_engine); + ok(ret, "Unexpected state.\n"); + + hr = IMFMediaEngine_Shutdown(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_GetMuted(media_engine); + ok(ret, "Unexpected state.\n"); + + IMFMediaEngine_Release(media_engine); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -490,6 +517,7 @@ START_TEST(mfmediaengine) test_Shutdown(); test_Play(); test_playback_rate(); + test_mute(); IMFMediaEngineClassFactory_Release(factory);

1 0

Nikolay Sivov : dwrite: Include required feature when collecting lookups.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 15baea930a3563bf66c688612e08b7f8925eda3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=15baea930a3563bf66c68861… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:51 2020 +0300 dwrite: Include required feature when collecting lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fd59f40dcb..629bc7f407 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4405,6 +4405,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex { unsigned int last_num_lookups = 0, stage, script_feature_count = 0; UINT16 total_feature_count, total_lookup_count; + struct shaping_feature required_feature = { 0 }; const struct ot_feature_list *feature_list; const struct ot_langsys *langsys = NULL; struct shaping_feature *feature; @@ -4455,6 +4456,12 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if (!feature_list) return; + /* Required feature. */ + required_feature.index = langsys ? GET_BE_WORD(langsys->required_feature_index) : 0xffff; + if (required_feature.index < total_feature_count) + required_feature.tag = feature_list->features[required_feature.index].tag; + required_feature.mask = global_bit_mask; + context->global_mask = global_bit_mask; next_bit = global_bit_shift + 1; for (i = 0; i < features->count; ++i) @@ -4474,6 +4481,9 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if (!feature->max_value || next_bit + bits_needed > 8 * sizeof (feature->mask)) continue; + if (required_feature.tag == feature->tag) + required_feature.stage = feature->stage; + for (j = 0; j < script_feature_count; ++j) { feature_index = GET_BE_WORD(langsys->feature_index[j]); @@ -4517,6 +4527,9 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex for (stage = 0; stage <= features->stage; ++stage) { + if (required_feature.index != 0xffff && required_feature.stage == stage) + opentype_layout_add_lookups(feature_list, total_lookup_count, table, &required_feature, lookups); + for (i = 0; i < features->count; ++i) { if (features->features[i].stage == stage)

1 0

Nikolay Sivov : mf/session: Handle source buffering events.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 68b5a0574c8ad6d1df27b3641f6be7ecbb6d4f4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b5a0574c8ad6d1df27b364… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:43:42 2020 +0300 mf/session: Handle source buffering events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index ba30733fe5..39b5e1a537 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2867,6 +2867,23 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM LeaveCriticalSection(&session->cs); break; + + case MEBufferingStarted: + case MEBufferingStopped: + + EnterCriticalSection(&session->cs); + if (session_get_media_source(session, (IMFMediaSource *)event_source)) + { + if (event_type == MEBufferingStarted) + IMFPresentationClock_Pause(session->clock); + else + IMFPresentationClock_Start(session->clock, PRESENTATION_CURRENT_POSITION); + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + } + LeaveCriticalSection(&session->cs); + break; + case MENewStream: stream = (IMFMediaStream *)value.punkVal;

1 0

Nikolay Sivov : mfmediaengine: Send "ratechange" event for both default and playback rate changes.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 6fa8ff69300d167b34a4c4b079ae6d5924ba1fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fa8ff69300d167b34a4c4b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:41:04 2020 +0300 mfmediaengine: Send "ratechange" event for both default and playback rate changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 60 +++++++++++++++++++++++++++----- dlls/mfmediaengine/tests/mfmediaengine.c | 32 +++++++++++++++-- 2 files changed, 81 insertions(+), 11 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index fcef1be048..b9bf3c7027 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -76,6 +76,8 @@ struct media_engine IMFDXGIDeviceManager *dxgi_manager; enum media_engine_mode mode; unsigned int flags; + double playback_rate; + double default_playback_rate; IMFMediaSession *session; CRITICAL_SECTION cs; }; @@ -344,30 +346,70 @@ static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + double rate; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + rate = engine->default_playback_rate; + LeaveCriticalSection(&engine->cs); + + return rate; } static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngine *iface, double rate) { - FIXME("(%p, %f): stub.\n", iface, rate); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %f.\n", iface, rate); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->default_playback_rate != rate) + { + engine->default_playback_rate = rate; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_RATECHANGE, 0, 0); + } + LeaveCriticalSection(&engine->cs); + + return hr; } static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + double rate; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + rate = engine->playback_rate; + LeaveCriticalSection(&engine->cs); + + return rate; } static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngine *iface, double rate) { - FIXME("(%p, %f): stub.\n", iface, rate); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %f.\n", iface, rate); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->playback_rate != rate) + { + engine->playback_rate = rate; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_RATECHANGE, 0, 0); + } + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngine *iface, IMFMediaTimeRange **played) @@ -672,6 +714,8 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->session_events.lpVtbl = &media_engine_session_events_vtbl; engine->refcount = 1; engine->flags = (flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK) | FLAGS_ENGINE_PAUSED; + engine->default_playback_rate = 1.0; + engine->playback_rate = 1.0; InitializeCriticalSection(&engine->cs); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index a3db611e9f..4079e9aa70 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -310,15 +310,12 @@ todo_wine ok(!!state, "Unexpected state %d.\n", state); val = IMFMediaEngine_GetDefaultPlaybackRate(media_engine); -todo_wine ok(val == 1.0, "Unexpected rate %f.\n", val); hr = IMFMediaEngine_SetDefaultPlaybackRate(media_engine, 2.0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); val = IMFMediaEngine_GetPlaybackRate(media_engine); -todo_wine ok(val == 1.0, "Unexpected rate %f.\n", val); hr = IMFMediaEngine_GetPlayed(media_engine, &time_range); @@ -440,6 +437,34 @@ static void test_Play(void) IMFMediaEngine_Release(media_engine); } +static void test_playback_rate(void) +{ + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine; + double rate; + HRESULT hr; + + media_engine = create_media_engine(callback); + + rate = IMFMediaEngine_GetDefaultPlaybackRate(media_engine); + ok(rate == 1.0, "Unexpected default rate.\n"); + + rate = IMFMediaEngine_GetPlaybackRate(media_engine); + ok(rate == 1.0, "Unexpected default rate.\n"); + + hr = IMFMediaEngine_SetPlaybackRate(media_engine, 0.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + rate = IMFMediaEngine_GetPlaybackRate(media_engine); + ok(rate == 0.0, "Unexpected default rate.\n"); + + hr = IMFMediaEngine_SetDefaultPlaybackRate(media_engine, 0.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaEngine_Release(media_engine); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -464,6 +489,7 @@ START_TEST(mfmediaengine) test_CreateInstance(); test_Shutdown(); test_Play(); + test_playback_rate(); IMFMediaEngineClassFactory_Release(factory);

1 0