- Wine-Devel - list.winehq.org

[PATCH vkd3d 1/5] vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_free().
by Henri Verbeet Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 83f91960..479cc5b8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1075,17 +1075,17 @@ void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, return priv; } -void shader_sm4_free(void *data) +void shader_sm4_free(struct vkd3d_shader_parser *parser) { struct vkd3d_shader_src_param_entry *e1, *e2; - struct vkd3d_sm4_data *priv = data; + struct vkd3d_sm4_data *sm4 = parser->data; - list_move_head(&priv->src_free, &priv->src); - LIST_FOR_EACH_ENTRY_SAFE(e1, e2, &priv->src_free, struct vkd3d_shader_src_param_entry, entry) + list_move_head(&sm4->src_free, &sm4->src); + LIST_FOR_EACH_ENTRY_SAFE(e1, e2, &sm4->src_free, struct vkd3d_shader_src_param_entry, entry) { vkd3d_free(e1); } - vkd3d_free(priv); + vkd3d_free(sm4); } static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 36c211e6..c439308e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -394,7 +394,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) { - shader_sm4_free(parser->data); + shader_sm4_free(parser); free_shader_desc(&parser->shader_desc); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 97c1999b..fb449aac 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -890,7 +890,7 @@ struct vkd3d_shader_message_context; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context); -void shader_sm4_free(void *data); +void shader_sm4_free(struct vkd3d_shader_parser *parser); void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(void *data, const DWORD **ptr, -- 2.20.1

1 0

[PATCH v2] shlwapi/tests: Document where SHFormatDateTimeA() crashes for NULL pointers.
by Francois Gouget Sept. 2, 2021

Sept. 2, 2021

Knowing which Windows versions have been confirmed to crash will make it easier to know whether that information is potentially obsolete if the Windows behavior changes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Indented. The if (0) is likely to stay there for a good while so it makes sense to indent the corresponding test. --- dlls/shlwapi/tests/ordinal.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bf43d35b1c2..8a294ec1751 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1674,11 +1674,8 @@ static void test_SHFormatDateTimeA(void) DWORD flags; INT ret; -if (0) -{ - /* crashes on native */ - pSHFormatDateTimeA(NULL, NULL, NULL, 0); -} + if (0) /* crashes on Windows XP to Windows 10 20H2 */ + pSHFormatDateTimeA(NULL, NULL, NULL, 0); GetLocalTime(&st); SystemTimeToFileTime(&st, &filetime); -- 2.30.2

5 10

[PATCH] uxtheme/tests: Use the OpenThemeDataForDpi() function pointer.
by Francois Gouget Sept. 2, 2021

Sept. 2, 2021

OpenThemeDataForDpi() is not available in Windows 10 1607 and older. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f9bf371e6bf..b088a7a050e 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -657,7 +657,7 @@ static void test_OpenThemeDataForDpi(void) is_theme_active = IsThemeActive(); SetLastError(0xdeadbeef); - htheme = OpenThemeDataForDpi(NULL, WC_BUTTONW, 96); + htheme = pOpenThemeDataForDpi(NULL, WC_BUTTONW, 96); if (is_theme_active) { ok(!!htheme, "Got a NULL handle.\n"); -- 2.30.2

2 1

[PATCH v2 1/9] ntoskrnl.exe/tests: Reduce the verbosity of test_return_status.
by Rémi Bernon Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix an incorrect use of sizeof in the WCHAR / char conversion, in GetFullPathNameW and SetupCopyOEMInfW calls. I also initially overlooked the small differences variations between driver_pnp and driver_hid start/stop sequences, it doesn't seem to make any difference but I used the driver_pnp version which does a few more things. Also edited the subjects. dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index dc10497caee..e3afd46181c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -946,7 +946,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) static void test_return_status(void) { struct return_status_params params; - unsigned int i, j, k; + unsigned int i, j, k, old_threshold; static const ULONG method_tests[] = { @@ -979,12 +979,15 @@ static void test_return_status(void) params.ret_status = status_tests[i]; params.iosb_status = status_tests[j]; - winetest_push_context("return 0x%08x, iosb 0x%08x, pending %d, method %u", - params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3); + trace("testing return 0x%08x, iosb 0x%08x, pending %d, method %u\n", + params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3); + old_threshold = winetest_mute_threshold; + winetest_mute_threshold = 1; do_return_status(method_tests[k], &params); - winetest_pop_context(); + winetest_mute_threshold = old_threshold; + trace("done\n"); } } } -- 2.33.0

2 10

[PATCH 00/13] Hardening of Dwarf debug info parsing
by Eric Pouech Sept. 2, 2021

Sept. 2, 2021

The following serie is the first step toward adding Dwarf3/4 support into dbghelp. It mainly includes: - constant / definition updates - hardening of code regarding error conditions, improper input stream... - a couple of bug fixes A+ --- Eric Pouech (13): dbghelp: fix in dwarf2 subprogram handling dbghelp: dwarf support of DW_FORM_ref_udata dbghelp: more traces while parsing dwarf dbghelp: update dwarf definitions dbghelp: fix dwarf constants dbghelp: dwarf's internals adjustement dbghelp: Mostly get rid of symt_cache in dwarf debug information dbghelp: Added an unknown type in symt_cache for handling bad references to types dbghelp: check correctness of type (esp. in case of unknown ones) dbghelp: No longer call assert() on missing subprogram dwarf's information dbghelp: Harden inspection of Dwarf line number information dbghelp: Fix some erroneous string manipulation when said string is empty "" dbghelp: Properly handle errors when reading first DIE in compilation unit dlls/dbghelp/dbghelp_private.h | 5 + dlls/dbghelp/dwarf.c | 191 ++++++++++++++------------------- dlls/dbghelp/dwarf.h | 44 +++++++- dlls/dbghelp/source.c | 2 +- 4 files changed, 129 insertions(+), 113 deletions(-)

1 13

[PATCH] gdi32: Remove useless calls to CreateICA.
by Jiajin Cui Sept. 2, 2021

Sept. 2, 2021

We can get funcs without calling CreateICA. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com> --- dlls/gdi32/driver.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 340476bca10..2c8feee25e7 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1057,16 +1057,13 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd, if (!WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, 300, NULL, NULL)) return -1; - if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1; - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtDeviceMode ); - ret = physdev->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, + const struct gdi_dc_funcs *funcs = NULL; + funcs = DRIVER_load_driver(bufW); + if (funcs) { + ret = funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, lpszProfile, fwMode ); - release_dc_ptr( dc ); } - DeleteDC( hdc ); + return ret; } -- 2.20.1

1 0

[PATCH v4 1/4] winebus.sys: Report WINEBUS\WINE_COMP_HID compatible id.
by Rémi Bernon Sept. 1, 2021

Sept. 1, 2021

And match it in winehid.sys instead of individual bus ids. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Add FIXMEs to unimplemented codes in pdo_pnp, add a missing IRP_MN_QUERY_CAPABILITIES, stop passing the irps down. dlls/winebus.sys/main.c | 22 ++++++++++++++++++++-- dlls/winehid.sys/winehid.inf | 7 +------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index e9c85deb846..49385576d62 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -226,7 +226,7 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) return dst; } -static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) +static WCHAR *get_hardware_ids(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; WCHAR *dst; @@ -240,6 +240,24 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) return dst; } +static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) +{ + static const WCHAR hid_compat[] = + { + 'W','I','N','E','B','U','S','\\','W','I','N','E','_','C','O','M','P','_','H','I','D',0 + }; + DWORD size = sizeof(hid_compat); + WCHAR *dst; + + if ((dst = ExAllocatePool(PagedPool, size + sizeof(WCHAR)))) + { + memcpy(dst, hid_compat, sizeof(hid_compat)); + dst[size / sizeof(WCHAR)] = 0; + } + + return dst; +} + static void remove_pending_irps(DEVICE_OBJECT *device) { struct device_extension *ext = device->DeviceExtension; @@ -444,7 +462,7 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) { case BusQueryHardwareIDs: TRACE("BusQueryHardwareIDs\n"); - irp->IoStatus.Information = (ULONG_PTR)get_compatible_ids(device); + irp->IoStatus.Information = (ULONG_PTR)get_hardware_ids(device); break; case BusQueryCompatibleIDs: TRACE("BusQueryCompatibleIDs\n"); diff --git a/dlls/winehid.sys/winehid.inf b/dlls/winehid.sys/winehid.inf index f9ed4091217..c1d8a1cf999 100644 --- a/dlls/winehid.sys/winehid.inf +++ b/dlls/winehid.sys/winehid.inf @@ -7,12 +7,7 @@ Class=HIDClass Wine=mfg_section [mfg_section] -Wine hidraw device=device_section,HIDRAW -Wine IOHID device=device_section,IOHID -Wine libevent device=device_section,LNXEV -Wine SDL HID device=device_section,SDLJOY -Wine mouse device=device_section,WINEMOUSE -Wine keyboard device=device_section,WINEKEYBOARD +Wine HID compatible device=device_section,WINEBUS\WINE_COMP_HID [device_section.Services] AddService = winehid,0x2,svc_section -- 2.33.0

2 7

[PATCH 1/7] server: Allow calling async_terminate() with STATUS_PENDING.
by Zebediah Figura Sept. 1, 2021

Sept. 1, 2021

We still don't quite handle this completely correctly, but we should at least avoid crashing the server due to a failed assertion. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/async.c | 2 -- server/device.c | 1 - 2 files changed, 3 deletions(-) diff --git a/server/async.c b/server/async.c index 1c3082083ed..b414604fcd4 100644 --- a/server/async.c +++ b/server/async.c @@ -156,8 +156,6 @@ static void async_destroy( struct object *obj ) /* notifies client thread of new status of its async request */ void async_terminate( struct async *async, unsigned int status ) { - assert( status != STATUS_PENDING ); - if (async->terminated) return; async->terminated = 1; diff --git a/server/device.c b/server/device.c index b669921a003..ef93a0a9024 100644 --- a/server/device.c +++ b/server/device.c @@ -386,7 +386,6 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, if (!file) return; /* already finished */ - /* FIXME: handle the STATUS_PENDING case */ iosb->status = status; iosb->result = result; iosb->out_size = min( iosb->out_size, out_size ); -- 2.33.0

1 6

[PATCH 1/2] avicap32: Build with msvcrt.
by Zebediah Figura Sept. 1, 2021

Sept. 1, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- There's a good chance that we'll want to move v4l handling to a kernel streaming infrastructure, which is the main reason I hadn't bothered converting avicap32 yet, but I'm not likely to get the time to do that research in the near future. dlls/avicap32/Makefile.in | 7 +- dlls/avicap32/avicap32_main.c | 135 +++++++-------------------------- dlls/avicap32/unixlib.h | 33 ++++++++ dlls/avicap32/v4l.c | 137 ++++++++++++++++++++++++++++++++++ 4 files changed, 201 insertions(+), 111 deletions(-) create mode 100644 dlls/avicap32/unixlib.h create mode 100644 dlls/avicap32/v4l.c diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in index 8f5a1089d5c..a899a6207b0 100644 --- a/dlls/avicap32/Makefile.in +++ b/dlls/avicap32/Makefile.in @@ -1,4 +1,9 @@ MODULE = avicap32.dll IMPORTLIB = avicap32 +EXTRALIBS = -Wl,--subsystem,unixlib -C_SRCS = avicap32_main.c +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + avicap32_main.c \ + v4l.c diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 9e2a99d4c7c..d4608138d8b 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -17,45 +17,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> -#include <stdio.h> -#include <fcntl.h> -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#include <errno.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#ifdef HAVE_ASM_TYPES_H -# include <asm/types.h> -#endif -#ifdef HAVE_LINUX_VIDEODEV2_H -# include <linux/videodev2.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "vfw.h" -#include "winnls.h" #include "winternl.h" #include "wine/debug.h" -#define CAP_DESC_MAX 32 +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(avicap); +static unixlib_handle_t unix_handle; /*********************************************************************** * capCreateCaptureWindowW (AVICAP32.@) @@ -88,81 +63,6 @@ HWND VFWAPI capCreateCaptureWindowA(LPCSTR lpszWindowName, DWORD dwStyle, INT x, return retW; } -#ifdef HAVE_LINUX_VIDEODEV2_H - -static int xioctl(int fd, int request, void * arg) -{ - int r; - - do r = ioctl (fd, request, arg); - while (-1 == r && EINTR == errno); - - return r; -} - -static BOOL query_video_device(int devnum, char *name, int namesize, char *version, int versionsize) -{ - int fd; - char device[16]; - struct stat st; - struct v4l2_capability caps; - - snprintf(device, sizeof(device), "/dev/video%i", devnum); - - if (stat (device, &st) == -1) { - /* This is probably because the device does not exist */ - WARN("%s: %s\n", device, strerror(errno)); - return FALSE; - } - - if (!S_ISCHR (st.st_mode)) { - ERR("%s: Not a device\n", device); - return FALSE; - } - - fd = open(device, O_RDWR | O_NONBLOCK); - if (fd == -1) { - ERR("%s: Failed to open: %s\n", device, strerror(errno)); - return FALSE; - } - - memset(&caps, 0, sizeof(caps)); - if (xioctl(fd, VIDIOC_QUERYCAP, &caps) != -1) { - BOOL isCaptureDevice; -#ifdef V4L2_CAP_DEVICE_CAPS - if (caps.capabilities & V4L2_CAP_DEVICE_CAPS) - isCaptureDevice = caps.device_caps & V4L2_CAP_VIDEO_CAPTURE; - else -#endif - isCaptureDevice = caps.capabilities & V4L2_CAP_VIDEO_CAPTURE; - if (isCaptureDevice) { - lstrcpynA(name, (char *)caps.card, namesize); - snprintf(version, versionsize, "%s v%u.%u.%u", (char *)caps.driver, (caps.version >> 16) & 0xFF, - (caps.version >> 8) & 0xFF, caps.version & 0xFF); - } - close(fd); - return isCaptureDevice; - } - - if (errno != EINVAL && errno != 515) -/* errno 515 is used by some webcam drivers for unknown IOICTL command */ - ERR("%s: Querying failed: %s\n", device, strerror(errno)); - else ERR("%s: Querying failed: Not a V4L compatible device\n", device); - - close(fd); - return FALSE; -} - -#else /* HAVE_LINUX_VIDEODEV2_H */ - -static BOOL query_video_device(int devnum, char *name, int namesize, char *version, int versionsize) -{ - ERR("Video 4 Linux support not enabled\n"); - return FALSE; -} - -#endif /* HAVE_LINUX_VIDEODEV2_H */ - /*********************************************************************** * capGetDriverDescriptionA (AVICAP32.@) */ @@ -183,15 +83,30 @@ BOOL VFWAPI capGetDriverDescriptionA(WORD wDriverIndex, LPSTR lpszName, /*********************************************************************** * capGetDriverDescriptionW (AVICAP32.@) */ -BOOL VFWAPI capGetDriverDescriptionW(WORD wDriverIndex, LPWSTR lpszName, - INT cbName, LPWSTR lpszVer, INT cbVer) +BOOL VFWAPI capGetDriverDescriptionW(WORD index, WCHAR *name, int name_len, WCHAR *version, int version_len) { - char devname[CAP_DESC_MAX], devver[CAP_DESC_MAX]; + struct get_device_desc_params params; - if (!query_video_device(wDriverIndex, devname, CAP_DESC_MAX, devver, CAP_DESC_MAX)) return FALSE; + params.index = index; + if (__wine_unix_call(unix_handle, unix_get_device_desc, &params)) + return FALSE; - MultiByteToWideChar(CP_UNIXCP, 0, devname, -1, lpszName, cbName); - MultiByteToWideChar(CP_UNIXCP, 0, devver, -1, lpszVer, cbVer); - TRACE("Version: %s - Name: %s\n", debugstr_w(lpszVer), debugstr_w(lpszName)); - return TRUE; + TRACE("Found device name %s, version %s.\n", debugstr_w(params.name), debugstr_w(params.version)); + lstrcpynW(name, params.name, name_len); + lstrcpynW(version, params.version, version_len); + return TRUE; +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + NtQueryVirtualMemory(GetCurrentProcess(), instance, + MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL); + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; } diff --git a/dlls/avicap32/unixlib.h b/dlls/avicap32/unixlib.h new file mode 100644 index 00000000000..89ef1cc93f9 --- /dev/null +++ b/dlls/avicap32/unixlib.h @@ -0,0 +1,33 @@ +/* + * Copyright 2021 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/unixlib.h" + +#define CAP_DESC_MAX 32 + +struct get_device_desc_params +{ + WORD index; + WCHAR name[CAP_DESC_MAX]; + WCHAR version[CAP_DESC_MAX]; +}; + +enum unix_funcs +{ + unix_get_device_desc, +}; diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c new file mode 100644 index 00000000000..ab2694ae041 --- /dev/null +++ b/dlls/avicap32/v4l.c @@ -0,0 +1,137 @@ +/* + * Copyright 2002 Dmitry Timoshkov for CodeWeavers + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <errno.h> +#include <fcntl.h> +#include <stdarg.h> +#include <stdio.h> +#include <unistd.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef HAVE_LINUX_VIDEODEV2_H +# include <linux/videodev2.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "wine/debug.h" + +#include "unixlib.h" + +#ifdef HAVE_LINUX_VIDEODEV2_H + +WINE_DEFAULT_DEBUG_CHANNEL(avicap); + +static int xioctl(int fd, int request, void *arg) +{ + int ret; + + do + ret = ioctl(fd, request, arg); + while (ret < 0 && errno == EINTR); + + return ret; +} + +static void v4l_umbstowcs(const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen) +{ + DWORD ret = ntdll_umbstowcs(src, srclen, dst, dstlen - 1); + + dst[ret] = 0; +} + +static NTSTATUS get_device_desc(void *args) +{ + struct get_device_desc_params *params = args; + struct v4l2_capability caps = {{0}}; + char device[16]; + struct stat st; + int fd; + + snprintf(device, sizeof(device), "/dev/video%u", params->index); + + if (stat(device, &st) < 0) + { + /* This is probably because the device does not exist */ + WARN("Failed to stat %s: %s\n", device, strerror(errno)); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + if (!S_ISCHR(st.st_mode)) + { + ERR("%s is not a character device.\n", device); + return STATUS_OBJECT_TYPE_MISMATCH; + } + + if ((fd = open(device, O_RDWR | O_NONBLOCK)) < 0) + { + ERR("%s: Failed to open: %s\n", device, strerror(errno)); + return STATUS_UNSUCCESSFUL; + } + + if (!xioctl(fd, VIDIOC_QUERYCAP, &caps)) + { + BOOL is_capture_device; +#ifdef V4L2_CAP_DEVICE_CAPS + if (caps.capabilities & V4L2_CAP_DEVICE_CAPS) + is_capture_device = caps.device_caps & V4L2_CAP_VIDEO_CAPTURE; + else +#endif + is_capture_device = caps.capabilities & V4L2_CAP_VIDEO_CAPTURE; + if (is_capture_device) + { + char version[CAP_DESC_MAX]; + int ret; + + v4l_umbstowcs((char *)caps.card, strlen((char *)caps.card), + params->name, ARRAY_SIZE(params->name)); + + ret = snprintf(version, ARRAY_SIZE(version), "%s v%u.%u.%u", (char *)caps.driver, + (caps.version >> 16) & 0xff, (caps.version >> 8) & 0xff, caps.version & 0xff); + v4l_umbstowcs(version, ret, params->version, ARRAY_SIZE(params->version)); + } + close(fd); + return is_capture_device; + } + + /* errno 515 is used by some webcam drivers for unknown IOCTL commands. */ + ERR("Failed to get capabilities for %s: %s\n", device, strerror(errno)); + + close(fd); + return FALSE; +} + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + get_device_desc, +}; + +#endif /* HAVE_LINUX_VIDEODEV_2 */ -- 2.33.0

1 1

[PATCH vkd3d 2/5] vkd3d-shader/hlsl: Set the source name in hlsl_ctx_init().
by Henri Verbeet Sept. 1, 2021

Sept. 1, 2021

Without this, HLSL compiler messages were missing the source name. For example, when attempting to compile gears.hlsl from the "gears" demo with vkd3d-compiler: ":33:17: E5000: syntax error, unexpected NEW_IDENTIFIER" Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 13ef6cf9..0d539600 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1694,8 +1694,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } } -static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info *profile, - struct vkd3d_shader_message_context *message_context) +static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name, + const struct hlsl_profile_info *profile, struct vkd3d_shader_message_context *message_context) { memset(ctx, 0, sizeof(*ctx)); @@ -1705,7 +1705,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * if (!(ctx->source_files = hlsl_alloc(ctx, sizeof(*ctx->source_files)))) return false; - if (!(ctx->source_files[0] = hlsl_strdup(ctx, ""))) + if (!(ctx->source_files[0] = hlsl_strdup(ctx, source_name ? source_name : "<anonymous>"))) { vkd3d_free(ctx->source_files); return false; @@ -1800,7 +1800,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source); - if (!hlsl_ctx_init(&ctx, profile, message_context)) + if (!hlsl_ctx_init(&ctx, compile_info->source_name, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; if ((ret = hlsl_lexer_compile(&ctx, hlsl)) == 2) -- 2.20.1

2 1