March 2022 - Wine-commits - list.winehq.org

Nikolay Sivov : xmllite/tests: Use CRT allocation functions.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: ff09cb4f3013912cd8a8f7cd8b9e43a9f41c796a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff09cb4f3013912cd8a8f7cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:55:20 2022 +0300 xmllite/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 9 ++++----- dlls/xmllite/tests/writer.c | 35 +++++++++++++++++------------------ 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d0d2373aaf1..d9c831fb52d 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -30,7 +30,6 @@ #include "ole2.h" #include "xmllite.h" #include "wine/test.h" -#include "wine/heap.h" DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); @@ -383,12 +382,12 @@ static ULONG WINAPI testinput_AddRef(IUnknown *iface) static ULONG WINAPI testinput_Release(IUnknown *iface) { - testinput *This = impl_from_IUnknown(iface); + testinput *input = impl_from_IUnknown(iface); LONG ref; - ref = InterlockedDecrement(&This->ref); + ref = InterlockedDecrement(&input->ref); if (ref == 0) - heap_free(This); + free(input); return ref; } @@ -404,7 +403,7 @@ static HRESULT testinput_createinstance(void **ppObj) { testinput *input; - input = heap_alloc(sizeof(*input)); + input = malloc(sizeof(*input)); if(!input) return E_OUTOFMEMORY; input->IUnknown_iface.lpVtbl = &testinput_vtbl; diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 8d096b0d632..2f6edb26d16 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -27,7 +27,6 @@ #include "ole2.h" #include "xmllite.h" -#include "wine/heap.h" #include "wine/test.h" #include "initguid.h" @@ -100,7 +99,7 @@ static WCHAR *strdupAtoW(const char *str) if (!str) return ret; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = heap_alloc(len * sizeof(WCHAR)); + ret = malloc(len * sizeof(WCHAR)); if (ret) MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); return ret; @@ -843,9 +842,9 @@ static HRESULT write_start_element(IXmlWriter *writer, const char *prefix, const hr = IXmlWriter_WriteStartElement(writer, prefixW, localW, uriW); - heap_free(prefixW); - heap_free(localW); - heap_free(uriW); + free(prefixW); + free(localW); + free(uriW); return hr; } @@ -863,10 +862,10 @@ static HRESULT write_element_string(IXmlWriter *writer, const char *prefix, cons hr = IXmlWriter_WriteElementString(writer, prefixW, localW, uriW, valueW); - heap_free(prefixW); - heap_free(localW); - heap_free(uriW); - heap_free(valueW); + free(prefixW); + free(localW); + free(uriW); + free(valueW); return hr; } @@ -880,7 +879,7 @@ static HRESULT write_string(IXmlWriter *writer, const char *str) hr = IXmlWriter_WriteString(writer, strW); - heap_free(strW); + free(strW); return hr; } @@ -1589,10 +1588,10 @@ static HRESULT write_attribute_string(IXmlWriter *writer, const char *prefix, co hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, valueW); - heap_free(prefixW); - heap_free(localW); - heap_free(uriW); - heap_free(valueW); + free(prefixW); + free(localW); + free(uriW); + free(valueW); return hr; } @@ -2116,10 +2115,10 @@ static HRESULT write_doctype(IXmlWriter *writer, const char *name, const char *p hr = IXmlWriter_WriteDocType(writer, nameW, pubidW, sysidW, subsetW); - heap_free(nameW); - heap_free(pubidW); - heap_free(sysidW); - heap_free(subsetW); + free(nameW); + free(pubidW); + free(sysidW); + free(subsetW); return hr; }

1 0

Ziqing Hui : d2d1: Fix a typo.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 16abbb4ae8c5231999f8731eac6c6bd7cd2f9436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16abbb4ae8c5231999f8731e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Mar 29 17:23:39 2022 +0800 d2d1: Fix a typo. 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/factory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 737864df69c..3d3393e5f0c 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -597,7 +597,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory2 * return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory1_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device, +static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory2_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device, ID2D1Device1 **device) { FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); @@ -634,7 +634,7 @@ static const struct ID2D1Factory2Vtbl d2d_factory_vtbl = d2d_factory_UnregisterEffect, d2d_factory_GetRegisteredEffects, d2d_factory_GetEffectProperties, - d2d_factory_ID2D1Factory1_CreateDevice, + d2d_factory_ID2D1Factory2_CreateDevice, }; static HRESULT STDMETHODCALLTYPE d2d_factory_mt_QueryInterface(ID2D1Multithread *iface, REFIID iid, void **out)

1 0

Ziqing Hui : include: Add defines for ID2D1InkStyle.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: e0be2d476f636eb447e58ceaae8496637f8c2b1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0be2d476f636eb447e58cea… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Mar 29 17:23:40 2022 +0800 include: Add defines for ID2D1InkStyle. 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/d2d1_private.h | 2 +- include/Makefile.in | 1 + include/d2d1_3.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ libs/uuid/d2d.c | 2 +- 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index aaf6d045c73..aa8e8569455 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -28,7 +28,7 @@ #include <stdbool.h> #include <math.h> #define COBJMACROS -#include "d2d1_2.h" +#include "d2d1_3.h" #include "d3d11_1.h" #ifdef D2D1_INIT_GUID #include "initguid.h" diff --git a/include/Makefile.in b/include/Makefile.in index 9578c557af7..40d6c00fb7b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -102,6 +102,7 @@ SOURCES = \ d2d1.idl \ d2d1_1.idl \ d2d1_2.idl \ + d2d1_3.idl \ d2d1effects.idl \ d2dbasetypes.h \ d2derr.h \ diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl new file mode 100644 index 00000000000..3b27439f2d1 --- /dev/null +++ b/include/d2d1_3.idl @@ -0,0 +1,45 @@ +/* + * 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_2.idl"; + +typedef enum D2D1_INK_NIB_SHAPE +{ + D2D1_INK_NIB_SHAPE_ROUND = 0x0, + D2D1_INK_NIB_SHAPE_SQUARE = 0x1, + D2D1_INK_NIB_SHAPE_FORCE_DWORD = 0xffffffff +} D2D1_INK_NIB_SHAPE; + +[ + object, + uuid(bae8b344-23fc-4071-8cb5-d05d6f073848), + local, +] +interface ID2D1InkStyle : ID2D1Resource +{ + void SetNibTransform( + [in] const D2D1_MATRIX_3X2_F *transform + ); + void GetNibTransform( + [out] D2D1_MATRIX_3X2_F *transform + ); + void SetNibShape( + [in] D2D1_INK_NIB_SHAPE shape + ); + D2D1_INK_NIB_SHAPE GetNibShape(); +}; diff --git a/libs/uuid/d2d.c b/libs/uuid/d2d.c index c74ebc9c495..801bcaeab92 100644 --- a/libs/uuid/d2d.c +++ b/libs/uuid/d2d.c @@ -18,4 +18,4 @@ #include "d3d10_1.h" #include "initguid.h" -#include "d2d1_2.h" +#include "d2d1_3.h"

1 0

Ziqing Hui : include: Add defines for ID2D1Ink.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 17cf3037081b842f1e20127f01a47f29d7934226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17cf3037081b842f1e20127f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Mar 29 17:23:41 2022 +0800 include: Add defines for ID2D1Ink. 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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 3b27439f2d1..93c273816e2 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -25,6 +25,20 @@ typedef enum D2D1_INK_NIB_SHAPE D2D1_INK_NIB_SHAPE_FORCE_DWORD = 0xffffffff } D2D1_INK_NIB_SHAPE; +typedef struct D2D1_INK_POINT +{ + float x; + float y; + float radius; +} D2D1_INK_POINT; + +typedef struct D2D1_INK_BEZIER_SEGMENT +{ + D2D1_INK_POINT point1; + D2D1_INK_POINT point2; + D2D1_INK_POINT point3; +} D2D1_INK_BEZIER_SEGMENT; + [ object, uuid(bae8b344-23fc-4071-8cb5-d05d6f073848), @@ -43,3 +57,48 @@ interface ID2D1InkStyle : ID2D1Resource ); D2D1_INK_NIB_SHAPE GetNibShape(); }; + +[ + object, + uuid(b499923b-7029-478f-a8b3-432c7c5f5312), + local, +] +interface ID2D1Ink : ID2D1Resource +{ + void SetStartPoint( + [in] const D2D1_INK_POINT *start_point + ); + D2D1_INK_POINT GetStartPoint(); + HRESULT AddSegments( + [in] const D2D1_INK_BEZIER_SEGMENT *segments, + [in] UINT32 segment_count + ); + HRESULT RemoveSegmentsAtEnd( + [in] UINT32 segment_count + ); + HRESULT SetSegments( + [in] UINT32 start_segment, + [in] const D2D1_INK_BEZIER_SEGMENT *segments, + [in] UINT32 segment_count + ); + HRESULT SetSegmentAtEnd( + [in] const D2D1_INK_BEZIER_SEGMENT *segment + ); + UINT32 GetSegmentCount(); + HRESULT GetSegments( + [in] UINT32 start_segment, + [out] D2D1_INK_BEZIER_SEGMENT *segments, + [in] UINT32 segment_count + ); + HRESULT StreamAsGeometry( + [in, optional] ID2D1InkStyle *ink_style, + [in, optional] const D2D1_MATRIX_3X2_F *world_transform, + [in] float flattening_tolerance, + [in] ID2D1SimplifiedGeometrySink *geometry_sink + ); + HRESULT GetBounds( + [in, optional] ID2D1InkStyle *ink_style, + [in, optional] const D2D1_MATRIX_3X2_F *world_transform, + [out] D2D1_RECT_F *bounds + ); +};

1 0

Ziqing Hui : include: Add defines for ID2D1GradientMesh.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 64150d55dddd392c9a188bdc103fc5fd1f94d68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=64150d55dddd392c9a188bdc… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Mar 29 17:23:42 2022 +0800 include: Add defines for ID2D1GradientMesh. 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 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 93c273816e2..5fbb9c4629c 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -39,6 +39,42 @@ typedef struct D2D1_INK_BEZIER_SEGMENT D2D1_INK_POINT point3; } D2D1_INK_BEZIER_SEGMENT; +typedef enum D2D1_PATCH_EDGE_MODE +{ + D2D1_PATCH_EDGE_MODE_ALIASED = 0x0, + D2D1_PATCH_EDGE_MODE_ANTIALIASED = 0x1, + D2D1_PATCH_EDGE_MODE_ALIASED_INFLATED = 0x2, + D2D1_PATCH_EDGE_MODE_FORCE_DWORD = 0xffffffff +} D2D1_PATCH_EDGE_MODE; + +typedef struct D2D1_GRADIENT_MESH_PATCH +{ + D2D1_POINT_2F point00; + D2D1_POINT_2F point01; + D2D1_POINT_2F point02; + D2D1_POINT_2F point03; + D2D1_POINT_2F point10; + D2D1_POINT_2F point11; + D2D1_POINT_2F point12; + D2D1_POINT_2F point13; + D2D1_POINT_2F point20; + D2D1_POINT_2F point21; + D2D1_POINT_2F point22; + D2D1_POINT_2F point23; + D2D1_POINT_2F point30; + D2D1_POINT_2F point31; + D2D1_POINT_2F point32; + D2D1_POINT_2F point33; + D2D1_COLOR_F color00; + D2D1_COLOR_F color03; + D2D1_COLOR_F color30; + D2D1_COLOR_F color33; + D2D1_PATCH_EDGE_MODE topEdgeMode; + D2D1_PATCH_EDGE_MODE leftEdgeMode; + D2D1_PATCH_EDGE_MODE bottomEdgeMode; + D2D1_PATCH_EDGE_MODE rightEdgeMode; +} D2D1_GRADIENT_MESH_PATCH; + [ object, uuid(bae8b344-23fc-4071-8cb5-d05d6f073848), @@ -102,3 +138,18 @@ interface ID2D1Ink : ID2D1Resource [out] D2D1_RECT_F *bounds ); }; + +[ + object, + uuid(f292e401-c050-4cde-83d7-04962d3b23c2), + local, +] +interface ID2D1GradientMesh : ID2D1Resource +{ + UINT32 GetPatchCount(); + HRESULT GetPatches( + [in] UINT32 start_index, + [out] D2D1_GRADIENT_MESH_PATCH *patches, + [in] UINT32 patch_count + ); +};

1 0

Ziqing Hui : include: Add defines for ID2D1ImageSource.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 1c65c9487945e68a2799bc1b0f41d7d95f2bd278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c65c9487945e68a2799bc1b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Mar 29 17:23:43 2022 +0800 include: Add defines for ID2D1ImageSource. 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 5fbb9c4629c..a33292882df 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -153,3 +153,16 @@ interface ID2D1GradientMesh : ID2D1Resource [in] UINT32 patch_count ); }; + +[ + object, + uuid(c9b664e5-74a1-4378-9ac2-eefc37a3f4d8), + local, +] +interface ID2D1ImageSource : ID2D1Image +{ + HRESULT OfferResources(); + HRESULT TryReclaimResources( + [out] BOOL *resources_discarded + ); +};

1 0

Dmitry Timoshkov : wined3d: Avoid calling _strnicmp() with limit -1.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 0e4f31ac93f6fdbee5c8d147ae280e4442b9fead URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4f31ac93f6fdbee5c8d147… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 29 16:02:20 2022 +0300 wined3d: Avoid calling _strnicmp() with limit -1. It's considered invalid by native ucrtbase (installed with winetricks). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_sm4.c | 2 +- dlls/wined3d/wined3d_main.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6282883ed04..a296e34bc9f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3736,7 +3736,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { if (e[i].stream_idx == stream_idx - && !_strnicmp(e[i].semantic_name, semantic_name, -1) + && !stricmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx) return &e[i]; } diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 868d9b3cc64..266b54d1d15 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1319,7 +1319,7 @@ static void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, struct wined3d_shader_signature_element *e = &output_signature->elements[i]; if (priv->shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && _strnicmp(e->semantic_name, "SV_TARGET", -1)) + && stricmp(e->semantic_name, "SV_TARGET")) continue; if (e->register_idx >= ARRAY_SIZE(priv->output_map)) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 4f50e8aeb7d..35973e210b0 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -329,17 +329,17 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } if (!get_config_key(hkey, appkey, env, "shader_backend", buffer, size)) { - if (!_strnicmp(buffer, "glsl", -1)) + if (!stricmp(buffer, "glsl")) { ERR_(winediag)("Using the GLSL shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL; } - else if (!_strnicmp(buffer, "arb", -1)) + else if (!stricmp(buffer, "arb")) { ERR_(winediag)("Using the ARB shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; } - else if (!_strnicmp(buffer, "none", -1)) + else if (!stricmp(buffer, "none")) { ERR_(winediag)("Disabling shader backends.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE;

1 0

Nikolay Sivov : wer: Use CRT memory allocation functions.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 56c57f8ae220e403ff02051c5b11f6ae8db379b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56c57f8ae220e403ff02051c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 15:11:49 2022 +0300 wer: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 44c6718f310..b0f18b0568d 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -18,12 +18,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "winreg.h" #include "werapi.h" -#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" @@ -219,7 +219,7 @@ HRESULT WINAPI WerReportCloseHandle(HREPORT hreport) if (!found) return E_INVALIDARG; - heap_free(report); + free(report); return S_OK; } @@ -259,7 +259,7 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE return E_INVALIDARG; } - report = heap_alloc_zero(FIELD_OFFSET(report_t, eventtype[lstrlenW(eventtype) + 1])); + report = calloc(1, FIELD_OFFSET(report_t, eventtype[lstrlenW(eventtype) + 1])); if (!report) return __HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY);

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*INFINITY/NAN in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 17928e6a0146e9024339e04414ab813a933a10a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17928e6a0146e9024339e044… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:20 2022 +0200 kernelbase: Reimplement LOCALE_*INFINITY/NAN in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4b205aed9af..3eb598be505 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1151,13 +1151,13 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->siso3166ctryname2, type, buffer, len ); case LOCALE_SNAN: - return -1; + return locale_return_string( locale->snan, type, buffer, len ); case LOCALE_SPOSINFINITY: - return -1; + return locale_return_string( locale->sposinfinity, type, buffer, len ); case LOCALE_SNEGINFINITY: - return -1; + return locale_return_string( locale->sneginfinity, type, buffer, len ); case LOCALE_SSCRIPTS: return -1;

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*PERCENT in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 9ef9d0293ad84b40d93f2bcd18e52534f51fb57d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef9d0293ad84b40d93f2bcd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:30 2022 +0200 kernelbase: Reimplement LOCALE_*PERCENT in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 3eb598be505..e3960c1e74e 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -900,6 +900,7 @@ static int locale_return_strarray( DWORD pos, WORD idx, LCTYPE type, WCHAR *buff static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE type, WCHAR *buffer, int len ) { + static const WCHAR spermille[] = { 0x2030, 0 }; /* this one seems hardcoded */ UINT val; if (locale != user_locale) type |= LOCALE_NOUSEROVERRIDE; @@ -1185,16 +1186,16 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->snativedisplayname, type, buffer, len ); case LOCALE_INEGATIVEPERCENT: - return -1; + return locale_return_number( locale->inegativepercent, type, buffer, len ); case LOCALE_IPOSITIVEPERCENT: - return -1; + return locale_return_number( locale->ipositivepercent, type, buffer, len ); case LOCALE_SPERCENT: - return -1; + return locale_return_string( locale->spercent, type, buffer, len ); case LOCALE_SPERMILLE: - return -1; + return locale_return_data( spermille, ARRAY_SIZE(spermille), type, buffer, len ); case LOCALE_SMONTHDAY: return -1;

1 0