August 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : winebuild: Fix 64-bit argument alignment on ARM.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 8ee30e6dcc6cc705c9e59893d631e79d887b0644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ee30e6dcc6cc705c9e59893… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 25 15:14:11 2021 +0200 winebuild: Fix 64-bit argument alignment on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 56e76fc35cd..441e84aa092 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1144,6 +1144,7 @@ unsigned int get_args_size( const ORDDEF *odp ) { case ARG_INT64: case ARG_DOUBLE: + if (target_cpu == CPU_ARM) size = (size + 7) & ~7; size += 8; break; case ARG_INT128:

1 0

Rémi Bernon : winebus.sys: Use the private data pointer as device unique id.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 11c6b376c04b4e1b6095c85656bcb1decc908b0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=11c6b376c04b4e1b6095c856… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 23 10:49:42 2021 +0200 winebus.sys: Use the private data pointer as device unique id. Instead of a separately allocated device list entry pointer. And link the device object into the device list directly. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 69 +++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index f0e94648d4e..41aef8ab018 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -105,12 +105,6 @@ static DEVICE_OBJECT *bus_fdo; HANDLE driver_key; -struct pnp_device -{ - struct list entry; - DEVICE_OBJECT *device; -}; - enum device_state { DEVICE_STATE_STOPPED, @@ -120,11 +114,12 @@ enum device_state struct device_extension { + struct list entry; + DEVICE_OBJECT *device; + CRITICAL_SECTION cs; enum device_state state; - struct pnp_device *pnp_device; - WORD vid, pid, input; DWORD uid, version, index; BOOL is_gamepad; @@ -151,7 +146,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static struct list pnp_devset = LIST_INIT(pnp_devset); +static struct list device_list = LIST_INIT(device_list); static const WCHAR zero_serialW[]= {'0','0','0','0',0}; static const WCHAR miW[] = {'M','I',0}; @@ -179,12 +174,11 @@ struct unix_device *get_unix_device(DEVICE_OBJECT *device) static DWORD get_device_index(WORD vid, WORD pid, WORD input) { - struct pnp_device *ptr; + struct device_extension *ext; DWORD index = 0; - LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, struct pnp_device, entry) + LIST_FOR_EACH_ENTRY(ext, &device_list, struct device_extension, entry) { - struct device_extension *ext = (struct device_extension *)ptr->device->DeviceExtension; if (ext->vid == vid && ext->pid == pid && ext->input == input) index = max(ext->index + 1, index); } @@ -266,7 +260,6 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO { static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; struct device_extension *ext; - struct pnp_device *pnp_dev; DEVICE_OBJECT *device; UNICODE_STRING nameW; WCHAR dev_name[256]; @@ -276,16 +269,12 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO "is_gamepad %u, vtbl %p, unix_device %p\n", debugstr_w(busidW), vid, pid, input, version, uid, debugstr_w(serialW), is_gamepad, vtbl, unix_device); - if (!(pnp_dev = HeapAlloc(GetProcessHeap(), 0, sizeof(*pnp_dev)))) - return NULL; - - sprintfW(dev_name, device_name_fmtW, busidW, pnp_dev); + sprintfW(dev_name, device_name_fmtW, busidW, unix_device); RtlInitUnicodeString(&nameW, dev_name); status = IoCreateDevice(driver_obj, sizeof(struct device_extension), &nameW, 0, 0, FALSE, &device); if (status) { FIXME("failed to create device error %x\n", status); - HeapFree(GetProcessHeap(), 0, pnp_dev); return NULL; } @@ -293,7 +282,7 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO /* fill out device_extension struct */ ext = (struct device_extension *)device->DeviceExtension; - ext->pnp_device = pnp_dev; + ext->device = device; ext->vid = vid; ext->pid = pid; ext->input = input; @@ -315,8 +304,7 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO ext->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); /* add to list of pnp devices */ - pnp_dev->device = device; - list_add_tail(&pnp_devset, &pnp_dev->entry); + list_add_tail(&device_list, &ext->entry); LeaveCriticalSection(&device_list_cs); return device; @@ -324,19 +312,18 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) { - struct pnp_device *dev; + struct device_extension *ext; DEVICE_OBJECT *ret = NULL; TRACE("bus_id %s, platform_dev %p\n", debugstr_w(bus_id), platform_dev); EnterCriticalSection(&device_list_cs); - LIST_FOR_EACH_ENTRY(dev, &pnp_devset, struct pnp_device, entry) + LIST_FOR_EACH_ENTRY(ext, &device_list, struct device_extension, entry) { - struct device_extension *ext = (struct device_extension *)dev->device->DeviceExtension; if (strcmpW(ext->busid, bus_id)) continue; - if (ext->vtbl->compare_platform_device(dev->device, platform_dev) == 0) + if (ext->vtbl->compare_platform_device(ext->device, platform_dev) == 0) { - ret = dev->device; + ret = ext->device; break; } } @@ -348,23 +335,22 @@ DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) { - struct pnp_device *dev, *dev_next; + struct device_extension *ext, *next; DEVICE_OBJECT *ret = NULL; int cont; TRACE("bus_id %p\n", debugstr_w(bus_id)); EnterCriticalSection(&device_list_cs); - LIST_FOR_EACH_ENTRY_SAFE(dev, dev_next, &pnp_devset, struct pnp_device, entry) + LIST_FOR_EACH_ENTRY_SAFE(ext, next, &device_list, struct device_extension, entry) { - struct device_extension *ext = (struct device_extension *)dev->device->DeviceExtension; if (strcmpW(ext->busid, bus_id)) continue; LeaveCriticalSection(&device_list_cs); - cont = function(dev->device, context); + cont = function(ext->device, context); EnterCriticalSection(&device_list_cs); if (!cont) { - ret = dev->device; + ret = ext->device; break; } } @@ -375,20 +361,19 @@ DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function void bus_unlink_hid_device(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - struct pnp_device *pnp_device = ext->pnp_device; EnterCriticalSection(&device_list_cs); - list_remove(&pnp_device->entry); + list_remove(&ext->entry); LeaveCriticalSection(&device_list_cs); } static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) { + struct device_extension *ext; int i; - struct pnp_device *ptr; EnterCriticalSection(&device_list_cs); - *devices = ExAllocatePool(PagedPool, offsetof(DEVICE_RELATIONS, Objects[list_count(&pnp_devset)])); + *devices = ExAllocatePool(PagedPool, offsetof(DEVICE_RELATIONS, Objects[list_count(&device_list)])); if (!*devices) { @@ -397,10 +382,10 @@ static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) } i = 0; - LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, struct pnp_device, entry) + LIST_FOR_EACH_ENTRY(ext, &device_list, struct device_extension, entry) { - (*devices)->Objects[i] = ptr->device; - call_fastcall_func1(ObfReferenceObject, ptr->device); + (*devices)->Objects[i] = ext->device; + call_fastcall_func1(ObfReferenceObject, ext->device); i++; } LeaveCriticalSection(&device_list_cs); @@ -835,9 +820,6 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) break; case IRP_MN_REMOVE_DEVICE: - { - struct pnp_device *pnp_device = ext->pnp_device; - remove_pending_irps(device); bus_unlink_hid_device(device); @@ -853,12 +835,7 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) IoCompleteRequest(irp, IO_NO_INCREMENT); IoDeleteDevice(device); - - /* pnp_device must be released after the device is gone */ - HeapFree(GetProcessHeap(), 0, pnp_device); - return STATUS_SUCCESS; - } default: FIXME("Unhandled function %08x\n", irpsp->MinorFunction);

1 0

Rémi Bernon : winebus.sys: Allocate private device data separately.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 09c14c63211e21c4f590f1fb1e32038835037e1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09c14c63211e21c4f590f1fb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 23 10:49:41 2021 +0200 winebus.sys: Allocate private device data separately. And use an opaque struct unix_device as private data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 8 ++++---- dlls/winebus.sys/bus_iohid.c | 23 ++++++++++++++++------- dlls/winebus.sys/bus_sdl.c | 25 ++++++++++++++++--------- dlls/winebus.sys/bus_udev.c | 31 ++++++++++++++++++++++++------- dlls/winebus.sys/main.c | 25 +++++++++++-------------- dlls/winebus.sys/unix_private.h | 4 ++++ dlls/winebus.sys/unixlib.h | 2 ++ 7 files changed, 77 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09c14c63211e21c4f590…

1 0

Francois Gouget : secur32/tests: Fix an ASCII / ANSI mixup in an ntlm comment.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: ab9ba9968fe93872f2522a3a65bf7cde563814ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab9ba9968fe93872f2522a3a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 25 15:36:08 2021 +0200 secur32/tests: Fix an ASCII / ANSI mixup in an ntlm comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 930a49e451b..5ed650ffc2d 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1384,7 +1384,7 @@ static void testAcquireCredentialsHandleW(void) getSecError(ret)); pFreeCredentialsHandle(&cred); - /* Test using the ASCII structure. */ + /* Test using the ANSI structure. */ idA.User = (unsigned char*) test_user; idA.UserLength = strlen(test_user); idA.Domain = (unsigned char *) workgroup;

1 0

Jacek Caban : gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrushPt.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 48d586b782fb823174982afecb96a4cbd1cca5fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=48d586b782fb823174982afe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 25 13:39:52 2021 +0100 gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrushPt. 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/gdi32/brush.c | 11 ++++++----- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index c723b7c842f..5868824dd8f 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -245,20 +245,21 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) /*********************************************************************** - * CreateDIBPatternBrushPt (GDI32.@) + * NtGdiCreateDIBBrush (win32u.@) * * Create a logical brush with a pattern from a DIB. */ -HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) +HBRUSH WINAPI NtGdiCreateDIBBrush( const void *data, UINT coloruse, UINT size, + BOOL is_8x8, BOOL pen, const void *client ) { - const BITMAPINFO *info=data; + const BITMAPINFO *info = data; LOGBRUSH logbrush; if (!data) return NULL; - TRACE("%p %dx%d %dbpp\n", info, info->bmiHeader.biWidth, - info->bmiHeader.biHeight, info->bmiHeader.biBitCount); + TRACE( "%p %dx%d %dbpp\n", info, info->bmiHeader.biWidth, + info->bmiHeader.biHeight, info->bmiHeader.biBitCount ); logbrush.lbStyle = BS_DIBPATTERNPT; logbrush.lbColor = coloruse; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 6981eea72d0..9f43f1505e8 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -448,6 +448,14 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP bitmap ) return NtGdiCreatePatternBrushInternal( bitmap, FALSE, FALSE ); } +/*********************************************************************** + * CreateDIBPatternBrushPt (GDI32.@) + */ +HBRUSH WINAPI CreateDIBPatternBrushPt( const void *data, UINT coloruse ) +{ + return NtGdiCreateDIBBrush( data, coloruse, /* FIXME */ 0, FALSE, FALSE, data ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 928d1cec505..66611b38fb0 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -195,7 +195,8 @@ HANDLE WINAPI NtGdiCreateClientObj( ULONG type ); HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, ULONG unk3, ULONG unk4, void *data ); HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); -HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); +HBRUSH WINAPI NtGdiCreateDIBBrush( const void *data, UINT coloruse, UINT size, + BOOL is_8x8, BOOL pen, const void *client ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen, BOOL is_8x8 );

1 0

Jacek Caban : gdi32: Use NtGdiCreateHatchBrush for CreateHatchBrush.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: e0877b84a6921e45deff93639702c472fee80a64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0877b84a6921e45deff9363… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 25 13:39:50 2021 +0100 gdi32: Use NtGdiCreateHatchBrush for CreateHatchBrush. 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/gdi32/brush.c | 6 +++--- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index d3b83beffe8..408d93b2167 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -190,15 +190,15 @@ HBRUSH create_brush( const LOGBRUSH *brush ) /*********************************************************************** - * CreateHatchBrush (GDI32.@) + * NtGdiCreateHatchBrush (win32u.@) * * Create a logical brush with a hatched pattern. */ -HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) +HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ) { LOGBRUSH logbrush; - TRACE("%d %06x\n", style, color ); + TRACE( "%d %06x\n", style, color ); logbrush.lbStyle = BS_HATCHED; logbrush.lbColor = color; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b68cdd455b9..80f7454c2cb 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -432,6 +432,14 @@ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) return NtGdiCreateSolidBrush( color, NULL ); } +/*********************************************************************** + * CreateHatchBrush (GDI32.@) + */ +HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) +{ + return NtGdiCreateHatchBrush( style, color, FALSE ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index d275a239434..a7936561b23 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -197,6 +197,7 @@ HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, UL HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); +HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen ); HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ); HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom );

1 0

Paul Gofman : winegstreamer: Create media source read thread after initializing wg_parser.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: f49b8602e357957744db95b11d0c187175551833 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f49b8602e357957744db95b1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 25 14:43:39 2021 +0300 winegstreamer: Create media source read thread after initializing wg_parser. Fixes race condition as wg_parser is used right away in the created thread. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 05544ef7abe..01ab626254a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1315,8 +1315,6 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue))) goto fail; - object->read_thread = CreateThread(NULL, 0, read_thread, object, 0, NULL); - if (!(parser = unix_funcs->wg_decodebin_parser_create())) { hr = E_OUTOFMEMORY; @@ -1324,6 +1322,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ } object->wg_parser = parser; + object->read_thread = CreateThread(NULL, 0, read_thread, object, 0, NULL); + object->state = SOURCE_OPENING; if (FAILED(hr = unix_funcs->wg_parser_connect(parser, file_size)))

1 0

Jacek Caban : gdi32: Use NtGdiCreatePatternBrushInternal for CreatePatternBrush.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 99367b66e640cddf6b314b0a591003bb3fcd8987 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99367b66e640cddf6b314b0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 25 13:39:51 2021 +0100 gdi32: Use NtGdiCreatePatternBrushInternal for CreatePatternBrush. 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/gdi32/brush.c | 9 +++++---- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 408d93b2167..c723b7c842f 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -209,16 +209,17 @@ HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ) /*********************************************************************** - * CreatePatternBrush (GDI32.@) + * NtGdiCreatePatternBrushInternal (win32u.@) * * Create a logical brush with a pattern from a bitmap. */ -HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) +HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP bitmap, BOOL pen, BOOL is_8x8 ) { LOGBRUSH logbrush = { BS_PATTERN, 0, 0 }; - TRACE("%p\n", hbitmap ); - logbrush.lbHatch = (ULONG_PTR)hbitmap; + TRACE( "%p\n", bitmap ); + + logbrush.lbHatch = (ULONG_PTR)bitmap; return create_brush( &logbrush ); } diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 80f7454c2cb..6981eea72d0 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -440,6 +440,14 @@ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) return NtGdiCreateHatchBrush( style, color, FALSE ); } +/*********************************************************************** + * CreatePatternBrush (GDI32.@) + */ +HBRUSH WINAPI CreatePatternBrush( HBITMAP bitmap ) +{ + return NtGdiCreatePatternBrushInternal( bitmap, FALSE, FALSE ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index a7936561b23..928d1cec505 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -198,7 +198,7 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ); -HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen ); +HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen, BOOL is_8x8 ); HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ); HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT bottom,

1 0

Rémi Bernon : winebus.sys: Create the IOHID bus thread in main.c.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: b4d8cd38918c3ec74d70d9d229f3d88de91e405c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4d8cd38918c3ec74d70d9d2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 23 10:49:38 2021 +0200 winebus.sys: Create the IOHID bus thread in main.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 7 +++--- dlls/winebus.sys/bus_iohid.c | 59 +++++++++++++++++++++----------------------- dlls/winebus.sys/main.c | 15 ++++++++++- 3 files changed, 46 insertions(+), 35 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 6dc95a5b803..cecde2aa83c 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -28,9 +28,6 @@ typedef int(*enum_func)(DEVICE_OBJECT *device, void *context); /* Buses */ -NTSTATUS iohid_driver_init(void) DECLSPEC_HIDDEN; -void iohid_driver_unload( void ) DECLSPEC_HIDDEN; - extern NTSTATUS sdl_bus_init(void *) DECLSPEC_HIDDEN; extern NTSTATUS sdl_bus_wait(void *) DECLSPEC_HIDDEN; extern NTSTATUS sdl_bus_stop(void *) DECLSPEC_HIDDEN; @@ -39,6 +36,10 @@ extern NTSTATUS udev_bus_init(void *) DECLSPEC_HIDDEN; extern NTSTATUS udev_bus_wait(void *) DECLSPEC_HIDDEN; extern NTSTATUS udev_bus_stop(void *) DECLSPEC_HIDDEN; +extern NTSTATUS iohid_bus_init(void *) DECLSPEC_HIDDEN; +extern NTSTATUS iohid_bus_wait(void *) DECLSPEC_HIDDEN; +extern NTSTATUS iohid_bus_stop(void *) DECLSPEC_HIDDEN; + /* Native device function table */ typedef struct { diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 4eb0ea0e4b3..49774dd0662 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -96,7 +96,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); static IOHIDManagerRef hid_manager; static CFRunLoopRef run_loop; -static HANDLE run_loop_handle; static const WCHAR busidW[] = {'I','O','H','I','D',0}; @@ -385,63 +384,61 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, } } -/* This puts the relevant run loop for event handling into a WINE thread */ -static DWORD CALLBACK runloop_thread(void *args) +NTSTATUS iohid_bus_init(void *args) { + if (!(hid_manager = IOHIDManagerCreate(kCFAllocatorDefault, 0L))) + { + ERR("IOHID manager creation failed\n"); + return STATUS_UNSUCCESSFUL; + } + run_loop = CFRunLoopGetCurrent(); IOHIDManagerSetDeviceMatching(hid_manager, NULL); IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, handle_DeviceMatchingCallback, NULL); IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, handle_RemovalCallback, NULL); IOHIDManagerScheduleWithRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - - CFRunLoopRun(); - TRACE("Run Loop exiting\n"); - return 1; - + return STATUS_SUCCESS; } -NTSTATUS iohid_driver_init(void) +NTSTATUS iohid_bus_wait(void *args) { - hid_manager = IOHIDManagerCreate(kCFAllocatorDefault, 0L); - if (!(run_loop_handle = CreateThread(NULL, 0, runloop_thread, NULL, 0, NULL))) - { - ERR("Failed to initialize IOHID Manager thread\n"); - CFRelease(hid_manager); - return STATUS_UNSUCCESSFUL; - } + CFRunLoopRun(); - TRACE("Initialization successful\n"); + TRACE("IOHID main loop exiting\n"); + IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, NULL, NULL); + IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, NULL, NULL); + CFRelease(hid_manager); return STATUS_SUCCESS; } -void iohid_driver_unload( void ) +NTSTATUS iohid_bus_stop(void *args) { - TRACE("Unloading Driver\n"); - - if (!run_loop_handle) - return; + if (!run_loop) return STATUS_SUCCESS; IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); CFRunLoopStop(run_loop); - WaitForSingleObject(run_loop_handle, INFINITE); - CloseHandle(run_loop_handle); - IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, NULL, NULL); - IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, NULL, NULL); - CFRelease(hid_manager); - TRACE("Driver Unloaded\n"); + return STATUS_SUCCESS; } #else -NTSTATUS iohid_driver_init(void) +NTSTATUS iohid_bus_init(void *args) +{ + WARN("IOHID support not compiled in!\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS iohid_bus_wait(void *args) { + WARN("IOHID support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; } -void iohid_driver_unload( void ) +NTSTATUS iohid_bus_stop(void *args) { - TRACE("Stub: Unload Driver\n"); + WARN("IOHID support not compiled in!\n"); + return STATUS_NOT_IMPLEMENTED; } #endif /* HAVE_IOHIDMANAGERCREATE */ diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 505fc131be4..9d57a0c4db2 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -699,6 +699,19 @@ static NTSTATUS udev_driver_init(void) return bus_main_thread_start(&bus); } +static NTSTATUS iohid_driver_init(void) +{ + static const WCHAR bus_name[] = {'I','O','H','I','D'}; + struct bus_main_params bus = + { + .name = bus_name, + .init_func = iohid_bus_init, + .wait_func = iohid_bus_wait, + }; + + return bus_main_thread_start(&bus); +} + static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; @@ -727,9 +740,9 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Status = STATUS_SUCCESS; break; case IRP_MN_REMOVE_DEVICE: - iohid_driver_unload(); sdl_bus_stop(NULL); udev_bus_stop(NULL); + iohid_bus_stop(NULL); WaitForMultipleObjects(bus_count, bus_thread, TRUE, INFINITE); while (bus_count--) CloseHandle(bus_thread[bus_count]);

1 0

Alistair Leslie-Hughes : ntdll: Add NtTraceControl/ZwTraceControl stubs.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 16a7976de968b668bc970be4dc3bb5506bed2a34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16a7976de968b668bc970be4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 25 18:04:58 2021 +1000 ntdll: Add NtTraceControl/ZwTraceControl stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/debug.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ dlls/wow64/sync.c | 16 ++++++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 3 ++- 6 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1bff52a299d..c3d17d989ac 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -414,6 +414,7 @@ @ stdcall -syscall NtTerminateProcess(long long) @ stdcall -syscall NtTerminateThread(long long) @ stdcall -syscall NtTestAlert() +@ stdcall -syscall NtTraceControl(long ptr long ptr long long) # @ stub NtTraceEvent # @ stub NtTranslateFilePath @ stdcall -syscall NtUnloadDriver(ptr) @@ -1435,6 +1436,7 @@ @ stdcall -private -syscall ZwTerminateProcess(long long) NtTerminateProcess @ stdcall -private -syscall ZwTerminateThread(long long) NtTerminateThread @ stdcall -private -syscall ZwTestAlert() NtTestAlert +@ stdcall -private -syscall ZwTraceControl(long ptr long ptr long long) NtTraceControl # @ stub ZwTraceEvent # @ stub ZwTranslateFilePath @ stdcall -private -syscall ZwUnloadDriver(ptr) NtUnloadDriver diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index d43cdaeb917..a2a63b5a9f4 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -34,6 +34,8 @@ # include <unistd.h> #endif +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winnt.h" #include "winternl.h" @@ -42,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); +WINE_DEFAULT_DEBUG_CHANNEL(ntdll); struct debug_info { @@ -328,3 +331,15 @@ void dbg_init(void) options[nb_debug_options] = default_option; init_done = TRUE; } + + +/*********************************************************************** + * NtTraceControl (NTDLL.@) + */ +NTSTATUS WINAPI NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len, + void *outbuf, ULONG outbuf_len, ULONG *size ) +{ + FIXME( "code %u, inbuf %p, inbuf_len %u, outbuf %p, outbuf_len %u, size %p\n", code, inbuf, inbuf_len, + outbuf, outbuf_len, size ); + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f51833b91a0..071dae6ceca 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -818,6 +818,7 @@ @ stdcall NtSetSecurityObject(long long ptr) @ stdcall NtSetVolumeInformationFile(long ptr ptr long long) @ stdcall NtShutdownSystem(long) +@ stdcall NtTraceControl(long ptr long ptr long long) @ stub NtTraceEvent @ stdcall NtUnlockFile(long ptr ptr ptr ptr) @ stub NtVdmControl @@ -1514,6 +1515,7 @@ @ stdcall -private ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile @ stdcall -private ZwTerminateJobObject(long long) NtTerminateJobObject @ stdcall -private ZwTerminateProcess(long long) NtTerminateProcess +@ stdcall -private ZwTraceControl(long ptr long ptr long long) NtTraceControl @ stub ZwTranslateFilePath @ stdcall ZwUnloadDriver(ptr) @ stdcall -private ZwUnloadKey(ptr) NtUnloadKey diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 2560fc10a0a..0078508fc7f 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1481,6 +1481,22 @@ NTSTATUS WINAPI wow64_NtTestAlert( UINT *args ) } +/********************************************************************** + * wow64_NtTraceControl + */ +NTSTATUS WINAPI wow64_NtTraceControl( UINT *args ) +{ + ULONG code = get_ulong( &args ); + void *inbuf = get_ptr( &args ); + ULONG inbuf_len = get_ulong( &args ); + void *outbuf = get_ptr( &args ); + ULONG outbuf_len = get_ulong( &args ); + ULONG *size = get_ptr( &args ); + + return NtTraceControl( code, inbuf, inbuf_len, outbuf, outbuf_len, size ); +} + + /********************************************************************** * wow64_NtWaitForDebugEvent */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index d6c1b7c74fa..a565e9cda3a 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -228,6 +228,7 @@ SYSCALL_ENTRY( NtTerminateProcess ) \ SYSCALL_ENTRY( NtTerminateThread ) \ SYSCALL_ENTRY( NtTestAlert ) \ + SYSCALL_ENTRY( NtTraceControl ) \ SYSCALL_ENTRY( NtUnloadDriver ) \ SYSCALL_ENTRY( NtUnloadKey ) \ SYSCALL_ENTRY( NtUnlockFile ) \ diff --git a/include/winternl.h b/include/winternl.h index 06f00740e43..bc70121ac28 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4009,7 +4009,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetEvent(HANDLE,LONG*); NTSYSAPI NTSTATUS WINAPI NtSetHighEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetHighWaitLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetHighWaitLowThread(VOID); -NTSYSAPI NTSTATUS WINAPI NtSetInformationDebugObject(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); +NTSYSAPI NTSTATUS WINAPI NtSetInformationDebugObject(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI NtSetInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtSetInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetInformationKey(HANDLE,const int,PVOID,ULONG); @@ -4045,6 +4045,7 @@ NTSYSAPI NTSTATUS WINAPI NtTerminateJobObject(HANDLE,NTSTATUS); NTSYSAPI NTSTATUS WINAPI NtTerminateProcess(HANDLE,LONG); NTSYSAPI NTSTATUS WINAPI NtTerminateThread(HANDLE,LONG); NTSYSAPI NTSTATUS WINAPI NtTestAlert(VOID); +NTSYSAPI NTSTATUS WINAPI NtTraceControl(ULONG,void*,ULONG,void*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI NtUnloadDriver(const UNICODE_STRING *); NTSYSAPI NTSTATUS WINAPI NtUnloadKey(POBJECT_ATTRIBUTES); NTSYSAPI NTSTATUS WINAPI NtUnloadKeyEx(POBJECT_ATTRIBUTES,HANDLE);

1 0