January 2019 - Wine-commits

Jacek Caban : ntoskrnl.exe: Add KeEnterGuardedRegion and KeLeaveGuardedRegion stubs.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: wine Branch: master Commit: 80c23190f809c542350e8b015dcfa97dc067631d URL: https://source.winehq.org/git/wine.git/?a=commit;h=80c23190f809c542350e8b01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 16:12:50 2019 +0100 ntoskrnl.exe: Add KeEnterGuardedRegion and KeLeaveGuardedRegion stubs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 18 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 25d9eb7..298247b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3940,3 +3940,19 @@ NTSTATUS WINAPI MmCopyVirtualMemory(PEPROCESS fromprocess, PVOID fromaddress, PE FIXME("stub: %p %p %p %p %lu %d %p\n", fromprocess, fromaddress, toprocess, toaddress, bufsize, mode, copied); return STATUS_NOT_IMPLEMENTED; } + +/********************************************************************* + * KeEnterGuardedRegion (NTOSKRNL.@) + */ +void WINAPI KeEnterGuardedRegion(void) +{ + FIXME("\n"); +} + +/********************************************************************* + * KeLeaveGuardedRegion (NTOSKRNL.@) + */ +void WINAPI KeLeaveGuardedRegion(void) +{ + FIXME("\n"); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a5da0e8..df2f15b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -43,6 +43,8 @@ @ stdcall -norelay IofCompleteRequest(ptr long) @ stdcall -arch=arm,arm64,x86_64 KeAcquireInStackQueuedSpinLock(ptr ptr) @ stdcall -norelay KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) +@ stdcall KeEnterGuardedRegion() +@ stdcall KeLeaveGuardedRegion() @ stdcall -arch=arm,arm64,x86_64 KeReleaseInStackQueuedSpinLock(ptr) @ stdcall -norelay KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) @ stub KeSetTimeUpdateNotifyRoutine

1 0

Michael Stefaniuc : mshtml: Print the debug string and not the pointer to it.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: wine Branch: master Commit: 6f9f57e85fa7916c9e3dfbebbd7e5b8c9be6333d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9f57e85fa7916c9e3dfbeb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 31 20:56:27 2019 +0100 mshtml: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cab39d6..9fa258c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2121,7 +2121,7 @@ static HRESULT WINAPI DOMCustomEvent_initCustomEvent(IDOMCustomEvent *iface, BST DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); HRESULT hres; - TRACE("(%p)->(%s %x %x %p)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); + TRACE("(%p)->(%s %x %x %s)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); hres = IDOMEvent_initEvent(&This->event.IDOMEvent_iface, type, can_bubble, cancelable); if(FAILED(hres))

1 0

Alistair Leslie-Hughes : crypt32: Fix compile error on older gnutls.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: wine Branch: master Commit: 66ca1fa4bd2336d56e8604fc4d877cb2c73fa860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66ca1fa4bd2336d56e8604fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 31 00:40:05 2019 +0000 crypt32: Fix compile error on older gnutls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index cde2f19..46bf356 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -45,6 +45,8 @@ int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12, const char *password, gnutls_x509_crt_t **extra_certs, unsigned int *extra_certs_len, gnutls_x509_crl_t * crl, unsigned int flags); +int gnutls_x509_privkey_get_pk_algorithm2(gnutls_x509_privkey_t, unsigned int*); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_global_deinit);

1 0

Dmitry Timoshkov : crypt32: Add support for CERT_COMPARE_KEY_IDENTIFIER to CertFindCertificateInStore.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: wine Branch: master Commit: e020d6c99d1328ca867511f9ada7b49b46a0ce4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e020d6c99d1328ca867511f9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 31 16:35:32 2019 +0800 crypt32: Add support for CERT_COMPARE_KEY_IDENTIFIER to CertFindCertificateInStore. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f4cde69..dde6528 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1769,6 +1769,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, PCCERT_CONTEXT ret; CertFindFunc find = NULL; CertCompareFunc compare = NULL; + CERT_ID cert_id; TRACE("(%p, %08x, %08x, %08x, %p, %p)\n", hCertStore, dwCertEncodingType, dwFlags, dwType, pvPara, pPrevCertContext); @@ -1799,6 +1800,11 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_SUBJECT_CERT: compare = compare_cert_by_subject_cert; break; + case CERT_COMPARE_KEY_IDENTIFIER: + cert_id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + cert_id.u.KeyId = *(const CRYPT_HASH_BLOB *)pvPara; + pvPara = &cert_id; + /* fall through */ case CERT_COMPARE_CERT_ID: compare = compare_cert_by_cert_id; break;

1 0

Nikolay Sivov : dwrite: Add a helper to get shaped glyph positions.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: wine Branch: master Commit: d1c73489971d0576b1867a5218a52f0c17697017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1c73489971d0576b1867a52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 31 11:35:26 2019 +0300 dwrite: Add a helper to get shaped glyph positions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 134 ++++++++++++++++++++----------------------- dlls/dwrite/dwrite_private.h | 36 ++++++++++-- dlls/dwrite/font.c | 49 +++++++++++++++- dlls/dwrite/shape.c | 48 ++++++++++------ 4 files changed, 172 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1c73489971d0576b186…

1 0

Józef Kucia : vkd3d-shader: Move VKD3D_SHADER_DUMP_PATH implementation from libvkd3d.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 1ae1f831f62664a6e904bb2e9e0651692e968b33 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1ae1f831f62664a6e904bb2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:27 2019 +0100 vkd3d-shader: Move VKD3D_SHADER_DUMP_PATH implementation from libvkd3d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 35 ++++++---------- libs/vkd3d-shader/vkd3d_shader_main.c | 44 +++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 + libs/vkd3d/state.c | 68 -------------------------------- 4 files changed, 58 insertions(+), 91 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 8769513..cb7452b 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1238,44 +1238,32 @@ static void shader_dump_interpolation_mode(struct vkd3d_string_buffer *buffer, } } -static void shader_dump_version(struct vkd3d_string_buffer *buffer, - const struct vkd3d_shader_version *shader_version) +const char *shader_get_type_prefix(enum vkd3d_shader_type type) { - const char *prefix; - - switch (shader_version->type) + switch (type) { case VKD3D_SHADER_TYPE_VERTEX: - prefix = "vs"; - break; + return "vs"; case VKD3D_SHADER_TYPE_HULL: - prefix = "hs"; - break; + return "hs"; case VKD3D_SHADER_TYPE_DOMAIN: - prefix = "ds"; - break; + return "ds"; case VKD3D_SHADER_TYPE_GEOMETRY: - prefix = "gs"; - break; + return "gs"; case VKD3D_SHADER_TYPE_PIXEL: - prefix = "ps"; - break; + return "ps"; case VKD3D_SHADER_TYPE_COMPUTE: - prefix = "cs"; - break; + return "cs"; default: - FIXME("Unhandled shader type %#x.\n", shader_version->type); - prefix = "unknown"; - break; + FIXME("Unhandled shader type %#x.\n", type); + return "unknown"; } - - shader_addline(buffer, "%s_%u_%u\n", prefix, shader_version->major, shader_version->minor); } static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, @@ -1606,7 +1594,8 @@ void vkd3d_shader_trace(void *data) } shader_sm4_read_header(data, &ptr, &shader_version); - shader_dump_version(&buffer, &shader_version); + shader_addline(&buffer, "%s_%u_%u\n", + shader_get_type_prefix(shader_version.type), shader_version.major, shader_version.minor); while (!shader_sm4_is_end(data, &ptr)) { diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 73a9236..dfd6b72 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -18,9 +18,51 @@ #include "vkd3d_shader_private.h" +#include <stdio.h> + STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); +static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const void *data, size_t size) +{ + static int shader_id = 0; + char filename[1024]; + unsigned int id; + FILE *f; + + id = InterlockedIncrement(&shader_id) - 1; + + snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id); + if ((f = fopen(filename, "wb"))) + { + if (fwrite(data, 1, size, f) != size) + ERR("Failed to write shader to %s.\n", filename); + if (fclose(f)) + ERR("Failed to close stream %s.\n", filename); + } + else + { + ERR("Failed to open %s for dumping shader.\n", filename); + } +} + +static void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) +{ + static bool enabled = true; + const char *path; + + if (!enabled) + return; + + if (!(path = getenv("VKD3D_SHADER_DUMP_PATH"))) + { + enabled = false; + return; + } + + vkd3d_shader_dump_blob(path, shader_get_type_prefix(type), shader->code, shader->size); +} + struct vkd3d_shader_parser { struct vkd3d_shader_desc shader_desc; @@ -114,6 +156,8 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, if ((ret = vkd3d_shader_parser_init(&parser, dxbc)) < 0) return ret; + vkd3d_shader_dump_shader(parser.shader_version.type, dxbc); + if (TRACE_ON()) vkd3d_shader_trace(parser.data); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e08f1f3..ba5875c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -791,6 +791,8 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; +const char *shader_get_type_prefix(enum vkd3d_shader_type type) DECLSPEC_HIDDEN; + void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature) DECLSPEC_HIDDEN; void shader_sm4_free(void *data) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 75feacc..8aff2f2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -19,8 +19,6 @@ #include "vkd3d_private.h" -#include <stdio.h> - /* ID3D12RootSignature */ static inline struct d3d12_root_signature *impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) { @@ -1243,71 +1241,6 @@ struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12Pipeline return impl_from_ID3D12PipelineState(iface); } -static void dump_shader(const char *path, const char *prefix, const void *data, size_t size) -{ - static int shader_id = 0; - char filename[1024]; - unsigned int id; - FILE *f; - - id = InterlockedIncrement(&shader_id) - 1; - - snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id); - if (!(f = fopen(filename, "wb"))) - { - ERR("Failed to open %s for dumping shader.\n", filename); - return; - } - - if (fwrite(data, 1, size, f) != size) - ERR("Failed to write shader to %s.\n", filename); - if (fclose(f)) - ERR("Failed to close stream %s.\n", filename); -} - -static void dump_shader_stage(VkShaderStageFlagBits stage, const void *data, size_t size) -{ - static bool enabled = true; - const char *prefix; - const char *path; - - if (!enabled) - return; - - if (!(path = getenv("VKD3D_SHADER_DUMP_PATH"))) - { - enabled = false; - return; - } - - switch (stage) - { - case VK_SHADER_STAGE_VERTEX_BIT: - prefix = "vs"; - break; - case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: - prefix = "hs"; - break; - case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT: - prefix = "ds"; - break; - case VK_SHADER_STAGE_GEOMETRY_BIT: - prefix = "gs"; - break; - case VK_SHADER_STAGE_FRAGMENT_BIT: - prefix = "ps"; - break; - case VK_SHADER_STAGE_COMPUTE_BIT: - prefix = "cs"; - break; - default: - prefix = "unk"; - break; - } - - dump_shader(path, prefix, data, size); -} - static HRESULT create_shader_stage(struct d3d12_device *device, struct VkPipelineShaderStageCreateInfo *stage_desc, enum VkShaderStageFlagBits stage, const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, @@ -1331,7 +1264,6 @@ static HRESULT create_shader_stage(struct d3d12_device *device, shader_desc.pNext = NULL; shader_desc.flags = 0; - dump_shader_stage(stage, code->pShaderBytecode, code->BytecodeLength); if ((ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, shader_interface, compile_args)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret);

1 0

Józef Kucia : vkd3d-common: Add support for naming debug environment variable.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 52015b30b3ef8ac240842180284949cb51eadeda URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=52015b30b3ef8ac24084218… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:28 2019 +0100 vkd3d-common: Add support for naming debug environment variable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_debug.h | 2 ++ libs/vkd3d-common/debug.c | 4 +++- libs/vkd3d-shader/vkd3d_shader_main.c | 2 ++ libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d/vkd3d_main.c | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index e5e938d..8b4c77d 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -57,6 +57,8 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) +#define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name + static inline const char *debugstr_guid(const GUID *guid) { if (!guid) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index b838045..ee23ab0 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -28,6 +28,8 @@ #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 +extern const char *vkd3d_dbg_env_name DECLSPEC_HIDDEN; + static const char *debug_level_names[] = { /* VKD3D_DBG_LEVEL_NONE */ "none", @@ -46,7 +48,7 @@ enum vkd3d_dbg_level vkd3d_dbg_get_level(void) if (level != ~0u) return level; - if (!(vkd3d_debug = getenv("VKD3D_DEBUG"))) + if (!(vkd3d_debug = getenv(vkd3d_dbg_env_name))) vkd3d_debug = ""; for (i = 0; i < ARRAY_SIZE(debug_level_names); ++i) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index dfd6b72..0718808 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -20,6 +20,8 @@ #include <stdio.h> +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index fa6e5f8..03f9f52 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -18,6 +18,8 @@ #include "vkd3d_utils_private.h" +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 63dabda..ba55056 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -19,6 +19,8 @@ #define INITGUID #include "vkd3d_private.h" +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device) {

1 0

Józef Kucia : vkd3d-shader: Use VKD3D_SHADER_DEBUG instead of VKD3D_DEBUG.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 97c3aa0cdca31ce06785b024acf81faef6429ac8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=97c3aa0cdca31ce06785b02… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:29 2019 +0100 vkd3d-shader: Use VKD3D_SHADER_DEBUG instead of VKD3D_DEBUG. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0718808..2bfdad0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -20,7 +20,7 @@ #include <stdio.h> -VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); +VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS);

1 0

Józef Kucia : build: Build DLLs for Windows.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 50fe2b76382c676262879789fa2c042e4f58ee0c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=50fe2b76382c67626287978… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:30 2019 +0100 build: Build DLLs for Windows. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 7 ++++--- configure.ac | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 487d2ea..e0b31a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = @VKD3D_CFLAGS@ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private +AM_LDFLAGS = -no-undefined widl_headers = \ include/vkd3d_d3d12.h \ @@ -79,7 +80,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@ -libvkd3d_shader_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map @@ -104,7 +105,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h \ libs/vkd3d_version.c -libvkd3d_la_LDFLAGS = -version-info 2:0:1 +libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -114,7 +115,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_LDFLAGS = -version-info 1:1:0 +libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map diff --git a/configure.ac b/configure.ac index 6e55279..e539d98 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) LT_PREREQ([2.4.2]) -LT_INIT +LT_INIT([win32-dll]) gl_LD_VERSION_SCRIPT

1 0

Józef Kucia : build: Add option to disable tests.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 0bbf92404dc16da8d0c8dd32789e90eecfcd09db URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0bbf92404dc16da8d0c8dd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:31 2019 +0100 build: Add option to disable tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 4 +++- configure.ac | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index e0b31a6..3e9ddea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,12 +137,14 @@ vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_LDADD = libvkd3d-shader.la LDADD = libvkd3d.la libvkd3d-utils.la -check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) AM_DEFAULT_SOURCE_EXT = .c +if BUILD_TESTS +check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la +endif if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ diff --git a/configure.ac b/configure.ac index e539d98..37e1edd 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,12 @@ AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) -AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) +AC_ARG_ENABLE([demos], + AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),, + [enable_demos=no]) +AC_ARG_ENABLE([tests], + AS_HELP_STRING([--enable-tests], [Build tests (default: enabled)]),, + [enable_tests=yes]) AC_USE_SYSTEM_EXTENSIONS @@ -107,10 +112,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP dnl Makefiles -AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) +AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) @@ -129,6 +134,7 @@ AS_ECHO([" Have SPIRV-Tools: ${with_spirv_tools} Building demos: ${enable_demos} + Building tests: ${enable_tests} Building crosstests: ${HAVE_CROSSTEST}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])])

1 0