April 2017 - Wine-Commits - list.winehq.org

Ken Thomases : winemac: Sync the frame of the Cocoa view for a window' s client area while handling a frame-changed event.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 49964b3bc414f3be66b13b7e606e6d40a2ea3379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49964b3bc414f3be66b13b7e6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:07 2017 -0500 winemac: Sync the frame of the Cocoa view for a window's client area while handling a frame-changed event. Fixes a problem where the client area view would not be resized as the user resizes the Cocoa window. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 878b4dc..72dc938 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1053,6 +1053,21 @@ RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) /*********************************************************************** + * sync_client_view_position + */ +static void sync_client_view_position(struct macdrv_win_data *data) +{ + if (data->cocoa_view != data->client_cocoa_view) + { + RECT rect = data->client_rect; + OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); + macdrv_set_view_frame(data->client_cocoa_view, cgrect_from_rect(rect)); + TRACE("win %p/%p client %s\n", data->hwnd, data->client_cocoa_view, wine_dbgstr_rect(&rect)); + } +} + + +/*********************************************************************** * sync_window_position * * Synchronize the Mac window position with the Windows one @@ -1098,13 +1113,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c macdrv_set_view_frame(data->cocoa_view, frame); } - if (data->cocoa_view != data->client_cocoa_view) - { - RECT rect = data->client_rect; - OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); - macdrv_set_view_frame(data->client_cocoa_view, cgrect_from_rect(rect)); - TRACE("win %p/%p client %s\n", data->hwnd, data->client_cocoa_view, wine_dbgstr_rect(&rect)); - } + sync_client_view_position(data); if (old_window_rect && old_whole_rect && (IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect) || @@ -2097,10 +2106,15 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, } /* check if we are currently processing an event relevant to this window */ - if (!thread_data || !thread_data->current_event || - !data->cocoa_window || thread_data->current_event->window != data->cocoa_window || - (thread_data->current_event->type != WINDOW_FRAME_CHANGED && - thread_data->current_event->type != WINDOW_DID_UNMINIMIZE)) + if (thread_data && thread_data->current_event && + data->cocoa_window && thread_data->current_event->window == data->cocoa_window && + (thread_data->current_event->type == WINDOW_FRAME_CHANGED || + thread_data->current_event->type == WINDOW_DID_UNMINIMIZE)) + { + if (thread_data->current_event->type == WINDOW_FRAME_CHANGED) + sync_client_view_position(data); + } + else { sync_window_position(data, swp_flags, &old_window_rect, &old_whole_rect); if (data->cocoa_window)

1 0

Hugh McMaster : regedit/tests: Add some more import tests.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 2926c2822c7f218ac688033fe78da05427c4cd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2926c2822c7f218ac688033fe… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 24 13:48:35 2017 +0000 regedit/tests: Add some more import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 9ff760a..7584ed4 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -294,6 +294,23 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine9a\"=hex(2):4c,69,6e,65,00\n" + "\"Wine9b\"=\"Value 1\"\n" + "\"Wine9c\"=hex(2):4c,69,6e,65\\\n" + "\"Wine9d\"=\"Value 2\"\n" + "\"Wine9e\"=hex(2):4c,69,6e,65,\\\n" + "\"Wine9f\"=\"Value 3\"\n" + "\"Wine9g\"=\"Value 4\"\n\n"); + verify_reg(hkey, "Wine9a", REG_EXPAND_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine9b", REG_SZ, "Value 1", 8, 0); + verify_reg_nonexist(hkey, "Wine9c"); + todo_wine verify_reg(hkey, "Wine9d", REG_SZ, "Value 2", 8, 0); + verify_reg_nonexist(hkey, "Wine9e"); + verify_reg_nonexist(hkey, "Wine9f"); + verify_reg(hkey, "Wine9g", REG_SZ, "Value 4", 8, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n"); verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); @@ -839,6 +856,16 @@ static void test_import_with_whitespace(void) verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "@ = \"Test Value\"\n\n"); + todo_wine verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\t@\t=\tdword:\t00000008\t\n\n"); + todo_wine verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Alistair Leslie-Hughes : include/mfreadwrite.idl: Add MF_SOURCE_READER_* enum values.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 07967d93aa29eec34857421d0a5b5f76150b5a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=07967d93aa29eec34857421d0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 22 10:44:42 2017 +0000 include/mfreadwrite.idl: Add MF_SOURCE_READER_* enum values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 3f53ff9..a146552 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -20,6 +20,17 @@ import "objidl.idl"; import "oaidl.idl"; import "mfobjects.idl"; +enum +{ + MF_SOURCE_READER_INVALID_STREAM_INDEX = 0xffffffff, + MF_SOURCE_READER_ALL_STREAMS = 0xfffffffe, + MF_SOURCE_READER_ANY_STREAM = 0xfffffffe, + MF_SOURCE_READER_FIRST_AUDIO_STREAM = 0xfffffffd, + MF_SOURCE_READER_FIRST_VIDEO_STREAM = 0xfffffffc, + MF_SOURCE_READER_MEDIASOURCE = 0xffffffff, + MF_SOURCE_READER_CURRENT_TYPE_INDEX = 0xffffffff +}; + interface IMFMediaSource; [

1 0

Huw Davies : shell32: Remove an extraneous '@'.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 6751e57e0b846e3021f0179642a33c35b74b64ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6751e57e0b846e3021f017964… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 24 16:01:38 2017 +0100 shell32: Remove an extraneous '@'. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rgs b/dlls/shell32/shell32.rgs index 79bf4b7..877be6b 100644 --- a/dlls/shell32/shell32.rgs +++ b/dlls/shell32/shell32.rgs @@ -9,7 +9,7 @@ HKCR '{645FF040-5081-101B-9F08-00AA002F954E}' { val LocalizedString = s '@%MODULE%,-8964' - DefaultIcon = s '@%MODULE%,-33' + DefaultIcon = s '%MODULE%,-33' } '{00021401-0000-0000-C000-000000000046}' { shellex { MayChangeDefaultMenu } } }

1 0

Jacek Caban : mshtml: Don' t emulate legacy style filters in compatibility mode >= IE10.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: d25684d5ae4540b87db0d3d1c4c77a24bd3a2a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25684d5ae4540b87db0d3d1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 24 15:20:03 2017 +0200 mshtml: Don't emulate legacy style filters in compatibility mode >= IE10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 72fc1d3..0c6f3bc 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -341,6 +341,11 @@ static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) return NULL; } +static inline compat_mode_t get_style_compat_mode(HTMLStyle *style) +{ + return style->elem && style->elem->node.doc ? style->elem->node.doc->document_mode : COMPAT_MODE_QUIRKS; +} + static LPWSTR fix_px_value(LPCWSTR val) { LPCWSTR ptr = val; @@ -2681,10 +2686,15 @@ static void set_opacity(HTMLStyle *This, const WCHAR *val) static void update_filter(HTMLStyle *This) { - const WCHAR *ptr = This->elem->filter, *ptr2; + const WCHAR *ptr, *ptr2; static const WCHAR alphaW[] = {'a','l','p','h','a'}; + if(get_style_compat_mode(This) >= COMPAT_MODE_IE10) + return; + + ptr = This->elem->filter; + TRACE("%s\n", debugstr_w(ptr)); if(!ptr) { set_opacity(This, emptyW); return;

1 0

Jacek Caban : mshtml: Added edge compatibility mode support.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: cad03646c58382da599537e702246960596adf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad03646c58382da599537e70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 24 15:19:19 2017 +0200 mshtml: Added edge compatibility mode support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 9 ++++++++- dlls/mshtml/tests/script.c | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 8c4fc67..84a290e 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -371,10 +371,17 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) { int v = 0; + static const WCHAR edgeW[] = {'e','d','g','e',0}; + if(p[0] != 'I' || p[1] != 'E' || p[2] != '=') return FALSE; - p += 3; + + if(!strcmpiW(p, edgeW)) { + *r = COMPAT_MODE_IE11; + return TRUE; + } + while('0' <= *p && *p <= '9') v = v*10 + *(p++)-'0'; if(*p || !v) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index e8b3d19..41aaa3e 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3471,6 +3471,7 @@ static void run_js_tests(void) run_script_as_http_with_mode("documentmode.js", "?9", "9"); run_script_as_http_with_mode("documentmode.js", "?10", "10"); run_script_as_http_with_mode("documentmode.js", "?11", "11"); + run_script_as_http_with_mode("documentmode.js", "?11", "edge"); run_script_as_http_with_mode("asyncscriptload.js", NULL, "9"); }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSGetUnorderedAccessViews().
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 57cd6bc641e9e0f5a21e49e51dc787d2ae514afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=57cd6bc641e9e0f5a21e49e51… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:31 2017 +0200 d3d11: Implement d3d11_immediate_context_CSGetUnorderedAccessViews(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 175e271..7df59e1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2055,7 +2055,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11UnorderedAccessView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct wined3d_unordered_access_view *wined3d_view; + struct d3d11_unordered_access_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_cs_uav(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_unordered_access_view_get_parent(wined3d_view); + ID3D11UnorderedAccessView_AddRef(views[i] = &view_impl->ID3D11UnorderedAccessView_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceContext *iface,

1 0

Daniel Lehman : msvcrt: Stop at trylevel for ControlPc on target frame for non-consolidate unwinds.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 64c4c39746049fcaaa3af42ee982df2fad18dd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c4c39746049fcaaa3af42ee… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Apr 21 12:41:31 2017 -0700 msvcrt: Stop at trylevel for ControlPc on target frame for non-consolidate unwinds. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 8210f7b..e891567 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -515,7 +515,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } if (frame == orig_frame) - cxx_local_unwind(frame, dispatch, descr, -1); + cxx_local_unwind(frame, dispatch, descr, rec->ExceptionFlags & EH_TARGET_UNWIND ? trylevel : -1); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch;

1 0

Daniel Lehman : msvcrt: Handle synchronous flag for x64 C++ exceptions.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: b0326bea747c4f789f0fb36cf317df1b98816f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0326bea747c4f789f0fb36cf… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Apr 20 06:21:14 2017 -0700 msvcrt: Handle synchronous flag for x64 C++ exceptions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cppexcept.h | 2 ++ dlls/msvcrt/except_i386.c | 2 -- dlls/msvcrt/except_x86_64.c | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 6ea5818..2091889 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -26,6 +26,8 @@ #define CXX_FRAME_MAGIC_VC8 0x19930522 #define CXX_EXCEPTION 0xe06d7363 +#define FUNC_DESCR_SYNCHRONOUS 1 /* synchronous exceptions only (built with /EHs and /EHsc) */ + typedef void (*vtable_ptr)(void); /* type_info object, see cpp.c for implementation */ diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index d26a864..963bd58 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -96,8 +96,6 @@ typedef struct __cxx_function_descr UINT flags; /* flags when magic >= VC8 */ } cxx_function_descr; -#define FUNC_DESCR_SYNCHRONOUS 1 /* synchronous exceptions only (built with /EHs) */ - typedef struct _SCOPETABLE { int previousTryLevel; diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index d299608..8210f7b 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -331,6 +331,12 @@ static inline void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) return ret_addr; } +static inline BOOL cxx_is_consolidate(const EXCEPTION_RECORD *rec) +{ + return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && + rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block; +} + static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, @@ -442,6 +448,13 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } + if (descr->magic >= CXX_FRAME_MAGIC_VC8 && + (descr->flags & FUNC_DESCR_SYNCHRONOUS) && + (rec->ExceptionCode != CXX_EXCEPTION && + !cxx_is_consolidate(rec) && + rec->ExceptionCode != STATUS_LONGJUMP)) + return ExceptionContinueSearch; /* handle only c++ exceptions */ + /* update orig_frame if it's a nested exception */ throw_func_off = RtlLookupFunctionEntry(dispatch->ControlPc, &throw_base, NULL)->BeginAddress; throw_func = rva_to_ptr(throw_func_off, throw_base); @@ -470,8 +483,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { - if (rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && - rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block) + if (cxx_is_consolidate(rec)) { EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; thread_data_t *data = msvcrt_get_thread_data();

1 0

Christopher Berner : wined3d: Add Nvidia TitanX (Pascal).
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: dad06728ce75e0422218bff06168e0c6328b9b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad06728ce75e0422218bff06… Author: Christopher Berner <christopherberner(a)gmail.com> Date: Sun Apr 23 12:12:05 2017 -0700 wined3d: Add Nvidia TitanX (Pascal). Signed-off-by: Christopher Berner <christopherberner(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e89cd6d..0a925f0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1389,6 +1389,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1873,6 +1874,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 829360c..357ceed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2201,6 +2201,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, + CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_VMWARE_SVGA3D = 0x0405,

1 0