wine-devel February 2021

wine-devel@winehq.org

81 participants
640 discussions

[PATCH vkd3d] vkd3d-shader: Implement global resource memory barriers.
by Zebediah Figura 04 Feb '21

04 Feb '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 7 +++++++ libs/vkd3d-shader/trace.c | 5 +++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 13 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a997ec6f..106c2980 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8866,6 +8866,13 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, flags &= ~VKD3DSSF_THREAD_GROUP; } + if (flags & VKD3DSSF_GLOBAL_UAV) + { + memory_scope = SpvScopeDevice; + memory_semantics |= SpvMemorySemanticsImageMemoryMask; + flags &= ~VKD3DSSF_GLOBAL_UAV; + } + if (flags) { FIXME("Unhandled sync flags %#x.\n", flags); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index cab5b80d..40b3e318 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -368,6 +368,11 @@ static void shader_dump_global_flags(struct vkd3d_string_buffer *buffer, DWORD g static void shader_dump_sync_flags(struct vkd3d_string_buffer *buffer, DWORD sync_flags) { + if (sync_flags & VKD3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "_uglobal"); + sync_flags &= ~VKD3DSSF_GLOBAL_UAV; + } if (sync_flags & VKD3DSSF_GROUP_SHARED_MEMORY) { shader_addline(buffer, "_g"); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 0601bdeb..8bb85a8b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -493,6 +493,7 @@ enum vkd3d_shader_sync_flags { VKD3DSSF_THREAD_GROUP = 0x1, VKD3DSSF_GROUP_SHARED_MEMORY = 0x2, + VKD3DSSF_GLOBAL_UAV = 0x8, }; enum vkd3d_shader_uav_flags -- 2.30.0

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Move hlsl_message() and hlsl_report_message() to hlsl.c.
by Zebediah Figura 04 Feb '21

04 Feb '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 16 ++++++++++++++++ libs/vkd3d-shader/hlsl.y | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ebd74e64..011cdaf5 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -20,6 +20,22 @@ #include "hlsl.h" #include <stdio.h> +void hlsl_message(const char *fmt, ...) +{ + /* FIXME */ +} + +void hlsl_report_message(const struct source_location loc, + enum hlsl_error_level level, const char *fmt, ...) +{ + /* FIXME */ + + if (level == HLSL_LEVEL_ERROR) + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + else if (level == HLSL_LEVEL_WARNING) + set_parse_status(&hlsl_ctx.status, PARSE_WARN); +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) { struct hlsl_ir_var *var; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ed832077..e1ba7c98 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -30,22 +30,6 @@ struct hlsl_parse_ctx hlsl_ctx; struct YYLTYPE; static struct source_location get_location(const struct YYLTYPE *l); -void hlsl_message(const char *fmt, ...) -{ - /* FIXME */ -} - -void hlsl_report_message(const struct source_location loc, - enum hlsl_error_level level, const char *fmt, ...) -{ - /* FIXME */ - - if (level == HLSL_LEVEL_ERROR) - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - else if (level == HLSL_LEVEL_WARNING) - set_parse_status(&hlsl_ctx.status, PARSE_WARN); -} - static void hlsl_error(const char *s) { const struct source_location loc = -- 2.30.0

4 15

[PATCH] include: Fix sprintf_s declaration.
by Daniel Lehman 04 Feb '21

04 Feb '21

2 1

[PATCH 1/5] widl: Remove useless find_type_or_error2 helper.
by Rémi Bernon 04 Feb '21

04 Feb '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is the first part of a refactoring series, to cleanup namespace usage, and ultimately better support qualified type names. tools/widl/parser.y | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 480552e3723..328829cc0da 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -76,7 +76,6 @@ static warning_list_t *append_warning(warning_list_t *, int); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); static type_t *find_type_or_error(const char *name, int t); -static type_t *find_type_or_error2(char *name, int t); static var_t *reg_const(var_t *var); @@ -1015,7 +1014,7 @@ interfacedef: interfacehdr inherit | interfacehdr ':' aIDENTIFIER '{' import int_statements '}' semicolon_opt { $$ = $1; - type_interface_define($$, find_type_or_error2($3, 0), $6); + type_interface_define($$, find_type_or_error($3, 0), $6); } | dispinterfacedef semicolon_opt { $$ = $1; } ; @@ -1255,7 +1254,7 @@ acf_int_statement acf_interface : acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}' - { type_t *iface = find_type_or_error2($3, 0); + { type_t *iface = find_type_or_error($3, 0); if (type_get_type(iface) != TYPE_INTERFACE) error_loc("%s is not an interface\n", iface->name); iface->attrs = append_attr_list(iface->attrs, $1); @@ -2105,13 +2104,6 @@ static type_t *find_type_or_error(const char *name, int t) return type; } -static type_t *find_type_or_error2(char *name, int t) -{ - type_t *tp = find_type_or_error(name, t); - free(name); - return tp; -} - int is_type(const char *name) { return find_type(name, current_namespace, 0) != NULL || -- 2.30.0

2 9

[PATCH v2 1/2] user32/tests: Test minimized window placement after trying to change position.
by Gabriel Ivăncescu 04 Feb '21

04 Feb '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4786434..c457ce1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11547,6 +11547,61 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + wp.flags = WPF_SETMINPOSITION; + wp.showCmd = SW_NORMAL; + wp.ptMinPosition.x = wp.ptMinPosition.y = 100; + wp.ptMaxPosition.x = wp.ptMaxPosition.y = 100; + wp.rcNormalPosition = orig; + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %u\n", GetLastError()); + + ShowWindow(hwnd, SW_MINIMIZE); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + ret = SetWindowPos(hwnd, NULL, 100, 100, 151, 151, SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "failed to set window pos, error %u\n", GetLastError()); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); +todo_wine + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + GetWindowRect(hwnd, &rect); +todo_wine + ok(rect.left == -32000 && rect.top == -32000, "got window rect %s\n", wine_dbgstr_rect(&rect)); + + ShowWindow(hwnd, SW_SHOWNORMAL); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); +todo_wine + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + GetWindowRect(hwnd, &rect); + ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + DestroyWindow(hwnd); } -- 2.30.0

2 2

Google Summer of Code
by Stefan Dösinger 04 Feb '21

04 Feb '21

Hi, As threatened a while ago [1] I have deleted all gsoc ideas that did not result in an acceptable proposal in the past 2 years. Since we didn't have a single project that means all of them... This email is a call to re-fill the gsoc ideas page: https://wiki.winehq.org/Summer_Of_Code The gsoc organization application period begins in 7 days and ends in 27 days. That should be enough time to add new ideas; Otherwise I take it as a collective decision that gsoc is no longer suitable for Wine. Please beware of changes to gsoc itself: https://opensource.googleblog.com/2020/10/google-summer-of-code-2021-is-bri… . In short, the program is shorter, therefore the projects worked on should be smaller. IMHO a good idea suggestion should give a starting point for further research and list some open questions to fill. A good application would then have answers for those questions. I'd like to also bring up my proposal from last year to think beyond the main Wine code and tooling. There are things like PlayOnLinux, PlayOnMac, winevdm, etc that may provide something useful. Cheers, Stefan 1: https://www.winehq.org/pipermail/wine-devel/2020-November/177115.html

3 2

[PATCH resend v5 5/5] kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle.
by Erich E. Hoover 04 Feb '21

04 Feb '21

This patch removes the volume querying information duplication in kernelbase by re-implementing GetVolumeInformation using GetVolumeInformationByHandle (itself implemented with NtQueryVolumeInformationFile). v5: Rebase against 1b1b6c5f7d28768feb853eefd015aa714b819ed4 v4: Reordered (no content change) v3: No change v2: Reordered (no content change) Best, Erich

1 0

[PATCH resend v5 3/5] ntoskrnl.exe: Implement volume information queries for device files.
by Erich E. Hoover 04 Feb '21

04 Feb '21

This patch implements volume information queries for device files, which allows NtQueryVolumeInformationFile to issue IRP_MJ_QUERY_VOLUME_INFORMATION to return volume information from a driver. The patch also now includes a simple test that issues FileFsVolumeInformation (for systems that support unsigned drivers). v5: No change v4: Split out content from server/device.c and dlls/ntoskrnl.exe/ntoskrnl.c, fixed copy-paste error identified by Zeb, and added tests Best, Erich

1 0

[PATCH resend v5 2/5] ntdll: Allow NtQueryVolumeInformationFile to make async volume information queries.
by Erich E. Hoover 04 Feb '21

04 Feb '21

This patch allows NtQueryVolumeInformationFile to pass FileFsVolumeInformation and FileFsAttributeInformation requests to the mountmgr (as well as other device drivers). These requests currently do not work for NT device paths, which results in a bunch of duplication in kernelbase (see patch 5). v5: Fixed improper usage of io->u.Status that caused intermittent test failures in v4 patch 5 v4: Reordered (no content change) v3: No change v2: Split Best, Erich

1 0

[PATCH resend v5 1/5] server: Allow volume information queries to be asynchronous.
by Erich E. Hoover 04 Feb '21

04 Feb '21

Overall, this patchset has two objectives: 1) remove the volume information duplication in dlls/kernelbase/volume.c in preference to the version in dlls/mountmgr.sys/device.c 2) set the stage for fixing the advertisement of reparse point support ( https://github.com/wine-staging/wine-staging/blob/master/patches/ntdll-Junc… ) Per Zeb's suggestion, these patches are now organized as follows: 0001: allow volume information queries to be asynchronous 0002: allow NtQueryVolumeInformationFile to make async volume information queries 0003: implement volume information queries for device files 0004: hook up volume information queries for mountmgr 0005: reimplement GetVolumeInformation on top of GetVolumeInformationByHandle === This specific patch allows the volume information queries to be asynchronous on the server side. v5: No change v4: Split content from server/device.c and dlls/ntoskrnl.exe/ntoskrnl.c and moved to patch 4 v3: No change v2: Split Best, Erich

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
64
Older →

Jump to page:

2025

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 February 2021