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

Re: [PATCH 3/6] ddraw/tests: Rewrite GetDCFormatTest().
by Marvin 10 Apr '16

10 Apr '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22022 Your paranoid android. === w864 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH] d3d11: Support NULL DepthStecilView pointer in ClearDepthStencilView
by Henri Verbeet 10 Apr '16

10 Apr '16

On 10 April 2016 at 12:15, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > --- > dlls/d3d11/device.c | 3 +++ > dlls/d3d11/tests/d3d11.c | 3 +++ > 2 files changed, 6 insertions(+) > Before you resend this with the proper sign-off, could you please check d3d10 and the other clears (uav, rtv) as well?

1 0

Re: [PATCH 2/2] d3drm/tests: Add tests for IDirect3DRMObject::Add/DeleteDestroyCallback (v2).
by Stefan Dösinger 09 Apr '16

09 Apr '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, A few questions / suggestions: *) What happens if you register the same callback with different context pointers? *) The test already does some testing of the call order. I think you could extend it a bit if you store arrays of expected callback functions and context pointers in the structure and compare them when the callbacks are invoked. *) Does DeleteDestroyCallback return an error when no matching callback is found? *) The last one is mostly curiosity / a bad feeling: Is there a difference between callbacks added with IDirect3DRMObject (and its derived interfaces) and IDirect3DRMObject2? I am asking because Object2 is a separate interface and might be implemented in a separate object and then aggregated. If Microsoft screwed up (they never do that, right? ;-) ) then it'll have its own list of added callbacks... Stefan Am 2016-04-03 um 20:42 schrieb Aaryaman Vasishta: > v2: Fixed commit message. > > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/tests/d3drm.c | 203 ++++++++++++++++++----------------------------- > 1 file changed, 79 insertions(+), 124 deletions(-) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 1abfed3..1f197b8 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1219,6 +1219,7 @@ static void test_Frame(void) > struct destroy_context > { > IDirect3DRMObject *obj; > + unsigned int test_idx; > int called; > }; > > @@ -1238,6 +1239,81 @@ static void CDECL destroy_callback1(IDirect3DRMObject *obj, void *arg) > ctxt->called++; > } > > +static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID iid) > +{ > + struct destroy_context context; > + IDirect3DRMObject *obj; > + IUnknown *unknown; > + IDirect3DRM *d3drm; > + HRESULT hr; > + > + hr = Direct3DRMCreate(&d3drm); > + ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface (hr = %x).\n", test_idx, hr); > + > + hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown); > + ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr); > + hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + IUnknown_Release(unknown); > + > + context.called = 0; > + context.test_idx = test_idx; > + context.obj = obj; > + > + hr = IDirect3DRMObject_AddDestroyCallback(obj, NULL, &context); > + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE (hr = %x).\n", test_idx, hr); > + > + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + > + /* same callback added twice */ > + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + > + hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, NULL); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + > + hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, &context); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + > + /* add one more */ > + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + > + hr = IDirect3DRMObject_DeleteDestroyCallback(obj, NULL, NULL); > + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE (hr = %x).\n", test_idx, hr); > + > + context.called = 0; > + IDirect3DRMObject_Release(obj); > + ok(context.called == 3, "Test %u: got %d, expected 3.\n", test_idx, context.called); > + > + /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */ > + hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown); > + ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr); > + hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + IUnknown_Release(unknown); > + > + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + > + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + > + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + > + hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback, &context); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + > + context.called = 0; > + hr = IDirect3DRMObject_QueryInterface(obj, &IID_IDirect3DRMObject, (void**)&context.obj); > + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); > + IDirect3DRMObject_Release(context.obj); > + IUnknown_Release(unknown); > + ok(context.called == 2, "Test %u: got %d, expected 2.\n", test_idx, context.called); > +} > + > static void test_object(void) > { > static const struct > @@ -1292,6 +1368,9 @@ static void test_object(void) > ref2 = get_refcount((IUnknown *)d3drm1); > ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > > + /* test Add/Destroy callbacks */ > + test_destroy_callback(i, tests[i].clsid, tests[i].iid); > + > hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); > ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); > ref2 = get_refcount((IUnknown *)d3drm1); > @@ -1325,7 +1404,6 @@ static void test_object(void) > > static void test_Viewport(void) > { > - struct destroy_context context; > IDirectDrawClipper *pClipper; > HRESULT hr; > IDirect3DRM *d3drm; > @@ -1411,129 +1489,6 @@ static void test_Viewport(void) > ok(data == 1, "got %x\n", data); > IDirect3DRMViewport2_Release(viewport2); > > - /* destroy callback */ > - context.called = 0; > - hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&context.obj); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - IDirect3DRMObject_Release(context.obj); > - > - hr = IDirect3DRMViewport_AddDestroyCallback(viewport, NULL, &context); > - ok(hr == D3DRMERR_BADVALUE, "expected D3DRMERR_BADVALUE (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - /* same callback added twice */ > - hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport_DeleteDestroyCallback(viewport, destroy_callback1, NULL); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport_DeleteDestroyCallback(viewport, destroy_callback1, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - /* add one more */ > - hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback1, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport_DeleteDestroyCallback(viewport, NULL, NULL); > - ok(hr == D3DRMERR_BADVALUE, "expected D3DRM_BADVALUE (hr = %x)\n", hr); > - > - context.called = 0; > - IDirect3DRMViewport_Release(viewport); > - ok(context.called == 3, "got %d, expected 3\n", context.called); > - > - /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */ > - hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); > - ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback1, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport_AddDestroyCallback(viewport, destroy_callback, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport_DeleteDestroyCallback(viewport, destroy_callback, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - context.called = 0; > - hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&context.obj); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - IDirect3DRMObject_Release(context.obj); > - IDirect3DRMViewport_Release(viewport); > - ok(context.called == 2, "got %d, expected 2\n", context.called); > - > - /* destroy from Viewport2 */ > - hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); > - ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - IDirect3DRMViewport_Release(viewport); > - > - context.called = 0; > - hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&context.obj); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - IDirect3DRMObject_Release(context.obj); > - > - hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, NULL, &context); > - ok(hr == D3DRMERR_BADVALUE, "expected D3DRMERR_BADVALUE (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - /* same callback added twice */ > - hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport2_DeleteDestroyCallback(viewport2, destroy_callback1, NULL); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport2_DeleteDestroyCallback(viewport2, destroy_callback1, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - /* add one more */ > - hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback1, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport2_DeleteDestroyCallback(viewport2, NULL, NULL); > - ok(hr == D3DRMERR_BADVALUE, "expected D3DRM_BADVALUE (hr = %x)\n", hr); > - > - context.called = 0; > - IDirect3DRMViewport2_Release(viewport2); > - ok(context.called == 3, "got %d, expected 3\n", context.called); > - > - /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */ > - hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); > - ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - IDirect3DRMViewport_Release(viewport); > - > - hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback1, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport2_AddDestroyCallback(viewport2, destroy_callback, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - hr = IDirect3DRMViewport2_DeleteDestroyCallback(viewport2, destroy_callback, &context); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - > - context.called = 0; > - hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&context.obj); > - ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > - IDirect3DRMObject_Release(context.obj); > - IDirect3DRMViewport2_Release(viewport2); > - ok(context.called == 2, "got %d, expected 2\n", context.called); > - > IDirect3DRMFrame_Release(frame); > IDirect3DRMDevice_Release(device); > IDirectDrawClipper_Release(pClipper); > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXAXjPAAoJEN0/YqbEcdMwaCAP/R0jPTn4638NJY+4kpdtREkT pmpe3+RAx7XQXqJd7baFP1Ge5A8+UyH0GC5jraqneelZ4tjIePY9weFtTI0dPlbO W5Ptty2lIqI5e79S9BC9RYn6HOVVcLqWZTbArBwfRLWCDmHFDKIvLzzg1CmgVoZQ rL8pPiqzE0qanj7UnAZXt8/N5Dz8Uy3aY2tXimnn/ao/ET4Tpi2rp6CRuFGXo71I n7ydIj+spggC6GSk1HmOiAsHLOoKwmmxd83XOrQE+awlYJVxe/jrKZu6Du/29eYa /J+xfD9iHvm2oXAvQKNy8Tca3KaynCTB0aLPzZzZ1E/UXZsI3CPYWeEzXNxkyvQv yrSVRWyUjhAegPB3DUB4JWZq8sDiEjZw6y8hRwibN3NCGTZYtjsK2AuFAK5zUmlH H4k6BFtYRyVNvOUARA5UHO+bJ9wzr0nak14DZbiWoDYISLFKm77nieWR4EU03TNh cZWOpQde/CngNRXIr1mth/WAabPm8WN1IXRcayDAh5GfTC3bVLiRvrjT/vlpm8AH G+9qVEUTmH7HRpSXJpQ4vjAnZJkpJa/ixJazz9cxcNYucPD1LMg/ZbvTGLjKRFhF 1yR9UWOFKBAZyKolehBwRuDFFzw0cXpsUJW9gW/CFyoxtoL6qV+BmmZLN2Gy6Yoe XQJAPbjrbZ4oxHyyGsGp =BxYw -----END PGP SIGNATURE-----

2 2

Re: How to change Wine DLL search path for "built-in" DLLs?
by Vladimir Panteleev 09 Apr '16

09 Apr '16

Thanks Theodore. As I have mentioned, I have already tried DLL overrides, which did not provide the desired effect. Also, as I have mentioned, I'm looking for a programmatic solution, without involving user intervention. On Fri, Apr 8, 2016 at 11:21 PM, Vladimir Panteleev <vladimir(a)thecybershadow.net> wrote: > Thanks Theodore. As I have mentioned, I have already tried DLL > overrides, which did not provide the desired effect. Also, as I have > mentioned, I'm looking for a programmatic solution, without involving > user intervention. > > On Fri, Apr 8, 2016 at 11:19 PM, Theodore Dubois <tblodt(a)icloud.com> wrote: >> Use DLL overrides. Open winecfg, go to the Libraries tab, type msvcr120, click add, click edit, click native, click ok. >> >> ~Theodore >> >>> On Apr 8, 2016, at 2:52 PM, Vladimir Panteleev <vladimir(a)thecybershadow.net> wrote: >>> >>> (reposting from wine-users, which seems to be dead) >>> >>> I'm trying to get the VS2012 C++ compiler (cl.exe) running under Wine >>> - stand-alone, as a component for a different larger project. The >>> project works fine on Windows without affecting any global system >>> settings or files (i.e. it unpacks DLLs etc. to private subdirs >>> instead of installing them system-wide). I'd like it to "just work" >>> under Wine as well, without user intervention or persistent >>> modifications to bottle settings or system files. >>> >>> Wine has a msvcr120.dll, however it is incomplete, at least as far as >>> cl.exe is concerned: >>> >>> wine: Call from 0x7b44ee37 to unimplemented function >>> msvcr120.dll.??0reader_writer_lock(a)Concurrency@@QEAA(a)XZ, aborting >>> Internal Compiler Error in >>> Z:\home\vladimir\work\Digger\work-wine\dl\vs2013-community\Program >>> Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\cl.exe. You >>> will be prompted to send an error report to Microsoft later. >>> >>> The problem is that it attempts to load its builtin DLL even if I >>> place the native Microsoft's DLL in PATH before system32/syswow64. >>> WINEDLLPATH seems to have no effect, and adding a DLL override has no >>> effect other than changing whether it loads Wine's DLL on fails to >>> load a DLL at all (even though it's in PATH!). Yes, the model >>> (bitness) is correct. >>> >>> I remember reading somewhere that Wine uses the value of PATH from the >>> registry. I guess I could also just delete or overwrite Wine's DLL in >>> system32/syswow64. But is it possible to change the DLL search path >>> for one Wine invocation, without any permanent modifications to the >>> bottle? >>> >>> Partially related, but I noticed that Wine does not skip over DLLs of >>> wrong bitness as Windows does. Instead, the program fails to >>> initialize. This means you can't add 32-bit and 64-bit DLL directories >>> to PATH and let the programs' bitness sort out which to use. That's >>> definitely a bug I guess. >>> >>> >>

2 2

Fwd: How to change Wine DLL search path for "built-in" DLLs?
by Vladimir Panteleev 08 Apr '16

08 Apr '16

(reposting from wine-users, which seems to be dead) I'm trying to get the VS2012 C++ compiler (cl.exe) running under Wine - stand-alone, as a component for a different larger project. The project works fine on Windows without affecting any global system settings or files (i.e. it unpacks DLLs etc. to private subdirs instead of installing them system-wide). I'd like it to "just work" under Wine as well, without user intervention or persistent modifications to bottle settings or system files. Wine has a msvcr120.dll, however it is incomplete, at least as far as cl.exe is concerned: wine: Call from 0x7b44ee37 to unimplemented function msvcr120.dll.??0reader_writer_lock(a)Concurrency@@QEAA(a)XZ, aborting Internal Compiler Error in Z:\home\vladimir\work\Digger\work-wine\dl\vs2013-community\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\cl.exe. You will be prompted to send an error report to Microsoft later. The problem is that it attempts to load its builtin DLL even if I place the native Microsoft's DLL in PATH before system32/syswow64. WINEDLLPATH seems to have no effect, and adding a DLL override has no effect other than changing whether it loads Wine's DLL on fails to load a DLL at all (even though it's in PATH!). Yes, the model (bitness) is correct. I remember reading somewhere that Wine uses the value of PATH from the registry. I guess I could also just delete or overwrite Wine's DLL in system32/syswow64. But is it possible to change the DLL search path for one Wine invocation, without any permanent modifications to the bottle? Partially related, but I noticed that Wine does not skip over DLLs of wrong bitness as Windows does. Instead, the program fails to initialize. This means you can't add 32-bit and 64-bit DLL directories to PATH and let the programs' bitness sort out which to use. That's definitely a bug I guess.

2 2

Re: [PATCH 1/4] dsound: Rework ugly mixer logic
by Henri Verbeet 08 Apr '16

08 Apr '16

On 8 April 2016 at 20:37, Andrew Eikum <aeikum(a)codeweavers.com> wrote: > From: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> > > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > --- > dlls/dsound/dsound.c | 1 - > dlls/dsound/dsound_main.c | 6 -- > dlls/dsound/dsound_private.h | 6 +- > dlls/dsound/mixer.c | 252 +++++++++++-------------------------------- > dlls/dsound/primary.c | 107 ++++++++---------- > 5 files changed, 108 insertions(+), 264 deletions(-) > You're the one that has to maintain this, so I don't care all too much, but this looks like it's doing a bunch of different things under a pretty vague commit message.

2 1

Winegstreamer entry on Wine FAQ Wiki Page
by NP-Hardass 08 Apr '16

08 Apr '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hello, About a month ago, I created a Wine Wiki account and requested that it be activated, explicitly so that I could add an entry to the FAQ page [1]. After going to reference this new entry to someone today, I noticed that my changes were reverted soon after my submission and the page was subsequently locked [2]. This submission was made after consulting wine developer, Sebastian Lackner. I think this information would be very useful to users starting to adopt Winegstreamer, now that Andrew Eikum has updated it to gstreamer 1.0 and it is functioning again. I'd like to inquire why the change was reverted, if my content is deemed unnecessary, and if not, why it was not moved elsewhere. - -- NP-Hardass Gentoo Wine maintainer [1] https://wiki.winehq.org/index.php?title=FAQ [2] https://wiki.winehq.org/index.php?title=FAQ&action=history -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXBgQkAAoJEBzZQR2yrxj7Q6gP/27bv0ZQSiRYVgaoWu4SUOsu TXeZyPLTbKs+KbYuScyMmE1fv8d6FetSNdubUw0ZYKyryu7qUqm/19hhhrs3T6Oo j7hXa7QPmsejtRkM3kCWNItPS6M5olEEqBJq2Ics84DrfFiEaUxPdeJwFgiJLwvX erNgf5600OJHzhDxSCa0UfMdEBWBs7DsdVFncgAWyv3s4dnp4L7aaYGgv2vlpkXI QrhbUCzqWy5grjf9HOsmix4Zz9SSwk6xvEMBjRi9RHiAAOTx2f9Gussiwq2N1Dbe VYoZpxtGaEFt+UKtNJds5vZXaSQlWFg+IT8aeh/VglJJp7avM8Hi6gGFQ22CvwUr M31oU3t/adH3EzyKC0eVBrNjiicnRyzFbrTrkWwokKV+LjV/C8/SfexzHqzn40Vi T4yQrMBoHZcjT6YhLXFjVIE4RSIXbmT5TrCA6oAqKgbueGcfiEvLaz8ti/XUnsyO fgiCNrdSV1hPvAi+5yI2l+BE9xxxhrS2DOXyJlxYMflxXctbRnQ0KFjBzs24x4Qj CXXrXavrP8MhMoemzMuBZMEt7hui0+z4WUGZdjc+oT0Cso8VLrdnE93wJdBJOlbD G/K3cQb6hNr387pKcUXTEq1KDTyrH5LCzxOAjS4TOuhFti8jMbSdKRea9flfR2bp pVoJARXzVNeQla7n7+ox =3Bex -----END PGP SIGNATURE-----

4 7

Re: [PATCH 2/2] cmd: Add support for || and &&.
by Sebastian Lackner 07 Apr '16

07 Apr '16

On 07.04.2016 22:12, Qian Hong wrote: > Slightly improved based on Mikhail Bystryantsev's patch, add support for those built-in commands which does not change %ERRORLEVEL%. > > Signed-off-by: Qian Hong <qhong(a)codeweavers.com> > --- > programs/cmd/builtins.c | 14 +++++++++++--- > programs/cmd/tests/test_builtins.cmd | 13 +++++++++++++ > programs/cmd/tests/test_builtins.cmd.exp | 13 ++++++++++++- > programs/cmd/tests/test_cmdline.cmd | 20 ++++++++++++++++++++ > programs/cmd/tests/test_cmdline.cmd.exp | 22 ++++++++++++++++++++++ > programs/cmd/wcmd.h | 1 + > programs/cmd/wcmdmain.c | 26 ++++++++++++++++++++++++-- > 7 files changed, 103 insertions(+), 6 deletions(-) > Has it really something to do with builtin-commands which do not change %ERRORLEVEL%? I think the tests only cover one of those commands, a couple of additional tests would probably not hurt. The lack of tests is also the reason why I haven't merged this into Staging yet. If this turns out to be right way to solve it, I would suggest to define a function check_errorlevel() which checks 'errorlevel' and 'changed' at once.

1 0

Re: [PATCH 2/2] cmd: Add support for || and &&.
by Qian Hong 07 Apr '16

07 Apr '16

I should add "From Mikhail Bystryantsev." in commit message, but something was wrong with my mail client. (Could you please use git send-email to send patches in the future? --- from Henri. :D) On Fri, Apr 8, 2016 at 4:12 AM, Qian Hong <qhong(a)codeweavers.com> wrote: > Slightly improved based on Mikhail Bystryantsev's patch, add support for > those built-in commands which does not change %ERRORLEVEL%. > > Signed-off-by: Qian Hong <qhong(a)codeweavers.com> > --- > programs/cmd/builtins.c | 14 +++++++++++--- > programs/cmd/tests/test_builtins.cmd | 13 +++++++++++++ > programs/cmd/tests/test_builtins.cmd.exp | 13 ++++++++++++- > programs/cmd/tests/test_cmdline.cmd | 20 ++++++++++++++++++++ > programs/cmd/tests/test_cmdline.cmd.exp | 22 ++++++++++++++++++++++ > programs/cmd/wcmd.h | 1 + > programs/cmd/wcmdmain.c | 26 ++++++++++++++++++++++++-- > 7 files changed, 103 insertions(+), 6 deletions(-) > > > > > -- Regards, Qian Hong - http://www.codeweavers.com

1 0

Re: [PATCH 1/2] user32/tests: Message filtering tests for broadcast messages
by Marvin 07 Apr '16

07 Apr '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21970 Your paranoid android. === w864 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

2 1