March 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Get resource info from the rendertarget view in draw_primitive().
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 9083addc6a49e64ea011b53ce6ce06fc3e0d8181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9083addc6a49e64ea011b53ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 6 20:59:48 2016 +0100 wined3d: Get resource info from the rendertarget view in draw_primitive(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ff62850..c95f92d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -622,17 +622,19 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { - struct wined3d_surface *target = wined3d_rendertarget_view_get_surface(device->fb.render_targets[i]); - if (target && target->resource.format->id != WINED3DFMT_NULL) + struct wined3d_rendertarget_view *rtv = device->fb.render_targets[i]; + struct wined3d_surface *target = wined3d_rendertarget_view_get_surface(rtv); + + if (target && rtv->format->id != WINED3DFMT_NULL) { if (state->render_states[WINED3D_RS_COLORWRITEENABLE]) { - surface_load_location(target, context, target->container->resource.draw_binding); - surface_invalidate_location(target, ~target->container->resource.draw_binding); + surface_load_location(target, context, rtv->resource->draw_binding); + surface_invalidate_location(target, ~rtv->resource->draw_binding); } else { - wined3d_surface_prepare(target, context, target->container->resource.draw_binding); + wined3d_surface_prepare(target, context, rtv->resource->draw_binding); } } }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_device_set_cursor_properties ().
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 1e78dd31979937862a66ac35ebcc79ee824603c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e78dd31979937862a66ac35e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 6 20:59:46 2016 +0100 wined3d: Get resource info from the texture in wined3d_device_set_cursor_properties(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ded1229..a724659 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4296,10 +4296,10 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device device->cursor_texture = NULL; } - if (cursor_image->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) + if (texture->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) { - WARN("Surface %p has an invalid format %s.\n", - cursor_image, debug_d3dformat(cursor_image->resource.format->id)); + WARN("Texture %p has invalid format %s.\n", + texture, debug_d3dformat(texture->resource.format->id)); return WINED3DERR_INVALIDCALL; }

1 0

André Hentschel : wrc: Remove getopt prototype.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 0beb178a2e1bac0efb774823567268cb75b0eaa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0beb178a2e1bac0efb7748235… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 4 19:07:18 2016 +0100 wrc: Remove getopt prototype. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/wrc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 15326ee..ea8bfe0 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -162,7 +162,6 @@ int parser_debug, yy_flex_debug; resource_t *resource_top; /* The top of the parsed resources */ -int getopt (int argc, char *const *argv, const char *optstring); static void cleanup_files(void); static void segvhandler(int sig);

1 0

Alexandre Julliard : Wine release 1.9.5
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: website Branch: master Commit: 041a4da6f88aa5b561e65fc6887572930cd20aa5 URL: http://source.winehq.org/git/website.git/?a=commit;h=041a4da6f88aa5b561e65f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 5 00:48:44 2016 +0900 Wine release 1.9.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016030501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016030501.xml b/news/en/2016030501.xml new file mode 100644 index 0000000..750ff31 --- /dev/null +++ b/news/en/2016030501.xml @@ -0,0 +1,16 @@ +<news> +<date>March 5, 2016</date> +<title>Wine 1.9.5 Released</title> +<body> + The Wine development release 1.9.5 is now available. + <a href="{$root}/announce/1.9.5">What's new</a> in this release: +<ul> + <li>New version of the Mono engine, with 64-bit support.</li> + <li>Beginnings of the WineD3D command stream.</li> + <li>Support for effect states in Direct3DX.</li> + <li>Drag & drop improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Józef Kucia : d3d11: Trace actual swapchain pointer in D3D11CreateDeviceAndSwapChain().
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: cd8be0b43181ee05de27d5322c86063d49a2871d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8be0b43181ee05de27d5322… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 4 11:43:31 2016 +0100 d3d11: Trace actual swapchain pointer in D3D11CreateDeviceAndSwapChain(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 8602f00..a4277db 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -331,7 +331,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T goto cleanup; } - TRACE("Created IDXGISwapChain %p.\n", swapchain); + TRACE("Created IDXGISwapChain %p.\n", *swapchain); } if (device_out)

1 0

Nikolay Sivov : d3drm: Remove first found callback, not all of them.
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: d5d1a288e9bc7a108a6b7b46e22ca2d617df88b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d1a288e9bc7a108a6b7b46e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 07:20:18 2016 +0300 d3drm: Remove first found callback, not all of them. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_main.c | 5 +++-- dlls/d3drm/tests/d3drm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 62ad5b9..67d1ad1 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -77,17 +77,18 @@ HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJE HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) { - struct destroy_callback *callback, *callback2; + struct destroy_callback *callback; if (!cb) return D3DRMERR_BADVALUE; - LIST_FOR_EACH_ENTRY_SAFE(callback, callback2, &object->destroy_callbacks, struct destroy_callback, entry) + LIST_FOR_EACH_ENTRY(callback, &object->destroy_callbacks, struct destroy_callback, entry) { if (callback->cb == cb && callback->ctx == ctx) { list_remove(&callback->entry); HeapFree(GetProcessHeap(), 0, callback); + break; } } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 77b4d59..8a125fc 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1355,6 +1355,26 @@ static void test_Viewport(void) 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; + 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); @@ -1395,6 +1415,30 @@ static void test_Viewport(void) 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; + IDirect3DRMViewport2_Release(viewport2); + ok(context.called == 2, "got %d, expected 2\n", context.called); + IDirect3DRMFrame_Release(frame); IDirect3DRMDevice_Release(device); IDirectDrawClipper_Release(pClipper);

1 0

Aric Stewart : hidclass.sys: Handle failure to parse preparseData.
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: 5fb6a94bb9c5688a27b01cf65bdec0774b481a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb6a94bb9c5688a27b01cf65… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 3 12:53:06 2016 -0600 hidclass.sys: Handle failure to parse preparseData. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 24dd140..5de7522 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -212,8 +212,16 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) } ext->preparseData = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[0].wReportLength); - ext->information.DescriptorSize = ext->preparseData->dwSize; + HeapFree(GetProcessHeap(), 0, reportDescriptor); + if (!ext->preparseData) + { + ERR("Cannot parse Report Descriptor\n"); + HID_DeleteDevice(&minidriver->minidriver, device); + return STATUS_NOT_SUPPORTED; + } + + ext->information.DescriptorSize = ext->preparseData->dwSize; serial[0] = 0; status = call_minidriver(IOCTL_HID_GET_STRING, device,

1 0

Tag wine-1.9.5 : Alexandre Julliard : Release 1.9.5
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: refs/tags/wine-1.9.5 Tag: 0b0a22d1d2aec09a358729f5e8577d1d3a843866 URL: http://source.winehq.org/git/wine.git/?a=tag;h=0b0a22d1d2aec09a358729f5e857… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 5 00:46:54 2016 +0900 Release 1.9.5

1 0

Alexandre Julliard : Release 1.9.5.
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: 10deca7caa60eed55b98a30589c61468f8454e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10deca7caa60eed55b98a3058… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 5 00:46:54 2016 +0900 Release 1.9.5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 915 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 429 insertions(+), 509 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10deca7caa60eed55b98a…

1 0

Józef Kucia : d3d11/tests: Remove unnecessary explicit array sizes.
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: aa817a85cb22fdadbb4a55ac362d6cee10bd668c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa817a85cb22fdadbb4a55ac3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 4 11:43:35 2016 +0100 d3d11/tests: Remove unnecessary explicit array sizes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e8934fb..f1e5c20 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3264,35 +3264,35 @@ static void test_texture(void) 0xffb1c4de, 0xfff0f1f2, 0xfffafdfe, 0xff5a560f, 0xffd5ff00, 0xffc8f99f, 0xffaa00aa, 0xffdd55bb, }; - static const BYTE bc1_data[4 * 8] = + static const BYTE bc1_data[] = { 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, }; - static const BYTE bc2_data[4 * 16] = + static const BYTE bc2_data[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, }; - static const BYTE bc3_data[4 * 16] = + static const BYTE bc3_data[] = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, }; - static const BYTE bc4_data[4 * 8] = + static const BYTE bc4_data[] = { 0x10, 0x7f, 0x77, 0x39, 0x05, 0x00, 0x00, 0x00, 0x10, 0x7f, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, }; - static const BYTE bc5_data[4 * 16] = + static const BYTE bc5_data[] = { 0x10, 0x7f, 0x77, 0x39, 0x05, 0x00, 0x00, 0x00, 0x10, 0x7f, 0x77, 0x39, 0x05, 0x00, 0x00, 0x00, 0x10, 0x7f, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x10, 0x7f, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24,

1 0