November 2019 - Wine-commits

Alexandre Julliard : cabinet: Build with msvcrt.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: df2521bff234acb049e2fb534e6ad1dfe6cf5d45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df2521bff234acb049e2fb53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:30:33 2019 +0100 cabinet: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/Makefile.in | 2 ++ dlls/cabinet/cabinet.h | 21 --------------------- dlls/cabinet/cabinet_main.c | 3 +-- dlls/cabinet/fci.c | 6 ++---- dlls/cabinet/fdi.c | 4 ++-- 5 files changed, 7 insertions(+), 29 deletions(-) diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in index 1d5b549bb5..6b7211aac8 100644 --- a/dlls/cabinet/Makefile.in +++ b/dlls/cabinet/Makefile.in @@ -1,6 +1,8 @@ MODULE = cabinet.dll IMPORTLIB = cabinet +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ cabinet_main.c \ deflate.c \ diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index b84c3a7c5d..6193622cb1 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -29,27 +29,6 @@ #include "fdi.h" #include "fci.h" -/* from msvcrt/sys/stat.h */ -#define _S_IWRITE 0x0080 -#define _S_IREAD 0x0100 - -/* from msvcrt/fcntl.h */ -#define _O_RDONLY 0 -#define _O_WRONLY 1 -#define _O_RDWR 2 -#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) -#define _O_APPEND 0x0008 -#define _O_RANDOM 0x0010 -#define _O_SEQUENTIAL 0x0020 -#define _O_TEMPORARY 0x0040 -#define _O_NOINHERIT 0x0080 -#define _O_CREAT 0x0100 -#define _O_TRUNC 0x0200 -#define _O_EXCL 0x0400 -#define _O_SHORT_LIVED 0x1000 -#define _O_TEXT 0x4000 -#define _O_BINARY 0x8000 - #define CAB_SPLITMAX (10) #define CAB_SEARCH_SIZE (32*1024) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 8af0fb1e6d..f95eca93c5 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -18,11 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <assert.h> #include <stdarg.h> #include <string.h> +#include <fcntl.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index d746ac9cbc..1b72d7c77c 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -30,14 +30,12 @@ There is still some work to be done: */ - - -#include "config.h" - #include <assert.h> #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <sys/stat.h> +#include <fcntl.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 777174b4d1..1f442917d5 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -58,10 +58,10 @@ * -gmt */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> +#include <sys/stat.h> +#include <fcntl.h> #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : opcservices: Import zlib deflate code.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: c6aeabdd2c9cfeae1f0274514196dd9ac040b177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6aeabdd2c9cfeae1f027451… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:30:39 2019 +0100 opcservices: Import zlib deflate code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 3 +- dlls/opcservices/compress.c | 33 +- dlls/opcservices/deflate.c | 2974 ++++++++++++++++++++++++++++++++++++++++++ dlls/opcservices/zlib.h | 162 +++ 4 files changed, 3138 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6aeabdd2c9cfeae1f02…

1 0

Alexandre Julliard : opcservices: Build with msvcrt.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 8631960745396109ec450eafb9fe76684388f84a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8631960745396109ec450eaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:30:44 2019 +0100 opcservices: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 2 ++ dlls/opcservices/compress.c | 2 -- dlls/opcservices/package.c | 11 +++++------ dlls/opcservices/uri.c | 11 +++++------ 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index 2b6c1ce57a..b55c79826d 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,6 +1,8 @@ MODULE = opcservices.dll IMPORTS = uuid ole32 advapi32 urlmon xmllite oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ compress.c \ deflate.c \ diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index 19a4f0399f..0ee876512c 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -18,8 +18,6 @@ #define COBJMACROS -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 9bdd4b1f15..6ed7f6bcd7 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -26,7 +26,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "opc_private.h" @@ -732,7 +731,7 @@ static WCHAR *opc_strdupW(const WCHAR *str) { size_t size; - size = (strlenW(str) + 1) * sizeof(WCHAR); + size = (lstrlenW(str) + 1) * sizeof(WCHAR); ret = CoTaskMemAlloc(size); if (ret) memcpy(ret, str, size); @@ -1169,7 +1168,7 @@ static struct opc_relationship *opc_relationshipset_get_rel(struct opc_relations for (i = 0; i < relationship_set->count; i++) { - if (!strcmpW(id, relationship_set->relationships[i]->id)) + if (!wcscmp(id, relationship_set->relationships[i]->id)) return relationship_set->relationships[i]; } @@ -1207,7 +1206,7 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W /* FIXME: test that generated id is unique */ RtlGenRandom(&generated, sizeof(generated)); - sprintfW(relationship->id, fmtW, generated); + swprintf(relationship->id, 10, fmtW, generated); if (opc_relationshipset_get_rel(set, relationship->id)) { @@ -1635,11 +1634,11 @@ static HRESULT opc_package_add_content_type(struct content_types *types, IOpcPar if (cur->element == CONTENT_TYPE_OVERRIDE) continue; - if (!strcmpiW(cur->u.def.ext, ext)) + if (!wcsicmp(cur->u.def.ext, ext)) { added = TRUE; - if (!strcmpW(cur->u.def.type, content_type)) + if (!wcscmp(cur->u.def.type, content_type)) break; hr = opc_package_add_override_content_type(types, part); diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index 800ae34571..db889f7144 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -23,7 +23,6 @@ #include "winbase.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "opc_private.h" @@ -467,7 +466,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) return NULL; } - end = strrchrW(path, '/'); + end = wcsrchr(path, '/'); if (end && end >= path + ARRAY_SIZE(relsdirW) - 1) start = end - ARRAY_SIZE(relsdirW) + 1; if (!start) @@ -476,7 +475,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) /* Test if it's already relationships uri. */ if (len > ARRAY_SIZE(relsextW)) { - if (!strcmpW(path + len - ARRAY_SIZE(relsextW) + 1, relsextW)) + if (!wcscmp(path + len - ARRAY_SIZE(relsextW) + 1, relsextW)) { if (start && !memcmp(start, relsdirW, ARRAY_SIZE(relsdirW) - sizeof(WCHAR))) { @@ -500,9 +499,9 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) ret[start - path] = 0; } - strcatW(ret, relsdirW); - strcatW(ret, end); - strcatW(ret, relsextW); + lstrcatW(ret, relsdirW); + lstrcatW(ret, end); + lstrcatW(ret, relsextW); if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri))) WARN("Failed to create rels uri, hr %#x.\n", hr);

1 0

Alexandre Julliard : msi: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: d977c55bb4b9c564f376c22b43c60c9be7dc782d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d977c55bb4b9c564f376c22b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:05 2019 +0100 msi: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 2 +- dlls/msi/sql.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 2183d1edf4..1a79de31bf 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -114,7 +114,7 @@ static void value_free( struct value val ) %lex-param { COND_input *info } %parse-param { COND_input *info } -%pure-parser +%define api.pure %union { diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 50092abacf..8ffbcd4de5 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -58,7 +58,7 @@ static struct expr * EXPR_wildcard( void *info ); %lex-param { SQL_input *info } %parse-param { SQL_input *info } -%pure-parser +%define api.pure %union {

1 0

Alexandre Julliard : kernel32: Avoid forwarding to advapi32.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 69d0381b5af3a73745adda22cc7695ef71156def URL: https://source.winehq.org/git/wine.git/?a=commit;h=69d0381b5af3a73745adda22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 23 11:26:52 2019 +0100 kernel32: Avoid forwarding to advapi32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 78 ++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a26d65edf7..f6c40a9c42 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1200,48 +1200,48 @@ @ stdcall -import ReadFileScatter(long ptr long ptr ptr) @ stdcall -import ReadProcessMemory(long ptr ptr long ptr) # @ stub ReadThreadProfilingData -@ stdcall -private RegCloseKey(long) advapi32.RegCloseKey -@ stdcall -private RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA -@ stdcall -private RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW -@ stdcall -private RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA -@ stdcall -private RegDeleteKeyExW(long wstr long long) advapi32.RegDeleteKeyExW -@ stdcall -private RegDeleteTreeA(long str) advapi32.RegDeleteTreeA -@ stdcall -private RegDeleteTreeW(long wstr) advapi32.RegDeleteTreeW -@ stdcall -private RegDeleteValueA(long str) advapi32.RegDeleteValueA -@ stdcall -private RegDeleteValueW(long wstr) advapi32.RegDeleteValueW +@ stdcall -private -import RegCloseKey(long) +@ stdcall -private -import RegCreateKeyExA(long str long ptr long long ptr ptr ptr) +@ stdcall -private -import RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) +@ stdcall -private -import RegDeleteKeyExA(long str long long) +@ stdcall -private -import RegDeleteKeyExW(long wstr long long) +@ stdcall -private -import RegDeleteTreeA(long str) +@ stdcall -private -import RegDeleteTreeW(long wstr) +@ stdcall -private -import RegDeleteValueA(long str) +@ stdcall -private -import RegDeleteValueW(long wstr) # stub RegDisablePredefinedCacheEx -@ stdcall -private RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExA -@ stdcall -private RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExW -@ stdcall -private RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueA -@ stdcall -private RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueW -@ stdcall -private RegFlushKey(long) advapi32.RegFlushKey -@ stdcall -private RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity -@ stdcall -private RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA -@ stdcall -private RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +@ stdcall -private -import RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegFlushKey(long) +@ stdcall -private -import RegGetKeySecurity(long long ptr ptr) +@ stdcall -private -import RegGetValueA(long str str long ptr ptr ptr) +@ stdcall -private -import RegGetValueW(long wstr wstr long ptr ptr ptr) # stub RegKrnGetGlobalState # stub RegKrnInitialize -@ stdcall -private RegLoadKeyA(long str str) advapi32.RegLoadKeyA -@ stdcall -private RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW -@ stdcall -private RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA -@ stdcall -private RegLoadMUIStringW(long wstr wstr long ptr long wstr) advapi32.RegLoadMUIStringW -@ stdcall -private RegNotifyChangeKeyValue(long long long long long) advapi32.RegNotifyChangeKeyValue -@ stdcall -private RegOpenCurrentUser(long ptr) advapi32.RegOpenCurrentUser -@ stdcall -private RegOpenKeyExA(long str long long ptr) advapi32.RegOpenKeyExA -@ stdcall -private RegOpenKeyExW(long wstr long long ptr) advapi32.RegOpenKeyExW -@ stdcall -private RegOpenUserClassesRoot(ptr long long ptr) advapi32.RegOpenUserClassesRoot -@ stdcall -private RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyA -@ stdcall -private RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyW -@ stdcall -private RegQueryValueExA(long str ptr ptr ptr ptr) advapi32.RegQueryValueExA -@ stdcall -private RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW -@ stdcall -private RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA -@ stdcall -private RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW -# stub RegSaveKeyExA -# stub RegSaveKeyExW -@ stdcall -private RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity -@ stdcall -private RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA -@ stdcall -private RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW -@ stdcall -private RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA -@ stdcall -private RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW +@ stdcall -private -import RegLoadKeyA(long str str) +@ stdcall -private -import RegLoadKeyW(long wstr wstr) +@ stdcall -private -import RegLoadMUIStringA(long str str long ptr long str) +@ stdcall -private -import RegLoadMUIStringW(long wstr wstr long ptr long wstr) +@ stdcall -private -import RegNotifyChangeKeyValue(long long long long long) +@ stdcall -private -import RegOpenCurrentUser(long ptr) +@ stdcall -private -import RegOpenKeyExA(long str long long ptr) +@ stdcall -private -import RegOpenKeyExW(long wstr long long ptr) +@ stdcall -private -import RegOpenUserClassesRoot(ptr long long ptr) +@ stdcall -private -import RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegQueryValueExA(long str ptr ptr ptr ptr) +@ stdcall -private -import RegQueryValueExW(long wstr ptr ptr ptr ptr) +@ stdcall -private -import RegRestoreKeyA(long str long) +@ stdcall -private -import RegRestoreKeyW(long wstr long) +@ stdcall -private -import RegSaveKeyExA(long str ptr long) +@ stdcall -private -import RegSaveKeyExW(long wstr ptr long) +@ stdcall -private -import RegSetKeySecurity(long long ptr) +@ stdcall -private -import RegSetValueExA(long str long long ptr long) +@ stdcall -private -import RegSetValueExW(long wstr long long ptr long) +@ stdcall -private -import RegUnLoadKeyA(long str) +@ stdcall -private -import RegUnLoadKeyW(long wstr) @ stdcall RegisterApplicationRecoveryCallback(ptr ptr long long) @ stdcall RegisterApplicationRestart(wstr long) @ stub RegisterConsoleIME

1 0

Alexandre Julliard : cmd: Environment variables contain signed numbers.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 5d48eac4562953e08136801908beba8f60f2fe9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d48eac4562953e081368019… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 20:47:23 2019 +0100 cmd: Environment variables contain signed numbers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a1952e8024..c6048eb5c1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3713,7 +3713,7 @@ static int WCMD_peeknumber(VARSTACK **varstack) { if (!thisvar->isnum) { WCHAR tmpstr[MAXSTRING]; if (GetEnvironmentVariableW(thisvar->variable, tmpstr, MAXSTRING)) { - result = wcstoul(tmpstr,NULL,0); + result = wcstol(tmpstr,NULL,0); } WINE_TRACE("Envvar %s converted to %d\n", wine_dbgstr_w(thisvar->variable), result); } else {

1 0

Hans-Kristian Arntzen : vkd3d: Use size_t instead of SIZE_T for GPU VA sizes.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: 54d2a15aa64c0d5a030ef1a5501f055b605fd023 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=54d2a15aa64c0d5a030ef1a… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Mon Nov 25 17:53:36 2019 +0330 vkd3d: Use size_t instead of SIZE_T for GPU VA sizes. This also fixes a format specifier warning in an ERR for the 32-bit Linux build. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/vkd3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 84b5ff2..c6bfe96 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -205,13 +205,13 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, struct vkd3d_gpu_va_allocation { D3D12_GPU_VIRTUAL_ADDRESS base; - SIZE_T size; + size_t size; void *ptr; }; struct vkd3d_gpu_va_slab { - SIZE_T size; + size_t size; void *ptr; };

1 0

Philip Rebohle : vkd3d: Implement d3d12_command_list_ClearUnorderedAccessViewFloat().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: 126a789019ae0450521c456f299a8c7b5c3c7a63 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=126a789019ae0450521c456… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon Nov 25 17:53:37 2019 +0330 vkd3d: Implement d3d12_command_list_ClearUnorderedAccessViewFloat(). Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + libs/vkd3d/command.c | 184 ++++++++++++++++++++- libs/vkd3d/device.c | 6 + libs/vkd3d/state.c | 222 +++++++++++++++++++++++--- libs/vkd3d/vkd3d_private.h | 38 +++++ libs/vkd3d/vkd3d_shaders.h | 388 +++++++++++++++++++++++++++++++++++++++++++++ tests/d3d12.c | 48 +++--- 7 files changed, 836 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=126a789019ae0450521…

1 0

Philip Rebohle : vkd3d: Set VK_IMAGE_MUTABLE_FORMAT_BIT for UAV images with non-UINT formats.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: 65ee0562f942ab16c81da9b6e5dceedbac0a132e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=65ee0562f942ab16c81da9b… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon Nov 25 17:53:38 2019 +0330 vkd3d: Set VK_IMAGE_MUTABLE_FORMAT_BIT for UAV images with non-UINT formats. Needed to support ClearUnorderedAccessViewUint() for all formats. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 8615464..7d22ba4 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -864,13 +864,17 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.pNext = NULL; image_info.flags = 0; - if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) && format->type == VKD3D_FORMAT_TYPE_TYPELESS) + if (desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS) + { + /* Format compatibility rules are more relaxed for UAVs. */ + if (format->type != VKD3D_FORMAT_TYPE_UINT) + image_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; + } + else if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) && format->type == VKD3D_FORMAT_TYPE_TYPELESS) { image_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; - /* Format compatibility rules are more relaxed for UAVs. */ - if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS) - && (compat_list = vkd3d_get_format_compatibility_list(device, desc->Format))) + if ((compat_list = vkd3d_get_format_compatibility_list(device, desc->Format))) { format_list.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR; format_list.pNext = NULL;

1 0

Philip Rebohle : vkd3d: Re-implement d3d12_command_list_ClearUnorderedAccessViewUint().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: 207ca12725e073d896e6fabb6c2890ac29cbee7b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=207ca12725e073d896e6fab… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon Nov 25 17:53:39 2019 +0330 vkd3d: Re-implement d3d12_command_list_ClearUnorderedAccessViewUint(). Addresses the following limitations of the previous implementation: - Only R32_{UINT,TYPELESS} were supported for buffers. - Clearing an image UAV did not behave correctly for images with non-UINT formats. - Due to the use of transfer operations, extra memory barriers were needed. If necessary, this will create a temporary view with a bit-compatible UINT format for the resource in order to perform a bit-exact clear. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 116 ++++++++++++++++----------------------------- libs/vkd3d/resource.c | 20 ++------ libs/vkd3d/utils.c | 31 ++++++++++++ libs/vkd3d/vkd3d_private.h | 19 ++++++++ tests/d3d12.c | 22 ++++----- 5 files changed, 104 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=207ca12725e073d896e…

1 0