November 2019 - Wine-Commits

Alexandre Julliard : cabinet: Import zlib deflate code.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: 03e9bf95be8217b6326038c1e701e4debcb942e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e9bf95be8217b6326038c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:30:27 2019 +0100 cabinet: Import zlib deflate code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/Makefile.in | 3 +- dlls/cabinet/deflate.c | 2974 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/cabinet/fci.c | 10 +- dlls/cabinet/zlib.h | 162 +++ 4 files changed, 3138 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03e9bf95be8217b63260…

1 0

Alexandre Julliard : opcservices: Build with msvcrt.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

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

Zebediah Figura : strmbase: Simplify SendFurther().
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: b0b56001fe89188b6b14ce62860a6a0a1cd58e56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b56001fe89188b6b14ce62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 21:14:00 2019 -0600 strmbase: Simplify SendFurther(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 87 ++++++++--------------------------------------------- 1 file changed, 12 insertions(+), 75 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 92a2fe55b9..4606c25a78 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -56,82 +56,18 @@ static HRESULT updatehres( HRESULT original, HRESULT new ) * If the pin given is an input pin, the message will be sent downstream to other input pins * If the pin given is an output pin, the message will be sent upstream to other output pins */ -static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPinFunc fnEnd ) +static HRESULT SendFurther(struct strmbase_sink *sink, SendPinFunc func, void *arg) { - PIN_INFO pin_info; - ULONG amount = 0; + struct strmbase_pin *pin; HRESULT hr = S_OK; - HRESULT hr_return = S_OK; - IEnumPins *enumpins = NULL; - BOOL foundend = TRUE; - PIN_DIRECTION from_dir; + unsigned int i; - IPin_QueryDirection( from, &from_dir ); - - hr = IPin_QueryInternalConnections( from, NULL, &amount ); - if (hr != E_NOTIMPL && amount) - FIXME("Use QueryInternalConnections!\n"); - - pin_info.pFilter = NULL; - hr = IPin_QueryPinInfo( from, &pin_info ); - if (FAILED(hr)) - goto out; - - hr = IBaseFilter_EnumPins( pin_info.pFilter, &enumpins ); - if (FAILED(hr)) - goto out; - - hr = IEnumPins_Reset( enumpins ); - while (hr == S_OK) { - IPin *pin = NULL; - hr = IEnumPins_Next( enumpins, 1, &pin, NULL ); - if (hr == VFW_E_ENUM_OUT_OF_SYNC) - { - hr = IEnumPins_Reset( enumpins ); - continue; - } - if (pin) - { - PIN_DIRECTION dir; - - IPin_QueryDirection( pin, &dir ); - if (dir != from_dir) - { - IPin *connected = NULL; - - foundend = FALSE; - IPin_ConnectedTo( pin, &connected ); - if (connected) - { - HRESULT hr_local; - - hr_local = fnMiddle( connected, arg ); - hr_return = updatehres( hr_return, hr_local ); - IPin_Release(connected); - } - } - IPin_Release( pin ); - } - else - { - hr = S_OK; - break; - } - } - - if (!foundend) - hr = hr_return; - else if (fnEnd) { - HRESULT hr_local; - - hr_local = fnEnd( from, arg ); - hr_return = updatehres( hr_return, hr_local ); + for (i = 0; (pin = sink->pin.filter->ops->filter_get_pin(sink->pin.filter, i)); ++i) + { + if (pin->dir == PINDIR_OUTPUT && pin->peer) + hr = updatehres(hr, func(pin->peer, arg)); } - IEnumPins_Release(enumpins); -out: - if (pin_info.pFilter) - IBaseFilter_Release( pin_info.pFilter ); return hr; } @@ -799,7 +735,7 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) LeaveCriticalSection(&This->pin.filter->csFilter); if (hr == S_OK) - hr = SendFurther( iface, deliver_endofstream, NULL, NULL ); + hr = SendFurther(This, deliver_endofstream, NULL); return hr; } @@ -817,7 +753,7 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); This->flushing = TRUE; - hr = SendFurther( iface, deliver_beginflush, NULL, NULL ); + hr = SendFurther(This, deliver_beginflush, NULL); LeaveCriticalSection(&This->pin.filter->csFilter); return hr; @@ -837,7 +773,7 @@ HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); This->flushing = This->end_of_stream = FALSE; - hr = SendFurther( iface, deliver_endflush, NULL, NULL ); + hr = SendFurther(This, deliver_endflush, NULL); LeaveCriticalSection(&This->pin.filter->csFilter); return hr; @@ -857,6 +793,7 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { + struct strmbase_sink *pin = impl_sink_from_IPin(iface); newsegmentargs args; TRACE("iface %p, start %s, stop %s, rate %.16e.\n", @@ -866,7 +803,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, R args.tStop = stop; args.rate = rate; - return SendFurther( iface, deliver_newsegment, &args, NULL ); + return SendFurther(pin, deliver_newsegment, &args); } /*** IMemInputPin implementation ***/

1 0

Alexandre Julliard : msvcrt: Fix range check in wsctoul().
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: ad96d9195e4b524a7bf8ea7250aa384ee07bca0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad96d9195e4b524a7bf8ea72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 24 12:42:03 2019 +0100 msvcrt: Fix range check in wsctoul(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 3e5bb512ff..1ae292423c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2487,7 +2487,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, MSVCRT_ulong __cdecl MSVCRT__wcstoul_l(const MSVCRT_wchar_t *s, MSVCRT_wchar_t **end, int base, MSVCRT__locale_t locale) { - __int64 ret = MSVCRT__wcstoui64_l(s, end, base, locale); + unsigned __int64 ret = MSVCRT__wcstoui64_l(s, end, base, locale); if(ret > MSVCRT_ULONG_MAX) { ret = MSVCRT_ULONG_MAX;

1 0

Alexandre Julliard : cmd: Environment variables contain signed numbers.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

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

Alexandre Julliard : kernel32: Avoid forwarding to advapi32.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

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

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

Nov. 25, 2019

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

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

Nov. 25, 2019

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 Nov. 25, 2019

Nov. 25, 2019

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

Conor McCarthy : vkd3d: Return valid node masks in external resource heap properties.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: vkd3d Branch: master Commit: e783784cace2fb2af7d9fb9fe3d8a1af07a8c8a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e783784cace2fb2af7d9fb9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 25 17:53:42 2019 +0330 vkd3d: Return valid node masks in external resource heap properties. Hitman 2 calls GetHeapProperties() for each swapchain buffer and checks if the creation node mask is 1. If not then it fails to store the resource pointers for later rendering. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 2 ++ tests/vkd3d_api.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 89733ce..f5cdf4a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1522,6 +1522,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_GetHeapProperties(ID3D12Resource { memset(heap_properties, 0, sizeof(*heap_properties)); heap_properties->Type = D3D12_HEAP_TYPE_DEFAULT; + heap_properties->CreationNodeMask = 1; + heap_properties->VisibleNodeMask = 1; } if (flags) *flags = D3D12_HEAP_FLAG_NONE; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 135782d..d4fe79a 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -907,8 +907,8 @@ static void test_external_resource_map(void) "Got unexpected CPU page property %#x.\n", heap_properties.CPUPageProperty); ok(heap_properties.MemoryPoolPreference == D3D12_MEMORY_POOL_UNKNOWN, "Got unexpected memory pool preference %#x.\n", heap_properties.MemoryPoolPreference); - todo ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); - todo ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); + ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); + ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); ID3D12Resource_Release(vk_resource); vk_device = vkd3d_get_vk_device(device);

1 0