wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Aric Stewart : winehid.sys: Implement handing internal ioctls.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: f2e9a215343323458535ce0aea3bc2841ecd9f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e9a215343323458535ce0ae… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 14 08:12:46 2016 +0200 winehid.sys: Implement handing internal ioctls. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winehid.sys/Makefile.in | 2 +- dlls/winehid.sys/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in index ad7881e..8db0f0e 100644 --- a/dlls/winehid.sys/Makefile.in +++ b/dlls/winehid.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = winehid.sys -IMPORTS = hidclass +IMPORTS = hidclass ntoskrnl EXTRADLLFLAGS = -Wb,--subsystem,native C_SRCS = \ diff --git a/dlls/winehid.sys/main.c b/dlls/winehid.sys/main.c index cdef3c5..0f18514 100644 --- a/dlls/winehid.sys/main.c +++ b/dlls/winehid.sys/main.c @@ -20,17 +20,54 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "winioctl.h" #include "ddk/wdm.h" #include "ddk/hidport.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); +static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) +{ + NTSTATUS status = irp->IoStatus.u.Status; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; + + switch (code) + { + case IOCTL_GET_PHYSICAL_DESCRIPTOR: + case IOCTL_HID_ACTIVATE_DEVICE: + case IOCTL_HID_DEACTIVATE_DEVICE: + case IOCTL_HID_GET_INDEXED_STRING: + case IOCTL_HID_GET_DEVICE_ATTRIBUTES: + case IOCTL_HID_GET_DEVICE_DESCRIPTOR: + case IOCTL_HID_GET_REPORT_DESCRIPTOR: + case IOCTL_HID_GET_STRING: + case IOCTL_HID_GET_INPUT_REPORT: + case IOCTL_HID_READ_REPORT: + case IOCTL_HID_SET_OUTPUT_REPORT: + case IOCTL_HID_WRITE_REPORT: + case IOCTL_HID_GET_FEATURE: + case IOCTL_HID_SET_FEATURE: + /* All these are handled by the lower level driver */ + IoSkipCurrentIrpStackLocation(irp); + return IoCallDriver(((HID_DEVICE_EXTENSION *)device->DeviceExtension)->NextDeviceObject, irp); + + default: + FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + IoCompleteRequest(irp, IO_NO_INCREMENT); + return status; + } +} + static NTSTATUS WINAPI add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *device) { TRACE("(%p, %p)\n", driver, device); @@ -43,6 +80,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); + driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = internal_ioctl; driver->DriverExtension->AddDevice = add_device; memset(&registration, 0, sizeof(registration));

1 0

Sebastian Lackner : ntoskrnl.exe: Do not abuse UserEvent to store event handle.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 02c861306e97e10ac58da74c3b390247cbd87bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c861306e97e10ac58da74c3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 14 06:46:12 2016 +0200 ntoskrnl.exe: Do not abuse UserEvent to store event handle. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 974f946..428e700 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2883,7 +2883,8 @@ done: static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void *context ) { - SetEvent( irp->UserEvent ); + HANDLE event = context; + SetEvent( event ); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -2891,15 +2892,11 @@ static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void static NTSTATUS send_device_irp( DEVICE_OBJECT *device, IRP *irp, ULONG_PTR *info ) { NTSTATUS status; - IO_STACK_LOCATION *irpsp; HANDLE event = CreateEventA( NULL, FALSE, FALSE, NULL ); DEVICE_OBJECT *toplevel_device; - irp->UserEvent = event; irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; - irpsp = IoGetNextIrpStackLocation( irp ); - irpsp->CompletionRoutine = internal_complete; - irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_CANCEL; + IoSetCompletionRoutine( irp, internal_complete, event, TRUE, TRUE, TRUE ); toplevel_device = IoGetAttachedDeviceReference( device ); status = IoCallDriver( toplevel_device, irp );

1 0

Vincent Povirk : gdiplus: Add a software path for thin line drawing.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 6e054e43c6f7a09c8cbcaa64650a49ca20a0cfb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e054e43c6f7a09c8cbcaa646… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 13 16:23:17 2016 -0500 gdiplus: Add a software path for thin line drawing. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 324 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 324 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e054e43c6f7a09c8cbca…

1 0

Vincent Povirk : gdiplus: Add non-gdi32 implementation of GdipDrawPath.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 092531df7124f1e076648bd5b2f578d0ce2abfb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092531df7124f1e076648bd5b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 13 16:23:16 2016 -0500 gdiplus: Add non-gdi32 implementation of GdipDrawPath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 84 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c75618c..56faa16 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3375,26 +3375,12 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST return retval; } -GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { INT save_state; GpStatus retval; HRGN hrgn=NULL; - TRACE("(%p, %p, %p)\n", graphics, pen, path); - - if(!pen || !graphics) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - save_state = prepare_dc(graphics, pen); retval = get_clip_hrgn(graphics, &hrgn); @@ -3415,6 +3401,74 @@ end: return retval; } +GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +{ + GpStatus stat; + GpPath *wide_path; + GpMatrix *transform=NULL; + + stat = GdipClonePath(path, &wide_path); + + if (stat != Ok) + return stat; + + if (pen->unit == UnitPixel) + { + /* We have to transform this to device coordinates to get the widths right. */ + stat = GdipCreateMatrix(&transform); + + if (stat == Ok) + stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + CoordinateSpaceWorld, transform); + } + + if (stat == Ok) + stat = GdipWidenPath(wide_path, pen, transform, 1.0); + + if (pen->unit == UnitPixel) + { + /* Transform the path back to world coordinates */ + if (stat == Ok) + stat = GdipInvertMatrix(transform); + + if (stat == Ok) + stat = GdipTransformPath(wide_path, transform); + } + + /* Actually draw the path */ + if (stat == Ok) + stat = GdipFillPath(graphics, pen->brush, wide_path); + + GdipDeleteMatrix(transform); + + GdipDeletePath(wide_path); + + return stat; +} + +GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +{ + GpStatus retval; + + TRACE("(%p, %p, %p)\n", graphics, pen, path); + + if(!pen || !graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + if (path->pathdata.Count == 0) + return Ok; + + if (!graphics->hdc) + retval = SOFTWARE_GdipDrawPath(graphics, pen, path); + else + retval = GDI32_GdipDrawPath(graphics, pen, path); + + return retval; +} + GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) {

1 0

Vincent Povirk : gdiplus/tests: Add tests for 0-pixel pens.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: dd5fd46c6361de0ce04095675965d58e25e9c37b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5fd46c6361de0ce04095675… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 13 16:23:15 2016 -0500 gdiplus/tests: Add tests for 0-pixel pens. It turns out that GdipDrawLine behaves differently from GdipDrawPath, only in the case of a 0 pixel pen. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 94 ++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/tests/graphicspath.c | 18 ++++++++ 2 files changed, 105 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d86f49d..529f1a2 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3899,15 +3899,18 @@ static void test_pen_thickness(void) REAL res_x, res_y, scale; GpUnit pen_unit, page_unit; REAL pen_width; - INT cx, cy; + INT cx, cy, path_cx, path_cy; } td[] = { - { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 1.0, 1, 1 }, - { 10.0, 10.0, 3.0, UnitPixel, UnitPixel, 2.0, 2, 2 }, - { 10.0, 10.0, 30.0, UnitPixel, UnitInch, 1.0, 1, 1 }, - { 10.0, 10.0, 1.0, UnitWorld, UnitPixel, 1.0, 1, 1 }, - { 10.0, 10.0, 3.0, UnitWorld, UnitPixel, 2.0, 6, 6 }, - { 10.0, 10.0, 2.0, UnitWorld, UnitInch, 1.0, 20, 20 }, + { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 1.0, 1, 1, 1, 1 }, + { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 0.0, 0, 0, 1, 1 }, + { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 0.1, 1, 1, 1, 1 }, + { 10.0, 10.0, 3.0, UnitPixel, UnitPixel, 2.0, 2, 2, 2, 2 }, + { 10.0, 10.0, 30.0, UnitPixel, UnitInch, 1.0, 1, 1, 1, 1 }, + { 10.0, 10.0, 1.0, UnitWorld, UnitPixel, 1.0, 1, 1, 1, 1 }, + { 10.0, 10.0, 1.0, UnitWorld, UnitPixel, 0.0, 1, 1, 1, 1 }, + { 10.0, 10.0, 3.0, UnitWorld, UnitPixel, 2.0, 6, 6, 6, 6 }, + { 10.0, 10.0, 2.0, UnitWorld, UnitInch, 1.0, 20, 20, 20, 20 }, }; GpStatus status; int i, j; @@ -3919,6 +3922,7 @@ static void test_pen_thickness(void) } u; GpPen *pen; GpPointF corner; + GpPath *path; BitmapData bd; INT min, max, size; @@ -4008,6 +4012,82 @@ static void test_pen_thickness(void) status = GdipBitmapUnlockBits(u.bitmap, &bd); expect(Ok, status); + status = GdipGraphicsClear(graphics, 0xff000000); + expect(Ok, status); + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + + status = GdipAddPathLine(path, corner.X/2, 0, corner.X/2, corner.Y); + expect(Ok, status); + + status = GdipClosePathFigure(path); + expect(Ok, status); + + status = GdipAddPathLine(path, 0, corner.Y/2, corner.X, corner.Y/2); + expect(Ok, status); + + status = GdipDrawPath(graphics, pen, path); + expect(Ok, status); + + GdipDeletePath(path); + + status = GdipBitmapLockBits(u.bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(Ok, status); + + min = -1; + max = -2; + + for (j=0; j<100; j++) + { + if (((BYTE*)bd.Scan0)[j*3] == 0xff) + { + min = j; + break; + } + } + + for (j=99; j>=0; j--) + { + if (((BYTE*)bd.Scan0)[j*3] == 0xff) + { + max = j; + break; + } + } + + size = max-min+1; + + ok(size == td[i].path_cx, "%u: expected %d, got %d\n", i, td[i].path_cx, size); + + min = -1; + max = -2; + + for (j=0; j<100; j++) + { + if (((BYTE*)bd.Scan0)[bd.Stride*j] == 0xff) + { + min = j; + break; + } + } + + for (j=99; j>=0; j--) + { + if (((BYTE*)bd.Scan0)[bd.Stride*j] == 0xff) + { + max = j; + break; + } + } + + size = max-min+1; + + ok(size == td[i].path_cy, "%u: expected %d, got %d\n", i, td[i].path_cy, size); + + status = GdipBitmapUnlockBits(u.bitmap, &bd); + expect(Ok, status); + GdipDeletePen(pen); GdipDeleteGraphics(graphics); GdipDisposeImage(u.image); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index c43fb42..c44ed5e 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1071,6 +1071,7 @@ static void test_widen(void) GpPath *path; GpPen *pen; GpMatrix *m; + INT count=-1; status = GdipCreatePath(FillModeAlternate, &path); expect(Ok, status); @@ -1195,6 +1196,23 @@ static void test_widen(void) expect(Ok, status); ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + /* pen width = 0 pixels - native fails to widen but can draw with this pen */ + GdipDeletePen(pen); + status = GdipCreatePen1(0xffffffff, 0.0, UnitPixel, &pen); + expect(Ok, status); + + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + + status = GdipGetPointCount(path, &count); + expect(Ok, status); + todo_wine expect(0, count); + GdipDeleteMatrix(m); GdipDeletePen(pen); GdipDeletePath(path);

1 0

Vincent Povirk : gdiplus: GdipDrawLine ignores 0-pixel pens.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 99e5f24b6d0eae88a03034fd8025c459a42776a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e5f24b6d0eae88a03034fd8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 13 16:23:14 2016 -0500 gdiplus: GdipDrawLine ignores 0-pixel pens. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 076ed81..c75618c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3306,6 +3306,12 @@ GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x1, y1, x2, y2); + if (!pen) + return InvalidParameter; + + if (pen->unit == UnitPixel && pen->width <= 0.0) + return Ok; + pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2;

1 0

Vincent Povirk : gdiplus: Allow widening a "closed" line segment.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 96eac4876caee69e251b15b4dfdc0c43321a89c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96eac4876caee69e251b15b4d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 13 16:23:13 2016 -0500 gdiplus: Allow widening a "closed" line segment. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 963ee1c..8ba0016 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1888,7 +1888,7 @@ static void widen_closed_figure(GpPath *path, GpPen *pen, int start, int end, int i; path_list_node_t *prev_point; - if (end <= start+1) + if (end <= start) return; /* left outline */

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 1f00ba5b5da103be61aa0ea8c62c24690b5ff420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f00ba5b5da103be61aa0ea8c… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Oct 13 22:36:19 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 3cd1550..6338128 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-10-13 08:19+0300\n" +"PO-Revision-Date: 2016-10-13 22:35+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10519,10 +10519,8 @@ msgid "IPv6 address" msgstr "IPv6 adresas" #: msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "Sistemos konfigūracija" +msgstr "Sistemos informacija" #: net.rc:30 msgid ""

1 0

Alex Henrie : msinfo32: Display an About dialog when the program is run.
by Alexandre Julliard 13 Oct '16

13 Oct '16

1 0

Jacek Caban : server: Create ifchange async queue on socket fd.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: 60f8ddbf9d372948674733169fcafc04c3d4827d URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f8ddbf9d372948674733169… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 17:11:50 2016 +0200 server: Create ifchange async queue on socket fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 30 +++++++++++++++++++++++++++++- server/sock.c | 18 ++++++------------ 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b7aaea3..a144bd3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8345,12 +8345,15 @@ static void test_sioAddressListChange(void) { struct sockaddr_in bindAddress; struct in_addr net_address; - WSAOVERLAPPED overlapped; + WSAOVERLAPPED overlapped, *olp; struct hostent *h; DWORD num_bytes, error, tick; SOCKET sock, sock2, sock3; WSAEVENT event2, event3; + HANDLE io_port; + ULONG_PTR key; int acount; + BOOL bret; int ret; /* Use gethostbyname to find the list of local network interfaces */ @@ -8465,8 +8468,33 @@ static void test_sioAddressListChange(void) ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); ok (error == WSAEWOULDBLOCK, "expected 10035, got %d\n", error); + io_port = CreateIoCompletionPort( (HANDLE)sock, NULL, 0, 0 ); + ok (io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + set_blocking(sock, FALSE); + memset(&overlapped, 0, sizeof(overlapped)); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %u\n", error); + ok (error == ERROR_IO_PENDING, "expected ERROR_IO_PENDING got %u\n", error); + + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 0 ); + ok(!bret, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(!olp, "Overlapped structure is at %p\n", olp); + closesocket(sock); + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 0 ); + ok(!bret, "failed to get completion status %u\n", bret); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %u\n", GetLastError()); + ok(olp == &overlapped, "Overlapped structure is at %p\n", olp); + + CloseHandle(io_port); + /* Misuse of the API by using a blocking socket and not using an overlapped structure, * this leads to a hang forever. */ if (0) diff --git a/server/sock.c b/server/sock.c index d7349fc..0de6f68 100644 --- a/server/sock.c +++ b/server/sock.c @@ -606,7 +606,9 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) { struct sock *sock = get_fd_user( fd ); - sock_reselect( sock ); + /* ignore reselect on ifchange queue */ + if (sock->ifchange_q != queue) + sock_reselect( sock ); } static int sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ) @@ -640,6 +642,7 @@ static void sock_destroy( struct object *obj ) free_async_queue( sock->read_q ); free_async_queue( sock->write_q ); + async_wake_up( sock->ifchange_q, STATUS_CANCELLED ); sock_destroy_ifchange_q( sock ); if (sock->event) release_object( sock->event ); if (sock->fd) @@ -973,7 +976,6 @@ static void ifchange_destroy( struct object *obj ); static int ifchange_get_poll_events( struct fd *fd ); static void ifchange_poll_event( struct fd *fd, int event ); -static void ifchange_reselect_async( struct fd *fd, struct async_queue *queue ); struct ifchange { @@ -1014,7 +1016,7 @@ static const struct fd_ops ifchange_fd_ops = no_fd_flush, /* flush */ no_fd_ioctl, /* ioctl */ NULL, /* queue_async */ - ifchange_reselect_async, /* reselect_async */ + NULL, /* reselect_async */ NULL /* cancel_async */ }; @@ -1096,11 +1098,6 @@ static void ifchange_poll_event( struct fd *fd, int event ) if (status != STATUS_PENDING) ifchange_wake_up( ifchange, status ); } -static void ifchange_reselect_async( struct fd *fd, struct async_queue *queue ) -{ - /* do nothing, this object is about to disappear */ -} - #endif /* we only need one of these interface notification objects, all of the sockets dependent upon @@ -1174,7 +1171,6 @@ static void ifchange_add_sock( struct object *obj, struct sock *sock ) static struct async_queue *sock_get_ifchange_q( struct sock *sock ) { struct object *ifchange; - struct fd *fd; if (sock->ifchange_q) /* reuse existing ifchange_q for this socket */ return sock->ifchange_q; @@ -1183,9 +1179,7 @@ static struct async_queue *sock_get_ifchange_q( struct sock *sock ) return NULL; /* create the ifchange notification queue */ - fd = get_obj_fd( ifchange ); - sock->ifchange_q = create_async_queue( fd ); - release_object( fd ); + sock->ifchange_q = create_async_queue( sock->fd ); if (!sock->ifchange_q) { release_object( ifchange );

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
46
Older →

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 October 2016