July 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : include: Add strongname.h.
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: 274829691818f44cf115b21200ddd0cc34445243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=274829691818f44cf115b212… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 11 14:23:44 2019 -0500 include: Add strongname.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/strongname.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 6913587..7ca25e2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -612,6 +612,7 @@ SOURCES = \ sti.h \ storage.h \ strmif.idl \ + strongname.h \ strsafe.h \ structuredquerycondition.idl \ svrapi.h \ diff --git a/include/strongname.h b/include/strongname.h new file mode 100644 index 0000000..f05861a --- /dev/null +++ b/include/strongname.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2019 Zebediah Figura for CodeWeavers + * + * 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 + */ + +#ifndef __STRONG_NAME_H +#define __STRONG_NAME_H + +#include <windows.h> +#include <wincrypt.h> +#include <ole2.h> +#include <corerror.h> + +#define SN_INFLAG_FORCE_VER 0x00000001 +#define SN_INFLAG_INSTALL 0x00000002 +#define SN_INFLAG_ADMIN_ACCESS 0x00000004 +#define SN_INFLAG_USER_ACCESS 0x00000008 +#define SN_INFLAG_ALL_ACCESS 0x00000010 +#define SN_INFLAG_RUNTIME 0x80000000 + +#define SN_OUTFLAG_WAS_VERIFIED 0x00000001 + +BOOLEAN __stdcall StrongNameSignatureVerification(const WCHAR *path, DWORD flags, DWORD *ret_flags); +BOOLEAN __stdcall StrongNameSignatureVerificationEx(const WCHAR *path, BOOLEAN force, BOOLEAN *verified); + +#endif

1 0

Serge Gautherie : kernel32/tests: Test QueryFullProcessImageNameW() flags.
by Alexandre Julliard July 31, 2019

July 31, 2019

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

Zebediah Figura : d3dcompiler: Parse type name strings.
by Alexandre Julliard July 31, 2019

July 31, 2019

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

Conor McCarthy : wined3d: Track windows styles per-swapchain.
by Alexandre Julliard July 31, 2019

July 31, 2019

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

Francois Gouget : xaudio2: Fix the optional FAudio functions check.
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: 55e09533db40f10ba3843d5b1736f9786f2fb5b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e09533db40f10ba3843d5b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 30 18:39:28 2019 +0200 xaudio2: Fix the optional FAudio functions check. WINE_CHECK_LIB_FUNCS() must be called in WINE_PACKAGE_FLAGS()'s checks parameter so this happens before CAUDIO_{FLAGS,LIBS} have been mangled for use by makefiles. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 ++++++++-------- configure.ac | 9 ++++----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 177c834..ed56167 100755 --- a/configure +++ b/configure @@ -15004,15 +15004,10 @@ fi done -CPPFLAGS=$ac_save_CPPFLAGS -test -z "$FAUDIO_CFLAGS" || FAUDIO_CFLAGS=`echo " $FAUDIO_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` -test -z "$FAUDIO_LIBS" || FAUDIO_LIBS=`echo " $FAUDIO_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` - - ac_wine_check_funcs_save_LIBS="$LIBS" + ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $FAUDIO_LIBS" -for ac_func in \ - FAudio_CommitOperationSet \ - F3DAudioInitialize8 +for ac_func in FAudio_CommitOperationSet \ + F3DAudioInitialize8 do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -15025,6 +15020,11 @@ fi done LIBS="$ac_wine_check_funcs_save_LIBS" + +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$FAUDIO_CFLAGS" || FAUDIO_CFLAGS=`echo " $FAUDIO_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$FAUDIO_LIBS" || FAUDIO_LIBS=`echo " $FAUDIO_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$ac_cv_lib_soname_FAudio" = "x"; then : case "x$with_faudio" in diff --git a/configure.ac b/configure.ac index a2cd2c7..0fe2602 100644 --- a/configure.ac +++ b/configure.ac @@ -1691,11 +1691,10 @@ if test "x$with_faudio" != "xno" then WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, [AC_CHECK_HEADERS([FAudio.h], - [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])])]) - WINE_CHECK_LIB_FUNCS(\ - FAudio_CommitOperationSet \ - F3DAudioInitialize8, - [$FAUDIO_LIBS]) + [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) + WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \ + F3DAudioInitialize8], [$FAUDIO_LIBS]) + ]) fi WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], [libFAudio ${notice_platform}development files not found, XAudio2 won't be supported.])

1 0

Henri Verbeet : wined3d: Filter messages per-window instead of per-device.
by Alexandre Julliard July 31, 2019

July 31, 2019

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: Acquire front-buffer contexts when blitting to the drawable in texture2d_blt_fbo ().
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: 96a0a54c5252b80dc30a50e1ec1b89557ef8d623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96a0a54c5252b80dc30a50e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 15:32:47 2019 +0430 wined3d: Acquire front-buffer contexts when blitting to the drawable in texture2d_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3668c61..7d7dd25 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -147,9 +147,9 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co const RECT *dst_rect) { struct wined3d_texture *required_texture, *restore_texture; - unsigned int required_idx, restore_idx; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; + unsigned int restore_idx; GLenum gl_filter; GLenum buffer; RECT s, d; @@ -192,26 +192,21 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + /* Acquire a context for the front-buffer, even though we may be blitting + * to/from a back-buffer. Since context_acquire() doesn't take the + * resource location into account, it may consider the back-buffer to be + * offscreen. */ if (src_location == WINED3D_LOCATION_DRAWABLE) - { - required_texture = src_texture; - required_idx = src_sub_resource_idx; - } + required_texture = src_texture->swapchain->front_buffer; else if (dst_location == WINED3D_LOCATION_DRAWABLE) - { - required_texture = dst_texture; - required_idx = dst_sub_resource_idx; - } + required_texture = dst_texture->swapchain->front_buffer; else - { required_texture = NULL; - required_idx = 0; - } restore_texture = context->current_rt.texture; restore_idx = context->current_rt.sub_resource_idx; - if (restore_texture != required_texture || restore_idx != required_idx) - context = context_acquire(device, required_texture, required_idx); + if (restore_texture != required_texture) + context = context_acquire(device, required_texture, 0); else restore_texture = NULL;

1 0

Jeff Smith : d3drm: Check for NULL pointer in d3drm_viewport2_GetDevice().
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: wine Branch: master Commit: 76a7fe59ebc0f53073715477bed2c7dc31e03e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a7fe59ebc0f53073715477… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 8 10:19:43 2019 -0500 d3drm: Check for NULL pointer in d3drm_viewport2_GetDevice(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++++ dlls/d3drm/viewport.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8667819..67696d5 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2153,6 +2153,8 @@ static void test_Viewport(void) hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMViewport_GetDevice(viewport, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport_Release(viewport); ref4 = get_refcount((IUnknown *)d3drm1); @@ -2241,6 +2243,8 @@ static void test_Viewport(void) hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport2_Release(viewport2); ref4 = get_refcount((IUnknown *)d3drm1); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 51174cd..d049f37 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -683,6 +683,9 @@ static HRESULT WINAPI d3drm_viewport2_GetDevice(IDirect3DRMViewport2 *iface, IDi TRACE("iface %p, device %p.\n", iface, device); + if (!device) + return D3DRMERR_BADVALUE; + if (!viewport->device) return D3DRMERR_BADOBJECT; @@ -698,6 +701,9 @@ static HRESULT WINAPI d3drm_viewport1_GetDevice(IDirect3DRMViewport *iface, IDir TRACE("iface %p, device %p.\n\n", iface, device); + if (!device) + return D3DRMERR_BADVALUE; + if (!viewport->device) return D3DRMERR_BADOBJECT;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context structure to wined3d_vertex_pipe_ops.vp_enable().
by Alexandre Julliard July 31, 2019

July 31, 2019

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 July 31, 2019

July 31, 2019

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