November 2023 - Wine-commits

Rémi Bernon : dmime: Send notification messages with DMUS_PMSGF_TOOL_IMMEDIATE.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: 87dba38469cd65c8aca9d8c6e093587641d41e9d URL: https://gitlab.winehq.org/wine/wine/-/commit/87dba38469cd65c8aca9d8c6e09358… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 10:13:17 2023 +0200 dmime: Send notification messages with DMUS_PMSGF_TOOL_IMMEDIATE. Then send them again with DMUS_PMSGF_TOOL_ATTIME for the notification queue. --- dlls/dmime/performance.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 942452d353e..b58a7d9cd18 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -199,7 +199,7 @@ static HRESULT performance_send_notification_pmsg(struct performance *This, MUSI return hr; msg->mtTime = music_time; - msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE; + msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE; msg->dwType = DMUS_PMSGT_NOTIFICATION; if ((msg->punkUser = object)) IUnknown_AddRef(object); msg->guidNotificationType = type; @@ -1230,7 +1230,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = performance_send_notification_pmsg(This, start_time, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_pmsg(This, start_time, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGT_DIRTY, NULL); + hr = performance_send_pmsg(This, start_time, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) hr = segment_state_play(state, iface); @@ -1242,7 +1242,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_pmsg(This, start_time + length, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGT_DIRTY, NULL); + hr = performance_send_pmsg(This, start_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) hr = performance_send_notification_pmsg(This, start_time + length, This->notification_performance, GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED, NULL); @@ -1790,6 +1790,21 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, enabled = This->notification_segment; if (!enabled) return DMUS_S_FREE; + if (msg->dwFlags & DMUS_PMSGF_TOOL_IMMEDIATE) + { + /* re-send the message for queueing at the expected time */ + msg->dwFlags &= ~DMUS_PMSGF_TOOL_IMMEDIATE; + msg->dwFlags |= DMUS_PMSGF_TOOL_ATTIME; + + if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)msg))) + { + ERR("Failed to send notification message, hr %#lx\n", hr); + return DMUS_S_FREE; + } + + return S_OK; + } + list_add_tail(&This->notifications, &message->entry); /* discard old notification messages */

1 0

Rémi Bernon : dmime/tests: Add a track and longer segment to notifications tests.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: a429a3fb4b1e8d5c04accd1e56c30f2138f03cf4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a429a3fb4b1e8d5c04accd1e56c30f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 24 10:09:23 2023 +0200 dmime/tests: Add a track and longer segment to notifications tests. --- dlls/dmime/tests/dmime.c | 105 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 78 insertions(+), 27 deletions(-)

1 0

Rémi Bernon : dmime: Use the current time if PlaySegmentEx start_time is 0.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: 60538c57cd8c6082244cafa3045671b75a26f49a URL: https://gitlab.winehq.org/wine/wine/-/commit/60538c57cd8c6082244cafa3045671… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 24 10:09:23 2023 +0200 dmime: Use the current time if PlaySegmentEx start_time is 0. --- dlls/dmime/performance.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b58a7d9cd18..3fc5df80b58 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1203,8 +1203,8 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, { struct performance *This = impl_from_IDirectMusicPerformance8(iface); IDirectMusicSegmentState *state; + MUSIC_TIME length, music_time; IDirectMusicSegment *segment; - MUSIC_TIME length; HRESULT hr; FIXME("(%p, %p, %s, %p, %#lx, %I64d, %p, %p, %p): stub\n", This, source, debugstr_w(segment_name), @@ -1216,7 +1216,8 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, if (FAILED(hr = IUnknown_QueryInterface(source, &IID_IDirectMusicSegment, (void **)&segment))) return hr; - if (FAILED(hr = segment_state_create(segment, start_time, iface, &state))) + if ((!(music_time = start_time) && FAILED(hr = IDirectMusicPerformance8_GetTime(iface, NULL, &music_time))) + || FAILED(hr = segment_state_create(segment, music_time, iface, &state))) { IDirectMusicSegment_Release(segment); return hr; @@ -1224,27 +1225,27 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = IDirectMusicSegment_GetLength(segment, &length); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, start_time, This->notification_performance, + hr = performance_send_notification_pmsg(This, music_time, This->notification_performance, GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTARTED, NULL); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, start_time, This->notification_segment, + hr = performance_send_notification_pmsg(This, music_time, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_pmsg(This, start_time, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); + hr = performance_send_pmsg(This, music_time, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) hr = segment_state_play(state, iface); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, + hr = performance_send_notification_pmsg(This, music_time + length, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, + hr = performance_send_notification_pmsg(This, music_time + length, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_pmsg(This, start_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); + hr = performance_send_pmsg(This, music_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, start_time + length, This->notification_performance, + hr = performance_send_notification_pmsg(This, music_time + length, This->notification_performance, GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED, NULL); if (SUCCEEDED(hr) && segment_state)

1 0

Rémi Bernon : dmime: Send DMUS_NOTIFICATION_SEGALMOSTEND before DMUS_NOTIFICATION_SEGEND.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: a66b6f96b625f40c62f39a1876dad0673af74a29 URL: https://gitlab.winehq.org/wine/wine/-/commit/a66b6f96b625f40c62f39a1876dad0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 10:04:00 2023 +0200 dmime: Send DMUS_NOTIFICATION_SEGALMOSTEND before DMUS_NOTIFICATION_SEGEND. --- dlls/dmime/performance.c | 6 +++--- dlls/dmime/tests/dmime.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 3fc5df80b58..83c2401c083 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1237,11 +1237,11 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = segment_state_play(state, iface); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, music_time + length, This->notification_segment, - GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, (IUnknown *)state); + hr = performance_send_notification_pmsg(This, music_time + length - 1450, This->notification_segment, + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) hr = performance_send_notification_pmsg(This, music_time + length, This->notification_segment, - GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, (IUnknown *)state); if (SUCCEEDED(hr)) hr = performance_send_pmsg(This, music_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 35a6fbc98f4..dc9e98aab0f 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3019,8 +3019,6 @@ static void check_dmus_notification_pmsg_(int line, DMUS_NOTIFICATION_PMSG *msg, "got dwType %#lx\n", msg->dwType); ok_(__FILE__, line)(IsEqualGUID(&msg->guidNotificationType, type), "got guidNotificationType %s\n", debugstr_guid(&msg->guidNotificationType)); - todo_wine_if(IsEqualGUID(type, &GUID_NOTIFICATION_SEGMENT) && - (option == DMUS_NOTIFICATION_SEGALMOSTEND || option == DMUS_NOTIFICATION_SEGEND)) ok_(__FILE__, line)(msg->dwNotificationOption == option, "got dwNotificationOption %#lx\n", msg->dwNotificationOption); ok_(__FILE__, line)(!msg->dwField1, "got dwField1 %lu\n", msg->dwField1);

1 0

Rémi Bernon : dmime/tests: Check more notification / dirty messages fields.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: b1bd72343e49f68e42b4493055b1f5de9796d335 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1bd72343e49f68e42b4493055b1f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 24 10:09:23 2023 +0200 dmime/tests: Check more notification / dirty messages fields. --- dlls/dmime/tests/dmime.c | 91 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 70 insertions(+), 21 deletions(-)

1 0

Alex Henrie : winecfg: Mention protocol associations.
by Alexandre Julliard 06 Nov '23

06 Nov '23

1 0

Alex Henrie : winegstreamer: Remove unused heap.h include.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: 7129484745852c51b66dcd58fbb4cf6fe29326fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7129484745852c51b66dcd58fbb4cf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 5 23:10:34 2023 -0700 winegstreamer: Remove unused heap.h include. --- dlls/winegstreamer/wma_decoder.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 62c727eae80..d1082fe327a 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -26,7 +26,6 @@ #include "wmcodecdsp.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmadec); WINE_DECLARE_DEBUG_CHANNEL(winediag);

1 0

Alexandre Julliard : include: Use proper dllimports for pathcch functions.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: 526b3cd4367e4c416fd7dff7045e82741a00a52e URL: https://gitlab.winehq.org/wine/wine/-/commit/526b3cd4367e4c416fd7dff7045e82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:21:47 2023 +0100 include: Use proper dllimports for pathcch functions. --- include/pathcch.h | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/include/pathcch.h b/include/pathcch.h index 0c2dc63c41b..72fbe2ad23b 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -26,25 +26,25 @@ #define PATHCCH_MAX_CCH 0x8000 -HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out); -HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out); -HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); -HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); -HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -HRESULT WINAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2); -HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); -HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); -HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); -HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); -HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); -HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); -BOOL WINAPI PathCchIsRoot(const WCHAR *path); -HRESULT WINAPI PathCchRemoveBackslash(WCHAR *path, SIZE_T path_size); -HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size); -HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); -HRESULT WINAPI PathCchRemoveFileSpec(WCHAR *path, SIZE_T size); -HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); -HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); -HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size); -BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server); +WINBASEAPI HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out); +WINBASEAPI HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out); +WINBASEAPI HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); +WINBASEAPI HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); +WINBASEAPI HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +WINBASEAPI HRESULT WINAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2); +WINBASEAPI HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); +WINBASEAPI HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); +WINBASEAPI HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); +WINBASEAPI HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); +WINBASEAPI HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); +WINBASEAPI HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); +WINBASEAPI BOOL WINAPI PathCchIsRoot(const WCHAR *path); +WINBASEAPI HRESULT WINAPI PathCchRemoveBackslash(WCHAR *path, SIZE_T path_size); +WINBASEAPI HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size); +WINBASEAPI HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); +WINBASEAPI HRESULT WINAPI PathCchRemoveFileSpec(WCHAR *path, SIZE_T size); +WINBASEAPI HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +WINBASEAPI HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); +WINBASEAPI HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); +WINBASEAPI HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size); +WINBASEAPI BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server);

1 0

Alexandre Julliard : include: Use proper dllimports for propsys functions.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: f0b2e0d00c86fb04d47467f39e49c587250ffec5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0b2e0d00c86fb04d47467f39e49c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:23:02 2023 +0100 include: Use proper dllimports for propsys functions. --- dlls/propsys/Makefile.in | 1 + include/propsys.idl | 26 ++++++++++------- include/propvarutil.h | 72 +++++++++++++++++++++++++++--------------------- 3 files changed, 58 insertions(+), 41 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index 4a3e77a6ba5..a8661ca17e9 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_PROPSYS_ MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid diff --git a/include/propsys.idl b/include/propsys.idl index fa6902831e0..4df73640f5e 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -27,7 +27,13 @@ import "shtypes.idl"; import "structuredquerycondition.idl"; cpp_quote("#ifndef PSSTDAPI") -cpp_quote("#define PSSTDAPI EXTERN_C DECLSPEC_IMPORT HRESULT STDAPICALLTYPE") +cpp_quote("#ifdef _PROPSYS_") +cpp_quote("#define PSSTDAPI STDAPI") +cpp_quote("#define PSSTDAPI_(type) STDAPI_(type)") +cpp_quote("#else") +cpp_quote("#define PSSTDAPI DECLSPEC_IMPORT STDAPI") +cpp_quote("#define PSSTDAPI_(type) DECLSPEC_IMPORT STDAPI_(type)") +cpp_quote("#endif") cpp_quote("#endif") cpp_quote("#if 0") @@ -799,15 +805,15 @@ cpp_quote("#define PKEY_PIDSTR_MAX 10") cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") -cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") -cpp_quote("HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown*,DWORD,REFIID,void **);") -cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") -cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") -cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") -cpp_quote("HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") -cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") -cpp_quote("HRESULT WINAPI PSRegisterPropertySchema(LPCWSTR);") -cpp_quote("HRESULT WINAPI PSUnregisterPropertySchema(LPCWSTR);") +cpp_quote("PSSTDAPI PSCreateMemoryPropertyStore(REFIID,void **);") +cpp_quote("PSSTDAPI PSCreatePropertyStoreFromObject(IUnknown*,DWORD,REFIID,void **);") +cpp_quote("PSSTDAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") +cpp_quote("PSSTDAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") +cpp_quote("PSSTDAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") +cpp_quote("PSSTDAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") +cpp_quote("PSSTDAPI PSRefreshPropertySchema(void);") +cpp_quote("PSSTDAPI PSRegisterPropertySchema(LPCWSTR);") +cpp_quote("PSSTDAPI PSUnregisterPropertySchema(LPCWSTR);") /* TODO: Add remainder of the C api here */ diff --git a/include/propvarutil.h b/include/propvarutil.h index 026304e3f15..8bbe0c8fd15 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -27,6 +27,16 @@ typedef LONG NTSTATUS; #endif +#ifndef PSSTDAPI +#ifdef _PROPSYS_ +#define PSSTDAPI STDAPI +#define PSSTDAPI_(type) STDAPI_(type) +#else +#define PSSTDAPI DECLSPEC_IMPORT STDAPI +#define PSSTDAPI_(type) DECLSPEC_IMPORT STDAPI_(type) +#endif +#endif + #ifdef __cplusplus extern "C" { #endif @@ -68,37 +78,37 @@ enum tagPROPVAR_COMPARE_FLAGS typedef int PROPVAR_COMPARE_FLAGS; -HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, +PSSTDAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); -HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); -HRESULT WINAPI InitVariantFromFileTime(const FILETIME *ft, VARIANT *var); -HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); -HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); -HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar); -HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); -HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); -HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); -INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, +PSSTDAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); +PSSTDAPI InitVariantFromFileTime(const FILETIME *ft, VARIANT *var); +PSSTDAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); +PSSTDAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); +PSSTDAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar); +PSSTDAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); +PSSTDAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); +PSSTDAPI VariantToGUID(const VARIANT *pvar, GUID *guid); +PSSTDAPI_(INT) PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); -HRESULT WINAPI InitPropVariantFromFileTime(const FILETIME *pftIn, PROPVARIANT *ppropvar); -HRESULT WINAPI InitPropVariantFromStringVector(PCWSTR *strs, ULONG count, PROPVARIANT *ppropvar); - -HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); -HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret); -HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret); -HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret); -HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); -HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); -ULONG WINAPI PropVariantToUInt32WithDefault(REFPROPVARIANT propvarIn, ULONG uLDefault); -HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); -HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); -HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); -HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); -PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); -PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); -HRESULT WINAPI VariantToString(REFVARIANT var, PWSTR ret, UINT cch); - -HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); +PSSTDAPI InitPropVariantFromFileTime(const FILETIME *pftIn, PROPVARIANT *ppropvar); +PSSTDAPI InitPropVariantFromStringVector(PCWSTR *strs, ULONG count, PROPVARIANT *ppropvar); + +PSSTDAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); +PSSTDAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret); +PSSTDAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret); +PSSTDAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret); +PSSTDAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); +PSSTDAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); +PSSTDAPI_(ULONG) PropVariantToUInt32WithDefault(REFPROPVARIANT propvarIn, ULONG uLDefault); +PSSTDAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); +PSSTDAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +PSSTDAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); +PSSTDAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); +PSSTDAPI_(PCWSTR) PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PSSTDAPI_(PCWSTR) VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); +PSSTDAPI VariantToString(REFVARIANT var, PWSTR ret, UINT cch); + +PSSTDAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); #ifdef __cplusplus @@ -208,8 +218,8 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -HRESULT WINAPI StgSerializePropVariant(const PROPVARIANT *ppropvar, SERIALIZEDPROPERTYVALUE **ppprop, ULONG *pcb); -HRESULT WINAPI StgDeserializePropVariant(const SERIALIZEDPROPERTYVALUE *pprop, ULONG cbmax, PROPVARIANT *ppropvar); +PSSTDAPI StgSerializePropVariant(const PROPVARIANT *ppropvar, SERIALIZEDPROPERTYVALUE **ppprop, ULONG *pcb); +PSSTDAPI StgDeserializePropVariant(const SERIALIZEDPROPERTYVALUE *pprop, ULONG cbmax, PROPVARIANT *ppropvar); #ifdef __cplusplus }

1 0

Brendan Shanks : ntdll/unix: Replace some malloc/sprintf calls with asprintf.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: cd763004a6b159f77534e6e1d5e1dde255ac06a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd763004a6b159f77534e6e1d5e1dd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Nov 2 15:23:45 2023 -0700 ntdll/unix: Replace some malloc/sprintf calls with asprintf. --- dlls/ntdll/unix/env.c | 10 +++------- dlls/ntdll/unix/file.c | 14 ++++---------- dlls/ntdll/unix/loader.c | 21 +++++++++------------ dlls/ntdll/unix/server.c | 30 +++++++++++++----------------- 4 files changed, 29 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f845d2372e1..ec908a5389f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -108,8 +108,7 @@ static char *get_nls_file_path( UINT type, UINT id ) break; } if (!name) return NULL; - if (!(path = malloc( strlen(dir) + strlen(name) + 10 ))) return NULL; - sprintf( path, "%s/nls/%s.nls", dir, name ); + if (asprintf( &path, "%s/nls/%s.nls", dir, name ) == -1) return NULL; return path; } @@ -121,8 +120,7 @@ static void *read_nls_file( const char *name ) void *data, *ret = NULL; int fd; - if (!(path = malloc( strlen(dir) + strlen(name) + 10 ))) return NULL; - sprintf( path, "%s/nls/%s", dir, name ); + if (asprintf( &path, "%s/nls/%s", dir, name ) == -1) return NULL; if ((fd = open( path, O_RDONLY )) != -1) { @@ -2238,9 +2236,7 @@ NTSTATUS WINAPI NtInitializeNlsFiles( void **ptr, LCID *lcid, LARGE_INTEGER *siz SIZE_T mapsize; NTSTATUS status; - if (!(path = malloc( strlen(dir) + sizeof("/nls/locale.nls") ))) return STATUS_NO_MEMORY; - strcpy( path, dir ); - strcat( path, "/nls/locale.nls" ); + if (asprintf( &path, "%s/nls/locale.nls", dir ) == -1) return STATUS_NO_MEMORY; status = open_nls_data_file( path, system_dir, &file ); free( path ); if (!status) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c6533710365..72fcba6e998 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2098,10 +2098,8 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) struct stat st; unsigned int i; - if ((buffer = malloc( strlen(config_dir) + sizeof("/dosdevices/a:") ))) + if (asprintf( &buffer, "%s/dosdevices/a:", config_dir ) != -1) { - strcpy( buffer, config_dir ); - strcat( buffer, "/dosdevices/a:" ); p = buffer + strlen(buffer) - 2; for (i = nb_drives = 0; i < MAX_DOS_DRIVES; i++) @@ -2898,9 +2896,7 @@ static void init_redirects(void) char *dir; struct stat st; - if (!(dir = malloc( strlen(config_dir) + sizeof(system_dir) ))) return; - strcpy( dir, config_dir ); - strcat( dir, system_dir ); + if (asprintf( &dir, "%s%s", config_dir, system_dir ) == -1) return; if (!stat( dir, &st )) { sysdir.dev = st.st_dev; @@ -3904,11 +3900,9 @@ static NTSTATUS unmount_device( HANDLE handle ) #else static const char umount[] = "umount >/dev/null 2>&1 "; #endif - char *cmd = malloc( strlen(mount_point)+sizeof(umount)); - if (cmd) + char *cmd; + if (asprintf( &cmd, "%s%s", umount, mount_point ) != -1) { - strcpy( cmd, umount ); - strcat( cmd, mount_point ); system( cmd ); free( cmd ); #ifdef linux diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bfa161e25c9..0db25f88527 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -663,9 +663,7 @@ static void init_paths( char *argv[] ) } else wineloader = build_path( build_path( build_dir, "loader" ), basename ); - env = malloc( sizeof("WINELOADER=") + strlen(wineloader) ); - strcpy( env, "WINELOADER=" ); - strcat( env, wineloader ); + asprintf( &env, "WINELOADER=%s", wineloader ); putenv( env ); set_dll_path(); @@ -1835,18 +1833,18 @@ static void load_ntdll(void) UNICODE_STRING str; void *module; SIZE_T size = 0; - char *name; + char *name = NULL; init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/ntdll.dll.so") ); - if (build_dir) sprintf( name, "%s%s/ntdll.dll", ntdll_dir, pe_dir ); - else sprintf( name, "%s%s/ntdll.dll", dll_dir, pe_dir ); + if (build_dir) asprintf( &name, "%s%s/ntdll.dll", ntdll_dir, pe_dir ); + else asprintf( &name, "%s%s/ntdll.dll", dll_dir, pe_dir ); status = open_builtin_pe_file( name, &attr, &module, &size, &info, 0, 0, current_machine, FALSE ); if (status == STATUS_DLL_NOT_FOUND) { - sprintf( name, "%s/ntdll.dll.so", ntdll_dir ); + free( name ); + asprintf( &name, "%s/ntdll.dll.so", ntdll_dir ); status = open_builtin_so_file( name, &attr, &module, &info, FALSE ); } if (status == STATUS_IMAGE_NOT_AT_BASE) status = virtual_relocate_module( module ); @@ -1873,16 +1871,15 @@ static void load_apiset_dll(void) unsigned int status; HANDLE handle, mapping; SIZE_T size; - char *name; + char *name = NULL; void *ptr; UINT i; init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/apisetschema/apisetschema.dll") ); - if (build_dir) sprintf( name, "%s/dlls/apisetschema%s/apisetschema.dll", build_dir, pe_dir ); - else sprintf( name, "%s%s/apisetschema.dll", dll_dir, pe_dir ); + if (build_dir) asprintf( &name, "%s/dlls/apisetschema%s/apisetschema.dll", build_dir, pe_dir ); + else asprintf( &name, "%s%s/apisetschema.dll", dll_dir, pe_dir ); status = open_unix_file( &handle, name, GENERIC_READ | SYNCHRONIZE, &attr, 0, FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE, NULL, 0 ); diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 24653904308..7211457387c 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1243,29 +1243,25 @@ int server_pipe( int fd[2] ) */ static const char *init_server_dir( dev_t dev, ino_t ino ) { - char *p, *dir; - size_t len = sizeof("/server-") + 2 * sizeof(dev) + 2 * sizeof(ino) + 2; + char *dir = NULL; + int p; + char tmp[2 * sizeof(dev) + 2 * sizeof(ino) + 2]; -#ifdef __ANDROID__ /* there's no /tmp dir on Android */ - len += strlen( config_dir ) + sizeof("/.wineserver"); - dir = malloc( len ); - strcpy( dir, config_dir ); - strcat( dir, "/.wineserver/server-" ); -#else - len += sizeof("/tmp/.wine-") + 12; - dir = malloc( len ); - sprintf( dir, "/tmp/.wine-%u/server-", getuid() ); -#endif - p = dir + strlen( dir ); if (dev != (unsigned long)dev) - p += sprintf( p, "%lx%08lx-", (unsigned long)((unsigned long long)dev >> 32), (unsigned long)dev ); + p = snprintf( tmp, sizeof(tmp), "%lx%08lx-", (unsigned long)((unsigned long long)dev >> 32), (unsigned long)dev ); else - p += sprintf( p, "%lx-", (unsigned long)dev ); + p = snprintf( tmp, sizeof(tmp), "%lx-", (unsigned long)dev ); if (ino != (unsigned long)ino) - sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino ); + snprintf( tmp + p, sizeof(tmp) - p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino ); else - sprintf( p, "%lx", (unsigned long)ino ); + snprintf( tmp + p, sizeof(tmp) - p, "%lx", (unsigned long)ino ); + +#ifdef __ANDROID__ /* there's no /tmp dir on Android */ + asprintf( &dir, "%s/.wineserver/server-%s", config_dir, tmp ); +#else + asprintf( &dir, "/tmp/.wine-%u/server-%s", getuid(), tmp ); +#endif return dir; }

1 0