February 2022 - Wine-commits

Zebediah Figura : winegstreamer: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 91c993bb78f50ea2d4c8159bda87901364c432bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c993bb78f50ea2d4c8159b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 18:45:24 2022 -0600 winegstreamer: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 - dlls/winegstreamer/audioconvert.c | 44 ++++++------ dlls/winegstreamer/media_source.c | 60 ++++++++-------- dlls/winegstreamer/mfplat.c | 34 ++++----- dlls/winegstreamer/quartz_parser.c | 36 +++++----- dlls/winegstreamer/wm_asyncreader.c | 133 ++++++++++++++++++++++-------------- dlls/winegstreamer/wm_reader.c | 74 ++++++++++---------- dlls/winegstreamer/wm_syncreader.c | 24 +++---- dlls/winegstreamer/wma_decoder.c | 72 +++++++++---------- 9 files changed, 253 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91c993bb78f50ea2d4c8…

1 0

Zebediah Figura : winegstreamer: Constify some static variables.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 83023a9f2b4840a97c5b587a2ba6c2f05a44b7b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83023a9f2b4840a97c5b587a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 18:45:25 2022 -0600 winegstreamer: Constify some static variables. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 10 +++++----- dlls/winegstreamer/wma_decoder.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index aa5e60ec116..a111bbe196d 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -437,21 +437,21 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) } static WCHAR audio_converterW[] = L"Audio Converter"; -static const GUID *audio_converter_supported_types[] = +static const GUID *const audio_converter_supported_types[] = { &MFAudioFormat_PCM, &MFAudioFormat_Float, }; static WCHAR wma_decoderW[] = L"WMAudio Decoder MFT"; -static const GUID *wma_decoder_input_types[] = +static const GUID *const wma_decoder_input_types[] = { &MEDIASUBTYPE_MSAUDIO1, &MFAudioFormat_WMAudioV8, &MFAudioFormat_WMAudioV9, &MFAudioFormat_WMAudio_Lossless, }; -static const GUID *wma_decoder_output_types[] = +static const GUID *const wma_decoder_output_types[] = { &MFAudioFormat_PCM, &MFAudioFormat_Float, @@ -465,9 +465,9 @@ static const struct mft const UINT32 flags; const GUID *major_type; const UINT32 input_types_count; - const GUID **input_types; + const GUID *const *input_types; const UINT32 output_types_count; - const GUID **output_types; + const GUID *const *output_types; } mfts[] = { diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 945390f44db..78316059052 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -30,14 +30,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmadec); -static const GUID *wma_decoder_input_types[] = +static const GUID *const wma_decoder_input_types[] = { &MEDIASUBTYPE_MSAUDIO1, &MFAudioFormat_WMAudioV8, &MFAudioFormat_WMAudioV9, &MFAudioFormat_WMAudio_Lossless, }; -static const GUID *wma_decoder_output_types[] = +static const GUID *const wma_decoder_output_types[] = { &MFAudioFormat_Float, &MFAudioFormat_PCM,

1 0

Zebediah Figura : shlwapi: Use the public definition of shared shell memory allocation functions.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 07b502e0a29e46227ce6ef8c6cbecc5d088c9e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07b502e0a29e46227ce6ef8c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 18:47:18 2022 -0600 shlwapi: Use the public definition of shared shell memory allocation functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/changenotify.c | 1 + dlls/shell32/shellord.c | 2 +- dlls/shell32/undocshell.h | 24 ------------------------ include/shlwapi.h | 7 ++++++- 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 40ccb891589..35c090ceb67 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -27,6 +27,7 @@ #include "wine/debug.h" #include "shell32_main.h" #include "pidl.h" +#include "shlwapi.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 57308e1c988..af00f125662 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1353,7 +1353,7 @@ BOOL WINAPI IsUserAnAdmin(VOID) * * See shlwapi.SHAllocShared */ -HANDLE WINAPI SHAllocShared(LPVOID lpvData, DWORD dwSize, DWORD dwProcId) +HANDLE WINAPI SHAllocShared(const void *lpvData, DWORD dwSize, DWORD dwProcId) { GET_FUNC(pSHAllocShared, shlwapi, (char*)7, NULL); return pSHAllocShared(lpvData, dwSize, dwProcId); diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 61c2ff4069f..f5c5ed8d43a 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -31,30 +31,6 @@ extern "C" { #endif /* defined(__cplusplus) */ -/**************************************************************************** - * Memory Routines - */ - -/* The Platform SDK's shlobj.h header defines similar functions with a - * leading underscore. However those are unusable because of the leading - * underscore, because they have an incorrect calling convention, and - * because these functions are not exported by name anyway. - */ -HANDLE WINAPI SHAllocShared( - LPVOID pv, - ULONG cb, - DWORD pid); - -BOOL WINAPI SHFreeShared( - HANDLE hMem, - DWORD pid); - -LPVOID WINAPI SHLockShared( - HANDLE hMem, - DWORD pid); - -BOOL WINAPI SHUnlockShared(LPVOID pv); - /**************************************************************************** * System Imagelist Routines */ diff --git a/include/shlwapi.h b/include/shlwapi.h index ca15bd20777..07ca0fac837 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1171,7 +1171,12 @@ HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bagname, BOOL WINAPI SHIsLowMemoryMachine(DWORD type); -#include <poppack.h> +#include <poppack.h> + +HANDLE WINAPI SHAllocShared(const void *data, DWORD size, DWORD pid); +BOOL WINAPI SHFreeShared(HANDLE handle, DWORD pid); +void * WINAPI SHLockShared(HANDLE handle, DWORD pid); +BOOL WINAPI SHUnlockShared(void *data); #ifdef __cplusplus } /* extern "C" */

1 0

Zebediah Figura : shell32: Remove redundant definitions of undocumented shell functions.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 3113c5412fe9c285f345ac8e58178740a58ccb65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3113c5412fe9c285f345ac8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 18:47:19 2022 -0600 shell32: Remove redundant definitions of undocumented shell functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 1 - dlls/shell32/brsfolder.c | 3 +- dlls/shell32/clipboard.c | 1 - dlls/shell32/cpanelfolder.c | 1 - dlls/shell32/dataobject.c | 1 - dlls/shell32/dialogs.c | 1 - dlls/shell32/folders.c | 1 - dlls/shell32/iconcache.c | 1 - dlls/shell32/pidl.c | 1 - dlls/shell32/shell32_main.c | 1 - dlls/shell32/shell32_main.h | 1 - dlls/shell32/shelllink.c | 1 - dlls/shell32/shellole.c | 1 - dlls/shell32/shellord.c | 1 - dlls/shell32/shellpath.c | 1 - dlls/shell32/shellreg.c | 1 - dlls/shell32/shellstring.c | 3 +- dlls/shell32/shfldr_desktop.c | 1 - dlls/shell32/shfldr_fs.c | 1 - dlls/shell32/shfldr_mycomp.c | 1 - dlls/shell32/shfldr_netplaces.c | 1 - dlls/shell32/shlfileop.c | 1 - dlls/shell32/shlfolder.c | 1 - dlls/shell32/shlview.c | 1 - dlls/shell32/shlview_cmenu.c | 1 - dlls/shell32/undocshell.h | 184 ---------------------------------------- 26 files changed, 3 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3113c5412fe9c285f345…

1 0

Zebediah Figura : shell32/tests: Remove pointless redefinition of FOF_NORECURSION.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: aade29db0613a64dca0212bf5719bc92be1e5e83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aade29db0613a64dca0212bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 18:47:20 2022 -0600 shell32/tests: Remove pointless redefinition of FOF_NORECURSION. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 9eab928c12f..1c7f25ccd52 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -29,10 +29,6 @@ #include "wine/test.h" -#ifndef FOF_NORECURSION -#define FOF_NORECURSION 0x1000 -#endif - /* Error codes could be pre-Win32 */ #define DE_SAMEFILE 0x71 #define DE_MANYSRC1DEST 0x72

1 0

Nikolay Sivov : dxva2: Fix long types warnings in traces.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 7868f1b918f7972316382b66468f2f9cf53604d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7868f1b918f7972316382b66… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 4 09:46:33 2022 +0300 dxva2: Fix long types warnings in traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/Makefile.in | 1 - dlls/dxva2/main.c | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index 66add06535b..8f7a62bb902 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxva2.dll IMPORTS = uuid ole32 IMPORTLIB = dxva2 diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 5beac4164a6..b262990e0f7 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -163,7 +163,7 @@ static ULONG WINAPI video_processor_AddRef(IDirectXVideoProcessor *iface) struct video_processor *processor = impl_from_IDirectXVideoProcessor(iface); ULONG refcount = InterlockedIncrement(&processor->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -173,7 +173,7 @@ static ULONG WINAPI video_processor_Release(IDirectXVideoProcessor *iface) struct video_processor *processor = impl_from_IDirectXVideoProcessor(iface); ULONG refcount = InterlockedDecrement(&processor->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -314,7 +314,7 @@ static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *if if (FAILED(hr = IDirect3DSurface9_GetDevice(rt, &device))) { - WARN("Failed to get surface device, hr %#x.\n", hr); + WARN("Failed to get surface device, hr %#lx.\n", hr); return hr; } @@ -330,7 +330,7 @@ static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *if if (FAILED(hr = IDirect3DDevice9_StretchRect(device, samples[i].SrcSurface, &samples[i].SrcRect, rt, &dst_rect, D3DTEXF_POINT))) { - WARN("Failed to copy sample %u, hr %#x.\n", i, hr); + WARN("Failed to copy sample %u, hr %#lx.\n", i, hr); } } @@ -398,7 +398,7 @@ static HRESULT WINAPI device_manager_processor_service_CreateSurface(IDirectXVid unsigned int i, j; HRESULT hr; - TRACE("%p, %u, %u, %u, %u, %u, %u, %u, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, + TRACE("%p, %u, %u, %u, %u, %u, %lu, %lu, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, surfaces, shared_handle); if (backbuffers >= UINT_MAX) @@ -679,7 +679,7 @@ static HRESULT WINAPI device_manager_decoder_service_CreateSurface(IDirectXVideo UINT width, UINT height, UINT backbuffers, D3DFORMAT format, D3DPOOL pool, DWORD usage, DWORD dxvaType, IDirect3DSurface9 **surfaces, HANDLE *shared_handle) { - FIXME("%p, %u, %u, %u, %#x, %d, %d, %d, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, + FIXME("%p, %u, %u, %u, %#x, %d, %ld, %ld, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, surfaces, shared_handle); return E_NOTIMPL; @@ -753,7 +753,7 @@ static ULONG WINAPI device_manager_AddRef(IDirect3DDeviceManager9 *iface) struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); ULONG refcount = InterlockedIncrement(&manager->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -764,7 +764,7 @@ static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) ULONG refcount = InterlockedDecrement(&manager->refcount); size_t i; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1037,7 +1037,7 @@ static const IDirect3DDeviceManager9Vtbl device_manager_vtbl = BOOL WINAPI CapabilitiesRequestAndCapabilitiesReply( HMONITOR monitor, LPSTR buffer, DWORD length ) { - FIXME("(%p, %p, %d): stub\n", monitor, buffer, length); + FIXME("%p, %p, %ld: stub.\n", monitor, buffer, length); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1113,7 +1113,7 @@ BOOL WINAPI DestroyPhysicalMonitor( HMONITOR monitor ) BOOL WINAPI DestroyPhysicalMonitors( DWORD arraySize, LPPHYSICAL_MONITOR array ) { - FIXME("(0x%x, %p): stub\n", arraySize, array); + FIXME("%lu, %p: stub.\n", arraySize, array); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1221,7 +1221,7 @@ HRESULT WINAPI GetNumberOfPhysicalMonitorsFromIDirect3DDevice9( IDirect3DDevice9 BOOL WINAPI GetPhysicalMonitorsFromHMONITOR( HMONITOR monitor, DWORD arraySize, LPPHYSICAL_MONITOR array ) { - FIXME("(%p, 0x%x, %p): stub\n", monitor, arraySize, array); + FIXME("%p, %lu, %p: stub.\n", monitor, arraySize, array); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1229,7 +1229,7 @@ BOOL WINAPI GetPhysicalMonitorsFromHMONITOR( HMONITOR monitor, DWORD arraySize, HRESULT WINAPI GetPhysicalMonitorsFromIDirect3DDevice9( IDirect3DDevice9 *device, DWORD arraySize, LPPHYSICAL_MONITOR array ) { - FIXME("(%p, 0x%x, %p): stub\n", device, arraySize, array); + FIXME("%p, %lu, %p: stub.\n", device, arraySize, array); return E_NOTIMPL; } @@ -1301,7 +1301,7 @@ BOOL WINAPI SaveCurrentSettings( HMONITOR monitor ) BOOL WINAPI SetMonitorBrightness( HMONITOR monitor, DWORD brightness ) { - FIXME("(%p, 0x%x): stub\n", monitor, brightness); + FIXME("%p, %#lx: stub.\n", monitor, brightness); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1317,7 +1317,7 @@ BOOL WINAPI SetMonitorColorTemperature( HMONITOR monitor, MC_COLOR_TEMPERATURE t BOOL WINAPI SetMonitorContrast( HMONITOR monitor, DWORD contrast ) { - FIXME("(%p, 0x%x): stub\n", monitor, contrast); + FIXME("%p, %#lx: stub.\n", monitor, contrast); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1325,7 +1325,7 @@ BOOL WINAPI SetMonitorContrast( HMONITOR monitor, DWORD contrast ) BOOL WINAPI SetMonitorDisplayAreaPosition( HMONITOR monitor, MC_POSITION_TYPE type, DWORD position ) { - FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, position); + FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, position); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1333,7 +1333,7 @@ BOOL WINAPI SetMonitorDisplayAreaPosition( HMONITOR monitor, MC_POSITION_TYPE ty BOOL WINAPI SetMonitorDisplayAreaSize( HMONITOR monitor, MC_SIZE_TYPE type, DWORD size ) { - FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, size); + FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, size); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1341,7 +1341,7 @@ BOOL WINAPI SetMonitorDisplayAreaSize( HMONITOR monitor, MC_SIZE_TYPE type, DWOR BOOL WINAPI SetMonitorRedGreenOrBlueDrive( HMONITOR monitor, MC_DRIVE_TYPE type, DWORD drive ) { - FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, drive); + FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, drive); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1349,7 +1349,7 @@ BOOL WINAPI SetMonitorRedGreenOrBlueDrive( HMONITOR monitor, MC_DRIVE_TYPE type, BOOL WINAPI SetMonitorRedGreenOrBlueGain( HMONITOR monitor, MC_GAIN_TYPE type, DWORD gain ) { - FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, gain); + FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, gain); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1357,7 +1357,7 @@ BOOL WINAPI SetMonitorRedGreenOrBlueGain( HMONITOR monitor, MC_GAIN_TYPE type, D BOOL WINAPI SetVCPFeature( HMONITOR monitor, BYTE vcpCode, DWORD value ) { - FIXME("(%p, 0x%02x, 0x%x): stub\n", monitor, vcpCode, value); + FIXME("%p, 0x%02x, %#lx: stub.\n", monitor, vcpCode, value); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE;

1 0

Eric Pouech : wldap32: Fix compilation in 32-bit.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 25946b48148784e8275c1685f6498ab88f553ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25946b48148784e8275c1685… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:34:49 2022 +0100 wldap32: Fix compilation in 32-bit. 32-bit compilation has been broken by 8db1662d749991a77b8945c752ab024d2d6b1244. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/libldap.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c index 8872421dabc..592e526ecdc 100644 --- a/dlls/wldap32/libldap.c +++ b/dlls/wldap32/libldap.c @@ -53,7 +53,14 @@ C_ASSERT( sizeof(LDAPSortKeyU) == sizeof(LDAPSortKey) ); C_ASSERT( sizeof(LDAPVLVInfoU) == sizeof(LDAPVLVInfo) ); C_ASSERT( sizeof(LDAPAPIInfoU) == sizeof(LDAPAPIInfo) ); C_ASSERT( sizeof(LDAPAPIFeatureInfoU) == sizeof(LDAPAPIFeatureInfo) ); -C_ASSERT( sizeof(struct timevalU) == sizeof(struct timeval) ); + +static struct timeval *convert_timeval(const struct timevalU *tvu, struct timeval *tv) +{ + if (!tvu) return NULL; + tv->tv_sec = tvu->tv_sec; + tv->tv_usec = tvu->tv_usec; + return tv; +} #define WLDAP32_LBER_ERROR (~0l) @@ -488,8 +495,9 @@ static NTSTATUS wrap_ldap_rename_s( void *args ) static NTSTATUS wrap_ldap_result( void *args ) { struct ldap_result_params *params = args; + struct timeval tv; return ldap_result( params->ld, params->msgid, params->all, - (struct timeval *)params->timeout, (LDAPMessage **)params->result ); + convert_timeval(params->timeout, &tv), (LDAPMessage **)params->result ); } static NTSTATUS wrap_ldap_sasl_bind( void *args ) @@ -555,18 +563,20 @@ static NTSTATUS wrap_ldap_sasl_interactive_bind_s( void *args ) static NTSTATUS wrap_ldap_search_ext( void *args ) { struct ldap_search_ext_params *params = args; + struct timeval tv; return ldap_search_ext( params->ld, params->base, params->scope, params->filter, params->attrs, params->attrsonly, (LDAPControl **)params->serverctrls, - (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout, + (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv), params->sizelimit, (int *)params->msg ); } static NTSTATUS wrap_ldap_search_ext_s( void *args ) { struct ldap_search_ext_s_params *params = args; + struct timeval tv; return ldap_search_ext_s( params->ld, params->base, params->scope, params->filter, params->attrs, params->attrsonly, (LDAPControl **)params->serverctrls, - (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout, + (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv), params->sizelimit, (LDAPMessage **)params->result ); }

1 0

Alexandre Julliard : vkd3d: Add inline wrappers for the pthread synchronization functions.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: vkd3d Branch: master Commit: 129b0be7acb81282088a10be5afcd1e5d5fd401e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=129b0be7acb81282088a10b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 12:06:28 2022 +0100 vkd3d: Add inline wrappers for the pthread synchronization functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/command.c | 134 ++++++++++++++++++++++----------------------- libs/vkd3d/device.c | 52 +++++++++--------- libs/vkd3d/resource.c | 28 +++++----- libs/vkd3d/state.c | 12 ++-- libs/vkd3d/utils.c | 12 ++-- libs/vkd3d/vkd3d_private.h | 86 ++++++++++++++++++++++++----- 6 files changed, 190 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=129b0be7acb81282088…

1 0

Alexandre Julliard : vkd3d: Implement the synchronization wrappers for Windows.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: vkd3d Branch: master Commit: 2a1470cddf9717e30eff70874205d00dc1ed9064 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2a1470cddf9717e30eff708… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 12:07:03 2022 +0100 vkd3d: Implement the synchronization wrappers for Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/vkd3d_private.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bb7be99..ece1113 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -23,6 +23,10 @@ #define NONAMELESSUNION #define VK_NO_PROTOTYPES +#ifdef _WIN32 +# define _WIN32_WINNT 0x0600 /* for condition variables */ +#endif + #include "vkd3d_common.h" #include "vkd3d_blob.h" #include "vkd3d_memory.h" @@ -171,6 +175,72 @@ union vkd3d_thread_handle void *handle; }; +#ifdef _WIN32 + +struct vkd3d_mutex +{ + CRITICAL_SECTION lock; +}; + +struct vkd3d_cond +{ + CONDITION_VARIABLE cond; +}; + +static inline int vkd3d_mutex_init(struct vkd3d_mutex *lock) +{ + InitializeCriticalSection(&lock->lock); + return 0; +} + +static inline int vkd3d_mutex_lock(struct vkd3d_mutex *lock) +{ + EnterCriticalSection(&lock->lock); + return 0; +} + +static inline int vkd3d_mutex_unlock(struct vkd3d_mutex *lock) +{ + LeaveCriticalSection(&lock->lock); + return 0; +} + +static inline int vkd3d_mutex_destroy(struct vkd3d_mutex *lock) +{ + DeleteCriticalSection(&lock->lock); + return 0; +} + +static inline int vkd3d_cond_init(struct vkd3d_cond *cond) +{ + InitializeConditionVariable(&cond->cond); + return 0; +} + +static inline int vkd3d_cond_signal(struct vkd3d_cond *cond) +{ + WakeConditionVariable(&cond->cond); + return 0; +} + +static inline int vkd3d_cond_broadcast(struct vkd3d_cond *cond) +{ + WakeAllConditionVariable(&cond->cond); + return 0; +} + +static inline int vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock) +{ + return !SleepConditionVariableCS(&cond->cond, &lock->lock, INFINITE); +} + +static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond) +{ + return 0; +} + +#else /* _WIN32 */ + struct vkd3d_mutex { pthread_mutex_t lock; @@ -227,6 +297,8 @@ static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond) return pthread_cond_destroy(&cond->cond); } +#endif /* _WIN32 */ + HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread); HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread);

1 0

Alexandre Julliard : vkd3d-utils: Implement the event functions for Windows.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: vkd3d Branch: master Commit: 923ea7bb1e071f6a14456641f731b9d649657992 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=923ea7bb1e071f6a1445664… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 12:07:30 2022 +0100 vkd3d-utils: Implement the event functions for Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-utils/vkd3d_utils_main.c | 37 ++++++++++++++++++++++++++++++++++ libs/vkd3d-utils/vkd3d_utils_private.h | 8 -------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 9c968cc..7fb042c 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -327,6 +327,41 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename } /* Events */ + +#ifdef _WIN32 + +HANDLE vkd3d_create_event(void) +{ + return CreateEventA(NULL, FALSE, FALSE, NULL); +} + +HRESULT vkd3d_signal_event(HANDLE event) +{ + SetEvent(event); + return S_OK; +} + +unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds) +{ + return WaitForSingleObject(event, milliseconds); +} + +void vkd3d_destroy_event(HANDLE event) +{ + CloseHandle(event); +} + +#else /* _WIN32 */ + +#include <pthread.h> + +struct vkd3d_event +{ + pthread_mutex_t mutex; + pthread_cond_t cond; + BOOL is_signaled; +}; + HANDLE vkd3d_create_event(void) { struct vkd3d_event *event; @@ -434,6 +469,8 @@ void vkd3d_destroy_event(HANDLE event) vkd3d_free(impl); } +#endif /* _WIN32 */ + HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob) { HRESULT hr; diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 06ac7e6..1b8254b 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -23,7 +23,6 @@ #define NONAMELESSUNION #define VK_NO_PROTOTYPES -#include <pthread.h> #include <vkd3d.h> #include <vkd3d_shader.h> #include <vkd3d_d3dcompiler.h> @@ -32,11 +31,4 @@ #include "vkd3d_memory.h" #include <vkd3d_utils.h> -struct vkd3d_event -{ - pthread_mutex_t mutex; - pthread_cond_t cond; - BOOL is_signaled; -}; - #endif /* __VKD3D_UTILS_PRIVATE_H */

1 0