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

[PATCH] taskmgr: use StrFormatKBSizeW to show memory usage
by Vijay Kiran Kamuju 03 Apr '19

03 Apr '19

Superceeds Patch# 162216 From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/taskmgr/Makefile.in | 2 +- programs/taskmgr/graph.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 48313e93e66..e0f4daebe24 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -1,6 +1,6 @@ MODULE = taskmgr.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = shell32 comctl32 user32 gdi32 advapi32 +IMPORTS = shell32 comctl32 user32 gdi32 advapi32 shlwapi C_SRCS = \ about.c \ diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 7e978e16f7a..f5190a101e9 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -26,6 +26,7 @@ #include <windows.h> #include <commctrl.h> +#include <shlwapi.h> #include <winnt.h> #include "taskmgr.h" @@ -239,8 +240,6 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* Top bars that are "unused", i.e. are dark green, representing free memory */ int i; - static const WCHAR wszFormat[] = {'%','d','K',0}; - /* * Get the client area rectangle */ @@ -257,7 +256,7 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - swprintf(Text, wszFormat, (int)CommitChargeTotal); + StrFormatKBSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text)); /* * Draw the font text onto the graph -- 2.17.0

1 0

[PATCH v3 1/5] shell32/autocomplete: Forward to the original listbox proc outside the switch
by Gabriel Ivăncescu 03 Apr '19

03 Apr '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Make the dropdown a proper pop-up instead of a child window hack. dlls/shell32/autocomplete.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index bd9b872..ed8b270 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -801,23 +801,21 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_MOUSEMOVE: sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam); SendMessageW(hwnd, LB_SETCURSEL, sel, 0); - break; + return 0; case WM_LBUTTONDOWN: sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); if (sel < 0) - break; + return 0; len = SendMessageW(hwnd, LB_GETTEXTLEN, sel, 0); if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) - break; + return 0; len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); set_text_and_selection(This, This->hwndEdit, msg, 0, len); hide_listbox(This, hwnd, TRUE); heap_free(msg); - break; - default: - return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); + return 0; } - return 0; + return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); } static void create_listbox(IAutoCompleteImpl *This) -- 2.20.1

2 9

[PATCH v2] taskmgr: Use different units depending on memory usage.
by Vijay Kiran Kamuju 03 Apr '19

03 Apr '19

Use localizible strings Based on patch from Michael Müller <michael(a)fds-team.de> From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/taskmgr/graph.c | 22 +++++-- programs/taskmgr/resource.h | 118 +++++++++++++++++++----------------- programs/taskmgr/taskmgr.rc | 3 + 3 files changed, 83 insertions(+), 60 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 7e978e16f7a..1c35de1fe41 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -239,8 +239,8 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* Top bars that are "unused", i.e. are dark green, representing free memory */ int i; - static const WCHAR wszFormat[] = {'%','d','K',0}; - + static WCHAR wszMemUsage[8]; + /* * Get the client area rectangle */ @@ -257,8 +257,22 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - swprintf(Text, wszFormat, (int)CommitChargeTotal); - + if (CommitChargeTotal > 1048576) + { + LoadStringW(hInst, IDS_MEMORYUSAGEGB, wszMemUsage, ARRAY_SIZE(wszMemUsage)); + swprintf(Text, wszMemUsage, (float)CommitChargeTotal / 1048576); + } + else if (CommitChargeTotal > 1024) + { + LoadStringW(hInst, IDS_MEMORYUSAGEMB, wszMemUsage, ARRAY_SIZE(wszMemUsage)); + swprintf(Text, wszMemUsage, (DWORD)CommitChargeTotal / 1024); + } + else + { + LoadStringW(hInst, IDS_MEMORYUSAGEKB, wszMemUsage, ARRAY_SIZE(wszMemUsage)); + swprintf(Text, wszMemUsage, (DWORD)CommitChargeTotal); + } + /* * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index 4153f66c329..29f0d7dac66 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -62,69 +62,72 @@ #define IDC_MEMORYUSAGE 1026 #define IDC_TOTALS_THREAD_COUNT 1026 #define IDC_CPU8 1027 -#define IDC_MEMORYUSAGEDELTA 1027 +#define IDC_MEMORYUSAGEGB 1027 #define IDC_TOTALS_PROCESS_COUNT 1027 #define IDC_CPU9 1028 -#define IDC_PEAKMEMORYUSAGE 1028 +#define IDC_MEMORYUSAGEKB 1028 #define IDC_COMMIT_CHARGE_TOTAL 1028 #define IDC_CPU10 1029 -#define IDC_PAGEFAULTS 1029 +#define IDC_MEMORYUSAGEMB 1029 #define IDC_COMMIT_CHARGE_LIMIT 1029 #define IDC_CPU11 1030 -#define IDC_USEROBJECTS 1030 +#define IDC_MEMORYUSAGEDELTA 1030 #define IDC_COMMIT_CHARGE_PEAK 1030 #define IDC_CPU12 1031 -#define IDC_IOREADS 1031 +#define IDC_PEAKMEMORYUSAGE 1031 #define IDC_PHYSICAL_MEMORY_TOTAL 1031 #define IDC_CPU13 1032 -#define IDC_IOREADBYTES 1032 +#define IDC_PAGEFAULTS 1032 #define IDC_PHYSICAL_MEMORY_AVAILABLE 1032 #define IDC_CPU14 1033 -#define IDC_SESSIONID 1033 +#define IDC_USEROBJECTS 1033 #define IDC_PHYSICAL_MEMORY_SYSTEM_CACHE 1033 #define IDC_CPU15 1034 -#define IDC_USERNAME 1034 +#define IDC_IOREADS 1034 #define IDC_KERNEL_MEMORY_TOTAL 1034 #define IDC_CPU16 1035 -#define IDC_PAGEFAULTSDELTA 1035 +#define IDC_IOREADBYTES 1035 #define IDC_KERNEL_MEMORY_PAGED 1035 #define IDC_CPU17 1036 -#define IDC_VIRTUALMEMORYSIZE 1036 +#define IDC_SESSIONID 1036 #define IDC_KERNEL_MEMORY_NONPAGED 1036 #define IDC_CPU18 1037 -#define IDC_PAGEDPOOL 1037 +#define IDC_USERNAME 1037 #define IDC_TOTALS_FRAME 1037 #define IDC_CPU19 1038 -#define IDC_NONPAGEDPOOL 1038 +#define IDC_PAGEFAULTSDELTA 1038 #define IDC_COMMIT_CHARGE_FRAME 1038 #define IDC_CPU20 1039 -#define IDC_BASEPRIORITY 1039 +#define IDC_VIRTUALMEMORYSIZE 1039 #define IDC_KERNEL_MEMORY_FRAME 1039 #define IDC_CPU21 1040 -#define IDC_HANDLECOUNT 1040 +#define IDC_PAGEDPOOL 1040 #define IDC_PHYSICAL_MEMORY_FRAME 1040 #define IDC_CPU22 1041 -#define IDC_THREADCOUNT 1041 +#define IDC_NONPAGEDPOOL 1041 #define IDC_CPU23 1042 +#define IDC_BASEPRIORITY 1042 #define IDC_CPU24 1043 -#define IDC_GDIOBJECTS 1043 +#define IDC_HANDLECOUNT 1043 #define IDC_CPU_USAGE_FRAME 1043 #define IDC_CPU25 1044 -#define IDC_IOWRITES 1044 +#define IDC_THREADCOUNT 1044 #define IDC_MEM_USAGE_FRAME 1044 #define IDC_CPU26 1045 -#define IDC_IOWRITEBYTES 1045 +#define IDC_GDIOBJECTS 1045 #define IDC_CPU_USAGE_HISTORY_FRAME 1045 #define IDC_CPU27 1046 -#define IDC_IOOTHER 1046 +#define IDC_IOWRITES 1046 #define IDC_MEMORY_USAGE_HISTORY_FRAME 1046 #define IDC_CPU28 1047 -#define IDC_IOOTHERBYTES 1047 +#define IDC_IOWRITEBYTES 1047 #define IDC_CPU_USAGE_GRAPH 1047 #define IDC_CPU29 1048 +#define IDC_IOOTHER 1048 #define IDC_MEM_USAGE_GRAPH2 1048 #define IDC_MEM_USAGE_GRAPH 1048 #define IDC_CPU30 1049 +#define IDC_IOOTHERBYTES 1049 #define IDC_MEM_USAGE_HISTORY_GRAPH 1049 #define IDC_CPU31 1050 #define IDC_CPU_USAGE_HISTORY_GRAPH 1050 @@ -207,42 +210,45 @@ #define IDS_CPUUSAGE 32834 #define IDS_CPUTIME 32835 #define IDS_MEMORYUSAGE 32836 -#define IDS_MEMORYUSAGEDELTA 32837 -#define IDS_PEAKMEMORYUSAGE 32838 -#define IDS_PAGEFAULTS 32839 -#define IDS_USEROBJECTS 32840 -#define IDS_IOREADS 32841 -#define IDS_IOREADBYTES 32842 -#define IDS_SESSIONID 32843 -#define IDS_USERNAME 32844 -#define IDS_PAGEFAULTSDELTA 32845 -#define IDS_VIRTUALMEMORYSIZE 32846 -#define IDS_PAGEDPOOL 32847 -#define IDS_NONPAGEDPOOL 32848 -#define IDS_BASEPRIORITY 32849 -#define IDS_HANDLECOUNT 32850 -#define IDS_THREADCOUNT 32851 -#define IDS_GDIOBJECTS 32852 -#define IDS_IOWRITES 32853 -#define IDS_IOWRITEBYTES 32854 -#define IDS_IOOTHER 32855 -#define IDS_IOOTHERBYTES 32856 -#define IDS_WARNING_TITLE 32857 -#define IDS_PRIORITY_CHANGE_MESSAGE 32858 -#define IDS_PRIORITY_UNABLE2CHANGE 32859 -#define IDS_TERMINATE_MESSAGE 32860 -#define IDS_TERMINATE_UNABLE2TERMINATE 32861 -#define IDS_DEBUG_MESSAGE 32862 -#define IDS_DEBUG_UNABLE2DEBUG 32863 -#define IDS_AFFINITY_ERROR_MESSAGE 32864 -#define IDS_AFFINITY_ERROR_TITLE 32865 -#define IDS_AFFINITY_UNABLE2ACCESS 32866 -#define IDS_SYSTEM_IDLE_PROCESS 32867 -#define IDS_APPLICATION_NOT_RESPONDING 32868 -#define IDS_APPLICATION_RUNNING 32869 -#define IDS_APPLICATION_TASK 32870 -#define IDS_APPLICATION_STATUS 32871 -#define IDS_DEBUG_CHANNEL 32872 +#define IDS_MEMORYUSAGEGB 32837 +#define IDS_MEMORYUSAGEKB 32838 +#define IDS_MEMORYUSAGEMB 32839 +#define IDS_MEMORYUSAGEDELTA 32840 +#define IDS_PEAKMEMORYUSAGE 32841 +#define IDS_PAGEFAULTS 32842 +#define IDS_USEROBJECTS 32843 +#define IDS_IOREADS 32844 +#define IDS_IOREADBYTES 32845 +#define IDS_SESSIONID 32846 +#define IDS_USERNAME 32847 +#define IDS_PAGEFAULTSDELTA 32848 +#define IDS_VIRTUALMEMORYSIZE 32849 +#define IDS_PAGEDPOOL 32850 +#define IDS_NONPAGEDPOOL 32851 +#define IDS_BASEPRIORITY 32852 +#define IDS_HANDLECOUNT 32853 +#define IDS_THREADCOUNT 32854 +#define IDS_GDIOBJECTS 32855 +#define IDS_IOWRITES 32856 +#define IDS_IOWRITEBYTES 32857 +#define IDS_IOOTHER 32858 +#define IDS_IOOTHERBYTES 32859 +#define IDS_WARNING_TITLE 32860 +#define IDS_PRIORITY_CHANGE_MESSAGE 32861 +#define IDS_PRIORITY_UNABLE2CHANGE 32862 +#define IDS_TERMINATE_MESSAGE 32863 +#define IDS_TERMINATE_UNABLE2TERMINATE 32864 +#define IDS_DEBUG_MESSAGE 32865 +#define IDS_DEBUG_UNABLE2DEBUG 32866 +#define IDS_AFFINITY_ERROR_MESSAGE 32867 +#define IDS_AFFINITY_ERROR_TITLE 32868 +#define IDS_AFFINITY_UNABLE2ACCESS 32869 +#define IDS_SYSTEM_IDLE_PROCESS 32870 +#define IDS_APPLICATION_NOT_RESPONDING 32871 +#define IDS_APPLICATION_RUNNING 32872 +#define IDS_APPLICATION_TASK 32873 +#define IDS_APPLICATION_STATUS 32874 +#define IDS_DEBUG_CHANNEL 32875 #define IDC_STATIC -1 /* diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index ffd0699f80d..71ae3a38cdb 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -273,6 +273,9 @@ BEGIN IDS_CPUUSAGE "CPU" IDS_CPUTIME "CPU Time" IDS_MEMORYUSAGE "Mem Usage" + IDS_MEMORYUSAGEGB "%.1f GB" + IDS_MEMORYUSAGEKB "%u KB" + IDS_MEMORYUSAGEMB "%u MB" IDS_MEMORYUSAGEDELTA "Mem Delta" IDS_PEAKMEMORYUSAGE "Peak Mem Usage" IDS_PAGEFAULTS "Page Faults" -- 2.17.0

1 0

[PATCH] taskmgr: Use different units depending on memory usage.
by Vijay Kiran Kamuju 03 Apr '19

03 Apr '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/taskmgr/graph.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 7e978e16f7a..eb2a4a3ba8e 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -239,8 +239,10 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* Top bars that are "unused", i.e. are dark green, representing free memory */ int i; - static const WCHAR wszFormat[] = {'%','d','K',0}; - + static const WCHAR wszFormatKB[] = {'%','u',' ','K','B',0}; + static const WCHAR wszFormatMB[] = {'%','u',' ','M','B',0}; + static const WCHAR wszFormatGB[] = {'%','.','1','f',' ','G','B',0}; + /* * Get the client area rectangle */ @@ -257,8 +259,13 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - swprintf(Text, wszFormat, (int)CommitChargeTotal); - + if (CommitChargeTotal > 1048576) + swprintf(Text, wszFormatGB, (float)CommitChargeTotal / 1048576); + else if (CommitChargeTotal > 1024) + swprintf(Text, wszFormatMB, (DWORD)CommitChargeTotal / 1024); + else + swprintf(Text, wszFormatKB, (DWORD)CommitChargeTotal); + /* * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text -- 2.17.0

3 3

[PATCH 01/10] comctl32/button: Center align split buttons' text by default
by Gabriel Ivăncescu 03 Apr '19

03 Apr '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/button.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index f7497a1..0bd416d 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -215,6 +215,13 @@ static inline UINT get_button_type( LONG window_style ) return (window_style & BS_TYPEMASK); } +static inline BOOL button_centers_text( LONG window_style ) +{ + /* Push button's text is centered by default, same for split buttons */ + UINT type = get_button_type(window_style); + return type <= BS_DEFPUSHBUTTON || type == BS_SPLITBUTTON || type == BS_DEFSPLITBUTTON; +} + /* paint a button of any type */ static inline void paint_button( BUTTON_INFO *infoPtr, LONG style, UINT action ) { @@ -308,9 +315,7 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) case BS_RIGHT: dtStyle |= DT_RIGHT; break; case BS_CENTER: dtStyle |= DT_CENTER; break; default: - /* Pushbutton's text is centered by default */ - if (get_button_type(style) <= BS_DEFPUSHBUTTON) dtStyle |= DT_CENTER; - /* all other flavours have left aligned text */ + if (button_centers_text(style)) dtStyle |= DT_CENTER; } if (ex_style & WS_EX_RIGHT) dtStyle = DT_RIGHT | (dtStyle & ~(DT_LEFT | DT_CENTER)); @@ -984,8 +989,7 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe if (!(style & BS_CENTER)) { - /* Push button's text is centered by default, all other types have left aligned text */ - if (get_button_type(style) <= BS_DEFPUSHBUTTON) + if (button_centers_text(style)) style |= BS_CENTER; else style |= BS_LEFT; -- 2.20.1

2 16

[PATCH vkd3d 3/3] vkd3d: Improve UMA memory detection.
by Zhiyi Zhang 03 Apr '19

03 Apr '19

Some vulkan implementation report 2 memory types with the same VkMemoryPropertyFlags for a device. So check property flags to determine if UMA and CacheCoherentUMA are actually supported by the device. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/device.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a754077..c1992e6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2098,6 +2098,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { struct d3d12_device *device = impl_from_ID3D12Device(iface); + uint32_t i; TRACE("iface %p, feature %#x, feature_data %p, feature_data_size %u.\n", iface, feature, feature_data, feature_data_size); @@ -2138,18 +2139,16 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * FIXME("Assuming device does not support tile based rendering.\n"); data->TileBasedRenderer = FALSE; - if (device->memory_properties.memoryTypeCount == 1) + data->UMA = FALSE; + data->CacheCoherentUMA = FALSE; + for (i = 0; i < device->memory_properties.memoryTypeCount; i++) { - TRACE("Assuming cache coherent UMA.\n"); - data->UMA = TRUE; - data->CacheCoherentUMA = TRUE; - } - else - { - FIXME("Assuming NUMA.\n"); - data->UMA = FALSE; - data->CacheCoherentUMA = FALSE; + if (device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) + data->UMA = TRUE; + if (device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) + data->CacheCoherentUMA = TRUE; } + TRACE("UMA:%d CacheCoherentUMA:%d\n", data->UMA, data->CacheCoherentUMA); return S_OK; } -- 2.20.1

2 1

[PATCH 1/6] include: Add IDebugClient interface definition.
by Nikolay Sivov 03 Apr '19

03 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Unfortunately it's not possible to generate this because of variadic and va_list's methods. include/Makefile.in | 1 + include/dbgeng.h | 163 ++++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 11 +++ 3 files changed, 175 insertions(+) create mode 100644 include/dbgeng.h diff --git a/include/Makefile.in b/include/Makefile.in index 2817c10d17..c478c348ec 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -143,6 +143,7 @@ SOURCES = \ dbccmd.idl \ dbcses.idl \ dbdsad.idl \ + dbgeng.h \ dbghelp.h \ dbinit.idl \ dbprop.idl \ diff --git a/include/dbgeng.h b/include/dbgeng.h new file mode 100644 index 0000000000..03305cce41 --- /dev/null +++ b/include/dbgeng.h @@ -0,0 +1,163 @@ +/* + * Copyright 2019 Nikolay Sivov 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 + */ + +#include "objbase.h" + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(IID_IDebugInputCallbacks, 0x9f50e42c, 0xf136, 0x499e, 0x9a, 0x97, 0x73, 0x03, 0x6c, 0x94, 0xed, 0x2d); +DEFINE_GUID(IID_IDebugOutputCallbacks, 0x4bf58045, 0xd654, 0x4c40, 0xb0, 0xaf, 0x68, 0x30, 0x90, 0xf3, 0x56, 0xdc); +DEFINE_GUID(IID_IDebugEventCallbacks, 0x337be28b, 0x5036, 0x4d72, 0xb6, 0xbf, 0xc4, 0x5f, 0xbb, 0x9f, 0x2e, 0xaa); +DEFINE_GUID(IID_IDebugClient, 0x27fe5639, 0x8407, 0x4f47, 0x83, 0x64, 0xee, 0x11, 0x8f, 0xb0, 0x8a, 0xc8); + +#define INTERFACE IDebugBreakpoint +DECLARE_INTERFACE_(IDebugBreakpoint, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugBreakpoint */ + /* FIXME */ +}; +#undef INTERFACE + +typedef IDebugBreakpoint* PDEBUG_BREAKPOINT; + +#define INTERFACE IDebugInputCallbacks +DECLARE_INTERFACE_(IDebugInputCallbacks, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugInputCallbacks */ + STDMETHOD(StartInput)(THIS_ ULONG buffer_size) PURE; + STDMETHOD(EndInput)(THIS) PURE; +}; +#undef INTERFACE + +#define INTERFACE IDebugOutputCallbacks +DECLARE_INTERFACE_(IDebugOutputCallbacks, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugOutputCallbacks */ + STDMETHOD(Output)(THIS_ ULONG mask, const char *text) PURE; +}; +#undef INTERFACE + +#ifdef WINE_NO_UNICODE_MACROS +#undef CreateProcess +#endif + +#define INTERFACE IDebugEventCallbacks +DECLARE_INTERFACE_(IDebugEventCallbacks, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugEventCallbacks */ + STDMETHOD(GetInterestMask)(THIS_ ULONG *mask) PURE; + STDMETHOD(Breakpoint)(THIS_ PDEBUG_BREAKPOINT breakpoint) PURE; + STDMETHOD(Exception)(THIS_ EXCEPTION_RECORD64 *exception, ULONG first_chance) PURE; + STDMETHOD(CreateThread)(THIS_ ULONG64 handle, ULONG64 data_offset, ULONG64 start_offset) PURE; + STDMETHOD(ExitThread)(THIS_ ULONG exit_code) PURE; + STDMETHOD(CreateProcess)(THIS_ ULONG64 image_handle, ULONG64 handle, ULONG64 base_offset, ULONG module_size, + const char *module_name, const char *image_name, ULONG checksum, ULONG timedatestamp, + ULONG64 initial_thread_handle, ULONG64 thread_data_offset, ULONG64 start_offset) PURE; + STDMETHOD(ExitProcess)(THIS_ ULONG exit_code) PURE; + STDMETHOD(LoadModule)(THIS_ ULONG64 image_handle, ULONG64 base_offset, ULONG module_size, const char *module_name, + const char *image_name, ULONG checksum, ULONG timedatestamp) PURE; + STDMETHOD(UnloadModule)(THIS_ const char *image_basename, ULONG64 base_offset) PURE; + STDMETHOD(SystemError)(THIS_ ULONG error, ULONG level) PURE; + STDMETHOD(SessionStatus)(THIS_ ULONG status) PURE; + STDMETHOD(ChangeDebuggeeState)(THIS_ ULONG flags, ULONG64 argument) PURE; + STDMETHOD(ChangeEngineState)(THIS_ ULONG flags, ULONG64 argument) PURE; + STDMETHOD(ChangeSymbolState)(THIS_ ULONG flags, ULONG64 argument) PURE; +}; +#undef INTERFACE + +#define INTERFACE IDebugClient +DECLARE_INTERFACE_(IDebugClient, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugClient */ + STDMETHOD(AttachKernel)(THIS_ ULONG flags, const char *options) PURE; + STDMETHOD(GetKernelConnectionOptions)(THIS_ char *buffer, ULONG buffer_size, ULONG *options_size) PURE; + STDMETHOD(SetKernelConnectionOptions)(THIS_ const char *options) PURE; + STDMETHOD(StartProcessServer)(THIS_ ULONG flags, const char *options, void *reserved) PURE; + STDMETHOD(ConnectProcessServer)(THIS_ const char *remote_options, ULONG64 *server) PURE; + STDMETHOD(DisconnectProcessServer)(THIS_ ULONG64 server) PURE; + STDMETHOD(GetRunningProcessSystemIds)(THIS_ ULONG64 server, ULONG *ids, ULONG count, ULONG *actual_count) PURE; + STDMETHOD(GetRunningProcessSystemIdByExecutableName)(THIS_ ULONG64 server, const char *exe_name, + ULONG flags, ULONG *id) PURE; + STDMETHOD(GetRunningProcessDescription)(THIS_ ULONG64 server, ULONG systemid, ULONG flags, char *exe_name, + ULONG exe_name_size, ULONG *actual_exe_name_size, char *description, ULONG description_size, + ULONG *actual_description_size) PURE; + STDMETHOD(AttachProcess)(THIS_ ULONG64 server, ULONG pid, ULONG flags) PURE; + STDMETHOD(CreateProcess)(THIS_ ULONG64 server, char *cmdline, ULONG flags) PURE; + STDMETHOD(CreateProcessAndAttach)(THIS_ ULONG64 server, char *cmdline, ULONG create_flags, + ULONG pid, ULONG attach_flags) PURE; + STDMETHOD(GetProcessOptions)(THIS_ ULONG *options) PURE; + STDMETHOD(AddProcessOptions)(THIS_ ULONG options) PURE; + STDMETHOD(RemoveProcessOptions)(THIS_ ULONG options) PURE; + STDMETHOD(SetProcessOptions)(THIS_ ULONG options) PURE; + STDMETHOD(OpenDumpFile)(THIS_ const char *filename) PURE; + STDMETHOD(WriteDumpFile)(THIS_ const char *filename, ULONG qualifier) PURE; + STDMETHOD(ConnectSession)(THIS_ ULONG flags, ULONG history_limit) PURE; + STDMETHOD(StartServer)(THIS_ const char *options) PURE; + STDMETHOD(OutputServers)(THIS_ ULONG output_control, const char *machine, ULONG flags) PURE; + STDMETHOD(TerminateProcesses)(THIS) PURE; + STDMETHOD(DetachProcesses)(THIS) PURE; + STDMETHOD(EndSession)(THIS_ ULONG flags) PURE; + STDMETHOD(GetExitCode)(THIS_ ULONG *code) PURE; + STDMETHOD(DispatchCallbacks)(THIS_ ULONG timeout) PURE; + STDMETHOD(ExitDispatch)(THIS_ IDebugClient *client) PURE; + STDMETHOD(CreateClient)(THIS_ IDebugClient **client) PURE; + STDMETHOD(GetInputCallbacks)(THIS_ IDebugInputCallbacks **callbacks) PURE; + STDMETHOD(SetInputCallbacks)(THIS_ IDebugInputCallbacks *callbacks) PURE; + STDMETHOD(GetOutputCallbacks)(THIS_ IDebugOutputCallbacks **callbacks) PURE; + STDMETHOD(SetOutputCallbacks)(THIS_ IDebugOutputCallbacks *callbacks) PURE; + STDMETHOD(GetOutputMask)(THIS_ ULONG *mask) PURE; + STDMETHOD(SetOutputMask)(THIS_ ULONG mask) PURE; + STDMETHOD(GetOtherOutputMask)(THIS_ IDebugClient *client, ULONG *mask) PURE; + STDMETHOD(SetOtherOutputMask)(THIS_ IDebugClient *client, ULONG mask) PURE; + STDMETHOD(GetOutputWidth)(THIS_ ULONG *columns) PURE; + STDMETHOD(SetOutputWidth)(THIS_ ULONG columns) PURE; + STDMETHOD(GetOutputLinePrefix)(THIS_ char *buffer, ULONG buffer_size, ULONG *prefix_size) PURE; + STDMETHOD(SetOutputLinePrefix)(THIS_ const char *prefix) PURE; + STDMETHOD(GetIdentity)(THIS_ char *buffer, ULONG buffer_size, ULONG *identity_size) PURE; + STDMETHOD(OutputIdentity)(THIS_ ULONG output_control, ULONG flags, const char *format) PURE; + STDMETHOD(GetEventCallbacks)(THIS_ IDebugEventCallbacks **callbacks) PURE; + STDMETHOD(SetEventCallbacks)(THIS_ IDebugEventCallbacks *callbacks) PURE; + STDMETHOD(FlushCallbacks)(THIS) PURE; +}; +#undef INTERFACE + +#ifdef __cplusplus +} +#endif diff --git a/include/winnt.h b/include/winnt.h index 28e87c7dff..1e2165652e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2419,6 +2419,17 @@ typedef struct _EXCEPTION_RECORD ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; } EXCEPTION_RECORD, *PEXCEPTION_RECORD; +typedef struct _EXCEPTION_RECORD64 +{ + DWORD ExceptionCode; + DWORD ExceptionFlags; + DWORD64 ExceptionRecord; + DWORD64 ExceptionAddress; + DWORD NumberParameters; + DWORD __unusedAlignment; + DWORD64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; +} EXCEPTION_RECORD64, *PEXCEPTION_RECORD64; + /* * The exception pointers structure passed to exception filters * in except() and the UnhandledExceptionFilter(). -- 2.20.1

1 5

[PATCH vkd3d 2/3] tests: Add tests for subresource read write.
by Zhiyi Zhang 03 Apr '19

03 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- tests/d3d12.c | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6abc1df..70facfe 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27319,6 +27319,219 @@ static void test_vertex_shader_stream_output(void) destroy_test_context(&context); } +static void test_read_write_subresource(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12GraphicsCommandList *command_list; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_SUBRESOURCE_DATA texture_data; + D3D12_RESOURCE_DESC resource_desc; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + ID3D12Resource *rb_buffer; + struct resource_readback rb; + ID3D12Resource *src_texture; + ID3D12Resource *dst_texture; + unsigned int got, expected; + unsigned int *dst_buffer; + unsigned int *ptr; + unsigned int buffer_size; + unsigned int row_pitch; + unsigned int slice_pitch; + unsigned int x, y, z; + D3D12_BOX box; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + buffer_size = 128 * 100 * 64 * sizeof(unsigned int); + row_pitch = 128 * sizeof(unsigned int); + slice_pitch = row_pitch * 100; + + /* Buffers are unsupported */ + rb_buffer = create_readback_buffer(device, buffer_size); + dst_buffer = malloc(buffer_size); + ok(dst_buffer, "Failed to allocate memory\n"); + + set_box(&box, 0, 0, 0, 1, 1, 1); + hr = ID3D12Resource_WriteToSubresource(rb_buffer, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Resource_ReadFromSubresource(rb_buffer, dst_buffer, row_pitch, slice_pitch, 0, &box); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D12Resource_Release(rb_buffer); + + /* Only texture on custom heaps is legal for ReadFromSubresource/WriteToSubresource */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; + resource_desc.Alignment = 0; + resource_desc.Width = 128; + resource_desc.Height = 100; + resource_desc.DepthOrArraySize = 64; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = 0; + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_CUSTOM; + heap_properties.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; + heap_properties.MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&src_texture); + if (FAILED(hr)) + { + skip("Failed to create texture on custom heap.\n"); + } + else + { + /* NULL box */ + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Empty box */ + set_box(&box, 0, 0, 0, 0, 0, 0); + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Normal */ + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 100; ++y) + { + for (x = 0; x < 128; ++x) + { + ptr = &dst_buffer[z * 128 * 100 + y * 128 + x]; + if (x < 2 && y< 2 && z < 2) /* Region 1 */ + *ptr = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */ + *ptr = (z + 2) << 16 | (y + 2) << 8 | (x + 2); + else + *ptr = 0xdeadbeef; + } + } + } + /* Write region 1 */ + set_box(&box, 0, 0, 0, 2, 2, 2); + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Write region 2 */ + set_box(&box, 2, 2, 2, 11, 13, 17); + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], + row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(dst_buffer, 0, buffer_size); + + /* Read region 1 */ + set_box(&box, 0, 0, 0, 2, 2, 2); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Read region 2 */ + set_box(&box, 2, 2, 2, 11, 13, 17); + hr = ID3D12Resource_ReadFromSubresource(src_texture, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, + slice_pitch, 0, &box); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 100; ++y) + { + for (x = 0; x < 128; ++x) + { + if (x < 2 && y < 2 && z < 2) /* Region 1 */ + expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */ + expected = (z + 2) << 16 | (y + 2) << 8 | (x + 2); + else /* Untouched */ + expected = 0; + + got = dst_buffer[z * 128 * 100 + y * 128 + x]; + if (got != expected) + break; + } + if (got != expected) + break; + } + if (got != expected) + break; + } + todo ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); + + /* Test layout is the same */ + dst_texture = create_default_texture3d(device, 128, 100, 64, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, + D3D12_RESOURCE_STATE_COPY_DEST); + memset(dst_buffer, 0, buffer_size); + texture_data.pData = dst_buffer; + texture_data.RowPitch = 128 * sizeof(*dst_buffer); + texture_data.SlicePitch = texture_data.RowPitch * 100; + upload_texture_data(dst_texture, &texture_data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + + src_location.pResource = src_texture; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + dst_location.pResource = dst_texture; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + dst_location.SubresourceIndex = 0; + set_box(&box, 0, 0, 0, 128, 100, 64); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, &box); + + transition_resource_state(command_list, dst_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(dst_texture, 0, &rb, queue, command_list); + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 100; ++y) + { + for (x = 0; x < 128; ++x) + { + if (x < 2 && y < 2 && z < 2) /* Region 1 */ + expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */ + expected = (z + 2) << 16 | (y + 2) << 8 | (x + 2); + else /* Untouched */ + expected = 0; + + got = get_readback_uint(&rb, x, y, z);; + if (got != expected) + break; + } + if (got != expected) + break; + } + if (got != expected) + break; + } + todo ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); + release_resource_readback(&rb); + ID3D12Resource_Release(src_texture); + ID3D12Resource_Release(dst_texture); + reset_command_list(command_list, context.allocator); + } + + free(dst_buffer); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -27461,4 +27674,5 @@ START_TEST(d3d12) run_test(test_shader_eval_attribute); run_test(test_primitive_restart); run_test(test_vertex_shader_stream_output); + run_test(test_read_write_subresource); } -- 2.20.1

1 0

[PATCH v2 3/3] wined3d: Pass application info to Vulkan.
by Józef Kucia 03 Apr '19

03 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 26 +++++++++++++++++++++ dlls/wined3d/wined3d_main.c | 42 +++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8a2514f3ff99..cf96bf144219 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -106,10 +106,27 @@ static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) {} #endif +static unsigned int wined3d_get_wine_vk_version(void) +{ + const char *ptr = PACKAGE_VERSION; + int major, minor; + + major = atoi(ptr); + + while (isdigit(*ptr) || *ptr == '.') + ++ptr; + + minor = atoi(ptr); + + return VK_MAKE_VERSION(major, minor, 0); +} + static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstanceCreateInfo instance_info; + VkApplicationInfo app_info; + char app_name[MAX_PATH]; VkInstance instance; VkResult vr; @@ -122,8 +139,17 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) goto fail; } + memset(&app_info, 0, sizeof(app_info)); + app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; + if (wined3d_get_app_name(app_name, ARRAY_SIZE(app_name))) + app_info.pApplicationName = app_name; + app_info.pEngineName = "Damavand"; + app_info.engineVersion = wined3d_get_wine_vk_version(); + app_info.apiVersion = VK_API_VERSION_1_0; + memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_info.pApplicationInfo = &app_info; if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %d.\n", vr); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index d2e4978ee79b..0a0121d909e4 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -142,6 +142,30 @@ success: return 0; } +BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) +{ + char buffer[MAX_PATH]; + unsigned int len; + char *p, *name; + + len = GetModuleFileNameA(0, buffer, ARRAY_SIZE(buffer)); + if (!(len && len < MAX_PATH)) + return FALSE; + + name = buffer; + if ((p = strrchr(name, '/' ))) + name = p + 1; + if ((p = strrchr(name, '\\'))) + name = p + 1; + + len = strlen(name) + 1; + if (app_name_size < len) + return FALSE; + + memcpy(app_name, name, len); + return TRUE; +} + static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; @@ -149,7 +173,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) DWORD size = sizeof(buffer); HKEY hkey = 0; HKEY appkey = 0; - DWORD len, tmpvalue; + DWORD tmpvalue; WNDCLASSA wc; wined3d_context_tls_idx = TlsAlloc(); @@ -191,20 +215,16 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0; - len = GetModuleFileNameA( 0, buffer, MAX_PATH ); - if (len && len < MAX_PATH) + if (wined3d_get_app_name(buffer, ARRAY_SIZE(buffer))) { HKEY tmpkey; /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Direct3D */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey )) + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey)) { - char *p, *appname = buffer; - if ((p = strrchr( appname, '/' ))) appname = p + 1; - if ((p = strrchr( appname, '\\' ))) appname = p + 1; - strcat( appname, "\\Direct3D" ); - TRACE("appname = [%s]\n", appname); - if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; - RegCloseKey( tmpkey ); + strcat(buffer, "\\Direct3D"); + TRACE("Application name %s.\n", buffer); + if (RegOpenKeyA(tmpkey, buffer, &appkey)) appkey = 0; + RegCloseKey(tmpkey); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 012c90f5d345..c2fbf1dae519 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2919,6 +2919,8 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; +BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) DECLSPEC_HIDDEN; + struct wined3d_blend_state { LONG refcount; -- 2.19.2

1 0

[PATCH v2 2/3] wined3d: Add support for USE_WIN32_VULKAN.
by Józef Kucia 03 Apr '19

03 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 58 ++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_vk.h | 6 ++++ 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 337c6f71946c..8a2514f3ff99 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -59,13 +59,37 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_check_format, }; -static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) +#ifdef USE_WIN32_VULKAN +static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) +{ + struct vulkan_ops *vk_ops = &vk_info->vk_ops; + + if (!(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) + { + WARN("Failed to load vulkan-1.dll.\n"); + return FALSE; + } + + vk_ops->vkGetInstanceProcAddr = (void *)GetProcAddress(vk_info->vulkan_lib, "vkGetInstanceProcAddr"); + if (!vk_ops->vkGetInstanceProcAddr) + { + FreeLibrary(vk_info->vulkan_lib); + return FALSE; + } + + return TRUE; +} + +static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) +{ + FreeLibrary(vk_info->vulkan_lib); + vk_info->vulkan_lib = NULL; +} +#else +static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; const struct vulkan_funcs *vk_funcs; - VkInstanceCreateInfo instance_info; - VkInstance instance; - VkResult vr; HDC dc; dc = GetDC(0); @@ -76,11 +100,26 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) return FALSE; vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr; + return TRUE; +} + +static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) {} +#endif + +static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) +{ + struct vulkan_ops *vk_ops = &vk_info->vk_ops; + VkInstanceCreateInfo instance_info; + VkInstance instance; + VkResult vr; + + if (!wined3d_load_vulkan(vk_info)) + return FALSE; if (!(vk_ops->vkCreateInstance = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkCreateInstance")))) { ERR("Could not get 'vkCreateInstance'.\n"); - return FALSE; + goto fail; } memset(&instance_info, 0, sizeof(instance_info)); @@ -97,8 +136,9 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if (!(vk_ops->name = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #name)))) \ { \ WARN("Could not get instance proc addr for '" #name "'.\n"); \ - vk_funcs->p_vkDestroyInstance(instance, NULL); \ - return FALSE; \ + if (vk_ops->vkDestroyInstance) \ + VK_CALL(vkDestroyInstance(instance, NULL)); \ + goto fail; \ } #define VK_INSTANCE_PFN LOAD_INSTANCE_PFN #define VK_DEVICE_PFN LOAD_INSTANCE_PFN @@ -110,6 +150,10 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) vk_info->instance = instance; return TRUE; + +fail: + wined3d_unload_vulkan(vk_info); + return FALSE; } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index ac59a2dcd1ab..784dd0c310c5 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -20,7 +20,9 @@ #define __WINE_WINED3D_VK_H #define VK_NO_PROTOTYPES +#ifndef USE_WIN32_VULKAN #define WINE_VK_HOST +#endif #include "wine/vulkan.h" #define VK_INSTANCE_FUNCS() \ @@ -179,6 +181,10 @@ struct wined3d_vk_info { VkInstance instance; struct vulkan_ops vk_ops; + +#ifdef USE_WIN32_VULKAN + HMODULE vulkan_lib; +#endif }; #define VK_CALL(f) (vk_info->vk_ops.f) -- 2.19.2

1 0