April 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : win32u: Move NtUserTrackMouseEvent() implementation from user32.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 5ce53f95cf61cbd7f998ddc706a88cddb7a70c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce53f95cf61cbd7f998ddc7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 26 16:06:02 2022 +0100 win32u: Move NtUserTrackMouseEvent() implementation from user32. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 254 ------------------------------------------- dlls/user32/scroll.c | 8 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 218 +++++++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 3 +- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 13 files changed, 235 insertions(+), 265 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ce53f95cf61cbd7f998…

1 0

Huw Davies : wineoss: Move MIDM_GETNUMDEVS to the unixlib.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: dd29a1f61af8cd480a12858c8aabd8ff1b8bdb95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd29a1f61af8cd480a12858c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 26 07:28:00 2022 +0100 wineoss: Move MIDM_GETNUMDEVS to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 2 -- dlls/wineoss.drv/ossmidi.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 2a1619cced3..46a0f03e819 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -605,8 +605,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midClose(wDevID); case MIDM_ADDBUFFER: return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETNUMDEVS: - return MIDM_NumDevs; case MIDM_RESET: return midReset(wDevID); case MIDM_START: diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 6ac75284812..f9c34943c46 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1217,6 +1217,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETDEVCAPS: *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); break; + case MIDM_GETNUMDEVS: + *params->err = num_srcs; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED;

1 0

Ziqing Hui : include: Remove useless semi-colon in d2d1_3.idl.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 795bc4804b226da34ffd54e1891a99cee62dea90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=795bc4804b226da34ffd54e1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:43:53 2022 +0800 include: Remove useless semi-colon in d2d1_3.idl. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 91835ee1a77..07dc98968f8 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -143,7 +143,7 @@ interface ID2D1InkStyle : ID2D1Resource [in] D2D1_INK_NIB_SHAPE shape ); D2D1_INK_NIB_SHAPE GetNibShape(); -}; +} [ object, @@ -188,7 +188,7 @@ interface ID2D1Ink : ID2D1Resource [in, optional] const D2D1_MATRIX_3X2_F *world_transform, [out] D2D1_RECT_F *bounds ); -}; +} [ object, @@ -203,7 +203,7 @@ interface ID2D1GradientMesh : ID2D1Resource [out] D2D1_GRADIENT_MESH_PATCH *patches, [in] UINT32 patch_count ); -}; +} [ object, @@ -216,7 +216,7 @@ interface ID2D1ImageSource : ID2D1Image HRESULT TryReclaimResources( [out] BOOL *resources_discarded ); -}; +} [ object, @@ -234,7 +234,7 @@ interface ID2D1ImageSourceFromWic : ID2D1ImageSource void GetSource( [out] IWICBitmapSource **source ); -}; +} [ object, @@ -249,7 +249,7 @@ interface ID2D1TransformedImageSource : ID2D1Image void GetProperties( [out] D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *out ); -}; +} [ object,

1 0

Ziqing Hui : include: Add defines for ID2D1DrawInfo.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 04de217c266e667a60276aa6eb054db90bc87fc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04de217c266e667a60276aa6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:36 2022 +0800 include: Add defines for ID2D1DrawInfo. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 93 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 91c8fc20141..1f98999a117 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -40,12 +40,73 @@ typedef enum D2D1_CHANNEL_DEPTH D2D1_CHANNEL_DEPTH_FORCE_DWORD = 0xffffffff } D2D1_CHANNEL_DEPTH; +typedef enum D2D1_PIXEL_OPTIONS +{ + D2D1_PIXEL_OPTIONS_NONE = 0x0, + D2D1_PIXEL_OPTIONS_TRIVIAL_SAMPLING = 0x1, + D2D1_PIXEL_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_PIXEL_OPTIONS; + +typedef enum D2D1_VERTEX_OPTIONS +{ + D2D1_VERTEX_OPTIONS_NONE = 0x0, + D2D1_VERTEX_OPTIONS_DO_NOT_CLEAR = 0x1, + D2D1_VERTEX_OPTIONS_USE_DEPTH_BUFFER = 0x2, + D2D1_VERTEX_OPTIONS_ASSUME_NO_OVERLAP = 0x4, + D2D1_VERTEX_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_VERTEX_OPTIONS; + +typedef enum D2D1_BLEND_OPERATION +{ + D2D1_BLEND_OPERATION_ADD = 0x1, + D2D1_BLEND_OPERATION_SUBTRACT = 0x2, + D2D1_BLEND_OPERATION_REV_SUBTRACT = 0x3, + D2D1_BLEND_OPERATION_MIN = 0x4, + D2D1_BLEND_OPERATION_MAX = 0x5, + D2D1_BLEND_OPERATION_FORCE_DWORD = 0xffffffff +} D2D1_BLEND_OPERATION; + +typedef enum D2D1_BLEND +{ + D2D1_BLEND_ZERO = 1, + D2D1_BLEND_ONE = 2, + D2D1_BLEND_SRC_COLOR = 3, + D2D1_BLEND_INV_SRC_COLOR = 4, + D2D1_BLEND_SRC_ALPHA = 5, + D2D1_BLEND_INV_SRC_ALPHA = 6, + D2D1_BLEND_DEST_ALPHA = 7, + D2D1_BLEND_INV_DEST_ALPHA = 8, + D2D1_BLEND_DEST_COLOR = 9, + D2D1_BLEND_INV_DEST_COLOR = 10, + D2D1_BLEND_SRC_ALPHA_SAT = 11, + D2D1_BLEND_BLEND_FACTOR = 14, + D2D1_BLEND_INV_BLEND_FACTOR = 15, + D2D1_BLEND_FORCE_DWORD = 0xffffffff +} D2D1_BLEND; + typedef struct D2D1_INPUT_DESCRIPTION { D2D1_FILTER filter; UINT32 levelOfDetailCount; } D2D1_INPUT_DESCRIPTION; +typedef struct D2D1_VERTEX_RANGE +{ + UINT32 startVertex; + UINT32 vertexCount; +} D2D1_VERTEX_RANGE; + +typedef struct D2D1_BLEND_DESCRIPTION +{ + D2D1_BLEND sourceBlend; + D2D1_BLEND destinationBlend; + D2D1_BLEND_OPERATION blendOperation; + D2D1_BLEND sourceBlendAlpha; + D2D1_BLEND destinationBlendAlpha; + D2D1_BLEND_OPERATION blendOperationAlpha; + float blendFactor[4]; +} D2D1_BLEND_DESCRIPTION; + [ object, uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), @@ -99,3 +160,35 @@ interface ID2D1RenderInfo : IUnknown [in] UINT32 count ); } + +[ + object, + uuid(693ce632-7f2f-45de-93fe-18d88b37aa21), + local, +] +interface ID2D1DrawInfo : ID2D1RenderInfo +{ + HRESULT SetPixelShaderConstantBuffer( + [in] const BYTE *buffer, + [in] UINT32 size + ); + HRESULT SetResourceTexture( + [in] UINT32 index, + [in] ID2D1ResourceTexture *texture + ); + HRESULT SetVertexShaderConstantBuffer( + [in] const BYTE *buffer, + [in] UINT32 size + ); + HRESULT SetPixelShader( + [in] REFGUID id, + [in] D2D1_PIXEL_OPTIONS options + ); + HRESULT SetVertexProcessing( + [in, optional] ID2D1VertexBuffer *buffer, + [in] D2D1_VERTEX_OPTIONS options, + [in, optional] const D2D1_BLEND_DESCRIPTION *description, + [in, optional] const D2D1_VERTEX_RANGE *range, + [in, optional] const GUID *shader + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1RenderInfo.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 3b64dfd8e6fc38d5aebf1face8cf7cd923cf6864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b64dfd8e6fc38d5aebf1fac… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:35 2022 +0800 include: Add defines for ID2D1RenderInfo. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 9d64690b453..91c8fc20141 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -18,6 +18,34 @@ import "d2d1_1.idl"; +typedef enum D2D1_FILTER +{ + D2D1_FILTER_MIN_MAG_MIP_POINT = 0x00, + D2D1_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x01, + D2D1_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x04, + D2D1_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x05, + D2D1_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x10, + D2D1_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x11, + D2D1_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x14, + D2D1_FILTER_MIN_MAG_MIP_LINEAR = 0x15, + D2D1_FILTER_ANISOTROPIC = 0x55, + D2D1_FILTER_FORCE_DWORD = 0xffffffff +} D2D1_FILTER; + +typedef enum D2D1_CHANNEL_DEPTH +{ + D2D1_CHANNEL_DEPTH_DEFAULT = 0x0, + D2D1_CHANNEL_DEPTH_1 = 0x1, + D2D1_CHANNEL_DEPTH_4 = 0x4, + D2D1_CHANNEL_DEPTH_FORCE_DWORD = 0xffffffff +} D2D1_CHANNEL_DEPTH; + +typedef struct D2D1_INPUT_DESCRIPTION +{ + D2D1_FILTER filter; + UINT32 levelOfDetailCount; +} D2D1_INPUT_DESCRIPTION; + [ object, uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), @@ -48,3 +76,26 @@ interface ID2D1ResourceTexture : IUnknown [in] UINT32 data_size ); } + +[ + object, + uuid(519ae1bd-d19a-420d-b849-364f594776b7), + local, +] +interface ID2D1RenderInfo : IUnknown +{ + HRESULT SetInputDescription( + [in] UINT32 index, + [in] D2D1_INPUT_DESCRIPTION description + ); + HRESULT SetOutputBuffer( + [in] D2D1_BUFFER_PRECISION precision, + [in] D2D1_CHANNEL_DEPTH depth + ); + void SetCached( + [in] BOOL is_cached + ); + void SetInstructionCountHint( + [in] UINT32 count + ); +}

1 0

Connor McAdams : oleacc/tests: Add tests for IIS_IsOleaccProxy service on default accessible objects.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: e75ceba11a62ae226d2530cad610c120df4303ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=e75ceba11a62ae226d2530ca… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Apr 25 15:08:00 2022 -0400 oleacc/tests: Add tests for IIS_IsOleaccProxy service on default accessible objects. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 5522867b085..ba7ac3cc3ac 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -27,6 +27,7 @@ #include <ole2.h> #include <commctrl.h> #include <oleacc.h> +#include <servprov.h> #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -1409,6 +1410,32 @@ static LRESULT WINAPI test_query_class(HWND hwnd, UINT msg, WPARAM wparam, LPARA return 0; } +#define check_acc_proxy_service( acc ) \ + check_acc_proxy_service_( (acc), __LINE__) +static void check_acc_proxy_service_(IAccessible *acc, int line) +{ + IServiceProvider *service = NULL; + IUnknown *unk = NULL; + HRESULT hr; + + hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&service); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = IServiceProvider_QueryService(service, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#lx\n", hr); + ok(!!unk, "unk == NULL\n"); + ok(iface_cmp(unk, (IUnknown*)acc), "unk != acc\n"); + IUnknown_Release(unk); + + unk = (IUnknown*)0xdeadbeef; + hr = IServiceProvider_QueryService(service, &IID_IUnknown, &IID_IUnknown, (void **)&unk); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); + ok(!unk, "unk != NULL\n"); + IServiceProvider_Release(service); + } +} + static void test_CreateStdAccessibleObject_classes(void) { static const struct { @@ -1463,6 +1490,7 @@ static void test_CreateStdAccessibleObject_classes(void) ok(hr == S_OK, "CreateStdAccessibleObject failed %lx\n", hr); if (tests[i].client) CHECK_CALLED(winproc_GETOBJECT); + check_acc_proxy_service(acc); IAccessible_Release(acc); if (tests[i].window) @@ -1471,6 +1499,7 @@ static void test_CreateStdAccessibleObject_classes(void) ok(hr == S_OK, "CreateStdAccessibleObject failed %lx\n", hr); if (tests[i].window) CHECK_CALLED(winproc_GETOBJECT); + check_acc_proxy_service(acc); IAccessible_Release(acc); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)win_proc);

1 0

Nikolay Sivov : dwrite/opentype: Use stdint types for layout table structures.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: e1270c99fe8ff776415369b3864e3c77bb389842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1270c99fe8ff776415369b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 09:15:28 2022 +0300 dwrite/opentype: Use stdint types for layout table structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 318 +++++++++++++++++++++++++------------------------ 1 file changed, 160 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1270c99fe8ff7764153…

1 0

Ziqing Hui : include: Add defines for ID2D1ResourceTexture.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: ef16100946e9870bfc8333195735e4ff49c13a94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef16100946e9870bfc833319… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:34 2022 +0800 include: Add defines for ID2D1ResourceTexture. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 8b7a024c025..9d64690b453 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -31,3 +31,20 @@ interface ID2D1VertexBuffer : IUnknown ); HRESULT Unmap(); } + +[ + object, + uuid(688d15c3-02b0-438d-b13a-d1b44c32c39a), + local, +] +interface ID2D1ResourceTexture : IUnknown +{ + HRESULT Update( + [in] const UINT32 *min_extents, + [in] const UINT32 *max_extents, + [in] const UINT32 *strides, + [in] UINT32 dimensions, + [in] const BYTE *data, + [in] UINT32 data_size + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1VertexBuffer.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 2629c606bf8e464eb580153ce666069f9a570a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2629c606bf8e464eb580153c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:33 2022 +0800 include: Add defines for ID2D1VertexBuffer. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 1 + include/Makefile.in | 1 + include/d2d1effectauthor.idl | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 601932b005b..350ac3c7bbf 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -17,6 +17,7 @@ */ #include "d2d1_private.h" +#include "d2d1effectauthor.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/include/Makefile.in b/include/Makefile.in index 31dc14a39d1..571f91d6ced 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -104,6 +104,7 @@ SOURCES = \ d2d1_1.idl \ d2d1_2.idl \ d2d1_3.idl \ + d2d1effectauthor.idl \ d2d1effects.idl \ d2d1effects_1.idl \ d2d1effects_2.idl \ diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl new file mode 100644 index 00000000000..8b7a024c025 --- /dev/null +++ b/include/d2d1effectauthor.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Ziqing Hui 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 + */ + + import "d2d1_1.idl"; + +[ + object, + uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), + local, +] +interface ID2D1VertexBuffer : IUnknown +{ + HRESULT Map( + [out] BYTE **data, + [in] UINT32 size + ); + HRESULT Unmap(); +}

1 0

Nikolay Sivov : include: Fix IDWriteFontResource definition.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 075730925af01cec1a7a0fb9f4e5596180cfe095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=075730925af01cec1a7a0fb9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 09:15:26 2022 +0300 include: Fix IDWriteFontResource definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- include/dwrite_3.idl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 385c7fdeb03..ff95d3e57d9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7431,7 +7431,7 @@ static UINT32 WINAPI dwritefontresource_GetFontAxisCount(IDWriteFontResource *if } static HRESULT WINAPI dwritefontresource_GetDefaultFontAxisValues(IDWriteFontResource *iface, - DWRITE_FONT_AXIS_VALUE const *values, UINT32 num_values) + DWRITE_FONT_AXIS_VALUE *values, UINT32 num_values) { FIXME("%p, %p, %u.\n", iface, values, num_values); @@ -7439,7 +7439,7 @@ static HRESULT WINAPI dwritefontresource_GetDefaultFontAxisValues(IDWriteFontRes } static HRESULT WINAPI dwritefontresource_GetFontAxisRanges(IDWriteFontResource *iface, - DWRITE_FONT_AXIS_RANGE const *ranges, UINT32 num_ranges) + DWRITE_FONT_AXIS_RANGE *ranges, UINT32 num_ranges) { FIXME("%p, %p, %u.\n", iface, ranges, num_ranges); diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 3542fbc8f1d..845754f6e3f 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -219,10 +219,10 @@ interface IDWriteFontResource : IUnknown UINT32 GetFontFaceIndex(); UINT32 GetFontAxisCount(); HRESULT GetDefaultFontAxisValues( - DWRITE_FONT_AXIS_VALUE const *values, + DWRITE_FONT_AXIS_VALUE *values, UINT32 num_values); HRESULT GetFontAxisRanges( - DWRITE_FONT_AXIS_RANGE const *ranges, + DWRITE_FONT_AXIS_RANGE *ranges, UINT32 num_ranges); DWRITE_FONT_AXIS_ATTRIBUTES GetFontAxisAttributes( UINT32 axis);

1 0