- Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : msimtf: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: 83da83ef9872feb1146636df8059895da0576822 URL: https://gitlab.winehq.org/wine/wine/-/commit/83da83ef9872feb1146636df805989… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:27 2023 +1100 msimtf: Remove DECLSPEC_HIDDEN usage. --- dlls/msimtf/activeimmapp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index 9d3318bf017..f062ae269c2 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -887,7 +887,7 @@ static const IActiveIMMMessagePumpOwnerVtbl ActiveIMMMessagePumpOwnerVtbl = ActiveIMMMessagePumpOwner_Resume, }; -DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ActiveIMMApp *This; if (pUnkOuter)

1 0

Alistair Leslie-Hughes : browseui: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: 6c4844292f94d46e65d51445718a21b356b4554e URL: https://gitlab.winehq.org/wine/wine/-/commit/6c4844292f94d46e65d51445718a21… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:27 2023 +1100 browseui: Remove DECLSPEC_HIDDEN usage. --- dlls/browseui/browseui.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 73780f1ce27..441955681eb 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -21,13 +21,13 @@ #ifndef __WINE_BROWSEUI_H #define __WINE_BROWSEUI_H -extern LONG BROWSEUI_refCount DECLSPEC_HIDDEN; -extern HINSTANCE BROWSEUI_hinstance DECLSPEC_HIDDEN; +extern LONG BROWSEUI_refCount; +extern HINSTANCE BROWSEUI_hinstance; -extern HRESULT ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +extern HRESULT ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +extern HRESULT CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut); extern const GUID CLSID_CompCatCacheDaemon;

1 0

Alistair Leslie-Hughes : wintrust: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: de3ac6a5e7a0cc5a9df038c260e6bf757cd36718 URL: https://gitlab.winehq.org/wine/wine/-/commit/de3ac6a5e7a0cc5a9df038c260e6bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:27 2023 +1100 wintrust: Remove DECLSPEC_HIDDEN usage. --- dlls/wintrust/wintrust_priv.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 7c6e5a4adc0..1e2e7a701f2 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -18,12 +18,11 @@ #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ -BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN; +BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, - BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr) DECLSPEC_HIDDEN; + BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr); BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, - BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add) DECLSPEC_HIDDEN; -BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, - CRYPT_PROVIDER_PRIVDATA *pPrivData2Add) DECLSPEC_HIDDEN; + BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add); +BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, CRYPT_PROVIDER_PRIVDATA *pPrivData2Add); #endif /* ndef __WINTRUST_PRIV_H__ */

1 0

Alistair Leslie-Hughes : hlink: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: ef51f7b4021b16ce7d56f186e3bf07daeda25982 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef51f7b4021b16ce7d56f186e3bf07… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:27 2023 +1100 hlink: Remove DECLSPEC_HIDDEN usage. --- dlls/hlink/hlink_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index cf1befdb78f..883e36c0d8e 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -27,8 +27,8 @@ #include "ole2.h" #include "hlink.h" -extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**); +extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**); static inline LPWSTR hlink_co_strdupW(LPCWSTR str) {

1 0

Zebediah Figura : gitlab: Enable d3d10core:d3d10core and d3d8:visual.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: d7d782b1123dc26ec2eca1051f712e686a2b6b22 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7d782b1123dc26ec2eca1051f712e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 7 21:47:39 2023 -0600 gitlab: Enable d3d10core:d3d10core and d3d8:visual. These pass on llvmpipe now. --- tools/gitlab/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 4e0b6d75983..590eacb2438 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -58,7 +58,7 @@ test-linux-64: test-linux-32: extends: .wine-test variables: - EXCLUDE_TESTS: "d3d10core:d3d10core d3d11:d3d11 d3d8:visual d3d9:d3d9ex d3d9:visual" + EXCLUDE_TESTS: "d3d11:d3d11 d3d9:d3d9ex d3d9:visual" rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' needs:

1 0

Zebediah Figura : tests: Add more semantics to test_nop_tessellation_shaders().
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 0805ce121ed3103fe08e044112a513c6fc27e0f6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0805ce121ed3103fe08e044112a51… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 7 19:47:07 2023 -0600 tests: Add more semantics to test_nop_tessellation_shaders(). To act as a regression test for 852eefc01df90c4202212944ecc4af4bac7a5fae. --- tests/d3d12.c | 230 ++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 160 insertions(+), 70 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader: Add constant folding for 'floor'.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 4778d051df2d8a92a729751c15cfff6355459958 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4778d051df2d8a92a729751c15cff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 18 00:08:02 2023 +0200 vkd3d-shader: Add constant folding for 'floor'. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 30 ++++++++++++++++++++++++++++++ tests/hlsl/floor.shader_test | 10 ++++++++++ 2 files changed, 40 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index c869dc02..b76b1fce 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -280,6 +280,32 @@ static bool fold_exp2(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, return true; } +static bool fold_floor(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, + const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) +{ + enum hlsl_base_type type = dst_type->base_type; + unsigned int k; + + assert(type == src->node.data_type->base_type); + + for (k = 0; k < dst_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].f = floorf(src->value.u[k].f); + break; + + default: + FIXME("Fold 'floor' for type %s.\n", debug_hlsl_type(ctx, dst_type)); + return false; + } + } + + return true; +} + static bool fold_fract(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) { @@ -1263,6 +1289,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_exp2(ctx, &res, instr->data_type, arg1); break; + case HLSL_OP1_FLOOR: + success = fold_floor(ctx, &res, instr->data_type, arg1); + break; + case HLSL_OP1_FRACT: success = fold_fract(ctx, &res, instr->data_type, arg1); break; diff --git a/tests/hlsl/floor.shader_test b/tests/hlsl/floor.shader_test index deb9acf9..e6562c4a 100644 --- a/tests/hlsl/floor.shader_test +++ b/tests/hlsl/floor.shader_test @@ -1,3 +1,13 @@ +[pixel shader] +float4 main() : sv_target +{ + return floor(float4(-0.5, 6.5, 7.5, 3.4)); +} + +[test] +draw quad +probe all rgba (-1.0, 6.0, 7.0, 3.0) 4 + [pixel shader] uniform float4 u;

1 0

Henri Verbeet : vkd3d-compiler: Sort the options in the usage text.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 375b3e0db3c87dbc261c15a51e32eed23399c0ed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/375b3e0db3c87dbc261c15a51e32e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 5 00:22:10 2023 +0100 vkd3d-compiler: Sort the options in the usage text. --- programs/vkd3d-compiler/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 51eb15e8..2d10baca 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -182,19 +182,19 @@ static void print_usage(const char *program_name) " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" - " --matrix-storage-order=<order>\n" - " Specify default matrix storage order. Valid values are\n" - " 'column' (default) and 'row'.\n" " -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n" " -E Preprocess the source code instead of compiling it.\n" - " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" - " output file is specified, output will be written to\n" - " standard output.\n" " --formatting=<flags> Specify the formatting options for text output.\n" " <flags> is a comma separated list of formatting flags,\n" " optionally prefixed by '+' or '-'. Valid flags are\n" " 'colour', 'indent', 'offsets', 'header', and 'raw-ids'.\n" " The 'indent' and 'header' flags are enabled by default.\n" + " --matrix-storage-order=<order>\n" + " Specify the default matrix storage order. Valid values\n" + " are 'column' (default) and 'row'.\n" + " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" + " output file is specified, output will be written to\n" + " standard output.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n"

1 0

Henri Verbeet : vkd3d: Report D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE for UAV formats.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: c5cc46739469c06bd4a89c976f437ed9093474c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5cc46739469c06bd4a89c976f437… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 7 23:35:28 2023 +0100 vkd3d: Report D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE for UAV formats. --- libs/vkd3d/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 2be5e103..ec5a921c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2934,6 +2934,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device5 data->Support1 |= D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW; if (device->vk_info.uav_read_without_format) data->Support2 |= D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD; + /* We effectively require shaderStorageImageWriteWithoutFormat, + * so we can just report UAV_TYPED_STORE unconditionally. */ + data->Support2 |= D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE; } if (image_features & VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT)

1 0

Henri Verbeet : vkd3d-compiler: Slightly reword the --semantic-compat-map usage text.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 4c4843126e0a8f3d6c309554f4f53b01757ad277 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4c4843126e0a8f3d6c309554f4f53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 5 00:28:47 2023 +0100 vkd3d-compiler: Slightly reword the --semantic-compat-map usage text. --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 2e5f2b97..51eb15e8 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -185,8 +185,6 @@ static void print_usage(const char *program_name) " --matrix-storage-order=<order>\n" " Specify default matrix storage order. Valid values are\n" " 'column' (default) and 'row'.\n" - " --semantic-compat-map Enable semantic mapping compatibility mode to use SM4+ system values\n" - " instead of SM1-3 style semantic names when compiling from HLSL sources.\n" " -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n" " -E Preprocess the source code instead of compiling it.\n" " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" @@ -201,6 +199,8 @@ static void print_usage(const char *program_name) " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" " -p, --profile=<name> Specify the target shader profile for HLSL shaders.\n" + " --semantic-compat-map Map shader model 1-3 semantic names to shader model 4+\n" + " system values when compiling HLSL sources.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -x <type> Specify the type of the source. Use --print-source-types\n"

1 0