wine-devel September 2021

wine-devel@winehq.org

83 participants
748 discussions

[PATCH v4 1/4] winebus.sys: Report WINEBUS\WINE_COMP_HID compatible id.
by Rémi Bernon 01 Sep '21

01 Sep '21

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 01 Sep '21

01 Sep '21

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 01 Sep '21

01 Sep '21

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 01 Sep '21

01 Sep '21

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

[PATCH] wined3d: Make wined3d_context_vk_allocate_memory() static.
by Francois Gouget 01 Sep '21

01 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8df416851f2..705f789ed5f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -306,7 +306,7 @@ VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_cont return vk_memory; } -struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, +static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e9f3884724..86c053df0db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2611,8 +2611,6 @@ static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_conte void wined3d_context_vk_accumulate_pending_queries(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; void wined3d_context_vk_add_pending_query(struct wined3d_context_vk *context_vk, struct wined3d_query_vk *query_vk) DECLSPEC_HIDDEN; -struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, - unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) DECLSPEC_HIDDEN; bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct wined3d_query_pool_idx_vk *pool_idx) DECLSPEC_HIDDEN; VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk, -- 2.30.2

2 1

[PATCH] windowscodecs: Make the png_{de,en}coder_*() functions static.
by Francois Gouget 01 Sep '21

01 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windowscodecs/libpng.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 0571f5a2aad..6496fa36436 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -203,7 +203,7 @@ static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t lengt } } -HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) +static HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) { struct png_decoder *This = impl_from_decoder(iface); png_structp png_ptr; @@ -484,14 +484,14 @@ end: return hr; } -HRESULT CDECL png_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) +static HRESULT CDECL png_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) { struct png_decoder *This = impl_from_decoder(iface); *info = This->decoder_frame; return S_OK; } -HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, +static HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) { struct png_decoder *This = impl_from_decoder(iface); @@ -501,7 +501,7 @@ HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, prc, stride, buffersize, buffer); } -HRESULT CDECL png_decoder_get_metadata_blocks(struct decoder* iface, +static HRESULT CDECL png_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) { struct png_decoder *This = impl_from_decoder(iface); @@ -574,7 +574,7 @@ end: return hr; } -HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, +static HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) { struct png_decoder *This = impl_from_decoder(iface); @@ -590,7 +590,7 @@ HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, U return S_OK; } -void CDECL png_decoder_destroy(struct decoder* iface) +static void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); @@ -738,7 +738,7 @@ static HRESULT CDECL png_encoder_initialize(struct encoder *encoder, IStream *st return S_OK; } -HRESULT CDECL png_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) +static HRESULT CDECL png_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) { int i; @@ -869,7 +869,7 @@ static HRESULT CDECL png_encoder_create_frame(struct encoder *encoder, const str return S_OK; } -HRESULT CDECL png_encoder_write_lines(struct encoder* encoder, BYTE *data, DWORD line_count, DWORD stride) +static HRESULT CDECL png_encoder_write_lines(struct encoder* encoder, BYTE *data, DWORD line_count, DWORD stride) { struct png_encoder *This = impl_from_encoder(encoder); jmp_buf jmpbuf; -- 2.30.2

2 1

[PATCH 0/3] Let 64bit dbghelp handle a 32bit target
by Eric Pouech 01 Sep '21

01 Sep '21

Allow 64bit dbghelp handle a 32bit target on WOW64 context The good news is that the serie is rather small. Improvements on last patch are welcomed :-( A+ --- Eric Pouech (3): dbghelp: split storage of PE header dbghelp: now storing the IMAGE_OPTIONAL_HEADER in either 32bit or 64bit form dbghelp: fix failing SymInitialize for a live 32bit target from a 64bit caller in WOW64 dlls/dbghelp/dbghelp.c | 58 +++++++++++++++++++++++++++++++++--- dlls/dbghelp/image_private.h | 6 +++- dlls/dbghelp/pe_module.c | 37 ++++++++++++++++------- 3 files changed, 86 insertions(+), 15 deletions(-)

5 10

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Write SM4 multiplication instructions.
by Zebediah Figura 01 Sep '21

01 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 32a4eda1..af1660f1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -957,6 +957,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); break; + case HLSL_OP2_MUL: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_MUL, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, expr->node.loc, "SM4 float \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; -- 2.33.0

7 26

[PATCH v2 1/5] winemac.drv: Enable layer-backed views.
by Chip Davis 01 Sep '21

01 Sep '21

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d5434b8a966..bc06a9506ee 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -311,6 +311,16 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @end +#ifndef MAC_OS_X_VERSION_10_14 +@protocol NSViewLayerContentScaleDelegate <NSObject> +@optional + + - (BOOL) layer:(CALayer*)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow*)window; + +@end +#endif + + @interface WineBaseView : NSView @end @@ -327,7 +337,7 @@ - (id) initWithFrame:(NSRect)frame device:(id<MTLDevice>)device; #endif -@interface WineContentView : WineBaseView <NSTextInputClient> +@interface WineContentView : WineBaseView <NSTextInputClient, NSViewLayerContentScaleDelegate> { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; @@ -339,6 +349,7 @@ @interface WineContentView : WineBaseView <NSTextInputClient> NSMutableAttributedString* markedText; NSRange markedTextSelection; + BOOL _retinaMode; int backingSize[2]; #ifdef HAVE_METAL_METAL_H @@ -688,9 +699,15 @@ - (void) setRetinaMode:(int)mode [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; + _retinaMode = !!mode; [super setRetinaMode:mode]; } + - (BOOL) layer:(CALayer*)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow*)window + { + return (_retinaMode || newScale == 1.0); + } + - (void) viewDidHide { [super viewDidHide]; @@ -1002,6 +1019,7 @@ + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)w contentView = [[[WineContentView alloc] initWithFrame:NSZeroRect] autorelease]; if (!contentView) return nil; + [contentView setWantsLayer:YES]; [contentView setAutoresizesSubviews:NO]; /* We use tracking areas in addition to setAcceptsMouseMovedEvents:YES @@ -3576,6 +3594,7 @@ macdrv_view macdrv_create_view(CGRect rect) NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; view = [[WineContentView alloc] initWithFrame:NSRectFromCGRect(cgrect_mac_from_win(rect))]; + [view setWantsLayer:YES]; [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES]; -- 2.33.0

2 5

[PATCH v2 1/2] jscript: Allow ES5 keywords in identifiers.
by Gabriel Ivăncescu 01 Sep '21

01 Sep '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- So, I managed to solve all the extra shift/reduce conflicts, but I'm not entirely happy about how I've done it, and I can't for the life of me figure out WHY, so I'm hoping by sending it some review might help me out of this situation. I tried bison with --report=all and verbose, and I don't know how to solve that conflict. The problem is in LabelledStatement; for some reason I cannot comprehend, I had to duplicate all the ES5 keywords and use tIdentifier as separate rules to avoid any extra shift/reduce conflicts from it. Using just "Identifier" would generate two extra shift/reduce conflicts! Using "tIdentifier | ES5Keyword" would generate only one extra shift/reduce conflict. And using "tIdentifier | kGET | kSET | kLET" generates no extra conflicts (this patch). I think I'm going crazy; isn't it supposed to be the same thing? Why the difference? Any ideas? dlls/jscript/parser.y | 44 ++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 0ebdc2b..34ad532 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -220,7 +220,7 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t %type <expr> MemberExpression %type <expr> PrimaryExpression %type <expr> GetterSetterMethod -%type <identifier> Identifier_opt +%type <identifier> Identifier Identifier_opt %type <variable_list> VariableDeclarationList %type <variable_list> VariableDeclarationListNoIn %type <variable_declaration> VariableDeclaration @@ -240,10 +240,11 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t %type <literal> PropertyName %type <literal> BooleanLiteral %type <ival> AssignOper -%type <identifier> IdentifierName ReservedAsIdentifier +%type <identifier> IdentifierName ReservedAsIdentifier ES5Keyword %nonassoc LOWER_THAN_ELSE -%nonassoc kELSE +%nonassoc kELSE kIN kINSTANCEOF ':' +%nonassoc kGET kLET kSET %% @@ -267,9 +268,9 @@ FunctionStatementList FunctionExpression : kFUNCTION left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, NULL, $3, $6, NULL, ctx->begin + @1, @7 - @1 + 1); } - | kFUNCTION tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + | kFUNCTION Identifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, $2, $4, $7, NULL, ctx->begin + @1, @8 - @1 + 1); } - | kFUNCTION tIdentifier kDCOL tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + | kFUNCTION Identifier kDCOL Identifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, $4, $6, $9, $2, ctx->begin + @1, @10 - @1 + 1); } /* ECMA-262 10th Edition 14.1 */ @@ -278,8 +279,8 @@ FunctionBody /* ECMA-262 3rd Edition 13 */ FormalParameterList - : tIdentifier { $$ = new_parameter_list(ctx, $1); } - | FormalParameterList ',' tIdentifier + : Identifier { $$ = new_parameter_list(ctx, $1); } + | FormalParameterList ',' Identifier { $$ = parameter_list_add(ctx, $1, $3); } /* ECMA-262 3rd Edition 13 */ @@ -380,12 +381,12 @@ VariableDeclarationListNoIn /* ECMA-262 3rd Edition 12.2 */ VariableDeclaration - : tIdentifier Initialiser_opt + : Identifier Initialiser_opt { $$ = new_variable_declaration(ctx, $1, $2); } /* ECMA-262 3rd Edition 12.2 */ VariableDeclarationNoIn - : tIdentifier InitialiserNoIn_opt + : Identifier InitialiserNoIn_opt { $$ = new_variable_declaration(ctx, $1, $2); } /* ECMA-262 3rd Edition 12.2 */ @@ -478,6 +479,12 @@ WithStatement LabelledStatement : tIdentifier ':' Statement { $$ = new_labelled_statement(ctx, @$, $1, $3); } + | kGET ':' Statement + { $$ = new_labelled_statement(ctx, @$, $1, $3); } + | kSET ':' Statement + { $$ = new_labelled_statement(ctx, @$, $1, $3); } + | kLET ':' Statement + { $$ = new_labelled_statement(ctx, @$, $1, $3); } /* ECMA-262 3rd Edition 12.11 */ SwitchStatement @@ -526,7 +533,7 @@ TryStatement /* ECMA-262 3rd Edition 12.14 */ Catch - : kCATCH left_bracket tIdentifier right_bracket Block + : kCATCH left_bracket Identifier right_bracket Block { $$ = new_catch_block(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.14 */ @@ -785,7 +792,7 @@ ArgumentList /* ECMA-262 3rd Edition 11.1 */ PrimaryExpression : kTHIS { $$ = new_expression(ctx, EXPR_THIS, 0); } - | tIdentifier { $$ = new_identifier_expression(ctx, $1); } + | Identifier { $$ = new_identifier_expression(ctx, $1); } | Literal { $$ = new_literal_expression(ctx, $1); } | ArrayLiteral { $$ = $1; } | ObjectLiteral { $$ = $1; } @@ -859,7 +866,11 @@ PropertyName /* ECMA-262 3rd Edition 7.6 */ Identifier_opt : /* empty*/ { $$ = NULL; } - | tIdentifier { $$ = $1; } + | Identifier { $$ = $1; } + +Identifier + : tIdentifier { $$ = $1; } + | ES5Keyword { $$ = $1; } /* ECMA-262 5.1 Edition 7.6 */ IdentifierName @@ -889,15 +900,12 @@ ReservedAsIdentifier | kFINALLY { $$ = $1; } | kFOR { $$ = $1; } | kFUNCTION { $$ = $1; } - | kGET { $$ = $1; } | kIF { $$ = $1; } | kIN { $$ = $1; } | kINSTANCEOF { $$ = $1; } - | kLET { $$ = $1; } | kNEW { $$ = $1; } | kNULL { $$ = $1; } | kRETURN { $$ = $1; } - | kSET { $$ = $1; } | kSWITCH { $$ = $1; } | kTHIS { $$ = $1; } | kTHROW { $$ = $1; } @@ -908,6 +916,12 @@ ReservedAsIdentifier | kVOID { $$ = $1; } | kWHILE { $$ = $1; } | kWITH { $$ = $1; } + | ES5Keyword { $$ = $1; } + +ES5Keyword + : kGET { $$ = $1; } + | kLET { $$ = $1; } + | kSET { $$ = $1; } /* ECMA-262 3rd Edition 7.8 */ Literal -- 2.31.1

2 2

← Newer
1
...
68
69
70
71
72
73
74
75
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel September 2021