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

Re: [PATCH 07/12] d3drm: Implement IDirect3DRMViewport*::Init. (v4)
by Stefan Dösinger July 10, 2016

July 10, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-07-07 um 14:52 schrieb Aaryaman Vasishta: > - {&CLSID_CDirect3DRMTexture, d3drm_create_texture_object}, > - {&CLSID_CDirect3DRMDevice, d3drm_create_device_object}, > + { &CLSID_CDirect3DRMTexture, d3drm_create_texture_object }, > + { &CLSID_CDirect3DRMDevice, d3drm_create_device_object }, > + { &CLSID_CDirect3DRMViewport, d3drm_create_viewport_object }, I guess Visual Studio or xcode re-added the spaces between { and &. Henri removed them in the slightly modified version of "d3drm: Use a table in d3drm3_CreateObject() to create objects in a generic manner." > + if (FAILED(hr = IDirect3DRMFrame3_QueryInterface(camera, &IID_IDirect3DRMFrame, (void **)&viewport->camera))) > + goto cleanup; Aren't you more likely to need the implementation structure of the camera in the future? > + > + color = IDirect3DRMFrame3_GetSceneBackground(camera); > + /* Create material (ambient/diffuse/emissive?), set material */ > + if (FAILED(hr = IDirect3D_CreateMaterial(d3d1, &material, NULL))) > + goto cleanup; > + > + memset(&mat, 0, sizeof(mat)); > + memcpy(&mat.diffuse, &color, sizeof(color)); > + > + if (FAILED(hr = IDirect3DMaterial_SetMaterial(material, &mat))) > + goto cleanup; > + > + if (FAILED(hr = IDirect3DMaterial_GetHandle(material, d3d_device, &hmat))) > + goto cleanup; > + > + hr = IDirect3DViewport_SetBackground(viewport->d3d_viewport, hmat); > + > +cleanup: > + > + if (material) > + IDirect3DMaterial_Release(material); In the success case this will destroy the material you just created. Our IDirect3DViewport::SetBackground implementation does not AddRef the material. I don't think we have any tests for this, but because SetBackground accepts a handle instead of a COM object I don't expect it to AddRef. Overall it seems questionable to call camera->GetSceneBackground and apply the color here. I'd expect that the camera background can be changed after creating the viewport. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXgnMdAAoJEN0/YqbEcdMwk+IP/2DZH4tPgtCN/PHoB/ZdsVwJ oodz6Sax5LZUaumbXZme4CPgPZKSKr44ue3qho/5cQicRISuJ3G6I6vFmkiiHol6 nFmY9cTJiNeXzd6NcJq5KK6IUmgrzO5YjGgXIbzgzEiTycbws/lo5fVwF74LSYn7 RMPg+U4qMaHVT/w/rb7dWWqPugSbm8cIGfp8Zjz2VrO+JX+S1Qs3ymCZViyMfCRz A1VtyJh/u72GlfCoRoUiT6DDsMjw1BCMogR4asDkQmoTdkc7XFRU3MYQwUN7cFY2 bxos78d6xozUwvDRoezrtRLh4gQis9gudaNYv4Dt4fZjNOSvCtA8fMbl35gXuJog ooROiaXSoW5oBrzv++Fvp38cixS0j9MMECNDgs1yCCKt0a/B4/IFEQMvyGt5LzRG zeJ2XzDEZI3ntsbeVdKPRuH6m7ROlQLfp+Q0ac+MrhJSQtnAd88mXVfU5U8330b4 DNyeSmyPhBpaRp62WZxMCeOct7psy1p4LYkbbE5QZ3eFS2QhHlnPC6PzNtcUbDqI RG4J+ZhquDnT57ViyjX1vKt6tXPlDOkwJf0AApwQ84OGs7ATNci/7Z1WuyULx9sR xPrpNYUPbFIxcadmvaa7jO+aaOXoNWFQQz7rJdCVBxUY1T4Bz8+FyzQ0O8Ld/xNj b7LndQJz3AbU//fQ1gdO =8gsI -----END PGP SIGNATURE-----

2 2

Re: [PATCH 1/2] d3d9/tests/visual: Add Vertexbuffer locking tests
by Stefan Dösinger July 10, 2016

July 10, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi Patrick, I ran your tests on one of my Nvidia machines, see below. Thanks for looking into this. I had problems with a few games (3DMark2001, Call of Duty Modern Warfare) doing stupid buffer / texture mapping calls that forced my command stream code to wait. Your findings may have some answers to why they work better on Windows. Please port this test to ddraw, d3d8, d3d10 and d3d11 as well. I know it's a lot of work, but the APIs might have different behavior for compatibility reasons, and I know at least one ddraw game that requires that we ignore redundant D3DLOCK_DISCARD locks (see commit d3520ef4, bug 32485). Am 2016-07-08 um 17:15 schrieb Patrick Rudolph: > + { > + "D3DLOCK_NOOVERWRITE", > + D3DLOCK_NOOVERWRITE, > + FALSE, > + TRUE, > + TRUE > + }, > + { It seems that this is not true on my Nvidia card: > visual.c:21966: Driver string: "nvd3dum.dll" > visual.c:21967: Description string: "NVIDIA GeForce GT 650M" > visual.c:21970: Device name string: "\\.\DISPLAY1" > visual.c:21972: Driver version 10.18.13.5900 > ... > visual.c:5503: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE. Dynamic = 0. > visual.c:5503: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. If AMD GPUs accept D3DLOCK_NOOVERWRITE on non-dynamic buffers we can pick any behavior in Wine because games can't rely on it on Windows. I'll run the test on AMD GPUs later, currently all my machines with AMD GPUs are in a rather bad shape :-\ . > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); > + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); This is redundant. > + /* sanity check */ > + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad_strip1), 0, 0, D3DPOOL_DEFAULT, &buffer, NULL); > + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); Is there any place where this would fail, but the other tests succeed? My sense is that if something as basic as a vertex buffer draw is broken we'd have mass test failures anyway. > + /* Increase triangle draw count for faster GPUs. > + Limit size to 0x40000 as bigger values causes the Nvidia driver to crash. */ As mentioned I'll test this on other machines as well, it might make sense to use a pixel shader that calculates square roots in a loop to slow down the GPU if the current setup is unreliable. > + if (tests[i].dynamic) > + hr = IDirect3DDevice9_CreateVertexBuffer(device, size, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer, NULL); > + else > + hr = IDirect3DDevice9_CreateVertexBuffer(device, size, 0, 0, D3DPOOL_DEFAULT, &buffer, NULL); You could store a DWORD of flags in the tests structure and set it either to 0 or D3DUSAGE_DYNAMIC. That way you can avoid the branch and it makes the tests array easier to read IMO. > + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, size, (void **)&quad_strip_array, 0); > + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); > + if (!SUCCEEDED(hr) || !quad_strip_array) > + { > + IDirect3DVertexBuffer9_Release(buffer); > + continue; > + } You don't really need the if branch. If the call fails the ok() call will already mean that the test fails, and we don't really care about error handling after that. I.e., if you have a test failure it's no problem if you segfault afterwards. (It would matter if you ok is marked todo_wine or has a broken() clause because it fails in some cases on Windows.) > + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); Please consistently use SUCCEEDED(hr). Yeah, I know the existing code isn't perfect regarding this :-( . > + hr = IDirect3DVertexBuffer9_Lock(buffer, (quads - 1) * sizeof(quad_strip1), sizeof(quad_strip1), (void **)&quad_strip_array, D3DLOCK_READONLY); What is the purpose of the readonly lock here? I think it would be interesting to test how D3DLOCK_READONLY behaves regarding synchronization too. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXgk0zAAoJEN0/YqbEcdMwDDMP/3lJ/4Uu4hHSy9KWeLz5wDxH mq9cmVCon/34BlPOTAzIvYJ1tEoFnNGrXur5iuYgOuCq/4m8TZA7W10pCYEJ7yYE xS90d2udHsxYBEBoPDXzUff5GFdkRv53AX6IdYc2BmuPN+jA9+j51TxN9qWqYMHK XNV76BDZC8EZ+mQyTov82CsSsn0K3TvhBa/1njDlbUvuNuvuaDm7qzBMqooZycgv AejEiI/dwHPyu0dmAJxHjpEJl5FozdOELJwoRtXFCp2LANnWqCAugKkjD9O1kQsb u0/iKowANpHkP+VS1PkG5dZeIEJjM2lHlopUigwjeBY/SQ/Pdlh2wfJT3HWGKnEo mnACOI4xHGp5XyNX6iit1W5mjRtv0ZiMNaTawjvptTfMM54XopsuMw+hAK+6itLo 7fgccAGUhZo+Uun2p5ceZSr+2+J7q3TUtWlh633m8yW1jz/82jer2soyDoiFw+ap uo3+w8iQ2RUTrmD2kJ7dh0ZSaHeqSh522yi3fExbyyyFQiGd5S1CBaUgrHdnt56Z ciQWEb/hhJyAhLhlbjqJuaYaaozBwXrWCkpX2uRluOoMZFN3H7mi76jtNLys8mOO eQRQrw1j9vuN/vxEz1yg5NQMvV9PImrc1p56HYn2NXMqVptABjhcnyRpNwnB2ar+ PH/xwUDQRY9CTGRkt4dR =d9bG -----END PGP SIGNATURE-----

1 0

Re: explorerframe/tests: Use SetRect() instead of open coding it.
by Marvin July 9, 2016

July 9, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24129 Your paranoid android. === w7pro64 (64 bit nstc) === nstc.c:1953: Test failed: Got event 17, count 1

2 1

Re: explorerframe/tests: Use EqualRect() instead of open coding it.
by Marvin July 9, 2016

July 9, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24131 Your paranoid android. === w7pro64 (32 bit nstc) === nstc.c:1941: Test failed: Got event 17, count 1 === w7pro64 (64 bit nstc) === nstc.c:1951: Test failed: Got event 17, count 1

1 0

Re: explorerframe/tests: The width is between the RECT left and right fields
by Marvin July 9, 2016

July 9, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24130 Your paranoid android. === w7pro64 (64 bit nstc) === nstc.c:1946: Test failed: Got event 17, count 1

1 0

Re: [PATCH 2/2] wined3d/resource: Performance improvements
by Marvin July 8, 2016

July 8, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24126 Your paranoid android. === w8 (32 bit visual) === visual.c:4578: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. visual.c:4578: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 1. === w864 (32 bit visual) === visual.c:4578: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. visual.c:4578: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 1. === w1064 (32 bit visual) === visual.c:4578: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. visual.c:4578: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 1. === w864 (64 bit visual) === visual.c:4578: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. visual.c:4578: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 1. === w1064 (64 bit visual) === visual.c:4578: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. visual.c:4578: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 1.

1 0

Re: [PATCH 1/2] d3d9/tests/visual: Add Vertexbuffer locking tests
by Marvin July 8, 2016

July 8, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24125 Your paranoid android. === w8 (32 bit visual) === visual.c:4573: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. visual.c:4573: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 1. === w864 (32 bit visual) === visual.c:4573: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. visual.c:4573: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 1. === w1064 (32 bit visual) === visual.c:4573: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. visual.c:4573: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 1. === w864 (64 bit visual) === visual.c:4573: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. visual.c:4573: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 1. === w1064 (64 bit visual) === visual.c:4573: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 0. visual.c:4573: Test failed: Expected buffer mapped unsyncronized. Flags = D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD. Dynamic = 1.

1 0

Re: [PATCH] xmllite/writer: Support trivial case of WriteAttributeString()
by Marvin July 8, 2016

July 8, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24119 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/2] wscript: Added WScript.Quit tests.
by Marvin July 8, 2016

July 8, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24118 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 5/5] d3d11/tests: Add test for immediate constant buffer.
by Marvin July 8, 2016

July 8, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24114 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/5] d3d10core/tests: Add test for vertex formats.
by Marvin July 8, 2016

July 8, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24113 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/5] d3d11/tests: Add test for vertex formats.
by Marvin July 8, 2016

July 8, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24112 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [3/3] wininet/tests: Add a test for recently introduced regression related to InternetCrackUrl.
by Marvin July 8, 2016

July 8, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24111 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [2/3] wininet/tests: Avoid unnecessary initialization of variables.
by Marvin July 8, 2016

July 8, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24110 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [1/3] wininet: Correctly set lpszUrlPath in InternetCrackUrlW for urls without path component.
by Marvin July 8, 2016

July 8, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24109 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: gdi32: Remove unused function.
by Sebastian Lackner July 8, 2016

July 8, 2016

On 08.07.2016 12:25, Huw Davies wrote: > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > dlls/gdi32/region.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c > index 0b0ff47..1e10221 100644 > --- a/dlls/gdi32/region.c > +++ b/dlls/gdi32/region.c > @@ -149,11 +149,6 @@ static inline void empty_region( WINEREGION *reg ) > reg->extents.left = reg->extents.top = reg->extents.right = reg->extents.bottom = 0; > } > > -static inline BOOL is_in_rect( const RECT *rect, int x, int y ) > -{ > - return (rect->right > x && rect->left <= x && rect->bottom > y && rect->top <= y); > -} > - > /* > * number of points to buffer before sending them off > * to scanlines() : Must be an even number > I assume it was intentional to remove the is_in_rect() check from PtInRegion, but is it really such a good idea? For points outside of the extents rectangle it increased runtime from O(1) to O(log N), which could still matter in practice.

2 1

Re: gdi32: Optionally return the type from GDI_GetObjPtr().
by Dmitry Timoshkov July 8, 2016

July 8, 2016

Huw Davies <huw(a)codeweavers.com> wrote: > This enables get_dc_obj() to check the type without calling GetObjectType() > and thus it saves additional calls to Enter/LeaveCriticalSection(). > > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > This reduces the runtime of the dib tests by about 8% and achieves a similar > increase in performance with the drawing phase of a (gdi heavy) app I'm > looking at. ... > - bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); > + bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP, NULL ); Did you consider introducing GDI_GetObjPtrEx() with additional pointer to type, and making a shortcut by defining/calling it by a not Ex version? That would simplify the patch and avoid penalizing/changing the callers that don't need the type. -- Dmitry.

3 3

Re: [v3] riched20: Add support for ECO_NOHIDESEL flag
by Huw Davies July 8, 2016

July 8, 2016

On Fri, Jul 08, 2016 at 12:32:55PM +0200, Piotr Caban wrote: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/riched20/editor.c | 9 +++++++-- > dlls/riched20/paint.c | 6 ++++-- > 2 files changed, 11 insertions(+), 4 deletions(-) > > > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 13a2857..cb6fe3d 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -3453,14 +3453,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, > ME_RewrapRepaint(editor); > } > > + if ((changedSettings & settings & ECO_NOHIDESEL) && !editor->bHaveFocus) > + ME_InvalidateSelection( editor ); > + Actually on reflection, I think comparing with ES_NOHIDESEL is slightly less confusing, so let's go with v2. Huw.

1 0

Re: riched20: Add support for ECO_NOHIDESEL flag
by Huw Davies July 8, 2016

July 8, 2016

On Fri, Jul 08, 2016 at 11:34:11AM +0200, Piotr Caban wrote: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > > This patch also fixes control behavior when ECO_NOHIDESEL is not specified > and the control looses focus (for bug 40915). > --- > dlls/riched20/editor.c | 9 +++++++-- > dlls/riched20/paint.c | 6 ++++-- > 2 files changed, 11 insertions(+), 4 deletions(-) > > > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 13a2857..b7864eb 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -3453,14 +3453,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, > ME_RewrapRepaint(editor); > } > > + if ((changedSettings & settings & ECO_NOHIDESEL) && !editor->bHaveFocus) > + ME_InvalidateSelection( editor ); > + > if (changedSettings & settings & ECO_VERTICAL) > FIXME("ECO_VERTICAL not implemented yet!\n"); > if (changedSettings & settings & ECO_AUTOHSCROLL) > FIXME("ECO_AUTOHSCROLL not implemented yet!\n"); > if (changedSettings & settings & ECO_AUTOVSCROLL) > FIXME("ECO_AUTOVSCROLL not implemented yet!\n"); > - if (changedSettings & settings & ECO_NOHIDESEL) > - FIXME("ECO_NOHIDESEL not implemented yet!\n"); > if (changedSettings & settings & ECO_WANTRETURN) > FIXME("ECO_WANTRETURN not implemented yet!\n"); > if (changedSettings & settings & ECO_AUTOWORDSELECTION) > @@ -4257,6 +4258,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, > editor->bHaveFocus = TRUE; > ME_ShowCaret(editor); > ME_SendOldNotify(editor, EN_SETFOCUS); > + if (!editor->bHideSelection && !(editor->styleFlags & ECO_NOHIDESEL)) I think this, and all subsequent ECO_NOHIDESELs, would be better as ES_NOHIDESEL. The first one is fine as ECO_NOHIDESEL, since that's the setting one. Huw.

2 3

Re: [PATCH 02/12] d3drm: Move d3drm_device struct to d3drm_private.h.
by Aaryaman Vasishta July 8, 2016

July 8, 2016

> > +struct d3drm_device > +{ > + IDirect3DRMDevice IDirect3DRMDevice_iface; > + IDirect3DRMDevice2 IDirect3DRMDevice2_iface; > + IDirect3DRMDevice3 IDirect3DRMDevice3_iface; > + IDirect3DRMWinDevice IDirect3DRMWinDevice_iface; > + IDirect3DRM *d3drm; > + IDirectDraw *ddraw; > + IDirectDrawSurface *primary_surface, *render_target; > + IDirectDrawClipper *clipper; > + IDirect3DDevice *device; > + LONG ref; > + BOOL dither; > + D3DRMRENDERQUALITY quality; > + DWORD rendermode; > + DWORD height; > + DWORD width; > +}; > + > > I should remove the current forward declaration now that this patch moves the definition here.

1 0

Re: [PATCH 04/12] d3drm: Implement IDirect3DRMDevice*::Add/DeleteDestroyCallback.
by Aaryaman Vasishta July 8, 2016

July 8, 2016

On Thu, Jul 7, 2016 at 7:22 PM, Aaryaman Vasishta <jem456.vasishta(a)gmail.com > wrote: > > @@ -65,6 +65,7 @@ void d3drm_device_destroy(struct d3drm_device *device) > IDirectDraw_Release(device->ddraw); > IDirect3DRM_Release(device->d3drm); > } > + d3drm_object_cleanup((IDirect3DRMObject > *)&device->IDirect3DRMDevice_iface, &device->obj); > HeapFree(GetProcessHeap(), 0, device); > } > I should've probably put d3drm_object_cleanup at the beginning.

1 0

Re: [PATCH v2 3/3] winex11.drv: fix NULL pointer dereference (clang)
by Alexandre Julliard July 8, 2016

July 8, 2016

Kirill Smirnov <kirill.k.smirnov(a)gmail.com> writes: > @@ -1679,6 +1679,11 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, Picture mask > } > else > { > + if (!physdev) > + { > + ERR("physdev is NULL\n"); > + return; > + } This should never happen. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] server: Move the \BaseNamedObjects symlink from \Sessions\0 to \Sessions\1\BaseNamedObjects.
by flan July 8, 2016

July 8, 2016

What is wrong with the patch? Right now the most glaring formatting issue I can find is inconsistent spacing in a variable declaration, but I'm asking just in case there are more problems I haven't noticed.

3 7

[PATCH] server: Move the \BaseNamedObjects symlink from \Sessions\0 to \Sessions\1\BaseNamedObjects.
by flan July 7, 2016

July 7, 2016

What is wrong with the patch? Right now the most glaring formatting issue I can find is inconsistent spacing in a variable declaration, but I'm asking just in case there are more problems I haven't noticed.

1 0

Re: [PATCH 01/12] d3drm: Store reference to IDirect3DRM in struct d3drm_device.
by Aaryaman Vasishta July 7, 2016

July 7, 2016

The end of the subject should have "d3drm_device_create" instead of "struct d3drm_device". On Thu, Jul 7, 2016 at 8:18 PM, Marvin <testbot(a)winehq.org> wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch. >

1 0

Re: [PATCH] wininet: fix the bug can not save proxy bypass server into regedit by ie internet options dialog
by Alex Henrie July 7, 2016

July 7, 2016

Hi huangxuewei, Thanks for your interest in contributing to Wine! The Wine project requires you to use your real name (with capitalization and spaces) when submitting patches. It would also help to link to a bug report in the patch email, and to add tests to demonstrate that the behavior you want is the correct behavior. -Alex

1 0

Re: [PATCH] ws2_32: Allow user to enable IP dual stack (v4)
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24060 Your paranoid android. === wvistau64 (32 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: -559038737; 10048 expected if IPv6 binds to IPv4 as well). === w2008s64 (32 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: -559038737; 10048 expected if IPv6 binds to IPv4 as well). sock: unhandled exception c0000005 at 00000000 === w7u (32 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: 0; 10048 expected if IPv6 binds to IPv4 as well). === w7pro64 (32 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: 0; 10048 expected if IPv6 binds to IPv4 as well). === w8 (32 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: 0; 10048 expected if IPv6 binds to IPv4 as well). === w864 (32 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: 0; 10048 expected if IPv6 binds to IPv4 as well). === w1064 (32 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: 0; 10048 expected if IPv6 binds to IPv4 as well). === wvistau64 (64 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: -559038737; 10048 expected if IPv6 binds to IPv4 as well). === w2008s64 (64 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: -559038737; 10048 expected if IPv6 binds to IPv4 as well). === w7pro64 (64 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: 0; 10048 expected if IPv6 binds to IPv4 as well). === w864 (64 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: 0; 10048 expected if IPv6 binds to IPv4 as well). === w1064 (64 bit sock) === sock.c:6149: Test failed: IPV6_V6ONLY is enabled after bind. sock.c:6158: Test failed: Failed to disable IPV6_V6ONLY (LastError: 0; 10048 expected if IPv6 binds to IPv4 as well).

1 0

Re: [PATCH 3/3] mshtml: Export IElementSelector for all elements in compatibility mode >= IE8.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24059 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [10/10] webservices: Implement WsWriteBody.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24055 Your paranoid android. === build (build) === Make failed

1 0

Re: [09/10] webservices: Implement WsWriteEnvelopeEnd.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24054 Your paranoid android. === build (build) === Make failed

1 0

Re: [08/10] webservices: Implement WsWriteEnvelopeStart.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24053 Your paranoid android. === build (build) === Make failed

1 0

Re: [07/10] webservices: Implement WsAddressMessage.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24052 Your paranoid android. === build (build) === Make failed

1 0

Re: [06/10] webservices: Implement WsInitializeMessage.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24051 Your paranoid android. === build (build) === Make failed

1 0

Re: [05/10] webservices: Implement WsCreateMessageForChannel.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24050 Your paranoid android. === build (build) === Make failed

1 0

Re: [03/10] webservices: Allow integer values to be passed by pointer in WsWriteType.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24049 Your paranoid android. === build (build) === Make failed

1 0

Re: [02/10] webservices: Inherit the prefix only if parent and child namespaces match.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24048 Your paranoid android. === build (build) === Make failed

1 0

Re: [01/10] webservices: Add support for writing double values.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24047 Your paranoid android. === build (build) === Make failed

1 0

Re: [PATCH v3 6/6] shell32: Set output interfaces to NULL in FolderItems functions.
by Michael Stefaniuc July 7, 2016

July 7, 2016

On 07/06/2016 06:55 AM, Alex Henrie wrote: > Cc: Christian Costa <titan.costa(a)gmail.com> > Cc: Sebastian Lackner <sebastian(a)fds-team.de> > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/shell32/shelldispatch.c | 9 ++++++++- > dlls/shell32/tests/shelldispatch.c | 3 --- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c > index 6d7973e..2705389 100644 > --- a/dlls/shell32/shelldispatch.c > +++ b/dlls/shell32/shelldispatch.c > @@ -1063,12 +1063,16 @@ static HRESULT WINAPI FolderItemsImpl_get_Application(FolderItems3 *iface, IDisp > if (!ppid) > return E_INVALIDARG; > > + *ppid = NULL; > return E_NOTIMPL; > } > > static HRESULT WINAPI FolderItemsImpl_get_Parent(FolderItems3 *iface, IDispatch **ppid) > { > - FIXME("(%p,%p)\n", iface, ppid); > + TRACE("(%p,%p)\n", iface, ppid); > + > + if (ppid) > + *ppid = NULL; This two if's look odd: one for ppid and then for !ppid. Why don't you just unconditionally do the NULL assignment after the check below? > if (!ppid) > return E_INVALIDARG; bye michael

2 2

Re: [2/2] kernel32/tests: Add a test for sorting of InMemoryOrderModuleList.
by Marvin July 7, 2016

July 7, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24042 Your paranoid android. === w7u (32 bit loader) === loader.c:2308: Test failed: WaitForSingleObject failed: 102 loader.c:2310: Test failed: expected exit code 199, got 259 loader.c:2329: Test failed: expected 198, got 199 === w1064 (32 bit loader) === loader.c:2733: Test failed: Test 0: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 0: expected 74374550, got 00000000 loader.c:2733: Test failed: Test 1: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 1: expected 72BC2CF0, got 00000000 loader.c:2733: Test failed: Test 2: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 2: expected 74372DC0, got 00000000 loader.c:2741: Test failed: Test 3: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2742: Test failed: Test 3: Wrong callback count: 0 loader.c:2741: Test failed: Test 4: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2742: Test failed: Test 4: Wrong callback count: 0 loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195 === w864 (64 bit loader) === loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195 === w1064 (64 bit loader) === loader.c:2733: Test failed: Test 0: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 0: expected 00007FFC76DA5510, got 0000000000000000 loader.c:2733: Test failed: Test 1: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 1: expected 00007FFC6EFE1B00, got 0000000000000000 loader.c:2733: Test failed: Test 2: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 2: expected 00007FFC76DA2390, got 0000000000000000 loader.c:2741: Test failed: Test 3: ResolveDelayLoadedAPI succeeded with 0000000000000000 loader.c:2742: Test failed: Test 3: Wrong callback count: 0 loader.c:2741: Test failed: Test 4: ResolveDelayLoadedAPI succeeded with 0000000000000000 loader.c:2742: Test failed: Test 4: Wrong callback count: 0 loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195

2 1

Re: [PATCH 1/3] kernel32/tests/fiber: Add tests for fiber-local storage.
by André Hentschel July 6, 2016

July 6, 2016

Am 02.07.2016 um 04:41 schrieb John Sheu: > Signed-off-by: John Sheu <sheu(a)google.com> Hi and welcome to Wine development! May I ask if you could name an application which will benefit from your fixes? Your tests currently fail on our testbot as you can see here: https://source.winehq.org/patches/ Some inline comments: > static VOID WINAPI FiberMainProc(LPVOID lpFiberParameter) > { > BYTE *tparam = (BYTE *)lpFiberParameter; > - cbCount++; > + fiberCount++; > ok(*tparam == 185, "Parameterdata expected not to be changed\n"); > + if (fls_index_to_set != FLS_OUT_OF_INDEXES) > + { > + if (!pFlsSetValue || !pFlsGetValue) > + { > + win_skip( "Fiber Local Storage not supported\n" ); > + } > + else > + { > + PVOID pret; > + BOOL bret; > + > + pret = FlsGetValue(fls_index_to_set); > + ok(pret == NULL, "FlsGetValue returned %p, expected NULL\n", pret); > + > + /* Set the FLS value */ > + SetLastError( 0xdeadbeef ); > + bret = pFlsSetValue(fls_index_to_set, fls_value_to_set); > + ok(bret, "FlsSetValue failed with error %u\n", GetLastError()); > + > + /* Verify that FlsGetValue retrieves the value set by FlsSetValue */ > + SetLastError( 0xdeadbeef ); > + pret = FlsGetValue(fls_index_to_set); > + ok(pret == fls_value_to_set, > + "FlsGetValue returned %p, expected %p\n", pret, fls_value_to_set); > + ok(GetLastError() == ERROR_SUCCESS, > + "FlsGetValue error %u\n", GetLastError()); > + } > + } > pSwitchToFiber(fibers[0]); > } You are mixing tabs and spaces in FiberMainProc, spaces are preferred. Further you can avoid some line brakes in ok() calls, only wrap at around 100 > +static void test_FiberLocalStorageWithFibers(PFLS_CALLBACK_FUNCTION cbfunc) { > + PVOID val1 = (PVOID) 0x314; > + PVOID val2 = (PVOID) 0x152; > + BOOL ret; > + > + if (!pConvertThreadToFiber || !pSwitchToFiber || !pDeleteFiber) > + { > + win_skip( "Fibers not supported\n" ); > + return; > + } > + if (!pFlsAlloc || !pFlsFree || !pFlsSetValue || !pFlsGetValue) > + { > + win_skip( "Fiber Local Storage not supported\n" ); > + return; > + } > + > + > + fls_index_to_set = pFlsAlloc(cbfunc); > + ok(fls_index_to_set != FLS_OUT_OF_INDEXES, "FlsAlloc failed with error %d\n", GetLastError()); > + > + fiberCount = 0; > + cbCount = 0; > + fibers[0] = pConvertThreadToFiber(&testparam); Why do you convert the current thread into a fiber? It seems to me that is causing the crash on w2k3. You could try to run that test in a seperate thread > + fibers[1] = pCreateFiber(0,FiberMainProc,&testparam); > + fibers[2] = pCreateFiber(0,FiberMainProc,&testparam); > + ok(fibers[1] != 0, "CreateFiber failed with error %d\n", GetLastError()); > + ok(fibers[2] != 0, "CreateFiber failed with error %d\n", GetLastError()); > + ok(fiberCount == 0, "Wrong fiber count: %d\n", fiberCount); > + ok(cbCount == 0, "Wrong callback count: %d\n", cbCount); > + > + fiberCount = 0; > + cbCount = 0; > + fls_value_to_set = val1; > + pSwitchToFiber(fibers[1]); > + ok(fiberCount == 1, "Wrong fiber count: %d\n", fiberCount); > + ok(cbCount == 0, "Wrong callback count: %d\n", cbCount); > + > + fiberCount = 0; > + cbCount = 0; > + fls_value_to_set = val2; > + pSwitchToFiber(fibers[2]); > + ok(fiberCount == 1, "Wrong fiber count: %d\n", fiberCount); > + ok(cbCount == 0, "Wrong callback count: %d\n", cbCount); > + > + fls_value_to_set = val2; > + ret = pFlsSetValue(fls_index_to_set, fls_value_to_set); > + ok(ret, "FlsSetValue failed\n"); > + ok(val2 == pFlsGetValue(fls_index_to_set), "FlsGetValue failed\n"); > + > + fiberCount = 0; > + cbCount = 0; > + fls_value_to_set = val1; > + pDeleteFiber(fibers[1]); > + ok(fiberCount == 0, "Wrong fiber count: %d\n", fiberCount); > + todo_wine > + { > + ok(cbCount == 1, "Wrong callback count: %d\n", cbCount); > + } You can make that a one liner: todo_wine ok(); Hope that helps Have fun!

2 1

Re: [PATCH 3/3] wininet: Added semi-stub INTERNET_OPTION_END_BROWSER_SESSION implementation.
by Marvin July 6, 2016

July 6, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24024 Your paranoid android. === w7u (32 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14 === w7pro64 (32 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14 === w8 (32 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14 === w864 (32 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14 === w7pro64 (64 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14 === w864 (64 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14

1 0

Re: [PATCH 2/3] wininet: Always set returned size in InternetGetCookieExA.
by Marvin July 6, 2016

July 6, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24023 Your paranoid android. === w7u (32 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14 === w7pro64 (32 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14 === w8 (32 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14 === w864 (32 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14 === w7pro64 (64 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14 === w864 (64 bit internet) === internet.c:366: Test failed: InternetGetCookie should have failed with FALSE and error 14

1 0

Re: [PATCH 1/6] wined3d: Implement d3d11_immediate_context_Begin().
by Józef Kucia July 6, 2016

July 6, 2016

On Wed, Jul 6, 2016 at 12:02 PM, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/d3d11/async.c | 5 +++++ > dlls/d3d11/d3d11_private.h | 1 + > dlls/d3d11/device.c | 10 +++++++++- > 3 files changed, 15 insertions(+), 1 deletion(-) The subject prefix should be "d3d11".

1 0

Re: [PATCH] explorer: add registry support to disable Virtual Desktop systray
by Alexandre Julliard July 6, 2016

July 6, 2016

Rob Walker <bob.mt.wya(a)gmail.com> writes: > Workaround for https://bugs.winehq.org/show_bug.cgi?id=40828 A better approach would be to detect the fullscreen window and automatically hide the taskbar. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH v2 1/3] comdlg32: Init clipboard format only once in filedlg.
by Alexandre Julliard July 6, 2016

July 6, 2016

Lauri Kenttä <lauri.kentta(a)gmail.com> writes: > @@ -3798,6 +3789,25 @@ static void COMCTL32_ReleaseStgMedium (STGMEDIUM medium) > } > > /*********************************************************************** > + * GetFormatEtc > + * > + * Get the FORMATETC used in the shell id list > + */ > +static FORMATETC* GetFormatEtc(void) > +{ > + static FORMATETC formatetc; > + if (!formatetc.cfFormat) > + { > + formatetc.cfFormat = RegisterClipboardFormatA(CFSTR_SHELLIDLISTA); > + formatetc.ptd = 0; > + formatetc.dwAspect = DVASPECT_CONTENT; > + formatetc.lindex = -1; > + formatetc.tymed = TYMED_HGLOBAL; > + } > + return &formatetc; > +} This looks a little risky, since the structure is passed to the application. Caching only the clipboard format should be enough. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] explorer: add registry support to disable Virtual Desktop systray
by Alex Henrie July 6, 2016

July 6, 2016

+ if (using_root) + { + enable_shell = FALSE; + initialize_systray( graphics_driver, using_root, enable_shell ); + } + else + { + enable_systray=get_default_systray_state(); + initialize_systray( graphics_driver, !enable_systray, enable_shell ); + } I think you should put the same whitespace around the equals sign in both cases. -Alex

1 0

Re: [1/3] imm32, user32: Create and destroy the default IME window implicitly. (try 8)
by Alexandre Julliard July 6, 2016

July 6, 2016

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > Try 8: > - Fix user32 test failures. To achieve this, we create the default IME window > as message-only window for now. This doesn't match Windows behavior, as the tests show: ../../../tools/runtest -q -P wine -T ../../.. -M imm32.dll -p imm32_test.exe.so imm32 && touch imm32.ok imm32.c:209: Test failed: expected IME window existence imm32.c:221: Test failed: expected IME window existence imm32.c:946: Test failed: Expected IME window existence imm32.c:948: Test failed: Expected (nil), got 0x30066 imm32.c:195: Test failed: expected IME window existence imm32.c:209: Test failed: expected IME window existence imm32.c:221: Test failed: expected IME window existence imm32.c:956: Test failed: Expected IME window existence imm32.c:209: Test failed: expected IME window existence imm32.c:221: Test failed: expected IME window existence imm32.c:209: Test failed: expected IME window existence imm32.c:221: Test failed: expected IME window existence imm32.c:994: Test failed: Expected IME window existence imm32.c:996: Test failed: Expected (nil), got 0x50066 imm32.c:209: Test failed: expected IME window existence imm32.c:221: Test failed: expected IME window existence imm32.c:946: Test failed: Expected IME window existence imm32.c:948: Test failed: Expected (nil), got 0x60066 imm32.c:195: Test failed: expected IME window existence imm32.c:209: Test failed: expected IME window existence imm32.c:221: Test failed: expected IME window existence imm32.c:956: Test failed: Expected IME window existence imm32.c:209: Test failed: expected IME window existence imm32.c:221: Test failed: expected IME window existence imm32.c:209: Test failed: expected IME window existence imm32.c:221: Test failed: expected IME window existence imm32.c:994: Test failed: Expected IME window existence imm32.c:996: Test failed: Expected (nil), got 0x80066 imm32.c:946: Test failed: Expected IME window existence imm32.c:948: Test failed: Expected (nil), got 0xb005e imm32.c:195: Test failed: expected IME window existence imm32.c:209: Test failed: expected IME window existence imm32.c:221: Test failed: expected IME window existence imm32.c:956: Test failed: Expected IME window existence imm32.c:946: Test failed: Expected IME window existence imm32.c:948: Test failed: Expected (nil), got 0x20040 imm32.c:195: Test failed: expected IME window existence imm32.c:209: Test failed: expected IME window existence imm32.c:221: Test failed: expected IME window existence imm32.c:956: Test failed: Expected IME window existence make: *** [imm32.ok] Error 40 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] advapi32: Add some tests for StartTrace().
by Marvin July 6, 2016

July 6, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=23920 Your paranoid android. === wxppro (32 bit eventlog) === eventlog.c:1172: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1185: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1194: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1255: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1272: Test failed: Expected success eventlog.c:1280: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w2003std (32 bit eventlog) === eventlog.c:1172: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1185: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1194: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1255: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1272: Test failed: Expected success eventlog.c:1280: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === wvistau64 (32 bit eventlog) === eventlog.c:1172: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1194: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1255: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1272: Test failed: Expected success eventlog.c:1280: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w2008s64 (32 bit eventlog) === eventlog.c:1172: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1194: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1255: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1272: Test failed: Expected success eventlog.c:1280: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w7u (32 bit eventlog) === eventlog.c:1172: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1194: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1255: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1272: Test failed: Expected success eventlog.c:1280: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w7pro64 (32 bit eventlog) === eventlog.c:1172: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1194: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1255: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1272: Test failed: Expected success eventlog.c:1280: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w8 (32 bit eventlog) === eventlog.c:1172: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1194: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1255: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1272: Test failed: Expected success eventlog.c:1280: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w864 (32 bit eventlog) === eventlog.c:1172: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1194: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1255: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1272: Test failed: Expected success eventlog.c:1280: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w1064 (32 bit eventlog) === eventlog.c:1172: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1194: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:1255: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:1272: Test failed: Expected success eventlog.c:1280: Test failed: Expected ERROR_ALREADY_EXISTS, got 87

3 3

Re: [PATCH 3/3] regedit: Process the next file, if any, on error (v2)
by Sebastian Lackner July 6, 2016

July 6, 2016

On 05.07.2016 11:13, Hugh McMaster wrote: > Changes since v1: > * Do not leak memory when moving to the next file. > > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > programs/regedit/regedit.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c > index 04dd317..8a6a975 100644 > --- a/programs/regedit/regedit.c > +++ b/programs/regedit/regedit.c > @@ -88,7 +88,7 @@ typedef enum { > ACTION_ADD, ACTION_EXPORT, ACTION_DELETE > } REGEDIT_ACTION; > > -static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) > +static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) > { > switch (action) { > case ACTION_ADD: { > @@ -113,7 +113,9 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) > if (size == 0) > { > output_message(STRING_FILE_NOT_FOUND, filename); > - exit(1); > + if (realname) > + HeapFree(GetProcessHeap(), 0, realname); I haven't reviewed the whole series, but passing a NULL pointer to HeapFree() is perfectly fine, and its better to avoid such checks. > + return; > } > reg_file = _wfopen(realname, rb_mode); > if (reg_file == NULL) > @@ -121,7 +123,9 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) > WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; > _wperror(regedit); > output_message(STRING_CANNOT_OPEN_FILE, filename); > - exit(1); > + if (realname) > + HeapFree(GetProcessHeap(), 0, realname); Same here. > + return; > } > import_registry_file(reg_file); > if (realname) > @@ -150,7 +154,6 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) > exit(1); > break; > } > - return TRUE; > } > > BOOL ProcessCmdLine(WCHAR *cmdline) >

2 1

Re: [v2] secur32 : add and fix some algids
by Jacek Caban July 6, 2016

July 6, 2016

Hi Max, On 03.07.2016 23:41, Max Qian wrote: > diff --git a/include/wincrypt.h b/include/wincrypt.h > index 55c9509..19af6ca 100644 > --- a/include/wincrypt.h > +++ b/include/wincrypt.h > @@ -1583,6 +1583,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; > #define ALG_SID_AGREED_KEY_ANY 3 > #define ALG_SID_KEA 4 > #define ALG_SID_ECDH 5 > +#define ALG_SID_ECDH_EPHEM 6 > /* RC2 SIDs */ > #define ALG_SID_RC4 1 > #define ALG_SID_RC2 2 > @@ -1639,6 +1640,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; > #define CALG_KEA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_KEA) > #define CALG_HUGHES_MD5 (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_MD5) > #define CALG_ECDH (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_ECDH) > +#define CALG_ECDH_EPHEM (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_ECDH_EPHEM) > #define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) > #define CALG_ECMQV (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_ECMQV) > #define CALG_DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DES) Do you have a version of PSDK that has this definition? I can't see it here. If those are not in MS headers, we shouldn't have them unless we have a strong reason. When I asked you about adding a comment, I was hoping for something like /* MSDN mentions CALG_ECDH_EPHEM, but it's not available in headers. */ case ....: return CALG_ECDH; Thanks, Jacek

2 1