- Wine-Commits - list.winehq.org

Rémi Bernon : winepath: Free wine_get_(dos|unix)_file_name memory with HeapFree.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 1c30f7803cf094860935013752a547322f2ac523 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c30f7803cf094860935013752a547… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 16:11:59 2022 +0100 winepath: Free wine_get_(dos|unix)_file_name memory with HeapFree. --- programs/winepath/winepath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 88c64b91a42..9a322f40937 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -215,7 +215,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { printf("%s%c", unix_name, separator); } - free( unix_name ); + HeapFree( GetProcessHeap(), 0, unix_name ); break; } @@ -262,7 +262,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { WideCharToMultiByte(CP_UNIXCP, 0, windows_name, -1, path, MAX_PATH, NULL, NULL); printf("%s%c", path, separator); - free( windows_name ); + HeapFree( GetProcessHeap(), 0, windows_name ); } else printf("%c", separator); free( unix_name );

1 0

Rémi Bernon : appwiz.cpl: Free wine_get_dos_file_name memory with HeapFree.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 489218444f5fdf3e2c0571f371b17d329008e115 URL: https://gitlab.winehq.org/wine/wine/-/commit/489218444f5fdf3e2c0571f371b17d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 16:11:25 2022 +0100 appwiz.cpl: Free wine_get_dos_file_name memory with HeapFree. --- dlls/appwiz.cpl/addons.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index f7e36b8b99b..c63106de95b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -233,7 +233,7 @@ static enum install_res install_from_unix_file(const char *dir, const WCHAR *sub if (p_wine_get_dos_file_name && (dos_dir = p_wine_get_dos_file_name( dir ))) { ret = install_from_dos_file( dos_dir, subdir, file_name ); - free( dos_dir ); + HeapFree( GetProcessHeap(), 0, dos_dir ); } return ret; } @@ -329,7 +329,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) } else if ((home_dir = _wgetenv( L"WINEHOMEDIR" ))) { - if (!(cache_dir = malloc( wcslen(home_dir) * sizeof(WCHAR) + sizeof(L"\\.cache") ))) return NULL; + if (!(cache_dir = HeapAlloc( GetProcessHeap(), 0, wcslen(home_dir) * sizeof(WCHAR) + sizeof(L"\\.cache") ))) return NULL; lstrcpyW( cache_dir, home_dir ); lstrcatW( cache_dir, L"\\.cache" ); cache_dir[1] = '\\'; /* change \??\ into \\?\ */ @@ -339,19 +339,19 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) if (ensure_exists && !CreateDirectoryW( cache_dir, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) { WARN( "%s does not exist and could not be created (%lu)\n", debugstr_w(cache_dir), GetLastError() ); - free( cache_dir ); + HeapFree( GetProcessHeap(), 0, cache_dir ); return NULL; } size = lstrlenW( cache_dir ) + ARRAY_SIZE(L"\\wine") + lstrlenW( addon->file_name ) + 1; if (!(ret = malloc( size * sizeof(WCHAR) ))) { - free( cache_dir ); + HeapFree( GetProcessHeap(), 0, cache_dir ); return NULL; } lstrcpyW( ret, cache_dir ); lstrcatW( ret, L"\\wine" ); - free( cache_dir ); + HeapFree( GetProcessHeap(), 0, cache_dir ); if (ensure_exists && !CreateDirectoryW( ret, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) {

1 0

Rémi Bernon : mshtml: Free wine_get_dos_file_name memory with HeapFree.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: a49838f24e9cfded845b006e9f6189209f306d0e URL: https://gitlab.winehq.org/wine/wine/-/commit/a49838f24e9cfded845b006e9f6189… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 16:11:48 2022 +0100 mshtml: Free wine_get_dos_file_name memory with HeapFree. --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 66dd3f1d65e..8fb3b2a52ed 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -763,7 +763,7 @@ static WCHAR *find_wine_gecko_unix(const char *unix_path) ret = check_version(dos_dir); - free(dos_dir); + HeapFree(GetProcessHeap(), 0, dos_dir); return ret; }

1 0

Alex Henrie : mshtml: Handle memory allocation failure in ConnectionPoint_Advise.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 76696cd966c41965036d1858692a6dfd77808c86 URL: https://gitlab.winehq.org/wine/wine/-/commit/76696cd966c41965036d1858692a6d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 24 15:34:36 2022 -0700 mshtml: Handle memory allocation failure in ConnectionPoint_Advise. --- dlls/mshtml/conpoint.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 52a99dd411f..95043e7cec6 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -216,6 +216,7 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * { ConnectionPoint *This = impl_from_IConnectionPoint(iface); IUnknown *sink; + void *new_sinks; DWORD i; HRESULT hres; @@ -227,18 +228,19 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * if(FAILED(hres)) return CONNECT_E_CANNOTCONNECT; - if(This->sinks) { - for(i=0; i<This->sinks_size; i++) { - if(!This->sinks[i].unk) - break; - } + for(i = 0; i < This->sinks_size; i++) { + if(!This->sinks[i].unk) + break; + } - if(i == This->sinks_size) - This->sinks = realloc(This->sinks, (++This->sinks_size) * sizeof(*This->sinks)); - }else { - This->sinks = malloc(sizeof(*This->sinks)); - This->sinks_size = 1; - i = 0; + if(i == This->sinks_size) { + new_sinks = realloc(This->sinks, (This->sinks_size + 1) * sizeof(*This->sinks)); + if(!new_sinks) { + IUnknown_Release(sink); + return E_OUTOFMEMORY; + } + This->sinks = new_sinks; + This->sinks_size++; } This->sinks[i].unk = sink;

1 0

Alex Henrie : wininet: Use standard C functions for memory allocation.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: db691cd9d0a49f19d590a43db18b7fdc4749bef3 URL: https://gitlab.winehq.org/wine/wine/-/commit/db691cd9d0a49f19d590a43db18b7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 24 21:13:01 2022 -0700 wininet: Use standard C functions for memory allocation. --- dlls/wininet/cookie.c | 126 ++++++------- dlls/wininet/dialogs.c | 14 +- dlls/wininet/ftp.c | 201 ++++++++++---------- dlls/wininet/http.c | 441 ++++++++++++++++++++++--------------------- dlls/wininet/internet.c | 329 ++++++++++++++++---------------- dlls/wininet/internet.h | 53 +----- dlls/wininet/netconnection.c | 32 ++-- dlls/wininet/urlcache.c | 122 ++++++------ dlls/wininet/utility.c | 8 +- 9 files changed, 648 insertions(+), 678 deletions(-)

1 0

Mohamad Al-Jaf : windows.media: Partially implement IClosedCaptionPropertiesStatics_get_RegionOpacity.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: d673b697eb2ecd14e9880950fcf4f75c252c80e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d673b697eb2ecd14e9880950fcf4f7… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 24 03:58:49 2022 -0500 windows.media: Partially implement IClosedCaptionPropertiesStatics_get_RegionOpacity. --- dlls/windows.media/captions.c | 6 ++++-- dlls/windows.media/tests/captions.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media/captions.c b/dlls/windows.media/captions.c index a3a27abc823..b7e07710603 100644 --- a/dlls/windows.media/captions.c +++ b/dlls/windows.media/captions.c @@ -210,8 +210,10 @@ static HRESULT WINAPI captions_get_ComputedRegionColor( IClosedCaptionProperties static HRESULT WINAPI captions_get_RegionOpacity( IClosedCaptionPropertiesStatics *iface, ClosedCaptionOpacity *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + FIXME( "iface %p, value %p semi-stub.\n", iface, value ); + + *value = ClosedCaptionOpacity_Default; + return S_OK; } static const struct IClosedCaptionPropertiesStaticsVtbl captions_statics_vtbl = diff --git a/dlls/windows.media/tests/captions.c b/dlls/windows.media/tests/captions.c index 21d15e03589..c496a8503fb 100644 --- a/dlls/windows.media/tests/captions.c +++ b/dlls/windows.media/tests/captions.c @@ -142,8 +142,8 @@ static void test_CaptionStatics(void) opacity = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_RegionOpacity( caption_statics, &opacity ); - todo_wine ok( hr == S_OK, "get_RegionOpacity returned %#lx\n", hr ); - todo_wine ok( opacity == ClosedCaptionOpacity_Default, "expected default region opacity, got %d\n", opacity ); + ok( hr == S_OK, "get_RegionOpacity returned %#lx\n", hr ); + ok( opacity == ClosedCaptionOpacity_Default, "expected default region opacity, got %d\n", opacity ); ref = IClosedCaptionPropertiesStatics_Release( caption_statics ); ok( ref == 2, "got ref %ld.\n", ref );

1 0

Mohamad Al-Jaf : windows.media: Partially implement IClosedCaptionPropertiesStatics_get_FontSize.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 0b015772319c925482d72f84b2b4865f7b1176c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b015772319c925482d72f84b2b486… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 24 03:51:10 2022 -0500 windows.media: Partially implement IClosedCaptionPropertiesStatics_get_FontSize. --- dlls/windows.media/captions.c | 6 ++++-- dlls/windows.media/tests/captions.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media/captions.c b/dlls/windows.media/captions.c index 43a421f0fa8..f9bd9505ea5 100644 --- a/dlls/windows.media/captions.c +++ b/dlls/windows.media/captions.c @@ -150,8 +150,10 @@ static HRESULT WINAPI captions_get_FontOpacity( IClosedCaptionPropertiesStatics static HRESULT WINAPI captions_get_FontSize( IClosedCaptionPropertiesStatics *iface, ClosedCaptionSize *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + FIXME( "iface %p, value %p semi-stub.\n", iface, value ); + + *value = ClosedCaptionSize_Default; + return S_OK; } static HRESULT WINAPI captions_get_FontStyle( IClosedCaptionPropertiesStatics *iface, ClosedCaptionStyle *value ) diff --git a/dlls/windows.media/tests/captions.c b/dlls/windows.media/tests/captions.c index df2e02b644b..cd3a3ccbd13 100644 --- a/dlls/windows.media/tests/captions.c +++ b/dlls/windows.media/tests/captions.c @@ -102,8 +102,8 @@ static void test_CaptionStatics(void) size = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_FontSize( caption_statics, &size ); - todo_wine ok( hr == S_OK, "get_FontSize returned %#lx\n", hr ); - todo_wine ok( size == ClosedCaptionSize_Default, "expected default font size, got %d\n", size ); + ok( hr == S_OK, "get_FontSize returned %#lx\n", hr ); + ok( size == ClosedCaptionSize_Default, "expected default font size, got %d\n", size ); style = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_FontStyle( caption_statics, &style );

1 0

Mohamad Al-Jaf : windows.media: Partially implement IClosedCaptionPropertiesStatics_get_FontStyle.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 925c14251e917fa7e86657f4fe4b12d0d7c39d5e URL: https://gitlab.winehq.org/wine/wine/-/commit/925c14251e917fa7e86657f4fe4b12… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 24 03:52:08 2022 -0500 windows.media: Partially implement IClosedCaptionPropertiesStatics_get_FontStyle. --- dlls/windows.media/captions.c | 6 ++++-- dlls/windows.media/tests/captions.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media/captions.c b/dlls/windows.media/captions.c index f9bd9505ea5..40f5fbb9800 100644 --- a/dlls/windows.media/captions.c +++ b/dlls/windows.media/captions.c @@ -158,8 +158,10 @@ static HRESULT WINAPI captions_get_FontSize( IClosedCaptionPropertiesStatics *if static HRESULT WINAPI captions_get_FontStyle( IClosedCaptionPropertiesStatics *iface, ClosedCaptionStyle *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + FIXME( "iface %p, value %p semi-stub.\n", iface, value ); + + *value = ClosedCaptionStyle_Default; + return S_OK; } static HRESULT WINAPI captions_get_FontEffect( IClosedCaptionPropertiesStatics *iface, ClosedCaptionEdgeEffect *value ) diff --git a/dlls/windows.media/tests/captions.c b/dlls/windows.media/tests/captions.c index cd3a3ccbd13..57e1bf6a998 100644 --- a/dlls/windows.media/tests/captions.c +++ b/dlls/windows.media/tests/captions.c @@ -107,8 +107,8 @@ static void test_CaptionStatics(void) style = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_FontStyle( caption_statics, &style ); - todo_wine ok( hr == S_OK, "get_FontStyle returned %#lx\n", hr ); - todo_wine ok( style == ClosedCaptionStyle_Default, "expected default font style, got %d\n", style ); + ok( hr == S_OK, "get_FontStyle returned %#lx\n", hr ); + ok( style == ClosedCaptionStyle_Default, "expected default font style, got %d\n", style ); effect = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_FontEffect( caption_statics, &effect );

1 0

Mohamad Al-Jaf : windows.media: Partially implement IClosedCaptionPropertiesStatics_get_RegionColor.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 576f7e2a73977daaf9a8f39961ce6940efa93489 URL: https://gitlab.winehq.org/wine/wine/-/commit/576f7e2a73977daaf9a8f39961ce69… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 24 03:58:06 2022 -0500 windows.media: Partially implement IClosedCaptionPropertiesStatics_get_RegionColor. --- dlls/windows.media/captions.c | 6 ++++-- dlls/windows.media/tests/captions.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media/captions.c b/dlls/windows.media/captions.c index 13a88da34ff..a3a27abc823 100644 --- a/dlls/windows.media/captions.c +++ b/dlls/windows.media/captions.c @@ -196,8 +196,10 @@ static HRESULT WINAPI captions_get_BackgroundOpacity( IClosedCaptionPropertiesSt static HRESULT WINAPI captions_get_RegionColor( IClosedCaptionPropertiesStatics *iface, ClosedCaptionColor *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + FIXME( "iface %p, value %p semi-stub.\n", iface, value ); + + *value = ClosedCaptionColor_Default; + return S_OK; } static HRESULT WINAPI captions_get_ComputedRegionColor( IClosedCaptionPropertiesStatics *iface, Color *value ) diff --git a/dlls/windows.media/tests/captions.c b/dlls/windows.media/tests/captions.c index 26e9ae9ab21..21d15e03589 100644 --- a/dlls/windows.media/tests/captions.c +++ b/dlls/windows.media/tests/captions.c @@ -132,8 +132,8 @@ static void test_CaptionStatics(void) color = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_RegionColor( caption_statics, &color ); - todo_wine ok( hr == S_OK, "get_RegionColor returned %#lx\n", hr ); - todo_wine ok( color == ClosedCaptionColor_Default, "expected default region color, got %d\n", color ); + ok( hr == S_OK, "get_RegionColor returned %#lx\n", hr ); + ok( color == ClosedCaptionColor_Default, "expected default region color, got %d\n", color ); hr = IClosedCaptionPropertiesStatics_get_ComputedRegionColor( caption_statics, &computed_color ); todo_wine ok( hr == E_INVALIDARG, "get_ComputedRegionColor returned %#lx\n", hr );

1 0

Mohamad Al-Jaf : windows.media: Partially implement IClosedCaptionPropertiesStatics_get_FontEffect.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: f923b6bb4ef3b2243c4937d0cbafb141c17d137c URL: https://gitlab.winehq.org/wine/wine/-/commit/f923b6bb4ef3b2243c4937d0cbafb1… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 24 03:54:42 2022 -0500 windows.media: Partially implement IClosedCaptionPropertiesStatics_get_FontEffect. --- dlls/windows.media/captions.c | 6 ++++-- dlls/windows.media/tests/captions.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media/captions.c b/dlls/windows.media/captions.c index 40f5fbb9800..d3954eb1b4f 100644 --- a/dlls/windows.media/captions.c +++ b/dlls/windows.media/captions.c @@ -166,8 +166,10 @@ static HRESULT WINAPI captions_get_FontStyle( IClosedCaptionPropertiesStatics *i static HRESULT WINAPI captions_get_FontEffect( IClosedCaptionPropertiesStatics *iface, ClosedCaptionEdgeEffect *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + FIXME( "iface %p, value %p semi-stub.\n", iface, value ); + + *value = ClosedCaptionEdgeEffect_Default; + return S_OK; } static HRESULT WINAPI captions_get_BackgroundColor( IClosedCaptionPropertiesStatics *iface, ClosedCaptionColor *value ) diff --git a/dlls/windows.media/tests/captions.c b/dlls/windows.media/tests/captions.c index 57e1bf6a998..323d77dd3b8 100644 --- a/dlls/windows.media/tests/captions.c +++ b/dlls/windows.media/tests/captions.c @@ -112,8 +112,8 @@ static void test_CaptionStatics(void) effect = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_FontEffect( caption_statics, &effect ); - todo_wine ok( hr == S_OK, "get_FontEffect returned %#lx\n", hr ); - todo_wine ok( effect == ClosedCaptionEdgeEffect_Default, "expected default font effect, got %d\n", effect ); + ok( hr == S_OK, "get_FontEffect returned %#lx\n", hr ); + ok( effect == ClosedCaptionEdgeEffect_Default, "expected default font effect, got %d\n", effect ); color = 0xdeadbeef; hr = IClosedCaptionPropertiesStatics_get_BackgroundColor( caption_statics, &color );

1 0