November 2023 - Wine-Commits

Alexandre Julliard : widl: Make the alignment option generic instead of win32/win64-specific.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: a426b6b4a93dbe0869a83bd5c8d94cc95e1daebe URL: https://gitlab.winehq.org/wine/wine/-/commit/a426b6b4a93dbe0869a83bd5c8d94c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 11:06:38 2023 +0100 widl: Make the alignment option generic instead of win32/win64-specific. Support both --align and --packing for compatibility with midl. --- dlls/msdaps/Makefile.in | 5 +++-- tools/widl/typegen.c | 1 - tools/widl/widl.c | 27 ++++++++++----------------- tools/widl/widl.h | 3 +-- tools/widl/widl.man.in | 2 ++ 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 1a974266d11..bf1e5c8b3b4 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -1,6 +1,5 @@ MODULE = msdaps.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 -EXTRAIDLFLAGS = --win32-align=2 SOURCES = \ main.c \ @@ -9,4 +8,6 @@ SOURCES = \ row_server.idl \ usrmarshal.c -dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_ +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_ +i386_EXTRAIDLFLAGS = --packing=2 +arm_EXTRAIDLFLAGS = --packing=2 diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b3373ded11d..23db6555e9d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -234,7 +234,6 @@ static unsigned char get_basic_fc_signed(const type_t *type) static inline unsigned int clamp_align(unsigned int align) { - unsigned int packing = (pointer_size == 4) ? win32_packing : win64_packing; if(align > packing) align = packing; return align; } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index e37160e3869..9d3ea0c36bf 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -41,6 +41,7 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" " --acf=file Use ACF file\n" +" --align=n Set structure packing to 'n'\n" " -app_config Ignored, present for midl compatibility\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" @@ -61,6 +62,7 @@ static const char usage[] = " -o, --output=NAME Set the output file name\n" " -Otype Type of stubs to generate (-Os, -Oi, -Oif)\n" " -p Generate proxy\n" +" --packing=n Set structure packing to 'n'\n" " --prefix-all=p Prefix names of client stubs / server functions with 'p'\n" " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" @@ -73,8 +75,6 @@ static const char usage[] = " -V Print version and exit\n" " -W Enable pedantic warnings\n" " --win32, --win64 Set the target architecture (Win32 or Win64)\n" -" --win32-align n Set win32 structure alignment to 'n'\n" -" --win64-align n Set win64 structure alignment to 'n'\n" " --winrt Enable Windows Runtime mode\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" @@ -106,8 +106,6 @@ int do_idfile = 0; int do_dlldata = 0; static int no_preprocess = 0; int old_names = 0; -int win32_packing = 8; -int win64_packing = 8; int winrt_mode = 0; int use_abi_namespace = 0; static int stdinc = 1; @@ -142,6 +140,7 @@ static const char *sysroot = ""; static FILE *idfile; +unsigned int packing = 8; unsigned int pointer_size = 0; time_t now; @@ -154,6 +153,7 @@ enum { DLLDATA_ONLY_OPTION, LOCAL_STUBS_OPTION, NOSTDINC_OPTION, + PACKING_OPTION, PREFIX_ALL_OPTION, PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, @@ -164,14 +164,13 @@ enum { SYSROOT_OPTION, WIN32_OPTION, WIN64_OPTION, - WIN32_ALIGN_OPTION, - WIN64_ALIGN_OPTION }; static const char short_options[] = "b:cC:d:D:EhH:I:L:m:No:O:pP:rsS:tT:uU:VW"; static const struct long_option long_options[] = { { "acf", 1, ACF_OPTION }, + { "align", 1, PACKING_OPTION }, { "app_config", 0, APP_CONFIG_OPTION }, { "dlldata", 1, DLLDATA_OPTION }, { "dlldata-only", 0, DLLDATA_ONLY_OPTION }, @@ -181,6 +180,7 @@ static const struct long_option long_options[] = { { "ns_prefix", 0, RT_NS_PREFIX }, { "oldnames", 0, OLDNAMES_OPTION }, { "output", 0, 'o' }, + { "packing", 1, PACKING_OPTION }, { "prefix-all", 1, PREFIX_ALL_OPTION }, { "prefix-client", 1, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, PREFIX_SERVER_OPTION }, @@ -190,8 +190,6 @@ static const struct long_option long_options[] = { { "winrt", 0, RT_OPTION }, { "win32", 0, WIN32_OPTION }, { "win64", 0, WIN64_OPTION }, - { "win32-align", 1, WIN32_ALIGN_OPTION }, - { "win64-align", 1, WIN64_ALIGN_OPTION }, { NULL } }; @@ -532,15 +530,10 @@ static void option_callback( int optc, char *optarg ) case WIN64_OPTION: pointer_size = 8; break; - case WIN32_ALIGN_OPTION: - win32_packing = strtol(optarg, NULL, 0); - if(win32_packing != 2 && win32_packing != 4 && win32_packing != 8) - error("Packing must be one of 2, 4 or 8\n"); - break; - case WIN64_ALIGN_OPTION: - win64_packing = strtol(optarg, NULL, 0); - if(win64_packing != 2 && win64_packing != 4 && win64_packing != 8) - error("Packing must be one of 2, 4 or 8\n"); + case PACKING_OPTION: + packing = strtol(optarg, NULL, 0); + if(packing != 2 && packing != 4 && packing != 8) + error("Structure packing must be one of 2, 4 or 8\n"); break; case ACF_OPTION: acf_name = xstrdup(optarg); diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 7595cfe7311..15ac74bf310 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -46,8 +46,6 @@ extern int do_regscript; extern int do_idfile; extern int do_dlldata; extern int old_names; -extern int win32_packing; -extern int win64_packing; extern int winrt_mode; extern int use_abi_namespace; @@ -69,6 +67,7 @@ extern char *regscript_name; extern char *regscript_token; extern const char *prefix_client; extern const char *prefix_server; +extern unsigned int packing; extern unsigned int pointer_size; extern time_t now; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 858b04a38e8..8c5442b621d 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -67,6 +67,8 @@ option can be specified multiple times. Generate a UUID file. The default output filename is \fIinfile\fB_i.c\fR. .PP .B Proxy/stub generation options: +.IP "\fB--align=\fIn\fB, --packing=\fIn\fR" +Set the structure packing to \fIn\fR. Supported values are 2, 4, and 8. .IP "\fB-c\fR" Generate a client stub file. The default output filename is \fIinfile\fB_c.c\fR. .IP "\fB-Os\fR"

1 0

Alex Henrie : nsi: Use CRT allocation functions.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: 5847aab99efe5b410d6779623aee51087d5e193f URL: https://gitlab.winehq.org/wine/wine/-/commit/5847aab99efe5b410d6779623aee51… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 9 07:40:21 2023 -0700 nsi: Use CRT allocation functions. --- dlls/nsi/nsi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 5dc54d0035f..c5f481efb48 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -174,7 +174,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *pa out_size = sizeof(DWORD) + (params->key_size + params->rw_size + params->dynamic_size + params->static_size) * params->count; - out = heap_alloc( out_size ); + out = malloc( out_size ); if (!out) return ERROR_OUTOFMEMORY; in.module = *params->module; @@ -202,7 +202,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *pa if (params->static_size) memcpy( params->static_data, ptr, params->static_size * params->count ); } - heap_free( out ); + free( out ); return err; } @@ -254,8 +254,8 @@ DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) if (device == INVALID_HANDLE_VALUE) return GetLastError(); - in = heap_alloc( in_size ); - out = heap_alloc( out_size ); + in = malloc( in_size ); + out = malloc( out_size ); if (!in || !out) { err = ERROR_OUTOFMEMORY; @@ -284,8 +284,8 @@ DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) } err: - heap_free( out ); - heap_free( in ); + free( out ); + free( in ); return err; } @@ -321,7 +321,7 @@ DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) if (device == INVALID_HANDLE_VALUE) return GetLastError(); - in = heap_alloc( in_size ); + in = malloc( in_size ); if (!in) return ERROR_OUTOFMEMORY; in->module = *params->module; in->first_arg = params->first_arg; @@ -334,7 +334,7 @@ DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_GET_PARAMETER, in, in_size, params->data, params->data_size, &received, NULL )) err = GetLastError(); - heap_free( in ); + free( in ); return err; }

1 0

Conor McCarthy : vkd3d-shader/spirv: Introduce orderedness to comparison instructions.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: vkd3d Branch: master Commit: 22960753e94967888bada0d7e7731295b3823acd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/22960753e94967888bada0d7e7731… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jun 3 00:31:59 2023 +1000 vkd3d-shader/spirv: Introduce orderedness to comparison instructions. --- libs/vkd3d-shader/d3d_asm.c | 16 ++++++++++------ libs/vkd3d-shader/dxil.c | 24 ++++++++++++------------ libs/vkd3d-shader/spirv.c | 32 ++++++++++++++++++++------------ libs/vkd3d-shader/tpf.c | 12 ++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 16 ++++++++++------ 5 files changed, 58 insertions(+), 42 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement the DXIL CMP2 instruction.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: vkd3d Branch: master Commit: d3b90cc8770416f08087cfe27889efe683c54feb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d3b90cc8770416f08087cfe27889e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 7 14:01:39 2023 +1000 vkd3d-shader/dxil: Implement the DXIL CMP2 instruction. --- libs/vkd3d-shader/dxil.c | 170 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 + tests/hlsl/all.shader_test | 14 +-- tests/hlsl/any.shader_test | 36 +++---- tests/hlsl/bool-cast.shader_test | 4 +- tests/hlsl/cast-to-float.shader_test | 2 +- tests/hlsl/cast-to-half.shader_test | 2 +- tests/hlsl/cast-to-int.shader_test | 2 +- tests/hlsl/cast-to-uint.shader_test | 2 +- tests/hlsl/sign.shader_test | 20 ++-- 10 files changed, 213 insertions(+), 41 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/spirv: Support bool dst register in spirv_compiler_emit_comparison_instruction().
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: vkd3d Branch: master Commit: 1dd141535ced178995fde3d24761f4d1c5dc6a3d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1dd141535ced178995fde3d24761f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 1 16:41:52 2023 +1000 vkd3d-shader/spirv: Support bool dst register in spirv_compiler_emit_comparison_instruction(). --- libs/vkd3d-shader/spirv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 35561079..51cc639e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7387,7 +7387,8 @@ static void spirv_compiler_emit_comparison_instruction(struct spirv_compiler *co result_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, op, type_id, src0_id, src1_id); - result_id = spirv_compiler_emit_bool_to_int(compiler, component_count, result_id, true); + if (dst->reg.data_type != VKD3D_DATA_BOOL) + result_id = spirv_compiler_emit_bool_to_int(compiler, component_count, result_id, true); spirv_compiler_emit_store_reg(compiler, &dst->reg, dst->write_mask, result_id); }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement tex2Dproj().
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: vkd3d Branch: master Commit: dd6a9135f4b49ae61c52e932663c0fec68bd05c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dd6a9135f4b49ae61c52e932663c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 9 18:43:41 2023 +0100 vkd3d-shader/hlsl: Implement tex2Dproj(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/d3dbc.c | 2 ++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 38 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_codegen.c | 1 + libs/vkd3d-shader/tpf.c | 3 +++ 5 files changed, 45 insertions(+) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 8a15fc4e..7e0eac6c 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2337,6 +2337,8 @@ static void write_sm1_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_ .src_count = 2, }; + if (load->load_type == HLSL_RESOURCE_SAMPLE_PROJ) + sm1_instr.opcode |= VKD3DSI_TEXLD_PROJECT << VKD3D_SM1_INSTRUCTION_FLAGS_SHIFT; assert(instr->reg.allocated); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index a29e94a9..f1eaf6c2 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -679,6 +679,7 @@ enum hlsl_resource_load_type HLSL_RESOURCE_SAMPLE_LOD, HLSL_RESOURCE_SAMPLE_LOD_BIAS, HLSL_RESOURCE_SAMPLE_GRAD, + HLSL_RESOURCE_SAMPLE_PROJ, HLSL_RESOURCE_GATHER_RED, HLSL_RESOURCE_GATHER_GREEN, HLSL_RESOURCE_GATHER_BLUE, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 57c63c43..e70ccf08 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3572,6 +3572,37 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * return false; } } + else if (!strcmp(name, "tex2Dproj")) + { + if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1], + hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 4), loc))) + { + return false; + } + + if (shader_profile_version_ge(ctx, 4, 0)) + { + unsigned int count = hlsl_sampler_dim_count(dim); + struct hlsl_ir_node *divisor; + + if (!(divisor = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(W, W, W, W), count, coords, loc))) + return false; + hlsl_block_add_instr(params->instrs, divisor); + + if (!(coords = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, Y, Z, W), count, coords, loc))) + return false; + hlsl_block_add_instr(params->instrs, coords); + + if (!(coords = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_DIV, coords, divisor, loc))) + return false; + + load_params.type = HLSL_RESOURCE_SAMPLE; + } + else + { + load_params.type = HLSL_RESOURCE_SAMPLE_PROJ; + } + } else { load_params.type = HLSL_RESOURCE_SAMPLE; @@ -3645,6 +3676,12 @@ static bool intrinsic_tex2Dlod(struct hlsl_ctx *ctx, return intrinsic_tex(ctx, params, loc, "tex2Dlod", HLSL_SAMPLER_DIM_2D); } +static bool intrinsic_tex2Dproj(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return intrinsic_tex(ctx, params, loc, "tex2Dproj", HLSL_SAMPLER_DIM_2D); +} + static bool intrinsic_tex3D(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3831,6 +3868,7 @@ intrinsic_functions[] = {"tex1D", -1, false, intrinsic_tex1D}, {"tex2D", -1, false, intrinsic_tex2D}, {"tex2Dlod", 2, false, intrinsic_tex2Dlod}, + {"tex2Dproj", 2, false, intrinsic_tex2Dproj}, {"tex3D", -1, false, intrinsic_tex3D}, {"texCUBE", -1, false, intrinsic_texCUBE}, {"transpose", 1, true, intrinsic_transpose}, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 0f4c4441..598d6c66 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2419,6 +2419,7 @@ static bool lower_combined_samples(struct hlsl_ctx *ctx, struct hlsl_ir_node *in case HLSL_RESOURCE_SAMPLE: case HLSL_RESOURCE_SAMPLE_LOD: case HLSL_RESOURCE_SAMPLE_LOD_BIAS: + case HLSL_RESOURCE_SAMPLE_PROJ: break; } if (load->sampler.var) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 3c8096d5..e78a48ef 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -5574,6 +5574,9 @@ static void write_sm4_resource_load(const struct tpf_writer *tpf, const struct h case HLSL_RESOURCE_RESINFO: write_sm4_resinfo(tpf, load); break; + + case HLSL_RESOURCE_SAMPLE_PROJ: + vkd3d_unreachable(); } }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement tex3Dproj().
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: vkd3d Branch: master Commit: 81ff57e07c88f70b9d1f2dff595037288cdc48df URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/81ff57e07c88f70b9d1f2dff59503… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 9 20:04:35 2023 +0100 vkd3d-shader/hlsl: Implement tex3Dproj(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e70ccf08..b5fe4126 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3572,7 +3572,8 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * return false; } } - else if (!strcmp(name, "tex2Dproj")) + else if (!strcmp(name, "tex2Dproj") + || !strcmp(name, "tex3Dproj")) { if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1], hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 4), loc))) @@ -3688,6 +3689,12 @@ static bool intrinsic_tex3D(struct hlsl_ctx *ctx, return intrinsic_tex(ctx, params, loc, "tex3D", HLSL_SAMPLER_DIM_3D); } +static bool intrinsic_tex3Dproj(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return intrinsic_tex(ctx, params, loc, "tex3Dproj", HLSL_SAMPLER_DIM_3D); +} + static bool intrinsic_texCUBE(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3870,6 +3877,7 @@ intrinsic_functions[] = {"tex2Dlod", 2, false, intrinsic_tex2Dlod}, {"tex2Dproj", 2, false, intrinsic_tex2Dproj}, {"tex3D", -1, false, intrinsic_tex3D}, + {"tex3Dproj", 2, false, intrinsic_tex3Dproj}, {"texCUBE", -1, false, intrinsic_texCUBE}, {"transpose", 1, true, intrinsic_transpose}, {"trunc", 1, true, intrinsic_trunc},

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement texCUBEproj().
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: vkd3d Branch: master Commit: 418c177a1be5bcca3b4f5616ff517fc4420a286a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/418c177a1be5bcca3b4f5616ff517… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 9 20:18:17 2023 +0100 vkd3d-shader/hlsl: Implement texCUBEproj(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b5fe4126..e8f84fe6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3573,7 +3573,8 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * } } else if (!strcmp(name, "tex2Dproj") - || !strcmp(name, "tex3Dproj")) + || !strcmp(name, "tex3Dproj") + || !strcmp(name, "texCUBEproj")) { if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1], hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 4), loc))) @@ -3701,6 +3702,12 @@ static bool intrinsic_texCUBE(struct hlsl_ctx *ctx, return intrinsic_tex(ctx, params, loc, "texCUBE", HLSL_SAMPLER_DIM_CUBE); } +static bool intrinsic_texCUBEproj(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return intrinsic_tex(ctx, params, loc, "texCUBEproj", HLSL_SAMPLER_DIM_CUBE); +} + static bool intrinsic_transpose(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3879,6 +3886,7 @@ intrinsic_functions[] = {"tex3D", -1, false, intrinsic_tex3D}, {"tex3Dproj", 2, false, intrinsic_tex3Dproj}, {"texCUBE", -1, false, intrinsic_texCUBE}, + {"texCUBEproj", 2, false, intrinsic_texCUBEproj}, {"transpose", 1, true, intrinsic_transpose}, {"trunc", 1, true, intrinsic_trunc}, };

1 0

Alistair Leslie-Hughes : winhttp: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 01d7780a0f7574d7f7fe0a8beb2fad181ec66838 URL: https://gitlab.winehq.org/wine/wine/-/commit/01d7780a0f7574d7f7fe0a8beb2fad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 6 12:20:37 2023 +1100 winhttp: Remove DECLSPEC_HIDDEN usage. --- dlls/winhttp/winhttp_private.h | 80 +++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index bf1e60e2cee..0bf1c5bc6b0 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -378,45 +378,45 @@ struct socket_shutdown BOOL complete_async; }; -struct object_header *addref_object( struct object_header * ) DECLSPEC_HIDDEN; -struct object_header *grab_object( HINTERNET ) DECLSPEC_HIDDEN; -void release_object( struct object_header * ) DECLSPEC_HIDDEN; -HINTERNET alloc_handle( struct object_header * ) DECLSPEC_HIDDEN; -BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; - -void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; -void close_connection( struct request * ) DECLSPEC_HIDDEN; -void init_queue( struct queue *queue ) DECLSPEC_HIDDEN; -void stop_queue( struct queue * ) DECLSPEC_HIDDEN; - -void netconn_addref( struct netconn * ) DECLSPEC_HIDDEN; -void netconn_release( struct netconn * ) DECLSPEC_HIDDEN; -DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ) DECLSPEC_HIDDEN; -void netconn_unload( void ) DECLSPEC_HIDDEN; -ULONG netconn_query_data_available( struct netconn * ) DECLSPEC_HIDDEN; -DWORD netconn_recv( struct netconn *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; -DWORD netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -DWORD netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; -DWORD netconn_send( struct netconn *, const void *, size_t, int *, WSAOVERLAPPED * ) DECLSPEC_HIDDEN; -BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ) DECLSPEC_HIDDEN; -void netconn_cancel_io( struct netconn *conn ) DECLSPEC_HIDDEN; -DWORD netconn_set_timeout( struct netconn *, BOOL, int ) DECLSPEC_HIDDEN; -BOOL netconn_is_alive( struct netconn * ) DECLSPEC_HIDDEN; -const void *netconn_get_certificate( struct netconn * ) DECLSPEC_HIDDEN; -int netconn_get_cipher_strength( struct netconn * ) DECLSPEC_HIDDEN; - -BOOL set_cookies( struct request *, const WCHAR * ) DECLSPEC_HIDDEN; -DWORD add_cookie_headers( struct request * ) DECLSPEC_HIDDEN; -DWORD add_request_headers( struct request *, const WCHAR *, DWORD, DWORD ) DECLSPEC_HIDDEN; -void destroy_cookies( struct session * ) DECLSPEC_HIDDEN; -BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ) DECLSPEC_HIDDEN; -void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; - -void release_host( struct hostdata * ) DECLSPEC_HIDDEN; -DWORD process_header( struct request *, const WCHAR *, const WCHAR *, DWORD, BOOL ) DECLSPEC_HIDDEN; - -extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; -void release_typelib( void ) DECLSPEC_HIDDEN; +struct object_header *addref_object( struct object_header * ); +struct object_header *grab_object( HINTERNET ); +void release_object( struct object_header * ); +HINTERNET alloc_handle( struct object_header * ); +BOOL free_handle( HINTERNET ); + +void send_callback( struct object_header *, DWORD, LPVOID, DWORD ); +void close_connection( struct request * ); +void init_queue( struct queue *queue ); +void stop_queue( struct queue * ); + +void netconn_addref( struct netconn * ); +void netconn_release( struct netconn * ); +DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ); +void netconn_unload( void ); +ULONG netconn_query_data_available( struct netconn * ); +DWORD netconn_recv( struct netconn *, void *, size_t, int, int * ); +DWORD netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ); +DWORD netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ); +DWORD netconn_send( struct netconn *, const void *, size_t, int *, WSAOVERLAPPED * ); +BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ); +void netconn_cancel_io( struct netconn *conn ); +DWORD netconn_set_timeout( struct netconn *, BOOL, int ); +BOOL netconn_is_alive( struct netconn * ); +const void *netconn_get_certificate( struct netconn * ); +int netconn_get_cipher_strength( struct netconn * ); + +BOOL set_cookies( struct request *, const WCHAR * ); +DWORD add_cookie_headers( struct request * ); +DWORD add_request_headers( struct request *, const WCHAR *, DWORD, DWORD ); +void destroy_cookies( struct session * ); +BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ); +void destroy_authinfo( struct authinfo * ); + +void release_host( struct hostdata * ); +DWORD process_header( struct request *, const WCHAR *, const WCHAR *, DWORD, BOOL ); + +extern HRESULT WinHttpRequest_create( void ** ); +void release_typelib( void ); static inline WCHAR *strdupAW( const char *src ) { @@ -457,7 +457,7 @@ static inline char *strdupWA_sized( const WCHAR *src, DWORD size ) return dst; } -extern HINSTANCE winhttp_instance DECLSPEC_HIDDEN; +extern HINSTANCE winhttp_instance; #define MIN_WEBSOCKET_SEND_BUFFER_SIZE 16

1 0

Alistair Leslie-Hughes : msi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 91e81083458374706bbace11114f4ad5e473ac07 URL: https://gitlab.winehq.org/wine/wine/-/commit/91e81083458374706bbace11114f4a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 6 11:19:02 2023 +1100 msi: Remove DECLSPEC_HIDDEN usage. --- dlls/msi/query.h | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 2323a8481d4..1997b50e932 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -108,50 +108,46 @@ typedef struct struct list *mem; } SQL_input; -UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, - struct list *mem ) DECLSPEC_HIDDEN; +UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, struct list *mem ); -UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) DECLSPEC_HIDDEN; +UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ); -UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, - const column_info *columns ) DECLSPEC_HIDDEN; +UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, const column_info *columns ); -UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) DECLSPEC_HIDDEN; +UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); -UINT ORDER_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, - column_info *columns ) DECLSPEC_HIDDEN; +UINT ORDER_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, column_info *columns ); -UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, - struct expr *cond ) DECLSPEC_HIDDEN; +UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, struct expr *cond ); UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, - column_info *col_info, BOOL hold ) DECLSPEC_HIDDEN; + column_info *col_info, BOOL hold ); UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, - column_info *columns, column_info *values, BOOL temp ) DECLSPEC_HIDDEN; + column_info *columns, column_info *values, BOOL temp ); UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, - column_info *list, struct expr *expr ) DECLSPEC_HIDDEN; + column_info *list, struct expr *expr ); -UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) DECLSPEC_HIDDEN; +UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); -UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ) DECLSPEC_HIDDEN; +UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ); -UINT STREAMS_CreateView( MSIDATABASE *db, MSIVIEW **view ) DECLSPEC_HIDDEN; +UINT STREAMS_CreateView( MSIDATABASE *db, MSIVIEW **view ); -UINT STORAGES_CreateView( MSIDATABASE *db, MSIVIEW **view ) DECLSPEC_HIDDEN; +UINT STORAGES_CreateView( MSIDATABASE *db, MSIVIEW **view ); -UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name ) DECLSPEC_HIDDEN; +UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name ); -int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip) DECLSPEC_HIDDEN; +int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip); -MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ) DECLSPEC_HIDDEN; +MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ); UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - MSICONDITION persistent, BOOL hold ) DECLSPEC_HIDDEN; + MSICONDITION persistent, BOOL hold ); -UINT msi_select_update( MSIVIEW *view, MSIRECORD *rec, UINT row ) DECLSPEC_HIDDEN; +UINT msi_select_update( MSIVIEW *view, MSIRECORD *rec, UINT row ); -UINT msi_view_refresh_row( MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD *rec ) DECLSPEC_HIDDEN; +UINT msi_view_refresh_row( MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD *rec ); #endif /* __WINE_MSI_QUERY_H */

1 0