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

Nikolay Sivov : dwrite: Initial implementation of CreateFontCollectionFromFontSet().
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 38d2d2f3504ba4724a36700f900eb38ae0fccea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d2d2f3504ba4724a36700f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 13:31:48 2022 +0300 dwrite: Initial implementation of CreateFontCollectionFromFontSet(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/font.c | 117 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 11 ++-- dlls/dwrite/tests/font.c | 28 ++++------- 4 files changed, 134 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=38d2d2f3504ba4724a36…

1 0

Nikolay Sivov : dwrite: Implement newer GetSystemFontCollection() variants.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: fe86eeceebf0cc0e39e39102b184e520f2f83279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe86eeceebf0cc0e39e39102… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 13:31:49 2022 +0300 dwrite: Implement newer GetSystemFontCollection() variants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 4 +- dlls/dwrite/font.c | 28 +++++++++--- dlls/dwrite/main.c | 100 ++++++++++++++++++++++++++++--------------- dlls/dwrite/tests/font.c | 5 +-- 4 files changed, 90 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe86eeceebf0cc0e39e3…

1 0

Zhiyi Zhang : windows.networking: Add stub dll.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 47b9dc3ddecd71b7268290daf0603cd252228bdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=47b9dc3ddecd71b7268290da… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 25 16:46:24 2022 +0800 windows.networking: Add stub dll. Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/windows.networking/Makefile.in | 4 ++++ dlls/windows.networking/main.c | 29 ++++++++++++++++++++++ dlls/windows.networking/windows.networking.spec | 8 +++++++ include/Makefile.in | 1 + include/socketapi.h | 32 +++++++++++++++++++++++++ 7 files changed, 77 insertions(+) diff --git a/configure b/configure index f6d0a677912..30546b3b1fc 100755 --- a/configure +++ b/configure @@ -1417,6 +1417,7 @@ enable_windows_gaming_input enable_windows_globalization enable_windows_media_devices enable_windows_media_speech +enable_windows_networking enable_windowscodecs enable_windowscodecsext enable_winealsa_drv @@ -21851,6 +21852,7 @@ wine_fn_config_makefile dlls/windows.media.devices enable_windows_media_devices wine_fn_config_makefile dlls/windows.media.devices/tests enable_tests wine_fn_config_makefile dlls/windows.media.speech enable_windows_media_speech wine_fn_config_makefile dlls/windows.media.speech/tests enable_tests +wine_fn_config_makefile dlls/windows.networking enable_windows_networking wine_fn_config_makefile dlls/windowscodecs enable_windowscodecs wine_fn_config_makefile dlls/windowscodecs/tests enable_tests wine_fn_config_makefile dlls/windowscodecsext enable_windowscodecsext diff --git a/configure.ac b/configure.ac index 75292210bc4..74c80fd7fa8 100644 --- a/configure.ac +++ b/configure.ac @@ -3098,6 +3098,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.devices) WINE_CONFIG_MAKEFILE(dlls/windows.media.devices/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.networking) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecsext) diff --git a/dlls/windows.networking/Makefile.in b/dlls/windows.networking/Makefile.in new file mode 100644 index 00000000000..19ca237ec36 --- /dev/null +++ b/dlls/windows.networking/Makefile.in @@ -0,0 +1,4 @@ +MODULE = windows.networking.dll + +C_SRCS = \ + main.c diff --git a/dlls/windows.networking/main.c b/dlls/windows.networking/main.c new file mode 100644 index 00000000000..3ac8a3042ab --- /dev/null +++ b/dlls/windows.networking/main.c @@ -0,0 +1,29 @@ +/* + * Copyright 2022 Zhiyi Zhang 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 + */ + +#include <windef.h> +#include <winnt.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winsock); + +HRESULT WINAPI SetSocketMediaStreamingMode(BOOL value) +{ + FIXME("value %d stub!\n", value); + return S_OK; +} diff --git a/dlls/windows.networking/windows.networking.spec b/dlls/windows.networking/windows.networking.spec new file mode 100644 index 00000000000..8220ba93a55 --- /dev/null +++ b/dlls/windows.networking/windows.networking.spec @@ -0,0 +1,8 @@ +1 stub @ +@ stdcall -private DllCanUnloadNow() +@ stub DllGetActivationFactory +@ stub DllGetClassObject +@ stdcall -private DllMain(long long ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stdcall SetSocketMediaStreamingMode(long) diff --git a/include/Makefile.in b/include/Makefile.in index b0a1d0e4880..b9816f90a38 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -682,6 +682,7 @@ SOURCES = \ slerror.h \ slpublic.h \ snmp.h \ + socketapi.h \ softpub.h \ spatialaudioclient.idl \ specstrings.h \ diff --git a/include/socketapi.h b/include/socketapi.h new file mode 100644 index 00000000000..a3e8220972f --- /dev/null +++ b/include/socketapi.h @@ -0,0 +1,32 @@ +/* + * Copyright 2022 Zhiyi Zhang 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 + */ + +#ifndef SOCKETAPI_H +#define SOCKETAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI SetSocketMediaStreamingMode(BOOL value); + +#ifdef __cplusplus +} +#endif + +#endif /* SOCKETAPI_H */

1 0

Biswapriyo Nath : include: Use nested namespace declaration in windows.foundation.idl.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 82fe55f3ca473c35f7bfda5a342a82cc4f4031c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82fe55f3ca473c35f7bfda5a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Apr 25 11:00:39 2022 +0200 include: Use nested namespace declaration in windows.foundation.idl. And move generic instantiations forward. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 269 ++++++++++++++++++++--------------------- 1 file changed, 133 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82fe55f3ca473c35f7bf…

1 0

Biswapriyo Nath : include: Add Windows.Foundation.MemoryBuffer runtimeclass declaration.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 8c50a9508ccb8f10b7e4d7bb1a7c4c5eaca61f2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c50a9508ccb8f10b7e4d7bb… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Apr 25 11:00:40 2022 +0200 include: Add Windows.Foundation.MemoryBuffer runtimeclass declaration. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 53 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 08a6af4ea7b..cdc603f8e84 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -23,7 +23,7 @@ import "inspectable.idl"; import "asyncinfo.idl"; import "windowscontracts.idl"; -/* import "eventtoken.idl"; */ +import "eventtoken.idl"; /* import "ivectorchangedeventargs.idl"; */ import "windows.foundation.collections.idl"; @@ -36,7 +36,11 @@ namespace Windows.Foundation { typedef struct TimeSpan TimeSpan; interface IAsyncAction; interface IClosable; + interface IMemoryBuffer; + interface IMemoryBufferFactory; + interface IMemoryBufferReference; interface IStringable; + runtimeclass MemoryBuffer; declare { interface Windows.Foundation.Collections.IIterable<HSTRING>; @@ -55,6 +59,7 @@ namespace Windows.Foundation { interface Windows.Foundation.IAsyncOperation<boolean>; interface Windows.Foundation.IReference<INT32>; interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>; + interface Windows.Foundation.TypedEventHandler<Windows.Foundation.IMemoryBufferReference *, IInspectable *>; } [ @@ -173,4 +178,50 @@ namespace Windows.Foundation { [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncActionCompletedHandler **handler); HRESULT GetResults(); } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(fbc4dd2a-245b-11e4-af98-689423260cf8) + ] + interface IMemoryBuffer : IInspectable + requires Windows.Foundation.IClosable + { + HRESULT CreateReference([out, retval] Windows.Foundation.IMemoryBufferReference **reference); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Foundation.MemoryBuffer), + uuid(fbc4dd2b-245b-11e4-af98-689423260cf8) + ] + interface IMemoryBufferFactory : IInspectable + { + HRESULT Create([in, range(0x00000000, 0x7fffffff)] UINT32 capacity, + [out, retval] Windows.Foundation.MemoryBuffer **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(fbc4dd29-245b-11e4-af98-689423260cf8) + ] + interface IMemoryBufferReference : IInspectable + requires Windows.Foundation.IClosable + { + [propget] HRESULT Capacity([out, retval] UINT32 *value); + [eventadd] HRESULT Closed([in] Windows.Foundation.TypedEventHandler<Windows.Foundation.IMemoryBufferReference *, IInspectable *> *handler, + [out, retval] EventRegistrationToken *cookie); + [eventremove] HRESULT Closed([in] EventRegistrationToken cookie); + } + + [ + activatable(Windows.Foundation.IMemoryBufferFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass MemoryBuffer + { + [default] interface Windows.Foundation.IMemoryBuffer; + interface Windows.Foundation.IClosable; + } }

1 0

Mohamad Al-Jaf : include: Add windows.ui.idl file.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: cb6c472351dbdc3e6f44d41c4bdb0ceba2172f1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb6c472351dbdc3e6f44d41c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Apr 24 23:49:51 2022 -0400 include: Add windows.ui.idl file. Needed by windows.media.closedcaptioning.idl. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.ui.idl | 323 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 324 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb6c472351dbdc3e6f44…

1 0

Mohamad Al-Jaf : include: Add windows.media.closedcaptioning.idl file.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 425d1b9be41b0f0952befa8fde7b084becdcd6e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=425d1b9be41b0f0952befa8f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Apr 24 23:49:52 2022 -0400 include: Add windows.media.closedcaptioning.idl file. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.media.closedcaptioning.idl | 139 +++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2be5a2c2a31..31dc14a39d1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -793,6 +793,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.globalization.idl \ windows.h \ + windows.media.closedcaptioning.idl \ windows.media.devices.idl \ windows.media.idl \ windows.media.speechrecognition.idl \ diff --git a/include/windows.media.closedcaptioning.idl b/include/windows.media.closedcaptioning.idl new file mode 100644 index 00000000000..5e53ced1a50 --- /dev/null +++ b/include/windows.media.closedcaptioning.idl @@ -0,0 +1,139 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.ui.idl"; + +namespace Windows.Media.ClosedCaptioning { + typedef enum ClosedCaptionColor ClosedCaptionColor; + typedef enum ClosedCaptionEdgeEffect ClosedCaptionEdgeEffect; + typedef enum ClosedCaptionOpacity ClosedCaptionOpacity; + typedef enum ClosedCaptionSize ClosedCaptionSize; + typedef enum ClosedCaptionStyle ClosedCaptionStyle; + + interface IClosedCaptionPropertiesStatics; + + runtimeclass ClosedCaptionProperties; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ClosedCaptionColor + { + Default = 0, + White = 1, + Black = 2, + Red = 3, + Green = 4, + Blue = 5, + Yellow = 6, + Magenta = 7, + Cyan = 8, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ClosedCaptionEdgeEffect + { + Default = 0, + None = 1, + Raised = 2, + Depressed = 3, + Uniform = 4, + DropShadow = 5, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ClosedCaptionOpacity + { + Default = 0, + OneHundredPercent = 1, + SeventyFivePercent = 2, + TwentyFivePercent = 3, + ZeroPercent = 4, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ClosedCaptionSize + { + Default = 0, + FiftyPercent = 1, + OneHundredPercent = 2, + OneHundredFiftyPercent = 3, + TwoHundredPercent = 4, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ClosedCaptionStyle + { + Default = 0, + MonospacedWithSerifs = 1, + ProportionalWithSerifs = 2, + MonospacedWithoutSerifs = 3, + ProportionalWithoutSerifs = 4, + Casual = 5, + Cursive = 6, + SmallCapitals = 7, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.ClosedCaptioning.ClosedCaptionProperties), + uuid(10aa1f84-cc30-4141-b503-5272289e0c20) + ] + interface IClosedCaptionPropertiesStatics : IInspectable + { + [propget] HRESULT FontColor([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionColor *value); + [propget] HRESULT ComputedFontColor([out, retval] Windows.UI.Color *value); + [propget] HRESULT FontOpacity([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionOpacity *value); + [propget] HRESULT FontSize([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionSize *value); + [propget] HRESULT FontStyle([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionStyle *value); + [propget] HRESULT FontEffect([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionEdgeEffect *value); + [propget] HRESULT BackgroundColor([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionColor *value); + [propget] HRESULT ComputedBackgroundColor([out, retval] Windows.UI.Color *value); + [propget] HRESULT BackgroundOpacity([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionOpacity *value); + [propget] HRESULT RegionColor([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionColor *value); + [propget] HRESULT ComputedRegionColor([out, retval] Windows.UI.Color *value); + [propget] HRESULT RegionOpacity([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionOpacity *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.ClosedCaptioning.IClosedCaptionPropertiesStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass ClosedCaptionProperties + { + } +}

1 0

Nikolay Sivov : uxtheme: Fix double free on registry key handle.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 28d572aa14300b7452f491e2a6b53b4e1ad9a104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d572aa14300b7452f491e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 24 11:42:22 2022 +0300 uxtheme: Fix double free on registry key handle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52704 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 908451f0fe8..05b86e40b1a 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -127,7 +127,6 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, } } - RegCloseKey(hKey); return dwRet; }

1 0

Fabian Maurer : mscoree: Use LocalFree for memory allocated by LocalAlloc.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 2c405c746866fb3b07b7df77fd57be78bbc3669b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c405c746866fb3b07b7df77… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Apr 23 20:17:25 2022 +0200 mscoree: Use LocalFree for memory allocated by LocalAlloc. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 54b72091bf5..1651ca69d29 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1093,7 +1093,7 @@ static void get_utf8_args(int *argc, char ***argv) (*argv)[*argc] = NULL; - HeapFree(GetProcessHeap(), 0, argvw); + LocalFree(argvw); } #if __i386__

1 0

Fabian Maurer : printui: Use LocalFree for memory allocated by LocalAlloc (Coverity).
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: f1cf7a02184f758b0b578909fceffc89581d76e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1cf7a02184f758b0b578909… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Apr 23 20:17:24 2022 +0200 printui: Use LocalFree for memory allocated by LocalAlloc (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/printui/printui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index 8f65ed27e87..13669f05aab 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -227,7 +227,7 @@ void WINAPI PrintUIEntryW(HWND hWnd, HINSTANCE hInst, LPCWSTR pCommand, DWORD nC cx.nCmdShow = nCmdShow; if ((pCommand) && (pCommand[0])) { - /* result is allocated with GlobalAlloc() */ + /* result is allocated with LocalAlloc() */ cx.argv = CommandLineToArgvW(pCommand, &cx.argc); TRACE("got %d args at %p\n", cx.argc, cx.argv); @@ -253,6 +253,6 @@ void WINAPI PrintUIEntryW(HWND hWnd, HINSTANCE hInst, LPCWSTR pCommand, DWORD nC FIXME("dialog: Printer / The operation was not successful\n"); } - GlobalFree(cx.argv); + LocalFree(cx.argv); }

1 0