- wine-devel - winehq.org

Re: d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs
by Matteo Bruni 29 Jun '15

29 Jun '15

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 29 Jun '15

29 Jun '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=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 29 Jun '15

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

1 0

Re: d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 9).
by Marvin 29 Jun '15

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

1 0

Wiki is down
by Rosanne DiMesio 29 Jun '15

29 Jun '15

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 29 Jun '15

29 Jun '15

-----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 29 Jun '15

29 Jun '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=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 29 Jun '15

29 Jun '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=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 29 Jun '15

29 Jun '15

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 29 Jun '15

29 Jun '15

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 29 Jun '15

29 Jun '15

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 29 Jun '15

29 Jun '15

> 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 29 Jun '15

29 Jun '15

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 28 Jun '15

28 Jun '15

-----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 28 Jun '15

28 Jun '15

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 27 Jun '15

27 Jun '15

-----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 26 Jun '15

26 Jun '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=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 26 Jun '15

26 Jun '15

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 26 Jun '15

26 Jun '15

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 26 Jun '15

26 Jun '15

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 26 Jun '15

26 Jun '15

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 26 Jun '15

26 Jun '15

> 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 26 Jun '15

26 Jun '15

> 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 25 Jun '15

25 Jun '15

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

RE: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (try 5).
by Aaryaman Vasishta 25 Jun '15

25 Jun '15

> > This is by no means a full review, just a couple of obvious things I noticed. > > On 24 June 2015 at 17:02, Aaryaman Vasishta <jem456.vasishta at gmail.com <https://www.winehq.org/mailman/listinfo/wine-devel>> wrote: > >* +static HRESULT CALLBACK surface_callback(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) > *>* +{ > *>* + IDirectDrawClipper *d3drm_clipper = NULL; > *Initializing this to NULL is pointless, you initialize it before all > uses with the IDirectDrawSurface_GetClipper() call below. > > >* + if (context) > *>* + { > *"context" should always be non-NULL here. > > >* + hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper); > *>* + ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr); > *>* + if (SUCCEEDED(hr)) > *You have an ok() one line above that states "hr == DD_OK" at this > point. If the GetClipper() call failed you'd get a test failure. > > Once you've found the primary you can of course return DDENUMRET_CANCEL. > > I think you're making things too complicated though. I'd just call > EnumSurfaces() with "&primary" as context pointer, set it in the > callback, and then just do the rest of the tests after EnumSurfaces() > returns, instead of trying to fit those into the callback. > > Thank you for the suggestions! I have decided to return the primary surface directly, and set it to NULL if it doesn't exist via the context, something like this, which seems to run fine on my windows machine: > static HRESULT CALLBACK surface_callback(IDirectDrawSurface *surface, > DDSURFACEDESC *desc, void **context) > { > IDirectDrawClipper *d3drm_clipper; > HRESULT hr; > > if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) > { > *context = surface; > return DDENUMRET_CANCEL; > } > IDirectDrawSurface_Release(surface); > > return DDENUMRET_OK; > } > Then in the tests, simply check if the context returned is NULL, if yes then perform related tests on it inside the test. Thank you!

1 1

Re: [3/14]hid: translated HidD_ functions to their IOCTLs
by Nikolay Sivov 25 Jun '15

25 Jun '15

On 25.06.2015 18:15, Aric Stewart wrote: > BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) > { > - FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); > - return FALSE; > + TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); > + return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); > } I can't say I know anything about that, but this looks like a typo, maybe it should use IOCTL_HID_SET_FEATURE?

1 0

Re: d3dx9-36: Save multiplications to improve performance
by Matteo Bruni 25 Jun '15

25 Jun '15

2015-06-25 4:07 GMT+02:00 David Adam <david.adam.cnrs(a)gmail.com>: > Hello, > > with my dual-core, for sides=65000 the gain is about 40%. It probably has more to do with avoiding the division than the multiplication. Can you add a test for a polygon with that many faces and see if the result matches native better with the simplification or without?

1 0

Re: [1/3] d3dcompiler: Share the source with d3dcompiler_46 (try 2)
by Matteo Bruni 25 Jun '15

25 Jun '15

2015-06-25 12:30 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > Rename define to D3D_COMPILER_VERSION > > Changelog: > d3dcompiler: Share the source with d3dcompiler_46 > > > Best Regards > Alistair Leslie-Hughes Series looks good to me, thanks!

1 0

Re: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (try 5).
by Henri Verbeet 25 Jun '15

25 Jun '15

This is by no means a full review, just a couple of obvious things I noticed. On 24 June 2015 at 17:02, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > +static HRESULT CALLBACK surface_callback(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) > +{ > + IDirectDrawClipper *d3drm_clipper = NULL; Initializing this to NULL is pointless, you initialize it before all uses with the IDirectDrawSurface_GetClipper() call below. > + if (context) > + { "context" should always be non-NULL here. > + hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper); > + ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr); > + if (SUCCEEDED(hr)) You have an ok() one line above that states "hr == DD_OK" at this point. If the GetClipper() call failed you'd get a test failure. Once you've found the primary you can of course return DDENUMRET_CANCEL. I think you're making things too complicated though. I'd just call EnumSurfaces() with "&primary" as context pointer, set it in the callback, and then just do the rest of the tests after EnumSurfaces() returns, instead of trying to fit those into the callback.

1 0

Re: wineboot: Create MachineGuid registry value.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > The MachineGuid registry key should exist even without calling CryptAcquireContextW. > Optionally we could remove the remove the corresponding code from advapi32 afterwards. This doesn't need to run at every boot, so you can probably stick it into the registration of some crypto dll like wintrust. And please also remove the advapi32 code. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [1/3] wininet/tests: Add tests for overriding host header.
by Marvin 25 Jun '15

25 Jun '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=14698 Your paranoid android. === w7u (32 bit http) === http.c:2891: Test failed: HttpSendRequest failed http.c:2896: Test failed: HttpQueryInfo failed http.c:2897: Test failed: got status 0, expected 200 http.c:5813: Test failed: HttpAddRequestHeadersA failed 12019 http.c:5819: Test failed: HttpQueryInfoA failed 12019 http.c:5820: Test failed: header missing

1 0

Re: [1/3] wininet/tests: Add tests for overriding host header.
by Sebastian Lackner 25 Jun '15

25 Jun '15

On 25.06.2015 12:27, Sebastian Lackner wrote: > From: Michael Müller <michael(a)fds-team.de> > > --- > dlls/wininet/tests/http.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 109 insertions(+) > The testbot already shows a test failure on Win7, but it seems to be random. It doesn't occur in a second run: https://newtestbot.winehq.org/JobDetails.pl?Key=14699.

1 0

Re: [PATCH (resend)] cmd: Consistently wrap lines to 75 characters.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Alex Henrie <alexhenrie24(a)gmail.com> writes: > 75 characters is the maximum length of a line before gettext breaks it, > so this convention will cause each translatable string to fit snugly > into the po files. It's also about what we were doing anyway, just not > consistently. > > The biggest advantage to consistent line wrapping is that translators > will no longer have to guess where they should insert line breaks. You'll need to also update the duplicate text in programs/start, and it would be nice if you could try to fix at least some of the translations so that we don't have to invalidate all of them. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: d3drm: Mark DllCanUnloadNow and DllGetClassObject as private.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -19,5 +19,5 @@ > @ stdcall D3DRMVectorScale(ptr ptr float) > @ stdcall D3DRMVectorSubtract(ptr ptr ptr) > @ stdcall Direct3DRMCreate(ptr) > -@ stub DllCanUnloadNow > -@ stub DllGetClassObject > +@ stub -private DllCanUnloadNow > +@ stub -private DllGetClassObject Private is not useful on a stub. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] cmd: fix invalid "else if" execution (try2)
by Marvin 25 Jun '15

25 Jun '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=14664 Your paranoid android. === wxppro (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 692 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 693 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 694 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 695 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 696 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 697 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 698 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 699 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 700 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 701 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 702 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 703 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 704 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 705 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 706 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 707 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 708 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 709 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 710 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 711 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 712 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 713 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 715 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 716 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 717 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 718 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 719 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 721 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 722 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 723 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 724 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 725 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 726 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 727 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 729 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 730 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 731 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 732 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 733 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 734 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 735 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 736 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 737 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 738 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 739 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 740 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 741 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 742 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 743 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 744 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 745 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 746 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 747 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 748 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 755 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 756 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 757 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 761 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 762 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 763 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 764 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 765 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 766 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 767 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 768 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 769 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 770 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 774 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 775 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 776 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 780 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 781 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 782 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 783 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1367 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1368 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1369 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1370 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1371 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1372 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1373 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1374 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1376 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1379 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1380 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1381 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1382 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1383 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1384 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1385 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar') === w2003std (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 692 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 693 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 694 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 695 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 696 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 697 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 698 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 699 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 700 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 701 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 702 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 703 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 704 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 705 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 706 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 707 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 708 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 709 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 710 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 711 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 712 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 713 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 715 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 716 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 717 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 718 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 719 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 721 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 722 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 723 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 724 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 725 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 726 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 727 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 729 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 730 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 731 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 732 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 733 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 734 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 735 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 736 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 737 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 738 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 739 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 740 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 741 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 742 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 743 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 744 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 745 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 746 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 747 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 748 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 755 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 756 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 757 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 761 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 762 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 763 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 764 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 765 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 766 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 767 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 768 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 769 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 770 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 774 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 775 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 776 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 780 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 781 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 782 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 783 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1367 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1368 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1369 (got 'C:\Documents and Settings\Administrator\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1370 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1371 (got 'C:\Documents and Settings\Administrator\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1372 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1373 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1374 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1376 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1379 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1380 (got 'C:\Documents and Settings\Administrator\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1381 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1382 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1383 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1384 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1385 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar') === wvistau64 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'') === w8 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'') === wvistau64 (64 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'')

2 2

Re: ntdll: Randomize security cookie when available (try 3)
by Alexandre Julliard 25 Jun '15

25 Jun '15

André Hentschel <nerv(a)dawncrow.de> writes: > + /* randomize security cookie */ > + > + if (IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG < nt->OptionalHeader.NumberOfRvaAndSizes && > + (pos = nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress)) > + { > + IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg = (IMAGE_LOAD_CONFIG_DIRECTORY *)(ptr + pos); > + ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie; > + > + srand( time( NULL ) ); > + *cookie = rand(); This won't be random at all. -- Alexandre Julliard julliard(a)winehq.org

1 0

When/how to build separate debug symbol files
by Ken Thomases 25 Jun '15

25 Jun '15

Hi, I'm investigating how to best make Wine build and install debug symbol files on OS X. My understanding is that, on Linux, the distros usually provide a separate package for a user to install Wine's debug symbols. From recent work in dbghelp, I'm guessing such a package installs debug symbol files next to the corresponding binary or in a .debug subdirectory next to it. Is that correct? How do packagers generate such separate debug symbol files? Is it a special option (make target?) in Wine's build process? Or is it a post-processing step after Wine is built and installed to a staging directory? How does this interact with stripping during building for the non-debug-symbol, normal Wine package? For what it's worth, I'm working on make dbghelp support DWARF-2 debug info on OS X <https://bugs.winehq.org/show_bug.cgi?id=22384>. On OS X, the normal link step does not transfer the DWARF-2 debug info from the object files to the file binary. Rather, you have to execute a separate command, dsymutil, to "link" the debug info, but that ends up in a separate file, not the binary. So, the first part is figuring out when to invoke dsymutil and where to put the debug symbol file. The second part is having dbghelp find that debug symbol file. I think I have a handle on the second part. The first part is what I'm trying to figure out. The dsymutil depends on references from the linked binary to the original object files from which it was created. Those references are in the STABS info. So, it has to be invoked 1) at a point where those object files are accessible, and 2) before the binary has been stripped of the necessary references. A problem that may be unique to OS X is how to support debugging when running Wine build from source, either run from the build tree or installed by the user. Since the debug information isn't easily accessible unless the separate dsymutil step was done, we may want to do it at link time, not just at install time. Unfortunately, that largely defeats the point of separating out debug linking from normal linking, which was to save time and disk space. Thanks, Ken

3 3

Re: Wine developer frustration (was Re: ntdll: Improve stub of NtQueryEaFile.)
by Alex Henrie 25 Jun '15

25 Jun '15

2015-06-18 2:08 GMT-06:00 Alexandre Julliard <julliard(a)winehq.org>: > So now I want to take a step back, and take the time to look at what we > are doing wrong, and listen to new ideas. I'd like to encourage > everyone, but especially people who are disgruntled or have given up > hope that we'd ever change, to send (either in this thread or by private > mail) their suggestions for what we should be doing differently, and how. As a relatively new Wine developer, I submitted a UTF-7 implementation copied from ReactOS, but it was rejected without explanation. After some prodding, I was told that I needed to rewrite the code from scratch.[2] Then, after I rewrote the patches, I was told to put the implementation in kernel32 instead of libwine.[3] The next patchset was ignored, but I finally got a couple of cryptic messages about a buffer overflow and table-based tests.[4][5] Later I got more cryptic messages about needing more tests, but again I was not told what needed to be tested, just "think about it".[6][7] Finally I was told "this isn't going anywhere",[9] "you have nowhere near enough tests"[10] and "if you're too stupid to know what you're doing wrong then you shouldn't contribute".[11] The above process literally lasted from January to December 2012. After that, I was so upset with the Wine project and AJ in particular that I did not submit a single patch to Wine for more than a year.[12] When I finally decided to try submitting the UTF-7 patches again in October 2014, I begged AJ for feedback and once again got nothing specific.[13] In desperation, I turned to IRC and was invited to participate in Wine Staging. They patiently provided specific, line-by-line feedback and even helped rewrite the code in a couple of places. They also accepted the code into their fork to get some real-world testing.[14] By the end of November 2014 (less than two months later!) the patchset was accepted into mainline Wine.[12] Wine has been one of the worst, if not the worst, open source project I have ever worked with. (I think it's a tie between Wine and Qt's QSerialPort module, but that's another story.) My UTF-7 experience illustrates exactly why we need Wine Staging or something like it: Without the detailed feedback that the Wine Staging developers provided, this feature would have never been accepted. Furthermore, I would not have learned the tips and tricks that I needed to know to write acceptable patches in the future. The idea that all discussion and development needs to happen on wine-devel and wine-patches in order to gain trust is BS. AJ was unwilling to take more than a glance at the UTF-7 patches until they had gone through probably a hundred iterations on GitHub and the wine-staging IRC channel. In my experience, AJ is far more likely to accept a patch done right the first time than a patch submitted 12 times because the submitter keeps finding problems with it. Alexandre, the best thing you could do differently is to provide verbose feedback on every patch. You have been working on Wine for a very long time and what is obvious to you is not obvious to everyone else. If you don't have time to write feedback yourself, ask another Wine developer to do it. Ideally we would have a list of trusted advisors for each program and DLL, people who are available to answer questions in their areas of expertise. It would also be a good idea to notice new developers, assign tutors to them, and have the tutors welcome the new developers and offer to answer questions. Please understand that I like Wine, I want to attract new Wine developers, and I want to see it become the most popular Windows API implementation. I hope you can take this email as constructive criticism without it negatively affecting my Julliard Rank™ ;-) -Alex [1] https://www.winehq.org/pipermail/wine-devel/2012-January/093705.html [2] https://www.winehq.org/pipermail/wine-devel/2012-May/095451.html [3] https://www.winehq.org/pipermail/wine-devel/2012-July/096531.html [4] https://www.winehq.org/pipermail/wine-devel/2012-August/096867.html [5] https://www.winehq.org/pipermail/wine-devel/2012-August/096872.html [6] https://www.winehq.org/pipermail/wine-devel/2012-September/096901.html [7] https://www.winehq.org/pipermail/wine-devel/2012-September/096910.html [8] https://www.winehq.org/pipermail/wine-devel/2012-December/097994.html [9] https://www.winehq.org/pipermail/wine-devel/2012-December/098015.html [10] https://www.winehq.org/pipermail/wine-devel/2012-December/098036.html [11] https://www.winehq.org/pipermail/wine-devel/2012-December/098051.html [12] https://source.winehq.org/git/wine.git/?a=search&h=HEAD&st=author&s=Alex+He… [13] https://www.winehq.org/pipermail/wine-devel/2014-October/105402.html [14] https://github.com/wine-compholio/wine-staging/commit/04467e7e68b12850349fb…

6 6

Re: d3dcompiler: Share the source with d3dcompiler_46
by Matteo Bruni 24 Jun '15

24 Jun '15

2015-06-24 12:15 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in > index 08c5145..41c98f7 100644 > --- a/dlls/d3dcompiler_46/Makefile.in > +++ b/dlls/d3dcompiler_46/Makefile.in > @@ -1,6 +1,24 @@ > MODULE = d3dcompiler_46.dll > +IMPORTS = dxguid uuid > +EXTRALIBS = $(LIBWPP) > +EXTRADEFS = -D_D3DCOMPILER_VER=46 That define isn't used yet, right? I guess you can keep it around but maybe call it D3D_COMPILER_VERSION since there is such a define in recent d3dcompiler.h from the SDK. Or just drop it for the time being and reintroduce it when there will be a need to distinguish the version we're compiling for from the shared code. Otherwise it looks fine to me. Maybe rename d3dcompiler_43_main.c to just main.c? That change can be a separate patch.

1 0

Re: [PATCH 1/2] msvcp90: Set _Locimp vtable in _Locimp ctors (Valgrind) (try2) (was: msvcp90: Call _Locimp vector dtor (Valgrind))
by Piotr Caban 24 Jun '15

24 Jun '15

On 06/24/15 16:46, Daniel Lehman wrote: > +DEFINE_RTTI_DATA0(locale__Locimp, 0, ".?AV_Locimp@locale@std@@") There should be: DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp@locale@std@@") Cheers, Piotr

1 0

Re: [PATCH] cmd: fix invalid "else if" execution
by Frédéric Delanoy 24 Jun '15

24 Jun '15

On Tue, Jun 23, 2015 at 11:33 PM, Thomas Faller <tfaller1(a)gmx.de> wrote: > > Fix for: https://bugs.winehq.org/show_bug.cgi?id=37478 > > --- > programs/cmd/builtins.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) You should add a test case. -- Frédéric Delanoy

1 0

Re: [PATCH 2/2] msvcp90: Copy name in _Getctype (Valgrind)
by Piotr Caban 24 Jun '15

24 Jun '15

On 06/23/15 22:57, 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); There should be size*sizeof(*name) in memcpy. Also please rename the variable to len if it's used to store length (or store buffer size in it). Thanks, Piotr

1 0

Re: [PATCH 1/2] msvcp90: Call _Locimp vector dtor (Valgrind)
by Piotr Caban 24 Jun '15

24 Jun '15

Hi, the bug is caused by incorrect vtable being set in locale__Locimp_ctor_transparent and locale__Locimp_copy_ctor functions. The locale_facet vtable is correct and should not be changed. Cheers, Piotr

1 0

Re: [PATCH 3/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 4).
by Stefan Dösinger 24 Jun '15

24 Jun '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-06-23 um 20:19 schrieb Aaryaman Vasishta: > + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, coop_level); > + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); As long as you're always passing coop_level = DDSCL_NORMAL I don't think there's a need for the parameter. > + if (coop_level & DDSCL_NORMAL) > + { > + IDirectDrawClipper *clipper; > + > + hr = IDirectDraw2_CreateClipper(ddraw, 0, &clipper, NULL); > + ok(SUCCEEDED(hr), "Failed to create clipper, hr %#x.\n", hr); > + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); > + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); > + hr = IDirectDrawSurface_SetClipper(surface, clipper); > + ok(SUCCEEDED(hr), "Failed to set surface clipper, hr %#x.\n", hr); > + IDirectDrawClipper_Release(clipper); > + } I wonder why the ddraw test is setting a clipper on the offscreen surface. It should not have an effect. Henri, do you remember why this is done? > + hr = IDirect3D2_QueryInterface(d3d2, &IID_IDirectDraw, (void**)&ddraw); Why aren't you using the existing ddraw1 interface variable? > + primary_surface_found = FALSE; > + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, > + NULL, NULL, surface_callback); > + ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr); > + ok(!primary_surface_found, "Primary surface shouldn't be created by CreateDeviceFromD3D.\n"); > + IDirectDraw_Release(ddraw); > + > + 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); I think here it would be interesting to confirm that the Z surface is the one created by create_device(). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVicS1AAoJEN0/YqbEcdMwYNkQAIJL8xzJEd4WjLNzIw8wIuq3 BZiLV8SZIVTlCgZERHQQ46CqtG1MZ4JdZEOvEQpw1pGK0Keq3xTgPE7LLgNZzXx6 fg0Xm1CT9MwWalbj31HelKMB7yHnxTNHhE2oDncDboITI26kxL46IdCsTwJZD9cc yg65kkluHAUyT3+7+k7FFu7ZP3mQUOxnim4YkI3jx48Ls6snhMz6RZwTygZdJXvR eQ0pD/tMdGN/wDBy+y+Dehn2yWScbRgoO1GCqOLH4/L6y8rlAdLMSMZv4HWVN74m cAvpxKC0nketkROouNkDcHrjEhFbL3DnBeNRfd5IfnORgHjwZipqqv7dXhGWELZL R7ZpjtLEzV5/dL2pDjZri3j6Xpi5vZRhlMdiKAvCcNNYfFtXJcZSwlK0AP8ek1SF Lhr3RiOmY0RQ7a2K0Z0UqXCNr+vibBEsfBLdqhuTsC4ipMSzygo0J9dCVIoM9VOl SqjtXo0N6YdzZR0IGpSDuE/uCy33vu1D4ykqyW7UBGkT2CUNTVxfUEPkERnr26E0 h11OrBrNKoNSlxaeg1IcVdh9iipabkAF+iL5XqDsXzT/45TrvBvKsYYL+eRSSbtE q94hxYKMupoIHFtsx62wwhVZUYsf/8x27662aDmY3LmixAb8iOR08lo2JhKczOSZ mootefOFvk8PZPkF5Z8G =Zo0P -----END PGP SIGNATURE-----

2 2

Re: [PATCH 2/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromSurface (try 4).
by Stefan Dösinger 24 Jun '15

24 Jun '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, One I don't like here is the hardcoded DDSCAPS_SYSTEMEMORY for the Z buffer. You need it on Windows because of the RGB device and Wine doesn't check, so it kinda works. But I recommend to do something like this: BOOL use_sysmem_zbuffer; ... hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2); hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface); hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds); hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); use_sysmem_zbuffer = desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY; ... /* Release everything */ /* Create new sysmem surface */ when creating the new Z buffer set DDSCAPS_SYSTEMMEMORY only if use_sysmem_zbuffer is true. Another thing to test: After destroying the d3drm device is the Z buffer removed from the surface when (a) d3drm created it and (b) you created it? Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVicXHAAoJEN0/YqbEcdMw73gP/3wLEdptNIWr2IFNXJHoSZ15 2g3annULMUw++NvXuBXY1RJdUiR0UQxbGyRNJtFzl8KN66lbl2DOY9/ePkgahIbB 0XKedAtS8F5zoLwRHrbZ/VGSI5Kv8ClHSi0F+jZ5Og9TvwqYKC40vNaBC2WXlSHL KSmOzilln0xDFPecaqyIwbLNO7y1DBnQ7sncLgGCuyxrWM8lK0vmXcAxubS5JyJJ Hd0chD6+EpjxisVWZUVNLFV1HEN9zyL6VDSYcJnNNp9ufGKh6wAoFcywx1vyQTsX tiicEYlW90rvhM2dIZ/m6EcJsR/n6E4iMlj2S4yq9Kc4jySMaC0bYa0B4vPQbbaj YUcQ10qmuH/saROVPjjwjT5O1xISVZ2OOlk3PQYbwVSa1afOMU0ZZu5xNYmkRJ71 21r9cBqePMtIzWixxq+5DiYIRaSDelODlGD8P+LdfYu51DZK3oi1GK0vwX46wHmX M6S6i583uj//ZaZAVG/iCkZ9IPrnkqUnWe8WVGqy1KKJ/e/goq8eQhK9bUHz0GCM BCaklF368VarJWQ0S2ggtdZ006cnc+aqOlfJTRA4UoSfQGU6ACne/blCeJBIGMwv 4mwtvNQvZIvoO6sUW+kmU7T6vCsyxVGfVq96csPbqNvSlidLl8H8IN7f8DK65feW w4s6zvEsdURxeHfcOUNL =bY5s -----END PGP SIGNATURE-----

2 2

Re: [2/2] msimtf: Add stub implementation for IActiveIMMMessagePumpOwner.
by Nikolay Sivov 24 Jun '15

24 Jun '15

On 24.06.2015 0:48, Thomas Faber wrote: > +static HRESULT WINAPI ActiveIMMApp_IActiveIMMMessagePumpOwner_QueryInterface(IActiveIMMMessagePumpOwner* iface, > + REFIID iid, LPVOID *ppvOut) > +{ > + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); > + return IActiveIMMApp_QueryInterface(&This->IActiveIMMApp_iface, iid, ppvOut); > +} It's usually up to author, but I'll still mention this - no need to prefix function names with ActiveIMMApp_ because there's no other IActiveIMMMessagePumpOwner implementation, so names won't collide. It would be nice to have a simple test too, to make sure QI supports this interface, but as we don't have tests dir at all for this module it could be a separate patch I guess.

2 1

Re: [1/2] dimm.idl: Add IActiveIMMMessagePumpOwner.
by Nikolay Sivov 24 Jun '15

24 Jun '15

What's a reason for having it declared like that: -- + HRESULT OnTranslateMessage([in] const struct tagMSG *pMsg); --- Why not use MSG*?

2 3

Re: d3dcompiler: Add D3DReadFileToBlob, D3DWriteBlobToFile, , D3DCompileFromFile, D3DCompile2 stubs
by Matteo Bruni 24 Jun '15

24 Jun '15

2015-06-23 10:41 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Currently the code for d3dcompiler_*dll's is in the _43 version. > > However these function belong in d3dcompiler_46+ > > So, > 1. Is it ok to use private functions? I don't know all the implications of that but it doesn't seem to be necessarily wrong. > If not, how should it be done? Keep in mind that d3d9, d3d10, x_input will > have the same issue at some point. Not sure what you mean with d3d9 here. Did you mean d3dx9? > 2. Could it be done like the msvrt* libraites? However since the structures > haven't changed between versions maybe this isn't the best way. There are / have been a few bugs reported for d3dx9 with applications failing to cope with forwarded functions (e.g. https://bugs.winehq.org/show_bug.cgi?id=21817) and I imagine similar problems might also happen with d3dcompiler so that would be a point in favor of this solution. Moreover, in general each native d3dcompiler_xx (AND each d3dx9_xx!) version has a separate copy of the HLSL compiler inside and each one has a different version of the compiler. That means you will get things like https://bugs.winehq.org/show_bug.cgi?id=33770#c7 unless we can generate different code for different d3dcompiler_xx.dll versions. Another one of those I know of is that functions inside ASCII effect files can be "overloaded" with multiple implementations for different shader versions. In older d3dx9 you specify the target version by spelling it out in the function definition, but that changed at some point and the older syntax just doesn't work on newer HLSL compiler versions. So I think this is the route we want to take eventually. Maybe your patch is fine for the time being though. > 3. Move the code the latest DLL. That would work but notice that the same thing might (will?) repeat after MS releases new versions of d3dcompiler_xx.dll with new exports. BTW, I should have asked this earlier: what do you need those newer d3dcompiler_xx.dlls for? AFAIU those versions > 43 are never installed in system32 and applications are supposed to just bring a copy in their application directory (e.g. see the "Redistribution" section in http://blogs.msdn.com/b/chuckw/archive/2012/05/07/hlsl-fxc-and-d3dcompile.a… or point 6c in https://msdn.microsoft.com/en-us/library/windows/desktop/ee663275%28v=vs.85…).

2 1

Re: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (try 4).
by Stefan Dösinger 23 Jun '15

23 Jun '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Looks pretty good, there are 2 minor issues left (see below) and 3 code style things: Am 2015-06-23 um 20:19 schrieb Aaryaman Vasishta: > +BOOL primary_surface_found = FALSE; Please make it static. Also no need to initialize global variables, they're set to zero by the compiler. (Same as static variables inside a function). > + if ((desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) == DDSCAPS_PRIMARYSURFACE) desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE is enough in this case as there's only one flag. > + clipper = context; > + ok(clipper == d3drm_clipper, "Expected clipper returned == %p, got %p.\n", clipper, d3drm_clipper); > + IDirectDrawClipper_Release(d3drm_clipper); ok(clipper == context, "..."); should work, no need to have an extra variable for this. > +static void test_create_device_from_clipper(void) > +{ This function tests IDirect3DRM2 / IDirect3DRMDevice2. Think about how you want to add version 1 and 3 tests. Either add them in the same function or create 3 test functions. I prefer the latter case, but then you may want to name them test_create_device_from_clipper{1,2,3} or similar. > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2); > + ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + todo_wine ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); > + todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); Please also show that the d3drm2 refcount is untouched. This also applies to patches 2 and 3. > + hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 16); > + ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr); Please use the current desktop width and height here (i.e., what was returned from GetDisplayMode earlier). Setting a lower resolution has the tendency to screw up window and desktop icon positioning. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVib/vAAoJEN0/YqbEcdMw8UoP+gLjxDhe3SjrslH3I0h3cM0M W9KbODhgTmn+C2j3a2rOXvbllAXkjAI9oSnbKp3msE4uJw7GT5QOx+y1828xVF54 RhxoQsYJuXAptAzzlwOS9Dpj5f8sebfj8AG3KENEeMBaKPJFnuER2AHD7o0Bl9Td LVXbSWjvkhsGIRSW2JWKVFQIRdCKaeiRciA0ScH/yQxxL0h/1BOdoLqzc5+Nv6wW /drwTUVR0MQrqzNt3qKPnhNNe2CXS7DQvc4KA1s0WsNxTbrl1orKXDclls1UhL5L iIIJtVF0H7jPE5kF5yVsW0uyjojNI7EnEbVtQQHecFV1UfLQQhykIbw3Vc/tg8Up lpkaEtQvSUYsJMIWKyG9nTAsoz1ZAeb8k97YH8SS/HtG3dZzOThLkPjfbpOPRxeK 07d2P+I4FkyXdiDNZ/dzXIuJUGoBriXM/rPJFqnHWrOm3Lor6GqhKXE+SxOpPeOA rUcVYfd/XEJPT+7PIOdeu/C9ldUPjVmV3BpWze0oXaj9noLJUWojk4E0emsazaUB bXXcJfj0r65SnFUUbxmwjZK50OdF36iku3Oohgl7kpmatWF3IN1g9BmgoDnXuHi8 8xVAi+6OQm7+oU04kZi/4KHPAg41FcMBnxtuxYBASn0NZvaY002ZMWpfCAbdV6pX LouyQXU2ct2Y5h78u9FG =F7Cf -----END PGP SIGNATURE-----

2 1

Re: [PATCH 2/2] user32: Erase backgrounds of owner-drawn buttons with the default color.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Alex Henrie <alexhenrie24(a)gmail.com> writes: > @@ -268,13 +268,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, > { > HDC hdc = (HDC)wParam; > RECT rc; > - HBRUSH hBrush; > - HWND parent = GetParent(hWnd); > - if (!parent) parent = hWnd; > - hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORBTN, (WPARAM)hdc, (LPARAM)hWnd); > - if (!hBrush) /* did the app forget to call defwindowproc ? */ > - hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORBTN, > - (WPARAM)hdc, (LPARAM)hWnd); > + HBRUSH hBrush = GetSysColorBrush(COLOR_BTNFACE); This would need a more convincing test. -- Alexandre Julliard julliard(a)winehq.org

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel