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

[PATCH] user32: Return correct showCmd from GetWindowPlacement() for other process window.
by Paul Gofman 13 Aug '19

13 Aug '19

Fixes black screen in SWTOR after window minimize / maximize or switching window in full screen mode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/win.c | 126 ++++++++++++++++++++++++++++++++++++++-- dlls/user32/winpos.c | 35 +++++++++-- 2 files changed, 153 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 639eef4c42..5a35138fdc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11733,6 +11733,115 @@ static void test_arrange_iconic_windows(void) ok(ret, "failed to restore minimized metrics, error %u\n", GetLastError()); } +static void other_process_proc(HWND hwnd) +{ + HANDLE window_ready_event, test_done_event; + WINDOWPLACEMENT wp; + DWORD ret; + + window_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_window"); + ok(!!window_ready_event, "OpenEvent failed.\n"); + test_done_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_test"); + ok(!!test_done_event, "OpenEvent failed.\n"); + + /* SW_SHOW */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWNORMAL, "Unexpected showCmd %#x.\n", wp.showCmd); + ok(!wp.flags, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + /* SW_SHOWMAXIMIZED */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd); + todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + /* SW_SHOWMINIMIZED */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWMINIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd); + todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + /* SW_RESTORE */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd); + todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + CloseHandle(window_ready_event); + CloseHandle(test_done_event); +} + +static void test_other_process_window(const char *argv0) +{ + HANDLE window_ready_event, test_done_event; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char cmd[MAX_PATH]; + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, + 100, 100, 100, 100, 0, 0, NULL, NULL); + ok(!!hwnd, "CreateWindowEx failed.\n"); + + window_ready_event = CreateEventA(NULL, FALSE, FALSE, "test_opw_window"); + ok(!!window_ready_event, "CreateEvent failed.\n"); + test_done_event = CreateEventA(NULL, FALSE, FALSE, "test_opw_test"); + ok(!!test_done_event, "CreateEvent failed.\n"); + + + sprintf(cmd, "%s win test_other_process_window %p", argv0, hwnd); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + + ok(CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, + &startup, &info), "CreateProcess failed.\n"); + + ret = ShowWindow(hwnd, SW_SHOW); + ok(!ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + ret = ShowWindow(hwnd, SW_SHOWMAXIMIZED); + ok(ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + ret = ShowWindow(hwnd, SW_SHOWMINIMIZED); + ok(ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + winetest_wait_child_process(info.hProcess); + CloseHandle(window_ready_event); + CloseHandle(test_done_event); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -11762,16 +11871,24 @@ START_TEST(win) pAdjustWindowRectExForDpi = (void *)GetProcAddress( user32, "AdjustWindowRectExForDpi" ); pSystemParametersInfoForDpi = (void *)GetProcAddress( user32, "SystemParametersInfoForDpi" ); - if (argc==4 && !strcmp(argv[2], "create_children")) + if (argc == 4) { HWND hwnd; sscanf(argv[3], "%p", &hwnd); - window_from_point_proc(hwnd); - return; + if (!strcmp(argv[2], "create_children")) + { + window_from_point_proc(hwnd); + return; + } + else if (!strcmp(argv[2], "test_other_process_window")) + { + other_process_proc(hwnd); + return; + } } - if (argc==3 && !strcmp(argv[2], "winproc_limit")) + if (argc == 3 && !strcmp(argv[2], "winproc_limit")) { test_winproc_limit(); return; @@ -11894,6 +12011,7 @@ START_TEST(win) test_IsWindowEnabled(); test_window_placement(); test_arrange_iconic_windows(); + test_other_process_window(argv[0]); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5837c179e4..6b8927f020 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1280,11 +1280,38 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) } if (pWnd == WND_OTHER_PROCESS) { - if (!IsWindow( hwnd )) return FALSE; - FIXME( "not supported on other process window %p\n", hwnd ); - /* provide some dummy information */ + DWORD style, is_window; + + FIXME( "not fully supported on other process window %p.\n", hwnd ); + + SERVER_START_REQ( set_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + req->flags = 0; /* don't set anything, just retrieve */ + req->extra_offset = -1; + req->extra_size = 0; + if (wine_server_call_err( req )) + { + style = 0; + is_window = FALSE; + } + else + { + style = reply->old_style; + is_window = TRUE; + } + } + SERVER_END_REQ; + + if (!is_window) + return FALSE; + wndpl->length = sizeof(*wndpl); - wndpl->showCmd = SW_SHOWNORMAL; + if( style & WS_MINIMIZE ) + wndpl->showCmd = SW_SHOWMINIMIZED; + else + wndpl->showCmd = ( style & WS_MAXIMIZE ) ? SW_SHOWMAXIMIZED : SW_SHOWNORMAL; + /* provide some dummy information */ wndpl->flags = 0; wndpl->ptMinPosition.x = -1; wndpl->ptMinPosition.y = -1; -- 2.21.0

3 4

[PATCH v3] winex11.drv: Destroy old clipping message window if it has been replaced
by Rémi Bernon 13 Aug '19

13 Aug '19

When the same thread repeatedly calls ClipCursor, a message window is created for every call, then stored in x11drv_thread_data->clip_hwnd. The WM_X11DRV_CLIP_CURSOR notification is then sent to the desktop window, then to the previous clipping thread in order for it to destroy its clip_hwnd. But as the clipping thread is the same, and because x11drv_thread_data->clip_hwnd has been overwritten, it does not satisfy the "hwnd == data->clip_hwnd" condition and the window leaked. This was causing exhaustion of user handles, and ultimately, failures to create new clipping message windows, which then in turn makes the pointer grab be lost. This change makes sure that any dangling clipping message window is properly destroyed. Note: Implementing this by avoiding the re-creation of clipping message window leads to a race condition when ClipCursor rect is reset then restored: the desktop process sends reset notification which may be processed after the clipping rect has already been restored. --- dlls/winex11.drv/mouse.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index f737a306a56..bb07e289a2d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -499,6 +499,14 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) GetClipCursor( &clip ); X11DRV_ClipCursor( &clip ); } + else if (hwnd) + { + /* This is a notification send by the desktop window to an old + * dangling clip window. + */ + TRACE( "destroying old clip hwnd %p\n", hwnd ); + DestroyWindow( hwnd ); + } return 0; } -- 2.20.1

2 2

[PATCH 5/5] wined3d: Get rid of a redundant NULL check in wined3d_context_gl_acquire() (Coverity).
by Henri Verbeet 13 Aug '19

13 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6742f21cc80..2d22409d50b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4238,7 +4238,7 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * { context_gl = current_context; } - else if (texture && !wined3d_resource_is_offscreen(&texture->resource)) + else if (!wined3d_resource_is_offscreen(&texture->resource)) { TRACE("Rendering onscreen.\n"); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Move the context array from struct wined3d_swapchain to struct wined3d_swapchain_gl.
by Henri Verbeet 13 Aug '19

13 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/context.c | 18 +++++----- dlls/wined3d/device.c | 5 +-- dlls/wined3d/swapchain.c | 80 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 14 ++++---- 5 files changed, 64 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cf5cb0e79c7..0b7fcf47297 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4637,7 +4637,7 @@ static HRESULT adapter_gl_init_3d(struct wined3d_device *device) wined3d_cs_init_object(device->cs, wined3d_device_create_primary_opengl_context_cs, device); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - if (!device->swapchains[0]->num_contexts) + if (!wined3d_swapchain_gl(device->swapchains[0])->context_count) return E_FAIL; device->d3d_initialized = TRUE; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 89f37cd6613..6742f21cc80 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1935,7 +1935,7 @@ HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct w return WINED3D_OK; } -HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) +HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl) { const struct wined3d_format *color_format, *ds_format; struct wined3d_context *context = &context_gl->c; @@ -1947,9 +1947,9 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi HGLRC ctx, share_ctx; unsigned int i; - TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain); + TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl); - wined3d_context_init(&context_gl->c, swapchain); + wined3d_context_init(&context_gl->c, &swapchain_gl->s); device = context->device; gl_info = &device->adapter->gl_info; @@ -1968,7 +1968,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!context_gl->dc) { - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(wined3d_swapchain_gl(context->swapchain)))) + if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) { ERR("Failed to retrieve a device context.\n"); return E_FAIL; @@ -2056,7 +2056,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); /* Try to find a pixel format which matches our requirements. */ - if (!swapchain->ds_format) + if (!swapchain_gl->s.ds_format) { for (i = 0; i < ARRAY_SIZE(ds_formats); ++i) { @@ -2064,7 +2064,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if ((context_gl->pixel_format = context_choose_pixel_format(device, context_gl->dc, color_format, ds_format, TRUE))) { - swapchain->ds_format = ds_format; + swapchain_gl->s.ds_format = ds_format; break; } @@ -2075,7 +2075,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi else { context_gl->pixel_format = context_choose_pixel_format(device, - context_gl->dc, color_format, swapchain->ds_format, TRUE); + context_gl->dc, color_format, swapchain_gl->s.ds_format, TRUE); } } else @@ -4242,7 +4242,7 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * { TRACE("Rendering onscreen.\n"); - if (!(context_gl = wined3d_context_gl(swapchain_get_context(texture->swapchain)))) + if (!(context_gl = wined3d_swapchain_gl_get_context(wined3d_swapchain_gl(texture->swapchain)))) return NULL; } else @@ -4253,7 +4253,7 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * * context for the primary swapchain. */ if (current_context && current_context->c.device == device) context_gl = current_context; - else if (!(context_gl = wined3d_context_gl(swapchain_get_context(device->swapchains[0])))) + else if (!(context_gl = wined3d_swapchain_gl_get_context(wined3d_swapchain_gl(device->swapchains[0])))) return NULL; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c37f386f99a..81a6d3ab36c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -962,6 +962,7 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi void wined3d_device_delete_opengl_contexts_cs(void *object) { struct wined3d_resource *resource, *cursor; + struct wined3d_swapchain_gl *swapchain_gl; struct wined3d_device *device = object; struct wined3d_context_gl *context_gl; struct wined3d_device_gl *device_gl; @@ -991,8 +992,8 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) while (device->context_count) { - if (device->contexts[0]->swapchain) - swapchain_destroy_contexts(device->contexts[0]->swapchain); + if ((swapchain_gl = wined3d_swapchain_gl(device->contexts[0]->swapchain))) + wined3d_swapchain_gl_destroy_contexts(swapchain_gl); else wined3d_context_gl_destroy(wined3d_context_gl(device->contexts[0])); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index eb515f0a6dd..62bab65fcf3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -27,11 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); -static void wined3d_swapchain_destroy_object(void *object) -{ - swapchain_destroy_contexts(object); -} - void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) { HRESULT hr; @@ -66,9 +61,6 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) swapchain->back_buffers = NULL; } - wined3d_cs_destroy_object(swapchain->device->cs, wined3d_swapchain_destroy_object, swapchain); - wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); - /* Restore the screen resolution if we rendered in fullscreen. * This will restore the screen resolution to what it was before creating * the swapchain. In case of d3d8 and d3d9 this will be the original @@ -97,10 +89,20 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) } } +static void wined3d_swapchain_gl_destroy_object(void *object) +{ + wined3d_swapchain_gl_destroy_contexts(object); +} + void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) { + struct wined3d_cs *cs = swapchain_gl->s.device->cs; + wined3d_swapchain_cleanup(&swapchain_gl->s); + wined3d_cs_destroy_object(cs, wined3d_swapchain_gl_destroy_object, swapchain_gl); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); + if (swapchain_gl->backup_dc) { TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain_gl->backup_wnd, swapchain_gl->backup_dc); @@ -440,6 +442,7 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) { + struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); const struct wined3d_swapchain_desc *desc = &swapchain->state.desc; struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; @@ -530,7 +533,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, if (swapchain->render_to_fbo) swapchain_blit(swapchain, context, src_rect, dst_rect); - if (swapchain->num_contexts > 1) + if (swapchain_gl->context_count > 1) gl_info->gl_ops.gl.p_glFinish(); /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ @@ -1013,9 +1016,6 @@ err: heap_free(swapchain->back_buffers); } - wined3d_cs_destroy_object(device->cs, wined3d_swapchain_destroy_object, swapchain); - wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - if (swapchain->front_buffer) { wined3d_texture_set_swapchain(swapchain->front_buffer, NULL); @@ -1039,10 +1039,19 @@ HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, st HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { + HRESULT hr; + TRACE("swapchain_gl %p, device %p, desc %p, parent %p, parent_ops %p.\n", swapchain_gl, device, desc, parent, parent_ops); - return wined3d_swapchain_init(&swapchain_gl->s, device, desc, parent, parent_ops, &swapchain_gl_ops); + if (FAILED(hr = wined3d_swapchain_init(&swapchain_gl->s, device, desc, parent, parent_ops, &swapchain_gl_ops))) + { + /* Cleanup any context that may have been created for the swapchain. */ + wined3d_cs_destroy_object(device->cs, wined3d_swapchain_gl_destroy_object, swapchain_gl); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + } + + return hr; } HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain *swapchain_vk, struct wined3d_device *device, @@ -1085,13 +1094,12 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win return hr; } -static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain *swapchain) +static struct wined3d_context_gl *wined3d_swapchain_gl_create_context(struct wined3d_swapchain_gl *swapchain_gl) { - struct wined3d_device *device = swapchain->device; + struct wined3d_device *device = swapchain_gl->s.device; struct wined3d_context_gl *context_gl; - struct wined3d_context **ctx_array; - TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain, GetCurrentThreadId()); + TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain_gl, GetCurrentThreadId()); wined3d_from_cs(device->cs); @@ -1101,7 +1109,7 @@ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain return NULL; } - if (FAILED(wined3d_context_gl_init(context_gl, swapchain))) + if (FAILED(wined3d_context_gl_init(context_gl, swapchain_gl))) { WARN("Failed to initialise context.\n"); heap_free(context_gl); @@ -1119,47 +1127,45 @@ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain context_release(&context_gl->c); - if (!(ctx_array = heap_calloc(swapchain->num_contexts + 1, sizeof(*ctx_array)))) + if (!wined3d_array_reserve((void **)&swapchain_gl->contexts, &swapchain_gl->contexts_size, + swapchain_gl->context_count + 1, sizeof(*swapchain_gl->contexts))) { ERR("Failed to allocate new context array memory.\n"); wined3d_context_gl_destroy(context_gl); return NULL; } - memcpy(ctx_array, swapchain->context, sizeof(*ctx_array) * swapchain->num_contexts); - heap_free(swapchain->context); - ctx_array[swapchain->num_contexts] = &context_gl->c; - swapchain->context = ctx_array; - swapchain->num_contexts++; + swapchain_gl->contexts[swapchain_gl->context_count++] = context_gl; - return &context_gl->c; + return context_gl; } -void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) +void wined3d_swapchain_gl_destroy_contexts(struct wined3d_swapchain_gl *swapchain_gl) { unsigned int i; - for (i = 0; i < swapchain->num_contexts; ++i) + for (i = 0; i < swapchain_gl->context_count; ++i) { - wined3d_context_gl_destroy(wined3d_context_gl(swapchain->context[i])); + wined3d_context_gl_destroy(swapchain_gl->contexts[i]); } - heap_free(swapchain->context); - swapchain->num_contexts = 0; - swapchain->context = NULL; + heap_free(swapchain_gl->contexts); + swapchain_gl->contexts_size = 0; + swapchain_gl->context_count = 0; + swapchain_gl->contexts = NULL; } -struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) +struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl) { DWORD tid = GetCurrentThreadId(); unsigned int i; - for (i = 0; i < swapchain->num_contexts; ++i) + for (i = 0; i < swapchain_gl->context_count; ++i) { - if (wined3d_context_gl(swapchain->context[i])->tid == tid) - return swapchain->context[i]; + if (swapchain_gl->contexts[i]->tid == tid) + return swapchain_gl->contexts[i]; } - /* Create a new context for the thread */ - return swapchain_create_context(swapchain); + /* Create a new context for the thread. */ + return wined3d_swapchain_gl_create_context(swapchain_gl); } HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ce2a2a29ca..80ed41bb845 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -78,6 +78,7 @@ struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; struct wined3d_state; +struct wined3d_swapchain_gl; struct wined3d_texture_gl; struct wined3d_vertex_pipe_ops; @@ -2110,7 +2111,7 @@ GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_g const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, - struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; + struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, @@ -4399,17 +4400,12 @@ struct wined3d_swapchain LONG prev_time, frames; /* Performance tracking */ - struct wined3d_context **context; - unsigned int num_contexts; - struct wined3d_swapchain_state state; HWND win_handle; }; void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device) DECLSPEC_HIDDEN; @@ -4422,6 +4418,10 @@ struct wined3d_swapchain_gl { struct wined3d_swapchain s; + struct wined3d_context_gl **contexts; + SIZE_T contexts_size; + SIZE_T context_count; + HDC backup_dc; HWND backup_wnd; }; @@ -4432,7 +4432,9 @@ static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_s } void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; +void wined3d_swapchain_gl_destroy_contexts(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; +struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Move the backup window from struct wined3d_swapchain to struct wined3d_swapchain_gl.
by Henri Verbeet 13 Aug '19

13 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/swapchain.c | 32 ++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8a6cd5c889a..89f37cd6613 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1231,7 +1231,7 @@ success: static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context_gl) { - struct wined3d_swapchain *swapchain = context_gl->c.swapchain; + struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(context_gl->c.swapchain); BOOL backup = FALSE; if (!wined3d_context_gl_set_pixel_format(context_gl)) @@ -1252,14 +1252,14 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context * a swapchain, so we can't use the swapchain to get a backup dc. To * make this work windowless contexts would need to be handled by the * device. */ - if (context_gl->c.destroyed || !swapchain) + if (context_gl->c.destroyed || !swapchain_gl) { FIXME("Unable to get backup dc for destroyed context %p.\n", context_gl); wined3d_context_gl_set_current(NULL); return FALSE; } - if (!(context_gl->dc = swapchain_get_backup_dc(swapchain))) + if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) { wined3d_context_gl_set_current(NULL); return FALSE; @@ -1968,7 +1968,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!context_gl->dc) { - if (!(context_gl->dc = swapchain_get_backup_dc(context->swapchain))) + if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(wined3d_swapchain_gl(context->swapchain)))) { ERR("Failed to retrieve a device context.\n"); return E_FAIL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c0eeca52c7d..eb515f0a6dd 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -95,19 +95,19 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) wined3d_swapchain_state_restore_from_fullscreen(&swapchain->state, swapchain->state.device_window, NULL); } } - - if (swapchain->backup_dc) - { - TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain->backup_wnd, swapchain->backup_dc); - - wined3d_release_dc(swapchain->backup_wnd, swapchain->backup_dc); - DestroyWindow(swapchain->backup_wnd); - } } void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) { wined3d_swapchain_cleanup(&swapchain_gl->s); + + if (swapchain_gl->backup_dc) + { + TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain_gl->backup_wnd, swapchain_gl->backup_dc); + + wined3d_release_dc(swapchain_gl->backup_wnd, swapchain_gl->backup_dc); + DestroyWindow(swapchain_gl->backup_wnd); + } } ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) @@ -1162,29 +1162,29 @@ struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchai return swapchain_create_context(swapchain); } -HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) +HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl) { - if (!swapchain->backup_dc) + if (!swapchain_gl->backup_dc) { - TRACE("Creating the backup window for swapchain %p.\n", swapchain); + TRACE("Creating the backup window for swapchain %p.\n", swapchain_gl); - if (!(swapchain->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + if (!(swapchain_gl->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL))) { ERR("Failed to create a window.\n"); return NULL; } - if (!(swapchain->backup_dc = GetDC(swapchain->backup_wnd))) + if (!(swapchain_gl->backup_dc = GetDC(swapchain_gl->backup_wnd))) { ERR("Failed to get a DC.\n"); - DestroyWindow(swapchain->backup_wnd); - swapchain->backup_wnd = NULL; + DestroyWindow(swapchain_gl->backup_wnd); + swapchain_gl->backup_wnd = NULL; return NULL; } } - return swapchain->backup_dc; + return swapchain_gl->backup_dc; } void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e4e1390fe5..4ce2a2a29ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4404,16 +4404,12 @@ struct wined3d_swapchain struct wined3d_swapchain_state state; HWND win_handle; - - HDC backup_dc; - HWND backup_wnd; }; void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device) DECLSPEC_HIDDEN; @@ -4425,6 +4421,9 @@ HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_swapchain_gl { struct wined3d_swapchain s; + + HDC backup_dc; + HWND backup_wnd; }; static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_swapchain *swapchain) @@ -4433,6 +4432,7 @@ static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_s } void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; +HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Introduce a separate structure for OpenGL swapchain information.
by Henri Verbeet 13 Aug '19

13 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 10 ++++++---- dlls/wined3d/swapchain.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 13 ++++++++++++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cf54468a76b..cf5cb0e79c7 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4656,7 +4656,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { - struct wined3d_swapchain *swapchain_gl; + struct wined3d_swapchain_gl *swapchain_gl; HRESULT hr; TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", @@ -4673,15 +4673,17 @@ static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct } TRACE("Created swapchain %p.\n", swapchain_gl); - *swapchain = swapchain_gl; + *swapchain = &swapchain_gl->s; return hr; } static void adapter_gl_destroy_swapchain(struct wined3d_swapchain *swapchain) { - wined3d_swapchain_cleanup(swapchain); - heap_free(swapchain); + struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); + + wined3d_swapchain_gl_cleanup(swapchain_gl); + heap_free(swapchain_gl); } static HRESULT adapter_gl_create_buffer(struct wined3d_device *device, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4d277c7a5e2..c0eeca52c7d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -105,6 +105,11 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) } } +void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) +{ + wined3d_swapchain_cleanup(&swapchain_gl->s); +} + ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) { ULONG refcount = InterlockedIncrement(&swapchain->ref); @@ -1031,13 +1036,13 @@ HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, st return wined3d_swapchain_init(swapchain_no3d, device, desc, parent, parent_ops, &swapchain_no3d_ops); } -HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain *swapchain_gl, struct wined3d_device *device, +HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { TRACE("swapchain_gl %p, device %p, desc %p, parent %p, parent_ops %p.\n", swapchain_gl, device, desc, parent, parent_ops); - return wined3d_swapchain_init(swapchain_gl, device, desc, parent, parent_ops, &swapchain_gl_ops); + return wined3d_swapchain_init(&swapchain_gl->s, device, desc, parent, parent_ops, &swapchain_gl_ops); } HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain *swapchain_vk, struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e81d72b7db3..1e4e1390fe5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4422,7 +4422,18 @@ HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain *swapchain_gl, +struct wined3d_swapchain_gl +{ + struct wined3d_swapchain s; +}; + +static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_swapchain *swapchain) +{ + return CONTAINING_RECORD(swapchain, struct wined3d_swapchain_gl, s); +} + +void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; +HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Make the adapter responsible for texture creation and destruction.
by Henri Verbeet 13 Aug '19

13 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 86 +++++++++++ dlls/wined3d/adapter_vk.c | 54 +++++++ dlls/wined3d/directx.c | 53 +++++++ dlls/wined3d/texture.c | 336 ++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 38 +++++ 5 files changed, 425 insertions(+), 142 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index d32b66480a6..cf54468a76b 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4745,6 +4745,90 @@ static void adapter_gl_destroy_buffer(struct wined3d_buffer *buffer) wined3d_device_decref(device); } +static HRESULT adapter_gl_create_texture(struct wined3d_device *device, + const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, + uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) +{ + struct wined3d_texture_gl *texture_gl; + HRESULT hr; + + TRACE("device %p, desc %p, layer_count %u, level_count %u, flags %#x, parent %p, parent_ops %p, texture %p.\n", + device, desc, layer_count, level_count, flags, parent, parent_ops, texture); + + if (!(texture_gl = wined3d_texture_allocate_object_memory(sizeof(*texture_gl), level_count, layer_count))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_texture_gl_init(texture_gl, device, desc, + layer_count, level_count, flags, parent, parent_ops))) + { + WARN("Failed to initialise texture, hr %#x.\n", hr); + heap_free(texture_gl); + return hr; + } + + TRACE("Created texture %p.\n", texture_gl); + *texture = &texture_gl->t; + + return hr; +} + +static void wined3d_texture_gl_destroy_object(void *object) +{ + struct wined3d_renderbuffer_entry *entry, *entry2; + struct wined3d_texture_gl *texture_gl = object; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + struct wined3d_device *device; + + TRACE("texture_gl %p.\n", texture_gl); + + if (!list_empty(&texture_gl->renderbuffers)) + { + device = texture_gl->t.resource.device; + context = context_acquire(device, NULL, 0); + gl_info = wined3d_context_gl(context)->gl_info; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture_gl->renderbuffers, struct wined3d_renderbuffer_entry, entry) + { + TRACE("Deleting renderbuffer %u.\n", entry->id); + context_gl_resource_released(device, entry->id, TRUE); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); + heap_free(entry); + } + + context_release(context); + } + + wined3d_texture_gl_unload_texture(texture_gl); + + heap_free(texture_gl); +} + +static void adapter_gl_destroy_texture(struct wined3d_texture *texture) +{ + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); + struct wined3d_device *device = texture_gl->t.resource.device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("texture_gl %p.\n", texture_gl); + + /* Take a reference to the device, in case releasing the texture would + * cause the device to be destroyed. However, swapchain resources don't + * take a reference to the device, and we wouldn't want to increment the + * refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + + wined3d_texture_sub_resources_destroyed(texture); + texture->resource.parent_ops->wined3d_object_destroyed(texture->resource.parent); + + wined3d_texture_cleanup(&texture_gl->t); + wined3d_cs_destroy_object(device->cs, wined3d_texture_gl_destroy_object, texture_gl); + + if (swapchain_count) + wined3d_device_decref(device); +} + static HRESULT adapter_gl_create_rendertarget_view(const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view) @@ -4953,6 +5037,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy_swapchain, adapter_gl_create_buffer, adapter_gl_destroy_buffer, + adapter_gl_create_texture, + adapter_gl_destroy_texture, adapter_gl_create_rendertarget_view, adapter_gl_destroy_rendertarget_view, adapter_gl_create_shader_resource_view, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index c3a1832e353..f203e0f52e1 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -543,6 +543,58 @@ static void adapter_vk_destroy_buffer(struct wined3d_buffer *buffer) wined3d_device_decref(device); } +static HRESULT adapter_vk_create_texture(struct wined3d_device *device, + const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, + uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) +{ + struct wined3d_texture_vk *texture_vk; + HRESULT hr; + + TRACE("device %p, desc %p, layer_count %u, level_count %u, flags %#x, parent %p, parent_ops %p, texture %p.\n", + device, desc, layer_count, level_count, flags, parent, parent_ops, texture); + + if (!(texture_vk = wined3d_texture_allocate_object_memory(sizeof(*texture_vk), level_count, layer_count))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_texture_vk_init(texture_vk, device, desc, + layer_count, level_count, flags, parent, parent_ops))) + { + WARN("Failed to initialise texture, hr %#x.\n", hr); + heap_free(texture_vk); + return hr; + } + + TRACE("Created texture %p.\n", texture_vk); + *texture = &texture_vk->t; + + return hr; +} + +static void adapter_vk_destroy_texture(struct wined3d_texture *texture) +{ + struct wined3d_texture_vk *texture_vk = wined3d_texture_vk(texture); + struct wined3d_device *device = texture_vk->t.resource.device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("texture_vk %p.\n", texture_vk); + + /* Take a reference to the device, in case releasing the texture would + * cause the device to be destroyed. However, swapchain resources don't + * take a reference to the device, and we wouldn't want to increment the + * refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + + wined3d_texture_sub_resources_destroyed(texture); + texture->resource.parent_ops->wined3d_object_destroyed(texture->resource.parent); + + wined3d_texture_cleanup(&texture_vk->t); + wined3d_cs_destroy_object(device->cs, heap_free, texture_vk); + + if (swapchain_count) + wined3d_device_decref(device); +} + static HRESULT adapter_vk_create_rendertarget_view(const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view) @@ -696,6 +748,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy_swapchain, adapter_vk_create_buffer, adapter_vk_destroy_buffer, + adapter_vk_create_texture, + adapter_vk_destroy_texture, adapter_vk_create_rendertarget_view, adapter_vk_destroy_rendertarget_view, adapter_vk_create_shader_resource_view, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 201a5cf7a09..3c18e0e402e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2428,6 +2428,57 @@ static void adapter_no3d_destroy_buffer(struct wined3d_buffer *buffer) wined3d_device_decref(device); } +static HRESULT adapter_no3d_create_texture(struct wined3d_device *device, + const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, + uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) +{ + struct wined3d_texture *texture_no3d; + HRESULT hr; + + TRACE("device %p, desc %p, layer_count %u, level_count %u, flags %#x, parent %p, parent_ops %p, texture %p.\n", + device, desc, layer_count, level_count, flags, parent, parent_ops, texture); + + if (!(texture_no3d = wined3d_texture_allocate_object_memory(sizeof(*texture_no3d), level_count, layer_count))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_texture_no3d_init(texture_no3d, device, desc, + layer_count, level_count, flags, parent, parent_ops))) + { + WARN("Failed to initialise texture, hr %#x.\n", hr); + heap_free(texture_no3d); + return hr; + } + + TRACE("Created texture %p.\n", texture_no3d); + *texture = texture_no3d; + + return hr; +} + +static void adapter_no3d_destroy_texture(struct wined3d_texture *texture) +{ + struct wined3d_device *device = texture->resource.device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("texture %p.\n", texture); + + /* Take a reference to the device, in case releasing the texture would + * cause the device to be destroyed. However, swapchain resources don't + * take a reference to the device, and we wouldn't want to increment the + * refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + + wined3d_texture_sub_resources_destroyed(texture); + texture->resource.parent_ops->wined3d_object_destroyed(texture->resource.parent); + + wined3d_texture_cleanup(texture); + wined3d_cs_destroy_object(device->cs, heap_free, texture); + + if (swapchain_count) + wined3d_device_decref(device); +} + static HRESULT adapter_no3d_create_rendertarget_view(const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view) @@ -2518,6 +2569,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy_swapchain, adapter_no3d_create_buffer, adapter_no3d_destroy_buffer, + adapter_no3d_create_texture, + adapter_no3d_destroy_texture, adapter_no3d_create_rendertarget_view, adapter_no3d_destroy_rendertarget_view, adapter_no3d_create_shader_resource_view, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 467dd093a45..4d411bf33f2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -32,6 +32,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static const uint32_t wined3d_texture_sysmem_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_USER_MEMORY | WINED3D_LOCATION_BUFFER; +static const struct wined3d_texture_ops texture_gl_ops; struct wined3d_texture_idx { @@ -633,7 +634,7 @@ static void wined3d_texture_gl_allocate_immutable_storage(struct wined3d_texture checkGLcall("allocate immutable storage"); } -static void wined3d_texture_gl_unload_texture(struct wined3d_texture_gl *texture_gl) +void wined3d_texture_gl_unload_texture(struct wined3d_texture_gl *texture_gl) { struct wined3d_device *device = texture_gl->t.resource.device; const struct wined3d_gl_info *gl_info = NULL; @@ -678,7 +679,7 @@ static void wined3d_texture_gl_unload_texture(struct wined3d_texture_gl *texture resource_unload(&texture_gl->t.resource); } -static void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) +void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; struct wined3d_texture_sub_resource *sub_resource; @@ -821,97 +822,6 @@ static void wined3d_texture_destroy_dc(void *object) context_release(context); } -static void wined3d_texture_cleanup(struct wined3d_texture *texture) -{ - unsigned int sub_count = texture->level_count * texture->layer_count; - struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info = NULL; - struct wined3d_context *context = NULL; - struct wined3d_dc_info *dc_info; - GLuint buffer_object; - unsigned int i; - - TRACE("texture %p.\n", texture); - - for (i = 0; i < sub_count; ++i) - { - if (!(buffer_object = texture->sub_resources[i].buffer_object)) - continue; - - TRACE("Deleting buffer object %u.\n", buffer_object); - - /* We may not be able to get a context in wined3d_texture_cleanup() in - * general, but if a buffer object was previously created we can. */ - if (!context) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - } - - GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); - } - - if (context) - context_release(context); - - if ((dc_info = texture->dc_info)) - { - for (i = 0; i < sub_count; ++i) - { - if (dc_info[i].dc) - { - struct wined3d_texture_idx texture_idx = {texture, i}; - - wined3d_texture_destroy_dc(&texture_idx); - } - } - heap_free(dc_info); - } - - if (texture->overlay_info) - { - for (i = 0; i < sub_count; ++i) - { - struct wined3d_overlay_info *info = &texture->overlay_info[i]; - struct wined3d_overlay_info *overlay, *cur; - - list_remove(&info->entry); - LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &info->overlays, struct wined3d_overlay_info, entry) - { - list_remove(&overlay->entry); - } - } - heap_free(texture->overlay_info); - } -} - -static void wined3d_texture_gl_cleanup(struct wined3d_texture_gl *texture_gl) -{ - struct wined3d_device *device = texture_gl->t.resource.device; - struct wined3d_renderbuffer_entry *entry, *entry2; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - if (!list_empty(&texture_gl->renderbuffers)) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture_gl->renderbuffers, struct wined3d_renderbuffer_entry, entry) - { - TRACE("Deleting renderbuffer %u.\n", entry->id); - context_gl_resource_released(device, entry->id, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); - heap_free(entry); - } - - context_release(context); - } - - wined3d_texture_cleanup(&texture_gl->t); - wined3d_texture_gl_unload_texture(texture_gl); -} - void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) { texture->swapchain = swapchain; @@ -1201,20 +1111,83 @@ ULONG CDECL wined3d_texture_incref(struct wined3d_texture *texture) return refcount; } -static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) +static void wined3d_texture_destroy_object(void *object) { - wined3d_texture_sub_resources_destroyed(texture); - resource_cleanup(&texture->resource); - wined3d_resource_wait_idle(&texture->resource); - wined3d_texture_cleanup(texture); + const struct wined3d_gl_info *gl_info = NULL; + struct wined3d_texture *texture = object; + struct wined3d_context *context = NULL; + struct wined3d_dc_info *dc_info; + unsigned int sub_count; + GLuint buffer_object; + unsigned int i; + + TRACE("texture %p.\n", texture); + + sub_count = texture->level_count * texture->layer_count; + for (i = 0; i < sub_count; ++i) + { + if (!(buffer_object = texture->sub_resources[i].buffer_object)) + continue; + + TRACE("Deleting buffer object %u.\n", buffer_object); + + /* We may not be able to get a context in + * wined3d_texture_destroy_object() in general, but if a buffer object + * was previously created we can. */ + if (!context) + { + context = context_acquire(texture->resource.device, NULL, 0); + gl_info = wined3d_context_gl(context)->gl_info; + } + + GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); + } + + if (context) + context_release(context); + + if ((dc_info = texture->dc_info)) + { + for (i = 0; i < sub_count; ++i) + { + if (dc_info[i].dc) + { + struct wined3d_texture_idx texture_idx = {texture, i}; + + wined3d_texture_destroy_dc(&texture_idx); + } + } + heap_free(dc_info); + } + + if (texture->overlay_info) + { + for (i = 0; i < sub_count; ++i) + { + struct wined3d_overlay_info *info = &texture->overlay_info[i]; + struct wined3d_overlay_info *overlay, *cur; + + list_remove(&info->entry); + LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &info->overlays, struct wined3d_overlay_info, entry) + { + list_remove(&overlay->entry); + } + } + heap_free(texture->overlay_info); + } } -static void wined3d_texture_destroy_object(void *object) +void wined3d_texture_cleanup(struct wined3d_texture *texture) { - struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(object); + resource_cleanup(&texture->resource); + wined3d_cs_destroy_object(texture->resource.device->cs, wined3d_texture_destroy_object, texture); +} - wined3d_texture_gl_cleanup(texture_gl); - heap_free(texture_gl); +static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) +{ + wined3d_texture_sub_resources_destroyed(texture); + wined3d_texture_cleanup(texture); + wined3d_resource_wait_idle(&texture->resource); } ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) @@ -1234,13 +1207,10 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) /* Wait for the texture to become idle if it's using user memory, * since the application is allowed to free that memory once the * texture is destroyed. Note that this implies that - * wined3d_texture_destroy_object() can't access that memory either. */ + * the destroy handler can't access that memory either. */ if (texture->user_memory) wined3d_resource_wait_idle(&texture->resource); - wined3d_texture_sub_resources_destroyed(texture); - texture->resource.parent_ops->wined3d_object_destroyed(texture->resource.parent); - resource_cleanup(&texture->resource); - wined3d_cs_destroy_object(texture->resource.device->cs, wined3d_texture_destroy_object, texture); + texture->resource.device->adapter->adapter_ops->adapter_destroy_texture(texture); } return refcount; @@ -1636,10 +1606,13 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT sub_resource->size = texture->slice_pitch; sub_resource->locations = WINED3D_LOCATION_DISCARDED; - if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; - else - wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + if (texture->texture_ops == &texture_gl_ops) + { + if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; + else + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + } if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot && !d3d_info->texture_npot_conditional) @@ -3642,27 +3615,17 @@ HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture return WINED3D_OK; } -static void *wined3d_texture_allocate_object_memory(SIZE_T s, SIZE_T level_count, SIZE_T layer_count) -{ - struct wined3d_texture *t; - - if (level_count > ((~(SIZE_T)0 - s) / sizeof(*t->sub_resources)) / layer_count) - return NULL; - - return heap_alloc_zero(s + level_count * layer_count * sizeof(*t->sub_resources)); -} - -static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, struct wined3d_device *device, +HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, struct wined3d_device *device, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, - DWORD flags, void *parent, const struct wined3d_parent_ops *parent_ops, void *sub_resources) + uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; HRESULT hr; - TRACE("texture_gl %p, device %p, desc %p, layer_count %u, level_count %u, " - "flags %#x, parent %p, parent_ops %p, sub_resources %p.\n", - texture_gl, device, desc, layer_count, level_count, - flags, parent, parent_ops, sub_resources); + TRACE("texture_gl %p, device %p, desc %p, layer_count %u, " + "level_count %u, flags %#x, parent %p, parent_ops %p.\n", + texture_gl, device, desc, layer_count, + level_count, flags, parent, parent_ops); if (!(desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) && layer_count > 1 && !gl_info->supported[EXT_TEXTURE_ARRAY]) @@ -3718,7 +3681,7 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st list_init(&texture_gl->renderbuffers); if (FAILED(hr = wined3d_texture_init(&texture_gl->t, desc, layer_count, level_count, - flags, device, parent, parent_ops, sub_resources, &texture_gl_ops))) + flags, device, parent, parent_ops, &texture_gl[1], &texture_gl_ops))) return hr; if (texture_gl->t.resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) @@ -3732,7 +3695,6 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) { unsigned int sub_count = level_count * layer_count; - struct wined3d_texture_gl *object; unsigned int i; HRESULT hr; @@ -3790,16 +3752,9 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct } } - if (!(object = wined3d_texture_allocate_object_memory(sizeof(*object), level_count, layer_count))) - return E_OUTOFMEMORY; - - if (FAILED(hr = wined3d_texture_gl_init(object, device, desc, layer_count, - level_count, flags, parent, parent_ops, &object[1]))) - { - WARN("Failed to initialize texture, returning %#x.\n", hr); - heap_free(object); + if (FAILED(hr = device->adapter->adapter_ops->adapter_create_texture(device, desc, + layer_count, level_count, flags, parent, parent_ops, texture))) return hr; - } /* FIXME: We'd like to avoid ever allocating system memory for the texture * in this case. */ @@ -3809,14 +3764,13 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { - wined3d_texture_get_level_box(&object->t, i % object->t.level_count, &box); - wined3d_cs_emit_update_sub_resource(device->cs, &object->t.resource, + wined3d_texture_get_level_box(*texture, i % (*texture)->level_count, &box); + wined3d_cs_emit_update_sub_resource(device->cs, &(*texture)->resource, i, &box, data[i].data, data[i].row_pitch, data[i].slice_pitch); } } - TRACE("Created texture %p.\n", object); - *texture = &object->t; + TRACE("Created texture %p.\n", *texture); return WINED3D_OK; } @@ -3993,3 +3947,101 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); } + +static void wined3d_texture_no3d_upload_data(struct wined3d_context *context, + const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format, + const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, + struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_location, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) +{ + FIXME("Not implemented.\n"); +} + +static void wined3d_texture_no3d_download_data(struct wined3d_context *context, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, unsigned int src_location, + const struct wined3d_box *src_box, const struct wined3d_bo_address *dst_bo_addr, + const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch) +{ + FIXME("Not implemented.\n"); +} + +static BOOL wined3d_texture_no3d_load_location(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) +{ + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(location)); + + if (location == WINED3D_LOCATION_USER_MEMORY || location == WINED3D_LOCATION_SYSMEM) + return TRUE; + + ERR("Unhandled location %s.\n", wined3d_debug_location(location)); + + return FALSE; +} + +static const struct wined3d_texture_ops wined3d_texture_no3d_ops = +{ + wined3d_texture_no3d_load_location, + wined3d_texture_no3d_upload_data, + wined3d_texture_no3d_download_data, +}; + +HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct wined3d_device *device, + const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, + uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + TRACE("texture_no3d %p, device %p, desc %p, layer_count %u, " + "level_count %u, flags %#x, parent %p, parent_ops %p.\n", + texture_no3d, device, desc, layer_count, + level_count, flags, parent, parent_ops); + + return wined3d_texture_init(texture_no3d, desc, layer_count, level_count, + flags, device, parent, parent_ops, &texture_no3d[1], &wined3d_texture_no3d_ops); +} + +static void wined3d_texture_vk_upload_data(struct wined3d_context *context, + const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format, + const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, + struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_location, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) +{ + FIXME("Not implemented.\n"); +} + +static void wined3d_texture_vk_download_data(struct wined3d_context *context, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, unsigned int src_location, + const struct wined3d_box *src_box, const struct wined3d_bo_address *dst_bo_addr, + const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch) +{ + FIXME("Not implemented.\n"); +} + +static BOOL wined3d_texture_vk_load_location(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) +{ + FIXME("Not implemented.\n"); + + return FALSE; +} + +static const struct wined3d_texture_ops wined3d_texture_vk_ops = +{ + wined3d_texture_vk_load_location, + wined3d_texture_vk_upload_data, + wined3d_texture_vk_download_data, +}; + +HRESULT wined3d_texture_vk_init(struct wined3d_texture_vk *texture_vk, struct wined3d_device *device, + const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, + uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + TRACE("texture_vk %p, device %p, desc %p, layer_count %u, " + "level_count %u, flags %#x, parent %p, parent_ops %p.\n", + texture_vk, device, desc, layer_count, + level_count, flags, parent, parent_ops); + + return wined3d_texture_init(&texture_vk->t, desc, layer_count, level_count, + flags, device, parent, parent_ops, &texture_vk[1], &wined3d_texture_vk_ops); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 860cf03169d..e81d72b7db3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2788,6 +2788,10 @@ struct wined3d_adapter_ops const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); void (*adapter_destroy_buffer)(struct wined3d_buffer *buffer); + HRESULT (*adapter_create_texture)(struct wined3d_device *device, const struct wined3d_resource_desc *desc, + unsigned int layer_count, unsigned int level_count, uint32_t flags, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture); + void (*adapter_destroy_texture)(struct wined3d_texture *texture); HRESULT (*adapter_create_rendertarget_view)(const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view); @@ -3551,6 +3555,16 @@ struct wined3d_texture } *sub_resources; }; +static inline void *wined3d_texture_allocate_object_memory(SIZE_T s, SIZE_T level_count, SIZE_T layer_count) +{ + struct wined3d_texture *t; + + if (level_count > ((~(SIZE_T)0 - s) / sizeof(*t->sub_resources)) / layer_count) + return NULL; + + return heap_alloc_zero(s + level_count * layer_count * sizeof(*t->sub_resources)); +} + static inline struct wined3d_texture *texture_from_resource(struct wined3d_resource *resource) { return CONTAINING_RECORD(resource, struct wined3d_texture, resource); @@ -3613,6 +3627,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; +void wined3d_texture_cleanup(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; @@ -3629,6 +3644,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) DECLSPEC_HIDDEN; void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -3641,6 +3657,10 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; +HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct wined3d_device *device, + const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, + uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_fixup_desc fixup) DECLSPEC_HIDDEN; struct gl_texture @@ -3709,11 +3729,29 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; +HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, struct wined3d_device *device, + const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, + uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; +void wined3d_texture_gl_unload_texture(struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; + +struct wined3d_texture_vk +{ + struct wined3d_texture t; +}; + +static inline struct wined3d_texture_vk *wined3d_texture_vk(struct wined3d_texture *texture) +{ + return CONTAINING_RECORD(texture, struct wined3d_texture_vk, t); +} + +HRESULT wined3d_texture_vk_init(struct wined3d_texture_vk *texture_vk, struct wined3d_device *device, + const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, + uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; struct wined3d_renderbuffer_entry { -- 2.11.0

1 0

[PATCH 1/6] wtsapi32: Add stubs for WTSEnumerateProcessesEx[AW]
by Alex Henrie 13 Aug '19

13 Aug '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47612 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wtsapi32/wtsapi32.c | 21 +++++++++++++++++++++ dlls/wtsapi32/wtsapi32.spec | 2 ++ 2 files changed, 23 insertions(+) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 2f5e73d05a..72025c3c7a 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -70,6 +70,27 @@ BOOL WINAPI WTSEnableChildSessions(BOOL enable) return TRUE; } + +/************************************************************ + * WTSEnumerateProcessesExW (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateProcessesExW(HANDLE server, DWORD *level, DWORD session_id, WCHAR **info, DWORD *count) +{ + FIXME("Stub %p %p %d %p %p\n", server, level, session_id, info, count); + if (count) *count = 0; + return FALSE; +} + +/************************************************************ + * WTSEnumerateProcessesExA (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateProcessesExA(HANDLE server, DWORD *level, DWORD session_id, char **info, DWORD *count) +{ + FIXME("Stub %p %p %d %p %p\n", server, level, session_id, info, count); + if (count) *count = 0; + return FALSE; +} + /************************************************************ * WTSEnumerateProcessesA (WTSAPI32.@) */ diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index 2b0174177a..5d70da7f3f 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -4,6 +4,8 @@ @ stdcall WTSDisconnectSession(long long long) @ stdcall WTSEnableChildSessions(long) @ stdcall WTSEnumerateProcessesA(long long long ptr ptr) +@ stdcall WTSEnumerateProcessesExA(ptr ptr long ptr ptr) +@ stdcall WTSEnumerateProcessesExW(ptr ptr long ptr ptr) @ stdcall WTSEnumerateProcessesW(long long long ptr ptr) @ stdcall WTSEnumerateServersA(ptr long long ptr ptr) @ stdcall WTSEnumerateServersW(ptr long long ptr ptr) -- 2.22.0

1 5

[PATCH] wlanui: Add DLL
by Alex Henrie 13 Aug '19

13 Aug '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47611 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/wlanui/Makefile.in | 6 ++++++ dlls/wlanui/main.c | 43 +++++++++++++++++++++++++++++++++++++++++ dlls/wlanui/wlanui.spec | 6 ++++++ 5 files changed, 57 insertions(+) create mode 100644 dlls/wlanui/Makefile.in create mode 100644 dlls/wlanui/main.c create mode 100644 dlls/wlanui/wlanui.spec diff --git a/configure b/configure index 045f02739c..3a8e7f4257 100755 --- a/configure +++ b/configure @@ -20781,6 +20781,7 @@ wine_fn_config_makefile dlls/wintrust/tests enable_tests wine_fn_config_makefile dlls/winusb enable_winusb wine_fn_config_makefile dlls/wlanapi enable_wlanapi wine_fn_config_makefile dlls/wlanapi/tests enable_tests +wine_fn_config_makefile dlls/wlanui enable_wlanui wine_fn_config_makefile dlls/wldap32 enable_wldap32 wine_fn_config_makefile dlls/wldap32/tests enable_tests wine_fn_config_makefile dlls/wmasf enable_wmasf diff --git a/configure.ac b/configure.ac index c58d34330e..59d5fa662a 100644 --- a/configure.ac +++ b/configure.ac @@ -3765,6 +3765,7 @@ WINE_CONFIG_MAKEFILE(dlls/wintrust/tests) WINE_CONFIG_MAKEFILE(dlls/winusb) WINE_CONFIG_MAKEFILE(dlls/wlanapi) WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests) +WINE_CONFIG_MAKEFILE(dlls/wlanui) WINE_CONFIG_MAKEFILE(dlls/wldap32) WINE_CONFIG_MAKEFILE(dlls/wldap32/tests) WINE_CONFIG_MAKEFILE(dlls/wmasf) diff --git a/dlls/wlanui/Makefile.in b/dlls/wlanui/Makefile.in new file mode 100644 index 0000000000..a78f40f53b --- /dev/null +++ b/dlls/wlanui/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wlanui.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/wlanui/main.c b/dlls/wlanui/main.c new file mode 100644 index 0000000000..8e8278d039 --- /dev/null +++ b/dlls/wlanui/main.c @@ -0,0 +1,43 @@ +/* + * Wireless Local Area Network User Interface + * + * Copyright 2019 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wlanui); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/wlanui/wlanui.spec b/dlls/wlanui/wlanui.spec new file mode 100644 index 0000000000..92161f0de8 --- /dev/null +++ b/dlls/wlanui/wlanui.spec @@ -0,0 +1,6 @@ +@ stub DllGetClassObject +@ stub WLFreeProfile +@ stub WLFreeProfileXml +@ stub WLInvokeProfileUI +@ stub WLInvokeProfileUIFromXMLFile +@ stub WlanUIEditProfile -- 2.22.0

1 0

[PATCH v2] comctl32: Dont report current state when no state changes.
by Alistair Leslie-Hughes 13 Aug '19

13 Aug '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comctl32/listview.c | 7 +++-- dlls/comctl32/tests/listview.c | 51 ++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2717812d0b..5bc4997922 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4259,8 +4259,11 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL memset(&nmlv, 0, sizeof(NMLISTVIEW)); nmlv.iItem = lpLVItem->iItem; - nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); - nmlv.uOldState = item.state; + if(lpLVItem->mask & LVIF_STATE) + { + nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); + nmlv.uOldState = item.state; + } nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 48612db54f..f50c17e72f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3473,6 +3473,56 @@ static void test_ownerdata(void) DestroyWindow(hwnd); } +static void test_itemdatachange(void) +{ + static const DWORD styles[] = { LVS_ICON, LVS_LIST, LVS_REPORT, LVS_SMALLICON }; + LVITEMA item; + HWND hwnd; + DWORD res; + int i; + + for(i =0; i < ARRAY_SIZE(styles); i++) + { + hwnd = create_listview_control(styles[i]); + + insert_item(hwnd, 0); + + memset(&g_nmlistview, 0xcc, sizeof(g_nmlistview)); + memset(&item, 0, sizeof(item)); + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + + ok(g_nmlistview.iItem == 0, "got item %d\n", g_nmlistview.iItem); + ok(g_nmlistview.iSubItem == 0, "got subitem %d\n", g_nmlistview.iSubItem); + ok(g_nmlistview.uNewState == LVIS_SELECTED, "got new state 0x%08x\n", g_nmlistview.uNewState); + ok(g_nmlistview.uOldState == 0, "got old state 0x%08x\n", g_nmlistview.uOldState); + ok(g_nmlistview.uChanged == LVIF_STATE, "got changed 0x%08x\n", g_nmlistview.uChanged); + ok(g_nmlistview.ptAction.x == 0 && g_nmlistview.ptAction.y == 0, "got wrong ptAction value\n"); + ok(g_nmlistview.lParam == 0, "got wrong lparam %d\n", g_nmlistview.lParam); + + memset(&g_nmlistview, 0xcc, sizeof(g_nmlistview)); + memset(&item, 0, sizeof(item)); + item.iItem = 0; + item.lParam = 11; + item.mask = LVIF_PARAM; + res = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, res); + + ok(g_nmlistview.iItem == 0, "got item %d\n", g_nmlistview.iItem); + ok(g_nmlistview.iSubItem == 0, "got subitem %d\n", g_nmlistview.iSubItem); + ok(g_nmlistview.uNewState == 0, "got new state 0x%08x\n", g_nmlistview.uNewState); + ok(g_nmlistview.uOldState == 0, "got old state 0x%08x\n", g_nmlistview.uOldState); + ok(g_nmlistview.uChanged == LVIF_PARAM, "got changed 0x%08x\n", g_nmlistview.uChanged); + ok(g_nmlistview.ptAction.x == 0 && g_nmlistview.ptAction.y == 0, "got wrong ptAction value\n"); + ok(g_nmlistview.lParam == 11, "got wrong lparam %d\n", g_nmlistview.lParam); + + DestroyWindow(hwnd); + } +} + static void test_norecompute(void) { static CHAR testA[] = "test"; @@ -6492,6 +6542,7 @@ START_TEST(listview) test_sorting(); test_ownerdata(); test_norecompute(); + test_itemdatachange(); test_nosortheader(); test_setredraw(); test_hittest(); -- 2.17.1

1 0