January 2022 - Wine-Devel - list.winehq.org

[PATCH v2 1/5] user32/tests: Tweak window size to fix Win10 results.

by Rémi Bernon

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> --- v2: Drop the pre-existing window removal patch, add a new patch to reduce msg test verbosity. 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 cb6b61e59c0..e48d7bea513 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); -- 2.34.1

Jan. 31, 2022

[PATCH 14/14] dlls/ntdll: use correct integral type

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/actctx.c | 2 +- dlls/ntdll/loader.c | 8 ++++---- dlls/ntdll/sync.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 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..3a3cc82582a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -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; @@ -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( (LONG *)&path_safe_mode, 2 ); return STATUS_SUCCESS; default: return STATUS_INVALID_PARAMETER; @@ -4379,7 +4379,7 @@ NTSTATUS WINAPI RtlSetSearchPathMode( ULONG flags ) { int prev = path_safe_mode; if (prev == 2) break; /* permanently set */ - if (InterlockedCompareExchange( (int *)&path_safe_mode, val, prev ) == prev) return STATUS_SUCCESS; + if (InterlockedCompareExchange( (LONG *)&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 ); }

Jan. 31, 2022

[PATCH 13/14] dlls/msxml3: use correct integral type

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/mxwriter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 934d580064f..86e569f5dd8 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -687,7 +687,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * BindStatusCallback *bsc; IBindCtx *pbc; HRESULT hr; - int size; + LONG size; hr = CreateBindCtx(0, &pbc); if (hr != S_OK) return hr; diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index e0dd0e3c6e0..084324797c7 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -336,7 +336,7 @@ static HRESULT write_output_buffer(mxwriter *writer, const WCHAR *data, int len) { output_buffer *buffer = &writer->buffer; encoded_buffer *buff; - unsigned int written; + ULONG written; int src_len; if (!len || !*data)

Jan. 31, 2022

[PATCH 12/14] dlls/joy.cpl: use correct integral type

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- 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;

Jan. 31, 2022

[PATCH 11/14] dlls/itss: use correct integral type

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- 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)

Jan. 31, 2022

[PATCH 10/14] dlls/gdiplus: use correct integral type

by Eric Pouech

Note to Esme: - in GdipGetPropertyIdList, for the call to IWICEnumMetadataItem_Next(), MSDN states that the last parameter (items_returned) is optional. - Wine's implementation doesn't support optional parameter here. - I leave it to you if of any importance. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/gdiplus/image.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 59e3d038c4d..280a2c77da8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -95,7 +95,7 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT IWICPalette_GetColorCount(wic_palette, &count); palette = heap_alloc(2 * sizeof(UINT) + count * sizeof(ARGB)); - IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count); + IWICPalette_GetColors(wic_palette, count, (UINT *)palette->Entries, &palette->Count); IWICPalette_GetType(wic_palette, &type); switch(type) { @@ -140,7 +140,7 @@ static HRESULT set_palette(IWICBitmapFrameEncode *frame, ColorPalette *palette) IWICImagingFactory_Release(factory); if (SUCCEEDED(hr)) { - hr = IWICPalette_InitializeCustom(wic_palette, palette->Entries, palette->Count); + hr = IWICPalette_InitializeCustom(wic_palette, (UINT *)palette->Entries, palette->Count); if (SUCCEEDED(hr)) hr = IWICBitmapFrameEncode_SetPalette(frame, wic_palette); @@ -2437,7 +2437,8 @@ GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID *list HRESULT hr; IWICMetadataReader *reader; IWICEnumMetadataItem *enumerator; - UINT prop_count, i, items_returned; + UINT prop_count, i; + ULONG items_returned; TRACE("(%p, %u, %p)\n", image, num, list); @@ -2781,7 +2782,8 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT *size, UINT *count) for (i = 0; i < prop_count; i++) { - UINT items_returned, item_size; + ULONG items_returned; + UINT item_size; hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, &value, &items_returned); if (hr != S_OK) break; @@ -2859,7 +2861,8 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, for (i = 0; i < prop_count; i++) { PropertyItem *item; - UINT items_returned, item_size; + ULONG items_returned; + UINT item_size; hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, &value, &items_returned); if (hr != S_OK) break; @@ -4114,7 +4117,7 @@ static GpStatus load_wmf(IStream *stream, GpMetafile **metafile) METAHEADER mh; HMETAFILE hmf; HRESULT hr; - UINT size; + ULONG size; void *buf; hr = IStream_Read(stream, &key, sizeof(key), &size); @@ -4192,7 +4195,7 @@ static GpStatus load_emf(IStream *stream, GpMetafile **metafile) HENHMETAFILE hemf; GpStatus status; HRESULT hr; - UINT size; + ULONG size; void *buf; hr = IStream_Read(stream, &emh, sizeof(emh), &size); @@ -4281,7 +4284,7 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res const BYTE *pattern, *mask; LARGE_INTEGER seek; HRESULT hr; - UINT bytesread; + ULONG bytesread; int i; DWORD j, sig; @@ -5839,7 +5842,7 @@ static GpStatus create_optimal_palette(ColorPalette *palette, INT desired, { palette->Flags = 0; IWICPalette_GetColorCount(wic_palette, &palette->Count); - IWICPalette_GetColors(wic_palette, palette->Count, palette->Entries, &palette->Count); + IWICPalette_GetColors(wic_palette, palette->Count, (UINT *)palette->Entries, &palette->Count); } IWICBitmap_Release(bitmap);

Jan. 31, 2022

[PATCH 09/14] dlls/gdi32: use correct integral type

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/gdi32/dc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ea8047a4285..6023b930f58 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1482,7 +1482,7 @@ BOOL WINAPI PolyPolyline( HDC hdc, const POINT *points, const DWORD *counts, DWO if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolyPolyline( dc_attr, points, counts, polylines )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, counts, polylines, NtGdiPolyPolyline ); + return NtGdiPolyPolyDraw( hdc, points, (const UINT *)counts, polylines, NtGdiPolyPolyline ); } /****************************************************************************** @@ -1496,7 +1496,7 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT *points, DWORD count ) if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolyBezier( dc_attr, points, count )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyBezier ); + return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolyBezier ); } /****************************************************************************** @@ -1510,7 +1510,7 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT *points, DWORD count ) if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolyBezierTo( dc_attr, points, count )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyBezierTo ); + return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolyBezierTo ); } /********************************************************************** @@ -1524,7 +1524,7 @@ BOOL WINAPI PolylineTo( HDC hdc, const POINT *points, DWORD count ) if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolylineTo( dc_attr, points, count )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolylineTo ); + return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolylineTo ); } /***********************************************************************

Jan. 31, 2022

[PATCH 08/14] dlls/evr: use correct integral type

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- 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..9e00c231345 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -906,7 +906,8 @@ 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; + unsigned int i; + DWORD compare_flags; BOOL is_compressed = TRUE; 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..a656eab6805 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,7 +328,7 @@ 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; + DWORD size; GUID subtype; LONG stride; HRESULT hr; @@ -1104,7 +1104,7 @@ 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; + DWORD count; GUID id = { 0 }; HRESULT hr; @@ -1143,7 +1143,7 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo IMFTopologyServiceLookup *service_lookup) { struct video_presenter *presenter = impl_from_IMFTopologyServiceLookupClient(iface); - unsigned int count; + DWORD count; HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, service_lookup);

Jan. 31, 2022

[PATCH 07/14] dlls/dwrite: use correct integral type

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dwrite/font.c | 2 +- dlls/dwrite/main.c | 3 ++- dlls/dwrite/opentype.c | 5 +++-- dlls/dwrite/shape.c | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index cbc0434b72d..4b32bf1e0de 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5084,7 +5084,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 struct dwrite_fontcollection *collection; WCHAR eudckeypathW[16]; HKEY eudckey; - DWORD index; + UINT32 index; BOOL exists; LONG retval; HRESULT hr; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ab53d5cb80d..967aa10e9c2 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1515,7 +1515,8 @@ static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory7 *if static HRESULT create_system_path_list(WCHAR ***ret, unsigned int *ret_count) { - unsigned int index = 0, value_size, name_count, max_name_count, type, data_size; + unsigned int index = 0, value_size, max_name_count; + DWORD name_count, type, data_size; WCHAR **paths = NULL, *name, *value = NULL; size_t capacity = 0, count = 0; HKEY hkey; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 452b00240b8..5b681609f23 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4607,7 +4607,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex next_bit = global_bit_shift + 1; for (i = 0; i < features->count; ++i) { - unsigned int bits_needed; + DWORD bits_needed; BOOL found = FALSE; feature = &features->features[i]; @@ -5077,7 +5077,8 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con if (format == 1) { const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)); - unsigned int shift, alt_index; + DWORD shift; + unsigned int alt_index; UINT16 set_offset; coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 177ad1d06fe..84d04fe3a80 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -67,10 +67,10 @@ void release_scriptshaping_cache(struct scriptshaping_cache *cache) free(cache); } -static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, +static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const unsigned int *scripts, unsigned int *script_index) { - static const DWORD fallback_scripts[] = + static const unsigned fallback_scripts[] = { DWRITE_MAKE_OPENTYPE_TAG('D','F','L','T'), DWRITE_MAKE_OPENTYPE_TAG('d','f','l','t'),

Jan. 31, 2022

[PATCH 06/14] dlls/dsound: use correct integral type

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- 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);

Jan. 31, 2022