wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Serge Gautherie : kernel32/tests: Test QueryFullProcessImageNameW() flags.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 7e0acf14ccf0a430cefaaa9533098b4507ba6872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e0acf14ccf0a430cefaaa95… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Jul 9 14:01:18 2019 +0200 kernel32/tests: Test QueryFullProcessImageNameW() flags. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c593ebe..cba0a3f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1978,6 +1978,7 @@ static void test_QueryFullProcessImageNameW(void) WCHAR deviceW[] = {'\\','D', 'e','v','i','c','e',0}; WCHAR buf[1024]; DWORD size, len; + DWORD flags; if (!pQueryFullProcessImageNameW) { @@ -2031,6 +2032,33 @@ static void test_QueryFullProcessImageNameW(void) expect_eq_d(ERROR_INSUFFICIENT_BUFFER, GetLastError()); expect_eq_ws_i(module_name, buf); /* buffer not changed */ + /* Invalid flags - a few arbitrary values only */ + for (flags = 2; flags <= 15; ++flags) + { + size = ARRAY_SIZE(buf); + SetLastError(0xdeadbeef); + *(DWORD*)buf = 0x13579acf; + todo_wine + { + expect_eq_d(FALSE, pQueryFullProcessImageNameW(hSelf, flags, buf, &size)); + expect_eq_d(ARRAY_SIZE(buf), size); /* size not changed */ + expect_eq_d(ERROR_INVALID_PARAMETER, GetLastError()); + expect_eq_d(0x13579acf, *(DWORD*)buf); /* buffer not changed */ + } + } + for (flags = 16; flags != 0; flags <<= 1) + { + size = ARRAY_SIZE(buf); + SetLastError(0xdeadbeef); + *(DWORD*)buf = 0x13579acf; + todo_wine + { + expect_eq_d(FALSE, pQueryFullProcessImageNameW(hSelf, flags, buf, &size)); + expect_eq_d(ARRAY_SIZE(buf), size); /* size not changed */ + expect_eq_d(ERROR_INVALID_PARAMETER, GetLastError()); + expect_eq_d(0x13579acf, *(DWORD*)buf); /* buffer not changed */ + } + } /* native path */ size = ARRAY_SIZE(buf);

1 0

Gabriel Ivăncescu : ntdll: Define AT_NO_AUTOMOUNT if needed.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: ec4752cef24d3574ef275e992bace488fb1b0e8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec4752cef24d3574ef275e99… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jul 9 14:19:01 2019 +0300 ntdll: Define AT_NO_AUTOMOUNT if needed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47445 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b50d41b..e3f805a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -142,6 +142,10 @@ typedef struct # define O_DIRECTORY 0200000 /* must be directory */ #endif +#ifndef AT_NO_AUTOMOUNT +#define AT_NO_AUTOMOUNT 0x800 +#endif + #endif /* linux */ #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')

1 0

Zebediah Figura : d3dcompiler: Parse type name strings.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 72b74d7cdc31b8ac0e29faba82f1e18ab07db3f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72b74d7cdc31b8ac0e29faba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 29 12:44:17 2019 -0500 d3dcompiler: Parse type name strings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 15 +++++++++++++++ dlls/d3dcompiler_43/tests/reflection.c | 12 +++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e492011..b163fca 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -51,6 +51,7 @@ struct d3dcompiler_shader_reflection_type D3D11_SHADER_TYPE_DESC desc; struct d3dcompiler_shader_reflection_type_member *members; + char *name; }; struct d3dcompiler_shader_reflection_type_member @@ -222,6 +223,7 @@ static void d3dcompiler_shader_reflection_type_destroy(struct wine_rb_entry *ent HeapFree(GetProcessHeap(), 0, t->members); } + heap_free(t->name); HeapFree(GetProcessHeap(), 0, t); } @@ -1244,6 +1246,19 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type } } + if ((type->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) + { + read_dword(&ptr, &offset); + if (!copy_name(data + offset, &type->name)) + { + ERR("Failed to copy name.\n"); + heap_free(members); + return E_OUTOFMEMORY; + } + desc->Name = type->name; + TRACE("Type name: %s.\n", debugstr_a(type->name)); + } + type->members = members; return S_OK; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 2c1c902..1b9d2d4 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1207,11 +1207,11 @@ static const struct { static const D3D11_SHADER_TYPE_DESC test_reflection_constant_buffer_type_result[] = { - {D3D11_SVC_INTERFACE_POINTER, D3D11_SVT_INTERFACE_POINTER, 1, 4, 0, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 1, 0}, - {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 2, 0, 1, 0}, + {D3D11_SVC_INTERFACE_POINTER, D3D11_SVT_INTERFACE_POINTER, 1, 4, 0, 1, 0, "iTest"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 1, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 1, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 1, 0, "int"}, + {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 2, 0, 1, 0, "s"}, }; static void test_reflection_constant_buffer(void) @@ -1459,6 +1459,8 @@ static void test_reflection_constant_buffer(void) i, tdesc.Elements, ptdesc->Elements); ok(tdesc.Offset == ptdesc->Offset, "GetDesc(%u) Offset failed, got %u, expected %u\n", i, tdesc.Offset, ptdesc->Offset); + ok(!strcmp(tdesc.Name, ptdesc->Name), "GetDesc(%u) Name failed, got %s, expected %s\n", + i, tdesc.Name, ptdesc->Name); } /* types */

1 0

Henri Verbeet : wined3d: Move the "desc" field from struct wined3d_swapchain to struct wined3d_swapchain_state.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: bed677e34316595c6ade72c6871c396a455c26a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bed677e34316595c6ade72c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 16:18:55 2019 +0430 wined3d: Move the "desc" field from struct wined3d_swapchain to struct wined3d_swapchain_state. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +- dlls/wined3d/device.c | 67 ++++++++++--------- dlls/wined3d/surface.c | 6 +- dlls/wined3d/swapchain.c | 147 +++++++++++++++++++++-------------------- dlls/wined3d/view.c | 10 +-- dlls/wined3d/wined3d_private.h | 3 +- 6 files changed, 123 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bed677e34316595c6ade…

1 0

Conor McCarthy : wined3d: Track windows styles per-swapchain.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 3fc96a5d3586c756bda50fe6caa023cb44e0300c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fc96a5d3586c756bda50fe6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jul 29 16:18:54 2019 +0430 wined3d: Track windows styles per-swapchain. Instead of per-device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 134 ++++------------------------------------- dlls/wined3d/swapchain.c | 122 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 21 ++++--- 3 files changed, 141 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3fc96a5d3586c756bda5…

1 0

Henri Verbeet : wined3d: Filter messages per-window instead of per-device.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 0521cc0b8b49affe86d1e4687ea5fb39650b09f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0521cc0b8b49affe86d1e468… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 16:18:53 2019 +0430 wined3d: Filter messages per-window instead of per-device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 24 ++++++------------------ dlls/wined3d/swapchain.c | 34 ++++++++++++++++------------------ dlls/wined3d/wined3d_main.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 60 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 343e25b..71242bb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -930,8 +930,8 @@ static LONG fullscreen_exstyle(LONG exstyle) HRESULT wined3d_device_setup_fullscreen_window(struct wined3d_device *device, HWND window, unsigned int w, unsigned int h) { - BOOL filter_messages; LONG style, exstyle; + BOOL filter; TRACE("Setting up window %p for fullscreen mode.\n", window); @@ -956,14 +956,13 @@ HRESULT wined3d_device_setup_fullscreen_window(struct wined3d_device *device, TRACE("Old style was %08x, %08x, setting to %08x, %08x.\n", device->style, device->exStyle, style, exstyle); - filter_messages = device->filter_messages; - device->filter_messages = TRUE; + filter = wined3d_filter_messages(window, TRUE); SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); - device->filter_messages = filter_messages; + wined3d_filter_messages(window, filter); return WINED3D_OK; } @@ -972,9 +971,9 @@ void wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, const RECT *window_rect) { unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE; - BOOL filter_messages; LONG style, exstyle; RECT rect = {0}; + BOOL filter; if (!device->style && !device->exStyle) return; @@ -994,8 +993,7 @@ void wined3d_device_restore_fullscreen_window(struct wined3d_device *device, TRACE("Restoring window style of window %p to %08x, %08x.\n", window, device->style, device->exStyle); - filter_messages = device->filter_messages; - device->filter_messages = TRUE; + filter = wined3d_filter_messages(window, TRUE); /* Only restore the style if the application didn't modify it during the * fullscreen phase. Some applications change it before calling Reset() @@ -1014,7 +1012,7 @@ void wined3d_device_restore_fullscreen_window(struct wined3d_device *device, SetWindowPos(window, 0, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, window_pos_flags); - device->filter_messages = filter_messages; + wined3d_filter_messages(window, filter); /* Delete the old values. */ device->style = 0; @@ -5994,16 +5992,6 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { - if (device->filter_messages && message != WM_DISPLAYCHANGE) - { - TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", - window, message, wparam, lparam); - if (unicode) - return DefWindowProcW(window, message, wparam, lparam); - else - return DefWindowProcA(window, message, wparam, lparam); - } - if (message == WM_DESTROY) { TRACE("unregister window %p.\n", window); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 366ce80..d08ddf0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1148,16 +1148,16 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) { struct wined3d_device *device = swapchain->device; - BOOL filter_messages = device->filter_messages; - BOOL focus_messages = device->wined3d->flags & WINED3D_FOCUS_MESSAGES; + HWND window = swapchain->device_window; + BOOL focus_messages, filter; /* This code is not protected by the wined3d mutex, so it may run while * wined3d_device_reset is active. Testing on Windows shows that changing * focus during resets and resetting during focus change events causes * the application to crash with an invalid memory access. */ - if (!focus_messages) - device->filter_messages = 1; + if (!(focus_messages = device->wined3d->flags & WINED3D_FOCUS_MESSAGES)) + filter = wined3d_filter_messages(window, TRUE); if (activate) { @@ -1170,9 +1170,8 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa * * Guild Wars 1 wants a WINDOWPOSCHANGED message on the device window to * resume drawing after a focus loss. */ - SetWindowPos(swapchain->device_window, NULL, 0, 0, - swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, - SWP_NOACTIVATE | SWP_NOZORDER); + SetWindowPos(window, NULL, 0, 0, swapchain->desc.backbuffer_width, + swapchain->desc.backbuffer_height, SWP_NOACTIVATE | SWP_NOZORDER); } if (device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) @@ -1204,13 +1203,12 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if (swapchain == device->swapchains[0]) device->device_parent->ops->activate(device->device_parent, FALSE); - if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES) - && IsWindowVisible(swapchain->device_window)) - ShowWindow(swapchain->device_window, SW_MINIMIZE); + if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES) && IsWindowVisible(window)) + ShowWindow(window, SW_MINIMIZE); } if (!focus_messages) - device->filter_messages = filter_messages; + wined3d_filter_messages(window, filter); } HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, @@ -1454,14 +1452,14 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha } else { - /* Fullscreen -> fullscreen mode change */ - BOOL filter_messages = device->filter_messages; - device->filter_messages = TRUE; + HWND window = swapchain->device_window; + BOOL filter; - MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); - ShowWindow(swapchain->device_window, SW_SHOW); - - device->filter_messages = filter_messages; + /* Fullscreen -> fullscreen mode change */ + filter = wined3d_filter_messages(window, TRUE); + MoveWindow(window, 0, 0, width, height, TRUE); + ShowWindow(window, SW_SHOW); + wined3d_filter_messages(window, filter); } swapchain->d3d_mode = actual_mode; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 716a2b0..2d74d6f 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -36,6 +36,7 @@ struct wined3d_wndproc struct wined3d *wined3d; HWND window; BOOL unicode; + BOOL filter; WNDPROC proc; struct wined3d_device *device; uint32_t flags; @@ -474,11 +475,32 @@ static struct wined3d_wndproc *wined3d_find_wndproc(HWND window, struct wined3d return NULL; } +BOOL wined3d_filter_messages(HWND window, BOOL filter) +{ + struct wined3d_wndproc *entry; + BOOL ret; + + wined3d_wndproc_mutex_lock(); + + if (!(entry = wined3d_find_wndproc(window, NULL))) + { + wined3d_wndproc_mutex_unlock(); + return FALSE; + } + + ret = entry->filter; + entry->filter = filter; + + wined3d_wndproc_mutex_unlock(); + + return ret; +} + static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) { struct wined3d_wndproc *entry; struct wined3d_device *device; - BOOL unicode; + BOOL unicode, filter; WNDPROC proc; wined3d_wndproc_mutex_lock(); @@ -492,11 +514,24 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam device = entry->device; unicode = entry->unicode; + filter = entry->filter; proc = entry->proc; wined3d_wndproc_mutex_unlock(); if (device) + { + if (filter && message != WM_DISPLAYCHANGE) + { + TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", + window, message, wparam, lparam); + + if (unicode) + return DefWindowProcW(window, message, wparam, lparam); + return DefWindowProcA(window, message, wparam, lparam); + } + return device_process_message(device, window, unicode, message, wparam, lparam, proc); + } if (unicode) return CallWindowProcW(proc, window, message, wparam, lparam); return CallWindowProcA(proc, window, message, wparam, lparam); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8539290..d62774c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2993,6 +2993,7 @@ struct wined3d struct wined3d_adapter *adapters[1]; }; +BOOL wined3d_filter_messages(HWND window, BOOL filter) DECLSPEC_HIDDEN; void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -3183,8 +3184,7 @@ struct wined3d_device BYTE d3d_initialized : 1; BYTE inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ BYTE softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ - BYTE filter_messages : 1; - BYTE padding : 3; + BYTE padding : 4; unsigned char surface_alignment; /* Line Alignment of surfaces */

1 0

Henri Verbeet : wined3d: Setup/ restore fullscreen window state inside wined3d.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 5f96c5e26481bab17b5d0db9abf2b4f1c5af26e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f96c5e26481bab17b5d0db9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 16:18:52 2019 +0430 wined3d: Setup/restore fullscreen window state inside wined3d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 10 +--------- dlls/d3d9/device.c | 10 ---------- dlls/ddraw/ddraw.c | 15 --------------- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/swapchain.c | 27 +++++++++++++++++++-------- dlls/wined3d/wined3d.spec | 2 -- dlls/wined3d/wined3d_private.h | 4 ++++ include/wine/wined3d.h | 4 ---- 8 files changed, 27 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f96c5e26481bab17b5d…

1 0

Kristján Gerhardsson : wined3d: Add GPU information for various Mac GPUs.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: f49b27ce22c4869eefbac7b4c2f62f9caf828fd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f49b27ce22c4869eefbac7b4… Author: Kristján Gerhardsson <kristjang(a)ccpgames.com> Date: Mon Jul 29 16:18:51 2019 +0430 wined3d: Add GPU information for various Mac GPUs. Signed-off-by: Kristjan Gerhardsson <kristjang(a)ccpgames.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/directx.c | 17 +++++++++++++++-- dlls/wined3d/wined3d_private.h | 17 +++++++++++++++-- 3 files changed, 32 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f49b27ce22c4869eefba…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context structure to wined3d_vertex_pipe_ops.vp_enable().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: e8d86d43a861218cbfebe25686ab1295355bab3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8d86d43a861218cbfebe256… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 15:32:50 2019 +0430 wined3d: Pass a wined3d_context structure to wined3d_vertex_pipe_ops.vp_enable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/state.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0628c7c..f91ff87 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4659,7 +4659,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id)); checkGLcall("glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id);"); - priv->vertex_pipe->vp_enable(gl_info, FALSE); + priv->vertex_pipe->vp_enable(context, FALSE); /* Enable OpenGL vertex programs */ gl_info->gl_ops.gl.p_glEnable(GL_VERTEX_PROGRAM_ARB); @@ -4690,7 +4690,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context gl_info->gl_ops.gl.p_glDisable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glDisable(GL_VERTEX_PROGRAM_ARB)"); } - priv->vertex_pipe->vp_enable(gl_info, TRUE); + priv->vertex_pipe->vp_enable(context, TRUE); } } @@ -4720,7 +4720,7 @@ static void shader_arb_disable(void *shader_priv, struct wined3d_context *contex gl_info->gl_ops.gl.p_glDisable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glDisable(GL_VERTEX_PROGRAM_ARB)"); } - priv->vertex_pipe->vp_enable(gl_info, FALSE); + priv->vertex_pipe->vp_enable(context, FALSE); if (gl_info->supported[ARB_COLOR_BUFFER_FLOAT] && priv->last_vs_color_unclamp) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 89a34c8..d500329 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10553,7 +10553,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex GLenum current_vertex_color_clamp; GLuint program_id, prev_id; - priv->vertex_pipe->vp_enable(gl_info, !use_vs(state)); + priv->vertex_pipe->vp_enable(context, !use_vs(state)); priv->fragment_pipe->enable_extension(gl_info, !use_ps(state)); prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; @@ -10655,7 +10655,7 @@ static void shader_glsl_disable(void *shader_priv, struct wined3d_context *conte GL_EXTCALL(glUseProgram(0)); checkGLcall("glUseProgram"); - priv->vertex_pipe->vp_enable(gl_info, FALSE); + priv->vertex_pipe->vp_enable(context, FALSE); priv->fragment_pipe->enable_extension(gl_info, FALSE); if (needs_legacy_glsl_syntax(gl_info) && gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) @@ -11399,7 +11399,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = shader_glsl_has_ffp_proj_control, }; -static void glsl_vertex_pipe_vp_enable(const struct wined3d_gl_info *gl_info, BOOL enable) {} +static void glsl_vertex_pipe_vp_enable(const struct wined3d_context *context, BOOL enable) {} static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c233059..e0055f6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3188,7 +3188,7 @@ static void shader_none_select(void *shader_priv, struct wined3d_context *contex const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_none_priv *priv = shader_priv; - priv->vertex_pipe->vp_enable(gl_info, !use_vs(state)); + priv->vertex_pipe->vp_enable(context, !use_vs(state)); priv->fragment_pipe->enable_extension(gl_info, !use_ps(state)); } @@ -3198,7 +3198,7 @@ static void shader_none_disable(void *shader_priv, struct wined3d_context *conte struct shader_none_priv *priv = shader_priv; const struct wined3d_gl_info *gl_info = context->gl_info; - priv->vertex_pipe->vp_enable(gl_info, FALSE); + priv->vertex_pipe->vp_enable(context, FALSE); priv->fragment_pipe->enable_extension(gl_info, FALSE); context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 06b30ba..6df20a4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5187,6 +5187,7 @@ static const struct wined3d_state_entry_template ffp_fragmentstate_template[] = /* Context activation is done by the caller. */ static void ffp_enable(const struct wined3d_gl_info *gl_info, BOOL enable) {} +static void ffp_pipe_enable(const struct wined3d_context *context, BOOL enable) {} static void *ffp_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { @@ -5225,7 +5226,7 @@ static DWORD vp_ffp_get_emul_mask(const struct wined3d_gl_info *gl_info) const struct wined3d_vertex_pipe_ops ffp_vertex_pipe = { - ffp_enable, + ffp_pipe_enable, vp_ffp_get_caps, vp_ffp_get_emul_mask, ffp_alloc, @@ -5309,6 +5310,7 @@ const struct fragment_pipeline ffp_fragment_pipeline = { }; static void none_enable(const struct wined3d_gl_info *gl_info, BOOL enable) {} +static void none_pipe_enable(const struct wined3d_context *context, BOOL enable) {} static void *none_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { @@ -5329,7 +5331,7 @@ static DWORD vp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) const struct wined3d_vertex_pipe_ops none_vertex_pipe = { - none_enable, + none_pipe_enable, vp_none_get_caps, vp_none_get_emul_mask, none_alloc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b959a28..801b467 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2188,7 +2188,7 @@ struct wined3d_vertex_caps struct wined3d_vertex_pipe_ops { - void (*vp_enable)(const struct wined3d_gl_info *gl_info, BOOL enable); + void (*vp_enable)(const struct wined3d_context *context, BOOL enable); void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps); DWORD (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to arbfp_free_ffpshader().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: d53643ca1dd683fe9f0635c739be3125caf67a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d53643ca1dd683fe9f0635c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 15:32:49 2019 +0430 wined3d: Pass a wined3d_context_gl structure to arbfp_free_ffpshader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 15d13a2..0628c7c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5722,10 +5722,10 @@ static void *arbfp_alloc(const struct wined3d_shader_backend_ops *shader_backend static void arbfp_free_ffpshader(struct wine_rb_entry *entry, void *param) { struct arbfp_ffp_desc *entry_arb = WINE_RB_ENTRY_VALUE(entry, struct arbfp_ffp_desc, parent.entry); - struct wined3d_context *context = param; + struct wined3d_context_gl *context_gl = param; const struct wined3d_gl_info *gl_info; - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glDeleteProgramsARB(1, &entry_arb->shader)); checkGLcall("delete ffp program"); heap_free(entry_arb); @@ -5734,9 +5734,10 @@ static void arbfp_free_ffpshader(struct wine_rb_entry *entry, void *param) /* Context activation is done by the caller. */ static void arbfp_free(struct wined3d_device *device, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct shader_arb_priv *priv = device->fragment_priv; - wine_rb_destroy(&priv->fragment_shaders, arbfp_free_ffpshader, context); + wine_rb_destroy(&priv->fragment_shaders, arbfp_free_ffpshader, context_gl); priv->use_arbfp_fixed_func = FALSE; if (device->shader_backend != &arb_program_shader_backend)

1 0

← Newer
1
2
3
4
5
6
7
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2019