- Wine-Commits - list.winehq.org

Bartosz Kosiorek : msvcrt: Add _mbsbtype_l implementation.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: c59a856cc03e4e03fe734282da34652d7e1a4c56 URL: https://gitlab.winehq.org/wine/wine/-/commit/c59a856cc03e4e03fe734282da3465… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Nov 2 18:35:20 2023 +0100 msvcrt: Add _mbsbtype_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 65 ++++++++++++++++++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 1 + dlls/ucrtbase/ucrtbase.spec | 4 +-- 9 files changed, 52 insertions(+), 30 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9659cd1f3a2..5996051d5ed 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1096,7 +1096,7 @@ @ extern _mbctype MSVCRT_mbctype @ stub _mblen_l @ cdecl _mbsbtype(str long) -@ stub _mbsbtype_l +@ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) @ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4bab0eddc99..1dacd170343 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1453,7 +1453,7 @@ @ extern _mbctype MSVCRT_mbctype @ stub _mblen_l @ cdecl _mbsbtype(str long) -@ stub _mbsbtype_l +@ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) @ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index e0d87f7f7f1..b0e7c83101c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1464,7 +1464,7 @@ @ extern _mbctype MSVCRT_mbctype @ stub _mblen_l @ cdecl _mbsbtype(str long) -@ stub _mbsbtype_l +@ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) @ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5cc72177a33..68660cd6e87 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -768,7 +768,7 @@ @ extern _mbctype MSVCRT_mbctype @ stub _mblen_l @ cdecl _mbsbtype(str long) -@ stub _mbsbtype_l +@ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) @ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 556ba1fa1a7..5f38afdbdfc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -746,7 +746,7 @@ @ extern _mbctype MSVCRT_mbctype @ stub _mblen_l @ cdecl _mbsbtype(str long) -@ stub _mbsbtype_l +@ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) @ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 23d0bbbaeb8..abb5f574ba1 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2028,34 +2028,55 @@ int CDECL _mbbtype(unsigned char c, int type) } /********************************************************************* - * _mbsbtype (MSVCRT.@) + * _mbsbtype_l (MSVCRT.@) */ -int CDECL _mbsbtype(const unsigned char *str, size_t count) +int CDECL _mbsbtype_l(const unsigned char *str, size_t count, _locale_t locale) { - int lead = 0; - const unsigned char *end = str + count; + int lead = 0; + pthreadmbcinfo mbcinfo; + const unsigned char *end = str + count; - /* Lead bytes can also be trail bytes so we need to analyse the string. - * Also we must return _MBC_ILLEGAL for chars past the end of the string - */ - while (str < end) /* Note: we skip the last byte - will check after the loop */ - { - if (!*str) - return _MBC_ILLEGAL; - lead = get_mbcinfo()->ismbcodepage && !lead && _ismbblead(*str); - str++; - } + if (!MSVCRT_CHECK_PMT(str)) + return _MBC_ILLEGAL; - if (lead) - if (_ismbbtrail(*str)) - return _MBC_TRAIL; + if (locale) + mbcinfo = locale->mbcinfo; else - return _MBC_ILLEGAL; - else - if (_ismbblead(*str)) - return _MBC_LEAD; + mbcinfo = get_mbcinfo(); + + /* Lead bytes can also be trail bytes so we need to analyse the string. + * Also we must return _MBC_ILLEGAL for chars past the end of the string + */ + while (str < end) /* Note: we skip the last byte - will check after the loop */ + { + if (!*str) + return _MBC_ILLEGAL; + lead = mbcinfo->ismbcodepage && !lead && _ismbblead_l(*str, locale); + str++; + } + + if (lead) + { + if (_ismbbtrail_l(*str, locale)) + return _MBC_TRAIL; + else + return _MBC_ILLEGAL; + } else - return _MBC_SINGLE; + { + if (_ismbblead_l(*str, locale)) + return _MBC_LEAD; + else + return _MBC_SINGLE; + } +} + +/********************************************************************* + * _mbsbtype (MSVCRT.@) + */ +int CDECL _mbsbtype(const unsigned char *str, size_t count) +{ + return _mbsbtype_l(str, count, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e5e938959b8..7d7c81f72dd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -713,7 +713,7 @@ @ extern _mbctype MSVCRT_mbctype # stub _mblen_l(str long ptr) @ cdecl _mbsbtype(str long) -# stub _mbsbtype_l(str long ptr) +@ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat(str str) @ cdecl _mbscat_s(ptr long str) @ cdecl _mbscat_s_l(ptr long str ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index cdc19736832..2e95653c475 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -335,6 +335,7 @@ static void test_mbcp(void) expect_eq(_ismbstrail(mbsonlylead, &mbsonlylead[5]), FALSE, int, "%d"); /* _mbsbtype */ + expect_eq(_mbsbtype(NULL, 0), _MBC_ILLEGAL, int, "%d"); expect_eq(_mbsbtype(mbstring, 0), _MBC_LEAD, int, "%d"); expect_eq(_mbsbtype(mbstring, 1), _MBC_TRAIL, int, "%d"); expect_eq(_mbsbtype(mbstring, 2), _MBC_LEAD, int, "%d"); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 33c66e2f0b3..995237dcc5c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -611,7 +611,7 @@ @ cdecl _mbctoupper_l(long ptr) @ stub _mblen_l @ cdecl _mbsbtype(str long) -@ stub _mbsbtype_l +@ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) @ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @@ -1181,7 +1181,7 @@ @ cdecl _o__mbctoupper_l(long ptr) _mbctoupper_l @ stub _o__mblen_l @ cdecl _o__mbsbtype(str long) _mbsbtype -@ stub _o__mbsbtype_l +@ cdecl _o__mbsbtype_l(str long ptr) _mbsbtype_l @ cdecl _o__mbscat_s(ptr long str) _mbscat_s @ cdecl _o__mbscat_s_l(ptr long str ptr) _mbscat_s_l @ cdecl _o__mbschr(str long) _mbschr

1 0

Alexandre Julliard : include: Use proper dllimports for winmm functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: a74b1f004328a01d77e37ef76202c494ed98229b URL: https://gitlab.winehq.org/wine/wine/-/commit/a74b1f004328a01d77e37ef76202c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:19:01 2023 +0100 include: Use proper dllimports for winmm functions. --- dlls/winmm/Makefile.in | 1 + include/mmsystem.h | 392 ++++++++++++++++++++++++------------------------- 2 files changed, 195 insertions(+), 198 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for mimeole functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 5bd771d5dcedfe838de45052401e3b1260b7b51f URL: https://gitlab.winehq.org/wine/wine/-/commit/5bd771d5dcedfe838de45052401e3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:17:49 2023 +0100 include: Use proper dllimports for mimeole functions. --- dlls/inetcomm/Makefile.in | 1 + include/mimeole.idl | 180 ++++++++++++++++++++++++---------------------- 2 files changed, 95 insertions(+), 86 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for url functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: a36d747bfdb3b771d559c0e9b28d75311a1821be URL: https://gitlab.winehq.org/wine/wine/-/commit/a36d747bfdb3b771d559c0e9b28d75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:15:05 2023 +0100 include: Use proper dllimports for url functions. --- dlls/url/Makefile.in | 1 + include/intshcut.h | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in index 42bea8c95e3..8cfc7f5800a 100644 --- a/dlls/url/Makefile.in +++ b/dlls/url/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_INTSHCUT_ MODULE = url.dll IMPORTLIB = url IMPORTS = shell32 shlwapi diff --git a/include/intshcut.h b/include/intshcut.h index 842a9c07684..870386a3e09 100644 --- a/include/intshcut.h +++ b/include/intshcut.h @@ -21,7 +21,11 @@ #include <isguids.h> +#ifdef _INTSHCUT_ #define INTSHCUTAPI +#else +#define INTSHCUTAPI DECLSPEC_IMPORT +#endif #ifdef __cplusplus extern "C" { @@ -101,11 +105,10 @@ typedef enum translateurl_in_flags { TRANSLATEURL_FL_USE_DEFAULT_PROTOCOL } TRANSLATEURL_IN_FLAGS; -HRESULT WINAPI TranslateURLA(LPCSTR, DWORD, LPSTR *); -HRESULT WINAPI TranslateURLW(LPCWSTR, DWORD, LPWSTR *); +INTSHCUTAPI HRESULT WINAPI TranslateURLA(LPCSTR, DWORD, LPSTR *); +INTSHCUTAPI HRESULT WINAPI TranslateURLW(LPCWSTR, DWORD, LPWSTR *); #define TranslateURL WINELIB_NAME_AW(TranslateURL) - -BOOL WINAPI InetIsOffline(DWORD); +INTSHCUTAPI BOOL WINAPI InetIsOffline(DWORD); #ifdef __cplusplus }

1 0

Alexandre Julliard : include: Use proper dllimports for httpapi functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 18a1d3538c376cd21ed1caf5bc89154f50931456 URL: https://gitlab.winehq.org/wine/wine/-/commit/18a1d3538c376cd21ed1caf5bc8915… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:11:56 2023 +0100 include: Use proper dllimports for httpapi functions. --- dlls/httpapi/httpapi_main.c | 1 + include/http.h | 48 ++++++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index b808b627174..b320e1c1195 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define HTTPAPI_LINKAGE #include "wine/http.h" #include "winsvc.h" #include "winternl.h" diff --git a/include/http.h b/include/http.h index 3ab57f70bf0..ce2a1b0588c 100644 --- a/include/http.h +++ b/include/http.h @@ -28,6 +28,10 @@ extern "C" { #endif +#ifndef HTTPAPI_LINKAGE +#define HTTPAPI_LINKAGE DECLSPEC_IMPORT +#endif + typedef struct _HTTPAPI_VERSION { USHORT HttpApiMajorVersion; @@ -462,28 +466,28 @@ typedef struct _HTTP_QOS_SETTING_INFO void *QosSetting; } HTTP_QOS_SETTING_INFO, *PHTTP_QOS_SETTING_INFO; -ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); -ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved); -ULONG WINAPI HttpCloseRequestQueue(HANDLE handle); -ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); -ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id); -ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); -ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle); -ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); -ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, ULONG reserved); -ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); -ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved); -ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); -ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); -ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); -ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); -ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); -ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); -ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); -ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2); -ULONG WINAPI HttpSetServerSessionProperty(HTTP_SERVER_SESSION_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG size); -ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); -ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length); +HTTPAPI_LINKAGE ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); +HTTPAPI_LINKAGE ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved); +HTTPAPI_LINKAGE ULONG WINAPI HttpCloseRequestQueue(HANDLE handle); +HTTPAPI_LINKAGE ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); +HTTPAPI_LINKAGE ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id); +HTTPAPI_LINKAGE ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); +HTTPAPI_LINKAGE ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle); +HTTPAPI_LINKAGE ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); +HTTPAPI_LINKAGE ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, ULONG reserved); +HTTPAPI_LINKAGE ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); +HTTPAPI_LINKAGE ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved); +HTTPAPI_LINKAGE ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); +HTTPAPI_LINKAGE ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); +HTTPAPI_LINKAGE ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +HTTPAPI_LINKAGE ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +HTTPAPI_LINKAGE ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); +HTTPAPI_LINKAGE ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); +HTTPAPI_LINKAGE ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); +HTTPAPI_LINKAGE ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2); +HTTPAPI_LINKAGE ULONG WINAPI HttpSetServerSessionProperty(HTTP_SERVER_SESSION_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG size); +HTTPAPI_LINKAGE ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); +HTTPAPI_LINKAGE ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length); #ifdef __cplusplus }

1 0

Alexandre Julliard : include: Use proper dllimports for eventlog functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 9db1bbf2516b372cdbe2a1b71d9559e950465411 URL: https://gitlab.winehq.org/wine/wine/-/commit/9db1bbf2516b372cdbe2a1b71d9559… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:09:51 2023 +0100 include: Use proper dllimports for eventlog functions. --- dlls/advapi32/eventlog.c | 1 + dlls/sechost/trace.c | 1 + include/evntprov.h | 20 ++++++++++++-------- include/evntrace.h | 46 +++++++++++++++++++++++++++------------------- 4 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index e2e7bb238eb..58db53f5536 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -27,6 +27,7 @@ #include "winerror.h" #include "winternl.h" #include "wmistr.h" +#define _WMI_SOURCE_ #include "evntrace.h" #include "evntprov.h" diff --git a/dlls/sechost/trace.c b/dlls/sechost/trace.c index 7cefcbbb55f..e9914b69d0b 100644 --- a/dlls/sechost/trace.c +++ b/dlls/sechost/trace.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "wmistr.h" +#define _WMI_SOURCE_ #include "evntrace.h" #include "wine/debug.h" diff --git a/include/evntprov.h b/include/evntprov.h index a89c65fd4b0..5448524f492 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -23,6 +23,10 @@ extern "C" { #endif +#ifndef EVNTAPI +#define EVNTAPI DECLSPEC_IMPORT WINAPI +#endif + #define EVENT_LEVEL_MIN 0x00 #define EVENT_LEVEL_MAX 0xff @@ -67,14 +71,14 @@ typedef enum _EVENT_INFO_CLASS MaxEventInfo } EVENT_INFO_CLASS; -BOOLEAN WINAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); -BOOLEAN WINAPI EventProviderEnabled(REGHANDLE, UCHAR, ULONGLONG); -ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); -ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); -ULONG WINAPI EventUnregister(REGHANDLE); -ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); -ULONG WINAPI EventWriteString(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); -ULONG WINAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR); +BOOLEAN EVNTAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); +BOOLEAN EVNTAPI EventProviderEnabled(REGHANDLE, UCHAR, ULONGLONG); +ULONG EVNTAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); +ULONG EVNTAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); +ULONG EVNTAPI EventUnregister(REGHANDLE); +ULONG EVNTAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); +ULONG EVNTAPI EventWriteString(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); +ULONG EVNTAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR); #ifdef __cplusplus } diff --git a/include/evntrace.h b/include/evntrace.h index 89a6e2ebe34..4620d60b031 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -25,6 +25,14 @@ extern "C" { #endif +#ifndef WMIAPI +#ifdef _WMI_SOURCE_ +#define WMIAPI WINAPI +#else +#define WMIAPI DECLSPEC_IMPORT WINAPI +#endif +#endif + #define EVENT_TRACE_CONTROL_QUERY 0 #define EVENT_TRACE_CONTROL_STOP 1 #define EVENT_TRACE_CONTROL_UPDATE 2 @@ -286,33 +294,33 @@ typedef enum _TRACE_QUERY_INFO_CLASS #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0) -ULONG WINAPI CloseTrace(TRACEHANDLE); -ULONG WINAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); -ULONG WINAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG); +ULONG WMIAPI CloseTrace(TRACEHANDLE); +ULONG WMIAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); +ULONG WMIAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG); #define ControlTrace WINELIB_NAME_AW(ControlTrace) -ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); -ULONG WINAPI EnableTraceEx2(TRACEHANDLE,LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,ULONG,PENABLE_TRACE_PARAMETERS); -ULONG WINAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); -ULONG WINAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); +ULONG WMIAPI EnableTraceEx2(TRACEHANDLE,LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,ULONG,PENABLE_TRACE_PARAMETERS); +ULONG WMIAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define FlushTrace WINELIB_NAME_AW(FlushTrace) -ULONG WINAPI GetTraceEnableFlags(TRACEHANDLE); -UCHAR WINAPI GetTraceEnableLevel(TRACEHANDLE); -TRACEHANDLE WINAPI GetTraceLoggerHandle(PVOID); -ULONG WINAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); -ULONG WINAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); +ULONG WMIAPI GetTraceEnableFlags(TRACEHANDLE); +UCHAR WMIAPI GetTraceEnableLevel(TRACEHANDLE); +TRACEHANDLE WMIAPI GetTraceLoggerHandle(PVOID); +ULONG WMIAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); +ULONG WMIAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); #define QueryAllTraces WINELIB_NAME_AW(QueryAllTraces) -ULONG WINAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCSTR,LPCSTR,PTRACEHANDLE); -ULONG WINAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); +ULONG WMIAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCSTR,LPCSTR,PTRACEHANDLE); +ULONG WMIAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); #define RegisterTraceGuids WINELIB_NAME_AW(RegisterTraceGuids) -ULONG WINAPI StartTraceA(PTRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); -ULONG WINAPI StartTraceW(PTRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI StartTraceA(PTRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI StartTraceW(PTRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define StartTrace WINELIB_NAME_AW(StartTrace) -ULONG WINAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); +ULONG WMIAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); ULONG WINAPIV TraceMessage(TRACEHANDLE,ULONG,LPGUID,USHORT,...); #ifdef __ms_va_list -ULONG WINAPI TraceMessageVa(TRACEHANDLE,ULONG,LPGUID,USHORT,__ms_va_list); +ULONG WMIAPI TraceMessageVa(TRACEHANDLE,ULONG,LPGUID,USHORT,__ms_va_list); #endif -ULONG WINAPI UnregisterTraceGuids(TRACEHANDLE); +ULONG WMIAPI UnregisterTraceGuids(TRACEHANDLE); #ifdef __cplusplus }

1 0

Fabian Maurer : msvcrt: Fsetpos resets EOF flag.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 8e56d0feb5f08fef1df8810a79d4da0a63373974 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e56d0feb5f08fef1df8810a79d4da… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 2 02:43:31 2023 +0100 msvcrt: Fsetpos resets EOF flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55856 --- dlls/msvcrt/file.c | 14 +------------- dlls/msvcrt/tests/file.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7cccf96b1c7..3c1d9572585 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4682,19 +4682,7 @@ errno_t CDECL freopen_s(FILE** pFile, */ int CDECL fsetpos(FILE* file, fpos_t *pos) { - int ret; - - _lock_file(file); - msvcrt_flush_buffer(file); - - /* Reset direction of i/o */ - if(file->_flag & _IORW) { - file->_flag &= ~(_IOREAD|_IOWRT); - } - - ret = (_lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; - _unlock_file(file); - return ret; + return _fseeki64(file,*pos,SEEK_SET); } /********************************************************************* diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 71b3e1399f8..75d30648230 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -226,7 +226,50 @@ static void test_fileops( void ) ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); /* feof should be set now */ ok(feof(file), "feof after fread failed\n"); - fclose (file); + clearerr(file); + ok(!feof(file), "feof after clearerr failed\n"); + fclose(file); + + file = fopen("fdopen.tst", "rb"); + ok( file != NULL, "fopen failed\n"); + /* sizeof(buffer) > content of file */ + ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); + /* feof should be set now */ + ok(feof(file), "feof after fread failed\n"); + rewind(file); + ok(!feof(file), "feof after rewind failed\n"); + fclose(file); + + file = fopen("fdopen.tst", "rb"); + ok( file != NULL, "fopen failed\n"); + /* sizeof(buffer) > content of file */ + ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); + /* feof should be set now */ + ok(feof(file), "feof after fread failed\n"); + fseek(file, 0, SEEK_SET); + ok(!feof(file), "feof after fseek failed\n"); + fclose(file); + + file = fopen("fdopen.tst", "rb"); + ok( file != NULL, "fopen failed\n"); + /* sizeof(buffer) > content of file */ + ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); + /* feof should be set now */ + ok(feof(file), "feof after fread failed\n"); + fgetpos(file, &pos); + fsetpos(file, &pos); + ok(!feof(file), "feof after fsetpos failed\n"); + fclose(file); + + file = fopen("fdopen.tst", "rb"); + ok( file != NULL, "fopen failed\n"); + /* sizeof(buffer) > content of file */ + ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); + /* feof should be set now */ + ok(feof(file), "feof after fread failed\n"); + fsetpos(file, &pos); + ok(!feof(file), "feof after fsetpos failed\n"); + fclose(file); unlink ("fdopen.tst"); }

1 0

Alex Henrie : vulkan-1/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: c9ff04c35c04c26c05586eb5968a3d1f338d5a11 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9ff04c35c04c26c05586eb5968a3d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 4 21:00:18 2023 -0700 vulkan-1/tests: Use CRT allocation functions. --- dlls/vulkan-1/tests/vulkan.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index b9a36a55653..e68f4fa94c3 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -17,7 +17,6 @@ */ #include "windows.h" -#include "wine/heap.h" #include "wine/vulkan.h" #include "wine/test.h" @@ -72,7 +71,7 @@ static VkBool32 find_queue_family(VkPhysicalDevice vk_physical_device, uint32_t i, count; vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, NULL); - properties = heap_calloc(count, sizeof(*properties)); + properties = calloc(count, sizeof(*properties)); ok(!!properties, "Failed to allocate memory.\n"); vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, properties); @@ -86,7 +85,7 @@ static VkBool32 find_queue_family(VkPhysicalDevice vk_physical_device, } } - heap_free(properties); + free(properties); return ret; } @@ -184,7 +183,7 @@ static void test_enumerate_physical_device2(void) return; } - vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); ok(!!vk_physical_devices, "Failed to allocate memory.\n"); vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); @@ -225,7 +224,7 @@ static void test_enumerate_physical_device2(void) } } - heap_free(vk_physical_devices); + free(vk_physical_devices); vkDestroyInstance(vk_instance, NULL); } @@ -238,7 +237,7 @@ static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) vkGetPhysicalDeviceProperties(vk_physical_device, &device_properties); vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, NULL); - properties = heap_calloc(count, sizeof(*properties)); + properties = calloc(count, sizeof(*properties)); ok(!!properties, "Failed to allocate memory.\n"); vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, properties); @@ -248,7 +247,7 @@ static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) device_properties.deviceName, i, properties[i].queueFlags, properties[i].queueCount); } - heap_free(properties); + free(properties); } static void test_physical_device_groups(void) @@ -278,7 +277,7 @@ static void test_physical_device_groups(void) ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); ok(count > 0, "Unexpected device group count %u.\n", count); - properties = heap_calloc(count, sizeof(*properties)); + properties = calloc(count, sizeof(*properties)); ok(!!properties, "Failed to allocate memory.\n"); vr = vkEnumeratePhysicalDeviceGroupsKHR(vk_instance, &count, properties); ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); @@ -307,7 +306,7 @@ static void test_physical_device_groups(void) ok(vr == VK_SUCCESS, "Failed to create device, VkResult %d.\n", vr); vkDestroyDevice(vk_device, NULL); - heap_free(properties); + free(properties); vkDestroyInstance(vk_instance, NULL); } @@ -488,10 +487,10 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ vr = vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, surface, &count, NULL); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); ok(count, "Got zero count.\n"); - formats = heap_alloc(sizeof(*formats) * count); + formats = malloc(sizeof(*formats) * count); vr = vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, surface, &count, formats); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); - heap_free(formats); + free(formats); vr = vkGetPhysicalDeviceSurfaceSupportKHR(vk_physical_device, queue_family_index, surface, &bval); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); @@ -503,10 +502,10 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ vr = pvkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical_device, surface, &count, NULL); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); ok(count, "Got zero count.\n"); - modes = heap_alloc(sizeof(*modes) * count); + modes = malloc(sizeof(*modes) * count); vr = pvkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical_device, surface, &count, modes); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); - heap_free(modes); + free(modes); if (pvkGetPhysicalDevicePresentRectanglesKHR) { @@ -902,7 +901,7 @@ static void for_each_device_instance(uint32_t extension_count, const char * cons return; } - vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); ok(!!vk_physical_devices, "Failed to allocate memory.\n"); vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); @@ -915,7 +914,7 @@ static void for_each_device_instance(uint32_t extension_count, const char * cons test_func(vk_physical_devices[i]); } - heap_free(vk_physical_devices); + free(vk_physical_devices); vkDestroyInstance(vk_instance, NULL); }

1 0

Alexandre Julliard : include: Use proper dllimports for cryptdlg functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 175887749f52d1da3cb2f14289ae13314866698c URL: https://gitlab.winehq.org/wine/wine/-/commit/175887749f52d1da3cb2f14289ae13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:03:34 2023 +0100 include: Use proper dllimports for cryptdlg functions. --- dlls/cryptdlg/Makefile.in | 1 + include/cryptdlg.h | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 1b71d6cf10e..7669e79e3f0 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_CRYPTDLG_ MODULE = cryptdlg.dll IMPORTS = cryptui crypt32 wintrust user32 advapi32 diff --git a/include/cryptdlg.h b/include/cryptdlg.h index 47bd9843d59..265f6e140bc 100644 --- a/include/cryptdlg.h +++ b/include/cryptdlg.h @@ -20,6 +20,14 @@ #include <prsht.h> +#ifndef CRYPTDLGAPI +#ifdef _CRYPTDLG_ +#define CRYPTDLGAPI +#else +#define CRYPTDLGAPI DECLSPEC_IMPORT +#endif +#endif + #ifdef __cplusplus extern "C" { #endif @@ -115,8 +123,8 @@ typedef struct tagCSSW #define CERT_SELECT_STRUCT WINELIB_NAME_AW(CERT_SELECT_STRUCT_) -BOOL WINAPI CertSelectCertificateA(PCERT_SELECT_STRUCT_A pCertSelectInfo); -BOOL WINAPI CertSelectCertificateW(PCERT_SELECT_STRUCT_W pCertSelectInfo); +CRYPTDLGAPI BOOL WINAPI CertSelectCertificateA(PCERT_SELECT_STRUCT_A pCertSelectInfo); +CRYPTDLGAPI BOOL WINAPI CertSelectCertificateW(PCERT_SELECT_STRUCT_W pCertSelectInfo); #define CertSelectCertificate WINELIB_NAME_AW(CertSelectCertificate) #define CM_VIEWFLAGS_MASK 0x00ffffff @@ -196,8 +204,8 @@ typedef struct tagCERT_VIEWPROPERTIES_STRUCT_W #define PCERT_VIEWPROPERTIES_STRUCT \ WINELIB_NAME_AW(PCERT_VIEWPROPERTIES_STRUCT_) -BOOL WINAPI CertViewPropertiesA(PCERT_VIEWPROPERTIES_STRUCT_A pCertViewInfo); -BOOL WINAPI CertViewPropertiesW(PCERT_VIEWPROPERTIES_STRUCT_W pCertViewInfo); +CRYPTDLGAPI BOOL WINAPI CertViewPropertiesA(PCERT_VIEWPROPERTIES_STRUCT_A pCertViewInfo); +CRYPTDLGAPI BOOL WINAPI CertViewPropertiesW(PCERT_VIEWPROPERTIES_STRUCT_W pCertViewInfo); #define CertViewProperties WINELIB_NAME_AW(CertViewProperties) #define CERT_FILTER_OP_EXISTS 1 @@ -227,10 +235,8 @@ typedef struct tagCMFLTR DWORD dwCheckingFlags; } CERT_FILTER_DATA; -DWORD WINAPI GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, - DWORD cchBuffer); -DWORD WINAPI GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer, - DWORD cchBuffer); +CRYPTDLGAPI DWORD WINAPI GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, DWORD cchBuffer); +CRYPTDLGAPI DWORD WINAPI GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer, DWORD cchBuffer); #define GetFriendlyNameOfCert WINELIB_NAME_AW(GetFriendlyNameOfCert) #define CERT_CERTIFICATE_ACTION_VERIFY \ @@ -302,7 +308,7 @@ typedef struct _CTL_MODIFY_REQUEST DWORD dwError; } CTL_MODIFY_REQUEST, *PCTL_MODIFY_REQUEST; -HRESULT WINAPI CertModifyCertificatesToTrust(int cCertStore, +CRYPTDLGAPI HRESULT WINAPI CertModifyCertificatesToTrust(int cCertStore, PCTL_MODIFY_REQUEST rgCerts, LPCSTR szPurpose, HWND hwnd, HCERTSTORE hcertstoreTrust);

1 0

Ziqing Hui : winegstreamer: Create parser for muxer stream.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 29a8faf19f9ddc3274150e1bf39a0b154eeebb1e URL: https://gitlab.winehq.org/wine/wine/-/commit/29a8faf19f9ddc3274150e1bf39a0b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Oct 30 09:37:10 2023 +0800 winegstreamer: Create parser for muxer stream. --- dlls/winegstreamer/wg_muxer.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index 793444ad243..64a19a2ff44 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -46,7 +46,8 @@ struct wg_muxer_stream uint32_t id; GstPad *my_src; - GstCaps *my_src_caps; + GstCaps *my_src_caps, *parser_src_caps; + GstElement *parser; struct list entry; }; @@ -76,6 +77,8 @@ static gboolean muxer_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *qu static void stream_free(struct wg_muxer_stream *stream) { + if (stream->parser_src_caps) + gst_caps_unref(stream->parser_src_caps); gst_object_unref(stream->my_src); gst_caps_unref(stream->my_src_caps); free(stream); @@ -200,6 +203,22 @@ NTSTATUS wg_muxer_add_stream(void *args) goto out; gst_pad_set_element_private(stream->my_src, stream); + /* Create parser. */ + if ((stream->parser = find_element(GST_ELEMENT_FACTORY_TYPE_PARSER, stream->my_src_caps, NULL))) + { + GstPad *parser_src; + + if (!gst_bin_add(GST_BIN(muxer->container), stream->parser) + || !link_src_to_element(stream->my_src, stream->parser)) + goto out; + + parser_src = gst_element_get_static_pad(stream->parser, "src"); + stream->parser_src_caps = gst_pad_query_caps(parser_src, NULL); + GST_INFO("Created parser %"GST_PTR_FORMAT" for stream %u %p.", + stream->parser, stream->id, stream); + gst_object_unref(parser_src); + } + /* Add to muxer stream list. */ list_add_tail(&muxer->streams, &stream->entry); @@ -210,6 +229,8 @@ NTSTATUS wg_muxer_add_stream(void *args) return STATUS_SUCCESS; out: + if (stream->parser) + gst_object_unref(stream->parser); if (stream->my_src) gst_object_unref(stream->my_src); if (template)

1 0