June 2015 - Wine-Devel - list.winehq.org

Re: d3dx9_36 [try 2]: Save multiplications and divisions to improve performance
by Matteo Bruni June 29, 2015

June 29, 2015

2015-06-25 23:45 GMT+02:00 David Adam <david.adam.cnrs(a)gmail.com>: > Hi, > > I added a test with 65000 sides. All the test pass with a native d3dx9_36 > dll. You should have mentioned that the new test doesn't pass with the previous implementation, which is what makes this patch really convincing. So this patch is okay to me. Also notice that this in practice doesn't save any multiplication in the loop, at least with my version of GCC: the multiplication 2.0f * D3DX_PI was precalculated at compile time. A better patch title mentioning D3DXCreatePolygon would be nice. The tests generally have some room for improvement. As a followup it would be nice to try and improve them, maybe by replacing the comparison function with one which allows for a relative error and makes it possible to choose a potentially different error value for each test (to be able to lower those as much as possible). I would like to point you to some other place in Wine where the float comparison is done right but, on the spot, I only found relative_error + expect_color macros from d3dx9_36/tests/math.c which are really ugly. FWIW https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbe… seems to be a good read on the subject.

1 0

Re: d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs
by Matteo Bruni June 29, 2015

June 29, 2015

2015-06-27 8:41 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > These functions are only supported with d3dcompiler version 46 and above. > > Changelog: > d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs > > > Best Regards > Alistair Leslie-Hughes I don't think you need to encompass the function definitions in an #if D3D_COMPILER_VERSION since they won't be exported anyway by the spec files for version < 46. Can you use a format like the one used in D3DCompile() for the tracing of function parameters in the FIXME?

1 0

Re: d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 9 resend).
by Marvin June 29, 2015

June 29, 2015

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

1 0

Re: d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromSurface (try 7 resend).
by Marvin June 29, 2015

June 29, 2015

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

1 0

Re: d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 9).
by Marvin June 29, 2015

June 29, 2015

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

1 0

Wiki is down
by Rosanne DiMesio June 29, 2015

June 29, 2015

Http://wiki.winehq.org leads to a bluehost.com page that says "There is no website configured at this address" and links to specific wiki pages produce 404: File not found. -- Rosanne DiMesio <dimesio(a)earthlink.net>

4 3

Re: [PATCH 3/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 8).
by Stefan Dösinger June 29, 2015

June 29, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-06-28 um 11:14 schrieb Aaryaman Vasishta: > + if (FAILED(IDirectDraw2_CreateSurface(ddraw, &surface_desc, ds, NULL))) > + continue; > + > + hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds); > + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); > + if (FAILED(hr)) > + continue; You're leaking the depth surface in this case. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVkUYtAAoJEN0/YqbEcdMwCt4P/09yNvjELjIyH5T/5HRdUWm4 LoJLtK/OhmlwdaHCvsShqImde4IjszHm/wzL7sIokNxXJ9zDOvmFPjQ+8jcyBJoG ZPNGB7o2QT1RqVhgXRBJkAGWkrG7Pwd6oTShibKmbxySsTVuol62hcjqSZkZshCz 6iO/9MwhzW1KdpHrVGbXcKAQZzPg8rsqDb+97k5350FYdJFFd0935WOCUiNfHOuu iqAm6V3sJbcQ3SBxJN5l2vPLG2m4j40307fEFNJor9jOkFOGv9RnxzGCp2O+gUcV h6n6l/bmznT/lVl4IedUFYkxIQUgdGIMoUXZfgs5MZZYhuaUrR9XxeNlv7oJrcVQ i1fp3pjEQldw7X4KQXqlwzOn7CvVZTtSqH4D4Glyn/3rHFD0V9fIWINg6Fj/Nd73 fZf8TAHM45WqQ+9ueVmnaYGdkUhN0bq8JDE2QfCKUfXNIOC8j5vLgJ7NC5YhC7xc WtOAsXxF7RRVmbQbfMUYOWJcMWR9XUbTNGyWQhWsiWx92rz3n1m7C3e+K9fp2F2P Eybs30FWbPuKuBxvEy0Ws1bA1xY+my1iD/mQN4YEc1aet2X/YpZ4EqYSWOzwKLM/ FuAchmQFwo7Hyr+9nrAc47441ENMBdQQ/dpAS90wGy/uQPJURj08LFt3EWDjXy/O bkMhBscSpcPpizrksvna =U/er -----END PGP SIGNATURE-----

1 0

Re: vbscript: Treat empty regexp pattern the same way as NULL pattern.
by Marvin June 29, 2015

June 29, 2015

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=14818 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [1/2] user32/tests: Add some tests to show that WS_CLIPCHILDREN doesn't exclude children from update region.
by Marvin June 29, 2015

June 29, 2015

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=14817 Your paranoid android. === wvistau64 (64 bit msg) === msg.c:10561: Test failed: expected PeekMessage to return FALSE, got 1

1 0

Re: [1/2] qcap: Distinguish interface and implementation pointer for VfwCapture output pin.
by Nikolay Sivov June 29, 2015

June 29, 2015

On 29.06.2015 9:08, Sebastian Lackner wrote: > - BasePin *pin; > + VfwPinImpl *pin; > > TRACE("destroying everything\n"); > if (This->init) > @@ -226,10 +236,10 @@ static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) > qcap_driver_stop(This->driver_info, &This->filter.state); > qcap_driver_destroy(This->driver_info); > } > - pin = (BasePin*) This->pOutputPin; > - if (pin->pConnectedTo != NULL) > + pin = impl_from_IPin(This->pOutputPin); > + if (pin->pin.pin.pConnectedTo != NULL) > { > - IPin_Disconnect(pin->pConnectedTo); > + IPin_Disconnect(pin->pin.pin.pConnectedTo); This is not better than it is now, 'pOutputPin' is IPin* so you should be using public methods. > if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) > - *ppv = This; > + *ppv = &This->pin.pin.IPin_iface; This could as well say 'iface'.

2 3

Re: [PATCH 2/6]: msvcp110: Add tr2_sys__Rename implementation and test.
by Piotr Caban June 29, 2015

June 29, 2015

On 06/27/15 19:50, YongHaoHu wrote: > + ok(GetFileInformationByHandle(h2, &info2), "GetFileInformationByHandle failed\n"); > + CloseHandle(h2); > + ok(info1.nFileIndexHigh == info2.nFileIndexHigh > + && info1.nFileIndexLow == info2.nFileIndexLow, > + "test_tr2_sys__Rename(): test %d expect two files equivalent\n", i+1); This test is not working when run from VirtualBox share. Could you please run the tests inside temp directroy? Thanks, Piotr

1 0

Re: [1/2] qcap: Distinguish interface and implementation pointer for VfwCapture output pin.
by Michael Stefaniuc June 29, 2015

June 29, 2015

On 06/29/2015 08:08 AM, Sebastian Lackner wrote: > --- dlls/qcap/vfwcapture.c | 42 > ++++++++++++++++++++++++++---------------- 1 file changed, 26 > insertions(+), 16 deletions(-) > > diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index > 7804a3d..31620c0 100644 --- a/dlls/qcap/vfwcapture.c +++ > b/dlls/qcap/vfwcapture.c @@ -557,7 +567,7 @@ PPB_Load( > IPersistPropertyBag * iface, IPropertyBag *pPropBag, > var.__VARIANT_NAME_1.__VARIANT_NAME_2.__VARIANT_NAME_3.ulVal ); if > (This->driver_info) { - pin = (VfwPinImpl > *)This->pOutputPin; + pin = > impl_from_IPin(This->pOutputPin); impl_from_IFoo() is just for the interface pointer of a method. For internal stuff the object pointer should be passed or stored instead. For application provided interface pointers an unsafe_impl_from_IFoo() should be used. bye michael

1 0

Re: qmgr: Fix WINHTTP_OPTION_CONTEXT_VALUE data pointer (Coverity)
by Hans Leidekker June 29, 2015

June 29, 2015

> On 27 Jun 2015, at 09:57, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Hans, does it look right? Yes, thanks.

1 0

Re: [2/2] windowscodecs: Distinguish interface and implementation pointer for IcnsEncoder.
by Nikolay Sivov June 29, 2015

June 29, 2015

On 29.06.2015 9:08, Sebastian Lackner wrote: > --- > dlls/windowscodecs/icnsformat.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c > index 5ce44a2..3f24e91 100644 > --- a/dlls/windowscodecs/icnsformat.c > +++ b/dlls/windowscodecs/icnsformat.c > @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) > if (This->icns_image != NULL) > HeapFree(GetProcessHeap(), 0, This->icns_image); > > - IUnknown_Release((IUnknown*)This->encoder); > + IUnknown_Release(&This->encoder->IWICBitmapFrameEncode_iface); > HeapFree(GetProcessHeap(), 0, This); > } > > @@ -489,7 +489,7 @@ static HRESULT WINAPI IcnsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFII > if (IsEqualIID(&IID_IUnknown, iid) || > IsEqualIID(&IID_IWICBitmapEncoder, iid)) > { > - *ppv = This; > + *ppv = &This->IWICBitmapEncoder_iface; > } > else > { > @@ -639,7 +639,7 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, > frameEncode->committed = FALSE; > *ppIFrameEncode = &frameEncode->IWICBitmapFrameEncode_iface; > This->outstanding_commits++; > - IUnknown_AddRef((IUnknown*)This); > + IUnknown_AddRef(&This->IWICBitmapEncoder_iface); > > end: > LeaveCriticalSection(&This->lock); > @@ -725,8 +725,8 @@ HRESULT IcnsEncoder_CreateInstance(REFIID iid, void** ppv) > InitializeCriticalSection(&This->lock); > This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcnsEncoder.lock"); > > - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); > - IUnknown_Release((IUnknown*)This); > + ret = IUnknown_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); > + IUnknown_Release(&This->IWICBitmapEncoder_iface); > > return ret; > } > Please use proper wrappers for that.

1 0

Re: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (unmodified resend).
by Stefan Dösinger June 28, 2015

June 28, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Here's something for future reference. I believe Henri mentioned the same thing for a different place already. I don't think a resend is necessary for this, you can fix this when you add this test for d3drm1 and d3drm3. Am 2015-06-27 um 18:38 schrieb Aaryaman Vasishta: > + hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper); > + ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr); > + if (SUCCEEDED(hr)) > + { > + ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper); > + IDirectDrawClipper_Release(d3drm_clipper); > + } You don't really need the if (SUCCEEDED(hr)) here. You're unconditionally expecting GetClipper to return a clipper in the ok() line above. If it doesn't return one the test already failed, and there's no need to bother about preventing follow-up failures or crashes. (Yeah, we have many instances in the code of things like these, e.g. if (SUCCEEDED(hr)) after BeginScene / EndScene. They should ideally be fixe d.) > + if (d3drm_primary) > + IDirectDrawSurface_Release(d3drm_primary); Same thing here. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVj5yEAAoJEN0/YqbEcdMwi+oP/0uFOap9QRVWMILPN/PrupVO g3IR6KBx+QNf/mzkOEyP6rQVbZx0UUlHlQ16v0ftziediL73qpQfRKSIxf135THH ji6+DK0xHUvBNSz6XDSZjDky/cTtnTO0IRdRqZlL4Cd+y46GF04hwoiuIijnx1Fd +AHurqTvEBgYepc+oEPgQRh2q/OApxUs3kMTPXzK9rPIp2SKZwpcJ8NMkYhaGMRC FXEOq/lfaanQbgQdcPqavMgHBDCOR9xvhgSsPktUlCtltsrNJ/1INyRHHfbt8F1k Yg5yfXdxvaThkWy5pNlAeatPZFhYzJIiyECvol7MXymHSP4zMDlF+WoG9V21fHOR aYCA5lplQY3P7+0r0Nv7rQgtqWoo/mx6ntgm3Etl7MBKV5+ED8RNVPCWCkBV4j/y EXWJe8RLj+a0pHIA+sTop0Yym+F00/6SPH6sJcHnqqSo1W34FFnpzH5ddV3oNst0 8fVjYNLyQwdo9k2z5DVf1ZJQk87dk3Rg6bzZpofwhOd3NEmNr1f8kMDLCYNbs5GK jr1QdyLtFCpxoqqDu1iE2174SZgECXkDU6DJQE99BVtNs9QcIx9pqNXmHbLXXDyX akHSKWeDQrZpMOSZI/XZxlXhhVdxeGRJGdkZmzr4H1Qpu4kHA5OgOaXBGVRIoUNg ii/ChTzxObM40BdpuaH+ =5Y9W -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/6]: msvcp110: Add tr2_sys__Statvfs implementation and test.
by Nikolay Sivov June 28, 2015

June 28, 2015

On 27.06.2015 20:50, YongHaoHu wrote: > +typedef struct { > + ULONGLONG capacity; > + ULONGLONG free; > + ULONGLONG available; > +} space_info; > + Is this documented somewhere? > + info.capacity = ((ULONGLONG)(total.HighPart)<< 32) + total.LowPart; > + info.free = ((ULONGLONG)(free.HighPart)<< 32) + free.LowPart; > + info.available = ((ULONGLONG)(available.HighPart)<< 32) + available.LowPart; I don't think you'll need this if you used QuadPart.

2 1

Re: [PATCH 3/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 7).
by Stefan Dösinger June 27, 2015

June 27, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-06-27 um 18:38 schrieb Aaryaman Vasishta: > +static IDirect3DDevice2 *create_device(IDirectDraw2 *ddraw, HWND window, IDirectDrawSurface **ds) > ... > + if (FAILED(IDirectDraw2_CreateSurface(ddraw, &surface_desc, ds, NULL))) > + continue; > + > + hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds); > + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); > + IDirectDrawSurface_Release(*ds); should release the depth stencil surface in the success case because you're passing it out of the function. The other patches are OK. I'll ack them on monday on IRC, including a fixed version of patch 3 if it is on wine-patches by then. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVjwwxAAoJEN0/YqbEcdMwz+sP/1+Lme2ItbNjmvKnCwtSWdul tcMr9DkNrjkyUMsM1Glzgoll5XphGRj+4M6ZnPTrLU5i4qlZ8w6MWm8kkrQK3h12 KWhfYEhWBahqBTDva7dulThM6TvzHrvq7pK8ObfmDdWlchhv4Y89hksSIlIdGUD8 7QuEx7EvcutcEnaNFZI5yCtOGEvUNAK4GYzFPWYNnFjDpgq7567TBh5oXdFkyQsT 3wKOf8Uxt5O9/2f5E+7cYyOLC+BR6YM4uGarnma2eqQIzTUOXySm7UYA0gJ3KRw6 9OtzWUyIPw5Iz2CkVkP5M5o9srtkSVungsCg6aQSQIcbGaedvhu9K0G4fFJxVqWJ zmntVVp4yQzP+yov9NHEYOvX1rAkO9V3RudeVfe2sytxHNYYC7hwTR8lXLaM0WF6 fbWx32k8+6o0JP02PgkZFHBhlYZLN5a1deYFTpUFsW0YhUKNrRXAwV9MuVMihreC MmNbnE7DnnrX/vYkxh6MHAnkCFM6/uMy9M8jvTEuzpr0mhCfjn50mbv/lgUK3WiV leUda/RCBmfiM4YPJkhV3qytikRL5EPouB5LcvCR7xjpKT83TBnKOphCRgLPVBrR 2uuJ5orV8M+V9g67zXYibkaeh3yBr8w8vuvTz/L638zkdjshJJmQ/L/51FL0t9Qk 1FEipapwnAjq4NOKJvJi =+VK0 -----END PGP SIGNATURE-----

1 0

Re: user32: Limit number of hooks called recursively.
by Marvin June 26, 2015

June 26, 2015

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=14749 Your paranoid android. === wvistau64 (64 bit msg) === msg.c:10595: Test failed: expected PeekMessage to return FALSE, got 1

1 0

Re: [PATCH] msvcp90: Implement time_get<char> ctors and dtors
by Piotr Caban June 26, 2015

June 26, 2015

On 06/26/15 16:51, Daniel Lehman wrote: > + days = _Locinfo__Getdays((_Locinfo *)locinfo); Could you please change _Locinfo__Getdays header and make the cast there? Thanks to it we will much _Locinfo__Getdays mangled name. Also _Locinfo__W_Getmonths, _Locinfo__Getmonths and _Locinfo__W_Getdays header needs to be fixed. This will make this cast not needed. > + len = strlen(days)+1; > + this->days = MSVCRT_operator_new(len); > + if(this->days) Please handle allocation failures as it's done in other locale classes. > time_get_char* __thiscall time_get_char_ctor_locinfo(time_get_char *this, > const _Locinfo *locinfo, unsigned int refs) > { > - FIXME("(%p %p %d) stub\n", this, locinfo, refs); > + TRACE("(%p %p %d)\n", this, locinfo, refs); > + locale_facet_ctor_refs(&this->facet, refs); > this->facet.vtable = &MSVCP_time_get_char_vtable; > + time_get_char__Init(this, locinfo); > return NULL; > } You forgot to return THIS here. Thanks, Piotr

2 2

Re: [PATCH 2/2] msvcp90: Copy name in _Getctype (Valgrind) (try2)
by Piotr Caban June 26, 2015

June 26, 2015

On 06/24/15 16:46, Daniel Lehman wrote: > + name = ___lc_locale_name_func()[LC_COLLATE]; > + size = wcslen(name)+1; > + ret->name = malloc(size*sizeof(*name)); > + if (!ret->name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); > + memcpy(ret->name, name, size*sizeof(*name)); This will not work if ___lc_locale_name_func()[LC_COLLATE] is NULL. Thanks, Piotr

2 2

Re: [PATCH 2/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromSurface (try 6).
by Stefan Dösinger June 26, 2015

June 26, 2015

Hi, > + ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); Style-only issue: You're just checking one flag here, so ok(dwCaps & ZBUFFER, "..."); is enough > + IDirectDrawSurface_Release(surface); > + > + memset(&desc, 0, sizeof(desc)); > + desc.dwSize = sizeof(desc); > + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; > + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; > + desc.dwWidth = rc.right; > + desc.dwHeight = rc.bottom; > + > + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); > + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); Minor issue: I don't think there's a reason to destroy and recreate the surface. > + IDirectDrawSurface_Release(d3drm_ds); > + IDirectDrawSurface_Release(d3drm_surface); > + IDirectDrawSurface_Release(ds); What happens to the depth buffer here? Does it remain attached? Stefan

2 3

Re: [PATCH 3/4] dmband: Remove the extraneous IUnknown from DMBandTrack
by Jacek Caban June 26, 2015

June 26, 2015

Hi Michael, On 06/26/15 00:18, Michael Stefaniuc wrote: > @@ -97,22 +41,47 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr > } > > static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, > - void **ppobj) > + void **ret_iface) > { > IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); > - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); > + > + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack) || > + IsEqualIID(riid, &IID_IDirectMusicTrack8)) > + *ret_iface = iface; > + else if (IsEqualIID(riid, &IID_IPersistStream)) > + *ret_iface = &This->PersistStreamVtbl; > + else { > + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); > + return E_NOINTERFACE; > + } The patch is obviously fine and the problem exists in current code, but QI is supposed to set output interface on error and such assumption is common for callers. It would be nice to fix that when you rewrite QI ;) Cheers, Jacek

2 1

Re: [2/14]hid: break HidD_ functions out into their own module
by Charles Davis June 26, 2015

June 26, 2015

> On Jun 25, 2015, at 9:15 AM, Aric Stewart <aric(a)codeweavers.com> wrote: > --- a/dlls/hid/main.c > +++ b/dlls/hid/main.c > @@ -39,43 +35,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) > { > switch(fdwReason) > { > - case DLL_WINE_PREATTACH: > - return FALSE; /* prefer native version */ This is minor, but I don’t think we should prefer the builtin hid.dll until we’re done implementing it. Chip

2 1

Re: [1/14]include: add ddk/hidclass.h
by Charles Davis June 26, 2015

June 26, 2015

> On Jun 25, 2015, at 9:15 AM, Aric Stewart <aric(a)codeweavers.com> wrote: > @@ -0,0 +1,63 @@ […] > +#ifndef __HIDCLASS_H > +#define __HIDCLASS_H […] > +DEFINE_GUID (GUID_DEVINTERFACE_HID, \ > + 0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30); Correct me if I’m wrong, but I think this should go outside the header guard. That way, you can usefully include this definition multiple times, and one of those times you can define INITGUID to get a real definition. Chip

1 0

Re: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (try 6).
by Stefan Dösinger June 25, 2015

June 25, 2015

Hi, This patch looks good to me. Stefan > Am 25.06.2015 um 22:42 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > --- > dlls/d3drm/tests/d3drm.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 202 insertions(+) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 5dcfddc..666150f 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1947,6 +1947,207 @@ static void test_frame_qi(void) > IDirect3DRM_Release(d3drm1); > } > > +static HRESULT CALLBACK surface_callback(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) > +{ > + IDirectDrawSurface **primary = context; > + > + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) > + { > + *primary = surface; > + return DDENUMRET_CANCEL; > + } > + IDirectDrawSurface_Release(surface); > + > + return DDENUMRET_OK; > +} > + > +static void test_create_device_from_clipper(void) > +{ > + DDSCAPS caps = { DDSCAPS_ZBUFFER }; > + IDirect3DRM *d3drm1 = NULL; > + IDirect3DRM2 *d3drm2 = NULL; > + IDirectDraw *ddraw = NULL; > + IUnknown *unknown = NULL; > + IDirect3DRMDevice2 *device2 = NULL; > + IDirect3DDevice2 *d3ddevice2 = NULL; > + IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; > + IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; > + IDirectDrawSurface7 *surface7 = NULL; > + DDSURFACEDESC desc, surface_desc; > + DWORD expected_flags; > + HWND window; > + GUID driver = IID_IDirect3DRGBDevice; > + HRESULT hr; > + ULONG ref1, ref2, ref3, cref1, cref2; > + RECT rc; > + > + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 500, 400, 0, 0, 0, 0); > + GetClientRect(window, &rc); > + hr = DirectDrawCreateClipper(0, &clipper, NULL); > + ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr); > + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); > + ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr); > + > + hr = Direct3DRMCreate(&d3drm1); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); > + ref1 = get_refcount((IUnknown *)d3drm1); > + cref1 = get_refcount((IUnknown *)clipper); > + > + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm2); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); > + > + /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 0, 0, &device2); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2); > + ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); > + ref3 = get_refcount((IUnknown *)d3drm1); > + todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); > + 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(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); > + > + /* 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; > + > + hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > + ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); > + > + hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper); > + ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr); > + > + /* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */ > + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7); > + ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr); > + IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown); > + hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw); > + ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); > + IUnknown_Release(unknown); > + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, > + NULL, &d3drm_primary, surface_callback); > + ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr); > + ok(d3drm_primary != NULL, "No primary surface was enumerated.\n"); > + hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper); > + ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr); > + if (SUCCEEDED(hr)) > + { > + ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper); > + IDirectDrawClipper_Release(d3drm_clipper); > + } > + if (d3drm_primary) > + IDirectDrawSurface_Release(d3drm_primary); > + IDirectDrawSurface7_Release(surface7); > + IDirectDraw_Release(ddraw); > + > + /* Check properties of render target and depth surface */ > + surface_desc.dwSize = sizeof(surface_desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); > + ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); > + > + ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", > + surface_desc.dwWidth, surface_desc.dwHeight); > + ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), > + "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps); > + expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; > + ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags); > + > + hr = DirectDrawCreate(NULL, &ddraw, NULL); > + ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); > + desc.dwSize = sizeof(desc); > + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > + ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr); > + ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n", > + surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount); > + > + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds); > + ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr); > + > + desc.dwSize = sizeof(desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); > + ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); > + > + ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", > + desc.dwWidth, desc.dwHeight); > + ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); > + expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; > + ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags); > + ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth); > + ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask); > + > + /* Release old objects and check refcount of device and clipper */ > + IDirectDrawSurface_Release(ds); > + ds = NULL; > + IDirectDrawSurface_Release(surface); > + surface = NULL; > + IDirect3DDevice2_Release(d3ddevice2); > + d3ddevice2 = NULL; > + IDirect3DRMDevice2_Release(device2); > + ref3 = get_refcount((IUnknown *)d3drm1); > + ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3); > + 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); > + > + /* Test if render target format follows the screen format */ > + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > + ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr); > + hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16); > + ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr); > + > + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > + ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr); > + ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2); > + 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; > + > + hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > + ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); > + > + surface_desc.dwSize = sizeof(surface_desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); > + ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); > + todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", > + surface_desc.ddpfPixelFormat.dwRGBBitCount); > + > + 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); > + DestroyWindow(window); > +} > + > START_TEST(d3drm) > { > test_MeshBuilder(); > @@ -1964,4 +2165,5 @@ START_TEST(d3drm) > test_frame_mesh_materials(); > test_d3drm_qi(); > test_frame_qi(); > + test_create_device_from_clipper(); > } > -- > 1.9.3 (Apple Git-50) > > >

1 0