February 2016 - Wine-Devel - list.winehq.org

Re: [v3 PATCH] gdi32: Support Begin/End Path for metafile DCs
by Huw Davies Feb. 16, 2016

Feb. 16, 2016

On Tue, Feb 16, 2016 at 09:28:06PM +1100, Alistair Leslie-Hughes wrote: > From: Dmitry Timoshkov <dmitry(a)baikal.ru> > > Correct failed test. > Updated Author/signoffs. > v3 - Removed Dmitry signoff on request. > > Fixes https://bugs.winehq.org/show_bug.cgi?id=39185 > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/gdi32/enhmfdrv/dc.c | 4 +++- > dlls/gdi32/path.c | 20 +++++++++++++++++++- > dlls/gdi32/tests/metafile.c | 2 +- > 3 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c > index e09cd0b..166b6b2 100644 > --- a/dlls/gdi32/path.c > +++ b/dlls/gdi32/path.c ... > @@ -1513,6 +1523,14 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC > struct path_physdev *physdev = get_path_physdev( dev ); > unsigned int idx, ggo_flags = GGO_NATIVE; > POINT offset = {0, 0}; > + DWORD type; > + > + type = GetObjectType(dev->hdc); > + if (type == OBJ_METADC || type == OBJ_ENHMETADC) > + { > + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExtTextOut ); > + return next->funcs->pExtTextOut( next, x, y, flags, lprc, str, count, dx ); > + } > > if (!count) return TRUE; > if (flags & ETO_GLYPH_INDEX) ggo_flags |= GGO_GLYPH_INDEX; Why the special treatment for ExtTextOut()? I can believe we may need to do something with Begin/EndPath, but why this? Dmitry, is this the reason you don't want to send it? Huw.

2 6

Re: [PATCH 5/5] ntdll: Add special handling for int $0x2d exceptions.
by Sebastian Lackner Feb. 16, 2016

Feb. 16, 2016

Thanks for working on this. I assume you already saw the new test failures, those should be fixed of course. Besides that I have some more remarks on the patch: On 12.02.2016 18:52, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/ntdll/signal_i386.c | 14 +++++++++++++- > dlls/ntdll/tests/exception.c | 38 +++++++++++++++++++++++--------------- > 2 files changed, 36 insertions(+), 16 deletions(-) > > diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c > index a3abbff..46f932a 100644 > --- a/dlls/ntdll/signal_i386.c > +++ b/dlls/ntdll/signal_i386.c > @@ -2072,8 +2072,20 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) > case TRAP_x86_PROTFLT: /* General protection fault */ > case TRAP_x86_UNKNOWN: /* Unknown fault code */ > { > + CONTEXT *win_context = get_exception_context( rec ); > WORD err = get_error_code(context); > - if (!err && (rec->ExceptionCode = is_privileged_instr( get_exception_context(rec) ))) break; > + if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break; > + if ((err & 7) == 2 && (err >> 3) == 0x2d) /* int $0x2d */ > + { Int 0x2d is not just a special way to raise a breakpoint, its actually a kernel interface to send commands to the debugger. EAX contains the command value, other registers contain the arguments. An proper implementation is not necessary I guess, but at least for small values of EAX which are assigned to commands we would need better test coverage. Most anti- debugger tricks set EAX = 0 which is not tested at all so far. > + win_context->Eip += 3; > + rec->ExceptionCode = EXCEPTION_BREAKPOINT; > + rec->ExceptionAddress = (char *)win_context->Eip; > + rec->NumberParameters = is_wow64 ? 1 : 3; > + rec->ExceptionInformation[0] = EAX_sig(context); > + rec->ExceptionInformation[1] = ECX_sig(context); > + rec->ExceptionInformation[2] = EDX_sig(context); > + break; > + } > rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; > rec->NumberParameters = 2; > rec->ExceptionInformation[0] = 0; > diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c > index d6a610e..57b201a 100644 > --- a/dlls/ntdll/tests/exception.c > +++ b/dlls/ntdll/tests/exception.c > @@ -219,6 +219,11 @@ static const struct exception > > { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ > 1, 1, FALSE, STATUS_SINGLE_STEP, 0 }, > + { { 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, /* mov $0xb8b8b8b8, %eax */ > + 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, /* mov $0xb9b9b9b9, %ecx */ > + 0xba, 0xba, 0xba, 0xba, 0xba, /* mov $0xbabababa, %edx */ > + 0xcd, 0x2d, 0xc3 }, /* int $0x2d; ret */ > + 17, 0, FALSE, STATUS_BREAKPOINT, 3, { 0xb8b8b8b8, 0xb9b9b9b9, 0xbabababa } }, > }; Could you maybe also provide a testcase when a debugger is attached? I would expect that it behaves different then. Actually it should not even produce an exception then because the exception is transparently translated into a debug event, like wine already does for debug strings for example. > > static int got_exception; > @@ -473,7 +478,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram > CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) > { > const struct exception *except = *(const struct exception **)(frame + 1); > - unsigned int i, entry = except - exceptions; > + unsigned int i, parameter_count, entry = except - exceptions; > > got_exception++; > trace( "exception %u: %x flags:%x addr:%p\n", > @@ -482,20 +487,23 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram > ok( rec->ExceptionCode == except->status || > (except->alt_status != 0 && rec->ExceptionCode == except->alt_status), > "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status ); > - ok( rec->ExceptionAddress == (char*)code_mem + except->offset, > - "%u: Wrong exception address %p/%p\n", entry, > - rec->ExceptionAddress, (char*)code_mem + except->offset ); > - > - if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) > - { > - ok( rec->NumberParameters == except->nb_params, > - "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); > - } > + ok( context->Eip == (DWORD_PTR)code_mem + except->offset, > + "%u: Unexpected eip %#x/%#lx\n", entry, > + context->Eip, (DWORD_PTR)code_mem + except->offset ); > + ok( rec->ExceptionAddress == (char*)context->Eip || > + (rec->ExceptionCode == STATUS_BREAKPOINT && rec->ExceptionAddress == (char*)context->Eip + 1), I would prefer an exact test for ExceptionAddress here, off-by-one errors in exception handling would be kinda odd. > + "%u: Unexpected exception address %p/%p\n", entry, > + rec->ExceptionAddress, (char*)context->Eip ); > + > + if (except->status == STATUS_BREAKPOINT && is_wow64) > + parameter_count = 1; > + else if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) > + parameter_count = except->nb_params; > else > - { > - ok( rec->NumberParameters == except->alt_nb_params, > - "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); > - } > + parameter_count = except->alt_nb_params; > + > + ok( rec->NumberParameters == parameter_count, > + "%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count ); > > /* Most CPUs (except Intel Core apparently) report a segment limit violation */ > /* instead of page faults for accesses beyond 0xffffffff */ > @@ -530,7 +538,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram > > skip_params: > /* don't handle exception if it's not the address we expected */ > - if (rec->ExceptionAddress != (char*)code_mem + except->offset) return ExceptionContinueSearch; > + if (context->Eip != (DWORD_PTR)code_mem + except->offset) return ExceptionContinueSearch; > > context->Eip += except->length; > return ExceptionContinueExecution; >

2 3

Re: advapi32/tests: Use todo_wine_if() in tests
by Marvin Feb. 16, 2016

Feb. 16, 2016

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=20532 Your paranoid android. === w1064 (32 bit security) === security.c:3753: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3794: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3798: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3807: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: user32: Select text control content while setting initial dialog focus
by Dmitry Timoshkov Feb. 16, 2016

Feb. 16, 2016

Piotr Caban <piotr(a)codeweavers.com> wrote: > --- a/dlls/user32/dialog.c > +++ b/dlls/user32/dialog.c > @@ -707,7 +707,11 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, > focus = GetNextDlgTabItem( hwnd, 0, FALSE ); > if (!focus) focus = GetNextDlgGroupItem( hwnd, 0, FALSE ); > if (focus) > + { > + if (SendMessageW( focus, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) > + SendMessageW( focus, EM_SETSEL, 0, -1 ); > SetFocus( focus ); > + } > } Selecting the text on SetFocus() is the job of DefDlgProc(), it's worth to investigate why it doesn't work. -- Dmitry.

2 4

Re: [PATCH] mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}(). (try 3)
by Vincent Povirk Feb. 16, 2016

Feb. 16, 2016

Sadly, we can't add any tests that use Mono, because it doesn't work in 64-bit Wine.

2 1

Re: [v2 PATCH] gdi32: Support Begin/End Path for metafile DCs
by Dmitry Timoshkov Feb. 16, 2016

Feb. 16, 2016

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > From: Dmitry Timoshkov <dmitry(a)baikal.ru> > > Correct failed test. > Updated Author/signoffs. > > Fixes https://bugs.winehq.org/show_bug.cgi?id=39185 > > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Please resend the patch without my sign-off. -- Dmitry.

1 0

Re: [PATCH] gdi32: Support Begin/End Path for metafile DCs
by Dmitry Timoshkov Feb. 16, 2016

Feb. 16, 2016

Hi Alistair, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Based off Dmitry Timoshkov patch. > > Fixes https://bugs.winehq.org/show_bug.cgi?id=39185 It's an exact copy of my patch with just one hunk removed (without which the tests won't pass under Wine). So it's not just "based", it's a plain copy. It would be fine if you sent it in two parts: first under my name (but in that case you need at least my sign-off), and next patch with your test case. -- Dmitry.

1 1

Re: [PATCH 6/7] ntdll: Add special handling for int $0x2d exceptions.
by Sebastian Lackner Feb. 16, 2016

Feb. 16, 2016

On 15.02.2016 18:18, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/ntdll/signal_i386.c | 29 ++++++++++++++++++++++++++++- > dlls/ntdll/tests/exception.c | 38 +++++++++++++++++++++++--------------- > 2 files changed, 51 insertions(+), 16 deletions(-) > If possible please group only related patches in the future. According to the testbot, it still introduces test failures: http://source.winehq.org/patches/data/119233.testfail Also, I'm not sure if you saw https://www.winehq.org/pipermail/wine-devel/2016-February/111675.html where I gave some additional feedback. If you have any questions, feel free to ask. Best regards, Sebastian

1 0

Re: ws2_32/tests: Add tests for getsockopt() with SO_SNDBUF and SO_RCVBUF optname.
by Bruno Jesus Feb. 16, 2016

Feb. 16, 2016

On Tue, Feb 16, 2016 at 9:30 AM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > @Bruno: As far as I remember you were working on a fix for this, what is > the progress? > Hi, Sebastian. Unfortunately since December I'm buried by real life work and I thought I could restart working in Wine on February but that was not possible. My solution to this is still theoretical, I didn't write any code yet. The solution is to cache the values of SO_RCVBUF, SO_SNDBU, SO_REUSEADDR and SO_ACCEPTCONN. Why? SO_RCVBUF and SO_SNBUF are messed by Linux kernel. So we would cache the requested value and return a min() between what we have in the cache and what we read back from the kernel. This would solve this problem and not require #ifdef. SO_REUSEADDR because Windows does not have TIME_WAIT at all, so all sockets would be created with SO_REUSEADDR in the server and we would take care of it manually. There is a long standing uTorrent bug about this. SO_ACCEPTCONN is bugged in OSX, it is never updated by the kernel so it is useless and always fail. To solve this we would set the cache to 1 when listen() is called and return the cache instead of asking for the kernel. I'm still reading all bugs and emails so I'm aware of your divide by 2 solution and I really don't mind if it gets accepted as it is ready and mine is still months to come. Best wishes, Bruno

1 0

Re: ws2_32/tests: Add tests for getsockopt() with SO_SNDBUF and SO_RCVBUF optname.
by Marvin Feb. 16, 2016

Feb. 16, 2016

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=20513 Your paranoid android. === w7pro64 (32 bit sock) === sock.c:7750: Test failed: bytesReturned isn't supposed to be 1 sock.c:7774: Test failed: GetOverlappedResult failed, error 0

2 1

Re: user32: Select text control content while setting initial dialog focus
by Hugh McMaster Feb. 16, 2016

Feb. 16, 2016

On Tue, 16 Feb 2016 08:04:35 +0800, Dmitry Timoshkov wrote: >>Piotr Caban wrote: >> --- a/dlls/user32/dialog.c >> +++ b/dlls/user32/dialog.c >> @@ -707,7 +707,11 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, >> focus = GetNextDlgTabItem( hwnd, 0, FALSE ); >> if (!focus) focus = GetNextDlgGroupItem( hwnd, 0, FALSE ); >> if (focus) >> + { >> + if (SendMessageW( focus, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) >> + SendMessageW( focus, EM_SETSEL, 0, -1 ); >> SetFocus( focus ); >> + } >> } > >Selecting the text on SetFocus() is the job of DefDlgProc(), it's worth >to investigate why it doesn't work. I'm guessing this doesn't work for the same (or similar) reasons as with the combo box issue. -- Hugh McMaster

1 0

Re: shell32/tests: Take into account the Windows 10 DDE race condition.
by Marvin Feb. 16, 2016

Feb. 16, 2016

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=20511 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1685: Test failed: ShellExecute(verb="QuotedLowerL", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.shlexec") WaitForSingleObject returned 258 shlexec.c:1714: Test failed: ShellExecute(verb="QuotedLowerL", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.shlexec") argvA3 expected 'QuotedLowerL', but key not found or empty shlexec.c:1722: Test failed: ShellExecute(verb="QuotedLowerL", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.shlexec") argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.shlexec', but key not found or empty shlexec.c:1714: Test failed: ShellExecute(verb="QuotedUpperL", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.shlexec") argvA3 expected 'QuotedUpperL', got 'QuotedLowerL' shlexec.c:1685: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\masked file.shlexec") WaitForSingleObject returned 258 shlexec.c:1714: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\masked file.shlexec") argvA3 expected 'Open', but key not found or empty shlexec.c:1722: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\masked file.shlexec") argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\masked file.shlexec', but key not found or empty shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" failed: rc=2 err=2 shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" failed: rc=2 err=2 shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" failed: rc=2 err=2 shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2 file.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.exe"", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.exe" param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2 file.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2 file.exe"", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2 file.exe" param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2 param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\notexist.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\notexist.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="cmd", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="cmd param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="xyzwxyzwxyz", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="xyzwxyzwxyz param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2855: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2858: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec") argvA3 expected 'Exec', but key not found or empty shlexec.c:2859: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2.exe', but key not found or empty shlexec.c:2863: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2868: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp") WaitForSingleObject returned 258 shlexec.c:2868: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2871: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp") argvA3 expected 'Exec', but key not found or empty shlexec.c:2872: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2.exe', but key not found or empty shlexec.c:2876: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="%TMPDIR%") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2880: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="%TMPDIR%") WaitForSingleObject returned 258 shlexec.c:2880: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="%TMPDIR%") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2883: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="%TMPDIR%") argvA3 expected 'Exec', but key not found or empty shlexec.c:2884: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="%TMPDIR%") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2.exe', but key not found or empty shlexec.c:2889: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="C:\Users\Public\Documents:C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp") ShlexecVar expected 'Present', but key not found or empty

1 0

Re: advapi32/tests: Use todo_wine_if() in tests
by Marvin Feb. 16, 2016

Feb. 16, 2016

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=20503 Your paranoid android. === w1064 (32 bit security) === security.c:3753: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3794: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3798: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3807: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: wininet/tests: Use todo_wine_if() in tests
by Marvin Feb. 15, 2016

Feb. 15, 2016

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=20501 Your paranoid android. === w1064 (32 bit http) === http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1763: Test failed: Expected 2, got 4 http.c:1764: Test failed: Expected CRLF, got ' http.c:2398: Test failed: count was wrong http.c:2399: Test failed: http data wrong, got: Garbage: Header http.c:3062: Test failed: HttpAddRequestHeaders succeeded http.c:3063: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3068: Test failed: code = 200, expected 400 http.c:3068: Test failed: unexpected status code 200, expected 400 http.c:3068: Test failed: unexpected status code 200, expected 400 http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: crypt32/tests: Use todo_wine_if() in tests
by Marvin Feb. 15, 2016

Feb. 15, 2016

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=20499 Your paranoid android. === w1064 (32 bit chain) === chain.c:128: Test failed: Expected CRYPT_E_NOT_FOUND, got 00000002 === w864 (64 bit store) === store.c:2596: Test failed: CertAddCertificateContextToStore failed store.c:2597: Test failed: Unexpected cert3 store: unhandled exception c0000005 at 000000000044D8EE

1 0

Re: [PATCH] packet: create packet.dll and Implement GetAdapterNames
by Sebastian Lackner Feb. 15, 2016

Feb. 15, 2016

I am not sure if André wants to have this dll in wine, but nevertheless, here some comments. On 14.02.2016 16:10, Jianqiu Zhang wrote: > From dfc572cd1b1cdf51b84a5e367d054473c3c3e99d Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Sun, 14 Feb 2016 17:27:37 +0800 > Subject: [PATCH] packet: create packet.dll and Implement GetAdapterNames > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/packet/Makefile.in | 5 ++++ > dlls/packet/packet.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/packet/packet.spec | 32 +++++++++++++++++++++++++ Changes to configure.ac are missing. In this case its especially critical because compilation of packet.dll would have to be disabled, when pcap header files are not present. Take a look at how its done for wpcap.dll. > 3 files changed, 100 insertions(+) > create mode 100644 dlls/packet/Makefile.in > create mode 100644 dlls/packet/packet.c > create mode 100644 dlls/packet/packet.spec > > diff --git a/dlls/packet/Makefile.in b/dlls/packet/Makefile.in > new file mode 100644 > index 0000000..6ab9f08 > --- /dev/null > +++ b/dlls/packet/Makefile.in > @@ -0,0 +1,5 @@ > +MODULE = packet.dll > +DELAYIMPORTS = iphlpapi A regular import would make more sense here. > + > +C_SRCS = \ > + packet.c > diff --git a/dlls/packet/packet.c b/dlls/packet/packet.c > new file mode 100644 > index 0000000..c6d1568 > --- /dev/null > +++ b/dlls/packet/packet.c > @@ -0,0 +1,63 @@ > +#include "config.h" > +#include "wine/port.h" > + > +#include <stdarg.h> > + > +#include "windef.h" > +#include "winbase.h" > +#include "windows.h" > +#include "wine/debug.h" > + > +#include "winsock2.h" > +#include "iphlpapi.h" > +#include "ntddndis.h" > + > +#include <pcap/pcap.h> For the first patch, you will most likely not need all those headers. You should add them in later patches, whenever you implement a function which needs them. > + > +WINE_DEFAULT_DEBUG_CHANNEL(packet); > + > +BOOLEAN PacketGetAdapterNames(char *nameList, PULONG pSize) The calling convention (CDECL, WINAPI) is missing. Also, variable names are usually lower-case only, and without "p" prefix. Types like P* or LP* should also be avoided in the wine source. > +{ > + IP_ADAPTER_INFO *adInfo, *adInfoList = NULL; > + DWORD errcode; > + ULONG needsize = 0, minDescLen = 0, minAdNameLen = 0, minTotLen = 0, nameOffset, descOffset; > + > + TRACE("nameList %p &size %p size %d\n", nameList, pSize, *pSize); > + > + errcode = GetAdaptersInfo(adInfoList, &needsize); > + adInfoList = HeapAlloc(GetProcessHeap(), 0, needsize); Its a matter of taste, but checking return values for HeapAlloc functions usually does not hurt. > + > + TRACE("Get the needed space(%d) for adInfo\n", needsize); > + > + errcode = GetAdaptersInfo(adInfoList, &needsize); > + if(errcode) > + { You are leaking memory here. The same applies for a couple of other return paths. > + SetLastError(errcode); > + return FALSE; > + } > + for(adInfo = adInfoList; adInfo != NULL; adInfo = adInfo->Next) > + { > + minAdNameLen += lstrlenA(adInfo->AdapterName) + 1; > + minDescLen += lstrlenA(adInfo->Description) + 1; > + } > + minTotLen = minAdNameLen + minDescLen + 2; > + TRACE("minAdNameLen = %d, minDescLen = %d\n", minAdNameLen, minDescLen); Such a trace is only useful during debugging. > + if(nameList == NULL || *pSize < minTotLen) > + { > + SetLastError(ERROR_INSUFFICIENT_BUFFER); > + *pSize = minTotLen; > + return FALSE; > + } > + > + nameOffset = descOffset = 0; > + for(adInfo = adInfoList; adInfo != NULL; adInfo = adInfo->Next) > + { > + lstrcpyA(nameList + nameOffset, adInfo->AdapterName); > + lstrcpyA(nameList + minAdNameLen + descOffset + 1, adInfo->Description); > + nameOffset += lstrlenA(adInfo->AdapterName) + 1; > + descOffset += lstrlenA(adInfo->Description) + 1; > + } > + nameList[minAdNameLen] = '\0'; > + nameList[minTotLen - 1] = '\0'; > + return TRUE; > +} > diff --git a/dlls/packet/packet.spec b/dlls/packet/packet.spec > new file mode 100644 > index 0000000..b7f2781 > --- /dev/null > +++ b/dlls/packet/packet.spec > @@ -0,0 +1,32 @@ > + 1 stub PacketAllocatePacket Wine does not care about exact ordinal numbers. You can mark them all as "@". > + 2 stub PacketCloseAdapter > + 3 stub PacketFreePacket > + 4 cdecl PacketGetAdapterNames(str long) The first parameter is a buffer which is filled out by the function, so 'ptr' would make more sense. The second parameter is a pointer, not long. > + 5 stub PacketGetAirPcapHandle > + 6 stub PacketGetDriverVersion > + 7 stub PacketGetNetInfoEx > + 8 stub PacketGetNetType > + 9 stub PacketGetReadEvent > +10 stub PacketGetStats > +11 stub PacketGetStatsEx > +12 stub PacketGetVersion > +13 stub PacketInitPacket > +14 stub PacketIsDumpEnded > +15 stub PacketLibraryVersion > +16 stub PacketOpenAdapter > +17 stub PacketReceivePacket > +18 stub PacketRequest > +19 stub PacketSendPacket > +20 stub PacketSendPackets > +21 stub PacketSetBpf > +22 stub PacketSetBuff > +23 stub PacketSetDumpLimits > +24 stub PacketSetDumpName > +25 stub PacketSetHwFilter > +26 stub PacketSetLoopbackBehavior > +27 stub PacketSetMinToCopy > +28 stub PacketSetMode > +29 stub PacketSetNumWrites > +30 stub PacketSetReadTimeout > +31 stub PacketSetSnapLen > +32 stub PacketStopDriver > > > >

1 0

Re: [PATCH] mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}(). (try 2)
by Vincent Povirk Feb. 15, 2016

Feb. 15, 2016

I wrote a test program (attached), and it doesn't work: CreateDomain failed, hr=80004002 I didn't investigate, but I remember the issue I ran into when I tried to implement this. AppDomain.CreateDomain doesn't return a "real" AppDomain object, it returns a TransparentProxy, and the TransparentProxy doesn't support the _AppDomain interface. The real AppDomain object lives in the newly-created appdomain. I think you could get the real AppDomain and an IUnknown pointer for it if you used the newly-created MonoDomain, but I suspect the MonoDomain pointer you're getting is also wrong. Also, I'm not sure it's necessary to lock the RuntimeHost while creating the new AppDomain, it should only be needed when accessing the list.

1 1

Re: [PATCH 2/2] ntdll: Improve invalid paramater handling in NtAccessCheck.
by Marvin Feb. 15, 2016

Feb. 15, 2016

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=20489 Your paranoid android. === w1064 (32 bit security) === security.c:3802: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3843: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3847: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3856: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH 1/2] advapi32/tests: Add invalid paramater tests for AccessCheck.
by Marvin Feb. 15, 2016

Feb. 15, 2016

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=20488 Your paranoid android. === w1064 (32 bit security) === security.c:3806: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3847: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3851: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3860: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH] kernel32/tests: Use todo_wine_if() in tests
by Marvin Feb. 15, 2016

Feb. 15, 2016

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=20487 Your paranoid android. === w1064 (32 bit locale) === locale.c:2365: Test failed: LCMapStringEx should fail with bad locale name locale.c:2366: Test failed: unexpected error code -559038737 locale.c:2457: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4167: Test failed: IsValidLocaleName should have failed locale.c:4169: Test failed: IsValidLocaleName should have failed locale.c:4534: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4536: Test failed: For id 7, Expected IVC, got '' === w1064 (32 bit loader) === loader.c:2733: Test failed: Test 0: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 0: expected 74374550, got 00000000 loader.c:2733: Test failed: Test 1: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 1: expected 72BC2CF0, got 00000000 loader.c:2733: Test failed: Test 2: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 2: expected 74372DC0, got 00000000 loader.c:2741: Test failed: Test 3: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2742: Test failed: Test 3: Wrong callback count: 0 loader.c:2741: Test failed: Test 4: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2742: Test failed: Test 4: Wrong callback count: 0 loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195

1 0

Re: [PATCH 6/7] ntdll: Add special handling for int $0x2d exceptions.
by Marvin Feb. 15, 2016

Feb. 15, 2016

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=20482 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3d0000/0x3d0001 exception: unhandled exception 80000004 at 003D0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x3d0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3f0000/0x3f0001 exception: unhandled exception 80000004 at 003F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x3f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: opengl32: Ensure extension tables generated by make_opengl contain earliest GL_VERSION for each function.
by Matteo Bruni Feb. 15, 2016

Feb. 15, 2016

2016-02-13 0:21 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > A couple of functions (glBindBufferBase, glBindBufferRange, glGetIntegeri_v) are listed > in multiple feature levels. The current implementation of ./make_opengl does not handle > this correctly, so depending on the order of elements in the hash table, a different > GL_VERSION_* string is added to the extension registry. Spotted by accident when I noticed > that the output changes each time I regenerate OpenGL files. ;) > > The good news: Luckily the hash tables were sorted "correctly" when Matteo bumped the > version the last time, so the version in the Wine source tree is fine. Actually at the time there was only one version token listed for those functions. This weird thing with two functions (not sure why both 3.0 and 3.1 are specified) appeared in the XML shortly after our latest update IIRC. > > If some perl experts out there know a better way to fix it, or if I'm violating any perl > style rules I'm not aware of, feel free to send an improved version. ;) > > dlls/opengl32/make_opengl | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl > index 2b15f58..ec782ed 100755 > --- a/dlls/opengl32/make_opengl > +++ b/dlls/opengl32/make_opengl > @@ -692,12 +692,14 @@ sub parse_file($$) > } > > # generate extension functions from norm functions, if they are newer than the category > - while (my ($k, $v) = each(%{$data->{feature}})) { > + my %features = %{$data->{feature}}; > + foreach (sort keys %features) { > + my ($k, $v) = %features{$_}; > if (!$norm_categories{$k} && $v->{api} =~ /^gl(\||$)/) > { > for my $req (@{$v->{require}}) { > for (keys %{$req->{command}}) { > - if (!$norm_functions{$_}) { > + if (!$ext_functions{$_} && !$norm_functions{$_}) { > $ext_functions{$_} = [ $functions{$_}[0], $functions{$_}[1], [ $k ] ]; > } > } > -- > 2.7.1 I'm not a perl expert by any means but I guess it's fine. BTW I had tackled this in a slightly different way: diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 2b15f58..64e3bc6 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -698,7 +698,12 @@ sub parse_file($$) for my $req (@{$v->{require}}) { for (keys %{$req->{command}}) { if (!$norm_functions{$_}) { - $ext_functions{$_} = [ $functions{$_}[0], $functions{$_}[1], [ $k ] ]; + if (!$ext_functions{$_}) { + $ext_functions{$_} = [ $functions{$_}[0], $functions{$_}[1], [ $k ] ]; + } + else { + push @{$ext_functions{$_}->[2]}, $k; + } } } } I.e. store all the versions in the table. I guess your version is a bit better in that it avoids multiple version tokens. AFAICS there is another problem with make_opengl and the current XML files though: type GLint64 is not handled and that breaks the traces inside the wrapper functions. That's trivially fixed by adding an entry for GLint64 in the %debug_conv array. FWIW I didn't send my version of the patch at the time I wrote it because I had in mind to send it together with a fix for bug 38402. Of course I never got around to complete it and well... I had a very quick look at your fix for that bug and it looks okay, thank you.

1 0

Re: urlmon: Use todo_wine_if in uri.c tests.
by Marvin Feb. 15, 2016

Feb. 15, 2016

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=20474 Your paranoid android. === w1064 (32 bit uri) === uri.c:7615: Test failed: Expected google.com.uk but got L"com.uk" on uri_tests[71].str_props[3]. uri.c:7615: Test failed: Expected google.uk.1 but got L"uk.1" on uri_tests[73].str_props[3]. uri.c:7613: Test failed: GetPropertyBSTR returned 0x00000000, expected 0x00000001. On uri_tests[76].str_props[3]. uri.c:7615: Test failed: Expected but got L".uk" on uri_tests[76].str_props[3]. uri.c:7615: Test failed: Expected google.com.[] but got L"com.[]" on uri_tests[77].str_props[3]. uri.c:7800: Test failed: Error: Expected google.com.uk but got L"com.uk" on uri_tests[71]. uri.c:7800: Test failed: Error: Expected google.uk.1 but got L"uk.1" on uri_tests[73]. uri.c:7798: Test failed: Error: GetDomain returned 0x00000000, expected 0x00000001 on uri_tests[76]. uri.c:7800: Test failed: Error: Expected but got L".uk" on uri_tests[76]. uri.c:7800: Test failed: Error: Expected google.com.[] but got L"com.[]" on uri_tests[77]. uri.c:8080: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[71].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 11 but got 4 on uri_tests[73].str_props[3]. uri.c:8078: Test failed: Error: GetPropertyLength returned 0x00000000, expected 0x00000001 on uri_tests[76].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 0 but got 3 on uri_tests[76].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[77].str_props[3]. uri.c:8147: Test failed: Error: Received flag for property 3 when not expected on uri_tests[76]. uri.c:8197: Test failed: Error: Wasn't expecting to have property 3 on uri_tests[76]. uri.c:10487: Test failed: Error: Expected google.com.uk but got L"com.uk" instead on uri_parse_tests[42]. uri.c:10490: Test failed: Error: Expected 13, but got 6 instead on uri_parse_tests[42].

1 0

Re: [PATCH] ntdll: Finish serial reads of size 0 immediately.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Alex Henrie <alexhenrie24(a)gmail.com> writes: > diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c > index 3883e5a..1e37ce3 100644 > --- a/dlls/ntdll/file.c > +++ b/dlls/ntdll/file.c > @@ -883,7 +883,8 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, > status = length ? STATUS_END_OF_FILE : STATUS_SUCCESS; > goto done; > case FD_TYPE_SERIAL: > - break; > + status = STATUS_SUCCESS; What if the requested size wasn't 0? That probably needs a test case too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v4 PATCH] user32/test: Color message isn't sent during startup for buttons
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > +static void test_dlg_settext(void) > +{ > + int ret; > + > + ret = DialogBoxParamA(GetModuleHandleA(NULL), "EDIT_READONLY_DIALOG", NULL, test_dlg_settext_proc, 0); > + ok(ret == 0, "expected 0, got %d\n", ret); > + todo_wine ok(!color_message_called, "Unexpected color message\n"); It would be better to do this without depending on a dialog, particularly one that is meant to be used by the edit tests. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v4 PATCH] user32/test: Color message isn't sent during startup for buttons
by Marvin Feb. 15, 2016

Feb. 15, 2016

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=20463 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6868: Test failed: WmParentOnlyPaint: 1: the msg sequence is not complete: expected 0000 - actual 001a

1 0

Re: [PATCH 3/7] reg: Fail if the data for REG_DWORD cannot be converted into a DWORD
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > @@ -376,6 +376,12 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, > if (data) > reg_data = get_regdata(data,reg_type,separator,&reg_count); > > + if (!reg_data && reg_type == REG_DWORD) > + { > + RegCloseKey(subkey); > + return 1; > + } Shouldn't this fail for other types too? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [1/2 resend] user32/tests: Test DDE end to end with Chinese text which has latin characters begin.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Jactry Zeng <jzeng(a)codeweavers.com> writes: > Superseded patch 118355. > > For bug 38888: https://bugs.winehq.org/show_bug.cgi?id=38888 > > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/user32/tests/dde.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 45 insertions(+) It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M user32.dll -p user32_test.exe.so dde && touch dde.ok dde.c:2573: Test failed: Expected L"abc?", got L"a", msg_index=29 Makefile:306: recipe for target 'dde.ok' failed -- Alexandre Julliard julliard(a)winehq.org

2 1

reg: Fail if REG_DWORD is passed with no data or if the data cannot be converted to a DWORD
by Hugh McMaster Feb. 15, 2016

Feb. 15, 2016

Please ignore this patch (119156). It is not entirely correct. -- Hugh McMaster

1 0

Re: [v3] shell32: fix two bugs in IQueryAssocations
by Marvin Feb. 15, 2016

Feb. 15, 2016

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=20444 Your paranoid android. === w2003std (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:122: Test failed: assoc.c:330: Tests skipped: IApplicationAssociationRegistration not supported: 0x80040154 === wvistau64 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:282: L"txtfile" === w2008s64 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:282: L"txtfile" === w7u (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w7pro64 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:282: L"txtfile" === w8 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w864 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:282: L"txtfile" === w1064 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:282: L"txtfile" === wvistau64 (64 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w2008s64 (64 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w7pro64 (64 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w864 (64 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w1064 (64 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile"

1 0

Re: [PATCH] ntdll: Finish serial reads of size 0 immediately.
by Marvin Feb. 14, 2016

Feb. 14, 2016

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=20438 Your paranoid android. === w2008s64 (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 000000BC comm.c:1520: Changing CommMask on the fly for handle 000000BC after timeout 500 === w7pro64 (64 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1513 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1513 ms for waiting

1 0

Re: [PATCH 2/2] wpcap: Fix crash on pcap_loop(try 3)
by Alexandre Julliard Feb. 14, 2016

Feb. 14, 2016

André Hentschel <nerv(a)dawncrow.de> writes: > Am 12.02.2016 um 06:31 schrieb Jianqiu Zhang: >> From 12ecf0983d9355e3f1b4781645503cb4fb65e599 Mon Sep 17 00:00:00 2001 >> From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> >> Date: Tue, 5 Jan 2016 09:12:42 +0800 >> Subject: [PATCH 2/2] wpcap: Fix crash on pcap_loop >> > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Was there a reason you didn't use a simple stack variable originally? -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Nikolay Sivov Feb. 13, 2016

Feb. 13, 2016

On 14.02.2016 2:19, Theodore Dubois wrote: > Basically, returns the correct value for > ASSOCSTR_FRIENDLYDOCNAME and ASSOCSTR_DEFAULTICON > when passed a ProgID instead of a file extension. > > Also adds some tests to make sure it works. > > Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> > --- > dlls/shell32/assoc.c | 146 +++++++++++++++++++++++++-------------------- > dlls/shell32/tests/assoc.c | 71 +++++++++++++++++++++- > 2 files changed, 151 insertions(+), 66 deletions(-) > > diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c > index 90d00a8..2667ffe 100644 > --- a/dlls/shell32/assoc.c > +++ b/dlls/shell32/assoc.c > @@ -63,6 +63,7 @@ typedef struct > LONG ref; > HKEY hkeySource; > HKEY hkeyProgID; > + LPWSTR pszAssocName; > } IQueryAssociationsImpl; Why do you need this? It's not used anywhere as far as I can tell. > > typedef struct > @@ -88,6 +89,8 @@ static inline struct enumassochandlers *impl_from_IEnumAssocHandlers(IEnumAssocH > return CONTAINING_RECORD(iface, struct enumassochandlers, IEnumAssocHandlers_iface); > } > > +static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD *data_size); > + > /************************************************************************** > * IQueryAssociations_QueryInterface > * > @@ -152,6 +155,7 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) > TRACE("Destroying IQueryAssociations (%p)\n", This); > RegCloseKey(This->hkeySource); > RegCloseKey(This->hkeyProgID); > + HeapFree(GetProcessHeap(), 0, (LPVOID)This->pszAssocName); > SHFree(This); > } No need for a cast. > > @@ -186,20 +190,30 @@ static HRESULT WINAPI IQueryAssociations_fnInit( > LONG ret; > > TRACE("(%p)->(%d,%s,%p,%p)\n", iface, > - cfFlags, > - debugstr_w(pszAssoc), > - hkeyProgid, > - hWnd); > + cfFlags, > + debugstr_w(pszAssoc), > + hkeyProgid, > + hWnd); No need for that either. > + > + This->pszAssocName = HeapAlloc(GetProcessHeap(), 0, (strlenW(pszAssoc) + 10001) * sizeof(WCHAR)); Seriously? > - *data = HeapAlloc(GetProcessHeap(), 0, size); > + *data = HeapAlloc(GetProcessHeap(), 0, size + 100); What is that? > if (!*data) > return E_OUTOFMEMORY; > ret = RegQueryValueExW(hkey, name, 0, NULL, (LPBYTE)*data, &size); > @@ -507,33 +550,16 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( > > case ASSOCSTR_FRIENDLYDOCNAME: > { > - WCHAR *pszFileType; > - DWORD ret; > - DWORD size; > + WCHAR *docName; > + > + if (This->hkeyProgID == NULL) { > + > + } And that? > diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c > index 8aa2535..1ba4261 100644 > --- a/dlls/shell32/tests/assoc.c > +++ b/dlls/shell32/tests/assoc.c > @@ -91,6 +91,8 @@ struct assoc_getstring_test > }; > > static const WCHAR httpW[] = {'h','t','t','p',0}; > +static const WCHAR dot_urlW[] = {'.','u','r','l',0}; > +static const WCHAR InternetShortcutW[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; > static const WCHAR badW[] = {'b','a','d','b','a','d',0}; > > static struct assoc_getstring_test getstring_tests[] = > @@ -135,7 +137,7 @@ static void test_IQueryAssociations_GetString(void) > else > { > ok(hr == ptr->hr, "%d: GetString failed, 0x%08x\n", i, hr); > - ok(len > ptr->len, "%d: got needed length %d\n", i, len); > + ok(len >= ptr->len, "%d: got needed length %d\n", i, len); > } Why '>' was enough before? > + getstring_test(0, NULL, test_progid_key, ASSOCSTR_DEFAULTICON, NULL, S_OK, test_iconW); > + If it's only called with 0 flags, there's no need in this argument. > + //RegDeleteKeyExW(HKEY_CLASSES_ROOT, test_extensionW, KEY_WOW64_32KEY, 0); > + //RegDeleteKeyExW(HKEY_CLASSES_ROOT, test_progidW, KEY_WOW64_32KEY, 0); > +} Leftovers? > + > static void test_IQueryAssociations_Init(void) > { > IQueryAssociations *assoc; > @@ -229,6 +297,7 @@ START_TEST(assoc) > if (hr == S_OK) > { > test_IQueryAssociations_QueryInterface(); > + test_IQueryAssociations_GetString_results(); > test_IQueryAssociations_GetString(); > test_IQueryAssociations_Init(); Please merge this with existing *_GetString().

2 1

Re: shell32/tests: Fix an ok() call so it shows which DDE test caused the failure.
by Marvin Feb. 13, 2016

Feb. 13, 2016

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=20416 Your paranoid android. === wvistau64 (64 bit shlexec) === shlexec.c:2178: Test failed: ShellExecuteEx(mask="0x808040", file="C:/Users/winetest/AppData/Local/Temp/wtD2D8.tmp/test_shortcut_exe.lnk") WaitForSingleObject(hProcess) returned 258 shlexec.c:2178: Test failed: ShellExecuteEx(mask="0x808040", file="C:/Users/winetest/AppData/Local/Temp/wtD2D8.tmp/test_shortcut_exe.lnk") child returned 259

1 0

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Marvin Feb. 13, 2016

Feb. 13, 2016

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=20415 Your paranoid android. === wxppro (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 === w2003std (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 === wvistau64 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w2008s64 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w7u (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w7pro64 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w8 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w864 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w1064 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === wvistau64 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w2008s64 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w7pro64 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w864 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w1064 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0

1 0

Re: [4/5] ntdll/tests: Fix flags passed to VirtualFree in exception tests.
by Marvin Feb. 13, 2016

Feb. 13, 2016

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=20412 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/003D0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

2 1

Re: [1/5] kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character.
by Marvin Feb. 13, 2016

Feb. 13, 2016

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=20409 Your paranoid android. === w1064 (32 bit locale) === locale.c:2383: Test failed: LCMapStringEx should fail with bad locale name locale.c:2384: Test failed: unexpected error code -559038737 locale.c:2475: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4198: Test failed: IsValidLocaleName should have failed locale.c:4200: Test failed: IsValidLocaleName should have failed locale.c:4565: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4567: Test failed: For id 7, Expected IVC, got ''

2 1

Re: wineboot: Create serial comm registry keys
by Sebastian Lackner Feb. 12, 2016

Feb. 12, 2016

On 12.02.2016 00:32, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > For https://bugs.winehq.org/show_bug.cgi?id=11811 > > > programs/wineboot/wineboot.c | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > Are you sure there are no keys for com ports >= 10? In general, such serial ports are also possible. Nevertheless, more important: If I don't miss anything, the user still has to manually create a symlink in dosdevices/, otherwise this method will not work. Accessing serial ports on the other hand doesn't require any manual configuration when get_default_com_device() recognizes them (and the user has access). What is the benefit when it still requires manual user interaction?

2 5

Re: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump(try 5)
by André Hentschel Feb. 12, 2016

Feb. 12, 2016

Hi, great to see you continue your work :) But you missed a lot of valuable hints from Sebastian in try 4 and 5 What I need to add is that I'd still like to see the pcap_close function in the same patch and a TRACE in pcap_dump. In pcap_dump you could also remove the return as it is a void function, but the file isn't consistent in that regard anyway. Thinking twice, the pcap_dump function should maybe be a seperate patch, while the pcap_close function really should go in this one. Am 12.02.2016 um 17:14 schrieb Jianqiu Zhang: > From 2c90ac326c3eb2d58c95a219616b6789e98499ef Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Thu, 29 Oct 2015 15:33:28 +0800 > Subject: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/wpcap/wpcap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ > dlls/wpcap/wpcap.spec | 4 ++-- > 2 files changed, 46 insertions(+), 2 deletions(-) > > diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c > index ae9e482..b3bb6a5 100644 > --- a/dlls/wpcap/wpcap.c > +++ b/dlls/wpcap/wpcap.c > @@ -18,10 +18,13 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#include "ntstatus.h" > +#define WIN32_NO_STATUS > #include <pcap/pcap.h> > #include "winsock2.h" > #include "windef.h" > #include "winbase.h" > +#include "winternl.h" > #include "wine/debug.h" > > WINE_DEFAULT_DEBUG_CHANNEL(wpcap); > @@ -339,3 +342,44 @@ int CDECL wine_wsockinit(void) > if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; > return 0; > } > + > +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) > +{ > + UNICODE_STRING nt_name, dospathW; > + ANSI_STRING fname_dos; > + ANSI_STRING fname_unix; > + pcap_dumper_t *dumper_data; > + NTSTATUS status; > + TRACE("(%p %s)\n", p, fname); > + RtlInitAnsiString(&fname_dos, fname); > + status = RtlAnsiStringToUnicodeString(&dospathW, &fname_dos, TRUE); > + if (status) > + { > + SetLastError(RtlNtStatusToDosError(status)); > + return NULL; > + } > + if (!RtlDosPathNameToNtPathName_U(dospathW.Buffer, &nt_name, NULL, NULL)) > + { > + RtlFreeUnicodeString(&dospathW); > + SetLastError(ERROR_PATH_NOT_FOUND); > + return NULL; > + } > + status = wine_nt_to_unix_file_name(&nt_name, &fname_unix, FILE_OPEN_IF, FALSE); > + if (status && status != STATUS_NO_SUCH_FILE) > + { > + RtlFreeUnicodeString(&dospathW); > + RtlFreeUnicodeString(&nt_name); > + SetLastError(RtlNtStatusToDosError(status)); > + return NULL; > + } > + RtlFreeUnicodeString(&nt_name); > + RtlFreeUnicodeString(&dospathW); > + dumper_data = pcap_dump_open(p, fname_unix.Buffer); > + RtlFreeAnsiString(&fname_unix); > + return dumper_data; > +} > + > +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) > +{ > + return pcap_dump(user, h, sp); > +} > diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec > index 66303b4..541fc49 100644 > --- a/dlls/wpcap/wpcap.spec > +++ b/dlls/wpcap/wpcap.spec > @@ -16,12 +16,12 @@ > @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description > @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name > @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch > -@ stub pcap_dump > +@ cdecl pcap_dump(ptr ptr ptr) wine_pcap_dump > @ stub pcap_dump_close > @ stub pcap_dump_file > @ stub pcap_dump_flush > @ stub pcap_dump_ftell > -@ stub pcap_dump_open > +@ cdecl pcap_dump_open(ptr str) wine_pcap_dump_open > @ stub pcap_file > @ stub pcap_fileno > @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs > -- > 2.7.1 > > >

1 0

Re: [PATCH] dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up.
by Nikolay Sivov Feb. 12, 2016

Feb. 12, 2016

On 12.02.2016 12:00, Charles Davis wrote: > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > dlls/dwrite/opentype.c | 39 ++++++++++++++++++++++++++++++++++++--- > 1 file changed, 36 insertions(+), 3 deletions(-) > > diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c > index 5b29c21..7d59bf8 100644 > --- a/dlls/dwrite/opentype.c > +++ b/dlls/dwrite/opentype.c > @@ -470,7 +470,7 @@ enum TT_NAME_MAC_LANGUAGE_ID > TT_NAME_MAC_LANGID_LAO, > TT_NAME_MAC_LANGID_VIETNAMESE, > TT_NAME_MAC_LANGID_INDONESIAN, > - TT_NAME_MAC_LANGID_TAGALONG, > + TT_NAME_MAC_LANGID_TAGALOG, > TT_NAME_MAC_LANGID_MALAY_ROMAN, > TT_NAME_MAC_LANGID_MALAY_ARABIC, > TT_NAME_MAC_LANGID_AMHARIC, > @@ -483,11 +483,11 @@ enum TT_NAME_MAC_LANGUAGE_ID > TT_NAME_MAC_LANGID_NYANJA, > TT_NAME_MAC_LANGID_MALAGASY, > TT_NAME_MAC_LANGID_ESPERANTO, > - TT_NAME_MAC_LANGID_WELSH, > + TT_NAME_MAC_LANGID_WELSH = 128, > TT_NAME_MAC_LANGID_BASQUE, > TT_NAME_MAC_LANGID_CATALAN, > TT_NAME_MAC_LANGID_LATIN, > - TT_NAME_MAC_LANGID_QUENCHUA, > + TT_NAME_MAC_LANGID_QUECHUA, > TT_NAME_MAC_LANGID_GUARANI, > TT_NAME_MAC_LANGID_AYMARA, > TT_NAME_MAC_LANGID_TATAR, Hi, typos come from https://www.microsoft.com/typography/otspec/name.htm, thanks for fixing this. Broken indexing is something I missed though. I'm curious how did you spot this? Is there some fonts around that use id >= 128 on mac?

2 1

Re: [PATCH 5/5] ntdll: Add special handling for int $0x2d exceptions.
by Marvin Feb. 12, 2016

Feb. 12, 2016

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=20397 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x340000/0x340001 exception: unhandled exception 80000004 at 00340000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x340001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3f0000/0x3f0001 exception: unhandled exception 80000004 at 003F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x3f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

[PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump(try 4)
by Jianqiu Zhang Feb. 12, 2016

Feb. 12, 2016

>From 4e905186d67501943897e517a4a1cdfffe45993b Mon Sep 17 00:00:00 2001 From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Date: Thu, 29 Oct 2015 15:33:28 +0800 Subject: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> --- dlls/wpcap/wpcap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wpcap/wpcap.spec | 4 ++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index ae9e482..b3bb6a5 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -18,10 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS #include <pcap/pcap.h> #include "winsock2.h" #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wpcap); @@ -339,3 +342,44 @@ int CDECL wine_wsockinit(void) if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; return 0; } + +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) +{ + UNICODE_STRING nt_name, dospathW; + ANSI_STRING fname_dos; + ANSI_STRING fname_unix; + pcap_dumper_t *dumper_data; + NTSTATUS status; + TRACE("(%p %s)\n", p, fname); + RtlInitAnsiString(&fname_dos, fname); + status = RtlAnsiStringToUnicodeString(&dospathW, &fname_dos, TRUE); + if (status) + { + SetLastError(RtlNtStatusToDosError(status)); + return NULL; + } + if (!RtlDosPathNameToNtPathName_U(dospathW.Buffer, &nt_name, NULL, NULL)) + { + RtlFreeUnicodeString(&dospathW); + SetLastError(ERROR_PATH_NOT_FOUND); + return NULL; + } + status = wine_nt_to_unix_file_name(&nt_name, &fname_unix, FILE_OPEN_IF, FALSE); + if (status && status != STATUS_NO_SUCH_FILE) + { + RtlFreeUnicodeString(&dospathW); + RtlFreeUnicodeString(&nt_name); + SetLastError(RtlNtStatusToDosError(status)); + return NULL; + } + RtlFreeUnicodeString(&nt_name); + RtlFreeUnicodeString(&dospathW); + dumper_data = pcap_dump_open(p, fname_unix.Buffer); + RtlFreeAnsiString(&fname_unix); + return dumper_data; +} + +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) +{ + return pcap_dump(user, h, sp); +} diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 66303b4..541fc49 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -16,12 +16,12 @@ @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch -@ stub pcap_dump +@ cdecl pcap_dump(ptr ptr ptr) wine_pcap_dump @ stub pcap_dump_close @ stub pcap_dump_file @ stub pcap_dump_flush @ stub pcap_dump_ftell -@ stub pcap_dump_open +@ cdecl pcap_dump_open(ptr str) wine_pcap_dump_open @ stub pcap_file @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs -- 2.7.1

1 1

Re: [v3 PATCH] user32/test: Color message isn't sent during startup for buttons.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > v3 > Correct patch title. > hok is correct for the scenario being tested. > > If this isn't the correct location for the test, please let me know. It isn't, edit.c is for testing the edit control, surprisingly ;-) I'd suggest to put it in msg.c, there are already several WM_CTLCOLOR* tests in there. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/2] kernel32/tests: Add additional tests for CompareStringA.
by Marvin Feb. 12, 2016

Feb. 12, 2016

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=20380 Your paranoid android. === w1064 (32 bit locale) === locale.c:2353: Test failed: LCMapStringEx should fail with bad locale name locale.c:2354: Test failed: unexpected error code -559038737 locale.c:2445: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4168: Test failed: IsValidLocaleName should have failed locale.c:4170: Test failed: IsValidLocaleName should have failed locale.c:4535: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4537: Test failed: For id 7, Expected IVC, got ''

2 1

Re: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump(try 3)
by Sebastian Lackner Feb. 12, 2016

Feb. 12, 2016

On 12.02.2016 06:31, Jianqiu Zhang wrote: > From ba4fa665f40975587c8aeb132f853afa4c28b4ca Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Thu, 29 Oct 2015 15:33:28 +0800 > Subject: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/wpcap/wpcap.c | 43 +++++++++++++++++++++++++++++++++++++++++++ > dlls/wpcap/wpcap.spec | 4 ++-- > 2 files changed, 45 insertions(+), 2 deletions(-) > > diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c > index ae9e482..074c495 100644 > --- a/dlls/wpcap/wpcap.c > +++ b/dlls/wpcap/wpcap.c > @@ -22,6 +22,8 @@ > #include "winsock2.h" > #include "windef.h" > #include "winbase.h" > +#include "winternl.h" > +#include "ntstatus.h" As you already found out, this leads to build failures / warnings. You have to include "ntstatus.h" in the beginning, and then #define WIN32_NO_STATUS to avoid the duplicate definitions from other files. > #include "wine/debug.h" > > WINE_DEFAULT_DEBUG_CHANNEL(wpcap); > @@ -339,3 +341,44 @@ int CDECL wine_wsockinit(void) > if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; > return 0; > } > + The code below should be technically fine, so it depends on André if its acceptable as-is or if more cleanup is necessary. I would like to point out a couple more opportunities to make it easier to read. > +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) > +{ > + UNICODE_STRING nt_name, dospathW; With more consistent variable names it would be easier to recognize W and ansi strings. > + ANSI_STRING fname_dos; > + ANSI_STRING fname_unix; This could go into a single line. > + pcap_dumper_t *dumper_data; > + NTSTATUS status; > + TRACE("(%p %s)\n", p, fname); Some linebreaks in front and after the TRACE would not hurt, to make it more readable. > + RtlInitAnsiString(&fname_dos, fname); > + status = RtlAnsiStringToUnicodeString(&dospathW, &fname_dos, TRUE); > + if (status) > + { > + SetLastError(RtlNtStatusToDosError(status)); > + return NULL; > + } > + if (!RtlDosPathNameToNtPathName_U(dospathW.Buffer, &nt_name, NULL, NULL)) > + { > + RtlFreeUnicodeString(&dospathW); > + SetLastError(ERROR_PATH_NOT_FOUND); > + return NULL; > + } > + status = wine_nt_to_unix_file_name(&nt_name, &fname_unix, FILE_OPEN_IF, FALSE); You can move the RtlFreeUnicodeString(.) functions here to avoid code duplication. > + if (status && status != STATUS_NO_SUCH_FILE) > + { > + RtlFreeUnicodeString(&dospathW); > + RtlFreeUnicodeString(&nt_name); > + SetLastError(RtlNtStatusToDosError(status)); > + return NULL; > + } > + RtlFreeUnicodeString(&nt_name); > + RtlFreeUnicodeString(&dospathW); > + dumper_data = pcap_dump_open(p, fname_unix.Buffer); > + RtlFreeAnsiString(&fname_unix); > + return dumper_data; > +} > + > +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) > +{ > + return pcap_dump(user, h, sp); > +} > diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec > index 66303b4..541fc49 100644 > --- a/dlls/wpcap/wpcap.spec > +++ b/dlls/wpcap/wpcap.spec > @@ -16,12 +16,12 @@ > @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description > @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name > @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch > -@ stub pcap_dump > +@ cdecl pcap_dump(ptr ptr ptr) wine_pcap_dump > @ stub pcap_dump_close > @ stub pcap_dump_file > @ stub pcap_dump_flush > @ stub pcap_dump_ftell > -@ stub pcap_dump_open > +@ cdecl pcap_dump_open(ptr str) wine_pcap_dump_open > @ stub pcap_file > @ stub pcap_fileno > @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs > > > >

1 0

Re: [PATCH 2/2] wpcap: Fix crash on pcap_loop(try 2)
by Sebastian Lackner Feb. 12, 2016

Feb. 12, 2016

On 11.02.2016 09:55, Jianqiu Zhang wrote: > From 359272d74611e2c4a6ab1e3eb452cb277043b6d2 Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Tue, 5 Jan 2016 09:12:42 +0800 > Subject: [PATCH 2/2] wpcap: Fix crash on pcap_loop > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/wpcap/wpcap.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c > index e03e18e..3b0f618 100644 > --- a/dlls/wpcap/wpcap.c > +++ b/dlls/wpcap/wpcap.c > @@ -99,7 +99,6 @@ static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h > TRACE("(%p %p %p)\n", user_data, h, p); > pcb = (PCAP_HANDLER_CALLBACK *)user_data; > pcb->pfn_cb(pcb->user_data, h, p); > - HeapFree(GetProcessHeap(), 0, pcb); > TRACE("Callback COMPLETED\n"); > } > > @@ -111,11 +110,14 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, > > if (callback) > { > + int res = 0; You can remove the initialization here. In fact some analyzers will warn about double-initialization when you do that although its not really necessary. > PCAP_HANDLER_CALLBACK *pcb; > pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); > pcb->pfn_cb = callback; > pcb->user_data = user; > - return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb); > + res = pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char *)pcb); > + HeapFree(GetProcessHeap(), 0, pcb); > + return res; > } > > return pcap_dispatch(p, cnt, NULL, user); > @@ -204,11 +206,14 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt, > > if (callback) > { > + int res = 0; Same here. > PCAP_HANDLER_CALLBACK *pcb; > pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); > pcb->pfn_cb = callback; > pcb->user_data = user; > - return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb); > + res = pcap_loop(p, cnt, pcap_handler_callback, (unsigned char *)pcb); > + HeapFree(GetProcessHeap(), 0, pcb); > + return res; > } > > return pcap_loop(p, cnt, NULL, user); > > > >

2 2

Re: [PATCH 3/5] wined3d: Check relative addressing indices when accessing uniforms in GLSL shaders.
by Stefan Dösinger Feb. 11, 2016

Feb. 11, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 > + sprintf(register_name, "(%s + %u >= 0 && > %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", Did you do any testing on the performance impact of this? This seems like something where it's convenient to sacrifice performance everywhere for a corner case, but later on we wonder why games are unplayably slow. Keep in mind that currently it's pretty difficult to be GPU limited. With the CSMT patches you'll have a higher chance of being GPU limited, but there's no guarantee of course. dx10+ GPUs don't return 0.0 reliably on Windows here. My Geforce GPUs returned the int constants at c[-32] to c[-48]. I think there are additional options of increasing our odds of behaving like Windows. E.g. with constant buffers we could create a buffer that matches the hardware page size (which we can't query, I know) and fill everything except the 256 d3d9 constants with zeroes. If the out of bounds read falls into the buffer we get a zero. If not, the hardware should detect the invalid read and I'd expect it to return zero due to exactly this d3d requirement. Also I think d3d9 HW should "just work" in this regard because only 256 registers exist. Yes, I am aware that there are more games than just The Witcher that are affected by this problem. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWvPcoAAoJEN0/YqbEcdMwUJwQAI4eKz1YGS4N/VzSAt/7QlT+ xq6KOrGGjkbJCjtW97R16hisqLTrNqmq80qvHAPHX0Nh2Pa5Dcx9sbbgryGEsSfm ExzAKuMUSPsNch9mb5+72zXYn71UCRmBZxcfkt/NwQSD8qfhQD13OdxhQrWordMJ ZKphTjiBk7/O2gA6myxt7QcbFYjLHuee6kA909EF0tEpfjQ2Zeu+OsvTUnKbpQ1o P/nUU8goFpn0yom3X07dnjXkDUnvpuyK2d+5Mgp2xt9sHya0gGN5dbTNnRyEPs7O IwmWEUzVTQxEJYakASjZxA+3FlkzJrCZUHKufWNWMwPSFFCThuF/JXEoFb4+khW9 uVW0J73q257JibOvWg1AsJwGumn+5jKtXqrAO0WZlshxDx6iudN8RMEv2RngeMeo SFzYWfzHgLfHYmCeGVpPGqc9H3ThTukvymi3bBitqv0t/Zp7cXQ8fh0ghHNdRiEw 6ygzJxUJay3CRr9VKm/8hUaJBHCFdZOYjEk1z5IpgJhS4igeab7bE/z6KenCiY08 0/Mpb7UnUnrKb229u0fwEMyJSUHt8FkSf5tJBi4Bnl11qfDJdBccUc/5HuYB2Puk XfbWNHUDZA6clW/G2MumekuyUi9F4QIWypUrsqgBaWgJ+xxTzmm3UCOQkc4uv9as h5IrX0kN1CRYpBMwurXg =K2RI -----END PGP SIGNATURE-----

3 2

Re: (v2) uxtheme: test and fix CloseThemeData with invalid handle value
by Sebastian Lackner Feb. 11, 2016

Feb. 11, 2016

On 11.02.2016 20:34, Piet Jankbal wrote: > Now hopefully with correct signed-off statement. I lost my old > email-account, that's why i've sent it from new account (with fake-name, > now it should appear with my correct name) > > Hi, this fixes https://bugs.winehq.org/show_bug.cgi?id=29862 > > Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com > <https://www.winehq.org/mailman/listinfo/wine-patches>> > > > > > > signed off: Louis Lenders > > The author is still not correct, and there is a ">" missing at the end of the Signed-off-by line. You can also add a "From: ..." line at the beginning if you can't change the author in your mail client.

1 0

Re: kernel32: return a dummy value in GetSystemPreferredUILanguages
by Marvin Feb. 11, 2016

Feb. 11, 2016

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=20339 Your paranoid android. === w1064 (32 bit locale) === locale.c:2339: Test failed: LCMapStringEx should fail with bad locale name locale.c:2340: Test failed: unexpected error code -559038737 locale.c:2431: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4154: Test failed: IsValidLocaleName should have failed locale.c:4156: Test failed: IsValidLocaleName should have failed locale.c:4521: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4523: Test failed: For id 7, Expected IVC, got ''

2 1

Re: [PATCH] comdlg32/tests: Simplify a test using todo_wine_if()
by Marvin Feb. 11, 2016

Feb. 11, 2016

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=20372 Your paranoid android. === wvistau64 (32 bit filedlg) === filedlg.c:1052: Test failed: TestFilter (*.abc;*.def): expected TRUE filedlg.c:1058: Test failed: TestFilter (*.abc;*.def): Filename is deadbeef, expected deadbeef.abc

1 0