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

Re: kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Dmitry Timoshkov March 12, 2016

March 12, 2016

Thanks, I have only style related comments, and since I'm an author of existing tests I'd prefer to keep an original style if possible. Jacek Caban <jacek(a)codeweavers.com> wrote: > --- a/dlls/advapi32/tests/security.c > +++ b/dlls/advapi32/tests/security.c > @@ -5560,17 +5560,23 @@ static void test_filemap_security(void) > char temp_path[MAX_PATH]; > char file_name[MAX_PATH]; > DWORD ret, i, access; > - HANDLE file, mapping, dup; > + HANDLE file, mapping, dup, created_mapping; > static const struct > { > - int generic, mapped; > + DWORD generic, mapped; Please leave 'int' type, it changes nothing. > + BOOL open_only; > } map[] = > { > { 0, 0 }, > { GENERIC_READ, STANDARD_RIGHTS_READ | SECTION_QUERY | SECTION_MAP_READ }, > { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE }, > { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE }, > - { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS } > + { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS }, > + { SECTION_MAP_READ | SECTION_MAP_WRITE, SECTION_MAP_READ | SECTION_MAP_WRITE}, > + { SECTION_MAP_WRITE, SECTION_MAP_WRITE}, > + { SECTION_MAP_READ | SECTION_QUERY, SECTION_MAP_READ | SECTION_QUERY}, > + { SECTION_QUERY, SECTION_MAP_READ, TRUE }, > + { SECTION_QUERY | SECTION_MAP_READ, SECTION_QUERY | SECTION_MAP_READ } > }; > static const struct > { > @@ -5599,6 +5605,8 @@ static void test_filemap_security(void) > > for (i = 0; i < sizeof(prot_map)/sizeof(prot_map[0]); i++) > { > + if (map[i].open_only) continue; > + > SetLastError(0xdeadbeef); > mapping = CreateFileMappingW(file, NULL, prot_map[i].prot, 0, 4096, NULL); > if (prot_map[i].mapped) > @@ -5645,6 +5653,8 @@ static void test_filemap_security(void) > > for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) > { > + if (map[i].open_only) continue; > + > SetLastError( 0xdeadbeef ); > ret = DuplicateHandle(GetCurrentProcess(), mapping, GetCurrentProcess(), &dup, > map[i].generic, FALSE, 0); > @@ -5659,6 +5669,24 @@ static void test_filemap_security(void) > CloseHandle(mapping); > CloseHandle(file); > DeleteFileA(file_name); > + > + created_mapping = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 0x1000, > + "Wine Test Open Mapping"); > + ok( created_mapping != NULL, "CreateFileMapping failed with error %u\n", GetLastError() ); > + > + for(i=0; i < sizeof(map)/sizeof(*map); i++) Please add spaces around '=' and use sizeof(map[0]) for consistency with existing code. > + { > + if (!map[i].generic) continue; > + > + mapping = OpenFileMappingA( map[i].generic, FALSE, "Wine Test Open Mapping"); > + ok( mapping != NULL, "OpenFileMapping failed with error %d\n", GetLastError()); > + access = get_obj_access( mapping ); > + ok( access == map[i].mapped, "[%d] unexpected access flags %x, expected %x\n", > + i, access, map[i].mapped ); Please use "%d:" instead of [%d] and %#x instead of %x for consistency with existing code. P.S. That's perfectly fine to completely ignore my comments, just wanted to show how it looks like for comparison with d3d-like acceptance policy :) -- Dmitry.

3 4

Attachments missing in new wiki
by Qian Hong March 11, 2016

March 11, 2016

Hi folks, Thanks for migrating the wiki to new site. Recently two different people ask me about attachments on https://wiki.winehq.org/WineConf2015, and I found they are missing, anyone knows what happen during the migration? Should we manually upload again? Is there backup for the attachments from old side? Thanks! -- Regards, Qian Hong - http://www.winehq.org

5 5

Re: [PATCH 2/6] ddraw/tests: Skip initialising "quad" and "indices" in test_specular_lighting() if a 3D device can't be crea
by Marvin March 11, 2016

March 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=21376 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === The test timed out

1 0

Re: [PATCH try2] kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Marvin March 11, 2016

March 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=21372 Your paranoid android. === w1064 (32 bit security) === security.c:3964: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:4005: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:4009: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4018: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0) === w1064 (64 bit security) === security.c:4005: Test failed: Builtin Users ACE has unexpected flags (0x2 != 0xa) security.c:4009: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4018: Test failed: Builtin Admins ACE has unexpected flags (0x2 != 0x0)

1 0

Re: kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Marvin March 11, 2016

March 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=21371 Your paranoid android. === w1064 (32 bit security) === security.c:3964: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:4005: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:4009: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4018: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0) === w1064 (64 bit security) === security.c:4005: Test failed: Builtin Users ACE has unexpected flags (0x2 != 0xa) security.c:4009: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4018: Test failed: Builtin Admins ACE has unexpected flags (0x2 != 0x0)

1 0

Re: kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Dmitry Timoshkov March 11, 2016

March 11, 2016

Hi Jacek, Jacek Caban <jacek(a)codeweavers.com> wrote: > +static void test_OpenFileMapping(void) > +{ > + HANDLE created_handle, handle; > + DWORD access; > + int i; > + > + static const struct { > + DWORD open_access; > + DWORD handle_access; > + } access_tests[] = { > + { FILE_MAP_ALL_ACCESS, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_EXTEND_SIZE | SECTION_MAP_EXECUTE | SECTION_MAP_READ | SECTION_MAP_WRITE }, > + { SECTION_MAP_READ | SECTION_MAP_WRITE, SECTION_MAP_READ | SECTION_MAP_WRITE}, > + { SECTION_MAP_WRITE, SECTION_MAP_WRITE}, > + { SECTION_MAP_READ | SECTION_QUERY, SECTION_MAP_READ | SECTION_QUERY}, > + { SECTION_QUERY, SECTION_MAP_READ }, > + { SECTION_QUERY | SECTION_MAP_READ, SECTION_QUERY | SECTION_MAP_READ }, > + { GENERIC_READ, READ_CONTROL | SECTION_MAP_READ | SECTION_QUERY } > + }; > + > + created_handle = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 0x1000, > + "Wine Test Open Mapping"); > + ok( created_handle != NULL, "CreateFileMapping failed with error %u\n", GetLastError()); > + > + for(i=0; i < sizeof(access_tests)/sizeof(*access_tests); i++) > + { > + handle = OpenFileMappingA( access_tests[i].open_access, FALSE, "Wine Test Open Mapping"); > + ok( handle != NULL, "OpenFileMapping failed with error %d\n", GetLastError()); > + access = get_obj_access( handle ); > + ok( access == access_tests[i].handle_access, "[%d] unexpected access flags %x, expected %x\n", > + i, access, access_tests[i].handle_access ); > + CloseHandle( handle ); > + } > + > + CloseHandle( created_handle ); > + } Please correct me if I'm mistaken but this test is basically a modified copy of test_filemap_security() from dlls/advapi32/tests/security.c, why not add it there and extend the test if needed so that all related tests are collected in one place? -- Dmitry.

2 1

Re: [v2 3/6] d3dx9: implement fxlc constants (expressions) in effect.
by Marvin March 10, 2016

March 10, 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=21342 Your paranoid android. === w8 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w864 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w1064 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w864 (64 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w1064 (64 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c.

2 1

Re: [v2 1/6] d3dx9: add test for preshader in effect.
by Marvin March 10, 2016

March 10, 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=21340 Your paranoid android. === w8 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w864 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w1064 (32 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w864 (64 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. === w1064 (64 bit effect) === effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c. effect.c:3668: Test failed: Got result 0x8876086c.

1 0

Re: [PATCH 3/6] d3dx9: implement fxlc constants (expressions) in effect.
by Marvin March 10, 2016

March 10, 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=21341 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: wined3d: add Nvidia GPU SKUS (950,950M,960,960M)
by Henri Verbeet March 10, 2016

March 10, 2016

On 10 March 2016 at 01:40, Rob Walker <bob.mt.wya(a)gmail.com> wrote: > + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, > + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 2048}, This looks wrong. You're also missing a sign-off line.

1 0

Re: winex11.drv: Allow grabed window belonging to a different thread in send_mouse_input.
by Henri Verbeet March 10, 2016

March 10, 2016

On 8 March 2016 at 17:01, Jacek Caban <jacek(a)codeweavers.com> wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > > If we call XGrabPointer on a window belonging to a different thread, we > may end up handling its events with different display and being unable > to associate X11 window with HWND. Is calling SetCapture() on a window from a different thread really supposed to be valid? Assuming it is, wouldn't it then be easier to grab the window from the correct thread instead? (Similar to how e.g. WM_X11DRV_CLIP_CURSOR works.)

2 1

Re: [PATCH] ole32: Implement CoGetCurrentLogicalThreadId()
by Huw Davies March 10, 2016

March 10, 2016

On Wed, Mar 09, 2016 at 11:43:26PM +0300, Nikolay Sivov wrote: > diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c > index 183d8a0..e0c396f 100644 > --- a/dlls/ole32/tests/compobj.c > +++ b/dlls/ole32/tests/compobj.c > @@ -3093,6 +3093,21 @@ static void test_IMallocSpy(void) > ok(hr == CO_E_OBJNOTREG, "got 0x%08x\n", hr); > } > > +static void test_CoGetCurrentLogicalThreadId(void) > +{ > + GUID id, id2; > + HRESULT hr; > + > + hr = CoGetCurrentLogicalThreadId(NULL); > + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); > + > + memset(&id, 0, sizeof(id)); > + memset(&id2, 0, sizeof(id2)); > + hr = CoGetCurrentLogicalThreadId(&id); > + ok(hr == S_OK, "got 0x%08x\n", hr); > + ok(memcmp(&id, &id2, sizeof(id)), "got zero id\n"); Any reason why you didn't do ok(!IsEqualGUID(&id, &GUID_NULL), ...) here? A follow-up patch could implement Context_CTI_GetCurrentLogicalThreadId() using CoGetCurrentLogicalThreadId(). Huw.

2 1

Re: [PATCH 2/6] d3dx9: add preshaders to effect.
by Matteo Bruni March 10, 2016

March 10, 2016

2016-03-09 14:38 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/Makefile.in | 3 +- > dlls/d3dx9_36/d3dx9_36_private.h | 36 +++ > dlls/d3dx9_36/effect.c | 80 +++-- > dlls/d3dx9_36/preshader.c | 671 +++++++++++++++++++++++++++++++++++++++ > 4 files changed, 757 insertions(+), 33 deletions(-) > create mode 100644 dlls/d3dx9_36/preshader.c > > diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in > index 95e3045..b71b38e 100644 > --- a/dlls/d3dx9_36/Makefile.in > +++ b/dlls/d3dx9_36/Makefile.in > @@ -19,6 +19,7 @@ C_SRCS = \ > texture.c \ > util.c \ > volume.c \ > - xfile.c > + xfile.c \ > + preshader.c Please keep this in alphabetic order. > @@ -5427,6 +5407,7 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct > DWORD string_size; > struct d3dx_object *object = &base->objects[param->object_id]; > char *ptr = object->data; > + HRESULT ret; > > TRACE("Parsing array entry selection state for parameter %p.\n", param); > > @@ -5443,9 +5424,30 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct > } > TRACE("Unknown DWORD: 0x%.8x.\n", *(DWORD *)(ptr + string_size)); > > - FIXME("Parse preshader.\n"); > + d3dx_create_preshader(base, (DWORD *)(ptr + string_size) + 1, object->size - (string_size + 1), > + D3DXPT_INT, &param->pres); > + ret = D3D_OK; > + param = param->referenced_param; > + if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) > + { > + UINT i; > > - return D3D_OK; > + for (i = 0; i < param->element_count; i++) > + { > + if (param->members[i].type != param->type) > + { > + FIXME("Unexpected member parameter type %u (need %u).\n", param->members[i].type, param->type); > + return D3DXERR_INVALIDDATA; > + } > + if (!param->members[i].pres) > + { > + TRACE("Creating preshader for object %u.\n", param->members[i].object_id); > + object = &base->objects[param->members[i].object_id]; > + d3dx_create_preshader(base, object->data, object->size, param->type, &param->members[i].pres); > + } > + } > + } > + return ret; We discussed about this a bit already and arguably it's a matter of conventions but: a shader in an effect might have a preshader (PRES comment with its various subparts) or not. Calling the "plain" CTAB constants a "preshader" doesn't seem right to me. > +#define MIN(a, b) ((a) < (b) ? (a) : (b)) > +#define MAX(a, b) ((a) > (b) ? (a) : (b)) min() and max() are already defined and should be usable. > + > +enum preshader_type > +{ > + PRES_TYPE_FXLC, > + PRES_TYPE_SHADER > +}; You should rename this to something that doesn't imply that "plain shader constants" are a preshader type or drop it entirely (depending on how you separate the preshader from the plain constants an explicit type field might not be necessary). > + > +enum PRES_OPS > +{ > + PO_NOP, > + PO_MOV, > + PO_OP_MAX > +}; I would use somewhat longer and more descriptive names (e.g. PRESHADER_OP_NOP). > + > +typedef float (*pres_op_func)(float *args, int ncomp); > + > +static float pres_mov(float *args, int ncomp) {return args[0];} > + > +#define PRES_OPCODE_MASK 0x7FF00000 > +#define PRES_OPCODE_SHIFT 20 > +#define PRES_SCALAR_FLAG 0x80000000 > +#define PRES_NCOMP_MASK 0x0000FFFF > + > +#define FOURCC_PRES 0x53455250 > +#define FOURCC_CLIT 0x54494C43 > +#define FOURCC_FXLC 0x434C5846 > +#define FOURCC_PRSI 0x49535250 > +#define PRES_SIGN 0x46580000 Please use lowercase hexadecimal constants. > +struct op_info > +{ > + DWORD opcode; > + char mnem[8]; > + unsigned int ninp_args; > + BOOL func_all_comps; > + pres_op_func func; > +}; > + > +static struct op_info pres_op_info[] = > +{ > + {0x000, "nop", 0, 0, NULL }, /* PO_NOP */ > + {0x100, "mov", 1, 0, pres_mov}, /* PO_MOV */ > +}; > + > +enum PRES_VALUE_TYPE > +{ > + PRES_VT_FLOAT, > + PRES_VT_DOUBLE, > + PRES_VT_INT, > + PRES_VT_BOOL > +}; > + > +enum PRES_TABLES > +{ > + PRES_TAB_NONE, > + PRES_TAB_IMMED, /* immediate double constants from CLIT */ > + PRES_TAB_CONST, /* preshader input float constants */ > + PRES_TAB_VERTEX, /* not used */ > + PRES_TAB_OCONST, /* shader input float constants */ > + PRES_TAB_OBCONST, /* shader input bool constants */ > + PRES_TAB_OICONST, /* shader input int constants */ > + PRES_TAB_REG, /* registers */ > + PRES_TAB_MAX > +}; Same here, with more expressive names you might not need comments at all (although they seem pretty clear already). BTW, what is that PRES_TAB_VERTEX entry? > + > +static const struct > +{ > + unsigned int value_size; > + unsigned int reg_value_cnt; > + enum PRES_VALUE_TYPE type; > +} > +table_info[] = > +{ > + {0, 0}, > + {sizeof(double), 1, PRES_VT_DOUBLE}, /* PRES_TAB_IMMED */ > + {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_TAB_CONST */ > + {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_TAB_VERTEX */ > + {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_TAB_OCONST */ > + {sizeof(BOOL), 1, PRES_VT_BOOL }, /* PRES_TAB_OBCONST */ > + {sizeof(int), 4, PRES_VT_INT, }, /* PRES_TAB_OICONST */ > + {sizeof(float), 4, PRES_VT_FLOAT } /* PRES_TAB_REG */ > +}; > + > +static const char *table_symbol[] = > +{ > + "(null)", "imm", "c", "v", "oc", "ob", "oi", "r" > +}; > + > +static const char *xyzw_str = "xyzw"; > + > +#define OFFSET2REG(table, offset) ((offset) / table_info[table].reg_value_cnt) > + > +static const enum PRES_TABLES pres_regset2table[] = > +{ > + PRES_TAB_OBCONST, /* D3DXRS_BOOL */ > + PRES_TAB_OICONST, /* D3DXRS_INT4 */ > + PRES_TAB_CONST, /* D3DXRS_FLOAT4 */ > + PRES_TAB_NONE, /* D3DXRS_SAMPLER */ > +}; > + > +static const enum PRES_TABLES shad_regset2table[] = > +{ > + PRES_TAB_OBCONST, /* D3DXRS_BOOL */ > + PRES_TAB_OICONST, /* D3DXRS_INT4 */ > + PRES_TAB_OCONST, /* D3DXRS_FLOAT4 */ > + PRES_TAB_NONE, /* D3DXRS_SAMPLER */ > +}; > + > +struct d3dx_pres_operand > +{ > + enum PRES_TABLES table; > + unsigned int offset; /* value index, not register index */ That probably isn't very clear. Maybe call it "component index" instead of "value index" or write a longer comment. > +}; > + > +struct d3dx_pres_ins > +{ > + enum PRES_OPS op; > + BOOL scalar_op; /* first input argument is scalar, > + first scalar component is propagated */ Maybe put the comment above the field instead. > + unsigned int ncomps; > + unsigned int ninp_args; > + struct d3dx_pres_operand inputs[3]; > + struct d3dx_pres_operand output; > +}; > + > +#define PRES_VS_BITS_PER_WORD (sizeof(DWORD)*8) > + > +struct d3dx_const_tab > +{ > + unsigned int ninputs; > + D3DXCONSTANT_DESC *inputs; > + struct d3dx_parameter **inputs_param; > + ID3DXConstantTable *ctab; > + /* TODO: do not keep input constant structure > + (use it only at the parse stage) */ > + const enum PRES_TABLES *regset2table; > +}; > + > +struct d3dx_fxlc I would call this d3dx_preshader, > +{ > + void *tables[PRES_TAB_MAX]; > + unsigned int table_sizes[PRES_TAB_MAX]; /* registers count */ > + DWORD *table_value_set[PRES_TAB_MAX]; > + > + unsigned int nins; > + struct d3dx_pres_ins *ins; > + > + struct d3dx_const_tab inputs; > +}; > + > +struct d3dx_preshader and this one d3dx_shader or something. > +{ > + enum preshader_type pres_type; > + D3DXPARAMETER_TYPE param_type; > + > + struct d3dx_fxlc fxlc; > + struct d3dx_const_tab shader_inputs; > +}; > + > +static void val_set_reg(struct d3dx_fxlc *fxlc, unsigned int table, unsigned int reg_idx) > +{ > + fxlc->table_value_set[table][reg_idx / PRES_VS_BITS_PER_WORD] |= > + 1 << (reg_idx % PRES_VS_BITS_PER_WORD); > +} > + > +static void dump_shader_bytecode(void *data, unsigned int size) > +{ > + DWORD *words = (DWORD *)data; > + unsigned int i, j, n; > + > + size /= 4; > + i = 0; > + while (i < size) > + { > + n = MIN(size - i, 15); > + for (j = 0; j < n; j++) > + MESSAGE("0x%08X,", words[i + j]); > + i += n; > + MESSAGE("\n"); > + } > +} I would just use TRACE instead. 15 seems a bit too much, I'd stick to 8 per line or so. Also please use lowercase with hex. > + > +static DWORD *find_bytecode_comment(DWORD *ptr, DWORD fourcc) > +{ > + while ((*ptr & 0xFFFF) == 0xFFFE) > + { > + if (*(ptr + 1) == fourcc) > + return ptr + 2; > + ptr += 1 + (*ptr >> 16); > + } > + return NULL; > +} > + > +static DWORD *parse_pres_arg(DWORD *ptr, struct d3dx_pres_operand *opr) > +{ > + if (*ptr != 0) > + { > + FIXME("Relative addressing not supported yet, word %#x.\n", *ptr); > + return NULL; > + } > + ptr++; > + > + if (*ptr < 1 || *ptr >= PRES_TAB_MAX || *ptr == PRES_TAB_VERTEX) It's probably better to use the proper enum value instead of '1'. > +static HRESULT get_constants_desc(DWORD *byte_code, struct d3dx_const_tab *out, struct d3dx9_base_effect *base) > +{ > + ID3DXConstantTable *ctab; > + D3DXCONSTANT_DESC *cdesc; > + struct d3dx_parameter **inputs_param; > + D3DXCONSTANTTABLE_DESC desc; > + HRESULT hr; > + D3DXHANDLE hc; > + unsigned int i; > + unsigned int cnt; > + > + out->inputs = cdesc = NULL; > + out->ctab = NULL; > + out->inputs_param = NULL; > + out->ninputs = 0; > + inputs_param = NULL; > + hr = D3DXGetShaderConstantTable(byte_code, &ctab); > + if (FAILED(hr) || !ctab) > + { > + TRACE("Could not get CTAB data, hr %#x.\n", hr); > + /* returnin OK is not a typo */ But that is a typo ;) > + return D3D_OK; > + } > + hr = ID3DXConstantTable_GetDesc(ctab, &desc); > + if (FAILED(hr)) > + { > + FIXME("Could not get CTAB desc, hr %#x.\n", hr); > + goto err_out; > + } > + > + cdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3DXCONSTANT_DESC) * desc.Constants); > + inputs_param = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct d3dx_parameter **) * desc.Constants); Here you can use sizeof on the variable, as with your other patch, e.g.: cdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cdesc) * desc.Constants); inputs_param = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*inputs_param) * desc.Constants); Notice that the second allocation was wrong. I haven't looked in detail at the rest of the patch, although I spotted a number of formatting issues.

2 1

Re: wined3d: Use a printf format specifier to avoid a compiler warning [-Wformat-security]
by Józef Kucia March 10, 2016

March 10, 2016

On Thu, Mar 10, 2016 at 7:46 AM, Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/wined3d/glsl_shader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 85244c8..8b0f617 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -342,7 +342,7 @@ static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, > if (size > 1) > shader_addline(buffer, "ivec%u(%s%s%s%s)", size, str[0], str[1], str[2], str[3]); > else > - shader_addline(buffer, str[0]); > + shader_addline(buffer, "%s", str[0]); > } > > static const char *get_info_log_line(const char **ptr) > -- > 1.9.1 > > > This should be fixed by 120126 (https://www.winehq.org/pipermail/wine-patches/2016-March/148053.html)

1 0

Wiki migration update
by Rosanne DiMesio March 10, 2016

March 10, 2016

The old MoinMoin wiki (http://oldwiki.winehq.org) is going to be taken down at the end of this month. Dimi will provide a tarball archive; snapshots should also be available on archive.org. Kyle has set up a page migration status page on http://oldwiki.winehq.org/PageMigration; you can check the status of any pages you are interested in there. If you decide to port any of remaining pages yourself, please update its status on that page and leave a note at the top of the ported page saying "This page has been ported to the new wiki." -- Rosanne DiMesio dimesio(a)earthlink.net

1 0

Re: [PATCH 1/6] d3dx9: add test for preshader in effect.
by Matteo Bruni March 10, 2016

March 10, 2016

Hi Paul, I have a few more comments, in addition to Henri's (BTW thank you for taking a look). 2016-03-09 14:38 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 755 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 755 insertions(+) > > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index a785f4d..8c5b5bb 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -3009,6 +3009,760 @@ static void test_effect_states(IDirect3DDevice9 *device) > ok(value == 3, "Got result %u, expected %u.\n", value, 1); > } > > +/* > + * fxc.exe /Tfx_2_0 > + */ > +#if 0 > +float4 g_Pos1; > +float4 g_Pos2; > +float4 g_Selector[2] = {{0, 0, 0, 0}, {10, 10, 10, 10}}; > + > +float4 opvect1 = {0.0, -0.0, -2.2, 3.402823466e+38F}; > +float4 opvect2 = {1.0, 2.0, -3.0, 4.0}; > + > +int4 g_iVect = {4, 3, 2, 1}; > + > +vertexshader vs_arr[3] = > +{ > + asm > + { > + vs_1_0 > + def c0, 1, 1, 1, 1 > + mov oPos, c0 > + }, Indentation. > + asm > + { > + vs_1_1 > + def c0, 2, 2, 2, 2 > + mov oPos, c0 > + }, > + asm > + { > + vs_2_0 > + def c0, 3, 3, 3, 3 > + mov oPos, c0 > + } > +}; > + > +row_major float4x3 m4x3row={{11, 12, 13}, {21, 22, 23}, {31, 32, 33}, {41, 42, 43}}; > +row_major float3x4 m3x4row={{11, 12, 13, 14}, {21, 22, 23, 24}, {31, 32, 33, 34}}; > +column_major float4x3 m4x3column={{11, 12, 13},{21, 22, 23},{31, 32, 33},{41, 42, 43}}; > +column_major float3x4 m3x4column={{11, 12, 13, 14}, {21, 22, 23, 24}, {31, 32, 33, 34}}; > +row_major float2x2 m2x2row={{11, 12}, {21, 22}}; > +column_major float2x2 m2x2column={{11, 12}, {21, 22}}; > +row_major float2x3 m2x3row={{11, 12, 13}, {21, 22, 23}}; > +column_major float2x3 m2x3column={{11, 12, 13}, {21, 22, 23}}; > +row_major float3x2 m3x2row={{11, 12}, {21, 22}, {31, 32}}; > +column_major float3x2 m3x2column={{11, 12}, {21, 22}, {31, 32}}; Formatting. > + > +row_major bool2x3 mb2x3row = { {true, false, true}, {false, true, true}}; > +column_major bool2x3 mb2x3column = { {true, false, true}, {false, true, true}}; > + > +struct VS_OUTPUT > +{ > + float4 Position : POSITION; // vertex position > + float2 TextureUV : TEXCOORD0; // vertex texture coords > + float4 Diffuse : COLOR0; // vertex diffuse color > +}; Those comments don't seem particularly useful. > +static float test_effect_preshader_fconstsp[][4] = > +{ > + {11.0, 21.0, 0.0 , 0.0 }, Numbers are usually right-aligned. Also those need the 'f' suffix. The whitespace before the '}' seems wrong. > +static BOOL test_effect_preshader_bconsts[] = > +{ > + 1, 0, 1, 0, 1, 0 > +}; If you're using BOOL, you should also use TRUE and FALSE. > +static void test_effect_preshader(IDirect3DDevice9 *device) > +{ > + const static D3DXVECTOR4 fvect1 = {28.0f, 29.0f, 30.0f, 31.0f}; > + const static D3DXVECTOR4 fvect2 = {0.0f, 0.0f, 1.0f, 0.0f}; > + const static float fvect_empty[] = {-9999.0f, -9999.0f, -9999.0f, -9999.0f}; > + HRESULT hr; > + ID3DXEffect *effect; > + D3DXHANDLE par; > + UINT npasses; > + BOOL bval; > + D3DLIGHT9 light; > + DWORD value; > + float fdata[TEST_EFFECT_PRES_NFLOATMAX * 4]; > + BOOL bdata[TEST_EFFECT_PRES_NBOOL]; > + IDirect3DVertexShader9 *vshader; > + void *byte_code; > + UINT byte_code_size; Just use unsigned int instead of UINT or DWORD IMO. > + > + unsigned int i, j; > + > + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), > + NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + for (i = 0; i < TEST_EFFECT_PRES_NFLOATV; i++) > + { > + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, fvect_empty, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + } That is repeatedly setting c0, right? I don't think that's what you meant to do here. Regardless, you probably want to initialize all 256 float constant registers. > + hr = effect->lpVtbl->Begin(effect, &npasses, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + par = effect->lpVtbl->GetParameterByName(effect, NULL, "g_Pos2"); > + ok(par != NULL, "GetParameterByName failed.\n"); > + > + hr = effect->lpVtbl->SetVector(effect, par, &fvect1); > + ok(hr == D3D_OK, "SetFloatArray failed, hr %#x,\n", hr); Typo. More of the same below. > + for (i = 0; i < TEST_EFFECT_PRES_NOPTESTS; i++) > + { > + DWORD *v; > + > + hr = IDirect3DDevice9_GetLight(device, i % 8, &light); > + v = i < 8 ? (DWORD *)&light.Diffuse : (DWORD *)&light.Ambient; > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (i < TEST_EFFECT_PRES_NOPTESTS) This seems either wrong or unnecessary.

1 0

Re: [1/2] gdiplus/tests: Add tests for 0-pixel pens.
by Marvin March 9, 2016

March 9, 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=21326 Your paranoid android. === wxppro (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w2003std (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === wvistau64 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w2008s64 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w7u (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w7pro64 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w8 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w864 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w1064 (32 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === wvistau64 (64 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w2008s64 (64 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w7pro64 (64 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w864 (64 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0 === w1064 (64 bit graphics) === graphics.c:3903: Test failed: 1: expected 1, got 0 graphics.c:3928: Test failed: 1: expected 1, got 0

1 0

Re: [PATCH 1/6] d3dx9: add test for preshader in effect.
by Henri Verbeet March 9, 2016

March 9, 2016

On 9 March 2016 at 14:38, Paul Gofman <gofmanp(a)gmail.com> wrote: > +static float test_effect_preshader_fconstsv[][4] = > +{ > + {11.0, 12.0, 13.0, 0.0 }, > + {21.0, 22.0, 23.0, 0.0 }, > + {31.0, 32.0, 33.0, 0.0 }, > + {41.0, 42.0, 43.0, 0.0 }, > + {11.0, 21.0, 31.0, 0.0 }, > + {12.0, 22.0, 32.0, 0.0 }, > + {13.0, 23.0, 33.0, 0.0 }, > + {14.0, 24.0, 34.0, 0.0 }, > + {11.0, 12.0, 13.0, 14.0}, > + {21.0, 22.0, 23.0, 24.0}, > + {31.0, 32.0, 33.0, 34.0}, > + {11.0, 21.0, 31.0, 41.0}, > + {12.0, 22.0, 32.0, 42.0}, > + {13.0, 23.0, 33.0, 43.0} > +}; > + > +static float test_effect_preshader_fconstsp[][4] = > +{ > + {11.0, 21.0, 0.0 , 0.0 }, > + {12.0, 22.0, 0.0 , 0.0 }, > + {13.0, 23.0, 0.0 , 0.0 }, > + {11.0, 12.0, 0.0 , 0.0 }, > + {21.0, 22.0, 0.0 , 0.0 }, > + {31.0, 32.0, 0.0 , 0.0 }, > + {11.0, 12.0, 0.0 , 0.0 }, > + {21.0, 22.0, 0.0 , 0.0 }, > + {11.0, 21.0, 0.0 , 0.0 }, > + {12.0, 22.0, 0.0 , 0.0 }, > + {11.0, 12.0, 13.0, 0.0 }, > + {21.0, 22.0, 23.0, 0.0 }, > + {11.0, 21.0, 31.0, 0.0 }, > + {12.0, 22.0, 32.0, 0.0 } > +}; > + > +static BOOL test_effect_preshader_bconsts[] = > +{ > + 1, 0, 1, 0, 1, 0 > +}; > + > +static struct > +{ > + const char *comment; > + BOOL todo[4]; > + DWORD result[4]; > +} > +test_effect_preshader_op_results[] = > +{ > + {"1 / op", {1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, > + {"rsq", {1, 1, 3, 3}, {0x7f800000, 0x7f800000, 0x3f2c985d, 0x1f800000}}, > + {"mul", {1, 1, 1, 1}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, > + {"add", {0, 1, 1, 1}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, > + {"lt", {0, 0, 1, 0}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, > + {"ge", {1, 1, 0, 1}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, > + {"neg", {1, 1, 1, 1}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, > + {"rcp", {1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, > + {"frac", {0, 0, 1, 0}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, > + {"min", {0, 1, 1, 1}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, > + {"max", {1, 1, 1, 1}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, > + {"sin", {0, 1, 1, 3}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, > + {"cos", {1, 1, 1, 3}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, > + {"den mul",{1, 1, 1, 1}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, > + {"dot", {0, 1, 1, 0}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}} > +}; These should all be const. I'd probably use D3DXVECTOR4 for the float constant arrays. > +#define TEST_EFFECT_PRES_NFLOATV (sizeof(test_effect_preshader_fconstsv) / sizeof(*test_effect_preshader_fconstsv)) > +#define TEST_EFFECT_PRES_NFLOATP (sizeof(test_effect_preshader_fconstsp) / sizeof(*test_effect_preshader_fconstsp)) > +#define TEST_EFFECT_PRES_NFLOATMAX (TEST_EFFECT_PRES_NFLOATV > TEST_EFFECT_PRES_NFLOATP ? \ > + TEST_EFFECT_PRES_NFLOATV : TEST_EFFECT_PRES_NFLOATP) > +#define TEST_EFFECT_PRES_NBOOL (sizeof(test_effect_preshader_bconsts) / sizeof(*test_effect_preshader_bconsts)) > +#define TEST_EFFECT_PRES_NOPTESTS (sizeof(test_effect_preshader_op_results) / \ > + sizeof(*test_effect_preshader_op_results)) I think you should either just write these out, or introduce an ARRAY_SIZE macro. > + const static D3DXVECTOR4 fvect1 = {28.0f, 29.0f, 30.0f, 31.0f}; > + const static D3DXVECTOR4 fvect2 = {0.0f, 0.0f, 1.0f, 0.0f}; > + const static float fvect_empty[] = {-9999.0f, -9999.0f, -9999.0f, -9999.0f}; This is not wrong, but the usual order is "static const". > + todo_wine_if(!!bdata[i] != !!test_effect_preshader_bconsts[i]) You can write that as "!bdata[i] != !test_effect_preshader_bconsts[i]" without changing the meaning. > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); %#x to make it clear it's a hexadecimal value. You don't need to print the expected value if it's a constant. > + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(vshader != NULL, "Got NULL vshader.\n"); > + if (vshader) > + { That kind of thing is pointless, if "vshader" was NULL, the test would have failed. > + ok(vshader == NULL, "Incorrect shader selected.\n"); I would prefer those as "ok(!vshader, ...);", but it's just style.

2 6

Re: configure: Fix cross-compiling of 32-bit Wine for OSX.
by Alexandre Julliard March 9, 2016

March 9, 2016

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -175,6 +175,13 @@ case $host in > AC_SUBST(TARGETFLAGS,"-marm") > ;; > i[[3456789]]86*) > + if test "$cross_compiling" = "yes"; then > + CC="$CC -m32" > + CXX="$CXX -m32" > + host_cpu="i386" > + notice_platform="32-bit " > + AC_SUBST(TARGETFLAGS,"-m32") > + fi The idea is that if you are cross-compiling, you have already specified the correct host so this shouldn't be needed. How does the OS/X cross-compiler behave? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/5] user32: Add initial out of window procedure slots test
by Dmitry Timoshkov March 9, 2016

March 9, 2016

Piotr Caban <piotr(a)codeweavers.com> wrote: > +static LRESULT WINAPI winproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + if(!hwnd) { > + int *count = (int*)lparam; > + (*count)++; > + } > + return 0; > +} > + > +static LRESULT WINAPI winproc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + return 0; > +} ... > + memset(&wnd_classA, 0, sizeof(wnd_classA)); > + wnd_classA.lpszClassName = "winproc_test"; > + wnd_classA.lpfnWndProc = &winproc; Should be just "winproc" instead of "&winproc" > + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)&winproc2), > + "SetWindowLongPtr failed with error %d\n", GetLastError()); Same here. -- Dmitry.

2 1

Re: [PATCH 5/6] d3d10core/tests: Add test for aoffimmi modifier.
by Henri Verbeet March 9, 2016

March 9, 2016

On 8 March 2016 at 17:46, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/d3d10core/tests/device.c | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > This (and the equivalent d3d11 test) fails for me on Windows: device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (0, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (0, 1). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (1, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (1, 1). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (2, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (2, 1). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (3, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (3, 1).

1 0

Re: [PATCH 2/6] wined3d: Extend shader_glsl_gen_sample_code() to support offsets.
by Henri Verbeet March 9, 2016

March 9, 2016

On 8 March 2016 at 17:46, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, > + const int *values, unsigned int size) > +{ > + const char *fmt = "%#x"; > + char str[4][17] = {{0}}; I guess this is inspired by shader_glsl_append_imm_vec4(), but I think you can just append to the buffer here. > + if (1 > size || size > 4) I don't think "1 > size" is all that more readable than "!size". > + for (i = size - 1; i >= 0; --i) > + { > + sprintf(str[i], fmt, values[i]); > + fmt = "%#x, "; > + } If you use ", %#x" for the format you don't need the awkward reverse loop. > - if (flags != WINED3D_GLSL_SAMPLE_LOAD) > - ERR("Unexpected flags for texelFetch %#x.\n", flags & ~WINED3D_GLSL_SAMPLE_LOAD); > + static const DWORD texel_fetch_flags = WINED3D_GLSL_SAMPLE_LOAD | WINED3D_GLSL_SAMPLE_OFFSET; > + if (flags & ~texel_fetch_flags) > + ERR("Unexpected flags for texelFetch %#x.\n", flags & ~texel_fetch_flags); The original had this as well, of course, but "Unexpected flags %#x for texelFetch.\n" may be better.

1 0

Re: [PATCH v2 2/5] dxgi: Add feature level support.
by Henri Verbeet March 9, 2016

March 9, 2016

On 8 March 2016 at 23:19, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -214,7 +215,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter > return DXGI_ERROR_UNSUPPORTED; > } > > - if (FAILED(hr = dxgi_check_d3d10_support(adapter->parent, adapter))) > + if (FAILED(hr = dxgi_check_feature_level_support(adapter->parent, adapter, &feature_level, 1))) > return DXGI_ERROR_UNSUPPORTED; I don't think this does what you want it to do, > -HRESULT dxgi_check_d3d10_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter) > +HRESULT dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) ... > + D3D_FEATURE_LEVEL selected_feature_level = 0; ... > + return selected_feature_level; because this doesn't match the return type.

1 0

Re: [PATCH 1/5] wmasf: add stub dll
by Austin English March 9, 2016

March 9, 2016

On Wed, Mar 9, 2016 at 12:31 AM, Austin English <austinenglish(a)gmail.com> wrote: > This patch series is for https://bugs.winehq.org/show_bug.cgi?id=39797 > > The bug subject is wmasf, but the uploaded log shows that there are a > few more dlls requested (api-ms-wine-core-*), so I went ahead and > added stubs for those while I was at it. > > -- > -Austin Sorry for the noise, gitconfig wasn't set up on the machine the patches were generated on, I'll resend tomorrow. -- -Austin

1 0

Re: [PATCH] d3dx9: IsParameterUsed stub should return TRUE.
by Henri Verbeet March 8, 2016

March 8, 2016

On 7 March 2016 at 22:49, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > Yes, I guess returning TRUE is usually more likely to work. Of course Is that necessarily what you want though? It might be harder to debug something being slow because it's updating unused parameters than to debug something rendering incorrectly because it's not updating them. > a proper implementation would be even better (although it may be non > obvious to find out if a parameter is used, depending on what "used" > really means - it needs tests)... You always need tests, but a reasonable guess would be whether the parameter is referenced by the technique.

3 7

Metatrader 5 uses all CPU time
by Vyacheslav Napadovsky March 8, 2016

March 8, 2016

Hello. I'm trying to launch Metatrader 5 in ubuntu with winehq-devel=1.9.5~ubuntu14.04.1 When I log in to my demo account the wineserver and terminal.exe (Metetrader 5 itself) start consume all available CPU. And if I'm trying to "Show all symbols" in "Market overview" then Metatrader UI just hangs. Here's last 10000 lines of 1.9GB log I dumped with WINEDEBUG=fixme-all,warn+all,+relay wine terminal.exe > terminal.log 2>&1 http://sendfile.su/1211848 (can't post it with pastebin.com, because it's over 500kB). Note, I killed process at the end with `killall terminal.exe` Moreover, when terminal.exe is running (without showing all symbols), `vmstat 1` shows that user space / system space consumes 50 / 50 % of CPU. And one more notice, if I run terminal.exe in a Virtual Box and assign this VM only one CPU core, than terminal.exe works fine consuming about 7% cpu, but with 2 cores it consumes 50%/50% with wineserver. On native Windows OS terminal.exe consumes less than 4% CPU with showing all symbols (I have 4 CPU cores on my notebook). Any clues where to dig next? -- Vyacheslav Napadovsky

1 0

wine dll loader
by Vyacheslav Napadovsky March 8, 2016

March 8, 2016

Hello. I'm developing .dll plugin for thirdparty software. In Windows 8.0 all works fine (my plugin loads and unloads correctly), but in wine, I got DLL_PROCESS_ATTACH, then 7 DLL_THREAD_ATTACH at plugin loading stage and only 1 DLL_THREAD_DETACH at plugin unloading, i.e my plugin remains active (because no DLL_PROCESS_DETACH came in). Maybe that's because I spawn new thread (CreateThread) at DLL_PROCESS_ATTACH. Please, suggest ways to debug this issue. Regards, Vyacheslav Napadovsky

3 6

Re: [PATCH] opencl/tests: Add initial tests
by Henri Verbeet March 8, 2016

March 8, 2016

On 8 March 2016 at 13:14, Detlef Riekenberg <wine.dev(a)web.de> wrote: > + * Copyright 2013 Detlef Riekenberg Is the year correct? > +INT WINAPI clGetPlatformIDs(UINT, PVOID*, UINT*); That doesn't look right. I also don't think anything in this test is particularly Windows specific.

1 0

Re: [PATCH] opencl/tests: Add initial tests
by Marvin March 8, 2016

March 8, 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=21276 Your paranoid android. === build (build) === Recreation of tests/Makefile failed

1 0

Re: user32: Do not block sending/posting WM_NOTIFY messages.
by Alexandre Julliard March 8, 2016

March 8, 2016

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -11188,6 +11188,35 @@ static void test_quit_message(void) > ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", FALSE); > } > > +static void test_notify_message(void) > +{ > + HWND hwnd; > + BOOL ret; > + > + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, > + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, NULL, NULL, 0); > + ok(hwnd != 0, "Failed to create window\n"); > + > + ret = SendNotifyMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "SendNotifyMessageA failed with error %u\n", GetLastError()); > + ret = SendNotifyMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "SendNotifyMessageW failed with error %u\n", GetLastError()); > + ret = SendMessageCallbackA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); > + ok(ret == TRUE, "SendMessageCallbackA failed with error %u\n", GetLastError()); > + ret = SendMessageCallbackW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); > + ok(ret == TRUE, "SendMessageCallbackW failed with error %u\n", GetLastError()); > + ret = PostMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostMessageA failed with error %u\n", GetLastError()); > + ret = PostMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostMessageW failed with error %u\n", GetLastError()); > + ret = PostThreadMessageA(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostThreadMessageA failed with error %u\n", GetLastError()); > + ret = PostThreadMessageW(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostThreadMessageW failed with error %u\n", GetLastError()); It would be interesting to test the received message contents too, also for the case of valid data. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v3] d3dx9: support setting texture through SetValue in effect.
by Matteo Bruni March 7, 2016

March 7, 2016

2016-03-06 9:39 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2389,6 +2389,43 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) > } > } > > +static void test_effect_setvalue_object(IDirect3DDevice9 *device) > +{ > + ID3DXEffect *effect; > + D3DXHANDLE parameter; > + IDirect3DTexture9 *texture; > + IDirect3DTexture9 *texture_set; > + HRESULT hr; > + ULONG count; > + > + hr = D3DXCreateEffect(device, test_effect_parameter_value_blob_object, > + sizeof(test_effect_parameter_value_blob_object), NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); > + > + parameter = effect->lpVtbl->GetParameterByName(effect, NULL, "tex"); > + ok(parameter != NULL, "GetParameterByName failed, got %p\n", parameter); > + > + texture = NULL; > + hr = D3DXCreateTexture(device, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, 0, D3DPOOL_DEFAULT, &texture); > + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); > + hr = effect->lpVtbl->SetValue(effect, parameter, &texture, sizeof(IDirect3DTexture9 **)); That sizeof() happens to have the right value (because IDirect3DTexture9 * is also a pointer type) although it's technically incorrect. It's generally preferred to use the variable instead of the type in sizeof when possible (e.g. in this case sizeof(texture)), that would have avoided this mistake and it also helps in other cases. The other two calls to {GS}etValue below have the same issue.

1 0

[PATCH RFC] programs/winedevice.exe: allow group loading
by Aric Stewart March 7, 2016

March 7, 2016

Here is a patch Sebastian Lackner wanted to see. This is continued work to allow group loading and working off of moving to using IoCreateDriver and such in winedevice. Still using a mailslot which I know Sebastian does not like. But it works quite well. -aric --- programs/winedevice/device.c | 190 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 170 insertions(+), 20 deletions(-)

1 0

Re: [PATCH] webservices: Fixed memory leaks in one error condition (Coverity)
by Hans Leidekker March 7, 2016

March 7, 2016

Hi Marcus, > diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c > index 72e75c3..688bc2b 100644 > --- a/dlls/webservices/reader.c > +++ b/dlls/webservices/reader.c > @@ -928,7 +928,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) > WS_XML_UTF8_TEXT *text; > unsigned int len = 0, ch, skip, quote; > const unsigned char *start; > - WS_XML_STRING *prefix, *localname; > + WS_XML_STRING *prefix, *localname = NULL; > HRESULT hr = WS_E_INVALID_FORMAT; > > if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; > @@ -948,7 +948,11 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) > if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) > { > attr->isXmlNs = 1; > - if (!(attr->prefix = alloc_xml_string( localname->bytes, localname->length ))) goto error; > + heap_free (prefix); > + if (!(attr->prefix = alloc_xml_string( localname->bytes, localname->length ))) { > + heap_free (localname); > + goto error; > + } > attr->localName = localname; > } > else Please replace tabs with spaces and use the same formatting as surrounding code. Otherwise it looks good, thanks.

1 0

Re: ddraw/tests: Fix function name in multiple ok() messages. (resend)
by Marvin March 7, 2016

March 7, 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=21242 Your paranoid android. === w1064 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w864 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match

1 0

Re: user32: Do not block sending/posting WM_NOTIFY messages.
by Marvin March 7, 2016

March 7, 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=21241 Your paranoid android. === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

2 1

Re: make_xftmpl: Remove getopt prototype
by Alexandre Julliard March 7, 2016

March 7, 2016

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -92,8 +92,6 @@ static const struct keyword reserved_words[] = { > {"WORD", TOKEN_WORD} > }; > > -extern int getopt(int argc, char *const *argv, const char *optstring); This was explicitly added for MSVC builds. -- Alexandre Julliard julliard(a)winehq.org

1 0

Problems about License Compatibility
by Jianqiu Zhang March 7, 2016

March 7, 2016

Hi, I am writing packet.dll which is a dependency of windows native wpcap.dll , Source can be get from winpcap.org , When I try to impelment it in wine, I found that I need to use the Packet32.h from packet.dll , Which has a different license than wine(LGPL), And I am not familar with solving license compability, Is there anyone that know how to solve this problem? Thanks in advance I Attach the License for Packet32.h below -- snip -- /* * Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy) * Copyright (c) 2005 - 2007 CACE Technologies, Davis (California) * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the Politecnico di Torino, CACE Technologies * nor the names of its contributors may be used to endorse or promote * products derived from this software without specific prior written * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */

3 2

Re: ntdll: add stub for RtlAddAccessDeniedObjectAce and forward to AddAccessDeniedObjectAce in advapi32
by Alexandre Julliard March 7, 2016

March 7, 2016

Louis Lenders <xerox.xerox2000x(a)gmail.com> writes: > Signed-off-by: Louis Lenders <xerox.xerox2000x at gmail.com> I'll apply this one, but next time could you please put a valid email address here? Thanks. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2] d3dx9: support setting texture through SetValue in effect.
by Paul Gofman March 6, 2016

March 6, 2016

I will add a fall through message, thanks for the notice On 03/06/2016 11:29 AM, Paul Gofman wrote: > Hi Alistair, no, there is actual copy of data below there which is > required for this case either. Thanks, Paul. > > On Sun, 6 Mar 2016 at 06:16, Alistair Leslie-Hughes > <leslie_alistair(a)hotmail.com <mailto:leslie_alistair(a)hotmail.com>> wrote: > > Hi Paul, > I think you have missed a break in the switch or a message to > state fall through. > > > Alistair >

1 0

re: [v2] d3dx9: support setting texture through SetValue in effect.
by Alistair Leslie-Hughes March 6, 2016

March 6, 2016

Hi Paul, I think you have missed a break in the switch or a message to state fall through. Alistair

1 0

wine 1.9.5 shared wow64 compile error
by Olivier F. R. Dierick March 6, 2016

March 6, 2016

Hello, I've updated my git tree with 1.9.5 and now I have this error while compiling 32bit Wine with the --with-wine64 option (in a shared wow64 setup): ---begin make output--- ... rm -f fonts && ln -s ../1.9.5_wow_64/fonts fonts rm: impossible de supprimer « fonts »: est un dossier make: *** [fonts] Erreur 1 ... ---end make output--- It says fonts is a directory and can't be removed. I do out-of-tree builds. The 32bit directory doesn't exists when I run configure. After running configure, the 32bit build tree is there and contains a fonts directory with a single Makefile in it. I had no such error with Wine 1.9.4 and I don't have it when compiling stand-alone 32bit Wine or the 64bit shared wow part. I did a regression test and found this commit to be the culprit: ---begin git bisect output--- dcc16c7cac1cbf93096b072fe2f7b32ad08d1fa5 is the first bad commit commit dcc16c7cac1cbf93096b072fe2f7b32ad08d1fa5 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 29 15:06:42 2016 +0900 makefiles: Don't generate global rules in disabled directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ... ---end git bisect output--- I look forward to hearing from you soon -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

2 2

Wine-1.9.5 source code Cppcheck 1.69 scanning
by Игорь Чебаненко March 4, 2016

March 4, 2016

Source code scanned with Cppcheck 1.69. Yes,I know that in this scanning report I have messages called "noise messages",but I hope,that you will see real bugs,and will ingnore this type of messages.

1 0

Re: [PATCH 07/10] d3d10_1: Implement D3D10CreateDeviceAndSwapChain1().
by Henri Verbeet March 4, 2016

March 4, 2016

On 4 March 2016 at 11:43, Józef Kucia <jkucia(a)codeweavers.com> wrote: > It doesn't seem to be easy to declare D3D10CreateDeviceAndSwapChain1() > without using cpp_quote() because D3D10_DRIVER_TYPE is unknown to idl > (it's declared in d3d10misc.h). My knowledge about idl is limited > so maybe someone knows better. The easiest thing to do would be to use "enum D3D10_DRIVER_TYPE" instead of "D3D10_DRIVER_TYPE". I wouldn't be opposed to just using idl for d3d10misc.h either though. > +cpp_quote("HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *,") > +cpp_quote(" D3D10_DRIVER_TYPE, HMODULE, UINT, D3D10_FEATURE_LEVEL1,") > +cpp_quote(" UINT, DXGI_SWAP_CHAIN_DESC *, IDXGISwapChain **, ID3D10Device1 **);") I'd prefer this with parameter names either way.

1 0

Re: [PATCH 1/2] user32: Store pointer to timer callback in SetTimer function instead of treating it as window procedure
by Alexandre Julliard March 4, 2016

March 4, 2016

Piotr Caban <piotr(a)codeweavers.com> writes: > I decided to leave 16-bit version of SetTimer as is for now. I haven't > seen any application running out of window procedures in this > case. This patch will change behavior of following 16-bit application: > SetTimer(hWnd, TIMER_ID, 1, tfunc); > GetMessage32(&msg, 0, 0, 0, TRUE); //get's WM_TIMER message > DispatchMessage32(&msg, TRUE); > Now this code will no longer call tfunc callback. According to my test > new behavior is correct. The more likely case is a 16-bit app retrieving a 32-bit timer and calling it through DispatchMessage16. How is this going to work with your proposed changes? -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [PATCH 2/2 v2] d3drm: Implement AddDestroyCallback/DeleteDestroyCallback for a viewport
by Henri Verbeet March 4, 2016

March 4, 2016

On 3 March 2016 at 09:10, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) > +{ > + struct destroy_callback *callback, *callback2; > + > + if (!cb) > + return D3DRMERR_BADVALUE; > + > + LIST_FOR_EACH_ENTRY_SAFE(callback, callback2, &object->destroy_callbacks, struct destroy_callback, entry) > + { > + if (callback->cb == cb && callback->ctx == ctx) > + { > + list_remove(&callback->entry); > + HeapFree(GetProcessHeap(), 0, callback); > + } > + } > + > + return D3DRM_OK; > +} I won't hold it against the patch (much), but is that correct? E.g. suppose you do something like the following: add cb1 add cb2 add cb3 add cb2 delete cb2 What would the sequence be that ends up getting called?

2 1

Re: [v3 6/7] d3dx9: implement state save and restore in effect.
by Matteo Bruni March 3, 2016

March 3, 2016

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- For your next submissions, can you please write a short changelog of the differences with the previous version(s) of the same patch? Ideally that goes after the '---'. > @@ -3493,18 +3501,34 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW > if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) > WARN("Invalid flags (%#x) specified.\n", flags); > > - if (This->manager || flags & D3DXFX_DONOTSAVESTATE) > + if (effect->manager || flags & D3DXFX_DONOTSAVESTATE) > { > TRACE("State capturing disabled.\n"); > } > else > { > - FIXME("State capturing not supported, yet!\n"); > + HRESULT hr; > + unsigned int i; > + > + if (!technique->saved_state) > + { > + hr = IDirect3DDevice9_BeginStateBlock(effect->device); > + if (FAILED(hr)) > + ERR("BeginStateBlock failed, hr %#x.\n", hr); > + for (i = 0; i < technique->pass_count; i++) > + d3dx9_apply_pass_states(effect, &technique->passes[i]); This is likely correct but testing it with a technique with at least 2 passes would be nice.

1 0

Re: [v3 5/7] d3dx9: implement sampler and texture effect states application.
by Matteo Bruni March 3, 2016

March 3, 2016

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 41 +++++++++++++++++++++++++++++++++++++++-- > dlls/d3dx9_36/tests/effect.c | 2 +- > 2 files changed, 40 insertions(+), 3 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index e1f01f2..6813c79 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2681,7 +2681,8 @@ HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTA > return D3D_OK; > } > > -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, > + struct d3dx_state *state, int parent_index) I would have used an unsigned int here, flagging "none" with ~0u.

1 0

Re: [v3 4/7] d3dx9: implement shader constants effect states application.
by Matteo Bruni March 3, 2016

March 3, 2016

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > + UINT nelem; "unsigned int element_count;" would be better.

1 0

Re: [v3 3/7] d3dx9: implement light and material effect states application.
by Matteo Bruni March 3, 2016

March 3, 2016

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > + light_tbl[] = > + { > + {FIELD_OFFSET(D3DLIGHT9, Type), "LC_TYPE"}, > + {FIELD_OFFSET(D3DLIGHT9, Diffuse), "LT_DIFFUSE"}, > + {FIELD_OFFSET(D3DLIGHT9, Specular), "LT_SPECULAR"}, > + {FIELD_OFFSET(D3DLIGHT9, Ambient), "LT_AMBIENT"}, > + {FIELD_OFFSET(D3DLIGHT9, Position), "LT_POSITION"}, > + {FIELD_OFFSET(D3DLIGHT9, Direction), "LT_DIRECTION"}, > + {FIELD_OFFSET(D3DLIGHT9, Range), "LT_RANGE"}, > + {FIELD_OFFSET(D3DLIGHT9, Falloff), "LT_FALLOFF"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation0), "LT_ATTENUATION0"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation1), "LT_ATTENUATION1"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation2), "LT_ATTENUATION2"}, > + {FIELD_OFFSET(D3DLIGHT9, Theta), "LT_THETA"}, > + {FIELD_OFFSET(D3DLIGHT9, Phi), "LT_PHI"} > + }; This is misindented. > + switch (op) > + { > + case LT_TYPE: > + TRACE("LT_TYPE %u.\n", *(D3DLIGHTTYPE *)value); > + light->Type = *(D3DLIGHTTYPE *)value; > + break; > + case LT_DIFFUSE: > + case LT_SPECULAR: > + case LT_AMBIENT: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; > + > + TRACE("%s (%f %f %f %f).\n", light_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE *)((char *)light + light_tbl[op].offset) = c; It's probably a bit nicer to cast to (BYTE *) instead of (char *). > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 81a7d12..3bcba72 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2910,11 +2910,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > } > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(bval, "Got result %u, expected TRUE.\n", bval); > hr = IDirect3DDevice9_GetLight(device, 2, &light); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(light.Position.x == 4.0f && light.Position.y == 5.0f && light.Position.z == 6.0f, > "Got unexpected light position (%f, %f, %f).\n", light.Position.x, light.Position.y, light.Position.z); > @@ -2950,9 +2950,9 @@ static void test_effect_states(IDirect3DDevice9 *device) > todo_wine ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > - ok(!bval, "Got result %u, expected 0.\n", bval); > + todo_wine ok(!bval, "Got result %u, expected 0.\n", bval); It would be nice if the test also checked the material.

1 0

Re: [v3 1/7] d3dx9: add test for basic effect state management.
by Matteo Bruni March 3, 2016

March 3, 2016

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > + > + if (effect) > + effect->lpVtbl->Release(effect); > +} The if is unnecessary, the effect creation should never fail (and if it failed you would have already crashed long before that).

1 0