August 2023 - Wine-commits - list.winehq.org

Mohamad Al-Jaf : include: Add IStorageFolder interface definition.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: bf1b0d5f103c345fb1e289345ad4fcae61591e38 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf1b0d5f103c345fb1e289345ad4fc… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Jan 5 22:14:33 2023 -0500 include: Add IStorageFolder interface definition. --- include/windows.storage.idl | 82 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/include/windows.storage.idl b/include/windows.storage.idl index d46c7430b2b..717460a0817 100644 --- a/include/windows.storage.idl +++ b/include/windows.storage.idl @@ -32,6 +32,7 @@ import "windows.storage.streams.idl"; import "windows.system.idl"; namespace Windows.Storage { + typedef enum CreationCollisionOption CreationCollisionOption; typedef enum FileAccessMode FileAccessMode; typedef enum FileAttributes FileAttributes; typedef enum NameCollisionOption NameCollisionOption; @@ -50,12 +51,36 @@ namespace Windows.Storage { runtimeclass StorageStreamTransaction; declare { + interface Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *> *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *> *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *> *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.IStorageItem *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageFile *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageFolder *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageStreamTransaction *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *> *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *> *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *> *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.IStorageItem *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageStreamTransaction *>; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum CreationCollisionOption + { + GenerateUniqueName = 0, + ReplaceExisting = 1, + FailIfExists = 2, + OpenIfExists = 3, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -161,6 +186,52 @@ namespace Windows.Storage { HRESULT MoveAndReplaceAsync([in] Windows.Storage.IStorageFile *file, [out, retval] Windows.Foundation.IAsyncAction **operation); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(72d1cb78-b3ef-4f75-a80b-6fd9dae2944b) + ] + interface IStorageFolder : IInspectable + requires Windows.Storage.IStorageItem + { + [overload("CreateFileAsync")] + HRESULT CreateFileAsyncOverloadDefaultOptions( + [in] HSTRING name, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *> **operation + ); + [overload("CreateFileAsync")] + HRESULT CreateFileAsync( + [in] HSTRING name, + [in] Windows.Storage.CreationCollisionOption options, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *> **operation + ); + [overload("CreateFolderAsync")] + HRESULT CreateFolderAsyncOverloadDefaultOptions( + [in] HSTRING name, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *> **operation + ); + [overload("CreateFolderAsync")] + HRESULT CreateFolderAsync( + [in] HSTRING name, + [in] Windows.Storage.CreationCollisionOption options, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *> **operation + ); + HRESULT GetFileAsync([in] HSTRING name, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *> **operation); + HRESULT GetFolderAsync([in] HSTRING name, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *> **operation); + HRESULT GetItemAsync([in] HSTRING name, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.IStorageItem *> **operation); + [overload("GetFilesAsync")] + HRESULT GetFilesAsyncOverloadDefaultOptionsStartAndCount( + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *> *> **operation + ); + [overload("GetFoldersAsync")] + HRESULT GetFoldersAsyncOverloadDefaultOptionsStartAndCount( + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *> *> **operation + ); + [overload("GetItemsAsync")] + HRESULT GetItemsAsyncOverloadDefaultStartAndCount( + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *> *> **operation + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(4207a996-ca2f-42f7-bde8-8b10457a7f30) @@ -216,11 +287,20 @@ namespace Windows.Storage { [ contract(Windows.Foundation.UniversalApiContract, 1.0), - static(Windows.Storage.IStorageFolderStatics, Windows.Foundation.UniversalApiContract, 1.0) + static(Windows.Storage.IStorageFolderStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Storage.IStorageFolderStatics2, Windows.Foundation.UniversalApiContract, 10.0) ] runtimeclass StorageFolder { [default] interface Windows.Storage.IStorageFolder; + interface Windows.Storage.IStorageItem; + interface Windows.Storage.Search.IStorageFolderQueryOperations; + interface Windows.Storage.IStorageItemProperties; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemProperties2; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItem2; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageFolder2; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemPropertiesWithProvider; + [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Storage.IStorageFolder3; } [

1 0

Paul Gofman : winex11.drv: Release old drawables after setting new ones in sync_context().
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: a743f085df51120a6baa0543d48ca5d1f915afcc URL: https://gitlab.winehq.org/wine/wine/-/commit/a743f085df51120a6baa0543d48ca5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 16 20:22:01 2023 -0600 winex11.drv: Release old drawables after setting new ones in sync_context(). --- dlls/winex11.drv/opengl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index aadc0b99cd1..c23df82c7b9 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1201,18 +1201,19 @@ static void mark_drawable_dirty( struct gl_drawable *old, struct gl_drawable *ne static inline void sync_context(struct wgl_context *context) { BOOL refresh = FALSE; + struct gl_drawable *old[2] = { NULL }; pthread_mutex_lock( &context_mutex ); if (context->new_drawables[0]) { - release_gl_drawable( context->drawables[0] ); + old[0] = context->drawables[0]; context->drawables[0] = context->new_drawables[0]; context->new_drawables[0] = NULL; refresh = TRUE; } if (context->new_drawables[1]) { - release_gl_drawable( context->drawables[1] ); + old[1] = context->drawables[1]; context->drawables[1] = context->new_drawables[1]; context->new_drawables[1] = NULL; refresh = TRUE; @@ -1224,6 +1225,8 @@ static inline void sync_context(struct wgl_context *context) context->drawables[1]->drawable, context->ctx); else pglXMakeCurrent(gdi_display, context->drawables[0]->drawable, context->ctx); + release_gl_drawable( old[0] ); + release_gl_drawable( old[1] ); } pthread_mutex_unlock( &context_mutex ); }

1 0

Alex Henrie : adsldp: Use CRT allocation functions.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: 64d9d63fecb87c9dcfe14539c68bcf9b999c1072 URL: https://gitlab.winehq.org/wine/wine/-/commit/64d9d63fecb87c9dcfe14539c68bcf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 21:04:49 2023 -0600 adsldp: Use CRT allocation functions. --- dlls/adsldp/adsldp_private.h | 4 +--- dlls/adsldp/schema.c | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index 5d8b8177a7b..73bf8f379fd 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -19,8 +19,6 @@ #ifndef _ADSLDP_PRIVATE_H #define _ADSLDP_PRIVATE_H -#include "wine/heap.h" - static inline LPWSTR strnUtoW( LPCSTR str, DWORD inlen, DWORD *outlen ) { LPWSTR ret = NULL; @@ -28,7 +26,7 @@ static inline LPWSTR strnUtoW( LPCSTR str, DWORD inlen, DWORD *outlen ) if (str) { DWORD len = MultiByteToWideChar( CP_UTF8, 0, str, inlen, NULL, 0 ); - if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if ((ret = malloc( (len + 1) * sizeof(WCHAR) ))) { MultiByteToWideChar( CP_UTF8, 0, str, inlen, ret, len ); ret[len] = 0; diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 7a530cc57e3..d8d0d7e9cde 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -116,9 +116,9 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, static void free_attribute_type(struct attribute_type *at) { - heap_free(at->oid); - heap_free(at->name); - heap_free(at->syntax); + free(at->oid); + free(at->name); + free(at->syntax); } void free_attribute_types(struct attribute_type *at, ULONG count) @@ -128,7 +128,7 @@ void free_attribute_types(struct attribute_type *at, ULONG count) for (i = 0; i < count; i++) free_attribute_type(&at[i]); - heap_free(at); + free(at); } static BOOL is_space(WCHAR c) @@ -156,7 +156,7 @@ static WCHAR *parse_oid(WCHAR **str) } count = end - p; - oid = heap_alloc((count + 1) * sizeof(WCHAR)); + oid = malloc((count + 1) * sizeof(WCHAR)); if (!oid) return NULL; memcpy(oid, p, count * sizeof(WCHAR)); @@ -202,17 +202,14 @@ static WCHAR *parse_name(WCHAR **str, ULONG *name_count) count = wcslen(tmp_name); - if (!name) - new_name = heap_alloc((count + 1) * sizeof(WCHAR)); - else - new_name = heap_realloc(name, (total_count + count + 1) * sizeof(WCHAR)); + new_name = realloc(name, (total_count + count + 1) * sizeof(WCHAR)); if (!new_name) break; memcpy(new_name + total_count, tmp_name, (count + 1) * sizeof(WCHAR)); name = new_name; - heap_free(tmp_name); + free(tmp_name); total_count += count + 1; *name_count += 1; @@ -221,7 +218,7 @@ static WCHAR *parse_name(WCHAR **str, ULONG *name_count) *str = *p ? p + 1 : p; - heap_free(name); + free(name); return NULL; } @@ -236,7 +233,7 @@ static WCHAR *parse_name(WCHAR **str, ULONG *name_count) if (!end) return NULL; count = end - p; - name = heap_alloc((count + 1) * sizeof(WCHAR)); + name = malloc((count + 1) * sizeof(WCHAR)); if (!name) return NULL; memcpy(name, p, count * sizeof(WCHAR)); @@ -400,7 +397,7 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_single_count, ULONG *at_m { ULONG i, total = ldap_count_valuesW(types); - at = heap_alloc(total * sizeof(*at)); + at = malloc(total * sizeof(*at)); if (!at) goto exit; for (i = 0; i < total; i++)

1 0

Alex Henrie : inetcpl: Use CRT allocation functions.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: 81a5a8f46b378b0868dd6be4b97ee5d1abfcd75f URL: https://gitlab.winehq.org/wine/wine/-/commit/81a5a8f46b378b0868dd6be4b97ee5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 21:46:14 2023 -0600 inetcpl: Use CRT allocation functions. --- dlls/inetcpl.cpl/connections.c | 11 +++++------ dlls/inetcpl.cpl/security.c | 13 ++++++------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index a6591051771..842f154bd8c 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -27,7 +27,6 @@ #include "inetcpl.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); @@ -83,7 +82,7 @@ static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_se pac_url_len = 0; size += sizeof(DWORD)*10; - *ret = heap_alloc_zero(size); + *ret = calloc(1, size); if(!*ret) return 0; (*ret)->version = CONNECTION_SETTINGS_VERSION; @@ -152,11 +151,11 @@ static void connections_on_initdialog(HWND hwnd) while((res = RegQueryValueExW(con, L"DefaultConnectionSettings", NULL, &type, (BYTE*)settings, &size)) == ERROR_MORE_DATA || !settings) { - connection_settings *new_settings = heap_realloc(settings, size); + connection_settings *new_settings = realloc(settings, size); if(!new_settings) { RegCloseKey(con); - heap_free(settings); + free(settings); return; } settings = new_settings; @@ -170,7 +169,7 @@ static void connections_on_initdialog(HWND hwnd) else if(settings->flags & CONNECTION_SETTINGS_WPAD) CheckDlgButton(hwnd, IDC_USE_WPAD, BST_CHECKED); } - heap_free(settings); + free(settings); } TRACE("ProxyEnable = %lx\n", enabled); @@ -332,7 +331,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) res = RegSetValueExW(con, L"DefaultConnectionSettings", 0, REG_BINARY, (BYTE*)default_connection, size); - heap_free(default_connection); + free(default_connection); RegCloseKey(con); return !res; } diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index a6e8c03d505..05c6502043c 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -37,7 +37,6 @@ #include "inetcpl.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); @@ -273,8 +272,8 @@ static INT_PTR security_on_destroy(secdlg_data * sd) { TRACE("(%p)\n", sd); - heap_free(sd->zone_attr); - heap_free(sd->zones); + free(sd->zone_attr); + free(sd->zones); if (sd->himages) { SendMessageW(sd->hlv, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); ImageList_Destroy(sd->himages); @@ -282,7 +281,7 @@ static INT_PTR security_on_destroy(secdlg_data * sd) security_cleanup_zones(sd); SetWindowLongPtrW(sd->hsec, DWLP_USER, 0); - heap_free(sd); + free(sd); return TRUE; } @@ -300,7 +299,7 @@ static INT_PTR security_on_initdialog(HWND hsec) DWORD lv_index = 0; DWORD i; - sd = heap_alloc_zero(sizeof(secdlg_data)); + sd = calloc(1, sizeof(secdlg_data)); SetWindowLongPtrW(hsec, DWLP_USER, (LONG_PTR) sd); if (!sd) { return FALSE; @@ -338,14 +337,14 @@ static INT_PTR security_on_initdialog(HWND hsec) TRACE("found %ld zones\n", sd->num_zones); /* remember ZONEATTRIBUTES for a listview entry */ - sd->zone_attr = heap_alloc(sizeof(ZONEATTRIBUTES) * sd->num_zones); + sd->zone_attr = calloc(sd->num_zones, sizeof(ZONEATTRIBUTES)); if (!sd->zone_attr) { security_on_destroy(sd); return FALSE; } /* remember zone number and current security level for a listview entry */ - sd->zones = heap_alloc((sizeof(DWORD) + sizeof(DWORD)) * sd->num_zones); + sd->zones = calloc(sd->num_zones, sizeof(DWORD) + sizeof(DWORD)); if (!sd->zones) { security_on_destroy(sd); return FALSE;

1 0

Alex Henrie : odbccp32: Use CRT allocation functions.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: 79e78218ec0a1fc13b67b136f19edce1e4d53ccc URL: https://gitlab.winehq.org/wine/wine/-/commit/79e78218ec0a1fc13b67b136f19edc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 21:49:52 2023 -0600 odbccp32: Use CRT allocation functions. --- dlls/odbccp32/odbccp32.c | 107 +++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 54 deletions(-)

1 0

Alex Henrie : advapi32: Use CRT allocation functions.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: 7abcc31298567fbf7a1fb10047b8c625cd1d52bc URL: https://gitlab.winehq.org/wine/wine/-/commit/7abcc31298567fbf7a1fb10047b8c6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 21:22:54 2023 -0600 advapi32: Use CRT allocation functions. --- dlls/advapi32/advapi.c | 6 +-- dlls/advapi32/advapi32_misc.h | 3 +- dlls/advapi32/cred.c | 110 +++++++++++++++++++++--------------------- dlls/advapi32/eventlog.c | 18 +++---- dlls/advapi32/lsa.c | 60 +++++++++++------------ dlls/advapi32/security.c | 96 ++++++++++++++++++------------------ dlls/advapi32/service.c | 32 ++++++------ 7 files changed, 162 insertions(+), 163 deletions(-)

1 0

Ziqing Hui : winegstreamer: Implement GetStreamSinkCount for media sink.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 6de1cbfe3c24db824a73371fa1263738d611a030 URL: https://gitlab.winehq.org/wine/wine/-/commit/6de1cbfe3c24db824a73371fa12637… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Aug 11 11:23:11 2023 +0800 winegstreamer: Implement GetStreamSinkCount for media sink. --- dlls/winegstreamer/media_sink.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 9083dea6709..54a1c839758 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -624,9 +624,18 @@ static HRESULT WINAPI media_sink_RemoveStreamSink(IMFFinalizableMediaSink *iface static HRESULT WINAPI media_sink_GetStreamSinkCount(IMFFinalizableMediaSink *iface, DWORD *count) { - FIXME("iface %p, count %p stub!\n", iface, count); + struct media_sink *media_sink = impl_from_IMFFinalizableMediaSink(iface); - return E_NOTIMPL; + TRACE("iface %p, count %p.\n", iface, count); + + if (!count) + return E_POINTER; + + EnterCriticalSection(&media_sink->cs); + *count = list_count(&media_sink->stream_sinks); + LeaveCriticalSection(&media_sink->cs); + + return S_OK; } static HRESULT WINAPI media_sink_GetStreamSinkByIndex(IMFFinalizableMediaSink *iface, DWORD index,

1 0

Ziqing Hui : winegstreamer: Implement GetStreamSinkByIndex for media sink.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 59adbf66708e61553881da32b35334de6e50fc2e URL: https://gitlab.winehq.org/wine/wine/-/commit/59adbf66708e61553881da32b35334… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Aug 11 11:33:27 2023 +0800 winegstreamer: Implement GetStreamSinkByIndex for media sink. --- dlls/winegstreamer/media_sink.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 54a1c839758..4418a82096c 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -641,9 +641,31 @@ static HRESULT WINAPI media_sink_GetStreamSinkCount(IMFFinalizableMediaSink *ifa static HRESULT WINAPI media_sink_GetStreamSinkByIndex(IMFFinalizableMediaSink *iface, DWORD index, IMFStreamSink **stream) { - FIXME("iface %p, index %lu, stream %p stub!\n", iface, index, stream); + struct media_sink *media_sink = impl_from_IMFFinalizableMediaSink(iface); + struct stream_sink *stream_sink; + HRESULT hr = MF_E_INVALIDINDEX; + DWORD entry_index = 0; - return E_NOTIMPL; + TRACE("iface %p, index %lu, stream %p stub!\n", iface, index, stream); + + if (!stream) + return E_POINTER; + + EnterCriticalSection(&media_sink->cs); + + LIST_FOR_EACH_ENTRY(stream_sink, &media_sink->stream_sinks, struct stream_sink, entry) + { + if (entry_index++ == index) + { + IMFStreamSink_AddRef((*stream = &stream_sink->IMFStreamSink_iface)); + hr = S_OK; + break; + } + } + + LeaveCriticalSection(&media_sink->cs); + + return hr; } static HRESULT WINAPI media_sink_GetStreamSinkById(IMFFinalizableMediaSink *iface, DWORD stream_sink_id,

1 0

Ziqing Hui : winegstreamer: Implement GetStreamSinkById for media sink.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: a7594900ea9d0ee1fae864175848e23673c7881a URL: https://gitlab.winehq.org/wine/wine/-/commit/a7594900ea9d0ee1fae864175848e2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Aug 11 11:41:34 2023 +0800 winegstreamer: Implement GetStreamSinkById for media sink. --- dlls/winegstreamer/media_sink.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 4418a82096c..fcea67eb8f1 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -671,9 +671,27 @@ static HRESULT WINAPI media_sink_GetStreamSinkByIndex(IMFFinalizableMediaSink *i static HRESULT WINAPI media_sink_GetStreamSinkById(IMFFinalizableMediaSink *iface, DWORD stream_sink_id, IMFStreamSink **stream) { - FIXME("iface %p, stream_sink_id %#lx, stream %p stub!\n", iface, stream_sink_id, stream); + struct media_sink *media_sink = impl_from_IMFFinalizableMediaSink(iface); + struct stream_sink *stream_sink; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, stream_sink_id %#lx, stream %p.\n", iface, stream_sink_id, stream); + + if (!stream) + return E_POINTER; + + EnterCriticalSection(&media_sink->cs); + + hr = MF_E_INVALIDSTREAMNUMBER; + if ((stream_sink = media_sink_get_stream_sink_by_id(media_sink, stream_sink_id))) + { + IMFStreamSink_AddRef((*stream = &stream_sink->IMFStreamSink_iface)); + hr = S_OK; + } + + LeaveCriticalSection(&media_sink->cs); + + return hr; } static HRESULT WINAPI media_sink_SetPresentationClock(IMFFinalizableMediaSink *iface, IMFPresentationClock *clock)

1 0

Jacek Caban : cscript: Build as CUI application.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: a1d429dabde73689c66a5434d6f92284503b8f7a URL: https://gitlab.winehq.org/wine/wine/-/commit/a1d429dabde73689c66a5434d6f922… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 16 16:08:12 2023 +0200 cscript: Build as CUI application. --- programs/cscript/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in index d87a28fcc54..7d3e74768f3 100644 --- a/programs/cscript/Makefile.in +++ b/programs/cscript/Makefile.in @@ -3,7 +3,7 @@ IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 EXTRADEFS = -DCSCRIPT_BUILD PARENTSRC = ../wscript -EXTRADLLFLAGS = -mwindows -municode +EXTRADLLFLAGS = -mconsole -municode C_SRCS = \ arguments.c \

1 0