October 2016 - Wine-Commits

Alexandre Goujon : msvcrt: Implement 64-bit version of __std_type_info_hash.
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: eac56fbda547e21cf9f40d57c913b3b582fc5697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac56fbda547e21cf9f40d57c… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Oct 5 20:51:52 2016 +0200 msvcrt: Implement 64-bit version of __std_type_info_hash. Signed-off-by: GOUJON Alexandre <ale.goujon(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 19 +++++++++++++++---- dlls/ucrtbase/tests/cpp.c | 11 +++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 0ffe61e..f7127a3 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1591,20 +1591,31 @@ void CDECL MSVCRT_type_info_destroy_list(SLIST_HEADER *header) /****************************************************************** * __std_type_info_hash (UCRTBASE.@) - * - * TODO: 64-bit version of the function uses different constants */ MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti) { - MSVCRT_size_t hash = 0x811c9dc5; + MSVCRT_size_t hash, fnv_prime; const char *p; +#ifdef _WIN64 + hash = 0xcbf29ce484222325; + fnv_prime = 0x100000001b3; +#else + hash = 0x811c9dc5; + fnv_prime = 0x1000193; +#endif + TRACE("(%p)->%s\n", ti, ti->mangled); for(p = ti->mangled+1; *p; p++) { hash ^= *p; - hash *= 0x1000193; + hash *= fnv_prime; } + +#ifdef _WIN64 + hash ^= hash >> 32; +#endif + return hash; } #endif diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index 1a01fea..163e196 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -163,19 +163,22 @@ static void test___std_type_info(void) ti1.mangled[2] = 0; hash1 = p___std_type_info_hash(&ti1); #ifdef _WIN64 - todo_wine ok(hash1 == 0xcbf29ce44fd0bfc1, "hash = %p\n", (void*)hash1); + ok(hash1 == 0xcbf29ce44fd0bfc1, "hash = %p\n", (void*)hash1); #else ok(hash1 == 0x811c9dc5, "hash = %p\n", (void*)hash1); #endif ti1.mangled[0] = 1; hash2 = p___std_type_info_hash(&ti1); - ok(hash1 == hash2, "hash1 != hash2 (first char not ignorred)\n"); + ok(hash1 == hash2, "hash1 != hash2 (first char not ignored)\n"); ti1.mangled[1] = 1; hash1 = p___std_type_info_hash(&ti1); - if(sizeof(void*) == sizeof(int)) - ok(hash1 == 0x40c5b8c, "hash = %p\n", (void*)hash1); +#ifdef _WIN64 + ok(hash1 == 0xaf63bc4c29620a60, "hash = %p\n", (void*)hash1); +#else + ok(hash1 == 0x40c5b8c, "hash = %p\n", (void*)hash1); +#endif ok(hash1 != hash2, "hash1 == hash2 for different strings\n"); ti1.mangled[1] = 2;

1 0

Jacek Caban : mshtml: Fixed leak in get_nsstyle_attr_nsval.
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: a6d35fdaa810de43c2f3f5d5dda422ab01f6e593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d35fdaa810de43c2f3f5d5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 6 17:04:02 2016 +0200 mshtml: Fixed leak in get_nsstyle_attr_nsval. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7a4ebe3..a445bc2 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -485,15 +485,13 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei nsresult nsres; nsAString_InitDepend(&str_name, style_tbl[sid].name); - nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(nsstyle, &str_name, value); + nsAString_Finish(&str_name); if(NS_FAILED(nsres)) { ERR("SetProperty failed: %08x\n", nsres); return E_FAIL; } - nsAString_Finish(&str_name); - return S_OK; }

1 0

Aric Stewart : winebus.sys: Implement IOCTL_HID_GET_DEVICE_ATTRIBUTES for hid devices.
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: ea95a47bb54741215811c535d7a46102422be041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea95a47bb54741215811c535d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 6 07:19:27 2016 -0500 winebus.sys: Implement IOCTL_HID_GET_DEVICE_ATTRIBUTES for hid devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_udev.c | 1 + dlls/winebus.sys/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 099558b..342a66b 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -34,3 +34,4 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, const GUID *class, const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) DECLSPEC_HIDDEN; void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; +NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 93e56f3..a01d88e 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -299,6 +299,7 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry udev_driver_obj = driver; driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; + driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = hid_internal_dispatch; if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) goto error; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 09a59d6..eaa0b93 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -30,7 +30,9 @@ #include "winternl.h" #include "winreg.h" #include "setupapi.h" +#include "winioctl.h" #include "ddk/wdm.h" +#include "ddk/hidport.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" @@ -346,6 +348,50 @@ NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) return status; } +NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) +{ + NTSTATUS status = irp->IoStatus.u.Status; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + struct device_extension *extension = (struct device_extension *)device->DeviceExtension; + + TRACE("(%p, %p)\n", device, irp); + + switch (irpsp->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_HID_GET_DEVICE_ATTRIBUTES: + { + HID_DEVICE_ATTRIBUTES *attr = (HID_DEVICE_ATTRIBUTES *)irp->UserBuffer; + TRACE("IOCTL_HID_GET_DEVICE_ATTRIBUTES\n"); + + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(*attr)) + { + irp->IoStatus.u.Status = status = STATUS_BUFFER_TOO_SMALL; + break; + } + + memset(attr, 0, sizeof(*attr)); + attr->Size = sizeof(HID_DEVICE_ATTRIBUTES); + attr->VendorID = extension->vid; + attr->ProductID = extension->pid; + attr->VersionNumber = extension->version; + irp->IoStatus.u.Status = status = STATUS_SUCCESS; + irp->IoStatus.Information = sizeof(HID_DEVICE_ATTRIBUTES); + break; + } + default: + { + ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; + FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + break; + } + } + + IoCompleteRequest(irp, IO_NO_INCREMENT); + + return status; +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { static const WCHAR udevW[] = {'\\','D','r','i','v','e','r','\\','U','D','E','V',0};

1 0

Sebastian Lackner : ntoskrnl.exe: Return STATUS_INVALID_DEVICE_REQUEST when calling unhandled driver function.
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: 302d86f1a98b9414de731d0a451136121e820ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=302d86f1a98b9414de731d0a4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 5 23:30:10 2016 +0200 ntoskrnl.exe: Return STATUS_INVALID_DEVICE_REQUEST when calling unhandled driver function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 522facf..cc6ea0b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -884,6 +884,15 @@ static void build_driver_keypath( const WCHAR *name, UNICODE_STRING *keypath ) } +static NTSTATUS WINAPI unhandled_irp( DEVICE_OBJECT *device, IRP *irp ) +{ + TRACE( "(%p, %p)\n", device, irp ); + irp->IoStatus.u.Status = STATUS_INVALID_DEVICE_REQUEST; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_INVALID_DEVICE_REQUEST; +} + + /*********************************************************************** * IoCreateDriver (NTOSKRNL.EXE.@) */ @@ -891,6 +900,7 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) { struct wine_driver *driver; NTSTATUS status; + unsigned int i; TRACE("(%s, %p)\n", debugstr_us(name), init); @@ -909,24 +919,29 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) driver->driver_obj.DriverExtension = &driver->driver_extension; driver->driver_extension.DriverObject = &driver->driver_obj; build_driver_keypath( driver->driver_obj.DriverName.Buffer, &driver->driver_extension.ServiceKeyName ); + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + driver->driver_obj.MajorFunction[i] = unhandled_irp; status = driver->driver_obj.DriverInit( &driver->driver_obj, &driver->driver_extension.ServiceKeyName ); - if (status) { RtlFreeUnicodeString( &driver->driver_obj.DriverName ); RtlFreeUnicodeString( &driver->driver_extension.ServiceKeyName ); RtlFreeHeap( GetProcessHeap(), 0, driver ); + return status; } - else + + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) { - EnterCriticalSection( &drivers_cs ); - if (wine_rb_put( &wine_drivers, &driver->driver_obj.DriverName, &driver->entry )) - ERR( "failed to insert driver %s in tree\n", debugstr_us(name) ); - LeaveCriticalSection( &drivers_cs ); + if (driver->driver_obj.MajorFunction[i]) continue; + driver->driver_obj.MajorFunction[i] = unhandled_irp; } - return status; + EnterCriticalSection( &drivers_cs ); + if (wine_rb_put( &wine_drivers, &driver->driver_obj.DriverName, &driver->entry )) + ERR( "failed to insert driver %s in tree\n", debugstr_us(name) ); + LeaveCriticalSection( &drivers_cs ); + return STATUS_SUCCESS; }

1 0

Józef Kucia : wined3d: Pass context to destroy_default_samplers().
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: f45f384fa5fbc4033c5fb7d09770b487511b3142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45f384fa5fbc4033c5fb7d09… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 5 11:17:08 2016 +0200 wined3d: Pass context to destroy_default_samplers(). 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/wined3d/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1c8cb90..94ea4c5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -827,9 +827,9 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 } /* Context activation is done by the caller. */ -static void destroy_default_samplers(struct wined3d_device *device) +static void destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = context->gl_info; if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { @@ -1183,7 +1183,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->blitter->free_private(device); device->shader_backend->shader_free_private(device); destroy_dummy_textures(device, gl_info); - destroy_default_samplers(device); + destroy_default_samplers(device, context); context_release(context); @@ -4560,7 +4560,7 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d device->blitter->free_private(device); device->shader_backend->shader_free_private(device); destroy_dummy_textures(device, gl_info); - destroy_default_samplers(device); + destroy_default_samplers(device, context); context_release(context);

1 0

Józef Kucia : wined3d: Avoid destroying active contexts.
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: 13e464d0fbd70309f47a6d8cca5a7e4b3ae84161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e464d0fbd70309f47a6d8cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 5 11:17:07 2016 +0200 wined3d: Avoid destroying active contexts. This commit fixes a problem which can be observed in d3d10core and d3d11 tests while a device is destroyed in test_swapchain_flip(). When a swapchain is destroyed all contexts associated with this swapchain are destroyed. A context is destroyed even if it is active. This might lead to using a destroyed context. In order to fix this the destruction of context is delayed until leaving the last level. 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/wined3d/context.c | 17 +++++++++++++++++ dlls/wined3d/device.c | 6 +----- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 89cc9ce..394a2dc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1354,6 +1354,12 @@ void context_release(struct wined3d_context *context) context->restore_ctx = NULL; context->restore_dc = NULL; } + + if (context->destroy_delayed) + { + TRACE("Destroying context %p.\n", context); + context_destroy(context->device, context); + } } } @@ -2012,6 +2018,17 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont TRACE("Destroying ctx %p\n", context); + /* We delay destroying a context when it is active. The context_release() + * function invokes context_destroy() again while leaving the last level. */ + if (context->level) + { + TRACE("Delaying destruction of context %p.\n", context); + context->destroy_delayed = 1; + /* FIXME: Get rid of a pointer to swapchain from wined3d_context. */ + context->swapchain = NULL; + return; + } + if (context->tid == GetCurrentThreadId() || !context->current) { context_destroy_gl_resources(context); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 90d0008..1c8cb90 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1185,13 +1185,9 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) destroy_dummy_textures(device, gl_info); destroy_default_samplers(device); - /* Release the context again as soon as possible. In particular, - * releasing the render target views below may release the last reference - * to the swapchain associated with this context, which in turn will - * destroy the context. */ context_release(context); - /* Release the buffers (with sanity checks)*/ + /* Release the buffers (with sanity checks) */ if (device->onscreen_depth_stencil) { surface = device->onscreen_depth_stencil; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 08e9120..3887f91 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1497,7 +1497,8 @@ struct wined3d_context DWORD hdc_is_private : 1; DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ DWORD update_shader_resource_bindings : 1; - DWORD padding : 14; + DWORD destroy_delayed : 1; + DWORD padding : 13; DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */ DWORD shader_update_mask; DWORD constant_update_mask;

1 0

Józef Kucia : wined3d: Call context_destroy() directly if context is not associated with swapchain.
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: d90075b0bfab02f690e579f42d24e25585453173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90075b0bfab02f690e579f42… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 5 11:17:06 2016 +0200 wined3d: Call context_destroy() directly if context is not associated with swapchain. 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/wined3d/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f2dfac7..90d0008 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4570,7 +4570,10 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d while (device->context_count) { - swapchain_destroy_contexts(device->contexts[0]->swapchain); + if (device->contexts[0]->swapchain) + swapchain_destroy_contexts(device->contexts[0]->swapchain); + else + context_destroy(device, device->contexts[0]); } HeapFree(GetProcessHeap(), 0, swapchain->context);

1 0

Józef Kucia : wined3d: Avoid using "context-> swapchain" in context_update_window().
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: 8673dca87df76b8f94be65c82e4a1a389c13dd9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8673dca87df76b8f94be65c82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 5 11:17:04 2016 +0200 wined3d: Avoid using "context->swapchain" in context_update_window(). 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/wined3d/context.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e8d9abc..f249587 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1114,18 +1114,18 @@ static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HD } } -static void context_update_window(struct wined3d_context *context) +static void context_update_window(struct wined3d_context *context, HWND win_handle) { - if (context->win_handle == context->swapchain->win_handle) + if (context->win_handle == win_handle) return; TRACE("Updating context %p window from %p to %p.\n", - context, context->win_handle, context->swapchain->win_handle); + context, context->win_handle, win_handle); if (context->hdc) wined3d_release_dc(context->win_handle, context->hdc); - context->win_handle = context->swapchain->win_handle; + context->win_handle = win_handle; context->hdc_is_private = FALSE; context->hdc_has_format = FALSE; context->needs_set = 1; @@ -3519,6 +3519,7 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_surface *target) { struct wined3d_context *current_context = context_get_current(); + struct wined3d_swapchain *swapchain = NULL; struct wined3d_texture *target_texture; unsigned int target_sub_resource_idx; struct wined3d_context *context; @@ -3558,11 +3559,11 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str { context = current_context; } - else if (target_texture->swapchain) + else if ((swapchain = target_texture->swapchain)) { TRACE("Rendering onscreen.\n"); - context = swapchain_get_context(target_texture->swapchain); + context = swapchain_get_context(swapchain); } else { @@ -3571,13 +3572,19 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str /* Stay with the current context if possible. Otherwise use the * context for the primary swapchain. */ if (current_context && current_context->device == device) + { context = current_context; + } else - context = swapchain_get_context(device->swapchains[0]); + { + swapchain = device->swapchains[0]; + context = swapchain_get_context(swapchain); + } } context_enter(context); - context_update_window(context); + if (swapchain) + context_update_window(context, swapchain->win_handle); context_setup_target(context, target_texture, target_sub_resource_idx); if (!context->valid) return context;

1 0

Józef Kucia : wined3d: Store pointer to device in wined3d_context.
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: 79787263cc847fdb32b8c7610499a9884775e3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=79787263cc847fdb32b8c7610… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 5 11:17:03 2016 +0200 wined3d: Store pointer to device in wined3d_context. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++-------------- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 9 +++++---- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 20 ++++++++++---------- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 7 files changed, 34 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79787263cc847fdb32b8c…

1 0

Józef Kucia : wined3d: Pass context to destroy_dummy_textures().
by Alexandre Julliard Oct. 6, 2016

Oct. 6, 2016

Module: wine Branch: master Commit: 3edc4b27cde9bbaad7a396368855d687fa0a7b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3edc4b27cde9bbaad7a396368… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 5 11:17:09 2016 +0200 wined3d: Pass context to destroy_dummy_textures(). 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/wined3d/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 94ea4c5..de6d5a4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -772,8 +772,10 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ } /* Context activation is done by the caller. */ -static void destroy_dummy_textures(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) +static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; + if (gl_info->supported[EXT_TEXTURE_ARRAY]) gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_2d_array); @@ -1182,7 +1184,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ device->blitter->free_private(device); device->shader_backend->shader_free_private(device); - destroy_dummy_textures(device, gl_info); + destroy_dummy_textures(device, context); destroy_default_samplers(device, context); context_release(context); @@ -4559,7 +4561,7 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d device->blitter->free_private(device); device->shader_backend->shader_free_private(device); - destroy_dummy_textures(device, gl_info); + destroy_dummy_textures(device, context); destroy_default_samplers(device, context); context_release(context);

1 0