wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

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

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 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 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 : 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

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

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

29 Mar '22

Module: wine Branch: master Commit: dbd4f9e91df8a900c9e6ddfc497e7f8c6646261f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbd4f9e91df8a900c9e6ddfc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:55:19 2022 +0300 xmllite: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 16 ++++------------ dlls/xmllite/writer.c | 21 +++++---------------- dlls/xmllite/xmllite_private.h | 8 +++----- 3 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ccdc1ae2c1b..8d893b51f04 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3632,11 +3632,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); - if (imalloc) - reader = IMalloc_Alloc(imalloc, sizeof(*reader)); - else - reader = heap_alloc(sizeof(*reader)); - if (!reader) + if (!(reader = m_alloc(imalloc, sizeof(*reader)))) return E_OUTOFMEMORY; memset(reader, 0, sizeof(*reader)); @@ -3682,21 +3678,17 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, if (!stream || !ppInput) return E_INVALIDARG; - if (imalloc) - readerinput = IMalloc_Alloc(imalloc, sizeof(*readerinput)); - else - readerinput = heap_alloc(sizeof(*readerinput)); - if(!readerinput) return E_OUTOFMEMORY; + if (!(readerinput = m_alloc(imalloc, sizeof(*readerinput)))) + return E_OUTOFMEMORY; + memset(readerinput, 0, sizeof(*readerinput)); readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinputvtbl; readerinput->ref = 1; readerinput->imalloc = imalloc; - readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); readerinput->encoding = parse_encoding_name(encoding, -1); readerinput->hint = hint; readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); - readerinput->pending = 0; hr = alloc_input_buffer(readerinput); if (hr != S_OK) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index ac02bd4c200..58d9edea059 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -1865,13 +1865,8 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); - if (imalloc) - writer = IMalloc_Alloc(imalloc, sizeof(*writer)); - else - writer = heap_alloc(sizeof(*writer)); - if (!writer) + if (!(writer = m_alloc(imalloc, sizeof(*writer)))) return E_OUTOFMEMORY; - memset(writer, 0, sizeof(*writer)); writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl; @@ -1899,12 +1894,9 @@ static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_enco *out = NULL; - if (imalloc) - writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); - else - writeroutput = heap_alloc(sizeof(*writeroutput)); - if (!writeroutput) + if (!(writeroutput = m_alloc(imalloc, sizeof(*writeroutput)))) return E_OUTOFMEMORY; + memset(writeroutput, 0, sizeof(*writeroutput)); writeroutput->IXmlWriterOutput_iface.lpVtbl = &xmlwriteroutputvtbl; writeroutput->ref = 1; @@ -1912,21 +1904,18 @@ static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_enco if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = encoding; - writeroutput->stream = NULL; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { IUnknown_Release(&writeroutput->IXmlWriterOutput_iface); return hr; } - if (encoding_name) { + if (encoding_name) + { unsigned int size = (lstrlenW(encoding_name) + 1) * sizeof(WCHAR); writeroutput->encoding_name = writeroutput_alloc(writeroutput, size); memcpy(writeroutput->encoding_name, encoding_name, size); } - else - writeroutput->encoding_name = NULL; - writeroutput->written = 0; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 10f43760b41..03653bbe371 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -21,14 +21,12 @@ #ifndef __XMLLITE_PRIVATE__ #define __XMLLITE_PRIVATE__ -#include "wine/heap.h" - static inline void *m_alloc(IMalloc *imalloc, size_t len) { if (imalloc) return IMalloc_Alloc(imalloc, len); else - return heap_alloc(len); + return malloc(len); } static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len) @@ -36,7 +34,7 @@ static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len) if (imalloc) return IMalloc_Realloc(imalloc, mem, len); else - return heap_realloc(mem, len); + return realloc(mem, len); } static inline void m_free(IMalloc *imalloc, void *mem) @@ -44,7 +42,7 @@ static inline void m_free(IMalloc *imalloc, void *mem) if (imalloc) IMalloc_Free(imalloc, mem); else - heap_free(mem); + free(mem); } typedef enum

1 0

Nikolay Sivov : opcservices/tests: Use wide strings in test data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: f859e8b2eb8fa3c3b08d893eadf5b610ff8e5fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f859e8b2eb8fa3c3b08d893e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:51:58 2022 +0300 opcservices/tests: Use wide strings in test data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/opcservices.c | 187 +++++++++++++---------------------- 1 file changed, 69 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f859e8b2eb8fa3c3b08d…

1 0

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

29 Mar '22

Module: wine Branch: master Commit: ea15c212e375fe28d878265f6a9905af766d242d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea15c212e375fe28d878265f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:51:57 2022 +0300 opcservices: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/compress.c | 19 +++++++-------- dlls/opcservices/factory.c | 6 ++--- dlls/opcservices/opc_private.h | 3 +-- dlls/opcservices/package.c | 54 +++++++++++++++++++++--------------------- dlls/opcservices/uri.c | 20 ++++++++-------- 5 files changed, 50 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea15c212e375fe28d878…

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_SSORTNAME in GetLocaleInfoW/Ex.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 6549f1f3d2f5aadb7f2a19680076b5606d9663ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6549f1f3d2f5aadb7f2a1968… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 20:33:32 2022 +0200 kernelbase: Reimplement LOCALE_SSORTNAME in GetLocaleInfoW/Ex. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 8cb2120357c..31a81fc167c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -925,11 +925,88 @@ static int locale_return_strarray_concat( DWORD pos, LCTYPE type, WCHAR *buffer, } +/* FIXME: hardcoded, sortname is apparently not available in locale.nls */ +static const WCHAR *get_locale_sortname( LCID lcid ) +{ + switch (PRIMARYLANGID( lcid )) + { + case LANG_CHINESE: + switch (SORTIDFROMLCID( lcid )) + { + case SORT_CHINESE_PRCP: + switch (SUBLANGID( lcid )) + { + case SUBLANG_CHINESE_TRADITIONAL: + case SUBLANG_CHINESE_HONGKONG: + case 0x1f: + return L"Stroke Count"; + default: + return L"Pronunciation"; + } + case SORT_CHINESE_UNICODE: return L"Unicode"; + case SORT_CHINESE_PRC: return L"Stroke Count"; + case SORT_CHINESE_BOPOMOFO: return L"Bopomofo"; + case SORT_CHINESE_RADICALSTROKE: return L"Radical/Stroke"; + case 5: return L"Surname"; + } + break; + + case LANG_GEORGIAN: + if (SORTIDFROMLCID( lcid ) == SORT_GEORGIAN_MODERN) return L"Modern"; + return L"Traditional"; + + case LANG_GERMAN: + switch (SUBLANGID( lcid )) + { + case SUBLANG_NEUTRAL: + case SUBLANG_DEFAULT: + if (SORTIDFROMLCID( lcid ) == SORT_GERMAN_PHONE_BOOK) return L"Phone Book (DIN)"; + return L"Dictionary"; + } + break; + + case LANG_HUNGARIAN: + if (SORTIDFROMLCID( lcid ) == SORT_HUNGARIAN_TECHNICAL) return L"Technical"; + break; + + case LANG_INVARIANT: + if (SORTIDFROMLCID( lcid ) == SORT_INVARIANT_MATH) return L"Default"; + return L"Maths Alphanumerics"; + + case LANG_JAPANESE: + switch (SORTIDFROMLCID( lcid )) + { + case SORT_JAPANESE_XJIS: return L"XJIS"; + case SORT_JAPANESE_UNICODE: return L"Unicode"; + case SORT_JAPANESE_RADICALSTROKE: return L"Radical/Stroke"; + } + break; + + case LANG_KOREAN: + if (SORTIDFROMLCID( lcid ) == SORT_KOREAN_UNICODE) return L"Unicode"; + return L"Dictionary"; + + case LANG_SPANISH: + switch (SUBLANGID( lcid )) + { + case SUBLANG_NEUTRAL: + case SUBLANG_SPANISH_MODERN: + return L"International"; + case SUBLANG_DEFAULT: + return L"Traditional"; + } + break; + } + return L"Default"; +} + + /* get locale information from the locale.nls file */ 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 */ + const WCHAR *sort; UINT val; if (locale != user_locale) type |= LOCALE_NOUSEROVERRIDE; @@ -1312,7 +1389,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale->idefaultebcdiccodepage, type, buffer, len ); case LOCALE_SSORTNAME: - return -1; + sort = get_locale_sortname( lcid ); + return locale_return_data( sort, wcslen(sort) + 1, type, buffer, len ); case LOCALE_IDIGITSUBSTITUTION: return locale_return_number( locale->idigitsubstitution, type, buffer, len );

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
114
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022