wine-devel August 2016

wine-devel@winehq.org

55 participants
282 discussions

Re: [3/4] msvcirt: Add predefined streams.
by Piotr Caban 17 Aug '16

17 Aug '16

Hi, On 08/17/16 12:57, Iván Matellanes wrote: > + if ((fb = MSVCRT_operator_new(sizeof(filebuf)))) { > + filebuf_fd_ctor(fb, 0); > + istream_sb_ctor(&cin.is, &fb->base, TRUE); > + } else > + istream_sb_ctor(&cin.is, NULL, TRUE); > + Iostream_init_ios_ctor(NULL, &cin.vbase, 0); You should use istream_withassign_sb_ctor here. Thanks, Piotr

1 0

Re: [PATCH 4/6] ntdll: Add support for exceptions inside termination handlers in __C_specific_handler
by Marvin 17 Aug '16

17 Aug '16

2 1

Re: [1/4] gdiplus: Implement playback/recording for SetClipRect.
by Sebastian Lackner 17 Aug '16

17 Aug '16

On 16.08.2016 23:00, Vincent Povirk wrote: > diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c > index a854e55..643d3c4 100644 > --- a/dlls/gdiplus/metafile.c > +++ b/dlls/gdiplus/metafile.c > @@ -70,6 +70,12 @@ typedef struct EmfPlusFillRects > DWORD Count; > } EmfPlusFillRects; > > +typedef struct EmfPlusSetClipRect > +{ > + EmfPlusRecordHeader Header; > + GpRectF ClipRect; There is a small whitespace error in the line above. > +} EmfPlusSetClipRect; > + > typedef struct EmfPlusSetPageTransform > { > EmfPlusRecordHeader Header;

1 0

Re: [PATCH] server/console: Allow waiting on console_input
by Alexandre Julliard 17 Aug '16

17 Aug '16

Keno Fischer <keno(a)juliacomputing.com> writes: > Please see attached. This fixes console input under wine for julia and > probably other programs using libuv. I am not particularly familiar > with wine internals, so please review closely. The right way is probably to fix RegisterWaitForSingleObject to handle console handles the same way WaitForSingleObject does. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [3/4] gdiplus: Load EMF images directly instead of through olepicture.
by Dmitry Timoshkov 17 Aug '16

17 Aug '16

Vincent Povirk <madewokherd(a)gmail.com> wrote: > @@ -4721,7 +4767,7 @@ static const struct image_codec codecs[NUM_CODECS] = { > /* SigMask */ emf_sig_mask, > }, > NULL, > - decode_image_olepicture_metafile, > + decode_image_emf, > NULL > }, This patch is very incomplete, and probably won't pass the 'make test'. wine-staging contains a pretty full and well tested patch that reimplements metafile loading in gdiplus using gdi32 APis: https://github.com/wine-compholio/wine-staging/blob/master/patches/oleaut32… it should be possible to either use it directly or as a base for your work. There are some other related patches in staging that touch the metafile loading in gdiplus. -- Dmitry.

3 2

Re: [PATCH 2/2] kernel32: Implement GetConsoleScreenBufferInfoEx
by Marvin 17 Aug '16

17 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=25126 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 3964615102 console.c:1445: Test failed: [15] Expected output count to be 0, got 3964615102 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3964615102 console.c:1689: Test failed: [13] Expected output count to be 0, got 3964615102 console.c:1689: Test failed: [15] Expected output count to be 0, got 3964615102 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3964615102 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 4007961408 console.c:1445: Test failed: [15] Expected output count to be 0, got 4007961408 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 4007961408 console.c:1689: Test failed: [13] Expected output count to be 0, got 4007961408 console.c:1689: Test failed: [15] Expected output count to be 0, got 4007961408 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 4007961408 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 564791309 console.c:1445: Test failed: [15] Expected output count to be 0, got 564791309 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 564791309 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 564791309 console.c:1689: Test failed: [15] Expected output count to be 0, got 564791309 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 564791309 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: [PATCH 1/2] kernel32/tests: Add tests for GetConsoleScreenBufferInfoEx
by Marvin 17 Aug '16

17 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=25125 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2191869370 console.c:1445: Test failed: [15] Expected output count to be 0, got 2191869370 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2191869370 console.c:1689: Test failed: [13] Expected output count to be 0, got 2191869370 console.c:1689: Test failed: [15] Expected output count to be 0, got 2191869370 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2191869370 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 3647870754 console.c:1445: Test failed: [15] Expected output count to be 0, got 3647870754 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3647870754 console.c:1689: Test failed: [13] Expected output count to be 0, got 3647870754 console.c:1689: Test failed: [15] Expected output count to be 0, got 3647870754 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3647870754 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 3382944356 console.c:1445: Test failed: [15] Expected output count to be 0, got 3382944356 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3382944356 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 3382944356 console.c:1689: Test failed: [15] Expected output count to be 0, got 3382944356 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3382944356 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: [PATCH] server/console: Allow waiting on console_input
by Marvin 16 Aug '16

16 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=25120 Your paranoid android. === w8 (32 bit console) === console.c:1480: Test failed: [13] Expected output count to be 0, got 1510596369 console.c:1480: Test failed: [15] Expected output count to be 0, got 1510596369 console.c:1480: Test failed: [18] Expected output count to be 3735928559, got 1510596369 console.c:1724: Test failed: [13] Expected output count to be 0, got 1510596369 console.c:1724: Test failed: [15] Expected output count to be 0, got 1510596369 console.c:1724: Test failed: [18] Expected output count to be 3735928559, got 1510596369 === w864 (32 bit console) === console.c:1480: Test failed: [13] Expected output count to be 0, got 1764633039 console.c:1480: Test failed: [15] Expected output count to be 0, got 1764633039 console.c:1480: Test failed: [18] Expected output count to be 3735928559, got 1764633039 console.c:1724: Test failed: [13] Expected output count to be 0, got 1764633039 console.c:1724: Test failed: [15] Expected output count to be 0, got 1764633039 console.c:1724: Test failed: [18] Expected output count to be 3735928559, got 1764633039 === w1064 (32 bit console) === console.c:2602: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2608: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2615: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2622: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1305: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1480: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1480: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1480: Test failed: [13] Expected output count to be 0, got 2775085592 console.c:1480: Test failed: [15] Expected output count to be 0, got 2775085592 console.c:1480: Test failed: [18] Expected output count to be 3735928559, got 2775085592 console.c:1724: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1724: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1724: Test failed: [13] Expected output count to be 0, got 2775085592 console.c:1724: Test failed: [15] Expected output count to be 0, got 2775085592 console.c:1724: Test failed: [18] Expected output count to be 3735928559, got 2775085592 console.c:2183: Test failed: [7] Expected count to be 0, got 1 console.c:2249: Test failed: [7] Expected count to be 0, got 1 console.c:2315: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2602: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2608: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2615: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2622: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1305: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1480: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1480: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1480: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1724: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1724: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1724: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2183: Test failed: [7] Expected count to be 0, got 1 console.c:2249: Test failed: [7] Expected count to be 0, got 1 console.c:2315: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2602: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2608: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2615: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2622: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1305: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1480: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1480: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1480: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1724: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1724: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1724: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2183: Test failed: [7] Expected count to be 0, got 1 console.c:2249: Test failed: [7] Expected count to be 0, got 1 console.c:2315: Test failed: [7] Expected count to be 0, got 1

1 0

Re: [PATCH] server/console: Allow waiting on console_input
by Sebastian Lackner 16 Aug '16

16 Aug '16

On 16.08.2016 20:47, Keno Fischer wrote: > Please see attached. This fixes console input under wine for julia and > probably other programs using libuv. I am not particularly familiar > with wine internals, so please review closely. > > Thanks, > Keno > > > 0001-server-console-Allow-waiting-on-console_input.patch > > > From 5fe78027f0034b83145c879adb17531e9487c6f7 Mon Sep 17 00:00:00 2001 > From: Keno Fischer <keno(a)juliacomputing.com> > Date: Tue, 16 Aug 2016 14:35:27 -0400 > Subject: [PATCH] server/console: Allow waiting on console_input > > It appears that Windows allows this for notification of new input > events in the console. This functionality was used e.g., by the libuv > I/O library, causing any users thereof to not receive input under wine, > e.g. fixes https://github.com/JuliaLang/julia/issues/18006. Thanks for working on this. I think the implementation is fine, however there are some small things which could be improved a bit. > > Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> > --- > dlls/kernel32/tests/console.c | 37 +++++++++++++++++++++++++++++++++++++ > server/console.c | 16 +++++++++++++--- > 2 files changed, 50 insertions(+), 3 deletions(-) > > diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c > index 5b66d9f..f97b415 100644 > --- a/dlls/kernel32/tests/console.c > +++ b/dlls/kernel32/tests/console.c > @@ -908,6 +908,41 @@ static void testScreenBuffer(HANDLE hConOut) > SetConsoleOutputCP(oldcp); > } > > +static void CALLBACK signaled_function(PVOID p, BOOLEAN TimerOrWaitFired) > +{ Usually wine prefers "void *" instead of PVOID and also lowercase variable names, so for example just "timeout" instead of "TimerOrWaitFired" as on MSDN. > + HANDLE event = p; > + SetEvent(event); > + ok(!TimerOrWaitFired, "wait shouldn't have timed out\n"); > +} > + > +static void testWaitForConsoleInput(HANDLE input_handle) > +{ > + HANDLE wait_handle; > + HANDLE complete_event; > + INPUT_RECORD record; > + DWORD events_written; > + DWORD wait_ret; > + BOOL ret; > + > + complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); > + > + ret = RegisterWaitForSingleObject(&wait_handle, input_handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); > + ok(ret == TRUE, "Expected RegisterWaitForSingleObject to return TRUE, got %d\n", ret); To keep the testcase similar to the original code thats probably fine, however I would like to point out that you do not really need an asynchronous wait here. You could basically test the same with WaitForSingleObject(input_handle, INFINITE). > + /* give worker thread a chance to start up */ > + Sleep(100); > + record.EventType = KEY_EVENT; > + record.Event.KeyEvent.bKeyDown = 1; > + record.Event.KeyEvent.wRepeatCount = 1; > + record.Event.KeyEvent.wVirtualKeyCode = VK_RETURN; > + record.Event.KeyEvent.wVirtualScanCode = VK_RETURN; > + record.Event.KeyEvent.uChar.AsciiChar = '\r'; If I don't miss anything this does not initialize the upper byte of the union. > + record.Event.KeyEvent.dwControlKeyState = 0; > + ret = WriteConsoleInputW(input_handle, &record, 1, &events_written); > + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); > + wait_ret = WaitForSingleObject(complete_event, INFINITE); > + ok(wait_ret == WAIT_OBJECT_0, "Expected the handle to be signaled"); There is a linebreak missing in the line above. For completeness, it also wouldn't hurt to add another test after calling FlushConsoleInputBuffer() to make sure it times out as expected. If you want to keep the asynchronous wait, please also add cleanup of the complete_event and the wait_handle. > +} > + > static void test_GetSetConsoleInputExeName(void) > { > BOOL ret; > @@ -3044,6 +3079,8 @@ START_TEST(console) > testScroll(hConOut, sbi.dwSize); > /* will test sb creation / modification / codepage handling */ > testScreenBuffer(hConOut); > + /* Test waiting for a console handle */ > + testWaitForConsoleInput(hConIn); > > /* clear duplicated console font table */ > CloseHandle(hConIn); > diff --git a/server/console.c b/server/console.c > index 93f785a..376395d 100644 > --- a/server/console.c > +++ b/server/console.c > @@ -67,6 +67,7 @@ struct console_input > > static void console_input_dump( struct object *obj, int verbose ); > static void console_input_destroy( struct object *obj ); > +static int console_input_signaled( struct object *obj, struct wait_queue_entry *entry ); > static struct fd *console_input_get_fd( struct object *obj ); > > static const struct object_ops console_input_ops = > @@ -74,9 +75,9 @@ static const struct object_ops console_input_ops = > sizeof(struct console_input), /* size */ > console_input_dump, /* dump */ > no_get_type, /* get_type */ > - no_add_queue, /* add_queue */ > - NULL, /* remove_queue */ > - NULL, /* signaled */ > + add_queue, /* add_queue */ > + remove_queue, /* remove_queue */ > + console_input_signaled, /* signaled */ > no_satisfied, /* satisfied */ > no_signal, /* signal */ > console_input_get_fd, /* get_fd */ > @@ -543,6 +544,14 @@ static struct console_input* console_input_get( obj_handle_t handle, unsigned ac > return console; > } > > +/* the console input is signaled when it's not empty */ > +static int console_input_signaled( struct object *obj, struct wait_queue_entry *entry ) > +{ > + struct console_input *console = (struct console_input *)obj; > + assert( obj->ops == &console_input_ops ); > + return (console->recnum != 0); > +} > + > struct console_signal_info > { > struct console_input *console; > @@ -677,6 +686,7 @@ static int write_console_input( struct console_input* console, int count, > } > if (!console->recnum && count) set_event( console->event ); > console->recnum += count; > + wake_up( &console->obj, 0 ); > return count; > } > > -- 2.7.4 > > >

2 1

Re: kernel32/tests: Fill in the delay IAT to succeed on Win10
by Marvin 16 Aug '16

16 Aug '16

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
29
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-devel August 2016