October 2021 - Wine-Commits

Jinoh Kang : user32: Implement WindowFromPhysicalPoint.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: ef33382df539cd26a977b37adf7006336ae7ec5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef33382df539cd26a977b37a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Oct 4 03:53:39 2021 +0900 user32: Implement WindowFromPhysicalPoint. physical<->logical is an identity mapping in other functions and also >win8, so make it consistent with those. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec | 2 +- .../ext-ms-win-ntuser-window-l1-1-1.spec | 2 +- dlls/user32/sysparams.c | 8 ++++++++ dlls/user32/user32.spec | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec index ea155c098d9..acc03f665de 100644 --- a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec +++ b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec @@ -51,5 +51,5 @@ @ stub SoundSentry @ stdcall UnhookWindowsHookEx(long) user32.UnhookWindowsHookEx @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) user32.UpdateLayeredWindow -@ stub WindowFromPhysicalPoint +@ stdcall WindowFromPhysicalPoint(int64) user32.WindowFromPhysicalPoint @ stdcall WindowFromPoint(int64) user32.WindowFromPoint diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec index ea155c098d9..acc03f665de 100644 --- a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec +++ b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec @@ -51,5 +51,5 @@ @ stub SoundSentry @ stdcall UnhookWindowsHookEx(long) user32.UnhookWindowsHookEx @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) user32.UpdateLayeredWindow -@ stub WindowFromPhysicalPoint +@ stdcall WindowFromPhysicalPoint(int64) user32.WindowFromPhysicalPoint @ stdcall WindowFromPoint(int64) user32.WindowFromPoint diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index d6f08654ab0..733acd3d3c6 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4506,6 +4506,14 @@ BOOL WINAPI SetPhysicalCursorPos( INT x, INT y ) return SetCursorPos( x, y ); } +/*********************************************************************** + * WindowFromPhysicalPoint (USER32.@) + */ +HWND WINAPI WindowFromPhysicalPoint( POINT pt ) +{ + return WindowFromPoint( pt ); +} + /*********************************************************************** * LogicalToPhysicalPoint (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8d3ac70210c..8d5f1bc4145 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -820,6 +820,7 @@ # @ stub WinOldAppHackoMatic @ stdcall WindowFromDC(long) @ stdcall WindowFromPoint(int64) +@ stdcall WindowFromPhysicalPoint(int64) # @ stub YieldTask # @ stub _SetProcessDefaultLayout @ stdcall keybd_event(long long long long)

1 0

Jacek Caban : makedep: Use -fno-builtin for CRT DLLs on PE targets.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: 63e6eaedeee2643d365e5cd63f38e0b74ac05b44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63e6eaedeee2643d365e5cd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 17:21:47 2021 +0200 makedep: Use -fno-builtin for CRT DLLs on PE targets. Just like we do for other targets with cross compiler enabled. Fixes PE-only i686 build with llvm-mingw, which otherwise uses unexpected optimizations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 78befe58603..81f65f52dd8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3004,6 +3004,8 @@ static void output_source_default( struct makefile *make, struct incl_file *sour { output_filenames( dll_flags ); if (source->use_msvcrt) output_filenames( msvcrt_flags ); + if (!*dll_ext && make->module && is_crt_module( make->module )) + output_filename( "-fno-builtin" ); } output_filenames( extra_cflags ); output_filenames( cpp_flags );

1 0

Alexandre Julliard : winedbg: Use winsock for the gdb socket.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: 6a2325609ceea306c6d7cbce56f29e6589a18903 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a2325609ceea306c6d7cbce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 4 11:27:43 2021 +0200 winedbg: Use winsock for the gdb socket. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/Makefile.in | 3 +- programs/winedbg/gdbproxy.c | 271 +++++++++++++++++++------------------------ 2 files changed, 122 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a2325609ceea306c6d7…

1 0

Alexandre Julliard : winedbg: Avoid using the 'long double' type.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: 13125b51cdf7ba8e8d658dcf35b8f32d40447619 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13125b51cdf7ba8e8d658dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 4 15:00:20 2021 +0200 winedbg: Avoid using the 'long double' type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 6 ++---- programs/winedbg/be_arm64.c | 6 ++---- programs/winedbg/be_cpu.h | 2 +- programs/winedbg/be_i386.c | 26 +++++++++----------------- programs/winedbg/be_x86_64.c | 31 +++++++++---------------------- programs/winedbg/memory.c | 4 ++-- 6 files changed, 25 insertions(+), 50 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 98078e22640..fa25ce8dd2b 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1851,10 +1851,9 @@ static BOOL be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, return TRUE; } -static BOOL be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) +static BOOL be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) { - char tmp[sizeof(long double)]; + char tmp[sizeof(double)]; /* FIXME: this assumes that debuggee and debugger use the same * representation for reals @@ -1863,7 +1862,6 @@ static BOOL be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, if (size == sizeof(float)) *ret = *(float*)tmp; else if (size == sizeof(double)) *ret = *(double*)tmp; - else if (size == sizeof(long double)) *ret = *(long double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index 50bb5bad0b9..d22f254013b 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -248,10 +248,9 @@ static BOOL be_arm64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned siz return TRUE; } -static BOOL be_arm64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) +static BOOL be_arm64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) { - char tmp[sizeof(long double)]; + char tmp[sizeof(double)]; /* FIXME: this assumes that debuggee and debugger use the same * representation for reals @@ -260,7 +259,6 @@ static BOOL be_arm64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, if (size == sizeof(float)) *ret = *(float*)tmp; else if (size == sizeof(double)) *ret = *(double*)tmp; - else if (size == sizeof(long double)) *ret = *(long double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 354a6252d39..14746d6665b 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -121,7 +121,7 @@ struct backend_cpu /* Reads an integer from memory and stores it inside a long long int */ BOOL (*fetch_integer)(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG*); /* Reads a real from memory and stores it inside a long double */ - BOOL (*fetch_float)(const struct dbg_lvalue* lvalue, unsigned size, long double*); + BOOL (*fetch_float)(const struct dbg_lvalue* lvalue, unsigned size, double*); /* Writes an integer to memory */ BOOL (*store_integer)(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG); diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 76f9b8f807b..08d0841a208 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -133,7 +133,6 @@ static void be_i386_all_print_context(HANDLE hThread, const dbg_ctx_t *pctx) "DM", "ZM", "OM", "UM", "PM", "R-", "R+", "FZ" }; const WOW64_CONTEXT *ctx = &pctx->x86; XSAVE_FORMAT *xmm_area; - long double ST[8]; /* These are for floating regs */ int cnt; /* Break out the FPU state and the floating point registers */ @@ -185,16 +184,12 @@ static void be_i386_all_print_context(HANDLE hThread, const dbg_ctx_t *pctx) /* Now for the floating point registers */ dbg_printf("Floating Point Registers:\n"); - for (cnt = 0; cnt < 4; cnt++) - { - memcpy(&ST[cnt], &ctx->FloatSave.RegisterArea[cnt * 10], 10); - dbg_printf(" ST%d:%Lf ", cnt, ST[cnt]); - } - dbg_printf("\n"); - for (cnt = 4; cnt < 8; cnt++) + for (cnt = 0; cnt < 8; cnt++) { - memcpy(&ST[cnt], &ctx->FloatSave.RegisterArea[cnt * 10], 10); - dbg_printf(" ST%d:%Lf ", cnt, ST[cnt]); + const BYTE *p = &ctx->FloatSave.RegisterArea[cnt * 10]; + if (cnt == 4) dbg_printf("\n"); + dbg_printf(" ST%d:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x ", cnt, + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9] ); } xmm_area = (XSAVE_FORMAT *) &ctx->ExtendedRegisters; @@ -802,20 +797,17 @@ static BOOL be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size return TRUE; } -static BOOL be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) +static BOOL be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) { - char tmp[sizeof(long double)]; + char tmp[sizeof(double)]; /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ if (!memory_read_value(lvalue, size, tmp)) return FALSE; - /* float & double types have to be promoted to a long double */ - if (size == 4) *ret = *(float*)tmp; - else if (size == 8) *ret = *(double*)tmp; - else if (size == 10) *ret = *(long double*)tmp; + if (size == sizeof(float)) *ret = *(float*)tmp; + else if (size == sizeof(double)) *ret = *(double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 7b6d94deb59..74481645081 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -73,14 +73,6 @@ static void be_x86_64_single_step(dbg_ctx_t *ctx, BOOL enable) else ctx->ctx.EFlags &= ~STEP_FLAG; } -static inline long double m128a_to_longdouble(const M128A m) -{ - /* gcc uses the same IEEE-754 representation as M128A for long double - * but 16 byte aligned (hence only the first 10 bytes out of the 16 are used) - */ - return *(long double*)&m; -} - static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, int all_regs) { @@ -154,14 +146,12 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, ctx->u.FltSave.ErrorSelector, ctx->u.FltSave.ErrorOffset, ctx->u.FltSave.DataSelector, ctx->u.FltSave.DataOffset ); - for (i = 0; i < 4; i++) - { - dbg_printf(" st%u:%-16Lg ", i, m128a_to_longdouble(ctx->u.FltSave.FloatRegisters[i])); - } - dbg_printf("\n"); - for (i = 4; i < 8; i++) + for (i = 0; i < 8; i++) { - dbg_printf(" st%u:%-16Lg ", i, m128a_to_longdouble(ctx->u.FltSave.FloatRegisters[i])); + M128A reg = ctx->u.FltSave.FloatRegisters[i]; + if (i == 4) dbg_printf("\n"); + dbg_printf(" ST%u:%08x%08x%08x%08x ", i, + (DWORD)(reg.High >> 32), (DWORD)reg.High, (DWORD)(reg.Low >> 32), (DWORD)reg.Low ); } dbg_printf("\n"); @@ -731,20 +721,17 @@ static BOOL be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned si return TRUE; } -static BOOL be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) +static BOOL be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) { - char tmp[sizeof(long double)]; + char tmp[sizeof(double)]; /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ if (!memory_read_value(lvalue, size, tmp)) return FALSE; - /* float & double types have to be promoted to a long double */ - if (size == 4) *ret = *(float*)tmp; - else if (size == 8) *ret = *(double*)tmp; - else if (size == 10) *ret = *(long double*)tmp; + if (size == sizeof(float)) *ret = *(float*)tmp; + else if (size == sizeof(double)) *ret = *(double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index ed537e121a9..ab8b2eb49b8 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -350,7 +350,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) { LONGLONG val_int; void* val_ptr; - long double val_real; + double val_real; DWORD64 size64; DWORD tag, size, count, bt; struct dbg_type type = lvalue->type; @@ -385,7 +385,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) break; case btFloat: if (!dbg_curr_process->be_cpu->fetch_float(lvalue, size, &val_real)) return; - dbg_printf("%Lf", val_real); + dbg_printf("%f", val_real); break; case btChar: case btWChar:

1 0

Rémi Bernon : hidclass.sys: Overwrite queued reports as FIFO instead of LIFO.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: 51ae926240f05ac6fe3538728aec1e65ad7abf2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=51ae926240f05ac6fe353872… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 10:20:19 2021 +0200 hidclass.sys: Overwrite queued reports as FIFO instead of LIFO. Based on a patch from Ivo Ivanov <logos128(a)gmail.com>. The issue causes severe skipping and non smooth movement tracking in apps/games, when the HidP/HidD APIs are used to control the device (joysticks, controllers, steering wheels, etc.). Usually such devices use constant stream of INPUT reports to report their coords, so any report skipping or change of the sequence, when the interested apps are reading, would lead to such issues. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51824 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index e4592c4d242..cebdc3e1e65 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -190,10 +190,12 @@ static void hid_queue_push_report( struct hid_queue *queue, struct hid_report *r KeAcquireSpinLock( &queue->lock, &irql ); prev = queue->reports[i]; queue->reports[i] = report; - if (next != queue->read_idx) queue->write_idx = next; + if (next == queue->read_idx) queue->read_idx = next + 1; + if (queue->read_idx >= queue->length) queue->read_idx = 0; KeReleaseSpinLock( &queue->lock, irql ); hid_report_decref( prev ); + queue->write_idx = next; } static struct hid_report *hid_queue_pop_report( struct hid_queue *queue )

1 0

Nikolay Sivov : widl: Allow [hidden] and [version] on modules.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: 73686845d1c78a3ed705501f56013af373094c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73686845d1c78a3ed705501f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 13:09:16 2021 +0300 widl: Allow [hidden] and [version] on modules. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 51050a24fa3..fa863921c92 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2347,7 +2347,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_HELPSTRING */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, "helpstring" }, /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, "helpstringcontext" }, /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "helpstringdll" }, - /* ATTR_HIDDEN */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, "hidden" }, + /* ATTR_HIDDEN */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, "hidden" }, /* ATTR_ID */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, "id" }, /* ATTR_IDEMPOTENT */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "ignore" }, @@ -2406,7 +2406,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_UUID */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, "uuid" }, /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, /* ATTR_VARARG */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, - /* ATTR_VERSION */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 2, 0, 0, 1, 0, 0, 1, 0, 1, "version" }, + /* ATTR_VERSION */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 2, 0, 0, 1, 0, 1, 1, 0, 1, "version" }, /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "vi_progid" }, /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, };

1 0

Huw Davies : nsiproxy: Rename private unixlib header to unix_private.h.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: ef45e119182a34b71892e253e38e7ff7e438b531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef45e119182a34b71892e253… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 4 12:23:18 2021 +0100 nsiproxy: Rename private unixlib header to unix_private.h. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ip.c | 2 +- dlls/nsiproxy.sys/ndis.c | 2 +- dlls/nsiproxy.sys/nsi.c | 2 +- dlls/nsiproxy.sys/tcp.c | 2 +- dlls/nsiproxy.sys/udp.c | 2 +- dlls/nsiproxy.sys/{nsiproxy_private.h => unix_private.h} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 2e69c289c16..c7ec2e89b16 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -103,7 +103,7 @@ #include "wine/nsi.h" #include "wine/debug.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 8971b69c2db..3e37bcecc78 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -91,7 +91,7 @@ #include "wine/debug.h" #include "wine/unixlib.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index ccfc325a085..565ae2d11dd 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -36,7 +36,7 @@ #include "wine/nsi.h" #include "wine/debug.h" #include "wine/unixlib.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 55311a4affc..1ed80afbe4b 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -105,7 +105,7 @@ #include "wine/debug.h" #include "wine/server.h" -#include "nsiproxy_private.h" +#include "unix_private.h" #ifndef HAVE_NETINET_TCP_FSM_H #define TCPS_ESTABLISHED 1 diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 0cc2cadbc98..403431acbef 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -85,7 +85,7 @@ #include "wine/debug.h" #include "wine/server.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/unix_private.h similarity index 99% rename from dlls/nsiproxy.sys/nsiproxy_private.h rename to dlls/nsiproxy.sys/unix_private.h index acc60ce4806..97e264e9b1a 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -1,5 +1,5 @@ /* - * nsiproxy.sys + * nsiproxy.sys unixlib private header * * Copyright 2021 Huw Davies *

1 0

Huw Davies : nsiproxy: Let the general dispatch function update the irp's status.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: 7ed25b6c16fce6d608b9f047faaac69e58fea89c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ed25b6c16fce6d608b9f047… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 4 12:23:19 2021 +0100 nsiproxy: Let the general dispatch function update the irp's status. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/device.c | 77 ++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 41 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 3afd76487ff..fb330ddfc93 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -20,7 +20,6 @@ #include <stdarg.h> -#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -50,7 +49,7 @@ enum unix_calls nsi_get_parameter_ex, }; -static void nsiproxy_enumerate_all( IRP *irp ) +static NTSTATUS nsiproxy_enumerate_all( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_enumerate_all *in = (struct nsiproxy_enumerate_all *)irp->AssociatedIrp.SystemBuffer; @@ -58,18 +57,12 @@ static void nsiproxy_enumerate_all( IRP *irp ) void *out = irp->AssociatedIrp.SystemBuffer; DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsi_enumerate_all_ex enum_all; + NTSTATUS status; - if (in_len != sizeof(*in)) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + if (in_len != sizeof(*in)) return STATUS_INVALID_PARAMETER; if (out_len < sizeof(DWORD) + (in->key_size + in->rw_size + in->dynamic_size + in->static_size) * in->count) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + return STATUS_INVALID_PARAMETER; enum_all.unknown[0] = 0; enum_all.unknown[1] = 0; @@ -87,16 +80,18 @@ static void nsiproxy_enumerate_all( IRP *irp ) enum_all.static_size = in->static_size; enum_all.count = in->count; - irp->IoStatus.u.Status = nsiproxy_call( nsi_enumerate_all_ex, &enum_all ); - if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_BUFFER_OVERFLOW) + status = nsiproxy_call( nsi_enumerate_all_ex, &enum_all ); + if (status == STATUS_SUCCESS || status == STATUS_BUFFER_OVERFLOW) { irp->IoStatus.Information = out_len; *(DWORD *)out = enum_all.count; } else irp->IoStatus.Information = 0; + + return status; } -static void nsiproxy_get_all_parameters( IRP *irp ) +static NTSTATUS nsiproxy_get_all_parameters( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_get_all_parameters *in = (struct nsiproxy_get_all_parameters *)irp->AssociatedIrp.SystemBuffer; @@ -104,19 +99,14 @@ static void nsiproxy_get_all_parameters( IRP *irp ) BYTE *out = irp->AssociatedIrp.SystemBuffer; DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsi_get_all_parameters_ex get_all; + NTSTATUS status; - if (in_len < FIELD_OFFSET(struct nsiproxy_get_all_parameters, key[0]) || - in_len < FIELD_OFFSET(struct nsiproxy_get_all_parameters, key[in->key_size])) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + if (in_len < offsetof(struct nsiproxy_get_all_parameters, key[0]) || + in_len < offsetof(struct nsiproxy_get_all_parameters, key[in->key_size])) + return STATUS_INVALID_PARAMETER; if (out_len < in->rw_size + in->dynamic_size + in->static_size) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + return STATUS_INVALID_PARAMETER; get_all.unknown[0] = 0; get_all.unknown[1] = 0; @@ -133,11 +123,13 @@ static void nsiproxy_get_all_parameters( IRP *irp ) get_all.static_data = out + in->rw_size + in->dynamic_size; get_all.static_size = in->static_size; - irp->IoStatus.u.Status = nsiproxy_call( nsi_get_all_parameters_ex, &get_all ); - irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; + status = nsiproxy_call( nsi_get_all_parameters_ex, &get_all ); + irp->IoStatus.Information = (status == STATUS_SUCCESS) ? out_len : 0; + + return status; } -static void nsiproxy_get_parameter( IRP *irp ) +static NTSTATUS nsiproxy_get_parameter( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_get_parameter *in = (struct nsiproxy_get_parameter *)irp->AssociatedIrp.SystemBuffer; @@ -145,13 +137,11 @@ static void nsiproxy_get_parameter( IRP *irp ) void *out = irp->AssociatedIrp.SystemBuffer; DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsi_get_parameter_ex get_param; + NTSTATUS status; - if (in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[0]) || - in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[in->key_size])) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + if (in_len < offsetof(struct nsiproxy_get_parameter, key[0]) || + in_len < offsetof(struct nsiproxy_get_parameter, key[in->key_size])) + return STATUS_INVALID_PARAMETER; get_param.unknown[0] = 0; get_param.unknown[1] = 0; @@ -166,8 +156,10 @@ static void nsiproxy_get_parameter( IRP *irp ) get_param.data_size = out_len; get_param.data_offset = in->data_offset; - irp->IoStatus.u.Status = nsiproxy_call( nsi_get_parameter_ex, &get_param ); - irp->IoStatus.Information = irp->IoStatus.u.Status == STATUS_SUCCESS ? out_len : 0; + status = nsiproxy_call( nsi_get_parameter_ex, &get_param ); + irp->IoStatus.Information = (status == STATUS_SUCCESS) ? out_len : 0; + + return status; } static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) @@ -183,25 +175,28 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_NSIPROXY_WINE_ENUMERATE_ALL: - nsiproxy_enumerate_all( irp ); + status = nsiproxy_enumerate_all( irp ); break; case IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS: - nsiproxy_get_all_parameters( irp ); + status = nsiproxy_get_all_parameters( irp ); break; case IOCTL_NSIPROXY_WINE_GET_PARAMETER: - nsiproxy_get_parameter( irp ); + status = nsiproxy_get_parameter( irp ); break; default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + status = STATUS_NOT_SUPPORTED; break; } - status = irp->IoStatus.u.Status; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + if (status != STATUS_PENDING) + { + irp->IoStatus.Status = status; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } return status; }

1 0

Huw Davies : nsiproxy: Introduce IOCTL_NSIPROXY_WINE_ICMP_ECHO.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: f59a64144ba29fb1a382d8fbbb2fd4a71dd30cf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f59a64144ba29fb1a382d8fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 4 12:23:20 2021 +0100 nsiproxy: Introduce IOCTL_NSIPROXY_WINE_ICMP_ECHO. With this patch the irp is simply marked as pending and transferred to the request thread which completes the irp with STATUS_NOT_SUPPORTED. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/device.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 34 +++++++++++++++ 2 files changed, 137 insertions(+) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index fb330ddfc93..f4cefd4b794 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -36,6 +36,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(nsi); static unixlib_handle_t nsiproxy_handle; +static HANDLE request_event; + +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION( nsiproxy_cs ); + +#define LIST_ENTRY_INIT( list ) { .Flink = &(list), .Blink = &(list) } +static LIST_ENTRY request_queue = LIST_ENTRY_INIT( request_queue ); static NTSTATUS nsiproxy_call( unsigned int code, void *args ) { @@ -162,6 +174,59 @@ static NTSTATUS nsiproxy_get_parameter( IRP *irp ) return status; } +static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) +{ + TRACE( "device %p, irp %p.\n", device, irp ); + + IoReleaseCancelSpinLock( irp->CancelIrql ); + + /* FIXME: at the moment just let the request thread bail */ + return; +} + +static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + + TRACE( "\n" ); + + if (in_len < offsetof(struct nsiproxy_icmp_echo, data[0]) || + in_len < offsetof(struct nsiproxy_icmp_echo, data[((in->opt_size + 3) & ~3) + in->req_size]) || + out_len < sizeof(struct nsiproxy_icmp_echo_reply)) + return STATUS_INVALID_PARAMETER; + + switch (in->dst.si_family) + { + case AF_INET: + if (in->dst.Ipv4.sin_addr.s_addr == INADDR_ANY) return STATUS_INVALID_ADDRESS_WILDCARD; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + EnterCriticalSection( &nsiproxy_cs ); + + IoSetCancelRoutine( irp, icmp_echo_cancel ); + if (irp->Cancel && !IoSetCancelRoutine( irp, NULL )) + { + /* IRP was canceled before we set cancel routine */ + InitializeListHead( &irp->Tail.Overlay.ListEntry ); + LeaveCriticalSection( &nsiproxy_cs ); + return STATUS_CANCELLED; + } + + InsertTailList( &request_queue, &irp->Tail.Overlay.ListEntry ); + IoMarkIrpPending( irp ); + + LeaveCriticalSection( &nsiproxy_cs ); + SetEvent( request_event ); + + return STATUS_PENDING; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -186,6 +251,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = nsiproxy_get_parameter( irp ); break; + case IOCTL_NSIPROXY_WINE_ICMP_ECHO: + status = nsiproxy_icmp_echo( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); status = STATUS_NOT_SUPPORTED; @@ -220,10 +289,40 @@ static int add_device( DRIVER_OBJECT *driver ) return 1; } +static DWORD WINAPI request_thread_proc( void *arg ) +{ + LIST_ENTRY *entry; + + while (WaitForSingleObject( request_event, INFINITE ) == WAIT_OBJECT_0) + { + TRACE( "request_event triggered\n" ); + EnterCriticalSection( &nsiproxy_cs ); + while ((entry = RemoveHeadList( &request_queue )) != &request_queue ) + { + IRP *irp = CONTAINING_RECORD( entry, IRP, Tail.Overlay.ListEntry ); + + if (irp->Cancel) + { + irp->IoStatus.Status = STATUS_CANCELLED; + TRACE( "already cancelled\n" ); + IoCompleteRequest( irp, IO_NO_INCREMENT ); + continue; + } + + /* FIXME */ + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } + LeaveCriticalSection( &nsiproxy_cs ); + } + return 0; +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { HMODULE instance; NTSTATUS status; + HANDLE thread; TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); @@ -236,5 +335,9 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) add_device( driver ); + request_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + thread = CreateThread( NULL, 0, request_thread_proc, NULL, 0, NULL ); + CloseHandle( thread ); + return STATUS_SUCCESS; } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 7b8cb29e9d5..9664b534b09 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -380,6 +380,7 @@ struct nsi_udp_endpoint_static #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) #define IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS CTL_CODE(FILE_DEVICE_NETWORK, 0x401, METHOD_BUFFERED, 0) #define IOCTL_NSIPROXY_WINE_GET_PARAMETER CTL_CODE(FILE_DEVICE_NETWORK, 0x402, METHOD_BUFFERED, 0) +#define IOCTL_NSIPROXY_WINE_ICMP_ECHO CTL_CODE(FILE_DEVICE_NETWORK, 0x403, METHOD_BUFFERED, 0) /* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ struct nsiproxy_enumerate_all @@ -420,6 +421,39 @@ struct nsiproxy_get_parameter BYTE key[1]; /* key_size */ }; +/* input for IOCTL_NSIPROXY_WINE_ICMP_ECHO */ +struct nsiproxy_icmp_echo +{ + SOCKADDR_INET src; + SOCKADDR_INET dst; + BYTE ttl; + BYTE tos; + BYTE flags; + DWORD opt_size; + DWORD req_size; + DWORD timeout; + BYTE data[1]; /* ((opt_size + 3) & ~3) + req_size */ +}; + +/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ +struct nsiproxy_icmp_echo_reply +{ + SOCKADDR_INET addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + DWORD data_offset; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + DWORD options_offset; + } opts; +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0

1 0

Huw Davies : nsiproxy: Introduce a unix-side handle returned by icmp_send_echo().
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: 20fb14bf278da37f95931cbac3c829e8bcd572cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=20fb14bf278da37f95931cba… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 4 12:23:22 2021 +0100 nsiproxy: Introduce a unix-side handle returned by icmp_send_echo(). This represents the state of the icmp request for use on the PE-side. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/device.c | 10 ++++- dlls/nsiproxy.sys/icmp_echo.c | 77 +++++++++++++++++++++++++++++++++++- dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 1 + dlls/nsiproxy.sys/unix_private.h | 1 + 5 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 5ae243a4111..cd0bc0e4db2 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -58,6 +58,7 @@ static NTSTATUS nsiproxy_call( unsigned int code, void *args ) enum unix_calls { + icmp_close, icmp_send_echo, nsi_enumerate_all_ex, nsi_get_all_parameters_ex, @@ -309,7 +310,7 @@ static void handle_queued_send_echo( IRP *irp ) status = nsiproxy_call( icmp_send_echo, &params ); TRACE( "icmp_send_echo rets %08x\n", status ); - if (1) + if (status != STATUS_PENDING) { irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) @@ -320,6 +321,13 @@ static void handle_queued_send_echo( IRP *irp ) } IoCompleteRequest( irp, IO_NO_INCREMENT ); } + else + { + /* FIXME */ + nsiproxy_call( icmp_close, params.handle ); + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } } static DWORD WINAPI request_thread_proc( void *arg ) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 8ec506f823c..90a779fb67e 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -104,6 +104,68 @@ struct icmp_data const struct family_ops *ops; }; +#define MAX_HANDLES 256 /* Max number of simultaneous pings - could become dynamic if need be */ +static struct icmp_data *handle_table[MAX_HANDLES]; +static pthread_mutex_t handle_lock = PTHREAD_MUTEX_INITIALIZER; +static struct icmp_data **next_free, **next_unused = handle_table; + +static HANDLE handle_alloc( struct icmp_data *data ) +{ + struct icmp_data **entry; + HANDLE h; + + pthread_mutex_lock( &handle_lock ); + entry = next_free; + if (entry) next_free = *(struct icmp_data ***)entry; + else if (next_unused < handle_table + MAX_HANDLES) entry = next_unused++; + else + { + pthread_mutex_unlock( &handle_lock ); + FIXME( "Exhausted icmp handle count\n" ); + return 0; + } + *entry = data; + h = LongToHandle( entry - handle_table + 1 ); + pthread_mutex_unlock( &handle_lock ); + TRACE( "returning handle %p\n", h ); + return h; +} + +static struct icmp_data **handle_entry( HANDLE h ) +{ + unsigned int idx = HandleToLong( h ); + + if (!idx || idx > MAX_HANDLES) + { + ERR( "Invalid icmp handle\n" ); + return NULL; + } + return handle_table + idx - 1; +} + +static struct icmp_data *handle_data( HANDLE h ) +{ + struct icmp_data **entry = handle_entry( h ); + + if (!entry) return NULL; + return *entry; +} + +static void handle_free( HANDLE h ) +{ + struct icmp_data **entry; + + TRACE( "%p\n", h ); + pthread_mutex_lock( &handle_lock ); + entry = handle_entry( h ); + if (entry) + { + *(struct icmp_data ***)entry = next_free; + next_free = entry; + } + pthread_mutex_unlock( &handle_lock ); +} + static void ipv4_init_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp_hdr ) { icmp_hdr->type = ICMP4_ECHO_REQUEST; @@ -315,7 +377,18 @@ NTSTATUS icmp_send_echo( void *args ) return STATUS_SUCCESS; } - /* FIXME */ + params->handle = handle_alloc( data ); + if (!params->handle) icmp_data_free( data ); + return params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; +} + +NTSTATUS icmp_close( void *args ) +{ + HANDLE handle = args; + struct icmp_data *data = handle_data( handle ); + + if (!data) return STATUS_INVALID_PARAMETER; icmp_data_free( data ); - return STATUS_NOT_SUPPORTED; + handle_free( handle ); + return STATUS_SUCCESS; } diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 25219a1c3fe..dec66ad6a33 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -147,6 +147,7 @@ static NTSTATUS unix_nsi_get_parameter_ex( void *args ) const unixlib_entry_t __wine_unix_call_funcs[] = { + icmp_close, icmp_send_echo, unix_nsi_enumerate_all_ex, unix_nsi_get_all_parameters_ex, diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 9831998793d..b40a6198c7c 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -24,5 +24,6 @@ struct icmp_send_echo_params void *request; DWORD request_size; BYTE ttl, tos; + HANDLE handle; ULONG ip_status; }; diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 0dfe9e69dbc..7f81336e3f1 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -157,4 +157,5 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) return ascii_strncasecmp( s1, s2, -1 ); } +NTSTATUS icmp_close( void *args ) DECLSPEC_HIDDEN; NTSTATUS icmp_send_echo( void *args ) DECLSPEC_HIDDEN;

1 0