July 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from the "loop_statement" rule.
by Alexandre Julliard July 5, 2023

July 5, 2023

Module: vkd3d Branch: master Commit: 79dd9544b7233ef5704f01db3c73bea77faebd9f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/79dd9544b7233ef5704f01db3c73b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 19:10:38 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from the "loop_statement" rule. --- libs/vkd3d-shader/hlsl.y | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c8b7e255..a2f2f373 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -486,7 +486,8 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att return false; } -static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const struct parse_attribute_list *attributes, struct list *init, struct list *cond, +static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, + const struct parse_attribute_list *attributes, struct list *init, struct list *cond, struct list *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc) { struct hlsl_ir_node *loop; @@ -542,7 +543,7 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const vkd3d_free(cond); destroy_block(body); - return init; + return list_to_block(init); oom: destroy_instr_list(init); @@ -4571,7 +4572,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> jump_statement %type <list> logicand_expr %type <list> logicor_expr -%type <list> loop_statement %type <list> mul_expr %type <list> postfix_expr %type <list> primary_expr @@ -4599,6 +4599,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <attr_list> attribute_list_optional %type <block> compound_statement +%type <block> loop_statement %type <block> statement %type <block> statement_list @@ -5932,9 +5933,6 @@ statement: $$ = list_to_block($1); } | loop_statement - { - $$ = list_to_block($1); - } jump_statement: KW_RETURN expr ';'

1 0

Zebediah Figura : vkd3d-shader/hlsl: Free the "iter" block pointer on success in create_loop().
by Alexandre Julliard July 5, 2023

July 5, 2023

Module: vkd3d Branch: master Commit: 6e303af5192e61c8ca100dd81828a812487e759b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6e303af5192e61c8ca100dd81828a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 29 18:49:54 2023 -0500 vkd3d-shader/hlsl: Free the "iter" block pointer on success in create_loop(). Spotted by Giovanni Mascellani. --- libs/vkd3d-shader/hlsl.y | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a888ec76..42fa2129 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -548,6 +548,7 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, destroy_block(cond); destroy_block(body); + destroy_block(iter); return init; oom:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from the "jump_statement" rule.
by Alexandre Julliard July 5, 2023

July 5, 2023

Module: vkd3d Branch: master Commit: 07ce71158300497eb6db5d27cb938cfbd0cb6597 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/07ce71158300497eb6db5d27cb938… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 19:16:14 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from the "jump_statement" rule. --- libs/vkd3d-shader/hlsl.y | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bf72117a..00179664 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -138,6 +138,11 @@ static struct hlsl_ir_node *node_from_list(struct list *list) return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry); } +static struct hlsl_ir_node *node_from_block(struct hlsl_block *block) +{ + return LIST_ENTRY(list_tail(&block->instrs), struct hlsl_ir_node, entry); +} + static struct list *block_to_list(struct hlsl_block *block) { /* This is a temporary hack to ease the transition from lists to blocks. @@ -652,7 +657,7 @@ static struct hlsl_ir_node *get_swizzle(struct hlsl_ctx *ctx, struct hlsl_ir_nod return NULL; } -static bool add_return(struct hlsl_ctx *ctx, struct list *instrs, +static bool add_return(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *return_value, const struct vkd3d_shader_location *loc) { struct hlsl_type *return_type = ctx->cur_function->return_type; @@ -664,7 +669,7 @@ static bool add_return(struct hlsl_ctx *ctx, struct list *instrs, { struct hlsl_ir_node *store; - if (!(return_value = add_implicit_conversion(ctx, instrs, return_value, return_type, loc))) + if (!(return_value = add_implicit_conversion(ctx, block_to_list(block), return_value, return_type, loc))) return false; if (!(store = hlsl_new_simple_store(ctx, ctx->cur_function->return_var, return_value))) @@ -685,7 +690,7 @@ static bool add_return(struct hlsl_ctx *ctx, struct list *instrs, if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_RETURN, NULL, loc))) return false; - list_add_tail(instrs, &jump->entry); + hlsl_block_add_instr(block, jump); return true; } @@ -4569,7 +4574,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> expr_optional %type <list> expr_statement %type <list> initializer_expr -%type <list> jump_statement %type <list> logicand_expr %type <list> logicor_expr %type <list> mul_expr @@ -4598,6 +4602,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <attr_list> attribute_list_optional %type <block> compound_statement +%type <block> jump_statement %type <block> loop_statement %type <block> selection_statement %type <block> statement @@ -5925,22 +5930,19 @@ statement: } | compound_statement | jump_statement - { - $$ = list_to_block($1); - } | selection_statement | loop_statement jump_statement: KW_RETURN expr ';' { - if (!add_return(ctx, $2, node_from_list($2), &@1)) + $$ = list_to_block($2); + if (!add_return(ctx, $$, node_from_block($$), &@1)) YYABORT; - $$ = $2; } | KW_RETURN ';' { - if (!($$ = make_empty_list(ctx))) + if (!($$ = make_empty_block(ctx))) YYABORT; if (!add_return(ctx, $$, NULL, &@1)) YYABORT; @@ -5949,16 +5951,16 @@ jump_statement: { struct hlsl_ir_node *discard, *c; - if (!($$ = make_empty_list(ctx))) + if (!($$ = make_empty_block(ctx))) YYABORT; if (!(c = hlsl_new_uint_constant(ctx, ~0u, &@1))) return false; - list_add_tail($$, &c->entry); + hlsl_block_add_instr($$, c); if (!(discard = hlsl_new_jump(ctx, HLSL_IR_JUMP_DISCARD_NZ, c, &@1))) return false; - list_add_tail($$, &discard->entry); + hlsl_block_add_instr($$, discard); } selection_statement:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from the "statement" rule.
by Alexandre Julliard July 5, 2023

July 5, 2023

Module: vkd3d Branch: master Commit: 23ff83e8a0cea596f7eec92b6aa50e9e881df5b8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/23ff83e8a0cea596f7eec92b6aa50… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 19:07:27 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from the "statement" rule. As well as from the "statement_list" and "compound_statement" rules, which trivially pass through from "statement". --- libs/vkd3d-shader/hlsl.y | 63 ++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 82dd19eb..c8b7e255 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -487,9 +487,8 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att } static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const struct parse_attribute_list *attributes, struct list *init, struct list *cond, - struct list *iter, struct list *body, const struct vkd3d_shader_location *loc) + struct list *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc) { - struct hlsl_block body_block; struct hlsl_ir_node *loop; unsigned int i; @@ -529,32 +528,27 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const if (!append_conditional_break(ctx, cond)) goto oom; - hlsl_block_init(&body_block); - - if (type != LOOP_DO_WHILE) - list_move_tail(&body_block.instrs, cond); - - list_move_tail(&body_block.instrs, body); - if (iter) - list_move_tail(&body_block.instrs, iter); + list_move_tail(&body->instrs, iter); if (type == LOOP_DO_WHILE) - list_move_tail(&body_block.instrs, cond); + list_move_tail(&body->instrs, cond); + else + list_move_head(&body->instrs, cond); - if (!(loop = hlsl_new_loop(ctx, &body_block, loc))) + if (!(loop = hlsl_new_loop(ctx, body, loc))) goto oom; list_add_tail(init, &loop->entry); vkd3d_free(cond); - vkd3d_free(body); + destroy_block(body); return init; oom: destroy_instr_list(init); destroy_instr_list(cond); destroy_instr_list(iter); - destroy_instr_list(body); + destroy_block(body); return NULL; } @@ -4433,6 +4427,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type char *name; DWORD modifiers; struct hlsl_ir_node *instr; + struct hlsl_block *block; struct list *list; struct parse_fields fields; struct parse_function function; @@ -4565,7 +4560,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> bitand_expr %type <list> bitor_expr %type <list> bitxor_expr -%type <list> compound_statement %type <list> conditional_expr %type <list> declaration %type <list> declaration_statement @@ -4584,8 +4578,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> relational_expr %type <list> selection_statement %type <list> shift_expr -%type <list> statement -%type <list> statement_list %type <list> struct_declaration_without_vars %type <list> type_specs %type <list> unary_expr @@ -4606,6 +4598,10 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <attr_list> attribute_list %type <attr_list> attribute_list_optional +%type <block> compound_statement +%type <block> statement +%type <block> statement_list + %type <boolval> boolean %type <buffer_type> buffer_type @@ -4913,15 +4909,15 @@ func_declaration: "Function \"%s\" is already defined.", decl->func->name); hlsl_note(ctx, &decl->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously defined here.", decl->func->name); - hlsl_free_instr_list($2); + destroy_block($2); } else { size_t i; decl->has_body = true; - list_move_tail(&decl->body.instrs, $2); - vkd3d_free($2); + hlsl_block_add_block(&decl->body, $2); + destroy_block($2); /* Semantics are taken from whichever definition has a body. * We can't just replace the hlsl_ir_var pointers, though: if @@ -5098,7 +5094,7 @@ func_prototype: compound_statement: '{' '}' { - if (!($$ = make_empty_list(ctx))) + if (!($$ = make_empty_block(ctx))) YYABORT; } | '{' scope_start statement_list '}' @@ -5913,17 +5909,32 @@ statement_list: | statement_list statement { $$ = $1; - list_move_tail($$, $2); - vkd3d_free($2); + hlsl_block_add_block($$, $2); + destroy_block($2); } statement: declaration_statement + { + $$ = list_to_block($1); + } | expr_statement + { + $$ = list_to_block($1); + } | compound_statement | jump_statement + { + $$ = list_to_block($1); + } | selection_statement + { + $$ = list_to_block($1); + } | loop_statement + { + $$ = list_to_block($1); + } jump_statement: KW_RETURN expr ';' @@ -5985,13 +5996,13 @@ selection_statement: if_body: statement { - $$.then_block = list_to_block($1); + $$.then_block = $1; $$.else_block = NULL; } | statement KW_ELSE statement { - $$.then_block = list_to_block($1); - $$.else_block = list_to_block($3); + $$.then_block = $1; + $$.else_block = $3; } loop_statement:

1 0

Alex Henrie : include: Introduce wine_dbgstr_hstring and debugstr_hstring.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: f4a8ad89d43646a8d109da5747dfb1a92a6d8cd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4a8ad89d43646a8d109da5747dfb1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 4 12:33:55 2023 -0600 include: Introduce wine_dbgstr_hstring and debugstr_hstring. --- dlls/combase/roapi.c | 9 --------- dlls/cryptowinrt/main.c | 9 --------- dlls/cryptowinrt/private.h | 2 -- dlls/graphicscapture/main.c | 9 --------- dlls/threadpoolwinrt/main.c | 9 --------- dlls/windows.devices.bluetooth/main.c | 9 --------- dlls/windows.devices.bluetooth/private.h | 2 -- dlls/windows.devices.bluetooth/tests/bluetooth.c | 9 --------- dlls/windows.devices.enumeration/main.c | 9 --------- dlls/windows.devices.enumeration/private.h | 2 -- dlls/windows.globalization/main.c | 9 --------- dlls/windows.media.devices/main.c | 9 --------- dlls/windows.media.speech/tests/speech.c | 9 --------- dlls/windows.media/captions.c | 9 --------- dlls/windows.media/private.h | 2 -- dlls/windows.networking/main.c | 9 --------- dlls/windows.perception.stub/main.c | 9 --------- dlls/windows.system.profile.systemmanufacturers/main.c | 9 --------- dlls/windows.ui/main.c | 9 --------- dlls/wintypes/main.c | 10 ---------- include/wine/debug.h | 13 +++++++++++++ 21 files changed, 13 insertions(+), 153 deletions(-)

1 0

Alex Henrie : include: Use correct header guard name in winstring.h.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 7e366d46b204582ece39bbd48d78be5503f4874d URL: https://gitlab.winehq.org/wine/wine/-/commit/7e366d46b204582ece39bbd48d78be… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 4 12:33:55 2023 -0600 include: Use correct header guard name in winstring.h. --- include/winstring.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/winstring.h b/include/winstring.h index 27c299b9470..79b284a842e 100644 --- a/include/winstring.h +++ b/include/winstring.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_WINSTRING_H -#define __WINE_WINSTRING_H +#ifndef __WINSTRING_H_ +#define __WINSTRING_H_ #include <hstring.h> @@ -51,4 +51,4 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str, HSTRING charstr, HSTRING *out } #endif -#endif /* __WINE_WINSTRING_H */ +#endif /* __WINSTRING_H_ */

1 0

Jiajin Cui : shell32: Make sure wcmd has enough space to hold the string.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: eee640c93874317ab3ff62ca6afda962ac96d999 URL: https://gitlab.winehq.org/wine/wine/-/commit/eee640c93874317ab3ff62ca6afda9… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Wed Jun 21 17:53:52 2023 +0800 shell32: Make sure wcmd has enough space to hold the string. If the length of wszApplicationName exceeds 1024, it will cause an error when writing to the subsequent stack space after exceeding the wcmd space, Wcmd needs to be modified to dynamic allocation. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com> --- dlls/shell32/shlexec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index da2b5fdc2b0..43e965ca7d5 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1764,6 +1764,14 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; + len = lstrlenW(wszApplicationName) + 3; + if (sei_tmp.lpParameters[0]) + len += 1 + lstrlenW(wszParameters); + if (len > wcmdLen) + { + wcmd = heap_alloc(len * sizeof(WCHAR)); + wcmdLen = len; + } lstrcpyW(wcmd, wszApplicationName); if (sei_tmp.lpDirectory) {

1 0

Kevin Schmidt : taskmgr: Use macro for the color black too.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 29b29eddcccaefffd7c7a714d2a2c16a92fe948a URL: https://gitlab.winehq.org/wine/wine/-/commit/29b29eddcccaefffd7c7a714d2a2c1… Author: Kevin Schmidt <kevin(a)imkx.dev> Date: Sun Jun 18 19:58:25 2023 +0200 taskmgr: Use macro for the color black too. --- programs/taskmgr/graph.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 4d04017e331..44522ddf307 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -32,9 +32,10 @@ #include "taskmgr.h" #include "perfdata.h" -#define BRIGHT_GREEN RGB(0, 255, 0) -#define DARK_GREEN RGB(0, 130, 0) -#define RED RGB(255, 0, 0) +#define BRIGHT_GREEN RGB(0, 255, 0) +#define DARK_GREEN RGB(0, 130, 0) +#define RED RGB(255, 0, 0) +#define BLACK RGB(0, 0, 0) WNDPROC OldGraphWndProc; @@ -69,7 +70,7 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) /* * Fill it with blackness */ - FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); + FillSolidRect(hDC, &rcClient, BLACK); /* * Get the CPU usage @@ -248,7 +249,7 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* * Fill it with blackness */ - FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); + FillSolidRect(hDC, &rcClient, BLACK); /* * Get the memory usage @@ -344,7 +345,7 @@ static void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd) /* * Fill it with blackness */ - FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); + FillSolidRect(hDC, &rcClient, BLACK); /* * Draw the graph background

1 0

Billy Laws : server: Avoid using SOL_IPX to detect whether IPX is supported.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 41cc117b3f37ab4b9b4ac8a815cd2a496d38fb4b URL: https://gitlab.winehq.org/wine/wine/-/commit/41cc117b3f37ab4b9b4ac8a815cd2a… Author: Billy Laws <blaws05(a)gmail.com> Date: Sat Jun 3 21:57:42 2023 +0100 server: Avoid using SOL_IPX to detect whether IPX is supported. --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 088e6d63079..34be6ea22ef 100644 --- a/server/sock.c +++ b/server/sock.c @@ -62,6 +62,7 @@ #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> +# define HAS_IPX #elif defined(HAVE_LINUX_IPX_H) # ifdef HAVE_ASM_TYPES_H # include <asm/types.h> @@ -70,8 +71,6 @@ # include <linux/types.h> # endif # include <linux/ipx.h> -#endif -#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS) # define HAS_IPX #endif

1 0

Billy Laws : ntdll: Avoid using SOL_IPX to detect whether IPX is supported.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 954bf9e0505a7368c34047b311d613cff04393a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/954bf9e0505a7368c34047b311d613… Author: Billy Laws <blaws05(a)gmail.com> Date: Sat Jun 3 21:57:42 2023 +0100 ntdll: Avoid using SOL_IPX to detect whether IPX is supported. 4.18+ Linux kernels remove support for IPX but keep SOL_IPX defined, which causes compilation errors as wine unconditionally uses IPX structures if this is the case. Instead check for IPX_MTU to determine IPX support as it is defined within the ipx.h header itself. --- dlls/ntdll/unix/socket.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index bc5bc84fdf8..80105eda0c9 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -45,6 +45,7 @@ #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> +# define HAS_IPX #elif defined(HAVE_LINUX_IPX_H) # ifdef HAVE_ASM_TYPES_H # include <asm/types.h> @@ -53,8 +54,6 @@ # include <linux/types.h> # endif # include <linux/ipx.h> -#endif -#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS) # define HAS_IPX #endif @@ -2406,6 +2405,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } +#ifdef HAS_IPX #ifdef SOL_IPX case IOCTL_AFD_WINE_GET_IPX_PTYPE: return do_getsockopt( handle, io, SOL_IPX, IPX_TYPE, out_buffer, out_size ); @@ -2444,6 +2444,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, 0, SO_DEFAULT_HEADERS, &value, sizeof(value) ); } #endif +#endif #ifdef HAS_IRDA #define MAX_IRDA_DEVICES 10

1 0