August 2015 - Wine-devel - list.winehq.org

Re: dmobject: Remove unused unimpl_IPersistStream_GetClassID() functions.
by Nikolay Sivov 07 Aug '15

07 Aug '15

It's better to keep this, so dmobject* copies don't differ.

2 1

Re: d2d1: Make d2d_geometry_sink_vtbl static.
by Henri Verbeet 07 Aug '15

07 Aug '15

On 7 August 2015 at 12:42, Francois Gouget <fgouget(a)free.fr> wrote: > --- > dlls/d2d1/geometry.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c > index 056923e..beebf73 100644 > --- a/dlls/d2d1/geometry.c > +++ b/dlls/d2d1/geometry.c > @@ -1299,7 +1299,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddArc(ID2D1GeometrySink *iface, > ++geometry->u.path.segment_count; > } > > -struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = > +static struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = It should actually be const too.

1 0

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.(try 3)
by Piotr Caban 07 Aug '15

07 Aug '15

Hi, On 08/05/15 07:45, YongHao Hu wrote: > +typedef struct _REPARSE_MOUNTPOINT_DATA_BUFFER > +{ > + DWORD ReparseTag; > + DWORD ReparseDataLength; > + WORD Reserved; > + WORD ReparseTargetLength; > + WORD ReparseTargetMaximumLength; > + WORD Reserved1; > + WCHAR ReparseTarget[1]; > +} REPARSE_MOUNTPOINT_DATA_BUFFER, *PREPARSE_MOUNTPOINT_DATA_BUFFER; This structure is not defined in native ntifs.h. I don't know if it's acceptable to add it in wine. I think that it may be easier to get sys::tr2::_Stat implementation to wine without tests on reparse points. You can add this tests later but I'm not sure if they belong to msvcp tests. Thanks, Piotr

3 5

Re: [6/7] vcomp: Implement _vcomp_enter_critsect and _vcomp_leave_critsect.
by Nikolay Sivov 07 Aug '15

07 Aug '15

On 07.08.2015 9:22, Sebastian Lackner wrote: >However, this does not fully prevent a > leak when frequently unloading / reloading a library using OpenMP... sounds a bit > like a design flaw to me. You could keep a list of allocations to fix that if it's really a problem.

2 3

Re: Re: d3drm: Implement IDirect3DRMDevice{2-3}::GetDirect3DDevice2 (try 2).
by Marvin 06 Aug '15

06 Aug '15

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

1 0

Re: d3drm: Implement IDirect3DRMDevice{2-3}::GetDirect3DDevice2 (try 2).
by Aaryaman Vasishta 06 Aug '15

06 Aug '15

This patch supersedes patch 113488. On Fri, Aug 7, 2015 at 3:50 AM, Aaryaman Vasishta <jem456.vasishta(a)gmail.com > wrote: > --- > dlls/d3drm/device.c | 7 ++++- > dlls/d3drm/tests/d3drm.c | 68 > ++++++++++++++---------------------------------- > 2 files changed, 26 insertions(+), 49 deletions(-) > > diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c > index 1de6f91..26240c1 100644 > --- a/dlls/d3drm/device.c > +++ b/dlls/d3drm/device.c > @@ -1325,7 +1325,12 @@ static DWORD WINAPI > d3drm_device3_GetRenderMode(IDirect3DRMDevice3 *iface) > > static HRESULT WINAPI d3drm_device3_GetDirect3DDevice2(IDirect3DRMDevice3 > *iface, IDirect3DDevice2 **d3d_device) > { > - FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); > + struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); > + > + TRACE("iface %p, d3d_device %p.\n", iface, d3d_device); > + > + if (device->device) > + return IDirect3DDevice_QueryInterface(device->device, > &IID_IDirect3DDevice2, (void**)d3d_device); > > return E_NOTIMPL; > } > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 2d25bf3..52b0d9a 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -2185,9 +2185,7 @@ static void test_create_device_from_clipper2(void) > > /* Fetch immediate mode device in order to access render target */ > hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); > - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface > (hr = %x).\n", hr); > - if (FAILED(hr)) > - goto cleanup; > + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = > %x).\n", hr); > > hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > ok(hr == DD_OK, "Cannot get surface to the render target (hr = > %x).\n", hr); > @@ -2263,7 +2261,7 @@ static void test_create_device_from_clipper2(void) > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = > %u.\n", ref2, ref3); > cref2 = get_refcount((IUnknown *)clipper); > - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = > %u, cref2 = %u.\n", cref1, cref2); > + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = > %u.\n", cref1, cref2); > > /* Test if render target format follows the screen format */ > hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > @@ -2279,9 +2277,7 @@ static void test_create_device_from_clipper2(void) > ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = > %x).\n", hr); > > hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); > - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface > (hr = %x).\n", hr); > - if (FAILED(hr)) > - goto cleanup; > + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = > %x).\n", hr); > > hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > ok(hr == DD_OK, "Cannot get surface to the render target (hr = > %x).\n", hr); > @@ -2295,23 +2291,13 @@ static void test_create_device_from_clipper2(void) > hr = IDirectDraw2_RestoreDisplayMode(ddraw); > ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); > > -cleanup: > - if (ds) > - IDirectDrawSurface_Release(ds); > - if (surface) > - IDirectDrawSurface_Release(surface); > - if (d3ddevice2) > - IDirect3DDevice2_Release(d3ddevice2); > - if (device2) > - IDirect3DRMDevice2_Release(device2); > - if (d3drm2) > - IDirect3DRM2_Release(d3drm2); > - if (d3drm1) > - IDirect3DRM_Release(d3drm1); > - if (clipper) > - IDirectDrawClipper_Release(clipper); > - if (ddraw) > - IDirectDraw_Release(ddraw); > + IDirectDrawSurface_Release(surface); > + IDirect3DDevice2_Release(d3ddevice2); > + IDirect3DRMDevice2_Release(device2); > + IDirect3DRM2_Release(d3drm2); > + IDirect3DRM_Release(d3drm1); > + IDirectDrawClipper_Release(clipper); > + IDirectDraw_Release(ddraw); > DestroyWindow(window); > } > > @@ -2373,9 +2359,7 @@ static void test_create_device_from_clipper3(void) > > /* Fetch immediate mode device in order to access render target */ > hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); > - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface > (hr = %x).\n", hr); > - if (FAILED(hr)) > - goto cleanup; > + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = > %x).\n", hr); > > hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > ok(hr == DD_OK, "Cannot get surface to the render target (hr = > %x).\n", hr); > @@ -2451,7 +2435,7 @@ static void test_create_device_from_clipper3(void) > ref3 = get_refcount((IUnknown *)d3drm3); > ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = > %u.\n", ref2, ref3); > cref2 = get_refcount((IUnknown *)clipper); > - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = > %u, cref2 = %u.\n", cref1, cref2); > + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = > %u.\n", cref1, cref2); > > /* Test if render target format follows the screen format */ > hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > @@ -2467,9 +2451,7 @@ static void test_create_device_from_clipper3(void) > ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = > %x).\n", hr); > > hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); > - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface > (hr = %x).\n", hr); > - if (FAILED(hr)) > - goto cleanup; > + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = > %x).\n", hr); > > hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > ok(hr == DD_OK, "Cannot get surface to the render target (hr = > %x).\n", hr); > @@ -2483,23 +2465,13 @@ static void test_create_device_from_clipper3(void) > hr = IDirectDraw2_RestoreDisplayMode(ddraw); > ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); > > -cleanup: > - if (ds) > - IDirectDrawSurface_Release(ds); > - if (surface) > - IDirectDrawSurface_Release(surface); > - if (d3ddevice2) > - IDirect3DDevice2_Release(d3ddevice2); > - if (device3) > - IDirect3DRMDevice3_Release(device3); > - if (d3drm3) > - IDirect3DRM3_Release(d3drm3); > - if (d3drm1) > - IDirect3DRM_Release(d3drm1); > - if (clipper) > - IDirectDrawClipper_Release(clipper); > - if (ddraw) > - IDirectDraw_Release(ddraw); > + IDirectDrawSurface_Release(surface); > + IDirect3DDevice2_Release(d3ddevice2); > + IDirect3DRMDevice3_Release(device3); > + IDirect3DRM3_Release(d3drm3); > + IDirect3DRM_Release(d3drm1); > + IDirectDrawClipper_Release(clipper); > + IDirectDraw_Release(ddraw); > DestroyWindow(window); > } > > -- > 2.3.2 (Apple Git-55) > >

1 0

Re: [PATCH 7/8] d3drm: Implement IDirect3DRMDevice::CreateDeviceFromSurface.
by Stefan Dösinger 06 Aug '15

06 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-08-06 um 00:49 schrieb Aaryaman Vasishta: > device->d3drm = d3drm; > + device->render_target = surface; > IDirect3DRM_AddRef(d3drm); > device->render_target = surface; This is redundant. > + hr = IDirectDrawSurface_AddAttachedSurface(surface, ds); > + IDirectDrawSurface_Release(ds); > + if (FAILED(hr)) > + return hr; > + } You've overshot my suggestion for pre-attached depth stencils a bit. Now you no longer detach application-created depth stencils any more in case CreateDevice() fails, but you also don't detach a depth stencil that you attached. This may even be the correct behavior. If you want you can write a test (e.g. try to pass a color surface without DDSCAPS_3DDEVICE, but *with* a depth stencil attached. See if it is detached. Try to pass a color surface without DDSCAPS_3DDEVICE and see if a depth stencil is attached after the failing CreateDevice call), but I don't think it's worth spending much time on this. My suggestion is to detach if creating the IM device fails, but only if create_z_surface is TRUE. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVw1yLAAoJEN0/YqbEcdMwyJMP/jsXffvDJlssOGTqhDZvVpl0 WBoSf9mClvG7T5Gqz9Kq8tXXZaETSLPdovHryDn3Ux7kJcJllDfE1C/TqP0jc3X8 weQFMEK49TiNsYBItqgVr7v8YU15GMTqyrhwjIH6zTq9XIx27yhAecKNExb10nfD u32ebnJ//Eh90qkfIe6uvSytFUGmjs0OWZjPlneBbEPOj0jyGMFOyNX3IxN1bB6f czAxJBr6z8EQ0KHRQK9sq98WmIA2najmfakXPzg2fbE+RYRDPnYgcfQ1KmQdtvb1 b9KhIt7FMmL+O1VqgyNsWTUwUin57I0RpyjdBcZ8F48yblUf07a0qiY9udKawKYB xwAmriEMOd37n9Ip6PguawySmdv7a4Jrd8O0Xcu+FRidUMjzq9ZkgvqNht2OaWgv 2dYOCCR6TuA5dYxD3YaqHgJpUB46KS/vE7Nh8EG/Dh2e6paTQoamBUi15WNG/TQB o5Lr2DlJKuXaJnZYoNLDlYgy88P4/JoDvRBLYekbO/fDB1sqMgdBJbRlKGoy72g5 iIrEUbtMpNNLLpxw+ChwH7Gb5U8LZJWMSeyVv8oO/xliir6vF9Dm/sCt4b+bK4uM Y5Q2hC10oEd6jHkbdSKdU6/C8oyKMcfBQJ9adiiQWF+wXQoOPcsaDxwDILVmInGy /3lu18CaUtUdBEhoX/PR =JeVt -----END PGP SIGNATURE-----

2 1

Re: [PATCH 0/3] mshtml: Image map support
by Alex Henrie 06 Aug '15

06 Aug '15

2015-08-04 8:36 GMT-06:00 Alex Henrie <alexhenrie24(a)gmail.com>: > Hi, > > Could I get some feedback on the following changes before I submit them > to wine-patches? Shoot, I just sent these to wine-patches by accident instead of wine-devel. Feedback would still be appreciated. -Alex

2 4

Re: [4/4] msvcirt: Implement filebuf::setbuf
by Piotr Caban 06 Aug '15

06 Aug '15

On 08/05/15 20:32, Iván Matellanes wrote: > @@ -1000,8 +1000,14 @@ streampos __thiscall filebuf_seekoff(filebuf *this, streamoff offset, ios_seek_d > DEFINE_THISCALL_WRAPPER(filebuf_setbuf, 12) > streambuf* __thiscall filebuf_setbuf(filebuf *this, char *buffer, int length) > { > - FIXME("(%p %p %d) stub\n", this, buffer, length); > - return NULL; > + streambuf *ret; > + > + TRACE("(%p %p %d)\n", this, buffer, length); > + > + streambuf_lock(&this->base); > + ret = streambuf_setbuf(&this->base, buffer, length); > + streambuf_unlock(&this->base); > + return ret; > } It doesn't look correct if buffer was already set. Probably the function needs to sync previous buffer or return error in this case. Thanks, Piotr

2 1

Re: [PATCH 1/3] dwrite: Properly initialize LOGFONT returned from ConvertFontToLOGFONT()
by Alexandre Julliard 06 Aug '15

06 Aug '15

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > From: Nikolay Sivov <nsivov(a)codeweavers.com> > Date: Tue, 4 Aug 2015 21:40:52 +0300 > Subject: [PATCH 1/4] dwrite: Properly initialize LOGFONT returned from > ConvertFontToLOGFONT() > > --- > dlls/dwrite/gdiinterop.c | 2 ++ > dlls/dwrite/tests/font.c | 34 +++++++++++++++++++++++++++++++++- > 2 files changed, 35 insertions(+), 1 deletion(-) It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M dwrite.dll -p dwrite_test.exe.so font && touch font.ok font.c:2767: Test failed: got 300 font.c:3028: Tests skipped: Courier New font not found. font.c:4030: Tests skipped: Skipping tests with Arial Makefile:202: recipe for target 'font.ok' failed -- Alexandre Julliard julliard(a)winehq.org

1 0