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

Re: [PATCH] Fix some its vs it's typos
by Marvin 31 Jul '16

31 Jul '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24626 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level

1 0

Re: comctl32/tests: Avoid using memset() on RECTs.
by Nikolay Sivov 30 Jul '16

30 Jul '16

On 30.07.2016 22:55, Michael Stefaniuc wrote: > - memset(&r1, 0, sizeof r1); > - r1.left = LVIR_ICON; > + SetRect(&r1, LVIR_ICON, 0, 0, 0); I don't like this, I think it's better to use SetRect() when actual coordinates are used, and LVIR_* has special meaning.

2 2

Re: [PATCH 1/4] mpr: Implement local name automatic redirection for disks.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Pierre Schweitzer <pierre(a)reactos.org> writes: > +done: > + if (redirect) > + ctxt->resource->lpLocalName = NULL; It looks quite suspicious to modify that input parameter and restore it at the end. You should probably use a copy instead. -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [PATCH 08/10] gdi32: Where possible directly access the DC instead of using GetCurrentObject().
by Alexandre Julliard 29 Jul '16

29 Jul '16

Huw Davies <huw(a)codeweavers.com> writes: > @@ -1039,7 +1039,7 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) > } > release_dc_ptr( dc ); > /* font metrics depend on the graphics mode */ > - if (ret) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); > + if (ret) SelectObject(dc->hSelf, dc->hFont); The bug was already present, but we shouldn't be accessing the dc after release. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: comctl32: Avoid using memset on RECTs.
by Nikolay Sivov 29 Jul '16

29 Jul '16

On 29.07.2016 13:24, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > dlls/comctl32/status.c | 4 ++-- > dlls/comctl32/tab.c | 7 ++----- > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c > index 738c33b..08ca158 100644 > --- a/dlls/comctl32/status.c > +++ b/dlls/comctl32/status.c > @@ -127,8 +127,8 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) > * textHeight pixels large */ > HDC hdc = GetDC(infoPtr->Self); > RECT r; > - memset (&r, 0, sizeof (r)); > - r.bottom = max(infoPtr->minHeight, tm.tmHeight); > + > + SetRect(&r, 0, 0, 0, max(infoPtr->minHeight, tm.tmHeight)); > if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) > { > height = r.bottom - r.top; > diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c > index 0ed9152..62e34f9 100644 > --- a/dlls/comctl32/tab.c > +++ b/dlls/comctl32/tab.c > @@ -373,12 +373,9 @@ static BOOL TAB_InternalGetItemRect( > TRACE("Not Visible\n"); > /* need to initialize these to empty rects */ > if (itemRect) > - { > - memset(itemRect,0,sizeof(RECT)); > - itemRect->bottom = infoPtr->tabHeight; > - } > + SetRect(itemRect, 0, 0, 0, infoPtr->tabHeight); > if (selectedRect) > - memset(selectedRect,0,sizeof(RECT)); > + SetRectEmpty(selectedRect); > return FALSE; > } > > You probably can remove null rect checks as well.

2 1

Re: [PATCH] msxml3: Implement IXMLParser GetParserState
by Nikolay Sivov 29 Jul '16

29 Jul '16

On 29.07.2016 12:43, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/msxml3/tests/xmlparser.c | 3 +++ > dlls/msxml3/xmlparser.c | 6 ++++-- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/dlls/msxml3/tests/xmlparser.c b/dlls/msxml3/tests/xmlparser.c > index 51f2a27..32514e3 100644 > --- a/dlls/msxml3/tests/xmlparser.c > +++ b/dlls/msxml3/tests/xmlparser.c > @@ -144,6 +144,9 @@ static void create_test(void) > hr = IXMLParser_SetFlags(parser, 0); > ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); > > + hr = IXMLParser_GetParserState(parser); > + ok(hr == XMLPARSER_IDLE, "got 0x%08x\n", hr); > + > IXMLParser_Release(parser); > } > > diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c > index ca40b22..6fcdb82 100644 > --- a/dlls/msxml3/xmlparser.c > +++ b/dlls/msxml3/xmlparser.c > @@ -51,6 +51,7 @@ typedef struct _xmlparser > LONG ref; > > int flags; > + XML_PARSER_STATE state; > } xmlparser; > > static inline xmlparser *impl_from_IXMLParser( IXMLParser *iface ) > @@ -345,9 +346,9 @@ static HRESULT WINAPI xmlparser_GetParserState(IXMLParser *iface) > { > xmlparser *This = impl_from_IXMLParser( iface ); > > - FIXME("(%p)\n", This); > + TRACE("(%p)\n", This); > > - return E_NOTIMPL; > + return This->state; > } > > static HRESULT WINAPI xmlparser_Suspend(IXMLParser *iface) > @@ -447,6 +448,7 @@ HRESULT XMLParser_create(void **ppObj) > This->nodefactory = NULL; > This->input = NULL; > This->flags = 0; > + This->state = XMLPARSER_IDLE; > This->ref = 1; > > *ppObj = &This->IXMLParser_iface; > Do you have SDK headers for that interface? Having HRESULT for a state looks a bit weird.

2 1

Re: [PATCH 2/6] d3d9/tests: Add visual tests for locking vertexbuffers
by Patrick Rudolph 29 Jul '16

29 Jul '16

Am Thu, 28 Jul 2016 14:04:56 +0200 schrieb Henri Verbeet <hverbeet(a)gmail.com>: > On 26 July 2016 at 19:09, Patrick Rudolph <siro(a)das-labor.org> wrote: > > + static const struct > > + { > > + const char *flags_s; > > + unsigned int flags; > > + DWORD usage; > > + BOOL unsyncronized; > > + BOOL todo; > > + BOOL broken; > > + } > > + /* Nvidia ignores D3DLOCK_NOOVERWRITE on non dynamic buffers, > > + * while AMD always accepts D3DLOCK_NOOVERWRITE on all > > buffers. */ > > + tests[] = > > + { > > + {"0", 0, 0, FALSE, FALSE, FALSE}, > > + {"0", 0, D3DUSAGE_DYNAMIC, FALSE, FALSE, FALSE}, > > + {"D3DLOCK_NOOVERWRITE", D3DLOCK_NOOVERWRITE, 0, FALSE, > > FALSE, TRUE}, > > + {"D3DLOCK_NOOVERWRITE", D3DLOCK_NOOVERWRITE, > > D3DUSAGE_DYNAMIC, TRUE, FALSE, FALSE}, > > + {"D3DLOCK_DISCARD", D3DLOCK_DISCARD, 0, FALSE, FALSE, > > FALSE}, > > + {"D3DLOCK_DISCARD", D3DLOCK_DISCARD, D3DUSAGE_DYNAMIC, > > FALSE, FALSE, FALSE}, > > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", > > + D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, 0, FALSE, > > FALSE, TRUE}, > > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", > > + D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, > > D3DUSAGE_DYNAMIC, TRUE, TRUE, TRUE}, > > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", > > + D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, 0, FALSE, > > FALSE, TRUE}, > > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", > > + D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, > > D3DUSAGE_DYNAMIC, TRUE, TRUE, TRUE}, > > + }; > [...] > > + todo_wine_if (tests[i].todo) > > + { > > + ok(tests[i].unsyncronized == unsyncronized || > > broken(tests[i].broken), > > + "Expected buffer mapped %s. Flags = %s. Usage > > = %#x.\n", > > + tests[i].unsyncronized ? "unsyncronized" : > > "syncronized", tests[i].flags_s, tests[i].usage); > > + } > I assume the broken() is for the testbot, but the way this is written, > half the cases aren't really tested on Windows. Also, what makes these > fail on the testbot? > I can replace some of the broken test results with another flag for AMD behaviour. AMD allows D3DLOCK_NOOVERWRITE for non dynamic buffers on d3d9, too. I guess the WARP driver filters D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD calls. > > + timestamp1 = GetTickCount(); > > + > > + hr = IDirect3DDevice9_BeginScene(device); > > + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); > > + hr = IDirect3DDevice9_DrawPrimitive(device, > > D3DPT_TRIANGLESTRIP, 0, tri); > > + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); > > + hr = IDirect3DDevice9_EndScene(device); > > + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); > > + > > + /* dummy read to wait for GPU being done */ > > + color = getPixelColor(device, 160, 360); > > + > > + timestamp2 = GetTickCount(); > > + > > + /* Adjust buffer size for 1 second draw call duration */ > > + size = (size * 1000UL) / (timestamp2 - timestamp1 + 1); > Does this work reliably? GetTickCount() has very limited resolution, I > think there's a real chance that the draw will take only a fraction of > GetTickCount()'s resolution. Yes it does. I first thought about using timestamp queries, but those aren't supported on ddraw and d3d8 and are broken on my AMD test system, so I'm using GetTickCount instead. It allows to test to pass on fast systems (Intel Core i5 + HD6870) and slow systems (Intel Atom + Nvidia ION). The buffersize can't be hardcoded as the Windows driver nukes the display driver whenever a draw call takes more than a few seconds, which is the case when using huge buffers to make them pass on fast systems. Regards, Patrick

2 1

Re: wined3d: Add Nvidia GT 740M to the GPU list
by Henri Verbeet 29 Jul '16

29 Jul '16

On 28 July 2016 at 22:42, Jeremy Audiger <audiger(a)live.fr> wrote: > @@ -2158,6 +2160,7 @@ cards_nvidia_mesa[] = > {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, > {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, > {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, > + {"NV108", CARD_NVIDIA_GEFORCE_GT740M}, > /* Fermi */ > {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, > {"NVD7", CARD_NVIDIA_GEFORCE_820M}, The patch seems fine, but could you please add "NV108" above "NVF1" instead of below "NVE4"?

1 0

Re: [PATCH 2/2] DInput : Use vendor and product ids to generate product GUID like it's done on Windows
by Bruno Jesus 28 Jul '16

28 Jul '16

On Sat, Jul 23, 2016 at 8:01 AM, Corentin Rossignon <corossig(a)gmail.com> wrote: > Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> > --- > dlls/dinput/joystick_linux.c | 34 +++++++++++++++++++++++++++++++--- > dlls/dinput/joystick_linuxinput.c | 27 +++++++++++++++++++++++++-- > 2 files changed, 56 insertions(+), 5 deletions(-) Formatting problem: bruno(a)Note:~/programs/wine$ git apply dinput2 dinput2:31: trailing whitespace. /* dinput2:35: trailing whitespace. * Data4 seems to be a constant. dinput2:104: trailing whitespace. /* dinput2:108: trailing whitespace. * Data4 seems to be a constant. warning: 4 lines add whitespace errors. > diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c > index 90b7280..f8499ca 100644 > --- a/dlls/dinput/joystick_linux.c > +++ b/dlls/dinput/joystick_linux.c > @@ -77,6 +77,7 @@ struct JoyDev > { > char device[MAX_PATH]; > char name[MAX_PATH]; > + GUID guid_product; > > BYTE axis_count; > BYTE button_count; > @@ -122,6 +123,21 @@ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903 > {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} > }; > > + > +/* > + * Construct the GUID in the same way of Windows doing this. > + * Data1 is concatenation of productid and vendorid. > + * Data2 and Data3 are NULL. > + * Data4 seems to be a constant. > + */ > +static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { > + 0x000000000, > + 0x0000, > + 0x0000, > + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} > +}; > + > + Please remove all double blank lines in your changes in order to be more compatible with the surrounding code style.

3 4

Re: [PATCH 1/6] wined3d/resource: Add flag WINED3D_MAP_WRITEONLY
by Patrick Rudolph 28 Jul '16

28 Jul '16

Am Thu, 28 Jul 2016 14:04:48 +0200 schrieb Henri Verbeet <hverbeet(a)gmail.com>: > On 26 July 2016 at 19:09, Patrick Rudolph <siro(a)das-labor.org> wrote: > > #define WINED3D_MAP_READONLY > > 0x0010 +#define > > WINED3D_MAP_WRITEONLY 0x0020 > But now the API is weird. What happens when both READONLY and > WRITEONLY are set? I think the d3d11 model makes more sense. Yes you are right. The patch is required to fix some of the d3d11 TODOs introduced in my tests, but you can ignore it for now. I'll add additional tests for it.

1 0