September 2021 - Wine-commits

Alexandre Julliard : shell32: Build with msvcrt.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 48d62fc6234b221c6f681260e561351c97a5c26c URL: https://source.winehq.org/git/wine.git/?a=commit;h=48d62fc6234b221c6f681260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 17:16:11 2021 +0200 shell32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 + dlls/shell32/appbar.c | 3 - dlls/shell32/assoc.c | 27 +++--- dlls/shell32/autocomplete.c | 47 +++++---- dlls/shell32/brsfolder.c | 6 +- dlls/shell32/classes.c | 10 +- dlls/shell32/clipboard.c | 13 ++- dlls/shell32/control.c | 7 +- dlls/shell32/cpanelfolder.c | 3 - dlls/shell32/dde.c | 43 ++++----- dlls/shell32/dialogs.c | 11 +-- dlls/shell32/dragdrophelper.c | 3 - dlls/shell32/enumidlist.c | 7 +- dlls/shell32/folders.c | 7 +- dlls/shell32/iconcache.c | 24 ++--- dlls/shell32/pidl.c | 5 +- dlls/shell32/recyclebin.c | 91 +++++++++--------- dlls/shell32/shell32_main.c | 27 +++--- dlls/shell32/shell32_main.h | 1 - dlls/shell32/shelldispatch.c | 3 - dlls/shell32/shellitem.c | 3 - dlls/shell32/shelllink.c | 24 ++--- dlls/shell32/shellole.c | 5 +- dlls/shell32/shellord.c | 9 +- dlls/shell32/shellpath.c | 129 ++++++++++++------------- dlls/shell32/shellreg.c | 11 +-- dlls/shell32/shellstring.c | 5 +- dlls/shell32/shfldr.h | 2 +- dlls/shell32/shfldr_desktop.c | 9 +- dlls/shell32/shfldr_fs.c | 35 ++++--- dlls/shell32/shfldr_mycomp.c | 11 +-- dlls/shell32/shfldr_netplaces.c | 8 +- dlls/shell32/shlexec.c | 208 +++++++++++++++++++--------------------- dlls/shell32/shlfileop.c | 3 - dlls/shell32/shlfolder.c | 3 - dlls/shell32/shlfsbind.c | 2 - dlls/shell32/shlmenu.c | 4 +- dlls/shell32/shlview.c | 3 - dlls/shell32/shlview_cmenu.c | 24 ++--- 39 files changed, 378 insertions(+), 460 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48d62fc6234b221c6f68…

1 0

Alexandre Julliard : shell32: Check for macOS at runtime.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: ac241bf763efb18a3503678c25107dcb76bec94c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac241bf763efb18a3503678c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 17:47:07 2021 +0200 shell32: Check for macOS at runtime. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/recyclebin.c | 79 ++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 7db504c18cd..21d3fcd4be7 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -79,47 +79,56 @@ static WCHAR *trash_dir; static WCHAR *trash_info_dir; static ULONG random_seed; +extern void CDECL wine_get_host_version( const char **sysname, const char **release ); + +static BOOL is_macos(void) +{ + const char *sysname; + + wine_get_host_version( &sysname, NULL ); + return !strcmp( sysname, "Darwin" ); +} + static BOOL WINAPI init_trash_dirs( INIT_ONCE *once, void *param, void **context ) { - static const WCHAR homedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0}; - WCHAR var[MAX_PATH], *info = NULL, *files = NULL; - -#ifdef __APPLE__ - static const WCHAR trashW[] = {'\\','.','T','r','a','s','h',0}; - - if (!GetEnvironmentVariableW( homedirW, var, MAX_PATH )) return TRUE; - files = heap_alloc( (lstrlenW(var) + lstrlenW(trashW) + 1) * sizeof(WCHAR) ); - lstrcpyW( files, var ); - lstrcatW( files, trashW ); - files[1] = '\\'; /* change \??\ to \\?\ */ -#else - static const WCHAR dataW[] = {'X','D','G','_','D','A','T','A','_','H','O','M','E',0}; - static const WCHAR infoW[] = {'\\','i','n','f','o',0}; - static const WCHAR filesW[] = {'\\','f','i','l','e','s',0}; - static const WCHAR home_fmtW[] = {'%','s','/','.','l','o','c','a','l','/','s','h','a','r','e','/','T','r','a','s','h',0}; - static const WCHAR config_fmtW[] = {'\\','?','?','\\','u','n','i','x','%','s','/','T','r','a','s','h',0}; - const WCHAR *fmt = config_fmtW; - WCHAR *p; + const WCHAR *home = _wgetenv( L"WINEHOMEDIR" ); + WCHAR *info = NULL, *files = NULL; ULONG len; - if (!GetEnvironmentVariableW( dataW, var + 8, MAX_PATH - 8 ) || !var[8]) + if (!home) return TRUE; + if (is_macos()) { - if (!GetEnvironmentVariableW( homedirW, var, MAX_PATH )) return TRUE; - fmt = home_fmtW; + static const WCHAR trashW[] = {'\\','.','T','r','a','s','h',0}; + + files = heap_alloc( (lstrlenW(home) + lstrlenW(trashW) + 1) * sizeof(WCHAR) ); + lstrcpyW( files, home ); + lstrcatW( files, trashW ); + files[1] = '\\'; /* change \??\ to \\?\ */ + } + else + { + const WCHAR *data_home = _wgetenv( L"XDG_DATA_HOME" ); + const WCHAR *fmt = L"%s/.local/share/Trash"; + WCHAR *p; + + if (data_home && data_home[0] == '/') + { + home = data_home; + fmt = L"\\??\\unix%s/Trash"; + } + len = lstrlenW(home) + lstrlenW(fmt) + 7; + files = heap_alloc( len * sizeof(WCHAR) ); + swprintf( files, len, fmt, home ); + files[1] = '\\'; /* change \??\ to \\?\ */ + for (p = files; *p; p++) if (*p == '/') *p = '\\'; + CreateDirectoryW( files, NULL ); + info = heap_alloc( len * sizeof(WCHAR) ); + lstrcpyW( info, files ); + lstrcatW( files, L"\\files" ); + lstrcatW( info, L"\\info" ); + if (!CreateDirectoryW( info, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) goto done; + trash_info_dir = info; } - len = lstrlenW(var) + lstrlenW(fmt) + lstrlenW(filesW) + 1; - files = heap_alloc( len * sizeof(WCHAR) ); - swprintf( files, len, fmt, var ); - files[1] = '\\'; /* change \??\ to \\?\ */ - for (p = files; *p; p++) if (*p == '/') *p = '\\'; - CreateDirectoryW( files, NULL ); - info = heap_alloc( len * sizeof(WCHAR) ); - lstrcpyW( info, files ); - lstrcatW( files, filesW ); - lstrcatW( info, infoW ); - if (!CreateDirectoryW( info, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) goto done; - trash_info_dir = info; -#endif if (!CreateDirectoryW( files, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) goto done; trash_dir = files;

1 0

Daniel Lehman : msxml3/tests: Avoid double-free using BSTR helper.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 001aa01760168cd7e21e70bc1bb5fcc39a8432c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=001aa01760168cd7e21e70bc… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Sep 14 11:18:50 2021 -0700 msxml3/tests: Avoid double-free using BSTR helper. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a0bcca2d4e9..9e9789ebd9a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13644,11 +13644,11 @@ todo_wine ok(hr == S_OK, "got %#x\n", hr); ok(b == VARIANT_TRUE, "got %d\n", b); ok(qi_count == 0, "got %d QI calls\n", qi_count); - SysFreeString(V_BSTR(&var)); IXMLDOMDocument2_Release(doc); DeleteFileA(path); + free_bstrs(); } START_TEST(domdoc)

1 0

Derek Lesho : winegstreamer: Fix return code in init_gst failure case.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: b9a7e961cdd39203866be38e90b1d901595d54ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a7e961cdd39203866be38e… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Sep 16 17:00:45 2021 -0400 winegstreamer: Fix return code in init_gst failure case. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 5299f4dc2ed..a8e7e3d979f 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -982,7 +982,10 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons goto err; if (!filter->init_gst(filter)) + { + hr = E_FAIL; goto err; + } for (i = 0; i < filter->source_count; ++i) {

1 0

Rémi Bernon : winebus.sys: Build with msvcrt.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: e54ff70e5d910063c4183761873f0f432c9c0069 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e54ff70e5d910063c4183761… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 08:50:31 2021 +0200 winebus.sys: Build with msvcrt. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_iohid.c | 16 +++++++++------ dlls/winebus.sys/bus_sdl.c | 16 +++++++++------ dlls/winebus.sys/bus_udev.c | 16 +++++++++------ dlls/winebus.sys/hid.c | 4 ++++ dlls/winebus.sys/main.c | 43 +++++++++++++++++++++++++---------------- dlls/winebus.sys/unix_private.h | 18 ++++++++--------- dlls/winebus.sys/unixlib.c | 29 ++++++++++++++++++--------- dlls/winebus.sys/unixlib.h | 3 +-- 9 files changed, 91 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e54ff70e5d910063c418…

1 0

Rémi Bernon : winebus.sys: Avoid process heap allocations on the unix side.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 8f6932fd3510a8d939102e1c451e4175533e5e14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f6932fd3510a8d939102e1c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 08:50:32 2021 +0200 winebus.sys: Avoid process heap allocations on the unix side. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 10 ++++------ dlls/winebus.sys/bus_udev.c | 14 ++++++-------- dlls/winebus.sys/hid.c | 8 ++++---- dlls/winebus.sys/unixlib.c | 16 +++++++++------- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 0e36eac880c..70a7cd0b005 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -172,7 +172,7 @@ static NTSTATUS iohid_device_start(struct unix_device *iface) num = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDMaxInputReportSizeKey)); length = CFNumberToDWORD(num); - private->buffer = RtlAllocateHeap(GetProcessHeap(), 0, length); + private->buffer = malloc(length); IOHIDDeviceRegisterInputReportCallback(private->device, private->buffer, length, handle_IOHIDDeviceIOHIDReportCallback, iface); return STATUS_SUCCESS; diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 79dff5007c0..956340faf02 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -374,8 +374,7 @@ static NTSTATUS build_report_descriptor(struct platform_private *ext) return STATUS_NO_MEMORY; ext->buffer_length = report_size; - if (!(ext->report_buffer = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, report_size))) - goto failed; + if (!(ext->report_buffer = calloc(1, report_size))) goto failed; /* Initialize axis in the report */ for (i = 0; i < axis_count; i++) @@ -386,7 +385,7 @@ static NTSTATUS build_report_descriptor(struct platform_private *ext) return STATUS_SUCCESS; failed: - RtlFreeHeap(GetProcessHeap(), 0, ext->report_buffer); + free(ext->report_buffer); hid_descriptor_free(&ext->desc); return STATUS_NO_MEMORY; } @@ -475,8 +474,7 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) if (!hid_descriptor_end(&ext->desc)) return STATUS_NO_MEMORY; - if (!(ext->report_buffer = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, ext->buffer_length))) - goto failed; + if (!(ext->report_buffer = calloc(1, ext->buffer_length))) goto failed; /* Initialize axis in the report */ for (i = SDL_CONTROLLER_AXIS_LEFTX; i < SDL_CONTROLLER_AXIS_MAX; i++) @@ -491,7 +489,7 @@ static NTSTATUS build_mapped_report_descriptor(struct platform_private *ext) return STATUS_SUCCESS; failed: - RtlFreeHeap(GetProcessHeap(), 0, ext->report_buffer); + free(ext->report_buffer); hid_descriptor_free(&ext->desc); return STATUS_NO_MEMORY; } diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c859d5df546..928548b8893 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -548,10 +548,8 @@ static NTSTATUS build_report_descriptor(struct wine_input_private *ext, struct u TRACE("Report will be %i bytes\n", report_size); ext->buffer_length = report_size; - if (!(ext->current_report_buffer = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, report_size))) - goto failed; - if (!(ext->last_report_buffer = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, report_size))) - goto failed; + if (!(ext->current_report_buffer = calloc(1, report_size))) goto failed; + if (!(ext->last_report_buffer = calloc(1, report_size))) goto failed; ext->report_state = FIRST; /* Initialize axis in the report */ @@ -562,8 +560,8 @@ static NTSTATUS build_report_descriptor(struct wine_input_private *ext, struct u return STATUS_SUCCESS; failed: - RtlFreeHeap(GetProcessHeap(), 0, ext->current_report_buffer); - RtlFreeHeap(GetProcessHeap(), 0, ext->last_report_buffer); + free(ext->current_report_buffer); + free(ext->last_report_buffer); hid_descriptor_free(&ext->desc); return STATUS_NO_MEMORY; } @@ -811,8 +809,8 @@ static void lnxev_device_destroy(struct unix_device *iface) { struct wine_input_private *ext = input_impl_from_unix_device(iface); - RtlFreeHeap(GetProcessHeap(), 0, ext->current_report_buffer); - RtlFreeHeap(GetProcessHeap(), 0, ext->last_report_buffer); + free(ext->current_report_buffer); + free(ext->last_report_buffer); hid_descriptor_free(&ext->desc); udev_device_unref(ext->base.udev_device); diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 959cbf7c428..0ad5efa2775 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -23,6 +23,7 @@ #endif #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -40,13 +41,12 @@ static BOOL hid_descriptor_append(struct hid_descriptor *desc, const BYTE *buffe if (desc->size + size > desc->max_size) { desc->max_size = max(desc->max_size * 3 / 2, desc->size + size); - if (!desc->data) desc->data = RtlAllocateHeap(GetProcessHeap(), 0, desc->max_size); - else desc->data = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, desc->max_size); + desc->data = realloc(tmp, desc->max_size); } if (!desc->data) { - RtlFreeHeap(GetProcessHeap(), 0, tmp); + free(tmp); return FALSE; } @@ -93,7 +93,7 @@ BOOL hid_descriptor_end(struct hid_descriptor *desc) void hid_descriptor_free(struct hid_descriptor *desc) { - RtlFreeHeap(GetProcessHeap(), 0, desc->data); + free(desc->data); } BOOL hid_descriptor_add_buttons(struct hid_descriptor *desc, USAGE usage_page, diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index f21b5a25b04..f33b7cacfe3 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -23,6 +23,8 @@ #include "config.h" #include <stdarg.h> +#include <stdlib.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -257,7 +259,7 @@ void *unix_device_create(const struct unix_device_vtbl *vtbl, SIZE_T size) { struct unix_device *iface; - if (!(iface = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, size))) return NULL; + if (!(iface = calloc(1, size))) return NULL; iface->vtbl = vtbl; iface->ref = 1; @@ -269,7 +271,7 @@ static void unix_device_decref(struct unix_device *iface) if (!InterlockedDecrement(&iface->ref)) { iface->vtbl->destroy(iface); - RtlFreeHeap(GetProcessHeap(), 0, iface); + free(iface); } } @@ -357,14 +359,14 @@ void bus_event_queue_destroy(struct list *queue) LIST_FOR_EACH_ENTRY_SAFE(event, next, queue, struct bus_event, entry) { bus_event_cleanup(event); - RtlFreeHeap(GetProcessHeap(), 0, event); + free(event); } } BOOL bus_event_queue_device_removed(struct list *queue, struct unix_device *device) { ULONG size = sizeof(struct bus_event); - struct bus_event *event = RtlAllocateHeap(GetProcessHeap(), 0, size); + struct bus_event *event = malloc(size); if (!event) return FALSE; if (unix_device_incref(device) == 1) return FALSE; /* being destroyed */ @@ -379,7 +381,7 @@ BOOL bus_event_queue_device_removed(struct list *queue, struct unix_device *devi BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) { ULONG size = sizeof(struct bus_event); - struct bus_event *event = RtlAllocateHeap(GetProcessHeap(), 0, size); + struct bus_event *event = malloc(size); if (!event) return FALSE; if (unix_device_incref(device) == 1) return FALSE; /* being destroyed */ @@ -395,7 +397,7 @@ BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *devi BOOL bus_event_queue_input_report(struct list *queue, struct unix_device *device, BYTE *report, USHORT length) { ULONG size = offsetof(struct bus_event, input_report.buffer[length]); - struct bus_event *event = RtlAllocateHeap(GetProcessHeap(), 0, size); + struct bus_event *event = malloc(size); if (!event) return FALSE; if (unix_device_incref(device) == 1) return FALSE; /* being destroyed */ @@ -424,7 +426,7 @@ BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) else size = offsetof(struct bus_event, input_report.buffer[event->input_report.length]); memcpy(event, tmp, size); - RtlFreeHeap(GetProcessHeap(), 0, tmp); + free(tmp); return TRUE; }

1 0

Rémi Bernon : winebus.sys: Use a pthread_mutex_t instead of CRITICAL_SECTION.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: cc2f669390c051f972c8eea48dee9f8d0a820d84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc2f669390c051f972c8eea4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 08:50:33 2021 +0200 winebus.sys: Use a pthread_mutex_t instead of CRITICAL_SECTION. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_iohid.c | 19 +++++++------------ dlls/winebus.sys/bus_sdl.c | 20 +++++++------------- dlls/winebus.sys/bus_udev.c | 35 +++++++++++++++-------------------- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index 1675bf1951c..ec731c2b85c 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = winebus.sys IMPORTS = ntoskrnl advapi32 -EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) +EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 70a7cd0b005..8dc9e6c3df1 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -83,6 +83,8 @@ #undef PAGE_SHIFT #endif /* HAVE_IOKIT_HID_IOHIDLIB_H */ +#include <pthread.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -98,14 +100,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #ifdef HAVE_IOHIDMANAGERCREATE -static CRITICAL_SECTION iohid_cs; -static CRITICAL_SECTION_DEBUG iohid_cs_debug = -{ - 0, 0, &iohid_cs, - { &iohid_cs_debug.ProcessLocksList, &iohid_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": iohid_cs") } -}; -static CRITICAL_SECTION iohid_cs = { &iohid_cs_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t iohid_cs = PTHREAD_MUTEX_INITIALIZER; static IOHIDManagerRef hid_manager; static CFRunLoopRef run_loop; @@ -184,9 +179,9 @@ static void iohid_device_stop(struct unix_device *iface) IOHIDDeviceRegisterInputReportCallback(private->device, NULL, 0, NULL, NULL); - RtlEnterCriticalSection(&iohid_cs); + pthread_mutex_lock(&iohid_cs); list_remove(&private->unix_device.entry); - RtlLeaveCriticalSection(&iohid_cs); + pthread_mutex_unlock(&iohid_cs); } static NTSTATUS iohid_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, @@ -407,9 +402,9 @@ NTSTATUS WINAPI iohid_bus_wait(void *args) do { if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING; - RtlEnterCriticalSection(&iohid_cs); + pthread_mutex_lock(&iohid_cs); ret = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 10, TRUE); - RtlLeaveCriticalSection(&iohid_cs); + pthread_mutex_unlock(&iohid_cs); } while (ret != kCFRunLoopRunStopped); TRACE("IOHID main loop exiting\n"); diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 956340faf02..b7c3b28ba4e 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -35,6 +35,8 @@ # include <SDL.h> #endif +#include <pthread.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -62,15 +64,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); WINE_DECLARE_DEBUG_CHANNEL(hid_report); -static CRITICAL_SECTION sdl_cs; -static CRITICAL_SECTION_DEBUG sdl_cs_debug = -{ - 0, 0, &sdl_cs, - { &sdl_cs_debug.ProcessLocksList, &sdl_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": sdl_cs") } -}; -static CRITICAL_SECTION sdl_cs = { &sdl_cs_debug, -1, 0, 0, 0, 0 }; - +static pthread_mutex_t sdl_cs = PTHREAD_MUTEX_INITIALIZER; static const WCHAR sdl_busidW[] = {'S','D','L','J','O','Y',0}; static struct sdl_bus_options options; @@ -513,9 +507,9 @@ static void sdl_device_stop(struct unix_device *iface) if (private->sdl_controller) pSDL_GameControllerClose(private->sdl_controller); if (private->sdl_haptic) pSDL_HapticClose(private->sdl_haptic); - RtlEnterCriticalSection(&sdl_cs); + pthread_mutex_lock(&sdl_cs); list_remove(&private->unix_device.entry); - RtlLeaveCriticalSection(&sdl_cs); + pthread_mutex_unlock(&sdl_cs); } static NTSTATUS sdl_device_get_reportdescriptor(struct unix_device *iface, BYTE *buffer, @@ -787,7 +781,7 @@ static void process_device_event(SDL_Event *event) TRACE_(hid_report)("Received action %x\n", event->type); - RtlEnterCriticalSection(&sdl_cs); + pthread_mutex_lock(&sdl_cs); if (event->type == SDL_JOYDEVICEADDED) sdl_add_device(((SDL_JoyDeviceEvent *)event)->which); @@ -813,7 +807,7 @@ static void process_device_event(SDL_Event *event) else WARN("failed to find device with id %d\n", id); } - RtlLeaveCriticalSection(&sdl_cs); + pthread_mutex_unlock(&sdl_cs); } NTSTATUS WINAPI sdl_bus_init(void *args) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 928548b8893..c73a6dd2259 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -58,6 +58,8 @@ # endif #endif +#include <pthread.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -91,14 +93,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); WINE_DECLARE_DEBUG_CHANNEL(hid_report); -static CRITICAL_SECTION udev_cs; -static CRITICAL_SECTION_DEBUG udev_cs_debug = -{ - 0, 0, &udev_cs, - { &udev_cs_debug.ProcessLocksList, &udev_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": udev_cs") } -}; -static CRITICAL_SECTION udev_cs = { &udev_cs_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t udev_cs = PTHREAD_MUTEX_INITIALIZER; static struct udev *udev_context = NULL; static struct udev_monitor *udev_monitor; @@ -622,9 +617,9 @@ static void hidraw_device_destroy(struct unix_device *iface) static NTSTATUS hidraw_device_start(struct unix_device *iface) { - RtlEnterCriticalSection(&udev_cs); + pthread_mutex_lock(&udev_cs); start_polling_device(iface); - RtlLeaveCriticalSection(&udev_cs); + pthread_mutex_unlock(&udev_cs); return STATUS_SUCCESS; } @@ -632,10 +627,10 @@ static void hidraw_device_stop(struct unix_device *iface) { struct platform_private *private = impl_from_unix_device(iface); - RtlEnterCriticalSection(&udev_cs); + pthread_mutex_lock(&udev_cs); stop_polling_device(iface); list_remove(&private->unix_device.entry); - RtlLeaveCriticalSection(&udev_cs); + pthread_mutex_unlock(&udev_cs); } static NTSTATUS hidraw_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, @@ -824,9 +819,9 @@ static NTSTATUS lnxev_device_start(struct unix_device *iface) if ((status = build_report_descriptor(ext, ext->base.udev_device))) return status; - RtlEnterCriticalSection(&udev_cs); + pthread_mutex_lock(&udev_cs); start_polling_device(iface); - RtlLeaveCriticalSection(&udev_cs); + pthread_mutex_unlock(&udev_cs); return STATUS_SUCCESS; } @@ -834,10 +829,10 @@ static void lnxev_device_stop(struct unix_device *iface) { struct wine_input_private *ext = input_impl_from_unix_device(iface); - RtlEnterCriticalSection(&udev_cs); + pthread_mutex_lock(&udev_cs); stop_polling_device(iface); list_remove(&ext->base.unix_device.entry); - RtlLeaveCriticalSection(&udev_cs); + pthread_mutex_unlock(&udev_cs); } static NTSTATUS lnxev_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, @@ -1246,16 +1241,16 @@ NTSTATUS WINAPI udev_bus_wait(void *args) { if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING; - RtlEnterCriticalSection(&udev_cs); + pthread_mutex_lock(&udev_cs); while (close_count--) close(close_fds[close_count]); memcpy(pfd, poll_fds, poll_count * sizeof(*pfd)); count = poll_count; close_count = 0; - RtlLeaveCriticalSection(&udev_cs); + pthread_mutex_unlock(&udev_cs); while (poll(pfd, count, -1) <= 0) {} - RtlEnterCriticalSection(&udev_cs); + pthread_mutex_lock(&udev_cs); if (pfd[0].revents) process_monitor_event(udev_monitor); if (pfd[1].revents) read(deviceloop_control[0], &ctrl, 1); for (i = 2; i < count; ++i) @@ -1264,7 +1259,7 @@ NTSTATUS WINAPI udev_bus_wait(void *args) device = find_device_from_fd(pfd[i].fd); if (device) device->read_report(&device->unix_device); } - RtlLeaveCriticalSection(&udev_cs); + pthread_mutex_unlock(&udev_cs); } TRACE("UDEV main loop exiting\n");

1 0

Rémi Bernon : winebus.sys: Use new unixlib subsystem.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 5bbf1d1095e77fcd202b00ecfa1805bda6b7a1a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bbf1d1095e77fcd202b00ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 08:50:34 2021 +0200 winebus.sys: Use new unixlib subsystem. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_iohid.c | 12 ++++++------ dlls/winebus.sys/bus_sdl.c | 12 ++++++------ dlls/winebus.sys/bus_udev.c | 12 ++++++------ dlls/winebus.sys/main.c | 7 ++++--- dlls/winebus.sys/unix_private.h | 18 +++++++++--------- dlls/winebus.sys/unixlib.c | 25 +++++++++---------------- dlls/winebus.sys/unixlib.h | 2 -- 8 files changed, 41 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bbf1d1095e77fcd202b…

1 0

Conor McCarthy : vkd3d: Do not attempt to enable primitive restart for non-strip topology.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: vkd3d Branch: master Commit: eadf0ba88e46dd7a44105f04a763116ae27ead65 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eadf0ba88e46dd7a44105f0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Sep 14 12:58:17 2021 +1000 vkd3d: Do not attempt to enable primitive restart for non-strip topology. Prevents a validation failure if a d3d12 strip cut value is supplied. Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 4eccf1e..9e554b4 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2762,6 +2762,23 @@ static enum VkPrimitiveTopology vk_topology_from_d3d12_topology(D3D12_PRIMITIVE_ } } +static bool vk_topology_can_restart(VkPrimitiveTopology topology) +{ + switch (topology) + { + case VK_PRIMITIVE_TOPOLOGY_LINE_LIST: + case VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY: + case VK_PRIMITIVE_TOPOLOGY_PATCH_LIST: + case VK_PRIMITIVE_TOPOLOGY_POINT_LIST: + case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST: + case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY: + return false; + + default: + return true; + } +} + static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12_pipeline_state *state, const struct vkd3d_pipeline_key *key, VkRenderPass *vk_render_pass) { @@ -2938,7 +2955,8 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.pNext = NULL; ia_desc.flags = 0; ia_desc.topology = vk_topology_from_d3d12_topology(topology); - ia_desc.primitiveRestartEnable = !!graphics->index_buffer_strip_cut_value; + ia_desc.primitiveRestartEnable = graphics->index_buffer_strip_cut_value + && vk_topology_can_restart(ia_desc.topology); if (ia_desc.topology == VK_PRIMITIVE_TOPOLOGY_MAX_ENUM) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM1 max instructions.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: vkd3d Branch: master Commit: b46900bb82caf4dbac4667073b887891cf54f01c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b46900bb82caf4dbac46670… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 15 17:43:27 2021 -0500 vkd3d-shader/hlsl: Write SM1 max instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index b9a681a..d56b689 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -632,6 +632,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm1_binary_op(ctx, buffer, D3DSIO_ADD, &instr->reg, &arg1->reg, &arg2->reg); break; + case HLSL_OP2_MAX: + write_sm1_binary_op(ctx, buffer, D3DSIO_MAX, &instr->reg, &arg1->reg, &arg2->reg); + break; + case HLSL_OP2_MUL: write_sm1_binary_op(ctx, buffer, D3DSIO_MUL, &instr->reg, &arg1->reg, &arg2->reg); break;

1 0