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

Alexandre Julliard : kernelbase: Reimplement LOCALE_FONTSIGNATURE/SOPENTYPELANGUAGETAG in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: d39c6851d3b449cfe1a77dab4d1379a17d48861d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d39c6851d3b449cfe1a77dab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 20:33:04 2022 +0200 kernelbase: Reimplement LOCALE_FONTSIGNATURE/SOPENTYPELANGUAGETAG in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 967757f91e1..8cb2120357c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1139,7 +1139,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_FONTSIGNATURE: - return -1; + return locale_return_data( locale_strings + locale->fontsignature + 1, + locale_strings[locale->fontsignature], type, buffer, len ); case LOCALE_SISO639LANGNAME: return locale_return_string( locale->siso639langname, type, buffer, len ); @@ -1233,7 +1234,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_strarray( locale->sshorttime, 0, type, buffer, len ); case LOCALE_SOPENTYPELANGUAGETAG: - return -1; + return locale_return_string( locale->sopentypelanguagetag, type, buffer, len ); case LOCALE_SSORTLOCALE: return -1;

1 0

Nikolay Sivov : xmllite/tests: Use CRT allocation functions.
by Alexandre Julliard March 29, 2022

March 29, 2022

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 : include: Add defines for ID2D1ImageSource.
by Alexandre Julliard March 29, 2022

March 29, 2022

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

Alexandre Julliard : kernelbase: Reimplement LOCALE_*AM/PM in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 37278557dd5f9c377e84ac1bc4922ce53c8f16c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37278557dd5f9c377e84ac1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:35 2022 +0200 kernelbase: Reimplement LOCALE_*AM/PM in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index e3960c1e74e..b3cc0b0d3f0 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1028,10 +1028,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_S1159: - return -1; + return locale_return_string( locale->s1159, type, buffer, len ); case LOCALE_S2359: - return -1; + return locale_return_string( locale->s2359, type, buffer, len ); case LOCALE_SDAYNAME1: case LOCALE_SDAYNAME2: @@ -1216,10 +1216,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SSHORTESTAM: - return -1; + return locale_return_string( locale->sshortestam, type, buffer, len ); case LOCALE_SSHORTESTPM: - return -1; + return locale_return_string( locale->sshortestpm, type, buffer, len ); case LOCALE_SENGLANGUAGE: return locale_return_string( locale->senglanguage, type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_SNATIVEDIGITS in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: ec5d3c9fe753f53f6efe6d308b5d40bbbc1f052a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec5d3c9fe753f53f6efe6d30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:02 2022 +0200 kernelbase: Reimplement LOCALE_SNATIVEDIGITS in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 33 +++++++++++++++++++++++++++++++-- dlls/usp10/tests/usp10.c | 4 ---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2a74cab6500..16b923915a9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -896,6 +896,35 @@ static int locale_return_strarray( DWORD pos, WORD idx, LCTYPE type, WCHAR *buff } +static int locale_return_strarray_concat( DWORD pos, LCTYPE type, WCHAR *buffer, int len ) +{ + WORD i, count = locale_strings[pos]; + const DWORD *array = (const DWORD *)(locale_strings + pos + 1); + int ret; + + if (type & LOCALE_RETURN_NUMBER) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + for (i = 0, ret = 1; i < count; i++) ret += locale_strings[array[i]]; + + if (!len) return ret; + if (ret > len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + for (i = 0; i < count; i++) + { + memcpy( buffer, locale_strings + array[i] + 1, locale_strings[array[i]] * sizeof(WCHAR) ); + buffer += locale_strings[array[i]]; + } + *buffer = 0; + return ret; +} + + /* 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 ) @@ -967,7 +996,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SNATIVEDIGITS: - return -1; + return locale_return_strarray_concat( locale->snativedigits, type, buffer, len ); case LOCALE_SCURRENCY: return locale_return_string( locale->scurrency, type, buffer, len ); @@ -1285,7 +1314,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IDIGITSUBSTITUTION: - return -1; + return locale_return_number( locale->idigitsubstitution, type, buffer, len ); } SetLastError( ERROR_INVALID_FLAGS ); return 0; diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index c18076bab53..aee751423b3 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3613,7 +3613,6 @@ static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR l SCRIPT_CONTROL sc; SCRIPT_STATE ss; LCID lcid_old; - BOOL todo; if (!IsValidLocale(lcid, LCID_INSTALLED)) return TRUE; @@ -3624,10 +3623,7 @@ static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR l lcid_old = GetThreadLocale(); if (!SetThreadLocale(lcid)) return TRUE; - todo = !GetLocaleInfoW(lcid, LOCALE_IDIGITSUBSTITUTION | LOCALE_RETURN_NUMBER, NULL, 0); - hr = ScriptRecordDigitSubstitution(lcid, &sds); - todo_wine_if( todo ) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ScriptApplyDigitSubstitution(&sds, &sc, &ss);

1 0

Alexandre Julliard : kernelbase: Reimplement date/time format strings in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 30e8a28c3df80ce9549ff3b43c8935b28936e1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e8a28c3df80ce9549ff3b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:12 2022 +0200 kernelbase: Reimplement date/time format strings in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 16b923915a9..529cc663cd5 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1030,10 +1030,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SSHORTDATE: - return -1; + return locale_return_strarray( locale->sshortdate, 0, type, buffer, len ); case LOCALE_SLONGDATE: - return -1; + return locale_return_strarray( locale->slongdate, 0, type, buffer, len ); case LOCALE_IDATE: return -1; @@ -1159,7 +1159,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sname, type, buffer, len ); case LOCALE_SDURATION: - return -1; + return locale_return_strarray( locale->sduration, 0, type, buffer, len ); case LOCALE_SKEYBOARDSTOINSTALL: return -1; @@ -1227,10 +1227,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_data( spermille, ARRAY_SIZE(spermille), type, buffer, len ); case LOCALE_SMONTHDAY: - return -1; + return locale_return_strarray( locale->smonthday, 0, type, buffer, len ); case LOCALE_SSHORTTIME: - return -1; + return locale_return_strarray( locale->sshorttime, 0, type, buffer, len ); case LOCALE_SOPENTYPELANGUAGETAG: return -1; @@ -1239,7 +1239,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SRELATIVELONGDATE: - return -1; + return locale_return_string( locale->srelativelongdate, type, buffer, len ); case 0x007d: /* undocumented */ return -1; @@ -1257,7 +1257,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sengcountry, type, buffer, len ); case LOCALE_STIMEFORMAT: - return -1; + return locale_return_strarray( locale->stimeformat, 0, type, buffer, len ); case LOCALE_IDEFAULTANSICODEPAGE: val = locale->idefaultansicodepage == CP_UTF8 ? CP_ACP : locale->idefaultansicodepage; @@ -1267,7 +1267,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SYEARMONTH: - return -1; + return locale_return_strarray( locale->syearmonth, 0, type, buffer, len ); case LOCALE_SENGCURRNAME: return locale_return_string( locale->sengcurrname, type, buffer, len );

1 0

Ziqing Hui : include: Add defines for ID2D1Ink.
by Alexandre Julliard March 29, 2022

March 29, 2022

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 March 29, 2022

March 29, 2022

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

Dmitry Timoshkov : wined3d: Avoid calling _strnicmp() with limit -1.
by Alexandre Julliard March 29, 2022

March 29, 2022

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 : xmllite: Use CRT allocation functions.
by Alexandre Julliard March 29, 2022

March 29, 2022

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