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

Re: [PATCH 1/6] d3drm: Implement IDirect3DRMViewport*::Init. (v7)
by Stefan Dösinger 27 Jul '16

27 Jul '16

On 2016-07-19 19:08, Aaryaman Vasishta wrote: > + memset(&mat, 0, sizeof(mat)); > + mat.dwSize = sizeof(mat); > + mat.diffuse.r = RGBA_GETRED(color) / 255.0f; > + mat.diffuse.g = RGBA_GETGREEN(color) / 255.0f; > + mat.diffuse.b = RGBA_GETBLUE(color) / 255.0f; > + mat.diffuse.a = RGBA_GETALPHA(color) / 255.0f; Doing this here seems questionable. What happens if the camera's background is changed after the viewport is created? You'll probably want to update the material property in viewport::clear(), or maybe in camera::SetSceneBackground. > + if (material) > + IDirect3DMaterial_Release(material); This will destroy the material, viewport::SetBackground doesn't addref it. > + hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); The first and third test are identical. > + IDirect3DRMDevice3_Release(device3); > + IDirect3DRMDevice_Release(device1); > + ref4 = get_refcount((IUnknown *)d3drm1); > + todo_wine ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4); The ref4 > inital_ref1 check isn't all too surprising because frame3 still holds a reference to its d3drm parent. Though it seems the leaked reference added by the second Viewport::Init call gets released somewhere. The test doesn't exactly show where. It is possible that releasing the device frees it, or releasing the frame does it.

3 3

Re: [PATCH 3/6] d3drm: Implement IDirect3DRMViewport::GetDirect3DViewport. (resend)
by Stefan Dösinger 27 Jul '16

27 Jul '16

You have some lines > 120 characters in here. Otherwise looks good to me. On 2016-07-19 19:08, Aaryaman Vasishta wrote: > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/tests/d3drm.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++- > dlls/d3drm/viewport.c | 18 ++++++++++--- > 2 files changed, 80 insertions(+), 5 deletions(-) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 17cf2dd..fc0b6b4 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1474,12 +1474,13 @@ static void test_Viewport(void) > IDirect3DRMFrame3 *frame3; > IDirect3DRMViewport *viewport; > IDirect3DRMViewport2 *viewport2; > + IDirect3DViewport *d3d_viewport; > IDirect3DRMObject *obj, *obj2; > GUID driver; > HWND window; > RECT rc; > DWORD size, data, ref1, ref2, ref3, ref4; > - DWORD initial_ref1, initial_ref2, initial_ref3, device_ref, frame_ref, frame_ref2; > + DWORD initial_ref1, initial_ref2, initial_ref3, device_ref, frame_ref, frame_ref2, viewport_ref; > CHAR cname[64] = {0}; > > window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); > @@ -1641,13 +1642,47 @@ static void test_Viewport(void) > > hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); > ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + viewport_ref = get_refcount((IUnknown *)d3d_viewport); > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > IDirect3DRMViewport_Release(viewport); > + > hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2); > ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface (hr = %x)\n", hr); > + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + viewport_ref = get_refcount((IUnknown *)d3d_viewport); > + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > IDirect3DRMViewport2_Release(viewport2); > > hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); > ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + viewport_ref = get_refcount((IUnknown *)d3d_viewport); > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > > hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj); > ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > @@ -1713,6 +1748,9 @@ static void test_Viewport(void) > ref4 = get_refcount((IUnknown *)d3drm3); > ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4); > > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + > /* Test all failures together */ > hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); > ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > @@ -1740,6 +1778,18 @@ static void test_Viewport(void) > ref4 = get_refcount((IUnknown *)frame); > ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4); > > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + viewport_ref = get_refcount((IUnknown *)d3d_viewport); > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + > hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); > ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > > @@ -1768,6 +1818,9 @@ static void test_Viewport(void) > ref4 = get_refcount((IUnknown *)d3drm3); > ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4); > > + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + > hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); > ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > hr = IDirect3DRMViewport2_Init(viewport2, device3, NULL, rc.left, rc.top, rc.right, rc.bottom); > @@ -1788,6 +1841,18 @@ static void test_Viewport(void) > ref4 = get_refcount((IUnknown *)frame3); > ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); > > + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + viewport_ref = get_refcount((IUnknown *)d3d_viewport); > + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + > hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); > ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > > diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c > index 730a1f5..09b0e83 100644 > --- a/dlls/d3drm/viewport.c > +++ b/dlls/d3drm/viewport.c > @@ -826,17 +826,27 @@ static D3DRMPROJECTIONTYPE WINAPI d3drm_viewport1_GetProjection(IDirect3DRMViewp > static HRESULT WINAPI d3drm_viewport2_GetDirect3DViewport(IDirect3DRMViewport2 *iface, > IDirect3DViewport **viewport) > { > - FIXME("iface %p, viewport %p stub!\n", iface, viewport); > + struct d3drm_viewport *viewport_object = impl_from_IDirect3DRMViewport2(iface); > > - return E_NOTIMPL; > + TRACE("iface %p, viewport %p.\n", iface, viewport); > + > + if (!viewport_object->d3d_viewport) > + return D3DRMERR_BADOBJECT; > + > + *viewport = viewport_object->d3d_viewport; > + IDirect3DViewport_AddRef(*viewport); > + > + return D3DRM_OK; > } > > static HRESULT WINAPI d3drm_viewport1_GetDirect3DViewport(IDirect3DRMViewport *iface, > IDirect3DViewport **viewport) > { > - FIXME("iface %p, viewport %p stub!\n", iface, viewport); > + struct d3drm_viewport *viewport_object = impl_from_IDirect3DRMViewport(iface); > > - return E_NOTIMPL; > + TRACE("iface %p, viewport %p.\n", iface, viewport); > + > + return d3drm_viewport2_GetDirect3DViewport(&viewport_object->IDirect3DRMViewport2_iface, viewport); > } > > static HRESULT WINAPI d3drm_viewport2_TransformVectors(IDirect3DRMViewport2 *iface, >

1 1

Re: [PATCH 1/3] ntdll: For Mac 64-bit, poke the TEB address to %gs:0x30 and re-enable the inlining of NtCurrentTeb().
by Sebastian Lackner 27 Jul '16

27 Jul '16

On 27.07.2016 17:42, Ken Thomases wrote: > 64-bit Windows apps have hard-coded accesses to %gs:0x30 baked into them. They > need to find the TEB self pointer there. > > Technically, the gsbase register and the memory it points to belong to the > pthread implementation on macOS. It's used for the pthread TLS implementation. > However, study of the sources and experimentation reveal that TLS slot 6 > (offset 0x30) is not currently used. Furthermore, Apple has promised to not > use that slot in the future. So, we hijack it for our purposes. > > This removes the implementation of NtCurrentTeb() based on pthread_key_create() > and pthread_set/getspecific(). > > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > --- > dlls/ntdll/ntdll.spec | 2 +- > dlls/ntdll/signal_x86_64.c | 34 +++------------------------------- > include/winnt.h | 2 +- > 3 files changed, 5 insertions(+), 33 deletions(-) Nice to hear that Apple agreed to keep that slot reserved. Would it make sense to keep the NtCurrentTeb export neverthless, for compatibility with libraries compiled against old Wine?

2 3

Re: [v2 PATCH] ucrtbase: Implement _get_narrow_winmain_command_line/_get_wide_winmain_command_line
by Dmitry Timoshkov 27 Jul '16

27 Jul '16

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +char* CDECL _get_narrow_winmain_command_line(void) > +{ > + static char *narrow_command_line; > + char *s; > + > + if (narrow_command_line) > + return narrow_command_line; > + > + s = GetCommandLineA(); > + if (*s == '"') > + { > + /* skip all leading quotes */ > + while (*++s == '"') > + ; > + /* skip everything up to next quote */ > + while (*s && *s++ != '"') > + ; > + } > + else > + { > + while (*s && *s != ' ' && *s != '\t') > + { > + /* allow embedded quoted blocks */ > + if (*s == '"') > + { > + s++; > + while (*s && *s++ != '"') > + ; > + } > + else > + s++; > + } > + } > + while (*s == ' ' || *s == '\t') > + s++; > + > + return narrow_command_line = s; > +} Once again: Where did you get an idea of such an implementation? Is this copied from some place or based on some other implementation? Why for instance simple 'return GetCommandLineA()' is not enough as an initial implementation? -- Dmitry.

2 4

Re: [PATCH 1/6] amstream: Fix AMAudioData::QueryInterface.
by Nikolay Sivov 27 Jul '16

27 Jul '16

On 27.07.2016 15:51, Anton Baskanov wrote: > Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> > --- > dlls/amstream/audiodata.c | 1 - > dlls/amstream/tests/Makefile.in | 3 +- > dlls/amstream/tests/audiodata.c | 67 +++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 69 insertions(+), 2 deletions(-) > create mode 100755 dlls/amstream/tests/audiodata.c Hi, Anton. Please keep tests in existing amstream.c file. + > +static void test_query_interface(void) > +{ > + IUnknown *unknown = create_audio_data(); > + IMemoryData *memory_data = NULL; > + IAudioData *audio_data = NULL; > + > + HRESULT result = S_OK; result initialization is not needed; > + > + result = IUnknown_QueryInterface(unknown, &IID_IMemoryData, (void **)&memory_data); > + ok(E_NOINTERFACE == result, "got 0x%08x\n", result); > + if (S_OK == result) > + { > + IMemoryData_Release(memory_data); > + } If it always fails, there's no reason add conditional Release. > + > + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); > + ok(S_OK == result, "got 0x%08x\n", result); > + if (S_OK == result) > + { > + IAudioData_Release(audio_data); > + } > + > + IUnknown_Release(unknown); > +} Could you check if you can query IMemoryData from IAudioData? It seems really weird if parent interface is not supported at all.

1 0

RE: MPR patches
by Hugh McMaster 27 Jul '16

27 Jul '16

On Wednesday, 27 July 2016, Pierre Schweitzer wrote: > Regarding 1. & 3. should I perform a resend with that changed, or should > I change it in the next patch I submit? > > For 2., this is done on purpose. Real implementation will come in a > later patch (already ready and tested here :-)). Personally, I'd submit your real implementation of WNetCancelConnection2W as patch 1 of 2. Then submit your implementation patch using the WCHAR * style as the second patch. But if you decide to keep to your original order, please change the style before sending. You should also rebase your patches on the latest git. Your current patch has an offset of -87 lines. As for your security certificate, although it doesn't prevent the patch from applying, it would be better removed, if possible. Le 27/07/2016 à 13:40, Hugh McMaster a écrit : > On Wednesday, 27 July 2016 6:40 AM, Pierre Schweitzer wrote: > >> Is there any reason why the MPR patches are left abandoned? There are >> others awaiting in my queue... > >> + PWSTR name = strdupAtoW(lpName); >> + if (!name) >> + return ERROR_NOT_CONNECTED; > > 1. New code should use the WCHAR * style. > > 2. All three functions call WNetCancelConnection2W, but that function is a stub: > > DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce ) > { > FIXME( "(%s, %08X, %d), stub\n", debugstr_w(lpName), dwFlags, fForce ); > > return WN_SUCCESS; > } > > 3. Your mail has a StartCom Secure Digital Certificate attached. This has been mangled, as can be seen at the bottom of your patch: http://source.winehq.org/patches/data/124723

2 1

MPR patches
by Pierre Schweitzer 27 Jul '16

27 Jul '16

Hi, Is there any reason why the MPR patches are left abandoned? There are others awaiting in my queue... Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

2 2

Re: [PATCH] ucrtbase: Expose the fabsf function on arm
by Piotr Caban 27 Jul '16

27 Jul '16

Hi Martin, On 07/26/16 12:19, Martin Storsjo wrote: > It isn't available in the x86 or x64 versions of ucrtbase.dll > or api-ms-win-crt-math-l1-1-0.dll, but exists (and gets used by > MSVC 2015) on arm. > --- > dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 1 + > dlls/ucrtbase/ucrtbase.spec | 1 + > 2 files changed, 2 insertions(+) you forgot to sign-off your patch. Except of that it looks good for me. Thanks, Piotr

1 0

Re: [PATCH 2/3 v2] kernel32/tests/loader: Add tests for fiber-local storage.
by Alexandre Julliard 27 Jul '16

27 Jul '16

John Sheu <sheu(a)google.com> writes: > Signed-off-by: John Sheu <sheu(a)google.com> > --- > dlls/kernel32/tests/loader.c | 118 ++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 116 insertions(+), 2 deletions(-) Could you please rebase it against recent changes, and resend with a fixed sequence number so that it can run through the testbot? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/6] d3d11/tests: Add visual tests for locking vertexbuffers
by Marvin 26 Jul '16

26 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=24541 Your paranoid android. === wvistau64 (32 bit d3d11) === d3d11: unhandled exception 0000087c at 75A2E743 === w2008s64 (32 bit d3d11) === d3d11: unhandled exception 0000087c at 7680E743 === w7u (32 bit d3d11) === d3d11: unhandled exception c0000005 at 004022D6 === w7pro64 (32 bit d3d11) === d3d11: unhandled exception c0000005 at 004022D6 === w8 (32 bit d3d11) === d3d11: unhandled exception c0000005 at 004022D6 === w864 (32 bit d3d11) === d3d11: unhandled exception c0000005 at 004022D6 === w1064 (32 bit d3d11) === d3d11: unhandled exception c0000005 at 004022D6 === wvistau64 (64 bit d3d11) === d3d11: unhandled exception 0000087c at 000000007765674D === w2008s64 (64 bit d3d11) === d3d11: unhandled exception 0000087c at 0000000076EA674D === w7pro64 (64 bit d3d11) === d3d11: unhandled exception c0000005 at 000000000040217C === w864 (64 bit d3d11) === d3d11: unhandled exception c0000005 at 000000000040217C === w1064 (64 bit d3d11) === d3d11: unhandled exception c0000005 at 000000000040217C

1 0