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

Alistair Leslie-Hughes : avifil32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 65c3ad91d47490e6f489a2d7e9e26d6d0f035531 URL: https://gitlab.winehq.org/wine/wine/-/commit/65c3ad91d47490e6f489a2d7e9e26d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 avifil32: Remove DECLSPEC_HIDDEN usage. --- dlls/avifil32/avifile_private.h | 18 +++++++++--------- dlls/avifil32/extrachunk.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index 4bf11f42a8c..b1c0011e400 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -56,16 +56,16 @@ DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0); DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0); DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0); -extern HMODULE AVIFILE_hModule DECLSPEC_HIDDEN; +extern HMODULE AVIFILE_hModule; -extern HRESULT AVIFILE_CreateAVIFile(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN; -extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; +extern HRESULT AVIFILE_CreateAVIFile(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface); +extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj); +extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj); +extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream); +extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams); -extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; -extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) DECLSPEC_HIDDEN; +extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName); +extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv); #endif diff --git a/dlls/avifil32/extrachunk.h b/dlls/avifil32/extrachunk.h index 5b87d7f44de..d401a39a6a1 100644 --- a/dlls/avifil32/extrachunk.h +++ b/dlls/avifil32/extrachunk.h @@ -35,18 +35,18 @@ typedef struct _EXTRACHUNKS { } EXTRACHUNKS, *LPEXTRACHUNKS; /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size) DECLSPEC_HIDDEN; +HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size); /* writes a chunk into the extrachunk-structure */ -HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size) DECLSPEC_HIDDEN; +HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size); /* reads a chunk from the HMMIO into the extrachunk-structure */ -HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck) DECLSPEC_HIDDEN; +HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck); /* reads all non-junk chunks into the extrachunk-structure until it finds * the given chunk or the optional parent-chunk is at the end */ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio, - MMCKINFO *lpck,MMCKINFO *lpckParent,UINT flags) DECLSPEC_HIDDEN; + MMCKINFO *lpck,MMCKINFO *lpckParent,UINT flags); #ifdef __cplusplus }

1 0

Alistair Leslie-Hughes : evr: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 59718856802d3f41f48cd1ecbe294d4134e70671 URL: https://gitlab.winehq.org/wine/wine/-/commit/59718856802d3f41f48cd1ecbe294d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 evr: Remove DECLSPEC_HIDDEN usage. --- dlls/evr/evr_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 93047b50c94..225e60348b4 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -51,9 +51,9 @@ static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect * return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); } -HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; -HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; -HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; +HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv); +HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv); +HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv); HRESULT create_video_sample_allocator(BOOL lock_notify_release, REFIID riid, void **obj);

1 0

Alistair Leslie-Hughes : hhctrl.ocx: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 23c75adf2d36c73f1853ed2a7c4db6465711b013 URL: https://gitlab.winehq.org/wine/wine/-/commit/23c75adf2d36c73f1853ed2a7c4db6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 hhctrl.ocx: Remove DECLSPEC_HIDDEN usage. --- dlls/hhctrl.ocx/hhctrl.h | 76 ++++++++++++++++++++++++------------------------ dlls/hhctrl.ocx/stream.h | 16 +++++----- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 359b199e141..ebec0eebf30 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -205,42 +205,42 @@ typedef struct { DWORD current_tab; } HHInfo; -BOOL InitWebBrowser(HHInfo*,HWND) DECLSPEC_HIDDEN; -void ReleaseWebBrowser(HHInfo*) DECLSPEC_HIDDEN; -void ResizeWebBrowser(HHInfo*,DWORD,DWORD) DECLSPEC_HIDDEN; -void DoPageAction(WebBrowserContainer*,DWORD) DECLSPEC_HIDDEN; - -void InitContent(HHInfo*) DECLSPEC_HIDDEN; -void ReleaseContent(HHInfo*) DECLSPEC_HIDDEN; -void ActivateContentTopic(HWND,LPCWSTR,ContentItem *) DECLSPEC_HIDDEN; - -void InitIndex(HHInfo*) DECLSPEC_HIDDEN; -void ReleaseIndex(HHInfo*) DECLSPEC_HIDDEN; - -CHMInfo *OpenCHM(LPCWSTR szFile) DECLSPEC_HIDDEN; -BOOL LoadWinTypeFromCHM(HHInfo *info) DECLSPEC_HIDDEN; -CHMInfo *CloseCHM(CHMInfo *pCHMInfo) DECLSPEC_HIDDEN; -void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; -IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN; -LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN; -WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN; - -extern struct list window_list DECLSPEC_HIDDEN; -HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND) DECLSPEC_HIDDEN; -void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; -BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; -BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; -void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL) DECLSPEC_HIDDEN; -void UpdateHelpWindow(HHInfo *info) DECLSPEC_HIDDEN; - -void InitSearch(HHInfo *info, const char *needle) DECLSPEC_HIDDEN; -void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN; - -LPCWSTR skip_schema(LPCWSTR url) DECLSPEC_HIDDEN; -void wintype_stringsA_free(struct wintype_stringsA *stringsA) DECLSPEC_HIDDEN; -void wintype_stringsW_free(struct wintype_stringsW *stringsW) DECLSPEC_HIDDEN; -WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page) DECLSPEC_HIDDEN; -HHInfo *find_window(const WCHAR *window) DECLSPEC_HIDDEN; +BOOL InitWebBrowser(HHInfo*,HWND); +void ReleaseWebBrowser(HHInfo*); +void ResizeWebBrowser(HHInfo*,DWORD,DWORD); +void DoPageAction(WebBrowserContainer*,DWORD); + +void InitContent(HHInfo*); +void ReleaseContent(HHInfo*); +void ActivateContentTopic(HWND,LPCWSTR,ContentItem *); + +void InitIndex(HHInfo*); +void ReleaseIndex(HHInfo*); + +CHMInfo *OpenCHM(LPCWSTR szFile); +BOOL LoadWinTypeFromCHM(HHInfo *info); +CHMInfo *CloseCHM(CHMInfo *pCHMInfo); +void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR); +IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*); +LPWSTR FindContextAlias(CHMInfo*,DWORD); +WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR); + +extern struct list window_list; +HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND); +void ReleaseHelpViewer(HHInfo*); +BOOL NavigateToUrl(HHInfo*,LPCWSTR); +BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR); +void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL); +void UpdateHelpWindow(HHInfo *info); + +void InitSearch(HHInfo *info, const char *needle); +void ReleaseSearch(HHInfo *info); + +LPCWSTR skip_schema(LPCWSTR url); +void wintype_stringsA_free(struct wintype_stringsA *stringsA); +void wintype_stringsW_free(struct wintype_stringsW *stringsW); +WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page); +HHInfo *find_window(const WCHAR *window); /* memory allocation functions */ @@ -287,7 +287,7 @@ static inline LPSTR strdupWtoA(LPCWSTR str) } -extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN; -extern BOOL hh_process DECLSPEC_HIDDEN; +extern HINSTANCE hhctrl_hinstance; +extern BOOL hh_process; #endif diff --git a/dlls/hhctrl.ocx/stream.h b/dlls/hhctrl.ocx/stream.h index 8d61ad54d51..68f105c11a3 100644 --- a/dlls/hhctrl.ocx/stream.h +++ b/dlls/hhctrl.ocx/stream.h @@ -36,13 +36,13 @@ typedef struct { ULONG p; } stream_t; -void strbuf_init(strbuf_t *buf) DECLSPEC_HIDDEN; -void strbuf_zero(strbuf_t *buf) DECLSPEC_HIDDEN; -void strbuf_free(strbuf_t *buf) DECLSPEC_HIDDEN; -void stream_init(stream_t *stream, IStream *str) DECLSPEC_HIDDEN; -void get_node_name(strbuf_t *node, strbuf_t *name) DECLSPEC_HIDDEN; -BOOL next_content(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; -BOOL next_node(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; -const char *get_attr(const char *node, const char *name, int *len) DECLSPEC_HIDDEN; +void strbuf_init(strbuf_t *buf); +void strbuf_zero(strbuf_t *buf); +void strbuf_free(strbuf_t *buf); +void stream_init(stream_t *stream, IStream *str); +void get_node_name(strbuf_t *node, strbuf_t *name); +BOOL next_content(stream_t *stream, strbuf_t *buf); +BOOL next_node(stream_t *stream, strbuf_t *buf); +const char *get_attr(const char *node, const char *name, int *len); #endif

1 0

Alistair Leslie-Hughes : dxdiagn: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 92d7b284e0a0cf2df45f31b52b5e90285fe18a14 URL: https://gitlab.winehq.org/wine/wine/-/commit/92d7b284e0a0cf2df45f31b52b5e90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 dxdiagn: Remove DECLSPEC_HIDDEN usage. --- dlls/dxdiagn/dxdiag_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 7c32a8518a5..5f4b7c28fd0 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -70,18 +70,18 @@ struct IDxDiagContainerImpl { /** * factories */ -extern HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); /** internal factory */ -extern HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, IDxDiagContainerImpl_Container *cont, IDxDiagProvider *pProv, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, IDxDiagContainerImpl_Container *cont, IDxDiagProvider *pProv, LPVOID *ppobj); /********************************************************************** * Dll lifetime tracking declaration for dxdiagn.dll */ -extern LONG DXDIAGN_refCount DECLSPEC_HIDDEN; +extern LONG DXDIAGN_refCount; static inline void DXDIAGN_LockModule(void) { InterlockedIncrement( &DXDIAGN_refCount ); } static inline void DXDIAGN_UnlockModule(void) { InterlockedDecrement( &DXDIAGN_refCount ); } -extern HINSTANCE dxdiagn_instance DECLSPEC_HIDDEN; +extern HINSTANCE dxdiagn_instance; #endif

1 0

Alistair Leslie-Hughes : netcfgx: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 6b4921520373eda331828e90a6bad80ec4c38876 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b4921520373eda331828e90a6bad8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 netcfgx: Remove DECLSPEC_HIDDEN usage. --- dlls/netcfgx/netcfg_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netcfgx/netcfg_private.h b/dlls/netcfgx/netcfg_private.h index 14c5111168d..a43dd881632 100644 --- a/dlls/netcfgx/netcfg_private.h +++ b/dlls/netcfgx/netcfg_private.h @@ -18,6 +18,6 @@ #ifndef __NETCFG_PRIVATE_H__ #define __NETCFG_PRIVATE_H__ -extern HRESULT INetCfg_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDEN; +extern HRESULT INetCfg_CreateInstance(IUnknown **ppUnk); #endif

1 0

Alistair Leslie-Hughes : schedsvc: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: dd6515c9ba04bca5a93336fb619729909adfadf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd6515c9ba04bca5a93336fb619729… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:07 2023 +1000 schedsvc: Remove DECLSPEC_HIDDEN usage. --- dlls/schedsvc/schedsvc_private.h | 20 ++++++++++---------- dlls/schedsvc/tests/atsvcapi.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 224b4c1b398..fae5d2b376a 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -19,15 +19,15 @@ #ifndef __WINE_SCHEDSVC_PRIVATE_H__ #define __WINE_SCHEDSVC_PRIVATE_H__ -void schedsvc_auto_start(void) DECLSPEC_HIDDEN; -void add_job(const WCHAR *name) DECLSPEC_HIDDEN; -void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; -void check_task_state(void) DECLSPEC_HIDDEN; -void add_process_to_queue(HANDLE hproc) DECLSPEC_HIDDEN; -void update_process_status(DWORD pid) DECLSPEC_HIDDEN; -BOOL get_next_runtime(LARGE_INTEGER *rt) DECLSPEC_HIDDEN; -void check_task_time(void) DECLSPEC_HIDDEN; -void load_at_tasks(void) DECLSPEC_HIDDEN; -void check_missed_task_time(void) DECLSPEC_HIDDEN; +void schedsvc_auto_start(void); +void add_job(const WCHAR *name); +void remove_job(const WCHAR *name); +void check_task_state(void); +void add_process_to_queue(HANDLE hproc); +void update_process_status(DWORD pid); +BOOL get_next_runtime(LARGE_INTEGER *rt); +void check_task_time(void); +void load_at_tasks(void); +void check_missed_task_time(void); #endif /* __WINE_SCHEDSVC_PRIVATE_H__ */ diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index fb70c346654..4903c9d9417 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -177,7 +177,7 @@ skip_tests: ok(hr == RPC_S_OK, "RpcBindingFree error %#lx\n", hr); } -DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) +handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) { static unsigned char ncalrpc[] = "ncalrpc"; unsigned char *binding_str; @@ -194,7 +194,7 @@ DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) return rpc_handle; } -DECLSPEC_HIDDEN void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) +void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) { RpcBindingFree(&rpc_handle); }

1 0

Rémi Bernon : winegstreamer: Don't append videoconvert for video/x-wmv output.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 61d9065315fba14436bb1caf72cb09f029ffb1de URL: https://gitlab.winehq.org/wine/wine/-/commit/61d9065315fba14436bb1caf72cb09… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 6 18:39:41 2023 +0200 winegstreamer: Don't append videoconvert for video/x-wmv output. --- dlls/winegstreamer/wg_transform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 775fed7a46c..25dfb62b08c 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -401,7 +401,6 @@ NTSTATUS wg_transform_create(void *args) break; case WG_MAJOR_TYPE_VIDEO: - case WG_MAJOR_TYPE_VIDEO_WMV: if (!(element = create_element("videoconvert", "base")) || !append_element(transform->container, element, &first, &last)) goto out; @@ -418,13 +417,14 @@ NTSTATUS wg_transform_create(void *args) gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); break; + case WG_MAJOR_TYPE_UNKNOWN: case WG_MAJOR_TYPE_AUDIO_MPEG1: case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: - case WG_MAJOR_TYPE_UNKNOWN: case WG_MAJOR_TYPE_VIDEO_INDEO: + case WG_MAJOR_TYPE_VIDEO_WMV: GST_FIXME("Format %u not implemented!", output_format.major_type); goto out; }

1 0

Daniel Lehman : include: Add [_w]getenv_s.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 8fb70648d13875eefb07ae26c53bdb7bd2db8141 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fb70648d13875eefb07ae26c53bdb… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Aug 21 22:32:06 2023 -0700 include: Add [_w]getenv_s. --- include/msvcrt/corecrt_wstdlib.h | 11 +++++++++++ include/msvcrt/stdlib.h | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/msvcrt/corecrt_wstdlib.h b/include/msvcrt/corecrt_wstdlib.h index eef1fa26e0b..e37da1848ac 100644 --- a/include/msvcrt/corecrt_wstdlib.h +++ b/include/msvcrt/corecrt_wstdlib.h @@ -24,6 +24,7 @@ _ACRTIMP wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); _ACRTIMP errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); _ACRTIMP wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); _ACRTIMP wchar_t* __cdecl _wgetenv(const wchar_t*); +_ACRTIMP errno_t __cdecl _wgetenv_s(size_t *,wchar_t *,size_t,const wchar_t *); _ACRTIMP void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); _ACRTIMP int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); _ACRTIMP void __cdecl _wperror(const wchar_t*); @@ -63,6 +64,16 @@ _ACRTIMP unsigned __int64 __cdecl wcstoull(const wchar_t*,wchar_t**,int); _ACRTIMP unsigned __int64 __cdecl _wcstoull_l(const wchar_t*,wchar_t**,int,_locale_t); #ifdef __cplusplus +extern "C++" { + +template <size_t size> +inline errno_t _wgetenv_s(size_t *ret, wchar_t (&buf)[size], const wchar_t *var) +{ + return _wgetenv_s(ret, buf, size, var); +} + +} /* extern "C++" */ + } #endif diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index e7dd2caefc4..b7ced413440 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -216,6 +216,7 @@ _ACRTIMP ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); _ACRTIMP lldiv_t __cdecl lldiv(__int64,__int64); _ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int); _ACRTIMP char* __cdecl getenv(const char*); +_ACRTIMP errno_t __cdecl getenv_s(size_t*,char*,size_t,const char*); _ACRTIMP __msvcrt_long __cdecl labs(__msvcrt_long); _ACRTIMP __int64 __cdecl llabs(__int64); _ACRTIMP int __cdecl mblen(const char*,size_t); @@ -255,6 +256,16 @@ static inline long double strtold(const char *string, char **endptr) { return _s #endif /* _UCRT */ #ifdef __cplusplus +extern "C++" { + +template <size_t size> +inline errno_t getenv_s(size_t *ret, char (&buf)[size], const char *var) +{ + return getenv_s(ret, buf, size, var); +} + +} /* extern "C++" */ + } #endif

1 0

Davide Beatrici : wineoss: Update device cache in get_device_guid().
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: ef1e9aa051e0653064db4f0ae4fda16e3d285268 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef1e9aa051e0653064db4f0ae4fda1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 16:26:54 2023 +0200 wineoss: Update device cache in get_device_guid(). --- dlls/wineoss.drv/mmdevdrv.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 4a45c532dd0..343581ee9e1 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -95,6 +95,18 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } +static void device_add(OSSDevice *oss_dev) +{ + OSSDevice *dev_item; + LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry) + if(IsEqualGUID(&oss_dev->guid, &dev_item->guid)){ /* already in list */ + HeapFree(GetProcessHeap(), 0, oss_dev); + return; + } + + list_add_tail(&g_devices, &oss_dev->entry); +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -135,6 +147,15 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) HKEY key = NULL, dev_key; DWORD type, size = sizeof(*guid); WCHAR key_name[256]; + const unsigned int dev_size = strlen(device) + 1; + OSSDevice *oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); + + if(oss_dev){ + oss_dev->flow = flow; + oss_dev->guid = *guid; + memcpy(oss_dev->devnode, device, dev_size); + device_add(oss_dev); + } if(flow == eCapture) key_name[0] = '1'; @@ -185,18 +206,6 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) return FALSE; } -static void device_add(OSSDevice *oss_dev) -{ - OSSDevice *dev_item; - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry) - if(IsEqualGUID(&oss_dev->guid, &dev_item->guid)){ /* already in list */ - HeapFree(GetProcessHeap(), 0, oss_dev); - return; - } - - list_add_tail(&g_devices, &oss_dev->entry); -} - HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) { @@ -229,23 +238,14 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); char *device = (char *)params.endpoints + params.endpoints[i].device; unsigned int name_size = (wcslen(name) + 1) * sizeof(WCHAR); - unsigned int dev_size = strlen(device) + 1; - OSSDevice *oss_dev; ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size); - oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); - if(!ids[i] || !oss_dev){ - HeapFree(GetProcessHeap(), 0, oss_dev); + if(!ids[i]){ params.result = E_OUTOFMEMORY; goto end; } memcpy(ids[i], name, name_size); get_device_guid(flow, device, guids + i); - - oss_dev->flow = flow; - oss_dev->guid = guids[i]; - memcpy(oss_dev->devnode, device, dev_size); - device_add(oss_dev); } *def_index = params.default_idx;

1 0

Davide Beatrici : winepulse: Open/create driver registry key in get_device_guid().
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 557a6a1ba69a500f2909abeea8fea5d4fbeec3ea URL: https://gitlab.winehq.org/wine/wine/-/commit/557a6a1ba69a500f2909abeea8fea5… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 16:35:24 2023 +0200 winepulse: Open/create driver registry key in get_device_guid(). --- dlls/winepulse.drv/mmdevdrv.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index f7de3296567..3eb95fa1f18 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -103,19 +103,22 @@ static void pulse_call(enum unix_funcs code, void *params) assert(!status); } -static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name, GUID *guid) +static void get_device_guid(EDataFlow flow, const char *pulse_name, GUID *guid) { WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; DWORD type, size = sizeof(*guid); LSTATUS status; - HKEY dev_key; + HKEY drv_key, dev_key; if (!pulse_name[0]) { *guid = (flow == eRender) ? pulse_render_guid : pulse_capture_guid; return; } - if (!drv_key) { + status = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, + KEY_WRITE | KEY_WOW64_64KEY, NULL, &drv_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open devices registry key: %lu\n", status); CoCreateGuid(guid); return; } @@ -128,6 +131,7 @@ static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name NULL, &dev_key, NULL); if (status != ERROR_SUCCESS) { ERR("Failed to open registry key for device %s: %lu\n", pulse_name, status); + RegCloseKey(drv_key); CoCreateGuid(guid); return; } @@ -140,6 +144,7 @@ static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name ERR("Failed to store device GUID for %s to registry: %lu\n", pulse_name, status); } RegCloseKey(dev_key); + RegCloseKey(drv_key); } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **keys, @@ -149,8 +154,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **ke GUID *guids = NULL; WCHAR **ids = NULL; unsigned int i = 0; - LSTATUS status; - HKEY drv_key; TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); @@ -173,13 +176,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **ke goto end; } - status = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, - KEY_WRITE | KEY_WOW64_64KEY, NULL, &drv_key, NULL); - if (status != ERROR_SUCCESS) { - ERR("Failed to open devices registry key: %lu\n", status); - drv_key = NULL; - } - for (i = 0; i < params.num; i++) { WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); char *pulse_name = (char *)params.endpoints + params.endpoints[i].device; @@ -190,10 +186,8 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **ke break; } memcpy(ids[i], name, size); - get_device_guid(drv_key, flow, pulse_name, &guids[i]); + get_device_guid(flow, pulse_name, &guids[i]); } - if (drv_key) - RegCloseKey(drv_key); end: HeapFree(GetProcessHeap(), 0, params.endpoints);

1 0