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

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

12 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 12 Feb '16

12 Feb '16

>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 12 Feb '16

12 Feb '16

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 12 Feb '16

12 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 12 Feb '16

12 Feb '16

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 12 Feb '16

12 Feb '16

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 11 Feb '16

11 Feb '16

-----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 11 Feb '16

11 Feb '16

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 11 Feb '16

11 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 11 Feb '16

11 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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