January 2022 - Wine-commits

Eric Pouech : evr: Use correct integral type.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: c47f30529536787db44454b3e71e8b98334c464a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47f30529536787db44454b3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 17:26:07 2022 +0300 evr: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 5 +++-- dlls/evr/presenter.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 5af5b2861b3..3d72270fc16 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -906,8 +906,9 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; struct video_mixer *mixer = impl_from_IMFTransform(iface); HRESULT hr = MF_E_INVALIDMEDIATYPE; - unsigned int i, compare_flags; BOOL is_compressed = TRUE; + DWORD compare_flags; + unsigned int i; TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); @@ -1557,7 +1558,7 @@ static HRESULT WINAPI video_mixer_service_client_InitServicePointers(IMFTopology IMFTopologyServiceLookup *service_lookup) { struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); - unsigned int count; + DWORD count; HRESULT hr; TRACE("%p, %p.\n", iface, service_lookup); diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index fd02404b7af..cf8ba20cbb8 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -282,7 +282,7 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter) static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) { - unsigned int flags; + DWORD flags; HRESULT hr; if (!media_type) @@ -328,9 +328,9 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, static HRESULT video_presenter_configure_output_type(struct video_presenter *presenter, const MFVideoArea *aperture, IMFMediaType *media_type) { - unsigned int size; GUID subtype; LONG stride; + DWORD size; HRESULT hr; hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture->Area.cx << 32 | aperture->Area.cy); @@ -1104,8 +1104,8 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter) static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; - unsigned int count; GUID id = { 0 }; + DWORD count; HRESULT hr; count = 1; @@ -1143,8 +1143,8 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo IMFTopologyServiceLookup *service_lookup) { struct video_presenter *presenter = impl_from_IMFTopologyServiceLookupClient(iface); - unsigned int count; HRESULT hr = S_OK; + DWORD count; TRACE("%p, %p.\n", iface, service_lookup);

1 0

Eric Pouech : include/msvcrt: Add attribute((format)) to printf and scanf -like APIs.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: bb1fc33570098543e2ec8b6b43fa155adfea2182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb1fc33570098543e2ec8b6b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:13:15 2022 +0100 include/msvcrt: Add attribute((format)) to printf and scanf -like APIs. Fix a bunch of warnings generated by this patch and the migration of GUID.Data1 to long in ae2693e2c4079edcc719c08abed5ad58ba7aace7 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 2 +- dlls/crypt32/sip.c | 2 +- dlls/iphlpapi/iphlpapi_main.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 4 +- dlls/msdmo/tests/msdmo.c | 2 +- dlls/mshtml/main.c | 2 +- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/rpcrt4/rpcrt4_main.c | 4 +- dlls/shell32/classes.c | 2 +- dlls/shell32/debughlp.c | 2 +- dlls/shell32/shfldr.h | 2 +- dlls/shlwapi/ordinal.c | 2 +- dlls/typelib.dll16/typelib.c | 2 +- dlls/webservices/writer.c | 4 +- dlls/winebus.sys/main.c | 10 ++--- include/msvcrt/corecrt.h | 8 ++++ include/msvcrt/crtdbg.h | 2 +- include/msvcrt/stdio.h | 90 ++++++++++++++++++++++++++++-------------- programs/winetest/main.c | 2 +- 20 files changed, 93 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb1fc33570098543e2ec…

1 0

Eric Pouech : include: Define HandleToU?Long to return a long (as SDK does).
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: f2e0c5cab2366c038680796bc7ddf780fc4eb01b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e0c5cab2366c038680796b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:13:33 2022 +0100 include: Define HandleToU?Long to return a long (as SDK does). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetsd.h | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index a46172403ef..329db66c8f0 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -153,16 +153,32 @@ typedef unsigned int UHALF_PTR, *PUHALF_PTR; #if !defined(__midl) && !defined(__WIDL__) -static inline ULONG32 HandleToULong(const void *h) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) + +static inline unsigned long HandleToULong(const void *h) +{ + return (unsigned long)(ULONG_PTR)h; +} + +static inline long HandleToLong(const void *h) +{ + return (long)(LONG_PTR)h; +} + +#else + +static inline unsigned HandleToULong(const void *h) { - return (ULONG32)(ULONG_PTR)h; + return (unsigned)(ULONG_PTR)h; } -static inline LONG32 HandleToLong(const void *h) +static inline int HandleToLong(const void *h) { - return (LONG32)(LONG_PTR)h; + return (int)(LONG_PTR)h; } +#endif /* !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) */ + static inline void *ULongToHandle(ULONG32 ul) { return (void *)(ULONG_PTR)ul;

1 0

Eric Pouech : winedbg: Use correct integral type.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: f44f3c23a6fd029d208947f90aba5193bb1f2b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f44f3c23a6fd029d208947f9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:14:11 2022 +0100 winedbg: Use correct integral type. (* as width or precision specifier in printf requires an int not a long) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index b676bc8d955..0cc2f8b7a6c 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -39,7 +39,7 @@ #include "oaidl.h" #include <wine/list.h> -#define ADDRSIZE (dbg_curr_process ? dbg_curr_process->be_cpu->pointer_size : (int)sizeof(void*)) +#define ADDRSIZE ((int)(dbg_curr_process ? dbg_curr_process->be_cpu->pointer_size : sizeof(void*))) #define ADDRWIDTH (ADDRSIZE * 2) /* the debugger uses these exceptions for its internal use */

1 0

Eric Pouech : dbgeng: Use correct integral type.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: a41b45a8c5a7ca178748c09aaaca519aaa028d7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a41b45a8c5a7ca178748c09a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:14:18 2022 +0100 dbgeng: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 014f723981b..5ffde0e3c80 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -81,7 +81,7 @@ static struct target_process *debug_client_get_target(struct debug_client *debug } static HRESULT debug_target_return_string(const char *str, char *buffer, unsigned int buffer_size, - unsigned int *size) + ULONG *size) { unsigned int len = strlen(str), dst_len; @@ -1877,7 +1877,8 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug struct target_process *target; void *version_info, *ptr; HRESULT hr = E_FAIL; - DWORD handle, size; + DWORD handle; + UINT size; TRACE("%p, %u, %s, %s, %p, %u, %p.\n", iface, index, wine_dbgstr_longlong(base), debugstr_a(item), buffer, buffer_size, info_size);

1 0

Eric Pouech : dsound: Use correct integral type.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: c5b0974b93b7cc54aee4defdda445b0aa7e89a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b0974b93b7cc54aee4defd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:15:17 2022 +0100 dsound: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/mixer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index d28cc8dc5aa..1f91bc4dc0e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -694,7 +694,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) */ static void DSOUND_PerformMix(DirectSoundDevice *device) { - DWORD block, pad_frames, pad_bytes, frames; + DWORD block, pad_bytes, frames; + UINT32 pad_frames; HRESULT hr; TRACE("(%p)\n", device);

1 0

Eric Pouech : itss: Use correct integral type.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 7e90d60233966b151b977938f75408b4ea472665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e90d60233966b151b977938… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:16:24 2022 +0100 itss: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/chm_lib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index 91e3fa3d811..f2665cae529 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -941,7 +941,7 @@ static UChar *_chm_find_in_PMGL(UChar *page_buf, * that is provided for us. */ struct chmPmglHeader header; - UInt32 hremain; + unsigned int hremain; UChar *end; UChar *cur; UChar *temp; @@ -983,7 +983,7 @@ static Int32 _chm_find_in_PMGI(UChar *page_buf, * that is provided for us */ struct chmPmgiHeader header; - UInt32 hremain; + unsigned int hremain; int page=-1; UChar *end; UChar *cur; @@ -1093,7 +1093,7 @@ static BOOL _chm_get_cmpblock_bounds(struct chmFile *h, Int64 *len) { UChar buffer[8], *dummy; - UInt32 remain; + unsigned int remain; /* for all but the last block, use the reset table */ if (block < h->reset_table.block_count-1)

1 0

Eric Pouech : joy.cpl: Use correct integral type.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 1c374a7c51eade2b0d6f03b363873b0acf73ff6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c374a7c51eade2b0d6f03b3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:16:38 2022 +0100 joy.cpl: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 081dcf2dc74..8ea3892b750 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -789,7 +789,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) HRESULT hr; DIEFFECT dieffect; DWORD axes[2] = {DIJOFS_X, DIJOFS_Y}; - int direction[2] = {0, 0}; + LONG direction[2] = {0, 0}; int num_axes = 2; struct Joystick *joystick = pvRef; DIRAMPFORCE rforce;

1 0

Eric Pouech : ntdll: Use correct integral type.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 310d7c688346e89a1cb0f4ec7cfbb0e690015543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=310d7c688346e89a1cb0f4ec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:17:06 2022 +0100 ntdll: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 2 +- dlls/ntdll/loader.c | 16 ++++++++-------- dlls/ntdll/sync.c | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index ca38f37e673..9fa93a3b5e3 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -532,7 +532,7 @@ enum context_sections typedef struct _ACTIVATION_CONTEXT { ULONG magic; - int ref_count; + LONG ref_count; struct file_info config; struct file_info appdir; struct assembly *assemblies; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b50b9e61bbc..2c3e62f6e25 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -90,8 +90,8 @@ static BOOL is_prefix_bootstrap; /* are we bootstrapping the prefix? */ static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ -static ULONG path_safe_mode; /* path mode set by RtlSetSearchPathMode */ -static ULONG dll_safe_mode = 1; /* dll search mode */ +static LONG path_safe_mode; /* path mode set by RtlSetSearchPathMode */ +static LONG dll_safe_mode = 1; /* dll search mode */ static UNICODE_STRING dll_directory; /* extra path for LdrSetDllDirectory */ static UNICODE_STRING system_dll_path; /* path to search for system dependency dlls */ static DWORD default_search_flags; /* default flags set by LdrSetDefaultDllDirectories */ @@ -250,8 +250,8 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) */ void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) { - static unsigned int element_size = sizeof(*unload_traces); - static unsigned int element_count = ARRAY_SIZE(unload_traces); + static ULONG element_size = sizeof(*unload_traces); + static ULONG element_count = ARRAY_SIZE(unload_traces); *size = &element_size; *count = &element_count; @@ -3334,7 +3334,7 @@ NTSTATUS WINAPI LdrQueryProcessModuleInformation(RTL_PROCESS_MODULES *smi, } -static NTSTATUS query_dword_option( HANDLE hkey, LPCWSTR name, ULONG *value ) +static NTSTATUS query_dword_option( HANDLE hkey, LPCWSTR name, LONG *value ) { NTSTATUS status; UNICODE_STRING str; @@ -4369,7 +4369,7 @@ NTSTATUS WINAPI RtlSetSearchPathMode( ULONG flags ) val = 0; break; case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT: - InterlockedExchange( (int *)&path_safe_mode, 2 ); + InterlockedExchange( &path_safe_mode, 2 ); return STATUS_SUCCESS; default: return STATUS_INVALID_PARAMETER; @@ -4377,9 +4377,9 @@ NTSTATUS WINAPI RtlSetSearchPathMode( ULONG flags ) for (;;) { - int prev = path_safe_mode; + LONG prev = path_safe_mode; if (prev == 2) break; /* permanently set */ - if (InterlockedCompareExchange( (int *)&path_safe_mode, val, prev ) == prev) return STATUS_SUCCESS; + if (InterlockedCompareExchange( &path_safe_mode, val, prev ) == prev) return STATUS_SUCCESS; } return STATUS_ACCESS_DENIED; } diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index bdb39e59d6d..06b594c633f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -182,12 +182,12 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) } else { - int *lock = (int *)&crit->LockSemaphore; + LONG *lock = (LONG *)&crit->LockSemaphore; while (!InterlockedCompareExchange( lock, 0, 1 )) { - static const int zero; + static const LONG zero; /* this may wait longer than specified in case of multiple wake-ups */ - if (RtlWaitOnAddress( lock, &zero, sizeof(int), &time ) == STATUS_TIMEOUT) + if (RtlWaitOnAddress( lock, &zero, sizeof(LONG), &time ) == STATUS_TIMEOUT) return STATUS_TIMEOUT; } return STATUS_WAIT_0; @@ -363,7 +363,7 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) } else { - int *lock = (int *)&crit->LockSemaphore; + LONG *lock = (LONG *)&crit->LockSemaphore; InterlockedExchange( lock, 1 ); RtlWakeAddressSingle( lock ); ret = STATUS_SUCCESS; @@ -761,7 +761,7 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - InterlockedIncrement( (int *)&variable->Ptr ); + InterlockedIncrement( (LONG *)&variable->Ptr ); RtlWakeAddressSingle( variable ); } @@ -772,7 +772,7 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - InterlockedIncrement( (int *)&variable->Ptr ); + InterlockedIncrement( (LONG *)&variable->Ptr ); RtlWakeAddressAll( variable ); }

1 0

Rémi Bernon : user32/tests: Tweak window size to fix Win10 results.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 34d1c100b044afa5eb6d6243e9fb40db085b78d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d1c100b044afa5eb6d6243… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 31 14:18:06 2022 +0100 user32/tests: Tweak window size to fix Win10 results. Fix these failures: > win.c:2445: Test failed: style 0x200000: expected !100 > win.c:2445: Test failed: style 0x300000: expected !100 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 273dc8bd8ed..4c0bd430180 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2249,7 +2249,7 @@ static void test_mdi(void) mdi_hwndMain = CreateWindowExA(0, "MDI_parent_Class", "MDI parent window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX /*| WS_VISIBLE*/, - 100, 100, CW_USEDEFAULT, CW_USEDEFAULT, + 200, 100, CW_USEDEFAULT, CW_USEDEFAULT, GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL); assert(mdi_hwndMain);

1 0