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

Jacek Caban : winex11: Use pthread_once in create_x11_physdev.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: aae54301207c1ce10f7f845c9ab6c5725036e2b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae54301207c1ce10f7f845c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:30:40 2022 +0200 winex11: Use pthread_once in create_x11_physdev. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 3447e7bc69f..88d09145f8e 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -37,7 +37,7 @@ static int palette_size; static Pixmap stock_bitmap_pixmap; /* phys bitmap for the default stock bitmap */ -static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; +static pthread_once_t init_once = PTHREAD_ONCE_INIT; static const struct user_driver_funcs x11drv_funcs; static const struct gdi_dc_funcs *xrender_funcs; @@ -59,7 +59,7 @@ void init_recursive_mutex( pthread_mutex_t *mutex ) * * Perform initializations needed upon creation of the first device. */ -static BOOL WINAPI device_init( INIT_ONCE *once, void *param, void **context ) +static void device_init(void) { /* Initialize XRender */ xrender_funcs = X11DRV_XRender_Init(); @@ -70,8 +70,6 @@ static BOOL WINAPI device_init( INIT_ONCE *once, void *param, void **context ) palette_size = X11DRV_PALETTE_Init(); stock_bitmap_pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 1 ); - - return TRUE; } @@ -79,7 +77,7 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) { X11DRV_PDEVICE *physDev; - InitOnceExecuteOnce( &init_once, device_init, NULL, NULL ); + pthread_once( &init_once, device_init ); if (!(physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ))) return NULL;

1 0

Huw Davies : winealsa: Wait for the notify buffer to empty, rather than dropping an event.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: ff1641ce0aee9e4f26aaadeb24630597b0cd7356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff1641ce0aee9e4f26aaadeb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 19 13:18:33 2022 +0100 winealsa: Wait for the notify buffer to empty, rather than dropping an event. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52828 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Jacek Caban : winex11: Directly use ntdll in display_device_init mutex.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 12cb04fd2f13707e5b7eeed24f0ef916e71cd4fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=12cb04fd2f13707e5b7eeed2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:31:53 2022 +0200 winex11: Directly use ntdll in display_device_init mutex. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 928d2bd16f0..f90cc455c36 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -29,17 +29,21 @@ struct x11drv_display_device_handler desktop_handler; HANDLE get_display_device_init_mutex(void) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; - HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); - - WaitForSingleObject(mutex, INFINITE); + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t'}; + UNICODE_STRING name = { sizeof(init_mutexW), sizeof(init_mutexW), (WCHAR *)init_mutexW }; + OBJECT_ATTRIBUTES attr; + HANDLE mutex = 0; + + InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); + NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ); + if (mutex) NtWaitForSingleObject( mutex, FALSE, NULL ); return mutex; } void release_display_device_init_mutex(HANDLE mutex) { - ReleaseMutex(mutex); - CloseHandle(mutex); + NtReleaseMutant( mutex, NULL ); + NtClose( mutex ); } POINT virtual_screen_to_root(INT x, INT y)

1 0

Nikolay Sivov : gdi32: Use NtUserGetSysColor() directly.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: f534e3f499dbee05352e155e43fbf9df0289d56f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f534e3f499dbee05352e155e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 14:00:32 2022 +0100 gdi32: Use NtUserGetSysColor() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/uniscribe/usp10.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index a5637dbf645..3e27fcc2a03 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -31,6 +31,7 @@ #include "windef.h" #include "winbase.h" #include "ntgdi.h" +#include "ntuser.h" #include "winuser.h" #include "winnls.h" #include "winreg.h" @@ -2107,19 +2108,6 @@ static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WOR return FALSE; } -static DWORD get_sys_color(INT index) -{ - static DWORD (WINAPI *pGetSysColor)(INT index); - - if (!pGetSysColor) - { - HMODULE user = GetModuleHandleW( L"user32.dll" ); - if (user) pGetSysColor = (void *)GetProcAddress( user, "GetSysColor" ); - } - - return pGetSysColor(index); -} - static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, int iX, int iY, @@ -2159,11 +2147,11 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, BkMode = GetBkMode(analysis->hdc); SetBkMode( analysis->hdc, OPAQUE); BkColor = GetBkColor(analysis->hdc); - SetBkColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHT)); + SetBkColor(analysis->hdc, NtUserGetSysColor(COLOR_HIGHLIGHT)); if (!fDisabled) { TextColor = GetTextColor(analysis->hdc); - SetTextColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHTTEXT)); + SetTextColor(analysis->hdc, NtUserGetSysColor(COLOR_HIGHLIGHTTEXT)); } } if (analysis->glyphs[iItem].fallbackFont)

1 0

Jacek Caban : win32u: Expose public parts of user_thread_info in ntuser.h.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 356f37466fe1db8216c86c7a5bbe41876b07f196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=356f37466fe1db8216c86c7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:31:01 2022 +0200 win32u: Expose public parts of user_thread_info in ntuser.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 12 ++++++------ dlls/user32/win.c | 6 +++--- dlls/win32u/driver.c | 2 +- dlls/win32u/message.c | 12 ++++++------ dlls/win32u/ntuser_private.h | 6 +----- dlls/win32u/sysparams.c | 2 +- dlls/win32u/window.c | 6 +++--- dlls/win32u/winstation.c | 6 +++--- include/ntuser.h | 15 +++++++++++++++ 9 files changed, 39 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=356f37466fe1db8216c8…

1 0

Connor McAdams : webservices/tests: Add test for binary encoding nested structure handling.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 0913f72e6365948bf7b77833e7965f62c51bde17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0913f72e6365948bf7b77833… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Apr 18 13:13:08 2022 -0400 webservices/tests: Add test for binary encoding nested structure handling. Add a test for a nested structure with an optional ending element. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 89 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index eacde56928d..1a2cd1fe420 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4874,6 +4874,8 @@ static const WS_XML_TEXT_NODE *read_text_node( WS_XML_READER *reader ) static void test_binary_encoding(void) { + WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_s_a = {3, (BYTE *)"s_a"}, str_s_b = {3, (BYTE *)"s_b"}; + WS_XML_STRING str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; static WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; static const char test[] = {0x40,0x01,'t',0x01}; @@ -4949,6 +4951,9 @@ static void test_binary_encoding(void) {0x40,0x01,'t',0x05,0x02,'p','2',0x01,'t',0x98,0x04,'t','e','s','t',0x09,0x02,'p','2',0x02,'n','s',0x01}; static const char test200[] = {0x02,0x07,'c','o','m','m','e','n','t'}; + static const char test_endelem[] = + { 0x40, 0x01, 't', 0x40, 0x01, 'a', 0x83, 0x40, 0x01, 's', 0x40, 0x03, 's', '_', 'a', 0x82, 0x01, 0x01, + 0x40, 0x01, 'b', 0x83, 0x01 }; const WS_XML_NODE *node; const WS_XML_TEXT_NODE *text_node; const WS_XML_ELEMENT_NODE *elem; @@ -4969,8 +4974,8 @@ static void test_binary_encoding(void) WS_HEAP *heap; BOOL found; HRESULT hr; - WS_STRUCT_DESCRIPTION s; - WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION s, s2; + WS_FIELD_DESCRIPTION f, f1[3], f2[2], *fields[3], *fields2[2]; struct typetest { WS_BYTES data; @@ -4983,6 +4988,17 @@ static void test_binary_encoding(void) { UINT64 val; } *typetest3; + struct s + { + INT32 s_a; + INT32 s_b; + }; + struct test + { + INT32 a; + struct s *s; + INT32 b; + } *test_struct; hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); @@ -5689,6 +5705,75 @@ static void test_binary_encoding(void) WS_READ_REQUIRED_POINTER, heap, &typetest3, sizeof(typetest3), NULL ); ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); + /* Test optional ending field on a nested struct. */ + hr = set_input_bin( reader, test_endelem, sizeof(test_endelem), NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + memset( &f1[0], 0, sizeof(f1[0]) ); + f1[0].mapping = WS_ELEMENT_FIELD_MAPPING; + f1[0].localName = &str_a; + f1[0].ns = &ns; + f1[0].type = WS_INT32_TYPE; + fields[0] = &f1[0]; + + memset( &f1[1], 0, sizeof(f1[1]) ); + f1[1].mapping = WS_ELEMENT_FIELD_MAPPING; + f1[1].localName = &str_s; + f1[1].ns = &ns; + f1[1].type = WS_STRUCT_TYPE; + f1[1].typeDescription = &s2; + f1[1].options = WS_FIELD_POINTER; + f1[1].offset = FIELD_OFFSET(struct test, s); + fields[1] = &f1[1]; + + memset( &f1[2], 0, sizeof(f1[2]) ); + f1[2].mapping = WS_ELEMENT_FIELD_MAPPING; + f1[2].localName = &str_b; + f1[2].ns = &ns; + f1[2].type = WS_INT32_TYPE; + f1[2].offset = FIELD_OFFSET(struct test, b); + fields[2] = &f1[2]; + + memset( &f2[0], 0, sizeof(f2[0]) ); + f2[0].mapping = WS_ELEMENT_FIELD_MAPPING; + f2[0].localName = &str_s_a; + f2[0].ns = &ns; + f2[0].type = WS_INT32_TYPE; + fields2[0] = &f2[0]; + + memset( &f2[1], 0, sizeof(f2[1]) ); + f2[1].mapping = WS_ELEMENT_FIELD_MAPPING; + f2[1].localName = &str_s_b; + f2[1].ns = &ns; + f2[1].type = WS_INT32_TYPE; + f2[1].offset = FIELD_OFFSET(struct s, s_b); + f2[1].options = WS_FIELD_OPTIONAL; + fields2[1] = &f2[1]; + + memset( &s2, 0, sizeof(s2) ); + s2.size = sizeof(struct s); + s2.alignment = TYPE_ALIGNMENT(struct s); + s2.fields = fields2; + s2.fieldCount = 2; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 3; + + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test_struct, sizeof(test_struct), NULL ); + todo_wine ok( hr == S_OK, "got %#lx\n", hr ); + if (SUCCEEDED(hr)) + { + ok( test_struct->a == 1, "got %d\n", test_struct->a ); + ok( !!test_struct->s, "s is not set\n" ); + ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); + ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); + ok( test_struct->b == 1, "got %d\n", test_struct->b ); + } + WsFreeHeap( heap ); WsFreeReader( reader ); }

1 0

Jacek Caban : winex11: Use TEB to store driver thread data.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: db9b7b0f511197255d0cbe81605a42e34bf630d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db9b7b0f511197255d0cbe81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:31:41 2022 +0200 winex11: Use TEB to store driver thread data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7ac31e326c6..900f24c4002 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -478,8 +478,8 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { + struct x11drv_thread_data *data = x11drv_thread_data(); DWORD ret; - struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); if (!data) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 086e66b2366..23886936dd4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -395,14 +395,10 @@ struct x11drv_thread_data }; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN; -extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - DWORD err = GetLastError(); /* TlsGetValue always resets last error */ - struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); - SetLastError( err ); - return data; + return NtUserGetThreadInfo()->driver_data; } /* retrieve the thread display, or NULL if not created yet */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 203237f24aa..14ee13dc676 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -81,7 +81,6 @@ BOOL client_side_with_render = TRUE; BOOL shape_layered_windows = TRUE; int copy_default_colors = 128; int alloc_system_colors = 256; -DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; int xrender_error_base = 0; HMODULE x11drv_module = 0; char *process_name = NULL; @@ -650,8 +649,6 @@ static BOOL process_attach(void) setup_options(); - if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; - /* Open display */ if (!XInitThreads()) ERR( "XInitThreads failed, trouble ahead\n" ); @@ -702,7 +699,7 @@ static BOOL process_attach(void) */ void X11DRV_ThreadDetach(void) { - struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + struct x11drv_thread_data *data = x11drv_thread_data(); if (data) { @@ -712,7 +709,7 @@ void X11DRV_ThreadDetach(void) XCloseDisplay( data->display ); HeapFree( GetProcessHeap(), 0, data ); /* clear data in case we get re-entered from user32 before the thread is truly dead */ - TlsSetValue( thread_data_tls_index, NULL ); + NtUserGetThreadInfo()->driver_data = NULL; } } @@ -773,7 +770,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) if (TRACE_ON(synchronous)) XSynchronize( data->display, True ); set_queue_display_fd( data->display ); - TlsSetValue( thread_data_tls_index, data ); + NtUserGetThreadInfo()->driver_data = data; if (use_xim) X11DRV_SetupXIM(); diff --git a/include/ntuser.h b/include/ntuser.h index e391940d63e..8eafd78beef 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -45,6 +45,7 @@ enum /* TEB thread info, not compatible with Windows */ struct ntuser_thread_info { + void *driver_data; /* driver-specific data */ DWORD message_time; /* value for GetMessageTime */ DWORD message_pos; /* value for GetMessagePos */ ULONG_PTR message_extra; /* value for GetMessageExtraInfo */

1 0

Jacek Caban : winex11: Use build_hwnd_list for X11DRV_DisplayDevices_Update implementation.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 29062759676e87551848de5b2787304d7f950b49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29062759676e87551848de5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:30:26 2022 +0200 winex11: Use build_hwnd_list for X11DRV_DisplayDevices_Update implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 50 +++++++++++++++++++++++----------------------- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 ++ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a7229d3a256..928d2bd16f0 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -174,35 +174,13 @@ void X11DRV_DisplayDevices_RegisterEventHandlers(void) handler->register_event_handlers(); } -static BOOL CALLBACK update_windows_on_display_change(HWND hwnd, LPARAM lparam) -{ - struct x11drv_win_data *data; - UINT mask = (UINT)lparam; - - if (!(data = get_win_data(hwnd))) - return TRUE; - - /* update the full screen state */ - update_net_wm_states(data); - - if (mask && data->whole_window) - { - POINT pos = virtual_screen_to_root(data->whole_rect.left, data->whole_rect.top); - XWindowChanges changes; - changes.x = pos.x; - changes.y = pos.y; - XReconfigureWMWindow(data->display, data->whole_window, data->vis.screen, mask, &changes); - } - release_win_data(data); - return TRUE; -} - void X11DRV_DisplayDevices_Update(BOOL send_display_change) { RECT old_virtual_rect, new_virtual_rect; DWORD tid, pid; HWND foreground; - UINT mask = 0; + UINT mask = 0, i; + HWND *list; old_virtual_rect = NtUserGetVirtualScreenRect(); X11DRV_DisplayDevices_Init(TRUE); @@ -215,7 +193,29 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) mask |= CWY; X11DRV_resize_desktop(send_display_change); - EnumWindows(update_windows_on_display_change, (LPARAM)mask); + + list = build_hwnd_list(); + for (i = 0; list && list[i] != HWND_BOTTOM; i++) + { + struct x11drv_win_data *data; + + if (!(data = get_win_data( list[i] ))) continue; + + /* update the full screen state */ + update_net_wm_states(data); + + if (mask && data->whole_window) + { + POINT pos = virtual_screen_to_root(data->whole_rect.left, data->whole_rect.top); + XWindowChanges changes; + changes.x = pos.x; + changes.y = pos.y; + XReconfigureWMWindow(data->display, data->whole_window, data->vis.screen, mask, &changes); + } + release_win_data(data); + } + + free( list ); /* forward clip_fullscreen_window request to the foreground window */ if ((foreground = NtUserGetForegroundWindow()) && diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index c1fc008b7d3..4c4e47884ff 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -171,7 +171,7 @@ static BOOL is_managed( HWND hwnd ) return ret; } -static HWND *build_hwnd_list(void) +HWND *build_hwnd_list(void) { NTSTATUS status; HWND *list; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 95e4b4ff29a..086e66b2366 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -28,6 +28,7 @@ #include <limits.h> #include <stdarg.h> +#include <stdlib.h> #include <pthread.h> #include <X11/Xlib.h> #include <X11/Xresource.h> @@ -690,6 +691,7 @@ extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN; extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN; extern DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) DECLSPEC_HIDDEN; +extern HWND *build_hwnd_list(void) DECLSPEC_HIDDEN; typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void *arg );

1 0

Nikolay Sivov : xmllite/tests: Use wide string literals.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 416d1416a5461ba06109bf906c8c90aeb52a51e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=416d1416a5461ba06109bf90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 09:18:42 2022 +0300 xmllite/tests: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 47 +++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d9c831fb52d..c4af39173a6 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1248,7 +1248,6 @@ static const char test_public_dtd[] = static void test_read_public_dtd(void) { - static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; IXmlReader *reader; const WCHAR *str; XmlNodeType type; @@ -1299,8 +1298,8 @@ static void test_read_public_dtd(void) hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine { - ok(len == lstrlenW(dtdnameW), "got %u\n", len); - ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); + ok(len == 7, "got %u\n", len); + ok(!lstrcmpW(str, L"testdtd"), "got %s\n", wine_dbgstr_w(str)); } IXmlReader_Release(reader); } @@ -1311,7 +1310,6 @@ static const char test_system_dtd[] = static void test_read_system_dtd(void) { - static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; IXmlReader *reader; const WCHAR *str; XmlNodeType type; @@ -1352,8 +1350,8 @@ static void test_read_system_dtd(void) hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine { - ok(len == lstrlenW(dtdnameW), "got %u\n", len); - ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); + ok(len == 7, "got %u\n", len); + ok(!lstrcmpW(str, L"testdtd"), "got %s\n", wine_dbgstr_w(str)); } read_node(reader, XmlNodeType_Comment); @@ -2550,16 +2548,7 @@ static void test_attribute_by_name(void) { static const char *xml = "<a><elem xmlns=\"myns\" a=\"value a\" b=\"value b\" xmlns:ns=\"ns uri\" " "ns:c=\"value c\" c=\"value c2\"/></a>"; - static const WCHAR xmlns_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', - '2','0','0','0','/','x','m','l','n','s','/',0}; - static const WCHAR nsuriW[] = {'n','s',' ','u','r','i',0}; - static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; - static const WCHAR mynsW[] = {'m','y','n','s',0}; - static const WCHAR nsW[] = {'n','s',0}; - static const WCHAR emptyW[] = {0}; - static const WCHAR aW[] = {'a',0}; - static const WCHAR bW[] = {'b',0}; - static const WCHAR cW[] = {'c',0}; + static const WCHAR xmlns_uriW[] = L"http://www.w3.org/2000/xmlns/"; IXmlReader *reader; HRESULT hr; @@ -2571,12 +2560,12 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); - hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); @@ -2587,43 +2576,43 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, NULL, xmlns_uriW); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, emptyW, xmlns_uriW); + hr = IXmlReader_MoveToAttributeByName(reader, L"", xmlns_uriW); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, xmlns_uriW); + hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"myns"); - hr = IXmlReader_MoveToAttributeByName(reader, aW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value a"); - hr = IXmlReader_MoveToAttributeByName(reader, bW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value b"); - hr = IXmlReader_MoveToAttributeByName(reader, aW, mynsW); + hr = IXmlReader_MoveToAttributeByName(reader, L"a", L"myns"); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, nsW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"ns", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, nsW, xmlns_uriW); + hr = IXmlReader_MoveToAttributeByName(reader, L"ns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"ns uri"); - hr = IXmlReader_MoveToAttributeByName(reader, bW, emptyW); + hr = IXmlReader_MoveToAttributeByName(reader, L"b", L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value b"); - hr = IXmlReader_MoveToAttributeByName(reader, cW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"c", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value c2"); - hr = IXmlReader_MoveToAttributeByName(reader, cW, nsuriW); + hr = IXmlReader_MoveToAttributeByName(reader, L"c", L"ns uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value c");

1 0

Huw Davies : wineoss: Remove some unused members.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: dbb2a75aeae42ef6d0c5d1d234066845dfab4594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb2a75aeae42ef6d0c5d1d2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 19 07:38:42 2022 +0100 wineoss: Remove some unused members. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 439bc9e442c..03c329680e5 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -67,11 +67,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - DWORD bufsize; MIDIOPENDESC midiDesc; WORD wFlags; LPMIDIHDR lpQueueHdr; - DWORD dwTotalPlayed; unsigned char incoming[3]; unsigned char incPrev; char incLen; @@ -81,11 +79,9 @@ typedef struct { typedef struct { BOOL bEnabled; - DWORD bufsize; MIDIOPENDESC midiDesc; WORD wFlags; LPMIDIHDR lpQueueHdr; - DWORD dwTotalPlayed; void* lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ MIDIOUTCAPSW caps; } WINE_MIDIOUT; @@ -749,8 +745,6 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].dwTotalPlayed = 0; - MidiInDev[wDevID].bufsize = 0x3FFF; MidiInDev[wDevID].midiDesc = *lpDesc; MidiInDev[wDevID].state = 0; MidiInDev[wDevID].incLen = 0; @@ -796,7 +790,6 @@ static DWORD midClose(WORD wDevID) } midiCloseSeq(); - MidiInDev[wDevID].bufsize = 0; MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); MidiInDev[wDevID].midiDesc.hMidi = 0; return ret; @@ -1130,8 +1123,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); MidiOutDev[wDevID].lpQueueHdr = NULL; - MidiOutDev[wDevID].dwTotalPlayed = 0; - MidiOutDev[wDevID].bufsize = 0x3FFF; MidiOutDev[wDevID].midiDesc = *lpDesc; MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); @@ -1175,7 +1166,6 @@ static DWORD modClose(WORD wDevID) HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra); MidiOutDev[wDevID].lpExtra = 0; - MidiOutDev[wDevID].bufsize = 0; MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); MidiOutDev[wDevID].midiDesc.hMidi = 0; return ret;

1 0