- wine-devel - winehq.org

Re: Assorted spelling fixes
by Marvin 16 Feb '14

16 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4916 Your paranoid android. === w8 (32 bit midi) === midi.c:518: Test failed: midiOutPrepare old size rc=MMSYSERR_INVALPARAM midi.c:519: Test failed: MHDR.dwFlags when prepared 0 midi.c:523: Test failed: midiStreamOut old size rc=MIDIERR_UNPREPARED midi.c:547: Test failed: MHDR.dwFlags 0 no ISSTRM when out of queue midi.c:553: Test failed: MHDR.dwFlags 0 not DONE when out of queue midi.c:554: Test failed: Wait failed: 0102 -559038737 midi.c:554: Test failed: Expect message 3ca from midiStream callback midi.c:555: Test failed: Wait failed: 0102 -559038737 midi.c:555: Test failed: Expect message 3c9 from midiStreamOut midi.c:558: Test failed: play left MIDIHDR.dwOffset at 1234567890 midi.c:561: Test failed: midiOutUnprepare rc=MMSYSERR_INVALPARAM midi.c:563: Test failed: midiOutUnprepare #2 rc=MMSYSERR_INVALPARAM midi.c:566: Test failed: MHDR.dwFlags when done 0 midi.c:580: Test failed: stream set tempo 500000 midi.c:588: Test failed: midiOutPrepare used flags 8 rc=MMSYSERR_INVALPARAM midi.c:590: Test failed: midiOutUnprepare used flags 8 rc=MMSYSERR_INVALPARAM midi.c:518: Test failed: midiOutPrepare old size rc=MMSYSERR_INVALPARAM midi.c:519: Test failed: MHDR.dwFlags when prepared 0 midi.c:523: Test failed: midiStreamOut old size rc=MIDIERR_UNPREPARED midi.c:547: Test failed: MHDR.dwFlags 0 no ISSTRM when out of queue midi.c:553: Test failed: MHDR.dwFlags 0 not DONE when out of queue midi.c:554: Test failed: Wait failed: 0102 -559038737 midi.c:554: Test failed: Expect message 3ca from midiStream callback midi.c:555: Test failed: Wait failed: 0102 -559038737 midi.c:555: Test failed: Expect message 3c9 from midiStreamOut midi.c:558: Test failed: play left MIDIHDR.dwOffset at 1234567890 midi.c:561: Test failed: midiOutUnprepare rc=MMSYSERR_INVALPARAM midi.c:563: Test failed: midiOutUnprepare #2 rc=MMSYSERR_INVALPARAM midi.c:566: Test failed: MHDR.dwFlags when done 0 midi.c:580: Test failed: stream set tempo 500000 midi.c:588: Test failed: midiOutPrepare used flags 8 rc=MMSYSERR_INVALPARAM midi.c:590: Test failed: midiOutUnprepare used flags 8 rc=MMSYSERR_INVALPARAM

1 0

Re: [PATCH 1/7] wined3d: Restore the pixel format of the window whose pixel format was actually changed. (try 2)
by Henri Verbeet 15 Feb '14

15 Feb '14

On 14 February 2014 00:31, Ken Thomases <ken(a)codeweavers.com> wrote: > -static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HDC dc, HGLRC gl_ctx, int pf) > +static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HDC dc, HGLRC gl_ctx) This doesn't need "gl_info" either anymore now. It's also a bit questionable if context_restore_gl_context() has much of a purpose at all anymore, it's pretty much just a wglMakeCurrent() call, and has only two callers.

2 2

Converting source to unicode, bug 28189
by Hugh McMaster 15 Feb '14

15 Feb '14

I've put together a draft patch to address bug 28189, regsvr32: No usage in wineconsole. I'm using resource strings and have converted all of the printf calls to WriteConsoleW. I also converted the source to Unicode, but overall, there are few coding points I'm not quite sure about. If someone could look over the changes and offer some feedback, I'd certainly appreciate it. URL: http://bugs.winehq.org/show_bug.cgi?id=28189 -- Hugh

2 4

Re: xmllite: Don't fail the whole parsing process because of unsupported 'xmlns' attribute.
by Nikolay Sivov 15 Feb '14

15 Feb '14

On 2/14/2014 11:23, Dmitry Timoshkov wrote: > This patch allows to successfully parse pretty complex XML task definitions. > > Please apply after other xmllite fixes. I think it's fine to relax a check here as you did if it really helps. Same applies to other patches. My main problem with all of that is that whole reader code needs to be revised and partially rewritten at some point (better sooner than later), to properly support chunked reads and corresponding state updates. Looking at it now I don't actually like the way I did it, it's not easily extensible and not very clean. Do you plan to add more code to xmllite itself or what we have is enough for taskschd so far?

2 1

Re: [PATCH 1/5] d3d9/tests: Clean up yuv_color_test.
by Henri Verbeet 14 Feb '14

14 Feb '14

On 13 February 2014 23:10, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > - HRESULT color; > - DWORD ref_color_left, ref_color_right; > + DWORD ref_color_left, ref_color_right, color; > If you're cleaning it up anyway, you may as well make that a D3DCOLOR. > + static const struct > + { > + DWORD in; /* The input color. */ > + DWORD uyvy_left; /* "in" interpreted as uyvy and transformed to RGB, pixel 1/1. */ > + DWORD uyvy_right; /* "in" interpreted as uyvy and transformed to RGB, pixel 2/1. */ > + DWORD yuy2_left; /* "in" interpreted as yuy2 and transformed to RGB, pixel 1/1. */ > + DWORD yuy2_right; /* "in" interpreted as yuy2 and transformed to RGB, pixel 2/1. */ > + } > + test_data[] = > + { > + {0x00000000, 0x00008700, 0x00008700, 0x00008700, 0x00008700}, > + {0xff000000, 0x00008700, 0x004bff1c, 0x00b30000, 0x00b30000}, > + {0x00ff0000, 0x00b30000, 0x00b30000, 0x00008700, 0x004bff1c}, > + {0x0000ff00, 0x004bff1c, 0x00008700, 0x000030e1, 0x000030e1}, > + {0x000000ff, 0x000030e1, 0x000030e1, 0x004bff1c, 0x00008700}, > + {0xffff0000, 0x00b30000, 0x00ffd01c, 0x00b30000, 0x00ffd01c}, > + {0xff00ff00, 0x004bff1c, 0x004bff1c, 0x00b300e1, 0x00b300e1}, > + {0xff0000ff, 0x000030e1, 0x004bffff, 0x00ffd01c, 0x00b30000}, > + {0x00ffff00, 0x00ffd01c, 0x00b30000, 0x000030e1, 0x004bffff}, > + {0x00ff00ff, 0x00b300e1, 0x00b300e1, 0x004bff1c, 0x004bff1c}, > + {0x0000ffff, 0x004bffff, 0x000030e1, 0x004bffff, 0x000030e1}, > + {0xffffff00, 0x00ffd01c, 0x00ffd01c, 0x00b300e1, 0x00ff79ff}, > + {0xffff00ff, 0x00b300e1, 0x00ff79ff, 0x00ffd01c, 0x00ffd01c}, > + {0xffffffff, 0x00ff79ff, 0x00ff79ff, 0x00ff79ff, 0x00ff79ff}, > + {0x4cff4c54, 0x00ff0000, 0x00ff0000, 0x000b8b00, 0x00b6ffa3}, > + {0x00800080, 0x00000000, 0x00000000, 0x0000ff00, 0x0000ff00}, > + {0xff80ff80, 0x00ffffff, 0x00ffffff, 0x00ff00ff, 0x00ff00ff}, > + {0x1c6b1cff, 0x000000fd, 0x000000fd, 0x006dff45, 0x0000d500}, > }; ... > - for(fmt = 0; fmt < 2; fmt++) { > - if(fmt == 0) { > - format = D3DFMT_UYVY; > - fmt_string = "D3DFMT_UYVY"; > - } else { > + for (fmt = 0; fmt < 2; fmt++) > + { > + if (fmt) > + { > format = D3DFMT_YUY2; > fmt_string = "D3DFMT_YUY2"; > } > + else > + { > + format = D3DFMT_UYVY; > + fmt_string = "D3DFMT_UYVY"; > + } ... > + if (fmt) > + { > ref_color_left = test_data[i].yuy2_left; > ref_color_right = test_data[i].yuy2_right; > } > + else > + { > + ref_color_left = test_data[i].uyvy_left; > + ref_color_right = test_data[i].uyvy_right; > + } > There's probably a nicer way to do all that.

1 0

Re: [PATCH 4/7] ddraw/tests: Test that DirectDraw7 doesn't modify the pixel format of the window it targets.
by Henri Verbeet 14 Feb '14

14 Feb '14

On 14 February 2014 00:31, Ken Thomases <ken(a)codeweavers.com> wrote: > --- > dlls/ddraw/tests/Makefile.in | 2 +- > dlls/ddraw/tests/ddraw7.c | 161 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 162 insertions(+), 1 deletion(-) > For what it's worth, I think it's fine to fold the ddraw tests into a single patch, but splitting them like this is fine too.

1 0

Re: [PATCH 4/7] ddraw/tests: Test that DirectDraw7 doesn't modify the pixel format of the window it targets.
by Henri Verbeet 14 Feb '14

14 Feb '14

On 14 February 2014 00:31, Ken Thomases <ken(a)codeweavers.com> wrote: > --- > dlls/ddraw/tests/Makefile.in | 2 +- > dlls/ddraw/tests/ddraw7.c | 161 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 162 insertions(+), 1 deletion(-) > For what it's worth, I think it's fine to fold the ddraw tests into a single patch, but splitting them like this is fine too.

1 0

Re: [PATCH 5/5] d3dx9: Handle pixel formats larger than 32 bits in surface loading / filtering functions.
by Henri Verbeet 14 Feb '14

14 Feb '14

On 14 February 2014 15:53, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + if (format->bits[c]) > + { > + mask = format->bits[c] == 32 ? ~0U : (1 << format->bits[c]) - 1; You could probably also do that as "mask = ~0u >> (32 - format->bits[c]);", since you already need to check "format->bits[c]" for 0 anyway.

2 1

Re: [PATCH 2/2] mshtml: Use IWebBrowserPriv2IE9 instead of IWebBrowserPriv2IE8 in tests on IE9+.
by Marvin 14 Feb '14

14 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4905 Your paranoid android. === w8 (32 bit htmldoc) === htmldoc.c:2858: Test failed: unexpected command 74 htmldoc.c:2858: Test failed: unexpected command 74

1 0

Re: ws2_32: Fix some edge cases for getaddrinfo in BSD and OSX
by Dmitry Timoshkov 14 Feb '14

14 Feb '14

Bruno Jesus <00cpxxx(a)gmail.com> wrote: > + /* servname tweaks required by OSX and BSD kernels */ > + if (!servname) > + serv = NULL; > + else if (!servname[0]) > + serv = "0"; > + else > + serv = servname; Shouldn't 'serv = "0"' be 'serv = ""' ? -- Dmitry.

2 1

Re: [PATCH 5/5] tests: Allow broken results to cause failures on the "windows" platform as well.
by Alexandre Julliard 14 Feb '14

14 Feb '14

Henri Verbeet <hverbeet(a)codeweavers.com> writes: > --- > include/wine/test.h | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/include/wine/test.h b/include/wine/test.h > index f8b608f..c81fe11 100644 > --- a/include/wine/test.h > +++ b/include/wine/test.h > @@ -208,6 +208,9 @@ const char *winetest_platform = "windows"; > /* report successful tests (BOOL) */ > static int report_success = 0; > > +/* fail on broken() */ > +static int fail_broken = 0; > + > /* passing arguments around */ > static int winetest_argc; > static char** winetest_argv; > @@ -289,7 +292,7 @@ void winetest_set_location( const char* file, int line ) > > int broken( int condition ) > { > - return (strcmp(winetest_platform, "windows") == 0) && condition; > + return !fail_broken && condition; > } > > /* > @@ -636,6 +639,8 @@ int main( int argc, char **argv ) > if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); > if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); > if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); > + if (GetEnvironmentVariableA( "WINETEST_FAIL_BROKEN", p, sizeof(p) )) fail_broken = atoi(p); > + else fail_broken = strcmp( winetest_platform, "windows" ); Couldn't you simply set the platform to "windows_broken" or something like that? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: ws2_32: Fix some edge cases for getaddrinfo in BSD and OSX
by Marvin 14 Feb '14

14 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4901 Your paranoid android. === wxppro (32 bit sock) === sock.c:557: Test failed: oob_server (b34): unexpectedly at the OOB mark: 0 === wvistau64 (32 bit sock) === sock.c:557: Test failed: oob_server (744): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 753E9799 === w2008s64 (32 bit sock) === sock.c:547: Test failed: oob_server (768): unexpectedly at the OOB mark: 0 sock.c:557: Test failed: oob_server (768): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 757C9799 === wvistau64 (64 bit sock) === sock.c:557: Test failed: oob_server (b5c): unexpectedly at the OOB mark: 0 === w2008s64 (64 bit sock) === sock.c:557: Test failed: oob_server (750): unexpectedly at the OOB mark: 0 === w7pro64 (64 bit sock) === sock.c:547: Test failed: oob_server (a54): unexpectedly at the OOB mark: 0 sock.c:557: Test failed: oob_server (a54): unexpectedly at the OOB mark: 0 sock.c:326: Test failed: do_synchronous_recv (a54): error 10054: sock.c:572: Test failed: oob_server (a54): not at the OOB mark: 1

1 0

Re: ntdll: add a stub for NtSetLdtEntries/ZwSetLdtEntries
by Dmitry Timoshkov 14 Feb '14

14 Feb '14

Austin English <austinenglish(a)gmail.com> wrote: > On Mon, Jan 27, 2014 at 3:48 PM, Austin English <austinenglish(a)gmail.com>wrote: > > > Fixes http://bugs.winehq.org/show_bug.cgi?id=26268 (tested with Kwik > > Support). > > > > -- > > -Austin > > > > Any comments on this patch? It's clearly wrong. -- Dmitry.

1 0

Re: dpnet: Use registry for lookup in IDirectPlay8Peer (try 2)
by Bruno Jesus 14 Feb '14

14 Feb '14

On Thu, Feb 13, 2014 at 1:23 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Hi, > Corrected pointer arithmetic. > Corrected assign memory for RegGetValueW calls. > > Changelog: > dpnet: Use registry for lookup in IDirectPlay8Peer > > > Best Regards > Alistair Leslie-Hughes > > > Hi, here are my thoughts about this patch, as I told you before I'm really looking forward for your dpnet work =) I'm not used to review patches so if I do something wrong I ask for sorry in advance. + if(!pcReturned || !pcbEnumData) + return E_POINTER; This checks together with the error tests could be in a different patch as they are not related to the main subject of the patch. + while(nextKeyNameResult == ERROR_SUCCESS) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); + if(res == ERROR_SUCCESS) + { + WCHAR *buf = HeapAlloc(GetProcessHeap(), 0, size); + if(buf) + { + res = RegGetValueW( key, provider, friendly, RRF_RT_REG_SZ, NULL, buf, &size); + if(res == ERROR_SUCCESS) + { + TRACE("%s=%s\n", debugstr_w(provider), debugstr_w(buf)); + + req_size += sizeof(DPN_SERVICE_PROVIDER_INFO) + (size * sizeof(WCHAR)); + + (*pcReturned)++; + } You are only reading the key value in the first loop to trace it, maybe you could simplify this loop with a single RegGetValueW call and no memory allocation just to get the size required and in the next loop where you really copy the data you could trace it. + char *infoend = ((char *)pSPInfoBuffer + (sizeof(DPN_SERVICE_PROVIDER_INFO) * (*pcReturned))); Since you are copying WCHAR data infoend should be a WCHAR pointer and it could be done like this AFAICS: WCHAR *infoend = (WCHAR *)(pSPInfoBuffer + *pcReturned); + while(nextKeyNameResult == ERROR_SUCCESS) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); + + if(res == ERROR_SUCCESS) + { + WCHAR *buf = HeapAlloc(GetProcessHeap(), 0, size); + if(buf) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, buf, &size); + if(res == ERROR_SUCCESS) + { + pSPInfoBuffer[count].guid = CLSID_DP8SP_TCPIP; + pSPInfoBuffer[count].pwszName = (LPWSTR)(infoend + offset); + lstrcpyW(pSPInfoBuffer[count].pwszName, buf); + What if you read data directly over infoend buffer? This would eliminate the need for buf memory allocation and the strcpy. You would only have to set the pwszName. + offset += size-1; If you do a -1 here the next string will overwrite the NULL terminator from the previous string, won't it? If you decide to copy directly over the infoend buffer you could also get rid from the offset variable since you could do infoend += size instead. Best regards, Bruno

2 3

Re: [PATCH 1/5] d3d9/tests: Clean up yuv_color_test.
by Marvin 14 Feb '14

14 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4882 Your paranoid android. === w8 (32 bit visual) === visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0x00000000: Got color 0x00000000 for pixel 1/1, expected 0x00008700, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0x00000000: Got color 0x00000000 for pixel 2/1, expected 0x00008700, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0xff000000: Got color 0x00000000 for pixel 1/1, expected 0x00b30000, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0xff000000: Got color 0x00000000 for pixel 2/1, expected 0x00b30000, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0x00ff0000: Got color 0x00000000 for pixel 1/1, expected 0x00008700, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0x00ff0000: Got color 0x00000000 for pixel 2/1, expected 0x004bff1c, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0x0000ff00: Got color 0x00000000 for pixel 1/1, expected 0x000030e1, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0x0000ff00: Got color 0x00000000 for pixel 2/1, expected 0x000030e1, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0x000000ff: Got color 0x00000000 for pixel 1/1, expected 0x004bff1c, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0x000000ff: Got color 0x00000000 for pixel 2/1, expected 0x00008700, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0xffff0000: Got color 0x00000000 for pixel 1/1, expected 0x00b30000, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0xffff0000: Got color 0x00000000 for pixel 2/1, expected 0x00ffd01c, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0xff00ff00: Got color 0x00000000 for pixel 1/1, expected 0x00b300e1, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0xff00ff00: Got color 0x00000000 for pixel 2/1, expected 0x00b300e1, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0xff0000ff: Got color 0x00000000 for pixel 1/1, expected 0x00ffd01c, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0xff0000ff: Got color 0x00000000 for pixel 2/1, expected 0x00b30000, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0x00ffff00: Got color 0x00000000 for pixel 1/1, expected 0x000030e1, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0x00ffff00: Got color 0x00000000 for pixel 2/1, expected 0x004bffff, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0x00ff00ff: Got color 0x00000000 for pixel 1/1, expected 0x004bff1c, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0x00ff00ff: Got color 0x00000000 for pixel 2/1, expected 0x004bff1c, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0x0000ffff: Got color 0x00000000 for pixel 1/1, expected 0x004bffff, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0x0000ffff: Got color 0x00000000 for pixel 2/1, expected 0x000030e1, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0xffffff00: Got color 0x00000000 for pixel 1/1, expected 0x00b300e1, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0xffffff00: Got color 0x00000000 for pixel 2/1, expected 0x00ff79ff, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0xffff00ff: Got color 0x00000000 for pixel 1/1, expected 0x00ffd01c, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0xffff00ff: Got color 0x00000000 for pixel 2/1, expected 0x00ffd01c, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0xffffffff: Got color 0x00000000 for pixel 1/1, expected 0x00ff79ff, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0xffffffff: Got color 0x00000000 for pixel 2/1, expected 0x00ff79ff, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0x4cff4c54: Got color 0x00000000 for pixel 1/1, expected 0x000b8b00, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0x4cff4c54: Got color 0x00000000 for pixel 2/1, expected 0x00b6ffa3, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0x00800080: Got color 0x00000000 for pixel 1/1, expected 0x0000ff00, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0x00800080: Got color 0x00000000 for pixel 2/1, expected 0x0000ff00, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0xff80ff80: Got color 0x00000000 for pixel 1/1, expected 0x00ff00ff, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0xff80ff80: Got color 0x00000000 for pixel 2/1, expected 0x00ff00ff, format D3DFMT_YUY2. visual.c:10474: Test failed: Failed to draw surface onto backbuffer, hr 0x8876086c. visual.c:10483: Test failed: Input 0x1c6b1cff: Got color 0x00000000 for pixel 1/1, expected 0x006dff45, format D3DFMT_YUY2. visual.c:10487: Test failed: Input 0x1c6b1cff: Got color 0x00000000 for pixel 2/1, expected 0x0000d500, format D3DFMT_YUY2.

2 1

Re: [PATCH 5/7] ddraw/tests: Test that DirectDraw4 doesn't modify the pixel format of the window it targets.
by Marvin 14 Feb '14

14 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4892 Your paranoid android. === w8 (32 bit ddraw4) === ddraw4.c:3462: Test failed: SetDisplayMode failed, hr 0x80004001.

2 1

Re: [PATCH 3/7] d3d8/tests: Test that Direct3D8 doesn't modify the pixel format of the window it targets.
by Marvin 14 Feb '14

14 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4890 Your paranoid android. === w8 (32 bit device) === device.c:2572: Test failed: Expected foreground window 00030196, got 0002004E. device.c:3268: Test failed: Expected wndproc 0x4100c0, got 0x4100c0.

2 1

Re: [PATCH 5/5] ddraw/tests: Port test_private_data to ddraw4.
by Marvin 14 Feb '14

14 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4886 Your paranoid android. === w8 (32 bit ddraw7) === ddraw7.c:3185: Test failed: SetDisplayMode failed, hr 0x80004001.

1 0

Re: [PATCH 4/5] d3d8/tests: Add a test for sub resource private data.
by Marvin 13 Feb '14

13 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4885 Your paranoid android. === w8 (32 bit device) === device.c:2572: Test failed: Expected foreground window 00030196, got 0002004E. device.c:3268: Test failed: Expected wndproc 0x410530, got 0x410530.

1 0

Re: [PATCHv5 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Looks good, thanks! Wrt the testbot failures: It looks like CheckDeviceFormatConversion is in fact the right way to check this - I missed a sentence in the msdn page. I'll send a patch to handle this in this test and yuv_color_test. Real Windows drivers seem to agree with our interpretation of CheckDeviceFormatConversion. (Sorry if this mail arrives twice. I think my mail server swallowed the last one.) Am 2014-02-13 14:52, schrieb Martin Storsjo: > There are no public defines for the YV12 and NV12 > formats, although they do seem to be supported on > actual D3D on windows, at least on the one machine I > tested on. > --- > Removed unnecessary IDirect3DDevice9_SetFVF call. > --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/NuWAAoJEN0/YqbEcdMwg+0P/iXXzioHwCQuR4fQxmaZ0iQa FB/3kQd1E2Gn/k0sV9H+Uqb0s+C6g1/QSk11Q4+KaYjmAgcp7j2BJXi81wksInRV wLix2vEqENroLxoDbVVcjEyvlLBENnkCU88ixzK2IjzDuMGrDBNX6xnpDgE7UQIT ra5JiO6hnY2J6LN78QXomwgIQgtbTURhR+NwyXbYk6uYhWGu3+JoB24Ga0NnRH/p zfNXEWYgcrW05lBUCBEwu7+7XHHaYY45l8/p5o33JqiacYJIvFlwJ/H/Kpcc4bQ1 4yky4k/K2DEwpdlhBAzsGheqs5mAZ7xCYytFH+f1kNbDAfowN9M03wgFjfecPPJa 2UENwr0otG2/NdYyqD4FbfLUQZYnAcP4OdZ2lTIE/oZqlsN7T3d7xVhfzqDjRWP+ NhsCfKFTct+v0DWZpqp9Gcyi2aOJtoxuRFpaQIUHcKnEDD6PzBCLutVVERrhI3Gy 55+j7FfH9MfDT08+EOhK+4VXu74CdIgTUaR2Hm2nZFFw9q4Awh4Ixkd4RjjGFAWP RDnNzInSeaBKFYlwHhIxt5lnnVdIsJTkRvQi+j7g3j9YBMncE88YFWWw8wqkmPaE 9QfCvMCQZp7qmf9ak8A2PfCNDQv4jx4LEoJoNjgloLm8qQq0Yu+JYRpNjyvC6MJa pfw1CcMzFR626dZ9dOW2 =69kR -----END PGP SIGNATURE-----

1 1

Re: [PATCH 1/3] atl: Share atl_ax.c with atl100.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/atl/Makefile.in | 3 ++- > dlls/atl/atl.spec | 18 +++++++++--------- > dlls/atl/atl_main.c | 48 ------------------------------------------------ > dlls/atl100/atl_ax.c | 15 ++++++++++----- > 4 files changed, 21 insertions(+), 63 deletions(-) It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M atl.dll -p atl_test.exe.so atl_ax && touch atl_ax.ok atl_ax.c:133: Test failed: wcex.style 00004008 make[1]: *** [atl_ax.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: urlmon: Unregister window class on DLL unload.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Jacek Caban <jacek(a)codeweavers.com> writes: > @@ -83,15 +83,50 @@ static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM > return DefWindowProcW(hwnd, msg, wParam, lParam); > } > > +static const WCHAR wszURLMonikerNotificationWindow[] = > + {'U','R','L',' ','M','o','n','i','k','e','r',' ', > + 'N','o','t','i','f','i','c','a','t','i','o','n',' ','W','i','n','d','o','w',0}; > + > +static ATOM notif_wnd_class; > + > +static CRITICAL_SECTION notif_wnd_class_cs; > +static CRITICAL_SECTION_DEBUG notif_wnd_class_cs_dbg = { > + 0, 0, &notif_wnd_class_cs, > + { &notif_wnd_class_cs_dbg.ProcessLocksList, &notif_wnd_class_cs_dbg.ProcessLocksList }, > + 0, 0, { (DWORD_PTR)(__FILE__ ": notif_wnd_class") } > +}; > +static CRITICAL_SECTION notif_wnd_class_cs = { &notif_wnd_class_cs_dbg, -1, 0, 0, 0, 0 }; > + > +static BOOL ensure_notif_wnd_class(void) > +{ > + EnterCriticalSection(&notif_wnd_class_cs); > + > + if(!notif_wnd_class) { > + static WNDCLASSEXW wndclass = { > + sizeof(wndclass), 0, notif_wnd_proc, 0, 0, > + NULL, NULL, NULL, NULL, NULL, > + wszURLMonikerNotificationWindow, NULL > + }; > + > + wndclass.hInstance = hProxyDll; > + notif_wnd_class = RegisterClassExW(&wndclass); > + } > + > + LeaveCriticalSection(&notif_wnd_class_cs); > + > + return notif_wnd_class != 0; > +} You don't really need a whole new critical section for this. Just use InitOnce or interlocked functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCHv4 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-02-13 14:25, schrieb Martin Storsjo: > + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | > D3DFVF_TEX0); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF > failed, hr = %#x.\n", hr); Another issue I missed: This call is not needed because you don't call DrawPrimitive and friends. I'll send a patch to clean up the same problems I pointed out here in yuv_color_test. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/MzZAAoJEN0/YqbEcdMwZysQAIt75Q8zVg7KHGGuTDPPjq+G vtUI+xZryYVHSubEDG7uawf3L9n3QEdF6l5RIEEi7p40NPG9zf7P2eGGrIOoVpqY L5j1WAhnseHVO6e+vuB0/9M4RvSGHMzdTmzsdIz2/LiGgq3ui13semLC10NvybNy nmSNhU4umJAHR/Ize+3UHwgxOmyhyJvZ6I1ieMdprxmmC8LeOM+BAeY+hPZ6T671 jqwK64hRxCJVZdcqbHIV/0SAoFPoy9ndDZvcOe/a0FSqPQJGKCRWVDWd/JF2vH0p utAQcw9exQUga4F+0ds/60TMOVT87V+O4yyV81HeF+eYXR3U7W/IgvNPtvZW/HIM 0QMHYBEXKOLKXmqB2QONBC92l0TZcMZ3prXscexwpsOVMWyr6OHKYDBuo4Doc7av 3bPR9SGDY/V2wCJLIdjXZIWWO9C35JYDN2hrtyhAaCoIN2CBJDsqCPBbA4NcYFiy UOQB9QPExcK0f/Jg2Gqx1nbQ3lqMuCwOz8l3nv4Xwf/sJDbB2WXm6pllR/dmXppG DKx3G9/CrZkKukaSH93BNj9a1BDhIkNbA99CffJfuqH3qj7/QB9n4+VLDZQSB9E7 ykL4qXxXMZcUT47BtHS6wWV/QqRPtW3cG3/a0EUI03+WclYYt0V6KJX3izQEu6Fm XUUxgRjpsTexsjs6Hk/o =xV6C -----END PGP SIGNATURE-----

1 0

Re: [PATCHv3 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, There are two more style issues I missed in my previous reviews: > + static const struct > + { > + DWORD color1, color2; > + DWORD rgb1, rgb2; > + } > + test_data[] = > + { > + { 0x000000, 0xffffff, 0x00008800, 0x00ff7dff }, > + { 0xff0000, 0x00ffff, 0x004aff14, 0x00b800ee }, > + { 0x00ff00, 0xff00ff, 0x000024ee, 0x00ffe114 }, > + { 0x0000ff, 0xffff00, 0x00b80000, 0x004affff }, > + { 0xffff00, 0x0000ff, 0x004affff, 0x00b80000 }, > + { 0xff00ff, 0x00ff00, 0x00ffe114, 0x000024ee }, > + { 0x00ffff, 0xff0000, 0x00b800ee, 0x004aff14 }, > + { 0xffffff, 0x000000, 0x00ff7dff, 0x00008800 }, 4 space indents in the data block. > + DWORD color = (x < width/2 && y < height/2) ? test_data[i].color1 : test_data[i].color2; Please use spaces consistently around binary opertions. (i.e. x < width / 2) etc. I think I've also seen some multiplications that are affected. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/MXbAAoJEN0/YqbEcdMwJjQP/2OzFt2DE5iEhWuwTOACdXSM 1dhlZnmz4bH+sUymen1dvxIXCLxhKWlLGl5cPkkFk2OCj0B2YlYaheV4qDJj5Cye zfKyrKjv1nfwk86g5YepoS2Ee/ZUdiMkNF+5tq9FkAa5LjStTgpC4KU6Vxpye1i5 Wmv2IBc0jAe84pRoDuZGYt0CT/RqgdHo8yvouK6Z5ytS7ClpLYWrLt/FYhpk0Sjj ITa6l7NksgBVN4ByZW5Pyk9Hf8gZ44qx9J8rzxOGBxLkGGpTOuGLB9MsE4riYwGy M1X10s7llWCs7Qy8Hs96Gg4vfHMS09xgfuYlj3UBKaXJVyRhTIDJpc7iqXA4WDaN mWJUrVaHCPha6ZGW2llC43wh5zECMH1/v98veRICbYqFhlKFzWuhtLq4BOwloJj4 fvJaYivFhkyDsn1y5grO8dGYjirZFNkiG/dIj7XpO8lh+4xGuTrBCO5hWBqICLV2 uQX6woh2MKv7ddFmRdvUuL/emV8oKBKga9t8LgTQdeSX7v//5aPtCLeawPKczpIB yPv2zUIei3G5TAcLlter66KGyvQZgXhiZXwtwq0wCWvNWRitjTztLp+2jrg9uWJ1 JiuhXuBFbsI8r/iiTrYXmZv1vX6BBFfL8I59SS0+J/7dFFZ63F5ePqEsl0WKSQ0W 0haQuTaKNLiVBlP1pmkF =fSNX -----END PGP SIGNATURE-----

1 0

Re: [PATCHv4 2/3] wined3d: Use an rbtree for storing shaders for texture format conversion/blitting
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Looks good to me. Am 2014-02-13 13:05, schrieb Martin Storsjo: > --- Fixed the final style issues and added comments about who > activates the GL context. --- dlls/wined3d/arb_program_shader.c | > 204 +++++++++++++++++++++++++------------- 1 file changed, 134 > insertions(+), 70 deletions(-) > > diff --git a/dlls/wined3d/arb_program_shader.c > b/dlls/wined3d/arb_program_shader.c index 93a6e31..a273eac 100644 > --- a/dlls/wined3d/arb_program_shader.c +++ > b/dlls/wined3d/arb_program_shader.c @@ -6768,22 +6768,74 @@ const > struct fragment_pipeline arbfp_fragment_pipeline = { > arbfp_fragmentstate_template, }; > > -struct arbfp_blit_priv { - GLenum yuy2_rect_shader, > yuy2_2d_shader; - GLenum uyvy_rect_shader, uyvy_2d_shader; - > GLenum yv12_rect_shader, yv12_2d_shader; - GLenum > nv12_rect_shader, nv12_2d_shader; - GLenum p8_rect_shader, > p8_2d_shader; +struct arbfp_blit_type +{ + enum complex_fixup > fixup; + GLenum textype; +}; + +struct arbfp_blit_desc +{ + > GLenum shader; + struct arbfp_blit_type type; + struct > wine_rb_entry entry; +}; + +struct arbfp_blit_priv +{ + struct > wine_rb_tree shaders; GLuint palette_texture; }; > > +static int arbfp_blit_type_compare(const void *key, const struct > wine_rb_entry *entry) +{ + const struct arbfp_blit_type *ka = > key; + const struct arbfp_blit_type *kb = > &WINE_RB_ENTRY_VALUE(entry, const struct arbfp_blit_desc, > entry)->type; + + if (ka->fixup != kb->fixup) + return > ka->fixup < kb->fixup ? -1 : 1; + if (ka->textype != > kb->textype) + return ka->textype < kb->textype ? -1 : 1; + > return 0; +} + +/* Context activation is done by the caller. */ > +static void arbfp_free_blit_shader(struct wine_rb_entry *entry, > void *context) +{ + const struct wined3d_gl_info *gl_info = > context; + struct arbfp_blit_desc *entry_arb = > WINE_RB_ENTRY_VALUE(entry, struct arbfp_blit_desc, entry); + + > GL_EXTCALL(glDeleteProgramsARB(1, &entry_arb->shader)); + > checkGLcall("glDeleteProgramsARB(1, &entry_arb->shader)"); + > HeapFree(GetProcessHeap(), 0, entry_arb); +} + +const struct > wine_rb_functions wined3d_arbfp_blit_rb_functions = +{ + > wined3d_rb_alloc, + wined3d_rb_realloc, + wined3d_rb_free, + > arbfp_blit_type_compare, +}; + static HRESULT > arbfp_blit_alloc(struct wined3d_device *device) { + struct > arbfp_blit_priv *priv; device->blit_priv = > HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct > arbfp_blit_priv)); if(!device->blit_priv) { ERR("Out of > memory\n"); return E_OUTOFMEMORY; } + priv = device->blit_priv; > + + if (wine_rb_init(&priv->shaders, > &wined3d_arbfp_blit_rb_functions) == -1) + { + > ERR("Failed to initialize rbtree.\n"); + > HeapFree(GetProcessHeap(), 0, device->blit_priv); + > device->blit_priv = NULL; + return E_OUTOFMEMORY; + } + > return WINED3D_OK; } > > @@ -6793,17 +6845,8 @@ static void arbfp_blit_free(struct > wined3d_device *device) const struct wined3d_gl_info *gl_info = > &device->adapter->gl_info; struct arbfp_blit_priv *priv = > device->blit_priv; > > - GL_EXTCALL(glDeleteProgramsARB(1, &priv->yuy2_rect_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->yuy2_2d_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->uyvy_rect_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->uyvy_2d_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->yv12_rect_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->yv12_2d_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->nv12_rect_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->nv12_2d_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->p8_rect_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->p8_2d_shader)); - > checkGLcall("Delete yuv and p8 programs"); + > wine_rb_destroy(&priv->shaders, arbfp_free_blit_shader, > &device->adapter->gl_info); + checkGLcall("Delete blit > programs"); > > if (priv->palette_texture) gl_info->gl_ops.gl.p_glDeleteTextures(1, > &priv->palette_texture); @@ -7196,12 +7239,14 @@ static BOOL > gen_nv12_read(struct wined3d_shader_buffer *buffer, GLenum > textype, return TRUE; } > > +/* Context activation is done by the caller. */ static GLuint > gen_p8_shader(struct arbfp_blit_priv *priv, const struct > wined3d_gl_info *gl_info, GLenum textype) { GLenum shader; struct > wined3d_shader_buffer buffer; GLint pos; + struct > arbfp_blit_desc *desc; > > /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -7249,14 > +7294,34 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv > *priv, shader_arb_dump_program_source(buffer.buffer); } > > - if (textype == GL_TEXTURE_RECTANGLE_ARB) - > priv->p8_rect_shader = shader; - else - > priv->p8_2d_shader = shader; - shader_buffer_free(&buffer); > > + desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*desc)); + if > (!desc) + { + ERR("Out of memory\n"); + goto > err_out; + } + + desc->type.textype = textype; + > desc->type.fixup = COMPLEX_FIXUP_P8; + desc->shader = shader; + > if (wine_rb_put(&priv->shaders, &desc->type, &desc->entry) == -1) + > { + ERR("Out of memory\n"); + goto err_out; + } + > return shader; + +err_out: + GL_EXTCALL(glDeleteProgramsARB(1, > &shader)); + checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, > &shader))"); + > GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)); + > checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)"); + > if (desc) + HeapFree(GetProcessHeap(), 0, desc); + return > 0; } > > /* Context activation is done by the caller. */ @@ -7298,6 +7363,7 > @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const > struct wined3d_ struct wined3d_shader_buffer buffer; char > luminance_component; GLint pos; + struct arbfp_blit_desc *desc; > > /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -7428,34 > +7494,32 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv > *priv, const struct wined3d_ > > shader_buffer_free(&buffer); > > - switch (yuv_fixup) + desc = HeapAlloc(GetProcessHeap(), 0, > sizeof(*desc)); + if (!desc) { - case > COMPLEX_FIXUP_YUY2: - if (textype == > GL_TEXTURE_RECTANGLE_ARB) priv->yuy2_rect_shader = shader; - > else priv->yuy2_2d_shader = shader; - break; - - > case COMPLEX_FIXUP_UYVY: - if (textype == > GL_TEXTURE_RECTANGLE_ARB) priv->uyvy_rect_shader = shader; - > else priv->uyvy_2d_shader = shader; - break; - - > case COMPLEX_FIXUP_YV12: - if (textype == > GL_TEXTURE_RECTANGLE_ARB) priv->yv12_rect_shader = shader; - > else priv->yv12_2d_shader = shader; - break; + > ERR("Out of memory\n"); + goto err_out; + } > > - case COMPLEX_FIXUP_NV12: - if (textype == > GL_TEXTURE_RECTANGLE_ARB) - priv->nv12_rect_shader = > shader; - else - priv->nv12_2d_shader = > shader; - break; - default: - > ERR("Unsupported complex fixup: %d\n", yuv_fixup); + > desc->type.textype = textype; + desc->type.fixup = yuv_fixup; + > desc->shader = shader; + if (wine_rb_put(&priv->shaders, > &desc->type, &desc->entry) == -1) + { + ERR("Out of > memory\n"); + goto err_out; } > > return shader; + +err_out: + GL_EXTCALL(glDeleteProgramsARB(1, > &shader)); + checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, > &shader))"); + > GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)); + > checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)"); + > if (desc) + HeapFree(GetProcessHeap(), 0, desc); + return > 0; } > > /* Context activation is done by the caller. */ @@ -7467,6 +7531,8 > @@ static HRESULT arbfp_blit_set(void *blit_priv, struct > wined3d_context *context, enum complex_fixup fixup; const struct > wined3d_gl_info *gl_info = context->gl_info; GLenum textype = > surface->container->target; + struct wine_rb_entry *entry; + > struct arbfp_blit_type type; > > if (surface->flags & SFLAG_CONVERTED) { @@ -7487,39 +7553,37 @@ > static HRESULT arbfp_blit_set(void *blit_priv, struct > wined3d_context *context, > > fixup = get_complex_fixup(surface->resource.format->color_fixup); > > - switch(fixup) + type.fixup = fixup; + type.textype = > textype; + entry = wine_rb_get(&priv->shaders, &type); + if > (entry) { - case COMPLEX_FIXUP_YUY2: - shader = > textype == GL_TEXTURE_RECTANGLE_ARB ? priv->yuy2_rect_shader : > priv->yuy2_2d_shader; - break; - - case > COMPLEX_FIXUP_UYVY: - shader = textype == > GL_TEXTURE_RECTANGLE_ARB ? priv->uyvy_rect_shader : > priv->uyvy_2d_shader; - break; - - case > COMPLEX_FIXUP_YV12: - shader = textype == > GL_TEXTURE_RECTANGLE_ARB ? priv->yv12_rect_shader : > priv->yv12_2d_shader; - break; - - case > COMPLEX_FIXUP_NV12: - shader = textype == > GL_TEXTURE_RECTANGLE_ARB ? priv->nv12_rect_shader : > priv->nv12_2d_shader; - break; - - case > COMPLEX_FIXUP_P8: - shader = textype == > GL_TEXTURE_RECTANGLE_ARB ? priv->p8_rect_shader : > priv->p8_2d_shader; - if (!shader) shader = > gen_p8_shader(priv, gl_info, textype); + struct > arbfp_blit_desc *desc = WINE_RB_ENTRY_VALUE(entry, struct > arbfp_blit_desc, entry); + shader = desc->shader; + } + > else + { + switch (fixup) + { + case > COMPLEX_FIXUP_P8: + shader = gen_p8_shader(priv, > gl_info, textype); + break; > > - upload_palette(surface, context); - break; > + default: + shader = > gen_yuv_shader(priv, gl_info, fixup, textype); + > break; + } > > - default: + if (!shader) + { > FIXME("Unsupported complex fixup %#x, not setting a shader\n", > fixup); gl_info->gl_ops.gl.p_glEnable(textype); > checkGLcall("glEnable(textype)"); return E_NOTIMPL; + } } - > - if (!shader) shader = gen_yuv_shader(priv, gl_info, fixup, > textype); + if (fixup == COMPLEX_FIXUP_P8) + > upload_palette(surface, context); > > gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); > checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/MUJAAoJEN0/YqbEcdMwJDEQAIEBkWRt2YIly+I+2jO2Y2al MxewjsCeQRf2uFnn4QIVNSfBOrjx6tq5d4aaj0pMlW2O98nXpVJWrHH5suqdX3IP F57tC6bLkucvwuutKFn+h5JohkHw7mjiPjDMYV2H2Lml3Yy0CXDfpSUJsREfTXgl YefKfzxIjckRV/u64kCTOxXCjkeI1LakEWIs8zL8QKXHSUIQtUHfN5uNynbhSnNq SU7+d3B/p/ZFvdOpT6HyhXHyGmx584CcmDTIz9tj6JG0oWmHE6dLZoIrgR/f32iH M0SYfxFEpRhv26a3NFEx98VAHTarZKkMTrcu6QQIgZ0RiC1jpSOvidk98sIK7dbr T+ynOho0GaZt5ZC0pvc1w6GPw7sf040Oz2JcSqIxDX+S5JjqG7PsMvJSYcziY8xJ eBrYgpO/Db5DVyOHfEuFbcS6fyLcO9P9hi2VvhQx2TR9q2XQEMklMamo+OTGng5t cx61mfvCLUF/BsQBteW/SAIHaUGfKgUOgmPIJpucssVbULVXnxI1op1PcczvT6JP xqaG+GiXzuDMulcQR+gnYz7oWnMWj2AA+bPVrTKUhZTbEupUgG9j8CsxeJ678tlk bBKK1p/3UBz1+oc7Qo+Yu6mBVSjPSxwczxmErWe+L7K1kP2L8vtqYg06CSTPH8t7 Y6kf6yuWGIbyapYMcuAO =jA/i -----END PGP SIGNATURE-----

1 0

Re: [PATCHv3 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Marvin 13 Feb '14

13 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4869 Your paranoid android. === w8 (32 bit visual) === visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xff7dff. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xb800ee. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xffe114. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x4affff. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xb80000. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x24ee. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x4aff14. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x8800.

1 0

Re: [PATCHv2 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, You still have a few formatting issues in this patch, I've quoted the ones I found below. I ran the test on my Windows boxes and it passed on the following devices: Windows 7 x86_64, Radeon HD 5770 Windows 7 x86_64, Radeon X1600 Windows 7 x32, Nvidia GeForce 9600 Windows Vista x32, Nvidia GeForce 7400 It did not pass on my very ancient Windows XP x32 laptop with a Radeon 9000 Mobility. It fails there the same way as on the testbot - the card claims to support YUY2 and YV12, but the StretchRect call fails with D3DERR_INVALIDCALL. Do you have any idea why that might happen? If not maybe the best solution is to accept the error with broken() and skip the rest of the test. There's IDirect3D9::CheckDeviceFormatConversion, but according to msdn it only tests backbuffer and adapter format compatibility. That's not the way we implement it, but I don't think we have tests to find out how it's really supposed to behave. Fwiw none of the above machines claims I420 support. There are plenty of other odd formats though. Am 2014-02-12 21:05, schrieb Martin Storsjo: Use 8 space indentation vs the first line of the if and put the && into the next line. Same as above. Curly bracket placement. Same. 8 space indent on line contiuation as in if conditions. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/KsdAAoJEN0/YqbEcdMwckoP/RTST4uApXJwApHZeP5DC7M9 9gN0k8G/zKFN/79I9RPC/fVhMbk/uniloVK+uuYwKmNsoFLRnT1ikg320D09KclZ R1+sLK3Cr9x8lR9NAbR/NsCglRupoE3qX916T1QVApWgeGb9WvExkto6rP+DhI8L sw5T/Rtr3odiMKdSXyllXNgZl0cljhd821OXn5bl6A1VpRO5tXJr7WFfMSIl5TUT VDOub/n2bPwKB38wUwxSgd+m/9hgl+4U+z4V1gfyichgVp4gZKSRH+mr96WI3trc eGjWxtH4+kk1LLshxjCaQOJ0fqoMDQbxJjUBtkAqSKYbCvd7KEfbcTcyKfd4mOHX ZgTqsMRlB/jVK2ugmojf2JgCasecDhENcibjOH2DHXe2SbUUx/QV7cFzjGEGiMNj fOBW0B/f1WJHuyYcKrpw1EWhsR4lFjM6uehmNC+ndA78zy5NPg15U6iBS0ArwZLN kSqbUd6VJy74zVs8CH/v6/cbjUhHguyYcO77/I7k9CMVV3rssgO2oV4GyOnfJGZg dLqN+mQGD3mZhhBhTZrqmuSK1BoPMgA89O7kbJB/x+l3f5XNuCmCxzK4ydgUsr11 kJ/gjrnc51/snAE61+qUZ7sxvGdJKqNdk19Xwrtjp7z2NIcJaNVT8qB41JJFrr4/ Woj0DvcYK1wrmPg8XSJ3 =Hogg -----END PGP SIGNATURE-----

2 1

Re: [PATCHv3] wined3d: Use an rbtree for storing shaders for texture format conversion/blitting
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Two more non-functional nitpicks: Am 2014-02-13 11:16, schrieb Martin Storsjo: > +static void arbfp_free_blit_shader(struct wine_rb_entry *entry, void *context) > +{ > + const struct wined3d_gl_info *gl_info = context; > + struct arbfp_blit_desc *entry_arb = WINE_RB_ENTRY_VALUE(entry, struct arbfp_blit_desc, entry); > + > + GL_EXTCALL(glDeleteProgramsARB(1, &entry_arb->shader)); > + checkGLcall("glDeleteProgramsARB(1, &entry_arb->shader)"); > + HeapFree(GetProcessHeap(), 0, entry_arb); > +} Please add a comment /* Context activation is done by the caller. */ above the function. While you're at it, please also add it above gen_p8_shader. It is not necessary to add this comment above gen_planar_yuv_read and gen_nv12_read because those functions do not call OpenGL functions. > + switch (fixup) > + { > case COMPLEX_FIXUP_P8: > - shader = textype == GL_TEXTURE_RECTANGLE_ARB ? priv->p8_rect_shader : priv->p8_2d_shader; > - if (!shader) shader = gen_p8_shader(priv, gl_info, textype); > - > - upload_palette(surface, context); > + shader = gen_p8_shader(priv, gl_info, textype); > break; > > default: > + shader = gen_yuv_shader(priv, gl_info, fixup, textype); > + break; > + } Please add 4 spaces of indentation, like this switch (fixup) { case foo: code(); more_code(); break; case bar: other_code(); break; } Other than that the code looks good to me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/K4ZAAoJEN0/YqbEcdMwHzoP/0/wPibZu3Jy3MAlACpiPlq9 0inM3Egyh/qfYw7Qi8I+2eaAYZKZYy9LZDJ89fXjS87Ip8v+ryoGMXpLeCGgGze4 VV7F/mr/V7OKHs6ObFipmO4pEgqYn6gbc5x87SCuHvEwz70CUOfZiTPzt94d71Z4 Hr69M6wSU4DNOndOr83pJNjEQAff9qIecvNZwp/xlvgg/rZSdr3uMBLap/fJmAGy NtbJVgIAtCovkANBTDmE55U8bPQLdRQapZbBH+JQN3LMxmg3C4pJ++Wnc/1kRmmv 3ZvVSBHdwTK7dPuLx7aGl66gMYo9IdyGUYvD+Jk2GchfhRowwC2FcWDhLEDRhWpd ahQnoa8bTuKgtlTwygWZLm748e8asaC1Chcr5pKj+IZDo/F/qq6U46LL9K5SBFC1 1sTjF578QQ3K5LiCrGv6ivsHvJq+JkwQz0QxDhqJ4Bs0lJ5LEvC54l7XjumDvtfg 8+4slUf/FKhZNjgp/XRF/qip1+hwMehZULlHIo0CBzSjBiNxxKA+IQq/CeKfjAMa cjPkhRW42H/l47IJthepxuMaoNO5WAp75TXha2vwHQY/Axs8AsKqyzTyImuMa50U b+kHVilfW9hjSJWSGbLb7JgCurgTMKHkt1W2+6OQpbFOBrCihr3uQWAifo8+IuTP 3U5Y0hUe8rU9IKyDS0eO =AU5Y -----END PGP SIGNATURE-----

1 0

Re: [PATCHv2 2/3] wined3d: Use an rbtree for storing shaders for texture format conversion/blitting
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-02-12 21:05, schrieb Martin Storsjo: > + entry = wine_rb_get(&priv->shaders, &type); > + if (entry) > { > - case COMPLEX_FIXUP_YUY2: > - shader = textype == GL_TEXTURE_RECTANGLE_ARB ? priv->yuy2_rect_shader : priv->yuy2_2d_shader; > ... > - break; > - > + struct arbfp_blit_desc *desc = WINE_RB_ENTRY_VALUE(entry, struct arbfp_blit_desc, entry); > + shader = desc->shader; > + } > + else > + { > + switch(fixup) > + { > case COMPLEX_FIXUP_P8: > - shader = textype == GL_TEXTURE_RECTANGLE_ARB ? priv->p8_rect_shader : priv->p8_2d_shader; > - if (!shader) shader = gen_p8_shader(priv, gl_info, textype); > ... > + } > } You'll have to execute upload_palette before running the p8 shader, not just when generating it. > struct arbfp_blit_priv { > - GLenum yuy2_rect_shader, yuy2_2d_shader; > - GLenum uyvy_rect_shader, uyvy_2d_shader; > - GLenum yv12_rect_shader, yv12_2d_shader; > - GLenum nv12_rect_shader, nv12_2d_shader; > - GLenum p8_rect_shader, p8_2d_shader; > + struct wine_rb_tree shaders; > GLuint palette_texture; > }; When you're resending the patch please take the opportunity to move the opening { to its own line. Otherwise the patch (and the first one) looks good to me. Thanks for your perseverance :-) . I'll run the test in patch 3 on my Windows machines and report back. I ran the earlier version it on the Radeon X1600 + Win7 box yesterday. It passed, NV12 was supported, I420 was not. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/JOCAAoJEN0/YqbEcdMwmCgP/2SeBnj9x5Nm3iWAQnqwEHs9 1ECpmmuCkbEcjOgxCrZEQWf7iv9RyrX3iEjyjqs5JJfpckOFEH51ydb+7JQpG/Q4 3+gLlXA1R5Qnku+Iz+gS6JW3aRSGIowlnbWTsggrqj71FzonFroy71z1NRsVmIQI f8SpgmtSVRSUoQ3b3K0Zc2zUb6+oaBsk55zRC8W37RejA73Alsc+C3vad+mFpMxQ xOtVkCyMqMGIxvb+llUygSMVf7oIT8AbAW0Yy6RMzS4FElG41HkCk1tTWI93v6b1 Aq064B6nZ7fkSqktwMpxdP8+xxQpuUUSWL4jA3ydq0UNoK7CrPQJlsP/ePtMBVkb 4yylQeVw+2Z2LbeDOJWbtLCQXVuJdvii1ULjlQciWSMvABmLy04pb8NqRAzvYfrL WL12mLfjKmA+9oylMbFll321vIXyoIyOBvSITLrEolAOUGU+xZu+pdIR8lVoyJpQ Djdu2zRmQnKIv3Q8zFQsdk201xKI9SqZScQHO68IwqqyNK5cyhIg91d7lFDlMFJx BihHAXW61O+fZfz1Q+SGWEztaFYYNZouBhFo0F7odjCHHGodNjVtLVJaa6N7fLHA rEek5LL+Uj2kzg4r+t3EnpSn+qhwZ3kOQYgyNqHlvY/m1MqvDRBp5Ln0RU0qtFHm rhaw1CZsViF5dlKEB72H =7Xyb -----END PGP SIGNATURE-----

1 0

FOSDEM Videos - previews
by Marcus Meissner 13 Feb '14

13 Feb '14

Hi, The FOSDEM Video team is still processing our videos. But! Previews can be checked out at: http://video.fosdem.org/2014/previews/AW1120/2014-02-02/ They are basically in order of appearance. The filenames are UTC (so Bruessel - 1 hour). (timetable:) https://fosdem.org/2014/schedule/track/wine/ Notes: - We only got the master recording laptop around 9:10, so Alexandres keynote is mostly lost in time and space. I did not dare him to redo it for us ;) - I failed to select the +48V switch in fear of blowing up the microphone. So sound arrived at 42:20 in the Pipelight Talk after the audio angel helped us. Sound is only on the left side. - The presenter laptop->slave laptop firewire cable was broken, so it only started working for Rosannes talk. (Its also the reason her talk is cut into various pieces as we rebooted the machines inbetween.) - Talks after Rosannes are good. - As there were no BOF topics, the recording slot is empty. - We did not record the blame session. Ciao, Marcus

2 2

Strange behavior from native OpenGL
by Ken Thomases 13 Feb '14

13 Feb '14

Hi, I have been working on refining a d3d9 test patch I recently submitted <http://source.winehq.org/patches/data/102263> and noticed a strange behavior when running on a real Windows machine. I'm wondering if anybody is familiar with it or can check my reasoning. The strange behavior is that a failed call to wglCreateContext() must be done before SetPixelFormat() will work properly. The call to wglCreateContext() has to fail because it can't succeed until SetPixelFormat() has been done. And yet it still seems to be necessary. My test does the following sequence: CreateWindowA() GetDC() ChoosePixelFormat() SetPixelFormat() GetPixelFormat() This seems fairly simple, straightforward, and commonplace. Although everything through the SetPixelFormat() indicates success, the GetPixelFormat() call still returns 0. This causes the test to be skipped. This happened on the testbot, but I assumed that was caused by the VM's display driver. However, when I got the chance to try on a real Windows machine, it happened there, too. I looked around to see if the same sort of thing is done elsewhere in Wine. It's done in the opengl32 tests in test_setpixelformat() <http://source.winehq.org/source/dlls/opengl32/tests/opengl.c#L254> and it works there, both on the testbot and the Windows machine. So, then I figured it must be working in those tests because of stuff that is done beforehand. I disabled most of the opengl32 tests other than test_setpixelformat(). That was testbot job <https://newtestbot.winehq.org/JobDetails.pl?Key=4751> and it still passed on the testbot and real Windows. I then disabled the expected-to-fail call to wglCreateContext() that is done in the test main entry function (START_TEST(opengl)). Once that is disabled, test_setpixelformat() starts failing in the same way as my d3d9 test. That is testbot job <https://newtestbot.winehq.org/JobDetails.pl?Key=4752>. So, can it really be that a failed call to wglCreateContext() is necessary before SetPixelFormat() will work properly? One thing that I haven't had the chance to test yet is whether a wglCreateContext() call _after_ SetPixelFormat() will cause a subsequent GetPixelFormat() to return the right format. That is, perhaps SetPixelFormat() has worked and the pixel format is remembered, but it's only "realized" once wglCreateContext() is called. And GetPixelFormat() only returns realized pixel formats. Also, it's possible that it's sufficient to call any opengl32 function and not wglCreateContext() specifically. (ChoosePixelFormat(), SetPixelFormat(), and GetPixelFormat() are gdi32 functions.) In any case, that would mean that my d3d9 test will have to link with opengl32 and call one of its functions. -Ken

2 1

Re: dpnet: Improve Error checking in Get/Set SP (try 3)
by Marvin 13 Feb '14

13 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4854 Your paranoid android. === w8 (32 bit address) === Timeout

1 0

Re: wininet: Fix InternetGetConnectedStateEx[A|W] (try 2)
by Marvin 13 Feb '14

13 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4853 Your paranoid android. === w8 (32 bit internet) === internet.c:203: Test failed: Got wrong error code 0 internet.c:690: Test failed: sz wrong, got 16, expected 14 or 30 internet.c:701: Test failed: cookie data wrong internet.c:1073: Test failed: GetLastError() = 0

1 0

Re: [PATCH 3/3] ws2_32: Add an interactive test for interface change notifications (resend).
by Marvin 12 Feb '14

12 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4848 Your paranoid android. === wxppro (32 bit sock) === sock.c:557: Test failed: oob_server (b2c): unexpectedly at the OOB mark: 0 === w2008s64 (32 bit sock) === sock: unhandled exception c0000005 at 00000000 === w2008s64 (64 bit sock) === sock.c:557: Test failed: oob_server (654): unexpectedly at the OOB mark: 0

1 0

Re: [PATCH 1/3] ws2_32: Ask the server to process unsupported WSAIoctl operations (resend).
by Alexandre Julliard 12 Feb '14

12 Feb '14

"Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: > @@ -4101,11 +4125,29 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID > WSASetLastError(WSAEOPNOTSUPP); > return SOCKET_ERROR; > default: > - FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); > status = WSAEOPNOTSUPP; > break; > } > > + if (status == WSAEOPNOTSUPP) > + { > + status = server_ioctl_sock(s, code, in_buff, in_size, out_buff, out_size, ret_size, > + overlapped, completion); > + if (status != WSAEOPNOTSUPP) > + { > + if (status == 0 || status == WSA_IO_PENDING) > + TRACE("-> %s request\n", debugstr_wsaioctl(code)); > + else > + ERR("-> %s request failed with status 0x%x\n", debugstr_wsaioctl(code), status); > + > + /* overlapped and completion operations will be handled by the server */ > + completion = NULL; > + overlapped = NULL; > + } > + else > + FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); > + } The returned size handling doesn't look right. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: d3d8/tests: Ignore broken CheckDeviceType() behavior on 64-bit Windows 8.
by Marvin 12 Feb '14

12 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4841 Your paranoid android. === w8 (32 bit device) === device.c:2572: Test failed: Expected foreground window 00030196, got 0002004E. device.c:3268: Test failed: Expected wndproc 0x4100c0, got 0x4100c0.

2 1

Re: [PATCHv2 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Marvin 12 Feb '14

12 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4843 Your paranoid android. === w8 (32 bit visual) === visual.c:10628: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xff7dff. visual.c:10628: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xb800ee. visual.c:10628: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xffe114. visual.c:10628: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x4affff. visual.c:10628: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x4affff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xb80000. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xb80000. visual.c:10628: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xffe114. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x24ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x24ee. visual.c:10628: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xb800ee. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x4aff14. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x4aff14. visual.c:10628: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xff7dff. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x8800. visual.c:10641: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x8800.

1 0

Re: ddraw/tests: Skip the primary palette tests if the 640x480x8 mode is not supported.
by Henri Verbeet 12 Feb '14

12 Feb '14

On 12 February 2014 10:28, Francois Gouget <fgouget(a)codeweavers.com> wrote: > hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 8); > + if (hr == E_NOTIMPL) > + { > + win_skip("8bpp display mode is not supported\n"); > + DestroyWindow(window); > + return; > + } Is this for the Win 8 testbot? Unsupported display modes should return DDERR_UNSUPPORTED, and 640x480 at 8 bpp should pretty much always be supported. Does changing display modes work at all on that VM? IIRC it had more issues with changing display modes, and not just in the ddraw tests.

2 1

Re: [PATCH 5/6] wined3d: Add support for I420 textures
by Stefan Dösinger 12 Feb '14

12 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-02-11 12:14, schrieb Martin Storsjo: > I420 is similar to YV12, but the chroma planes are swapped. Do you have an application that uses this? Just making sure we're not adding dead code here. Otherwise this looks good, but patch 3 needs fixes. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS+4lrAAoJEN0/YqbEcdMwDjUP/1mawzD6WIoBsR/eFxSDu2SZ yE4AHd/HaUkYwYan6CjiYAV8uf3ikUIGHQhvyF79jKikRWUCGHRoQTL8xwx6wcXm fCIQjPuuwpizEpdGjD+mZHWMgg+RtgbYrJbSX8pWtRfcRQsVxtB8Q5tXyVtZGwWr vBtmeQUlaIBlSH8hG5ZC0UGsljP/hwV/LayeYmAKFRTccX/PFKTM1cua5AznPrxQ noEW9kYxpilWDPwvNWsic7e6FCYTHxMGZblVC5FSMxSq/66CAYUakD1iRc4xomw7 9jk0UQ308LKTzw7m86HfvnuqvIHprhZcn1IHwDWAmGxsQD+e+4uJ8XBwAKA575Sm RUQMDZdXzsxmBkZIYGDs7WNI03v6rEsGaM3KoHuurfhmc7XaCjzla0W3Y0yLgN4P 9+7WHzBZ8CyYDBHsNKNkFpXEwQuSzAbzr+nt8/8RhrwHyIa2RX26xCe91+6MYKkc trwK1inGiB3CBvzEha/YQuGzeyzTp8oV6yhGnGpf5tPJlRtzxc8IpHmWXCdwrk6z 3AAxUliwm4cYTPgrY2zAXHc/0rTULQ+3GCUb3pWGgdKCDzmyWsPaZ5TY0XmBGvIH R9JrC39ku/Md33+oWCKF4tpwzJ1go6eWnbBu/mPKStpoTaIi708H/vrTCmL/dHCp aYOYafddUXk5NKEcS91m =dZNW -----END PGP SIGNATURE-----

3 3

Re: [PATCH 6/6] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 12 Feb '14

12 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-02-11 12:14, schrieb Martin Storsjo: > + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 8, 8, format, D3DPOOL_DEFAULT, &surface, NULL); > + ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface failed, hr = %08x\n", hr); Please use a non power of two size and skip the test if D3DPTEXTURECAPS_POW2 is set and D3DPTEXTURECAPS_NONPOW2CONDITIONAL is not set. That should avoid another regression in the np2 code. There's a decent chance that StretchRect from a plain np2 surface works even if NP2 textures are completely unsupported, but it will be rather hard to find a Windows machine to confirm this. > + memset(&lr, 0, sizeof(lr)); > + hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0); > + ok(hr == D3D_OK, "IDirect3DSurface9_LockRect failed, hr = %08x\n", hr); There's no need to memset lr to 0. We know LockRect returns a properly initialized structure if it succeeds. > + switch (format) > + { > + case D3DFMT_YV12: v_buf = chroma_buf; u_buf = chroma_buf + 4 * lr.Pitch/2; break; > + case D3DFMT_I420: u_buf = chroma_buf; v_buf = chroma_buf + 4 * lr.Pitch/2; break; > + default: break; > + } The switch causes a warning here because YV12 and I420 are not part of the D3DFORMAT enum. Please use an if to make the compiler happy. Set v_buf and u_buf to NULL in case of other formats - this should avoid the warning that they may be uninitialized. (Although I think the compiler is broken here. It should see that they're not used for formats that are not YV12 and I420.) > + /* Draw the top left quarter of the screen with color1, the rest with color2 */ > + for (y = 0; y < 8; y++) > + { > + for (x = 0; x < 8; x += 2) > + { > + DWORD color = (x < 4 && y < 4) ? test_data[i].color1 : test_data[i].color2; > + BYTE Y = (color >> 16) & 0xff; It would be nice to use different values for the two Y channels, unless this makes reading the result too difficult with filtering on. > + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); No need to clear the Z buffer. > + ok(hr == D3D_OK, "IDirect3DDevice9_StretchRect failed with 0x%08x\n", hr); Please use %#x instead of 0x%08x and add interpunctuation at the end of the ok message. Another set of unwritten style rules :-\ . -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS+5B8AAoJEN0/YqbEcdMwgLUP/19EoAQNiOg0JTdAHco28fTm zfSqZtMTv7JJAtznqt5EilK2gb33/oiyMXZcotg6YevJWRFrVQQw9K3b+JepxY4O l8ZBas9GGEAoTppb4W03w7Ngzr5J4yBBSXpVoEQDnmztywzZqcpaQc4y1/ukkkgg lN7HIPP3tychxk3IBiQtgVQ/U+xC6BmEgWdNClDBBpMnGkKbLERLjxpkOPi7fs1f FPOCW7P18BDLANw/FMipEqDsm+K/EOdVFBU4wcIWB7BOavZzwGRaKDFdifhwq2VR CBvm3uT6drct5put/JF/RIfnY5Za7GOIi5Ks4P0Gwt/e6xQ3WK+LrsEAASottF0O IUskCxGIKB/P7CsxtwGjTg9gDOm35W+4g0QiMvBoJk8dO2eggPXdNdmAR+5ZI/ez wxZzAl9m8VnXe0xeUSMha44n7F3EJ8Bz7F/Sixc6v8G6pmVdJNK9LM8+ZqD4muWQ cnZNKWLMeWaufb3KEVno0F2SUFhGb7q/FHBCInaz9EKOG5yMEEzNbHYMh3v/oJ9s IWXJgavdbIfUbj1YGulasKqlNzHzKnL+V2oMaqT+rGxypAcVentxIbV/bFseN091 b6oc8bL9KIKEHpWtPKqXYJ3wZBb2dKbcFhmd2VDNrWQSOTI5ZeU5xUnfsXeIthqo ntdGlkDSfAJlSMvzZOyh =m68B -----END PGP SIGNATURE-----

2 1

Re: [PATCH 4/6] wined3d: Fix the YV12 illustration
by Stefan Dösinger 12 Feb '14

12 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-02-11 12:14, schrieb Martin Storsjo: > The comment in the description further above is correct, that the > chroma planes are ordered V, then U, while the illustration had > them swapped. This patch looks correct to me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS+4czAAoJEN0/YqbEcdMwKx8P/1J1flCobX1Z3XHptyIlEuyC gVt1OwxjQ2ayx5WwTtO8wlY//h+167HE4Ip7KFxk3QR21PKO/kvmhImmjVr2oUdm t8ZDh3q3158qSu1USNvKfTzLaBpXbXQNs10XIgvj2olHw80+CW0ZodPONAls94dU YHVAmYataxvTMkM/EXooBVJkJdF0qy80pkAcQLpN+wwpw+xZXwXq0901bm2u2LJn XuN9UDS9lViR2NRSNUkHhJKNKJiy72U6RXnKsjao83IES27zFKCpaJx8UeyvRCQY ZGCREFf4Xw9ge+Bi2tA5zfCeClVVZ5ds2gSbTvGmy7DAcjYCG4z7iYwWaUOWduH/ OGW9ASPdqvRTELjqB40x1hvtdhhFFjC2PI+UbS1ltiIpgHUQn2FZcG9qsOh1QaDt ddtyOc1cKazeE4iFFdDfNy9cJTg8n0bKAEFAfj/tUsKJjoDfbOyF0xeEsECs6MVt ayaEWUduLTD/hHq7kA/U8vzGmucJ7Ng7XvypLu3vKbH76f63e4nuUWfc8K2VpAXK SRoLvhePgmUkXkus+Y3l3ttAvN/y+HhKZiNvFIxQKUfZ07mg4gqhM1DzwO0/9Gdt byo+Nu0bK9arSyJUCi7Ah+fcBvJUCAvt47xQ1AnUvv2/2sOUfWcPxSERX4WLFPRG /RSNua7b9MRvibHxXC1G =rFkd -----END PGP SIGNATURE-----

1 0

Re: [PATCH v2 1/6] wined3d: Add support for NV12 textures
by Stefan Dösinger 12 Feb '14

12 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi again! I have some more format nitpicks below. As far as the big picture is concerned there is also a software conversion path in dlls/wined3d/surface.c. Search the file for d3dfmt_converter_desc and you should find the right place. You don't have to submit a patch for that unless you know an application that needs it though; I'm just making you aware of it. Am 2014-02-11 12:14, schrieb Martin Storsjo: > + switch(textype) You're missing a space here. As far as I can see the other places in this patch are correct, but it doesn't hurt to double-check with grep or something. (I really hope the testbot can one day take care of this...) > + case GL_TEXTURE_2D: tex = "2D"; break; Please make this case GL_TEXTURE_2D: tex = "2D"; break; etc > + * When reading from rectangle textures, keep in mind that > the input y coordinates + * go from 0 to d3d_height, whereas > the opengl texture height is 1.5 * d3d_height + */ Comment closing should go next to the last line of text. Also add proper interpunctuation at the last sentence of a comment. This applies to a few more places in this patch, and most likely the other patches. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS+4aPAAoJEN0/YqbEcdMwCXMQAIPeaYbrI+zC2zf6KlOdOCbe yDSbSvRS4vZWkukemQCb6jr2qFCjqoCJMHj1GpfWxlBxJ1+rOWyTdc+YG2DDzCqk YE3K8PgOaID7BnopA/Ri0gYiwRz7K2WBpMWMwgeVnjTFOUWJ8tYt1z4VmCHXgEEi JDphv1q9IDzCW/s3Pu68VtDrE4rsG/KLietRPTCgakdjX1oLvlKn1Fg5D7q78y87 szJg2SRaYOVWSXIK2D+s+A5Tvjr9gffSsDE6fgFgxeFyHsViGyq6QDJEBxCO+f+A UZ1FhidcogIt/sqSphg7lCyEUw49WojlXSXhLpdofwjrR/4griYgp21h6Y8UhtqG LzPUVGBfScvb208bIhL+LvCukQ00WnTI4LJA6khjL9AlCnrzh4nrhVo6RQDrL1A3 6V5gJLd1ZT4DepQc2XQLC0FupgYWafIJAzCcpZIpvQRjzH4MqJgeJC9m6alRzyWr TkN+Jo6yKRk2t+x7LOzee+mMPAfIT2OcHoIlG60Z8ZxK3Apu6k7/RPoqi1BWdJZZ gHA1CZLUDC+UXhPhr2pxNy4AQnD2EbIBp5GPKNHHvoqJJzXvbHPBx5TgOOaEyLnH idubGx+GLf3zXEaK+ujbMg8Ae/poGh841gBVbMLDqZguSkuTsVGpt8hjCZgWq+5d u177zpoEIMhOFIK17nSY =IHTQ -----END PGP SIGNATURE-----

1 0

Re: [PATCH 6/6] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 12 Feb '14

12 Feb '14

Am 11.02.2014 um 12:14 schrieb Martin Storsjo <martin(a)martin.st>: > +#define D3DFMT_YV12 MAKEFOURCC('Y','V','1','2') > +#define D3DFMT_I420 MAKEFOURCC('I','4','2','0') > +#define D3DFMT_NV12 MAKEFOURCC('N','V','1','2’) There’s no need for global definitions. Other tests that use custom fourccs just use MAKEFOURCC in their code. > + struct > + { > + DWORD color1, color2; > + DWORD rgb1, rgb2; > + } > + test_data[] = > + { > + { 0x000000, 0xffffff, 0x00008800, 0x00ff7dff }, > + { 0xff0000, 0x00ffff, 0x004aff14, 0x00b800ee }, > + { 0x00ff00, 0xff00ff, 0x000024ee, 0x00ffe114 }, > + { 0x0000ff, 0xffff00, 0x00b80000, 0x004affff }, > + { 0xffff00, 0x0000ff, 0x004affff, 0x00b80000 }, > + { 0xff00ff, 0x00ff00, 0x00ffe114, 0x000024ee }, > + { 0x00ffff, 0xff0000, 0x00b800ee, 0x004aff14 }, > + { 0xffffff, 0x000000, 0x00ff7dff, 0x00008800 }, > + }; Please make this static const. The same applies to the formats[] table. I’ll look at the details of the test and the other patches later today, when my headache is gone :-\ .

2 9

Re: msvcrt: Return error on invalid handle in _open_osfhandle (try4)
by Marvin 12 Feb '14

12 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4819 Your paranoid android. === wxppro (32 bit file) === file.c:2202: Test failed: info->exflag = 1, expected 4

1 0

Re: shell32/tests: Skip any test that needs the .shlexec association if we could not create it.
by Marvin 12 Feb '14

12 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4818 Your paranoid android. === wxppro (32 bit shlexec) === shlexec.c:1211: Test failed: expected 1 args, got 4 shlexec.c:2283: Test failed: argcA expected 5, but got 4 === w2008s64 (32 bit shlexec) === shlexec.c:1564: Test failed: argvA4 expected 'C:/Users/ADMINI~1/AppData/Local/Temp/wt6C3.tmp/test file.shlexec', got 'C:\Users\Administrator\AppData\Local\Temp\wt6C3.tmp\test file.shlexec' shlexec.c:2660: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt6C3.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt6C3.tmp\test2.exe' shlexec.c:2673: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt6C3.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt6C3.tmp\test2.exe' shlexec.c:2685: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt6C3.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt6C3.tmp\test2.exe' === w8 (32 bit shlexec) === shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:1532: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc") failed: rc=33 err=2 shlexec.c:1564: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:1532: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.shlexec.noassoc") failed: rc=33 err=2 shlexec.c:1564: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.shlexec.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\wt8C15.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\wt8C15.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:2102: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\wt8C15.tmp" Exec") succeeded: rc=42 === w2008s64 (64 bit shlexec) === shlexec.c:1564: Test failed: argvA4 expected 'C:/Users/ADMINI~1/AppData/Local/Temp/wt249F.tmp/test file.shlexec', got 'C:\Users\Administrator\AppData\Local\Temp\wt249F.tmp\test file.shlexec' shlexec.c:2660: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt249F.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt249F.tmp\test2.exe' shlexec.c:2673: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt249F.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt249F.tmp\test2.exe' shlexec.c:2685: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt249F.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt249F.tmp\test2.exe'

1 0

Re: ole32/tests: Use wine_dbgstr_guid for printing GUIDs.
by Marvin 12 Feb '14

12 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4817 Your paranoid android. === wxppro (32 bit marshal) === marshal.c:3054: Test failed: wait timed out marshal.c:3058: Test failed: CoCreateInstance failed with error 0x80040154 marshal: unhandled exception c0000005 at 0041C45C === w8 (32 bit marshal) === marshal.c:3315: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3332: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3370: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3388: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3352: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3315: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3332: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3370: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3388: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3352: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3315: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3332: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3370: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3388: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3352: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0xc04 instead of 0xb00

1 0

Re: [PATCH 5/5] d3d10core: Implement d3d10_depthstencil_view_GetDevice().
by Marvin 12 Feb '14

12 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4815 Your paranoid android. === wvista (32 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. device.c:165: Test failed: Got unexpected refcount 4. device.c:170: Test failed: Got unexpected refcount 5. device.c:184: Test failed: Got unexpected refcount 4. device.c:189: Test failed: Got unexpected refcount 5. device.c:244: Test failed: Got unexpected refcount 4. device.c:248: Test failed: Got unexpected refcount 6. device.c:253: Test failed: Got unexpected refcount 7. device.c:298: Test failed: Got unexpected refcount 4. device.c:303: Test failed: Got unexpected refcount 5. === w2008s64 (32 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. device.c:165: Test failed: Got unexpected refcount 4. device.c:170: Test failed: Got unexpected refcount 5. device.c:184: Test failed: Got unexpected refcount 4. device.c:189: Test failed: Got unexpected refcount 5. device.c:244: Test failed: Got unexpected refcount 4. device.c:248: Test failed: Got unexpected refcount 6. device.c:253: Test failed: Got unexpected refcount 7. device.c:298: Test failed: Got unexpected refcount 4. device.c:303: Test failed: Got unexpected refcount 5. === w2008s64 (64 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. device.c:165: Test failed: Got unexpected refcount 4. device.c:170: Test failed: Got unexpected refcount 5. device.c:184: Test failed: Got unexpected refcount 4. device.c:189: Test failed: Got unexpected refcount 5. device.c:244: Test failed: Got unexpected refcount 4. device.c:248: Test failed: Got unexpected refcount 6. device.c:253: Test failed: Got unexpected refcount 7. device.c:298: Test failed: Got unexpected refcount 4. device.c:303: Test failed: Got unexpected refcount 5.

1 0

Re: [PATCH 4/5] d3d10core: Implement d3d10_buffer_GetDevice().
by Marvin 12 Feb '14

12 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4814 Your paranoid android. === wvista (32 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. device.c:165: Test failed: Got unexpected refcount 4. device.c:170: Test failed: Got unexpected refcount 5. device.c:184: Test failed: Got unexpected refcount 4. device.c:189: Test failed: Got unexpected refcount 5. device.c:288: Test failed: Got unexpected refcount 4. device.c:293: Test failed: Got unexpected refcount 5. === w2008s64 (32 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. device.c:165: Test failed: Got unexpected refcount 4. device.c:170: Test failed: Got unexpected refcount 5. device.c:184: Test failed: Got unexpected refcount 4. device.c:189: Test failed: Got unexpected refcount 5. device.c:288: Test failed: Got unexpected refcount 4. device.c:293: Test failed: Got unexpected refcount 5. === w2008s64 (64 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. device.c:165: Test failed: Got unexpected refcount 4. device.c:170: Test failed: Got unexpected refcount 5. device.c:184: Test failed: Got unexpected refcount 4. device.c:189: Test failed: Got unexpected refcount 5. device.c:288: Test failed: Got unexpected refcount 4. device.c:293: Test failed: Got unexpected refcount 5.

1 0

Re: [PATCH 3/5] d3d10core: Implement d3d10_texture3d_GetDevice().
by Marvin 12 Feb '14

12 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4813 Your paranoid android. === wvista (32 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. device.c:165: Test failed: Got unexpected refcount 4. device.c:170: Test failed: Got unexpected refcount 5. device.c:184: Test failed: Got unexpected refcount 4. device.c:189: Test failed: Got unexpected refcount 5. === w2008s64 (32 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. device.c:165: Test failed: Got unexpected refcount 4. device.c:170: Test failed: Got unexpected refcount 5. device.c:184: Test failed: Got unexpected refcount 4. device.c:189: Test failed: Got unexpected refcount 5. === w2008s64 (64 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. device.c:165: Test failed: Got unexpected refcount 4. device.c:170: Test failed: Got unexpected refcount 5. device.c:184: Test failed: Got unexpected refcount 4. device.c:189: Test failed: Got unexpected refcount 5.

1 0

Re: [PATCH 2/5] d3d10core: Implement d3d10_texture2d_GetDevice().
by Marvin 12 Feb '14

12 Feb '14

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://newtestbot.winehq.org/JobDetails.pl?Key=4812 Your paranoid android. === wvista (32 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. === w2008s64 (32 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5. === w2008s64 (64 bit device) === device.c:76: Test failed: Got unexpected refcount 4. device.c:81: Test failed: Got unexpected refcount 5. device.c:95: Test failed: Got unexpected refcount 4. device.c:100: Test failed: Got unexpected refcount 5.

1 0

2025

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