April 2022 - Wine-devel - list.winehq.org

[PATCH resend 1/5] mf/tests: Simplify handling of broken Win7 results.
by Rémi Bernon 19 Apr '22

19 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 231858, 231871-231874 FWIW I'm also happy to move the tests elsewhere if it's a burden. I now think that, though there's no guarantee the modules won't change, the transform / dmo classes and their tests should perhaps better live in the same modules where native has them. It is in theory possible that some applications load them and instantiate the classes directly, and I don't think it is likely that windows will remove these modules. The main blocker for that is winegstreamer being a dll and the classes being registered in it. Perhaps it should be a static lib instead, or expose the unixlib interface as its PE entry points. dlls/mf/tests/mf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 31a84e47bc1..b2dd807dd33 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6631,6 +6631,7 @@ static void test_h264_decoder(void) IMFMediaType *media_type; IMFTransform *transform; DWORD status, length; + BOOL is_win7 = FALSE; ULONG i, ret, flags; HANDLE output_file; IMFSample *sample; @@ -6741,10 +6742,9 @@ static void test_h264_decoder(void) winetest_push_context("out %lu", i); ok(hr == S_OK, "GetOutputAvailableType returned %#lx\n", hr); check_media_type(media_type, default_outputs[i], -1); - if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL))) - check_media_type(media_type, default_outputs_win7[i], -1); - else - check_media_type(media_type, default_outputs_extra[i], -1); + hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL); + is_win7 = broken(FAILED(hr)); + check_media_type(media_type, is_win7 ? default_outputs_win7[i] : default_outputs_extra[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); @@ -6772,11 +6772,9 @@ static void test_h264_decoder(void) init_media_type(media_type, output_type_desc, i + 1); } hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - if (broken(hr == MF_E_INVALIDMEDIATYPE)) - { - init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1); - hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - } + ok(hr == (is_win7 ? MF_E_INVALIDMEDIATYPE : S_OK), "SetOutputType returned %#lx.\n", hr); + init_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 1, "Release returned %lu\n", ret); -- 2.35.1

2 7

[tools 1/4] testbot/cgi: Add support for importing JavaScript files.
by Francois Gouget 19 Apr '22

19 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 7 +++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index d7463b5a8..406ca4ff8 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -369,6 +369,13 @@ sub GetTitle($) return undef; } +sub GenerateImportJS($$) +{ + my ($self, $Filename) = @_; + + $self->{PageBase}->GenerateImportJS($Filename); +} + sub GenerateHttpHeaders($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 477a2ff15..0dacbf6dd 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -397,6 +397,17 @@ sub GetPageTitle($$) return $Title; } +sub GenerateImportJS($$) +{ + my ($self, $Filename) = @_; + + if (!$self->{js}->{$Filename}) + { + print "<script type='text/javascript' src='$Filename'></script>\n"; + $self->{js}->{$Filename} = 1; + } +} + sub GenerateHttpHeaders($) { my ($self) = @_; -- 2.30.2

1 3

[PATCH 1/8] jscript: Initialize hres in String constructor.
by Gabriel Ivăncescu 19 Apr '22

19 Apr '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Sorry about this. c464c1bd4781ca650a5397ff6a2cfd574c1877f0 made it possibly used uninitialized when argc was 0 and return value was not used. dlls/jscript/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e73b9e8..dac89c9 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1628,7 +1628,7 @@ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, jsval_t vthis, WORD static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - HRESULT hres; + HRESULT hres = S_OK; TRACE("\n"); -- 2.34.1

3 20

[PATCH 9/9] win32u: Move NtUserFindWindowEx implementation from user32.
by Jacek Caban 19 Apr '22

19 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 61 +++++++---------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 49 +++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 16 +++++++++++ include/ntuser.h | 2 ++ 7 files changed, 80 insertions(+), 52 deletions(-)

2 1

[PATCH] winealsa: Wait for the notify buffer to empty, rather than dropping an event.
by Huw Davies 19 Apr '22

19 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52828 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 42 ++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 4f3f5538891..b226dac310f 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -90,7 +90,8 @@ static int rec_cancel_pipe[2]; static pthread_t rec_thread_id; static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; -static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; +static pthread_cond_t notify_read_cond = PTHREAD_COND_INITIALIZER; +static pthread_cond_t notify_write_cond = PTHREAD_COND_INITIALIZER; static BOOL notify_quit; #define NOTIFY_BUFFER_SIZE 64 + 1 /* + 1 for the sentinel */ static struct notify_context notify_buffer[NOTIFY_BUFFER_SIZE]; @@ -156,19 +157,23 @@ static struct notify_context *notify_buffer_next(struct notify_context *notify) return notify; } -static void notify_buffer_add(struct notify_context *notify) +static BOOL notify_buffer_empty(void) { - struct notify_context *next = notify_buffer_next(notify_write); + return notify_read == notify_write; +} - if (next == notify_read) /* buffer is full - we can't issue a WARN() in a non-Win32 thread */ - notify_read = notify_buffer_next(notify_read); /* drop the oldest notification */ - *notify_write = *notify; - notify_write = next; +static BOOL notify_buffer_full(void) +{ + return notify_buffer_next(notify_write) == notify_read; } -static BOOL notify_buffer_empty(void) +static BOOL notify_buffer_add(struct notify_context *notify) { - return notify_read == notify_write; + if (notify_buffer_full()) return FALSE; + + *notify_write = *notify; + notify_write = notify_buffer_next(notify_write); + return TRUE; } static BOOL notify_buffer_remove(struct notify_context *notify) @@ -184,9 +189,15 @@ static void notify_post(struct notify_context *notify) { pthread_mutex_lock(&notify_mutex); - if (notify) notify_buffer_add(notify); + if (notify) + { + while (notify_buffer_full()) + pthread_cond_wait(&notify_write_cond, &notify_mutex); + + notify_buffer_add(notify); + } else notify_quit = TRUE; - pthread_cond_signal(&notify_cond); + pthread_cond_signal(&notify_read_cond); pthread_mutex_unlock(&notify_mutex); } @@ -1476,11 +1487,14 @@ NTSTATUS midi_notify_wait(void *args) pthread_mutex_lock(&notify_mutex); while (!notify_quit && notify_buffer_empty()) - pthread_cond_wait(&notify_cond, &notify_mutex); + pthread_cond_wait(&notify_read_cond, &notify_mutex); *params->quit = notify_quit; - if (!notify_quit) notify_buffer_remove(params->notify); - + if (!notify_quit) + { + notify_buffer_remove(params->notify); + pthread_cond_signal(&notify_write_cond); + } pthread_mutex_unlock(&notify_mutex); return STATUS_SUCCESS; -- 2.25.1

2 1

[PATCH 8/9] winex11: Directly use ntdll in display_device_init mutex.
by Jacek Caban 19 Apr '22

19 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/display.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)

2 1

[PATCH 7/9] winex11: Use TEB to store driver thread data.
by Jacek Caban 19 Apr '22

19 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/x11drv.h | 6 +----- dlls/winex11.drv/x11drv_main.c | 9 +++------ include/ntuser.h | 1 + 4 files changed, 6 insertions(+), 12 deletions(-)

2 1

[PATCH 6/9] winex11: Use NtUserGetThreadInfo to access thread data.
by Jacek Caban 19 Apr '22

19 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 3 --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 2 +- include/ntuser.h | 6 ------ 4 files changed, 2 insertions(+), 11 deletions(-)

2 1

[PATCH 5/9] win32u: Expose public parts of user_thread_info in ntuser.h.
by Jacek Caban 19 Apr '22

19 Apr '22

2 1

[PATCH 4/9] winex11: Use pthread_once in create_x11_physdev.
by Jacek Caban 19 Apr '22

19 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/init.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

2 1