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

Jacek Caban : winex11: Use pthread for surface locking.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: e395c161edf239bbe8055c2237857a44d2fe9b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e395c161edf239bbe8055c22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:26 2022 +0200 winex11: Use pthread for surface locking. 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/Makefile.in | 2 +- dlls/winex11.drv/bitblt.c | 11 ++++------- dlls/winex11.drv/init.c | 12 ++++++++++++ dlls/winex11.drv/x11drv.h | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index b6b1062c425..ff2e38d64a7 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -3,7 +3,7 @@ MODULE = winex11.drv IMPORTS = uuid user32 gdi32 win32u DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) -EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) +EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) $(PTHREAD_LIBS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index bae0784be78..963fde035da 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1583,7 +1583,7 @@ struct x11drv_window_surface #ifdef HAVE_LIBXXSHM XShmSegmentInfo shminfo; #endif - CRITICAL_SECTION crit; + pthread_mutex_t mutex; BITMAPINFO info; /* variable size, must be last */ }; @@ -1831,7 +1831,7 @@ static void x11drv_surface_lock( struct window_surface *window_surface ) { struct x11drv_window_surface *surface = get_x11_surface( window_surface ); - EnterCriticalSection( &surface->crit ); + pthread_mutex_lock( &surface->mutex ); } /*********************************************************************** @@ -1841,7 +1841,7 @@ static void x11drv_surface_unlock( struct window_surface *window_surface ) { struct x11drv_window_surface *surface = get_x11_surface( window_surface ); - LeaveCriticalSection( &surface->crit ); + pthread_mutex_unlock( &surface->mutex ); } /*********************************************************************** @@ -1987,8 +1987,6 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) surface->image->data = NULL; XDestroyImage( surface->image ); } - surface->crit.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &surface->crit ); if (surface->region) NtGdiDeleteObjectApp( surface->region ); HeapFree( GetProcessHeap(), 0, surface ); } @@ -2026,8 +2024,7 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co surface->info.bmiHeader.biSizeImage = get_dib_image_size( &surface->info ); if (format->bits_per_pixel > 8) set_color_info( vis, &surface->info, use_alpha ); - InitializeCriticalSection( &surface->crit ); - surface->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": surface"); + init_recursive_mutex( &surface->mutex ); surface->header.funcs = &x11drv_surface_funcs; surface->header.rect = *rect; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8f4bb9fd7e9..3447e7bc69f 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -42,6 +42,18 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static const struct user_driver_funcs x11drv_funcs; static const struct gdi_dc_funcs *xrender_funcs; + +void init_recursive_mutex( pthread_mutex_t *mutex ) +{ + pthread_mutexattr_t attr; + + pthread_mutexattr_init( &attr ); + pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); + pthread_mutex_init( mutex, &attr ); + pthread_mutexattr_destroy( &attr ); +} + + /********************************************************************** * device_init * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 07c36899eb3..ed7a75a8d17 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -28,6 +28,7 @@ #include <limits.h> #include <stdarg.h> +#include <pthread.h> #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> @@ -702,6 +703,7 @@ extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_work_area( const RECT *monitor_rect ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; +extern void init_recursive_mutex( pthread_mutex_t *mutex ) DECLSPEC_HIDDEN; #define DEPTH_COUNT 3 extern const unsigned int *depths DECLSPEC_HIDDEN;

1 0

Jacek Caban : winex11: Use pthread for win data locking.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: fd83308b0b89dc560df77221dcd509bca336a323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd83308b0b89dc560df77221… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:59 2022 +0200 winex11: Use pthread for win data locking. 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/window.c | 28 +++++++++++++++------------- dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/x11drv_main.c | 4 +--- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index dd5c298c7a6..3f20fc9c7d2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -86,7 +86,7 @@ BOOL clipping_cursor = FALSE; XContext winContext = 0; /* X context to associate a struct x11drv_win_data to an hwnd */ -XContext win_data_context = 0; +static XContext win_data_context = 0; /* time of last user event and window where it's stored */ static Time last_user_time; @@ -99,14 +99,7 @@ static const WCHAR whole_window_prop[] = static const WCHAR clip_window_prop[] = {'_','_','w','i','n','e','_','x','1','1','_','c','l','i','p','_','w','i','n','d','o','w',0}; -static CRITICAL_SECTION win_data_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &win_data_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": win_data_section") } -}; -static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t win_data_mutex = PTHREAD_MUTEX_INITIALIZER; /*********************************************************************** @@ -215,7 +208,7 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) data->display = display; data->vis = default_visual; data->hwnd = hwnd; - EnterCriticalSection( &win_data_section ); + pthread_mutex_lock( &win_data_mutex ); XSaveContext( gdi_display, (XID)hwnd, win_data_context, (char *)data ); } return data; @@ -1938,10 +1931,10 @@ struct x11drv_win_data *get_win_data( HWND hwnd ) char *data; if (!hwnd) return NULL; - EnterCriticalSection( &win_data_section ); + pthread_mutex_lock( &win_data_mutex ); if (!XFindContext( gdi_display, (XID)hwnd, win_data_context, &data )) return (struct x11drv_win_data *)data; - LeaveCriticalSection( &win_data_section ); + pthread_mutex_unlock( &win_data_mutex ); return NULL; } @@ -1953,7 +1946,7 @@ struct x11drv_win_data *get_win_data( HWND hwnd ) */ void release_win_data( struct x11drv_win_data *data ) { - if (data) LeaveCriticalSection( &win_data_section ); + if (data) pthread_mutex_unlock( &win_data_mutex ); } @@ -3039,3 +3032,12 @@ void X11DRV_FlashWindowEx( FLASHWINFO *pfinfo ) } release_win_data( data ); } + +void init_win_context(void) +{ + init_recursive_mutex( &win_data_mutex ); + + winContext = XUniqueContext(); + win_data_context = XUniqueContext(); + cursor_context = XUniqueContext(); +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ed7a75a8d17..95e4b4ff29a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -661,6 +661,7 @@ extern void change_systray_owner( Display *display, Window systray_window ) DECL extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN; extern BOOL update_clipboard( HWND hwnd ) DECLSPEC_HIDDEN; +extern void init_win_context(void) DECLSPEC_HIDDEN; static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { @@ -672,8 +673,6 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) /* X context to associate a hwnd to an X window */ extern XContext winContext DECLSPEC_HIDDEN; -/* X context to associate a struct x11drv_win_data to an hwnd */ -extern XContext win_data_context DECLSPEC_HIDDEN; /* X context to associate an X cursor to a Win32 cursor handle */ extern XContext cursor_context DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 539f49197a3..49aff9571bc 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -683,9 +683,7 @@ static BOOL process_attach(void) XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms ); - winContext = XUniqueContext(); - win_data_context = XUniqueContext(); - cursor_context = XUniqueContext(); + init_win_context(); if (TRACE_ON(synchronous)) XSynchronize( display, True );

1 0

Jacek Caban : win32u: Use RtlInitUnicodeString from ntdll.so.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: acfec2f94ce4e9bb778cc4830f164ac200894ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acfec2f94ce4e9bb778cc483… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:06:12 2022 +0200 win32u: Use RtlInitUnicodeString from ntdll.so. 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/win32u/driver.c | 4 ++-- dlls/win32u/win32u_private.h | 7 ------- dlls/win32u/winstation.c | 10 +++++----- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 6b6f1a64ce8..83814ba14f5 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -215,7 +215,7 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) dc = get_nulldrv_dc( dev ); memset( &devmode, 0, sizeof(devmode) ); devmode.dmSize = sizeof(devmode); - init_unicode_string( &display, dc->display ); + RtlInitUnicodeString( &display, dc->display ); if (NtUserEnumDisplaySettings( &display, ENUM_CURRENT_SETTINGS, &devmode, 0 ) && (devmode.dmFields & DM_BITSPERPEL) && devmode.dmBitsPerPel) return devmode.dmBitsPerPel; @@ -267,7 +267,7 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) memset( &devmode, 0, sizeof(devmode) ); devmode.dmSize = sizeof(devmode); - init_unicode_string( &display, dc->display ); + RtlInitUnicodeString( &display, dc->display ); if (NtUserEnumDisplaySettings( &display, ENUM_CURRENT_SETTINGS, &devmode, 0 ) && devmode.dmDisplayFrequency) return devmode.dmDisplayFrequency; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 651003d4e84..d85cb9d683d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -626,13 +626,6 @@ static inline BOOL is_win9x(void) return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s; } -static inline void init_unicode_string( UNICODE_STRING *str, const WCHAR *data ) -{ - str->Length = lstrlenW(data) * sizeof(WCHAR); - str->MaximumLength = str->Length + sizeof(WCHAR); - str->Buffer = (WCHAR *)data; -} - static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index a25edfc9771..8e47c97510e 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -450,11 +450,11 @@ HWND get_desktop_window(void) params.Environment = peb->ProcessParameters->Environment; params.EnvironmentSize = peb->ProcessParameters->EnvironmentSize; params.hStdError = peb->ProcessParameters->hStdError; - init_unicode_string( &params.CurrentDirectory.DosPath, system_dir ); - init_unicode_string( &params.ImagePathName, appnameW + 4 ); - init_unicode_string( &params.CommandLine, cmdlineW ); - init_unicode_string( &params.WindowTitle, appnameW + 4 ); - init_unicode_string( &params.Desktop, desktop ); + RtlInitUnicodeString( &params.CurrentDirectory.DosPath, system_dir ); + RtlInitUnicodeString( &params.ImagePathName, appnameW + 4 ); + RtlInitUnicodeString( &params.CommandLine, cmdlineW ); + RtlInitUnicodeString( &params.WindowTitle, appnameW + 4 ); + RtlInitUnicodeString( &params.Desktop, desktop ); ps_attr.TotalLength = sizeof(ps_attr); ps_attr.Attributes[0].Attribute = PS_ATTRIBUTE_IMAGE_NAME;

1 0

Huw Davies : wineoss: Move get_next_packet_size to the unixlib.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: d1ab294002ed8eebc9483d5452f8541f27b62703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1ab294002ed8eebc9483d54… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 21:40:39 2022 +0100 wineoss: Move get_next_packet_size to the unixlib. 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/mmdevdrv.c | 12 +++++------- dlls/wineoss.drv/oss.c | 14 ++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 80bac1d9ceb..c101d757836 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1364,20 +1364,18 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct oss_stream *stream = This->stream; + struct get_next_packet_size_params params; TRACE("(%p)->(%p)\n", This, frames); if(!frames) return E_POINTER; - oss_lock(stream); - - *frames = stream->held_frames < stream->period_frames ? 0 : stream->period_frames; - - oss_unlock(stream); + params.stream = This->stream; + params.frames = frames; + OSS_CALL(get_next_packet_size, &params); - return S_OK; + return params.result; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index f1994295618..ffea1bb8338 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1243,6 +1243,19 @@ static NTSTATUS get_current_padding(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_next_packet_size(void *args) +{ + struct get_next_packet_size_params *params = args; + struct oss_stream *stream = params->stream; + UINT32 *frames = params->frames; + + oss_lock(stream); + + *frames = stream->held_frames < stream->period_frames ? 0 : stream->period_frames; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -1282,5 +1295,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, + get_next_packet_size, set_event_handle, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 2f0884b9ac5..a809ad41d3e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -186,6 +186,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct get_next_packet_size_params +{ + struct oss_stream *stream; + HRESULT result; + UINT32 *frames; +}; + struct set_event_handle_params { struct oss_stream *stream; @@ -212,6 +219,7 @@ enum oss_funcs oss_get_buffer_size, oss_get_latency, oss_get_current_padding, + oss_get_next_packet_size, oss_set_event_handle, };

1 0

Francois Gouget : winegstreamer: Fix the spelling of a comment.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 86e0a2489a7e82bff3eb751094661270a40a2167 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86e0a2489a7e82bff3eb7510… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 13:12:30 2022 +0200 winegstreamer: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 0327b92ce8e..49c7bfaa927 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -218,7 +218,7 @@ NTSTATUS wg_transform_create(void *args) { case WG_MAJOR_TYPE_H264: /* Call of Duty: Black Ops 3 doesn't care about the ProcessInput/ProcessOutput - * return values, it calls them in a specific order and and expects the decoder + * return values, it calls them in a specific order and expects the decoder * transform to be able to queue its input buffers. We need to use a buffer list * to match its expectations. */

1 0

Francois Gouget : conhost: Fix the spelling of a couple of comments.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 7b63a5f44606cc4f6458c07175f6710513bfda9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b63a5f44606cc4f6458c071… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 13:12:35 2022 +0200 conhost: Fix the spelling of a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- programs/conhost/conhost.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 6ea64395e1a..792daeb520f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -328,7 +328,7 @@ static void init_tty_output( struct console *console ) console->tty_cursor_visible = TRUE; } -/* no longer use relative cursor positionning (legacy API have been used) */ +/* no longer use relative cursor positioning (legacy API have been used) */ static void enter_absolute_mode( struct console *console ) { console->use_relative_cursor = 0; diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 65cf5d39ebd..9f2a90cd510 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -78,7 +78,7 @@ struct console unsigned int mode; /* input mode */ struct screen_buffer *active; /* active screen buffer */ int is_unix; /* UNIX terminal mode */ - int use_relative_cursor; /* use relative cursor positionning */ + int use_relative_cursor; /* use relative cursor positioning */ int no_window; /* don't create console window */ INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */

1 0

Jacek Caban : ntdll: Provide RtlInitUnicodeString for unixlibs.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 1c0288413a5dc5ab2f1f38855885de2bd18643c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c0288413a5dc5ab2f1f3885… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:05:53 2022 +0200 ntdll: Provide RtlInitUnicodeString for unixlibs. 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/ntdll/unix/env.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ee958ae71f4..5b192f39732 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2356,6 +2356,15 @@ NTSTATUS WINAPI RtlUnicodeToUTF8N( char *dst, DWORD dstlen, DWORD *reslen, const return status; } +/********************************************************************** + * RtlInitUnicodeString (ntdll.so) + */ +void WINAPI RtlInitUnicodeString( UNICODE_STRING *str, const WCHAR *data ) +{ + if (data) init_unicode_string( str, data ); + else str->Length = str->MaximumLength = 0; +} + /********************************************************************** * RtlNtStatusToDosError (ntdll.so) */

1 0

Jinoh Kang : include: Remove duplicate definitions of UOI_* macros.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 949edcec172cc690100394433afba3d9c714f2fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=949edcec172cc69010039443… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Apr 17 00:24:42 2022 +0900 include: Remove duplicate definitions of UOI_* macros. Commit 5ec458fd41f (Add declarations for GetClassLongPtr{A,W}, GCLP_* defines and user object information defines., 2004-10-14) inadvertently introduced duplicate definitions of UOI_* macros. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 4f79face860..f9af7db0331 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2874,12 +2874,6 @@ typedef struct { #define DSS_PREFIXONLY 0x0400 #define DSS_RIGHT 0x8000 -/* UserObjectInformation classes */ -#define UOI_FLAGS 1 -#define UOI_NAME 2 -#define UOI_TYPE 3 -#define UOI_USER_SID 4 - /* Sent as the lParam of a WM_DRAWITEM message to instruct how an * owner drawn control is to be drawn */

1 0

Jacek Caban : win32u: Use winuser.h inline rect helpers.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 62e51da2cdb6bf033c6820db93002b68873aca93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62e51da2cdb6bf033c6820db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:05:36 2022 +0200 win32u: Use winuser.h inline rect helpers. 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/win32u/bitblt.c | 26 +++++++++++++------------- dlls/win32u/clipping.c | 8 ++++---- dlls/win32u/dc.c | 4 ++-- dlls/win32u/dce.c | 8 ++++---- dlls/win32u/dib.c | 14 +++++++------- dlls/win32u/dibdrv/bitblt.c | 10 +++++----- dlls/win32u/dibdrv/dc.c | 12 ++++++------ dlls/win32u/dibdrv/objects.c | 10 +++++----- dlls/win32u/dibdrv/primitives.c | 14 +++++++------- dlls/win32u/font.c | 2 +- dlls/win32u/ntgdi_private.h | 35 +++++------------------------------ dlls/win32u/painting.c | 2 +- dlls/win32u/sysparams.c | 4 ++-- dlls/win32u/window.c | 36 ++++++++++++++++++------------------ 14 files changed, 80 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62e51da2cdb6bf033c68…

1 0

Francois Gouget : crypt32/tests: Fix the spelling of an ok() message.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 2fa950f6b70916e12ea6a079c5c9dfb9f51bd093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fa950f6b70916e12ea6a079… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 13:12:24 2022 +0200 crypt32/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index 0fd082c57db..22936d3738d 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -316,7 +316,7 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, &content_type, NULL, NULL, NULL, NULL); - ok(!ret, "CryptQueryObject succeded\n"); + ok(!ret, "CryptQueryObject succeeded\n"); ok(GetLastError() == CRYPT_E_NO_MATCH, "Unexpected error %lu.\n", GetLastError()); SetEnvironmentVariableW(L"TMP", tmp_path);

1 0