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

Windows Service + CreateWindowEx
by Robert D Kocisko 19 Aug '15

19 Aug '15

I am attempting to make some tweaks to Wine so it can run a (3rd party) windows service that uses CreateWindowEx, and I'm not sure whether I'm on the right track or not. What is happening is that when the service calls CreateWindowEx, I get this error: Application tried to create a window, but no driver could be loaded. The explorer process failed to start. I traced it down to the following source code line in wine/dlls/user32/driver.c: UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); What is happening is that guid_atom returns 0 which ultimately ends up disallowing any connection to a graphics driver. Now it seems to me that the explorer.exe process is supposed to be providing a desktop window and setting that atom value. But if I try to run wine explorer.exe it doesn't make any difference. I am keeping Wine alive by running wine notepad & and I am also running wine services to make sure that the SCM is alive and available for the services. OS: Elementary OS Freya 0.3 Is this something that Wine should support? I have had success getting other 3rd party services to work so it seems that it shouldn't be too difficult to make this work. Could anyone provide guidance on how I should proceed to tweak the code to support this? Or if this is going to be a huge project to make this work I would appreciate knowing that too :). Thanks much, Bob Kocisko

2 2

Re: [PATCH 3/4] d3dx9/tests: Add tests for DDS file format size validation.
by Matteo Bruni 19 Aug '15

19 Aug '15

2015-08-16 22:28 GMT+02:00 Józef Kucia <jkucia(a)codeweavers.com>: > --- > dlls/d3dx9_36/tests/surface.c | 172 ++++++++++++++++++++++++++++-------------- > 1 file changed, 116 insertions(+), 56 deletions(-) > > diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c > index 7a4dff8..9da3628 100644 > --- a/dlls/d3dx9_36/tests/surface.c > +++ b/dlls/d3dx9_36/tests/surface.c > + { { 32, DDS_PF_RGB, 0, 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000 }, DDS_MIPMAPCOUNT, 256, 256, 0, 0, 196607, { D3DXERR_INVALIDDATA, 0 } }, > + { { 32, DDS_PF_RGB, 0, 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000 }, DDS_MIPMAPCOUNT, 256, 256, 0, 0, 196608, { D3D_OK, 1 } }, I would add another test for DDS_MIPMAPCOUNT with a count of 0 but a larger data size. I wonder if 0 actually means something like "as many levels as they fit in the file".

1 0

Re: [1/2] kernel32/tests: Fix compilation with PSDK.
by Michael Stefaniuc 19 Aug '15

19 Aug '15

Hello Dmitry, On 08/19/2015 06:23 AM, Dmitry Timoshkov wrote: > --- > dlls/kernel32/tests/process.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c > index 113ec35..a8abdc1 100644 > --- a/dlls/kernel32/tests/process.c > +++ b/dlls/kernel32/tests/process.c > @@ -2302,7 +2302,7 @@ static void test_TerminateJobObject(void) > > static void test_QueryInformationJobObject(void) > { > - char buf[FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[5])]; > + char buf[sizeof(JOBOBJECT_BASIC_PROCESS_ID_LIST) + sizeof(ULONG_PTR) * 5]; this change looks odd. Using offsetof (or FIELD_OFFSET) is the standard Wine way of getting the size of a struct with a variable length array. I have done quite a few patches on Alexandre's request that replace sizeof+sizeof*x with offsetof. E.g. 14e20162f9448a648f3973a86e03aea17387c040 Last but not least you're not allocating the same amount of memory: offsetof(struct, field[n]) == sizeof(struct) + (n-1) * sizeof(field) bye michael

2 1

Re: [1/3] comdlg32: Implement SetControlItemState for menu controls.
by Dmitry Timoshkov 19 Aug '15

19 Aug '15

Vincent Povirk <madewokherd(a)gmail.com> wrote: > This required some rethinking because menus and combo boxes don't > provide a way to "hide" items, just remove them, and native always > shows items in the order they were added even when hidden and shown. You can always add an item at a particular position. That should allow implementing hide/show for menus and combo/listboxes pretty easily using standard functionality. -- Dmitry.

2 1

Re: [PATCH 5/5] d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromClipper.
by Marvin 18 Aug '15

18 Aug '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=16135 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 4/5] d3drm: Implement IDirect3DRMDevice*::GetDirect3DDevice (resend).
by Marvin 18 Aug '15

18 Aug '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=16134 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/5] d3drm: Implement IDirect3DRM::CreateDeviceFromClipper.
by Marvin 18 Aug '15

18 Aug '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=16133 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 5/5] d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromClipper.
by Aaryaman Vasishta 18 Aug '15

18 Aug '15

Please ignore this patchset. Just realized this patchset was already committed 13 hours ago. Is the bot on IRC not working? Cheers, Jam On Wed, Aug 19, 2015 at 12:17 AM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > --- > dlls/d3drm/d3drm.c | 54 > +++++++++++++++++++++++++++++++++++++++++------- > dlls/d3drm/tests/d3drm.c | 36 ++++++++++++++++---------------- > 2 files changed, 64 insertions(+), 26 deletions(-) > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index e4cc4fa..61d0a25 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -697,18 +697,24 @@ static HRESULT WINAPI > d3drm2_CreateDeviceFromClipper(IDirect3DRM2 *iface, > IDirectDrawClipper *clipper, GUID *guid, int width, int height, > IDirect3DRMDevice2 **device) > { > - struct d3drm_device *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); > + IDirect3DRMDevice3 *device3; > HRESULT hr; > - FIXME("iface %p, clipper %p, guid %s, width %d, height %d, device > %p.\n", > + > + TRACE("iface %p, clipper %p, guid %s, width %d, height %d, device > %p.\n", > iface, clipper, debugstr_guid(guid), width, height, device); > > - hr = d3drm_device_create(&object); > + if (!device) > + return D3DRMERR_BADVALUE; > + *device = NULL; > + hr = IDirect3DRM3_CreateDeviceFromClipper(&d3drm->IDirect3DRM3_iface, > clipper, guid, width, height, &device3); > if (FAILED(hr)) > return hr; > > - *device = IDirect3DRMDevice2_from_impl(object); > + hr = IDirect3DRMDevice3_QueryInterface(device3, > &IID_IDirect3DRMDevice2, (void**)device); > + IDirect3DRMDevice3_Release(device3); > > - return D3DRM_OK; > + return hr; > } > > static HRESULT WINAPI d3drm2_CreateTextureFromSurface(IDirect3DRM2 *iface, > @@ -1103,18 +1109,50 @@ static HRESULT WINAPI > d3drm3_CreateDeviceFromClipper(IDirect3DRM3 *iface, > IDirectDrawClipper *clipper, GUID *guid, int width, int height, > IDirect3DRMDevice3 **device) > { > + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); > struct d3drm_device *object; > + IDirectDraw *ddraw; > + IDirectDrawSurface *render_target; > HRESULT hr; > - FIXME("iface %p, clipper %p, guid %s, width %d, height %d, device > %p.\n", > + > + TRACE("iface %p, clipper %p, guid %s, width %d, height %d, device > %p.\n", > iface, clipper, debugstr_guid(guid), width, height, device); > > + if (!device) > + return D3DRMERR_BADVALUE; > + *device = NULL; > + > + if (!clipper || !width || !height) > + return D3DRMERR_BADVALUE; > + > + hr = DirectDrawCreate(NULL, &ddraw, NULL); > + if (FAILED(hr)) > + return hr; > + > hr = d3drm_device_create(&object); > if (FAILED(hr)) > + { > + IDirectDraw_Release(ddraw); > return hr; > + } > > - *device = IDirect3DRMDevice3_from_impl(object); > + hr = d3drm_device_create_surfaces_from_clipper(object, ddraw, > clipper, width, height, &render_target); > + if (FAILED(hr)) > + { > + IDirectDraw_Release(ddraw); > + d3drm_device_destroy(object); > + return hr; > + } > > - return D3DRM_OK; > + hr = d3drm_device_init(object, 3, &d3drm->IDirect3DRM_iface, ddraw, > render_target); > + IDirectDraw_Release(ddraw); > + IDirectDrawSurface_Release(render_target); > + if (FAILED(hr)) > + d3drm_device_destroy(object); > + else > + *device = IDirect3DRMDevice3_from_impl(object); > + > + return hr; > } > > static HRESULT WINAPI d3drm3_CreateShadow(IDirect3DRM3 *iface, IUnknown > *object, IDirect3DRMLight *light, > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index c797ccd..2d25bf3 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -2134,7 +2134,7 @@ static void test_create_device_from_clipper2(void) > IDirect3DRM2 *d3drm2 = NULL; > IDirectDraw *ddraw = NULL; > IUnknown *unknown = NULL; > - IDirect3DRMDevice2 *device2 = NULL; > + IDirect3DRMDevice2 *device2 = (IDirect3DRMDevice2 *)0xdeadbeef; > IDirect3DDevice2 *d3ddevice2 = NULL; > IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; > IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; > @@ -2164,24 +2164,24 @@ static void test_create_device_from_clipper2(void) > 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 (SUCCEEDED(hr)) > - IDirect3DRMDevice2_Release(device2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", > device2); > > /* If NULL is passed for clipper, CreateDeviceFromClipper returns > D3DRMERR_BADVALUE */ > hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 300, > 200, &device2); > - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > - if (SUCCEEDED(hr)) > - IDirect3DRMDevice2_Release(device2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, > 300, 200, NULL); > + 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); > + 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); > + 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); > @@ -2322,7 +2322,7 @@ static void test_create_device_from_clipper3(void) > IDirect3DRM3 *d3drm3 = NULL; > IDirectDraw *ddraw = NULL; > IUnknown *unknown = NULL; > - IDirect3DRMDevice3 *device3 = NULL; > + IDirect3DRMDevice3 *device3 = (IDirect3DRMDevice3 *)0xdeadbeef; > IDirect3DDevice2 *d3ddevice2 = NULL; > IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; > IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; > @@ -2352,24 +2352,24 @@ static void test_create_device_from_clipper3(void) > ref2 = get_refcount((IUnknown *)d3drm3); > > hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, > 0, 0, &device3); > - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > - if (SUCCEEDED(hr)) > - IDirect3DRMDevice3_Release(device3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", > device3); > > /* If NULL is passed for clipper, CreateDeviceFromClipper returns > D3DRMERR_BADVALUE */ > hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 300, > 200, &device3); > - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > - if (SUCCEEDED(hr)) > - IDirect3DRMDevice3_Release(device3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + > + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, > 300, 200, NULL); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > > hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, > 300, 200, &device3); > ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 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); > + ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", > ref1, ref3); > ref3 = get_refcount((IUnknown *)d3drm3); > ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = > %u.\n", ref2, ref3); > cref2 = get_refcount((IUnknown *)clipper); > - todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , > cref2 = %u.\n", cref1, cref2); > + 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 = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); > -- > 2.3.2 (Apple Git-55) > >

2 2

Re: d3drm: Implement GetDirect3DDevice
by Marvin 18 Aug '15

18 Aug '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=16107 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: d3drm: Implement GetDirect3DDevice2.
by Marvin 18 Aug '15

18 Aug '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=16106 Your paranoid android. === build (build) === Patch failed to apply

1 0