September 2022 - Wine-Commits

Nikolay Sivov : evr/filter: Initial implementation of sample rendering.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: a1d2e52468b71172c6bdc9938d6498ba84afb436 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1d2e52468b71172c6bdc9938d6498… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 6 17:09:51 2022 +0300 evr/filter: Initial implementation of sample rendering. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 141 insertions(+), 3 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 67b13cbd5af..26a2a3a1eb5 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -51,6 +51,8 @@ struct evr IMFTransform *mixer; IMFVideoPresenter *presenter; + IMFVideoSampleAllocator *allocator; + IMFMediaType *media_type; unsigned int flags; }; @@ -148,6 +150,20 @@ static BOOL evr_is_mixer_d3d_aware(const struct evr *filter) return ret; } +static HRESULT evr_get_service(void *unk, REFGUID service, REFIID riid, void **obj) +{ + IMFGetService *gs; + HRESULT hr; + + if (SUCCEEDED(hr = IUnknown_QueryInterface((IUnknown *)unk, &IID_IMFGetService, (void **)&gs))) + { + hr = IMFGetService_GetService(gs, service, riid, obj); + IMFGetService_Release(gs); + } + + return hr; +} + static HRESULT evr_init_services(struct evr *filter) { IMFTopologyServiceLookupClient *lookup_client; @@ -224,6 +240,16 @@ static void evr_release_services(struct evr *filter) } } +static void evr_set_input_type(struct evr *filter, IMFMediaType *media_type) +{ + if (filter->media_type) + IMFMediaType_Release(filter->media_type); + if ((filter->media_type = media_type)) + IMFMediaType_AddRef(filter->media_type); + if (!media_type && filter->allocator) + IMFVideoSampleAllocator_UninitializeSampleAllocator(filter->allocator); +} + static HRESULT evr_test_input_type(struct evr *filter, const AM_MEDIA_TYPE *mt, IMFMediaType **ret) { IMFMediaType *media_type; @@ -259,7 +285,9 @@ static HRESULT evr_test_input_type(struct evr *filter, const AM_MEDIA_TYPE *mt, static HRESULT evr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { struct evr *filter = impl_from_strmbase_renderer(iface); + IMFVideoSampleAllocator *allocator; IMFMediaType *media_type; + IUnknown *device_manager; HRESULT hr; if (SUCCEEDED(hr = evr_test_input_type(filter, mt, &media_type))) @@ -267,6 +295,27 @@ static HRESULT evr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE if (SUCCEEDED(hr = IMFTransform_SetInputType(filter->mixer, 0, media_type, 0))) hr = IMFVideoPresenter_ProcessMessage(filter->presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); + if (SUCCEEDED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&allocator))) + { + if (SUCCEEDED(hr = evr_get_service(filter->presenter, &MR_VIDEO_RENDER_SERVICE, + &IID_IDirect3DDeviceManager9, (void **)&device_manager))) + { + if (SUCCEEDED(hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, device_manager))) + { + if (SUCCEEDED(hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, media_type))) + { + IMFVideoSampleAllocator_AddRef((filter->allocator = allocator)); + } + } + IUnknown_Release(device_manager); + } + + IMFVideoSampleAllocator_Release(allocator); + } + + if (SUCCEEDED(hr)) + evr_set_input_type(filter, media_type); + IMFMediaType_Release(media_type); } @@ -279,6 +328,7 @@ static void evr_disconnect(struct strmbase_renderer *iface) if (filter->mixer) IMFTransform_SetInputType(filter->mixer, 0, NULL, 0); + evr_set_input_type(filter, NULL); evr_release_services(filter); } @@ -287,14 +337,102 @@ static void evr_destroy(struct strmbase_renderer *iface) struct evr *filter = impl_from_strmbase_renderer(iface); evr_uninitialize(filter); + evr_set_input_type(filter, NULL); + if (filter->allocator) + IMFVideoSampleAllocator_Release(filter->allocator); strmbase_renderer_cleanup(&filter->renderer); free(filter); } -static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *sample) +static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sample, IMFSample **sample) { - FIXME("Not implemented.\n"); - return E_NOTIMPL; + IDirect3DSurface9 *surface; + D3DLOCKED_RECT locked_rect; + IMFMediaBuffer *buffer; + UINT64 frame_size = 0; + UINT32 width, lines; + LONG src_stride; + HRESULT hr; + BYTE *src; + + if (FAILED(hr = IMFMediaType_GetUINT32(filter->media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&src_stride))) + { + WARN("Unknown input buffer stride.\n"); + return hr; + } + IMFMediaType_GetUINT64(filter->media_type, &MF_MT_FRAME_SIZE, &frame_size); + width = frame_size >> 32; + lines = frame_size; + + if (FAILED(hr = IMediaSample_GetPointer(input_sample, &src))) + { + WARN("Failed to get pointer to sample data, hr %#lx.\n", hr); + return hr; + } + + if (FAILED(hr = IMFVideoSampleAllocator_AllocateSample(filter->allocator, sample))) + { + WARN("Failed to allocate a sample, hr %#lx.\n", hr); + return hr; + } + + if (SUCCEEDED(hr = IMFSample_GetBufferByIndex(*sample, 0, &buffer))) + { + if (SUCCEEDED(hr = evr_get_service(buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface))) + { + if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_DISCARD))) + { + if (src_stride < 0) src -= src_stride * (lines - 1); + MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width * 4, lines); + IDirect3DSurface9_UnlockRect(surface); + } + + IDirect3DSurface9_Release(surface); + } + IMFMediaBuffer_Release(buffer); + } + + if (FAILED(hr)) + { + IMFSample_Release(*sample); + *sample = NULL; + } + + return hr; +} + +static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *input_sample) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + HRESULT hr = E_NOTIMPL; + GUID subtype = { 0 }; + IMFSample *sample; + + if (!filter->media_type) + { + WARN("Media type wasn't set.\n"); + return E_UNEXPECTED; + } + + IMFMediaType_GetGUID(filter->media_type, &MF_MT_SUBTYPE, &subtype); + + if (IsEqualGUID(&subtype, &MFVideoFormat_ARGB32) + || IsEqualGUID(&subtype, &MFVideoFormat_RGB32)) + { + if (SUCCEEDED(hr = evr_copy_sample_buffer(filter, input_sample, &sample))) + { + if (SUCCEEDED(IMFTransform_ProcessInput(filter->mixer, 0, sample, 0))) + IMFVideoPresenter_ProcessMessage(filter->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0); + + IMFSample_Release(sample); + } + } + else + { + FIXME("Unhandled input type %s.\n", debugstr_guid(&subtype)); + } + + return hr; } static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt)

1 0

Robert Wilhelm : scrrun: Store full path in folder object.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: 97b83a6dec3fee3d86deccb1fc65179366ad4649 URL: https://gitlab.winehq.org/wine/wine/-/commit/97b83a6dec3fee3d86deccb1fc6517… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Sep 6 08:18:50 2022 +0200 scrrun: Store full path in folder object. --- dlls/scrrun/filesystem.c | 20 ++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 7a8a7689902..cfeb5bb1532 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2699,6 +2699,7 @@ static const IFolderVtbl foldervtbl = { HRESULT create_folder(const WCHAR *path, IFolder **folder) { struct folder *object; + DWORD len; *folder = NULL; @@ -2709,13 +2710,28 @@ HRESULT create_folder(const WCHAR *path, IFolder **folder) object->IFolder_iface.lpVtbl = &foldervtbl; object->ref = 1; - object->path = SysAllocString(path); - if (!object->path) + + len = GetFullPathNameW(path, 0, NULL, NULL); + if (!len) + { + free(object); + return E_FAIL; + } + + object->path = SysAllocStringLen(NULL, len); + if(!object->path) { free(object); return E_OUTOFMEMORY; } + if (!GetFullPathNameW(path, len, object->path, NULL)) + { + SysFreeString(object->path); + free(object); + return E_FAIL; + } + init_classinfo(&CLSID_Folder, (IUnknown *)&object->IFolder_iface, &object->classinfo); *folder = &object->IFolder_iface; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 98652ecf523..f2e23e4011c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -973,7 +973,7 @@ static void test_GetFolder(void) SysFreeString(str); hr = IFolder_get_Path(folder, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!PathIsRelativeW(str), "path %s is relative.\n", wine_dbgstr_w(str)); + ok(!PathIsRelativeW(str), "path %s is relative.\n", wine_dbgstr_w(str)); SysFreeString(str); IFolder_Release(folder); RemoveDirectoryW(dir);

1 0

Nikolay Sivov : dwrite/bidi: Prepare for characters above BMP.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: 4a7a979e7971084f0e3791b490a28676a8fee9f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a7a979e7971084f0e3791b490a286… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 6 07:24:53 2022 +0300 dwrite/bidi: Prepare for characters above BMP. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 121 ++++++++----------- dlls/dwrite/bidi.c | 273 ++++++++++++++++++++++--------------------- dlls/dwrite/dwrite_private.h | 11 +- 3 files changed, 199 insertions(+), 206 deletions(-)

1 0

Nikolay Sivov : dwrite: Handle higher planes when setting DWRITE_SCRIPT_SHAPES_NO_VISUAL.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: d8584a16edef716b2f2690d8043e5b60d5d08da4 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8584a16edef716b2f2690d8043e5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 3 11:13:32 2022 +0300 dwrite: Handle higher planes when setting DWRITE_SCRIPT_SHAPES_NO_VISUAL. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 27 ++++++++++++++++----------- dlls/dwrite/tests/analyzer.c | 10 ++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 72d3aada285..8d7053a066e 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -654,17 +654,22 @@ static DWRITE_SCRIPT_ANALYSIS get_char_sa(UINT32 c) sa.script = get_char_script(c); sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; - if ((c >= 0x0001 && c <= 0x001f) || - (c >= 0x007f && c <= 0x009f) || - (c == 0x00ad) /* SOFT HYPHEN */ || - (c >= 0x200b && c <= 0x200f) || - (c >= 0x2028 && c <= 0x202e) || - (c >= 0x2060 && c <= 0x2064) || - (c >= 0x2066 && c <= 0x206f) || - (c == 0xfeff) || - (c == 0xfff9) || - (c == 0xfffa) || - (c == 0xfffb)) + if ((c >= 0x0001 && c <= 0x001f) /* C0 controls */ + || (c >= 0x007f && c <= 0x009f) /* DELETE, C1 controls */ + || (c == 0x00ad) /* SOFT HYPHEN */ + || (c >= 0x200b && c <= 0x200f) /* ZWSP, ZWNJ, ZWJ, LRM, RLM */ + || (c >= 0x2028 && c <= 0x202e) /* Line/paragraph separators, LRE, RLE, PDF, LRO, RLO */ + || (c >= 0x2060 && c <= 0x2064) /* WJ, invisible operators */ + || (c >= 0x2066 && c <= 0x2069) /* LRI, RLI, FSI, PDI */ + || (c >= 0x206a && c <= 0x206f) /* Deprecated control characters */ + || (c == 0xfeff) /* ZWBNSP */ + || (c == 0xfff9) /* Interlinear annotation */ + || (c == 0xfffa) + || (c == 0xfffb) + || (c >= 0x1bca0 && c <= 0x1bca3) /* Shorthand format controls */ + || (c >= 0x1d173 && c <= 0x1d17a) /* Musical symbols: beams and slurs */ + || (c == 0xe0001) /* Language tag, deprecated */ + || (c >= 0xe0020 && c <= 0xe007f)) /* Tag components */ { sa.shapes = DWRITE_SCRIPT_SHAPES_NO_VISUAL; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index aac0fcc0e01..0363293197e 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1026,6 +1026,16 @@ static struct sa_test sa_tests[] = { {0xd805,0xde80,0}, 1, { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT } } }, + { + /* Musical symbols, U+1D173 */ + {0xd834,0xdd73,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } + }, + { + /* Tags, U+E0020 */ + {0xdb40,0xdc20,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } + }, /* keep this as end test data marker */ { {0} } };

1 0

Francois Gouget : tests: Allow marking unreliable tests as flaky.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: f9b836b1c1d259b4c780d9388ec1d5fb25a83287 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9b836b1c1d259b4c780d9388ec1d5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 1 14:29:23 2022 +0200 tests: Allow marking unreliable tests as flaky. --- include/wine/test.h | 89 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 77 insertions(+), 12 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 3782c6eeeb6..505f0daaaf4 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -44,6 +44,9 @@ extern int winetest_time; /* running in interactive mode? */ extern int winetest_interactive; +/* always count flaky tests as successful (BOOL) */ +extern int winetest_allow_flaky; + /* report successful tests (BOOL) */ extern int winetest_report_success; @@ -59,6 +62,9 @@ extern void winetest_ignore_exceptions( BOOL ignore ); extern void winetest_start_todo( int is_todo ); extern int winetest_loop_todo(void); extern void winetest_end_todo(void); +extern void winetest_start_flaky( int is_flaky ); +extern int winetest_loop_flaky(void); +extern void winetest_end_flaky(void); extern int winetest_get_mainargs( char*** pargv ); extern LONG winetest_get_failures(void); extern void winetest_add_failures( LONG new_failures ); @@ -111,6 +117,13 @@ extern void winetest_pop_context(void); #define trace trace_(__FILE__, __LINE__) #define wait_child_process wait_child_process_(__FILE__, __LINE__) +#define flaky_if(is_flaky) for (winetest_start_flaky(is_flaky); \ + winetest_loop_flaky(); \ + winetest_end_flaky()) +#define flaky flaky_if(TRUE) +#define flaky_wine flaky_if(!strcmp(winetest_platform, "wine")) +#define flaky_wine_if(is_flaky) flaky_if((is_flaky) && !strcmp(winetest_platform, "wine")) + #define todo_if(is_todo) for (winetest_start_todo(is_todo); \ winetest_loop_todo(); \ winetest_end_todo()) @@ -194,6 +207,9 @@ int winetest_interactive = 0; /* current platform */ const char *winetest_platform = "windows"; +/* always count flaky tests as successful (BOOL) */ +int winetest_allow_flaky; + /* report successful tests (BOOL) */ int winetest_report_success = 0; @@ -211,6 +227,7 @@ static const struct test *current_test; /* test currently being run */ static LONG successes; /* number of successful tests */ static LONG failures; /* number of failures */ +static LONG flaky_failures; /* number of failures inside flaky block */ static LONG skipped; /* number of skipped test chunks */ static LONG todo_successes; /* number of successful tests inside todo block */ static LONG todo_failures; /* number of failures inside todo block */ @@ -226,6 +243,8 @@ struct tls_data { const char* current_file; /* file of current check */ int current_line; /* line of current check */ + unsigned int flaky_level; /* current flaky nesting level */ + int flaky_do_loop; unsigned int todo_level; /* current todo nesting level */ int todo_do_loop; char *str_pos; /* position in debug buffer */ @@ -283,10 +302,12 @@ const char *winetest_elapsed(void) static const char color_reset[] = "\e[0m"; static const char color_dark_red[] = "\e[31m"; +static const char color_dark_purple[] = "\e[35m"; static const char color_green[] = "\e[32m"; static const char color_yellow[] = "\e[33m"; static const char color_blue[] = "\e[34m"; static const char color_bright_red[] = "\e[1;91m"; +static const char color_bright_purple[] = "\e[1;95m"; static void winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static void winetest_printf( const char *msg, ... ) @@ -359,11 +380,21 @@ int winetest_vok( int condition, const char *msg, va_list args ) { if (condition) { - if (winetest_color) printf( color_dark_red ); - winetest_print_context( "Test succeeded inside todo block: " ); - vprintf(msg, args); + if (data->flaky_level) + { + if (winetest_color) printf( color_dark_purple ); + winetest_print_context( "Test succeeded inside flaky todo block: " ); + vprintf(msg, args); + InterlockedIncrement(&flaky_failures); + } + else + { + if (winetest_color) printf( color_dark_red ); + winetest_print_context( "Test succeeded inside todo block: " ); + vprintf(msg, args); + InterlockedIncrement(&todo_failures); + } if (winetest_color) printf( color_reset ); - InterlockedIncrement(&todo_failures); return 0; } else @@ -389,11 +420,21 @@ int winetest_vok( int condition, const char *msg, va_list args ) { if (!condition) { - if (winetest_color) printf( color_bright_red ); - winetest_print_context( "Test failed: " ); - vprintf(msg, args); + if (data->flaky_level) + { + if (winetest_color) printf( color_bright_purple ); + winetest_print_context( "Test marked flaky: " ); + vprintf(msg, args); + InterlockedIncrement(&flaky_failures); + } + else + { + if (winetest_color) printf( color_bright_red ); + winetest_print_context( "Test failed: " ); + vprintf(msg, args); + InterlockedIncrement(&failures); + } if (winetest_color) printf( color_reset ); - InterlockedIncrement(&failures); return 0; } else @@ -470,6 +511,27 @@ void winetest_win_skip( const char *msg, ... ) va_end(valist); } +void winetest_start_flaky( int is_flaky ) +{ + struct tls_data *data = get_tls_data(); + data->flaky_level = (data->flaky_level << 1) | (is_flaky != 0); + data->flaky_do_loop = 1; +} + +int winetest_loop_flaky(void) +{ + struct tls_data *data = get_tls_data(); + int do_flaky = data->flaky_do_loop; + data->flaky_do_loop = 0; + return do_flaky; +} + +void winetest_end_flaky(void) +{ + struct tls_data *data = get_tls_data(); + data->flaky_level >>= 1; +} + void winetest_start_todo( int is_todo ) { struct tls_data *data = get_tls_data(); @@ -615,14 +677,16 @@ static int run_test( const char *name ) printf( "%04x:%s:%s Silenced %d todos, %d skips and %d traces.\n", (UINT)GetCurrentProcessId(), test->name, winetest_elapsed(), (UINT)muted_todo_successes, (UINT)muted_skipped, (UINT)muted_traces); - printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d as flaky, %d %s), %d skipped.\n", (UINT)GetCurrentProcessId(), test->name, winetest_elapsed(), - (UINT)(successes + failures + todo_successes + todo_failures), - (UINT)todo_successes, (UINT)(failures + todo_failures), + (UINT)(successes + failures + flaky_failures + todo_successes + todo_failures), + (UINT)todo_successes, (UINT)flaky_failures, (UINT)(failures + todo_failures), (failures + todo_failures != 1) ? "failures" : "failure", (UINT)skipped ); } - status = (failures + todo_failures < 255) ? failures + todo_failures : 255; + status = failures + todo_failures; + if (!winetest_allow_flaky) status += flaky_failures; + if (status > 255) status = 255; return status; } @@ -694,6 +758,7 @@ int main( int argc, char **argv ) } if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_ALLOW_FLAKY", p, sizeof(p) )) winetest_allow_flaky = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p); if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); winetest_last_time = winetest_start_time = GetTickCount();

1 0

Alexandre Julliard : user32/tests: Remove checks that rely on the absolute position of a top-level window.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: e37769b108f8578e7d13ee276ad290ff463c3bd2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e37769b108f8578e7d13ee276ad290… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 17:32:55 2022 +0200 user32/tests: Remove checks that rely on the absolute position of a top-level window. --- dlls/user32/tests/msg.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9c77bdc7c09..610228c3559 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10128,15 +10128,6 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam case WM_MOUSEMOVE: case WM_NCMOUSEMOVE: return 0; - - case WM_ERASEBKGND: - { - RECT rc; - INT ret = GetClipBox((HDC)wParam, &rc); - - trace("WM_ERASEBKGND: GetClipBox()=%d, %s\n", ret, wine_dbgstr_rect(&rc)); - break; - } } msg.hwnd = hwnd; @@ -10525,7 +10516,6 @@ static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, switch (uMsg) { case CB_FINDSTRINGEXACT: - trace("String: %p\n", (LPCWSTR)lParam); if (!lstrcmpW((LPCWSTR)lParam, wszUnicode)) return 1; if (!lstrcmpW((LPCWSTR)lParam, wszAnsi)) @@ -13656,11 +13646,11 @@ static void test_TrackMouseEvent(void) static const struct message WmSetWindowRgn[] = { { WM_WINDOWPOSCHANGING, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE |SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE, 0 }, - { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, + { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_NCPAINT, sent|optional }, /* wparam != 1 */ { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE, 0xf }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; @@ -13668,17 +13658,17 @@ static const struct message WmSetWindowRgn[] = { static const struct message WmSetWindowRgn_no_redraw[] = { { WM_WINDOWPOSCHANGING, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE |SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW, 0 }, - { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, - { WM_WINDOWPOSCHANGED, sent|wparam|lparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW, 0xf }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; static const struct message WmSetWindowRgn_clear[] = { { WM_WINDOWPOSCHANGING, sent/*|wparam|lparam*/, SWP_NOACTIVATE|SWP_FRAMECHANGED - |SWP_NOSIZE|SWP_NOMOVE/*|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE only on some Windows versions */, 0xf + |SWP_NOSIZE|SWP_NOMOVE/*|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE only on some Windows versions */ /* Some newer Windows versions set window coordinates instead of zeros in WINDOWPOS structure */}, - { WM_NCCALCSIZE, sent|wparam|lparam, 1, 0xf }, + { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, /* FIXME: remove optional once Wine is fixed */

1 0

Alexandre Julliard : kernel32/tests: Don't test console flags that are modified by WINETEST_COLOR=1.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: e031f355b097bcc652fdced003989a93ed3fad50 URL: https://gitlab.winehq.org/wine/wine/-/commit/e031f355b097bcc652fdced003989a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 13:30:21 2022 +0200 kernel32/tests: Don't test console flags that are modified by WINETEST_COLOR=1. --- dlls/kernel32/tests/process.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 4a6451a23fe..287e84642be 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1573,6 +1573,10 @@ static void test_Console(void) SetConsoleMode(startup.hStdInput, modeIn); SetConsoleMode(startup.hStdOutput, modeOut); + /* don't test flag that is changed at startup if WINETEST_COLOR is set */ + modeOut = (modeOut & ~ENABLE_VIRTUAL_TERMINAL_PROCESSING) | + (modeOutC & ENABLE_VIRTUAL_TERMINAL_PROCESSING); + cpInC = GetConsoleCP(); cpOutC = GetConsoleOutputCP();

1 0

Eric Pouech : msvfw32: Test window creation with filename.
by Alexandre Julliard Sept. 5, 2022

Sept. 5, 2022

Module: wine Branch: master Commit: e9de4ae05cd2ce56302f117cd9755f453ae0a6eb URL: https://gitlab.winehq.org/wine/wine/-/commit/e9de4ae05cd2ce56302f117cd9755f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Sep 4 16:43:56 2022 +0200 msvfw32: Test window creation with filename. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvfw32/tests/mciwnd.c | 146 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 134 insertions(+), 12 deletions(-) diff --git a/dlls/msvfw32/tests/mciwnd.c b/dlls/msvfw32/tests/mciwnd.c index 85006ca95bf..915624b2eeb 100644 --- a/dlls/msvfw32/tests/mciwnd.c +++ b/dlls/msvfw32/tests/mciwnd.c @@ -153,6 +153,114 @@ static BOOL create_avi_file(char *fname) return ret; } +/* expected information for window creation */ +static struct { + /* input */ + const char* expectedA; + const WCHAR* expectedW; + /* output */ + unsigned open_msg; + enum {NO_MATCH, PTR_ANSI_MATCH, PTR_UNICODE_MATCH, ANSI_MATCH, UNICODE_MATCH, TODO_WINE = 0x40} match; +} wnd_creation; + +static WNDPROC old_MCIWndProc; +static LRESULT WINAPI proxy_MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam) +{ + switch (wMsg) + { + case WM_CREATE: + { + CREATESTRUCTW* cs = (CREATESTRUCTW*)lParam; + if (cs->lpCreateParams) + { + if (cs->lpCreateParams == wnd_creation.expectedA) + wnd_creation.match = PTR_ANSI_MATCH; + else if (cs->lpCreateParams == wnd_creation.expectedW) + wnd_creation.match = PTR_UNICODE_MATCH; + else if (!strcmp(cs->lpCreateParams, wnd_creation.expectedA)) + wnd_creation.match = ANSI_MATCH; + else if (!wcscmp(cs->lpCreateParams, wnd_creation.expectedW)) + wnd_creation.match = UNICODE_MATCH; + } + } + break; + case MCIWNDM_OPENA: + case MCIWNDM_OPENW: + wnd_creation.open_msg = wMsg; + break; + default: + break; + } + return old_MCIWndProc(hWnd, wMsg, wParam, lParam); +} + +static LRESULT CALLBACK hook_proc( int code, WPARAM wp, LPARAM lp ) +{ + if (code == HCBT_CREATEWND && lp) + { + CREATESTRUCTW* cs = ((CBT_CREATEWNDW *)lp)->lpcs; + if (cs && ((ULONG_PTR)cs->lpszClass >> 16) && !wcsicmp(cs->lpszClass, L"MCIWndClass")) + { + old_MCIWndProc = (WNDPROC)SetWindowLongPtrW((HWND)wp, GWLP_WNDPROC, (LPARAM)proxy_MCIWndProc); + ok(old_MCIWndProc != NULL, "No wnd proc\n"); + } + } + + return CallNextHookEx( NULL, code, wp, lp ); +} + +static void test_window_create(unsigned line, const char* fname, HWND parent, + BOOL with_mci, BOOL call_ansi, unsigned match) +{ + HMODULE hinst = GetModuleHandleA(NULL); + WCHAR fnameW[MAX_PATH]; + HWND window; + char error[200]; + LRESULT ret; + BOOL expect_ansi = (match & ~TODO_WINE) == PTR_ANSI_MATCH || (match & ~TODO_WINE) == ANSI_MATCH; + + MultiByteToWideChar(CP_ACP, 0, fname, -1, fnameW, ARRAY_SIZE(fnameW)); + + wnd_creation.expectedA = fname; + wnd_creation.expectedW = fnameW; + wnd_creation.open_msg = 0; + wnd_creation.match = NO_MATCH; + + if (call_ansi) + { + if (with_mci) + window = MCIWndCreateA(parent, hinst, MCIWNDF_NOERRORDLG, fname); + else + window = CreateWindowExA(0, "MCIWndClass", NULL, + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | MCIWNDF_NOERRORDLG, + 0, 0, 300, 0, + parent, 0, hinst, expect_ansi ? (LPVOID)fname : (LPVOID)fnameW); + } + else + { + if (with_mci) + window = MCIWndCreateW(parent, hinst, MCIWNDF_NOERRORDLG, fnameW); + else + window = CreateWindowExW(0, L"MCIWndClass", NULL, + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | MCIWNDF_NOERRORDLG, + 0, 0, 300, 0, + parent, 0, hinst, expect_ansi ? (LPVOID)fname : (LPVOID)fnameW); + } + ok_(__FILE__, line)(window != NULL, "Failed to create an MCIWnd window\n"); + ok_(__FILE__, line)(wnd_creation.match == (match & ~TODO_WINE), "unexpected match %u\n", wnd_creation.match); + todo_wine_if(match & TODO_WINE) + ok_(__FILE__, line)((expect_ansi && wnd_creation.open_msg == MCIWNDM_OPENA) || + (!expect_ansi && wnd_creation.open_msg == MCIWNDM_OPENW), + "bad open message %u %s%u\n", match, + wnd_creation.open_msg >= WM_USER ? "WM_USER+" : "", + wnd_creation.open_msg >= WM_USER ? wnd_creation.open_msg - WM_USER : wnd_creation.open_msg); + ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); + todo_wine_if(match & TODO_WINE) + ok_(__FILE__, line)(!ret || broken(ret == ERROR_INVALID_HANDLE) /* w2003std, w2008s64 */, + "Unexpected error %Id\n", ret); + DestroyWindow(window); +} + static void test_MCIWndCreate(void) { HWND parent, window; @@ -160,32 +268,46 @@ static void test_MCIWndCreate(void) char fname[MAX_PATH]; char invalid_fname[] = "invalid.avi"; char error[200]; + HHOOK hook; LRESULT ret; create_avi_file(fname); - window = MCIWndCreateA(NULL, hinst, MCIWNDF_NOERRORDLG, fname); - ok(window != NULL, "Failed to create an MCIWnd window without parent\n"); + hook = SetWindowsHookExW( WH_CBT, hook_proc, NULL, GetCurrentThreadId() ); - ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); - ok(!ret || broken(ret == ERROR_INVALID_HANDLE) /* w2003std, w2008s64 */, - "Unexpected error %Id\n", ret); - - DestroyWindow(window); + test_window_create( __LINE__, fname, NULL, TRUE, TRUE, UNICODE_MATCH | TODO_WINE ); + test_window_create( __LINE__, fname, NULL, TRUE, FALSE, PTR_UNICODE_MATCH | TODO_WINE ); + test_window_create( __LINE__, fname, NULL, FALSE, TRUE, PTR_ANSI_MATCH ); + test_window_create( __LINE__, fname, NULL, FALSE, FALSE, PTR_ANSI_MATCH ); parent = CreateWindowExA(0, "static", "msvfw32 test", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); ok(parent != NULL, "Failed to create a window\n"); - window = MCIWndCreateA(parent, hinst, MCIWNDF_NOERRORDLG, fname); - ok(window != NULL, "Failed to create an MCIWnd window\n"); + ok(!IsWindowUnicode(parent), "Expecting ansi parent window\n"); - ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); - ok(!ret || broken(ret == ERROR_INVALID_HANDLE) /* w2003std, w2008s64 */, - "Unexpected error %Id\n", ret); + test_window_create( __LINE__, fname, parent, TRUE, TRUE, UNICODE_MATCH | TODO_WINE ); + test_window_create( __LINE__, fname, parent, TRUE, FALSE, PTR_UNICODE_MATCH | TODO_WINE ); + test_window_create( __LINE__, fname, parent, FALSE, TRUE, PTR_ANSI_MATCH ); + test_window_create( __LINE__, fname, parent, FALSE, FALSE, PTR_ANSI_MATCH ); DestroyWindow(parent); + parent = CreateWindowExW(0, L"static", L"msvfw32 test", + WS_POPUP, 0, 0, 100, 100, + 0, 0, 0, NULL); + ok(parent != NULL, "Failed to create a window\n"); + ok(IsWindowUnicode(parent), "Expecting unicode parent window\n"); + + test_window_create( __LINE__, fname, parent, TRUE, TRUE, UNICODE_MATCH ); + test_window_create( __LINE__, fname, parent, TRUE, FALSE, PTR_UNICODE_MATCH ); + test_window_create( __LINE__, fname, parent, FALSE, TRUE, PTR_UNICODE_MATCH ); + test_window_create( __LINE__, fname, parent, FALSE, FALSE, PTR_UNICODE_MATCH ); + + DestroyWindow(parent); + + UnhookWindowsHookEx( hook ); + window = MCIWndCreateA(NULL, hinst, MCIWNDF_NOERRORDLG, invalid_fname); ok(window != NULL, "Failed to create an MCIWnd window\n");

1 0

Alexandre Julliard : unicode: Add data for high Unicode planes to the Arabic shaping table.
by Alexandre Julliard Sept. 5, 2022

Sept. 5, 2022

Module: wine Branch: master Commit: aeff5099fb4d7a013ea9400e76a56468a921ca80 URL: https://gitlab.winehq.org/wine/wine/-/commit/aeff5099fb4d7a013ea9400e76a564… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 12:07:59 2022 +0200 unicode: Add data for high Unicode planes to the Arabic shaping table. --- dlls/dwrite/shapers/arabic.c | 5 +- dlls/dwrite/shapers/arabic_table.c | 375 +++++++++++++++++++++++++++---------- tools/make_unicode | 2 +- 3 files changed, 279 insertions(+), 103 deletions(-)

1 0

Francois Gouget : mshtml: Add trailing linefeeds to a couple of FIXME() messages.
by Alexandre Julliard Sept. 5, 2022

Sept. 5, 2022

Module: wine Branch: master Commit: 2b5a4b75be10dd69f84060e9b4c5c3865dd360db URL: https://gitlab.winehq.org/wine/wine/-/commit/2b5a4b75be10dd69f84060e9b4c5c3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 25 11:55:42 2022 +0200 mshtml: Add trailing linefeeds to a couple of FIXME() messages. --- dlls/mshtml/omnavigator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 42e8149a602..c49f1b4f55f 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2769,7 +2769,7 @@ static HRESULT WINAPI media_query_list_addListener(IWineMSHTMLMediaQueryList *if { struct media_query_list *media_query_list = impl_from_IWineMSHTMLMediaQueryList(iface); - FIXME("(%p)->(%s)", media_query_list, debugstr_variant(listener)); + FIXME("(%p)->(%s)\n", media_query_list, debugstr_variant(listener)); return E_NOTIMPL; } @@ -2778,7 +2778,7 @@ static HRESULT WINAPI media_query_list_removeListener(IWineMSHTMLMediaQueryList { struct media_query_list *media_query_list = impl_from_IWineMSHTMLMediaQueryList(iface); - FIXME("(%p)->(%s)", media_query_list, debugstr_variant(listener)); + FIXME("(%p)->(%s)\n", media_query_list, debugstr_variant(listener)); return E_NOTIMPL; }

1 0