wine-devel February 2016

wine-devel@winehq.org

55 participants
280 discussions

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

15 Feb '16

1 0

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

15 Feb '16

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

15 Feb '16

1 0

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

15 Feb '16

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

15 Feb '16

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

15 Feb '16

1 0

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

15 Feb '16

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

15 Feb '16

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

15 Feb '16

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

1 0

Re: [v3] shell32: fix two bugs in IQueryAssocations
by Marvin 15 Feb '16

15 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=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

← Newer
1
...
15
16
17
18
19
20
21
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2016