wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Zebediah Figura : vkd3d-shader/hlsl: Remove a couple of redundant default switch cases.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: vkd3d Branch: master Commit: 65a13c829078df6d82bed43b7b7376a282dd7d57 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=65a13c829078df6d82bed43… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:15 2021 -0500 vkd3d-shader/hlsl: Remove a couple of redundant default switch cases. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 62dc535..7f12dd2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1211,9 +1211,6 @@ static void dump_instr(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, case HLSL_IR_SWIZZLE: dump_ir_swizzle(buffer, hlsl_ir_swizzle(instr)); break; - - default: - vkd3d_string_buffer_printf(buffer, "<No dump function for %s>", hlsl_node_type_to_string(instr->type)); } } @@ -1361,9 +1358,6 @@ void hlsl_free_instr(struct hlsl_ir_node *node) case HLSL_IR_SWIZZLE: free_ir_swizzle(hlsl_ir_swizzle(node)); break; - - default: - FIXME("Unsupported node type %s.\n", hlsl_node_type_to_string(node->type)); } }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Split array copies.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: vkd3d Branch: master Commit: 3cc6b565cede6d4063bc7380f4c77da3bc8e7b48 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3cc6b565cede6d4063bc738… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:14 2021 -0500 vkd3d-shader/hlsl: Split array copies. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 119 +++++++++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5f23f34..db340a7 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -264,12 +264,54 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst return false; } -static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +/* Helper for split_array_copies() and split_struct_copies(). Inserts new + * instructions right before "store". */ +static bool split_copy(struct hlsl_ctx *ctx, struct hlsl_ir_store *store, + const struct hlsl_ir_load *load, const unsigned int offset, struct hlsl_type *type) +{ + struct hlsl_ir_node *offset_instr, *add; + struct hlsl_ir_store *split_store; + struct hlsl_ir_load *split_load; + struct hlsl_ir_constant *c; + + if (!(c = hlsl_new_uint_constant(ctx, offset, store->node.loc))) + return false; + list_add_before(&store->node.entry, &c->node.entry); + + offset_instr = &c->node; + if (load->src.offset.node) + { + if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, load->src.offset.node, &c->node))) + return false; + list_add_before(&store->node.entry, &add->entry); + offset_instr = add; + } + if (!(split_load = hlsl_new_load(ctx, load->src.var, offset_instr, type, store->node.loc))) + return false; + list_add_before(&store->node.entry, &split_load->node.entry); + + offset_instr = &c->node; + if (store->lhs.offset.node) + { + if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, store->lhs.offset.node, &c->node))) + return false; + list_add_before(&store->node.entry, &add->entry); + offset_instr = add; + } + + if (!(split_store = hlsl_new_store(ctx, store->lhs.var, offset_instr, &split_load->node, 0, store->node.loc))) + return false; + list_add_before(&store->node.entry, &split_store->node.entry); + + return true; +} + +static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { - const struct hlsl_struct_field *field; - const struct hlsl_ir_load *rhs_load; const struct hlsl_ir_node *rhs; + struct hlsl_type *element_type; const struct hlsl_type *type; + unsigned int element_size, i; struct hlsl_ir_store *store; if (instr->type != HLSL_IR_STORE) @@ -278,46 +320,45 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr store = hlsl_ir_store(instr); rhs = store->rhs.node; type = rhs->data_type; - if (type->type != HLSL_CLASS_STRUCT) + if (type->type != HLSL_CLASS_ARRAY) return false; + element_type = type->e.array.type; + element_size = element_type->reg_size; - rhs_load = hlsl_ir_load(rhs); - - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + for (i = 0; i < type->e.array.elements_count; ++i) { - struct hlsl_ir_store *field_store; - struct hlsl_ir_node *offset, *add; - struct hlsl_ir_load *field_load; - struct hlsl_ir_constant *c; - - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, instr->loc))) + if (!split_copy(ctx, store, hlsl_ir_load(rhs), i * element_size, element_type)) return false; - list_add_before(&instr->entry, &c->node.entry); + } - offset = &c->node; - if (rhs_load->src.offset.node) - { - if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, rhs_load->src.offset.node, &c->node))) - return false; - list_add_before(&instr->entry, &add->entry); - offset = add; - } - if (!(field_load = hlsl_new_load(ctx, rhs_load->src.var, offset, field->type, instr->loc))) - return false; - list_add_before(&instr->entry, &field_load->node.entry); + /* Remove the store instruction, so that we can split structs which contain + * other structs. Although assignments produce a value, we don't allow + * HLSL_IR_STORE to be used as a source. */ + list_remove(&store->node.entry); + hlsl_free_instr(&store->node); + return true; +} - offset = &c->node; - if (store->lhs.offset.node) - { - if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, store->lhs.offset.node, &c->node))) - return false; - list_add_before(&instr->entry, &add->entry); - offset = add; - } +static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + const struct hlsl_struct_field *field; + const struct hlsl_ir_node *rhs; + const struct hlsl_type *type; + struct hlsl_ir_store *store; - if (!(field_store = hlsl_new_store(ctx, store->lhs.var, offset, &field_load->node, 0, instr->loc))) + if (instr->type != HLSL_IR_STORE) + return false; + + store = hlsl_ir_store(instr); + rhs = store->rhs.node; + type = rhs->data_type; + if (type->type != HLSL_CLASS_STRUCT) + return false; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (!split_copy(ctx, store, hlsl_ir_load(rhs), field->reg_offset, field->type)) return false; - list_add_before(&instr->entry, &field_store->node.entry); } /* Remove the store instruction, so that we can split structs which contain @@ -1151,6 +1192,7 @@ struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const struct int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { struct hlsl_ir_var *var; + bool progress; list_move_head(entry_func->body, &ctx->static_initializers); @@ -1197,7 +1239,12 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun } while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); - while (transform_ir(ctx, split_struct_copies, entry_func->body, NULL)); + do + { + progress = transform_ir(ctx, split_array_copies, entry_func->body, NULL); + progress |= transform_ir(ctx, split_struct_copies, entry_func->body, NULL); + } + while (progress); while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); if (ctx->profile->major_version < 4)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Rename hlsl_ir_expr_op members.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: vkd3d Branch: master Commit: 7960f9e37382a06c7d1e00b99c38916b85b53a9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7960f9e37382a06c7d1e00b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:13 2021 -0500 vkd3d-shader/hlsl: Rename hlsl_ir_expr_op members. For the sake of simplicity and clarity, especially in the interest of allowing us to have expressions with larger numbers of terms. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 92 +++++++++++++++++------------------ libs/vkd3d-shader/hlsl.h | 101 +++++++++++++++++---------------------- libs/vkd3d-shader/hlsl.y | 55 +++++++++++---------- libs/vkd3d-shader/hlsl_codegen.c | 20 ++++---- libs/vkd3d-shader/hlsl_sm1.c | 20 ++++---- 5 files changed, 138 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=7960f9e37382a06c7d1…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use a designated initializer in debug_expr_op().
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: vkd3d Branch: master Commit: b65789e74ad255e06b950f67718b67bac9233dba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b65789e74ad255e06b950f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:12 2021 -0500 vkd3d-shader/hlsl: Use a designated initializer in debug_expr_op(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 103 +++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e407057..9f50d2f 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1033,64 +1033,53 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl static const char *debug_expr_op(const struct hlsl_ir_expr *expr) { - static const char * const op_names[] = + static const char *const op_names[] = { - "~", - "!", - "-", - "abs", - "sign", - "rcp", - "rsq", - "sqrt", - "nrm", - "exp2", - "log2", - - "cast", - - "fract", - - "sin", - "cos", - "sin_reduced", - "cos_reduced", - - "dsx", - "dsy", - - "sat", - - "+", - "*", - "/", - - "%", - - "<", - ">", - "<=", - ">=", - "==", - "!=", - - "&&", - "||", - - "<<", - ">>", - "&", - "|", - "^", - - "dot", - "crs", - "min", - "max", - - "pow", - - "lerp", + [HLSL_IR_UNOP_ABS] = "abs", + [HLSL_IR_UNOP_BIT_NOT] = "~", + [HLSL_IR_UNOP_CAST] = "cast", + [HLSL_IR_UNOP_COS] = "cos", + [HLSL_IR_UNOP_COS_REDUCED] = "cos_reduced", + [HLSL_IR_UNOP_DSX] = "dsx", + [HLSL_IR_UNOP_DSY] = "dsy", + [HLSL_IR_UNOP_EXP2] = "exp2", + [HLSL_IR_UNOP_FRACT] = "fract", + [HLSL_IR_UNOP_LOG2] = "log2", + [HLSL_IR_UNOP_LOGIC_NOT] = "!", + [HLSL_IR_UNOP_NEG] = "-", + [HLSL_IR_UNOP_NRM] = "nrm", + [HLSL_IR_UNOP_RCP] = "rcp", + [HLSL_IR_UNOP_RSQ] = "rsq", + [HLSL_IR_UNOP_SAT] = "sat", + [HLSL_IR_UNOP_SIGN] = "sign", + [HLSL_IR_UNOP_SIN] = "sin", + [HLSL_IR_UNOP_SIN_REDUCED] = "sin_reduced", + [HLSL_IR_UNOP_SQRT] = "sqrt", + + [HLSL_IR_BINOP_ADD] = "+", + [HLSL_IR_BINOP_BIT_AND] = "&", + [HLSL_IR_BINOP_BIT_OR] = "|", + [HLSL_IR_BINOP_BIT_XOR] = "^", + [HLSL_IR_BINOP_CRS] = "crs", + [HLSL_IR_BINOP_DIV] = "/", + [HLSL_IR_BINOP_DOT] = "dot", + [HLSL_IR_BINOP_EQUAL] = "==", + [HLSL_IR_BINOP_GEQUAL] = ">=", + [HLSL_IR_BINOP_GREATER] = ">", + [HLSL_IR_BINOP_LEQUAL] = "<=", + [HLSL_IR_BINOP_LESS] = "<", + [HLSL_IR_BINOP_LOGIC_AND] = "&&", + [HLSL_IR_BINOP_LOGIC_OR] = "||", + [HLSL_IR_BINOP_LSHIFT] = "<<", + [HLSL_IR_BINOP_MAX] = "max", + [HLSL_IR_BINOP_MIN] = "min", + [HLSL_IR_BINOP_MOD] = "%", + [HLSL_IR_BINOP_MUL] = "*", + [HLSL_IR_BINOP_NEQUAL] = "!=", + [HLSL_IR_BINOP_POW] = "pow", + [HLSL_IR_BINOP_RSHIFT] = ">>", + + [HLSL_IR_TEROP_LERP] = "lerp", }; return op_names[expr->op];

1 0

Francois Gouget : testbot/TestLauncher: Report CreateProcess() errors like WineTest.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: tools Branch: master Commit: 3115062baa5aaabf2539abc08c57f6ef680b9a8c URL: https://source.winehq.org/git/tools.git/?a=commit;h=3115062baa5aaabf2539abc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Aug 14 12:58:38 2021 +0200 testbot/TestLauncher: Report CreateProcess() errors like WineTest. Show the GetLastError() value on the done line instead of exiting with a non-standard error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index fc67f92..41fb904 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -238,16 +238,15 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi */ if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { + *Pid = 0; if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) { Skips++; printf("%s.c:0: Tests skipped: Side-by-side dll version not found\n", (*Subtest ? Subtest : "testlauncher")); - *Pid = 0; return 0; } - Error("CreateProcess failed (error %lu)\n", GetLastError()); - ExitProcess(1); + return -GetLastError(); } CloseHandle(ProcessInformation.hThread); *Pid = ProcessInformation.dwProcessId;

1 0

Francois Gouget : winetest: Detect Windows 10 21H1.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: tools Branch: master Commit: ab445f0ccdd0309e97c414102bad492a17b60fb3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ab445f0ccdd0309e97c4141… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Aug 14 12:17:37 2021 +0200 winetest: Detect Windows 10 21H1. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 4371c90..43f7790 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -393,6 +393,7 @@ my @idmatch = ( [ "win1909", 2, 10, 0, 18363, 1, 0 ], [ "win2004", 2, 10, 0, 19041, 1, 0 ], [ "win2009", 2, 10, 0, 19042, 1, 0 ], + [ "win21H1", 2, 10, 0, 19043, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, undef, 1 ],

1 0

Alexandre Julliard : Wine release 6.15
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: website Branch: master Commit: 365fc2f69209d256ed075453f0e573bb803a5db4 URL: https://source.winehq.org/git/website.git/?a=commit;h=365fc2f69209d256ed075… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 13 21:44:31 2021 +0200 Wine release 6.15 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021081301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2021081301.xml b/news/en/2021081301.xml new file mode 100644 index 00000000..25326675 --- /dev/null +++ b/news/en/2021081301.xml @@ -0,0 +1,18 @@ +<news> +<date>August 13, 2021</date> +<title>Wine 6.15 Released</title> +<body> + The Wine development release 6.15 is now available. + <a href="{$root}/announce/6.15">What's new</a> in this release: +<ul> + <li>WinSock (WS2_32) library converted to PE.</li> + <li>Support for performance data in the registry.</li> + <li>More 32->64-bit thunks for NTDLL calls.</li> + <li>Improved floating point status handling in the C runtime.</li> + <li>More preparation work for the GDI syscall interface.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.15.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.15 : Alexandre Julliard : Release 6.15
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: refs/tags/wine-6.15 Tag: fe33148e556d2a333154d5d3e40085423e142b5d URL: https://source.winehq.org/git/wine.git/?a=tag;h=fe33148e556d2a333154d5d3e40… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 13 21:42:33 2021 +0200 Release 6.15

1 0

Alexandre Julliard : Release 6.15.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 7f144646ffac6f3632d0c39b217dbd433c1154a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f144646ffac6f3632d0c39b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 13 21:42:33 2021 +0200 Release 6.15. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 853 +++++++++++++++++++++++++++++++++++++------------------------- AUTHORS | 5 +- VERSION | 2 +- configure | 18 +- 4 files changed, 524 insertions(+), 354 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f144646ffac6f3632d0…

1 0

Jacek Caban : include: Use WOWHandle32 for HDC_32 on Wine.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 5c8ac458bb72518a1c6f2ed05c783cee6c4a3b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c8ac458bb72518a1c6f2ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 14:59:53 2021 +0200 include: Use WOWHandle32 for HDC_32 on Wine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51570 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wownt32.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/wownt32.h b/include/wownt32.h index ddfa9b562b7..0afe23d360a 100644 --- a/include/wownt32.h +++ b/include/wownt32.h @@ -85,7 +85,6 @@ WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE); #define HMENU_32(h16) ((HMENU) (ULONG_PTR)(h16)) #define HDWP_32(h16) ((HDWP) (ULONG_PTR)(h16)) #define HDROP_32(h16) ((HDROP) (ULONG_PTR)(h16)) -#define HDC_32(h16) ((HDC) (ULONG_PTR)(h16)) #define HFONT_32(h16) ((HFONT) (ULONG_PTR)(h16)) #define HRGN_32(h16) ((HRGN) (ULONG_PTR)(h16)) #define HBITMAP_32(h16) ((HBITMAP) (ULONG_PTR)(h16)) @@ -113,7 +112,6 @@ WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE); #define HMENU_32(h16) ((HMENU) (WOWHandle32(h16, WOW_TYPE_HMENU))) #define HDWP_32(h16) ((HDWP) (WOWHandle32(h16, WOW_TYPE_HDWP))) #define HDROP_32(h16) ((HDROP) (WOWHandle32(h16, WOW_TYPE_HDROP))) -#define HDC_32(h16) ((HDC) (WOWHandle32(h16, WOW_TYPE_HDC))) #define HFONT_32(h16) ((HFONT) (WOWHandle32(h16, WOW_TYPE_HFONT))) #define HRGN_32(h16) ((HRGN) (WOWHandle32(h16, WOW_TYPE_HRGN))) #define HBITMAP_32(h16) ((HBITMAP) (WOWHandle32(h16, WOW_TYPE_HBITMAP))) @@ -137,9 +135,10 @@ WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE); #endif /* __WINESRC__ */ -#define HMETAFILE_32(h16) ((HMETAFILE)(WOWHandle32(h16, WOW_TYPE_HMETAFILE))) -#define HTASK_32(h16) ((DWORD)(WOWHandle32(h16, WOW_TYPE_HTASK))) -#define FULLHWND_32(h16) ((HWND)(WOWHandle32(h16, WOW_TYPE_FULLHWND))) +#define HDC_32(h16) ((HDC) (WOWHandle32(h16, WOW_TYPE_HDC))) +#define HMETAFILE_32(h16) ((HMETAFILE) (WOWHandle32(h16, WOW_TYPE_HMETAFILE))) +#define HTASK_32(h16) ((DWORD) (WOWHandle32(h16, WOW_TYPE_HTASK))) +#define FULLHWND_32(h16) ((HWND) (WOWHandle32(h16, WOW_TYPE_FULLHWND))) #define HMETAFILE_16(h32) (WOWHandle16(h32, WOW_TYPE_HMETAFILE)) #define HTASK_16(h32) (WOWHandle16((HANDLE)(h32), WOW_TYPE_HTASK))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021