July 2023 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : mciavi32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 67b5c77af609fcfe7d93d624fb0cf33bf6f22d75 URL: https://gitlab.winehq.org/wine/wine/-/commit/67b5c77af609fcfe7d93d624fb0cf3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:15:52 2023 +1000 mciavi32: Remove DECLSPEC_HIDDEN usage. --- dlls/mciavi32/private_mciavi.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/mciavi32/private_mciavi.h b/dlls/mciavi32/private_mciavi.h index 1b53ab8d247..806804714a5 100644 --- a/dlls/mciavi32/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -86,32 +86,32 @@ typedef struct { HANDLE hStopEvent; } WINE_MCIAVI; -extern HINSTANCE MCIAVI_hInstance DECLSPEC_HIDDEN; +extern HINSTANCE MCIAVI_hInstance; /* info.c */ -DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val) DECLSPEC_HIDDEN; -DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) DECLSPEC_HIDDEN; -DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) DECLSPEC_HIDDEN; -DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) DECLSPEC_HIDDEN; -DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val); +DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms); +DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms); +DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms); +DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms); /* mmoutput.c */ -BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN; -DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr) DECLSPEC_HIDDEN; -BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN; -void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr) DECLSPEC_HIDDEN; -double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) DECLSPEC_HIDDEN; +BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma); +DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr); +BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma); +void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr); +double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC); /* mciavi.c */ -WINE_MCIAVI* MCIAVI_mciGetOpenDev(UINT wDevID) DECLSPEC_HIDDEN; -DWORD MCIAVI_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS) DECLSPEC_HIDDEN; +WINE_MCIAVI* MCIAVI_mciGetOpenDev(UINT wDevID); +DWORD MCIAVI_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS); /* wnd.c */ -BOOL MCIAVI_RegisterClass(void) DECLSPEC_HIDDEN; -BOOL MCIAVI_UnregisterClass(void) DECLSPEC_HIDDEN; -BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpOpenParms) DECLSPEC_HIDDEN; -DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) DECLSPEC_HIDDEN; -DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) DECLSPEC_HIDDEN; -DWORD MCIAVI_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpParms) DECLSPEC_HIDDEN; +BOOL MCIAVI_RegisterClass(void); +BOOL MCIAVI_UnregisterClass(void); +BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpOpenParms); +DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms); +DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms); +DWORD MCIAVI_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpParms); #endif /* __WINE_PRIVATE_MCIAVI_H */

1 0

Alistair Leslie-Hughes : inetcpl.cpl: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 4d14f2ddeaf254b9e9ed61d70e7496949bd2a5b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d14f2ddeaf254b9e9ed61d70e7496… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:15:52 2023 +1000 inetcpl.cpl: Remove DECLSPEC_HIDDEN usage. --- dlls/inetcpl.cpl/inetcpl.c | 2 +- dlls/inetcpl.cpl/inetcpl.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index 770a93ef007..2afd8ccb3ed 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); -DECLSPEC_HIDDEN HMODULE hcpl; +HMODULE hcpl; /********************************************************************* * DllMain (inetcpl.@) diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index 73d9034346d..ff7d7d535d0 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -27,10 +27,10 @@ #include <commctrl.h> extern HMODULE hcpl; -INT_PTR CALLBACK connections_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; -INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; -INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; -INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; +INT_PTR CALLBACK connections_dlgproc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM); #define NUM_PROPERTY_PAGES 8

1 0

Alistair Leslie-Hughes : scrrun: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 3969c56ef1e15d28934043b8c6be17cea795e9e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3969c56ef1e15d28934043b8c6be17… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:15:52 2023 +1000 scrrun: Remove DECLSPEC_HIDDEN usage. --- dlls/scrrun/scrrun_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 5083d30a8ea..a186da63f61 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -18,8 +18,8 @@ #ifndef _SCRRUN_PRIVATE_H_ #define _SCRRUN_PRIVATE_H_ -extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); typedef enum tid_t { @@ -36,7 +36,7 @@ typedef enum tid_t LAST_tid } tid_t; -HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo); struct provideclassinfo { IProvideClassInfo IProvideClassInfo_iface; @@ -44,6 +44,6 @@ struct provideclassinfo { const GUID *guid; }; -extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; +extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo); #endif

1 0

Alistair Leslie-Hughes : wldap32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: b97a22fb1c33e3ffac634abc793d90714502bea7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b97a22fb1c33e3ffac634abc793d90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:15:52 2023 +1000 wldap32: Remove DECLSPEC_HIDDEN usage. --- dlls/wldap32/error.c | 2 +- dlls/wldap32/winldap_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index c8897165d1d..ab6bb140843 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); -extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; +extern HINSTANCE hwldap32; ULONG map_error( int error ) { diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index e31dcbb6207..e834f9d4e6f 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -560,7 +560,7 @@ struct WLDAP32_berval ** CDECL ldap_get_values_lenA( LDAP *, LDAPMessage *, struct WLDAP32_berval ** CDECL ldap_get_values_lenW( LDAP *, LDAPMessage *, WCHAR * ) __WINE_DEALLOC(WLDAP32_ldap_value_free_len); -ULONG map_error( int ) DECLSPEC_HIDDEN; +ULONG map_error( int ); static inline char *strWtoU( const WCHAR *str ) {

1 0

Alistair Leslie-Hughes : wuapi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 30c67775f0c8978cc01a897889ccac4f6ac465a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/30c67775f0c8978cc01a897889ccac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:15:52 2023 +1000 wuapi: Remove DECLSPEC_HIDDEN usage. --- dlls/wuapi/wuapi_private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wuapi/wuapi_private.h b/dlls/wuapi/wuapi_private.h index 62b6dec521f..1c350032e5a 100644 --- a/dlls/wuapi/wuapi_private.h +++ b/dlls/wuapi/wuapi_private.h @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -extern HRESULT AutomaticUpdates_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateSession_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateSearcher_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateDownloader_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateInstaller_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT SystemInformation_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT AutomaticUpdates_create( LPVOID *ppObj ); +extern HRESULT UpdateSession_create( LPVOID *ppObj ); +extern HRESULT UpdateSearcher_create( LPVOID *ppObj ); +extern HRESULT UpdateDownloader_create( LPVOID *ppObj ); +extern HRESULT UpdateInstaller_create( LPVOID *ppObj ); +extern HRESULT SystemInformation_create( LPVOID *ppObj );

1 0

Alistair Leslie-Hughes : wiaservc: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 4b296f0e3e6b9db75c393b41e651ac1387d7c9c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b296f0e3e6b9db75c393b41e651ac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:15:52 2023 +1000 wiaservc: Remove DECLSPEC_HIDDEN usage. --- dlls/wiaservc/wiaservc_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index c8bdbaaa53f..bb241151768 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -26,7 +26,7 @@ typedef struct IClassFactory IClassFactory_iface; } ClassFactoryImpl; -extern ClassFactoryImpl WIASERVC_ClassFactory DECLSPEC_HIDDEN; +extern ClassFactoryImpl WIASERVC_ClassFactory; typedef struct { @@ -34,6 +34,6 @@ typedef struct LONG ref; } wiadevmgr; -HRESULT wiadevmgr_Constructor(IWiaDevMgr **ppObj) DECLSPEC_HIDDEN; +HRESULT wiadevmgr_Constructor(IWiaDevMgr **ppObj); #endif /* __WIASERVC_PRIVATE__ */

1 0

Alistair Leslie-Hughes : msvfw32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 4961e89875131cee32f78088469621140a3a31b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/4961e89875131cee32f78088469621… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:15:52 2023 +1000 msvfw32: Remove DECLSPEC_HIDDEN usage. --- dlls/msvfw32/msvideo_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/msvideo_private.h b/dlls/msvfw32/msvideo_private.h index 4ca97806e44..8bce5cd77a5 100644 --- a/dlls/msvfw32/msvideo_private.h +++ b/dlls/msvfw32/msvideo_private.h @@ -44,7 +44,7 @@ typedef struct tagWINE_HIC { struct tagWINE_HIC* next; } WINE_HIC; -extern HMODULE MSVFW32_hModule DECLSPEC_HIDDEN; +extern HMODULE MSVFW32_hModule; #define IDC_CONFIGURE 882 #define IDC_ABOUT 883

1 0

Jeff Smith : windowscodecs: Handle PNG last-modification time (tIME) chunk type.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 432d8229ecad639d9a327986db6989c765e3f367 URL: https://gitlab.winehq.org/wine/wine/-/commit/432d8229ecad639d9a327986db6989… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 23 19:41:14 2023 -0500 windowscodecs: Handle PNG last-modification time (tIME) chunk type. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/pngformat.c | 86 +++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 25 ++++++++ dlls/windowscodecs/tests/metadata.c | 61 ++++++++++++++++--- dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 +++ 6 files changed, 173 insertions(+), 8 deletions(-)

1 0

Jeff Smith : windowscodecs/tests: Move compare_metadata function so it can be used earlier.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 60f6539f4387bdeffdde69a125efd074dbb3ec7c URL: https://gitlab.winehq.org/wine/wine/-/commit/60f6539f4387bdeffdde69a125efd0… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 23 17:45:07 2023 -0500 windowscodecs/tests: Move compare_metadata function so it can be used earlier. --- dlls/windowscodecs/tests/metadata.c | 224 ++++++++++++++++++------------------ 1 file changed, 112 insertions(+), 112 deletions(-)

1 0

Rémi Bernon : winegstreamer: Keep default decodebin queue limits.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 28fe6207e909178c588f111645157c88a6ad7014 URL: https://gitlab.winehq.org/wine/wine/-/commit/28fe6207e909178c588f111645157c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 15 19:12:54 2022 +0200 winegstreamer: Keep default decodebin queue limits. --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/main.c | 5 ++--- dlls/winegstreamer/media_source.c | 8 +------- dlls/winegstreamer/quartz_parser.c | 2 +- dlls/winegstreamer/unixlib.h | 1 - dlls/winegstreamer/wg_parser.c | 10 ---------- dlls/winegstreamer/wm_reader.c | 2 +- 7 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index e32fa46a117..920ffc9d252 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -69,7 +69,7 @@ HRESULT wg_sample_queue_create(struct wg_sample_queue **out); void wg_sample_queue_destroy(struct wg_sample_queue *queue); void wg_sample_queue_flush(struct wg_sample_queue *queue, bool all); -wg_parser_t wg_parser_create(enum wg_parser_type type, bool unlimited_buffering); +wg_parser_t wg_parser_create(enum wg_parser_type type); void wg_parser_destroy(wg_parser_t parser); HRESULT wg_parser_connect(wg_parser_t parser, uint64_t file_size); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index b651b45be69..a92d440c42f 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -66,17 +66,16 @@ bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) return TRUE; } -wg_parser_t wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) +wg_parser_t wg_parser_create(enum wg_parser_type type) { struct wg_parser_create_params params = { .type = type, - .unlimited_buffering = unlimited_buffering, .err_on = ERR_ON(quartz), .warn_on = WARN_ON(quartz), }; - TRACE("type %#x, unlimited_buffering %d.\n", type, unlimited_buffering); + TRACE("type %#x.\n", type); if (WINE_UNIX_CALL(unix_wg_parser_create, &params)) return 0; diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e1e64fc7f98..7b0857158ae 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1643,13 +1643,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue))) goto fail; - /* In Media Foundation, sources may read from any media source stream - * without fear of blocking due to buffering limits on another. Trailmakers, - * a Unity3D Engine game, only reads one sample from the audio stream (and - * never deselects it). Remove buffering limits from decodebin in order to - * account for this. Note that this does leak memory, but the same memory - * leak occurs with native. */ - if (!(parser = wg_parser_create(WG_PARSER_DECODEBIN, true))) + if (!(parser = wg_parser_create(WG_PARSER_DECODEBIN))) { hr = E_OUTOFMEMORY; goto fail; diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 734e2e48e1f..f9d8d79b259 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1451,7 +1451,7 @@ static HRESULT parser_create(enum wg_parser_type type, struct parser **parser) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = wg_parser_create(type, false))) + if (!(object->wg_parser = wg_parser_create(type))) { free(object); return E_OUTOFMEMORY; diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 66c363b5b6e..702bd7aa69b 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -212,7 +212,6 @@ struct wg_parser_create_params { wg_parser_t parser; wg_parser_type type; - UINT8 unlimited_buffering; UINT8 err_on; UINT8 warn_on; }; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 9c020cbf055..298c05c6b88 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -93,8 +93,6 @@ struct wg_parser bool sink_connected; - bool unlimited_buffering; - gchar *sink_caps; struct input_cache_chunk input_cache_chunks[4]; @@ -1771,13 +1769,6 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) gst_bin_add(GST_BIN(parser->container), element); parser->decodebin = element; - if (parser->unlimited_buffering) - { - g_object_set(parser->decodebin, "max-size-buffers", G_MAXUINT, NULL); - g_object_set(parser->decodebin, "max-size-time", G_MAXUINT64, NULL); - g_object_set(parser->decodebin, "max-size-bytes", G_MAXUINT, NULL); - } - g_signal_connect(element, "pad-added", G_CALLBACK(pad_added_cb), parser); g_signal_connect(element, "pad-removed", G_CALLBACK(pad_removed_cb), parser); g_signal_connect(element, "autoplug-continue", G_CALLBACK(autoplug_continue_cb), parser); @@ -1888,7 +1879,6 @@ static NTSTATUS wg_parser_create(void *args) pthread_cond_init(&parser->read_cond, NULL); pthread_cond_init(&parser->read_done_cond, NULL); parser->init_gst = init_funcs[params->type]; - parser->unlimited_buffering = params->unlimited_buffering; parser->err_on = params->err_on; parser->warn_on = params->warn_on; GST_DEBUG("Created winegstreamer parser %p.", parser); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 0dfe765c759..6440f8dbb60 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1459,7 +1459,7 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) HRESULT hr; WORD i; - if (!(wg_parser = wg_parser_create(WG_PARSER_DECODEBIN, false))) + if (!(wg_parser = wg_parser_create(WG_PARSER_DECODEBIN))) return E_OUTOFMEMORY; reader->wg_parser = wg_parser;

1 0