April 2017 - Wine-devel - list.winehq.org

Re: [PATCH 2/4] winex11: move XDestroyWindow() after free_gl_drawable() in set_win_format()
by Alexandre Julliard 08 Apr '17

08 Apr '17

Miklós Máté <mtmkls(a)gmail.com> writes: > @@ -1334,21 +1334,21 @@ static void free_gl_drawable( struct gl_drawable *gl ) > /*********************************************************************** > * create_gl_drawable > */ > -static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) > +static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl, struct x11drv_win_data *data ) > { > gl->drawable = 0; > > if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ > { > - struct x11drv_win_data *data = get_win_data( hwnd ); > - > if (data) > { > gl->type = DC_GL_WINDOW; > gl->window = create_client_window( data, gl->visual ); > if (gl->window) > + { > gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL ); > - release_win_data( data ); > + XSync( gdi_display, False ); Do you really need all the extra XSync calls? We try to avoid server round-trips as much as possible. -- Alexandre Julliard julliard(a)winehq.org

2 5

Re: [PATCH 1/2 v4] ntdll/tests: Check debug registers of a newly created thread
by Dmitry Timoshkov 08 Apr '17

08 Apr '17

Hi Christian, Christian Inci <chris.wine(a)broke-the-inter.net> wrote: > + thread = CreateThread(NULL, 0, dummy_thread, NULL, CREATE_SUSPENDED, NULL); > + ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError()); > + memset(&ctx, 0, sizeof(ctx)); > + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; > + status = pNtGetContextThread(thread, &ctx); > + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status); > + ok(!ctx.Dr0, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr0); > + ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1); > + ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2); > + ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3); > + todo_wine ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); > + todo_wine ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); > + CloseHandle(thread); > +} The thread needs to be explicitly terminated. -- Dmitry.

2 1

Re: [PATCH] tools/winedump: Change duplicate flag.
by Alexandre Julliard 07 Apr '17

07 Apr '17

Zebediah Figura <z.figura12(a)gmail.com> writes: > diff --git a/tools/winedump/main.c b/tools/winedump/main.c > index a4ebb43..5c683f6 100644 > --- a/tools/winedump/main.c > +++ b/tools/winedump/main.c > @@ -226,7 +226,7 @@ static const struct my_option option_table[] = { > {"-v", SPEC, 0, do_verbose, "-v Show lots of detail while working (verbose)."}, > {"dump", DUMP, 0, do_dump, "dump <file> Dump the contents of 'file' (dll, exe, lib...)"}, > {"-C", DUMP, 0, do_symdmngl, "-C Turn on symbol demangling"}, > - {"-f", DUMP, 0, do_dumphead, "-f Dump file header information"}, > + {"-F", DUMP, 0, do_dumphead, "-F Dump file header information"}, Not a big deal, but is there a reason for changing this? -- Alexandre Julliard julliard(a)winehq.org

2 5

Re: [PATCH 1/2 v2] ntdll/tests: Check debug registers of a newly created thread
by Christian Inci 07 Apr '17

07 Apr '17

Forgot to send the response to wine-devel too. On 04/07/2017 10:01 PM, Christian Inci wrote: > Thank you very much for letting me know. > > Setting Dr7 with the "wrong" bits set will result into this error. > I'm going to change the testcase right now. > > On 04/07/2017 09:07 PM, Alexandre Julliard wrote: >> Christian Inci <chris.wine(a)broke-the-inter.net> writes: >> >>> +static void test_thread_debug_registers(void) >>> +{ >>> + HANDLE thread; >>> + CONTEXT ctx; >>> + NTSTATUS status; >>> + >>> + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; >>> + ctx.Dr0 = 0xffffffff; >>> + ctx.Dr1 = 0xffffffff; >>> + ctx.Dr2 = 0xffffffff; >>> + ctx.Dr3 = 0xffffffff; >>> + ctx.Dr6 = 0xffffffff; >>> + ctx.Dr7 = 0xffffffff; >>> + status = pNtSetContextThread(GetCurrentThread(), &ctx); >>> + todo_wine ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", status); >> >> It would be a more convincing test if setting the context succeeded. The >> failure is of course interesting too, but that could be a separate test. >>

1 0

Re: [PATCH v4 4/4] user32/tests: Fix an intermittent failure. (resend)
by Marvin 07 Apr '17

07 Apr '17

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=30041 Your paranoid android. === w7u (32 bit msg) === msg.c:12062: Test failed: WmMouseHoverSeq: 0: the msg sequence is not complete: expected 0118 - actual 0000 msg.c:12064: Test failed: wrong tme.dwFlags 00000001, expected 00000000 msg.c:12064: Test failed: wrong tme.hwndTrack 0018017E, expected 00000000 msg.c:12064: Test failed: wrong tme.dwHoverTime 400, expected 0 === w7pro64 (32 bit msg) === msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 4: in msg 0x0047 expecting wParam 0x8170 got 0x1803 msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 5: the msg 0x0003 was expected, but got msg 0x0047 instead msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 6: the msg 0x0005 was expected, but got msg 0x0003 instead msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 7: the msg sequence is not complete: expected 0000 - actual 0005

1 0

Re: [PATCH] tools/winedump: Change duplicate flag.
by Austin English 07 Apr '17

07 Apr '17

On Apr 7, 2017 2:22 PM, "Zebediah Figura" <z.figura12(a)gmail.com> wrote: On 04/07/2017 02:09 PM, Alexandre Julliard wrote: > Zebediah Figura <z.figura12(a)gmail.com> writes: > >> diff --git a/tools/winedump/main.c b/tools/winedump/main.c >> index a4ebb43..5c683f6 100644 >> --- a/tools/winedump/main.c >> +++ b/tools/winedump/main.c >> @@ -226,7 +226,7 @@ static const struct my_option option_table[] = { >> {"-v", SPEC, 0, do_verbose, "-v Show lots of detail while working (verbose)."}, >> {"dump", DUMP, 0, do_dump, "dump <file> Dump the contents of 'file' (dll, exe, lib...)"}, >> {"-C", DUMP, 0, do_symdmngl, "-C Turn on symbol demangling"}, >> - {"-f", DUMP, 0, do_dumphead, "-f Dump file header information"}, >> + {"-F", DUMP, 0, do_dumphead, "-F Dump file header information"}, > > Not a big deal, but is there a reason for changing this? > The -f flag is assigned to two different options, yielding this one unreachable. Please also update the manpage. Thanks for catching this!

1 0

Re: [PATCH 1/2 v2] ntdll/tests: Check debug registers of a newly created thread
by Alexandre Julliard 07 Apr '17

07 Apr '17

Christian Inci <chris.wine(a)broke-the-inter.net> writes: > +static void test_thread_debug_registers(void) > +{ > + HANDLE thread; > + CONTEXT ctx; > + NTSTATUS status; > + > + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; > + ctx.Dr0 = 0xffffffff; > + ctx.Dr1 = 0xffffffff; > + ctx.Dr2 = 0xffffffff; > + ctx.Dr3 = 0xffffffff; > + ctx.Dr6 = 0xffffffff; > + ctx.Dr7 = 0xffffffff; > + status = pNtSetContextThread(GetCurrentThread(), &ctx); > + todo_wine ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", status); It would be a more convincing test if setting the context succeeded. The failure is of course interesting too, but that could be a separate test. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] regedit: Correctly handle the importing of DWORD strings that are followed by a comment
by Alexandre Julliard 07 Apr '17

07 Apr '17

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > programs/regedit/regproc.c | 29 ++++++++++++++++++++++++----- > programs/regedit/tests/regedit.c | 4 ++-- > 2 files changed, 26 insertions(+), 7 deletions(-) > > diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c > index e0049c6..c8149f5 100644 > --- a/programs/regedit/regproc.c > +++ b/programs/regedit/regproc.c > @@ -146,15 +146,34 @@ static char* GetMultiByteStringN(const WCHAR* strW, int chars, DWORD* len) > */ > static BOOL convertHexToDWord(WCHAR* str, DWORD *dw) > { > - char buf[9]; > + char *buf; > char dummy; > + BOOL ret = TRUE; > > - WideCharToMultiByte(CP_ACP, 0, str, -1, buf, 9, NULL, NULL); > - if (lstrlenW(str) > 8 || sscanf(buf, "%x%c", dw, &dummy) != 1) { > + buf = GetMultiByteString(str); > + if (!buf) return FALSE; > + > + if (strlen(buf) > 8) /* Look for any characters after the DWORD string */ > + { > + char *p = buf + 8; > + > + while (*p == ' ' || *p == '\t') p++; > + if (*p != ';') > + { > + HeapFree(GetProcessHeap(), 0, buf); > + return FALSE; > + } > + buf[8] = 0; > + } > + > + if (sscanf(buf, "%x%c", dw, &dummy) != 1) > + { > output_message(STRING_INVALID_HEX); > - return FALSE; > + ret = FALSE; > } It may be a good idea to write tests for dwords with different numbers of digits, it's not clear to me that this would be doing the right thing. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/8] server: Pass async_data_t as varargs in write request.
by Jacek Caban 07 Apr '17

07 Apr '17

On 06.04.2017 17:58, Jacek Caban wrote: > This is needed for later patch that adds APCs to async_data_t, causing > request to exceed allowed size. Having second thoughts about it, I think there is a solution that doesn't require changing async_data_t size. We could require that the first field of callback argument is a pointer to callback. This way we could have just one pointer for callback and its argument, saving space for APC in async_data_t. Please let me know if that would be preferred. Thanks, Jacek

2 1

Re: [PATCH] odbccp32: Implement SQLConfigDriver/W
by Huw Davies 07 Apr '17

07 Apr '17

On Fri, Apr 07, 2017 at 12:48:17AM +0000, Alistair Leslie-Hughes wrote: > v2 - Use worker function to load DLL > - Correctly set error when required. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/odbccp32/odbccp32.c | 115 ++++++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 105 insertions(+), 10 deletions(-) > > diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c > index 773c5d2..041170a 100644 > --- a/dlls/odbccp32/odbccp32.c > +++ b/dlls/odbccp32/odbccp32.c > @@ -62,6 +62,12 @@ static const WCHAR odbc_error_component_not_found[] = {'C','o','m','p','o','n',' > static const WCHAR odbc_error_out_of_mem[] = {'O','u','t',' ','o','f',' ','m','e','m','o','r','y',0}; > static const WCHAR odbc_error_invalid_param_sequence[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','e','q','u','e','n','c','e',0}; > static const WCHAR odbc_error_invalid_param_string[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','t','r','i','n','g',0}; > +static const WCHAR odbc_error_invalid_dsn[] = {'I','n','v','a','l','i','d',' ','D','S','N',0}; > +static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i','b','r','a','r','y',' ','F','a','i','l','e','d',0}; > +static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; > + > +static BOOL (WINAPI *pConfigDriverW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *args, const WCHAR *msg, WORD msgmax, WORD *msgout); > +static BOOL (WINAPI *pConfigDriverA)(HWND hwnd, WORD request, const char *driver, const char *args, const char *msg, WORD msgmax, WORD *msgout); Is there a reason why pConfigDriverA/W are not local variables? Huw.

1 0