- wine-devel - winehq.org

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_hull_shader().
by Henri Verbeet 01 Jul '19

01 Jul '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8023f7bd2ff..92a95865f6d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8533,10 +8533,9 @@ static GLuint find_glsl_vertex_shader(const struct wined3d_context_gl *context_g return ret; } -static GLuint find_glsl_hull_shader(const struct wined3d_context *context, +static GLuint find_glsl_hull_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_hs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int new_size; @@ -10151,7 +10150,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) hs_id = ctx_data->glsl_program->hs.id; else if (hshader) - hs_id = find_glsl_hull_shader(context, priv, hshader); + hs_id = find_glsl_hull_shader(context_gl, priv, hshader); dshader = state->shader[WINED3D_SHADER_TYPE_DOMAIN]; if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program) -- 2.11.0

1 0

[PATCH v2] user32: Do not call SendMessage() to show a window that is already visible.
by Alexey Prokhin 01 Jul '19

01 Jul '19

Based on a patch made by Kimmo Myllyvirta. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39731 Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- v2: handle all ShowWindow commands, add a better test case. Supersede 166154 --- dlls/user32/tests/msg.c | 116 ++++++++++++++++++++++++++++++---------- dlls/user32/winpos.c | 64 +++++++++++++++++++--- 2 files changed, 146 insertions(+), 34 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a5bc1c5518..8aa00d5ba0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5041,16 +5041,6 @@ static void test_WM_DEVICECHANGE(HWND hwnd) } } -static DWORD CALLBACK show_window_thread(LPVOID arg) -{ - HWND hwnd = arg; - - /* function will not return if ShowWindow(SW_HIDE) calls SendMessage() */ - ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); - - return 0; -} - /* Helper function to easier test SetWindowPos messages */ #define test_msg_setpos( expected_list, flags, todo ) \ test_msg_setpos_( (expected_list), (flags), (todo), __FILE__, __LINE__) @@ -5071,8 +5061,6 @@ static void test_msg_setpos_(const struct message *expected_list, UINT flags, BO /* test if we receive the right sequence of messages */ static void test_messages(void) { - DWORD tid; - HANDLE hthread; HWND hwnd, hparent, hchild; HWND hchild2, hbutton; HMENU hmenu; @@ -5111,14 +5099,6 @@ static void test_messages(void) flush_events(); ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); - /* test ShowWindow(SW_HIDE) on a hidden window - multi-threaded */ - hthread = CreateThread(NULL, 0, show_window_thread, hwnd, 0, &tid); - ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); - ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); - CloseHandle(hthread); - flush_events(); - ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); - ShowWindow(hwnd, SW_SHOW); flush_events(); ok_sequence(WmShowOverlappedSeq, "ShowWindow(SW_SHOW):overlapped", TRUE); @@ -13180,6 +13160,14 @@ static const struct message WmShowMaximized_3[] = { { 0 } }; +static const char * const sw_cmd_name[13] = +{ + "SW_HIDE", "SW_SHOWNORMAL", "SW_SHOWMINIMIZED", "SW_SHOWMAXIMIZED", + "SW_SHOWNOACTIVATE", "SW_SHOW", "SW_MINIMIZE", "SW_SHOWMINNOACTIVE", + "SW_SHOWNA", "SW_RESTORE", "SW_SHOWDEFAULT", "SW_FORCEMINIMIZE", + "SW_NORMALNA" /* 0xCC */ +}; + static void test_ShowWindow(void) { /* ShowWindow commands in random order */ @@ -13366,13 +13354,6 @@ static void test_ShowWindow(void) for (i = 0; i < ARRAY_SIZE(sw); i++) { - static const char * const sw_cmd_name[13] = - { - "SW_HIDE", "SW_SHOWNORMAL", "SW_SHOWMINIMIZED", "SW_SHOWMAXIMIZED", - "SW_SHOWNOACTIVATE", "SW_SHOW", "SW_MINIMIZE", "SW_SHOWMINNOACTIVE", - "SW_SHOWNA", "SW_RESTORE", "SW_SHOWDEFAULT", "SW_FORCEMINIMIZE", - "SW_NORMALNA" /* 0xCC */ - }; char comment[64]; INT idx; /* index into the above array of names */ @@ -13421,6 +13402,86 @@ if (0) /* FIXME: Wine behaves completely different here */ flush_events(); } +struct show_window_thread_data +{ + const char *comment; + HWND hwnd; + int cmd; + BOOL ret; +}; + +static DWORD CALLBACK show_window_thread(LPVOID arg) +{ + struct show_window_thread_data *d = arg; + BOOL ret; + + /* function will not return if ShowWindow() calls SendMessage() */ + ret = ShowWindow(d->hwnd, d->cmd); + ok(!ret == !d->ret, "%s: expected ret %u, got %u\n", d->comment, d->ret, ret); + + return 0; +} + +static void test_ShowWindow_multithreaded(void) +{ + static const struct + { + INT initial_cmd; /* ShowWindow command to apply before the test */ + INT cmd; /* ShowWindow command to apply in a thread */ + BOOL ret; /* ShowWindow return value */ + } sw[] = { + { SW_HIDE, SW_HIDE, FALSE }, + { SW_RESTORE, SW_SHOW, TRUE }, + { SW_RESTORE, SW_SHOWNOACTIVATE, TRUE }, + { SW_RESTORE, SW_RESTORE, TRUE }, + { SW_RESTORE, SW_SHOWNORMAL, TRUE }, + { SW_RESTORE, SW_SHOWDEFAULT, TRUE }, + { SW_MINIMIZE, SW_SHOW, TRUE }, + { SW_MINIMIZE, SW_SHOWMINNOACTIVE, TRUE }, + { SW_MINIMIZE, SW_MINIMIZE, TRUE }, + { SW_MINIMIZE, SW_SHOWMINIMIZED, TRUE }, + { SW_MINIMIZE, SW_FORCEMINIMIZE, TRUE }, + { SW_SHOWMAXIMIZED, SW_SHOW, TRUE }, + { SW_SHOWMAXIMIZED, SW_SHOWMAXIMIZED, TRUE }, + }; + + DWORD tid; + HANDLE hthread; + HWND hwnd; + int i; + struct show_window_thread_data swtd; + + hwnd = CreateWindowExA(0, "ShowWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 120, 120, 90, 90, + 0, 0, 0, NULL); + assert(hwnd); + + for (i = 0; i < ARRAY_SIZE(sw); ++i) + { + char comment[64]; + sprintf(comment, "%d: ShowWindow(%s)", i+1, sw_cmd_name[sw[i].cmd]); + + ShowWindow(hwnd, sw[i].initial_cmd); + flush_events(); + flush_sequence(); + + swtd.comment = comment; + swtd.hwnd = hwnd; + swtd.cmd = sw[i].cmd; + swtd.ret = sw[i].ret; + hthread = CreateThread(NULL, 0, show_window_thread, &swtd, 0, &tid); + ok(hthread != NULL, "%d: CreateThread failed, error %d\n", i, GetLastError()); + ok(WaitForSingleObject(hthread, 3000) == WAIT_OBJECT_0, "%d: WaitForSingleObject failed\n", i); + CloseHandle(hthread); + + flush_events(); + ok_sequence(WmOptionalPaint, comment, FALSE); + } + + DestroyWindow(hwnd); + flush_events(); +} + static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct recvd_message msg; @@ -17748,6 +17809,7 @@ START_TEST(msg) test_PostMessage(); test_broadcast(); test_ShowWindow(); + test_ShowWindow_multithreaded(); test_PeekMessage(); test_PeekMessage2(); test_PeekMessage3(); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5837c179e4..96f86c4aeb 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1032,6 +1032,51 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) return swpFlags; } +/*********************************************************************** + * is_window_state_changed + * + * A helper function for ShowWindow and ShowWindowAsync for checking if + * a window already has the requested style. + */ +static BOOL is_window_state_changed( LONG style, INT cmd ) +{ + BOOL is_visible = (style & WS_VISIBLE) != 0; + + switch (cmd) { + case SW_HIDE: + if (!is_visible) + return FALSE; + break; + case SW_SHOW: + if (is_visible) + return FALSE; + break; + case SW_SHOWMINNOACTIVE: + case SW_MINIMIZE: + case SW_FORCEMINIMIZE: + case SW_SHOWMINIMIZED: + if (is_visible && (style & WS_MINIMIZE)) + return FALSE; + break; + case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ + if (is_visible && (style & WS_MAXIMIZE)) + return FALSE; + break; + case SW_SHOWNA: + break; + case SW_SHOWNOACTIVATE: + case SW_RESTORE: + case SW_SHOWNORMAL: /* same as SW_NORMAL: */ + case SW_SHOWDEFAULT: + if (is_visible && !(style & (WS_MINIMIZE | WS_MAXIMIZE))) + return FALSE; + break; + default: + return FALSE; + } + + return TRUE; +} /*********************************************************************** * show_window @@ -1056,7 +1101,6 @@ static BOOL show_window( HWND hwnd, INT cmd ) switch(cmd) { case SW_HIDE: - if (!wasVisible) goto done; showFlag = FALSE; swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1070,14 +1114,12 @@ static BOOL show_window( HWND hwnd, INT cmd ) case SW_SHOWMINIMIZED: swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos ); - if ((style & WS_MINIMIZE) && wasVisible) goto done; break; case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ if (!wasVisible) swp |= SWP_SHOWWINDOW; swp |= SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos ); - if ((style & WS_MAXIMIZE) && wasVisible) goto done; break; case SW_SHOWNA: @@ -1085,7 +1127,6 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (style & WS_CHILD) swp |= SWP_NOZORDER; break; case SW_SHOW: - if (wasVisible) goto done; swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; @@ -1105,7 +1146,6 @@ static BOOL show_window( HWND hwnd, INT cmd ) } else { - if (wasVisible) goto done; swp |= SWP_NOSIZE | SWP_NOMOVE; } if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1114,6 +1154,9 @@ static BOOL show_window( HWND hwnd, INT cmd ) goto done; } + if (!is_window_state_changed( style, cmd )) + goto done; + if ((showFlag != wasVisible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED)) { SendMessageW( hwnd, WM_SHOWWINDOW, showFlag, 0 ); @@ -1199,6 +1242,7 @@ done: BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd ) { HWND full_handle; + LONG style; if (is_broadcast(hwnd)) { @@ -1209,6 +1253,10 @@ BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd ) if ((full_handle = WIN_IsCurrentThread( hwnd ))) return show_window( full_handle, cmd ); + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!is_window_state_changed( style, cmd )) + return (style & WS_VISIBLE) != 0; + return SendNotifyMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); } @@ -1219,6 +1267,7 @@ BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd ) BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) { HWND full_handle; + LONG style; if (is_broadcast(hwnd)) { @@ -1228,8 +1277,9 @@ BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) if ((full_handle = WIN_IsCurrentThread( hwnd ))) return show_window( full_handle, cmd ); - if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) - return FALSE; + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!is_window_state_changed( style, cmd )) + return (style & WS_VISIBLE) != 0; return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); } -- 2.17.2 (Apple Git-113)

2 1

[PATCH 7/7] mshtml: Include URL pathname and query in test traces.
by Jacek Caban 01 Jul '19

01 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/script.c | 22 +++++++++++----------- dlls/mshtml/tests/winetest.js | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 14 deletions(-)

2 1

[PATCH 6/7] mshtml/tests: Improve tests exception handling.
by Jacek Caban 01 Jul '19

01 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/winetest.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

2 1

[PATCH 5/7] mshtml/tests: Rename elements.js to dom.js.
by Jacek Caban 01 Jul '19

01 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/{elements.js => dom.js} | 0 dlls/mshtml/tests/rsrc.rc | 4 ++-- dlls/mshtml/tests/script.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename dlls/mshtml/tests/{elements.js => dom.js} (100%)

2 1

[PATCH 4/7] mshtml: Add IHTMLDOMRange stub.
by Jacek Caban 01 Jul '19

01 Jul '19

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I integrated tests into existing tests to avoid running new document instance. If we need more range tests, it would probably be better in JavaScript anyway. dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/{txtrange.c => range.c} | 349 ++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 27 ++- include/mshtml.idl | 88 +++++++ 6 files changed, 483 insertions(+), 4 deletions(-) rename dlls/mshtml/{txtrange.c => range.c} (82%)

2 1

[PATCH 3/7] mshtml/tests: Merge text range tests.
by Jacek Caban 01 Jul '19

01 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)

1 0

[PATCH 2/7] mshtml/tests: Introduce set_body_html helper.
by Jacek Caban 01 Jul '19

01 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)

1 0

[PATCH 1/7] mshtml/tests: Fix comment tests on recent IE versions.
by Jacek Caban 01 Jul '19

01 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)

1 0

Re: Profiling application under Wine
by Hin-Tak Leung 01 Jul '19

01 Jul '19

Hmm, I think wine-mono has been working in 64-bit mode for a while - although you have to invoke wine explicitly as wine64 to hook into it . I think there are some quirks about how wine and wine-mono interacts, in such a way that you cannot do 32-bit + 64-bit switches within the process - i.e. you must do 64-bit wine to get at 64-bit wine-mono. Do you notice any performance difference between using wine-mono and dotnet472 64-bit ? I am going back to wine-mono for your issue, as mono supports setting profiling option via environment variables (catering for exactly this use case, when mono is running embedded inside another process), and you can set WINE_MONO_* variables to pass those along. I am not sure about the exact details so you'll need to look up the relevant docs, but I know this is possible - mono has a built-in profiler, and it is accessible and turned on via environment variables. -------------------------------------------- On Tue, 25/6/19, Chambers, Matthew <matt.chambers42(a)gmail.com> wrote: The application requires dotnet472 and 64-bit at that. I actually had to add that verb to winetricks to get our application to work. I'm definitely getting varying mileage! My question is how to profile it with Windows symbols so I can understand why and either help fix it in Wine or possibly avoid the problem from my application code.

3 3

[PATCH 2/2] user32: Cache monitor information.
by Zhiyi Zhang 01 Jul '19

01 Jul '19

Multiple applications call EnumDisplayMonitors very frequently. This reduce the most of the overhead by caching. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47431 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 181 +++++++++++++++++++++++++--------------- 1 file changed, 116 insertions(+), 65 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 83450eee36..3f93f9c827 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -305,6 +305,19 @@ static const WCHAR MONITOR_INTERFACE_PREFIX[] = {'\\','\\','\?','\\',0}; static const WCHAR GUID_DEVINTERFACE_MONITOR[] = {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +/* Cached monitor information */ +static MONITORINFOEXW *monitors; +static UINT monitor_count; +static FILETIME last_query_monitors_time; +static CRITICAL_SECTION monitors_section; +static CRITICAL_SECTION_DEBUG monitors_critsect_debug = +{ + 0, 0, &monitors_section, + { &monitors_critsect_debug.ProcessLocksList, &monitors_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": monitors_section") } +}; +static CRITICAL_SECTION monitors_section = { &monitors_critsect_debug, -1 , 0, 0, 0, 0 }; + static HDC display_dc; static CRITICAL_SECTION display_dc_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -328,6 +341,7 @@ static DPI_AWARENESS dpi_awareness; static DPI_AWARENESS default_awareness = DPI_AWARENESS_UNAWARE; static HKEY volatile_base_key; +static HKEY video_key; union sysparam_all_entry; @@ -3723,15 +3737,85 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return MonitorFromRect( &rect, dwFlags ); } -BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) +/* Return FALSE on failure and TRUE on success */ +static BOOL update_monitor_cache(void) { SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - WCHAR adapter_name[CCHDEVICENAME]; - HDEVINFO devinfo; - DWORD error = 0; - HANDLE mutex; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + MONITORINFOEXW *monitor_array; + FILETIME filetime = {0}; + DWORD device_count = 0; + HANDLE mutex = NULL; + DWORD state_flags; + BOOL ret = FALSE; + DWORD i = 0; DWORD type; - BOOL ret; + + /* Update monitor cache from SetupAPI if it's outdated */ + if (!video_key && RegOpenKeyW( HKEY_LOCAL_MACHINE, VIDEO_KEY, &video_key )) + return FALSE; + if (RegQueryInfoKeyW( video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime )) + return FALSE; + if (CompareFileTime( &filetime, &last_query_monitors_time ) < 1) + return TRUE; + + mutex = get_display_device_init_mutex(); + EnterCriticalSection( &monitors_section ); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); + + while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) + { + /* Inactive monitors don't get enumerated */ + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&state_flags, sizeof(DWORD), NULL, 0 )) + goto fail; + if (state_flags & DISPLAY_DEVICE_ACTIVE) + device_count++; + } + + if (device_count && monitor_count < device_count) + { + monitor_array = heap_alloc( device_count * sizeof(*monitor_array) ); + if (!monitor_array) + goto fail; + heap_free( monitors ); + monitors = monitor_array; + } + + for (i = 0, monitor_count = 0; SetupDiEnumDeviceInfo( devinfo, i, &device_data ); i++) + { + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&state_flags, sizeof(DWORD), NULL, 0 )) + goto fail; + if (!(state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) + goto fail; + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, + (BYTE *)&monitors[monitor_count].rcWork, sizeof(RECT), NULL, 0 )) + goto fail; + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, + (BYTE *)monitors[monitor_count].szDevice, CCHDEVICENAME * sizeof(WCHAR), NULL, 0)) + goto fail; + monitors[monitor_count].dwFlags = + !lstrcmpW( DEFAULT_ADAPTER_NAME, monitors[monitor_count].szDevice ) ? MONITORINFOF_PRIMARY : 0; + + monitor_count++; + } + + last_query_monitors_time = filetime; + ret = TRUE; +fail: + SetupDiDestroyDeviceInfoList( devinfo ); + LeaveCriticalSection( &monitors_section ); + release_display_device_init_mutex( mutex ); + return ret; +} + +BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) +{ + UINT index = (UINT_PTR)handle - 1; TRACE("(%p, %p)\n", handle, info); @@ -3747,32 +3831,26 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) return TRUE; } - /* Use SetupAPI to get monitors */ - mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); - if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) + if (!update_monitor_cache()) + return FALSE; + + EnterCriticalSection( &monitors_section ); + if (index < monitor_count) { - SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&info->rcMonitor, sizeof(info->rcMonitor), NULL, 0 ); - SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, - (BYTE *)&info->rcWork, sizeof(info->rcWork), NULL, 0 ); - SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, - (BYTE *)adapter_name, sizeof(adapter_name), NULL, 0 ); - info->dwFlags = !lstrcmpW( DEFAULT_ADAPTER_NAME, adapter_name ) ? MONITORINFOF_PRIMARY : 0; + info->rcMonitor = monitors[index].rcMonitor; + info->rcWork = monitors[index].rcWork; + info->dwFlags = monitors[index].dwFlags; if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, adapter_name ); - ret = TRUE; + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[index].szDevice ); + LeaveCriticalSection( &monitors_section ); + return TRUE; } else { - error = ERROR_INVALID_MONITOR_HANDLE; - ret = FALSE; - } - SetupDiDestroyDeviceInfoList( devinfo ); - release_display_device_init_mutex( mutex ); - if (error) + LeaveCriticalSection( &monitors_section ); SetLastError( ERROR_INVALID_MONITOR_HANDLE ); - return ret; + return FALSE; + } } /*********************************************************************** @@ -3875,56 +3953,29 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - USEROBJECTFLAGS flags; - HWINSTA winstation; - BOOL success = FALSE; - HDEVINFO devinfo; - RECT monitor_rect; - DWORD state_flags; - HANDLE mutex; - DWORD type; - DWORD i = 0; + RECT default_rect = {0, 0, 640, 480}; + DWORD i; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); - /* Use SetupAPI to get monitors only if window station has visible display surfaces */ - winstation = GetProcessWindowStation(); - if (GetUserObjectInformationA( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && (flags.dwFlags & WSF_VISIBLE)) + if (update_monitor_cache()) { - mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); - while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) + EnterCriticalSection( &monitors_section ); + for (i = 0; i < monitor_count; i++) { - /* Inactive monitors don't get enumerated */ - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&state_flags, sizeof(state_flags), NULL, 0 ) - || !(state_flags & DISPLAY_DEVICE_ACTIVE)) - continue; - - if (SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0 )) + if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitors[i].rcMonitor, lp )) { - if (!proc( (HMONITOR)(UINT_PTR)i, hdc, &monitor_rect, lp )) - { - SetupDiDestroyDeviceInfoList( devinfo ); - release_display_device_init_mutex( mutex ); - return FALSE; - } - success = TRUE; + LeaveCriticalSection( &monitors_section ); + return FALSE; } } - SetupDiDestroyDeviceInfoList( devinfo ); - release_display_device_init_mutex( mutex ); + LeaveCriticalSection( &monitors_section ); + return TRUE; } /* Fallback to report one monitor if using SetupAPI failed */ - if (!success) - { - RECT default_rect = {0, 0, 640, 480}; - if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) - return FALSE; - } + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + return FALSE; return TRUE; } -- 2.20.1

2 1

[PATCH 1/2] user32: Specify enumerator when calling SetupDiGetClassDevsW.
by Zhiyi Zhang 01 Jul '19

01 Jul '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 12225a6551..83450eee36 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -283,7 +283,8 @@ static const WCHAR BACKSLASH[] = {'\\',0}; static const WCHAR DRIVER_DESC[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR STATE_FLAGS[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR GPU_ID[] = {'G','P','U','I','D',0}; -static const WCHAR DISPLAY[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; +static const WCHAR ADAPTER_PREFIX[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static const WCHAR MONITOR_ID_VALUE_FMT[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; static const WCHAR VIDEO_KEY[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -3748,7 +3749,7 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) /* Use SetupAPI to get monitors */ mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) { SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, @@ -3892,7 +3893,7 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro if (GetUserObjectInformationA( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && (flags.dwFlags & WSF_VISIBLE)) { mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) { /* Inactive monitors don't get enumerated */ @@ -4062,10 +4063,10 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i else { /* Check adapter name */ - if (strncmpiW( device, DISPLAY, ARRAY_SIZE(DISPLAY) )) + if (strncmpiW( device, ADAPTER_PREFIX, ARRAY_SIZE(ADAPTER_PREFIX) )) goto done; - adapter_index = strtolW( device + ARRAY_SIZE(DISPLAY), NULL, 10 ); + adapter_index = strtolW( device + ARRAY_SIZE(ADAPTER_PREFIX), NULL, 10 ); sprintfW( key_nameW, VIDEO_VALUE_FMT, adapter_index - 1 ); size = sizeof(bufferW); -- 2.20.1

2 1

[PATCH] ntdll: Support NtQuerySystemInformation(SystemFirmwareTableInformation) on macOS.
by Hans Leidekker 01 Jul '19

01 Jul '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c3eb4a1205..aeca6160a6 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -36,6 +36,9 @@ #ifdef HAVE_MACH_MACHINE_H # include <mach/machine.h> #endif +#ifdef HAVE_IOKIT_IOKITLIB_H +# include <IOKit/IOKitLib.h> +#endif #include <ctype.h> #include <string.h> @@ -2227,6 +2230,80 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG } } +#elif defined(__APPLE__) +static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) +{ + switch (sfti->ProviderSignature) + { + case RSMB: + { + io_service_t service; + CFDataRef data; + const UInt8 *ptr; + CFIndex len; + struct smbios_prologue *prologue; + BYTE major_version = 2, minor_version = 0; + + if (!(service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleSMBIOS")))) + { + WARN("can't find AppleSMBIOS service\n"); + return STATUS_NO_MEMORY; + } + + if (!(data = IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS-EPS"), kCFAllocatorDefault, 0))) + { + WARN("can't find SMBIOS entry point\n"); + IOObjectRelease(service); + return STATUS_NO_MEMORY; + } + + len = CFDataGetLength(data); + ptr = CFDataGetBytePtr(data); + if (len >= 8 && !memcmp(ptr, "_SM_", 4)) + { + major_version = ptr[6]; + minor_version = ptr[7]; + } + CFRelease(data); + + if (!(data = IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS"), kCFAllocatorDefault, 0))) + { + WARN("can't find SMBIOS table\n"); + IOObjectRelease(service); + return STATUS_NO_MEMORY; + } + + len = CFDataGetLength(data); + ptr = CFDataGetBytePtr(data); + sfti->TableBufferLength = sizeof(*prologue) + len; + *required_len = sfti->TableBufferLength + FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + if (available_len < *required_len) + { + CFRelease(data); + IOObjectRelease(service); + return STATUS_BUFFER_TOO_SMALL; + } + + prologue = (struct smbios_prologue *)sfti->TableBuffer; + prologue->calling_method = 0; + prologue->major_version = major_version; + prologue->minor_version = minor_version; + prologue->revision = 0; + prologue->length = sfti->TableBufferLength - sizeof(*prologue); + + memcpy(sfti->TableBuffer + sizeof(*prologue), ptr, len); + + CFRelease(data); + IOObjectRelease(service); + return STATUS_SUCCESS; + } + default: + { + FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature); + return STATUS_NOT_IMPLEMENTED; + } + } +} #else static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) -- 2.20.1

1 0

[PATCH] winex11.drv: Specify enumerator when calling SetupDiGetClassDevsW.
by Zhiyi Zhang 01 Jul '19

01 Jul '19

This reduces some search time. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index f5ef65f428..7ddaf1c10d 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -46,6 +46,8 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0x DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; +static const WCHAR pciW[] = {'P','C','I',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; @@ -309,7 +311,7 @@ static void prepare_devices(HKEY video_hkey) DWORD i = 0; /* Remove all monitors */ - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { if (!SetupDiRemoveDevice(devinfo, &device_data)) @@ -326,7 +328,7 @@ static void prepare_devices(HKEY video_hkey) * of prefix copying or having devices unplugged. But then we couldn't simply delete GPUs because we need to retain * the same GUID for the same GPU. */ i = 0; - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pciW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, @@ -344,7 +346,7 @@ static void cleanup_devices(void) DWORD i = 0; BOOL present; - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pciW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { present = FALSE; -- 2.20.1

1 0

[PATCH] msxml3: Fix string length handling in I[VB]SAXContentHandler::characters.
by Jacek Caban 01 Jul '19

01 Jul '19

Windows crashes when -1 length is passed. Escaping should just copy embedded null bytes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msxml3/mxwriter.c | 10 ++--- dlls/msxml3/tests/saxreader.c | 72 ++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 6 deletions(-)

3 2

[PATCH] mfplat: Trace MF_PD_DURATION guid.
by Nikolay Sivov 01 Jul '19

01 Jul '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 1 + include/mfidl.idl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 45d1677b9b..eec54ae3f6 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -641,6 +641,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_AUDIO_BLOCK_ALIGNMENT), X(MF_PD_PMPHOST_CONTEXT), X(MF_PD_APP_CONTEXT), + X(MF_PD_DURATION), X(MF_PD_TOTAL_FILE_SIZE), X(MF_PD_AUDIO_ENCODING_BITRATE), X(MF_PD_VIDEO_ENCODING_BITRATE), diff --git a/include/mfidl.idl b/include/mfidl.idl index 66a84771a7..1ed63bea12 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -761,9 +761,9 @@ cpp_quote("EXTERN_GUID(MF_SD_MUTUALLY_EXCLUSIVE, 0x023ef79c, 0x388d, 0x487f cpp_quote("EXTERN_GUID(MF_SD_PROTECTED, 0x00af2181, 0xbdc2, 0x423c, 0xab, 0xca, 0xf5, 0x03, 0x59, 0x3b, 0xc1, 0x21);") cpp_quote("EXTERN_GUID(MF_SD_STREAM_NAME, 0x4f1b099d, 0xd314, 0x41e5, 0xa7, 0x81, 0x7f, 0xef, 0xaa, 0x4c, 0x50, 0x1f);") cpp_quote("EXTERN_GUID(MF_SD_SAMI_LANGUAGE, 0x36fcb98a, 0x6cd0, 0x44cb, 0xac, 0xb9, 0xa8, 0xf5, 0x60, 0x0d, 0xd0, 0xbb);") - cpp_quote("EXTERN_GUID(MF_PD_PMPHOST_CONTEXT, 0x6c990d31, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_APP_CONTEXT, 0x6c990d32, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_DURATION, 0x6c990d33, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_TOTAL_FILE_SIZE, 0x6c990d34, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_AUDIO_ENCODING_BITRATE, 0x6c990d35, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_VIDEO_ENCODING_BITRATE, 0x6c990d36, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") -- 2.20.1

1 0

[PATCH 1/3] user32/tests: Use SendInput() directly.
by Nikolay Sivov 01 Jul '19

01 Jul '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/input.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4a9be550bd..78d1e54588 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -76,7 +76,6 @@ static struct { BOOL sendinput_broken; } key_status; -static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); @@ -163,7 +162,6 @@ static void init_function_pointers(void) if (!(p ## func = (void*)GetProcAddress(hdll, #func))) \ trace("GetProcAddress(%s) failed\n", #func) - GET_PROC(SendInput); GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); GET_PROC(GetPointerType); @@ -249,7 +247,7 @@ static BOOL do_test( HWND hwnd, int seqnr, const KEV td[] ) for( kmctr = 0; kmctr < MAXKEYEVENTS && expmsg[kmctr].message; kmctr++) ; ok( evtctr <= MAXKEYEVENTS, "evtctr is above MAXKEYEVENTS\n" ); - if( evtctr != pSendInput(evtctr, &inputs[0], sizeof(INPUT))) + if( evtctr != SendInput(evtctr, &inputs[0], sizeof(INPUT))) ok (FALSE, "SendInput failed to send some events\n"); i = 0; if (winetest_debug > 1) @@ -954,7 +952,7 @@ static void test_Input_blackbox(void) i.u.ki.wScan = ii+1 /* useful for debugging */; i.u.ki.dwFlags = sendinput_test[ii].dwFlags; i.u.ki.wVk = sendinput_test[ii].wVk; - pSendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); + SendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); empty_message_queue(); GetKeyboardState(ks2); compare_and_check(ii, ks1, ks2, &sendinput_test[ii], foreground); @@ -997,7 +995,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[0].u.ki.dwFlags = KEYEVENTF_UNICODE; reset_key_status(); - pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + SendInput(1, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1019,7 +1017,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; reset_key_status(); - pSendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); + SendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1045,7 +1043,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) reset_key_status(); key_status.expect_alt = TRUE; - pSendInput(2, (INPUT*)inputs, sizeof(INPUT)); + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1072,7 +1070,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) reset_key_status(); key_status.expect_alt = TRUE; - pSendInput(2, (INPUT*)inputs, sizeof(INPUT)); + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -2758,7 +2756,7 @@ static void test_input_message_source(void) SendMessageA( hwnd, WM_KEYDOWN, 0, 0 ); SendMessageA( hwnd, WM_MOUSEMOVE, 0, 0 ); - pSendInput( 2, (INPUT *)inputs, sizeof(INPUT) ); + SendInput( 2, (INPUT *)inputs, sizeof(INPUT) ); while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) { expect_src.deviceType = IMDT_KEYBOARD; @@ -2834,15 +2832,10 @@ START_TEST(input) init_function_pointers(); GetCursorPos( &pos ); - if (pSendInput) - { - test_Input_blackbox(); - test_Input_whitebox(); - test_Input_unicode(); - test_Input_mouse(); - } - else win_skip("SendInput is not available\n"); - + test_Input_blackbox(); + test_Input_whitebox(); + test_Input_unicode(); + test_Input_mouse(); test_keynames(); test_mouse_ll_hook(); test_key_map(); -- 2.20.1

1 2

[PATCH] msi: Close all handles opened by a custom action thread.
by Zebediah Figura 01 Jul '19

01 Jul '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47418 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/custom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 03f9b085c04..b864270690b 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -580,7 +580,8 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) midl_user_free(dll); midl_user_free(proc); - MsiCloseHandle(hPackage); + + MsiCloseAllHandles(); return r; } -- 2.22.0

2 1

[PATCH] ntdll: Add '-norelay' flag for _vsnprintf().
by Dmitry Timoshkov 01 Jul '19

01 Jul '19

Otherwise for instance +relay,+ver log has ver: traces completely messed up. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ec7b56c2b..94bc52cc14 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1419,7 +1419,7 @@ @ cdecl _ui64tow(int64 ptr long) @ cdecl _ultoa(long ptr long) @ cdecl _ultow(long ptr long) -@ cdecl _vsnprintf(ptr long str ptr) NTDLL__vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) NTDLL__vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) NTDLL__vsnwprintf @ cdecl _wcsicmp(wstr wstr) NTDLL__wcsicmp @ cdecl _wcslwr(wstr) NTDLL__wcslwr -- 2.20.1

1 0

[PATCH] wined3d: Always try to create a hardware cursor.
by Zebediah Figura 30 Jun '19

30 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47386 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 65 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d35a0648c9c..39dd93e11b7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5216,9 +5216,12 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx) { unsigned int texture_level = sub_resource_idx % texture->level_count; - unsigned int cursor_width, cursor_height; + unsigned int cursor_width, cursor_height, mask_size; struct wined3d_display_mode mode; struct wined3d_map_desc map_desc; + ICONINFO cursor_info; + DWORD *mask_bits; + HCURSOR cursor; HRESULT hr; TRACE("device %p, x_hotspot %u, y_hotspot %u, texture %p, sub_resource_idx %u.\n", @@ -5268,43 +5271,37 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (cursor_width == 32 && cursor_height == 32) - { - UINT mask_size = cursor_width * cursor_height / 8; - ICONINFO cursor_info; - DWORD *mask_bits; - HCURSOR cursor; + mask_size = cursor_width * cursor_height / 8; - /* 32-bit user32 cursors ignore the alpha channel if it's all - * zeroes, and use the mask instead. Fill the mask with all ones - * to ensure we still get a fully transparent cursor. */ - if (!(mask_bits = heap_alloc(mask_size))) - return E_OUTOFMEMORY; - memset(mask_bits, 0xff, mask_size); + /* 32-bit user32 cursors ignore the alpha channel if it's all + * zeroes, and use the mask instead. Fill the mask with all ones + * to ensure we still get a fully transparent cursor. */ + if (!(mask_bits = heap_alloc(mask_size))) + return E_OUTOFMEMORY; + memset(mask_bits, 0xff, mask_size); - wined3d_resource_map(&texture->resource, sub_resource_idx, &map_desc, NULL, - WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READ); - cursor_info.fIcon = FALSE; - cursor_info.xHotspot = x_hotspot; - cursor_info.yHotspot = y_hotspot; - cursor_info.hbmMask = CreateBitmap(cursor_width, cursor_height, 1, 1, mask_bits); - cursor_info.hbmColor = CreateBitmap(cursor_width, cursor_height, 1, 32, map_desc.data); - wined3d_resource_unmap(&texture->resource, sub_resource_idx); + wined3d_resource_map(&texture->resource, sub_resource_idx, &map_desc, NULL, + WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READ); + cursor_info.fIcon = FALSE; + cursor_info.xHotspot = x_hotspot; + cursor_info.yHotspot = y_hotspot; + cursor_info.hbmMask = CreateBitmap(cursor_width, cursor_height, 1, 1, mask_bits); + cursor_info.hbmColor = CreateBitmap(cursor_width, cursor_height, 1, 32, map_desc.data); + wined3d_resource_unmap(&texture->resource, sub_resource_idx); - /* Create our cursor and clean up. */ - cursor = CreateIconIndirect(&cursor_info); - if (cursor_info.hbmMask) - DeleteObject(cursor_info.hbmMask); - if (cursor_info.hbmColor) - DeleteObject(cursor_info.hbmColor); - if (device->hardwareCursor) - DestroyCursor(device->hardwareCursor); - device->hardwareCursor = cursor; - if (device->bCursorVisible) - SetCursor(cursor); + /* Create our cursor and clean up. */ + cursor = CreateIconIndirect(&cursor_info); + if (cursor_info.hbmMask) + DeleteObject(cursor_info.hbmMask); + if (cursor_info.hbmColor) + DeleteObject(cursor_info.hbmColor); + if (device->hardwareCursor) + DestroyCursor(device->hardwareCursor); + device->hardwareCursor = cursor; + if (device->bCursorVisible) + SetCursor(cursor); - heap_free(mask_bits); - } + heap_free(mask_bits); TRACE("New cursor dimensions are %ux%u.\n", cursor_width, cursor_height); device->cursorWidth = cursor_width; -- 2.20.1

3 2

[PATCH 1/4] qedit/tests: Add some tests for media types.
by Zebediah Figura 29 Jun '19

29 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/tests/nullrenderer.c | 28 ++++++++++++++++++++++++++ dlls/qedit/tests/samplegrabber.c | 34 ++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index d39b28d5779..3d5221b0a9e 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -352,6 +352,33 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_null_renderer(); + AM_MEDIA_TYPE mt = {}, *pmt; + IEnumMediaTypes *enummt; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -373,6 +400,7 @@ START_TEST(nullrenderer) test_find_pin(); test_pin_info(); test_aggregation(); + test_media_types(); CoUninitialize(); } diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 8bc44b9c22f..9bb4eb4f01c 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -449,6 +449,39 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_sample_grabber(); + IEnumMediaTypes *enummt; + AM_MEDIA_TYPE mt = {}; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(samplegrabber) { IBaseFilter *filter; @@ -470,6 +503,7 @@ START_TEST(samplegrabber) test_find_pin(); test_pin_info(); test_aggregation(); + test_media_types(); CoUninitialize(); } -- 2.22.0

1 3

[PATCH 5/5] ddraw: Use wined3d_bit_scan() in viewport_alloc_active_light_index().
by Henri Verbeet 28 Jun '19

28 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/viewport.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index e94c4b8da0e..556783ab947 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -152,15 +152,10 @@ void viewport_alloc_active_light_index(struct d3d_light *light) } } } - map = vp->map_lights; - assert(vp->active_lights_count < DDRAW_MAX_ACTIVE_LIGHTS && map != ~0u); - i = 0; - while (map & 1) - { - map >>= 1; - ++i; - } + map = ~vp->map_lights; + assert(vp->active_lights_count < DDRAW_MAX_ACTIVE_LIGHTS && map); + i = wined3d_bit_scan(&map); light->active_light_index = i + 1; ++vp->active_lights_count; vp->map_lights |= 1u << i; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_vshader().
by Henri Verbeet 28 Jun '19

28 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3aa31c168f9..8023f7bd2ff 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8470,12 +8470,11 @@ static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const str return !memcmp(stored->interpolation_mode, new->interpolation_mode, sizeof(new->interpolation_mode)); } -static GLuint find_glsl_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, - struct wined3d_shader *shader, const struct vs_compile_args *args) +static GLuint find_glsl_vertex_shader(const struct wined3d_context_gl *context_gl, + struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct vs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_vs_compiled_shader *gl_shaders, *new_array; - uint32_t use_map = context->stream_info.use_map; + uint32_t use_map = context_gl->c.stream_info.use_map; struct glsl_shader_private *shader_data; unsigned int i, new_size; GLuint ret; @@ -10134,7 +10133,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args, context); - vs_id = find_glsl_vshader(context, priv, vshader, &vs_compile_args); + vs_id = find_glsl_vertex_shader(context_gl, priv, vshader, &vs_compile_args); vs_list = &vshader->linked_programs; } else if (priv->vertex_pipe == &glsl_vertex_pipe) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_pshader().
by Henri Verbeet 28 Jun '19

28 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2ed5e7afb89..3aa31c168f9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8373,12 +8373,11 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g return shader_id; } -static GLuint find_glsl_pshader(const struct wined3d_context *context, +static GLuint find_glsl_fragment_shader(const struct wined3d_context_gl *context_gl, struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, struct wined3d_shader *shader, const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ps_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; struct ps_np2fixup_info *np2fixup; @@ -10200,7 +10199,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct ps_compile_args ps_compile_args; pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; find_ps_compile_args(state, pshader, context->stream_info.position_transformed, &ps_compile_args, context); - ps_id = find_glsl_pshader(context, &priv->shader_buffer, &priv->string_buffers, + ps_id = find_glsl_fragment_shader(context_gl, &priv->shader_buffer, &priv->string_buffers, pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_compute_shader().
by Henri Verbeet 28 Jun '19

28 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1b04e9addb8..2ed5e7afb89 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8332,14 +8332,13 @@ static void shader_glsl_generate_shader_epilogue(const struct wined3d_shader_con } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_gl *context_gl, struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, const struct wined3d_shader *shader) { const struct wined3d_shader_thread_group_size *thread_group_size = &shader->u.cs.thread_group_size; - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; unsigned int i; @@ -10010,7 +10009,7 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, TRACE("Compiling compute shader %p.\n", shader); string_buffer_clear(buffer); - shader_id = shader_glsl_generate_compute_shader(context, buffer, &priv->string_buffers, shader); + shader_id = shader_glsl_generate_compute_shader(context_gl, buffer, &priv->string_buffers, shader); gl_shaders[shader_data->num_gl_shaders++].id = shader_id; program_id = GL_EXTCALL(glCreateProgram()); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_geometry_shader().
by Henri Verbeet 28 Jun '19

28 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a793bf71f23..1b04e9addb8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8203,14 +8203,13 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_signature_element *output; enum wined3d_primitive_type primitive_type; struct shader_glsl_ctx_priv priv_ctx; @@ -8642,6 +8641,7 @@ static GLuint find_glsl_domain_shader(const struct wined3d_context *context, static GLuint find_glsl_geometry_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct gs_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_gs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -8687,7 +8687,7 @@ static GLuint find_glsl_geometry_shader(const struct wined3d_context *context, gl_shaders = new_array; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_geometry_shader(context, priv, shader, args); + ret = shader_glsl_generate_geometry_shader(context_gl, priv, shader, args); gl_shaders[shader_data->num_gl_shaders].args = *args; gl_shaders[shader_data->num_gl_shaders++].id = ret; -- 2.11.0

1 0

[PATCH] winecfg: Disable MIME-type associations by default.
by Jimi Huotari 28 Jun '19

28 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45672 Signed-off-by: Jimi Huotari <chiitoo(a)gentoo.org> --- programs/winecfg/theme.c | 2 +- programs/winemenubuilder/winemenubuilder.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 66d23448f6..c47c9ed566 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1165,7 +1165,7 @@ static void on_select_font(HWND hDlg) static void init_mime_types(HWND hDlg) { - char *buf = get_reg_key(config_key, keypath("FileOpenAssociations"), "Enable", "Y"); + char *buf = get_reg_key(config_key, keypath("FileOpenAssociations"), "Enable", "N"); int state = IS_OPTION_TRUE(*buf) ? BST_CHECKED : BST_UNCHECKED; CheckDlgButton(hDlg, IDC_ENABLE_FILE_ASSOCIATIONS, state); diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fa700f8c19..88e1a3e7f2 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3624,7 +3624,7 @@ static BOOL init_xdg(void) static BOOL associations_enabled(void) { - BOOL ret = TRUE; + BOOL ret = FALSE; HKEY hkey; BYTE buf[32]; DWORD len; -- 2.22.0

3 3

[PATCH] winebus.sys: Increase buffer size to match max length avaialble.
by Alistair Leslie-Hughes 28 Jun '19

28 Jun '19

The current buffer is 1024, however the ioctl call can handle a max length of 8191. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47013 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index a3255dfc85..08ad8765af 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -880,7 +880,7 @@ static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE int rc; struct platform_private* ext = impl_from_DEVICE_OBJECT(device); BYTE *feature_buffer; - BYTE buffer[1024]; + BYTE buffer[8192]; if (id == 0) { -- 2.17.1

1 0

[PATCH 1/6] winebus.inf: Add new INF file and copy it to the INF directory.
by Zebediah Figura 28 Jun '19

28 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/Makefile.in | 1 + loader/wine.inf.in | 1 + loader/winebus.inf.in | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 loader/winebus.inf.in diff --git a/loader/Makefile.in b/loader/Makefile.in index 3ada656408b..11a476103c1 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -10,6 +10,7 @@ SOURCES = \ wine.man.in \ wine.pl.UTF-8.man.in \ wine_info.plist.in \ + winebus.inf.in \ winehid.inf.in PROGRAMS = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9f97b346f93..0da7eeef7d8 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3682,4 +3682,5 @@ inf_section = 17 l_intl.nls [inf_section] +winebus.inf winehid.inf diff --git a/loader/winebus.inf.in b/loader/winebus.inf.in new file mode 100644 index 00000000000..3950c3dfc4e --- /dev/null +++ b/loader/winebus.inf.in @@ -0,0 +1,22 @@ +[Version] +Signature="$CHICAGO$" +ClassGuid={4d36e97d-e325-11ce-bfc1-08002be10318} +Class=System + +[Manufacturer] +Wine=mfg_section + +[mfg_section] +Wine HID bus driver=device_section,root\winebus + +[device_section.Services] +AddService = winebus,0x2,svc_section + +[svc_section] +Description="Wine HID bus driver" +DisplayName="Wine HID bus" +ServiceBinary="%12%\winebus.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1 -- 2.22.0

1 5

[PATCH 1/4] quartz/tests: Add some tests for VMR7 media types.
by Zebediah Figura 28 Jun '19

28 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index e702be70609..9574a2971d2 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -661,6 +661,75 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr7(0); + AM_MEDIA_TYPE *mt, req_mt = {{0}}; + VIDEOINFOHEADER vih = + { + {0}, {0}, 0, 0, 0, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, BI_RGB} + }; + IEnumMediaTypes *enummt; + unsigned int i; + HRESULT hr; + ULONG ref; + IPin *pin; + + static const GUID *subtype_tests[] = + { + &MEDIASUBTYPE_NULL, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + }; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + req_mt.majortype = MEDIATYPE_Video; + req_mt.formattype = FORMAT_VideoInfo; + req_mt.cbFormat = sizeof(VIDEOINFOHEADER); + req_mt.pbFormat = (BYTE *)&vih; + + for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) + { + req_mt.subtype = *subtype_tests[i]; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x for subtype %s.\n", hr, wine_dbgstr_guid(subtype_tests[i])); + } + + req_mt.subtype = MEDIASUBTYPE_RGB8; + hr = IPin_QueryAccept(pin, &req_mt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.subtype = MEDIASUBTYPE_RGB24; + + req_mt.majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Video; + + req_mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + req_mt.formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); @@ -671,6 +740,7 @@ START_TEST(vmr7) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); CoUninitialize(); } -- 2.22.0

1 3

[PATCH 5/5] wined3d: Use Windows 7 as fallback driver version in wined3d_driver_info_init().
by Henri Verbeet 27 Jun '19

27 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7202a907ab1..72c3de98a95 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -609,10 +609,10 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, break; default: - FIXME("Unhandled OS version %u.%u, reporting 2000/XP.\n", + FIXME("Unhandled OS version %u.%u, reporting Windows 7.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); - driver_os_version = 6; - driver_model = DRIVER_MODEL_NT5X; + driver_os_version = 8; + driver_model = DRIVER_MODEL_NT6X; break; } } -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_domain_shader().
by Henri Verbeet 27 Jun '19

27 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ae08f6131fd..a793bf71f23 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8109,14 +8109,13 @@ static void shader_glsl_generate_ds_epilogue(const struct wined3d_gl_info *gl_in shader_glsl_fixup_position(buffer, FALSE); } -static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct ds_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; @@ -8587,6 +8586,7 @@ static GLuint find_glsl_hull_shader(const struct wined3d_context *context, static GLuint find_glsl_domain_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct ds_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ds_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -8632,7 +8632,7 @@ static GLuint find_glsl_domain_shader(const struct wined3d_context *context, gl_shaders = new_array; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_domain_shader(context, priv, shader, args); + ret = shader_glsl_generate_domain_shader(context_gl, priv, shader, args); gl_shaders[shader_data->num_gl_shaders].args = *args; gl_shaders[shader_data->num_gl_shaders++].id = ret; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_hull_shader().
by Henri Verbeet 27 Jun '19

27 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f72d6ebb4fb..ae08f6131fd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8013,14 +8013,13 @@ static void shader_glsl_generate_shader_phase_invocation(struct wined3d_string_b } } -static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_hull_shader *hs = &shader->u.hs; const struct wined3d_shader_phase *phase; struct shader_glsl_ctx_priv priv_ctx; @@ -8542,6 +8541,7 @@ static GLuint find_glsl_vshader(const struct wined3d_context *context, struct sh static GLuint find_glsl_hull_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_hs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int new_size; @@ -8578,7 +8578,7 @@ static GLuint find_glsl_hull_shader(const struct wined3d_context *context, gl_shaders = new_array; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_hull_shader(context, priv, shader); + ret = shader_glsl_generate_hull_shader(context_gl, priv, shader); gl_shaders[shader_data->num_gl_shaders++].id = ret; return ret; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_vshader().
by Henri Verbeet 27 Jun '19

27 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f6f0c46f010..f72d6ebb4fb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7870,15 +7870,14 @@ static void shader_glsl_generate_vs_epilogue(const struct wined3d_gl_info *gl_in } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_vertex_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct vs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; unsigned int i; @@ -8479,11 +8478,11 @@ static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const str static GLuint find_glsl_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct vs_compile_args *args) { - UINT i; - DWORD new_size; - DWORD use_map = context->stream_info.use_map; + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_vs_compiled_shader *gl_shaders, *new_array; + uint32_t use_map = context->stream_info.use_map; struct glsl_shader_private *shader_data; + unsigned int i, new_size; GLuint ret; if (!shader->backend_data) @@ -8534,7 +8533,7 @@ static GLuint find_glsl_vshader(const struct wined3d_context *context, struct sh gl_shaders[shader_data->num_gl_shaders].args = *args; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_vshader(context, priv, shader, args); + ret = shader_glsl_generate_vertex_shader(context_gl, priv, shader, args); gl_shaders[shader_data->num_gl_shaders++].id = ret; return ret; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_pshader().
by Henri Verbeet 27 Jun '19

27 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3c74ff7054d..f6f0c46f010 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7518,17 +7518,16 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_gl *context_gl, struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, - const struct wined3d_shader *shader, - const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) + const struct wined3d_shader *shader, const struct ps_compile_args *args, + struct ps_np2fixup_info *np2fixup_info) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - const char *prefix = shader_glsl_get_prefix(version->type); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const BOOL legacy_syntax = needs_legacy_glsl_syntax(gl_info); + const char *prefix = shader_glsl_get_prefix(version->type); unsigned int i, extra_constants_needed = 0; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; @@ -7683,7 +7682,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) { - if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "layout(%spixel_center_integer) in vec4 gl_FragCoord;\n", args->render_offscreen ? "" : "origin_upper_left, "); else if (!args->render_offscreen) @@ -7765,7 +7764,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) shader_addline(buffer, "vpos = gl_FragCoord;\n"); - else if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + else if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); else @@ -8384,6 +8383,7 @@ static GLuint find_glsl_pshader(const struct wined3d_context *context, struct wined3d_shader *shader, const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ps_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; struct ps_np2fixup_info *np2fixup; @@ -8448,7 +8448,7 @@ static GLuint find_glsl_pshader(const struct wined3d_context *context, pixelshader_update_resource_types(shader, args->tex_types); string_buffer_clear(buffer); - ret = shader_glsl_generate_pshader(context, buffer, string_buffers, shader, args, np2fixup); + ret = shader_glsl_generate_fragment_shader(context_gl, buffer, string_buffers, shader, args, np2fixup); gl_shaders[shader_data->num_gl_shaders++].id = ret; return ret; -- 2.11.0

1 0

[PATCH vkd3d 7/7] tests: Add bug_if() for VK_EXT_conditional_rendering radv bugs.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Radv executes vkCmdResolveImage() and clears conditionally. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2e4daf56e445..5177607fbbcc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31010,6 +31010,7 @@ static void test_conditional_rendering(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + bug_if(is_radv_device(context.device)) todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); release_resource_readback(&rb); @@ -31244,6 +31245,7 @@ static void test_conditional_rendering(void) D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list); + bug_if(is_radv_device(context.device)) todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0); release_resource_readback(&rb); -- 2.21.0

2 1

[PATCH vkd3d 1/7] tests: Add buf_if() in test_tessellation_primitive_id().
by Józef Kucia 27 Jun '19

27 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> The test is affected by bugs mentioned in 18442763f1683ac7c47f17588b0632c3b34ac1f2. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c2d5bb5c75e4..1864a879c24b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27434,6 +27434,7 @@ static void test_tessellation_primitive_id(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_nvidia_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); ID3D12Resource_Release(vb); -- 2.21.0

3 2

[PATCH vkd3d 6/7] tests: Add more tests for predicated rendering.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1eec9222e5fd..2e4daf56e445 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30883,6 +30883,7 @@ static void prepare_instanced_draw(struct test_context *context) static void test_conditional_rendering(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + ID3D12Resource *conditions, *upload_buffer; ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; @@ -30895,7 +30896,6 @@ static void test_conditional_rendering(void) struct test_context context; ID3D12Resource *buffer, *cb; struct resource_readback rb; - ID3D12Resource *conditions; ID3D12CommandQueue *queue; unsigned int i; uint32_t value; @@ -30976,7 +30976,7 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, @@ -30992,6 +30992,8 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, + sizeof(uint64_t), D3D12_PREDICATION_OP_EQUAL_ZERO); check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); reset_command_list(command_list, context.allocator); @@ -31095,6 +31097,26 @@ static void test_conditional_rendering(void) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); ID3D12Resource_Release(buffer); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* SetPredication() and upload buffer. */ + upload_buffer = create_upload_buffer(context.device, sizeof(predicate_args), predicate_args); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + /* Skip. */ + ID3D12GraphicsCommandList_SetPredication(command_list, upload_buffer, + 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetPredication(command_list, upload_buffer, + 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); @@ -31300,6 +31322,7 @@ static void test_conditional_rendering(void) ID3D12Resource_Release(conditions); ID3D12Resource_Release(cb); ID3D12Resource_Release(buffer); + ID3D12Resource_Release(upload_buffer); ID3D12RootSignature_Release(root_signature); ID3D12PipelineState_Release(pipeline_state); destroy_test_context(&context); -- 2.21.0

2 1

[PATCH vkd3d 5/7] tests: Remove tests for DXGI_FORMAT_B8G8R8A8_UNORM UAV support.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> UAV support for B8G8R8A8_UNORM appears to be present even on feature level 11_0 on newer Windows versions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5a870d96b05c..1eec9222e5fd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1184,8 +1184,6 @@ static void test_format_support(void) /* A recent version of WARP suppots B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */ {{DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, - {{DXGI_FORMAT_B8G8R8A8_UNORM, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, - D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, }; if (!(device = create_device())) @@ -1797,26 +1795,6 @@ static void test_create_committed_resource(void) &IID_ID3D12Resource, (void **)&resource); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - /* DXGI_FORMAT_B8G8R8A8_UNORM does not support D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS. */ - heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; - resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; - resource_desc.Alignment = 0; - resource_desc.Width = 32; - resource_desc.Height = 32; - resource_desc.DepthOrArraySize = 1; - resource_desc.MipLevels = 1; - resource_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; - resource_desc.SampleDesc.Count = 1; - resource_desc.SampleDesc.Quality = 0; - resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; - resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; - hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, - &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, - &IID_ID3D12Resource, (void **)&resource); - todo ok(hr == E_INVALIDARG || broken_on_warp(true), "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12Resource_Release(resource); - heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD; resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; -- 2.21.0

2 1

[PATCH vkd3d 4/7] tests: Add more tests for D3D12_FEATURE_FORMAT_INFO.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 68 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 14 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c3931b94fc06..5a870d96b05c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -975,8 +975,11 @@ static void test_check_feature_support(void) D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; D3D12_FEATURE_DATA_FORMAT_INFO format_info; + unsigned int expected_plane_count; ID3D12Device *device; + DXGI_FORMAT format; ULONG refcount; + bool is_todo; HRESULT hr; static const D3D_FEATURE_LEVEL all_feature_levels[] = @@ -1096,21 +1099,58 @@ static void test_check_feature_support(void) ok(format_info.Format == DXGI_FORMAT_UNKNOWN, "Got unexpected format %#x.\n", format_info.Format); ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); - memset(&format_info, 0, sizeof(format_info)); - format_info.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, - &format_info, sizeof(format_info)); - ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); - ok(format_info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected format %#x.\n", format_info.Format); - ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + vkd3d_test_set_context("format %#x", format); - memset(&format_info, 0, sizeof(format_info)); - format_info.Format = DXGI_FORMAT_R24G8_TYPELESS; - hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, - &format_info, sizeof(format_info)); - ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); - ok(format_info.Format == DXGI_FORMAT_R24G8_TYPELESS, "Got unexpected format %#x.\n", format_info.Format); - ok(format_info.PlaneCount == 2, "Got unexpected plane count %u.\n", format_info.PlaneCount); + switch (format) + { + case DXGI_FORMAT_R32G8X24_TYPELESS: + case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: + case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS: + case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT: + case DXGI_FORMAT_D24_UNORM_S8_UINT: + case DXGI_FORMAT_R24G8_TYPELESS: + case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: + case DXGI_FORMAT_X24_TYPELESS_G8_UINT: + case DXGI_FORMAT_NV12: + case DXGI_FORMAT_P010: + case DXGI_FORMAT_P016: + case DXGI_FORMAT_NV11: + expected_plane_count = 2; + break; + default: + expected_plane_count = 1; + break; + } + + is_todo = format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP + || format == DXGI_FORMAT_R8G8_B8G8_UNORM + || format == DXGI_FORMAT_G8R8_G8B8_UNORM + || format == DXGI_FORMAT_B5G6R5_UNORM + || format == DXGI_FORMAT_B5G5R5A1_UNORM + || format == DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM + || (DXGI_FORMAT_AYUV <= format && format <= DXGI_FORMAT_B4G4R4A4_UNORM); + + memset(&format_info, 0, sizeof(format_info)); + format_info.Format = format; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, + &format_info, sizeof(format_info)); + + if (format == DXGI_FORMAT_R1_UNORM) + { + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + continue; + } + + todo_if(is_todo) + ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); + ok(format_info.Format == format, "Got unexpected format %#x.\n", format_info.Format); + todo_if(is_todo) + ok(format_info.PlaneCount == expected_plane_count, + "Got plane count %u, expected %u.\n", format_info.PlaneCount, expected_plane_count); + } + vkd3d_test_set_context(NULL); /* GPU virtual address */ memset(&gpu_virtual_address, 0, sizeof(gpu_virtual_address)); -- 2.21.0

2 1

[PATCH vkd3d 3/7] vkd3d: Implement D3D12_FEATURE_FORMAT_INFO.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 31 ++++++ libs/vkd3d/utils.c | 192 ++++++++++++++++++------------------- libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 12 +-- 4 files changed, 134 insertions(+), 102 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index f67713594ea5..2fd13f6c138c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2371,6 +2371,37 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return d3d12_device_check_multisample_quality_levels(device, data); } + case D3D12_FEATURE_FORMAT_INFO: + { + D3D12_FEATURE_DATA_FORMAT_INFO *data = feature_data; + const struct vkd3d_format *format; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + if (data->Format == DXGI_FORMAT_UNKNOWN) + { + data->PlaneCount = 1; + return S_OK; + } + + if (!(format = vkd3d_get_format(device, data->Format, false))) + format = vkd3d_get_format(device, data->Format, true); + if (!format) + { + FIXME("Unhandled format %#x.\n", data->Format); + return E_INVALIDARG; + } + + data->PlaneCount = format->plane_count; + + TRACE("Format %#x, plane count %"PRIu8".\n", data->Format, data->PlaneCount); + return S_OK; + } + case D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT: { const D3D12_FEATURE_DATA_D3D12_OPTIONS *options = &device->feature_options; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 16960624b294..5c8d3635b22c 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -26,107 +26,107 @@ #define DEPTH_STENCIL (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT) static const struct vkd3d_format vkd3d_formats[] = { - {DXGI_FORMAT_R32G32B32A32_TYPELESS, VK_FORMAT_R32G32B32A32_SFLOAT, 16, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, 16, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32B32A32_UINT, VK_FORMAT_R32G32B32A32_UINT, 16, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32B32A32_SINT, VK_FORMAT_R32G32B32A32_SINT, 16, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32B32_TYPELESS, VK_FORMAT_R32G32B32_SFLOAT, 12, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, 12, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32B32_UINT, VK_FORMAT_R32G32B32_UINT, 12, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32B32_SINT, VK_FORMAT_R32G32B32_SINT, 12, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16B16A16_TYPELESS, VK_FORMAT_R16G16B16A16_SFLOAT, 8, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16B16A16_FLOAT, VK_FORMAT_R16G16B16A16_SFLOAT, 8, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16B16A16_UNORM, VK_FORMAT_R16G16B16A16_UNORM, 8, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16B16A16_UINT, VK_FORMAT_R16G16B16A16_UINT, 8, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16B16A16_SNORM, VK_FORMAT_R16G16B16A16_SNORM, 8, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16B16A16_SINT, VK_FORMAT_R16G16B16A16_SINT, 8, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32_TYPELESS, VK_FORMAT_R32G32_SFLOAT, 8, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, 8, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32_UINT, VK_FORMAT_R32G32_UINT, 8, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32_SINT, VK_FORMAT_R32G32_SINT, 8, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R10G10B10A2_TYPELESS, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R10G10B10A2_UINT, VK_FORMAT_A2B10G10R10_UINT_PACK32, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8_TYPELESS, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8_UINT, VK_FORMAT_R8G8_UINT, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8_SNORM, VK_FORMAT_R8G8_SNORM, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8_SINT, VK_FORMAT_R8G8_SINT, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8B8A8_TYPELESS, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, VK_FORMAT_R8G8B8A8_SRGB, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8B8A8_UINT, VK_FORMAT_R8G8B8A8_UINT, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8B8A8_SNORM, VK_FORMAT_R8G8B8A8_SNORM, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8G8B8A8_SINT, VK_FORMAT_R8G8B8A8_SINT, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16_TYPELESS, VK_FORMAT_R16G16_SFLOAT, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16_FLOAT, VK_FORMAT_R16G16_SFLOAT, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16_UNORM, VK_FORMAT_R16G16_UNORM, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16_UINT, VK_FORMAT_R16G16_UINT, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16_SNORM, VK_FORMAT_R16G16_SNORM, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16G16_SINT, VK_FORMAT_R16G16_SINT, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32_TYPELESS, VK_FORMAT_R32_UINT, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_D32_FLOAT, VK_FORMAT_D32_SFLOAT, 4, 1, 1, 1, DEPTH}, - {DXGI_FORMAT_R32_FLOAT, VK_FORMAT_R32_SFLOAT, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32_UINT, VK_FORMAT_R32_UINT, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32_SINT, VK_FORMAT_R32_SINT, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16_TYPELESS, VK_FORMAT_R16_UINT, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16_FLOAT, VK_FORMAT_R16_SFLOAT, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_D16_UNORM, VK_FORMAT_D16_UNORM, 2, 1, 1, 1, DEPTH}, - {DXGI_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16_UINT, VK_FORMAT_R16_UINT, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16_SNORM, VK_FORMAT_R16_SNORM, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R16_SINT, VK_FORMAT_R16_SINT, 2, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8_TYPELESS, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8_UINT, VK_FORMAT_R8_UINT, 1, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8_SNORM, VK_FORMAT_R8_SNORM, 1, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R8_SINT, VK_FORMAT_R8_SINT, 1, 1, 1, 1, COLOR}, - {DXGI_FORMAT_A8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, - {DXGI_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_B8G8R8A8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_B8G8R8X8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_B8G8R8X8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, 4, 1, 1, 1, COLOR}, - {DXGI_FORMAT_BC1_TYPELESS, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, 1, 4, 4, 8, COLOR}, - {DXGI_FORMAT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, 1, 4, 4, 8, COLOR}, - {DXGI_FORMAT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, 1, 4, 4, 8, COLOR}, - {DXGI_FORMAT_BC2_TYPELESS, VK_FORMAT_BC2_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC2_UNORM_SRGB, VK_FORMAT_BC2_SRGB_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC3_TYPELESS, VK_FORMAT_BC3_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC3_UNORM, VK_FORMAT_BC3_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC3_UNORM_SRGB, VK_FORMAT_BC3_SRGB_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC4_TYPELESS, VK_FORMAT_BC4_UNORM_BLOCK, 1, 4, 4, 8, COLOR}, - {DXGI_FORMAT_BC4_UNORM, VK_FORMAT_BC4_UNORM_BLOCK, 1, 4, 4, 8, COLOR}, - {DXGI_FORMAT_BC4_SNORM, VK_FORMAT_BC4_SNORM_BLOCK, 1, 4, 4, 8, COLOR}, - {DXGI_FORMAT_BC5_TYPELESS, VK_FORMAT_BC5_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC5_UNORM, VK_FORMAT_BC5_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC5_SNORM, VK_FORMAT_BC5_SNORM_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC6H_TYPELESS, VK_FORMAT_BC6H_UFLOAT_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC6H_UF16, VK_FORMAT_BC6H_UFLOAT_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC7_TYPELESS, VK_FORMAT_BC7_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, - {DXGI_FORMAT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, 1, 4, 4, 16, COLOR}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, VK_FORMAT_R32G32B32A32_SFLOAT, 16, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, 16, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32B32A32_UINT, VK_FORMAT_R32G32B32A32_UINT, 16, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32B32A32_SINT, VK_FORMAT_R32G32B32A32_SINT, 16, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32B32_TYPELESS, VK_FORMAT_R32G32B32_SFLOAT, 12, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, 12, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32B32_UINT, VK_FORMAT_R32G32B32_UINT, 12, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32B32_SINT, VK_FORMAT_R32G32B32_SINT, 12, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, VK_FORMAT_R16G16B16A16_SFLOAT, 8, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, VK_FORMAT_R16G16B16A16_SFLOAT, 8, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16B16A16_UNORM, VK_FORMAT_R16G16B16A16_UNORM, 8, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16B16A16_UINT, VK_FORMAT_R16G16B16A16_UINT, 8, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16B16A16_SNORM, VK_FORMAT_R16G16B16A16_SNORM, 8, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16B16A16_SINT, VK_FORMAT_R16G16B16A16_SINT, 8, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32_TYPELESS, VK_FORMAT_R32G32_SFLOAT, 8, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, 8, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32_UINT, VK_FORMAT_R32G32_UINT, 8, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32G32_SINT, VK_FORMAT_R32G32_SINT, 8, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R10G10B10A2_UINT, VK_FORMAT_A2B10G10R10_UINT_PACK32, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8_TYPELESS, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8_UINT, VK_FORMAT_R8G8_UINT, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8_SNORM, VK_FORMAT_R8G8_SNORM, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8_SINT, VK_FORMAT_R8G8_SINT, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, VK_FORMAT_R8G8B8A8_SRGB, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8B8A8_UINT, VK_FORMAT_R8G8B8A8_UINT, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8B8A8_SNORM, VK_FORMAT_R8G8B8A8_SNORM, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8G8B8A8_SINT, VK_FORMAT_R8G8B8A8_SINT, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16_TYPELESS, VK_FORMAT_R16G16_SFLOAT, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16_FLOAT, VK_FORMAT_R16G16_SFLOAT, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16_UNORM, VK_FORMAT_R16G16_UNORM, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16_UINT, VK_FORMAT_R16G16_UINT, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16_SNORM, VK_FORMAT_R16G16_SNORM, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16G16_SINT, VK_FORMAT_R16G16_SINT, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32_TYPELESS, VK_FORMAT_R32_UINT, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_D32_FLOAT, VK_FORMAT_D32_SFLOAT, 4, 1, 1, 1, DEPTH, 1}, + {DXGI_FORMAT_R32_FLOAT, VK_FORMAT_R32_SFLOAT, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32_UINT, VK_FORMAT_R32_UINT, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R32_SINT, VK_FORMAT_R32_SINT, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16_TYPELESS, VK_FORMAT_R16_UINT, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16_FLOAT, VK_FORMAT_R16_SFLOAT, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_D16_UNORM, VK_FORMAT_D16_UNORM, 2, 1, 1, 1, DEPTH, 1}, + {DXGI_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16_UINT, VK_FORMAT_R16_UINT, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16_SNORM, VK_FORMAT_R16_SNORM, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R16_SINT, VK_FORMAT_R16_SINT, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8_TYPELESS, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8_UINT, VK_FORMAT_R8_UINT, 1, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8_SNORM, VK_FORMAT_R8_SNORM, 1, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_R8_SINT, VK_FORMAT_R8_SINT, 1, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_A8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_B8G8R8A8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_B8G8R8X8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_B8G8R8X8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, 4, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_BC1_TYPELESS, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, 1, 4, 4, 8, COLOR, 1}, + {DXGI_FORMAT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, 1, 4, 4, 8, COLOR, 1}, + {DXGI_FORMAT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, 1, 4, 4, 8, COLOR, 1}, + {DXGI_FORMAT_BC2_TYPELESS, VK_FORMAT_BC2_UNORM_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC2_UNORM_SRGB, VK_FORMAT_BC2_SRGB_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC3_TYPELESS, VK_FORMAT_BC3_UNORM_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC3_UNORM, VK_FORMAT_BC3_UNORM_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC3_UNORM_SRGB, VK_FORMAT_BC3_SRGB_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC4_TYPELESS, VK_FORMAT_BC4_UNORM_BLOCK, 1, 4, 4, 8, COLOR, 1}, + {DXGI_FORMAT_BC4_UNORM, VK_FORMAT_BC4_UNORM_BLOCK, 1, 4, 4, 8, COLOR, 1}, + {DXGI_FORMAT_BC4_SNORM, VK_FORMAT_BC4_SNORM_BLOCK, 1, 4, 4, 8, COLOR, 1}, + {DXGI_FORMAT_BC5_TYPELESS, VK_FORMAT_BC5_UNORM_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC5_UNORM, VK_FORMAT_BC5_UNORM_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC5_SNORM, VK_FORMAT_BC5_SNORM_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC6H_TYPELESS, VK_FORMAT_BC6H_UFLOAT_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC6H_UF16, VK_FORMAT_BC6H_UFLOAT_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC7_TYPELESS, VK_FORMAT_BC7_UNORM_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, 1, 4, 4, 16, COLOR, 1}, + {DXGI_FORMAT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, 1, 4, 4, 16, COLOR, 1}, }; /* Each depth/stencil format is only compatible with itself in Vulkan. */ static const struct vkd3d_format vkd3d_depth_stencil_formats[] = { - {DXGI_FORMAT_R32G8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, 8, 1, 1, 1, DEPTH_STENCIL}, - {DXGI_FORMAT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, 8, 1, 1, 1, DEPTH_STENCIL}, - {DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, 8, 1, 1, 1, DEPTH}, - {DXGI_FORMAT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, 8, 1, 1, 1, STENCIL}, - {DXGI_FORMAT_R32_TYPELESS, VK_FORMAT_D32_SFLOAT, 4, 1, 1, 1, DEPTH}, - {DXGI_FORMAT_R32_FLOAT, VK_FORMAT_D32_SFLOAT, 4, 1, 1, 1, DEPTH}, - {DXGI_FORMAT_R24G8_TYPELESS, VK_FORMAT_D24_UNORM_S8_UINT, 4, 1, 1, 1, DEPTH_STENCIL}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, 4, 1, 1, 1, DEPTH_STENCIL}, - {DXGI_FORMAT_R24_UNORM_X8_TYPELESS, VK_FORMAT_D24_UNORM_S8_UINT, 4, 1, 1, 1, DEPTH}, - {DXGI_FORMAT_X24_TYPELESS_G8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, 4, 1, 1, 1, STENCIL}, - {DXGI_FORMAT_R16_TYPELESS, VK_FORMAT_D16_UNORM, 2, 1, 1, 1, DEPTH}, - {DXGI_FORMAT_R16_UNORM, VK_FORMAT_D16_UNORM, 2, 1, 1, 1, DEPTH}, + {DXGI_FORMAT_R32G8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, 8, 1, 1, 1, DEPTH_STENCIL, 2}, + {DXGI_FORMAT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, 8, 1, 1, 1, DEPTH_STENCIL, 2}, + {DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, 8, 1, 1, 1, DEPTH, 2}, + {DXGI_FORMAT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, 8, 1, 1, 1, STENCIL, 2}, + {DXGI_FORMAT_R32_TYPELESS, VK_FORMAT_D32_SFLOAT, 4, 1, 1, 1, DEPTH, 1}, + {DXGI_FORMAT_R32_FLOAT, VK_FORMAT_D32_SFLOAT, 4, 1, 1, 1, DEPTH, 1}, + {DXGI_FORMAT_R24G8_TYPELESS, VK_FORMAT_D24_UNORM_S8_UINT, 4, 1, 1, 1, DEPTH_STENCIL, 2}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, 4, 1, 1, 1, DEPTH_STENCIL, 2}, + {DXGI_FORMAT_R24_UNORM_X8_TYPELESS, VK_FORMAT_D24_UNORM_S8_UINT, 4, 1, 1, 1, DEPTH, 2}, + {DXGI_FORMAT_X24_TYPELESS_G8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, 4, 1, 1, 1, STENCIL, 2}, + {DXGI_FORMAT_R16_TYPELESS, VK_FORMAT_D16_UNORM, 2, 1, 1, 1, DEPTH, 1}, + {DXGI_FORMAT_R16_UNORM, VK_FORMAT_D16_UNORM, 2, 1, 1, 1, DEPTH, 1}, }; #undef COLOR #undef DEPTH diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d23b2782a408..0ea501c9c35a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1104,6 +1104,7 @@ struct vkd3d_format size_t block_height; size_t block_byte_count; VkImageAspectFlags vk_aspect_mask; + unsigned int plane_count; bool is_emulated; }; diff --git a/tests/d3d12.c b/tests/d3d12.c index 1864a879c24b..c3931b94fc06 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1092,25 +1092,25 @@ static void test_check_feature_support(void) memset(&format_info, 0, sizeof(format_info)); hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, &format_info, sizeof(format_info)); - todo ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); ok(format_info.Format == DXGI_FORMAT_UNKNOWN, "Got unexpected format %#x.\n", format_info.Format); - todo ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); + ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); memset(&format_info, 0, sizeof(format_info)); format_info.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, &format_info, sizeof(format_info)); - todo ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); ok(format_info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected format %#x.\n", format_info.Format); - todo ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); + ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); memset(&format_info, 0, sizeof(format_info)); format_info.Format = DXGI_FORMAT_R24G8_TYPELESS; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, &format_info, sizeof(format_info)); - todo ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); ok(format_info.Format == DXGI_FORMAT_R24G8_TYPELESS, "Got unexpected format %#x.\n", format_info.Format); - todo ok(format_info.PlaneCount == 2, "Got unexpected plane count %u.\n", format_info.PlaneCount); + ok(format_info.PlaneCount == 2, "Got unexpected plane count %u.\n", format_info.PlaneCount); /* GPU virtual address */ memset(&gpu_virtual_address, 0, sizeof(gpu_virtual_address)); -- 2.21.0

2 1

[PATCH vkd3d 2/7] vkd3d: Add DXGI_FORMAT_R32G32B32_TYPELESS.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 245f297587ae..16960624b294 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -30,6 +30,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, 16, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32A32_UINT, VK_FORMAT_R32G32B32A32_UINT, 16, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32A32_SINT, VK_FORMAT_R32G32B32A32_SINT, 16, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R32G32B32_TYPELESS, VK_FORMAT_R32G32B32_SFLOAT, 12, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, 12, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32_UINT, VK_FORMAT_R32G32B32_UINT, 12, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32_SINT, VK_FORMAT_R32G32B32_SINT, 12, 1, 1, 1, COLOR}, -- 2.21.0

2 1

[v3 PATCH] mshtml: Add IHTMLDOMRange stub.
by Nikolay Sivov 27 Jun '19

27 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Using doc_blank_ie9 returns different iid - {c59c6b12-f6c1-11cf-8835-00a0c911e8b2}, I don't see it defined anywhere so test is still using doc_blank. dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/{txtrange.c => range.c} | 349 ++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 24 ++ include/mshtml.idl | 88 +++++++ 6 files changed, 481 insertions(+), 3 deletions(-) rename dlls/mshtml/{txtrange.c => range.c} (82%) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index f054816056..7e1d517f07 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -55,13 +55,13 @@ C_SRCS = \ persist.c \ pluginhost.c \ protocol.c \ + range.c \ script.c \ secmgr.c \ selection.c \ service.c \ svg.c \ task.c \ - txtrange.c \ view.c \ xmlhttprequest.c diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7595ad852a..a000884dc8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5223,8 +5223,22 @@ static HRESULT WINAPI DocumentRange_Invoke(IDocumentRange *iface, DISPID dispIdM static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMRange **p) { HTMLDocument *This = impl_from_IDocumentRange(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMRange *nsrange; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + if(NS_FAILED(nsIDOMHTMLDocument_CreateRange(This->doc_node->nsdoc, &nsrange))) + return E_FAIL; + + hres = HTMLDOMRange_Create(nsrange, p); + nsIDOMRange_Release(nsrange); + return hres; } static const IDocumentRangeVtbl DocumentRangeVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ef56f1d23d..441da2019c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -95,6 +95,7 @@ typedef struct EventTarget EventTarget; XDIID(DispHTMLDocument) \ XDIID(DispHTMLDOMAttribute) \ XDIID(DispHTMLDOMImplementation) \ + XDIID(DispHTMLDOMRange) \ XDIID(DispHTMLDOMTextNode) \ XDIID(DispHTMLElementCollection) \ XDIID(DispHTMLEmbed) \ @@ -178,6 +179,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ XIID(IHTMLDOMNode3) \ + XIID(IHTMLDOMRange) \ XIID(IHTMLDOMTextNode) \ XIID(IHTMLDOMTextNode2) \ XIID(IHTMLElement) \ @@ -1008,6 +1010,7 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectio HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*) DECLSPEC_HIDDEN; IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN; +HRESULT HTMLDOMRange_Create(nsIDOMRange*,IHTMLDOMRange**) DECLSPEC_HIDDEN; void detach_document_node(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_selection(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/range.c similarity index 82% rename from dlls/mshtml/txtrange.c rename to dlls/mshtml/range.c index c6a6ed096b..9350ebeed1 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/range.c @@ -49,6 +49,15 @@ typedef struct { struct list entry; } HTMLTxtRange; +typedef struct { + DispatchEx dispex; + IHTMLDOMRange IHTMLDOMRange_iface; + + LONG ref; + + nsIDOMRange *nsrange; +} HTMLDOMRange; + typedef struct { WCHAR *buf; DWORD len; @@ -1758,6 +1767,346 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx return S_OK; } +static inline HTMLDOMRange *impl_from_IHTMLDOMRange(IHTMLDOMRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMRange, IHTMLDOMRange_iface); +} + +static HRESULT WINAPI HTMLDOMRange_QueryInterface(IHTMLDOMRange *iface, REFIID riid, void **ppv) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IHTMLDOMRange_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMRange, riid)) { + *ppv = &This->IHTMLDOMRange_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLDOMRange_AddRef(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLDOMRange_Release(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->nsrange) + nsIDOMRange_Release(This->nsrange); + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLDOMRange_GetTypeInfoCount(IHTMLDOMRange *iface, UINT *pctinfo) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMRange_GetTypeInfo(IHTMLDOMRange *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMRange_GetIDsOfNames(IHTMLDOMRange *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMRange_Invoke(IHTMLDOMRange *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMRange_get_startContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_startOffset(IHTMLDOMRange *iface, LONG *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_endContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_endOffset(IHTMLDOMRange *iface, LONG *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_collapsed(IHTMLDOMRange *iface, VARIANT_BOOL *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_commonAncestorContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStart(IHTMLDOMRange *iface, IDispatch *node, LONG offset) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p, %d)\n", This, node, offset); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEnd(IHTMLDOMRange *iface, IDispatch *node, LONG offset) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p, %d)\n", This, node, offset); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStartBefore(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStartAfter(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEndBefore(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEndAfter(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_collapse(IHTMLDOMRange *iface, VARIANT_BOOL tostart) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%x)\n", This, tostart); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_selectNode(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_selectNodeContents(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_compareBoundaryPoints(IHTMLDOMRange *iface, short how, + IDispatch *src_range, LONG *result) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%x, %p, %p)\n", This, how, src_range, result); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_deleteContents(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_extractContents(IHTMLDOMRange *iface, IDispatch **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_cloneContents(IHTMLDOMRange *iface, IDispatch **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_insertNode(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_surroundContents(IHTMLDOMRange *iface, IDispatch *parent) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, parent); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_cloneRange(IHTMLDOMRange *iface, IHTMLDOMRange **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_toString(IHTMLDOMRange *iface, BSTR *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_detach(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_getClientRects(IHTMLDOMRange *iface, IHTMLRectCollection **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_getBoundingClientRect(IHTMLDOMRange *iface, IHTMLRect **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLDOMRangeVtbl HTMLDOMRangeVtbl = { + HTMLDOMRange_QueryInterface, + HTMLDOMRange_AddRef, + HTMLDOMRange_Release, + HTMLDOMRange_GetTypeInfoCount, + HTMLDOMRange_GetTypeInfo, + HTMLDOMRange_GetIDsOfNames, + HTMLDOMRange_Invoke, + HTMLDOMRange_get_startContainer, + HTMLDOMRange_get_startOffset, + HTMLDOMRange_get_endContainer, + HTMLDOMRange_get_endOffset, + HTMLDOMRange_get_collapsed, + HTMLDOMRange_get_commonAncestorContainer, + HTMLDOMRange_setStart, + HTMLDOMRange_setEnd, + HTMLDOMRange_setStartBefore, + HTMLDOMRange_setStartAfter, + HTMLDOMRange_setEndBefore, + HTMLDOMRange_setEndAfter, + HTMLDOMRange_collapse, + HTMLDOMRange_selectNode, + HTMLDOMRange_selectNodeContents, + HTMLDOMRange_compareBoundaryPoints, + HTMLDOMRange_deleteContents, + HTMLDOMRange_extractContents, + HTMLDOMRange_cloneContents, + HTMLDOMRange_insertNode, + HTMLDOMRange_surroundContents, + HTMLDOMRange_cloneRange, + HTMLDOMRange_toString, + HTMLDOMRange_detach, + HTMLDOMRange_getClientRects, + HTMLDOMRange_getBoundingClientRect, +}; + +static const tid_t HTMLDOMRange_iface_tids[] = { + IHTMLDOMRange_tid, + 0 +}; + +static dispex_static_data_t HTMLDOMRange_dispex = { + NULL, + DispHTMLDOMRange_tid, + HTMLDOMRange_iface_tids +}; + +HRESULT HTMLDOMRange_Create(nsIDOMRange *nsrange, IHTMLDOMRange **p) +{ + HTMLDOMRange *ret; + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMRange_iface, &HTMLDOMRange_dispex); + + ret->IHTMLDOMRange_iface.lpVtbl = &HTMLDOMRangeVtbl; + ret->ref = 1; + + if(nsrange) + nsIDOMRange_AddRef(nsrange); + ret->nsrange = nsrange; + + *p = &ret->IHTMLDOMRange_iface; + return S_OK; +} + void detach_ranges(HTMLDocumentNode *This) { HTMLTxtRange *iter, *next; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 586df7d8a5..124b7fe409 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10380,6 +10380,28 @@ static void test_docfrag(IHTMLDocument2 *doc) IHTMLDocument2_Release(frag); } +static void test_domrange(IHTMLDocument2 *doc) +{ + IDocumentRange *doc_range; + IHTMLDOMRange *range; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentRange, (void **)&doc_range); + ok(hres == S_OK || broken(hres == E_NOINTERFACE) /* XP */, "Failed to get IDocumentRange: %08x\n", hres); + + if (FAILED(hres)) + return; + + hres = IDocumentRange_createRange(doc_range, &range); + ok(hres == S_OK, "Failed to create range, %08x\n", hres); + + test_disp((IUnknown *)range, &DIID_DispHTMLDOMRange, NULL, NULL); + + IHTMLDOMRange_Release(range); + + IDocumentRange_Release(doc_range); +} + static void check_quirks_mode(IHTMLDocument2 *doc) { test_compatmode(doc, "BackCompat"); @@ -11077,6 +11099,8 @@ START_TEST(dom) run_domtest(emptydiv_str, test_docfrag); run_domtest(doc_blank, test_replacechild_elems); run_domtest(doctype_str, test_doctype); + if(is_ie9plus) + run_domtest(doc_blank, test_domrange); test_quirks_mode(); diff --git a/include/mshtml.idl b/include/mshtml.idl index aea888b2b8..0faa605482 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -420,6 +420,7 @@ interface ILineInfo; interface IMarkupPointer; interface IMarkupContainer; interface ISVGSVGElement; +interface IHTMLDOMRange; /***************************************************************************** * IHTMLCSSStyleDeclaration interface @@ -12205,6 +12206,93 @@ interface IHTMLTxtRange : IDispatch [retval, out] VARIANT_BOOL *pfRet); } +[ + hidden, + uuid(3050f5a3-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLDOMRange +{ +properties: +methods: + [propget, id(DISPID_IHTMLDOMRANGE_STARTCONTAINER)] + IHTMLDOMNode *startContainer(); + + [propget, id(DISPID_IHTMLDOMRANGE_STARTOFFSET)] + long startOffset(); + + [propget, id(DISPID_IHTMLDOMRANGE_ENDCONTAINER)] + IHTMLDOMNode *endContainer(); + + [propget, id(DISPID_IHTMLDOMRANGE_ENDOFFSET)] + long endOffset(); + + [propget, id(DISPID_IHTMLDOMRANGE_COLLAPSED)] + VARIANT_BOOL collapsed(); + + [propget, id(DISPID_IHTMLDOMRANGE_COMMONANCESTORCONTAINER)] + IHTMLDOMNode *commonAncestorContainer(); + + [id(DISPID_IHTMLDOMRANGE_SETSTART)] + void setStart([in] IDispatch *node ,[in] long offset); + + [id(DISPID_IHTMLDOMRANGE_SETEND)] + void setEnd([in] IDispatch *node, [in] long offset); + + [id(DISPID_IHTMLDOMRANGE_SETSTARTBEFORE)] + void setStartBefore([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_SETSTARTAFTER)] + void setStartAfter([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_SETENDBEFORE)] + void setEndBefore([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_SETENDAFTER)] + void setEndAfter([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_COLLAPSE)] + void collapse([in] VARIANT_BOOL tostart); + + [id(DISPID_IHTMLDOMRANGE_SELECTNODE)] + void selectNode([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_SELECTNODECONTENTS)] + void selectNodeContents([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_COMPAREBOUNDARYPOINTS)] + long compareBoundaryPoints([in] short how, [in] IDispatch *src_range); + + [id(DISPID_IHTMLDOMRANGE_DELETECONTENTS)] + void deleteContents(); + + [id(DISPID_IHTMLDOMRANGE_EXTRACTCONTENTS)] + IDispatch *extractContents(); + + [id(DISPID_IHTMLDOMRANGE_CLONECONTENTS)] + IDispatch *cloneContents(); + + [id(DISPID_IHTMLDOMRANGE_INSERTNODE)] + void insertNode([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_SURROUNDCONTENTS)] + void surroundContents([in] IDispatch *parent); + + [id(DISPID_IHTMLDOMRANGE_CLONERANGE)] + IHTMLDOMRange *cloneRange(); + + [id(DISPID_IHTMLDOMRANGE_TOSTRING)] + BSTR toString(); + + [id(DISPID_IHTMLDOMRANGE_DETACH)] + void detach(); + + [id(DISPID_IHTMLDOMRANGE_GETCLIENTRECTS)] + IHTMLRectCollection *getClientRects(); + + [id(DISPID_IHTMLDOMRANGE_GETBOUNDINGCLIENTRECT)] + IHTMLRect *getBoundingClientRect(); +} + /***************************************************************************** * IHTMLDOMRange interface */ -- 2.20.1

2 1

[v2 PATCH] mshtml: Add IHTMLDOMRange stub.
by Nikolay Sivov 27 Jun '19

27 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/{txtrange.c => range.c} | 349 ++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 23 ++ include/mshtml.idl | 88 +++++++ 6 files changed, 480 insertions(+), 3 deletions(-) rename dlls/mshtml/{txtrange.c => range.c} (82%) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index f054816056..7e1d517f07 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -55,13 +55,13 @@ C_SRCS = \ persist.c \ pluginhost.c \ protocol.c \ + range.c \ script.c \ secmgr.c \ selection.c \ service.c \ svg.c \ task.c \ - txtrange.c \ view.c \ xmlhttprequest.c diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7595ad852a..0daaff7d95 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5223,8 +5223,22 @@ static HRESULT WINAPI DocumentRange_Invoke(IDocumentRange *iface, DISPID dispIdM static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMRange **p) { HTMLDocument *This = impl_from_IDocumentRange(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMRange *nsrange; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + if(NS_FAILED(nsIDOMHTMLDocument_CreateRange(This->doc_node->nsdoc, &nsrange))) + return E_FAIL; + + hres = HTMLDOMRange_Create(This->doc_node, nsrange, p); + nsIDOMRange_Release(nsrange); + return hres; } static const IDocumentRangeVtbl DocumentRangeVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ef56f1d23d..17c44f340e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -95,6 +95,7 @@ typedef struct EventTarget EventTarget; XDIID(DispHTMLDocument) \ XDIID(DispHTMLDOMAttribute) \ XDIID(DispHTMLDOMImplementation) \ + XDIID(DispHTMLDOMRange) \ XDIID(DispHTMLDOMTextNode) \ XDIID(DispHTMLElementCollection) \ XDIID(DispHTMLEmbed) \ @@ -178,6 +179,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ XIID(IHTMLDOMNode3) \ + XIID(IHTMLDOMRange) \ XIID(IHTMLDOMTextNode) \ XIID(IHTMLDOMTextNode2) \ XIID(IHTMLElement) \ @@ -1008,6 +1010,7 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectio HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*) DECLSPEC_HIDDEN; IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN; +HRESULT HTMLDOMRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLDOMRange**) DECLSPEC_HIDDEN; void detach_document_node(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_selection(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/range.c similarity index 82% rename from dlls/mshtml/txtrange.c rename to dlls/mshtml/range.c index c6a6ed096b..1fa746f539 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/range.c @@ -49,6 +49,15 @@ typedef struct { struct list entry; } HTMLTxtRange; +typedef struct { + DispatchEx dispex; + IHTMLDOMRange IHTMLDOMRange_iface; + + LONG ref; + + nsIDOMRange *nsrange; +} HTMLDOMRange; + typedef struct { WCHAR *buf; DWORD len; @@ -1758,6 +1767,346 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx return S_OK; } +static inline HTMLDOMRange *impl_from_IHTMLDOMRange(IHTMLDOMRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMRange, IHTMLDOMRange_iface); +} + +static HRESULT WINAPI HTMLDOMRange_QueryInterface(IHTMLDOMRange *iface, REFIID riid, void **ppv) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IHTMLDOMRange_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMRange, riid)) { + *ppv = &This->IHTMLDOMRange_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLDOMRange_AddRef(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLDOMRange_Release(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->nsrange) + nsIDOMRange_Release(This->nsrange); + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLDOMRange_GetTypeInfoCount(IHTMLDOMRange *iface, UINT *pctinfo) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMRange_GetTypeInfo(IHTMLDOMRange *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMRange_GetIDsOfNames(IHTMLDOMRange *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMRange_Invoke(IHTMLDOMRange *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMRange_get_startContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_startOffset(IHTMLDOMRange *iface, LONG *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_endContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_endOffset(IHTMLDOMRange *iface, LONG *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_collapsed(IHTMLDOMRange *iface, VARIANT_BOOL *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_commonAncestorContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStart(IHTMLDOMRange *iface, IDispatch *node, LONG offset) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p, %d)\n", This, node, offset); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEnd(IHTMLDOMRange *iface, IDispatch *node, LONG offset) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p, %d)\n", This, node, offset); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStartBefore(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStartAfter(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEndBefore(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEndAfter(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_collapse(IHTMLDOMRange *iface, VARIANT_BOOL tostart) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%x)\n", This, tostart); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_selectNode(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_selectNodeContents(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_compareBoundaryPoints(IHTMLDOMRange *iface, short how, + IDispatch *src_range, LONG *result) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%x, %p, %p)\n", This, how, src_range, result); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_deleteContents(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_extractContents(IHTMLDOMRange *iface, IDispatch **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_cloneContents(IHTMLDOMRange *iface, IDispatch **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_insertNode(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_surroundContents(IHTMLDOMRange *iface, IDispatch *parent) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, parent); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_cloneRange(IHTMLDOMRange *iface, IHTMLDOMRange **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_toString(IHTMLDOMRange *iface, BSTR *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_detach(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_getClientRects(IHTMLDOMRange *iface, IHTMLRectCollection **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_getBoundingClientRect(IHTMLDOMRange *iface, IHTMLRect **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLDOMRangeVtbl HTMLDOMRangeVtbl = { + HTMLDOMRange_QueryInterface, + HTMLDOMRange_AddRef, + HTMLDOMRange_Release, + HTMLDOMRange_GetTypeInfoCount, + HTMLDOMRange_GetTypeInfo, + HTMLDOMRange_GetIDsOfNames, + HTMLDOMRange_Invoke, + HTMLDOMRange_get_startContainer, + HTMLDOMRange_get_startOffset, + HTMLDOMRange_get_endContainer, + HTMLDOMRange_get_endOffset, + HTMLDOMRange_get_collapsed, + HTMLDOMRange_get_commonAncestorContainer, + HTMLDOMRange_setStart, + HTMLDOMRange_setEnd, + HTMLDOMRange_setStartBefore, + HTMLDOMRange_setStartAfter, + HTMLDOMRange_setEndBefore, + HTMLDOMRange_setEndAfter, + HTMLDOMRange_collapse, + HTMLDOMRange_selectNode, + HTMLDOMRange_selectNodeContents, + HTMLDOMRange_compareBoundaryPoints, + HTMLDOMRange_deleteContents, + HTMLDOMRange_extractContents, + HTMLDOMRange_cloneContents, + HTMLDOMRange_insertNode, + HTMLDOMRange_surroundContents, + HTMLDOMRange_cloneRange, + HTMLDOMRange_toString, + HTMLDOMRange_detach, + HTMLDOMRange_getClientRects, + HTMLDOMRange_getBoundingClientRect, +}; + +static const tid_t HTMLDOMRange_iface_tids[] = { + IHTMLDOMRange_tid, + 0 +}; + +static dispex_static_data_t HTMLDOMRange_dispex = { + NULL, + DispHTMLDOMRange_tid, + HTMLDOMRange_iface_tids +}; + +HRESULT HTMLDOMRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLDOMRange **p) +{ + HTMLDOMRange *ret; + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMRange_iface, &HTMLDOMRange_dispex); + + ret->IHTMLDOMRange_iface.lpVtbl = &HTMLDOMRangeVtbl; + ret->ref = 1; + + if(nsrange) + nsIDOMRange_AddRef(nsrange); + ret->nsrange = nsrange; + + *p = &ret->IHTMLDOMRange_iface; + return S_OK; +} + void detach_ranges(HTMLDocumentNode *This) { HTMLTxtRange *iter, *next; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 586df7d8a5..cb5e930820 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10380,6 +10380,28 @@ static void test_docfrag(IHTMLDocument2 *doc) IHTMLDocument2_Release(frag); } +static void test_domrange(IHTMLDocument2 *doc) +{ + IDocumentRange *doc_range; + IHTMLDOMRange *range; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentRange, (void **)&doc_range); + ok(hres == S_OK || broken(hres == E_NOINTERFACE) /* XP */, "Failed to get IDocumentRange: %08x\n", hres); + + if (FAILED(hres)) + return; + + hres = IDocumentRange_createRange(doc_range, &range); + ok(hres == S_OK, "Failed to create range, %08x\n", hres); + + test_disp((IUnknown *)range, &DIID_DispHTMLDOMRange, NULL, NULL); + + IHTMLDOMRange_Release(range); + + IDocumentRange_Release(doc_range); +} + static void check_quirks_mode(IHTMLDocument2 *doc) { test_compatmode(doc, "BackCompat"); @@ -11077,6 +11099,7 @@ START_TEST(dom) run_domtest(emptydiv_str, test_docfrag); run_domtest(doc_blank, test_replacechild_elems); run_domtest(doctype_str, test_doctype); + run_domtest(doc_blank, test_domrange); test_quirks_mode(); diff --git a/include/mshtml.idl b/include/mshtml.idl index aea888b2b8..0faa605482 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -420,6 +420,7 @@ interface ILineInfo; interface IMarkupPointer; interface IMarkupContainer; interface ISVGSVGElement; +interface IHTMLDOMRange; /***************************************************************************** * IHTMLCSSStyleDeclaration interface @@ -12205,6 +12206,93 @@ interface IHTMLTxtRange : IDispatch [retval, out] VARIANT_BOOL *pfRet); } +[ + hidden, + uuid(3050f5a3-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLDOMRange +{ +properties: +methods: + [propget, id(DISPID_IHTMLDOMRANGE_STARTCONTAINER)] + IHTMLDOMNode *startContainer(); + + [propget, id(DISPID_IHTMLDOMRANGE_STARTOFFSET)] + long startOffset(); + + [propget, id(DISPID_IHTMLDOMRANGE_ENDCONTAINER)] + IHTMLDOMNode *endContainer(); + + [propget, id(DISPID_IHTMLDOMRANGE_ENDOFFSET)] + long endOffset(); + + [propget, id(DISPID_IHTMLDOMRANGE_COLLAPSED)] + VARIANT_BOOL collapsed(); + + [propget, id(DISPID_IHTMLDOMRANGE_COMMONANCESTORCONTAINER)] + IHTMLDOMNode *commonAncestorContainer(); + + [id(DISPID_IHTMLDOMRANGE_SETSTART)] + void setStart([in] IDispatch *node ,[in] long offset); + + [id(DISPID_IHTMLDOMRANGE_SETEND)] + void setEnd([in] IDispatch *node, [in] long offset); + + [id(DISPID_IHTMLDOMRANGE_SETSTARTBEFORE)] + void setStartBefore([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_SETSTARTAFTER)] + void setStartAfter([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_SETENDBEFORE)] + void setEndBefore([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_SETENDAFTER)] + void setEndAfter([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_COLLAPSE)] + void collapse([in] VARIANT_BOOL tostart); + + [id(DISPID_IHTMLDOMRANGE_SELECTNODE)] + void selectNode([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_SELECTNODECONTENTS)] + void selectNodeContents([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_COMPAREBOUNDARYPOINTS)] + long compareBoundaryPoints([in] short how, [in] IDispatch *src_range); + + [id(DISPID_IHTMLDOMRANGE_DELETECONTENTS)] + void deleteContents(); + + [id(DISPID_IHTMLDOMRANGE_EXTRACTCONTENTS)] + IDispatch *extractContents(); + + [id(DISPID_IHTMLDOMRANGE_CLONECONTENTS)] + IDispatch *cloneContents(); + + [id(DISPID_IHTMLDOMRANGE_INSERTNODE)] + void insertNode([in] IDispatch *node); + + [id(DISPID_IHTMLDOMRANGE_SURROUNDCONTENTS)] + void surroundContents([in] IDispatch *parent); + + [id(DISPID_IHTMLDOMRANGE_CLONERANGE)] + IHTMLDOMRange *cloneRange(); + + [id(DISPID_IHTMLDOMRANGE_TOSTRING)] + BSTR toString(); + + [id(DISPID_IHTMLDOMRANGE_DETACH)] + void detach(); + + [id(DISPID_IHTMLDOMRANGE_GETCLIENTRECTS)] + IHTMLRectCollection *getClientRects(); + + [id(DISPID_IHTMLDOMRANGE_GETBOUNDINGCLIENTRECT)] + IHTMLRect *getBoundingClientRect(); +} + /***************************************************************************** * IHTMLDOMRange interface */ -- 2.20.1

3 2

[PATCH 5/5] wined3d: Explicitly handle Windows 2 & 3 in wined3d_driver_info_init().
by Henri Verbeet 27 Jun '19

27 Jun '19

By returning Windows 9x driver versions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c052918c015..7202a907ab1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -565,6 +565,8 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, TRACE("OS version %u.%u.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); switch (os_version.dwMajorVersion) { + case 2: + case 3: case 4: /* If needed we could distinguish between 9x and NT4, but this code won't make * sense for NT4 since it had no way to obtain this info through DirectDraw 3.0. -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to shader_generate_glsl_declarations().
by Henri Verbeet 27 Jun '19

27 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8678a846a58..3c74ff7054d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2134,14 +2134,14 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b } /** Generate the variable & register declarations for the GLSL output target */ -static void shader_generate_glsl_declarations(const struct wined3d_context *context, +static void shader_generate_glsl_declarations(const struct wined3d_context_gl *context_gl, struct wined3d_string_buffer *buffer, const struct wined3d_shader *shader, const struct wined3d_shader_reg_maps *reg_maps, const struct shader_glsl_ctx_priv *ctx_priv) { const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct vs_compile_args *vs_args = ctx_priv->cur_vs_args; const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_shader_indexable_temp *idx_temp_reg; unsigned int uniform_block_base, uniform_block_count; const struct wined3d_shader_lconst *lconst; @@ -2381,7 +2381,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } if (shader_glsl_use_layout_binding_qualifier(gl_info)) - shader_glsl_append_sampler_binding_qualifier(buffer, context, version, entry->bind_idx); + shader_glsl_append_sampler_binding_qualifier(buffer, &context_gl->c, version, entry->bind_idx); shader_addline(buffer, "uniform %s%s %s_sampler%u;\n", sampler_type_prefix, sampler_type, prefix, entry->bind_idx); } @@ -7523,6 +7523,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context const struct wined3d_shader *shader, const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; const char *prefix = shader_glsl_get_prefix(version->type); @@ -7561,7 +7562,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); /* Base Declarations */ - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); if (gl_info->supported[ARB_CONSERVATIVE_DEPTH]) { @@ -7873,6 +7874,7 @@ static void shader_glsl_generate_vs_epilogue(const struct wined3d_gl_info *gl_in static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct vs_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; @@ -7897,7 +7899,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_shader_viewport_layer_array : enable\n"); /* Base Declarations */ - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); for (i = 0; i < shader->input_signature.element_count; ++i) shader_glsl_declare_generic_vertex_attribute(buffer, gl_info, &shader->input_signature.elements[i]); @@ -8016,6 +8018,7 @@ static void shader_glsl_generate_shader_phase_invocation(struct wined3d_string_b static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; @@ -8034,7 +8037,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *con shader_glsl_enable_extensions(buffer, gl_info); shader_addline(buffer, "#extension GL_ARB_tessellation_shader : enable\n"); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); shader_addline(buffer, "layout(vertices = %u) out;\n", hs->output_vertex_count); @@ -8112,6 +8115,7 @@ static void shader_glsl_generate_ds_epilogue(const struct wined3d_gl_info *gl_in static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct ds_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; @@ -8128,7 +8132,7 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *c shader_glsl_enable_extensions(buffer, gl_info); shader_addline(buffer, "#extension GL_ARB_tessellation_shader : enable\n"); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); shader_addline(buffer, "layout("); switch (shader->u.ds.tessellator_domain) @@ -8206,6 +8210,7 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *c static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; @@ -8224,7 +8229,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_glsl_enable_extensions(buffer, gl_info); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); primitive_type = shader->u.gs.input_type ? shader->u.gs.input_type : args->primitive_type; shader_addline(buffer, "layout(%s", glsl_primitive_type_from_d3d(primitive_type)); @@ -8337,6 +8342,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * const struct wined3d_shader *shader) { const struct wined3d_shader_thread_group_size *thread_group_size = &shader->u.cs.thread_group_size; + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; @@ -8351,7 +8357,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * shader_glsl_enable_extensions(buffer, gl_info); shader_addline(buffer, "#extension GL_ARB_compute_shader : enable\n"); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); for (i = 0; i < reg_maps->tgsm_count; ++i) { -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_clip_plane_uniform().
by Henri Verbeet 27 Jun '19

27 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c45b0a611f0..8678a846a58 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1478,10 +1478,10 @@ static void shader_glsl_load_fog_uniform(const struct wined3d_context_gl *contex checkGLcall("fog emulation uniforms"); } -static void shader_glsl_clip_plane_uniform(const struct wined3d_context *context, +static void shader_glsl_clip_plane_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, unsigned int index, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_matrix matrix; struct wined3d_vec4 plane; @@ -1547,7 +1547,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_VS_CLIP_PLANES) { for (i = 0; i < gl_info->limits.user_clip_distances; ++i) - shader_glsl_clip_plane_uniform(context, state, i, prog); + shader_glsl_clip_plane_uniform(context_gl, state, i, prog); } if (update_mask & WINED3D_SHADER_CONST_VS_POINTSIZE) -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_load_fog_uniform().
by Henri Verbeet 27 Jun '19

27 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fdc435e8928..c45b0a611f0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1455,10 +1455,10 @@ static void shader_glsl_pointsize_uniform(const struct wined3d_context_gl *conte checkGLcall("glUniform1f"); } -static void shader_glsl_load_fog_uniform(const struct wined3d_context *context, +static void shader_glsl_load_fog_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_color color; float start, end, scale; union @@ -1471,7 +1471,7 @@ static void shader_glsl_load_fog_uniform(const struct wined3d_context *context, GL_EXTCALL(glUniform4fv(prog->ps.fog_color_location, 1, &color.r)); tmpvalue.d = state->render_states[WINED3D_RS_FOGDENSITY]; GL_EXTCALL(glUniform1f(prog->ps.fog_density_location, tmpvalue.f)); - get_fog_start_end(context, state, &start, &end); + get_fog_start_end(&context_gl->c, state, &start, &end); scale = 1.0f / (end - start); GL_EXTCALL(glUniform1f(prog->ps.fog_end_location, end)); GL_EXTCALL(glUniform1f(prog->ps.fog_scale_location, scale)); @@ -1766,7 +1766,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } if (update_mask & WINED3D_SHADER_CONST_PS_FOG) - shader_glsl_load_fog_uniform(context, state, prog); + shader_glsl_load_fog_uniform(context_gl, state, prog); if (update_mask & WINED3D_SHADER_CONST_PS_ALPHA_TEST) { -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_pointsize_uniform().
by Henri Verbeet 27 Jun '19

27 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8faa421c22c..fdc435e8928 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1429,21 +1429,21 @@ static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context_gl checkGLcall("setting FFP lights uniforms"); } -static void shader_glsl_pointsize_uniform(const struct wined3d_context *context, +static void shader_glsl_pointsize_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; float min, max; float size, att[3]; - get_pointsize_minmax(context, state, &min, &max); + get_pointsize_minmax(&context_gl->c, state, &min, &max); GL_EXTCALL(glUniform1f(prog->vs.pointsize_min_location, min)); checkGLcall("glUniform1f"); GL_EXTCALL(glUniform1f(prog->vs.pointsize_max_location, max)); checkGLcall("glUniform1f"); - get_pointsize(context, state, &size, att); + get_pointsize(&context_gl->c, state, &size, att); GL_EXTCALL(glUniform1f(prog->vs.pointsize_location, size)); checkGLcall("glUniform1f"); @@ -1551,7 +1551,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } if (update_mask & WINED3D_SHADER_CONST_VS_POINTSIZE) - shader_glsl_pointsize_uniform(context, state, prog); + shader_glsl_pointsize_uniform(context_gl, state, prog); if (update_mask & WINED3D_SHADER_CONST_POS_FIXUP) { -- 2.11.0

1 0

[PATCH v5 6/6] dxgi/tests: Run fullscreen set/restore tests on a D3D12 device.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 44 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 4273f412e556..10e6f2707ee1 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2295,28 +2295,18 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, heap_free(output_monitor_info); } -static void test_set_fullscreen(void) +static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) { struct swapchain_fullscreen_state initial_state; DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGIAdapter *adapter = NULL; IDXGISwapChain *swapchain; IDXGIFactory *factory; - IDXGIAdapter *adapter; - IDXGIDevice *device; + IDXGIOutput *output; ULONG refcount; HRESULT hr; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -2328,16 +2318,28 @@ static void test_set_fullscreen(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; memset(&initial_state, 0, sizeof(initial_state)); capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Failed to get containing output, hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not get output.\n"); + goto done; + } + hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&adapter); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIOutput_Release(output); + check_swapchain_fullscreen_state(swapchain, &initial_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE @@ -2407,16 +2409,15 @@ static void test_set_fullscreen(void) test_swapchain_fullscreen_state(swapchain, adapter, &initial_state); done: + if (adapter) + IDXGIAdapter_Release(adapter); refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); DestroyWindow(swapchain_desc.OutputWindow); - IDXGIAdapter_Release(adapter); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static void test_default_fullscreen_target_output(void) @@ -5697,7 +5698,6 @@ START_TEST(dxgi) /* These tests use full-screen swapchains, so shouldn't run in parallel. */ test_create_swapchain(); - test_set_fullscreen(); test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); @@ -5705,6 +5705,7 @@ START_TEST(dxgi) test_swapchain_window_messages(); test_swapchain_window_styles(); test_window_association(); + run_on_d3d10(test_set_fullscreen); run_on_d3d10(test_resize_target); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); @@ -5727,6 +5728,7 @@ START_TEST(dxgi) ID3D12Debug_Release(debug); } + run_on_d3d12(test_set_fullscreen); run_on_d3d12(test_resize_target); run_on_d3d12(test_swapchain_resize); run_on_d3d12(test_swapchain_present); -- 2.21.0

2 1

[PATCH v5 5/6] dxgi/tests: Run resize target tests on a D3D12 device.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 44 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 7ba417010dd6..4273f412e556 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -380,7 +380,7 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain HRESULT hr; hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); check_window_fullscreen_state_(line, swapchain_desc.OutputWindow, &expected_state->fullscreen_state); ok_(__FILE__, line)(swapchain_desc.Windowed == !expected_state->fullscreen, @@ -388,23 +388,19 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain swapchain_desc.Windowed, !expected_state->fullscreen); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#x.\n", hr); ok_(__FILE__, line)(fullscreen == expected_state->fullscreen, "Got fullscreen %#x, expected %#x.\n", fullscreen, expected_state->fullscreen); if (!swapchain_desc.Windowed && expected_state->fullscreen) { IDXGIAdapter *adapter; - IDXGIDevice *device; - - hr = IDXGISwapChain_GetDevice(swapchain, &IID_IDXGIDevice, (void **)&device); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetDevice failed, hr %#x.\n", hr); - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - IDXGIDevice_Release(device); hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get containing output, hr %#x.\n", hr); + + hr = IDXGIOutput_GetParent(containing_output, &IID_IDXGIAdapter, (void **)&adapter); + ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); check_output_equal_(line, target, expected_state->target); ok_(__FILE__, line)(target == containing_output, "Got target %p, expected %p.\n", @@ -2688,14 +2684,12 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, IDXGIOutput_Release(target); } -static void test_resize_target(void) +static void test_resize_target(IUnknown *device, BOOL is_d3d12) { struct swapchain_fullscreen_state initial_state, expected_state; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; - IDXGIAdapter *adapter; - IDXGIDevice *device; unsigned int i; ULONG refcount; HRESULT hr; @@ -2723,17 +2717,7 @@ static void test_resize_target(void) {{10, 10}, FALSE, TRUE, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH}, }; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -2745,9 +2729,9 @@ static void test_resize_target(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -2829,11 +2813,8 @@ static void test_resize_target(void) DestroyWindow(swapchain_desc.OutputWindow); } - IDXGIAdapter_Release(adapter); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) @@ -5718,13 +5699,13 @@ START_TEST(dxgi) test_create_swapchain(); test_set_fullscreen(); test_default_fullscreen_target_output(); - test_resize_target(); test_inexact_modes(); test_gamma_control(); test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); test_window_association(); + run_on_d3d10(test_resize_target); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); @@ -5746,6 +5727,7 @@ START_TEST(dxgi) ID3D12Debug_Release(debug); } + run_on_d3d12(test_resize_target); run_on_d3d12(test_swapchain_resize); run_on_d3d12(test_swapchain_present); run_on_d3d12(test_swapchain_backbuffer_index); -- 2.21.0

2 1

[PATCH v5 4/6] dxgi: Implement d3d12_swapchain_GetFullscreenState() and d3d12_swapchain_SetFullscreenState().
by Józef Kucia 27 Jun '19

27 Jun '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 133 +++++++++++++++++++++++++++++++++++++++-- dlls/dxgi/tests/dxgi.c | 40 ++++++------- 2 files changed, 149 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0491040909d3..2a4c01278bed 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1085,8 +1085,12 @@ struct d3d12_swapchain IWineDXGIFactory *factory; HWND window; + IDXGIOutput *target; DXGI_SWAP_CHAIN_DESC1 desc; DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + struct wined3d_window_state window_state; + DXGI_MODE_DESC original_mode; + RECT original_window_rect; }; static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) @@ -1880,6 +1884,12 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) if (swapchain->vk_instance) vk_funcs->p_vkDestroySurfaceKHR(swapchain->vk_instance, swapchain->vk_surface, NULL); + if (swapchain->target) + { + WARN("Destroying fullscreen swapchain.\n"); + IDXGIOutput_Release(swapchain->target); + } + if (swapchain->device) ID3D12Device_Release(swapchain->device); @@ -2178,17 +2188,112 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetBuffer(IDXGISwapChain3 *ifac static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreenState(IDXGISwapChain3 *iface, BOOL fullscreen, IDXGIOutput *target) { - FIXME("iface %p, fullscreen %#x, target %p stub!\n", iface, fullscreen, target); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc = &swapchain->fullscreen_desc; + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc = &swapchain->desc; + HWND window = swapchain->window; + DXGI_MODE_DESC mode; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target); + + if (!fullscreen && target) + { + WARN("Invalid call.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + if (target) + { + IDXGIOutput_AddRef(target); + } + else if (FAILED(hr = IDXGISwapChain3_GetContainingOutput(iface, &target))) + { + WARN("Failed to get target output for swapchain, hr %#x.\n", hr); + return hr; + } + + if (swapchain_desc->Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + { + if (fullscreen) + { + mode.Width = swapchain_desc->Width; + mode.Height = swapchain_desc->Height; + mode.RefreshRate = fullscreen_desc->RefreshRate; + mode.Format = swapchain_desc->Format; + mode.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + } + else + { + mode = swapchain->original_mode; + } + + if (FAILED(hr = dxgi_output_set_display_mode(target, &mode))) + goto fail; + } + else if (FAILED(hr = dxgi_output_get_display_mode(target, &mode))) + { + WARN("Failed to get display mode, hr %#x.\n", hr); + hr = DXGI_ERROR_INVALID_CALL; + goto fail; + } + + if (fullscreen) + { + if (fullscreen_desc->Windowed) + { + if (FAILED(hr = wined3d_window_state_setup_fullscreen(&swapchain->window_state, + window, mode.Width, mode.Height))) + goto fail; + } + else + { + /* Fullscreen -> fullscreen mode change */ + MoveWindow(window, 0, 0, mode.Width, mode.Height, TRUE); + ShowWindow(window, SW_SHOW); + } + } + else if (!fullscreen_desc->Windowed) + { + /* Fullscreen -> windowed switch */ + wined3d_window_state_restore_from_fullscreen(&swapchain->window_state, + window, &swapchain->original_window_rect); + } + + fullscreen_desc->Windowed = !fullscreen; + + if (!fullscreen) + { + IDXGIOutput_Release(target); + target = NULL; + } + + if (swapchain->target) + IDXGIOutput_Release(swapchain->target); + swapchain->target = target; + + return S_OK; + +fail: + IDXGIOutput_Release(target); + + return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapChain3 *iface, BOOL *fullscreen, IDXGIOutput **target) { - FIXME("iface %p, fullscreen %p, target %p stub!\n", iface, fullscreen, target); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); - return E_NOTIMPL; + TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); + + if (fullscreen) + *fullscreen = !swapchain->fullscreen_desc.Windowed; + + if (target && (*target = swapchain->target)) + IDXGIOutput_AddRef(*target); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain3 *iface, DXGI_SWAP_CHAIN_DESC *desc) @@ -2306,6 +2411,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh TRACE("iface %p, output %p.\n", iface, output); + if (swapchain->target) + { + IDXGIOutput_AddRef(*output = swapchain->target); + return S_OK; + } + device_parent = vkd3d_get_device_parent(swapchain->device); if (SUCCEEDED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) @@ -2736,6 +2847,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI uint32_t queue_family_index; VkSurfaceKHR vk_surface; VkInstance vk_instance; + IDXGIOutput *output; VkBool32 supported; VkDevice vk_device; VkFence vk_fence; @@ -2853,6 +2965,19 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hresult_from_vk_result(vr); } + GetWindowRect(window, &swapchain->original_window_rect); + if (SUCCEEDED(hr = d3d12_swapchain_GetContainingOutput(&swapchain->IDXGISwapChain3_iface, &output))) + { + hr = dxgi_output_get_display_mode(output, &swapchain->original_mode); + IDXGIOutput_Release(output); + } + if (FAILED(hr)) + { + WARN("Failed to get current display mode, hr %#x.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + IWineDXGIFactory_AddRef(swapchain->factory = factory); return S_OK; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d8176bb1c054..7ba417010dd6 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4155,7 +4155,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) skip("Test %u: Could not change fullscreen state.\n", i); continue; } - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); @@ -4163,23 +4163,23 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) output = NULL; fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); - todo_wine_if(is_d3d12) ok(!!output, "Test %u: Got unexpected output.\n", i); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + ok(!!output, "Test %u: Got unexpected output.\n", i); if (output) IDXGIOutput_ReleaseOwnership(output); /* Still fullscreen. */ fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); /* Calling IDXGISwapChain_Present() will exit fullscreen. */ hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); /* Now fullscreen mode is exited. */ if (!flags[i] && !is_d3d12) /* Still fullscreen on vista and 2008. */ @@ -4198,11 +4198,11 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * compositing. D3d12 fullscreen mode acts just like borderless * fullscreen window mode. */ hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); @@ -4217,8 +4217,8 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); /* A visible, but with bottom z-order window still causes the * swapchain to exit fullscreen mode. */ SetWindowPos(occluding_window, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); @@ -4231,7 +4231,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * for d3d12. */ fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); @@ -4243,7 +4243,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (flags[i] == DXGI_PRESENT_TEST) todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); @@ -4267,7 +4267,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * IDXGISwapChain_GetFullscreenState() before IDXGISwapChain_Present(). */ ShowWindow(occluding_window, SW_HIDE); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); ShowWindow(occluding_window, SW_SHOW); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); @@ -4302,7 +4302,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) } fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); DestroyWindow(occluding_window); @@ -4312,7 +4312,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); } @@ -5553,11 +5553,11 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) skip("Failed to change fullscreen state.\n"); goto done; } - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(fullscreen, "Got unexpected fullscreen state.\n"); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fullscreen, "Got unexpected fullscreen state.\n"); if (is_d3d12) wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); else -- 2.21.0

2 1

[PATCH] mshtml: Add IHTMLDOMRange stub.
by Nikolay Sivov 27 Jun '19

27 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 19 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/{txtrange.c => range.c} | 369 +++++++++++++++++++++++++++- include/mshtml.idl | 14 +- 5 files changed, 394 insertions(+), 13 deletions(-) rename dlls/mshtml/{txtrange.c => range.c} (81%) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index f054816056..7e1d517f07 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -55,13 +55,13 @@ C_SRCS = \ persist.c \ pluginhost.c \ protocol.c \ + range.c \ script.c \ secmgr.c \ selection.c \ service.c \ svg.c \ task.c \ - txtrange.c \ view.c \ xmlhttprequest.c diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7595ad852a..a6f22150b9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5223,8 +5223,22 @@ static HRESULT WINAPI DocumentRange_Invoke(IDocumentRange *iface, DISPID dispIdM static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMRange **p) { HTMLDocument *This = impl_from_IDocumentRange(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMRange *nsrange; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + if(NS_FAILED(nsIDOMHTMLDocument_CreateRange(This->doc_node->nsdoc, &nsrange))) + return E_FAIL; + + hres = HTMLDOMRange_Create(This->doc_node, nsrange, p); + nsIDOMRange_Release(nsrange); + return hres; } static const IDocumentRangeVtbl DocumentRangeVtbl = { @@ -5697,6 +5711,7 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo HTMLDocumentNode_SecMgr_Init(doc); list_init(&doc->selection_list); + list_init(&doc->txtrange_list); list_init(&doc->range_list); list_init(&doc->plugin_hosts); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ef56f1d23d..b8fb67315c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -178,6 +178,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ XIID(IHTMLDOMNode3) \ + XIID(IHTMLDOMRange) \ XIID(IHTMLDOMTextNode) \ XIID(IHTMLDOMTextNode2) \ XIID(IHTMLElement) \ @@ -884,6 +885,7 @@ struct HTMLDocumentNode { unsigned unique_id; struct list selection_list; + struct list txtrange_list; struct list range_list; struct list plugin_hosts; }; @@ -1008,6 +1010,7 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectio HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*) DECLSPEC_HIDDEN; IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN; +HRESULT HTMLDOMRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLDOMRange**) DECLSPEC_HIDDEN; void detach_document_node(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_selection(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/range.c similarity index 81% rename from dlls/mshtml/txtrange.c rename to dlls/mshtml/range.c index c6a6ed096b..3c28ad3e01 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/range.c @@ -49,6 +49,18 @@ typedef struct { struct list entry; } HTMLTxtRange; +typedef struct { + DispatchEx dispex; + IHTMLDOMRange IHTMLDOMRange_iface; + + LONG ref; + + nsIDOMRange *nsrange; + HTMLDocumentNode *doc; + + struct list entry; +} HTMLDOMRange; + typedef struct { WCHAR *buf; DWORD len; @@ -73,7 +85,7 @@ static HTMLTxtRange *get_range_object(HTMLDocumentNode *doc, IHTMLTxtRange *ifac { HTMLTxtRange *iter; - LIST_FOR_EACH_ENTRY(iter, &doc->range_list, HTMLTxtRange, entry) { + LIST_FOR_EACH_ENTRY(iter, &doc->txtrange_list, HTMLTxtRange, entry) { if(&iter->IHTMLTxtRange_iface == iface) return iter; } @@ -1752,18 +1764,369 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx ret->nsrange = nsrange; ret->doc = doc; - list_add_head(&doc->range_list, &ret->entry); + list_add_head(&doc->txtrange_list, &ret->entry); *p = &ret->IHTMLTxtRange_iface; return S_OK; } +static inline HTMLDOMRange *impl_from_IHTMLDOMRange(IHTMLDOMRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMRange, IHTMLDOMRange_iface); +} + +static HRESULT WINAPI HTMLDOMRange_QueryInterface(IHTMLDOMRange *iface, REFIID riid, void **ppv) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IHTMLDOMRange_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMRange, riid)) { + *ppv = &This->IHTMLDOMRange_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLDOMRange_AddRef(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLDOMRange_Release(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->nsrange) + nsIDOMRange_Release(This->nsrange); + if(This->doc) + list_remove(&This->entry); + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLDOMRange_GetTypeInfoCount(IHTMLDOMRange *iface, UINT *pctinfo) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMRange_GetTypeInfo(IHTMLDOMRange *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMRange_GetIDsOfNames(IHTMLDOMRange *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMRange_Invoke(IHTMLDOMRange *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMRange_get_startContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_startOffset(IHTMLDOMRange *iface, LONG *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_endContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_endOffset(IHTMLDOMRange *iface, LONG *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_collapsed(IHTMLDOMRange *iface, VARIANT_BOOL *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_commonAncestorContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStart(IHTMLDOMRange *iface, IDispatch *node, LONG offset) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p, %d)\n", This, node, offset); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEnd(IHTMLDOMRange *iface, IDispatch *node, LONG offset) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p, %d)\n", This, node, offset); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStartBefore(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStartAfter(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEndBefore(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEndAfter(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_collapse(IHTMLDOMRange *iface, VARIANT_BOOL tostart) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%x)\n", This, tostart); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_selectNode(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_selectNodeContents(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_compareBoundaryPoints(IHTMLDOMRange *iface, short how, + IDispatch *src_range, LONG *result) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%x, %p, %p)\n", This, how, src_range, result); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_deleteContents(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_extractContents(IHTMLDOMRange *iface, IDispatch **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_cloneContents(IHTMLDOMRange *iface, IDispatch **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_insertNode(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_surroundContents(IHTMLDOMRange *iface, IDispatch *parent) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, parent); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_cloneRange(IHTMLDOMRange *iface, IHTMLDOMRange **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_toString(IHTMLDOMRange *iface, BSTR *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_detach(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_getClientRects(IHTMLDOMRange *iface, IHTMLRectCollection **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_getBoundingClientRect(IHTMLDOMRange *iface, IHTMLRect **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLDOMRangeVtbl HTMLDOMRangeVtbl = { + HTMLDOMRange_QueryInterface, + HTMLDOMRange_AddRef, + HTMLDOMRange_Release, + HTMLDOMRange_GetTypeInfoCount, + HTMLDOMRange_GetTypeInfo, + HTMLDOMRange_GetIDsOfNames, + HTMLDOMRange_Invoke, + HTMLDOMRange_get_startContainer, + HTMLDOMRange_get_startOffset, + HTMLDOMRange_get_endContainer, + HTMLDOMRange_get_endOffset, + HTMLDOMRange_get_collapsed, + HTMLDOMRange_get_commonAncestorContainer, + HTMLDOMRange_setStart, + HTMLDOMRange_setEnd, + HTMLDOMRange_setStartBefore, + HTMLDOMRange_setStartAfter, + HTMLDOMRange_setEndBefore, + HTMLDOMRange_setEndAfter, + HTMLDOMRange_collapse, + HTMLDOMRange_selectNode, + HTMLDOMRange_selectNodeContents, + HTMLDOMRange_compareBoundaryPoints, + HTMLDOMRange_deleteContents, + HTMLDOMRange_extractContents, + HTMLDOMRange_cloneContents, + HTMLDOMRange_insertNode, + HTMLDOMRange_surroundContents, + HTMLDOMRange_cloneRange, + HTMLDOMRange_toString, + HTMLDOMRange_detach, + HTMLDOMRange_getClientRects, + HTMLDOMRange_getBoundingClientRect, +}; + +static const tid_t HTMLDOMRange_iface_tids[] = { + IHTMLDOMRange_tid, + 0 +}; + +static dispex_static_data_t HTMLDOMRange_dispex = { + NULL, + IHTMLDOMRange_tid, + HTMLDOMRange_iface_tids +}; + +HRESULT HTMLDOMRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLDOMRange **p) +{ + HTMLDOMRange *ret; + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMRange_iface, &HTMLDOMRange_dispex); + + ret->IHTMLDOMRange_iface.lpVtbl = &HTMLDOMRangeVtbl; + ret->ref = 1; + + if(nsrange) + nsIDOMRange_AddRef(nsrange); + ret->nsrange = nsrange; + + ret->doc = doc; + list_add_head(&doc->range_list, &ret->entry); + + *p = &ret->IHTMLDOMRange_iface; + return S_OK; +} + void detach_ranges(HTMLDocumentNode *This) { + HTMLDOMRange *domrange, *domrange_next; HTMLTxtRange *iter, *next; - LIST_FOR_EACH_ENTRY_SAFE(iter, next, &This->range_list, HTMLTxtRange, entry) { + LIST_FOR_EACH_ENTRY_SAFE(iter, next, &This->txtrange_list, HTMLTxtRange, entry) { iter->doc = NULL; list_remove(&iter->entry); } + + LIST_FOR_EACH_ENTRY_SAFE(domrange, domrange_next, &This->range_list, HTMLDOMRange, entry) { + domrange->doc = NULL; + list_remove(&domrange->entry); + } } diff --git a/include/mshtml.idl b/include/mshtml.idl index aea888b2b8..10eb3315b8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -12220,13 +12220,13 @@ interface IHTMLDOMRange : IDispatch HRESULT startContainer([out, retval] IHTMLDOMNode **p); [propget, id(DISPID_IHTMLDOMRANGE_STARTOFFSET)] - HRESULT startOffset([out, retval] long *p); + HRESULT startOffset([out, retval] LONG *p); [propget, id(DISPID_IHTMLDOMRANGE_ENDCONTAINER)] HRESULT endContainer([out, retval] IHTMLDOMNode **p); [propget, id(DISPID_IHTMLDOMRANGE_ENDOFFSET)] - HRESULT endOffset([out, retval] long *p); + HRESULT endOffset([out, retval] LONG *p); [propget, id(DISPID_IHTMLDOMRANGE_COLLAPSED)] HRESULT collapsed([out, retval] VARIANT_BOOL *p); @@ -12237,12 +12237,12 @@ interface IHTMLDOMRange : IDispatch [id(DISPID_IHTMLDOMRANGE_SETSTART)] HRESULT setStart( [in] IDispatch *refNode, - [in] long offset); + [in] LONG offset); - [id(DISPID_IHTMLDOMRANGE_SETEND)] HRESULT - setEnd( + [id(DISPID_IHTMLDOMRANGE_SETEND)] + HRESULT setEnd( [in] IDispatch *refNode, - [in] long offset); + [in] LONG offset); [id(DISPID_IHTMLDOMRANGE_SETSTARTBEFORE)] HRESULT setStartBefore([in] IDispatch* refNode); @@ -12269,7 +12269,7 @@ interface IHTMLDOMRange : IDispatch HRESULT compareBoundaryPoints( [in] short how, [in] IDispatch *sourceRange, - [out, retval] long *compareResult); + [out, retval] LONG *compareResult); [id(DISPID_IHTMLDOMRANGE_DELETECONTENTS)] HRESULT deleteContents(); -- 2.20.1

3 3

[PATCH v5 3/6] wined3d: Move fullscreen window setup/restore to new struct and functions.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/device.c | 82 +++++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 3 ++ dlls/wined3d/wined3d_private.h | 5 +-- include/wine/wined3d.h | 12 +++++ 4 files changed, 61 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d35a0648c9cb..32a233f59cf2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -927,10 +927,9 @@ static LONG fullscreen_exstyle(LONG exstyle) return exstyle; } -HRESULT CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, +HRESULT CDECL wined3d_window_state_setup_fullscreen(struct wined3d_window_state *state, HWND window, unsigned int w, unsigned int h) { - BOOL filter_messages; LONG style, exstyle; TRACE("Setting up window %p for fullscreen mode.\n", window); @@ -941,42 +940,47 @@ HRESULT CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *devi return WINED3DERR_NOTAVAILABLE; } - if (device->style || device->exStyle) + if (state->style || state->exstyle) { ERR("Changing the window style for window %p, but another style (%08x, %08x) is already stored.\n", - window, device->style, device->exStyle); + window, state->style, state->exstyle); } - device->style = GetWindowLongW(window, GWL_STYLE); - device->exStyle = GetWindowLongW(window, GWL_EXSTYLE); + state->style = GetWindowLongW(window, GWL_STYLE); + state->exstyle = GetWindowLongW(window, GWL_EXSTYLE); - style = fullscreen_style(device->style); - exstyle = fullscreen_exstyle(device->exStyle); + style = fullscreen_style(state->style); + exstyle = fullscreen_exstyle(state->exstyle); 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; + state->style, state->exstyle, style, exstyle); 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; - return WINED3D_OK; } -void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, - const RECT *window_rect) +HRESULT CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, + HWND window, unsigned int w, unsigned int h) +{ + BOOL filter_messages = device->filter_messages; + HRESULT hr; + device->filter_messages = TRUE; + hr = wined3d_window_state_setup_fullscreen(&device->window_state, window, w, h); + device->filter_messages = filter_messages; + return hr; +} + +void CDECL wined3d_window_state_restore_from_fullscreen(struct wined3d_window_state *state, + 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}; - if (!device->style && !device->exStyle) + if (!state->style && !state->exstyle) return; style = GetWindowLongW(window, GWL_STYLE); @@ -988,23 +992,20 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic * preserve the current status of these flags (i.e. don't restore them) to * more closely emulate the behavior of Direct3D, which leaves these flags * alone when returning to windowed mode. */ - device->style ^= (device->style ^ style) & WS_VISIBLE; - device->exStyle ^= (device->exStyle ^ exstyle) & WS_EX_TOPMOST; + state->style ^= (state->style ^ style) & WS_VISIBLE; + state->exstyle ^= (state->exstyle ^ exstyle) & WS_EX_TOPMOST; 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; + window, state->style, state->exstyle); /* Only restore the style if the application didn't modify it during the * fullscreen phase. Some applications change it before calling Reset() * when switching between windowed and fullscreen modes (HL2), some * depend on the original style (Eve Online). */ - if (style == fullscreen_style(device->style) && exstyle == fullscreen_exstyle(device->exStyle)) + if (style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle)) { - SetWindowLongW(window, GWL_STYLE, device->style); - SetWindowLongW(window, GWL_EXSTYLE, device->exStyle); + SetWindowLongW(window, GWL_STYLE, state->style); + SetWindowLongW(window, GWL_EXSTYLE, state->exstyle); } if (window_rect) @@ -1014,11 +1015,18 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic SetWindowPos(window, 0, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, window_pos_flags); - device->filter_messages = filter_messages; - /* Delete the old values. */ - device->style = 0; - device->exStyle = 0; + state->style = 0; + state->exstyle = 0; +} + +void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, + const RECT *window_rect) +{ + BOOL filter_messages = device->filter_messages; + device->filter_messages = TRUE; + wined3d_window_state_restore_from_fullscreen(&device->window_state, window, window_rect); + device->filter_messages = filter_messages; } HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window) @@ -5538,19 +5546,19 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } else if (!swapchain_desc->windowed) { - DWORD style = device->style; - DWORD exStyle = device->exStyle; + DWORD style = device->window_state.style; + DWORD exstyle = device->window_state.exstyle; /* If we're in fullscreen, and the mode wasn't changed, we have to get the window back into * the right position. Some applications(Battlefield 2, Guild Wars) move it and then call * Reset to clear up their mess. Guild Wars also loses the device during that. */ - device->style = 0; - device->exStyle = 0; + device->window_state.style = 0; + device->window_state.exstyle = 0; wined3d_device_setup_fullscreen_window(device, swapchain->device_window, swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height); - device->style = style; - device->exStyle = exStyle; + device->window_state.style = style; + device->window_state.exstyle = exstyle; } if (FAILED(hr = wined3d_swapchain_resize_buffers(swapchain, swapchain_desc->backbuffer_count, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 904bb3461ffb..8bbb89483f74 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -313,4 +313,7 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) +@ cdecl wined3d_window_state_restore_from_fullscreen(ptr ptr ptr) +@ cdecl wined3d_window_state_setup_fullscreen(ptr ptr long long) + @ cdecl wined3d_extract_shader_input_signature_from_dxbc(ptr ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6f4b670182e..6f1b9a2aca01 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3150,10 +3150,7 @@ struct wined3d_device struct wined3d_device_parent *device_parent; struct wined3d *wined3d; struct wined3d_adapter *adapter; - - /* Window styles to restore when switching fullscreen mode */ - LONG style; - LONG exStyle; + struct wined3d_window_state window_state; const struct wined3d_shader_backend_ops *shader_backend; void *shader_priv; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d1d3ca42e599..335d9fe04232 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2171,6 +2171,13 @@ struct wined3d_private_data } content; }; +struct wined3d_window_state +{ + /* Window styles to restore when switching fullscreen mode */ + LONG style; + LONG exstyle; +}; + typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resource); void __stdcall wined3d_mutex_lock(void); @@ -2756,6 +2763,11 @@ ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaratio HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_shader_signature *signature, const void *byte_code, SIZE_T byte_code_size); +void __cdecl wined3d_window_state_restore_from_fullscreen(struct wined3d_window_state *fullscreen, + HWND window, const RECT *window_rect); +HRESULT __cdecl wined3d_window_state_setup_fullscreen(struct wined3d_window_state *fullscreen, + HWND window, unsigned int w, unsigned int h); + /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) { -- 2.21.0

1 0

[PATCH v5 2/6] dxgi: Implement d3d12_swapchain_ResizeTarget().
by Józef Kucia 27 Jun '19

27 Jun '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index b7a4fd5cbad8..0491040909d3 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2287,9 +2287,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, const DXGI_MODE_DESC *target_mode_desc) { - FIXME("iface %p, target_mode_desc %p stub!\n", iface, target_mode_desc); + DXGI_SWAP_CHAIN_DESC swap_chain_desc; - return E_NOTIMPL; + TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); + + d3d12_swapchain_GetDesc(iface, &swap_chain_desc); + + return dxgi_swapchain_resize_target((IDXGISwapChain1 *)iface, &swap_chain_desc, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapChain3 *iface, -- 2.21.0

1 0

[PATCH v5 1/6] dxgi: Move wined3d_swapchain_resize_target() from wined3d.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 2 + dlls/dxgi/output.c | 69 ++++++++++++++++++++++++++++++++ dlls/dxgi/swapchain.c | 82 ++++++++++++++++++++++++++++++++------- dlls/wined3d/swapchain.c | 58 --------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 - 6 files changed, 138 insertions(+), 76 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 553eacee3b80..2f21d8e5b0ca 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -148,6 +148,8 @@ struct dxgi_output }; HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 123dee8c99e2..3dcbb5d6e540 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -522,6 +522,14 @@ static const struct IDXGIOutput4Vtbl dxgi_output_vtbl = dxgi_output_CheckOverlayColorSpaceSupport, }; +static struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (IDXGIOutputVtbl *)&dxgi_output_vtbl); + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); +} + static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; @@ -539,3 +547,64 @@ HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **ou dxgi_output_init(*output, adapter); return S_OK; } + +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct dxgi_output *target; + struct wined3d *wined3d; + HRESULT hr; + + target = unsafe_impl_from_IDXGIOutput(iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_mutex_lock(); + hr = wined3d_get_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode, NULL); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to get display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + dxgi_mode_from_wined3d(mode, &wined3d_mode); + + TRACE("Returning %s.\n", debug_dxgi_mode(mode)); + + return S_OK; +} + +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct dxgi_output *target; + struct wined3d *wined3d; + HRESULT hr; + + target = unsafe_impl_from_IDXGIOutput(iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_display_mode_from_dxgi(&wined3d_mode, mode); + + if (FAILED(hr = dxgi_output_find_closest_matching_mode(target, &wined3d_mode, NULL))) + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + else /* Copy the actual mode back to the caller */ + dxgi_mode_from_wined3d(mode, &wined3d_mode); + + wined3d_mutex_lock(); + hr = wined3d_set_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + return S_OK; +} diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8dbbfab805d3..b7a4fd5cbad8 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -152,6 +152,70 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_NOT_FOUND; } +static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *iface, + const DXGI_SWAP_CHAIN_DESC *desc, const DXGI_MODE_DESC *mode) +{ + RECT original_window_rect, window_rect; + HWND window = desc->OutputWindow; + HRESULT hr; + + if (!mode) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); + + if (mode->Scaling) + FIXME("Ignoring scaling %#x.\n", mode->Scaling); + + if (desc->Windowed) + { + SetRect(&window_rect, 0, 0, mode->Width, mode->Height); + AdjustWindowRectEx(&window_rect, + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); + SetRect(&window_rect, 0, 0, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); + GetWindowRect(window, &original_window_rect); + OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + } + else + { + DXGI_MODE_DESC actual_mode; + IDXGIOutput *target; + + if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &target))) + { + WARN("Failed to get output, hr %#x.\n", hr); + return hr; + } + + if (desc->Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + { + actual_mode = *mode; + hr = dxgi_output_set_display_mode(target, &actual_mode); + } + else + { + hr = dxgi_output_get_display_mode(target, &actual_mode); + } + + IDXGIOutput_Release(target); + + if (FAILED(hr)) + return hr; + + SetRect(&window_rect, 0, 0, actual_mode.Width, actual_mode.Height); + } + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + + return S_OK; +} + static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) { struct wined3d_swapchain_desc wined3d_desc; @@ -507,25 +571,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeBuffers(IDXGISwapChain1 * static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *iface, const DXGI_MODE_DESC *target_mode_desc) { - struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_display_mode mode; + DXGI_SWAP_CHAIN_DESC swap_chain_desc; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); - if (!target_mode_desc) - { - WARN("Invalid pointer.\n"); - return DXGI_ERROR_INVALID_CALL; - } - - TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); - - if (target_mode_desc->Scaling) - FIXME("Ignoring scaling %#x.\n", target_mode_desc->Scaling); - - wined3d_display_mode_from_dxgi(&mode, target_mode_desc); + d3d11_swapchain_GetDesc(iface, &swap_chain_desc); - return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); + return dxgi_swapchain_resize_target(iface, &swap_chain_desc, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b75aead1e831..8aa8b92a0a98 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1361,64 +1361,6 @@ static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swap return WINED3D_OK; } -HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, - const struct wined3d_display_mode *mode) -{ - struct wined3d_display_mode actual_mode; - RECT original_window_rect, window_rect; - struct wined3d_device *device; - HWND window; - HRESULT hr; - - TRACE("swapchain %p, mode %p.\n", swapchain, mode); - - wined3d_mutex_lock(); - - device = swapchain->device; - window = swapchain->device_window; - - if (swapchain->desc.windowed) - { - SetRect(&window_rect, 0, 0, mode->width, mode->height); - AdjustWindowRectEx(&window_rect, - GetWindowLongW(window, GWL_STYLE), FALSE, - GetWindowLongW(window, GWL_EXSTYLE)); - SetRect(&window_rect, 0, 0, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); - GetWindowRect(window, &original_window_rect); - OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); - } - else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) - { - actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) - { - wined3d_mutex_unlock(); - return hr; - } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - else - { - if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, - &actual_mode, NULL))) - { - ERR("Failed to get display mode, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - - wined3d_mutex_unlock(); - - MoveWindow(window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); - - return WINED3D_OK; -} - HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 59f99c91e075..904bb3461ffb 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -274,7 +274,6 @@ @ cdecl wined3d_swapchain_incref(ptr) @ cdecl wined3d_swapchain_present(ptr ptr ptr ptr long long) @ cdecl wined3d_swapchain_resize_buffers(ptr long long long long long long) -@ cdecl wined3d_swapchain_resize_target(ptr ptr) @ cdecl wined3d_swapchain_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_set_gamma_ramp(ptr long ptr) @ cdecl wined3d_swapchain_set_palette(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abef3f0ad021..d1d3ca42e599 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2690,8 +2690,6 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, c HRESULT __cdecl wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality); -HRESULT __cdecl wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, - const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, -- 2.21.0

1 0

[PATCH] ntdll: Support ISOLATIONAWARE_MANIFEST_RESOURCE_ID range
by Alistair Leslie-Hughes 27 Jun '19

27 Jun '19

From: André Hentschel <nerv(a)dawncrow.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18889 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/actctx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 106fea80a3..25c2dccb8c 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -57,6 +57,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); /* we don't want to include winuser.h */ #define RT_MANIFEST ((ULONG_PTR)24) #define CREATEPROCESS_MANIFEST_RESOURCE_ID ((ULONG_PTR)1) +#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID ((ULONG_PTR)1) +#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID ((ULONG_PTR)16) /* from oaidl.h */ typedef enum tagLIBFLAGS { @@ -3304,8 +3306,14 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = open_nt_file( &file, &nameW ); if (!status) { - status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, - (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); + INT rid; + for (rid = MINIMUM_RESERVED_MANIFEST_RESOURCE_ID; + rid <= MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID; rid++) + { + status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, + (LPCWSTR)(ULONG_PTR)rid, 0 ); + if (status == STATUS_SUCCESS) break; + } NtClose( file ); if (status == STATUS_SUCCESS) break; -- 2.17.1

2 1

[PATCH] include: Complete IMimeHeaderTable/IMimeEnumHeaderRows interfaces.
by Alistair Leslie-Hughes 27 Jun '19

27 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mimeole.idl | 124 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 105 insertions(+), 19 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index cc80c12f47..b560caeed1 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -495,13 +495,117 @@ library MIMEOLE [out, ref] LPPROPVARIANT pValue); } + [ + uuid(c558834d-7f86-11d0-8252-00c04fd85ab4), + object + ] + interface IMimeEnumHeaderRows : IUnknown + { + typedef struct tagENUMHEADERROW + { + HHEADERROW hRow; + LPSTR pszHeader; + LPSTR pszData; + ULONG cchData; + DWORD_PTR dwReserved; + } ENUMHEADERROW, *LPENUMHEADERROW; + + HRESULT Next( + [in] ULONG fetch, + [in,out] LPENUMHEADERROW row, + [out] ULONG *fetched); + + HRESULT Skip( + [in] ULONG items); + + HRESULT Reset(void); + + HRESULT Clone( + [out] IMimeEnumHeaderRows **rows); + + HRESULT Count( + [out] ULONG *pcItems); + } + [ uuid(fd853cd1-7f86-11d0-8252-00c04fd85ab4), object ] interface IMimeHeaderTable : IPersistStream { - /* FIXME: fill this in */ + typedef struct tagFINDHEADER + { + LPCSTR pszHeader; + DWORD dwReserved; + } FINDHEADER, *LPFINDHEADER; + + typedef struct tagHEADERROWINFO + { + DWORD dwRowNumber; + ULONG cboffStart; + ULONG cboffColon; + ULONG cboffEnd; + } HEADERROWINFO, *LPHEADERROWINFO; + + typedef enum tagHEADERTABLEFLAGS + { + HTF_NAMEINDATA = 0x00000001, + HTF_ENUMHANDLESONLY = 0x00000002 + } HEADERTABLEFLAGS; + + HRESULT FindFirstRow( + [in] LPFINDHEADER header, + [out] LPHHEADERROW row); + + HRESULT FindNextRow( + [in] LPFINDHEADER header, + [out] LPHHEADERROW row); + + HRESULT CountRows( + [in] const char *header, + [out] ULONG *rows); + + HRESULT AppendRow( + [in] const char *header, + [in] DWORD flags, + [in] const char *data, + [in] ULONG count, + [out] LPHHEADERROW row); + + HRESULT DeleteRow( + [in] HHEADERROW row); + + HRESULT GetRowData( + [in] HHEADERROW row, + [in] DWORD flags, + [out] char **data, + [out] ULONG *len); + + HRESULT SetRowData( + [in] HHEADERROW row, + [in] DWORD flags, + [in] const char *data, + [in] ULONG len); + + HRESULT GetRowInfo( + [in] HHEADERROW row, + [in,out] LPHEADERROWINFO info); + + HRESULT SetRowNumber( + [in] HHEADERROW row, + [in] DWORD number); + + HRESULT EnumRows( + [in] const char *header, + [in] DWORD flags, + [out] IMimeEnumHeaderRows **rows); + + HRESULT Clone( + [out] IMimeHeaderTable **table); + + HRESULT BindToObject( + [in] REFIID riid, + [out, iid_is(riid)] void *object); } [ @@ -1256,24 +1360,6 @@ cpp_quote("#endif") /* FIXME: fill this in */ } - [ - uuid(c558834d-7f86-11d0-8252-00c04fd85ab4), - object - ] - interface IMimeEnumHeaderRows : IUnknown - { - typedef struct tagENUMHEADERROW - { - HHEADERROW hRow; - LPSTR pszHeader; - LPSTR pszData; - ULONG cchData; - DWORD_PTR dwReserved; - } ENUMHEADERROW, *LPENUMHEADERROW; - - /* FIXME: fill this in */ - } - [ uuid(fd853cee-7f86-11d0-8252-00c04fd85ab4), object -- 2.17.1

1 0

[PATCH v2] setupapi: Also start newly installed root PnP services in SetupDiInstallDevice().
by Zebediah Figura 27 Jun '19

27 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b7625644bec..c38d518fb6f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -31,6 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winsvc.h" #include "setupapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -4735,9 +4736,12 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR dothwW[] = {'.','H','W',0}; static const WCHAR dotservicesW[] = {'.','S','e','r','v','i','c','e','s',0}; static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; + static const WCHAR rootW[] = {'r','o','o','t','\\',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; + WCHAR svc_name[LINE_LEN] = {0}; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; + SC_HANDLE manager, service; struct device *device; struct driver *driver; void *callback_ctx; @@ -4806,7 +4810,6 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) if (SetupGetIntField(&ctx, 2, &flags) && (flags & SPSVCINST_ASSOCSERVICE)) { - WCHAR svc_name[LINE_LEN]; if (SetupGetStringFieldW(&ctx, 1, svc_name, ARRAY_SIZE(svc_name), NULL) && svc_name[0]) RegSetValueExW(device->key, Service, 0, REG_SZ, (BYTE *)svc_name, strlenW(svc_name) * sizeof(WCHAR)); break; @@ -4827,5 +4830,24 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) RegCloseKey(device_key); RegCloseKey(driver_key); + + if (!strncmpiW(device->instanceId, rootW, strlenW(rootW)) && svc_name[0] + && (manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) + { + if ((service = OpenServiceW(manager, svc_name, SERVICE_START))) + { + SERVICE_STATUS status; + if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) + { + ERR("Failed to start service %s for device %s, error %u.\n", + debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError()); + } + CloseServiceHandle(service); + } + else + ERR("Failed to open service %s for device %s.\n", debugstr_w(svc_name), debugstr_w(device->instanceId)); + CloseServiceHandle(manager); + } + return TRUE; } -- 2.22.0

1 0

[PATCH 1/2] setupapi: Also start newly installed services in SetupDiInstallDevice().
by Zebediah Figura 27 Jun '19

27 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b7625644bec..f3ed10caca5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -31,6 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winsvc.h" #include "setupapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -4735,9 +4736,12 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR dothwW[] = {'.','H','W',0}; static const WCHAR dotservicesW[] = {'.','S','e','r','v','i','c','e','s',0}; static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; + static const WCHAR rootW[] = {'r','o','o','t','\\',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; + WCHAR svc_name[LINE_LEN] = {0}; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; + SC_HANDLE manager, service; struct device *device; struct driver *driver; void *callback_ctx; @@ -4806,7 +4810,6 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) if (SetupGetIntField(&ctx, 2, &flags) && (flags & SPSVCINST_ASSOCSERVICE)) { - WCHAR svc_name[LINE_LEN]; if (SetupGetStringFieldW(&ctx, 1, svc_name, ARRAY_SIZE(svc_name), NULL) && svc_name[0]) RegSetValueExW(device->key, Service, 0, REG_SZ, (BYTE *)svc_name, strlenW(svc_name) * sizeof(WCHAR)); break; @@ -4827,5 +4830,24 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) RegCloseKey(device_key); RegCloseKey(driver_key); + + if (!strncmpiW(device->instanceId, rootW, strlenW(rootW)) && svc_name[0] + && (manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) + { + if ((service = OpenServiceW(manager, svc_name, SERVICE_START|SERVICE_USER_DEFINED_CONTROL))) + { + SERVICE_STATUS status; + if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) + { + ERR("Failed to start service %s for device %s, error %u.\n", + debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError()); + } + CloseServiceHandle(service); + } + else + ERR("Failed to open service %s for device %s.\n", debugstr_w(svc_name), debugstr_w(device->instanceId)); + CloseServiceHandle(manager); + } + return TRUE; } -- 2.22.0

1 1

[PATCH 1/5] qcap/tests: Add some tests for IBaseFilter::EnumPins on the AVI muxer.
by Zebediah Figura 27 Jun '19

27 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/tests/avimux.c | 122 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index 8292067f533..e51c6af8b22 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -179,6 +179,127 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_avi_mux(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[3]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 3); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_seeking(void) { IBaseFilter *filter = create_avi_mux(); @@ -319,6 +440,7 @@ START_TEST(avimux) test_interfaces(); test_aggregation(); + test_enum_pins(); test_seeking(); CoUninitialize(); -- 2.22.0

1 4

32bit wine on macOS 10.15 (Catalina)
by Fabian Maurer 26 Jun '19

26 Jun '19

Hello wine-devel, What's the current state of wine on the new macOS? Now that the beta is released I got to play around with it, and it indeed seems to have all 32bit support removed. On Linux at least we could switch between 64bit and 32bit code, but the macOS kernel seems to not allow this. Assuming we can do the thunking, what are the options to execute 32bit code on 10.15? I see a few options: 1) Virtualization 2) Emulation / dynamic recompilation 3) Somehow get a 32bit "segment" to execute the code (Custom driver?) Unless I'm overlooking something, that's it. What are your current plans? Regards, Fabian Maurer

1 0

[PATCH] kernelbase: Return on failed allocation (Coverity)
by André Hentschel 26 Jun '19

26 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernelbase/registry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index f218ffccb5d..f2b0af9f03a 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2680,9 +2680,11 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, return ERROR_FILE_NOT_FOUND; size = GetFullPathNameW(file_name, 0, NULL, NULL); - full_name = heap_alloc(size * sizeof(WCHAR)); if (!size) return GetLastError(); + full_name = heap_alloc(size * sizeof(WCHAR)); + if (!full_name) + return ERROR_NOT_ENOUGH_MEMORY; GetFullPathNameW(file_name, size, full_name, NULL); EnterCriticalSection(&reg_mui_cs); -- 2.17.1

1 0

[PATCH] advapi32: Return on failed allocation (Coverity) (try 2)
by André Hentschel 26 Jun '19

26 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/registry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 2d2c1be4dce..01ae114bee1 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3260,9 +3260,11 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, return ERROR_FILE_NOT_FOUND; size = GetFullPathNameW(file_name, 0, NULL, NULL); - full_name = heap_alloc(size * sizeof(WCHAR)); if (!size) return GetLastError(); + full_name = heap_alloc(size * sizeof(WCHAR)); + if (!full_name) + return GetLastError(); GetFullPathNameW(file_name, size, full_name, NULL); EnterCriticalSection(&reg_mui_cs); -- 2.17.1

2 2

[v2 PATCH] mshtml: Add IDocumentRange stub.
by Nikolay Sivov 26 Jun '19

26 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 82 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 2 + include/mshtmdid.h | 3 ++ include/mshtml.idl | 16 +++++++ 5 files changed, 105 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 87ee8e6b68..7595ad852a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5159,6 +5159,85 @@ static const IDisplayServicesVtbl DisplayServicesVtbl = { DisplayServices_HasFlowLayout }; +/********************************************************** + * IDocumentRange implementation + */ +static inline HTMLDocument *impl_from_IDocumentRange(IDocumentRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDocumentRange_iface); +} + +static HRESULT WINAPI DocumentRange_QueryInterface(IDocumentRange *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI DocumentRange_AddRef(IDocumentRange *iface) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_addref(This); +} + +static ULONG WINAPI DocumentRange_Release(IDocumentRange *iface) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_release(This); +} + +static HRESULT WINAPI DocumentRange_GetTypeInfoCount(IDocumentRange *iface, UINT *pctinfo) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DocumentRange_GetTypeInfo(IDocumentRange *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DocumentRange_GetIDsOfNames(IDocumentRange *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI DocumentRange_Invoke(IDocumentRange *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMRange **p) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IDocumentRangeVtbl DocumentRangeVtbl = { + DocumentRange_QueryInterface, + DocumentRange_AddRef, + DocumentRange_Release, + DocumentRange_GetTypeInfoCount, + DocumentRange_GetTypeInfo, + DocumentRange_GetIDsOfNames, + DocumentRange_Invoke, + DocumentRange_createRange, +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5243,6 +5322,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IMarkupContainer_iface; else if(IsEqualGUID(&IID_IDisplayServices, riid)) *ppv = &This->IDisplayServices_iface; + else if(IsEqualGUID(&IID_IDocumentRange, riid)) + *ppv = &This->IDocumentRange_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5294,6 +5375,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; doc->IDisplayServices_iface.lpVtbl = &DisplayServicesVtbl; + doc->IDocumentRange_iface.lpVtbl = &DocumentRangeVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6bfce89698..ef56f1d23d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -144,6 +144,7 @@ typedef struct EventTarget EventTarget; XIID(IDOMMouseEvent) \ XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ + XIID(IDocumentRange) \ XIID(IDocumentSelector) \ XIID(IElementSelector) \ XIID(IElementTraversal) \ @@ -626,6 +627,7 @@ struct HTMLDocument { IMarkupServices IMarkupServices_iface; IMarkupContainer IMarkupContainer_iface; IDisplayServices IDisplayServices_iface; + IDocumentRange IDocumentRange_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f6eebbc18b..586df7d8a5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -171,6 +171,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentRange, &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IDisplayServices, @@ -190,6 +191,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentRange, &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IDisplayServices, diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 82055f690b..87b8877f4e 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4711,4 +4711,7 @@ #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTOR DISPID_OMDOCUMENT+105 #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL DISPID_OMDOCUMENT+106 +/* IDocumentRange */ +#define DISPID_IDOCUMENTRANGE_CREATERANGE DISPID_OMDOCUMENT+111 + #endif /* __MSHTMDID_H__ */ diff --git a/include/mshtml.idl b/include/mshtml.idl index f7ebd9e71a..aea888b2b8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -23451,6 +23451,19 @@ interface IDocumentSelector : IDispatch [out, retval] IHTMLDOMChildrenCollection **pel); } +[ + odl, + oleautomation, + dual, + uuid(305104af-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDocumentRange : IDispatch +{ + [id(DISPID_IDOCUMENTRANGE_CREATERANGE)] + HRESULT createRange( + [out, retval] IHTMLDOMRange **ppIHTMLDOMRange); +} + /***************************************************************************** * DispHTMLDocument dispinterface */ @@ -24058,6 +24071,9 @@ methods: [id(DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL)] IHTMLDOMChildrenCollection *querySelectorAll([in] BSTR v); + + [id(DISPID_IDOCUMENTRANGE_CREATERANGE)] + IHTMLDOMRange *createRange(); } /***************************************************************************** -- 2.20.1

2 1

[PATCH v2] include: Use WS_ prefix with struct timeval.
by Hans Leidekker 26 Jun '19

26 Jun '19

v2: Include change to ws2_32. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/socket.c | 2 +- include/ws2tcpip.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a3026126b4..3b78f0de5d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7098,7 +7098,7 @@ end: * GetAddrInfoExW (WS2_32.@) */ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namespace, GUID *namespace_id, - const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct timeval *timeout, OVERLAPPED *overlapped, + const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct WS_timeval *timeout, OVERLAPPED *overlapped, LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle) { int ret; diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index f12deec83e..ea19ee39ca 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -178,9 +178,9 @@ int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,s #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); #define GetAddrInfo WINELIB_NAME_AW(GetAddrInfo) -int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA*,ADDRINFOEXA**,struct timeval*, +int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA*,ADDRINFOEXA**,struct WS(timeval)*, OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); -int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct timeval*, +int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct WS(timeval)*, OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); #define GetAddrInfoEx WINELIB_NAME_AW(GetAddrInfoExW) int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED*); -- 2.11.0

1 0

[PATCH v4 1/6] dxgi: Move wined3d_swapchain_resize_target() from wined3d.
by Conor McCarthy 26 Jun '19

26 Jun '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 2 + dlls/dxgi/output.c | 69 ++++++++++++++++++++++++++++++++ dlls/dxgi/swapchain.c | 82 ++++++++++++++++++++++++++++++++------- dlls/wined3d/swapchain.c | 58 --------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 - 6 files changed, 138 insertions(+), 76 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 553eace..e3c264a 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -148,6 +148,8 @@ struct dxgi_output }; HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode_desc) DECLSPEC_HIDDEN; +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *target_mode_desc) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 123dee8..6d5a2ac 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -522,6 +522,14 @@ static const struct IDXGIOutput4Vtbl dxgi_output_vtbl = dxgi_output_CheckOverlayColorSpaceSupport, }; +struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (IDXGIOutputVtbl *)&dxgi_output_vtbl); + return impl_from_IDXGIOutput4((IDXGIOutput4 *)iface); +} + static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; @@ -539,3 +547,64 @@ HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **ou dxgi_output_init(*output, adapter); return S_OK; } + +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct dxgi_output *target; + struct wined3d *wined3d; + HRESULT hr; + + target = unsafe_impl_from_IDXGIOutput(iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_mutex_lock(); + hr = wined3d_get_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode, NULL); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to get display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + dxgi_mode_from_wined3d(mode, &wined3d_mode); + + TRACE("Returning %s.\n", debug_dxgi_mode(mode)); + + return S_OK; +} + +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct dxgi_output *target; + struct wined3d *wined3d; + HRESULT hr; + + target = unsafe_impl_from_IDXGIOutput(iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_display_mode_from_dxgi(&wined3d_mode, mode); + + if (FAILED(hr = dxgi_output_find_closest_matching_mode(target, &wined3d_mode, NULL))) + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + else /* Copy the actual mode back to the caller */ + dxgi_mode_from_wined3d(mode, &wined3d_mode); + + wined3d_mutex_lock(); + hr = wined3d_set_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + return S_OK; +} diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8dbbfab..3bf4202 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -152,6 +152,70 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_NOT_FOUND; } +static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *iface, + const DXGI_SWAP_CHAIN_DESC *desc, const DXGI_MODE_DESC *mode) +{ + RECT original_window_rect, window_rect; + HWND window = desc->OutputWindow; + HRESULT hr; + + if (!mode) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); + + if (mode->Scaling) + FIXME("Ignoring scaling %#x.\n", mode->Scaling); + + if (desc->Windowed) + { + SetRect(&window_rect, 0, 0, mode->Width, mode->Height); + AdjustWindowRectEx(&window_rect, + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); + SetRect(&window_rect, 0, 0, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); + GetWindowRect(window, &original_window_rect); + OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + } + else + { + DXGI_MODE_DESC actual_mode; + IDXGIOutput *target; + + if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &target))) + { + WARN("Failed to get output, hr %#x.\n", hr); + return hr; + } + + if (desc->Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + { + actual_mode = *mode; + hr = dxgi_output_set_display_mode(target, &actual_mode); + } + else + { + hr = dxgi_output_get_display_mode(target, &actual_mode); + } + + IDXGIOutput_Release(target); + + if (FAILED(hr)) + return hr; + + SetRect(&window_rect, 0, 0, actual_mode.Width, actual_mode.Height); + } + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + + return S_OK; +} + static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) { struct wined3d_swapchain_desc wined3d_desc; @@ -507,25 +571,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeBuffers(IDXGISwapChain1 * static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *iface, const DXGI_MODE_DESC *target_mode_desc) { - struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_display_mode mode; + struct DXGI_SWAP_CHAIN_DESC swap_chain_desc; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); - if (!target_mode_desc) - { - WARN("Invalid pointer.\n"); - return DXGI_ERROR_INVALID_CALL; - } - - TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); - - if (target_mode_desc->Scaling) - FIXME("Ignoring scaling %#x.\n", target_mode_desc->Scaling); - - wined3d_display_mode_from_dxgi(&mode, target_mode_desc); + d3d11_swapchain_GetDesc(iface, &swap_chain_desc); - return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); + return dxgi_swapchain_resize_target(iface, &swap_chain_desc, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b75aead..8aa8b92 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1361,64 +1361,6 @@ static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swap return WINED3D_OK; } -HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, - const struct wined3d_display_mode *mode) -{ - struct wined3d_display_mode actual_mode; - RECT original_window_rect, window_rect; - struct wined3d_device *device; - HWND window; - HRESULT hr; - - TRACE("swapchain %p, mode %p.\n", swapchain, mode); - - wined3d_mutex_lock(); - - device = swapchain->device; - window = swapchain->device_window; - - if (swapchain->desc.windowed) - { - SetRect(&window_rect, 0, 0, mode->width, mode->height); - AdjustWindowRectEx(&window_rect, - GetWindowLongW(window, GWL_STYLE), FALSE, - GetWindowLongW(window, GWL_EXSTYLE)); - SetRect(&window_rect, 0, 0, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); - GetWindowRect(window, &original_window_rect); - OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); - } - else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) - { - actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) - { - wined3d_mutex_unlock(); - return hr; - } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - else - { - if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, - &actual_mode, NULL))) - { - ERR("Failed to get display mode, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - - wined3d_mutex_unlock(); - - MoveWindow(window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); - - return WINED3D_OK; -} - HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 59f99c9..904bb34 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -274,7 +274,6 @@ @ cdecl wined3d_swapchain_incref(ptr) @ cdecl wined3d_swapchain_present(ptr ptr ptr ptr long long) @ cdecl wined3d_swapchain_resize_buffers(ptr long long long long long long) -@ cdecl wined3d_swapchain_resize_target(ptr ptr) @ cdecl wined3d_swapchain_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_set_gamma_ramp(ptr long ptr) @ cdecl wined3d_swapchain_set_palette(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abef3f0..d1d3ca4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2690,8 +2690,6 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, c HRESULT __cdecl wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality); -HRESULT __cdecl wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, - const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, -- 2.21.0

2 6

[PATCH] include: Use WS_ prefix with struct timeval.
by Hans Leidekker 26 Jun '19

26 Jun '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/ws2tcpip.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index f12deec83e..ea19ee39ca 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -178,9 +178,9 @@ int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,s #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); #define GetAddrInfo WINELIB_NAME_AW(GetAddrInfo) -int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA*,ADDRINFOEXA**,struct timeval*, +int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA*,ADDRINFOEXA**,struct WS(timeval)*, OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); -int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct timeval*, +int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct WS(timeval)*, OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); #define GetAddrInfoEx WINELIB_NAME_AW(GetAddrInfoExW) int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED*); -- 2.11.0

2 1

[PATCH v3 1/6] dxgi: Move wined3d_swapchain_resize_target() from wined3d.
by Conor McCarthy 26 Jun '19

26 Jun '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 2 + dlls/dxgi/output.c | 69 ++++++++++++++++++++++++++++++++ dlls/dxgi/swapchain.c | 82 ++++++++++++++++++++++++++++++++------- dlls/wined3d/swapchain.c | 58 --------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 - 6 files changed, 138 insertions(+), 76 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 553eace..e3c264a 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -148,6 +148,8 @@ struct dxgi_output }; HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode_desc) DECLSPEC_HIDDEN; +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *target_mode_desc) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 123dee8..6d5a2ac 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -522,6 +522,14 @@ static const struct IDXGIOutput4Vtbl dxgi_output_vtbl = dxgi_output_CheckOverlayColorSpaceSupport, }; +struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (IDXGIOutputVtbl *)&dxgi_output_vtbl); + return impl_from_IDXGIOutput4((IDXGIOutput4 *)iface); +} + static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; @@ -539,3 +547,64 @@ HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **ou dxgi_output_init(*output, adapter); return S_OK; } + +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct dxgi_output *target; + struct wined3d *wined3d; + HRESULT hr; + + target = unsafe_impl_from_IDXGIOutput(iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_mutex_lock(); + hr = wined3d_get_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode, NULL); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to get display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + dxgi_mode_from_wined3d(mode, &wined3d_mode); + + TRACE("Returning %s.\n", debug_dxgi_mode(mode)); + + return S_OK; +} + +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct dxgi_output *target; + struct wined3d *wined3d; + HRESULT hr; + + target = unsafe_impl_from_IDXGIOutput(iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_display_mode_from_dxgi(&wined3d_mode, mode); + + if (FAILED(hr = dxgi_output_find_closest_matching_mode(target, &wined3d_mode, NULL))) + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + else /* Copy the actual mode back to the caller */ + dxgi_mode_from_wined3d(mode, &wined3d_mode); + + wined3d_mutex_lock(); + hr = wined3d_set_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + return S_OK; +} diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8dbbfab..3bf4202 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -152,6 +152,70 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_NOT_FOUND; } +static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *iface, + const DXGI_SWAP_CHAIN_DESC *desc, const DXGI_MODE_DESC *mode) +{ + RECT original_window_rect, window_rect; + HWND window = desc->OutputWindow; + HRESULT hr; + + if (!mode) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); + + if (mode->Scaling) + FIXME("Ignoring scaling %#x.\n", mode->Scaling); + + if (desc->Windowed) + { + SetRect(&window_rect, 0, 0, mode->Width, mode->Height); + AdjustWindowRectEx(&window_rect, + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); + SetRect(&window_rect, 0, 0, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); + GetWindowRect(window, &original_window_rect); + OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + } + else + { + DXGI_MODE_DESC actual_mode; + IDXGIOutput *target; + + if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &target))) + { + WARN("Failed to get output, hr %#x.\n", hr); + return hr; + } + + if (desc->Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + { + actual_mode = *mode; + hr = dxgi_output_set_display_mode(target, &actual_mode); + } + else + { + hr = dxgi_output_get_display_mode(target, &actual_mode); + } + + IDXGIOutput_Release(target); + + if (FAILED(hr)) + return hr; + + SetRect(&window_rect, 0, 0, actual_mode.Width, actual_mode.Height); + } + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + + return S_OK; +} + static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) { struct wined3d_swapchain_desc wined3d_desc; @@ -507,25 +571,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeBuffers(IDXGISwapChain1 * static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *iface, const DXGI_MODE_DESC *target_mode_desc) { - struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_display_mode mode; + struct DXGI_SWAP_CHAIN_DESC swap_chain_desc; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); - if (!target_mode_desc) - { - WARN("Invalid pointer.\n"); - return DXGI_ERROR_INVALID_CALL; - } - - TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); - - if (target_mode_desc->Scaling) - FIXME("Ignoring scaling %#x.\n", target_mode_desc->Scaling); - - wined3d_display_mode_from_dxgi(&mode, target_mode_desc); + d3d11_swapchain_GetDesc(iface, &swap_chain_desc); - return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); + return dxgi_swapchain_resize_target(iface, &swap_chain_desc, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b75aead..8aa8b92 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1361,64 +1361,6 @@ static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swap return WINED3D_OK; } -HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, - const struct wined3d_display_mode *mode) -{ - struct wined3d_display_mode actual_mode; - RECT original_window_rect, window_rect; - struct wined3d_device *device; - HWND window; - HRESULT hr; - - TRACE("swapchain %p, mode %p.\n", swapchain, mode); - - wined3d_mutex_lock(); - - device = swapchain->device; - window = swapchain->device_window; - - if (swapchain->desc.windowed) - { - SetRect(&window_rect, 0, 0, mode->width, mode->height); - AdjustWindowRectEx(&window_rect, - GetWindowLongW(window, GWL_STYLE), FALSE, - GetWindowLongW(window, GWL_EXSTYLE)); - SetRect(&window_rect, 0, 0, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); - GetWindowRect(window, &original_window_rect); - OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); - } - else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) - { - actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) - { - wined3d_mutex_unlock(); - return hr; - } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - else - { - if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, - &actual_mode, NULL))) - { - ERR("Failed to get display mode, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - - wined3d_mutex_unlock(); - - MoveWindow(window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); - - return WINED3D_OK; -} - HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 59f99c9..904bb34 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -274,7 +274,6 @@ @ cdecl wined3d_swapchain_incref(ptr) @ cdecl wined3d_swapchain_present(ptr ptr ptr ptr long long) @ cdecl wined3d_swapchain_resize_buffers(ptr long long long long long long) -@ cdecl wined3d_swapchain_resize_target(ptr ptr) @ cdecl wined3d_swapchain_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_set_gamma_ramp(ptr long ptr) @ cdecl wined3d_swapchain_set_palette(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abef3f0..d1d3ca4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2690,8 +2690,6 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, c HRESULT __cdecl wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality); -HRESULT __cdecl wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, - const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, -- 2.21.0

4 12

[PATCH 5/5] wined3d: Handle Windows 8.1 in wined3d_driver_info_init().
by Henri Verbeet 26 Jun '19

26 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 313e522f4a5..c052918c015 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -115,11 +115,13 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) * The driver version has the form "x.y.z.w". * * "x" is the Windows version the driver is meant for: - * 4 -> 95/98/NT4 - * 5 -> 2000 - * 6 -> 2000/XP - * 7 -> Vista - * 8 -> Win 7 + * 4 -> 95/98/NT4 + * 5 -> 2000 + * 6 -> 2000/XP + * 7 -> Vista + * 8 -> Windows 7 + * 9 -> Windows 8 + * 10 -> Windows 10 * * "y" is the maximum Direct3D version the driver supports. * y -> d3d version mapping: @@ -589,7 +591,7 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, } else { - if (os_version.dwMinorVersion > 2) + if (os_version.dwMinorVersion > 3) { FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_light_uniform().
by Henri Verbeet 26 Jun '19

26 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ac4c16741f9..8faa421c22c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1374,12 +1374,12 @@ static void shader_glsl_ffp_vertex_lightambient_uniform(const struct wined3d_con checkGLcall("glUniform3fv"); } -static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, unsigned int light, const struct wined3d_light_info *light_info, struct glsl_shader_prog_link *prog) { const struct wined3d_matrix *view = &state->transforms[WINED3D_TS_VIEW]; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_vec4 vec4; GL_EXTCALL(glUniform4fv(prog->vs.light_location[light].diffuse, 1, &light_info->OriginalParms.diffuse.r)); @@ -1681,7 +1681,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context FIXME("Unhandled light type %#x.\n", light_info->OriginalParms.type); continue; } - shader_glsl_ffp_vertex_light_uniform(context, state, idx, light_info, prog); + shader_glsl_ffp_vertex_light_uniform(context_gl, state, idx, light_info, prog); } } -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_lightambient_uniform().
by Henri Verbeet 26 Jun '19

26 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3da8961eec6..ac4c16741f9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1363,10 +1363,10 @@ static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context checkGLcall("setting FFP material uniforms"); } -static void shader_glsl_ffp_vertex_lightambient_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_lightambient_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_color color; wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_AMBIENT]); @@ -1654,7 +1654,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context directional_idx = spot_idx + spot_count; parallel_point_idx = directional_idx + directional_count; - shader_glsl_ffp_vertex_lightambient_uniform(context, state, prog); + shader_glsl_ffp_vertex_lightambient_uniform(context_gl, state, prog); for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { const struct wined3d_light_info *light_info = state->light_state.lights[i]; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_material_uniform().
by Henri Verbeet 26 Jun '19

26 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8778c6122e6..3da8961eec6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1341,10 +1341,10 @@ static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_contex checkGLcall("glUniformMatrix4fv"); } -static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (state->render_states[WINED3D_RS_SPECULARENABLE]) { @@ -1615,7 +1615,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } if (update_mask & WINED3D_SHADER_CONST_FFP_MATERIAL) - shader_glsl_ffp_vertex_material_uniform(context, state, prog); + shader_glsl_ffp_vertex_material_uniform(context_gl, state, prog); if (update_mask & WINED3D_SHADER_CONST_FFP_LIGHTS) { -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_texmatrix_uniform().
by Henri Verbeet 26 Jun '19

26 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 80e58ccb72b..8778c6122e6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1325,10 +1325,10 @@ static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_con checkGLcall("glUniformMatrix3fv"); } -static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, unsigned int tex, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_matrix mat; if (tex >= WINED3D_MAX_TEXTURES) @@ -1336,7 +1336,7 @@ static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_contex if (prog->vs.texture_matrix_location[tex] == -1) return; - get_texture_matrix(context, state, tex, &mat); + get_texture_matrix(&context_gl->c, state, tex, &mat); GL_EXTCALL(glUniformMatrix4fv(prog->vs.texture_matrix_location[tex], 1, FALSE, &mat._11)); checkGLcall("glUniformMatrix4fv"); } @@ -1611,7 +1611,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_FFP_TEXMATRIX) { for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) - shader_glsl_ffp_vertex_texmatrix_uniform(context, state, i, prog); + shader_glsl_ffp_vertex_texmatrix_uniform(context_gl, state, i, prog); } if (update_mask & WINED3D_SHADER_CONST_FFP_MATERIAL) -- 2.11.0

1 0

[PATCH 1/7] user32: Add support for RIDEV_NOLEGACY flag.
by Derek Lesho 26 Jun '19

26 Jun '19

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/user32/rawinput.c | 2 +- server/queue.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 2085fd3f9f..120de073c8 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -250,7 +250,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(RAWINPUTDEVICE *devices, U TRACE("device %u: page %#x, usage %#x, flags %#x, target %p.\n", i, devices[i].usUsagePage, devices[i].usUsage, devices[i].dwFlags, devices[i].hwndTarget); - if (devices[i].dwFlags & ~RIDEV_REMOVE) + if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY)) FIXME("Unhandled flags %#x for device %u.\n", devices[i].dwFlags, i); d[i].usage_page = devices[i].usUsagePage; diff --git a/server/queue.c b/server/queue.c index 24239916af..4987fca79f 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1668,6 +1668,9 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg_data->rawinput.mouse.data = input->mouse.data; queue_hardware_message( desktop, msg, 0 ); + + if (device->flags & RIDEV_NOLEGACY) + return FALSE; } for (i = 0; i < ARRAY_SIZE( messages ); i++) @@ -1793,6 +1796,9 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg_data->rawinput.kbd.scan = input->kbd.scan; queue_hardware_message( desktop, msg, 0 ); + + if (device->flags & RIDEV_NOLEGACY) + return FALSE; } if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; -- 2.21.0

2 8

[PATCH 1/4] ntoskrnl.exe: Handle some no-op PnP requests.
by Zebediah Figura 26 Jun '19

26 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 48430f31123..90da2b7ee37 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -785,6 +785,18 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) TRACE("device %p, irp %p, minor function %#x.\n", device, irp, stack->MinorFunction); + switch (stack->MinorFunction) + { + case IRP_MN_START_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + case IRP_MN_REMOVE_DEVICE: + /* Nothing to do. */ + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + default: + FIXME("Unhandled PnP request %#x.\n", stack->MinorFunction); + } + IoCompleteRequest( irp, IO_NO_INCREMENT ); return irp->IoStatus.u.Status; } -- 2.22.0

1 3

[PATCH 1/5] qcap/vfwcapture: Store the source pin inline in the VfwCapture structure.
by Zebediah Figura 26 Jun '19

26 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/capture.h | 2 +- dlls/qcap/v4l.c | 26 +++--- dlls/qcap/vfwcapture.c | 190 +++++++++++++++-------------------------- 3 files changed, 80 insertions(+), 138 deletions(-) diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index aed88893e5d..82f5eb2461c 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -23,7 +23,7 @@ struct _Capture; typedef struct _Capture Capture; -Capture *qcap_driver_init(IPin*,USHORT) DECLSPEC_HIDDEN; +Capture *qcap_driver_init(BaseOutputPin*,USHORT) DECLSPEC_HIDDEN; HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 10b28b350a2..b308f14786e 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -60,8 +60,8 @@ #include "wine/debug.h" #include "wine/library.h" -#include "capture.h" #include "qcap_main.h" +#include "capture.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); @@ -101,7 +101,7 @@ struct _Capture CRITICAL_SECTION CritSect; - IPin *pOut; + BaseOutputPin *pin; int fd, mmap; BOOL iscommitted, stopped; @@ -409,7 +409,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) EnterCriticalSection(&capBox->CritSect); if (capBox->stopped) break; - hr = BaseOutputPinImpl_GetDeliveryBuffer((BaseOutputPin *)capBox->pOut, &pSample, NULL, NULL, 0); + hr = BaseOutputPinImpl_GetDeliveryBuffer(capBox->pin, &pSample, NULL, NULL, 0); if (SUCCEEDED(hr)) { int len; @@ -435,7 +435,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } Resize(capBox, pTarget, image_data); - hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); + hr = BaseOutputPinImpl_Deliver(capBox->pin, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); } @@ -473,7 +473,6 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) if (!capBox->iscommitted) { ALLOCATOR_PROPERTIES ap, actual; - BaseOutputPin *out; capBox->iscommitted = TRUE; @@ -486,12 +485,10 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) ap.cbAlign = 1; ap.cbPrefix = 0; - out = (BaseOutputPin *)capBox->pOut; - - hr = IMemAllocator_SetProperties(out->pAllocator, &ap, &actual); + hr = IMemAllocator_SetProperties(capBox->pin->pAllocator, &ap, &actual); if (SUCCEEDED(hr)) - hr = IMemAllocator_Commit(out->pAllocator); + hr = IMemAllocator_Commit(capBox->pin->pAllocator); TRACE("Committing allocator: %x\n", hr); } @@ -549,14 +546,11 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) capBox->thread = 0; if (capBox->iscommitted) { - BaseOutputPin *out; HRESULT hr; capBox->iscommitted = FALSE; - out = (BaseOutputPin*)capBox->pOut; - - hr = IMemAllocator_Decommit(out->pAllocator); + hr = IMemAllocator_Decommit(capBox->pin->pAllocator); if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) WARN("Decommitting allocator: %x\n", hr); @@ -568,7 +562,7 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) return S_OK; } -Capture * qcap_driver_init( IPin *pOut, USHORT card ) +Capture * qcap_driver_init(BaseOutputPin *pin, USHORT card) { struct v4l2_capability caps = {{0}}; struct v4l2_format format = {0}; @@ -649,7 +643,7 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) device->outputheight = device->height = format.fmt.pix.height; device->swresize = FALSE; device->bitDepth = 24; - device->pOut = pOut; + device->pin = pin; device->fps = 3; device->stopped = FALSE; device->iscommitted = FALSE; @@ -665,7 +659,7 @@ error: #else -Capture * qcap_driver_init( IPin *pOut, USHORT card ) +Capture * qcap_driver_init(BaseOutputPin *pin, USHORT card) { static const char msg[] = "The v4l headers were not available at compile time,\n" diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 660f44d4171..83682b89597 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -44,14 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); -static const IBaseFilterVtbl VfwCapture_Vtbl; -static const IAMStreamConfigVtbl IAMStreamConfig_VTable; -static const IAMVideoProcAmpVtbl IAMVideoProcAmp_VTable; -static const IPersistPropertyBagVtbl IPersistPropertyBag_VTable; -static const IPinVtbl VfwPin_Vtbl; - -static HRESULT VfwPin_Construct( IBaseFilter *, LPCRITICAL_SECTION, IPin ** ); - typedef struct VfwCapture { BaseFilter filter; @@ -61,7 +53,8 @@ typedef struct VfwCapture BOOL init; Capture *driver_info; - IPin * pOutputPin; + BaseOutputPin source; + IKsPropertySet IKsPropertySet_iface; } VfwCapture; static inline VfwCapture *impl_from_BaseFilter(BaseFilter *iface) @@ -89,17 +82,9 @@ static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *ifa return CONTAINING_RECORD(iface, VfwCapture, IPersistPropertyBag_iface); } -/* VfwPin implementation */ -typedef struct VfwPinImpl -{ - BaseOutputPin pin; - IKsPropertySet IKsPropertySet_iface; - VfwCapture *parent; -} VfwPinImpl; - -static inline VfwPinImpl *impl_from_IPin(IPin *iface) +static inline VfwCapture *impl_from_IPin(IPin *iface) { - return CONTAINING_RECORD(iface, VfwPinImpl, pin.pin.IPin_iface); + return CONTAINING_RECORD(iface, VfwCapture, source.pin.IPin_iface); } static IPin *vfw_capture_get_pin(BaseFilter *iface, unsigned int index) @@ -109,13 +94,12 @@ static IPin *vfw_capture_get_pin(BaseFilter *iface, unsigned int index) if (index >= 1) return NULL; - return This->pOutputPin; + return &This->source.pin.IPin_iface; } static void vfw_capture_destroy(BaseFilter *iface) { VfwCapture *filter = impl_from_BaseFilter(iface); - IPin *peer = NULL; if (filter->init) { @@ -123,14 +107,13 @@ static void vfw_capture_destroy(BaseFilter *iface) qcap_driver_stop(filter->driver_info, &filter->filter.state); qcap_driver_destroy(filter->driver_info); } - IPin_ConnectedTo(filter->pOutputPin, &peer); - if (peer) + + if (filter->source.pin.pConnectedTo) { - IPin_Disconnect(peer); - IPin_Disconnect(filter->pOutputPin); - IPin_Release(peer); + IPin_Disconnect(filter->source.pin.pConnectedTo); + IPin_Disconnect(&filter->source.pin.IPin_iface); } - BaseOutputPin_Destroy(&impl_from_IPin(filter->pOutputPin)->pin); + strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); ObjectRefCount(FALSE); @@ -159,38 +142,6 @@ static const BaseFilterFuncTable BaseFuncTable = { .filter_query_interface = vfw_capture_query_interface, }; -IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *outer, HRESULT *phr) -{ - VfwCapture *pVfwCapture; - HRESULT hr; - - *phr = E_OUTOFMEMORY; - pVfwCapture = CoTaskMemAlloc( sizeof(VfwCapture) ); - if (!pVfwCapture) - return NULL; - - strmbase_filter_init(&pVfwCapture->filter, &VfwCapture_Vtbl, outer, &CLSID_VfwCapture, - (DWORD_PTR)(__FILE__ ": VfwCapture.csFilter"), &BaseFuncTable); - - pVfwCapture->IAMStreamConfig_iface.lpVtbl = &IAMStreamConfig_VTable; - pVfwCapture->IAMVideoProcAmp_iface.lpVtbl = &IAMVideoProcAmp_VTable; - pVfwCapture->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; - pVfwCapture->init = FALSE; - - hr = VfwPin_Construct(&pVfwCapture->filter.IBaseFilter_iface, - &pVfwCapture->filter.csFilter, &pVfwCapture->pOutputPin); - if (FAILED(hr)) - { - CoTaskMemFree(pVfwCapture); - return NULL; - } - TRACE("-- created at %p\n", pVfwCapture); - - ObjectRefCount(TRUE); - *phr = S_OK; - return &pVfwCapture->filter.IUnknown_inner; -} - /** IMediaFilter methods **/ static HRESULT WINAPI VfwCapture_Stop(IBaseFilter * iface) @@ -263,7 +214,6 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) { HRESULT hr; VfwCapture *This = impl_from_IAMStreamConfig(iface); - BasePin *pin; TRACE("(%p): %p->%p\n", iface, pmt, pmt ? pmt->pbFormat : NULL); @@ -281,19 +231,18 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) dump_AM_MEDIA_TYPE(pmt); - pin = (BasePin *)This->pOutputPin; - if (pin->pConnectedTo != NULL) + if (This->source.pin.pConnectedTo) { - hr = IPin_QueryAccept(pin->pConnectedTo, pmt); + hr = IPin_QueryAccept(This->source.pin.pConnectedTo, pmt); TRACE("Would accept: %d\n", hr); if (hr == S_FALSE) return VFW_E_INVALIDMEDIATYPE; } hr = qcap_driver_set_format(This->driver_info, pmt); - if (SUCCEEDED(hr) && This->filter.filterInfo.pGraph && pin->pConnectedTo ) + if (SUCCEEDED(hr) && This->filter.filterInfo.pGraph && This->source.pin.pConnectedTo) { - hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, This->pOutputPin); + hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, &This->source.pin.IPin_iface); if (SUCCEEDED(hr)) TRACE("Reconnection completed, with new media format..\n"); } @@ -454,14 +403,9 @@ PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag, if (SUCCEEDED(hr)) { - VfwPinImpl *pin; - - This->driver_info = qcap_driver_init( This->pOutputPin, - var.__VARIANT_NAME_1.__VARIANT_NAME_2.__VARIANT_NAME_3.ulVal ); + This->driver_info = qcap_driver_init(&This->source, V_I4(&var)); if (This->driver_info) { - pin = (VfwPinImpl *)This->pOutputPin; - pin->parent = This; This->init = TRUE; hr = S_OK; } @@ -493,30 +437,27 @@ static const IPersistPropertyBagVtbl IPersistPropertyBag_VTable = }; /* IKsPropertySet interface */ -static inline VfwPinImpl *impl_from_IKsPropertySet(IKsPropertySet *iface) +static inline VfwCapture *impl_from_IKsPropertySet(IKsPropertySet *iface) { - return CONTAINING_RECORD(iface, VfwPinImpl, IKsPropertySet_iface); + return CONTAINING_RECORD(iface, VfwCapture, IKsPropertySet_iface); } static HRESULT WINAPI KSP_QueryInterface(IKsPropertySet * iface, REFIID riid, void **ret_iface) { - VfwPinImpl *This = impl_from_IKsPropertySet(iface); - - return IPin_QueryInterface(&This->pin.pin.IPin_iface, riid, ret_iface); + VfwCapture *filter = impl_from_IKsPropertySet(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, riid, ret_iface); } static ULONG WINAPI KSP_AddRef(IKsPropertySet * iface) { - VfwPinImpl *This = impl_from_IKsPropertySet(iface); - - return IPin_AddRef(&This->pin.pin.IPin_iface); + VfwCapture *filter = impl_from_IKsPropertySet(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); } static ULONG WINAPI KSP_Release(IKsPropertySet * iface) { - VfwPinImpl *This = impl_from_IKsPropertySet(iface); - - return IPin_Release(&This->pin.pin.IPin_iface); + VfwCapture *filter = impl_from_IKsPropertySet(iface); + return IPin_Release(&filter->source.pin.IPin_iface); } static HRESULT WINAPI @@ -571,20 +512,20 @@ static const IKsPropertySetVtbl IKsPropertySet_VTable = KSP_QuerySupported }; -static inline VfwPinImpl *impl_from_BasePin(BasePin *pin) +static inline VfwCapture *impl_from_BasePin(BasePin *pin) { - return CONTAINING_RECORD(pin, VfwPinImpl, pin.pin); + return CONTAINING_RECORD(pin, VfwCapture, source.pin); } static HRESULT WINAPI VfwPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *mt) { - VfwPinImpl *filter = impl_from_BasePin(pin); - return qcap_driver_check_format(filter->parent->driver_info, mt); + VfwCapture *filter = impl_from_BasePin(pin); + return qcap_driver_check_format(filter->driver_info, mt); } static HRESULT WINAPI VfwPin_GetMediaType(BasePin *pin, int iPosition, AM_MEDIA_TYPE *pmt) { - VfwPinImpl *This = impl_from_BasePin(pin); + VfwCapture *filter = impl_from_BasePin(pin); AM_MEDIA_TYPE *vfw_pmt; HRESULT hr; @@ -593,7 +534,7 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *pin, int iPosition, AM_MEDIA_ if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; - hr = qcap_driver_get_format(This->parent->driver_info, &vfw_pmt); + hr = qcap_driver_get_format(filter->driver_info, &vfw_pmt); if (SUCCEEDED(hr)) { CopyMediaType(pmt, vfw_pmt); DeleteMediaType(vfw_pmt); @@ -627,45 +568,19 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_DecideAllocator, }; -static HRESULT -VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, - IPin ** ppPin ) -{ - static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; - PIN_INFO piOutput; - HRESULT hr; - - *ppPin = NULL; - - piOutput.dir = PINDIR_OUTPUT; - piOutput.pFilter = pBaseFilter; - lstrcpyW(piOutput.achName, wszOutputPinName); - - hr = BaseOutputPin_Construct(&VfwPin_Vtbl, sizeof(VfwPinImpl), &piOutput, &output_BaseOutputFuncTable, pCritSec, ppPin); - - if (SUCCEEDED(hr)) - { - VfwPinImpl *pPinImpl = (VfwPinImpl*)*ppPin; - pPinImpl->IKsPropertySet_iface.lpVtbl = &IKsPropertySet_VTable; - ObjectRefCount(TRUE); - } - - return hr; -} - static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { - VfwPinImpl *This = impl_from_IPin(iface); + VfwCapture *filter = impl_from_IPin(iface); TRACE("%s %p\n", debugstr_guid(riid), ppv); *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) - *ppv = This; + *ppv = &filter->source.pin.IPin_iface; else if (IsEqualIID(riid, &IID_IKsPropertySet)) - *ppv = &This->IKsPropertySet_iface; + *ppv = &filter->IKsPropertySet_iface; else if (IsEqualIID(riid, &IID_IAMStreamConfig)) - return IUnknown_QueryInterface((IUnknown *)This->parent, riid, ppv); + return IUnknown_QueryInterface(&filter->filter.IBaseFilter_iface, riid, ppv); if (*ppv) { @@ -680,16 +595,15 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * static HRESULT WINAPI VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { - VfwPinImpl *This = impl_from_IPin(iface); + VfwCapture *filter = impl_from_IPin(iface); AM_MEDIA_TYPE *pmt; HRESULT hr; - hr = qcap_driver_get_format(This->parent->driver_info, &pmt); + hr = qcap_driver_get_format(filter->driver_info, &pmt); if (SUCCEEDED(hr)) { hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); DeleteMediaType(pmt); } - TRACE("%p -- %x\n", This, hr); return hr; } @@ -721,3 +635,37 @@ static const IPinVtbl VfwPin_Vtbl = BaseOutputPinImpl_EndFlush, BasePinImpl_NewSegment }; + +IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *outer, HRESULT *phr) +{ + static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; + VfwCapture *object; + PIN_INFO pin_info; + + if (!(object = CoTaskMemAlloc(sizeof(*object)))) + { + *phr = E_OUTOFMEMORY; + return NULL; + } + + strmbase_filter_init(&object->filter, &VfwCapture_Vtbl, outer, &CLSID_VfwCapture, + (DWORD_PTR)(__FILE__ ": VfwCapture.csFilter"), &BaseFuncTable); + + object->IAMStreamConfig_iface.lpVtbl = &IAMStreamConfig_VTable; + object->IAMVideoProcAmp_iface.lpVtbl = &IAMVideoProcAmp_VTable; + object->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; + object->init = FALSE; + + pin_info.dir = PINDIR_OUTPUT; + pin_info.pFilter = &object->filter.IBaseFilter_iface; + lstrcpyW(pin_info.achName, source_name); + strmbase_source_init(&object->source, &VfwPin_Vtbl, &pin_info, + &output_BaseOutputFuncTable, &object->filter.csFilter); + + object->IKsPropertySet_iface.lpVtbl = &IKsPropertySet_VTable; + + TRACE("Created VFW capture filter %p.\n", object); + ObjectRefCount(TRUE); + *phr = S_OK; + return &object->filter.IUnknown_inner; +} -- 2.22.0

1 4

[PATCH] mshtml: Add IDocumentRange stub.
by Nikolay Sivov 25 Jun '19

25 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 83 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 2 + include/mshtmdid.h | 3 ++ include/mshtml.idl | 16 +++++++ 5 files changed, 106 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 87ee8e6b68..6ea58e6cef 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5159,6 +5159,85 @@ static const IDisplayServicesVtbl DisplayServicesVtbl = { DisplayServices_HasFlowLayout }; +/********************************************************** + * IDocumentRange implementation + */ +static inline HTMLDocument *impl_from_IDocumentRange(IDocumentRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDocumentRange_iface); +} + +static HRESULT WINAPI DocumentRange_QueryInterface(IDocumentRange *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI DocumentRange_AddRef(IDocumentRange *iface) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_addref(This); +} + +static ULONG WINAPI DocumentRange_Release(IDocumentRange *iface) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_release(This); +} + +static HRESULT WINAPI DocumentRange_GetTypeInfoCount(IDocumentRange *iface, UINT *pctinfo) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DocumentRange_GetTypeInfo(IDocumentRange *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DocumentRange_GetIDsOfNames(IDocumentRange *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI DocumentRange_Invoke(IDocumentRange *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMRange **p) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IDocumentRangeVtbl DocumentRangeVtbl = { + DocumentRange_QueryInterface, + DocumentRange_AddRef, + DocumentRange_Release, + DocumentRange_GetTypeInfoCount, + DocumentRange_GetTypeInfo, + DocumentRange_GetIDsOfNames, + DocumentRange_Invoke, + DocumentRange_createRange, +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5243,6 +5322,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IMarkupContainer_iface; else if(IsEqualGUID(&IID_IDisplayServices, riid)) *ppv = &This->IDisplayServices_iface; + else if(IsEqualGUID(&IID_IDocumentRange, riid)) + *ppv = &This->IDocumentRange_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5294,6 +5375,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; doc->IDisplayServices_iface.lpVtbl = &DisplayServicesVtbl; + doc->IDocumentRange_iface.lpVtbl = &DocumentRangeVtbl; doc->outer_unk = outer; doc->dispex = dispex; @@ -5565,6 +5647,7 @@ static const tid_t HTMLDocumentNode_iface_tids[] = { IHTMLDocument2_tid, IHTMLDocument4_tid, IHTMLDocument5_tid, + IDocumentRange_tid, IDocumentSelector_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6bfce89698..ef56f1d23d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -144,6 +144,7 @@ typedef struct EventTarget EventTarget; XIID(IDOMMouseEvent) \ XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ + XIID(IDocumentRange) \ XIID(IDocumentSelector) \ XIID(IElementSelector) \ XIID(IElementTraversal) \ @@ -626,6 +627,7 @@ struct HTMLDocument { IMarkupServices IMarkupServices_iface; IMarkupContainer IMarkupContainer_iface; IDisplayServices IDisplayServices_iface; + IDocumentRange IDocumentRange_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f6eebbc18b..586df7d8a5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -171,6 +171,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentRange, &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IDisplayServices, @@ -190,6 +191,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentRange, &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IDisplayServices, diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 82055f690b..87b8877f4e 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4711,4 +4711,7 @@ #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTOR DISPID_OMDOCUMENT+105 #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL DISPID_OMDOCUMENT+106 +/* IDocumentRange */ +#define DISPID_IDOCUMENTRANGE_CREATERANGE DISPID_OMDOCUMENT+111 + #endif /* __MSHTMDID_H__ */ diff --git a/include/mshtml.idl b/include/mshtml.idl index f7ebd9e71a..aea888b2b8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -23451,6 +23451,19 @@ interface IDocumentSelector : IDispatch [out, retval] IHTMLDOMChildrenCollection **pel); } +[ + odl, + oleautomation, + dual, + uuid(305104af-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDocumentRange : IDispatch +{ + [id(DISPID_IDOCUMENTRANGE_CREATERANGE)] + HRESULT createRange( + [out, retval] IHTMLDOMRange **ppIHTMLDOMRange); +} + /***************************************************************************** * DispHTMLDocument dispinterface */ @@ -24058,6 +24071,9 @@ methods: [id(DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL)] IHTMLDOMChildrenCollection *querySelectorAll([in] BSTR v); + + [id(DISPID_IDOCUMENTRANGE_CREATERANGE)] + IHTMLDOMRange *createRange(); } /***************************************************************************** -- 2.20.1

3 2

[website] German translation for release 4.11
by Julian Rüger 25 Jun '19

25 Jun '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.10
by Julian Rüger 25 Jun '19

25 Jun '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

Re: Profiling application under Wine
by Hin-Tak Leung 25 Jun '19

25 Jun '19

Have you tried winetricks dotnet2 (if your application can run under dotnet2)? I have known quite a few dot net issues where running under wine-mono is a much slower than native dotnet2. dotnet2 runs quite okay on wine, and a lot faster, etc than wine-mono. There are some issues with running microsoft dotnet 3 and 4 under wine, so YMMV. -------------------------------------------- On Mon, 24/6/19, Chambers, Matthew <matt.chambers42(a)gmail.com> wrote: Hi all, I have a scientific application which runs much slower under Wine than on Windows for one type of data (read with a vendor's closed-source .NET DLLs). For most other types of data (read with other vendors' closed-source DLLs, some .NET, some not), the performance is nearly the same. I'm trying to understand why. I have run sysprof on both types of data trying to understand the difference, but without the Windows symbols I don't really understand what I'm looking at. I also ran perf and generated these interactive flame graphs. Perf from the slow data vendor (Thermo): Perf from one of the fast data vendor (Bruker):

2 1

[PATCH v2 1/6] dxgi: Remove wined3d_swapchain dependency from d3d11_swapchain_ResizeTarget().
by Conor McCarthy 25 Jun '19

25 Jun '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/output.c | 61 ++++++++++++++++++++++++++++++++++++++ dlls/dxgi/swapchain.c | 62 ++++++++++++++++++++++++++++++++++++--- dlls/wined3d/swapchain.c | 58 ------------------------------------ dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 6 files changed, 121 insertions(+), 65 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 553eace..9cb43b8 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -148,6 +148,8 @@ struct dxgi_output }; HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *target_mode_desc) DECLSPEC_HIDDEN; +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode_desc) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 123dee8..f64f425 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -539,3 +539,64 @@ HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **ou dxgi_output_init(*output, adapter); return S_OK; } + +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *target_mode_desc) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct dxgi_output *target; + struct wined3d *wined3d; + HRESULT hr; + + target = impl_from_IDXGIOutput4((IDXGIOutput4 *)iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_display_mode_from_dxgi(&wined3d_mode, target_mode_desc); + + if (FAILED(hr = dxgi_output_find_closest_matching_mode(target, &wined3d_mode, NULL))) + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + else /* Copy the actual mode back to the caller */ + dxgi_mode_from_wined3d(target_mode_desc, &wined3d_mode); + + wined3d_mutex_lock(); + hr = wined3d_set_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + return S_OK; +} + +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode_desc) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct dxgi_output *target; + struct wined3d *wined3d; + HRESULT hr; + + target = impl_from_IDXGIOutput4((IDXGIOutput4 *)iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_mutex_lock(); + hr = wined3d_get_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode, NULL); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to get display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + dxgi_mode_from_wined3d(mode_desc, &wined3d_mode); + + TRACE("Returning %s.\n", debug_dxgi_mode(mode_desc)); + + return S_OK; +} diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4f01d9c..b060a30 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -501,11 +501,65 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeBuffers(IDXGISwapChain1 * return hr; } +static HRESULT dxgi_resize_target(IDXGISwapChain1 *iface, + const DXGI_SWAP_CHAIN_DESC *desc, const DXGI_MODE_DESC *mode) +{ + RECT original_window_rect, window_rect; + HWND window = desc->OutputWindow; + HRESULT hr; + + TRACE("iface %p, desc %p, mode %p.\n", iface, desc, mode); + + if (desc->Windowed) + { + SetRect(&window_rect, 0, 0, mode->Width, mode->Height); + AdjustWindowRectEx(&window_rect, + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); + SetRect(&window_rect, 0, 0, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); + GetWindowRect(window, &original_window_rect); + OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + } + else + { + DXGI_MODE_DESC actual_mode; + IDXGIOutput *target; + + if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &target))) + { + WARN("Failed to get output, hr %#x.\n", hr); + return hr; + } + + if (desc->Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + { + actual_mode = *mode; + hr = dxgi_output_set_display_mode(target, &actual_mode); + } + else + { + hr = dxgi_output_get_display_mode(target, &actual_mode); + } + + IDXGIOutput_Release(target); + + if(FAILED(hr)) + return hr; + + SetRect(&window_rect, 0, 0, actual_mode.Width, actual_mode.Height); + } + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *iface, const DXGI_MODE_DESC *target_mode_desc) { - struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_display_mode mode; + struct DXGI_SWAP_CHAIN_DESC swap_chain_desc; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); @@ -520,9 +574,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i if (target_mode_desc->Scaling) FIXME("Ignoring scaling %#x.\n", target_mode_desc->Scaling); - wined3d_display_mode_from_dxgi(&mode, target_mode_desc); + d3d11_swapchain_GetDesc(iface, &swap_chain_desc); - return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); + return dxgi_resize_target(iface, &swap_chain_desc, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8d6306e..c6bab5a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1364,64 +1364,6 @@ static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swap return WINED3D_OK; } -HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, - const struct wined3d_display_mode *mode) -{ - struct wined3d_display_mode actual_mode; - RECT original_window_rect, window_rect; - struct wined3d_device *device; - HWND window; - HRESULT hr; - - TRACE("swapchain %p, mode %p.\n", swapchain, mode); - - wined3d_mutex_lock(); - - device = swapchain->device; - window = swapchain->device_window; - - if (swapchain->desc.windowed) - { - SetRect(&window_rect, 0, 0, mode->width, mode->height); - AdjustWindowRectEx(&window_rect, - GetWindowLongW(window, GWL_STYLE), FALSE, - GetWindowLongW(window, GWL_EXSTYLE)); - SetRect(&window_rect, 0, 0, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); - GetWindowRect(window, &original_window_rect); - OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); - } - else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) - { - actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) - { - wined3d_mutex_unlock(); - return hr; - } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - else - { - if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, - &actual_mode, NULL))) - { - ERR("Failed to get display mode, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - - wined3d_mutex_unlock(); - - MoveWindow(window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); - - return WINED3D_OK; -} - HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 59f99c9..904bb34 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -274,7 +274,6 @@ @ cdecl wined3d_swapchain_incref(ptr) @ cdecl wined3d_swapchain_present(ptr ptr ptr ptr long long) @ cdecl wined3d_swapchain_resize_buffers(ptr long long long long long long) -@ cdecl wined3d_swapchain_resize_target(ptr ptr) @ cdecl wined3d_swapchain_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_set_gamma_ramp(ptr long ptr) @ cdecl wined3d_swapchain_set_palette(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abef3f0..d1d3ca4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2690,8 +2690,6 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, c HRESULT __cdecl wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality); -HRESULT __cdecl wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, - const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, -- 2.21.0

4 16

[PATCH] ntoskrnl.exe: Implement KeBugCheck and KeBugCheckEx.
by Jacek Caban 25 Jun '19

25 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45656 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 +++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- include/ddk/ntddk.h | 1 + include/ddk/wdm.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-)

1 0

[PATCH vkd3d 2/2] tests: Print adapter name on Windows.
by Józef Kucia 25 Jun '19

25 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Using vkd3d-common in tests requires some work. --- tests/d3d12_crosstest.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 22844ab398e7..fbc0e3de795d 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -297,9 +297,11 @@ static ID3D12Device *create_device(void) static void init_adapter_info(void) { + char name[MEMBER_SIZE(DXGI_ADAPTER_DESC, Description)]; IDXGIAdapter *dxgi_adapter; DXGI_ADAPTER_DESC desc; IUnknown *adapter; + unsigned int i; HRESULT hr; if (!(adapter = create_adapter())) @@ -312,7 +314,12 @@ static void init_adapter_info(void) hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); - trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + /* FIXME: Use debugstr_w(). */ + for (i = 0; i < ARRAY_SIZE(desc.Description) && isprint(desc.Description[i]); ++i) + name[i] = desc.Description[i]; + name[min(i, ARRAY_SIZE(name) - 1)] = '\0'; + + trace("Adapter: %s, %04x:%04x.\n", name, desc.VendorId, desc.DeviceId); if (desc.VendorId == 0x1414 && desc.DeviceId == 0x008c) { -- 2.21.0

2 1

[PATCH vkd3d 1/2] vkd3d-shader: Avoid multiple PrimitiveId declarations in hull shaders.
by Józef Kucia 25 Jun '19

25 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 73d266195f5d..ee409539ac42 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4047,6 +4047,7 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * const struct vkd3d_shader_register *reg = &dst->reg; const struct vkd3d_spirv_builtin *builtin; struct vkd3d_symbol reg_symbol; + struct rb_entry *entry; uint32_t input_id; assert(!reg->idx[0].rel_addr); @@ -4059,9 +4060,13 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * return; } + /* vPrim may be declared in multiple hull shader phases. */ + vkd3d_symbol_make_register(&reg_symbol, reg); + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + return; + input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, 0); - vkd3d_symbol_make_register(&reg_symbol, reg); vkd3d_symbol_set_register_info(&reg_symbol, input_id, SpvStorageClassInput, builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); reg_symbol.info.reg.is_aggregate = builtin->spirv_array_size; -- 2.21.0

2 1

[PATCH] d3d9: Implement d3d9_device_CreateRenderTargetEx().
by Henri Verbeet 25 Jun '19

25 Jun '19

From: Justin Martin <jaming(a)protonmail.com> Signed-off-by: Justin Martin <jaming(a)protonmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This had a Wine-Bug reference to bug 45354, but there's no indication there that this function even gets called. This supersedes patch 167138. dlls/d3d9/device.c | 21 ++++++++++++++++++--- dlls/d3d9/tests/d3d9ex.c | 5 ++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9fbdcebf075..e2da02b35dc 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4059,16 +4059,31 @@ static HRESULT WINAPI d3d9_device_CreateRenderTargetEx(IDirect3DDevice9Ex *iface UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { - FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " - "lockable %#x, surface %p, shared_handle %p, usage %#x stub!\n", + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + unsigned int access = WINED3D_RESOURCE_ACCESS_GPU; + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " + "lockable %#x, surface %p, shared_handle %p, usage %#x.\n", iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle, usage); *surface = NULL; + + if (usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)) + { + WARN("Invalid usage %#x.\n", usage); + return D3DERR_INVALIDCALL; + } + if (shared_handle) FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - return E_NOTIMPL; + if (lockable) + access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + + return d3d9_device_create_surface(device, 0, wined3dformat_from_d3dformat(format), + multisample_type, multisample_quality, usage & WINED3DUSAGE_MASK, + WINED3D_BIND_RENDER_TARGET, access, width, height, NULL, surface); } static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurfaceEx(IDirect3DDevice9Ex *iface, diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 306241a7118..354a51d85a1 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3932,7 +3932,7 @@ static void test_format_unknown(void) iface = (void *)0xdeadbeef; hr = IDirect3DDevice9Ex_CreateRenderTargetEx(device, 64, 64, D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, FALSE, (IDirect3DSurface9 **)&iface, NULL, 0); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); ok(!iface, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; @@ -4372,8 +4372,7 @@ static void test_resource_access(void) case SURFACE_RT_EX: hr = IDirect3DDevice9Ex_CreateRenderTargetEx(device, 16, 16, format, D3DMULTISAMPLE_NONE, 0, tests[j].pool != D3DPOOL_DEFAULT, &surface, NULL, tests[j].usage); - todo_wine - ok(hr == (tests[j].format == FORMAT_COLOUR && !tests[j].usage ? D3D_OK : D3DERR_INVALIDCALL), + ok(hr == (tests[j].format == FORMAT_COLOUR && !tests[j].usage ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); if (FAILED(hr)) continue; -- 2.11.0

2 1

[PATCH] wined3d: Store the cursor texture in a local variable in swapchain_gl_present().
by Zebediah Figura 25 Jun '19

25 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47392 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/swapchain.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8d6306eee66..b75aead1e83 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -428,9 +428,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; + struct wined3d_texture *logo_texture, *cursor_texture; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - struct wined3d_texture *logo_texture; struct wined3d_context *context; BOOL render_to_fbo; @@ -456,8 +456,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); } - if (swapchain->device->bCursorVisible && swapchain->device->cursor_texture - && !swapchain->device->hardwareCursor) + if ((cursor_texture = swapchain->device->cursor_texture) + && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) { RECT dst_rect = { @@ -468,9 +468,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, }; RECT src_rect = { - 0, 0, - swapchain->device->cursor_texture->resource.width, - swapchain->device->cursor_texture->resource.height + 0, 0, cursor_texture->resource.width, cursor_texture->resource.height }; const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; @@ -479,9 +477,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) - wined3d_texture_blt(back_buffer, 0, &dst_rect, - swapchain->device->cursor_texture, 0, &src_rect, - WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); + wined3d_texture_blt(back_buffer, 0, &dst_rect, cursor_texture, 0, + &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } TRACE("Presenting DC %p.\n", context_gl->dc); -- 2.20.1

2 1

[PATCH 1/3] mfplat: Improve PROPVARIANT arguments traces.
by Nikolay Sivov 25 Jun '19

25 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mfplat_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 57e4211e40..6418afcb97 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -136,7 +136,7 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->u.dblVal); case VT_CLSID: - return wine_dbg_sprintf("%p {VT_CLSID: %s}", v, debugstr_guid(v->u.puuid)); + return wine_dbg_sprintf("%p {VT_CLSID: %s}", v, debugstr_mf_guid(v->u.puuid)); case VT_LPWSTR: return wine_dbg_sprintf("%p {VT_LPWSTR: %s}", v, wine_dbgstr_w(v->u.pwszVal)); case VT_VECTOR | VT_UI1: -- 2.20.1

1 2

[PATCH v4 3/3] gdi32: Also accept "\\.\DISPLAY<n>" devices names with <n> other than 1 as display devices.
by Zhiyi Zhang 25 Jun '19

25 Jun '19

From: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 96c2f1f129..dcbc480376 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -135,6 +135,32 @@ static const struct gdi_dc_funcs *get_display_driver(void) } +/********************************************************************** + * is_display_device + */ +static BOOL is_display_device( LPCWSTR name ) +{ + static const WCHAR display_deviceW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + const WCHAR *p = name; + + if (strncmpiW( name, display_deviceW, sizeof(display_deviceW) / sizeof(WCHAR) )) + return FALSE; + + p += sizeof(display_deviceW) / sizeof(WCHAR); + + if (!isdigitW( *p++ )) + return FALSE; + + for (; *p; p++) + { + if (!isdigitW( *p )) + return FALSE; + } + + return TRUE; +} + + /********************************************************************** * DRIVER_load_driver */ @@ -143,10 +169,9 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) HMODULE module; struct graphics_driver *driver, *new_driver; static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; - static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return get_display_driver(); + if (!strcmpiW( name, displayW ) || is_display_device( name )) return get_display_driver(); if ((module = GetModuleHandleW( name ))) { @@ -883,13 +908,12 @@ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) { static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; static const WCHAR devicesW[] = { 'd','e','v','i','c','e','s',0 }; - static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static const WCHAR empty_strW[] = { 0 }; WCHAR *p; /* display is a special case */ if (!strcmpiW( device, displayW ) || - !strcmpiW( device, display1W )) + is_display_device( device )) { lstrcpynW( driver, displayW, size ); return TRUE; -- 2.20.1

2 1

[PATCH v4 1/3] winex11.drv: Use generic EnumDisplayMonitors.
by Zhiyi Zhang 25 Jun '19

25 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v4: Fix test failures when window station has no visible surfaces. Supersede 167067~167069 dlls/user32/driver.c | 10 ------ dlls/user32/sysparams.c | 58 +++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 2 ++ dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/display.c | 5 +++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 15 +------- 8 files changed, 69 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..bf600708ed 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -354,16 +354,6 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode return DISP_CHANGE_FAILED; } -static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - RECT r = {0, 0, 640, 480}; - - TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); - - proc(NULLDRV_DEFAULT_HMONITOR, hdc, &r, lp); - return TRUE; -} - static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) { return FALSE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4d644b9edf..17becff651 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -251,6 +251,9 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); + +#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) /* Strings for monitor functions */ static const WCHAR DEFAULT_ADAPTER_NAME[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; @@ -3815,6 +3818,61 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, #endif } +BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + USEROBJECTFLAGS flags; + HWINSTA winstation; + BOOL success = FALSE; + HDEVINFO devinfo; + RECT monitor_rect; + DWORD state_flags; + HANDLE mutex; + DWORD type; + DWORD i = 0; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + /* Use SetupAPI to get monitors only if window station has visible display surfaces */ + winstation = GetProcessWindowStation(); + if (GetUserObjectInformationA( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && (flags.dwFlags & WSF_VISIBLE)) + { + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) + { + /* Inactive monitors don't get enumerated */ + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&state_flags, sizeof(state_flags), NULL, 0 ) + || !(state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + + if (SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0 )) + { + if (!proc( (HMONITOR)(UINT_PTR)i, hdc, &monitor_rect, lp )) + { + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + return FALSE; + } + success = TRUE; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + } + + /* Fallback to report one monitor if using SetupAPI failed */ + if (!success) + { + RECT default_rect = {0, 0, 640, 480}; + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + return FALSE; + } + return TRUE; +} + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 514cf6753f..a503ebe4db 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -122,6 +122,8 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; + struct received_message_info; enum user_obj_type diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a0495c44b1..ecbcd6b381 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -304,6 +304,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) resize_data.old_virtual_rect = get_virtual_screen_rect(); xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( TRUE ); resize_data.new_virtual_rect = get_virtual_screen_rect(); if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index ce2c568ad8..d6969b0cfe 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; @@ -276,6 +277,10 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) goto done; + /* RcMonitor */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 614f0b90f4..5b00a5dc5d 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -20,7 +20,6 @@ @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx -@ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ed5e268391..a6b07699a7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -695,6 +695,8 @@ struct x11drv_monitor { /* Name */ WCHAR name[128]; + /* RcMonitor in MONITORINFO struct */ + RECT rc_monitor; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index e401531450..c8fa63f459 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -321,6 +321,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * && !IsRectEmpty( &monitors[first].rcMonitor ))) { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); + monitor[index].rc_monitor = monitors[i].rcMonitor; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -410,17 +411,3 @@ BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); return TRUE; } - - -/*********************************************************************** - * X11DRV_EnumDisplayMonitors (X11DRV.@) - */ -BOOL CDECL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - int i; - - for (i = 0; i < nb_monitors; i++) - if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) return FALSE; - - return TRUE; -} -- 2.20.1

2 1

[PATCH v4 2/3] winex11.drv: Use generic GetMonitorInfo.
by Zhiyi Zhang 25 Jun '19

25 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 23 ------------- dlls/user32/sysparams.c | 54 +++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 1 + dlls/winex11.drv/display.c | 12 +++++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 40 ++--------------------- 7 files changed, 72 insertions(+), 61 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index bf600708ed..921ea2c962 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -197,8 +197,6 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ -#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) - static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { return 0; @@ -359,27 +357,6 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM return FALSE; } -static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) -{ - RECT r = {0, 0, 640, 480}; - static const WCHAR device[] = {'W','i','n','D','i','s','c',0}; - - TRACE("(%p, %p)\n", handle, info); - - if (handle != NULLDRV_DEFAULT_HMONITOR) - { - SetLastError(ERROR_INVALID_MONITOR_HANDLE); - return FALSE; - } - - info->rcMonitor = r; - info->rcWork = r; - info->dwFlags = MONITORINFOF_PRIMARY; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); - return TRUE; -} - static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) { return TRUE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 17becff651..12225a6551 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -252,6 +252,8 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); #define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) @@ -3720,6 +3722,58 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return MonitorFromRect( &rect, dwFlags ); } +BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR adapter_name[CCHDEVICENAME]; + HDEVINFO devinfo; + DWORD error = 0; + HANDLE mutex; + DWORD type; + BOOL ret; + + TRACE("(%p, %p)\n", handle, info); + + /* Fallback to report one monitor */ + if (handle == NULLDRV_DEFAULT_HMONITOR) + { + RECT default_rect = {0, 0, 640, 480}; + info->rcMonitor = default_rect; + info->rcWork = default_rect; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, DEFAULT_ADAPTER_NAME ); + return TRUE; + } + + /* Use SetupAPI to get monitors */ + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) + { + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&info->rcMonitor, sizeof(info->rcMonitor), NULL, 0 ); + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, + (BYTE *)&info->rcWork, sizeof(info->rcWork), NULL, 0 ); + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, + (BYTE *)adapter_name, sizeof(adapter_name), NULL, 0 ); + info->dwFlags = !lstrcmpW( DEFAULT_ADAPTER_NAME, adapter_name ) ? MONITORINFOF_PRIMARY : 0; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, adapter_name ); + ret = TRUE; + } + else + { + error = ERROR_INVALID_MONITOR_HANDLE; + ret = FALSE; + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + if (error) + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); + return ret; +} + /*********************************************************************** * GetMonitorInfoA (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a503ebe4db..c11aae707c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -123,6 +123,7 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) DECLSPEC_HIDDEN; struct received_message_info; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index d6969b0cfe..f5ef65f428 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -42,12 +42,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', @@ -281,6 +284,15 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; + /* RcWork */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) + goto done; + /* Adapter name */ + sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, + (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 5b00a5dc5d..c0e24d8fe8 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -21,7 +21,6 @@ @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx -@ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow @ cdecl DestroyWindow(long) X11DRV_DestroyWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a6b07699a7..9ab948f724 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -697,6 +697,8 @@ struct x11drv_monitor WCHAR name[128]; /* RcMonitor in MONITORINFO struct */ RECT rc_monitor; + /* RcWork in MONITORINFO struct */ + RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c8fa63f459..75ef3a2a99 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -57,18 +57,6 @@ static inline MONITORINFOEXW *get_primary(void) return &monitors[idx]; } -static inline HMONITOR index_to_monitor( int index ) -{ - return (HMONITOR)(UINT_PTR)(index + 1); -} - -static inline int monitor_to_index( HMONITOR handle ) -{ - UINT_PTR index = (UINT_PTR)handle; - if (index < 1 || index > nb_monitors) return -1; - return index - 1; -} - static void query_work_area( RECT *rc_work ) { Atom type; @@ -154,8 +142,6 @@ static int query_screens(void) monitors[i].dwFlags = 0; if (!IntersectRect( &monitors[i].rcWork, &rc_work, &monitors[i].rcMonitor )) monitors[i].rcWork = monitors[i].rcMonitor; - /* FIXME: using the same device name for all monitors for now */ - lstrcpyW( monitors[i].szDevice, default_monitor.szDevice ); } get_primary()->dwFlags |= MONITORINFOF_PRIMARY; @@ -322,6 +308,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); monitor[index].rc_monitor = monitors[i].rcMonitor; + monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -371,8 +358,8 @@ void xinerama_init( unsigned int width, unsigned int height ) OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); UnionRect( &virtual_screen_rect, &virtual_screen_rect, &monitors[i].rcMonitor ); - TRACE( "monitor %p: %s work %s%s\n", - index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), + TRACE( "monitor 0x%x: %s work %s%s\n", + i, wine_dbgstr_rect(&monitors[i].rcMonitor), wine_dbgstr_rect(&monitors[i].rcWork), (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } @@ -390,24 +377,3 @@ void xinerama_init( unsigned int width, unsigned int height ) TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } - - -/*********************************************************************** - * X11DRV_GetMonitorInfo (X11DRV.@) - */ -BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) -{ - int i = monitor_to_index( handle ); - - if (i == -1) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - info->rcMonitor = monitors[i].rcMonitor; - info->rcWork = monitors[i].rcWork; - info->dwFlags = monitors[i].dwFlags; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); - return TRUE; -} -- 2.20.1

1 0

[PATCH v3] d3d9: Implement d3d9_device_CreateRenderTargetEx.
by Jaming 25 Jun '19

25 Jun '19

Empty Message

2 1

[PATCH] wininet: Allow to set INTERNET_OPTION_HTTP_DECODING on sessions and connections.
by Alistair Leslie-Hughes 25 Jun '19

25 Jun '19

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 9 ++---- dlls/wininet/internet.c | 17 +++++++++-- dlls/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 62 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9244393633..538fc2bf6b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2343,11 +2343,6 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, if (!(req->session->appInfo->proxyPassword = heap_strdupW(buffer))) return ERROR_OUTOFMEMORY; return ERROR_SUCCESS; - case INTERNET_OPTION_HTTP_DECODING: - if(size != sizeof(BOOL)) - return ERROR_INVALID_PARAMETER; - req->decoding = *(BOOL*)buffer; - return ERROR_SUCCESS; } return INET_SetOption(hdr, option, buffer, size); @@ -2917,7 +2912,7 @@ static DWORD set_content_length(http_request_t *request) request->contentLength = ~0u; } - if(request->decoding) { + if(request->hdr.decoding) { int encoding_idx; static const WCHAR deflateW[] = {'d','e','f','l','a','t','e',0}; @@ -3303,6 +3298,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->hdr.htype = WH_HHTTPREQ; request->hdr.dwFlags = dwFlags; request->hdr.dwContext = dwContext; + request->hdr.decoding = session->hdr.decoding; request->contentLength = ~0u; request->netconn_stream.data_stream.vtbl = &netconn_stream_vtbl; @@ -5803,6 +5799,7 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->hdr.dwFlags = dwFlags; session->hdr.dwContext = dwContext; session->hdr.dwInternalFlags |= dwInternalFlags; + session->hdr.decoding = hIC->hdr.decoding; WININET_AddRef( &hIC->hdr ); session->appInfo = hIC; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7294241b67..20a6e10659 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2865,10 +2865,21 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, FIXME("Option INTERNET_OPTION_DISABLE_AUTODIAL; STUB\n"); break; case INTERNET_OPTION_HTTP_DECODING: - FIXME("INTERNET_OPTION_HTTP_DECODING; STUB\n"); - SetLastError(ERROR_INTERNET_INVALID_OPTION); - ret = FALSE; + { + if (!lpwhh) + { + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + return FALSE; + } + if (!lpBuffer || dwBufferLength != sizeof(BOOL)) + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } + else + lpwhh->decoding = *(BOOL *)lpBuffer; break; + } case INTERNET_OPTION_COOKIES_3RD_PARTY: FIXME("INTERNET_OPTION_COOKIES_3RD_PARTY; STUB\n"); SetLastError(ERROR_INTERNET_INVALID_OPTION); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 8d4266a9be..f712fb6b64 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -281,6 +281,7 @@ struct _object_header_t ULONG ErrorMask; DWORD dwInternalFlags; LONG refs; + BOOL decoding; INTERNET_STATUS_CALLBACK lpfnStatusCB; struct list entry; struct list children; @@ -377,7 +378,6 @@ typedef struct DWORD read_size; /* valid data size in read_buf */ BYTE read_buf[READ_BUFFER_SIZE]; /* buffer for already read but not returned data */ - BOOL decoding; data_stream_t *data_stream; netconn_stream_t netconn_stream; } http_request_t; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c8a2796322..c91b8063f2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3696,6 +3696,68 @@ static void test_cache_read_gzipped(int port) InternetCloseHandle(con); InternetCloseHandle(ses); + /* Decompression doesn't work while reading from cache */ + test_cache_gzip = 0; + sprintf(cache_url, cache_url_fmt, port, get_gzip); + DeleteUrlCacheEntryA(cache_url); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + ret = TRUE; + ret = InternetSetOptionA(ses, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed with error %u\n", GetLastError()); + + req = HttpOpenRequestA(con, NULL, get_gzip, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) + size += read; + ok(size == 10, "read %d bytes of data\n", size); + buf[size] = 0; + ok(!strncmp(buf, content, size), "incorrect page content: %s\n", buf); + InternetCloseHandle(req); + + InternetCloseHandle(con); + InternetCloseHandle(ses); + + /* Decompression doesn't work while reading from cache */ + test_cache_gzip = 0; + sprintf(cache_url, cache_url_fmt, port, get_gzip); + DeleteUrlCacheEntryA(cache_url); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed with error %u\n", GetLastError()); + + ret = TRUE; + ret = InternetSetOptionA(con, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + req = HttpOpenRequestA(con, NULL, get_gzip, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) + size += read; + ok(size == 10, "read %d bytes of data\n", size); + buf[size] = 0; + ok(!strncmp(buf, content, size), "incorrect page content: %s\n", buf); + InternetCloseHandle(req); + + InternetCloseHandle(con); + InternetCloseHandle(ses); + DeleteUrlCacheEntryA(cache_url); } -- 2.17.1

1 0

[PATCH v2] d3d9: Implement d3d9_device_CreateRenderTargetEx.
by Jaming 25 Jun '19

25 Jun '19

Empty Message

2 1

d3d9: Implement d3d9_device_CreateRenderTargetEx.
by Jaming 25 Jun '19

25 Jun '19

Empty Message

2 1

[PATCH 5/7] dxgi/tests: Add more IDXGISwapChain_Present() tests.
by Henri Verbeet 25 Jun '19

25 Jun '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166451. dlls/dxgi/tests/dxgi.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 69c868cf3b4..51ff4405b4e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -468,6 +468,30 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ } } +#define wait_fullscreen_state(a, b, c) wait_fullscreen_state_(__LINE__, a, b, c) +static void wait_fullscreen_state_(unsigned int line, IDXGISwapChain *swapchain, BOOL expected, BOOL todo) +{ + static const unsigned int wait_timeout = 2000; + static const unsigned int wait_step = 100; + unsigned int total_time = 0; + HRESULT hr; + BOOL state; + + while (total_time < wait_timeout) + { + state = !expected; + if (FAILED(hr = IDXGISwapChain_GetFullscreenState(swapchain, &state, NULL))) + break; + if (state == expected) + break; + Sleep(wait_step); + total_time += wait_step; + } + ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#x.\n", hr); + todo_wine_if(todo) ok_(__FILE__, line)(state == expected, + "Got unexpected state %#x, expected %#x.\n", state, expected); +} + static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -3997,9 +4021,12 @@ static void test_swapchain_parameters(void) static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) { + static const DWORD flags[] = {0, DXGI_PRESENT_TEST}; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; + IDXGIOutput *output; + BOOL fullscreen; unsigned int i; ULONG refcount; HRESULT hr; @@ -4034,6 +4061,201 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + HWND occluding_window = CreateWindowA("static", "occluding_window", + WS_POPUP | WS_VISIBLE, 0, 0, 400, 200, NULL, NULL, NULL, NULL); + + /* Another window covers the swapchain window. Not reported as occluded. */ + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Minimised window. */ + ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + todo_wine_if(!is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), + "Test %u: Got unexpected hr %#x.\n", i, hr); + ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL); + + /* Hidden window. */ + ShowWindow(swapchain_desc.OutputWindow, SW_HIDE); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ShowWindow(swapchain_desc.OutputWindow, SW_SHOW); + DestroyWindow(occluding_window); + + /* Test that IDXGIOutput_ReleaseOwnership() makes the swapchain exit + * fullscreen. */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + /* DXGI_ERROR_NOT_CURRENTLY_AVAILABLE on some machines. + * DXGI_ERROR_UNSUPPORTED on the Windows 7 testbot. */ + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED)) + { + skip("Test %u: Could not change fullscreen state.\n", i); + continue; + } + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + output = NULL; + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + todo_wine_if(is_d3d12) ok(!!output, "Test %u: Got unexpected output.\n", i); + + if (output) + IDXGIOutput_ReleaseOwnership(output); + /* Still fullscreen. */ + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + /* Calling IDXGISwapChain_Present() will exit fullscreen. */ + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + /* Now fullscreen mode is exited. */ + if (!flags[i] && !is_d3d12) + /* Still fullscreen on vista and 2008. */ + todo_wine ok(!fullscreen || broken(fullscreen), "Test %u: Got unexpected fullscreen status.\n", i); + else + ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + if (output) + IDXGIOutput_Release(output); + + /* Test creating a window when swapchain is in fullscreen. + * + * The window should break the swapchain out of fullscreen mode on + * d3d10/11. D3d12 is different, a new occluding window doesn't break + * the swapchain out of fullscreen because d3d12 fullscreen swapchains + * don't take exclusive ownership over the output, nor do they disable + * compositing. D3d12 fullscreen mode acts just like borderless + * fullscreen window mode. */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + occluding_window = CreateWindowA("static", "occluding_window", WS_POPUP, 0, 0, 400, 200, 0, 0, 0, 0); + /* An invisible window doesn't cause the swapchain to exit fullscreen + * mode. */ + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + /* A visible, but with bottom z-order window still causes the + * swapchain to exit fullscreen mode. */ + SetWindowPos(occluding_window, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); + ShowWindow(occluding_window, SW_SHOW); + /* Fullscreen mode takes a while to exit. */ + if (!is_d3d12) + wait_fullscreen_state(swapchain, FALSE, TRUE); + + /* No longer fullscreen before calling IDXGISwapChain_Present() except + * for d3d12. */ + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, + "Test %u: Got unexpected fullscreen status.\n", i); + + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); + + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (flags[i] == DXGI_PRESENT_TEST) + todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, + "Test %u: Got unexpected fullscreen status.\n", i); + else + todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + + /* Even though d3d12 doesn't exit fullscreen, a + * IDXGISwapChain_ResizeBuffers() is still needed for subsequent + * IDXGISwapChain_Present() calls to work, otherwise they will return + * DXGI_ERROR_INVALID_CALL */ + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + if (flags[i] == DXGI_PRESENT_TEST) + todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Trying to break out of fullscreen mode again. This time, don't call + * IDXGISwapChain_GetFullscreenState() before IDXGISwapChain_Present(). */ + ShowWindow(occluding_window, SW_HIDE); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ShowWindow(occluding_window, SW_SHOW); + + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + /* hr == S_OK on vista and 2008 */ + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + if (flags[i] == DXGI_PRESENT_TEST) + { + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); + /* IDXGISwapChain_Present() without flags refreshes the occlusion + * state. */ + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + } + else + { + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + } + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + + DestroyWindow(occluding_window); + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + } + wait_device_idle(device); IDXGISwapChain_Release(swapchain); -- 2.11.0

2 1

[PATCH 4/7] wined3d: Drop support for WINED3DFMT_D32_UNORM.
by Henri Verbeet 25 Jun '19

25 Jun '19

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166634. dlls/d3d8/tests/device.c | 4 ++-- dlls/d3d9/tests/device.c | 4 ++-- dlls/ddraw/tests/ddraw1.c | 10 +--------- dlls/ddraw/tests/ddraw2.c | 10 +--------- dlls/ddraw/tests/ddraw4.c | 10 +--------- dlls/ddraw/tests/ddraw7.c | 10 +--------- dlls/wined3d/utils.c | 13 ++++--------- 7 files changed, 12 insertions(+), 49 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 03eb69554cf..1e7b9888b62 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8263,12 +8263,12 @@ static void test_check_device_format(void) hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); IDirect3D8_Release(d3d); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c59b1f74bb5..f05aded3815 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11835,12 +11835,12 @@ static void test_check_device_format(void) hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 7f5e697e7af..b28f1d7515f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12903,9 +12903,7 @@ static void test_d32_support(void) { IDirectDrawSurface *surface; DDSURFACEDESC surface_desc; - IDirect3DDevice *device; IDirectDraw *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -12913,12 +12911,6 @@ static void test_d32_support(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - if ((device = create_device(ddraw, window, DDSCL_NORMAL))) - { - IDirect3DDevice_Release(device); - hw = TRUE; - } - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -12939,7 +12931,7 @@ static void test_d32_support(void) ok((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#x.\n", surface_desc.dwFlags); ok(U2(surface_desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth %u.\n", U2(surface_desc).dwZBufferBitDepth); - todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 75b848d1e28..f25cdd834c4 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13779,9 +13779,7 @@ static void test_d32_support(void) { IDirectDrawSurface *surface; DDSURFACEDESC surface_desc; - IDirect3DDevice2 *device; IDirectDraw2 *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -13789,12 +13787,6 @@ static void test_d32_support(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - if ((device = create_device(ddraw, window, DDSCL_NORMAL))) - { - IDirect3DDevice2_Release(device); - hw = TRUE; - } - hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -13815,7 +13807,7 @@ static void test_d32_support(void) ok((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#x.\n", surface_desc.dwFlags); ok(U2(surface_desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth %u.\n", U2(surface_desc).dwZBufferBitDepth); - todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b06e8db4f3a..bc58c1817c3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16339,9 +16339,7 @@ static void test_d32_support(void) { IDirectDrawSurface4 *surface; DDSURFACEDESC2 surface_desc; - IDirect3DDevice3 *device; IDirectDraw4 *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -16349,12 +16347,6 @@ static void test_d32_support(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - if ((device = create_device(window, DDSCL_NORMAL))) - { - IDirect3DDevice3_Release(device); - hw = TRUE; - } - hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -16382,7 +16374,7 @@ static void test_d32_support(void) "Got unexpected dwZBufferBitDepth %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth); ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff, "Got unexpected Z mask 0x%08x.\n", U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask); - todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface4_Release(surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 137270e3c7a..49aab667e55 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16293,9 +16293,7 @@ static void test_d32_support(void) { IDirectDrawSurface7 *surface; DDSURFACEDESC2 surface_desc; - IDirect3DDevice7 *device; IDirectDraw7 *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -16303,12 +16301,6 @@ static void test_d32_support(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - if ((device = create_device(window, DDSCL_NORMAL))) - { - IDirect3DDevice7_Release(device); - hw = TRUE; - } - hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -16336,7 +16328,7 @@ static void test_d32_support(void) "Got unexpected dwZBufferBitDepth %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth); ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff, "Got unexpected Z mask 0x%08x.\n", U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask); - todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface7_Release(surface); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 44b6c48e677..0872b1007a4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1270,7 +1270,10 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers return NULL; } -/* The following formats explicitly don't have WINED3DFMT_FLAG_TEXTURE set: +/* We intentionally don't support WINED3DFMT_D32_UNORM. No hardware driver + * supports it, and applications get confused when we do. + * + * The following formats explicitly don't have WINED3DFMT_FLAG_TEXTURE set: * * These are never supported on native. * WINED3DFMT_B8G8R8_UNORM @@ -1777,14 +1780,6 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_DEPTH, - WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, - ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, -- 2.11.0

2 1

[PATCH 3/7] ddraw/tests: Add tests for 32-bit depth format support.
by Henri Verbeet 25 Jun '19

25 Jun '19

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166637. dlls/ddraw/tests/ddraw1.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 214 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 860e101159f..7f5e697e7af 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12899,6 +12899,55 @@ static void test_caps(void) IDirectDraw_Release(ddraw); } +static void test_d32_support(void) +{ + IDirectDrawSurface *surface; + DDSURFACEDESC surface_desc; + IDirect3DDevice *device; + IDirectDraw *ddraw; + BOOL hw = FALSE; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if ((device = create_device(ddraw, window, DDSCL_NORMAL))) + { + IDirect3DDevice_Release(device); + hw = TRUE; + } + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U2(surface_desc).dwZBufferBitDepth = 32; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#x.\n", surface_desc.dwFlags); + ok(U2(surface_desc).dwZBufferBitDepth == 32, + "Got unexpected dwZBufferBitDepth %u.\n", U2(surface_desc).dwZBufferBitDepth); + todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); + IDirectDrawSurface_Release(surface); + + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -13010,4 +13059,5 @@ START_TEST(ddraw1) test_alphatest(); test_clipper_refcount(); test_caps(); + test_d32_support(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2c047a5e1ff..75b848d1e28 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13775,6 +13775,55 @@ static void test_caps(void) IDirectDraw2_Release(ddraw); } +static void test_d32_support(void) +{ + IDirectDrawSurface *surface; + DDSURFACEDESC surface_desc; + IDirect3DDevice2 *device; + IDirectDraw2 *ddraw; + BOOL hw = FALSE; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if ((device = create_device(ddraw, window, DDSCL_NORMAL))) + { + IDirect3DDevice2_Release(device); + hw = TRUE; + } + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U2(surface_desc).dwZBufferBitDepth = 32; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#x.\n", surface_desc.dwFlags); + ok(U2(surface_desc).dwZBufferBitDepth == 32, + "Got unexpected dwZBufferBitDepth %u.\n", U2(surface_desc).dwZBufferBitDepth); + todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); + IDirectDrawSurface_Release(surface); + + refcount = IDirectDraw2_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -13893,4 +13942,5 @@ START_TEST(ddraw2) test_alphatest(); test_clipper_refcount(); test_caps(); + test_d32_support(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 013d49c3658..b06e8db4f3a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16335,6 +16335,62 @@ static void test_caps(void) IDirectDraw4_Release(ddraw); } +static void test_d32_support(void) +{ + IDirectDrawSurface4 *surface; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice3 *device; + IDirectDraw4 *ddraw; + BOOL hw = FALSE; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if ((device = create_device(window, DDSCL_NORMAL))) + { + IDirect3DDevice3_Release(device); + hw = TRUE; + } + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = 32; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = 0xffffffff; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &surface_desc); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok((surface_desc.dwFlags & DDSD_PIXELFORMAT), "Got unexpected flags %#x.\n", surface_desc.dwFlags); + ok(U4(surface_desc).ddpfPixelFormat.dwFlags & DDPF_ZBUFFER, + "Got unexpected format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags); + ok(U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth == 32, + "Got unexpected dwZBufferBitDepth %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth); + ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff, + "Got unexpected Z mask 0x%08x.\n", U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask); + todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); + IDirectDrawSurface4_Release(surface); + + refcount = IDirectDraw4_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -16468,4 +16524,5 @@ START_TEST(ddraw4) test_alphatest(); test_clipper_refcount(); test_caps(); + test_d32_support(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b0fc634eef7..137270e3c7a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16289,6 +16289,62 @@ static void test_caps(void) IDirectDraw7_Release(ddraw); } +static void test_d32_support(void) +{ + IDirectDrawSurface7 *surface; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice7 *device; + IDirectDraw7 *ddraw; + BOOL hw = FALSE; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if ((device = create_device(window, DDSCL_NORMAL))) + { + IDirect3DDevice7_Release(device); + hw = TRUE; + } + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = 32; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = 0xffffffff; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok((surface_desc.dwFlags & DDSD_PIXELFORMAT), "Got unexpected flags %#x.\n", surface_desc.dwFlags); + ok(U4(surface_desc).ddpfPixelFormat.dwFlags & DDPF_ZBUFFER, + "Got unexpected format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags); + ok(U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth == 32, + "Got unexpected dwZBufferBitDepth %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth); + ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff, + "Got unexpected Z mask 0x%08x.\n", U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask); + todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); + IDirectDrawSurface7_Release(surface); + + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16436,4 +16492,5 @@ START_TEST(ddraw7) test_clipper_refcount(); test_begin_end_state_block(); test_caps(); + test_d32_support(); } -- 2.11.0

2 1

[PATCH 1/4] quartz/memallocator: Forbid setting the start media time without setting the end time.
by Zebediah Figura 25 Jun '19

25 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/memallocator.c | 21 ++++++++++----------- dlls/quartz/tests/memallocator.c | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index ac12abd6e58..1d74c3cb9fe 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -734,21 +734,20 @@ static HRESULT WINAPI StdMediaSample2_GetMediaTime(IMediaSample2 * iface, LONGLO return S_OK; } -static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 * iface, LONGLONG * pStart, LONGLONG * pEnd) +static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 *iface, LONGLONG *start, LONGLONG *end) { - StdMediaSample2 *This = impl_from_IMediaSample2(iface); - - TRACE("(%p)->(%p, %p)\n", iface, pStart, pEnd); + StdMediaSample2 *sample = impl_from_IMediaSample2(iface); - if (pStart) - This->tMediaStart = *pStart; - else - This->tMediaStart = INVALID_MEDIA_TIME; + TRACE("sample %p, start %p, end %p.\n", iface, start, end); - if (pEnd) - This->tMediaEnd = *pEnd; + if (start) + { + if (!end) return E_POINTER; + sample->tMediaStart = *start; + sample->tMediaEnd = *end; + } else - This->tMediaEnd = 0; + sample->tMediaStart = INVALID_MEDIA_TIME; return S_OK; } diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index b4f3b23710e..3868312aac9 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -379,7 +379,7 @@ static void test_media_time(void) { start = 0x123; hr = IMediaSample_SetMediaTime(sample, &start, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); } end = 0x321; -- 2.22.0

1 3

[PATCH 1/7] d3d8/tests: Add tests for 32-bit depth format support.
by Henri Verbeet 25 Jun '19

25 Jun '19

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166635. dlls/d3d8/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b0a279b11b6..03eb69554cf 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8261,6 +8261,16 @@ static void test_check_device_format(void) D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + IDirect3D8_Release(d3d); } -- 2.11.0

2 1

[PATCH v3] odbccp32: Implement SQLConfigDataSource/W
by Alistair Leslie-Hughes 25 Jun '19

25 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 121 +++++++++++++++++++++++++++++++-------- 1 file changed, 97 insertions(+), 24 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 283ed41a59..47dd8c14bd 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -68,6 +68,9 @@ static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i',' static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; static const WCHAR odbc_error_invalid_keyword[] = {'I','n','v','a','l','i','d',' ','k','e','y','w','o','r','d',' ','v','a','l','u','e',0}; +static BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); +static BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) { @@ -219,30 +222,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -359,6 +338,100 @@ fail: return FALSE; } +BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); + if (TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = attributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + mod = load_config_driver(driver); + if (!mod) + return FALSE; + + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if(pConfigDSNW) + ret = pConfigDSNW(hwnd, request, driver, attributes); + else + ERR("Failed to find ConfigDSNW\n"); + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(mod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); + + if (TRACE_ON(odbc)) + { + const char *p; + for (p = attributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(driver); + if (!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + mod = load_config_driver(driverW); + if (!mod) + { + heap_free(driverW); + return FALSE; + } + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + if (pConfigDSN) + { + TRACE("Calling ConfigDSN\n"); + ret = pConfigDSN(hwnd, request, driver, attributes); + } + else + { + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if (pConfigDSNW) + { + WCHAR *attr = NULL; + TRACE("Calling ConfigDSNW\n"); + + attr = SQLInstall_strdup_multi(attributes); + if(attr) + ret = pConfigDSNW(hwnd, request, driverW, attr); + heap_free(attr); + } + } + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + heap_free(driverW); + FreeLibrary(mod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { -- 2.17.1

1 0

[PATCH 7/7] dxgi/tests: Add IDXGIOutput ownership tests.
by Henri Verbeet 24 Jun '19

24 Jun '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Mostly to show that IDXGIOutput_TakeOwnership() and IDXGIOutput_ReleaseOwnership() are based on VidPN ownership. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166450. dlls/dxgi/tests/dxgi.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 212 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f5c16a779ab..d8176bb1c05 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -17,11 +17,15 @@ */ #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #define COBJMACROS #include "initguid.h" #include "dxgi1_6.h" #include "d3d11.h" #include "d3d12.h" +#include "winternl.h" +#include "ddk/d3dkmthk.h" #include "wine/heap.h" #include "wine/test.h" @@ -36,6 +40,10 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **factory); +static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc); +static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *desc); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); + static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; @@ -492,6 +500,27 @@ static void wait_fullscreen_state_(unsigned int line, IDXGISwapChain *swapchain, "Got unexpected state %#x, expected %#x.\n", state, expected); } +#define wait_vidpn_exclusive_ownership(a, b, c) wait_vidpn_exclusive_ownership_(__LINE__, a, b, c) +static void wait_vidpn_exclusive_ownership_(unsigned int line, + const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc, NTSTATUS expected, BOOL todo) +{ + static const unsigned int wait_timeout = 2000; + static const unsigned int wait_step = 100; + unsigned int total_time = 0; + NTSTATUS status; + + while (total_time < wait_timeout) + { + status = pD3DKMTCheckVidPnExclusiveOwnership(desc); + if (status == expected) + break; + Sleep(wait_step); + total_time += wait_step; + } + todo_wine_if(todo) ok_(__FILE__, line)(status == expected, + "Got unexpected status %#x, expected %#x.\n", status, expected); +} + static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -682,6 +711,39 @@ static void get_factory_(unsigned int line, IUnknown *device, BOOL is_d3d12, IDX } } +#define get_adapter(a, b) get_adapter_(__LINE__, a, b) +static IDXGIAdapter *get_adapter_(unsigned int line, IUnknown *device, BOOL is_d3d12) +{ + IDXGIAdapter *adapter = NULL; + ID3D12Device *d3d12_device; + IDXGIFactory4 *factory4; + IDXGIFactory *factory; + HRESULT hr; + LUID luid; + + if (is_d3d12) + { + get_factory_(line, device, is_d3d12, &factory); + hr = ID3D12CommandQueue_GetDevice((ID3D12CommandQueue *)device, &IID_ID3D12Device, (void **)&d3d12_device); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + luid = ID3D12Device_GetAdapterLuid(d3d12_device); + ID3D12Device_Release(d3d12_device); + hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, luid, &IID_IDXGIAdapter, (void **)&adapter); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGIFactory4_Release(factory4); + IDXGIFactory_Release(factory); + } + else + { + hr = IDXGIDevice_GetAdapter((IDXGIDevice *)device, &adapter); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + return adapter; +} + static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; @@ -5416,6 +5478,148 @@ static void test_window_association(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_output_ownership(IUnknown *device, BOOL is_d3d12) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP check_ownership_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + DXGI_OUTPUT_DESC output_desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIOutput *output; + BOOL fullscreen; + NTSTATUS status; + ULONG refcount; + HRESULT hr; + + if (!pD3DKMTCheckVidPnExclusiveOwnership + || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); + return; + } + + get_factory(device, is_d3d12, &factory); + adapter = get_adapter(device, is_d3d12); + ok(!!adapter, "Failed to get adapter.\n"); + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); + IDXGIAdapter_Release(adapter); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Adapter doesn't have any outputs.\n"); + IDXGIFactory_Release(factory); + return; + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + lstrcpyW(open_adapter_gdi_desc.DeviceName, output_desc.DeviceName); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + + check_ownership_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_ownership_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, NULL, NULL, NULL, NULL); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Swapchain in fullscreen mode. */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); + /* DXGI_ERROR_NOT_CURRENTLY_AVAILABLE on some machines. + * DXGI_ERROR_UNSUPPORTED on the Windows 7 testbot. */ + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED)) + { + skip("Failed to change fullscreen state.\n"); + goto done; + } + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Got unexpected fullscreen state.\n"); + if (is_d3d12) + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + else + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : E_INVALIDARG), "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_TakeOwnership(output, device, TRUE); + todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); + IDXGIOutput_ReleaseOwnership(output); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + + /* IDXGIOutput_TakeOwnership always returns E_NOINTERFACE for d3d12. Tests + * finished. */ + if (is_d3d12) + goto done; + + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_ReleaseOwnership(output); + + hr = IDXGIOutput_TakeOwnership(output, device, TRUE); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* Note that the "exclusive" parameter to IDXGIOutput_TakeOwnership() + * seems to behave opposite to what's described by MSDN. */ + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_ReleaseOwnership(output); + + /* Swapchain in windowed mode. */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Unexpected fullscreen state.\n"); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIOutput_TakeOwnership(output, device, TRUE); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + IDXGIOutput_ReleaseOwnership(output); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + +done: + IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + wait_device_idle(device); + + IDXGIOutput_Release(output); + IDXGISwapChain_Release(swapchain); + DestroyWindow(swapchain_desc.OutputWindow); + refcount = IDXGIFactory_Release(factory); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -5459,7 +5663,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { - HMODULE dxgi_module, d3d12_module; + HMODULE dxgi_module, d3d12_module, gdi32_module; BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; @@ -5469,6 +5673,11 @@ START_TEST(dxgi) pCreateDXGIFactory1 = (void *)GetProcAddress(dxgi_module, "CreateDXGIFactory1"); pCreateDXGIFactory2 = (void *)GetProcAddress(dxgi_module, "CreateDXGIFactory2"); + gdi32_module = GetModuleHandleA("gdi32.dll"); + pD3DKMTCheckVidPnExclusiveOwnership = (void *)GetProcAddress(gdi32_module, "D3DKMTCheckVidPnExclusiveOwnership"); + pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32_module, "D3DKMTCloseAdapter"); + pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32_module, "D3DKMTOpenAdapterFromGdiDisplayName"); + registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); @@ -5520,6 +5729,7 @@ START_TEST(dxgi) run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); run_on_d3d10(test_swapchain_formats); + run_on_d3d10(test_output_ownership); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -5540,6 +5750,7 @@ START_TEST(dxgi) run_on_d3d12(test_swapchain_present); run_on_d3d12(test_swapchain_backbuffer_index); run_on_d3d12(test_swapchain_formats); + run_on_d3d12(test_output_ownership); FreeLibrary(d3d12_module); } -- 2.11.0

1 0

[PATCH 6/7] dxgi: Return DXGI_STATUS_OCCLUDED for minimised windows in d3d11_swapchain_present().
by Henri Verbeet 24 Jun '19

24 Jun '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166452. dlls/dxgi/swapchain.c | 3 +++ dlls/dxgi/tests/dxgi.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 1bc59f48e90..8dbbfab805d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -306,6 +306,9 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return DXGI_ERROR_INVALID_CALL; } + if (IsIconic(d3d11_swapchain_get_hwnd(swapchain))) + return DXGI_STATUS_OCCLUDED; + if (flags & ~DXGI_PRESENT_TEST) FIXME("Unimplemented flags %#x.\n", flags); if (flags & DXGI_PRESENT_TEST) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 51ff4405b4e..f5c16a779ab 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4073,8 +4073,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* Minimised window. */ ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - todo_wine_if(!is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Test %u: Got unexpected hr %#x.\n", i, hr); ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL); /* Hidden window. */ -- 2.11.0

1 0

[PATCH 2/7] d3d9/tests: Add tests for 32-bit depth format support.
by Henri Verbeet 24 Jun '19

24 Jun '19

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166636. dlls/d3d9/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f5c89723cb2..c59b1f74bb5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11833,6 +11833,16 @@ static void test_check_device_format(void) } } + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + IDirect3D9_Release(d3d); } -- 2.11.0

1 0

[PATCH 5/5] wined3d: Move texture2d_load_renderbuffer() to texture.c.
by Henri Verbeet 24 Jun '19

24 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 39 --------------------------------------- dlls/wined3d/texture.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 39 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fc8be3827ba..3668c61fa33 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1423,45 +1423,6 @@ static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, } /* Context activation is done by the caller. */ -BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD dst_location) -{ - unsigned int level = sub_resource_idx % texture->level_count; - const RECT rect = {0, 0, - wined3d_texture_get_level_width(texture, level), - wined3d_texture_get_level_height(texture, level)}; - struct wined3d_texture_sub_resource *sub_resource; - DWORD src_location, locations; - - sub_resource = &texture->sub_resources[sub_resource_idx]; - locations = sub_resource->locations; - if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) - { - FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", - wined3d_debug_location(locations)); - return FALSE; - } - - if (locations & WINED3D_LOCATION_RB_MULTISAMPLE) - src_location = WINED3D_LOCATION_RB_MULTISAMPLE; - else if (locations & WINED3D_LOCATION_RB_RESOLVED) - src_location = WINED3D_LOCATION_RB_RESOLVED; - else if (locations & WINED3D_LOCATION_TEXTURE_SRGB) - src_location = WINED3D_LOCATION_TEXTURE_SRGB; - else if (locations & WINED3D_LOCATION_TEXTURE_RGB) - src_location = WINED3D_LOCATION_TEXTURE_RGB; - else if (locations & WINED3D_LOCATION_DRAWABLE) - src_location = WINED3D_LOCATION_DRAWABLE; - else /* texture2d_blt_fbo() will load the source location if necessary. */ - src_location = WINED3D_LOCATION_TEXTURE_RGB; - - texture2d_blt_fbo(texture->resource.device, context, WINED3D_TEXF_POINT, texture, - sub_resource_idx, src_location, &rect, texture, sub_resource_idx, dst_location, &rect); - - return TRUE; -} - -/* Context activation is done by the caller. */ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) { struct wined3d_blitter *next; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4ae869b4b2a..88db24927d1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2528,6 +2528,44 @@ static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, return TRUE; } +static BOOL wined3d_texture_load_renderbuffer(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) +{ + unsigned int level = sub_resource_idx % texture->level_count; + const RECT rect = {0, 0, + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)}; + struct wined3d_texture_sub_resource *sub_resource; + DWORD src_location, locations; + + sub_resource = &texture->sub_resources[sub_resource_idx]; + locations = sub_resource->locations; + if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) + { + FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", + wined3d_debug_location(locations)); + return FALSE; + } + + if (locations & WINED3D_LOCATION_RB_MULTISAMPLE) + src_location = WINED3D_LOCATION_RB_MULTISAMPLE; + else if (locations & WINED3D_LOCATION_RB_RESOLVED) + src_location = WINED3D_LOCATION_RB_RESOLVED; + else if (locations & WINED3D_LOCATION_TEXTURE_SRGB) + src_location = WINED3D_LOCATION_TEXTURE_SRGB; + else if (locations & WINED3D_LOCATION_TEXTURE_RGB) + src_location = WINED3D_LOCATION_TEXTURE_RGB; + else if (locations & WINED3D_LOCATION_DRAWABLE) + src_location = WINED3D_LOCATION_DRAWABLE; + else /* texture2d_blt_fbo() will load the source location if necessary. */ + src_location = WINED3D_LOCATION_TEXTURE_RGB; + + texture2d_blt_fbo(texture->resource.device, context, WINED3D_TEXF_POINT, texture, + sub_resource_idx, src_location, &rect, texture, sub_resource_idx, dst_location, &rect); + + return TRUE; +} + static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, BOOL srgb) { @@ -2702,7 +2740,7 @@ static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: - return texture2d_load_renderbuffer(texture, sub_resource_idx, context, location); + return wined3d_texture_load_renderbuffer(texture, sub_resource_idx, context, location); case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f796d12446f..b6f4b670182 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3551,8 +3551,6 @@ void texture2d_get_blt_info(const struct wined3d_texture_gl *texture_gl, unsigne const RECT *rect, struct wined3d_blt_info *info) DECLSPEC_HIDDEN; void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD src_location, DWORD dst_location) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_normalmatrix_uniform().
by Henri Verbeet 24 Jun '19

24 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e0220d108c0..80e58ccb72b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1308,18 +1308,18 @@ static void transpose_matrix(struct wined3d_matrix *out, const struct wined3d_ma *out = temp; } -static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_matrix mv; float mat[3 * 3]; if (prog->vs.normal_matrix_location == -1) return; - get_modelview_matrix(context, state, 0, &mv); - compute_normal_matrix(mat, context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_FFP_LIGHTING, &mv); + get_modelview_matrix(&context_gl->c, state, 0, &mv); + compute_normal_matrix(mat, context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_LEGACY_FFP_LIGHTING, &mv); GL_EXTCALL(glUniformMatrix3fv(prog->vs.normal_matrix_location, 1, FALSE, mat)); checkGLcall("glUniformMatrix3fv"); @@ -1516,6 +1516,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context const struct wined3d_shader *vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct glsl_context_data *ctx_data = context->shader_backend_data; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct glsl_shader_prog_link *prog = ctx_data->glsl_program; const struct wined3d_gl_info *gl_info = context->gl_info; float position_fixup[4 * WINED3D_MAX_VIEWPORTS]; @@ -1580,7 +1581,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context GL_EXTCALL(glUniformMatrix4fv(prog->vs.modelview_matrix_location[0], 1, FALSE, &mat._11)); checkGLcall("glUniformMatrix4fv"); - shader_glsl_ffp_vertex_normalmatrix_uniform(context, state, prog); + shader_glsl_ffp_vertex_normalmatrix_uniform(context_gl, state, prog); } if (update_mask & WINED3D_SHADER_CONST_FFP_VERTEXBLEND) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_init_transform_feedback().
by Henri Verbeet 24 Jun '19

24 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b316562e2e..e0220d108c0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -938,11 +938,11 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri return have_varyings_to_record; } -static void shader_glsl_init_transform_feedback(const struct wined3d_context *context, +static void shader_glsl_init_transform_feedback(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, GLuint program_id, struct wined3d_shader *shader) { const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer; unsigned int i, count, length; const char **varyings; @@ -10342,7 +10342,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glAttachShader(program_id, gs_id)); checkGLcall("glAttachShader"); - shader_glsl_init_transform_feedback(context, priv, program_id, gshader); + shader_glsl_init_transform_feedback(context_gl, priv, program_id, gshader); list_add_head(&gshader->linked_programs, &entry->gs.shader_entry); } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_load_program_resources().
by Henri Verbeet 24 Jun '19

24 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c1f9d4cfe70..4b316562e2e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -799,16 +799,16 @@ static void shader_glsl_load_images(const struct wined3d_gl_info *gl_info, struc } /* Context activation is done by the caller. */ -static void shader_glsl_load_program_resources(const struct wined3d_context *context, +static void shader_glsl_load_program_resources(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader *shader) { const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; - shader_glsl_init_uniform_block_bindings(context->gl_info, priv, program_id, reg_maps); - shader_glsl_load_icb(context->gl_info, priv, program_id, reg_maps); + shader_glsl_init_uniform_block_bindings(context_gl->c.gl_info, priv, program_id, reg_maps); + shader_glsl_load_icb(context_gl->c.gl_info, priv, program_id, reg_maps); /* Texture unit mapping is set up to be the same each time the shader * program is used so we can hardcode the sampler uniform values. */ - shader_glsl_load_samplers(context, priv, program_id, reg_maps); + shader_glsl_load_samplers(&context_gl->c, priv, program_id, reg_maps); } static void append_transform_feedback_varying(const char **varyings, unsigned int *varying_count, @@ -9966,6 +9966,7 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, const struct wined3d_context *context, struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_context_data *ctx_data = context->shader_backend_data; struct wined3d_string_buffer *buffer = &priv->shader_buffer; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -10033,7 +10034,7 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, GL_EXTCALL(glUseProgram(program_id)); checkGLcall("glUseProgram"); - shader_glsl_load_program_resources(context, priv, program_id, shader); + shader_glsl_load_program_resources(context_gl, priv, program_id, shader); shader_glsl_load_images(gl_info, priv, program_id, &shader->reg_maps); entry->constant_update_mask = 0; @@ -10092,6 +10093,7 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex static void set_glsl_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader *pre_rasterization_shader; @@ -10414,7 +10416,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->vs.base_vertex_id_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_BASE_VERTEX_ID; - shader_glsl_load_program_resources(context, priv, program_id, vshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, vshader); } else { @@ -10452,14 +10454,14 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const entry->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE; if (hshader) - shader_glsl_load_program_resources(context, priv, program_id, hshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, hshader); if (dshader) { if (entry->ds.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_load_program_resources(context, priv, program_id, dshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, dshader); } if (gshader) @@ -10467,7 +10469,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->gs.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_load_program_resources(context, priv, program_id, gshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, gshader); } if (ps_id) @@ -10482,7 +10484,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->ps.ycorrection_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; - shader_glsl_load_program_resources(context, priv, program_id, pshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, pshader); shader_glsl_load_images(gl_info, priv, program_id, &pshader->reg_maps); } else -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_destroy_buffer_object().
by Henri Verbeet 24 Jun '19

24 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5aca952b2cf..2ed3984bea1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -140,11 +140,10 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w /* Context activation is done by the caller. */ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_resource *resource = &buffer_gl->b.resource; - const struct wined3d_gl_info *gl_info = context->gl_info; if (!buffer_gl->buffer_object) return; @@ -172,7 +171,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) { device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); - if (context->transform_feedback_active) + if (context_gl->c.transform_feedback_active) { /* We have to make sure that transform feedback is not active * when deleting a potentially bound transform feedback buffer. @@ -269,7 +268,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, &context_gl->c); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context_gl); buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -758,7 +757,7 @@ static void buffer_unload(struct wined3d_resource *resource) wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), context); + wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), wined3d_context_gl(context)); buffer_clear_dirty_areas(buffer); context_release(context); @@ -787,7 +786,7 @@ static void wined3d_buffer_gl_destroy_object(void *object) if (buffer_gl->buffer_object) { context = context_acquire(buffer_gl->b.resource.device, NULL, 0); - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, wined3d_context_gl(context)); context_release(context); heap_free(buffer_gl->b.conversion_map); -- 2.11.0

1 0

[PATCH] tdi.sys: Fix EXTRADLLFLAGS.
by Jacek Caban 24 Jun '19

24 Jun '19

--- dlls/tdi.sys/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

2 1

[PATCH] tdi.sys: Fix EXTRADLLFLAGS.
by Jacek Caban 24 Jun '19

24 Jun '19

--- dlls/tdi.sys/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in index 9d5e05f4a6..eef2fec7c3 100644 --- a/dlls/tdi.sys/Makefile.in +++ b/dlls/tdi.sys/Makefile.in @@ -1,7 +1,6 @@ MODULE = tdi.sys -EXTRADLLFLAGS = -Wl,--subsystem,native -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ main.c -- 2.21.0

1 0

Profiling application under Wine
by Chambers, Matthew 24 Jun '19

24 Jun '19

Hi all, I have a scientific application which runs much slower under Wine than on Windows for one type of data (read with a vendor's closed-source .NET DLLs). For most other types of data (read with other vendors' closed-source DLLs, some .NET, some not), the performance is nearly the same. I'm trying to understand why. I have run sysprof on both types of data trying to understand the difference, but without the Windows symbols I don't really understand what I'm looking at. I also ran perf and generated these interactive flame graphs. Perf from the slow data vendor (Thermo): Perf from one of the fast data vendor (Bruker): Can someone point me in a better direction for understanding what's causing this performance difference? Thanks, -Matt

1 0

[PATCH 2/3] ntoskrnl.exe: Implement ExInitializePagedLookasideList.
by Jacek Caban 24 Jun '19

24 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47014 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 ++++++++++++++++++-------------- dlls/ntoskrnl.exe/tests/driver.c | 24 ++++++++++++++ include/ddk/wdm.h | 11 +++++- 3 files changed, 66 insertions(+), 26 deletions(-)

2 1

[PATCH 1/3] ntoskrnl.exe: Implement IoGetStackLimits.
by Jacek Caban 24 Jun '19

24 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47017 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 11 +++++++++++ include/ddk/wdm.h | 1 + 4 files changed, 25 insertions(+), 1 deletion(-)

2 1

[PATCH 3/3] ntoskrnl.exe: Implement ExDeletePagedLookasideList.
by Jacek Caban 24 Jun '19

24 Jun '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 49 +++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 23 deletions(-)

1 0

[PATCH v3 3/5] winex11.drv: Use generic EnumDisplayMonitors.
by Zhiyi Zhang 24 Jun '19

24 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 10 -------- dlls/user32/sysparams.c | 52 +++++++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 2 ++ dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/display.c | 5 ++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 15 +---------- 8 files changed, 63 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..bf600708ed 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -354,16 +354,6 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode return DISP_CHANGE_FAILED; } -static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - RECT r = {0, 0, 640, 480}; - - TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); - - proc(NULLDRV_DEFAULT_HMONITOR, hdc, &r, lp); - return TRUE; -} - static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) { return FALSE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4d644b9edf..e7aa418f09 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -251,6 +251,9 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); + +#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) /* Strings for monitor functions */ static const WCHAR DEFAULT_ADAPTER_NAME[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; @@ -3815,6 +3818,55 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, #endif } +BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + BOOL success = FALSE; + HDEVINFO devinfo; + RECT monitor_rect; + DWORD state_flags; + HANDLE mutex; + DWORD type; + DWORD i = 0; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + /* Use SetupAPI to get monitors */ + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) + { + /* Inactive monitors don't get enumerated */ + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&state_flags, sizeof(state_flags), NULL, 0 ) + || !(state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + + if (SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0 )) + { + if (!proc( (HMONITOR)(UINT_PTR)i, hdc, &monitor_rect, lp )) + { + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + return FALSE; + } + success = TRUE; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + + /* Fallback to report one monitor if using SetupAPI failed */ + if (!success) + { + RECT default_rect = {0, 0, 640, 480}; + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + return FALSE; + } + return TRUE; +} + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 514cf6753f..a503ebe4db 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -122,6 +122,8 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; + struct received_message_info; enum user_obj_type diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a0495c44b1..ecbcd6b381 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -304,6 +304,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) resize_data.old_virtual_rect = get_virtual_screen_rect(); xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( TRUE ); resize_data.new_virtual_rect = get_virtual_screen_rect(); if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index ce2c568ad8..d6969b0cfe 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; @@ -276,6 +277,10 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) goto done; + /* RcMonitor */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 614f0b90f4..5b00a5dc5d 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -20,7 +20,6 @@ @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx -@ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ed5e268391..a6b07699a7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -695,6 +695,8 @@ struct x11drv_monitor { /* Name */ WCHAR name[128]; + /* RcMonitor in MONITORINFO struct */ + RECT rc_monitor; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index e401531450..c8fa63f459 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -321,6 +321,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * && !IsRectEmpty( &monitors[first].rcMonitor ))) { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); + monitor[index].rc_monitor = monitors[i].rcMonitor; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -410,17 +411,3 @@ BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); return TRUE; } - - -/*********************************************************************** - * X11DRV_EnumDisplayMonitors (X11DRV.@) - */ -BOOL CDECL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - int i; - - for (i = 0; i < nb_monitors; i++) - if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) return FALSE; - - return TRUE; -} -- 2.15.2 (Apple Git-101.1)

4 4

[PATCH v2] wbemprox: Add support for parsing ASSOCIATORS OF queries.
by Hans Leidekker 24 Jun '19

24 Jun '19

v2: Add missing null test. Thanks Jacek. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 16 ++-- dlls/wbemprox/table.c | 2 +- dlls/wbemprox/tests/query.c | 31 +++++++- dlls/wbemprox/wbemprox_private.h | 13 +++- dlls/wbemprox/wql.y | 162 +++++++++++++++++++++++++++++++-------- 5 files changed, 179 insertions(+), 45 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index d193574a39..3221e27b0b 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -30,17 +30,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -HRESULT create_view( const struct property *proplist, const WCHAR *class, - const struct expr *cond, struct view **ret ) +HRESULT create_view( const WCHAR *path, const struct keyword *keywordlist, const WCHAR *class, + const struct property *proplist, const struct expr *cond, struct view **ret ) { - struct view *view = heap_alloc( sizeof(struct view) ); + struct view *view = heap_alloc_zero( sizeof(*view) ); if (!view) return E_OUTOFMEMORY; - view->proplist = proplist; - view->table = grab_table( class ); - view->cond = cond; - view->result = NULL; - view->count = 0; + view->path = path; + view->keywordlist = keywordlist; + view->proplist = proplist; + view->table = grab_table( class ); + view->cond = cond; *ret = view; return S_OK; } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index ad56e0c7ba..a8fd0041b3 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -357,7 +357,7 @@ struct table *grab_table( const WCHAR *name ) LIST_FOR_EACH_ENTRY( table, table_list, struct table, entry ) { - if (!strcmpiW( table->name, name )) + if (name && !strcmpiW( table->name, name )) { TRACE("returning %p\n", table); return addref_table( table ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 052e8a2778..2c1ca7f91d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -156,14 +156,37 @@ static void test_select( IWbemServices *services ) static void test_associators( IWbemServices *services ) { static const WCHAR query1[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F','{','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',0}; static const WCHAR query2[] = {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', - 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s','=','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR query3[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','}',0}; + static const WCHAR query4[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F',' ','{','W','i','n','3','2','_', + 'D','i','s','k','D','r','i','v','e','.','D','e','v','i','c','e','I','D','=', + '\'','\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\'','}',0}; + static const WCHAR query5[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s','=','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',' ', + 'C','l','a','s','s','D','e','f','s','O','n','l','y',0}; + static const WCHAR query6[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','C','l','a','s','s','D','e','f','s','O','n','l','y',0}; + static const WCHAR query7[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','C','l','a','s','s','D','e','f','s','O','n','l','y',' ', + 'A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; - static const WCHAR *test[] = { query1, query2 }; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 }; HRESULT hr; IEnumWbemClassObject *result; UINT i; @@ -171,7 +194,7 @@ static void test_associators( IWbemServices *services ) for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); - todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); if (result) IEnumWbemClassObject_Release( result ); } } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index d52affa82a..15b961de52 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -148,8 +148,17 @@ struct record struct table *table; }; +struct keyword +{ + const WCHAR *name; + const WCHAR *value; + const struct keyword *next; +}; + struct view { + const WCHAR *path; /* ASSOCIATORS OF query */ + const struct keyword *keywordlist; const struct property *proplist; struct table *table; const struct expr *cond; @@ -170,8 +179,8 @@ struct query *addref_query( struct query * ) DECLSPEC_HIDDEN; void release_query( struct query *query ) DECLSPEC_HIDDEN; HRESULT exec_query( const WCHAR *, IEnumWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT parse_query( const WCHAR *, struct view **, struct list * ) DECLSPEC_HIDDEN; -HRESULT create_view( const struct property *, const WCHAR *, const struct expr *, - struct view ** ) DECLSPEC_HIDDEN; +HRESULT create_view( const WCHAR *, const struct keyword *, const WCHAR *, const struct property *, + const struct expr *, struct view ** ) DECLSPEC_HIDDEN; void destroy_view( struct view * ) DECLSPEC_HIDDEN; HRESULT execute_view( struct view * ) DECLSPEC_HIDDEN; void init_table_list( void ) DECLSPEC_HIDDEN; diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 236a37d9f7..4d9ba493f0 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -67,6 +67,18 @@ static struct property *alloc_property( struct parser *parser, const WCHAR *clas return prop; } +static struct keyword *alloc_keyword( struct parser *parser, const WCHAR *name, const WCHAR *value ) +{ + struct keyword *keyword = alloc_mem( parser, sizeof(*keyword) ); + if (keyword) + { + keyword->name = name; + keyword->value = value; + keyword->next = NULL; + } + return keyword; +} + static WCHAR *get_string( struct parser *parser, const struct string *str ) { const WCHAR *p = str->data; @@ -87,6 +99,18 @@ static WCHAR *get_string( struct parser *parser, const struct string *str ) return ret; } +static WCHAR *get_path( struct parser *parser, const struct string *str ) +{ + const WCHAR *p = str->data; + int len = str->len; + WCHAR *ret; + + if (!(ret = alloc_mem( parser, (len + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, p, len * sizeof(WCHAR) ); + ret[len] = 0; + return ret; +} + static int get_int( struct parser *parser ) { const WCHAR *p = &parser->cmd[parser->idx]; @@ -195,28 +219,92 @@ static int wql_lex( void *val, struct parser *parser ); struct string str; WCHAR *string; struct property *proplist; + struct keyword *keywordlist; struct view *view; struct expr *expr; int integer; } %token TK_SELECT TK_FROM TK_STAR TK_COMMA TK_DOT TK_IS TK_LP TK_RP TK_NULL TK_FALSE TK_TRUE -%token TK_INTEGER TK_WHERE TK_SPACE TK_MINUS TK_ILLEGAL TK_BY -%token <str> TK_STRING TK_ID +%token TK_INTEGER TK_WHERE TK_SPACE TK_MINUS TK_ILLEGAL TK_BY TK_ASSOCIATORS TK_OF +%token <str> TK_STRING TK_ID TK_PATH -%type <string> id +%type <string> id path %type <proplist> prop proplist -%type <view> select +%type <keywordlist> keyword keywordlist +%type <view> query select associatorsof %type <expr> expr prop_val const_val string_val %type <integer> number -%left TK_OR -%left TK_AND -%left TK_NOT -%left TK_EQ TK_NE TK_LT TK_GT TK_LE TK_GE TK_LIKE +%left TK_OR TK_AND TK_NOT TK_EQ TK_NE TK_LT TK_GT TK_LE TK_GE TK_LIKE %% +query: + select + | + associatorsof + ; + +path: + TK_PATH + { + $$ = get_path( ctx, &$1 ); + if (!$$) + YYABORT; + } + ; + +keyword: + id + { + $$ = alloc_keyword( ctx, $1, NULL ); + if (!$$) + YYABORT; + } + | id TK_EQ id + { + $$ = alloc_keyword( ctx, $1, $3 ); + if (!$$) + YYABORT; + } + ; + +keywordlist: + keyword + | keyword keywordlist + { + $1->next = $2; + } + ; + +associatorsof: + TK_ASSOCIATORS TK_OF path + { + HRESULT hr; + struct parser *parser = ctx; + struct view *view; + + hr = create_view( $3, NULL, NULL, NULL, NULL, &view ); + if (hr != S_OK) + YYABORT; + + PARSER_BUBBLE_UP_VIEW( parser, $$, view ); + } + | TK_ASSOCIATORS TK_OF path TK_WHERE keywordlist + { + HRESULT hr; + struct parser *parser = ctx; + struct view *view; + + hr = create_view( $3, $5, NULL, NULL, NULL, &view ); + if (hr != S_OK) + YYABORT; + + PARSER_BUBBLE_UP_VIEW( parser, $$, view ); + } + ; + select: TK_SELECT TK_FROM id { @@ -224,7 +312,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( NULL, $3, NULL, &view ); + hr = create_view( NULL, NULL, $3, NULL, NULL, &view ); if (hr != S_OK) YYABORT; @@ -236,7 +324,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( $2, $4, NULL, &view ); + hr = create_view( NULL, NULL, $4, $2, NULL, &view ); if (hr != S_OK) YYABORT; @@ -248,7 +336,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( $2, $4, $6, &view ); + hr = create_view( NULL, NULL, $4, $2, $6, &view ); if (hr != S_OK) YYABORT; @@ -535,16 +623,18 @@ static const char id_char[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, }; -struct keyword +struct wql_keyword { const WCHAR *name; unsigned int len; int type; }; -#define MAX_TOKEN_LEN 6 +#define MIN_TOKEN_LEN 2 +#define MAX_TOKEN_LEN 11 static const WCHAR andW[] = {'A','N','D'}; +static const WCHAR associatorsW[] = {'A','S','S','O','C','I','A','T','O','R','S'}; static const WCHAR byW[] = {'B','Y'}; static const WCHAR falseW[] = {'F','A','L','S','E'}; static const WCHAR fromW[] = {'F','R','O','M'}; @@ -552,30 +642,33 @@ static const WCHAR isW[] = {'I','S'}; static const WCHAR likeW[] = {'L','I','K','E'}; static const WCHAR notW[] = {'N','O','T'}; static const WCHAR nullW[] = {'N','U','L','L'}; +static const WCHAR ofW[] = {'O','F'}; static const WCHAR orW[] = {'O','R'}; static const WCHAR selectW[] = {'S','E','L','E','C','T'}; static const WCHAR trueW[] = {'T','R','U','E'}; static const WCHAR whereW[] = {'W','H','E','R','E'}; -static const struct keyword keyword_table[] = +static const struct wql_keyword keyword_table[] = { - { andW, ARRAY_SIZE(andW), TK_AND }, - { byW, ARRAY_SIZE(byW), TK_BY }, - { falseW, ARRAY_SIZE(falseW), TK_FALSE }, - { fromW, ARRAY_SIZE(fromW), TK_FROM }, - { isW, ARRAY_SIZE(isW), TK_IS }, - { likeW, ARRAY_SIZE(likeW), TK_LIKE }, - { notW, ARRAY_SIZE(notW), TK_NOT }, - { nullW, ARRAY_SIZE(nullW), TK_NULL }, - { orW, ARRAY_SIZE(orW), TK_OR }, - { selectW, ARRAY_SIZE(selectW), TK_SELECT }, - { trueW, ARRAY_SIZE(trueW), TK_TRUE }, - { whereW, ARRAY_SIZE(whereW), TK_WHERE } + { andW, ARRAY_SIZE(andW), TK_AND }, + { associatorsW, ARRAY_SIZE(associatorsW), TK_ASSOCIATORS }, + { byW, ARRAY_SIZE(byW), TK_BY }, + { falseW, ARRAY_SIZE(falseW), TK_FALSE }, + { fromW, ARRAY_SIZE(fromW), TK_FROM }, + { isW, ARRAY_SIZE(isW), TK_IS }, + { likeW, ARRAY_SIZE(likeW), TK_LIKE }, + { notW, ARRAY_SIZE(notW), TK_NOT }, + { nullW, ARRAY_SIZE(nullW), TK_NULL }, + { ofW, ARRAY_SIZE(ofW), TK_OF }, + { orW, ARRAY_SIZE(orW), TK_OR }, + { selectW, ARRAY_SIZE(selectW), TK_SELECT }, + { trueW, ARRAY_SIZE(trueW), TK_TRUE }, + { whereW, ARRAY_SIZE(whereW), TK_WHERE } }; static int cmp_keyword( const void *arg1, const void *arg2 ) { - const struct keyword *key1 = arg1, *key2 = arg2; + const struct wql_keyword *key1 = arg1, *key2 = arg2; int len = min( key1->len, key2->len ); int ret; @@ -587,14 +680,14 @@ static int cmp_keyword( const void *arg1, const void *arg2 ) static int keyword_type( const WCHAR *str, unsigned int len ) { - struct keyword key, *ret; + struct wql_keyword key, *ret; - if (len > MAX_TOKEN_LEN) return TK_ID; + if (len < MIN_TOKEN_LEN || len > MAX_TOKEN_LEN) return TK_ID; key.name = str; key.len = len; key.type = 0; - ret = bsearch( &key, keyword_table, ARRAY_SIZE(keyword_table), sizeof(struct keyword), cmp_keyword ); + ret = bsearch( &key, keyword_table, ARRAY_SIZE(keyword_table), sizeof(struct wql_keyword), cmp_keyword ); if (ret) return ret->type; return TK_ID; } @@ -622,6 +715,15 @@ static int get_token( const WCHAR *s, int *token ) case ')': *token = TK_RP; return 1; + case '{': + for (i = 1; s[i] && s[i] != '}'; i++) {} + if (s[i] != '}') + { + *token = TK_ILLEGAL; + return i; + } + *token = TK_PATH; + return i + 1; case '*': *token = TK_STAR; return 1; -- 2.11.0

1 0

[PATCH] wbemprox: Add support for parsing ASSOCIATORS OF queries.
by Hans Leidekker 24 Jun '19

24 Jun '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 16 ++-- dlls/wbemprox/table.c | 2 +- dlls/wbemprox/tests/query.c | 31 +++++++- dlls/wbemprox/wbemprox_private.h | 13 +++- dlls/wbemprox/wql.y | 162 +++++++++++++++++++++++++++++++-------- 5 files changed, 179 insertions(+), 45 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index d193574a39..3221e27b0b 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -30,17 +30,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -HRESULT create_view( const struct property *proplist, const WCHAR *class, - const struct expr *cond, struct view **ret ) +HRESULT create_view( const WCHAR *path, const struct keyword *keywordlist, const WCHAR *class, + const struct property *proplist, const struct expr *cond, struct view **ret ) { - struct view *view = heap_alloc( sizeof(struct view) ); + struct view *view = heap_alloc_zero( sizeof(*view) ); if (!view) return E_OUTOFMEMORY; - view->proplist = proplist; - view->table = grab_table( class ); - view->cond = cond; - view->result = NULL; - view->count = 0; + view->path = path; + view->keywordlist = keywordlist; + view->proplist = proplist; + view->table = grab_table( class ); + view->cond = cond; *ret = view; return S_OK; } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index ad56e0c7ba..a8fd0041b3 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -357,7 +357,7 @@ struct table *grab_table( const WCHAR *name ) LIST_FOR_EACH_ENTRY( table, table_list, struct table, entry ) { - if (!strcmpiW( table->name, name )) + if (name && !strcmpiW( table->name, name )) { TRACE("returning %p\n", table); return addref_table( table ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 052e8a2778..2c1ca7f91d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -156,14 +156,37 @@ static void test_select( IWbemServices *services ) static void test_associators( IWbemServices *services ) { static const WCHAR query1[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F','{','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',0}; static const WCHAR query2[] = {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', - 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s','=','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR query3[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','}',0}; + static const WCHAR query4[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F',' ','{','W','i','n','3','2','_', + 'D','i','s','k','D','r','i','v','e','.','D','e','v','i','c','e','I','D','=', + '\'','\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\'','}',0}; + static const WCHAR query5[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s','=','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',' ', + 'C','l','a','s','s','D','e','f','s','O','n','l','y',0}; + static const WCHAR query6[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','C','l','a','s','s','D','e','f','s','O','n','l','y',0}; + static const WCHAR query7[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','C','l','a','s','s','D','e','f','s','O','n','l','y',' ', + 'A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; - static const WCHAR *test[] = { query1, query2 }; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 }; HRESULT hr; IEnumWbemClassObject *result; UINT i; @@ -171,7 +194,7 @@ static void test_associators( IWbemServices *services ) for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); - todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); if (result) IEnumWbemClassObject_Release( result ); } } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index d52affa82a..15b961de52 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -148,8 +148,17 @@ struct record struct table *table; }; +struct keyword +{ + const WCHAR *name; + const WCHAR *value; + const struct keyword *next; +}; + struct view { + const WCHAR *path; /* ASSOCIATORS OF query */ + const struct keyword *keywordlist; const struct property *proplist; struct table *table; const struct expr *cond; @@ -170,8 +179,8 @@ struct query *addref_query( struct query * ) DECLSPEC_HIDDEN; void release_query( struct query *query ) DECLSPEC_HIDDEN; HRESULT exec_query( const WCHAR *, IEnumWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT parse_query( const WCHAR *, struct view **, struct list * ) DECLSPEC_HIDDEN; -HRESULT create_view( const struct property *, const WCHAR *, const struct expr *, - struct view ** ) DECLSPEC_HIDDEN; +HRESULT create_view( const WCHAR *, const struct keyword *, const WCHAR *, const struct property *, + const struct expr *, struct view ** ) DECLSPEC_HIDDEN; void destroy_view( struct view * ) DECLSPEC_HIDDEN; HRESULT execute_view( struct view * ) DECLSPEC_HIDDEN; void init_table_list( void ) DECLSPEC_HIDDEN; diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 236a37d9f7..85d4339e8d 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -67,6 +67,18 @@ static struct property *alloc_property( struct parser *parser, const WCHAR *clas return prop; } +static struct keyword *alloc_keyword( struct parser *parser, const WCHAR *name, const WCHAR *value ) +{ + struct keyword *keyword = alloc_mem( parser, sizeof(*keyword) ); + if (keyword) + { + keyword->name = name; + keyword->value = value; + keyword->next = NULL; + } + return keyword; +} + static WCHAR *get_string( struct parser *parser, const struct string *str ) { const WCHAR *p = str->data; @@ -87,6 +99,18 @@ static WCHAR *get_string( struct parser *parser, const struct string *str ) return ret; } +static WCHAR *get_path( struct parser *parser, const struct string *str ) +{ + const WCHAR *p = str->data; + int len = str->len; + WCHAR *ret; + + if (!(ret = alloc_mem( parser, (len + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, p, len * sizeof(WCHAR) ); + ret[len] = 0; + return ret; +} + static int get_int( struct parser *parser ) { const WCHAR *p = &parser->cmd[parser->idx]; @@ -195,28 +219,92 @@ static int wql_lex( void *val, struct parser *parser ); struct string str; WCHAR *string; struct property *proplist; + struct keyword *keywordlist; struct view *view; struct expr *expr; int integer; } %token TK_SELECT TK_FROM TK_STAR TK_COMMA TK_DOT TK_IS TK_LP TK_RP TK_NULL TK_FALSE TK_TRUE -%token TK_INTEGER TK_WHERE TK_SPACE TK_MINUS TK_ILLEGAL TK_BY -%token <str> TK_STRING TK_ID +%token TK_INTEGER TK_WHERE TK_SPACE TK_MINUS TK_ILLEGAL TK_BY TK_ASSOCIATORS TK_OF +%token <str> TK_STRING TK_ID TK_PATH -%type <string> id +%type <string> id path %type <proplist> prop proplist -%type <view> select +%type <keywordlist> keyword keywordlist +%type <view> query select associatorsof %type <expr> expr prop_val const_val string_val %type <integer> number -%left TK_OR -%left TK_AND -%left TK_NOT -%left TK_EQ TK_NE TK_LT TK_GT TK_LE TK_GE TK_LIKE +%left TK_OR TK_AND TK_NOT TK_EQ TK_NE TK_LT TK_GT TK_LE TK_GE TK_LIKE %% +query: + select + | + associatorsof + ; + +path: + TK_PATH + { + $$ = get_path( ctx, &$1 ); + if (!$$) + YYABORT; + } + ; + +keyword: + id + { + $$ = alloc_keyword( ctx, $1, NULL ); + if (!$$) + YYABORT; + } + | id TK_EQ id + { + $$ = alloc_keyword( ctx, $1, $3 ); + if (!$$) + YYABORT; + } + ; + +keywordlist: + keyword + | keyword keywordlist + { + $1->next = $2; + } + ; + +associatorsof: + TK_ASSOCIATORS TK_OF path + { + HRESULT hr; + struct parser *parser = ctx; + struct view *view; + + hr = create_view( $3, NULL, NULL, NULL, NULL, &view ); + if (hr != S_OK) + YYABORT; + + PARSER_BUBBLE_UP_VIEW( parser, $$, view ); + } + | TK_ASSOCIATORS TK_OF path TK_WHERE keywordlist + { + HRESULT hr; + struct parser *parser = ctx; + struct view *view; + + hr = create_view( $3, $5, NULL, NULL, NULL, &view ); + if (hr != S_OK) + YYABORT; + + PARSER_BUBBLE_UP_VIEW( parser, $$, view ); + } + ; + select: TK_SELECT TK_FROM id { @@ -224,7 +312,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( NULL, $3, NULL, &view ); + hr = create_view( NULL, NULL, $3, NULL, NULL, &view ); if (hr != S_OK) YYABORT; @@ -236,7 +324,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( $2, $4, NULL, &view ); + hr = create_view( NULL, NULL, $4, $2, NULL, &view ); if (hr != S_OK) YYABORT; @@ -248,7 +336,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( $2, $4, $6, &view ); + hr = create_view( NULL, NULL, $4, $2, $6, &view ); if (hr != S_OK) YYABORT; @@ -535,16 +623,18 @@ static const char id_char[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, }; -struct keyword +struct wql_keyword { const WCHAR *name; unsigned int len; int type; }; -#define MAX_TOKEN_LEN 6 +#define MIN_TOKEN_LEN 2 +#define MAX_TOKEN_LEN 11 static const WCHAR andW[] = {'A','N','D'}; +static const WCHAR associatorsW[] = {'A','S','S','O','C','I','A','T','O','R','S'}; static const WCHAR byW[] = {'B','Y'}; static const WCHAR falseW[] = {'F','A','L','S','E'}; static const WCHAR fromW[] = {'F','R','O','M'}; @@ -552,30 +642,33 @@ static const WCHAR isW[] = {'I','S'}; static const WCHAR likeW[] = {'L','I','K','E'}; static const WCHAR notW[] = {'N','O','T'}; static const WCHAR nullW[] = {'N','U','L','L'}; +static const WCHAR ofW[] = {'O','F'}; static const WCHAR orW[] = {'O','R'}; static const WCHAR selectW[] = {'S','E','L','E','C','T'}; static const WCHAR trueW[] = {'T','R','U','E'}; static const WCHAR whereW[] = {'W','H','E','R','E'}; -static const struct keyword keyword_table[] = +static const struct wql_keyword keyword_table[] = { - { andW, ARRAY_SIZE(andW), TK_AND }, - { byW, ARRAY_SIZE(byW), TK_BY }, - { falseW, ARRAY_SIZE(falseW), TK_FALSE }, - { fromW, ARRAY_SIZE(fromW), TK_FROM }, - { isW, ARRAY_SIZE(isW), TK_IS }, - { likeW, ARRAY_SIZE(likeW), TK_LIKE }, - { notW, ARRAY_SIZE(notW), TK_NOT }, - { nullW, ARRAY_SIZE(nullW), TK_NULL }, - { orW, ARRAY_SIZE(orW), TK_OR }, - { selectW, ARRAY_SIZE(selectW), TK_SELECT }, - { trueW, ARRAY_SIZE(trueW), TK_TRUE }, - { whereW, ARRAY_SIZE(whereW), TK_WHERE } + { andW, ARRAY_SIZE(andW), TK_AND }, + { associatorsW, ARRAY_SIZE(associatorsW), TK_ASSOCIATORS }, + { byW, ARRAY_SIZE(byW), TK_BY }, + { falseW, ARRAY_SIZE(falseW), TK_FALSE }, + { fromW, ARRAY_SIZE(fromW), TK_FROM }, + { isW, ARRAY_SIZE(isW), TK_IS }, + { likeW, ARRAY_SIZE(likeW), TK_LIKE }, + { notW, ARRAY_SIZE(notW), TK_NOT }, + { nullW, ARRAY_SIZE(nullW), TK_NULL }, + { ofW, ARRAY_SIZE(ofW), TK_OF }, + { orW, ARRAY_SIZE(orW), TK_OR }, + { selectW, ARRAY_SIZE(selectW), TK_SELECT }, + { trueW, ARRAY_SIZE(trueW), TK_TRUE }, + { whereW, ARRAY_SIZE(whereW), TK_WHERE } }; static int cmp_keyword( const void *arg1, const void *arg2 ) { - const struct keyword *key1 = arg1, *key2 = arg2; + const struct wql_keyword *key1 = arg1, *key2 = arg2; int len = min( key1->len, key2->len ); int ret; @@ -587,14 +680,14 @@ static int cmp_keyword( const void *arg1, const void *arg2 ) static int keyword_type( const WCHAR *str, unsigned int len ) { - struct keyword key, *ret; + struct wql_keyword key, *ret; - if (len > MAX_TOKEN_LEN) return TK_ID; + if (len < MIN_TOKEN_LEN || len > MAX_TOKEN_LEN) return TK_ID; key.name = str; key.len = len; key.type = 0; - ret = bsearch( &key, keyword_table, ARRAY_SIZE(keyword_table), sizeof(struct keyword), cmp_keyword ); + ret = bsearch( &key, keyword_table, ARRAY_SIZE(keyword_table), sizeof(struct wql_keyword), cmp_keyword ); if (ret) return ret->type; return TK_ID; } @@ -622,6 +715,15 @@ static int get_token( const WCHAR *s, int *token ) case ')': *token = TK_RP; return 1; + case '{': + for (i = 1; s[i] != '}'; i++) {} + if (s[i] != '}') + { + *token = TK_ILLEGAL; + return i; + } + *token = TK_PATH; + return i + 1; case '*': *token = TK_STAR; return 1; -- 2.11.0

2 1

[PATCH 2/2] dxgi: Forbid creating D3D12 swapchains on desktop window.
by Józef Kucia 24 Jun '19

24 Jun '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 4 ++-- dlls/dxgi/swapchain.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index d23aba9dce23..54eec6b94fb4 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -1404,12 +1404,12 @@ static void test_desktop_window(void) swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; swapchain_desc.Flags = 0; hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); - todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); swapchain_desc.Width = rect.right; swapchain_desc.Height = rect.bottom; hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); - todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); IDXGIFactory4_Release(factory); destroy_test_context(&context); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4f01d9ce0240..1bc59f48e90d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2683,6 +2683,12 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkResult vr; HRESULT hr; + if (window == GetDesktopWindow()) + { + WARN("D3D12 swapchain cannot be created on desktop window.\n"); + return E_ACCESSDENIED; + } + swapchain->IDXGISwapChain3_iface.lpVtbl = &d3d12_swapchain_vtbl; swapchain->refcount = 1; -- 2.21.0

2 1

[PATCH 1/2] d3d12/tests: Add test for creating swapchain on desktop window.
by Józef Kucia 24 Jun '19

24 Jun '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 59 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index ae750af40aed..d23aba9dce23 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -308,6 +308,7 @@ static ID3D12CommandQueue *create_command_queue_(unsigned int line, struct test_context_desc { + BOOL no_render_target; BOOL no_pipeline; const D3D12_SHADER_BYTECODE *ps; }; @@ -436,6 +437,9 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, ok_(__FILE__, line)(hr == S_OK, "Failed to create command list %u, hr %#x.\n", i, hr); } + if (desc && desc->no_render_target) + return TRUE; + rtv_heap_desc.NumDescriptors = MAX_FRAME_COUNT; rtv_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; rtv_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; @@ -1011,6 +1015,7 @@ static void test_swapchain_draw(void) {DXGI_FORMAT_R10G10B10A2_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xc00ffc00}, }; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1088,6 +1093,7 @@ static void test_swapchain_refcount(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1165,6 +1171,7 @@ static void test_swapchain_size_mismatch(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1287,6 +1294,7 @@ static void test_swapchain_backbuffer_index(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1357,6 +1365,56 @@ static void test_swapchain_backbuffer_index(void) destroy_test_context(&context); } +static void test_desktop_window(void) +{ + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; + struct test_context_desc desc; + struct test_context context; + IDXGISwapChain1 *swapchain; + IDXGIFactory4 *factory; + IUnknown *queue; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = TRUE; + if (!init_test_context(&context, NULL)) + return; + queue = (IUnknown *)context.queue; + + window = GetDesktopWindow(); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + + swapchain_desc.Width = 640; + swapchain_desc.Height = 480; + swapchain_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.Stereo = FALSE; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 2; + swapchain_desc.Scaling = DXGI_SCALING_STRETCH; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; + swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; + swapchain_desc.Flags = 0; + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); + todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + + swapchain_desc.Width = rect.right; + swapchain_desc.Height = rect.bottom; + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); + todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + + IDXGIFactory4_Release(factory); + destroy_test_context(&context); +} + START_TEST(d3d12) { BOOL enable_debug_layer = FALSE; @@ -1391,4 +1449,5 @@ START_TEST(d3d12) test_swapchain_refcount(); test_swapchain_size_mismatch(); test_swapchain_backbuffer_index(); + test_desktop_window(); } -- 2.21.0

2 1

[PATCH 1/2] ddraw: Factor out fixup_texture_alpha_op() function.
by Paul Gofman 24 Jun '19

24 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/device.c | 78 +++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 48 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e07fe007f0..266499df4d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2664,6 +2664,33 @@ static HRESULT WINAPI d3d_device7_SetRenderState_FPUPreserve(IDirect3DDevice7 *i return hr; } +static void fixup_texture_alpha_op(struct d3d_device *device) +{ + /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. + See d3d_device3_SetRenderState() for details. */ + struct wined3d_texture *tex; + BOOL tex_alpha = FALSE; + DDPIXELFORMAT ddfmt; + + if (!(device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE)) + return; + + if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) + { + struct wined3d_resource_desc desc; + + wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); + ddfmt.dwSize = sizeof(ddfmt); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); + if (ddfmt.u5.dwRGBAlphaBitMask) + tex_alpha = TRUE; + } + + /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ + wined3d_device_set_texture_stage_state(device->wined3d_device, + 0, WINED3D_TSS_ALPHA_OP, tex_alpha ? WINED3D_TOP_SELECT_ARG1 : WINED3D_TOP_SELECT_ARG2); +} + static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, D3DRENDERSTATETYPE state, DWORD value) { @@ -2734,32 +2761,14 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, } device->legacyTextureBlending = TRUE; + device->texture_map_blend = value; switch (value) { case D3DTBLEND_MODULATE: { - struct wined3d_texture *tex = NULL; - BOOL tex_alpha = FALSE; - DDPIXELFORMAT ddfmt; - - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) - { - struct wined3d_resource_desc desc; + fixup_texture_alpha_op(device); - wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) - tex_alpha = TRUE; - } - - if (tex_alpha) - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1); - else - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); wined3d_device_set_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); wined3d_device_set_texture_stage_state(device->wined3d_device, @@ -2829,7 +2838,6 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, default: FIXME("Unhandled texture environment %#x.\n", value); } - device->texture_map_blend = value; hr = D3D_OK; break; } @@ -4908,33 +4916,7 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, hr = IDirect3DDevice7_SetTexture(&device->IDirect3DDevice7_iface, stage, &tex->IDirectDrawSurface7_iface); - if (device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE) - { - /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. - See d3d_device3_SetRenderState() for details. */ - struct wined3d_texture *tex = NULL; - BOOL tex_alpha = FALSE; - DDPIXELFORMAT ddfmt; - - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) - tex_alpha = TRUE; - } - - /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ - if (tex_alpha) - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1); - else - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); - } + fixup_texture_alpha_op(device); wined3d_mutex_unlock(); -- 2.21.0

3 4

[PATCH] d3drm: CreateViewport checks for non-NULL viewport pointer first
by Jeff Smith 24 Jun '19

24 Jun '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/d3drm.c | 18 ++++++++++++------ dlls/d3drm/tests/d3drm.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8ef5830efb..0b3af02a5a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -568,10 +568,12 @@ static HRESULT WINAPI d3drm1_CreateViewport(IDirect3DRM *iface, IDirect3DRMDevic TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) return hr; @@ -1090,10 +1092,12 @@ static HRESULT WINAPI d3drm2_CreateViewport(IDirect3DRM2 *iface, IDirect3DRMDevi TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) return hr; @@ -1761,10 +1765,12 @@ static HRESULT WINAPI d3drm3_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevi TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = d3drm_viewport_create(&object, &d3drm->IDirect3DRM_iface))) return hr; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index cc4f8fe16a..14b5b2f770 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1799,42 +1799,72 @@ static void test_Viewport(void) ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); /* Test all failures together */ + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); -- 2.14.3

2 1

[PATCH v3 5/5] gdi32: Also accept "\\.\DISPLAY<n>" devices names with <n> other than 1 as display devices.
by Zhiyi Zhang 24 Jun '19

24 Jun '19

From: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 96c2f1f129..dcbc480376 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -135,6 +135,32 @@ static const struct gdi_dc_funcs *get_display_driver(void) } +/********************************************************************** + * is_display_device + */ +static BOOL is_display_device( LPCWSTR name ) +{ + static const WCHAR display_deviceW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + const WCHAR *p = name; + + if (strncmpiW( name, display_deviceW, sizeof(display_deviceW) / sizeof(WCHAR) )) + return FALSE; + + p += sizeof(display_deviceW) / sizeof(WCHAR); + + if (!isdigitW( *p++ )) + return FALSE; + + for (; *p; p++) + { + if (!isdigitW( *p )) + return FALSE; + } + + return TRUE; +} + + /********************************************************************** * DRIVER_load_driver */ @@ -143,10 +169,9 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) HMODULE module; struct graphics_driver *driver, *new_driver; static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; - static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return get_display_driver(); + if (!strcmpiW( name, displayW ) || is_display_device( name )) return get_display_driver(); if ((module = GetModuleHandleW( name ))) { @@ -883,13 +908,12 @@ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) { static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; static const WCHAR devicesW[] = { 'd','e','v','i','c','e','s',0 }; - static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static const WCHAR empty_strW[] = { 0 }; WCHAR *p; /* display is a special case */ if (!strcmpiW( device, displayW ) || - !strcmpiW( device, display1W )) + is_display_device( device )) { lstrcpynW( driver, displayW, size ); return TRUE; -- 2.15.2 (Apple Git-101.1)

3 2

[PATCH v3 4/5] winex11.drv: Use generic GetMonitorInfo.
by Zhiyi Zhang 24 Jun '19

24 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 23 ------------------ dlls/user32/sysparams.c | 51 +++++++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 1 + dlls/winex11.drv/display.c | 12 +++++++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 40 +++--------------------------- 7 files changed, 69 insertions(+), 61 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index bf600708ed..921ea2c962 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -197,8 +197,6 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ -#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) - static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { return 0; @@ -359,27 +357,6 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM return FALSE; } -static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) -{ - RECT r = {0, 0, 640, 480}; - static const WCHAR device[] = {'W','i','n','D','i','s','c',0}; - - TRACE("(%p, %p)\n", handle, info); - - if (handle != NULLDRV_DEFAULT_HMONITOR) - { - SetLastError(ERROR_INVALID_MONITOR_HANDLE); - return FALSE; - } - - info->rcMonitor = r; - info->rcWork = r; - info->dwFlags = MONITORINFOF_PRIMARY; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); - return TRUE; -} - static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) { return TRUE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e7aa418f09..311ea5b2ad 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -252,6 +252,8 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); #define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) @@ -3720,6 +3722,55 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return MonitorFromRect( &rect, dwFlags ); } +BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR adapter_name[CCHDEVICENAME]; + HDEVINFO devinfo; + HANDLE mutex; + DWORD type; + BOOL ret; + + TRACE("(%p, %p)\n", handle, info); + + /* Fallback to report one monitor */ + if (handle == NULLDRV_DEFAULT_HMONITOR) + { + RECT default_rect = {0, 0, 640, 480}; + info->rcMonitor = default_rect; + info->rcWork = default_rect; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, DEFAULT_ADAPTER_NAME ); + return TRUE; + } + + /* Use SetupAPI to get monitors */ + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) + { + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&info->rcMonitor, sizeof(info->rcMonitor), NULL, 0 ); + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, + (BYTE *)&info->rcWork, sizeof(info->rcWork), NULL, 0 ); + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, + (BYTE *)adapter_name, sizeof(adapter_name), NULL, 0 ); + info->dwFlags = !lstrcmpW( DEFAULT_ADAPTER_NAME, adapter_name ) ? MONITORINFOF_PRIMARY : 0; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, adapter_name ); + ret = TRUE; + } + else + { + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); + ret = FALSE; + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + return ret; +} + /*********************************************************************** * GetMonitorInfoA (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a503ebe4db..c11aae707c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -123,6 +123,7 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) DECLSPEC_HIDDEN; struct received_message_info; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index d6969b0cfe..f5ef65f428 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -42,12 +42,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', @@ -281,6 +284,15 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; + /* RcWork */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) + goto done; + /* Adapter name */ + sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, + (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 5b00a5dc5d..c0e24d8fe8 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -21,7 +21,6 @@ @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx -@ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow @ cdecl DestroyWindow(long) X11DRV_DestroyWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a6b07699a7..9ab948f724 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -697,6 +697,8 @@ struct x11drv_monitor WCHAR name[128]; /* RcMonitor in MONITORINFO struct */ RECT rc_monitor; + /* RcWork in MONITORINFO struct */ + RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c8fa63f459..75ef3a2a99 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -57,18 +57,6 @@ static inline MONITORINFOEXW *get_primary(void) return &monitors[idx]; } -static inline HMONITOR index_to_monitor( int index ) -{ - return (HMONITOR)(UINT_PTR)(index + 1); -} - -static inline int monitor_to_index( HMONITOR handle ) -{ - UINT_PTR index = (UINT_PTR)handle; - if (index < 1 || index > nb_monitors) return -1; - return index - 1; -} - static void query_work_area( RECT *rc_work ) { Atom type; @@ -154,8 +142,6 @@ static int query_screens(void) monitors[i].dwFlags = 0; if (!IntersectRect( &monitors[i].rcWork, &rc_work, &monitors[i].rcMonitor )) monitors[i].rcWork = monitors[i].rcMonitor; - /* FIXME: using the same device name for all monitors for now */ - lstrcpyW( monitors[i].szDevice, default_monitor.szDevice ); } get_primary()->dwFlags |= MONITORINFOF_PRIMARY; @@ -322,6 +308,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); monitor[index].rc_monitor = monitors[i].rcMonitor; + monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -371,8 +358,8 @@ void xinerama_init( unsigned int width, unsigned int height ) OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); UnionRect( &virtual_screen_rect, &virtual_screen_rect, &monitors[i].rcMonitor ); - TRACE( "monitor %p: %s work %s%s\n", - index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), + TRACE( "monitor 0x%x: %s work %s%s\n", + i, wine_dbgstr_rect(&monitors[i].rcMonitor), wine_dbgstr_rect(&monitors[i].rcWork), (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } @@ -390,24 +377,3 @@ void xinerama_init( unsigned int width, unsigned int height ) TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } - - -/*********************************************************************** - * X11DRV_GetMonitorInfo (X11DRV.@) - */ -BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) -{ - int i = monitor_to_index( handle ); - - if (i == -1) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - info->rcMonitor = monitors[i].rcMonitor; - info->rcWork = monitors[i].rcWork; - info->dwFlags = monitors[i].dwFlags; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); - return TRUE; -} -- 2.15.2 (Apple Git-101.1)

2 1

[PATCH v3 2/5] user32: Avoid a possible race.
by Zhiyi Zhang 24 Jun '19

24 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3e457f09c4..4d644b9edf 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -701,6 +701,21 @@ void release_display_dc( HDC hdc ) LeaveCriticalSection( &display_dc_section ); } +static HANDLE get_display_device_init_mutex( void ) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW( NULL, FALSE, init_mutexW ); + + WaitForSingleObject( mutex, INFINITE ); + return mutex; +} + +static void release_display_device_init_mutex( HANDLE mutex ) +{ + ReleaseMutex( mutex ); + CloseHandle( mutex ); +} + /* map value from system dpi to standard 96 dpi for storing in the registry */ static int map_from_system_dpi( int val ) { @@ -3871,6 +3886,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i WCHAR bufferW[1024]; LONG adapter_index; WCHAR *next_charW; + HANDLE mutex; DWORD size; DWORD type; HKEY hkey; @@ -3878,13 +3894,15 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i TRACE("%s %d %p %#x\n", debugstr_w( device ), index, info, flags); + mutex = get_display_device_init_mutex(); + /* Find adapter */ if (!device) { sprintfW( key_nameW, VIDEO_VALUE_FMT, index ); size = sizeof(bufferW); if (RegGetValueW( HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) - return FALSE; + goto done; /* DeviceKey */ if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) @@ -3900,13 +3918,13 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i size = sizeof(info->DeviceString); if (RegGetValueW( HKEY_LOCAL_MACHINE, key_nameW, DRIVER_DESC, RRF_RT_REG_SZ, NULL, info->DeviceString, &size )) - return FALSE; + goto done; /* StateFlags */ size = sizeof(info->StateFlags); if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, STATE_FLAGS, RRF_RT_REG_DWORD, NULL, &info->StateFlags, &size )) - return FALSE; + goto done; /* DeviceID */ if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) @@ -3918,7 +3936,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i size = sizeof(bufferW); if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, GPU_ID, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, bufferW, &size )) - return FALSE; + goto done; set = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); if (!SetupDiOpenDeviceInfoW( set, bufferW, NULL, 0, &device_data ) || !SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, @@ -3933,14 +3951,14 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i { /* Check adapter name */ if (strncmpiW( device, DISPLAY, ARRAY_SIZE(DISPLAY) )) - return FALSE; + goto done; adapter_index = strtolW( device + ARRAY_SIZE(DISPLAY), NULL, 10 ); sprintfW( key_nameW, VIDEO_VALUE_FMT, adapter_index - 1 ); size = sizeof(bufferW); if (RegGetValueW( HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) - return FALSE; + goto done; /* DeviceName */ sprintfW( info->DeviceName, MONITOR_FMT, adapter_index, index ); @@ -3952,7 +3970,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i size = sizeof(instanceW); if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size )) - return FALSE; + goto done; set = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_MONITOR, NULL ); if (!SetupDiOpenDeviceInfoW( set, instanceW, NULL, 0, &device_data )) @@ -4016,6 +4034,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i ret = TRUE; done: + release_display_device_init_mutex( mutex ); SetupDiDestroyDeviceInfoList( set ); if (ret) return ret; -- 2.15.2 (Apple Git-101.1)

3 2

[PATCH v3 1/5] user32: Move EnumDisplayDevicesA/W.
by Zhiyi Zhang 24 Jun '19

24 Jun '19

Because most of the monitor functions are in sysparams.c. And format the string constants to be more consistent with the style in sysparams.c. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Fix test failure. Avoid a race issue. Delete unused code. Supersede 166972~166974 dlls/user32/misc.c | 313 ------------------------------------------------ dlls/user32/sysparams.c | 298 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 298 insertions(+), 313 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 5f26cf9af3..bed5812a47 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -28,14 +28,7 @@ #include "wine/windef16.h" #include "winbase.h" #include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winnls.h" -#include "winternl.h" #include "controls.h" -#include "initguid.h" -#include "devguid.h" -#include "setupapi.h" #include "user_private.h" #include "wine/unicode.h" @@ -43,66 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -/* Wine specific monitor properties */ -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); - -static const WCHAR default_adapter_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR default_monitor_name[] = - {'\\','\\','.','\\', - 'D','I','S','P','L','A','Y','1','\\', - 'M','o','n','i','t','o','r','0',0}; -static const WCHAR default_adapter_string[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; -static const WCHAR default_monitor_string[] = - {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; -static const WCHAR default_adapter_id[] = - {'P','C','I','\\', - 'V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0','&', - 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', - 'R','E','V','_','0','0',0}; -static const WCHAR default_monitor_id[] = - {'M','O','N','I','T','O','R','\\', - 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', - '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', - 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', - '\\','0','0','0','0',0}; -static const WCHAR default_monitor_interface_id[] = - {'\\','\\','\?','\\', - 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', - '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', - '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', - 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; - -static const WCHAR monitor_fmtW[] = - {'\\','\\','.','\\', - 'D','I','S','P','L','A','Y','%','d','\\', - 'M','o','n','i','t','o','r','%','d',0}; -static const WCHAR adapter_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; -static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; -static const WCHAR video_keyW[] = - {'H','A','R','D','W','A','R','E','\\', - 'D','E','V','I','C','E','M','A','P','\\', - 'V','I','D','E','O','\\',0}; -static const WCHAR video_value_fmtW[] = - {'\\','D','e','v','i','c','e','\\', - 'V','i','d','e','o','%','d',0}; -static const WCHAR monitor_interface_prefixW[] = {'\\','\\','\?','\\',0}; -static const WCHAR guid_devinterface_monitorW[] = - {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', - '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; -static const WCHAR backslashW[] = {'\\',0}; -static const WCHAR nt_classW[] = - {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\', - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'C','l','a','s','s','\\',0}; -static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; -static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; -static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; -static const WCHAR mointor_id_value_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; - #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -307,252 +240,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -/*********************************************************************** - * EnumDisplayDevicesA (USER32.@) - */ -BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpDispDev, - DWORD dwFlags ) -{ - UNICODE_STRING deviceW; - DISPLAY_DEVICEW ddW; - BOOL ret; - - if(lpDevice) - RtlCreateUnicodeStringFromAsciiz(&deviceW, lpDevice); - else - deviceW.Buffer = NULL; - - ddW.cb = sizeof(ddW); - ret = EnumDisplayDevicesW(deviceW.Buffer, i, &ddW, dwFlags); - RtlFreeUnicodeString(&deviceW); - - if(!ret) return ret; - - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceName, -1, lpDispDev->DeviceName, sizeof(lpDispDev->DeviceName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceString, -1, lpDispDev->DeviceString, sizeof(lpDispDev->DeviceString), NULL, NULL); - lpDispDev->StateFlags = ddW.StateFlags; - - if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceID) + sizeof(lpDispDev->DeviceID)) - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceID, -1, lpDispDev->DeviceID, sizeof(lpDispDev->DeviceID), NULL, NULL); - if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceKey) + sizeof(lpDispDev->DeviceKey)) - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceKey, -1, lpDispDev->DeviceKey, sizeof(lpDispDev->DeviceKey), NULL, NULL); - - return TRUE; -} - -/*********************************************************************** - * EnumDisplayDevicesW (USER32.@) - */ -BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, - DWORD dwFlags ) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO set = INVALID_HANDLE_VALUE; - WCHAR key_nameW[MAX_PATH]; - WCHAR instanceW[MAX_PATH]; - WCHAR bufferW[1024]; - LONG adapter_index; - WCHAR *next_charW; - DWORD size; - DWORD type; - HKEY hkey; - BOOL ret = FALSE; - - TRACE("%s %d %p %#x\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); - - /* Find adapter */ - if (!lpDevice) - { - sprintfW(key_nameW, video_value_fmtW, i); - size = sizeof(bufferW); - if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) - return FALSE; - - /* DeviceKey */ - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lstrcpyW(lpDisplayDevice->DeviceKey, bufferW); - - /* DeviceName */ - sprintfW(lpDisplayDevice->DeviceName, adapter_fmtW, i + 1); - - /* Strip \Registry\Machine\ */ - lstrcpyW(key_nameW, bufferW + 18); - - /* DeviceString */ - size = sizeof(lpDisplayDevice->DeviceString); - if (RegGetValueW(HKEY_LOCAL_MACHINE, key_nameW, driver_descW, RRF_RT_REG_SZ, NULL, - lpDisplayDevice->DeviceString, &size)) - return FALSE; - - /* StateFlags */ - size = sizeof(lpDisplayDevice->StateFlags); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, state_flagsW, RRF_RT_REG_DWORD, NULL, - &lpDisplayDevice->StateFlags, &size)) - return FALSE; - - /* DeviceID */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - lpDisplayDevice->DeviceID[0] = 0; - else - { - size = sizeof(bufferW); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, gpu_idW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, - bufferW, &size)) - return FALSE; - set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); - if (!SetupDiOpenDeviceInfoW(set, bufferW, NULL, 0, &device_data) - || !SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - lstrcpyW(lpDisplayDevice->DeviceID, bufferW); - } - } - } - /* Find monitor */ - else - { - /* Check adapter name */ - if (strncmpiW(lpDevice, displayW, ARRAY_SIZE(displayW))) - return FALSE; - - adapter_index = strtolW(lpDevice + ARRAY_SIZE(displayW), NULL, 10); - sprintfW(key_nameW, video_value_fmtW, adapter_index - 1); - - size = sizeof(bufferW); - if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) - return FALSE; - - /* DeviceName */ - sprintfW(lpDisplayDevice->DeviceName, monitor_fmtW, adapter_index, i); - - /* Get monitor instance */ - /* Strip \Registry\Machine\ first */ - lstrcpyW(key_nameW, bufferW + 18); - sprintfW(bufferW, mointor_id_value_fmtW, i); - - size = sizeof(instanceW); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size)) - return FALSE; - - set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); - if (!SetupDiOpenDeviceInfoW(set, instanceW, NULL, 0, &device_data)) - goto done; - - /* StateFlags */ - if (!SetupDiGetDevicePropertyW(set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&lpDisplayDevice->StateFlags, sizeof(lpDisplayDevice->StateFlags), NULL, 0)) - goto done; - - /* DeviceString */ - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DEVICEDESC, NULL, - (BYTE *)lpDisplayDevice->DeviceString, - sizeof(lpDisplayDevice->DeviceString), NULL)) - goto done; - - /* DeviceKey */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - { - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcpyW(lpDisplayDevice->DeviceKey, nt_classW); - lstrcatW(lpDisplayDevice->DeviceKey, bufferW); - } - - /* DeviceID */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - { - lstrcpyW(lpDisplayDevice->DeviceID, monitor_interface_prefixW); - lstrcatW(lpDisplayDevice->DeviceID, instanceW); - lstrcatW(lpDisplayDevice->DeviceID, guid_devinterface_monitorW); - /* Replace '\\' with '#' after prefix */ - for (next_charW = lpDisplayDevice->DeviceID + strlenW(monitor_interface_prefixW); *next_charW; - next_charW++) - { - if (*next_charW == '\\') - *next_charW = '#'; - } - } - else - { - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcpyW(lpDisplayDevice->DeviceID, bufferW); - lstrcatW(lpDisplayDevice->DeviceID, backslashW); - - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcatW(lpDisplayDevice->DeviceID, bufferW); - } - } - } - - ret = TRUE; -done: - SetupDiDestroyDeviceInfoList(set); - if (ret) - return ret; - - /* Fallback to report at least one adapter and monitor, if user driver didn't initialize display device registry */ - if (i) - return FALSE; - - /* If user driver did initialize the registry, then exit */ - if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &hkey)) - { - RegCloseKey(hkey); - return FALSE; - } - WARN("Reporting fallback display devices\n"); - - /* Adapter */ - if (!lpDevice) - { - memcpy(lpDisplayDevice->DeviceName, default_adapter_name, sizeof(default_adapter_name)); - memcpy(lpDisplayDevice->DeviceString, default_adapter_string, sizeof(default_adapter_string)); - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - lpDisplayDevice->DeviceID[0] = 0; - else - memcpy(lpDisplayDevice->DeviceID, default_adapter_id, sizeof(default_adapter_id)); - } - } - /* Monitor */ - else - { - if (lstrcmpiW(default_adapter_name, lpDevice)) - return FALSE; - - memcpy(lpDisplayDevice->DeviceName, default_monitor_name, sizeof(default_monitor_name)); - memcpy(lpDisplayDevice->DeviceString, default_monitor_string, sizeof(default_monitor_string)); - lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - memcpy(lpDisplayDevice->DeviceID, default_monitor_interface_id, sizeof(default_monitor_interface_id)); - else - memcpy(lpDisplayDevice->DeviceID, default_monitor_id, sizeof(default_monitor_id)); - } - } - - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; - - return TRUE; -} - /*********************************************************************** * QueryDisplayConfig (USER32.@) */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 9a5c3cf8d5..3e457f09c4 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -34,10 +34,14 @@ #include "winbase.h" #include "winnls.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "wine/wingdi16.h" #include "winerror.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "controls.h" #include "win.h" #include "user_private.h" @@ -245,6 +249,56 @@ static const WCHAR CSu[] = {'%','u',0}; static const WCHAR CSd[] = {'%','d',0}; static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); + +/* Strings for monitor functions */ +static const WCHAR DEFAULT_ADAPTER_NAME[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR DEFAULT_MONITOR_NAME[] = {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','1','\\', + 'M','o','n','i','t','o','r','0',0}; +static const WCHAR DEFAULT_ADAPTER_STRING[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; +static const WCHAR DEFAULT_MONITOR_STRING[] = {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; +static const WCHAR DEFAULT_ADAPTER_ID[] = {'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR DEFAULT_MONITOR_ID[] = {'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', + 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', + '\\','0','0','0','0',0}; +static const WCHAR DEFAULT_MONITOR_INTERFACE_ID[] = {'\\','\\','\?','\\', + 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', + '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', + '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', + 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +static const WCHAR BACKSLASH[] = {'\\',0}; +static const WCHAR DRIVER_DESC[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR STATE_FLAGS[] = {'S','t','a','t','e','F','l','a','g','s',0}; +static const WCHAR GPU_ID[] = {'G','P','U','I','D',0}; +static const WCHAR DISPLAY[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR MONITOR_ID_VALUE_FMT[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR VIDEO_KEY[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; +static const WCHAR NT_CLASS[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; +static const WCHAR ADAPTER_FMT[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; +static const WCHAR MONITOR_FMT[] = {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','%','d','\\', + 'M','o','n','i','t','o','r','%','d',0}; +static const WCHAR VIDEO_VALUE_FMT[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR MONITOR_INTERFACE_PREFIX[] = {'\\','\\','\?','\\',0}; +static const WCHAR GUID_DEVINTERFACE_MONITOR[] = {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', + '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; + static HDC display_dc; static CRITICAL_SECTION display_dc_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -3772,6 +3826,250 @@ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPA return USER_Driver->pEnumDisplayMonitors( 0, NULL, enum_mon_callback, (LPARAM)&data ); } +/*********************************************************************** + * EnumDisplayDevicesA (USER32.@) + */ +BOOL WINAPI EnumDisplayDevicesA( LPCSTR device, DWORD index, DISPLAY_DEVICEA *info, DWORD flags ) +{ + UNICODE_STRING deviceW; + DISPLAY_DEVICEW ddW; + BOOL ret; + + if (device) + RtlCreateUnicodeStringFromAsciiz( &deviceW, device ); + else + deviceW.Buffer = NULL; + + ddW.cb = sizeof(ddW); + ret = EnumDisplayDevicesW( deviceW.Buffer, index, &ddW, flags ); + RtlFreeUnicodeString( &deviceW ); + + if (!ret) + return ret; + + WideCharToMultiByte( CP_ACP, 0, ddW.DeviceName, -1, info->DeviceName, sizeof(info->DeviceName), NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, ddW.DeviceString, -1, info->DeviceString, sizeof(info->DeviceString), NULL, NULL ); + info->StateFlags = ddW.StateFlags; + + if (info->cb >= offsetof(DISPLAY_DEVICEA, DeviceID) + sizeof(info->DeviceID)) + WideCharToMultiByte( CP_ACP, 0, ddW.DeviceID, -1, info->DeviceID, sizeof(info->DeviceID), NULL, NULL ); + if (info->cb >= offsetof(DISPLAY_DEVICEA, DeviceKey) + sizeof(info->DeviceKey)) + WideCharToMultiByte( CP_ACP, 0, ddW.DeviceKey, -1, info->DeviceKey, sizeof(info->DeviceKey), NULL, NULL ); + + return TRUE; +} + +/*********************************************************************** + * EnumDisplayDevicesW (USER32.@) + */ +BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO set = INVALID_HANDLE_VALUE; + WCHAR key_nameW[MAX_PATH]; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + LONG adapter_index; + WCHAR *next_charW; + DWORD size; + DWORD type; + HKEY hkey; + BOOL ret = FALSE; + + TRACE("%s %d %p %#x\n", debugstr_w( device ), index, info, flags); + + /* Find adapter */ + if (!device) + { + sprintfW( key_nameW, VIDEO_VALUE_FMT, index ); + size = sizeof(bufferW); + if (RegGetValueW( HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) + return FALSE; + + /* DeviceKey */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) + lstrcpyW( info->DeviceKey, bufferW ); + + /* DeviceName */ + sprintfW( info->DeviceName, ADAPTER_FMT, index + 1 ); + + /* Strip \Registry\Machine\ */ + lstrcpyW( key_nameW, bufferW + 18 ); + + /* DeviceString */ + size = sizeof(info->DeviceString); + if (RegGetValueW( HKEY_LOCAL_MACHINE, key_nameW, DRIVER_DESC, RRF_RT_REG_SZ, NULL, + info->DeviceString, &size )) + return FALSE; + + /* StateFlags */ + size = sizeof(info->StateFlags); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, STATE_FLAGS, RRF_RT_REG_DWORD, NULL, + &info->StateFlags, &size )) + return FALSE; + + /* DeviceID */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + info->DeviceID[0] = 0; + else + { + size = sizeof(bufferW); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, GPU_ID, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, + bufferW, &size )) + return FALSE; + set = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); + if (!SetupDiOpenDeviceInfoW( set, bufferW, NULL, 0, &device_data ) + || !SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL )) + goto done; + lstrcpyW( info->DeviceID, bufferW ); + } + } + } + /* Find monitor */ + else + { + /* Check adapter name */ + if (strncmpiW( device, DISPLAY, ARRAY_SIZE(DISPLAY) )) + return FALSE; + + adapter_index = strtolW( device + ARRAY_SIZE(DISPLAY), NULL, 10 ); + sprintfW( key_nameW, VIDEO_VALUE_FMT, adapter_index - 1 ); + + size = sizeof(bufferW); + if (RegGetValueW( HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) + return FALSE; + + /* DeviceName */ + sprintfW( info->DeviceName, MONITOR_FMT, adapter_index, index ); + + /* Get monitor instance */ + /* Strip \Registry\Machine\ first */ + lstrcpyW( key_nameW, bufferW + 18 ); + sprintfW( bufferW, MONITOR_ID_VALUE_FMT, index ); + + size = sizeof(instanceW); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size )) + return FALSE; + + set = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_MONITOR, NULL ); + if (!SetupDiOpenDeviceInfoW( set, instanceW, NULL, 0, &device_data )) + goto done; + + /* StateFlags */ + if (!SetupDiGetDevicePropertyW( set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&info->StateFlags, sizeof(info->StateFlags), NULL, 0 )) + goto done; + + /* DeviceString */ + if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DEVICEDESC, NULL, + (BYTE *)info->DeviceString, + sizeof(info->DeviceString), NULL )) + goto done; + + /* DeviceKey */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) + { + if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL )) + goto done; + + lstrcpyW( info->DeviceKey, NT_CLASS ); + lstrcatW( info->DeviceKey, bufferW ); + } + + /* DeviceID */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + { + lstrcpyW( info->DeviceID, MONITOR_INTERFACE_PREFIX ); + lstrcatW( info->DeviceID, instanceW ); + lstrcatW( info->DeviceID, GUID_DEVINTERFACE_MONITOR ); + /* Replace '\\' with '#' after prefix */ + for (next_charW = info->DeviceID + strlenW( MONITOR_INTERFACE_PREFIX ); *next_charW; + next_charW++) + { + if (*next_charW == '\\') + *next_charW = '#'; + } + } + else + { + if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL )) + goto done; + + lstrcpyW( info->DeviceID, bufferW ); + lstrcatW( info->DeviceID, BACKSLASH ); + + if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL )) + goto done; + + lstrcatW( info->DeviceID, bufferW ); + } + } + } + + ret = TRUE; +done: + SetupDiDestroyDeviceInfoList( set ); + if (ret) + return ret; + + /* Fallback to report at least one adapter and monitor, if user driver didn't initialize display device registry */ + if (index) + return FALSE; + + /* If user driver did initialize the registry, then exit */ + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, VIDEO_KEY, &hkey )) + { + RegCloseKey( hkey ); + return FALSE; + } + WARN("Reporting fallback display devices\n"); + + /* Adapter */ + if (!device) + { + memcpy( info->DeviceName, DEFAULT_ADAPTER_NAME, sizeof(DEFAULT_ADAPTER_NAME) ); + memcpy( info->DeviceString, DEFAULT_ADAPTER_STRING, sizeof(DEFAULT_ADAPTER_STRING) ); + info->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + info->DeviceID[0] = 0; + else + memcpy( info->DeviceID, DEFAULT_ADAPTER_ID, sizeof(DEFAULT_ADAPTER_ID) ); + } + } + /* Monitor */ + else + { + if (lstrcmpiW( DEFAULT_ADAPTER_NAME, device )) + return FALSE; + + memcpy( info->DeviceName, DEFAULT_MONITOR_NAME, sizeof(DEFAULT_MONITOR_NAME) ); + memcpy( info->DeviceString, DEFAULT_MONITOR_STRING, sizeof(DEFAULT_MONITOR_STRING) ); + info->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + memcpy( info->DeviceID, DEFAULT_MONITOR_INTERFACE_ID, sizeof(DEFAULT_MONITOR_INTERFACE_ID) ); + else + memcpy( info->DeviceID, DEFAULT_MONITOR_ID, sizeof(DEFAULT_MONITOR_ID) ); + } + } + + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) + info->DeviceKey[0] = 0; + + return TRUE; +} /********************************************************************** * GetAutoRotationState [USER32.@] -- 2.15.2 (Apple Git-101.1)

3 2

[PATCH 2/2] wininet: Always set last error in InternetReadFile.
by Alistair Leslie-Hughes 24 Jun '19

24 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47352 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.c | 3 +-- dlls/wininet/tests/http.c | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6671950f8c..7294241b67 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2193,8 +2193,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, TRACE("-- %s (%u) (bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res, pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1); - if(res != ERROR_SUCCESS) - SetLastError(res); + SetLastError(res); return res == ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 70d57385e5..c8a2796322 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -987,7 +987,10 @@ static void InternetReadFile_chunked_test(void) { char *buffer = HeapAlloc(GetProcessHeap(),0,length+1); + SetLastError(0xdeadbeef); res = InternetReadFile(hor,buffer,length,&got); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); buffer[got]=0; trace("ReadFile -> %i %i\n",res,got); @@ -1000,8 +1003,11 @@ static void InternetReadFile_chunked_test(void) if (length == 0) { got = 0xdeadbeef; + SetLastError(0xdeadbeef); res = InternetReadFile( hor, buffer, 1, &got ); ok( res, "InternetReadFile failed: %u\n", GetLastError() ); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); ok( !got, "got %u\n", got ); break; } -- 2.17.1

2 1

[PATCH 1/2] wininet: Always set last error in HttpQueryInfoW.
by Alistair Leslie-Hughes 24 Jun '19

24 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 4 ++-- dlls/wininet/tests/http.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cbc95fb8ae..c90213bf46 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3911,8 +3911,8 @@ lend: WININET_Release( &request->hdr ); TRACE("%u <--\n", res); - if(res != ERROR_SUCCESS) - SetLastError(res); + + SetLastError(res); return res == ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5a0cc11754..70d57385e5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -722,8 +722,11 @@ static void InternetReadFile_test(int flags, const test_data_t *test) length = sizeof(buffer)-2; memset(buffer, 0x77, sizeof(buffer)); + SetLastError(0xdeadbeef); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); /* show that the function writes data past the length returned */ ok(buffer[length-2], "Expected any header character, got 0x00\n"); ok(!buffer[length-1], "Expected 0x00, got %02X\n", buffer[length-1]); -- 2.17.1

1 0

[PATCH 1/7] wined3d: Return a wined3d_stateblock from wined3d_device_begin_stateblock().
by Zebediah Figura 23 Jun '19

23 Jun '19

And hold it locally in d3d[789]. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/d3d8_private.h | 5 +++-- dlls/d3d8/device.c | 14 +++++++++----- dlls/d3d9/d3d9_private.h | 5 +++-- dlls/d3d9/device.c | 21 +++++++++++++-------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 10 ++++++---- dlls/wined3d/device.c | 30 ++++++++++++++++-------------- dlls/wined3d/wined3d.spec | 4 ++-- include/wine/wined3d.h | 4 ++-- 9 files changed, 55 insertions(+), 40 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 1669ff74315..0d4d4faf898 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -126,12 +126,13 @@ struct d3d8_device DWORD sysmem_vb : 16; /* D3D8_MAX_STREAMS */ DWORD sysmem_ib : 1; DWORD in_destruction : 1; - DWORD recording : 1; - DWORD padding : 13; + DWORD padding : 14; /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ struct wined3d_swapchain *implicit_swapchain; + + struct wined3d_stateblock *recording; }; HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e57e01e42ba..efea4708fda 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -911,7 +911,9 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, TRUE))) { - device->recording = FALSE; + if (device->recording) + wined3d_stateblock_decref(device->recording); + device->recording = NULL; present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; implicit_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchain); implicit_swapchain->swap_interval @@ -1862,13 +1864,14 @@ static HRESULT WINAPI d3d8_device_GetRenderState(IDirect3DDevice8 *iface, static HRESULT WINAPI d3d8_device_BeginStateBlock(IDirect3DDevice8 *iface) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) - device->recording = TRUE; + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + device->recording = stateblock; wined3d_mutex_unlock(); return hr; @@ -1886,14 +1889,15 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * * of memory later and cause locking problems) */ wined3d_mutex_lock(); - hr = wined3d_device_end_stateblock(device->wined3d_device, &stateblock); + hr = wined3d_device_end_stateblock(device->wined3d_device); if (FAILED(hr)) { WARN("Failed to end the state block, %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - device->recording = FALSE; + stateblock = device->recording; + device->recording = NULL; *token = d3d8_allocate_handle(&device->handle_table, stateblock, D3D8_HANDLE_SB); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 8ee521b14b0..c01e3997808 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -108,8 +108,7 @@ struct d3d9_device DWORD in_destruction : 1; DWORD in_scene : 1; DWORD has_vertex_declaration : 1; - DWORD recording : 1; - DWORD padding : 11; + DWORD padding : 12; DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ @@ -117,6 +116,8 @@ struct d3d9_device UINT implicit_swapchain_count; struct wined3d_swapchain **implicit_swapchains; + + struct wined3d_stateblock *recording; }; HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wined3d *wined3d, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9fbdcebf075..9d05771c5d1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -995,7 +995,9 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { - device->recording = FALSE; + if (device->recording) + wined3d_stateblock_decref(device->recording); + device->recording = NULL; device->auto_mipmaps = 0; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); @@ -2350,13 +2352,14 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_BeginStateBlock(IDirect3DDevice9Ex *iface) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) - device->recording = TRUE; + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + device->recording = stateblock; wined3d_mutex_unlock(); return hr; @@ -2372,14 +2375,16 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire TRACE("iface %p, stateblock %p.\n", iface, stateblock); wined3d_mutex_lock(); - hr = wined3d_device_end_stateblock(device->wined3d_device, &wined3d_stateblock); - wined3d_mutex_unlock(); + hr = wined3d_device_end_stateblock(device->wined3d_device); if (FAILED(hr)) { - WARN("Failed to end the state block, hr %#x.\n", hr); - return hr; + wined3d_mutex_unlock(); + WARN("Failed to end the stateblock, hr %#x.\n", hr); + return hr; } - device->recording = FALSE; + wined3d_stateblock = device->recording; + device->recording = NULL; + wined3d_mutex_unlock(); if (!(object = heap_alloc_zero(sizeof(*object)))) { diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b228f3ec355..6bdc7c789fa 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -350,7 +350,7 @@ struct d3d_device struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; - BOOL recording; + struct wined3d_stateblock *recording; }; HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cdf4de8f95d..2c0b85d9a47 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5625,6 +5625,7 @@ static HRESULT WINAPI d3d_device7_GetLight_FPUPreserve(IDirect3DDevice7 *iface, static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("iface %p.\n", iface); @@ -5636,8 +5637,8 @@ static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface) WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); return D3DERR_INBEGINSTATEBLOCK; } - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) - device->recording = TRUE; + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + device->recording = stateblock; wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr); @@ -5695,7 +5696,7 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl WARN("Trying to end a stateblock, but no stateblock is being recorded.\n"); return D3DERR_NOTINBEGINSTATEBLOCK; } - hr = wined3d_device_end_stateblock(device->wined3d_device, &wined3d_sb); + hr = wined3d_device_end_stateblock(device->wined3d_device); if (FAILED(hr)) { WARN("Failed to end stateblock, hr %#x.\n", hr); @@ -5703,7 +5704,8 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl *stateblock = 0; return hr_ddraw_from_wined3d(hr); } - device->recording = FALSE; + wined3d_sb = device->recording; + device->recording = NULL; h = ddraw_allocate_handle(&device->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK); if (h == DDRAW_INVALID_HANDLE) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d35a0648c9c..612278d5d56 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4178,49 +4178,51 @@ HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *devic return wined3d_swapchain_get_display_mode(swapchain, mode, rotation); } -HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device) +HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device, + struct wined3d_stateblock **stateblock) { - struct wined3d_stateblock *stateblock; + struct wined3d_stateblock *object; HRESULT hr; TRACE("device %p.\n", device); if (device->recording) + { + *stateblock = NULL; return WINED3DERR_INVALIDCALL; + } - hr = wined3d_stateblock_create(device, WINED3D_SBT_RECORDED, &stateblock); + hr = wined3d_stateblock_create(device, WINED3D_SBT_RECORDED, &object); if (FAILED(hr)) return hr; - device->recording = stateblock; - device->update_stateblock_state = &stateblock->stateblock_state; + device->recording = object; + device->update_stateblock_state = &object->stateblock_state; + *stateblock = object; - TRACE("Recording stateblock %p.\n", stateblock); + TRACE("Recording stateblock %p.\n", *stateblock); return WINED3D_OK; } -HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device, - struct wined3d_stateblock **stateblock) +HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device) { - struct wined3d_stateblock *object = device->recording; + struct wined3d_stateblock *stateblock = device->recording; - TRACE("device %p, stateblock %p.\n", device, stateblock); + TRACE("device %p.\n", device); if (!device->recording) { WARN("Not recording.\n"); - *stateblock = NULL; return WINED3DERR_INVALIDCALL; } - stateblock_init_contained_states(object); + stateblock_init_contained_states(stateblock); - *stateblock = object; device->recording = NULL; device->update_stateblock_state = &device->stateblock_state; - TRACE("Returning stateblock %p.\n", *stateblock); + TRACE("Ending stateblock %p.\n", stateblock); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 59f99c91e07..9b4f4792f5d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,7 +37,7 @@ @ cdecl wined3d_device_acquire_focus_window(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) -@ cdecl wined3d_device_begin_stateblock(ptr) +@ cdecl wined3d_device_begin_stateblock(ptr ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @@ -55,7 +55,7 @@ @ cdecl wined3d_device_draw_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_draw_primitive_instanced_indirect(ptr ptr long) @ cdecl wined3d_device_end_scene(ptr) -@ cdecl wined3d_device_end_stateblock(ptr ptr) +@ cdecl wined3d_device_end_stateblock(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_base_vertex_index(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abef3f0ad02..27776385313 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2231,7 +2231,7 @@ ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device); +HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); HRESULT __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *device, @@ -2267,7 +2267,7 @@ void __cdecl wined3d_device_draw_primitive_instanced(struct wined3d_device *devi void __cdecl wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); +HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); -- 2.21.0

2 14

[PATCH v4 1/5] wine.inf: Add the GUID_DEVCLASS_SYSTEM class key.
by Zebediah Figura 22 Jun '19

22 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 11298301f55..9f97b346f93 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -465,6 +465,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},"Class",,"System" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" -- 2.21.0

2 5

Wine staging 4.11 release
by Alistair Leslie-Hughes 22 Jun '19

22 Jun '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.11 (818 patches are applied to wine vanilla) NOTE: FAudio will not be supported until distro's have FAudio library as part of their standard repositories. Upstreamed (Either directly from staging or fixed with a similar patch). * ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps. * winex11: Make GetMonitorInfo() give a different device name (\.\DISPLAY<n>) to each monitor. * user32: Implement EnumDisplayDevicesW() based on EnumDisplayMonitors() and GetMonitorInfoW(). * user32: Return a more reasonable display DeviceID. * ntdll/directory: Add support for EXT4 case folding per directory. * dxgi: Improve stubs for MakeWindowAssociation and GetWindowAssociation. * wininet: Silence wininet no support on this platform message. Added: * [37058] mshtml: Improve IOleInPlaceActiveObject TranslateAccelerator. Updated: * kernel32-PE_Loader_Fixes Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

6 7

[PATCH v2 1/5] strmbase: Add default implementations of filter state change methods.
by Zebediah Figura 22 Jun '19

22 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/filter.c | 39 +++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 3 +++ 2 files changed, 42 insertions(+) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 5f57731b7a1..9ed588cf803 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -123,6 +123,45 @@ HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid) return S_OK; } +HRESULT WINAPI BaseFilterImpl_Stop(IBaseFilter *iface) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Stopped; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + +HRESULT WINAPI BaseFilterImpl_Pause(IBaseFilter *iface) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Paused; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + +HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start)); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Running; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ) { BaseFilter *This = impl_from_IBaseFilter(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 8de92b2826b..6abd8c76011 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -184,6 +184,9 @@ typedef struct BaseFilterFuncTable HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface); ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface); +HRESULT WINAPI BaseFilterImpl_Stop(IBaseFilter *iface); +HRESULT WINAPI BaseFilterImpl_Pause(IBaseFilter *iface); +HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start); HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid); HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ); HRESULT WINAPI BaseFilterImpl_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock); -- 2.21.0

1 4

[PATCH 1/5] strmbase: Add default implementations of filter state change methods.
by Zebediah Figura 22 Jun '19

22 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/filter.c | 39 +++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 3 +++ 2 files changed, 42 insertions(+) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 5f57731b7a1..9ed588cf803 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -123,6 +123,45 @@ HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid) return S_OK; } +HRESULT WINAPI BaseFilterImpl_Stop(IBaseFilter *iface) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Stopped; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + +HRESULT WINAPI BaseFilterImpl_Pause(IBaseFilter *iface) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Paused; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + +HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start)); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Running; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ) { BaseFilter *This = impl_from_IBaseFilter(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 8de92b2826b..6abd8c76011 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -184,6 +184,9 @@ typedef struct BaseFilterFuncTable HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface); ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface); +HRESULT WINAPI BaseFilterImpl_Stop(IBaseFilter *iface); +HRESULT WINAPI BaseFilterImpl_Pause(IBaseFilter *iface); +HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start); HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid); HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ); HRESULT WINAPI BaseFilterImpl_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock); -- 2.21.0

2 7

[PATCH 5/5] wined3d: Move texture2d_load_drawable() to texture.c.
by Henri Verbeet 21 Jun '19

21 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 48 ----------------------------------------- dlls/wined3d/texture.c | 49 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 48 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6d3590b3d13..fc8be3827ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1423,54 +1423,6 @@ static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, } /* Context activation is done by the caller. */ -BOOL texture2d_load_drawable(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context) -{ - struct wined3d_texture *restore_texture; - struct wined3d_device *device; - unsigned int restore_idx; - unsigned int level; - RECT r; - - if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) - { - DWORD current = texture->sub_resources[sub_resource_idx].locations; - FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", - wined3d_debug_location(current)); - return FALSE; - } - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && wined3d_resource_is_offscreen(&texture->resource)) - { - ERR("Trying to load offscreen texture into WINED3D_LOCATION_DRAWABLE.\n"); - return FALSE; - } - - device = texture->resource.device; - restore_texture = context->current_rt.texture; - restore_idx = context->current_rt.sub_resource_idx; - if (restore_texture != texture || restore_idx != sub_resource_idx) - context = context_acquire(device, texture, sub_resource_idx); - else - restore_texture = NULL; - - level = sub_resource_idx % texture->level_count; - SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), - wined3d_texture_get_level_height(texture, level)); - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, - texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &r, - texture, sub_resource_idx, WINED3D_LOCATION_DRAWABLE, &r, - NULL, WINED3D_TEXF_POINT); - - if (restore_texture) - context_restore(context, restore_texture, restore_idx); - - return TRUE; -} - -/* Context activation is done by the caller. */ BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ae3e17914f5..4ae869b4b2a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2481,6 +2481,53 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl return FALSE; } +static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context) +{ + struct wined3d_texture *restore_texture; + struct wined3d_device *device; + unsigned int restore_idx; + unsigned int level; + RECT r; + + if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) + { + DWORD current = texture->sub_resources[sub_resource_idx].locations; + FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", + wined3d_debug_location(current)); + return FALSE; + } + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && wined3d_resource_is_offscreen(&texture->resource)) + { + ERR("Trying to load offscreen texture into WINED3D_LOCATION_DRAWABLE.\n"); + return FALSE; + } + + device = texture->resource.device; + restore_texture = context->current_rt.texture; + restore_idx = context->current_rt.sub_resource_idx; + if (restore_texture != texture || restore_idx != sub_resource_idx) + context = context_acquire(device, texture, sub_resource_idx); + else + restore_texture = NULL; + + level = sub_resource_idx % texture->level_count; + SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)); + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); + device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, + texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &r, + texture, sub_resource_idx, WINED3D_LOCATION_DRAWABLE, &r, + NULL, WINED3D_TEXF_POINT); + + if (restore_texture) + context_restore(context, restore_texture, restore_idx); + + return TRUE; +} + static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, BOOL srgb) { @@ -2651,7 +2698,7 @@ static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); case WINED3D_LOCATION_DRAWABLE: - return texture2d_load_drawable(texture, sub_resource_idx, context); + return wined3d_texture_load_drawable(texture, sub_resource_idx, context); case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e23653024b..f796d12446f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3549,8 +3549,6 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co const RECT *dst_rect) DECLSPEC_HIDDEN; void texture2d_get_blt_info(const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *rect, struct wined3d_blt_info *info) DECLSPEC_HIDDEN; -BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context) DECLSPEC_HIDDEN; void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_create_buffer_object().
by Henri Verbeet 21 Jun '19

21 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b664214fb31..5aca952b2cf 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -196,10 +196,10 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu } /* Context activation is done by the caller. */ -static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) +static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, + struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; @@ -269,7 +269,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, &context_gl->c); buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -615,6 +615,9 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + switch (location) { case WINED3D_LOCATION_SYSMEM: @@ -626,7 +629,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return TRUE; case WINED3D_LOCATION_BUFFER: - if (wined3d_buffer_gl(buffer)->buffer_object) + if (buffer_gl->buffer_object) return TRUE; if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) @@ -634,7 +637,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); return FALSE; } - return wined3d_buffer_gl_create_buffer_object(wined3d_buffer_gl(buffer), context); + return wined3d_buffer_gl_create_buffer_object(buffer_gl, context_gl); default: ERR("Invalid location %s.\n", wined3d_debug_location(location)); -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_bind().
by Henri Verbeet 21 Jun '19

21 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8e1ac4819c5..b664214fb31 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -133,10 +133,8 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc } /* Context activation is done by the caller. */ -static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) +static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); } @@ -200,6 +198,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu /* Context activation is done by the caller. */ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; @@ -228,7 +227,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf goto fail; } - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -541,10 +540,11 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_map_range *range; - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--) { @@ -645,6 +645,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); const struct wined3d_gl_info *gl_info = context->gl_info; @@ -680,7 +681,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); @@ -1011,6 +1012,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, unsigned int offset, unsigned int size, BYTE **data, DWORD flags) { struct wined3d_device *device = buffer_gl->b.resource.device; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; LONG count; BYTE *base; @@ -1052,6 +1054,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, const struct wined3d_gl_info *gl_info; context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (flags & WINED3D_MAP_DISCARD) @@ -1070,7 +1073,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (count == 1) { - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 * multitexture fill rate test seems to depend on this. When @@ -1168,12 +1171,14 @@ static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) { struct wined3d_device *device = buffer_gl->b.resource.device; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to find_arb_vs_compile_args().
by Henri Verbeet 21 Jun '19

21 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7b06d641338..c07b23ae71e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4470,18 +4470,17 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, } static void find_arb_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_context *context, const struct wined3d_shader *shader, + const struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct arb_vs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_device *device = shader->device; const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; int i; WORD int_skip; - find_vs_compile_args(state, shader, context->stream_info.swizzle_map, &args->super, context); + find_vs_compile_args(state, shader, context_gl->c.stream_info.swizzle_map, &args->super, &context_gl->c); args->clip.boolclip_compare = 0; if (use_ps(state)) @@ -4496,7 +4495,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, { args->ps_signature = ~0; if (!d3d_info->vs_clipping && adapter->fragment_pipe == &arbfp_fragment_pipeline) - args->clip.boolclip.clip_texcoord = ffp_clip_emul(context) ? d3d_info->limits.ffp_blend_stages : 0; + args->clip.boolclip.clip_texcoord = ffp_clip_emul(&context_gl->c) ? d3d_info->limits.ffp_blend_stages : 0; /* Otherwise: Setting boolclip_compare set clip_texcoord to 0 */ } @@ -4632,7 +4631,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context const struct wined3d_shader_signature *ps_input_sig; TRACE("Using vertex shader %p\n", vs); - find_arb_vs_compile_args(state, context, vs, &compile_args); + find_arb_vs_compile_args(state, context_gl, vs, &compile_args); /* Instead of searching for the signature in the signature list, read the one from the * current pixel shader. It's maybe not the shader where the signature came from, but it -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to find_arb_ps_compile_args().
by Henri Verbeet 21 Jun '19

21 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 273c4f31568..7b06d641338 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4414,15 +4414,15 @@ static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *sh } static void find_arb_ps_compile_args(const struct wined3d_state *state, - const struct wined3d_context *context, const struct wined3d_shader *shader, + const struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct arb_ps_compile_args *args) { - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; int i; WORD int_skip; - find_ps_compile_args(state, shader, context->stream_info.position_transformed, &args->super, context); + find_ps_compile_args(state, shader, context_gl->c.stream_info.position_transformed, &args->super, &context_gl->c); /* This forces all local boolean constants to 1 to make them stateblock independent */ args->bools = shader->reg_maps.local_bool_consts; @@ -4564,7 +4564,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context struct arb_ps_compiled_shader *compiled; TRACE("Using pixel shader %p.\n", ps); - find_arb_ps_compile_args(state, context, ps, &compile_args); + find_arb_ps_compile_args(state, context_gl, ps, &compile_args); compiled = find_arb_pshader(context_gl, ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled; -- 2.11.0

1 0

RFC: Raw-Input Support
by Derek Lesho 21 Jun '19

21 Jun '19

Hello, attached is a patch that adds true raw-input support for mouse movements, bypassing the desktop's sensitivity and mouse acceleration settings. It is mostly complete, however I'd like some input on how I should get retain compatibility with non winex11 display drivers. My idea is to have all display drivers that support any kind of native raw input send a raw input message to wineserver w/ a special flag set and w/ the structure specifying which raw-input events the display driver supports. For example in the case of x11/xinput2, we'd set hw_rawinput_t.mouse.x to 1 indicating that we intend to send native raw movement events. What do you guys think about this approach?

1 0

[PATCH v2 3/3] winex11.drv: Use generic GetMonitorInfo.
by Huw Davies 21 Jun '19

21 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/driver.c | 23 --------------- dlls/user32/sysparams.c | 47 +++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 1 + dlls/winex11.drv/display.c | 12 ++++++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 22 +-------------- 7 files changed, 63 insertions(+), 45 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index bf600708ed..921ea2c962 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -197,8 +197,6 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ -#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) - static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { return 0; @@ -359,27 +357,6 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM return FALSE; } -static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) -{ - RECT r = {0, 0, 640, 480}; - static const WCHAR device[] = {'W','i','n','D','i','s','c',0}; - - TRACE("(%p, %p)\n", handle, info); - - if (handle != NULLDRV_DEFAULT_HMONITOR) - { - SetLastError(ERROR_INVALID_MONITOR_HANDLE); - return FALSE; - } - - info->rcMonitor = r; - info->rcWork = r; - info->dwFlags = MONITORINFOF_PRIMARY; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); - return TRUE; -} - static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) { return TRUE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 9f72d2725f..ead21e82b3 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -252,6 +252,8 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); #define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) @@ -3702,6 +3704,51 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return MonitorFromRect( &rect, dwFlags ); } +BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR adapter_name[CCHDEVICENAME]; + HDEVINFO devinfo; + DWORD type; + + TRACE("(%p, %p)\n", handle, info); + + /* Fallback to report one monitor */ + if (handle == NULLDRV_DEFAULT_HMONITOR) + { + RECT default_rect = {0, 0, 640, 480}; + info->rcMonitor = default_rect; + info->rcWork = default_rect; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, DEFAULT_ADAPTER_NAME ); + return TRUE; + } + + /* Use SetupAPI to get monitors */ + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) + { + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&info->rcMonitor, sizeof(info->rcMonitor), NULL, 0 ); + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, + (BYTE *)&info->rcWork, sizeof(info->rcWork), NULL, 0 ); + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, + (BYTE *)adapter_name, sizeof(adapter_name), NULL, 0 ); + info->dwFlags = !lstrcmpW( DEFAULT_ADAPTER_NAME, adapter_name ) ? MONITORINFOF_PRIMARY : 0; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, adapter_name ); + SetupDiDestroyDeviceInfoList( devinfo ); + return TRUE; + } + else + { + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); + SetupDiDestroyDeviceInfoList( devinfo ); + return FALSE; + } +} + /*********************************************************************** * GetMonitorInfoA (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a503ebe4db..c11aae707c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -123,6 +123,7 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) DECLSPEC_HIDDEN; struct received_message_info; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index d6969b0cfe..f5ef65f428 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -42,12 +42,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', @@ -281,6 +284,15 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; + /* RcWork */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) + goto done; + /* Adapter name */ + sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, + (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 5b00a5dc5d..c0e24d8fe8 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -21,7 +21,6 @@ @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx -@ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow @ cdecl DestroyWindow(long) X11DRV_DestroyWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a6b07699a7..9ab948f724 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -697,6 +697,8 @@ struct x11drv_monitor WCHAR name[128]; /* RcMonitor in MONITORINFO struct */ RECT rc_monitor; + /* RcWork in MONITORINFO struct */ + RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c8fa63f459..96d118a222 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -322,6 +322,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); monitor[index].rc_monitor = monitors[i].rcMonitor; + monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -390,24 +391,3 @@ void xinerama_init( unsigned int width, unsigned int height ) TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } - - -/*********************************************************************** - * X11DRV_GetMonitorInfo (X11DRV.@) - */ -BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) -{ - int i = monitor_to_index( handle ); - - if (i == -1) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - info->rcMonitor = monitors[i].rcMonitor; - info->rcWork = monitors[i].rcWork; - info->dwFlags = monitors[i].dwFlags; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); - return TRUE; -} -- 2.17.1

3 2

[PATCH v2 1/5] d3d11/tests: Test creating and rendering to a swapchain on the desktop window.
by Zebediah Figura 21 Jun '19

21 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 80 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e8c2f649f8..b8a90ec1ae 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29290,6 +29290,85 @@ static void test_standard_pattern(void) release_test_context(&test_context); } +static void test_desktop_window(void) +{ + ID3D11RenderTargetView *backbuffer_rtv; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *backbuffer; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.Width = 640; + swapchain_desc.BufferDesc.Height = 480; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = GetDesktopWindow(); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + todo_wine ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, + "Failed to create swapchain, hr %#x.\n", hr); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + ID3D11Device_Release(device); + return; + } + + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D11Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)backbuffer, NULL, &backbuffer_rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + + ID3D11DeviceContext_ClearRenderTargetView(context, backbuffer_rtv, red); + check_texture_color(backbuffer, 0xff0000ff, 1); + + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11RenderTargetView_Release(backbuffer_rtv); + ID3D11Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -29448,6 +29527,7 @@ START_TEST(d3d11) queue_test(test_staging_buffers); queue_test(test_render_a8); queue_test(test_standard_pattern); + queue_test(test_desktop_window); run_queued_tests(); } -- 2.20.1

3 12

[PATCH 1/2] dxgi: Remove wined3d_swapchain dependency from d3d11_swapchain_ResizeTarget().
by Conor McCarthy 21 Jun '19

21 Jun '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/output.c | 61 +++++++++++++++++++++++++++++++++++++++ dlls/dxgi/swapchain.c | 62 +++++++++++++++++++++++++++++++++++++--- 3 files changed, 121 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 553eace..9cb43b8 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -148,6 +148,8 @@ struct dxgi_output }; HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *target_mode_desc) DECLSPEC_HIDDEN; +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode_desc) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 123dee8..0b4d1b6 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -539,3 +539,64 @@ HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **ou dxgi_output_init(*output, adapter); return S_OK; } + +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *target_mode_desc) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_output *target; + struct dxgi_adapter *adapter; + struct wined3d *wined3d; + HRESULT hr; + + target = impl_from_IDXGIOutput4((IDXGIOutput4 *)iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_display_mode_from_dxgi(&wined3d_mode, target_mode_desc); + + if (FAILED(hr = dxgi_output_find_closest_matching_mode(target, &wined3d_mode, NULL))) + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + else /* Copy the actual mode back to the caller */ + dxgi_mode_from_wined3d(target_mode_desc, &wined3d_mode); + + wined3d_mutex_lock(); + hr = wined3d_set_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + return S_OK; +} + +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode_desc) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_output *target; + struct dxgi_adapter *adapter; + struct wined3d *wined3d; + HRESULT hr; + + target = impl_from_IDXGIOutput4((IDXGIOutput4 *)iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_mutex_lock(); + hr = wined3d_get_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode, NULL); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return hr; + } + + dxgi_mode_from_wined3d(mode_desc, &wined3d_mode); + + TRACE("Returning %s.\n", debug_dxgi_mode(mode_desc)); + + return S_OK; +} diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4f01d9c..b060a30 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -501,11 +501,65 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeBuffers(IDXGISwapChain1 * return hr; } +static HRESULT dxgi_resize_target(IDXGISwapChain1 *iface, + const DXGI_SWAP_CHAIN_DESC *desc, const DXGI_MODE_DESC *mode) +{ + RECT original_window_rect, window_rect; + HWND window = desc->OutputWindow; + HRESULT hr; + + TRACE("iface %p, desc %p, mode %p.\n", iface, desc, mode); + + if (desc->Windowed) + { + SetRect(&window_rect, 0, 0, mode->Width, mode->Height); + AdjustWindowRectEx(&window_rect, + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); + SetRect(&window_rect, 0, 0, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); + GetWindowRect(window, &original_window_rect); + OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + } + else + { + DXGI_MODE_DESC actual_mode; + IDXGIOutput *target; + + if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &target))) + { + WARN("Failed to get output, hr %#x.\n", hr); + return hr; + } + + if (desc->Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + { + actual_mode = *mode; + hr = dxgi_output_set_display_mode(target, &actual_mode); + } + else + { + hr = dxgi_output_get_display_mode(target, &actual_mode); + } + + IDXGIOutput_Release(target); + + if(FAILED(hr)) + return hr; + + SetRect(&window_rect, 0, 0, actual_mode.Width, actual_mode.Height); + } + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *iface, const DXGI_MODE_DESC *target_mode_desc) { - struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_display_mode mode; + struct DXGI_SWAP_CHAIN_DESC swap_chain_desc; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); @@ -520,9 +574,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i if (target_mode_desc->Scaling) FIXME("Ignoring scaling %#x.\n", target_mode_desc->Scaling); - wined3d_display_mode_from_dxgi(&mode, target_mode_desc); + d3d11_swapchain_GetDesc(iface, &swap_chain_desc); - return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); + return dxgi_resize_target(iface, &swap_chain_desc, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) -- 2.21.0

4 6

[PATCH v2 2/3] winex11.drv: Use generic EnumDisplayMonitors.
by Huw Davies 21 Jun '19

21 Jun '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/driver.c | 10 ------- dlls/user32/sysparams.c | 48 +++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 2 ++ dlls/winex11.drv/display.c | 5 ++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 15 +--------- 7 files changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..bf600708ed 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -354,16 +354,6 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode return DISP_CHANGE_FAILED; } -static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - RECT r = {0, 0, 640, 480}; - - TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); - - proc(NULLDRV_DEFAULT_HMONITOR, hdc, &r, lp); - return TRUE; -} - static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) { return FALSE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 63fea14c2a..9f72d2725f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -251,6 +251,9 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); + +#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) /* Strings for monitor functions */ static const WCHAR DEFAULT_ADAPTER_NAME[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; @@ -3797,6 +3800,51 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, #endif } +BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + BOOL success = FALSE; + HDEVINFO devinfo; + RECT monitor_rect; + DWORD state_flags; + DWORD type; + DWORD i = 0; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + /* Use SetupAPI to get monitors */ + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) + { + /* Inactive monitors don't get enumerated */ + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&state_flags, sizeof(state_flags), NULL, 0 ) + || !(state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + + if (SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0) ) + { + if (!proc( (HMONITOR)(UINT_PTR)i, hdc, &monitor_rect, lp )) + { + SetupDiDestroyDeviceInfoList( devinfo ); + return FALSE; + } + success = TRUE; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + + /* Fallback to report one monitor if using SetupAPI failed */ + if (!success) + { + RECT default_rect = {0, 0, 640, 480}; + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + return FALSE; + } + return TRUE; +} + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 514cf6753f..a503ebe4db 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -122,6 +122,8 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; + struct received_message_info; enum user_obj_type diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index ce2c568ad8..d6969b0cfe 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; @@ -276,6 +277,10 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) goto done; + /* RcMonitor */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 614f0b90f4..5b00a5dc5d 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -20,7 +20,6 @@ @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx -@ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ed5e268391..a6b07699a7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -695,6 +695,8 @@ struct x11drv_monitor { /* Name */ WCHAR name[128]; + /* RcMonitor in MONITORINFO struct */ + RECT rc_monitor; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index e401531450..c8fa63f459 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -321,6 +321,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * && !IsRectEmpty( &monitors[first].rcMonitor ))) { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); + monitor[index].rc_monitor = monitors[i].rcMonitor; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -410,17 +411,3 @@ BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); return TRUE; } - - -/*********************************************************************** - * X11DRV_EnumDisplayMonitors (X11DRV.@) - */ -BOOL CDECL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - int i; - - for (i = 0; i < nb_monitors; i++) - if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) return FALSE; - - return TRUE; -} -- 2.17.1

2 1

[PATCH] user32: Don't access a potentially uninitialized padded_border.
by Huw Davies 21 Jun '19

21 Jun '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/sysparams.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5bf82c66e0..9a5c3cf8d5 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1753,8 +1753,11 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, get_entry( &entry_MENULOGFONT, 0, &lpnm->lfMenuFont ) && get_entry( &entry_STATUSLOGFONT, 0, &lpnm->lfStatusFont ) && get_entry( &entry_MESSAGELOGFONT, 0, &lpnm->lfMessageFont ); - lpnm->iBorderWidth += padded_border; - if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0; + if (ret) + { + lpnm->iBorderWidth += padded_border; + if (lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0; + } normalize_nonclientmetrics( lpnm ); break; } -- 2.18.0

1 0

[PATCH 1/3] user32: Move EnumDisplayDeviceA/W.
by Zhiyi Zhang 21 Jun '19

21 Jun '19

Because most of the monitor functions are in sysparams.c. And format the string constants to be more consistent with the style in sysparams.c. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/misc.c | 313 ---------------------------------------- dlls/user32/sysparams.c | 297 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 297 insertions(+), 313 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 5f26cf9af3..bed5812a47 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -28,14 +28,7 @@ #include "wine/windef16.h" #include "winbase.h" #include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winnls.h" -#include "winternl.h" #include "controls.h" -#include "initguid.h" -#include "devguid.h" -#include "setupapi.h" #include "user_private.h" #include "wine/unicode.h" @@ -43,66 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -/* Wine specific monitor properties */ -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); - -static const WCHAR default_adapter_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR default_monitor_name[] = - {'\\','\\','.','\\', - 'D','I','S','P','L','A','Y','1','\\', - 'M','o','n','i','t','o','r','0',0}; -static const WCHAR default_adapter_string[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; -static const WCHAR default_monitor_string[] = - {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; -static const WCHAR default_adapter_id[] = - {'P','C','I','\\', - 'V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0','&', - 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', - 'R','E','V','_','0','0',0}; -static const WCHAR default_monitor_id[] = - {'M','O','N','I','T','O','R','\\', - 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', - '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', - 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', - '\\','0','0','0','0',0}; -static const WCHAR default_monitor_interface_id[] = - {'\\','\\','\?','\\', - 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', - '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', - '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', - 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; - -static const WCHAR monitor_fmtW[] = - {'\\','\\','.','\\', - 'D','I','S','P','L','A','Y','%','d','\\', - 'M','o','n','i','t','o','r','%','d',0}; -static const WCHAR adapter_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; -static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; -static const WCHAR video_keyW[] = - {'H','A','R','D','W','A','R','E','\\', - 'D','E','V','I','C','E','M','A','P','\\', - 'V','I','D','E','O','\\',0}; -static const WCHAR video_value_fmtW[] = - {'\\','D','e','v','i','c','e','\\', - 'V','i','d','e','o','%','d',0}; -static const WCHAR monitor_interface_prefixW[] = {'\\','\\','\?','\\',0}; -static const WCHAR guid_devinterface_monitorW[] = - {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', - '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; -static const WCHAR backslashW[] = {'\\',0}; -static const WCHAR nt_classW[] = - {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\', - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'C','l','a','s','s','\\',0}; -static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; -static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; -static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; -static const WCHAR mointor_id_value_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; - #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -307,252 +240,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -/*********************************************************************** - * EnumDisplayDevicesA (USER32.@) - */ -BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpDispDev, - DWORD dwFlags ) -{ - UNICODE_STRING deviceW; - DISPLAY_DEVICEW ddW; - BOOL ret; - - if(lpDevice) - RtlCreateUnicodeStringFromAsciiz(&deviceW, lpDevice); - else - deviceW.Buffer = NULL; - - ddW.cb = sizeof(ddW); - ret = EnumDisplayDevicesW(deviceW.Buffer, i, &ddW, dwFlags); - RtlFreeUnicodeString(&deviceW); - - if(!ret) return ret; - - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceName, -1, lpDispDev->DeviceName, sizeof(lpDispDev->DeviceName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceString, -1, lpDispDev->DeviceString, sizeof(lpDispDev->DeviceString), NULL, NULL); - lpDispDev->StateFlags = ddW.StateFlags; - - if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceID) + sizeof(lpDispDev->DeviceID)) - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceID, -1, lpDispDev->DeviceID, sizeof(lpDispDev->DeviceID), NULL, NULL); - if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceKey) + sizeof(lpDispDev->DeviceKey)) - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceKey, -1, lpDispDev->DeviceKey, sizeof(lpDispDev->DeviceKey), NULL, NULL); - - return TRUE; -} - -/*********************************************************************** - * EnumDisplayDevicesW (USER32.@) - */ -BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, - DWORD dwFlags ) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO set = INVALID_HANDLE_VALUE; - WCHAR key_nameW[MAX_PATH]; - WCHAR instanceW[MAX_PATH]; - WCHAR bufferW[1024]; - LONG adapter_index; - WCHAR *next_charW; - DWORD size; - DWORD type; - HKEY hkey; - BOOL ret = FALSE; - - TRACE("%s %d %p %#x\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); - - /* Find adapter */ - if (!lpDevice) - { - sprintfW(key_nameW, video_value_fmtW, i); - size = sizeof(bufferW); - if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) - return FALSE; - - /* DeviceKey */ - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lstrcpyW(lpDisplayDevice->DeviceKey, bufferW); - - /* DeviceName */ - sprintfW(lpDisplayDevice->DeviceName, adapter_fmtW, i + 1); - - /* Strip \Registry\Machine\ */ - lstrcpyW(key_nameW, bufferW + 18); - - /* DeviceString */ - size = sizeof(lpDisplayDevice->DeviceString); - if (RegGetValueW(HKEY_LOCAL_MACHINE, key_nameW, driver_descW, RRF_RT_REG_SZ, NULL, - lpDisplayDevice->DeviceString, &size)) - return FALSE; - - /* StateFlags */ - size = sizeof(lpDisplayDevice->StateFlags); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, state_flagsW, RRF_RT_REG_DWORD, NULL, - &lpDisplayDevice->StateFlags, &size)) - return FALSE; - - /* DeviceID */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - lpDisplayDevice->DeviceID[0] = 0; - else - { - size = sizeof(bufferW); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, gpu_idW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, - bufferW, &size)) - return FALSE; - set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); - if (!SetupDiOpenDeviceInfoW(set, bufferW, NULL, 0, &device_data) - || !SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - lstrcpyW(lpDisplayDevice->DeviceID, bufferW); - } - } - } - /* Find monitor */ - else - { - /* Check adapter name */ - if (strncmpiW(lpDevice, displayW, ARRAY_SIZE(displayW))) - return FALSE; - - adapter_index = strtolW(lpDevice + ARRAY_SIZE(displayW), NULL, 10); - sprintfW(key_nameW, video_value_fmtW, adapter_index - 1); - - size = sizeof(bufferW); - if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) - return FALSE; - - /* DeviceName */ - sprintfW(lpDisplayDevice->DeviceName, monitor_fmtW, adapter_index, i); - - /* Get monitor instance */ - /* Strip \Registry\Machine\ first */ - lstrcpyW(key_nameW, bufferW + 18); - sprintfW(bufferW, mointor_id_value_fmtW, i); - - size = sizeof(instanceW); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size)) - return FALSE; - - set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); - if (!SetupDiOpenDeviceInfoW(set, instanceW, NULL, 0, &device_data)) - goto done; - - /* StateFlags */ - if (!SetupDiGetDevicePropertyW(set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&lpDisplayDevice->StateFlags, sizeof(lpDisplayDevice->StateFlags), NULL, 0)) - goto done; - - /* DeviceString */ - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DEVICEDESC, NULL, - (BYTE *)lpDisplayDevice->DeviceString, - sizeof(lpDisplayDevice->DeviceString), NULL)) - goto done; - - /* DeviceKey */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - { - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcpyW(lpDisplayDevice->DeviceKey, nt_classW); - lstrcatW(lpDisplayDevice->DeviceKey, bufferW); - } - - /* DeviceID */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - { - lstrcpyW(lpDisplayDevice->DeviceID, monitor_interface_prefixW); - lstrcatW(lpDisplayDevice->DeviceID, instanceW); - lstrcatW(lpDisplayDevice->DeviceID, guid_devinterface_monitorW); - /* Replace '\\' with '#' after prefix */ - for (next_charW = lpDisplayDevice->DeviceID + strlenW(monitor_interface_prefixW); *next_charW; - next_charW++) - { - if (*next_charW == '\\') - *next_charW = '#'; - } - } - else - { - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcpyW(lpDisplayDevice->DeviceID, bufferW); - lstrcatW(lpDisplayDevice->DeviceID, backslashW); - - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcatW(lpDisplayDevice->DeviceID, bufferW); - } - } - } - - ret = TRUE; -done: - SetupDiDestroyDeviceInfoList(set); - if (ret) - return ret; - - /* Fallback to report at least one adapter and monitor, if user driver didn't initialize display device registry */ - if (i) - return FALSE; - - /* If user driver did initialize the registry, then exit */ - if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &hkey)) - { - RegCloseKey(hkey); - return FALSE; - } - WARN("Reporting fallback display devices\n"); - - /* Adapter */ - if (!lpDevice) - { - memcpy(lpDisplayDevice->DeviceName, default_adapter_name, sizeof(default_adapter_name)); - memcpy(lpDisplayDevice->DeviceString, default_adapter_string, sizeof(default_adapter_string)); - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - lpDisplayDevice->DeviceID[0] = 0; - else - memcpy(lpDisplayDevice->DeviceID, default_adapter_id, sizeof(default_adapter_id)); - } - } - /* Monitor */ - else - { - if (lstrcmpiW(default_adapter_name, lpDevice)) - return FALSE; - - memcpy(lpDisplayDevice->DeviceName, default_monitor_name, sizeof(default_monitor_name)); - memcpy(lpDisplayDevice->DeviceString, default_monitor_string, sizeof(default_monitor_string)); - lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - memcpy(lpDisplayDevice->DeviceID, default_monitor_interface_id, sizeof(default_monitor_interface_id)); - else - memcpy(lpDisplayDevice->DeviceID, default_monitor_id, sizeof(default_monitor_id)); - } - } - - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; - - return TRUE; -} - /*********************************************************************** * QueryDisplayConfig (USER32.@) */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5bf82c66e0..b401576efd 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -34,10 +34,14 @@ #include "winbase.h" #include "winnls.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "wine/wingdi16.h" #include "winerror.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "controls.h" #include "win.h" #include "user_private.h" @@ -245,6 +249,56 @@ static const WCHAR CSu[] = {'%','u',0}; static const WCHAR CSd[] = {'%','d',0}; static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); + +/* Strings for monitor functions */ +static const WCHAR DEFAULT_ADAPTER_NAME[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR DEFAULT_MONITOR_NAME[] = {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','1','\\', + 'M','o','n','i','t','o','r','0',0}; +static const WCHAR DEFAULT_ADAPTER_STRING[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; +static const WCHAR DEFAULT_MONITOR_STRING[] = {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; +static const WCHAR DEFAULT_ADAPTER_ID[] = {'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR DEFAULT_MONITOR_ID[] = {'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', + 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', + '\\','0','0','0','0',0}; +static const WCHAR DEFAULT_MONITOR_INTERFACE_ID[] = {'\\','\\','\?','\\', + 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', + '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', + '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', + 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +static const WCHAR BACKSLASH[] = {'\\',0}; +static const WCHAR DRIVER_DESC[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR STATE_FLAGS[] = {'S','t','a','t','e','F','l','a','g','s',0}; +static const WCHAR GPU_ID[] = {'G','P','U','I','D',0}; +static const WCHAR DISPLAY[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR MONITOR_ID_VALUE_FMT[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR VIDEO_KEY[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; +static const WCHAR NT_CLASS[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; +static const WCHAR ADAPTER_FMT[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; +static const WCHAR MONITOR_FMT[] = {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','%','d','\\', + 'M','o','n','i','t','o','r','%','d',0}; +static const WCHAR VIDEO_VALUE_FMT[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR MONITOR_INTERFACE_PREFIX[] = {'\\','\\','\?','\\',0}; +static const WCHAR GUID_DEVINTERFACE_MONITOR[] = {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', + '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; + static HDC display_dc; static CRITICAL_SECTION display_dc_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -3769,6 +3823,249 @@ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPA return USER_Driver->pEnumDisplayMonitors( 0, NULL, enum_mon_callback, (LPARAM)&data ); } +/*********************************************************************** + * EnumDisplayDevicesA (USER32.@) + */ +BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpDispDev, DWORD dwFlags ) +{ + UNICODE_STRING deviceW; + DISPLAY_DEVICEW ddW; + BOOL ret; + + if(lpDevice) + RtlCreateUnicodeStringFromAsciiz(&deviceW, lpDevice); + else + deviceW.Buffer = NULL; + + ddW.cb = sizeof(ddW); + ret = EnumDisplayDevicesW(deviceW.Buffer, i, &ddW, dwFlags); + RtlFreeUnicodeString(&deviceW); + + if(!ret) return ret; + + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceName, -1, lpDispDev->DeviceName, sizeof(lpDispDev->DeviceName), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceString, -1, lpDispDev->DeviceString, sizeof(lpDispDev->DeviceString), NULL, NULL); + lpDispDev->StateFlags = ddW.StateFlags; + + if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceID) + sizeof(lpDispDev->DeviceID)) + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceID, -1, lpDispDev->DeviceID, sizeof(lpDispDev->DeviceID), NULL, NULL); + if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceKey) + sizeof(lpDispDev->DeviceKey)) + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceKey, -1, lpDispDev->DeviceKey, sizeof(lpDispDev->DeviceKey), NULL, NULL); + + return TRUE; +} + +/*********************************************************************** + * EnumDisplayDevicesW (USER32.@) + */ +BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO set = INVALID_HANDLE_VALUE; + WCHAR key_nameW[MAX_PATH]; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + LONG adapter_index; + WCHAR *next_charW; + DWORD size; + DWORD type; + HKEY hkey; + BOOL ret = FALSE; + + TRACE("%s %d %p %#x\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); + + /* Find adapter */ + if (!lpDevice) + { + sprintfW(key_nameW, VIDEO_VALUE_FMT, i); + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) + return FALSE; + + /* DeviceKey */ + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lstrcpyW(lpDisplayDevice->DeviceKey, bufferW); + + /* DeviceName */ + sprintfW(lpDisplayDevice->DeviceName, ADAPTER_FMT, i + 1); + + /* Strip \Registry\Machine\ */ + lstrcpyW(key_nameW, bufferW + 18); + + /* DeviceString */ + size = sizeof(lpDisplayDevice->DeviceString); + if (RegGetValueW(HKEY_LOCAL_MACHINE, key_nameW, DRIVER_DESC, RRF_RT_REG_SZ, NULL, + lpDisplayDevice->DeviceString, &size)) + return FALSE; + + /* StateFlags */ + size = sizeof(lpDisplayDevice->StateFlags); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, STATE_FLAGS, RRF_RT_REG_DWORD, NULL, + &lpDisplayDevice->StateFlags, &size)) + return FALSE; + + /* DeviceID */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + lpDisplayDevice->DeviceID[0] = 0; + else + { + size = sizeof(bufferW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, GPU_ID, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, + bufferW, &size)) + return FALSE; + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + if (!SetupDiOpenDeviceInfoW(set, bufferW, NULL, 0, &device_data) + || !SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + lstrcpyW(lpDisplayDevice->DeviceID, bufferW); + } + } + } + /* Find monitor */ + else + { + /* Check adapter name */ + if (strncmpiW(lpDevice, DISPLAY, ARRAY_SIZE(DISPLAY))) + return FALSE; + + adapter_index = strtolW(lpDevice + ARRAY_SIZE(DISPLAY), NULL, 10); + sprintfW(key_nameW, VIDEO_VALUE_FMT, adapter_index - 1); + + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) + return FALSE; + + /* DeviceName */ + sprintfW(lpDisplayDevice->DeviceName, MONITOR_FMT, adapter_index, i); + + /* Get monitor instance */ + /* Strip \Registry\Machine\ first */ + lstrcpyW(key_nameW, bufferW + 18); + sprintfW(bufferW, MONITOR_ID_VALUE_FMT, i); + + size = sizeof(instanceW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size)) + return FALSE; + + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); + if (!SetupDiOpenDeviceInfoW(set, instanceW, NULL, 0, &device_data)) + goto done; + + /* StateFlags */ + if (!SetupDiGetDevicePropertyW(set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&lpDisplayDevice->StateFlags, sizeof(lpDisplayDevice->StateFlags), NULL, 0)) + goto done; + + /* DeviceString */ + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DEVICEDESC, NULL, + (BYTE *)lpDisplayDevice->DeviceString, + sizeof(lpDisplayDevice->DeviceString), NULL)) + goto done; + + /* DeviceKey */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcpyW(lpDisplayDevice->DeviceKey, NT_CLASS); + lstrcatW(lpDisplayDevice->DeviceKey, bufferW); + } + + /* DeviceID */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + { + lstrcpyW(lpDisplayDevice->DeviceID, MONITOR_INTERFACE_PREFIX); + lstrcatW(lpDisplayDevice->DeviceID, instanceW); + lstrcatW(lpDisplayDevice->DeviceID, GUID_DEVINTERFACE_MONITOR); + /* Replace '\\' with '#' after prefix */ + for (next_charW = lpDisplayDevice->DeviceID + strlenW(MONITOR_INTERFACE_PREFIX); *next_charW; + next_charW++) + { + if (*next_charW == '\\') + *next_charW = '#'; + } + } + else + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcpyW(lpDisplayDevice->DeviceID, bufferW); + lstrcatW(lpDisplayDevice->DeviceID, BACKSLASH); + + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcatW(lpDisplayDevice->DeviceID, bufferW); + } + } + } + + ret = TRUE; +done: + SetupDiDestroyDeviceInfoList(set); + if (ret) + return ret; + + /* Fallback to report at least one adapter and monitor, if user driver didn't initialize display device registry */ + if (i) + return FALSE; + + /* If user driver did initialize the registry, then exit */ + if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, VIDEO_KEY, &hkey)) + { + RegCloseKey(hkey); + return FALSE; + } + WARN("Reporting fallback display devices\n"); + + /* Adapter */ + if (!lpDevice) + { + memcpy(lpDisplayDevice->DeviceName, DEFAULT_ADAPTER_NAME, sizeof(DEFAULT_ADAPTER_NAME)); + memcpy(lpDisplayDevice->DeviceString, DEFAULT_ADAPTER_STRING, sizeof(DEFAULT_ADAPTER_STRING)); + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + lpDisplayDevice->DeviceID[0] = 0; + else + memcpy(lpDisplayDevice->DeviceID, DEFAULT_ADAPTER_ID, sizeof(DEFAULT_ADAPTER_ID)); + } + } + /* Monitor */ + else + { + if (lstrcmpiW(DEFAULT_ADAPTER_NAME, lpDevice)) + return FALSE; + + memcpy(lpDisplayDevice->DeviceName, DEFAULT_MONITOR_NAME, sizeof(DEFAULT_MONITOR_NAME)); + memcpy(lpDisplayDevice->DeviceString, DEFAULT_MONITOR_STRING, sizeof(DEFAULT_MONITOR_STRING)); + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + memcpy(lpDisplayDevice->DeviceID, DEFAULT_MONITOR_INTERFACE_ID, sizeof(DEFAULT_MONITOR_INTERFACE_ID)); + else + memcpy(lpDisplayDevice->DeviceID, DEFAULT_MONITOR_ID, sizeof(DEFAULT_MONITOR_ID)); + } + } + + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + + return TRUE; +} /********************************************************************** * GetAutoRotationState [USER32.@] -- 2.20.1

2 1

[PATCH v2 1/3] user32: Move EnumDisplayDeviceA/W.
by Huw Davies 21 Jun '19

21 Jun '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Because most of the monitor functions are in sysparams.c. And format the string constants to be more consistent with the style in sysparams.c. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/misc.c | 313 ---------------------------------------- dlls/user32/sysparams.c | 297 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 297 insertions(+), 313 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 5f26cf9af3..bed5812a47 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -28,14 +28,7 @@ #include "wine/windef16.h" #include "winbase.h" #include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winnls.h" -#include "winternl.h" #include "controls.h" -#include "initguid.h" -#include "devguid.h" -#include "setupapi.h" #include "user_private.h" #include "wine/unicode.h" @@ -43,66 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -/* Wine specific monitor properties */ -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); - -static const WCHAR default_adapter_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR default_monitor_name[] = - {'\\','\\','.','\\', - 'D','I','S','P','L','A','Y','1','\\', - 'M','o','n','i','t','o','r','0',0}; -static const WCHAR default_adapter_string[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; -static const WCHAR default_monitor_string[] = - {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; -static const WCHAR default_adapter_id[] = - {'P','C','I','\\', - 'V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0','&', - 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', - 'R','E','V','_','0','0',0}; -static const WCHAR default_monitor_id[] = - {'M','O','N','I','T','O','R','\\', - 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', - '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', - 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', - '\\','0','0','0','0',0}; -static const WCHAR default_monitor_interface_id[] = - {'\\','\\','\?','\\', - 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', - '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', - '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', - 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; - -static const WCHAR monitor_fmtW[] = - {'\\','\\','.','\\', - 'D','I','S','P','L','A','Y','%','d','\\', - 'M','o','n','i','t','o','r','%','d',0}; -static const WCHAR adapter_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; -static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; -static const WCHAR video_keyW[] = - {'H','A','R','D','W','A','R','E','\\', - 'D','E','V','I','C','E','M','A','P','\\', - 'V','I','D','E','O','\\',0}; -static const WCHAR video_value_fmtW[] = - {'\\','D','e','v','i','c','e','\\', - 'V','i','d','e','o','%','d',0}; -static const WCHAR monitor_interface_prefixW[] = {'\\','\\','\?','\\',0}; -static const WCHAR guid_devinterface_monitorW[] = - {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', - '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; -static const WCHAR backslashW[] = {'\\',0}; -static const WCHAR nt_classW[] = - {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\', - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'C','l','a','s','s','\\',0}; -static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; -static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; -static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; -static const WCHAR mointor_id_value_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; - #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -307,252 +240,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -/*********************************************************************** - * EnumDisplayDevicesA (USER32.@) - */ -BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpDispDev, - DWORD dwFlags ) -{ - UNICODE_STRING deviceW; - DISPLAY_DEVICEW ddW; - BOOL ret; - - if(lpDevice) - RtlCreateUnicodeStringFromAsciiz(&deviceW, lpDevice); - else - deviceW.Buffer = NULL; - - ddW.cb = sizeof(ddW); - ret = EnumDisplayDevicesW(deviceW.Buffer, i, &ddW, dwFlags); - RtlFreeUnicodeString(&deviceW); - - if(!ret) return ret; - - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceName, -1, lpDispDev->DeviceName, sizeof(lpDispDev->DeviceName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceString, -1, lpDispDev->DeviceString, sizeof(lpDispDev->DeviceString), NULL, NULL); - lpDispDev->StateFlags = ddW.StateFlags; - - if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceID) + sizeof(lpDispDev->DeviceID)) - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceID, -1, lpDispDev->DeviceID, sizeof(lpDispDev->DeviceID), NULL, NULL); - if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceKey) + sizeof(lpDispDev->DeviceKey)) - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceKey, -1, lpDispDev->DeviceKey, sizeof(lpDispDev->DeviceKey), NULL, NULL); - - return TRUE; -} - -/*********************************************************************** - * EnumDisplayDevicesW (USER32.@) - */ -BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, - DWORD dwFlags ) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO set = INVALID_HANDLE_VALUE; - WCHAR key_nameW[MAX_PATH]; - WCHAR instanceW[MAX_PATH]; - WCHAR bufferW[1024]; - LONG adapter_index; - WCHAR *next_charW; - DWORD size; - DWORD type; - HKEY hkey; - BOOL ret = FALSE; - - TRACE("%s %d %p %#x\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); - - /* Find adapter */ - if (!lpDevice) - { - sprintfW(key_nameW, video_value_fmtW, i); - size = sizeof(bufferW); - if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) - return FALSE; - - /* DeviceKey */ - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lstrcpyW(lpDisplayDevice->DeviceKey, bufferW); - - /* DeviceName */ - sprintfW(lpDisplayDevice->DeviceName, adapter_fmtW, i + 1); - - /* Strip \Registry\Machine\ */ - lstrcpyW(key_nameW, bufferW + 18); - - /* DeviceString */ - size = sizeof(lpDisplayDevice->DeviceString); - if (RegGetValueW(HKEY_LOCAL_MACHINE, key_nameW, driver_descW, RRF_RT_REG_SZ, NULL, - lpDisplayDevice->DeviceString, &size)) - return FALSE; - - /* StateFlags */ - size = sizeof(lpDisplayDevice->StateFlags); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, state_flagsW, RRF_RT_REG_DWORD, NULL, - &lpDisplayDevice->StateFlags, &size)) - return FALSE; - - /* DeviceID */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - lpDisplayDevice->DeviceID[0] = 0; - else - { - size = sizeof(bufferW); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, gpu_idW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, - bufferW, &size)) - return FALSE; - set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); - if (!SetupDiOpenDeviceInfoW(set, bufferW, NULL, 0, &device_data) - || !SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - lstrcpyW(lpDisplayDevice->DeviceID, bufferW); - } - } - } - /* Find monitor */ - else - { - /* Check adapter name */ - if (strncmpiW(lpDevice, displayW, ARRAY_SIZE(displayW))) - return FALSE; - - adapter_index = strtolW(lpDevice + ARRAY_SIZE(displayW), NULL, 10); - sprintfW(key_nameW, video_value_fmtW, adapter_index - 1); - - size = sizeof(bufferW); - if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) - return FALSE; - - /* DeviceName */ - sprintfW(lpDisplayDevice->DeviceName, monitor_fmtW, adapter_index, i); - - /* Get monitor instance */ - /* Strip \Registry\Machine\ first */ - lstrcpyW(key_nameW, bufferW + 18); - sprintfW(bufferW, mointor_id_value_fmtW, i); - - size = sizeof(instanceW); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size)) - return FALSE; - - set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); - if (!SetupDiOpenDeviceInfoW(set, instanceW, NULL, 0, &device_data)) - goto done; - - /* StateFlags */ - if (!SetupDiGetDevicePropertyW(set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&lpDisplayDevice->StateFlags, sizeof(lpDisplayDevice->StateFlags), NULL, 0)) - goto done; - - /* DeviceString */ - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DEVICEDESC, NULL, - (BYTE *)lpDisplayDevice->DeviceString, - sizeof(lpDisplayDevice->DeviceString), NULL)) - goto done; - - /* DeviceKey */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - { - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcpyW(lpDisplayDevice->DeviceKey, nt_classW); - lstrcatW(lpDisplayDevice->DeviceKey, bufferW); - } - - /* DeviceID */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - { - lstrcpyW(lpDisplayDevice->DeviceID, monitor_interface_prefixW); - lstrcatW(lpDisplayDevice->DeviceID, instanceW); - lstrcatW(lpDisplayDevice->DeviceID, guid_devinterface_monitorW); - /* Replace '\\' with '#' after prefix */ - for (next_charW = lpDisplayDevice->DeviceID + strlenW(monitor_interface_prefixW); *next_charW; - next_charW++) - { - if (*next_charW == '\\') - *next_charW = '#'; - } - } - else - { - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcpyW(lpDisplayDevice->DeviceID, bufferW); - lstrcatW(lpDisplayDevice->DeviceID, backslashW); - - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcatW(lpDisplayDevice->DeviceID, bufferW); - } - } - } - - ret = TRUE; -done: - SetupDiDestroyDeviceInfoList(set); - if (ret) - return ret; - - /* Fallback to report at least one adapter and monitor, if user driver didn't initialize display device registry */ - if (i) - return FALSE; - - /* If user driver did initialize the registry, then exit */ - if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &hkey)) - { - RegCloseKey(hkey); - return FALSE; - } - WARN("Reporting fallback display devices\n"); - - /* Adapter */ - if (!lpDevice) - { - memcpy(lpDisplayDevice->DeviceName, default_adapter_name, sizeof(default_adapter_name)); - memcpy(lpDisplayDevice->DeviceString, default_adapter_string, sizeof(default_adapter_string)); - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - lpDisplayDevice->DeviceID[0] = 0; - else - memcpy(lpDisplayDevice->DeviceID, default_adapter_id, sizeof(default_adapter_id)); - } - } - /* Monitor */ - else - { - if (lstrcmpiW(default_adapter_name, lpDevice)) - return FALSE; - - memcpy(lpDisplayDevice->DeviceName, default_monitor_name, sizeof(default_monitor_name)); - memcpy(lpDisplayDevice->DeviceString, default_monitor_string, sizeof(default_monitor_string)); - lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - memcpy(lpDisplayDevice->DeviceID, default_monitor_interface_id, sizeof(default_monitor_interface_id)); - else - memcpy(lpDisplayDevice->DeviceID, default_monitor_id, sizeof(default_monitor_id)); - } - } - - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; - - return TRUE; -} - /*********************************************************************** * QueryDisplayConfig (USER32.@) */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5bf82c66e0..63fea14c2a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -34,10 +34,14 @@ #include "winbase.h" #include "winnls.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "wine/wingdi16.h" #include "winerror.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "controls.h" #include "win.h" #include "user_private.h" @@ -245,6 +249,56 @@ static const WCHAR CSu[] = {'%','u',0}; static const WCHAR CSd[] = {'%','d',0}; static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); + +/* Strings for monitor functions */ +static const WCHAR DEFAULT_ADAPTER_NAME[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR DEFAULT_MONITOR_NAME[] = {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','1','\\', + 'M','o','n','i','t','o','r','0',0}; +static const WCHAR DEFAULT_ADAPTER_STRING[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; +static const WCHAR DEFAULT_MONITOR_STRING[] = {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; +static const WCHAR DEFAULT_ADAPTER_ID[] = {'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR DEFAULT_MONITOR_ID[] = {'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', + 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', + '\\','0','0','0','0',0}; +static const WCHAR DEFAULT_MONITOR_INTERFACE_ID[] = {'\\','\\','\?','\\', + 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', + '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', + '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', + 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +static const WCHAR BACKSLASH[] = {'\\',0}; +static const WCHAR DRIVER_DESC[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR STATE_FLAGS[] = {'S','t','a','t','e','F','l','a','g','s',0}; +static const WCHAR GPU_ID[] = {'G','P','U','I','D',0}; +static const WCHAR DISPLAY[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR MONITOR_ID_VALUE_FMT[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR VIDEO_KEY[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; +static const WCHAR NT_CLASS[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; +static const WCHAR ADAPTER_FMT[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; +static const WCHAR MONITOR_FMT[] = {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','%','d','\\', + 'M','o','n','i','t','o','r','%','d',0}; +static const WCHAR VIDEO_VALUE_FMT[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR MONITOR_INTERFACE_PREFIX[] = {'\\','\\','\?','\\',0}; +static const WCHAR GUID_DEVINTERFACE_MONITOR[] = {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', + '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; + static HDC display_dc; static CRITICAL_SECTION display_dc_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -3769,6 +3823,249 @@ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPA return USER_Driver->pEnumDisplayMonitors( 0, NULL, enum_mon_callback, (LPARAM)&data ); } +/*********************************************************************** + * EnumDisplayDevicesA (USER32.@) + */ +BOOL WINAPI EnumDisplayDevicesA( LPCSTR device, DWORD index, DISPLAY_DEVICEA *info, DWORD flags ) +{ + UNICODE_STRING deviceW; + DISPLAY_DEVICEW ddW; + BOOL ret; + + if (device) + RtlCreateUnicodeStringFromAsciiz(&deviceW, device); + else + deviceW.Buffer = NULL; + + ddW.cb = sizeof(ddW); + ret = EnumDisplayDevicesW(deviceW.Buffer, index, &ddW, flags); + RtlFreeUnicodeString(&deviceW); + + if (!ret) return ret; + + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceName, -1, info->DeviceName, sizeof(info->DeviceName), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceString, -1, info->DeviceString, sizeof(info->DeviceString), NULL, NULL); + info->StateFlags = ddW.StateFlags; + + if (info->cb >= offsetof(DISPLAY_DEVICEA, DeviceID) + sizeof(info->DeviceID)) + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceID, -1, info->DeviceID, sizeof(info->DeviceID), NULL, NULL); + if (info->cb >= offsetof(DISPLAY_DEVICEA, DeviceKey) + sizeof(info->DeviceKey)) + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceKey, -1, info->DeviceKey, sizeof(info->DeviceKey), NULL, NULL); + + return TRUE; +} + +/*********************************************************************** + * EnumDisplayDevicesW (USER32.@) + */ +BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO set = INVALID_HANDLE_VALUE; + WCHAR key_nameW[MAX_PATH]; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + LONG adapter_index; + WCHAR *next_charW; + DWORD size; + DWORD type; + HKEY hkey; + BOOL ret = FALSE; + + TRACE("%s %d %p %#x\n", debugstr_w(device), index, info, flags); + + /* Find adapter */ + if (!device) + { + sprintfW(key_nameW, VIDEO_VALUE_FMT, index); + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) + return FALSE; + + /* DeviceKey */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) + lstrcpyW(info->DeviceKey, bufferW); + + /* DeviceName */ + sprintfW(info->DeviceName, ADAPTER_FMT, index + 1); + + /* Strip \Registry\Machine\ */ + lstrcpyW(key_nameW, bufferW + 18); + + /* DeviceString */ + size = sizeof(info->DeviceString); + if (RegGetValueW(HKEY_LOCAL_MACHINE, key_nameW, DRIVER_DESC, RRF_RT_REG_SZ, NULL, + info->DeviceString, &size)) + return FALSE; + + /* StateFlags */ + size = sizeof(info->StateFlags); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, STATE_FLAGS, RRF_RT_REG_DWORD, NULL, + &info->StateFlags, &size)) + return FALSE; + + /* DeviceID */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + info->DeviceID[0] = 0; + else + { + size = sizeof(bufferW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, GPU_ID, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, + bufferW, &size)) + return FALSE; + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + if (!SetupDiOpenDeviceInfoW(set, bufferW, NULL, 0, &device_data) + || !SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + lstrcpyW(info->DeviceID, bufferW); + } + } + } + /* Find monitor */ + else + { + /* Check adapter name */ + if (strncmpiW(device, DISPLAY, ARRAY_SIZE(DISPLAY))) + return FALSE; + + adapter_index = strtolW(device + ARRAY_SIZE(DISPLAY), NULL, 10); + sprintfW(key_nameW, VIDEO_VALUE_FMT, adapter_index - 1); + + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) + return FALSE; + + /* DeviceName */ + sprintfW(info->DeviceName, MONITOR_FMT, adapter_index, index); + + /* Get monitor instance */ + /* Strip \Registry\Machine\ first */ + lstrcpyW(key_nameW, bufferW + 18); + sprintfW(bufferW, MONITOR_ID_VALUE_FMT, index); + + size = sizeof(instanceW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size)) + return FALSE; + + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); + if (!SetupDiOpenDeviceInfoW(set, instanceW, NULL, 0, &device_data)) + goto done; + + /* StateFlags */ + if (!SetupDiGetDevicePropertyW(set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&info->StateFlags, sizeof(info->StateFlags), NULL, 0)) + goto done; + + /* DeviceString */ + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DEVICEDESC, NULL, + (BYTE *)info->DeviceString, + sizeof(info->DeviceString), NULL)) + goto done; + + /* DeviceKey */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcpyW(info->DeviceKey, NT_CLASS); + lstrcatW(info->DeviceKey, bufferW); + } + + /* DeviceID */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + { + lstrcpyW(info->DeviceID, MONITOR_INTERFACE_PREFIX); + lstrcatW(info->DeviceID, instanceW); + lstrcatW(info->DeviceID, GUID_DEVINTERFACE_MONITOR); + /* Replace '\\' with '#' after prefix */ + for (next_charW = info->DeviceID + strlenW(MONITOR_INTERFACE_PREFIX); *next_charW; + next_charW++) + { + if (*next_charW == '\\') + *next_charW = '#'; + } + } + else + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcpyW(info->DeviceID, bufferW); + lstrcatW(info->DeviceID, BACKSLASH); + + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcatW(info->DeviceID, bufferW); + } + } + } + + ret = TRUE; +done: + SetupDiDestroyDeviceInfoList(set); + if (ret) + return ret; + + /* Fallback to report at least one adapter and monitor, if user driver didn't initialize display device registry */ + if (index) + return FALSE; + + /* If user driver did initialize the registry, then exit */ + if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, VIDEO_KEY, &hkey)) + { + RegCloseKey(hkey); + return FALSE; + } + WARN("Reporting fallback display devices\n"); + + /* Adapter */ + if (!device) + { + memcpy(info->DeviceName, DEFAULT_ADAPTER_NAME, sizeof(DEFAULT_ADAPTER_NAME)); + memcpy(info->DeviceString, DEFAULT_ADAPTER_STRING, sizeof(DEFAULT_ADAPTER_STRING)); + info->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + info->DeviceID[0] = 0; + else + memcpy(info->DeviceID, DEFAULT_ADAPTER_ID, sizeof(DEFAULT_ADAPTER_ID)); + } + } + /* Monitor */ + else + { + if (lstrcmpiW(DEFAULT_ADAPTER_NAME, device)) + return FALSE; + + memcpy(info->DeviceName, DEFAULT_MONITOR_NAME, sizeof(DEFAULT_MONITOR_NAME)); + memcpy(info->DeviceString, DEFAULT_MONITOR_STRING, sizeof(DEFAULT_MONITOR_STRING)); + info->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + memcpy(info->DeviceID, DEFAULT_MONITOR_INTERFACE_ID, sizeof(DEFAULT_MONITOR_INTERFACE_ID)); + else + memcpy(info->DeviceID, DEFAULT_MONITOR_ID, sizeof(DEFAULT_MONITOR_ID)); + } + } + + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) + info->DeviceKey[0] = 0; + + return TRUE; +} /********************************************************************** * GetAutoRotationState [USER32.@] -- 2.17.1

1 0

[PATCH] wininet: Always set last error in HttpQueryInfoW.
by Alistair Leslie-Hughes 21 Jun '19

21 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 4 ++-- dlls/wininet/tests/http.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cbc95fb8ae..c90213bf46 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3911,8 +3911,8 @@ lend: WININET_Release( &request->hdr ); TRACE("%u <--\n", res); - if(res != ERROR_SUCCESS) - SetLastError(res); + + SetLastError(res); return res == ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5a0cc11754..d5e0a432db 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -722,8 +722,11 @@ static void InternetReadFile_test(int flags, const test_data_t *test) length = sizeof(buffer)-2; memset(buffer, 0x77, sizeof(buffer)); + SetLastError(0xdeadbeef); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + /* Windows 7 and above Reset LastError */ + ok(GetLastError() == 0 || broken(GetLastError() == 0xdeadbeef), "Last Error not reset 0x%x\n", GetLastError()); /* show that the function writes data past the length returned */ ok(buffer[length-2], "Expected any header character, got 0x00\n"); ok(!buffer[length-1], "Expected 0x00, got %02X\n", buffer[length-1]); -- 2.17.1

2 1

[PATCH] wininet: Support QueryOption INTERNET_OPTION_ERROR_MASK for http
by Alistair Leslie-Hughes 21 Jun '19

21 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c90213bf46..3cb1f57bae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2266,6 +2266,17 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(DWORD*)buffer = flags; return ERROR_SUCCESS; } + case INTERNET_OPTION_ERROR_MASK: + { + TRACE("INTERNET_OPTION_ERROR_MASK\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *(ULONG*)buffer = hdr->ErrorMask; + *size = sizeof(ULONG); + return ERROR_SUCCESS; + } } return INET_QueryOption(hdr, option, buffer, size, unicode); -- 2.17.1

1 0

[PATCH 1/5] quartz/systemclock: Create the advise thread after the events it depends on.
by Zebediah Figura 21 Jun '19

21 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 6bb1f47e6f7..2b75c8da89e 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -103,9 +103,9 @@ static void notify_thread(struct system_clock *clock) { if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) { - clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); clock->notify_event = CreateEventW(NULL, FALSE, FALSE, NULL); clock->stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); + clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); } SetEvent(clock->notify_event); } -- 2.21.0

1 4

[PATCH 1/3] ddraw: Store _TEXTUREMAPBLEND state instead of guessing it from wined3d states.
by Paul Gofman 21 Jun '19

21 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 73 +++++--------------------------------- dlls/ddraw/tests/ddraw4.c | 5 +++ 3 files changed, 14 insertions(+), 65 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b08f66564c..9e98d81c8e 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -327,6 +327,7 @@ struct d3d_device /* Required to keep track which of two available texture blending modes in d3ddevice3 is used */ BOOL legacyTextureBlending; + D3DTEXTUREBLEND texture_map_blend; D3DMATRIX legacy_projection; D3DMATRIX legacy_clipspace; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ac4da191a2..2de9941249 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2463,62 +2463,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, case D3DRENDERSTATE_TEXTUREMAPBLEND: { - /* D3DRENDERSTATE_TEXTUREMAPBLEND is mapped to texture state stages in SetRenderState; reverse - the mapping to get the value. */ - DWORD colorop, colorarg1, colorarg2; - DWORD alphaop, alphaarg1, alphaarg2; - - wined3d_mutex_lock(); - - device->legacyTextureBlending = TRUE; - - colorop = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_OP); - colorarg1 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG1); - colorarg2 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG2); - alphaop = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_OP); - alphaarg1 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG1); - alphaarg2 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG2); - - if (colorop == WINED3D_TOP_SELECT_ARG1 && colorarg1 == WINED3DTA_TEXTURE - && alphaop == WINED3D_TOP_SELECT_ARG1 && alphaarg1 == WINED3DTA_TEXTURE) - *value = D3DTBLEND_DECAL; - else if (colorop == WINED3D_TOP_SELECT_ARG1 && colorarg1 == WINED3DTA_TEXTURE - && alphaop == WINED3D_TOP_MODULATE - && alphaarg1 == WINED3DTA_TEXTURE && alphaarg2 == WINED3DTA_CURRENT) - *value = D3DTBLEND_DECALALPHA; - else if (colorop == WINED3D_TOP_MODULATE - && colorarg1 == WINED3DTA_TEXTURE && colorarg2 == WINED3DTA_CURRENT - && alphaop == WINED3D_TOP_MODULATE - && alphaarg1 == WINED3DTA_TEXTURE && alphaarg2 == WINED3DTA_CURRENT) - *value = D3DTBLEND_MODULATEALPHA; - else - { - struct wined3d_texture *tex = NULL; - BOOL tex_alpha = FALSE; - DDPIXELFORMAT ddfmt; - - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) - tex_alpha = TRUE; - } - - if (!(colorop == WINED3D_TOP_MODULATE - && colorarg1 == WINED3DTA_TEXTURE && colorarg2 == WINED3DTA_CURRENT - && alphaop == (tex_alpha ? WINED3D_TOP_SELECT_ARG1 : WINED3D_TOP_SELECT_ARG2) - && alphaarg1 == WINED3DTA_TEXTURE && alphaarg2 == WINED3DTA_CURRENT)) - ERR("Unexpected texture stage state setup, returning D3DTBLEND_MODULATE - likely erroneous.\n"); - - *value = D3DTBLEND_MODULATE; - } - - wined3d_mutex_unlock(); - + *value = device->texture_map_blend; return D3D_OK; } @@ -2738,8 +2683,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, in device - TRUE if the app is using TEXTUREMAPBLEND. Tests show that setting TEXTUREMAPBLEND on native doesn't seem to change values returned by - GetTextureStageState and vice versa. Not so on Wine, but it is 'undefined' anyway so, probably, ok, - unless some broken game will be found that cares. */ + GetTextureStageState and vice versa. */ struct d3d_device *device = impl_from_IDirect3DDevice3(iface); HRESULT hr; @@ -2877,7 +2821,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, default: FIXME("Unhandled texture environment %#x.\n", value); } - + device->texture_map_blend = value; hr = D3D_OK; break; } @@ -4948,19 +4892,15 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice3(iface); struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture); - DWORD texmapblend; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); wined3d_mutex_lock(); - if (device->legacyTextureBlending) - IDirect3DDevice3_GetRenderState(iface, D3DRENDERSTATE_TEXTUREMAPBLEND, &texmapblend); - hr = IDirect3DDevice7_SetTexture(&device->IDirect3DDevice7_iface, stage, &tex->IDirectDrawSurface7_iface); - if (device->legacyTextureBlending && texmapblend == D3DTBLEND_MODULATE) + if (device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE) { /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. See d3d_device3_SetRenderState() for details. */ @@ -7131,8 +7071,11 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, else if (version == 2) wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_SPECULARENABLE, TRUE); if (version < 7) + { wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_NORMALIZENORMALS, TRUE); - + IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, + D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); + } return D3D_OK; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 7822bbaaf1..d12b0f015a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9500,6 +9500,7 @@ static void test_texturemapblend(void) DDSURFACEDESC2 surface_desc; IDirect3DTexture2 *texture; IDirect3DDevice3 *device; + DWORD texturemapblend; IDirectDraw4 *ddraw; IDirect3D3 *d3d; DDCOLORKEY ckey; @@ -9557,6 +9558,10 @@ static void test_texturemapblend(void) hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_TEXTUREMAPBLEND, &texturemapblend); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(texturemapblend == D3DTBLEND_MODULATE, "Got unexpected texture map blend %#x.\n", texturemapblend); + /* Test alpha with DDPF_ALPHAPIXELS texture - should be taken from texture * alpha channel. * -- 2.21.0

3 8

[PATCH vkd3d 2/5] vkd3d: Introduce d3d12_resource_is_cpu_accessible() helper.
by Józef Kucia 20 Jun '19

20 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> The condition in d3d12_resource_is_cpu_accessible() is going to be changed in the following commits. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- libs/vkd3d/resource.c | 19 ++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 13 +------------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 47f7a137f119..64c4bd6aeae3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2090,7 +2090,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 /* vkQueueSubmit() defines a memory dependency with prior host writes. */ src_stage_mask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; barrier.srcAccessMask = 0; - barrier.oldLayout = is_cpu_accessible_heap(&resource->heap_properties) ? + barrier.oldLayout = d3d12_resource_is_cpu_accessible(resource) ? VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 824698a143b5..fdf68363d29d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -23,6 +23,18 @@ #define VKD3D_HEAP_TYPE_INVALID ((D3D12_HEAP_TYPE)~0u) +static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *properties) +{ + if (properties->Type == D3D12_HEAP_TYPE_DEFAULT) + return false; + if (properties->Type == D3D12_HEAP_TYPE_CUSTOM) + { + return properties->CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE + || properties->CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; + } + return true; +} + static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { @@ -894,6 +906,11 @@ static ULONG d3d12_resource_decref(struct d3d12_resource *resource) return refcount; } +bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) +{ + return is_cpu_accessible_heap(&resource->heap_properties); +} + /* ID3D12Resource */ static inline struct d3d12_resource *impl_from_ID3D12Resource(ID3D12Resource *iface) { @@ -1034,7 +1051,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT device = resource->device; - if (!is_cpu_accessible_heap(&resource->heap_properties)) + if (!d3d12_resource_is_cpu_accessible(resource)) { WARN("Resource is not CPU accessible.\n"); return E_INVALIDARG; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 7cbf0d83b08e..c86370a60d04 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -414,6 +414,7 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour return resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER; } +bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) DECLSPEC_HIDDEN; HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) DECLSPEC_HIDDEN; HRESULT d3d12_committed_resource_create(struct d3d12_device *device, @@ -1165,18 +1166,6 @@ bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; -static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *properties) -{ - if (properties->Type == D3D12_HEAP_TYPE_DEFAULT) - return false; - if (properties->Type == D3D12_HEAP_TYPE_CUSTOM) - { - return properties->CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE - || properties->CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; - } - return true; -} - HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object) DECLSPEC_HIDDEN; -- 2.21.0

2 1

[PATCH vkd3d 5/5] vkd3d: Make resource mapping thread-safe.
by Józef Kucia 20 Jun '19

20 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> VkDeviceMemory must be externally synchronized. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 105 ++++++++++++++++++------------------- libs/vkd3d/vkd3d_private.h | 1 - 2 files changed, 52 insertions(+), 54 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 0e13cc53e018..f0864ab92170 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -411,7 +411,8 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) return impl_from_ID3D12Heap(iface); } -static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, void **data) +static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, + struct d3d12_resource *resource, void **data) { struct d3d12_device *device = heap->device; HRESULT hr = S_OK; @@ -425,29 +426,41 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, void **d return hresult_from_errno(rc); } - if (!heap->map_ptr) + assert(!resource->map_count || heap->map_ptr); + + if (!resource->map_count) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + if (!heap->map_ptr) + { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - TRACE("Mapping heap %p.\n", heap); + TRACE("Mapping heap %p.\n", heap); - if ((vr = VK_CALL(vkMapMemory(device->vk_device, heap->vk_memory, - 0, VK_WHOLE_SIZE, 0, &heap->map_ptr))) < 0) - { - WARN("Failed to map device memory, vr %d.\n", vr); - heap->map_ptr = NULL; + assert(!heap->map_count); + + if ((vr = VK_CALL(vkMapMemory(device->vk_device, heap->vk_memory, + 0, VK_WHOLE_SIZE, 0, &heap->map_ptr))) < 0) + { + WARN("Failed to map device memory, vr %d.\n", vr); + heap->map_ptr = NULL; + } + + hr = hresult_from_vk_result(vr); } - hr = hresult_from_vk_result(vr); + if (heap->map_ptr) + ++heap->map_count; } - if (heap->map_ptr) + if (hr == S_OK) { + assert(heap->map_ptr); *data = (BYTE *)heap->map_ptr + offset; - ++heap->map_count; + ++resource->map_count; } else { + assert(!heap->map_ptr); *data = NULL; } @@ -456,7 +469,7 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, void **d return hr; } -static void d3d12_heap_unmap(struct d3d12_heap *heap) +static void d3d12_heap_unmap(struct d3d12_heap *heap, struct d3d12_resource *resource) { struct d3d12_device *device = heap->device; int rc; @@ -467,24 +480,34 @@ static void d3d12_heap_unmap(struct d3d12_heap *heap) return; } - if (heap->map_count) + if (!resource->map_count) { - --heap->map_count; - if (!heap->map_count) - { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + WARN("Resource %p is not mapped.\n", resource); + goto done; + } - TRACE("Unmapping heap %p.\n", heap); + --resource->map_count; + if (resource->map_count) + goto done; - VK_CALL(vkUnmapMemory(device->vk_device, heap->vk_memory)); - heap->map_ptr = NULL; - } + if (!heap->map_count) + { + ERR("Heap %p is not mapped.\n", heap); + goto done; } - else + + --heap->map_count; + if (!heap->map_count) { - WARN("Heap %p is not mapped.\n", heap); + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + TRACE("Unmapping heap %p, ptr %p.\n", heap, heap->map_ptr); + + VK_CALL(vkUnmapMemory(device->vk_device, heap->vk_memory)); + heap->map_ptr = NULL; } +done: pthread_mutex_unlock(&heap->mutex); } @@ -1087,7 +1110,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); unsigned int sub_resource_count; - HRESULT hr = S_OK; + HRESULT hr; TRACE("iface %p, sub_resource %u, read_range %p, data %p.\n", iface, sub_resource, read_range, data); @@ -1120,20 +1143,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT WARN("Ignoring read range %p.\n", read_range); - if (!resource->map_count) - { - if FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_ptr)) - { - WARN("Failed to map resource, hr %#x.\n", hr); - resource->map_ptr = NULL; - } - } + if (FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, resource, data))) + WARN("Failed to map resource %p, hr %#x.\n", resource, hr); - if (resource->map_ptr) - { - *data = resource->map_ptr; - ++resource->map_count; - } + TRACE("Returning pointer %p.\n", *data); return hr; } @@ -1154,22 +1167,9 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s return; } - if (!resource->map_count) - { - WARN("Resource %p is not mapped.\n", resource); - return; - } - WARN("Ignoring written range %p.\n", written_range); - --resource->map_count; - if (!resource->map_count) - { - resource->map_ptr = NULL; - - assert(resource->heap); - d3d12_heap_unmap(resource->heap); - } + d3d12_heap_unmap(resource->heap, resource); } static D3D12_RESOURCE_DESC * STDMETHODCALLTYPE d3d12_resource_GetDesc(ID3D12Resource *iface, @@ -1445,7 +1445,6 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 } resource->map_count = 0; - resource->map_ptr = NULL; resource->initial_state = initial_state; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 34df976fe647..d23b2782a408 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -391,7 +391,6 @@ struct d3d12_resource unsigned int flags; unsigned int map_count; - void *map_ptr; struct d3d12_heap *heap; uint64_t heap_offset; -- 2.21.0

2 1

[PATCH vkd3d 4/5] vkd3d: Create private heap objects for committed resources.
by Józef Kucia 20 Jun '19

20 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 2 +- libs/vkd3d/resource.c | 201 +++++++++++++++++++------------------ libs/vkd3d/vkd3d_private.h | 12 +-- 3 files changed, 113 insertions(+), 102 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7522c413278a..f67713594ea5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2758,7 +2758,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device *iface, TRACE("iface %p, desc %p, iid %s, heap %p.\n", iface, desc, debugstr_guid(iid), heap); - if (FAILED(hr = d3d12_heap_create(device, desc, &object))) + if (FAILED(hr = d3d12_heap_create(device, desc, NULL, &object))) { *heap = NULL; return hr; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f1cbff11d1ea..0e13cc53e018 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -21,8 +21,6 @@ #define VKD3D_NULL_BUFFER_SIZE 16 #define VKD3D_NULL_VIEW_FORMAT DXGI_FORMAT_R8G8B8A8_UNORM -#define VKD3D_HEAP_TYPE_INVALID ((D3D12_HEAP_TYPE)~0u) - static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *properties) { if (properties->Type == D3D12_HEAP_TYPE_DEFAULT) @@ -288,31 +286,42 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_AddRef(ID3D12Heap *iface) TRACE("%p increasing refcount to %u.\n", heap, refcount); + assert(!heap->is_private); + return refcount; } -static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) +static void d3d12_heap_destroy(struct d3d12_heap *heap) { - struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); - ULONG refcount = InterlockedDecrement(&heap->refcount); + struct d3d12_device *device = heap->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - TRACE("%p decreasing refcount to %u.\n", heap, refcount); + TRACE("Destroying heap %p.\n", heap); - if (!refcount) - { - struct d3d12_device *device = heap->device; - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&heap->private_store); - vkd3d_private_store_destroy(&heap->private_store); + VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); - VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); + pthread_mutex_destroy(&heap->mutex); - pthread_mutex_destroy(&heap->mutex); + if (heap->is_private) + device = NULL; - vkd3d_free(heap); + vkd3d_free(heap); + if (device) d3d12_device_release(device); - } +} + +static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + ULONG refcount = InterlockedDecrement(&heap->refcount); + + TRACE("%p decreasing refcount to %u.\n", heap, refcount); + + if (!refcount) + d3d12_heap_destroy(heap); return refcount; } @@ -437,6 +446,10 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, void **d *data = (BYTE *)heap->map_ptr + offset; ++heap->map_count; } + else + { + *data = NULL; + } pthread_mutex_unlock(&heap->mutex); @@ -475,9 +488,9 @@ static void d3d12_heap_unmap(struct d3d12_heap *heap) pthread_mutex_unlock(&heap->mutex); } -static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc) +static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc, const struct d3d12_resource *resource) { - if (!desc->SizeInBytes) + if (!resource && !desc->SizeInBytes) { WARN("Invalid size %"PRIu64".\n", desc->SizeInBytes); return E_INVALIDARG; @@ -490,7 +503,7 @@ static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc) return E_INVALIDARG; } - if (desc->Flags & D3D12_HEAP_FLAG_ALLOW_DISPLAY) + if (!resource && desc->Flags & D3D12_HEAP_FLAG_ALLOW_DISPLAY) { WARN("D3D12_HEAP_FLAG_ALLOW_DISPLAY is only for committed resources.\n"); return E_INVALIDARG; @@ -500,15 +513,18 @@ static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc) } static HRESULT d3d12_heap_init(struct d3d12_heap *heap, - struct d3d12_device *device, const D3D12_HEAP_DESC *desc) + struct d3d12_device *device, const D3D12_HEAP_DESC *desc, const struct d3d12_resource *resource) { VkMemoryRequirements memory_requirements; + VkDeviceSize vk_memory_size; HRESULT hr; int rc; heap->ID3D12Heap_iface.lpVtbl = &d3d12_heap_vtbl; heap->refcount = 1; + heap->is_private = !!resource; + heap->desc = *desc; heap->map_ptr = NULL; @@ -525,13 +541,9 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, if (!heap->desc.Alignment) heap->desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; - if (FAILED(hr = validate_heap_desc(&heap->desc))) + if (FAILED(hr = validate_heap_desc(&heap->desc, resource))) return hr; - memory_requirements.size = heap->desc.SizeInBytes; - memory_requirements.alignment = heap->desc.Alignment; - memory_requirements.memoryTypeBits = ~(uint32_t)0; - if ((rc = pthread_mutex_init(&heap->mutex, NULL))) { ERR("Failed to initialize mutex, error %d.\n", rc); @@ -544,21 +556,49 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hr; } - if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, - heap->desc.Flags, &memory_requirements, NULL, &heap->vk_memory, &heap->vk_memory_type))) + if (resource) + { + if (d3d12_resource_is_buffer(resource)) + { + hr = vkd3d_allocate_buffer_memory(device, resource->u.vk_buffer, + &heap->desc.Properties, heap->desc.Flags, + &heap->vk_memory, &heap->vk_memory_type, &vk_memory_size); + } + else + { + hr = vkd3d_allocate_image_memory(device, resource->u.vk_image, + &heap->desc.Properties, heap->desc.Flags, + &heap->vk_memory, &heap->vk_memory_type, &vk_memory_size); + } + + heap->desc.SizeInBytes = vk_memory_size; + } + else + { + memory_requirements.size = heap->desc.SizeInBytes; + memory_requirements.alignment = heap->desc.Alignment; + memory_requirements.memoryTypeBits = ~(uint32_t)0; + + hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, + heap->desc.Flags, &memory_requirements, NULL, + &heap->vk_memory, &heap->vk_memory_type); + } + if (FAILED(hr)) { vkd3d_private_store_destroy(&heap->private_store); pthread_mutex_destroy(&heap->mutex); return hr; } - d3d12_device_add_ref(heap->device = device); + heap->device = device; + if (!heap->is_private) + d3d12_device_add_ref(heap->device); return S_OK; } -HRESULT d3d12_heap_create(struct d3d12_device *device, - const D3D12_HEAP_DESC *desc, struct d3d12_heap **heap) +HRESULT d3d12_heap_create(struct d3d12_device *device, const D3D12_HEAP_DESC *desc, + const struct d3d12_resource *resource, struct d3d12_heap **heap) { struct d3d12_heap *object; HRESULT hr; @@ -566,13 +606,13 @@ HRESULT d3d12_heap_create(struct d3d12_device *device, if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d12_heap_init(object, device, desc))) + if (FAILED(hr = d3d12_heap_init(object, device, desc, resource))) { vkd3d_free(object); return hr; } - TRACE("Created heap %p.\n", object); + TRACE("Created %s %p.\n", object->is_private ? "private heap" : "heap", object); *heap = object; @@ -883,8 +923,8 @@ static void d3d12_resource_destroy(struct d3d12_resource *resource, struct d3d12 else VK_CALL(vkDestroyImage(device->vk_device, resource->u.vk_image, NULL)); - if (resource->vk_memory) - VK_CALL(vkFreeMemory(device->vk_device, resource->vk_memory, NULL)); + if (resource->flags & VKD3D_RESOURCE_DEDICATED_HEAP) + d3d12_heap_destroy(resource->heap); } static ULONG d3d12_resource_incref(struct d3d12_resource *resource) @@ -914,7 +954,7 @@ static ULONG d3d12_resource_decref(struct d3d12_resource *resource) bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) { - return is_cpu_accessible_heap(&resource->heap_properties); + return resource->heap && is_cpu_accessible_heap(&resource->heap->desc.Properties); } /* ID3D12Resource */ @@ -1019,10 +1059,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_SetName(ID3D12Resource *iface, c TRACE("iface %p, name %s.\n", iface, debugstr_w(name, resource->device->wchar_size)); - if (resource->vk_memory) + if (resource->flags & VKD3D_RESOURCE_DEDICATED_HEAP) { - if (FAILED(hr = vkd3d_set_vk_object_name(resource->device, (uint64_t)resource->vk_memory, - VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, name))) + if (FAILED(hr = d3d12_heap_SetName(&resource->heap->ID3D12Heap_iface, name))) return hr; } @@ -1048,15 +1087,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); unsigned int sub_resource_count; - struct d3d12_device *device; HRESULT hr = S_OK; - VkResult vr; TRACE("iface %p, sub_resource %u, read_range %p, data %p.\n", iface, sub_resource, read_range, data); - device = resource->device; - if (!d3d12_resource_is_cpu_accessible(resource)) { WARN("Resource is not CPU accessible.\n"); @@ -1077,7 +1112,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT return E_INVALIDARG; } - if (!resource->heap && !resource->vk_memory) + if (!resource->heap) { FIXME("Not implemented for this resource type.\n"); return E_NOTIMPL; @@ -1087,22 +1122,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT if (!resource->map_count) { - if (resource->heap) - { - hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_ptr); - } - else - { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - - if ((vr = VK_CALL(vkMapMemory(device->vk_device, resource->vk_memory, - 0, VK_WHOLE_SIZE, 0, &resource->map_ptr))) < 0) - WARN("Failed to map device memory, vr %d.\n", vr); - - hr = hresult_from_vk_result(vr); - } - - if (FAILED(hr)) + if FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_ptr)) { WARN("Failed to map resource, hr %#x.\n", hr); resource->map_ptr = NULL; @@ -1123,7 +1143,6 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); unsigned int sub_resource_count; - struct d3d12_device *device; TRACE("iface %p, sub_resource %u, written_range %p.\n", iface, sub_resource, written_range); @@ -1141,21 +1160,15 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s return; } - device = resource->device; - WARN("Ignoring written range %p.\n", written_range); --resource->map_count; if (!resource->map_count) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - resource->map_ptr = NULL; - if (resource->heap) - d3d12_heap_unmap(resource->heap); - else - VK_CALL(vkUnmapMemory(device->vk_device, resource->vk_memory)); + assert(resource->heap); + d3d12_heap_unmap(resource->heap); } } @@ -1207,20 +1220,33 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_GetHeapProperties(ID3D12Resource D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS *flags) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + struct d3d12_heap *heap; TRACE("iface %p, heap_properties %p, flags %p.\n", iface, heap_properties, flags); - if (resource->heap_properties.Type == VKD3D_HEAP_TYPE_INVALID) + if (resource->flags & VKD3D_RESOURCE_EXTERNAL) + { + if (heap_properties) + { + memset(heap_properties, 0, sizeof(*heap_properties)); + heap_properties->Type = D3D12_HEAP_TYPE_DEFAULT; + } + if (flags) + *flags = D3D12_HEAP_FLAG_NONE; + return S_OK; + } + + if (!(heap = resource->heap)) { WARN("Cannot get heap properties for reserved resources.\n"); return E_INVALIDARG; } if (heap_properties) - *heap_properties = resource->heap_properties; + *heap_properties = heap->desc.Properties; if (flags) - *flags = resource->heap_flags; + *flags = heap->desc.Flags; return S_OK; } @@ -1382,7 +1408,6 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 WARN("Ignoring optimized clear value.\n"); resource->gpu_address = 0; - resource->vk_memory = VK_NULL_HANDLE; resource->flags = 0; if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) @@ -1422,18 +1447,6 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->map_count = 0; resource->map_ptr = NULL; - if (heap_properties) - { - resource->heap_properties = *heap_properties; - resource->heap_flags = heap_flags; - } - else - { - memset(&resource->heap_properties, 0, sizeof(resource->heap_properties)); - resource->heap_properties.Type = VKD3D_HEAP_TYPE_INVALID; - resource->heap_flags = 0; - } - resource->initial_state = initial_state; resource->heap = NULL; @@ -1477,16 +1490,16 @@ static HRESULT vkd3d_allocate_resource_memory( struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { - if (d3d12_resource_is_buffer(resource)) - { - return vkd3d_allocate_buffer_memory(device, resource->u.vk_buffer, - heap_properties, heap_flags, &resource->vk_memory, NULL, NULL); - } - else - { - return vkd3d_allocate_image_memory(device, resource->u.vk_image, - heap_properties, heap_flags, &resource->vk_memory, NULL, NULL); - } + D3D12_HEAP_DESC heap_desc; + HRESULT hr; + + heap_desc.SizeInBytes = 0; + heap_desc.Properties = *heap_properties; + heap_desc.Alignment = 0; + heap_desc.Flags = heap_flags; + if (SUCCEEDED(hr = d3d12_heap_create(device, &heap_desc, resource, &resource->heap))) + resource->flags |= VKD3D_RESOURCE_DEDICATED_HEAP; + return hr; } HRESULT d3d12_committed_resource_create(struct d3d12_device *device, @@ -1642,8 +1655,6 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->u.vk_image = create_info->vk_image; object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; - memset(&object->heap_properties, 0, sizeof(object->heap_properties)); - object->heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; object->initial_state = D3D12_RESOURCE_STATE_COMMON; if (create_info->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) object->present_state = create_info->present_state; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index caaaa2427af7..34df976fe647 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -54,6 +54,7 @@ struct d3d12_command_list; struct d3d12_device; +struct d3d12_resource; struct vkd3d_vk_global_procs { @@ -348,6 +349,7 @@ struct d3d12_heap ID3D12Heap ID3D12Heap_iface; LONG refcount; + bool is_private; D3D12_HEAP_DESC desc; pthread_mutex_t mutex; @@ -362,13 +364,14 @@ struct d3d12_heap struct vkd3d_private_store private_store; }; -HRESULT d3d12_heap_create(struct d3d12_device *device, - const D3D12_HEAP_DESC *desc, struct d3d12_heap **heap) DECLSPEC_HIDDEN; +HRESULT d3d12_heap_create(struct d3d12_device *device, const D3D12_HEAP_DESC *desc, + const struct d3d12_resource *resource, struct d3d12_heap **heap) DECLSPEC_HIDDEN; struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) DECLSPEC_HIDDEN; #define VKD3D_RESOURCE_PUBLIC_FLAGS \ (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) -#define VKD3D_RESOURCE_EXTERNAL 0x00000004 +#define VKD3D_RESOURCE_EXTERNAL 0x00000004 +#define VKD3D_RESOURCE_DEDICATED_HEAP 0x00000008 /* ID3D12Resource */ struct d3d12_resource @@ -385,7 +388,6 @@ struct d3d12_resource VkBuffer vk_buffer; VkImage vk_image; } u; - VkDeviceMemory vk_memory; unsigned int flags; unsigned int map_count; @@ -394,8 +396,6 @@ struct d3d12_resource struct d3d12_heap *heap; uint64_t heap_offset; - D3D12_HEAP_PROPERTIES heap_properties; - D3D12_HEAP_FLAGS heap_flags; D3D12_RESOURCE_STATES initial_state; D3D12_RESOURCE_STATES present_state; -- 2.21.0

2 1

[PATCH vkd3d 3/5] vkd3d: Return more information from device memory allocation functions.
by Józef Kucia 20 Jun '19

20 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- libs/vkd3d/resource.c | 26 ++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 64c4bd6aeae3..eeae9cf4efe2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3177,7 +3177,7 @@ static HRESULT d3d12_command_list_allocate_transfer_buffer(struct d3d12_command_ &buffer_desc, &buffer->vk_buffer))) return hr; if (FAILED(hr = vkd3d_allocate_buffer_memory(device, buffer->vk_buffer, - &heap_properties, D3D12_HEAP_FLAG_NONE, &buffer->vk_memory))) + &heap_properties, D3D12_HEAP_FLAG_NONE, &buffer->vk_memory, NULL, NULL))) { VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL)); return hr; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index fdf68363d29d..f1cbff11d1ea 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -130,7 +130,7 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory) + VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; @@ -174,7 +174,7 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu } if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - memory_requirements, dedicated_allocation, vk_memory, NULL))) + memory_requirements, dedicated_allocation, vk_memory, vk_memory_type))) return hr; if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0) @@ -184,12 +184,15 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu *vk_memory = VK_NULL_HANDLE; } + if (vk_memory_size) + *vk_memory_size = memory_requirements->size; + return hresult_from_vk_result(vr); } static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage vk_image, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory) + VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; @@ -233,7 +236,7 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage } if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - memory_requirements, dedicated_allocation, vk_memory, NULL))) + memory_requirements, dedicated_allocation, vk_memory, vk_memory_type))) return hr; if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0) @@ -244,6 +247,9 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage return hresult_from_vk_result(vr); } + if (vk_memory_size) + *vk_memory_size = memory_requirements->size; + return S_OK; } @@ -1474,12 +1480,12 @@ static HRESULT vkd3d_allocate_resource_memory( if (d3d12_resource_is_buffer(resource)) { return vkd3d_allocate_buffer_memory(device, resource->u.vk_buffer, - heap_properties, heap_flags, &resource->vk_memory); + heap_properties, heap_flags, &resource->vk_memory, NULL, NULL); } else { return vkd3d_allocate_image_memory(device, resource->u.vk_image, - heap_properties, heap_flags, &resource->vk_memory); + heap_properties, heap_flags, &resource->vk_memory, NULL, NULL); } } @@ -3591,7 +3597,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &resource_desc, &null_resources->vk_buffer))) goto fail; if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_buffer, - &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_buffer_memory))) + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_buffer_memory, NULL, NULL))) goto fail; /* buffer UAV */ @@ -3601,7 +3607,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &resource_desc, &null_resources->vk_storage_buffer))) goto fail; if (!use_sparse_resources && FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_storage_buffer, - &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_storage_buffer_memory))) + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_storage_buffer_memory, NULL, NULL))) goto fail; /* 2D SRV */ @@ -3621,7 +3627,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &resource_desc, &null_resources->vk_2d_image))) goto fail; if (FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_image, - &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_image_memory))) + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_image_memory, NULL, NULL))) goto fail; /* 2D UAV */ @@ -3642,7 +3648,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &resource_desc, &null_resources->vk_2d_storage_image))) goto fail; if (!use_sparse_resources && FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_storage_image, - &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_storage_image_memory))) + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_storage_image_memory, NULL, NULL))) goto fail; /* set Vulkan object names */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c86370a60d04..caaaa2427af7 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -431,7 +431,7 @@ struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) DE HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory) DECLSPEC_HIDDEN; + VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size) DECLSPEC_HIDDEN; HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) DECLSPEC_HIDDEN; -- 2.21.0

2 1

[PATCH vkd3d 1/5] vkd3d: Move resource memory allocation functions.
by Józef Kucia 20 Jun '19

20 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 238 +++++++++++++++++++++--------------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index bcf523e47d75..824698a143b5 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -116,6 +116,125 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, return S_OK; } +HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + VkDeviceMemory *vk_memory) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; + VkMemoryDedicatedRequirements dedicated_requirements; + VkMemoryDedicatedAllocateInfo dedicated_info; + VkMemoryRequirements2 memory_requirements2; + VkMemoryRequirements *memory_requirements; + VkBufferMemoryRequirementsInfo2 info; + VkResult vr; + HRESULT hr; + + memory_requirements = &memory_requirements2.memoryRequirements; + + if (device->vk_info.KHR_dedicated_allocation) + { + info.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2; + info.pNext = NULL; + info.buffer = vk_buffer; + + dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS; + dedicated_requirements.pNext = NULL; + + memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; + memory_requirements2.pNext = &dedicated_requirements; + + VK_CALL(vkGetBufferMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2)); + + if (dedicated_requirements.prefersDedicatedAllocation) + { + dedicated_allocation = &dedicated_info; + + dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO; + dedicated_info.pNext = NULL; + dedicated_info.image = VK_NULL_HANDLE; + dedicated_info.buffer = vk_buffer; + } + } + else + { + VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, vk_buffer, memory_requirements)); + } + + if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, + memory_requirements, dedicated_allocation, vk_memory, NULL))) + return hr; + + if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0) + { + WARN("Failed to bind memory, vr %d.\n", vr); + VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); + *vk_memory = VK_NULL_HANDLE; + } + + return hresult_from_vk_result(vr); +} + +static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage vk_image, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + VkDeviceMemory *vk_memory) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; + VkMemoryDedicatedRequirements dedicated_requirements; + VkMemoryDedicatedAllocateInfo dedicated_info; + VkMemoryRequirements2 memory_requirements2; + VkMemoryRequirements *memory_requirements; + VkImageMemoryRequirementsInfo2 info; + VkResult vr; + HRESULT hr; + + memory_requirements = &memory_requirements2.memoryRequirements; + + if (device->vk_info.KHR_dedicated_allocation) + { + info.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2; + info.pNext = NULL; + info.image = vk_image; + + dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS; + dedicated_requirements.pNext = NULL; + + memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; + memory_requirements2.pNext = &dedicated_requirements; + + VK_CALL(vkGetImageMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2)); + + if (dedicated_requirements.prefersDedicatedAllocation) + { + dedicated_allocation = &dedicated_info; + + dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO; + dedicated_info.pNext = NULL; + dedicated_info.image = vk_image; + dedicated_info.buffer = VK_NULL_HANDLE; + } + } + else + { + VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, memory_requirements)); + } + + if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, + memory_requirements, dedicated_allocation, vk_memory, NULL))) + return hr; + + if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0) + { + WARN("Failed to bind memory, vr %d.\n", vr); + VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); + *vk_memory = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + + return S_OK; +} + /* ID3D12Heap */ static inline struct d3d12_heap *impl_from_ID3D12Heap(ID3D12Heap *iface) { @@ -731,125 +850,6 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, return hr; } -HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory) -{ - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; - VkMemoryDedicatedRequirements dedicated_requirements; - VkMemoryDedicatedAllocateInfo dedicated_info; - VkMemoryRequirements2 memory_requirements2; - VkMemoryRequirements *memory_requirements; - VkBufferMemoryRequirementsInfo2 info; - VkResult vr; - HRESULT hr; - - memory_requirements = &memory_requirements2.memoryRequirements; - - if (device->vk_info.KHR_dedicated_allocation) - { - info.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2; - info.pNext = NULL; - info.buffer = vk_buffer; - - dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS; - dedicated_requirements.pNext = NULL; - - memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; - memory_requirements2.pNext = &dedicated_requirements; - - VK_CALL(vkGetBufferMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2)); - - if (dedicated_requirements.prefersDedicatedAllocation) - { - dedicated_allocation = &dedicated_info; - - dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO; - dedicated_info.pNext = NULL; - dedicated_info.image = VK_NULL_HANDLE; - dedicated_info.buffer = vk_buffer; - } - } - else - { - VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, vk_buffer, memory_requirements)); - } - - if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - memory_requirements, dedicated_allocation, vk_memory, NULL))) - return hr; - - if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0) - { - WARN("Failed to bind memory, vr %d.\n", vr); - VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); - *vk_memory = VK_NULL_HANDLE; - } - - return hresult_from_vk_result(vr); -} - -static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage vk_image, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory) -{ - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; - VkMemoryDedicatedRequirements dedicated_requirements; - VkMemoryDedicatedAllocateInfo dedicated_info; - VkMemoryRequirements2 memory_requirements2; - VkMemoryRequirements *memory_requirements; - VkImageMemoryRequirementsInfo2 info; - VkResult vr; - HRESULT hr; - - memory_requirements = &memory_requirements2.memoryRequirements; - - if (device->vk_info.KHR_dedicated_allocation) - { - info.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2; - info.pNext = NULL; - info.image = vk_image; - - dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS; - dedicated_requirements.pNext = NULL; - - memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; - memory_requirements2.pNext = &dedicated_requirements; - - VK_CALL(vkGetImageMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2)); - - if (dedicated_requirements.prefersDedicatedAllocation) - { - dedicated_allocation = &dedicated_info; - - dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO; - dedicated_info.pNext = NULL; - dedicated_info.image = vk_image; - dedicated_info.buffer = VK_NULL_HANDLE; - } - } - else - { - VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, memory_requirements)); - } - - if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - memory_requirements, dedicated_allocation, vk_memory, NULL))) - return hr; - - if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0) - { - WARN("Failed to bind memory, vr %d.\n", vr); - VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); - *vk_memory = VK_NULL_HANDLE; - return hresult_from_vk_result(vr); - } - - return S_OK; -} - static void d3d12_resource_destroy(struct d3d12_resource *resource, struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; -- 2.21.0

2 1

[PATCH 5/5] wined3d: Merge the wined3d_texture_gl texture ops implementations.
by Henri Verbeet 20 Jun '19

20 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 97 ++++++-------------------------------------------- 1 file changed, 11 insertions(+), 86 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4b6478537df..ae3e17914f5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2630,9 +2630,9 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g return TRUE; } -/* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ -static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD location) +/* Context activation is done by the caller. */ +static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); @@ -2640,6 +2640,9 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", texture, sub_resource_idx, context, wined3d_debug_location(location)); + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; + switch (location) { case WINED3D_LOCATION_USER_MEMORY: @@ -2660,7 +2663,8 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); default: - ERR("Don't know how to handle location %#x.\n", location); + FIXME("Unhandled %s load from %s.\n", wined3d_debug_location(location), + wined3d_debug_location(texture->sub_resources[sub_resource_idx].locations)); return FALSE; } } @@ -2757,9 +2761,9 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, dst_bo_addr); } -static const struct wined3d_texture_ops texture2d_ops = +static const struct wined3d_texture_ops texture_gl_ops = { - texture2d_load_location, + wined3d_texture_gl_load_location, wined3d_texture_gl_upload_data, wined3d_texture_gl_download_data, }; @@ -3040,45 +3044,6 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_resource_sub_resource_unmap, }; -/* Context activation is done by the caller. */ -static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD location) -{ - struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; - struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - - TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", - texture, sub_resource_idx, context, wined3d_debug_location(location)); - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) - return FALSE; - - switch (location) - { - case WINED3D_LOCATION_TEXTURE_RGB: - case WINED3D_LOCATION_TEXTURE_SRGB: - return wined3d_texture_gl_load_texture(texture_gl, sub_resource_idx, - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_BUFFER: - return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); - - default: - FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location), - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } -} - -static const struct wined3d_texture_ops texture1d_ops = -{ - texture1d_load_location, - wined3d_texture_gl_upload_data, - wined3d_texture_gl_download_data, -}; - static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, void *sub_resources, @@ -3351,42 +3316,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3D_OK; } -/* Context activation is done by the caller. */ -static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD location) -{ - struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; - struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) - return FALSE; - - switch (location) - { - case WINED3D_LOCATION_TEXTURE_RGB: - case WINED3D_LOCATION_TEXTURE_SRGB: - return wined3d_texture_gl_load_texture(texture_gl, sub_resource_idx, - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_BUFFER: - return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); - - default: - FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location), - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } -} - -static const struct wined3d_texture_ops texture3d_ops = -{ - texture3d_load_location, - wined3d_texture_gl_upload_data, - wined3d_texture_gl_download_data, -}; - HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) @@ -3648,7 +3577,6 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st DWORD flags, void *parent, const struct wined3d_parent_ops *parent_ops, void *sub_resources) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_texture_ops *texture_ops; HRESULT hr; TRACE("texture_gl %p, device %p, desc %p, layer_count %u, level_count %u, " @@ -3666,7 +3594,6 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st switch (desc->resource_type) { case WINED3D_RTYPE_TEXTURE_1D: - texture_ops = &texture1d_ops; if (layer_count > 1) texture_gl->target = GL_TEXTURE_1D_ARRAY; else @@ -3674,7 +3601,6 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st break; case WINED3D_RTYPE_TEXTURE_2D: - texture_ops = &texture2d_ops; if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) { texture_gl->target = GL_TEXTURE_CUBE_MAP_ARB; @@ -3701,7 +3627,6 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st WARN("OpenGL implementation does not support 3D textures.\n"); return WINED3DERR_INVALIDCALL; } - texture_ops = &texture3d_ops; texture_gl->target = GL_TEXTURE_3D; break; @@ -3713,7 +3638,7 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st list_init(&texture_gl->renderbuffers); if (FAILED(hr = wined3d_texture_init(&texture_gl->t, desc, layer_count, level_count, - flags, device, parent, parent_ops, sub_resources, texture_ops))) + flags, device, parent, parent_ops, sub_resources, &texture_gl_ops))) return hr; if (texture_gl->t.resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to find_arb_pshader().
by Henri Verbeet 20 Jun '19

20 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 82ef11943d3..273c4f31568 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4227,11 +4227,11 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, } /* Context activation is done by the caller. */ -static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_context *context, +static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_context_gl *context_gl, struct wined3d_shader *shader, const struct arb_ps_compile_args *args) { - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_device *device = shader->device; UINT i; DWORD new_size; @@ -4565,7 +4565,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context TRACE("Using pixel shader %p.\n", ps); find_arb_ps_compile_args(state, context, ps, &compile_args); - compiled = find_arb_pshader(context, ps, &compile_args); + compiled = find_arb_pshader(context_gl, ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to shader_arb_load_constants_internal().
by Henri Verbeet 20 Jun '19

20 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 50f49fd033e..82ef11943d3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -642,13 +642,11 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context * worry about the Integers or Booleans */ /* Context activation is done by the caller (state handler). */ -static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, - struct wined3d_context *context, const struct wined3d_state *state, - BOOL usePixelShader, BOOL useVertexShader, BOOL from_shader_select) +static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, struct wined3d_context_gl *context_gl, + const struct wined3d_state *state, BOOL use_ps, BOOL use_vs, BOOL from_shader_select) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (!from_shader_select) { @@ -661,7 +659,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, && (vshader->reg_maps.integer_constants & ~vshader->reg_maps.local_int_consts)))) { TRACE("bool/integer vertex shader constants potentially modified, forcing shader reselection.\n"); - shader_arb_select(priv, context, state); + shader_arb_select(priv, &context_gl->c, state); } else if (pshader && (pshader->reg_maps.boolean_constants @@ -669,11 +667,11 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, && (pshader->reg_maps.integer_constants & ~pshader->reg_maps.local_int_consts)))) { TRACE("bool/integer pixel shader constants potentially modified, forcing shader reselection.\n"); - shader_arb_select(priv, context, state); + shader_arb_select(priv, &context_gl->c, state); } } - if (context != priv->last_context) + if (&context_gl->c != priv->last_context) { memset(priv->vshader_const_dirty, 1, sizeof(*priv->vshader_const_dirty) * d3d_info->limits.vs_uniform_count); @@ -683,10 +681,10 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, sizeof(*priv->pshader_const_dirty) * d3d_info->limits.ps_uniform_count); priv->highest_dirty_ps_const = d3d_info->limits.ps_uniform_count; - priv->last_context = context; + priv->last_context = &context_gl->c; } - if (useVertexShader) + if (use_vs) { const struct wined3d_shader *vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; const struct arb_vs_compiled_shader *gl_shader = priv->compiled_vprog; @@ -697,7 +695,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, shader_arb_vs_local_constants(gl_shader, context_gl, state); } - if (usePixelShader) + if (use_ps) { const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct arb_ps_compiled_shader *gl_shader = priv->compiled_fprog; @@ -708,7 +706,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, priv->highest_dirty_ps_const, state->ps_consts_f, priv->pshader_const_dirty); shader_arb_ps_local_constants(gl_shader, context_gl, state, rt_height); - if (context->constant_update_mask & WINED3D_SHADER_CONST_PS_NP2_FIXUP) + if (context_gl->c.constant_update_mask & WINED3D_SHADER_CONST_PS_NP2_FIXUP) shader_arb_load_np2fixup_constants(&gl_shader->np2fixup_info, gl_info, state); } } @@ -716,10 +714,8 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, static void shader_arb_load_constants(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { - BOOL vs = use_vs(state); - BOOL ps = use_ps(state); - - shader_arb_load_constants_internal(shader_priv, context, state, ps, vs, FALSE); + shader_arb_load_constants_internal(shader_priv, wined3d_context_gl(context), + state, use_ps(state), use_vs(state), FALSE); } static void shader_arb_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) @@ -4598,7 +4594,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context priv->pshader_const_dirty[i] = 1; } /* Also takes care of loading local constants */ - shader_arb_load_constants_internal(shader_priv, context, state, TRUE, FALSE, TRUE); + shader_arb_load_constants_internal(shader_priv, context_gl, state, TRUE, FALSE, TRUE); } else { -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to shader_arb_vs_local_constants().
by Henri Verbeet 20 Jun '19

20 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 050d12f5650..50f49fd033e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -604,14 +604,14 @@ static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *g /* Context activation is done by the caller. */ static void shader_arb_vs_local_constants(const struct arb_vs_compiled_shader *gl_shader, - const struct wined3d_context *context, const struct wined3d_state *state) + const struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; float position_fixup[4]; unsigned char i; /* Upload the position fixup */ - shader_get_position_fixup(context, state, 1, position_fixup); + shader_get_position_fixup(&context_gl->c, state, 1, position_fixup); GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->pos_fixup, position_fixup)); if (!gl_shader->num_int_consts) return; @@ -694,7 +694,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, /* Load DirectX 9 float constants for vertex shader */ priv->highest_dirty_vs_const = shader_arb_load_constants_f(vshader, gl_info, GL_VERTEX_PROGRAM_ARB, priv->highest_dirty_vs_const, state->vs_consts_f, priv->vshader_const_dirty); - shader_arb_vs_local_constants(gl_shader, context, state); + shader_arb_vs_local_constants(gl_shader, context_gl, state); } if (usePixelShader) @@ -4661,7 +4661,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context gl_info->gl_ops.gl.p_glEnable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); TRACE("Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", priv->current_vprogram_id); - shader_arb_vs_local_constants(compiled, context, state); + shader_arb_vs_local_constants(compiled, context_gl, state); if(priv->last_vs_color_unclamp != compiled->need_color_unclamp) { priv->last_vs_color_unclamp = compiled->need_color_unclamp; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to shader_arb_ps_local_constants().
by Henri Verbeet 20 Jun '19

20 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 89f9b5a10a2..050d12f5650 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -540,9 +540,9 @@ static void shader_arb_load_np2fixup_constants(const struct arb_ps_np2fixup_info /* Context activation is done by the caller. */ static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *gl_shader, - const struct wined3d_context *context, const struct wined3d_state *state, UINT rt_height) + const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, unsigned int rt_height) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned char i; for(i = 0; i < gl_shader->numbumpenvmatconsts; i++) @@ -576,8 +576,8 @@ static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *g * ycorrection.w: 0.0 */ float val[4]; - val[0] = context->render_offscreen ? 0.0f : (float) rt_height; - val[1] = context->render_offscreen ? 1.0f : -1.0f; + val[0] = context_gl->c.render_offscreen ? 0.0f : (float)rt_height; + val[1] = context_gl->c.render_offscreen ? 1.0f : -1.0f; val[2] = 1.0f; val[3] = 0.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->ycorrection, val)); @@ -646,6 +646,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, struct wined3d_context *context, const struct wined3d_state *state, BOOL usePixelShader, BOOL useVertexShader, BOOL from_shader_select) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -705,7 +706,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, /* Load DirectX 9 float constants for pixel shader */ priv->highest_dirty_ps_const = shader_arb_load_constants_f(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, priv->highest_dirty_ps_const, state->ps_consts_f, priv->pshader_const_dirty); - shader_arb_ps_local_constants(gl_shader, context, state, rt_height); + shader_arb_ps_local_constants(gl_shader, context_gl, state, rt_height); if (context->constant_update_mask & WINED3D_SHADER_CONST_PS_NP2_FIXUP) shader_arb_load_np2fixup_constants(&gl_shader->np2fixup_info, gl_info, state); @@ -4554,8 +4555,9 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, static void shader_arb_select(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { - struct shader_arb_priv *priv = shader_priv; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; + struct shader_arb_priv *priv = shader_priv; int i; /* Deal with pixel shaders first so the vertex shader arg function has the input signature ready */ @@ -4601,7 +4603,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context else { UINT rt_height = state->fb->render_targets[0]->height; - shader_arb_ps_local_constants(compiled, context, state, rt_height); + shader_arb_ps_local_constants(compiled, context_gl, state, rt_height); } /* Force constant reloading for the NP2 fixup (see comment in shader_glsl_select for more info) */ -- 2.11.0

1 0

[PATCH v5 1/6] ntdll/tests: Cleanup NtAllocateVirtualMemory related tests
by Rémi Bernon 20 Jun '19

20 Jun '19

* Rename the test function for consistency * Remove unneeded if to release memory where allocation never succeeds * Fix a test where the zero_bits variable was used but not passed as parameter Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 183a097f76a..a5477177ce8 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -32,7 +32,7 @@ static NTSTATUS (WINAPI *pRtlCreateUserStack)(SIZE_T, SIZE_T, ULONG, SIZE_T, SIZ static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); -static void test_AllocateVirtualMemory(void) +static void test_NtAllocateVirtualMemory(void) { void *addr1, *addr2; NTSTATUS status; @@ -60,18 +60,12 @@ static void test_AllocateVirtualMemory(void) status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 12, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) - { - size = 0; - status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); - ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); - } /* 1 zero bits should zero 63-31 upper bits */ size = 0x1000; addr2 = NULL; zero_bits = 1; - status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 1, &size, + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, zero_bits, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY || broken(status == STATUS_INVALID_PARAMETER_3) /* winxp */, @@ -250,6 +244,6 @@ START_TEST(virtual) trace("system page size %#x\n", sbi.PageSize); page_size = sbi.PageSize; - test_AllocateVirtualMemory(); + test_NtAllocateVirtualMemory(); test_RtlCreateUserStack(); } -- 2.20.1

3 13

[PATCH v4 1/3] kernel32: Add sxs tests
by Fabian Maurer 20 Jun '19

20 Jun '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/tests/actctx.c | 385 +++++++++++++++++++++++++++++++++ dlls/kernel32/tests/dummy.c | 21 +- dlls/kernel32/tests/dummy.spec | 2 +- 3 files changed, 406 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 6891fbe761..19a51db742 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -504,6 +504,38 @@ static const char settings_manifest3[] = " </asmv3:application>" "</assembly>"; +static const char two_dll_manifest_dll[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v3\" manifestVersion=\"1.0\">" +" <assemblyIdentity type=\"win32\" name=\"sxs_dll\" version=\"1.0.0.0\" processorArchitecture=\"x86\" publicKeyToken=\"0000000000000000\"/>" +" <file name=\"sxs_dll.dll\"></file>" +"</assembly>"; + +static const char two_dll_manifest_exe[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <dependency>" +" <dependentAssembly>" +" <assemblyIdentity type=\"win32\" name=\"sxs_dll\" version=\"1.0.0.0\" processorArchitecture=\"x86\" publicKeyToken=\"0000000000000000\" language=\"*\"/>" +" </dependentAssembly>" +" </dependency>" +"</assembly>"; + +static const char builtin_dll_manifest[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <dependency>" +" <dependentAssembly>" +" <assemblyIdentity" +" type=\"win32\"" +" name=\"microsoft.vc90.crt\"" +" version=\"9.0.20718.0\"" +" processorArchitecture=\"*\"" +" publicKeyToken=\"1fc8b3b9a1e18e3b\"" +" language=\"*\"" +" />" +" </dependentAssembly>" +" </dependency>" +"</assembly>"; + + DEFINE_GUID(VISTA_COMPAT_GUID, 0xe2011457, 0x1546, 0x43c5, 0xa5, 0xfe, 0x00, 0x8d, 0xee, 0xe3, 0xd3, 0xf0); DEFINE_GUID(WIN7_COMPAT_GUID, 0x35138b9a, 0x5d96, 0x4fbd, 0x8e, 0x2d, 0xa2, 0x44, 0x02, 0x25, 0xf9, 0x3a); DEFINE_GUID(WIN8_COMPAT_GUID, 0x4a2f28e3, 0x53b9, 0x4441, 0xba, 0x9c, 0xd6, 0x9d, 0x4a, 0x4a, 0x6e, 0x38); @@ -3171,6 +3203,347 @@ static void test_settings(void) pReleaseActCtx(handle); } + +typedef struct +{ + char path_tmp[MAX_PATH]; + char path_dll[MAX_PATH]; + char path_manifest_exe[MAX_PATH]; + char path_manifest_dll[MAX_PATH]; + ACTCTXA context; + ULONG_PTR cookie; + HANDLE handle_context; + HMODULE module; + void (WINAPI *get_path)(char *buffer, int buffer_size); +} sxs_info; + +static BOOL fill_sxs_info(sxs_info *info, const char *temp, const char *path_dll, const char *exe_manifest, const char *dll_manifest, BOOL do_load) +{ + BOOL success; + + GetTempPathA(MAX_PATH, info->path_tmp); + strcat(info->path_tmp, temp); + strcat(info->path_tmp, "\\"); + CreateDirectoryA(info->path_tmp, NULL); + + sprintf(info->path_dll, "%s%s", info->path_tmp, "sxs_dll.dll"); + extract_resource(path_dll, "TESTDLL", info->path_dll); + + sprintf(info->path_manifest_exe, "%s%s", info->path_tmp, "exe.manifest"); + create_manifest_file(info->path_manifest_exe, exe_manifest, -1, NULL, NULL); + + sprintf(info->path_manifest_dll, "%s%s", info->path_tmp, "sxs_dll.manifest"); + create_manifest_file(info->path_manifest_dll, dll_manifest, -1, NULL, NULL); + + info->context.cbSize = sizeof(ACTCTXA); + info->context.lpSource = info->path_manifest_exe; + info->context.lpAssemblyDirectory = info->path_tmp; + info->context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + info->handle_context = CreateActCtxA(&info->context); + ok((info->handle_context != NULL && info->handle_context != INVALID_HANDLE_VALUE ) + || broken(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX), /* XP doesn't support manifests outside of PE files */ + "CreateActCtxA failed: %d\n", GetLastError()); + if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) + { + skip("Failed to create activation context.\n"); + return FALSE; + } + + if (do_load) + { + success = ActivateActCtx(info->handle_context, &info->cookie); + ok(success, "ActivateActCtx failed: %d\n", GetLastError()); + + info->module = LoadLibraryA("sxs_dll.dll"); + ok(info->module != NULL, "LoadLibrary failed\n"); + + info->get_path = (void *)GetProcAddress(info->module, "get_path"); + ok(info->get_path != NULL, "GetProcAddress failed\n"); + + DeactivateActCtx(0, info->cookie); + } + return TRUE; +} + +static void clean_sxs_info(sxs_info *info) +{ + if (info->handle_context) + ReleaseActCtx(info->handle_context); + if (*info->path_dll) + ok(DeleteFileA(info->path_dll), "DeleteFileA failed for %s: %d\n", info->path_dll, GetLastError()); + if (*info->path_manifest_exe) + ok(DeleteFileA(info->path_manifest_exe), "DeleteFileA failed for %s: %d\n", info->path_manifest_exe, GetLastError()); + if (*info->path_manifest_dll) + ok(DeleteFileA(info->path_manifest_dll), "DeleteFileA failed for %s: %d\n", info->path_manifest_dll, GetLastError()); + if (*info->path_tmp) + ok(RemoveDirectoryA(info->path_tmp), "RemoveDirectoryA failed for %s: %d\n", info->path_tmp, GetLastError()); +} + +static void get_application_directory(char *buffer, int buffer_size) +{ + char *end; + GetModuleFileNameA(NULL, buffer, buffer_size); + end = strrchr(buffer, '\\'); + end[1] = 0; +} + +/* Test loading two sxs dlls at the same time */ +static void test_two_dlls_at_same_time(void) +{ + sxs_info dll_1 = {0}; + sxs_info dll_2 = {0}; + char path1[MAX_PATH], path2[MAX_PATH]; + + if (!fill_sxs_info(&dll_1, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE)) + goto cleanup; + if (!fill_sxs_info(&dll_2, "2", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE)) + goto cleanup; + + todo_wine + ok(dll_1.module != dll_2.module, "Libraries are the same\n"); + dll_1.get_path(path1, sizeof(path1)); + ok(strcmp(path1, dll_1.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll_1.path_dll); + dll_2.get_path(path2, sizeof(path2)); + todo_wine + ok(strcmp(path2, dll_2.path_dll) == 0, "Got '%s', expected '%s'\n", path2, dll_2.path_dll); + +cleanup: + if (dll_1.module) + FreeLibrary(dll_1.module); + if (dll_2.module) + FreeLibrary(dll_2.module); + clean_sxs_info(&dll_1); + clean_sxs_info(&dll_2); +} + +/* Test loading a normal dll and then a sxs dll with the same name */ +static void test_one_sxs_and_one_local_1(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_application[MAX_PATH]; + HMODULE module = NULL; + char path1[MAX_PATH], path2[MAX_PATH]; + void (WINAPI *get_path)(char *buffer, int buffer_size); + + get_application_directory(path_application, sizeof(path_application)); + + sprintf(path_dll_local, "%s%s", path_application, "sxs_dll.dll"); + extract_resource("dummy.dll", "TESTDLL", path_dll_local); + + module = LoadLibraryA(path_dll_local); + get_path = (void *)GetProcAddress(module, "get_path"); + + if (!fill_sxs_info(&dll, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE)) + goto cleanup; + + todo_wine + ok(dll.module != module, "Libraries are the same\n"); + dll.get_path(path1, sizeof(path1)); + todo_wine + ok(strcmp(path1, dll.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll.path_dll); + get_path(path2, sizeof(path2)); + ok(strcmp(path2, path_dll_local) == 0, "Got '%s', expected '%s'\n", path2, path_dll_local); + +cleanup: + if (module) + FreeLibrary(module); + if (dll.module) + FreeLibrary(dll.module); + if (*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + +/* Test if sxs dll has priority over normal dll */ +static void test_one_sxs_and_one_local_2(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_application[MAX_PATH]; + HMODULE module = NULL; + char path1[MAX_PATH], path2[MAX_PATH]; + void (WINAPI *get_path)(char *buffer, int buffer_size); + + get_application_directory(path_application, sizeof(path_application)); + + sprintf(path_dll_local, "%s%s", path_application, "sxs_dll.dll"); + extract_resource("dummy.dll", "TESTDLL", path_dll_local); + + if (!fill_sxs_info(&dll, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE)) + goto cleanup; + + module = LoadLibraryA(path_dll_local); + get_path = (void *)GetProcAddress(module, "get_path"); + + ok(dll.module != module, "Libraries are the same\n"); + dll.get_path(path1, sizeof(path1)); + ok(strcmp(path1, dll.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll.path_dll); + get_path(path2, sizeof(path2)); + ok(strcmp(path2, path_dll_local) == 0, "Got '%s', expected '%s'\n", path2, path_dll_local); + +cleanup: + if (module) + FreeLibrary(module); + if (dll.module) + FreeLibrary(dll.module); + if (*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + + +/* Test if we can get a module handle from loaded normal dll while context is active */ +static void test_one_with_sxs_and_GetModuleHandleA(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_tmp[MAX_PATH]; + HMODULE module = NULL, module_temp; + BOOL success; + + GetTempPathA(sizeof(path_tmp), path_tmp); + + sprintf(path_dll_local, "%s%s", path_tmp, "sxs_dll.dll"); + extract_resource("dummy.dll", "TESTDLL", path_dll_local); + + module = LoadLibraryA(path_dll_local); + + if (!fill_sxs_info(&dll, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, FALSE)) + goto cleanup; + + success = ActivateActCtx(dll.handle_context, &dll.cookie); + ok(success, "ActivateActCtx failed: %d\n", GetLastError()); + + module_temp = GetModuleHandleA("sxs_dll.dll"); + todo_wine + ok (module_temp == 0, "Expected 0, got %p\n", module_temp); + + DeactivateActCtx(0, dll.cookie); + +cleanup: + if (module) + FreeLibrary(module); + if (dll.module) + FreeLibrary(dll.module); + if (*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + +static void test_builtin_sxs(void) +{ + char path_manifest[MAX_PATH] = {0}; + char path_tmp[MAX_PATH]; + HMODULE module_msvcp = 0, module_msvcr = 0; + char path_msvcp[MAX_PATH], path_msvcr[MAX_PATH]; + ACTCTXA context; + ULONG_PTR cookie; + HANDLE handle_context; + BOOL success; + static const char *expected_path = "C:\\Windows\\WinSxS"; + + GetTempPathA(sizeof(path_tmp), path_tmp); + + sprintf(path_manifest, "%s%s", path_tmp, "exe.manifest"); + create_manifest_file(path_manifest, builtin_dll_manifest, -1, NULL, NULL); + + context.cbSize = sizeof(ACTCTXA); + context.lpSource = path_manifest; + context.lpAssemblyDirectory = path_tmp; + context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + handle_context = CreateActCtxA(&context); + ok((handle_context != NULL && handle_context != INVALID_HANDLE_VALUE ) + || broken(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX), /* XP doesn't support manifests outside of PE files */ + "CreateActCtxA failed: %d\n", GetLastError()); + if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) + { + skip("Failed to create activation context.\n"); + goto cleanup; + } + + + success = ActivateActCtx(handle_context, &cookie); + ok(success, "ActivateActCtx failed: %d\n", GetLastError()); + + module_msvcp = LoadLibraryA("msvcp90.dll"); + ok (module_msvcp != 0 || broken(module_msvcp == 0), "LoadLibraryA failed, %d\n", GetLastError()); + module_msvcr = LoadLibraryA("msvcr90.dll"); + ok (module_msvcr != 0 || broken(module_msvcr == 0), "LoadLibraryA failed, %d\n", GetLastError()); + if (!module_msvcp || !module_msvcr) + { + skip("Failed to find msvcp90 or msvcr90.\n"); + goto cleanup; + } + + GetModuleFileNameA(module_msvcp, path_msvcp, sizeof(path_msvcp)); + GetModuleFileNameA(module_msvcr, path_msvcr, sizeof(path_msvcr)); + ok(strncasecmp(expected_path, path_msvcp, strlen(expected_path)) == 0, "Expected path to start with %s, got %s\n", expected_path, path_msvcp); + todo_wine + ok(strncasecmp(expected_path, path_msvcr, strlen(expected_path)) == 0, "Expected path to start with %s, got %s\n", expected_path, path_msvcr); + + DeactivateActCtx(0, cookie); + +cleanup: + if (module_msvcp) + FreeLibrary(module_msvcp); + if (module_msvcr) + FreeLibrary(module_msvcr); + if (*path_manifest) + ok(DeleteFileA(path_manifest), "DeleteFileA failed for %s: %d\n", path_manifest, GetLastError()); +} + +static void run_sxs_test(int run) +{ + switch(run) + { + case 1: + test_two_dlls_at_same_time(); + break; + case 2: + test_one_sxs_and_one_local_1(); + break; + case 3: + test_one_sxs_and_one_local_2(); + break; + case 4: + test_one_with_sxs_and_GetModuleHandleA(); + break; + case 5: + test_builtin_sxs(); + break; + } +} + +static void run_child_process_two_dll(int run) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs( &argv ); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s two_dll %d", argv[0], argv[1], run); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process( pi.hProcess ); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +} + START_TEST(actctx) { int argc; @@ -3190,6 +3563,13 @@ START_TEST(actctx) return; } + if (argc > 2 && !strcmp(argv[2], "two_dll")) + { + int run = atoi(argv[3]); + run_sxs_test(run); + return; + } + test_actctx(); test_create_fail(); test_CreateActCtx(); @@ -3198,4 +3578,9 @@ START_TEST(actctx) run_child_process(); test_compatibility(); test_settings(); + run_child_process_two_dll(1); + run_child_process_two_dll(2); + run_child_process_two_dll(3); + run_child_process_two_dll(4); + run_child_process_two_dll(5); } diff --git a/dlls/kernel32/tests/dummy.c b/dlls/kernel32/tests/dummy.c index 3053583c76..14d0d90dea 100644 --- a/dlls/kernel32/tests/dummy.c +++ b/dlls/kernel32/tests/dummy.c @@ -1 +1,20 @@ -/* nothing here */ +#include <windows.h> + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = instance_new; + break; + } + + return TRUE; +} + +WINAPI void get_path(char *buffer, int buffer_size) +{ + GetModuleFileNameA(instance, buffer, buffer_size); +} diff --git a/dlls/kernel32/tests/dummy.spec b/dlls/kernel32/tests/dummy.spec index b2a4ba5910..d227c47895 100644 --- a/dlls/kernel32/tests/dummy.spec +++ b/dlls/kernel32/tests/dummy.spec @@ -1 +1 @@ -# nothing here +@ stdcall get_path(ptr long) -- 2.22.0

2 3

[PATCH] hid: Fill the HIDD_ATTRIBUTES Size member, and add a test for expected size
by Rémi Bernon 20 Jun '19

20 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidd.c | 1 + dlls/hid/tests/device.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 16b3a3f0a2b..4bb4deb48b3 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -69,6 +69,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) if (ret) { + Attr->Size = sizeof(HIDD_ATTRIBUTES); Attr->VendorID = info.VendorID; Attr->ProductID = info.ProductID; Attr->VersionNumber = info.VersionNumber; diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 4651ced06dd..bb819cc83f2 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -34,6 +34,7 @@ static void test_device_info(HANDLE device) { PHIDP_PREPARSED_DATA ppd; HIDP_CAPS Caps; + HIDD_ATTRIBUTES attributes; NTSTATUS status; BOOL rc; WCHAR device_name[128]; @@ -47,6 +48,10 @@ static void test_device_info(HANDLE device) trace("Found device %s (%02x, %02x)\n", wine_dbgstr_w(device_name), Caps.UsagePage, Caps.Usage); rc = HidD_FreePreparsedData(ppd); ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); + rc = HidD_GetAttributes(device, &attributes); + ok(rc, "Failed to get device attributes (0x%x)\n", GetLastError()); + ok(attributes.Size == sizeof(attributes), "Unexpected HIDD_ATTRIBUTES size: %d\n", attributes.Size); + trace("Device attributes: vid:%04x pid:%04x ver:%04x\n", attributes.VendorID, attributes.ProductID, attributes.VersionNumber); } static void run_for_each_device(device_test *test) -- 2.20.1

2 1

[PATCH] services: Support delayed autostart services.
by Jacek Caban 20 Jun '19

20 Jun '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/services/services.c | 116 ++++++++++++++++++++++++++++++++++- programs/services/services.h | 1 + 2 files changed, 116 insertions(+), 1 deletion(-)

1 0

[PATCH v4 1/6] kernel32/tests: Fix some NtMapViewOfSection tests expectations, and add results for w1064v1809
by Rémi Bernon 20 Jun '19

20 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 62 ++++++++++++++++------------------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0b718606d0e..8f693d7ae68 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -73,6 +73,20 @@ static HANDLE create_target_process(const char *arg) return pi.hProcess; } +static UINT_PTR get_zero_bits(UINT_PTR p) +{ + UINT_PTR z = 0; + +#ifdef __x86_64__ + if (p >= 0xffffffff) + return (~(UINT_PTR)0) >> get_zero_bits(p >> 32); +#endif + + if (p == 0) return 32; + while ((p >> (31 - z)) != 1) z++; + return z; +} + static void test_VirtualAllocEx(void) { const unsigned int alloc_size = 1<<15; @@ -1260,24 +1274,12 @@ static void test_NtMapViewOfSection(void) ok( result == sizeof(buffer), "ReadProcessMemory didn't read all data (%lx)\n", result ); ok( !memcmp( buffer, data, sizeof(buffer) ), "Wrong data read\n" ); - /* for some unknown reason NtMapViewOfSection fails with STATUS_NO_MEMORY when zero_bits != 0 ? */ ptr2 = NULL; size = 0; offset.QuadPart = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine - ok( status == STATUS_NO_MEMORY, "NtMapViewOfSection returned %x\n", status ); - if (status == STATUS_SUCCESS) - { - status = pNtUnmapViewOfSection( hProcess, ptr2 ); - ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); - } - - ptr2 = NULL; - size = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine - ok( status == STATUS_NO_MEMORY, "NtMapViewOfSection returned %x\n", status ); + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 1, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { status = pNtUnmapViewOfSection( hProcess, ptr2 ); @@ -1288,7 +1290,8 @@ static void test_NtMapViewOfSection(void) ptr2 = NULL; size = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 22, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { status = pNtUnmapViewOfSection( hProcess, ptr2 ); @@ -1323,30 +1326,20 @@ static void test_NtMapViewOfSection(void) status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, 0, PAGE_READWRITE ); ok( status == STATUS_MAPPED_ALIGNMENT, "NtMapViewOfSection returned %x\n", status ); - /* zero_bits != 0 is not allowed when an address is set */ + /* when an address is passed, it has to satisfy the provided number of zero bits */ ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, get_zero_bits(((UINT_PTR)ptr2) >> 1), 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); - - ptr2 = (char *)ptr + 0x1001; - size = 0; - offset.QuadPart = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); - - ptr2 = (char *)ptr + 0x1000; - size = 0; - offset.QuadPart = 1; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, get_zero_bits((UINT_PTR)ptr2), 0, &offset, &size, 1, 0, PAGE_READWRITE ); + todo_wine + ok( status == STATUS_MAPPED_ALIGNMENT, "NtMapViewOfSection returned %x\n", status ); if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) @@ -1409,7 +1402,8 @@ static void test_NtMapViewOfSection(void) status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); todo_wine - ok( status == STATUS_INVALID_PARAMETER_9, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_9 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); } status = pNtUnmapViewOfSection( hProcess, ptr ); -- 2.20.1

3 13

[PATCH v3] d3drm: Introduce a d3drm_matrix structure.
by Henri Verbeet 20 Jun '19

20 Jun '19

Since D3DRMMATRIX4D is just a pain to work with. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166868 and 166901. As Jeff pointed out, version 1 and 2 of GetTransform() are supposed to only return the local transform. ...and v3, which is what v2 should have been. dlls/d3drm/d3drm_private.h | 15 ++++++++++++++- dlls/d3drm/frame.c | 24 ++++++++++++++---------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 858911f3507..dcda35fb081 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -33,6 +33,19 @@ #include "wine/heap.h" #include "wine/list.h" +struct d3drm_matrix +{ + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; +}; + +static inline struct d3drm_matrix *d3drm_matrix(D3DRMMATRIX4D m) +{ + return (struct d3drm_matrix *)m; +} + struct d3drm_object { LONG ref; @@ -71,7 +84,7 @@ struct d3drm_frame SIZE_T nb_lights; SIZE_T lights_size; IDirect3DRMLight **lights; - D3DRMMATRIX4D transform; + struct d3drm_matrix transform; D3DCOLOR scenebackground; DWORD traversal_options; }; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 8bed50b57eb..8bcd1f42497 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -23,11 +23,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -static D3DRMMATRIX4D identity = { - { 1.0f, 0.0f, 0.0f, 0.0f }, - { 0.0f, 1.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 1.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 1.0f } +static const struct d3drm_matrix identity = +{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, }; struct d3drm_frame_array @@ -941,13 +942,14 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + const struct d3drm_matrix *m = d3drm_matrix(matrix); TRACE("iface %p, type %#x, matrix %p.\n", iface, type, matrix); switch (type) { case D3DRMCOMBINE_REPLACE: - memcpy(frame->transform, matrix, sizeof(D3DRMMATRIX4D)); + frame->transform = *m; break; case D3DRMCOMBINE_BEFORE: @@ -1415,13 +1417,14 @@ static HRESULT WINAPI d3drm_frame3_GetTransform(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_matrix *m = d3drm_matrix(matrix); TRACE("iface %p, reference %p, matrix %p.\n", iface, reference, matrix); if (reference) - FIXME("Specifying a frame as the root of the scene different from the current root frame is not supported yet\n"); + FIXME("Ignoring reference frame %p.\n", reference); - memcpy(matrix, frame->transform, sizeof(D3DRMMATRIX4D)); + *m = frame->transform; return D3DRM_OK; } @@ -1429,10 +1432,11 @@ static HRESULT WINAPI d3drm_frame3_GetTransform(IDirect3DRMFrame3 *iface, static HRESULT WINAPI d3drm_frame2_GetTransform(IDirect3DRMFrame2 *iface, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); + struct d3drm_matrix *m = d3drm_matrix(matrix); TRACE("iface %p, matrix %p.\n", iface, matrix); - memcpy(matrix, frame->transform, sizeof(D3DRMMATRIX4D)); + *m = frame->transform; return D3DRM_OK; } @@ -2950,7 +2954,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I d3drm_object_init(&object->obj, classname); - memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); + object->transform = identity; if (parent_frame) { -- 2.11.0

1 0

[PATCH 04/10] d3drm: Introduce a d3drm_matrix structure.
by Henri Verbeet 20 Jun '19

20 Jun '19

Since D3DRMMATRIX4D is just a pain to work with. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3drm/d3drm_private.h | 15 ++++++++++++++- dlls/d3drm/frame.c | 27 ++++++++++++++------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 858911f3507..dcda35fb081 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -33,6 +33,19 @@ #include "wine/heap.h" #include "wine/list.h" +struct d3drm_matrix +{ + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; +}; + +static inline struct d3drm_matrix *d3drm_matrix(D3DRMMATRIX4D m) +{ + return (struct d3drm_matrix *)m; +} + struct d3drm_object { LONG ref; @@ -71,7 +84,7 @@ struct d3drm_frame SIZE_T nb_lights; SIZE_T lights_size; IDirect3DRMLight **lights; - D3DRMMATRIX4D transform; + struct d3drm_matrix transform; D3DCOLOR scenebackground; DWORD traversal_options; }; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 8bed50b57eb..2d32fb51e38 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -23,11 +23,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -static D3DRMMATRIX4D identity = { - { 1.0f, 0.0f, 0.0f, 0.0f }, - { 0.0f, 1.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 1.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 1.0f } +static const struct d3drm_matrix identity = +{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, }; struct d3drm_frame_array @@ -941,13 +942,14 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + const struct d3drm_matrix *m = d3drm_matrix(matrix); TRACE("iface %p, type %#x, matrix %p.\n", iface, type, matrix); switch (type) { case D3DRMCOMBINE_REPLACE: - memcpy(frame->transform, matrix, sizeof(D3DRMMATRIX4D)); + frame->transform = *m; break; case D3DRMCOMBINE_BEFORE: @@ -1415,13 +1417,14 @@ static HRESULT WINAPI d3drm_frame3_GetTransform(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_matrix *m = d3drm_matrix(matrix); TRACE("iface %p, reference %p, matrix %p.\n", iface, reference, matrix); if (reference) - FIXME("Specifying a frame as the root of the scene different from the current root frame is not supported yet\n"); + FIXME("Ignoring reference frame %p.\n", reference); - memcpy(matrix, frame->transform, sizeof(D3DRMMATRIX4D)); + *m = frame->transform; return D3DRM_OK; } @@ -1432,9 +1435,7 @@ static HRESULT WINAPI d3drm_frame2_GetTransform(IDirect3DRMFrame2 *iface, D3DRMM TRACE("iface %p, matrix %p.\n", iface, matrix); - memcpy(matrix, frame->transform, sizeof(D3DRMMATRIX4D)); - - return D3DRM_OK; + return d3drm_frame3_GetTransform(&frame->IDirect3DRMFrame3_iface, NULL, matrix); } static HRESULT WINAPI d3drm_frame1_GetTransform(IDirect3DRMFrame *iface, D3DRMMATRIX4D matrix) @@ -1443,7 +1444,7 @@ static HRESULT WINAPI d3drm_frame1_GetTransform(IDirect3DRMFrame *iface, D3DRMMA TRACE("iface %p, matrix %p.\n", iface, matrix); - return d3drm_frame2_GetTransform(&frame->IDirect3DRMFrame2_iface, matrix); + return d3drm_frame3_GetTransform(&frame->IDirect3DRMFrame3_iface, NULL, matrix); } static HRESULT WINAPI d3drm_frame3_GetVelocity(IDirect3DRMFrame3 *iface, @@ -2950,7 +2951,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I d3drm_object_init(&object->obj, classname); - memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); + object->transform = identity; if (parent_frame) { -- 2.11.0

4 3

[PATCH v2] d3drm: Introduce a d3drm_matrix structure.
by Henri Verbeet 20 Jun '19

20 Jun '19

Since D3DRMMATRIX4D is just a pain to work with. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166868. As Jeff pointed out, version 1 and 2 of GetTransform() are supposed to only return the local transform. dlls/d3drm/d3drm_private.h | 15 ++++++++++++++- dlls/d3drm/frame.c | 27 ++++++++++++++------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 858911f3507..dcda35fb081 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -33,6 +33,19 @@ #include "wine/heap.h" #include "wine/list.h" +struct d3drm_matrix +{ + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; +}; + +static inline struct d3drm_matrix *d3drm_matrix(D3DRMMATRIX4D m) +{ + return (struct d3drm_matrix *)m; +} + struct d3drm_object { LONG ref; @@ -71,7 +84,7 @@ struct d3drm_frame SIZE_T nb_lights; SIZE_T lights_size; IDirect3DRMLight **lights; - D3DRMMATRIX4D transform; + struct d3drm_matrix transform; D3DCOLOR scenebackground; DWORD traversal_options; }; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 8bed50b57eb..2d32fb51e38 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -23,11 +23,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -static D3DRMMATRIX4D identity = { - { 1.0f, 0.0f, 0.0f, 0.0f }, - { 0.0f, 1.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 1.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 1.0f } +static const struct d3drm_matrix identity = +{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, }; struct d3drm_frame_array @@ -941,13 +942,14 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + const struct d3drm_matrix *m = d3drm_matrix(matrix); TRACE("iface %p, type %#x, matrix %p.\n", iface, type, matrix); switch (type) { case D3DRMCOMBINE_REPLACE: - memcpy(frame->transform, matrix, sizeof(D3DRMMATRIX4D)); + frame->transform = *m; break; case D3DRMCOMBINE_BEFORE: @@ -1415,13 +1417,14 @@ static HRESULT WINAPI d3drm_frame3_GetTransform(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_matrix *m = d3drm_matrix(matrix); TRACE("iface %p, reference %p, matrix %p.\n", iface, reference, matrix); if (reference) - FIXME("Specifying a frame as the root of the scene different from the current root frame is not supported yet\n"); + FIXME("Ignoring reference frame %p.\n", reference); - memcpy(matrix, frame->transform, sizeof(D3DRMMATRIX4D)); + *m = frame->transform; return D3DRM_OK; } @@ -1432,9 +1435,7 @@ static HRESULT WINAPI d3drm_frame2_GetTransform(IDirect3DRMFrame2 *iface, D3DRMM TRACE("iface %p, matrix %p.\n", iface, matrix); - memcpy(matrix, frame->transform, sizeof(D3DRMMATRIX4D)); - - return D3DRM_OK; + return d3drm_frame3_GetTransform(&frame->IDirect3DRMFrame3_iface, NULL, matrix); } static HRESULT WINAPI d3drm_frame1_GetTransform(IDirect3DRMFrame *iface, D3DRMMATRIX4D matrix) @@ -1443,7 +1444,7 @@ static HRESULT WINAPI d3drm_frame1_GetTransform(IDirect3DRMFrame *iface, D3DRMMA TRACE("iface %p, matrix %p.\n", iface, matrix); - return d3drm_frame2_GetTransform(&frame->IDirect3DRMFrame2_iface, matrix); + return d3drm_frame3_GetTransform(&frame->IDirect3DRMFrame3_iface, NULL, matrix); } static HRESULT WINAPI d3drm_frame3_GetVelocity(IDirect3DRMFrame3 *iface, @@ -2950,7 +2951,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I d3drm_object_init(&object->obj, classname); - memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); + object->transform = identity; if (parent_frame) { -- 2.11.0

1 0

[PATCH v4] mshtml: Implement IHTMLDocument2 put/get_bgColor
by Alistair Leslie-Hughes 20 Jun '19

20 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mshtml/htmldoc.c | 60 ++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 34 +++++++++++++++++++++-- 2 files changed, 88 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index af99d643ac..cfa21f912f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -678,15 +678,67 @@ static HRESULT WINAPI HTMLDocument_get_alinkColor(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + IHTMLElement *element = NULL; + IHTMLBodyElement *body; + HRESULT hr; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + hr = IHTMLDocument2_get_body(iface, &element); + if (FAILED(hr)) + { + ERR("Failed to get body (0x%08x)\n", hr); + return hr; + } + + if(!element) + { + FIXME("Empty body element.\n"); + return hr; + } + + hr = IHTMLElement_QueryInterface(element, &IID_IHTMLBodyElement, (void**)&body); + if (SUCCEEDED(hr)) + { + hr = IHTMLBodyElement_put_bgColor(body, v); + IHTMLBodyElement_Release(body); + } + IHTMLElement_Release(element); + + return hr; } static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IHTMLElement *element = NULL; + IHTMLBodyElement *body; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, p); + + hr = IHTMLDocument2_get_body(iface, &element); + if (FAILED(hr)) + { + ERR("Failed to get body (0x%08x)\n", hr); + return hr; + } + + if(!element) + { + FIXME("Empty body element.\n"); + return hr; + } + + hr = IHTMLElement_QueryInterface(element, &IID_IHTMLBodyElement, (void**)&body); + if (SUCCEEDED(hr)) + { + hr = IHTMLBodyElement_get_bgColor(body, p); + IHTMLBodyElement_Release(body); + } + IHTMLElement_Release(element); + + return hr; } static HRESULT WINAPI HTMLDocument_put_fgColor(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e152c4fc25..f6eebbc18b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6708,7 +6708,7 @@ static void _set_body_scroll(unsigned line, IHTMLBodyElement *body, const char * _test_body_scroll(line, body, val); } -static void test_body_funs(IHTMLBodyElement *body) +static void test_body_funs(IHTMLBodyElement *body, IHTMLDocument2 *doc) { VARIANT vbg, vDefaultbg; HRESULT hres; @@ -6730,6 +6730,36 @@ static void test_body_funs(IHTMLBodyElement *body) ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); + hres = IHTMLDocument2_get_bgColor(doc, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + /* Restore Original */ + hres = IHTMLBodyElement_put_bgColor(body, vDefaultbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vDefaultbg); + + /* Set via IHTMLDocument2 */ + V_VT(&vbg) = VT_BSTR; + V_BSTR(&vbg) = a2bstr("red"); + hres = IHTMLDocument2_put_bgColor(doc, vbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLBodyElement_get_bgColor(body, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + hres = IHTMLDocument2_get_bgColor(doc, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + /* Restore Original */ hres = IHTMLBodyElement_put_bgColor(body, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); @@ -7161,7 +7191,7 @@ static void test_defaults(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres); test_default_body(body); - test_body_funs(body); + test_body_funs(body, doc); IHTMLBodyElement_Release(body); test_elem_set_outertext_fail(elem); -- 2.17.1

2 1

[PATCH 3/3] winex11.drv: Use generic GetMonitorInfo.
by Zhiyi Zhang 20 Jun '19

20 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 23 --------------- dlls/user32/sysparams.c | 47 +++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 1 + dlls/winex11.drv/display.c | 12 ++++++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 22 +-------------- 7 files changed, 63 insertions(+), 45 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index bf600708ed..921ea2c962 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -197,8 +197,6 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ -#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) - static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { return 0; @@ -359,27 +357,6 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM return FALSE; } -static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) -{ - RECT r = {0, 0, 640, 480}; - static const WCHAR device[] = {'W','i','n','D','i','s','c',0}; - - TRACE("(%p, %p)\n", handle, info); - - if (handle != NULLDRV_DEFAULT_HMONITOR) - { - SetLastError(ERROR_INVALID_MONITOR_HANDLE); - return FALSE; - } - - info->rcMonitor = r; - info->rcWork = r; - info->dwFlags = MONITORINFOF_PRIMARY; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); - return TRUE; -} - static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) { return TRUE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 39910afcf8..24c047349c 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -252,6 +252,8 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); #define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) @@ -3702,6 +3704,51 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return MonitorFromRect( &rect, dwFlags ); } +BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR adapter_name[CCHDEVICENAME]; + HDEVINFO devinfo; + DWORD type; + + TRACE("(%p, %p)\n", handle, info); + + /* Fallback to report one monitor */ + if (handle == NULLDRV_DEFAULT_HMONITOR) + { + RECT default_rect = {0, 0, 640, 480}; + info->rcMonitor = default_rect; + info->rcWork = default_rect; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, DEFAULT_ADAPTER_NAME ); + return TRUE; + } + + /* Use SetupAPI to get monitors */ + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) + { + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&info->rcMonitor, sizeof(info->rcMonitor), NULL, 0 ); + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, + (BYTE *)&info->rcWork, sizeof(info->rcWork), NULL, 0 ); + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, + (BYTE *)adapter_name, sizeof(adapter_name), NULL, 0 ); + info->dwFlags = !lstrcmpW( DEFAULT_ADAPTER_NAME, adapter_name ) ? MONITORINFOF_PRIMARY : 0; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, adapter_name ); + SetupDiDestroyDeviceInfoList( devinfo ); + return TRUE; + } + else + { + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); + SetupDiDestroyDeviceInfoList( devinfo ); + return FALSE; + } +} + /*********************************************************************** * GetMonitorInfoA (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7b06e1e183..a981c22d1b 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -123,6 +123,7 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) DECLSPEC_HIDDEN; struct received_message_info; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index d6969b0cfe..f5ef65f428 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -42,12 +42,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', @@ -281,6 +284,15 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; + /* RcWork */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) + goto done; + /* Adapter name */ + sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, + (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 5b00a5dc5d..c0e24d8fe8 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -21,7 +21,6 @@ @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx -@ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow @ cdecl DestroyWindow(long) X11DRV_DestroyWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a6b07699a7..9ab948f724 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -697,6 +697,8 @@ struct x11drv_monitor WCHAR name[128]; /* RcMonitor in MONITORINFO struct */ RECT rc_monitor; + /* RcWork in MONITORINFO struct */ + RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c8fa63f459..96d118a222 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -322,6 +322,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); monitor[index].rc_monitor = monitors[i].rcMonitor; + monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -390,24 +391,3 @@ void xinerama_init( unsigned int width, unsigned int height ) TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } - - -/*********************************************************************** - * X11DRV_GetMonitorInfo (X11DRV.@) - */ -BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) -{ - int i = monitor_to_index( handle ); - - if (i == -1) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - info->rcMonitor = monitors[i].rcMonitor; - info->rcWork = monitors[i].rcWork; - info->dwFlags = monitors[i].dwFlags; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); - return TRUE; -} -- 2.20.1

2 1

[PATCH 2/3] winex11.drv: Use generic EnumDisplayMonitors.
by Zhiyi Zhang 20 Jun '19

20 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 10 ------- dlls/user32/sysparams.c | 48 +++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 2 ++ dlls/winex11.drv/display.c | 5 ++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 15 +--------- 7 files changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..bf600708ed 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -354,16 +354,6 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode return DISP_CHANGE_FAILED; } -static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - RECT r = {0, 0, 640, 480}; - - TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); - - proc(NULLDRV_DEFAULT_HMONITOR, hdc, &r, lp); - return TRUE; -} - static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) { return FALSE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index b401576efd..39910afcf8 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -251,6 +251,9 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); + +#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) /* Strings for monitor functions */ static const WCHAR DEFAULT_ADAPTER_NAME[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; @@ -3797,6 +3800,51 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, #endif } +BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + BOOL success = FALSE; + HDEVINFO devinfo; + RECT monitor_rect; + DWORD state_flags; + DWORD type; + DWORD i = 0; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + /* Use SetupAPI to get monitors */ + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) + { + /* Inactive monitors don't get enumerated */ + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&state_flags, sizeof(state_flags), NULL, 0 ) + || !(state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + + if (SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0) ) + { + if(!proc( (HMONITOR)(UINT_PTR)i, hdc, &monitor_rect, lp )) + { + SetupDiDestroyDeviceInfoList( devinfo ); + return FALSE; + } + success = TRUE; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + + /* Fallback to report one monitor if using SetupAPI failed */ + if (!success) + { + RECT default_rect = {0, 0, 640, 480}; + if(!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + return FALSE; + } + return TRUE; +} + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 514cf6753f..7b06e1e183 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -122,6 +122,8 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; + struct received_message_info; enum user_obj_type diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index ce2c568ad8..d6969b0cfe 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; @@ -276,6 +277,10 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) goto done; + /* RcMonitor */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 614f0b90f4..5b00a5dc5d 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -20,7 +20,6 @@ @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx -@ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ed5e268391..a6b07699a7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -695,6 +695,8 @@ struct x11drv_monitor { /* Name */ WCHAR name[128]; + /* RcMonitor in MONITORINFO struct */ + RECT rc_monitor; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index e401531450..c8fa63f459 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -321,6 +321,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * && !IsRectEmpty( &monitors[first].rcMonitor ))) { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); + monitor[index].rc_monitor = monitors[i].rcMonitor; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -410,17 +411,3 @@ BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); return TRUE; } - - -/*********************************************************************** - * X11DRV_EnumDisplayMonitors (X11DRV.@) - */ -BOOL CDECL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - int i; - - for (i = 0; i < nb_monitors; i++) - if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) return FALSE; - - return TRUE; -} -- 2.20.1

2 1

[PATCH 01/18] widl: change struct _var_t's type member to a struct _decl_spec_t
by Richard Pospesel 20 Jun '19

20 Jun '19

Signed-off-by: Richard Pospesel <richard(a)torproject.org> --- tools/widl/client.c | 32 ++-- tools/widl/expr.c | 8 +- tools/widl/header.c | 116 +++++++------- tools/widl/parser.y | 113 +++++++------- tools/widl/proxy.c | 58 +++---- tools/widl/server.c | 16 +- tools/widl/typegen.c | 334 ++++++++++++++++++++-------------------- tools/widl/typetree.c | 8 +- tools/widl/typetree.h | 4 +- tools/widl/widltypes.h | 25 ++- tools/widl/write_msft.c | 22 +-- 11 files changed, 372 insertions(+), 364 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index fe88f5993c..b0a5d0cc8c 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -52,9 +52,9 @@ static void print_client( const char *format, ... ) static void write_client_func_decl( const type_t *iface, const var_t *func ) { - const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - const var_list_t *args = type_get_function_args(func->type); - type_t *rettype = type_function_get_rettype(func->type); + const char *callconv = get_attrp(func->declspec.type->attrs, ATTR_CALLCONV); + const var_list_t *args = type_get_function_args(func->declspec.type); + type_t *rettype = type_function_get_rettype(func->declspec.type); if (!callconv) callconv = "__cdecl"; write_type_decl_left(client, rettype); @@ -74,9 +74,9 @@ static void write_function_stub( const type_t *iface, const var_t *func, { unsigned char explicit_fc, implicit_fc; int has_full_pointer = is_full_pointer_function(func); - var_t *retval = type_function_get_retval(func->type); + var_t *retval = type_function_get_retval(func->declspec.type); const var_t *handle_var = get_func_handle_var( iface, func, &explicit_fc, &implicit_fc ); - int has_ret = !is_void(retval->type); + int has_ret = !is_void(retval->declspec.type); if (is_interpreted_func( iface, func )) { @@ -97,7 +97,7 @@ static void write_function_stub( const type_t *iface, const var_t *func, print_client("RPC_BINDING_HANDLE _Handle;\n"); } - if (has_ret && decl_indirect(retval->type)) + if (has_ret && decl_indirect(retval->declspec.type)) { print_client("void *_p_%s;\n", retval->name); } @@ -136,7 +136,7 @@ static void write_function_stub( const type_t *iface, const var_t *func, if (has_ret) { print_client("%s", ""); - write_type_decl(client, retval->type, retval->name); + write_type_decl(client, retval->declspec.type, retval->name); fprintf(client, ";\n"); } print_client("RPC_MESSAGE _RpcMessage;\n"); @@ -147,7 +147,7 @@ static void write_function_stub( const type_t *iface, const var_t *func, if (explicit_fc == FC_BIND_GENERIC) print_client("__frame->%s = %s;\n", handle_var->name, handle_var->name ); } - if (has_ret && decl_indirect(retval->type)) + if (has_ret && decl_indirect(retval->declspec.type)) { print_client("__frame->_p_%s = &%s;\n", retval->name, retval->name); } @@ -194,7 +194,7 @@ static void write_function_stub( const type_t *iface, const var_t *func, /* if the context_handle attribute appears in the chain of types * without pointers being followed, then the context handle must * be direct, otherwise it is a pointer */ - int is_ch_ptr = !is_aliaschain_attr(handle_var->type, ATTR_CONTEXTHANDLE); + int is_ch_ptr = !is_aliaschain_attr(handle_var->declspec.type, ATTR_CONTEXTHANDLE); print_client("if (%s%s != 0)\n", is_ch_ptr ? "*" : "", handle_var->name); indent++; print_client("__frame->_Handle = NDRCContextBinding(%s%s);\n", @@ -257,9 +257,9 @@ static void write_function_stub( const type_t *iface, const var_t *func, /* unmarshal return value */ if (has_ret) { - if (decl_indirect(retval->type)) + if (decl_indirect(retval->declspec.type)) print_client("MIDL_memset(&%s, 0, sizeof(%s));\n", retval->name, retval->name); - else if (is_ptr(retval->type) || is_array(retval->type)) + else if (is_ptr(retval->declspec.type) || is_array(retval->declspec.type)) print_client("%s = 0;\n", retval->name); write_remoting_arguments(client, indent, func, "", PASS_RETURN, PHASE_UNMARSHAL); } @@ -365,8 +365,8 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) case STMT_DECLARATION: { const var_t *func = stmt->u.var; - if (stmt->u.var->stgclass != STG_NONE - || type_get_type_detect_alias(stmt->u.var->type) != TYPE_FUNCTION) + if (stmt->u.var->declspec.stgclass != STG_NONE + || type_get_type_detect_alias(stmt->u.var->declspec.type) != TYPE_FUNCTION) continue; write_function_stub( iface, func, method_count++, *proc_offset ); *proc_offset += get_size_procformatstring_func( iface, func ); @@ -488,7 +488,7 @@ static void write_implicithandledecl(type_t *iface) if (implicit_handle) { - write_type_decl( client, implicit_handle->type, implicit_handle->name ); + write_type_decl( client, implicit_handle->declspec.type, implicit_handle->name ); fprintf(client, ";\n\n"); } } @@ -532,8 +532,8 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou LIST_FOR_EACH_ENTRY(stmt2, type_iface_get_stmts(iface), const statement_t, entry) { - if (stmt2->type == STMT_DECLARATION && stmt2->u.var->stgclass == STG_NONE && - type_get_type_detect_alias(stmt2->u.var->type) == TYPE_FUNCTION) + if (stmt2->type == STMT_DECLARATION && stmt2->u.var->declspec.stgclass == STG_NONE && + type_get_type_detect_alias(stmt2->u.var->declspec.type) == TYPE_FUNCTION) { needs_stub = 1; break; diff --git a/tools/widl/expr.c b/tools/widl/expr.c index 2ed4aff6ad..7ec42db79f 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -194,10 +194,10 @@ expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr) expr_t *e; type_t *tref; - if (var->stgclass != STG_NONE && var->stgclass != STG_REGISTER) + if (var->declspec.stgclass != STG_NONE && var->declspec.stgclass != STG_REGISTER) error_loc("invalid storage class for type expression\n"); - tref = var->type; + tref = var->declspec.type; e = xmalloc(sizeof(expr_t)); e->type = type; @@ -474,7 +474,7 @@ static type_t *find_identifier(const char *identifier, const type_t *cont_type, if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) if (field->name && !strcmp(identifier, field->name)) { - type = field->type; + type = field->declspec.type; *found_in_cont_type = 1; break; } @@ -482,7 +482,7 @@ static type_t *find_identifier(const char *identifier, const type_t *cont_type, if (!type) { var_t *const_var = find_const(identifier, 0); - if (const_var) type = const_var->type; + if (const_var) type = const_var->declspec.type; } return type; diff --git a/tools/widl/header.c b/tools/widl/header.c index f618e02f3d..3e8cbfae5e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -69,7 +69,7 @@ int is_ptrchain_attr(const var_t *var, enum attr_type t) return 1; else { - type_t *type = var->type; + type_t *type = var->declspec.type; for (;;) { if (is_attr(type->attrs, t)) @@ -204,9 +204,9 @@ static void write_fields(FILE *h, var_list_t *fields) if (!fields) return; LIST_FOR_EACH_ENTRY( v, fields, var_t, entry ) { - if (!v || !v->type) continue; + if (!v || !v->declspec.type) continue; - switch(type_get_type_detect_alias(v->type)) { + switch(type_get_type_detect_alias(v->declspec.type)) { case TYPE_STRUCT: case TYPE_ENCAPSULATED_UNION: nameless_struct_cnt++; @@ -220,12 +220,12 @@ static void write_fields(FILE *h, var_list_t *fields) } LIST_FOR_EACH_ENTRY( v, fields, var_t, entry ) { - if (!v || !v->type) continue; + if (!v || !v->declspec.type) continue; indent(h, 0); name = v->name; - switch(type_get_type_detect_alias(v->type)) { + switch(type_get_type_detect_alias(v->declspec.type)) { case TYPE_STRUCT: case TYPE_ENCAPSULATED_UNION: if(!v->name) { @@ -252,7 +252,7 @@ static void write_fields(FILE *h, var_list_t *fields) default: ; } - write_type_def_or_decl(h, v->type, TRUE, name); + write_type_def_or_decl(h, v->declspec.type, TRUE, name); fprintf(h, ";\n"); } } @@ -697,7 +697,7 @@ void check_for_additional_prototype_types(type_t *type) break; } if (vars) LIST_FOR_EACH_ENTRY( v, vars, const var_t, entry ) - check_for_additional_prototype_types(v->type); + check_for_additional_prototype_types(v->declspec.type); } if (type_is_alias(type)) @@ -800,7 +800,7 @@ int is_const_decl(const var_t *var) * declaration to mean that data isn't being instantiated. this appears * to be a bug, but there is no benefit to being incompatible with MIDL, * so we'll do the same thing */ - for (t = var->type; ; ) + for (t = var->declspec.type; ; ) { if (is_attr(t->attrs, ATTR_CONST)) return TRUE; @@ -821,7 +821,7 @@ static void write_declaration(FILE *header, const var_t *v) } else { - switch (v->stgclass) + switch (v->declspec.stgclass) { case STG_NONE: case STG_REGISTER: /* ignored */ @@ -833,7 +833,7 @@ static void write_declaration(FILE *header, const var_t *v) fprintf(header, "extern "); break; } - write_type_def_or_decl(header, v->type, FALSE, v->name); + write_type_def_or_decl(header, v->declspec.type, FALSE, v->name); fprintf(header, ";\n\n"); } } @@ -850,7 +850,7 @@ static void write_library(FILE *header, const typelib_t *typelib) const type_t* get_explicit_generic_handle_type(const var_t* var) { const type_t *t; - for (t = var->type; + for (t = var->declspec.type; is_ptr(t) || type_is_alias(t); t = type_is_alias(t) ? type_alias_get_aliasee(t) : type_pointer_get_ref(t)) if ((type_get_type_detect_alias(t) != TYPE_BASIC || type_basic_get_type(t) != TYPE_BASIC_HANDLE) && @@ -863,13 +863,13 @@ const var_t *get_func_handle_var( const type_t *iface, const var_t *func, unsigned char *explicit_fc, unsigned char *implicit_fc ) { const var_t *var; - const var_list_t *args = type_get_function_args( func->type ); + const var_list_t *args = type_get_function_args( func->declspec.type ); *explicit_fc = *implicit_fc = 0; if (args) LIST_FOR_EACH_ENTRY( var, args, const var_t, entry ) { if (!is_attr( var->attrs, ATTR_IN ) && is_attr( var->attrs, ATTR_OUT )) continue; - if (type_get_type( var->type ) == TYPE_BASIC && type_basic_get_type( var->type ) == TYPE_BASIC_HANDLE) + if (type_get_type( var->declspec.type ) == TYPE_BASIC && type_basic_get_type( var->declspec.type ) == TYPE_BASIC_HANDLE) { *explicit_fc = FC_BIND_PRIMITIVE; return var; @@ -879,7 +879,7 @@ const var_t *get_func_handle_var( const type_t *iface, const var_t *func, *explicit_fc = FC_BIND_GENERIC; return var; } - if (is_context_handle( var->type )) + if (is_context_handle( var->declspec.type )) { *explicit_fc = FC_BIND_CONTEXT; return var; @@ -888,8 +888,8 @@ const var_t *get_func_handle_var( const type_t *iface, const var_t *func, if ((var = get_attrp( iface->attrs, ATTR_IMPLICIT_HANDLE ))) { - if (type_get_type( var->type ) == TYPE_BASIC && - type_basic_get_type( var->type ) == TYPE_BASIC_HANDLE) + if (type_get_type( var->declspec.type ) == TYPE_BASIC && + type_basic_get_type( var->declspec.type ) == TYPE_BASIC_HANDLE) *implicit_fc = FC_BIND_PRIMITIVE; else *implicit_fc = FC_BIND_GENERIC; @@ -904,13 +904,13 @@ int has_out_arg_or_return(const var_t *func) { const var_t *var; - if (!is_void(type_function_get_rettype(func->type))) + if (!is_void(type_function_get_rettype(func->declspec.type))) return 1; - if (!type_get_function_args(func->type)) + if (!type_get_function_args(func->declspec.type)) return 0; - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->declspec.type), const var_t, entry ) if (is_attr(var->attrs, ATTR_OUT)) return 1; @@ -990,7 +990,7 @@ static int is_override_method(const type_t *iface, const type_t *child, const va static int is_aggregate_return(const var_t *func) { - enum type_type type = type_get_type(type_function_get_rettype(func->type)); + enum type_type type = type_get_type(type_function_get_rettype(func->declspec.type)); return type == TYPE_STRUCT || type == TYPE_UNION || type == TYPE_COCLASS || type == TYPE_INTERFACE; } @@ -1030,8 +1030,8 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); - if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) + if (type_get_function_args(func->declspec.type)) + LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->declspec.type), const var_t, entry ) fprintf(header, ",%s", arg->name); fprintf(header, ") "); @@ -1042,8 +1042,8 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * } fprintf(header, "(This)->lpVtbl->%s(This", get_vtbl_entry_name(iface, func)); - if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) + if (type_get_function_args(func->declspec.type)) + LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->declspec.type), const var_t, entry ) fprintf(header, ",%s", arg->name); fprintf(header, ")\n"); } @@ -1073,7 +1073,7 @@ void write_args(FILE *h, const var_list_t *args, const char *name, int method, i } else fprintf(h, ","); } - write_type_decl(h, arg->type, arg->name); + write_type_decl(h, arg->declspec.type, arg->name); if (method == 2) { const expr_t *expr = get_attrp(arg->attrs, ATTR_DEFAULTVALUE); if (expr) { @@ -1085,7 +1085,7 @@ void write_args(FILE *h, const var_list_t *args, const char *name, int method, i expr_t bstr; /* Fixup the expression type for a BSTR like midl does. */ - if (get_type_vt(arg->type) == VT_BSTR && expr->type == EXPR_STRLIT) + if (get_type_vt(arg->declspec.type) == VT_BSTR && expr->type == EXPR_STRLIT) { bstr = *expr; bstr.type = EXPR_WSTRLIT; @@ -1114,8 +1114,8 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) { const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) { - const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - const var_list_t *args = type_get_function_args(func->type); + const char *callconv = get_attrp(func->declspec.type->attrs, ATTR_CALLCONV); + const var_list_t *args = type_get_function_args(func->declspec.type); const var_t *arg; if (!callconv) callconv = "STDMETHODCALLTYPE"; @@ -1125,11 +1125,11 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) indent(header, 0); fprintf(header, "virtual "); - write_type_decl_left(header, type_function_get_rettype(func->type)); + write_type_decl_left(header, type_function_get_rettype(func->declspec.type)); fprintf(header, "* %s %s(\n", callconv, get_name(func)); ++indentation; indent(header, 0); - write_type_decl_left(header, type_function_get_rettype(func->type)); + write_type_decl_left(header, type_function_get_rettype(func->declspec.type)); fprintf(header, " *__ret"); --indentation; if (args) { @@ -1139,7 +1139,7 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) fprintf(header, ") = 0;\n"); indent(header, 0); - write_type_decl_left(header, type_function_get_rettype(func->type)); + write_type_decl_left(header, type_function_get_rettype(func->declspec.type)); fprintf(header, " %s %s(\n", callconv, get_name(func)); write_args(header, args, iface->name, 2, TRUE); fprintf(header, ")\n"); @@ -1147,7 +1147,7 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) fprintf(header, "{\n"); ++indentation; indent(header, 0); - write_type_decl_left(header, type_function_get_rettype(func->type)); + write_type_decl_left(header, type_function_get_rettype(func->declspec.type)); fprintf(header, " __ret;\n"); indent(header, 0); fprintf(header, "return *%s(&__ret", get_name(func)); @@ -1164,7 +1164,7 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) indent(header, 0); fprintf(header, "virtual "); - write_type_decl_left(header, type_function_get_rettype(func->type)); + write_type_decl_left(header, type_function_get_rettype(func->declspec.type)); fprintf(header, " %s %s(\n", callconv, get_name(func)); write_args(header, args, iface->name, 2, TRUE); fprintf(header, ") = 0;\n"); @@ -1201,25 +1201,25 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const type_ const var_t *arg; fprintf(header, "static FORCEINLINE "); - write_type_decl_left(header, type_function_get_rettype(func->type)); + write_type_decl_left(header, type_function_get_rettype(func->declspec.type)); fprintf(header, " %s_%s(", name, get_name(func)); - write_args(header, type_get_function_args(func->type), name, 1, FALSE); + write_args(header, type_get_function_args(func->declspec.type), name, 1, FALSE); fprintf(header, ") {\n"); ++indentation; if (!is_aggregate_return(func)) { indent(header, 0); fprintf(header, "%sThis->lpVtbl->%s(This", - is_void(type_function_get_rettype(func->type)) ? "" : "return ", + is_void(type_function_get_rettype(func->declspec.type)) ? "" : "return ", get_vtbl_entry_name(iface, func)); } else { indent(header, 0); - write_type_decl_left(header, type_function_get_rettype(func->type)); + write_type_decl_left(header, type_function_get_rettype(func->declspec.type)); fprintf(header, " __ret;\n"); indent(header, 0); fprintf(header, "return *This->lpVtbl->%s(This,&__ret", get_vtbl_entry_name(iface, func)); } - if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) + if (type_get_function_args(func->declspec.type)) + LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->declspec.type), const var_t, entry ) fprintf(header, ",%s", arg->name); fprintf(header, ");\n"); --indentation; @@ -1245,10 +1245,10 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char first_iface = 0; } if (!is_callas(func->attrs)) { - const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); + const char *callconv = get_attrp(func->declspec.type->attrs, ATTR_CALLCONV); if (!callconv) callconv = "STDMETHODCALLTYPE"; indent(header, 0); - write_type_decl_left(header, type_function_get_rettype(func->type)); + write_type_decl_left(header, type_function_get_rettype(func->declspec.type)); if (is_aggregate_return(func)) fprintf(header, " *"); if (is_inherited_method(iface, func)) @@ -1261,13 +1261,13 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char if (is_aggregate_return(func)) { fprintf(header, ",\n"); indent(header, 0); - write_type_decl_left(header, type_function_get_rettype(func->type)); + write_type_decl_left(header, type_function_get_rettype(func->declspec.type)); fprintf(header, " *__ret"); } --indentation; - if (type_get_function_args(func->type)) { + if (type_get_function_args(func->declspec.type)) { fprintf(header, ",\n"); - write_args(header, type_get_function_args(func->type), name, 0, TRUE); + write_args(header, type_get_function_args(func->declspec.type), name, 0, TRUE); } fprintf(header, ");\n"); fprintf(header, "\n"); @@ -1294,12 +1294,12 @@ static void write_method_proto(FILE *header, const type_t *iface) const var_t *func = stmt->u.var; if (is_callas(func->attrs)) { - const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); + const char *callconv = get_attrp(func->declspec.type->attrs, ATTR_CALLCONV); if (!callconv) callconv = "STDMETHODCALLTYPE"; /* proxy prototype */ - write_type_decl_left(header, type_function_get_rettype(func->type)); + write_type_decl_left(header, type_function_get_rettype(func->declspec.type)); fprintf(header, " %s %s_%s_Proxy(\n", callconv, iface->name, get_name(func)); - write_args(header, type_get_function_args(func->type), iface->name, 1, TRUE); + write_args(header, type_get_function_args(func->declspec.type), iface->name, 1, TRUE); fprintf(header, ");\n"); /* stub prototype */ fprintf(header, "void __RPC_STUB %s_%s_Stub(\n", iface->name, get_name(func)); @@ -1332,12 +1332,12 @@ static void write_locals(FILE *fp, const type_t *iface, int body) if (&stmt2->entry != type_iface_get_stmts(iface)) { const var_t *m = stmt2->u.var; /* proxy prototype - use local prototype */ - write_type_decl_left(fp, type_function_get_rettype(m->type)); + write_type_decl_left(fp, type_function_get_rettype(m->declspec.type)); fprintf(fp, " CALLBACK %s_%s_Proxy(\n", iface->name, get_name(m)); - write_args(fp, type_get_function_args(m->type), iface->name, 1, TRUE); + write_args(fp, type_get_function_args(m->declspec.type), iface->name, 1, TRUE); fprintf(fp, ")"); if (body) { - type_t *rt = type_function_get_rettype(m->type); + type_t *rt = type_function_get_rettype(m->declspec.type); fprintf(fp, "\n{\n"); fprintf(fp, " %s\n", comment); if (rt->name && strcmp(rt->name, "HRESULT") == 0) @@ -1354,9 +1354,9 @@ static void write_locals(FILE *fp, const type_t *iface, int body) else fprintf(fp, ";\n"); /* stub prototype - use remotable prototype */ - write_type_decl_left(fp, type_function_get_rettype(func->type)); + write_type_decl_left(fp, type_function_get_rettype(func->declspec.type)); fprintf(fp, " __RPC_STUB %s_%s_Stub(\n", iface->name, get_name(m)); - write_args(fp, type_get_function_args(func->type), iface->name, 1, TRUE); + write_args(fp, type_get_function_args(func->declspec.type), iface->name, 1, TRUE); fprintf(fp, ")"); if (body) /* Remotable methods must all return HRESULTs. */ @@ -1402,15 +1402,15 @@ void write_local_stubs(const statement_list_t *stmts) static void write_function_proto(FILE *header, const type_t *iface, const var_t *fun, const char *prefix) { - const char *callconv = get_attrp(fun->type->attrs, ATTR_CALLCONV); + const char *callconv = get_attrp(fun->declspec.type->attrs, ATTR_CALLCONV); if (!callconv) callconv = "__cdecl"; /* FIXME: do we need to handle call_as? */ - write_type_decl_left(header, type_function_get_rettype(fun->type)); + write_type_decl_left(header, type_function_get_rettype(fun->declspec.type)); fprintf(header, " %s ", callconv); fprintf(header, "%s%s(\n", prefix, get_name(fun)); - if (type_get_function_args(fun->type)) - write_args(header, type_get_function_args(fun->type), iface->name, 0, TRUE); + if (type_get_function_args(fun->declspec.type)) + write_args(header, type_get_function_args(fun->declspec.type), iface->name, 0, TRUE); else fprintf(header, " void"); fprintf(header, ");\n\n"); @@ -1536,7 +1536,7 @@ static void write_rpc_interface_start(FILE *header, const type_t *iface) if (var) { fprintf(header, "extern "); - write_type_decl( header, var->type, var->name ); + write_type_decl( header, var->declspec.type, var->name ); fprintf(header, ";\n"); } if (old_names) @@ -1745,7 +1745,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons fprintf(header, "%s\n", stmt->u.str); break; case STMT_DECLARATION: - if (iface && type_get_type(stmt->u.var->type) == TYPE_FUNCTION) + if (iface && type_get_type(stmt->u.var->declspec.type) == TYPE_FUNCTION) { if (!ignore_funcs) { diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5d910852d1..e6819a12d1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -52,13 +52,6 @@ struct _import_t int import_performed; }; -typedef struct _decl_spec_t -{ - type_t *type; - attr_list_t *attrs; - enum storage_class stgclass; -} decl_spec_t; - typelist_t incomplete_types = LIST_INIT(incomplete_types); static void fix_incomplete(void); @@ -651,10 +644,10 @@ enum_list: enum { if (!$1->eval) enum: ident '=' expr_int_const { $$ = reg_const($1); $$->eval = $3; - $$->type = type_new_int(TYPE_BASIC_INT, 0); + $$->declspec.type = type_new_int(TYPE_BASIC_INT, 0); } | ident { $$ = reg_const($1); - $$->type = type_new_int(TYPE_BASIC_INT, 0); + $$->declspec.type = type_new_int(TYPE_BASIC_INT, 0); } ; @@ -740,7 +733,7 @@ field: m_attributes decl_spec struct_declarator_list ';' $$ = set_var_types($1, $2, $3); } | m_attributes uniondef ';' { var_t *v = make_var(NULL); - v->type = $2; v->attrs = $1; + v->declspec.type = $2; v->attrs = $1; $$ = append_var(NULL, v); } ; @@ -764,13 +757,13 @@ s_field: m_attributes decl_spec declarator { $$ = declare_var(check_field_attrs free($3); } | m_attributes structdef { var_t *v = make_var(NULL); - v->type = $2; v->attrs = $1; + v->declspec.type = $2; v->attrs = $1; $$ = v; } ; funcdef: declaration { $$ = $1; - if (type_get_type($$->type) != TYPE_FUNCTION) + if (type_get_type($$->declspec.type) != TYPE_FUNCTION) error_loc("only methods may be declared inside the methods section of a dispinterface\n"); check_function_attrs($$->name, $$->attrs); } @@ -1540,19 +1533,19 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl } /* add type onto the end of the pointers in pident->type */ - v->type = append_chain_type(decl ? decl->type : NULL, type); - v->stgclass = decl_spec->stgclass; + v->declspec.type = append_chain_type(decl ? decl->type : NULL, type); + v->declspec.stgclass = decl_spec->stgclass; v->attrs = attrs; /* check for pointer attribute being applied to non-pointer, non-array * type */ - if (!is_array(v->type)) + if (!is_array(v->declspec.type)) { int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE); const type_t *ptr = NULL; /* pointer attributes on the left side of the type belong to the function * pointer, if one is being declared */ - type_t **pt = func_type ? &func_type : &v->type; + type_t **pt = func_type ? &func_type : &v->declspec.type; for (ptr = *pt; ptr && !ptr_attr; ) { ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE); @@ -1585,7 +1578,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl { type_t *t = type; - if (!is_ptr(v->type) && !is_array(v->type)) + if (!is_ptr(v->declspec.type) && !is_array(v->declspec.type)) error_loc("'%s': [string] attribute applied to non-pointer, non-array type\n", v->name); @@ -1611,15 +1604,15 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl if (is_attr(v->attrs, ATTR_V1ENUM)) { - if (type_get_type_detect_alias(v->type) != TYPE_ENUM) + if (type_get_type_detect_alias(v->declspec.type) != TYPE_ENUM) error_loc("'%s': [v1_enum] attribute applied to non-enum type\n", v->name); } - if (is_attr(v->attrs, ATTR_RANGE) && !is_allowed_range_type(v->type)) + if (is_attr(v->attrs, ATTR_RANGE) && !is_allowed_range_type(v->declspec.type)) error_loc("'%s': [range] attribute applied to non-integer type\n", v->name); - ptype = &v->type; + ptype = &v->declspec.type; if (sizes) LIST_FOR_EACH_ENTRY(dim, sizes, expr_t, entry) { if (dim->type != EXPR_VOID) @@ -1649,7 +1642,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl error_loc("%s: too many expressions in size_is attribute\n", v->name); } - ptype = &v->type; + ptype = &v->declspec.type; if (lengs) LIST_FOR_EACH_ENTRY(dim, lengs, expr_t, entry) { if (dim->type != EXPR_VOID) @@ -1681,28 +1674,28 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl if (func_type) { type_t *ft, *t; - type_t *return_type = v->type; - v->type = func_type; - for (ft = v->type; is_ptr(ft); ft = type_pointer_get_ref(ft)) + type_t *return_type = v->declspec.type; + v->declspec.type = func_type; + for (ft = v->declspec.type; is_ptr(ft); ft = type_pointer_get_ref(ft)) ; assert(type_get_type_detect_alias(ft) == TYPE_FUNCTION); ft->details.function->retval = make_var(xstrdup("_RetVal")); - ft->details.function->retval->type = return_type; + ft->details.function->retval->declspec.type = return_type; /* move calling convention attribute, if present, from pointer nodes to * function node */ - for (t = v->type; is_ptr(t); t = type_pointer_get_ref(t)) + for (t = v->declspec.type; is_ptr(t); t = type_pointer_get_ref(t)) ft->attrs = move_attr(ft->attrs, t->attrs, ATTR_CALLCONV); } else { type_t *t; - for (t = v->type; is_ptr(t); t = type_pointer_get_ref(t)) + for (t = v->declspec.type; is_ptr(t); t = type_pointer_get_ref(t)) if (is_attr(t->attrs, ATTR_CALLCONV)) error_loc("calling convention applied to non-function-pointer type\n"); } if (decl->bits) - v->type = type_new_bitfield(v->type, decl->bits); + v->declspec.type = type_new_bitfield(v->declspec.type, decl->bits); return v; } @@ -1770,10 +1763,9 @@ var_t *make_var(char *name) { var_t *v = xmalloc(sizeof(var_t)); v->name = name; - v->type = NULL; + init_declspec(&v->declspec, NULL); v->attrs = NULL; v->eval = NULL; - v->stgclass = STG_NONE; init_loc_info(&v->loc_info); return v; } @@ -1782,10 +1774,9 @@ static var_t *copy_var(var_t *src, char *name, map_attrs_filter_t attr_filter) { var_t *v = xmalloc(sizeof(var_t)); v->name = name; - v->type = src->type; + v->declspec = src->declspec; v->attrs = map_attrs(src->attrs, attr_filter); v->eval = src->eval; - v->stgclass = src->stgclass; v->loc_info = src->loc_info; return v; } @@ -2010,7 +2001,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at cur->loc_info.line_number); name = declare_var(attrs, decl_spec, decl, 0); - cur = type_new_alias(name->type, name->name); + cur = type_new_alias(name->declspec.type, name->name); cur->attrs = attrs; if (is_incomplete(cur)) @@ -2285,10 +2276,10 @@ static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs) if (attr->type == ATTR_IMPLICIT_HANDLE) { const var_t *var = attr->u.pval; - if (type_get_type( var->type) == TYPE_BASIC && - type_basic_get_type( var->type ) == TYPE_BASIC_HANDLE) + if (type_get_type( var->declspec.type) == TYPE_BASIC && + type_basic_get_type( var->declspec.type ) == TYPE_BASIC_HANDLE) continue; - if (is_aliaschain_attr( var->type, ATTR_HANDLE )) + if (is_aliaschain_attr( var->declspec.type, ATTR_HANDLE )) continue; error_loc("attribute %s requires a handle type in interface %s\n", allowed_attr[attr->type].display_name, name); @@ -2520,7 +2511,7 @@ static void check_remoting_fields(const var_t *var, type_t *type); static void check_field_common(const type_t *container_type, const char *container_name, const var_t *arg) { - type_t *type = arg->type; + type_t *type = arg->declspec.type; int more_to_do; const char *container_type_name; const char *var_type; @@ -2550,7 +2541,7 @@ static void check_field_common(const type_t *container_type, } if (is_attr(arg->attrs, ATTR_LENGTHIS) && - (is_attr(arg->attrs, ATTR_STRING) || is_aliaschain_attr(arg->type, ATTR_STRING))) + (is_attr(arg->attrs, ATTR_STRING) || is_aliaschain_attr(arg->declspec.type, ATTR_STRING))) error_loc_info(&arg->loc_info, "string and length_is specified for argument %s are mutually exclusive attributes\n", arg->name); @@ -2694,7 +2685,7 @@ static void check_remoting_fields(const var_t *var, type_t *type) fields = type_union_get_cases(type); if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) - if (field->type) check_field_common(type, type->name, field); + if (field->declspec.type) check_field_common(type, type->name, field); } /* checks that arguments for a function make sense for marshalling and unmarshalling */ @@ -2703,9 +2694,9 @@ static void check_remoting_args(const var_t *func) const char *funcname = func->name; const var_t *arg; - if (func->type->details.function->args) LIST_FOR_EACH_ENTRY( arg, func->type->details.function->args, const var_t, entry ) + if (func->declspec.type->details.function->args) LIST_FOR_EACH_ENTRY( arg, func->declspec.type->details.function->args, const var_t, entry ) { - const type_t *type = arg->type; + const type_t *type = arg->declspec.type; /* check that [out] parameters have enough pointer levels */ if (is_attr(arg->attrs, ATTR_OUT)) @@ -2745,16 +2736,16 @@ static void check_remoting_args(const var_t *func) } } - check_field_common(func->type, funcname, arg); + check_field_common(func->declspec.type, funcname, arg); } - if (type_get_type(type_function_get_rettype(func->type)) != TYPE_VOID) + if (type_get_type(type_function_get_rettype(func->declspec.type)) != TYPE_VOID) { var_t var; var = *func; - var.type = type_function_get_rettype(func->type); + var.declspec.type = type_function_get_rettype(func->declspec.type); var.name = xstrdup("return value"); - check_field_common(func->type, funcname, &var); + check_field_common(func->declspec.type, funcname, &var); free(var.name); } } @@ -2771,8 +2762,8 @@ static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func) * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); - idl_handle->type = find_type_or_error("handle_t", 0); - type_function_add_head_arg(func->type, idl_handle); + idl_handle->declspec.type = find_type_or_error("handle_t", 0); + type_function_add_head_arg(func->declspec.type, idl_handle); } } @@ -2853,7 +2844,7 @@ static void check_async_uuid(type_t *iface) var_t *begin_func, *finish_func, *func = stmt->u.var, *arg; var_list_t *begin_args = NULL, *finish_args = NULL, *args; - args = func->type->details.function->args; + args = func->declspec.type->details.function->args; if (args) LIST_FOR_EACH_ENTRY(arg, args, var_t, entry) { if (is_attr(arg->attrs, ATTR_IN) || !is_attr(arg->attrs, ATTR_OUT)) @@ -2863,15 +2854,15 @@ static void check_async_uuid(type_t *iface) } begin_func = copy_var(func, concat_str("Begin_", func->name), NULL); - begin_func->type = type_new_function(begin_args); - begin_func->type->attrs = func->attrs; - begin_func->type->details.function->retval = func->type->details.function->retval; + begin_func->declspec.type = type_new_function(begin_args); + begin_func->declspec.type->attrs = func->attrs; + begin_func->declspec.type->details.function->retval = func->declspec.type->details.function->retval; stmts = append_statement(stmts, make_statement_declaration(begin_func)); finish_func = copy_var(func, concat_str("Finish_", func->name), NULL); - finish_func->type = type_new_function(finish_args); - finish_func->type->attrs = func->attrs; - finish_func->type->details.function->retval = func->type->details.function->retval; + finish_func->declspec.type = type_new_function(finish_args); + finish_func->declspec.type->attrs = func->attrs; + finish_func->declspec.type->details.function->retval = func->declspec.type->details.function->retval; stmts = append_statement(stmts, make_statement_declaration(finish_func)); } @@ -2923,10 +2914,10 @@ static void check_all_user_types(const statement_list_t *stmts) const statement_t *stmt_func; STATEMENTS_FOR_EACH_FUNC(stmt_func, type_iface_get_stmts(stmt->u.type)) { const var_t *func = stmt_func->u.var; - if (func->type->details.function->args) - LIST_FOR_EACH_ENTRY( v, func->type->details.function->args, const var_t, entry ) - check_for_additional_prototype_types(v->type); - check_for_additional_prototype_types(type_function_get_rettype(func->type)); + if (func->declspec.type->details.function->args) + LIST_FOR_EACH_ENTRY( v, func->declspec.type->details.function->args, const var_t, entry ) + check_for_additional_prototype_types(v->declspec.type); + check_for_additional_prototype_types(type_function_get_rettype(func->declspec.type)); } } } @@ -2974,16 +2965,16 @@ static statement_t *make_statement_declaration(var_t *var) { statement_t *stmt = make_statement(STMT_DECLARATION); stmt->u.var = var; - if (var->stgclass == STG_EXTERN && var->eval) + if (var->declspec.stgclass == STG_EXTERN && var->eval) warning("'%s' initialised and declared extern\n", var->name); if (is_const_decl(var)) { if (var->eval) reg_const(var); } - else if (type_get_type(var->type) == TYPE_FUNCTION) + else if (type_get_type(var->declspec.type) == TYPE_FUNCTION) check_function_attrs(var->name, var->attrs); - else if (var->stgclass == STG_NONE || var->stgclass == STG_REGISTER) + else if (var->declspec.stgclass == STG_NONE || var->declspec.stgclass == STG_REGISTER) error_loc("instantiation of data is illegal\n"); return stmt; } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index ef52e35a4c..0b37cc9758 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -105,15 +105,15 @@ static void clear_output_vars( const var_list_t *args ) { if (is_attr(arg->attrs, ATTR_IN)) continue; if (!is_attr(arg->attrs, ATTR_OUT)) continue; - if (is_ptr(arg->type)) + if (is_ptr(arg->declspec.type)) { - if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_BASIC) continue; - if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_ENUM) continue; + if (type_get_type(type_pointer_get_ref(arg->declspec.type)) == TYPE_BASIC) continue; + if (type_get_type(type_pointer_get_ref(arg->declspec.type)) == TYPE_ENUM) continue; } print_proxy( "if (%s) MIDL_memset( %s, 0, ", arg->name, arg->name ); - if (is_array(arg->type) && type_array_has_conformance(arg->type)) + if (is_array(arg->declspec.type) && type_array_has_conformance(arg->declspec.type)) { - write_expr( proxy, type_array_get_conformance(arg->type), 1, 1, NULL, NULL, "" ); + write_expr( proxy, type_array_get_conformance(arg->declspec.type), 1, 1, NULL, NULL, "" ); fprintf( proxy, " * " ); } fprintf( proxy, "sizeof( *%s ));\n", arg->name ); @@ -147,7 +147,7 @@ static int need_delegation_indirect(const type_t *iface) static void free_variable( const var_t *arg, const char *local_var_prefix ) { unsigned int type_offset = arg->typestring_offset; - type_t *type = arg->type; + type_t *type = arg->declspec.type; write_parameter_conf_or_var_exprs(proxy, indent, local_var_prefix, PHASE_FREE, arg, FALSE); @@ -191,18 +191,18 @@ static void proxy_free_variables( var_list_t *args, const char *local_var_prefix static void gen_proxy(type_t *iface, const var_t *func, int idx, unsigned int proc_offset) { - var_t *retval = type_function_get_retval(func->type); - int has_ret = !is_void(retval->type); + var_t *retval = type_function_get_retval(func->declspec.type); + int has_ret = !is_void(retval->declspec.type); int has_full_pointer = is_full_pointer_function(func); - const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - const var_list_t *args = type_get_function_args(func->type); + const char *callconv = get_attrp(func->declspec.type->attrs, ATTR_CALLCONV); + const var_list_t *args = type_get_function_args(func->declspec.type); if (!callconv) callconv = "STDMETHODCALLTYPE"; indent = 0; if (is_interpreted_func( iface, func )) { if (get_stub_mode() == MODE_Oif && !is_callas( func->attrs )) return; - write_type_decl_left(proxy, retval->type); + write_type_decl_left(proxy, retval->declspec.type); print_proxy( " %s %s_%s_Proxy(\n", callconv, iface->name, get_name(func)); write_args(proxy, args, iface->name, 1, TRUE); print_proxy( ")\n"); @@ -219,7 +219,7 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, print_proxy( "}\n"); print_proxy( "\n"); - write_type_decl_left(proxy, retval->type); + write_type_decl_left(proxy, retval->declspec.type); print_proxy( " %s %s_%s_Proxy(\n", callconv, iface->name, get_name(func)); write_args(proxy, args, iface->name, 1, TRUE); print_proxy( ")\n"); @@ -229,12 +229,12 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, /* local variables */ if (has_ret) { print_proxy( "%s", "" ); - write_type_decl(proxy, retval->type, retval->name); + write_type_decl(proxy, retval->declspec.type, retval->name); fprintf( proxy, ";\n" ); } print_proxy( "RPC_MESSAGE _RpcMessage;\n" ); if (has_ret) { - if (decl_indirect(retval->type)) + if (decl_indirect(retval->declspec.type)) print_proxy("void *_p_%s = &%s;\n", retval->name, retval->name); } print_proxy( "\n"); @@ -246,7 +246,7 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, write_full_pointer_init(proxy, indent, func, FALSE); /* FIXME: trace */ - clear_output_vars( type_get_function_args(func->type) ); + clear_output_vars( type_get_function_args(func->declspec.type) ); print_proxy( "RpcTryExcept\n" ); print_proxy( "{\n" ); @@ -279,9 +279,9 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, if (has_ret) { - if (decl_indirect(retval->type)) + if (decl_indirect(retval->declspec.type)) print_proxy("MIDL_memset(&%s, 0, sizeof(%s));\n", retval->name, retval->name); - else if (is_ptr(retval->type) || is_array(retval->type)) + else if (is_ptr(retval->declspec.type) || is_array(retval->declspec.type)) print_proxy("%s = 0;\n", retval->name); write_remoting_arguments(proxy, indent, func, "", PASS_RETURN, PHASE_UNMARSHAL); } @@ -301,7 +301,7 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, print_proxy( "{\n" ); if (has_ret) { indent++; - proxy_free_variables( type_get_function_args(func->type), "" ); + proxy_free_variables( type_get_function_args(func->declspec.type), "" ); print_proxy( "_RetVal = NdrProxyErrorHandler(RpcExceptionCode());\n" ); indent--; } @@ -320,7 +320,7 @@ static void gen_stub(type_t *iface, const var_t *func, const char *cas, unsigned int proc_offset) { const var_t *arg; - int has_ret = !is_void(type_function_get_rettype(func->type)); + int has_ret = !is_void(type_function_get_rettype(func->declspec.type)); int has_full_pointer = is_full_pointer_function(func); if (is_interpreted_func( iface, func )) return; @@ -389,10 +389,10 @@ static void gen_stub(type_t *iface, const var_t *func, const char *cas, else fprintf(proxy, "__frame->_This->lpVtbl->%s", get_name(func)); fprintf(proxy, "(__frame->_This"); - if (type_get_function_args(func->type)) + if (type_get_function_args(func->declspec.type)) { - LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) - fprintf(proxy, ", %s__frame->%s", is_array(arg->type) && !type_array_is_decl_as_ptr(arg->type) ? "*" :"" , arg->name); + LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->declspec.type), const var_t, entry ) + fprintf(proxy, ", %s__frame->%s", is_array(arg->declspec.type) && !type_array_is_decl_as_ptr(arg->declspec.type) ? "*" :"" , arg->name); } fprintf(proxy, ");\n"); fprintf(proxy, "\n"); @@ -401,7 +401,7 @@ static void gen_stub(type_t *iface, const var_t *func, const char *cas, write_remoting_arguments(proxy, indent, func, "__frame->", PASS_OUT, PHASE_BUFFERSIZE); - if (!is_void(type_function_get_rettype(func->type))) + if (!is_void(type_function_get_rettype(func->declspec.type))) write_remoting_arguments(proxy, indent, func, "__frame->", PASS_RETURN, PHASE_BUFFERSIZE); print_proxy("NdrStubGetBuffer(This, _pRpcChannelBuffer, &__frame->_StubMsg);\n"); @@ -410,7 +410,7 @@ static void gen_stub(type_t *iface, const var_t *func, const char *cas, fprintf(proxy, "\n"); /* marshall the return value */ - if (!is_void(type_function_get_rettype(func->type))) + if (!is_void(type_function_get_rettype(func->declspec.type))) write_remoting_arguments(proxy, indent, func, "__frame->", PASS_RETURN, PHASE_MARSHAL); indent--; @@ -432,16 +432,16 @@ static void gen_stub(type_t *iface, const var_t *func, const char *cas, static void gen_stub_thunk( type_t *iface, const var_t *func, unsigned int proc_offset ) { - int has_ret = !is_void( type_function_get_rettype( func->type )); + int has_ret = !is_void( type_function_get_rettype( func->declspec.type )); const var_t *arg, *callas = is_callas( func->attrs ); - const var_list_t *args = type_get_function_args( func->type ); + const var_list_t *args = type_get_function_args( func->declspec.type ); indent = 0; print_proxy( "void __RPC_API %s_%s_Thunk( PMIDL_STUB_MESSAGE pStubMsg )\n", iface->name, get_name(func) ); print_proxy( "{\n"); indent++; - write_func_param_struct( proxy, iface, func->type, + write_func_param_struct( proxy, iface, func->declspec.type, "*pParamStruct = (struct _PARAM_STRUCT *)pStubMsg->StackTop", has_ret ); print_proxy( "%s%s_%s_Stub( pParamStruct->This", has_ret ? "pParamStruct->_RetVal = " : "", iface->name, callas->name ); @@ -614,14 +614,14 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) if (!is_local(func->attrs)) { const var_t *cas = is_callas(func->attrs); const char *cname = cas ? cas->name : NULL; - int idx = func->type->details.function->idx; + int idx = func->declspec.type->details.function->idx; if (cname) { const statement_t *stmt2; STATEMENTS_FOR_EACH_FUNC(stmt2, type_iface_get_stmts(iface)) { const var_t *m = stmt2->u.var; if (!strcmp(m->name, cname)) { - idx = m->type->details.function->idx; + idx = m->declspec.type->details.function->idx; break; } } diff --git a/tools/widl/server.c b/tools/widl/server.c index 59c17d661f..fb14dd87bc 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -55,7 +55,7 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned unsigned char explicit_fc, implicit_fc; int has_full_pointer = is_full_pointer_function(func); const var_t *handle_var = get_func_handle_var( iface, func, &explicit_fc, &implicit_fc ); - type_t *ret_type = type_function_get_rettype(func->type); + type_t *ret_type = type_function_get_rettype(func->declspec.type); if (is_interpreted_func( iface, func )) return; @@ -121,7 +121,7 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned if (has_full_pointer) write_full_pointer_init(server, indent, func, TRUE); - if (type_get_function_args(func->type)) + if (type_get_function_args(func->declspec.type)) { print_server("if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION)\n"); indent++; @@ -166,31 +166,31 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned print_server("%s", is_void(ret_type) ? "" : "__frame->_RetVal = "); fprintf(server, "%s%s", prefix_server, get_name(func)); - if (type_get_function_args(func->type)) + if (type_get_function_args(func->declspec.type)) { int first_arg = 1; fprintf(server, "(\n"); indent++; - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->declspec.type), const var_t, entry ) { if (first_arg) first_arg = 0; else fprintf(server, ",\n"); - if (is_context_handle(var->type)) + if (is_context_handle(var->declspec.type)) { /* if the context_handle attribute appears in the chain of types * without pointers being followed, then the context handle must * be direct, otherwise it is a pointer */ - const char *ch_ptr = is_aliaschain_attr(var->type, ATTR_CONTEXTHANDLE) ? "*" : ""; + const char *ch_ptr = is_aliaschain_attr(var->declspec.type, ATTR_CONTEXTHANDLE) ? "*" : ""; print_server("("); - write_type_decl_left(server, var->type); + write_type_decl_left(server, var->declspec.type); fprintf(server, ")%sNDRSContextValue(__frame->%s)", ch_ptr, var->name); } else { - print_server("%s__frame->%s", is_array(var->type) && !type_array_is_decl_as_ptr(var->type) ? "*" : "", var->name); + print_server("%s__frame->%s", is_array(var->declspec.type) && !type_array_is_decl_as_ptr(var->declspec.type) ? "*" : "", var->name); } } fprintf(server, ");\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f320f57789..cb61726f87 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -379,13 +379,13 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att static int cant_be_null(const var_t *v) { - switch (typegen_detect_type(v->type, v->attrs, TDT_IGNORE_STRINGS)) + switch (typegen_detect_type(v->declspec.type, v->attrs, TDT_IGNORE_STRINGS)) { case TGT_ARRAY: - if (!type_array_is_decl_as_ptr( v->type )) return 0; + if (!type_array_is_decl_as_ptr( v->declspec.type )) return 0; /* fall through */ case TGT_POINTER: - return (get_pointer_fc(v->type, v->attrs, TRUE) == FC_RP); + return (get_pointer_fc(v->declspec.type, v->attrs, TRUE) == FC_RP); case TGT_CTXT_HANDLE_POINTER: return TRUE; default: @@ -405,7 +405,7 @@ static int get_padding(const var_list_t *fields) LIST_FOR_EACH_ENTRY(f, fields, const var_t, entry) { - type_t *ft = f->type; + type_t *ft = f->declspec.type; unsigned int align = 0; unsigned int size = type_memsize_and_alignment(ft, &align); align = clamp_align(align); @@ -422,7 +422,7 @@ static unsigned int get_stack_size( const var_t *var, int *by_value ) unsigned int stack_size; int by_val; - switch (typegen_detect_type( var->type, var->attrs, TDT_ALL_TYPES )) + switch (typegen_detect_type( var->declspec.type, var->attrs, TDT_ALL_TYPES )) { case TGT_BASIC: case TGT_ENUM: @@ -430,7 +430,7 @@ static unsigned int get_stack_size( const var_t *var, int *by_value ) case TGT_STRUCT: case TGT_UNION: case TGT_USER_TYPE: - stack_size = type_memsize( var->type ); + stack_size = type_memsize( var->declspec.type ); by_val = (pointer_size < 8 || stack_size <= pointer_size); /* FIXME: should be platform-specific */ break; default: @@ -495,14 +495,14 @@ unsigned char get_struct_fc(const type_t *type) if (fields) LIST_FOR_EACH_ENTRY( field, fields, var_t, entry ) { - type_t *t = field->type; + type_t *t = field->declspec.type; enum typegen_type typegen_type; typegen_type = typegen_detect_type(t, field->attrs, TDT_IGNORE_STRINGS); if (typegen_type == TGT_ARRAY && !type_array_is_decl_as_ptr(t)) { - if (is_string_type(field->attrs, field->type)) + if (is_string_type(field->attrs, field->declspec.type)) { if (is_conformant_array(t)) has_conformance = 1; @@ -510,10 +510,10 @@ unsigned char get_struct_fc(const type_t *type) continue; } - if (is_array(type_array_get_element(field->type))) + if (is_array(type_array_get_element(field->declspec.type))) return FC_BOGUS_STRUCT; - if (type_array_has_conformance(field->type)) + if (type_array_has_conformance(field->declspec.type)) { has_conformance = 1; if (list_next(fields, &field->entry)) @@ -721,7 +721,7 @@ static int type_has_pointers(const type_t *type) const var_t *field; if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { - if (type_has_pointers(field->type)) + if (type_has_pointers(field->declspec.type)) return TRUE; } break; @@ -733,7 +733,7 @@ static int type_has_pointers(const type_t *type) fields = type_union_get_cases(type); if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { - if (field->type && type_has_pointers(field->type)) + if (field->declspec.type && type_has_pointers(field->declspec.type)) return TRUE; } break; @@ -775,7 +775,7 @@ static int type_has_full_pointer(const type_t *type, const attr_list_t *attrs, const var_t *field; if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { - if (type_has_full_pointer(field->type, field->attrs, FALSE)) + if (type_has_full_pointer(field->declspec.type, field->attrs, FALSE)) return TRUE; } break; @@ -787,7 +787,7 @@ static int type_has_full_pointer(const type_t *type, const attr_list_t *attrs, fields = type_union_get_cases(type); if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { - if (field->type && type_has_full_pointer(field->type, field->attrs, FALSE)) + if (field->declspec.type && type_has_full_pointer(field->declspec.type, field->attrs, FALSE)) return TRUE; } break; @@ -907,16 +907,16 @@ static void write_var_init(FILE *file, int indent, const type_t *t, const char * void write_parameters_init(FILE *file, int indent, const var_t *func, const char *local_var_prefix) { - const var_t *var = type_function_get_retval(func->type); + const var_t *var = type_function_get_retval(func->declspec.type); - if (!is_void(var->type)) - write_var_init(file, indent, var->type, var->name, local_var_prefix); + if (!is_void(var->declspec.type)) + write_var_init(file, indent, var->declspec.type, var->name, local_var_prefix); - if (!type_get_function_args(func->type)) + if (!type_get_function_args(func->declspec.type)) return; - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - write_var_init(file, indent, var->type, var->name, local_var_prefix); + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->declspec.type), const var_t, entry ) + write_var_init(file, indent, var->declspec.type, var->name, local_var_prefix); fprintf(file, "\n"); } @@ -980,14 +980,14 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned if (is_out) *flags |= IsOut; if (is_return) *flags |= IsReturn; - if (!is_string_type( var->attrs, var->type )) - buffer_size = get_required_buffer_size_type( var->type, NULL, var->attrs, TRUE, &alignment ); + if (!is_string_type( var->attrs, var->declspec.type )) + buffer_size = get_required_buffer_size_type( var->declspec.type, NULL, var->attrs, TRUE, &alignment ); - switch (typegen_detect_type( var->type, var->attrs, TDT_ALL_TYPES )) + switch (typegen_detect_type( var->declspec.type, var->attrs, TDT_ALL_TYPES )) { case TGT_BASIC: *flags |= IsBasetype; - fc = get_basic_fc_signed( var->type ); + fc = get_basic_fc_signed( var->declspec.type ); if (fc == FC_BIND_PRIMITIVE) { buffer_size = 4; /* actually 0 but avoids setting MustSize */ @@ -996,7 +996,7 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned break; case TGT_ENUM: *flags |= IsBasetype; - fc = get_enum_fc( var->type ); + fc = get_enum_fc( var->declspec.type ); break; case TGT_RANGE: *flags |= IsByValue; @@ -1011,19 +1011,19 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned break; case TGT_ARRAY: *flags |= MustFree; - if (type_array_is_decl_as_ptr(var->type) && var->type->details.array.ptr_tfsoff && - get_pointer_fc( var->type, var->attrs, !is_return ) == FC_RP) + if (type_array_is_decl_as_ptr(var->declspec.type) && var->declspec.type->details.array.ptr_tfsoff && + get_pointer_fc( var->declspec.type, var->attrs, !is_return ) == FC_RP) { - *typestring_offset = var->type->typestring_offset; + *typestring_offset = var->declspec.type->typestring_offset; *flags |= IsSimpleRef; } break; case TGT_STRING: *flags |= MustFree; - if (is_declptr( var->type ) && get_pointer_fc( var->type, var->attrs, !is_return ) == FC_RP) + if (is_declptr( var->declspec.type ) && get_pointer_fc( var->declspec.type, var->attrs, !is_return ) == FC_RP) { /* skip over pointer description straight to string description */ - if (is_conformant_array( var->type )) *typestring_offset += 4; + if (is_conformant_array( var->declspec.type )) *typestring_offset += 4; else *typestring_offset += 2; *flags |= IsSimpleRef; } @@ -1036,9 +1036,9 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned buffer_size = 20; break; case TGT_POINTER: - if (get_pointer_fc( var->type, var->attrs, !is_return ) == FC_RP) + if (get_pointer_fc( var->declspec.type, var->attrs, !is_return ) == FC_RP) { - const type_t *ref = type_pointer_get_ref( var->type ); + const type_t *ref = type_pointer_get_ref( var->declspec.type ); if (!is_string_type( var->attrs, ref )) buffer_size = get_required_buffer_size_type( ref, NULL, NULL, TRUE, &alignment ); @@ -1127,8 +1127,8 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned static unsigned char get_func_oi2_flags( const var_t *func ) { const var_t *var; - var_list_t *args = type_get_function_args( func->type ); - var_t *retval = type_function_get_retval( func->type ); + var_list_t *args = type_get_function_args( func->declspec.type ); + var_t *retval = type_function_get_retval( func->declspec.type ); unsigned char oi2_flags = 0x40; /* HasExtensions */ unsigned short flags; unsigned int stack_size, typestring_offset; @@ -1143,7 +1143,7 @@ static unsigned char get_func_oi2_flags( const var_t *func ) } } - if (!is_void( retval->type )) + if (!is_void( retval->declspec.type )) { oi2_flags |= 0x04; /* HasRet */ get_parameter_fc( retval, 1, &flags, &stack_size, &typestring_offset ); @@ -1197,8 +1197,8 @@ static unsigned int write_old_procformatstring_type(FILE *file, int indent, cons if (!is_in && !is_out) is_in = TRUE; - if (type_get_type(var->type) == TYPE_BASIC || - type_get_type(var->type) == TYPE_ENUM) + if (type_get_type(var->declspec.type) == TYPE_BASIC || + type_get_type(var->declspec.type) == TYPE_ENUM) { unsigned char fc; @@ -1207,13 +1207,13 @@ static unsigned int write_old_procformatstring_type(FILE *file, int indent, cons else print_file(file, indent, "0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - if (type_get_type(var->type) == TYPE_ENUM) + if (type_get_type(var->declspec.type) == TYPE_ENUM) { - fc = get_enum_fc(var->type); + fc = get_enum_fc(var->declspec.type); } else { - fc = get_basic_fc_signed(var->type); + fc = get_basic_fc_signed(var->declspec.type); if (fc == FC_BIND_PRIMITIVE) fc = FC_IGNORE; @@ -1227,10 +1227,10 @@ static unsigned int write_old_procformatstring_type(FILE *file, int indent, cons { unsigned short offset = var->typestring_offset; - if (!is_interpreted && is_array(var->type) && - type_array_is_decl_as_ptr(var->type) && - var->type->details.array.ptr_tfsoff) - offset = var->type->typestring_offset; + if (!is_interpreted && is_array(var->declspec.type) && + type_array_is_decl_as_ptr(var->declspec.type) && + var->declspec.type->details.array.ptr_tfsoff) + offset = var->declspec.type->typestring_offset; if (is_return) print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); @@ -1253,8 +1253,8 @@ int is_interpreted_func( const type_t *iface, const var_t *func ) { const char *str; const var_t *var; - const var_list_t *args = type_get_function_args( func->type ); - const type_t *ret_type = type_function_get_rettype( func->type ); + const var_list_t *args = type_get_function_args( func->declspec.type ); + const type_t *ret_type = type_function_get_rettype( func->declspec.type ); if (type_get_type( ret_type ) == TYPE_BASIC) { @@ -1276,10 +1276,10 @@ int is_interpreted_func( const type_t *iface, const var_t *func ) if (get_stub_mode() != MODE_Oif && args) { LIST_FOR_EACH_ENTRY( var, args, const var_t, entry ) - switch (type_get_type( var->type )) + switch (type_get_type( var->declspec.type )) { case TYPE_BASIC: - switch (type_basic_get_type( var->type )) + switch (type_basic_get_type( var->declspec.type )) { /* floating point arguments are not supported in Oi mode */ case TYPE_BASIC_FLOAT: return 0; @@ -1304,7 +1304,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, unsigned short num_proc ) { var_t *var; - var_list_t *args = type_get_function_args( func->type ); + var_list_t *args = type_get_function_args( func->declspec.type ); unsigned char explicit_fc, implicit_fc; unsigned char handle_flags; const var_t *handle_var = get_func_handle_var( iface, func, &explicit_fc, &implicit_fc ); @@ -1335,7 +1335,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, param_num++; nb_args++; } - if (!is_void( type_function_get_rettype( func->type ))) + if (!is_void( type_function_get_rettype( func->declspec.type ))) { stack_size += pointer_size; nb_args++; @@ -1363,22 +1363,22 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, *offset += 4; break; case FC_BIND_GENERIC: - handle_flags = type_memsize( handle_var->type ); + handle_flags = type_memsize( handle_var->declspec.type ); print_file( file, indent, "0x%02x,\t/* %s */\n", explicit_fc, string_of_type(explicit_fc) ); print_file( file, indent, "0x%02x,\n", handle_flags ); print_file( file, indent, "NdrFcShort(0x%hx),\t/* stack offset = %hu */\n", handle_stack_offset, handle_stack_offset ); - print_file( file, indent, "0x%02x,\n", get_generic_handle_offset( handle_var->type ) ); + print_file( file, indent, "0x%02x,\n", get_generic_handle_offset( handle_var->declspec.type ) ); print_file( file, indent, "0x%x,\t/* FC_PAD */\n", FC_PAD); *offset += 6; break; case FC_BIND_CONTEXT: - handle_flags = get_contexthandle_flags( iface, handle_var->attrs, handle_var->type, 0 ); + handle_flags = get_contexthandle_flags( iface, handle_var->attrs, handle_var->declspec.type, 0 ); print_file( file, indent, "0x%02x,\t/* %s */\n", explicit_fc, string_of_type(explicit_fc) ); print_file( file, indent, "0x%02x,\n", handle_flags ); print_file( file, indent, "NdrFcShort(0x%hx),\t/* stack offset = %hu */\n", handle_stack_offset, handle_stack_offset ); - print_file( file, indent, "0x%02x,\n", get_context_handle_offset( handle_var->type ) ); + print_file( file, indent, "0x%02x,\n", get_context_handle_offset( handle_var->declspec.type ) ); print_file( file, indent, "0x%02x,\t/* param %hu */\n", handle_param_num, handle_param_num ); *offset += 6; break; @@ -1414,9 +1414,9 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, if (is_object( iface )) pos += 2; if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) { - if (type_get_type( var->type ) == TYPE_BASIC) + if (type_get_type( var->declspec.type ) == TYPE_BASIC) { - switch (type_basic_get_type( var->type )) + switch (type_basic_get_type( var->declspec.type )) { case TYPE_BASIC_FLOAT: fpu_mask |= 1 << pos; break; case TYPE_BASIC_DOUBLE: fpu_mask |= 2 << pos; break; @@ -1439,15 +1439,15 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i unsigned int stack_offset = is_object( iface ) ? pointer_size : 0; int is_interpreted = is_interpreted_func( iface, func ); int is_new_style = is_interpreted && (get_stub_mode() == MODE_Oif); - var_t *retval = type_function_get_retval( func->type ); + var_t *retval = type_function_get_retval( func->declspec.type ); if (is_interpreted) write_proc_func_header( file, indent, iface, func, offset, num_proc ); /* emit argument data */ - if (type_get_function_args(func->type)) + if (type_get_function_args(func->declspec.type)) { const var_t *var; - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->declspec.type), const var_t, entry ) { print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); if (is_new_style) @@ -1458,7 +1458,7 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i } /* emit return value data */ - if (is_void(retval->type)) + if (is_void(retval->declspec.type)) { if (!is_new_style) { @@ -1605,7 +1605,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, { conftype = FC_TOP_LEVEL_CONFORMANCE; conftype_string = "parameter"; - cont_type = current_func->type; + cont_type = current_func->declspec.type; name = current_func->name; iface = current_iface; } @@ -1676,7 +1676,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, if (var->name && !strcmp(var->name, subexpr->u.sval)) { expr_loc.v = var; - correlation_variable = var->type; + correlation_variable = var->declspec.type; break; } offset += get_stack_size( var, NULL ); @@ -1688,11 +1688,11 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, if (fields) LIST_FOR_EACH_ENTRY( var, fields, const var_t, entry ) { - unsigned int size = field_memsize( var->type, &offset ); + unsigned int size = field_memsize( var->declspec.type, &offset ); if (var->name && !strcmp(var->name, subexpr->u.sval)) { expr_loc.v = var; - correlation_variable = var->type; + correlation_variable = var->declspec.type; break; } offset += size; @@ -1831,7 +1831,7 @@ static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align LIST_FOR_EACH_ENTRY( v, fields, const var_t, entry ) { unsigned int falign = 0; - unsigned int fsize = type_memsize_and_alignment(v->type, &falign); + unsigned int fsize = type_memsize_and_alignment(v->declspec.type, &falign); if (*align < falign) *align = falign; falign = clamp_align(falign); size = ROUND_SIZE(size, falign); @@ -1853,9 +1853,9 @@ static unsigned int union_memsize(const var_list_t *fields, unsigned int *pmaxa) if (fields) LIST_FOR_EACH_ENTRY( v, fields, const var_t, entry ) { /* we could have an empty default field with NULL type */ - if (v->type) + if (v->declspec.type) { - size = type_memsize_and_alignment(v->type, &align); + size = type_memsize_and_alignment(v->declspec.type, &align); if (maxs < size) maxs = size; if (*pmaxa < align) *pmaxa = align; } @@ -2028,8 +2028,8 @@ static unsigned int type_buffer_alignment(const type_t *t) if (!(fields = type_struct_get_fields(t))) break; LIST_FOR_EACH_ENTRY( var, fields, const var_t, entry ) { - if (!var->type) continue; - align = type_buffer_alignment( var->type ); + if (!var->declspec.type) continue; + align = type_buffer_alignment( var->declspec.type ); if (max < align) max = align; } break; @@ -2037,8 +2037,8 @@ static unsigned int type_buffer_alignment(const type_t *t) if (!(fields = type_encapsulated_union_get_fields(t))) break; LIST_FOR_EACH_ENTRY( var, fields, const var_t, entry ) { - if (!var->type) continue; - align = type_buffer_alignment( var->type ); + if (!var->declspec.type) continue; + align = type_buffer_alignment( var->declspec.type ); if (max < align) max = align; } break; @@ -2046,8 +2046,8 @@ static unsigned int type_buffer_alignment(const type_t *t) if (!(fields = type_union_get_cases(t))) break; LIST_FOR_EACH_ENTRY( var, fields, const var_t, entry ) { - if (!var->type) continue; - align = type_buffer_alignment( var->type ); + if (!var->declspec.type) continue; + align = type_buffer_alignment( var->declspec.type ); if (max < align) max = align; } break; @@ -2076,12 +2076,12 @@ static unsigned int type_buffer_alignment(const type_t *t) int is_full_pointer_function(const var_t *func) { const var_t *var; - if (type_has_full_pointer(type_function_get_rettype(func->type), func->attrs, TRUE)) + if (type_has_full_pointer(type_function_get_rettype(func->declspec.type), func->attrs, TRUE)) return TRUE; - if (!type_get_function_args(func->type)) + if (!type_get_function_args(func->declspec.type)) return FALSE; - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - if (type_has_full_pointer( var->type, var->attrs, TRUE )) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->declspec.type), const var_t, entry ) + if (type_has_full_pointer( var->declspec.type, var->attrs, TRUE )) return TRUE; return FALSE; } @@ -2423,7 +2423,7 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) if (fs) LIST_FOR_EACH_ENTRY(f, fs, var_t, entry) { - type_t *ft = f->type; + type_t *ft = f->declspec.type; unsigned int size = field_memsize( ft, &offset ); if (type_get_type(ft) == TYPE_UNION && is_attr(f->attrs, ATTR_SWITCHIS)) { @@ -2518,13 +2518,13 @@ static int write_pointer_description_offsets( { unsigned int padding; unsigned int align = 0; - type_memsize_and_alignment(v->type, &align); + type_memsize_and_alignment(v->declspec.type, &align); padding = ROUNDING(*offset_in_memory, align); *offset_in_memory += padding; *offset_in_buffer += padding; } written += write_pointer_description_offsets( - file, v->attrs, v->type, offset_in_memory, offset_in_buffer, + file, v->attrs, v->declspec.type, offset_in_memory, offset_in_buffer, typestring_offset); } } @@ -2570,13 +2570,13 @@ static int write_no_repeat_pointer_descriptions( { unsigned int padding; unsigned int align = 0; - type_memsize_and_alignment(v->type, &align); + type_memsize_and_alignment(v->declspec.type, &align); padding = ROUNDING(*offset_in_memory, align); *offset_in_memory += padding; *offset_in_buffer += padding; } written += write_no_repeat_pointer_descriptions( - file, v->attrs, v->type, + file, v->attrs, v->declspec.type, offset_in_memory, offset_in_buffer, typestring_offset); } } @@ -2639,13 +2639,13 @@ static int write_fixed_array_pointer_descriptions( { unsigned int padding; unsigned int align = 0; - type_memsize_and_alignment(v->type, &align); + type_memsize_and_alignment(v->declspec.type, &align); padding = ROUNDING(*offset_in_memory, align); *offset_in_memory += padding; *offset_in_buffer += padding; } pointer_count += write_fixed_array_pointer_descriptions( - file, v->attrs, v->type, offset_in_memory, offset_in_buffer, + file, v->attrs, v->declspec.type, offset_in_memory, offset_in_buffer, typestring_offset); } } @@ -2754,20 +2754,20 @@ static int write_varying_array_pointer_descriptions( { unsigned int align = 0, padding; - if (is_array(v->type) && type_array_has_variance(v->type)) + if (is_array(v->declspec.type) && type_array_has_variance(v->declspec.type)) { *offset_in_buffer = ROUND_SIZE(*offset_in_buffer, 4); /* skip over variance and offset in buffer */ *offset_in_buffer += 8; } - type_memsize_and_alignment(v->type, &align); + type_memsize_and_alignment(v->declspec.type, &align); padding = ROUNDING(*offset_in_memory, align); *offset_in_memory += padding; *offset_in_buffer += padding; } pointer_count += write_varying_array_pointer_descriptions( - file, v->attrs, v->type, offset_in_memory, offset_in_buffer, + file, v->attrs, v->declspec.type, offset_in_memory, offset_in_buffer, typestring_offset); } } @@ -2819,7 +2819,7 @@ static void write_pointer_description(FILE *file, const attr_list_t *attrs, type else if (type_get_type(type) == TYPE_STRUCT && get_struct_fc(type) == FC_CPSTRUCT) { - type_t *carray = find_array_or_string_in_struct(type)->type; + type_t *carray = find_array_or_string_in_struct(type)->declspec.type; write_conformant_array_pointer_descriptions( file, NULL, carray, type_memsize(type), typestring_offset); } @@ -3057,7 +3057,7 @@ static const var_t *find_array_or_string_in_struct(const type_t *type) return NULL; last_field = LIST_ENTRY( list_tail(fields), const var_t, entry ); - ft = last_field->type; + ft = last_field->declspec.type; if (is_conformant_array(ft) && !type_array_is_decl_as_ptr(ft)) return last_field; @@ -3080,7 +3080,7 @@ static void write_struct_members(FILE *file, const type_t *type, if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { - type_t *ft = field->type; + type_t *ft = field->declspec.type; unsigned int align = 0; unsigned int size = type_memsize_and_alignment(ft, &align); align = clamp_align(align); @@ -3109,7 +3109,7 @@ static void write_struct_members(FILE *file, const type_t *type, offset = ROUND_SIZE(offset, align); *typestring_offset += 1; } - write_member_type(file, type, is_complex, field->attrs, field->type, corroff, + write_member_type(file, type, is_complex, field->attrs, field->declspec.type, corroff, typestring_offset); offset += size; } @@ -3152,15 +3152,15 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, name, USHRT_MAX, total_size - USHRT_MAX); if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) - write_embedded_types(file, f->attrs, f->type, f->name, FALSE, tfsoff); + write_embedded_types(file, f->attrs, f->declspec.type, f->name, FALSE, tfsoff); array = find_array_or_string_in_struct(type); - if (array && !processed(array->type)) + if (array && !processed(array->declspec.type)) { - if(is_string_type(array->attrs, array->type)) - write_string_tfs(file, array->attrs, array->type, TYPE_CONTEXT_CONTAINER, array->name, tfsoff); + if(is_string_type(array->attrs, array->declspec.type)) + write_string_tfs(file, array->attrs, array->declspec.type, TYPE_CONTEXT_CONTAINER, array->name, tfsoff); else - write_array_tfs(file, array->attrs, array->type, array->name, tfsoff); + write_array_tfs(file, array->attrs, array->declspec.type, array->name, tfsoff); } corroff = *tfsoff; @@ -3176,7 +3176,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, if (array) { - unsigned int absoff = array->type->typestring_offset; + unsigned int absoff = array->declspec.type->typestring_offset; short reloff = absoff - *tfsoff; print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", reloff, reloff, absoff); @@ -3222,7 +3222,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, type->ptrdesc = *tfsoff; if (fields) LIST_FOR_EACH_ENTRY(f, fields, const var_t, entry) { - type_t *ft = f->type; + type_t *ft = f->declspec.type; switch (typegen_detect_type(ft, f->attrs, TDT_IGNORE_STRINGS)) { case TGT_POINTER: @@ -3318,8 +3318,8 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, expr_list_t *cases = get_attrp(f->attrs, ATTR_CASE); if (cases) nbranch += list_count(cases); - if (f->type) - write_embedded_types(file, f->attrs, f->type, f->name, TRUE, tfsoff); + if (f->declspec.type) + write_embedded_types(file, f->attrs, f->declspec.type, f->name, TRUE, tfsoff); } start_offset = *tfsoff; @@ -3328,7 +3328,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, if (type_get_type(type) == TYPE_ENCAPSULATED_UNION) { const var_t *sv = type_union_get_switch_value(type); - const type_t *st = sv->type; + const type_t *st = sv->declspec.type; unsigned int align = 0; unsigned char fc; @@ -3360,8 +3360,8 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, type_memsize_and_alignment(st, &align); if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) { - if (f->type) - type_memsize_and_alignment(f->type, &align); + if (f->declspec.type) + type_memsize_and_alignment(f->declspec.type, &align); } print_file(file, 2, "0x%x,\t/* FC_ENCAPSULATED_UNION */\n", FC_ENCAPSULATED_UNION); @@ -3416,7 +3416,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) { - type_t *ft = f->type; + type_t *ft = f->declspec.type; expr_list_t *cases = get_attrp(f->attrs, ATTR_CASE); int deflt = is_attr(f->attrs, ATTR_DEFAULT); expr_t *c; @@ -3699,21 +3699,21 @@ static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned in { const var_t *func = stmt->u.var; - if(stmt->u.var->stgclass != STG_NONE - || type_get_type_detect_alias(stmt->u.var->type) != TYPE_FUNCTION) + if(stmt->u.var->declspec.stgclass != STG_NONE + || type_get_type_detect_alias(stmt->u.var->declspec.type) != TYPE_FUNCTION) continue; current_func = func; if (is_local(func->attrs)) continue; - var = type_function_get_retval(func->type); - if (!is_void(var->type)) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, func->name, + var = type_function_get_retval(func->declspec.type); + if (!is_void(var->declspec.type)) + var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->declspec.type, func->name, TYPE_CONTEXT_RETVAL, offset); - if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, + if (type_get_function_args(func->declspec.type)) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->declspec.type), var_t, entry ) + var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->declspec.type, var->name, TYPE_CONTEXT_TOPLEVELPARAM, offset ); break; @@ -3899,8 +3899,8 @@ static unsigned int get_required_buffer_size(const var_t *var, unsigned int *ali return 20; } - if (!is_string_type(var->attrs, var->type)) - return get_required_buffer_size_type(var->type, var->name, + if (!is_string_type(var->attrs, var->declspec.type)) + return get_required_buffer_size_type(var->declspec.type, var->name, var->attrs, TRUE, alignment); } return 0; @@ -3911,19 +3911,19 @@ static unsigned int get_function_buffer_size( const var_t *func, enum pass pass const var_t *var; unsigned int total_size = 0, alignment; - if (type_get_function_args(func->type)) + if (type_get_function_args(func->declspec.type)) { - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->declspec.type), const var_t, entry ) { total_size += get_required_buffer_size(var, &alignment, pass); total_size += alignment; } } - if (pass == PASS_OUT && !is_void(type_function_get_rettype(func->type))) + if (pass == PASS_OUT && !is_void(type_function_get_rettype(func->declspec.type))) { var_t v = *func; - v.type = type_function_get_rettype(func->type); + v.declspec.type = type_function_get_rettype(func->declspec.type); total_size += get_required_buffer_size(&v, &alignment, PASS_RETURN); total_size += alignment; } @@ -3959,9 +3959,9 @@ static void print_phase_function(FILE *file, int indent, const char *type, print_file(file, indent, "&__frame->_StubMsg,\n"); print_file(file, indent, "%s%s%s%s%s,\n", (phase == PHASE_UNMARSHAL) ? "(unsigned char **)" : "(unsigned char *)", - (phase == PHASE_UNMARSHAL || decl_indirect(var->type)) ? "&" : "", + (phase == PHASE_UNMARSHAL || decl_indirect(var->declspec.type)) ? "&" : "", local_var_prefix, - (phase == PHASE_UNMARSHAL && decl_indirect(var->type)) ? "_p_" : "", + (phase == PHASE_UNMARSHAL && decl_indirect(var->declspec.type)) ? "_p_" : "", var->name); print_file(file, indent, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]%s\n", type_offset, (phase == PHASE_UNMARSHAL) ? "," : ");"); @@ -3974,7 +3974,7 @@ void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, enum remoting_phase phase, enum pass pass, const var_t *var, const char *varname) { - type_t *type = var->type; + type_t *type = var->declspec.type; unsigned int alignment = 0; /* no work to do for other phases, buffer sizing is done elsewhere */ @@ -4116,7 +4116,7 @@ expr_t *get_size_is_expr(const type_t *t, const char *name) void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char *local_var_prefix, enum remoting_phase phase, const var_t *var, int valid_variance) { - const type_t *type = var->type; + const type_t *type = var->declspec.type; /* get fundamental type for the argument */ for (;;) { @@ -4190,7 +4190,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { int in_attr, out_attr, pointer_type; const char *type_str = NULL; - const type_t *type = var->type; + const type_t *type = var->declspec.type; unsigned int alignment, start_offset = type->typestring_offset; if (is_ptr(type) || is_array(type)) @@ -4243,7 +4243,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const print_file(file, indent, "NdrServerContextNewMarshall(\n"); print_file(file, indent + 1, "&__frame->_StubMsg,\n"); print_file(file, indent + 1, "(NDR_SCONTEXT)%s%s,\n", local_var_prefix, var->name); - print_file(file, indent + 1, "(NDR_RUNDOWN)%s_rundown,\n", get_context_handle_type_name(var->type)); + print_file(file, indent + 1, "(NDR_RUNDOWN)%s_rundown,\n", get_context_handle_type_name(var->declspec.type)); print_file(file, indent + 1, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]);\n", start_offset); } } @@ -4387,9 +4387,9 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const range_max = LIST_ENTRY(list_next(range_list, list_head(range_list)), const expr_t, entry); print_file(file, indent, "if ((%s%s < (", local_var_prefix, var->name); - write_type_decl(file, var->type, NULL); + write_type_decl(file, var->declspec.type, NULL); fprintf(file, ")0x%x) || (%s%s > (", range_min->cval, local_var_prefix, var->name); - write_type_decl(file, var->type, NULL); + write_type_decl(file, var->declspec.type, NULL); fprintf(file, ")0x%x))\n", range_max->cval); print_file(file, indent, "{\n"); print_file(file, indent+1, "RpcRaiseException(RPC_S_INVALID_BOUND);\n"); @@ -4556,14 +4556,14 @@ void write_remoting_arguments(FILE *file, int indent, const var_t *func, const c if (pass == PASS_RETURN) { write_remoting_arg( file, indent, func, local_var_prefix, pass, phase, - type_function_get_retval(func->type) ); + type_function_get_retval(func->declspec.type) ); } else { const var_t *var; - if (!type_get_function_args(func->type)) + if (!type_get_function_args(func->declspec.type)) return; - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->declspec.type), const var_t, entry ) write_remoting_arg( file, indent, func, local_var_prefix, pass, phase, var ); } } @@ -4604,62 +4604,62 @@ void declare_stub_args( FILE *file, int indent, const var_t *func ) { int in_attr, out_attr; int i = 0; - const var_t *var = type_function_get_retval(func->type); + const var_t *var = type_function_get_retval(func->declspec.type); /* declare return value */ - if (!is_void(var->type)) + if (!is_void(var->declspec.type)) { - if (is_context_handle(var->type)) + if (is_context_handle(var->declspec.type)) print_file(file, indent, "NDR_SCONTEXT %s;\n", var->name); else { print_file(file, indent, "%s", ""); - write_type_decl(file, var->type, var->name); + write_type_decl(file, var->declspec.type, var->name); fprintf(file, ";\n"); } } - if (!type_get_function_args(func->type)) + if (!type_get_function_args(func->declspec.type)) return; - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->declspec.type), const var_t, entry ) { in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); if (!out_attr && !in_attr) in_attr = 1; - if (is_context_handle(var->type)) + if (is_context_handle(var->declspec.type)) print_file(file, indent, "NDR_SCONTEXT %s;\n", var->name); else { - if (!in_attr && !is_conformant_array(var->type)) + if (!in_attr && !is_conformant_array(var->declspec.type)) { type_t *type_to_print; char name[16]; print_file(file, indent, "%s", ""); - if (type_get_type(var->type) == TYPE_ARRAY && - !type_array_is_decl_as_ptr(var->type)) - type_to_print = var->type; + if (type_get_type(var->declspec.type) == TYPE_ARRAY && + !type_array_is_decl_as_ptr(var->declspec.type)) + type_to_print = var->declspec.type; else - type_to_print = type_pointer_get_ref(var->type); + type_to_print = type_pointer_get_ref(var->declspec.type); sprintf(name, "_W%u", i++); write_type_decl(file, type_to_print, name); fprintf(file, ";\n"); } print_file(file, indent, "%s", ""); - write_type_decl_left(file, var->type); + write_type_decl_left(file, var->declspec.type); fprintf(file, " "); - if (type_get_type(var->type) == TYPE_ARRAY && - !type_array_is_decl_as_ptr(var->type)) { + if (type_get_type(var->declspec.type) == TYPE_ARRAY && + !type_array_is_decl_as_ptr(var->declspec.type)) { fprintf(file, "(*%s)", var->name); } else fprintf(file, "%s", var->name); - write_type_right(file, var->type, FALSE); + write_type_right(file, var->declspec.type, FALSE); fprintf(file, ";\n"); - if (decl_indirect(var->type)) + if (decl_indirect(var->declspec.type)) print_file(file, indent, "void *_p_%s;\n", var->name); } } @@ -4673,10 +4673,10 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char const var_t *var; type_t *ref; - if (!type_get_function_args(func->type)) + if (!type_get_function_args(func->declspec.type)) return; - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->declspec.type), const var_t, entry ) { in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); @@ -4687,7 +4687,7 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char { print_file(file, indent, "%s%s", local_var_prefix, var->name); - switch (typegen_detect_type(var->type, var->attrs, TDT_IGNORE_STRINGS)) + switch (typegen_detect_type(var->declspec.type, var->attrs, TDT_IGNORE_STRINGS)) { case TGT_CTXT_HANDLE_POINTER: fprintf(file, " = NdrContextHandleInitialize(\n"); @@ -4696,13 +4696,13 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char var->typestring_offset); break; case TGT_ARRAY: - if (type_array_has_conformance(var->type)) + if (type_array_has_conformance(var->declspec.type)) { unsigned int size; type_t *type; fprintf(file, " = NdrAllocate(&__frame->_StubMsg, "); - for (type = var->type; + for (type = var->declspec.type; is_array(type) && type_array_has_conformance(type); type = type_array_get_element(type)) { @@ -4714,7 +4714,7 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char fprintf(file, "%u);\n", size); print_file(file, indent, "memset(%s%s, 0, ", local_var_prefix, var->name); - for (type = var->type; + for (type = var->declspec.type; is_array(type) && type_array_has_conformance(type); type = type_array_get_element(type)) { @@ -4730,7 +4730,7 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char break; case TGT_POINTER: fprintf(file, " = &%s_W%u;\n", local_var_prefix, i); - ref = type_pointer_get_ref(var->type); + ref = type_pointer_get_ref(var->declspec.type); switch (typegen_detect_type(ref, var->attrs, TDT_IGNORE_STRINGS)) { case TGT_BASIC: @@ -4790,7 +4790,7 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (args) LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) - if (!is_array( arg->type )) type_memsize_and_alignment( arg->type, &align ); + if (!is_array( arg->declspec.type )) type_memsize_and_alignment( arg->declspec.type, &align ); needs_packing = (align > pointer_size); @@ -4802,26 +4802,26 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (args) LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) { print_file(file, 2, "%s", ""); - write_type_left( file, (type_t *)arg->type, NAME_DEFAULT, TRUE ); - if (needs_space_after( arg->type )) fputc( ' ', file ); - if (is_array( arg->type ) && !type_array_is_decl_as_ptr( arg->type )) fputc( '*', file ); + write_type_left( file, (type_t *)arg->declspec.type, NAME_DEFAULT, TRUE ); + if (needs_space_after( arg->declspec.type )) fputc( ' ', file ); + if (is_array( arg->declspec.type ) && !type_array_is_decl_as_ptr( arg->declspec.type )) fputc( '*', file ); /* FIXME: should check for large args being passed by pointer */ align = 0; - if (is_array( arg->type ) || is_ptr( arg->type )) align = pointer_size; - else type_memsize_and_alignment( arg->type, &align ); + if (is_array( arg->declspec.type ) || is_ptr( arg->declspec.type )) align = pointer_size; + else type_memsize_and_alignment( arg->declspec.type, &align ); if (align >= pointer_size) fprintf( file, "%s;\n", arg->name ); else fprintf( file, "%s DECLSPEC_ALIGN(%u);\n", arg->name, pointer_size ); } - if (add_retval && !is_void( retval->type )) + if (add_retval && !is_void( retval->declspec.type )) { print_file(file, 2, "%s", ""); - write_type_decl( file, retval->type, retval->name ); - if (is_array( retval->type ) || is_ptr( retval->type ) || - type_memsize( retval->type ) == pointer_size) + write_type_decl( file, retval->declspec.type, retval->name ); + if (is_array( retval->declspec.type ) || is_ptr( retval->declspec.type ) || + type_memsize( retval->declspec.type ) == pointer_size) fprintf( file, ";\n" ); else fprintf( file, " DECLSPEC_ALIGN(%u);\n", pointer_size ); @@ -4833,7 +4833,7 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun void write_pointer_checks( FILE *file, int indent, const var_t *func ) { - const var_list_t *args = type_get_function_args( func->type ); + const var_list_t *args = type_get_function_args( func->declspec.type ); const var_t *var; if (!args) return; @@ -4963,9 +4963,9 @@ error: void write_client_call_routine( FILE *file, const type_t *iface, const var_t *func, const char *prefix, unsigned int proc_offset ) { - type_t *rettype = type_function_get_rettype( func->type ); + type_t *rettype = type_function_get_rettype( func->declspec.type ); int has_ret = !is_void( rettype ); - const var_list_t *args = type_get_function_args( func->type ); + const var_list_t *args = type_get_function_args( func->declspec.type ); const var_t *arg; int len, needs_params = 0; @@ -4976,7 +4976,7 @@ void write_client_call_routine( FILE *file, const type_t *iface, const var_t *fu if (needs_params) { if (has_ret) print_file( file, 1, "%s", "CLIENT_CALL_RETURN _RetVal;\n" ); - write_func_param_struct( file, iface, func->type, "__params", FALSE ); + write_func_param_struct( file, iface, func->declspec.type, "__params", FALSE ); if (is_object( iface )) print_file( file, 1, "__params.This = This;\n" ); if (args) LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index b93806be98..3b0c944387 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -137,7 +137,7 @@ type_t *type_new_function(var_list_t *args) if (args) { arg = LIST_ENTRY(list_head(args), var_t, entry); - if (list_count(args) == 1 && !arg->name && arg->type && type_get_type(arg->type) == TYPE_VOID) + if (list_count(args) == 1 && !arg->name && arg->declspec.type && type_get_type(arg->declspec.type) == TYPE_VOID) { list_remove(&arg->entry); free(arg); @@ -147,7 +147,7 @@ type_t *type_new_function(var_list_t *args) } if (args) LIST_FOR_EACH_ENTRY(arg, args, var_t, entry) { - if (arg->type && type_get_type(arg->type) == TYPE_VOID) + if (arg->declspec.type && type_get_type(arg->declspec.type) == TYPE_VOID) error_loc("argument '%s' has void type\n", arg->name); if (!arg->name) { @@ -354,7 +354,7 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio { type_t *t = get_type(TYPE_ENCAPSULATED_UNION, name, NULL, tsUNION); if (!union_field) union_field = make_var( xstrdup("tagged_union") ); - union_field->type = type_new_nonencapsulated_union(NULL, TRUE, cases); + union_field->declspec.type = type_new_nonencapsulated_union(NULL, TRUE, cases); t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = append_var( NULL, switch_field ); t->details.structure->fields = append_var( t->details.structure->fields, union_field ); @@ -430,7 +430,7 @@ static int compute_method_indexes(type_t *iface) { var_t *func = stmt->u.var; if (!is_callas(func->attrs)) - func->type->details.function->idx = idx++; + func->declspec.type->details.function->idx = idx++; } return idx; diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index fc134cd575..9f0dc5afc6 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -107,7 +107,7 @@ static inline var_t *type_function_get_retval(const type_t *type) static inline type_t *type_function_get_rettype(const type_t *type) { - return type_function_get_retval(type)->type; + return type_function_get_retval(type)->declspec.type; } static inline var_list_t *type_enum_get_values(const type_t *type) @@ -142,7 +142,7 @@ static inline var_list_t *type_union_get_cases(const type_t *type) if (type_type == TYPE_ENCAPSULATED_UNION) { const var_t *uv = LIST_ENTRY(list_tail(type->details.structure->fields), const var_t, entry); - return uv->type->details.structure->fields; + return uv->declspec.type->details.structure->fields; } else return type->details.structure->fields; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 1177c1a00a..31a0cc74dd 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -40,6 +40,7 @@ typedef struct _attr_t attr_t; typedef struct _expr_t expr_t; typedef struct _type_t type_t; typedef struct _var_t var_t; +typedef struct _decl_spec_t decl_spec_t; typedef struct _declarator_t declarator_t; typedef struct _ifref_t ifref_t; typedef struct _typelib_entry_t typelib_entry_t; @@ -293,6 +294,13 @@ struct str_list_entry_t struct list entry; }; +struct _decl_spec_t +{ + type_t *type; + attr_list_t *attrs; + enum storage_class stgclass; +}; + struct _attr_t { enum attr_type type; union { @@ -449,10 +457,10 @@ struct _type_t { struct _var_t { char *name; - type_t *type; + decl_spec_t declspec; + attr_list_t *attrs; expr_t *eval; - enum storage_class stgclass; unsigned int procstring_offset; unsigned int typestring_offset; @@ -596,8 +604,8 @@ static inline enum type_type type_get_type_detect_alias(const type_t *type) #define STATEMENTS_FOR_EACH_FUNC(stmt, stmts) \ if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, statement_t, entry ) \ - if (stmt->type == STMT_DECLARATION && stmt->u.var->stgclass == STG_NONE && \ - type_get_type_detect_alias(stmt->u.var->type) == TYPE_FUNCTION) + if (stmt->type == STMT_DECLARATION && stmt->u.var->declspec.stgclass == STG_NONE && \ + type_get_type_detect_alias(stmt->u.var->declspec.type) == TYPE_FUNCTION) static inline int statements_has_func(const statement_list_t *stmts) { @@ -616,4 +624,13 @@ static inline int is_global_namespace(const struct namespace *namespace) return !namespace->name; } +static inline decl_spec_t *init_declspec(decl_spec_t *declspec, type_t *type) +{ + declspec->type = type; + declspec->attrs = NULL; + declspec->stgclass = STG_NONE; + + return declspec; +} + #endif diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 4dcbc03702..7738cae729 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1301,8 +1301,8 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) return S_FALSE; } - if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), var_t, entry ) + if (type_get_function_args(func->declspec.type)) + LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->declspec.type), var_t, entry ) { num_params++; if (arg->attrs) LIST_FOR_EACH_ENTRY( attr, arg->attrs, const attr_t, entry ) { @@ -1444,7 +1444,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) /* fill out the basic type information */ typedata[0] = typedata_size | (index << 16); - encode_var(typeinfo->typelib, type_function_get_rettype(func->type), func, + encode_var(typeinfo->typelib, type_function_get_rettype(func->declspec.type), func, &typedata[1], &decoded_size); typedata[2] = funcflags; typedata[3] = ((52 /*sizeof(FUNCDESC)*/ + decoded_size) << 16) | typeinfo->typeinfo->cbSizeVft; @@ -1471,10 +1471,10 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) warning("unknown number of optional attrs\n"); } - if (type_get_function_args(func->type)) + if (type_get_function_args(func->declspec.type)) { i = 0; - LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), var_t, entry ) + LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->declspec.type), var_t, entry ) { int paramflags = 0; int *paramdata = typedata + 6 + extra_attr + (num_defaults ? num_params : 0) + i * 3; @@ -1482,13 +1482,13 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) if(defaultdata) *defaultdata = -1; - encode_var(typeinfo->typelib, arg->type, arg, paramdata, &decoded_size); + encode_var(typeinfo->typelib, arg->declspec.type, arg, paramdata, &decoded_size); if (arg->attrs) LIST_FOR_EACH_ENTRY( attr, arg->attrs, const attr_t, entry ) { switch(attr->type) { case ATTR_DEFAULTVALUE: { paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */ - write_default_value(typeinfo->typelib, arg->type, (expr_t *)attr->u.pval, defaultdata); + write_default_value(typeinfo->typelib, arg->declspec.type, (expr_t *)attr->u.pval, defaultdata); break; } case ATTR_IN: @@ -1572,10 +1572,10 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) if(typeinfo->typekind == TKIND_MODULE) namedata[9] |= 0x20; - if (type_get_function_args(func->type)) + if (type_get_function_args(func->declspec.type)) { i = 0; - LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), var_t, entry ) + LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->declspec.type), var_t, entry ) { /* don't give the last arg of a [propput*] func a name */ if(i != num_params - 1 || (invokekind != 0x4 /* INVOKE_PROPERTYPUT */ && invokekind != 0x8 /* INVOKE_PROPERTYPUTREF */)) @@ -1697,8 +1697,8 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) typeinfo->var_offsets[var_num] = offset; /* figure out type widths and whatnot */ - var_datawidth = type_memsize_and_alignment(var->type, &var_alignment); - encode_var(typeinfo->typelib, var->type, var, &typedata[1], &var_type_size); + var_datawidth = type_memsize_and_alignment(var->declspec.type, &var_alignment); + encode_var(typeinfo->typelib, var->declspec.type, var, &typedata[1], &var_type_size); /* pad out starting position to data width */ typeinfo->datawidth += var_alignment - 1; -- 2.17.1

2 21

[PATCH 1/5] wined3d: Use a backup device context for swapchains created on the desktop window.
by Zebediah Figura 20 Jun '19

20 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> This patch was written by "naur". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18490 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/context.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a7aafc96251..bd8a324fc57d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1961,10 +1961,16 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->tid = GetCurrentThreadId(); context_gl->window = context->swapchain->win_handle; - if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) + if (context_gl->window == GetDesktopWindow()) { + TRACE("Swapchain is created on the desktop window, trying backup device context.\n"); + context_gl->dc = NULL; + } + else if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) WARN("Failed to retrieve device context, trying swapchain backup.\n"); + if (!context_gl->dc) + { if (!(context_gl->dc = swapchain_get_backup_dc(context->swapchain))) { ERR("Failed to retrieve a device context.\n"); -- 2.20.1

2 6

[PATCH 1/5] winegstreamer: Use strmbase pin reference counting methods.
by Zebediah Figura 20 Jun '19

20 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 67cfbc02c2c..5e44c92e31c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1683,18 +1683,6 @@ static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void ** return E_NOINTERFACE; } -static ULONG WINAPI GSTOutPin_AddRef(IPin *iface) -{ - GSTOutPin *pin = impl_source_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); -} - -static ULONG WINAPI GSTOutPin_Release(IPin *iface) -{ - GSTOutPin *pin = impl_source_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); -} - static HRESULT WINAPI GSTOutPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) { FIXME("(%p) stub\n", base); @@ -1790,8 +1778,8 @@ static void free_source_pin(GSTOutPin *pin) static const IPinVtbl GST_OutputPin_Vtbl = { GSTOutPin_QueryInterface, - GSTOutPin_AddRef, - GSTOutPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, @@ -1875,18 +1863,6 @@ static inline GSTInPin *impl_sink_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, GSTInPin, pin.IPin_iface); } -static ULONG WINAPI GSTInPin_AddRef(IPin *iface) -{ - GSTInPin *pin = impl_sink_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -static ULONG WINAPI GSTInPin_Release(IPin *iface) -{ - GSTInPin *pin = impl_sink_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pinInfo.pFilter); -} - static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { GSTInPin *This = impl_sink_from_IPin(iface); @@ -2069,8 +2045,8 @@ static HRESULT WINAPI GSTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppE static const IPinVtbl GST_InputPin_Vtbl = { GSTInPin_QueryInterface, - GSTInPin_AddRef, - GSTInPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, GSTInPin_ReceiveConnection, GSTInPin_Disconnect, -- 2.21.0

1 4

[PATCH 03/10] dxgi: Validate that we got a valid window in wined3d_device_setup_fullscreen_window().
by Henri Verbeet 20 Jun '19

20 Jun '19

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166680. dlls/dxgi/tests/dxgi.c | 4 ++-- dlls/wined3d/device.c | 11 ++++++++++- dlls/wined3d/swapchain.c | 4 +++- include/wine/wined3d.h | 3 ++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f5e1b10a746..69c868cf3b4 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2292,7 +2292,7 @@ static void test_set_fullscreen(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); @@ -2310,7 +2310,7 @@ static void test_set_fullscreen(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 81b5a3ab620..4c323f2387c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -926,13 +926,20 @@ static LONG fullscreen_exstyle(LONG exstyle) return exstyle; } -void CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, HWND window, UINT w, UINT h) +HRESULT CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, + HWND window, unsigned int w, unsigned int h) { BOOL filter_messages; LONG style, exstyle; TRACE("Setting up window %p for fullscreen mode.\n", window); + if (!IsWindow(window)) + { + WARN("%p is not a valid window.\n", window); + return WINED3DERR_NOTAVAILABLE; + } + if (device->style || device->exStyle) { ERR("Changing the window style for window %p, but another style (%08x, %08x) is already stored.\n", @@ -956,6 +963,8 @@ void CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); device->filter_messages = filter_messages; + + return WINED3D_OK; } void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 780734112fe..8d6306eee66 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1478,7 +1478,9 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha if (swapchain->desc.windowed) { /* Switch from windowed to fullscreen */ - wined3d_device_setup_fullscreen_window(device, swapchain->device_window, width, height); + if (FAILED(hr = wined3d_device_setup_fullscreen_window(device, + swapchain->device_window, width, height))) + return hr; } else { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a0ff3f13354..abef3f0ad02 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2483,7 +2483,8 @@ HRESULT __cdecl wined3d_device_set_vs_consts_i(struct wined3d_device *device, void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); -void __cdecl wined3d_device_setup_fullscreen_window(struct wined3d_device *device, HWND window, UINT w, UINT h); +HRESULT __cdecl wined3d_device_setup_fullscreen_window(struct wined3d_device *device, + HWND window, unsigned int w, unsigned int h); BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show); void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, -- 2.11.0

2 1

[PATCH 01/10] dxgi: Add tests for setting the fullscreen state of swapchains with destroyed windows.
by Henri Verbeet 20 Jun '19

20 Jun '19

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166680. dlls/dxgi/tests/dxgi.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bff894773a5..f5e1b10a746 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2284,6 +2284,40 @@ static void test_set_fullscreen(void) DestroyWindow(swapchain_desc.OutputWindow); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + DestroyWindow(swapchain_desc.OutputWindow); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + DestroyWindow(swapchain_desc.OutputWindow); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); -- 2.11.0

3 2

[PATCH 10/10] d3drm: Implement d3drm_frame3_Transform().
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166701. dlls/d3drm/frame.c | 35 +++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 81 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 85 insertions(+), 31 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index e31d8142a31..13c9af19a42 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -155,6 +155,17 @@ static void d3drm_matrix_set_rotation(struct d3drm_matrix *matrix, D3DVECTOR *ax matrix->_44 = 1.0f; } +static void d3drm_vector_transform_affine(D3DVECTOR *dst, const D3DVECTOR *v, const struct d3drm_matrix *m) +{ + D3DVECTOR tmp; + + tmp.u1.x = v->u1.x * m->_11 + v->u2.y * m->_21 + v->u3.z * m->_31 + m->_41; + tmp.u2.y = v->u1.x * m->_12 + v->u2.y * m->_22 + v->u3.z * m->_32 + m->_42; + tmp.u3.z = v->u1.x * m->_13 + v->u2.y * m->_23 + v->u3.z * m->_33 + m->_43; + + *dst = tmp; +} + static HRESULT WINAPI d3drm_frame_array_QueryInterface(IDirect3DRMFrameArray *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -2589,23 +2600,35 @@ static HRESULT WINAPI d3drm_frame1_SetZbufferMode(IDirect3DRMFrame *iface, D3DRM static HRESULT WINAPI d3drm_frame3_Transform(IDirect3DRMFrame3 *iface, D3DVECTOR *d, D3DVECTOR *s) { - FIXME("iface %p, d %p, s %p stub!\n", iface, d, s); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, d %p, s %p.\n", iface, d, s); + + d3drm_vector_transform_affine(d, s, &frame->transform); + while ((frame = frame->parent)) + { + d3drm_vector_transform_affine(d, d, &frame->transform); + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_Transform(IDirect3DRMFrame2 *iface, D3DVECTOR *d, D3DVECTOR *s) { - FIXME("iface %p, d %p, s %p stub!\n", iface, d, s); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, d %p, s %p.\n", iface, d, s); + + return d3drm_frame3_Transform(&frame->IDirect3DRMFrame3_iface, d, s); } static HRESULT WINAPI d3drm_frame1_Transform(IDirect3DRMFrame *iface, D3DVECTOR *d, D3DVECTOR *s) { - FIXME("iface %p, d %p, s %p stub!\n", iface, d, s); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, d %p, s %p.\n", iface, d, s); + + return d3drm_frame3_Transform(&frame->IDirect3DRMFrame3_iface, d, s); } static HRESULT WINAPI d3drm_frame2_AddMoveCallback2(IDirect3DRMFrame2 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8b2922afbea..6ac7c35fae4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -86,21 +86,21 @@ static void expect_matrix_(unsigned int line, const D3DRMMATRIX4D m, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44); } -#define check_vector(a, b, c, d, e) check_vector_(__LINE__, a, b, c, d, e) -static void check_vector_(unsigned int line, const D3DVECTOR *v, float x, float y, float z, unsigned int ulps) +#define expect_vector(v, x, y, z, u) expect_vector_(__LINE__, v, x, y, z, u) +static void expect_vector_(unsigned int line, const D3DVECTOR *v, float x, float y, float z, unsigned int ulps) { - BOOL ret = compare_float(U1(v)->x, x, ulps) - && compare_float(U2(v)->y, y, ulps) - && compare_float(U3(v)->z, z, ulps); + BOOL equal = compare_float(U1(*v).x, x, ulps) + && compare_float(U2(*v).y, y, ulps) + && compare_float(U3(*v).z, z, ulps); - ok_(__FILE__, line)(ret, "Got unexpected vector {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", - U1(v)->x, U2(v)->y, U3(v)->z, x, y, z); + ok_(__FILE__, line)(equal, "Got unexpected vector {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", + U1(*v).x, U2(*v).y, U3(*v).z, x, y, z); } #define vector_eq(a, b) vector_eq_(__LINE__, a, b) static void vector_eq_(unsigned int line, const D3DVECTOR *left, const D3DVECTOR *right) { - check_vector_(line, left, U1(right)->x, U2(right)->y, U3(right)->z, 0); + expect_vector_(line, left, U1(*right).x, U2(*right).y, U3(*right).z, 0); } static D3DRMMATRIX4D identity = { @@ -125,6 +125,13 @@ static void frame_set_transform(IDirect3DRMFrame *frame, IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, matrix); } +static void set_vector(D3DVECTOR *v, float x, float y, float z) +{ + U1(*v).x = x; + U2(*v).y = y; + U3(*v).z = z; +} + static void matrix_sanitise(D3DRMMATRIX4D m) { unsigned int i, j; @@ -515,10 +522,10 @@ static void test_MeshBuilder(void) /* Check that Load method generated default normals */ hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL); ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); - check_vector(&n[0], 0.577350f, 0.577350f, 0.577350f, 32); - check_vector(&n[1], -0.229416f, 0.688247f, 0.688247f, 32); - check_vector(&n[2], -0.229416f, 0.688247f, 0.688247f, 32); - check_vector(&n[3], -0.577350f, 0.577350f, 0.577350f, 32); + expect_vector(&n[0], 0.577350f, 0.577350f, 0.577350f, 32); + expect_vector(&n[1], -0.229416f, 0.688247f, 0.688247f, 32); + expect_vector(&n[2], -0.229416f, 0.688247f, 0.688247f, 32); + expect_vector(&n[3], -0.577350f, 0.577350f, 0.577350f, 32); /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ valu = 1.23f; @@ -614,12 +621,12 @@ static void test_MeshBuilder(void) ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1); ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2); ok(val3 == 8, "Wrong number of face data bytes %d (must be 8)\n", val3); - check_vector(&v[0], 0.1f, 0.2f, 0.3f, 32); - check_vector(&v[1], 0.4f, 0.5f, 0.6f, 32); - check_vector(&v[2], 0.7f, 0.8f, 0.9f, 32); - check_vector(&n[0], 1.1f, 1.2f, 1.3f, 32); - check_vector(&n[1], 1.4f, 1.5f, 1.6f, 32); - check_vector(&n[2], 1.7f, 1.8f, 1.9f, 32); + expect_vector(&v[0], 0.1f, 0.2f, 0.3f, 32); + expect_vector(&v[1], 0.4f, 0.5f, 0.6f, 32); + expect_vector(&v[2], 0.7f, 0.8f, 0.9f, 32); + expect_vector(&n[0], 1.1f, 1.2f, 1.3f, 32); + expect_vector(&n[1], 1.4f, 1.5f, 1.6f, 32); + expect_vector(&n[2], 1.7f, 1.8f, 1.9f, 32); ok(f[0] == 3 , "Wrong component f[0] = %d (expected 3)\n", f[0]); ok(f[1] == 0 , "Wrong component f[1] = %d (expected 0)\n", f[1]); ok(f[2] == 0 , "Wrong component f[2] = %d (expected 0)\n", f[2]); @@ -683,13 +690,13 @@ static void test_MeshBuilder(void) ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2); ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1); - check_vector(&v[0], 0.1f * 2, 0.2f * 3, 0.3f * 4, 32); - check_vector(&v[1], 0.4f * 2, 0.5f * 3, 0.6f * 4, 32); - check_vector(&v[2], 0.7f * 2, 0.8f * 3, 0.9f * 4, 32); + expect_vector(&v[0], 0.1f * 2, 0.2f * 3, 0.3f * 4, 32); + expect_vector(&v[1], 0.4f * 2, 0.5f * 3, 0.6f * 4, 32); + expect_vector(&v[2], 0.7f * 2, 0.8f * 3, 0.9f * 4, 32); /* Normals are not affected by Scale */ - check_vector(&n[0], 1.1f, 1.2f, 1.3f, 32); - check_vector(&n[1], 1.4f, 1.5f, 1.6f, 32); - check_vector(&n[2], 1.7f, 1.8f, 1.9f, 32); + expect_vector(&n[0], 1.1f, 1.2f, 1.3f, 32); + expect_vector(&n[1], 1.4f, 1.5f, 1.6f, 32); + expect_vector(&n[2], 1.7f, 1.8f, 1.9f, 32); IDirect3DRMMeshBuilder_Release(pMeshBuilder); @@ -2768,9 +2775,10 @@ cleanup: static void test_frame_transform(void) { + IDirect3DRMFrame *frame, *subframe; D3DRMMATRIX4D matrix, add_matrix; - IDirect3DRMFrame *frame; IDirect3DRM *d3drm; + D3DVECTOR v1, v2; HRESULT hr; hr = Direct3DRMCreate(&d3drm); @@ -3000,6 +3008,29 @@ static void test_frame_transform(void) 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1); + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 4.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 8.0f, 0.0f, + 64.0f, 64.0f, 64.0f, 1.0f); + hr = IDirect3DRM_CreateFrame(d3drm, frame, &subframe); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + frame_set_transform(subframe, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 11.0f, 11.0f, 11.0f, 1.0f); + set_vector(&v1, 3.0f, 5.0f, 7.0f); + + hr = IDirect3DRMFrame_Transform(frame, &v2, &v1); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_vector(&v2, 70.0f, 84.0f, 120.0f, 1); + + hr = IDirect3DRMFrame_Transform(subframe, &v2, &v1); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_vector(&v2, 92.0f, 128.0f, 208.0f, 1); + + IDirect3DRMFrame_Release(subframe); IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.11.0

1 0

[PATCH 09/10] d3drm: Implement d3drm_frame3_AddRotation().
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166702. dlls/d3drm/frame.c | 76 +++++++++++++++++++++++++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 49a5077ed73..e31d8142a31 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -125,6 +125,36 @@ static void d3drm_matrix_multiply_affine(struct d3drm_matrix *dst, *dst = tmp; } +static void d3drm_matrix_set_rotation(struct d3drm_matrix *matrix, D3DVECTOR *axis, float theta) +{ + float sin_theta, cos_theta, vers_theta; + + D3DRMVectorNormalize(axis); + sin_theta = sinf(theta); + cos_theta = cosf(theta); + vers_theta = 1.0f - cos_theta; + + matrix->_11 = vers_theta * axis->u1.x * axis->u1.x + cos_theta; + matrix->_21 = vers_theta * axis->u1.x * axis->u2.y - sin_theta * axis->u3.z; + matrix->_31 = vers_theta * axis->u1.x * axis->u3.z + sin_theta * axis->u2.y; + matrix->_41 = 0.0f; + + matrix->_12 = vers_theta * axis->u2.y * axis->u1.x + sin_theta * axis->u3.z; + matrix->_22 = vers_theta * axis->u2.y * axis->u2.y + cos_theta; + matrix->_32 = vers_theta * axis->u2.y * axis->u3.z - sin_theta * axis->u1.x; + matrix->_42 = 0.0f; + + matrix->_13 = vers_theta * axis->u3.z * axis->u1.x - sin_theta * axis->u2.y; + matrix->_23 = vers_theta * axis->u3.z * axis->u2.y + sin_theta * axis->u1.x; + matrix->_33 = vers_theta * axis->u3.z * axis->u3.z + cos_theta; + matrix->_43 = 0.0f; + + matrix->_14 = 0.0f; + matrix->_24 = 0.0f; + matrix->_34 = 0.0f; + matrix->_44 = 1.0f; +} + static HRESULT WINAPI d3drm_frame_array_QueryInterface(IDirect3DRMFrameArray *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -1149,26 +1179,58 @@ static HRESULT WINAPI d3drm_frame1_AddScale(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddRotation(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e stub!\n", - iface, type, x, y, z, theta); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_matrix m; + D3DVECTOR axis; - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e.\n", iface, type, x, y, z, theta); + + axis.u1.x = x; + axis.u2.y = y; + axis.u3.z = z; + + switch (type) + { + case D3DRMCOMBINE_REPLACE: + d3drm_matrix_set_rotation(&frame->transform, &axis, theta); + break; + + case D3DRMCOMBINE_BEFORE: + d3drm_matrix_set_rotation(&m, &axis, theta); + d3drm_matrix_multiply_affine(&frame->transform, &m, &frame->transform); + break; + + case D3DRMCOMBINE_AFTER: + d3drm_matrix_set_rotation(&m, &axis, theta); + d3drm_matrix_multiply_affine(&frame->transform, &frame->transform, &m); + break; + + default: + FIXME("Unhandled type %#x.\n", type); + return D3DRMERR_BADVALUE; + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_AddRotation(IDirect3DRMFrame2 *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e stub!\n", iface, type, x, y, z, theta); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e.\n", iface, type, x, y, z, theta); + + return d3drm_frame3_AddRotation(&frame->IDirect3DRMFrame3_iface, type, x, y, z, theta); } static HRESULT WINAPI d3drm_frame1_AddRotation(IDirect3DRMFrame *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e stub!\n", iface, type, x, y, z, theta); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e, theta %.8e.\n", iface, type, x, y, z, theta); + + return d3drm_frame3_AddRotation(&frame->IDirect3DRMFrame3_iface, type, x, y, z, theta); } static HRESULT WINAPI d3drm_frame3_AddVisual(IDirect3DRMFrame3 *iface, IUnknown *visual) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 776282ce286..8b2922afbea 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -22,10 +22,12 @@ #include <limits.h> #define COBJMACROS +#define _USE_MATH_DEFINES #include <d3d.h> #include <initguid.h> #include <d3drm.h> #include <d3drmwin.h> +#include <math.h> #include "wine/test.h" @@ -123,6 +125,20 @@ static void frame_set_transform(IDirect3DRMFrame *frame, IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, matrix); } +static void matrix_sanitise(D3DRMMATRIX4D m) +{ + unsigned int i, j; + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + if (m[i][j] > -1e-7f && m[i][j] < 1e-7f) + m[i][j] = 0.0f; + } + } +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -2915,6 +2931,75 @@ static void test_frame_transform(void) 0.0f, 0.0f, 2.0f, 0.0f, 6.0f, 6.0f, 6.0f, 1.0f, 1); + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 1.0f, 0.0f, 0.0f, M_PI_2); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + matrix_sanitise(matrix); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 1); + + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_BEFORE, 1.0f, 0.0f, 0.0f, M_PI_2); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + matrix_sanitise(matrix); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_AFTER, 1.0f, 0.0f, 0.0f, M_PI_2); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + matrix_sanitise(matrix); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.0f, 0.0f, + 3.0f, -3.0f, 3.0f, 1.0f, 1); + + hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 1.0f, M_PI_2); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + matrix_sanitise(matrix); + expect_matrix(matrix, + 0.0f, 1.0f, 0.0f, 0.0f, + -1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 1); + + hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 0.0f, M_PI_2); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + matrix_sanitise(matrix); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 1); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.11.0

1 0

[PATCH 08/10] d3drm: Implement d3drm_frame3_AddScale().
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166700. dlls/d3drm/frame.c | 59 +++++++++++++++++++++++++++++++++++++++++++----- dlls/d3drm/tests/d3drm.c | 45 ++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 7891bd67ee5..49a5077ed73 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1078,25 +1078,72 @@ static HRESULT WINAPI d3drm_frame1_AddTranslation(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddScale(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { - FIXME("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e stub!\n", iface, type, sx, sy, sz); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e.\n", iface, type, sx, sy, sz); + + switch (type) + { + case D3DRMCOMBINE_REPLACE: + frame->transform = identity; + frame->transform._11 = sx; + frame->transform._22 = sy; + frame->transform._33 = sz; + break; + + case D3DRMCOMBINE_BEFORE: + frame->transform._11 *= sx; + frame->transform._12 *= sx; + frame->transform._13 *= sx; + frame->transform._21 *= sy; + frame->transform._22 *= sy; + frame->transform._23 *= sy; + frame->transform._31 *= sz; + frame->transform._32 *= sz; + frame->transform._33 *= sz; + break; + + case D3DRMCOMBINE_AFTER: + frame->transform._11 *= sx; + frame->transform._12 *= sy; + frame->transform._13 *= sz; + frame->transform._21 *= sx; + frame->transform._22 *= sy; + frame->transform._23 *= sz; + frame->transform._31 *= sx; + frame->transform._32 *= sy; + frame->transform._33 *= sz; + frame->transform._41 *= sx; + frame->transform._42 *= sy; + frame->transform._43 *= sz; + break; + + default: + FIXME("Unhandled type %#x.\n", type); + return D3DRMERR_BADVALUE; + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_AddScale(IDirect3DRMFrame2 *iface, D3DRMCOMBINETYPE type, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { - FIXME("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e stub!\n", iface, type, sx, sy, sz); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e.\n", iface, type, sx, sy, sz); + + return d3drm_frame3_AddScale(&frame->IDirect3DRMFrame3_iface, type, sx, sy, sz); } static HRESULT WINAPI d3drm_frame1_AddScale(IDirect3DRMFrame *iface, D3DRMCOMBINETYPE type, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { - FIXME("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e stub!\n", iface, type, sx, sy, sz); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e.\n", iface, type, sx, sy, sz); + + return d3drm_frame3_AddScale(&frame->IDirect3DRMFrame3_iface, type, sx, sy, sz); } static HRESULT WINAPI d3drm_frame3_AddRotation(IDirect3DRMFrame3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f7a81fc519b..776282ce286 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2870,6 +2870,51 @@ static void test_frame_transform(void) 0.0f, 0.0f, 2.0f, 0.0f, 3.0f, 3.0f, 3.0f, 1.0f, 1); + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_REPLACE, 2.0f, 2.0f, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 1); + + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_BEFORE, 2.0f, 2.0f, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_AFTER, 2.0f, 2.0f, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 6.0f, 6.0f, 6.0f, 1.0f, 1); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.11.0

1 0

[PATCH 07/10] d3drm: Implement d3drm_frame3_AddTranslation().
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166699. dlls/d3drm/frame.c | 44 ++++++++++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 9b38a296449..7891bd67ee5 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1022,25 +1022,57 @@ static HRESULT WINAPI d3drm_frame1_AddTransform(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddTranslation(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e stub!\n", iface, type, x, y, z); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e.\n", iface, type, x, y, z); + + switch (type) + { + case D3DRMCOMBINE_REPLACE: + frame->transform = identity; + frame->transform._41 = x; + frame->transform._42 = y; + frame->transform._43 = z; + break; + + case D3DRMCOMBINE_BEFORE: + frame->transform._41 += x * frame->transform._11 + y * frame->transform._21 + z * frame->transform._31; + frame->transform._42 += x * frame->transform._12 + y * frame->transform._22 + z * frame->transform._32; + frame->transform._43 += x * frame->transform._13 + y * frame->transform._23 + z * frame->transform._33; + break; + + case D3DRMCOMBINE_AFTER: + frame->transform._41 += x; + frame->transform._42 += y; + frame->transform._43 += z; + break; + + default: + FIXME("Unhandled type %#x.\n", type); + return D3DRMERR_BADVALUE; + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_AddTranslation(IDirect3DRMFrame2 *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e stub!\n", iface, type, x, y, z); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e.\n", iface, type, x, y, z); + + return d3drm_frame3_AddTranslation(&frame->IDirect3DRMFrame3_iface, type, x, y, z); } static HRESULT WINAPI d3drm_frame1_AddTranslation(IDirect3DRMFrame *iface, D3DRMCOMBINETYPE type, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, type %#x, x %.8e, y %.8e, z %.8e stub!\n", iface, type, x, y, z); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, x %.8e, y %.8e, z %.8e.\n", iface, type, x, y, z); + + return d3drm_frame3_AddTranslation(&frame->IDirect3DRMFrame3_iface, type, x, y, z); } static HRESULT WINAPI d3drm_frame3_AddScale(IDirect3DRMFrame3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index bbec35bc0a2..f7a81fc519b 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2825,6 +2825,51 @@ static void test_frame_transform(void) hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix); ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_REPLACE, 3.0f, 3.0f, 3.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_BEFORE, 3.0f, 3.0f, 3.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 6.0f, 6.0f, 6.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_AFTER, 3.0f, 3.0f, 3.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.11.0

1 0

[PATCH 06/10] d3drm: Validate that the transformation is affine in d3drm_frame3_AddTransform().
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166698. dlls/d3drm/frame.c | 3 +++ dlls/d3drm/tests/d3drm.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index b4c7e995228..9b38a296449 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -974,6 +974,9 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, TRACE("iface %p, type %#x, matrix %p.\n", iface, type, matrix); + if (m->_14 != 0.0f || m->_24 != 0.0f || m->_34 != 0.0f || m->_44 != 1.0f) + return D3DRMERR_BADVALUE; + switch (type) { case D3DRMCOMBINE_REPLACE: diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9494603b990..bbec35bc0a2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2821,6 +2821,10 @@ static void test_frame_transform(void) 0.0f, 0.0f, 2.0f, 0.0f, 3.0f, 3.0f, 3.0f, 1.0f, 1); + add_matrix[3][3] = 2.0f; + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.11.0

1 0

[PATCH 05/10] d3drm: Implement the BEFORE and AFTER frame transform combine types.
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166697. dlls/d3drm/frame.c | 34 +++++++++++++-- dlls/d3drm/tests/d3drm.c | 109 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 133 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 2d32fb51e38..b4c7e995228 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -97,6 +97,34 @@ static inline struct d3drm_animation *impl_from_IDirect3DRMAnimation2(IDirect3DR return CONTAINING_RECORD(iface, struct d3drm_animation, IDirect3DRMAnimation2_iface); } +static void d3drm_matrix_multiply_affine(struct d3drm_matrix *dst, + const struct d3drm_matrix *src1, const struct d3drm_matrix *src2) +{ + struct d3drm_matrix tmp; + + tmp._11 = src1->_11 * src2->_11 + src1->_12 * src2->_21 + src1->_13 * src2->_31; + tmp._12 = src1->_11 * src2->_12 + src1->_12 * src2->_22 + src1->_13 * src2->_32; + tmp._13 = src1->_11 * src2->_13 + src1->_12 * src2->_23 + src1->_13 * src2->_33; + tmp._14 = 0.0f; + + tmp._21 = src1->_21 * src2->_11 + src1->_22 * src2->_21 + src1->_23 * src2->_31; + tmp._22 = src1->_21 * src2->_12 + src1->_22 * src2->_22 + src1->_23 * src2->_32; + tmp._23 = src1->_21 * src2->_13 + src1->_22 * src2->_23 + src1->_23 * src2->_33; + tmp._24 = 0.0f; + + tmp._31 = src1->_31 * src2->_11 + src1->_32 * src2->_21 + src1->_33 * src2->_31; + tmp._32 = src1->_31 * src2->_12 + src1->_32 * src2->_22 + src1->_33 * src2->_32; + tmp._33 = src1->_31 * src2->_13 + src1->_32 * src2->_23 + src1->_33 * src2->_33; + tmp._34 = 0.0f; + + tmp._41 = src1->_41 * src2->_11 + src1->_42 * src2->_21 + src1->_43 * src2->_31 + src2->_41; + tmp._42 = src1->_41 * src2->_12 + src1->_42 * src2->_22 + src1->_43 * src2->_32 + src2->_42; + tmp._43 = src1->_41 * src2->_13 + src1->_42 * src2->_23 + src1->_43 * src2->_33 + src2->_43; + tmp._44 = 1.0f; + + *dst = tmp; +} + static HRESULT WINAPI d3drm_frame_array_QueryInterface(IDirect3DRMFrameArray *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -953,15 +981,15 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, break; case D3DRMCOMBINE_BEFORE: - FIXME("D3DRMCOMBINE_BEFORE not supported yet\n"); + d3drm_matrix_multiply_affine(&frame->transform, m, &frame->transform); break; case D3DRMCOMBINE_AFTER: - FIXME("D3DRMCOMBINE_AFTER not supported yet\n"); + d3drm_matrix_multiply_affine(&frame->transform, &frame->transform, m); break; default: - WARN("Unknown Combine Type %u\n", type); + FIXME("Unhandled type %#x.\n", type); return D3DRMERR_BADVALUE; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index cc4f8fe16a3..9494603b990 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -58,6 +58,32 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +#define expect_matrix(m, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44, u) \ + expect_matrix_(__LINE__, m, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44, u) +static void expect_matrix_(unsigned int line, const D3DRMMATRIX4D m, + float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, + float m31, float m32, float m33, float m34, float m41, float m42, float m43, float m44, + unsigned int ulps) +{ + BOOL equal = compare_float(m[0][0], m11, ulps) && compare_float(m[0][1], m12, ulps) + && compare_float(m[0][2], m13, ulps) && compare_float(m[0][3], m14, ulps) + && compare_float(m[1][0], m21, ulps) && compare_float(m[1][1], m22, ulps) + && compare_float(m[1][2], m23, ulps) && compare_float(m[1][3], m24, ulps) + && compare_float(m[2][0], m31, ulps) && compare_float(m[2][1], m32, ulps) + && compare_float(m[2][2], m33, ulps) && compare_float(m[2][3], m34, ulps) + && compare_float(m[3][0], m41, ulps) && compare_float(m[3][1], m42, ulps) + && compare_float(m[3][2], m43, ulps) && compare_float(m[3][3], m44, ulps); + + ok_(__FILE__, line)(equal, + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, " + "%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e}, " + "expected {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, " + "%.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + m[0][0], m[0][1], m[0][2], m[0][3], m[1][0], m[1][1], m[1][2], m[1][3], + m[2][0], m[2][1], m[2][2], m[2][3], m[3][0], m[3][1], m[3][2], m[3][3], + m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44); +} + #define check_vector(a, b, c, d, e) check_vector_(__LINE__, a, b, c, d, e) static void check_vector_(unsigned int line, const D3DVECTOR *v, float x, float y, float z, unsigned int ulps) { @@ -82,6 +108,21 @@ static D3DRMMATRIX4D identity = { { 0.0f, 0.0f, 0.0f, 1.0f } }; +static void frame_set_transform(IDirect3DRMFrame *frame, + float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, + float m31, float m32, float m33, float m34, float m41, float m42, float m43, float m44) +{ + D3DRMMATRIX4D matrix = + { + {m11, m12, m13, m14}, + {m21, m22, m23, m24}, + {m31, m32, m33, m34}, + {m41, m42, m43, m44}, + }; + + IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, matrix); +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -2711,20 +2752,74 @@ cleanup: static void test_frame_transform(void) { - HRESULT hr; - IDirect3DRM *d3drm; + D3DRMMATRIX4D matrix, add_matrix; IDirect3DRMFrame *frame; - D3DRMMATRIX4D matrix; + IDirect3DRM *d3drm; + HRESULT hr; hr = Direct3DRMCreate(&d3drm); - ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame); - ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMFrame_GetTransform(frame, matrix); - ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetTransform returned hr = %x\n", hr); - ok(!memcmp(matrix, identity, sizeof(D3DRMMATRIX4D)), "Returned matrix is not identity\n"); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 0); + + memcpy(add_matrix, identity, sizeof(add_matrix)); + add_matrix[3][0] = 3.0f; + add_matrix[3][1] = 3.0f; + add_matrix[3][2] = 3.0f; + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_BEFORE, add_matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 6.0f, 6.0f, 6.0f, 1.0f, 1); + + frame_set_transform(frame, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_AFTER, add_matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); -- 2.11.0

1 0

[PATCH 02/10] dxgi: Return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE if setting the fullscreen state failed.
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166680. dlls/dxgi/swapchain.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 030bb67c22d..4f01d9ce024 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -385,18 +385,18 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen swapchain_desc.windowed = !fullscreen; hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, &swapchain_desc, NULL); wined3d_mutex_unlock(); - - if (SUCCEEDED(hr)) + if (FAILED(hr)) { - if (swapchain->target) - IDXGIOutput_Release(swapchain->target); - swapchain->target = target; - return S_OK; + if (target) + IDXGIOutput_Release(target); + return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; } - if (target) - IDXGIOutput_Release(target); - return hr; + if (swapchain->target) + IDXGIOutput_Release(swapchain->target); + swapchain->target = target; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapChain1 *iface, -- 2.11.0

1 0

[PATCH 5/5] wined3d: Use wined3d_texture_gl_load_texture() in texture3d_load_location().
by Henri Verbeet 19 Jun '19

19 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 74 ++------------------------------------------------ 1 file changed, 2 insertions(+), 72 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 52dbe516abd..4b6478537df 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3352,45 +3352,12 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } /* Context activation is done by the caller. */ -static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, BOOL dest_is_srgb) -{ - struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int row_pitch, slice_pitch; - struct wined3d_bo_address data; - struct wined3d_box src_box; - - /* Optimisations are possible, but the effort should be put into either - * implementing EXT_SRGB_DECODE in the driver or finding out why we - * picked the wrong copy for the original upload and fixing that. - * - * Also keep in mind that we want to avoid using resource.heap_memory - * for DEFAULT pool surfaces. */ - WARN_(d3d_perf)("Performing slow rgb/srgb volume transfer.\n"); - data.buffer_object = 0; - if (!(data.addr = heap_alloc(sub_resource->size))) - return; - - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, !dest_is_srgb); - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, dest_is_srgb); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); - - heap_free(data.addr); -} - -/* Context activation is done by the caller. */ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int row_pitch, slice_pitch; if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; @@ -3399,43 +3366,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in { case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: - if (sub_resource->locations & WINED3D_LOCATION_SYSMEM) - { - struct wined3d_const_bo_address data = {0, texture->resource.heap_memory}; - struct wined3d_box src_box; - - data.addr += sub_resource->offset; - wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); - } - else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) - { - struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; - struct wined3d_box src_box; - - wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); - } - else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - { - texture3d_srgb_transfer(texture, sub_resource_idx, context, TRUE); - } - else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_SRGB) - { - texture3d_srgb_transfer(texture, sub_resource_idx, context, FALSE); - } - else - { - FIXME("Implement texture loading from %s.\n", wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; + return wined3d_texture_gl_load_texture(texture_gl, sub_resource_idx, + context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: @@ -3446,8 +3378,6 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_debug_location(sub_resource->locations)); return FALSE; } - - return TRUE; } static const struct wined3d_texture_ops texture3d_ops = -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to destroy_dummy_textures().
by Henri Verbeet 19 Jun '19

19 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 81b5a3ab620..768375d837a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -812,10 +812,11 @@ static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *de } /* Context activation is done by the caller. */ -static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) +static void wined3d_device_gl_destroy_dummy_textures(struct wined3d_device_gl *device_gl, + struct wined3d_context_gl *context_gl) { - struct wined3d_dummy_textures *dummy_textures = &wined3d_device_gl(device)->dummy_textures; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_dummy_textures *dummy_textures = &device_gl->dummy_textures; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) { @@ -1054,9 +1055,13 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) { struct wined3d_resource *resource, *cursor; struct wined3d_device *device = object; + struct wined3d_context_gl *context_gl; + struct wined3d_device_gl *device_gl; struct wined3d_context *context; struct wined3d_shader *shader; + device_gl = wined3d_device_gl(device); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { TRACE("Unloading resource %p.\n", resource); @@ -1069,9 +1074,10 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) } context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); device->blitter->ops->blitter_destroy(device->blitter, context); device->shader_backend->shader_free_private(device, context); - destroy_dummy_textures(device, context); + wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); destroy_default_samplers(device, context); context_release(context); -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_draw_textured_quad().
by Henri Verbeet 19 Jun '19

19 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 9 ++++----- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 29908b8bae9..89f9b5a10a2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7915,7 +7915,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl arbfp_blit_set(arbfp_blitter, context_gl, src_texture_gl, src_sub_resource_idx, color_key); /* Draw a textured quad */ - context_draw_textured_quad(context, src_texture_gl, + wined3d_context_gl_draw_textured_quad(context_gl, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); /* Leave the opengl state valid for blitting */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e74ec692ba9..5b293b46c09 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5669,12 +5669,11 @@ void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, } /* Context activation is done by the caller. */ -void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, - unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, - enum wined3d_texture_filter_type filter) +void wined3d_context_gl_draw_textured_quad(struct wined3d_context_gl *context_gl, + struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, + const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_blt_info info; unsigned int level; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a28a4277ab4..6d3590b3d13 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2089,7 +2089,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit checkGLcall("glAlphaFunc"); } - context_draw_textured_quad(context, src_texture_gl, + wined3d_context_gl_draw_textured_quad(context_gl, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea0096cd845..8e23653024b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2093,6 +2093,9 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_ void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +void wined3d_context_gl_draw_textured_quad(struct wined3d_context_gl *context_gl, + struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, + const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t mask) DECLSPEC_HIDDEN; void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; @@ -2257,9 +2260,6 @@ BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; -void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, - unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, - enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_draw_shaded_quad().
by Henri Verbeet 19 Jun '19

19 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 5 ++--- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e722944b995..e74ec692ba9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5584,12 +5584,11 @@ static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, stru } /* Context activation is done by the caller. */ -void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, +void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_blt_info info; unsigned int level, w, h, i; SIZE dst_size; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 326733d51c4..c1f9d4cfe70 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13085,7 +13085,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli location = GL_EXTCALL(glGetUniformLocation(program->id, "colour_key.high")); GL_EXTCALL(glUniform4fv(location, 1, &float_key[1].r)); } - context_draw_shaded_quad(context, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); + wined3d_context_gl_draw_shaded_quad(context_gl, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); GL_EXTCALL(glUseProgram(0)); if (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 51a4f64d192..ea0096cd845 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2090,6 +2090,9 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, + unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, + enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t mask) DECLSPEC_HIDDEN; void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; @@ -2254,9 +2257,6 @@ BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; -void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, - unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, - enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_unload_numbered_arrays().
by Henri Verbeet 19 Jun '19

19 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c88e2b391f4..e722944b995 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5315,14 +5315,14 @@ static void wined3d_context_gl_unload_numbered_array(struct wined3d_context_gl * context_gl->c.numbered_array_mask &= ~(1u << i); } -static void context_unload_numbered_arrays(struct wined3d_context *context) +static void wined3d_context_gl_unload_numbered_arrays(struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + uint32_t mask = context_gl->c.numbered_array_mask; unsigned int i; - while (context->numbered_array_mask) + while (mask) { - i = wined3d_bit_scan(&context->numbered_array_mask); + i = wined3d_bit_scan(&mask); wined3d_context_gl_unload_numbered_array(context_gl, i); } } @@ -5555,7 +5555,7 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context } TRACE("Loading named arrays.\n"); - context_unload_numbered_arrays(&context_gl->c); + wined3d_context_gl_unload_numbered_arrays(context_gl); wined3d_context_gl_load_vertex_data(context_gl, &context_gl->c.stream_info, state); context_gl->c.namedArraysLoaded = TRUE; } @@ -5635,7 +5635,7 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo)); wined3d_context_gl_unload_vertex_data(context_gl); - context_unload_numbered_arrays(context); + wined3d_context_gl_unload_numbered_arrays(context_gl); GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW)); GL_EXTCALL(glVertexAttribPointer(0, 2, GL_FLOAT, FALSE, sizeof(*quad), NULL)); -- 2.11.0

1 0

[PATCH] kernel32: Link against RT_LIBS.
by Andrew Eikum 19 Jun '19

19 Jun '19

Fixes linking against glibc < 2.17 where clock_gettime needs -lrt. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 2c0bbc93244..981b8b2520f 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_KERNEL32_ -D_NORMALIZE_ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = winecrt0 ntdll -EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) +EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) $(RT_LIBS) EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b400000 C_SRCS = \ -- 2.22.0

1 0

[PATCH] winebuild: Use the now available ARRAY_SIZE() macro
by Michael Stefaniuc 19 Jun '19

19 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winebuild/main.c | 2 +- tools/winebuild/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index d3087160fc..253957788a 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -225,7 +225,7 @@ static void set_target( const char *target ) /* get the OS part */ target_platform = PLATFORM_UNSPECIFIED; /* default value */ - for (i = 0; i < sizeof(platform_names)/sizeof(platform_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(platform_names); i++) { if (!strncmp( platform_names[i].name, platform, strlen(platform_names[i].name) )) { diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index dbfe7a4ba7..31a6b28371 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -943,7 +943,7 @@ int get_cpu_from_name( const char *name ) { unsigned int i; - for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(cpu_names); i++) if (!strcmp( cpu_names[i].name, name )) return cpu_names[i].cpu; return -1; } -- 2.20.1

1 0

[PATCH v3] mshtml: Add support for DIID_HTMLDocumentEvents2 connection point sink.
by Dmitry Timoshkov 19 Jun '19

19 Jun '19

This patch makes event handling work in a fairly large and complex application. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmldoc.c | 3 +- dlls/mshtml/htmlevent.c | 2 ++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/events.c | 58 ++++++++++++++++++++++++++++++------ 4 files changed, 54 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 54787f03b7..af99d643ac 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5216,12 +5216,13 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) } static cp_static_data_t HTMLDocumentEvents_data = { HTMLDocumentEvents_tid, HTMLDocument_on_advise }; +static cp_static_data_t HTMLDocumentEvents2_data = { HTMLDocumentEvents2_tid, HTMLDocument_on_advise, TRUE }; static const cpc_entry_t HTMLDocument_cpc[] = { {&IID_IDispatch, &HTMLDocumentEvents_data}, {&IID_IPropertyNotifySink}, {&DIID_HTMLDocumentEvents, &HTMLDocumentEvents_data}, - {&DIID_HTMLDocumentEvents2}, + {&DIID_HTMLDocumentEvents2, &HTMLDocumentEvents2_data}, {NULL} }; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b090d1c828..4cf994587f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2412,6 +2412,8 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event ULONG argerr; EXCEPINFO ei; + TRACE("%p,%d,%p,%p\n", disp, dispid, event_obj, retv); + if(event_obj) { V_VT(&event_arg) = VT_DISPATCH; V_DISPATCH(&event_arg) = (IDispatch*)event_obj; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a36da94e43..6bfce89698 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -136,6 +136,7 @@ typedef struct EventTarget EventTarget; XDIID(DispSVGSVGElement) \ XDIID(DispSVGTSpanElement) \ XDIID(HTMLDocumentEvents) \ + XDIID(HTMLDocumentEvents2) \ XDIID(HTMLElementEvents2) \ XIID(IDOMCustomEvent) \ XIID(IDOMEvent) \ diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index f9bf88e97c..4ef58df514 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -66,6 +66,7 @@ DEFINE_EXPECT(div_onclick_capture); DEFINE_EXPECT(div_onclick_bubble); DEFINE_EXPECT(timeout); DEFINE_EXPECT(doccp_onclick); +DEFINE_EXPECT(doccp2_onclick); DEFINE_EXPECT(doccp_onclick_cancel); DEFINE_EXPECT(div_onclick_disp); DEFINE_EXPECT(invoke_onclick); @@ -1440,14 +1441,28 @@ EVENT_HANDLER_FUNC_OBJ(nocall); }; \ static IDispatchEx cpname ## _obj = { &cpname ## Vtbl } -#define test_cp_args(a,b,c,d,e,f) _test_cp_args(__LINE__,a,b,c,d,e,f) -static void _test_cp_args(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp, VARIANT *vres, EXCEPINFO *ei, UINT *argerr) +#define test_cp_args(a,b,c,d,e,f,g) _test_cp_args(__LINE__,a,b,c,d,e,f,g) +static void _test_cp_args(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp, VARIANT *vres, EXCEPINFO *ei, UINT *argerr, BOOL use_events2) { ok_(__FILE__,line)(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", wine_dbgstr_guid(riid)); ok_(__FILE__,line)(flags == DISPATCH_METHOD, "flags = %x\n", flags); ok_(__FILE__,line)(dp != NULL, "dp == NULL\n"); - ok_(__FILE__,line)(!dp->cArgs, "dp->cArgs = %d\n", dp->cArgs); - ok_(__FILE__,line)(!dp->rgvarg, "dp->rgvarg = %p\n", dp->rgvarg); + if (use_events2) + { + IHTMLEventObj *event; + HRESULT hr; + ok_(__FILE__,line)(dp->cArgs == 1, "dp->cArgs = %d\n", dp->cArgs); + ok_(__FILE__,line)(dp->rgvarg != NULL, "dp->rgvarg = %p\n", dp->rgvarg); + ok_(__FILE__,line)(V_VT(&dp->rgvarg[0]) == VT_DISPATCH, "vt = %d\n", V_VT(&dp->rgvarg[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&dp->rgvarg[0]), &IID_IHTMLEventObj, (void **)&event); + ok_(__FILE__,line)(hr == S_OK, "Could not get IHTMLEventObj iface: %08x\n", hr); + IHTMLEventObj_Release(event); + } + else + { + ok_(__FILE__,line)(!dp->cArgs, "dp->cArgs = %d\n", dp->cArgs); + ok_(__FILE__,line)(!dp->rgvarg, "dp->rgvarg = %p\n", dp->rgvarg); + } ok_(__FILE__,line)(!dp->cNamedArgs, "dp->cNamedArgs = %d\n", dp->cNamedArgs); ok_(__FILE__,line)(!dp->rgdispidNamedArgs, "dp->rgdispidNamedArgs = %p\n", dp->rgdispidNamedArgs); ok_(__FILE__,line)(vres != NULL, "vres == NULL\n"); @@ -1489,7 +1504,7 @@ static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, switch(dispIdMember) { case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: CHECK_EXPECT(doccp_onclick); - test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr); + test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr, FALSE); break; default: ok(0, "unexpected call %d\n", dispIdMember); @@ -1501,13 +1516,32 @@ static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, CONNECTION_POINT_OBJ(doccp, DIID_HTMLDocumentEvents); +static HRESULT WINAPI doccp2(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) +{ + switch(dispIdMember) { + case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: + CHECK_EXPECT(doccp2_onclick); + test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr, TRUE); + break; + default: + ok(0, "unexpected call %d\n", dispIdMember); + return E_NOTIMPL; + } + + return S_OK; +} + +CONNECTION_POINT_OBJ(doccp2, DIID_HTMLDocumentEvents2); + static HRESULT WINAPI doccp_onclick_cancel(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) { switch(dispIdMember) { case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: CHECK_EXPECT(doccp_onclick_cancel); - test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr); + test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr, FALSE); V_VT(pVarResult) = VT_BOOL; V_BOOL(pVarResult) = VARIANT_FALSE; break; @@ -1788,7 +1822,7 @@ static void set_body_html(IHTMLDocument2 *doc, const char *html) static void test_onclick(IHTMLDocument2 *doc) { - DWORD cp_cookie, elem2_cp_cookie; + DWORD events_cp_cookie, events2_cp_cookie, elem2_cp_cookie; IHTMLElement *div, *body; VARIANT v; HRESULT hres; @@ -1936,7 +1970,8 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); CHECK_CALLED(invoke_onclick); - cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); + events_cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); + events2_cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents2, (IUnknown*)&doccp2_obj); elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); doc_attach_event(doc, "onclick", (IDispatch*)&doc_onclick_attached_obj); @@ -1951,6 +1986,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(document_onclick); SET_EXPECT(doc_onclick_attached); SET_EXPECT(doccp_onclick); + SET_EXPECT(doccp2_onclick); SET_EXPECT(invoke_onclick); hres = IHTMLElement_click(div); @@ -1967,6 +2003,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); CHECK_CALLED(doc_onclick_attached); CHECK_CALLED(doccp_onclick); + CHECK_CALLED(doccp2_onclick); CHECK_CALLED(invoke_onclick); elem2_cp_cookie = register_cp((IUnknown*)div, &DIID_HTMLElementEvents2, (IUnknown*)&elem2_cp_obj); @@ -1983,6 +2020,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(document_onclick); SET_EXPECT(doc_onclick_attached); SET_EXPECT(doccp_onclick); + SET_EXPECT(doccp2_onclick); SET_EXPECT(invoke_onclick); trace("click >>>\n"); @@ -2002,10 +2040,12 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); CHECK_CALLED(doc_onclick_attached); CHECK_CALLED(doccp_onclick); + CHECK_CALLED(doccp2_onclick); CHECK_CALLED(invoke_onclick); unregister_cp((IUnknown*)div, &DIID_HTMLElementEvents2, elem2_cp_cookie); - unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); + unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, events_cp_cookie); + unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents2, events2_cp_cookie); V_VT(&v) = VT_NULL; hres = IHTMLElement_put_onclick(div, v); -- 2.20.1

2 2

[PATCH v2] mshtml: Add support for DIID_HTMLDocumentEvents2 connection point sink.
by Dmitry Timoshkov 19 Jun '19

19 Jun '19

This patch makes event handling work in a fairly large and complex application. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmldoc.c | 3 +- dlls/mshtml/htmlevent.c | 2 ++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/events.c | 55 ++++++++++++++++++++++++++++++++---- 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 54787f03b7..af99d643ac 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5216,12 +5216,13 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) } static cp_static_data_t HTMLDocumentEvents_data = { HTMLDocumentEvents_tid, HTMLDocument_on_advise }; +static cp_static_data_t HTMLDocumentEvents2_data = { HTMLDocumentEvents2_tid, HTMLDocument_on_advise, TRUE }; static const cpc_entry_t HTMLDocument_cpc[] = { {&IID_IDispatch, &HTMLDocumentEvents_data}, {&IID_IPropertyNotifySink}, {&DIID_HTMLDocumentEvents, &HTMLDocumentEvents_data}, - {&DIID_HTMLDocumentEvents2}, + {&DIID_HTMLDocumentEvents2, &HTMLDocumentEvents2_data}, {NULL} }; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b090d1c828..4cf994587f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2412,6 +2412,8 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event ULONG argerr; EXCEPINFO ei; + TRACE("%p,%d,%p,%p\n", disp, dispid, event_obj, retv); + if(event_obj) { V_VT(&event_arg) = VT_DISPATCH; V_DISPATCH(&event_arg) = (IDispatch*)event_obj; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a36da94e43..6bfce89698 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -136,6 +136,7 @@ typedef struct EventTarget EventTarget; XDIID(DispSVGSVGElement) \ XDIID(DispSVGTSpanElement) \ XDIID(HTMLDocumentEvents) \ + XDIID(HTMLDocumentEvents2) \ XDIID(HTMLElementEvents2) \ XIID(IDOMCustomEvent) \ XIID(IDOMEvent) \ diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index f9bf88e97c..a1cc1c9efd 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -93,7 +93,7 @@ DEFINE_EXPECT(iframe_onload); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; static IOleDocumentView *view; -static BOOL is_ie9plus; +static BOOL is_ie9plus, use_events2; static int document_mode; static unsigned in_fire_event; @@ -1446,8 +1446,22 @@ static void _test_cp_args(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp ok_(__FILE__,line)(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", wine_dbgstr_guid(riid)); ok_(__FILE__,line)(flags == DISPATCH_METHOD, "flags = %x\n", flags); ok_(__FILE__,line)(dp != NULL, "dp == NULL\n"); - ok_(__FILE__,line)(!dp->cArgs, "dp->cArgs = %d\n", dp->cArgs); - ok_(__FILE__,line)(!dp->rgvarg, "dp->rgvarg = %p\n", dp->rgvarg); + if (use_events2) + { + IHTMLEventObj *event; + HRESULT hr; + ok_(__FILE__,line)(dp->cArgs == 1, "dp->cArgs = %d\n", dp->cArgs); + ok_(__FILE__,line)(dp->rgvarg != NULL, "dp->rgvarg = %p\n", dp->rgvarg); + ok_(__FILE__,line)(V_VT(&dp->rgvarg[0]) == VT_DISPATCH, "vt = %d\n", V_VT(&dp->rgvarg[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&dp->rgvarg[0]), &IID_IHTMLEventObj, (void **)&event); + ok_(__FILE__,line)(hr == S_OK, "Could not get IHTMLEventObj iface: %08x\n", hr); + IHTMLEventObj_Release(event); + } + else + { + ok_(__FILE__,line)(!dp->cArgs, "dp->cArgs = %d\n", dp->cArgs); + ok_(__FILE__,line)(!dp->rgvarg, "dp->rgvarg = %p\n", dp->rgvarg); + } ok_(__FILE__,line)(!dp->cNamedArgs, "dp->cNamedArgs = %d\n", dp->cNamedArgs); ok_(__FILE__,line)(!dp->rgdispidNamedArgs, "dp->rgdispidNamedArgs = %p\n", dp->rgdispidNamedArgs); ok_(__FILE__,line)(vres != NULL, "vres == NULL\n"); @@ -1501,6 +1515,25 @@ static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, CONNECTION_POINT_OBJ(doccp, DIID_HTMLDocumentEvents); +static HRESULT WINAPI doccp2(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) +{ + switch(dispIdMember) { + case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: + CHECK_EXPECT(doccp_onclick); + test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr); + break; + default: + ok(0, "unexpected call %d\n", dispIdMember); + return E_NOTIMPL; + } + + return S_OK; +} + +CONNECTION_POINT_OBJ(doccp2, DIID_HTMLDocumentEvents2); + static HRESULT WINAPI doccp_onclick_cancel(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) { @@ -1936,7 +1969,10 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); CHECK_CALLED(invoke_onclick); - cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); + if (use_events2) + cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents2, (IUnknown*)&doccp2_obj); + else + cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); doc_attach_event(doc, "onclick", (IDispatch*)&doc_onclick_attached_obj); @@ -2005,7 +2041,10 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(invoke_onclick); unregister_cp((IUnknown*)div, &DIID_HTMLElementEvents2, elem2_cp_cookie); - unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); + if (use_events2) + unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents2, cp_cookie); + else + unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); V_VT(&v) = VT_NULL; hres = IHTMLElement_put_onclick(div, v); @@ -3452,6 +3491,12 @@ START_TEST(events) run_test(empty_doc_str, test_timeout); run_test(empty_doc_str, test_onclick); run_test(empty_doc_ie9_str, test_onclick); + + use_events2 = TRUE; + run_test(empty_doc_str, test_onclick); + run_test(empty_doc_ie9_str, test_onclick); + use_events2 = FALSE; + run_test(readystate_doc_str, test_onreadystatechange); run_test(readystate_doc_ie9_str, test_onreadystatechange); run_test(img_doc_str, test_imgload); -- 2.20.1

2 1

[PATCH] mshtml: Add support for DIID_HTMLDocumentEvents2 connection point sink.
by Dmitry Timoshkov 19 Jun '19

19 Jun '19

This patch makes event handling work in a fairly large and complex application. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmldoc.c | 3 ++- dlls/mshtml/htmlevent.c | 2 ++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 04efb11819..3f301e52d0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5216,12 +5216,13 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) } static cp_static_data_t HTMLDocumentEvents_data = { HTMLDocumentEvents_tid, HTMLDocument_on_advise }; +static cp_static_data_t HTMLDocumentEvents2_data = { HTMLDocumentEvents2_tid, HTMLDocument_on_advise, TRUE }; static const cpc_entry_t HTMLDocument_cpc[] = { {&IID_IDispatch, &HTMLDocumentEvents_data}, {&IID_IPropertyNotifySink}, {&DIID_HTMLDocumentEvents, &HTMLDocumentEvents_data}, - {&DIID_HTMLDocumentEvents2}, + {&DIID_HTMLDocumentEvents2, &HTMLDocumentEvents2_data}, {NULL} }; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b090d1c828..4cf994587f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2412,6 +2412,8 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event ULONG argerr; EXCEPINFO ei; + TRACE("%p,%d,%p,%p\n", disp, dispid, event_obj, retv); + if(event_obj) { V_VT(&event_arg) = VT_DISPATCH; V_DISPATCH(&event_arg) = (IDispatch*)event_obj; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6c25cc828c..4c1d8db405 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -136,6 +136,7 @@ typedef struct EventTarget EventTarget; XDIID(DispSVGSVGElement) \ XDIID(DispSVGTSpanElement) \ XDIID(HTMLDocumentEvents) \ + XDIID(HTMLDocumentEvents2) \ XDIID(HTMLElementEvents2) \ XIID(IDOMCustomEvent) \ XIID(IDOMEvent) \ -- 2.20.1

3 2

[PATCH 4/5] wined3d: Do not acquire/release the focus window in wined3d_swapchain_set_fullscreen().
by Henri Verbeet 19 Jun '19

19 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 2 -- dlls/wined3d/device.c | 25 +++++++++++++++++++++---- dlls/wined3d/swapchain.c | 10 ---------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index c5e500692cc..d0581223a6a 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4685,7 +4685,6 @@ static void test_swapchain_window_messages(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); flush_events(); - todo_wine ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); expect_messages = NULL; @@ -4717,7 +4716,6 @@ static void test_swapchain_window_messages(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); flush_events(); - todo_wine ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); expect_messages = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 897e2f6087b..09e3da31854 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5405,7 +5405,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_rendertarget_view *view; struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; - BOOL backbuffer_resized; + BOOL backbuffer_resized, windowed; HRESULT hr = WINED3D_OK; unsigned int i; @@ -5496,13 +5496,30 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, backbuffer_resized = swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height; + windowed = swapchain->desc.windowed; - if (!swapchain_desc->windowed != !swapchain->desc.windowed - || swapchain->reapply_mode || mode - || (!swapchain_desc->windowed && backbuffer_resized)) + if (!swapchain_desc->windowed != !windowed || swapchain->reapply_mode + || mode || (!swapchain_desc->windowed && backbuffer_resized)) { + /* Switch from windowed to fullscreen. */ + if (windowed && !swapchain_desc->windowed) + { + HWND focus_window = device->create_parms.focus_window; + + if (!focus_window) + focus_window = swapchain->device_window; + if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) + { + ERR("Failed to acquire focus window, hr %#x.\n", hr); + return hr; + } + } if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain, swapchain_desc, mode))) return hr; + + /* Switch from fullscreen to windowed. */ + if (!windowed && swapchain_desc->windowed) + wined3d_device_release_focus_window(device); } else if (!swapchain_desc->windowed) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dd9ec123c20..e4882bd4007 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1474,15 +1474,6 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha if (swapchain->desc.windowed) { /* Switch from windowed to fullscreen */ - HWND focus_window = device->create_parms.focus_window; - if (!focus_window) - focus_window = swapchain->device_window; - if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) - { - ERR("Failed to acquire focus window, hr %#x.\n", hr); - return hr; - } - wined3d_device_setup_fullscreen_window(device, swapchain->device_window, width, height); } else @@ -1505,7 +1496,6 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) window_rect = &swapchain->original_window_rect; wined3d_device_restore_fullscreen_window(device, swapchain->device_window, window_rect); - wined3d_device_release_focus_window(device); } swapchain->desc.windowed = swapchain_desc->windowed; -- 2.11.0

2 1

[PATCH 2/5] dxgi: Implement dxgi_factory_GetWindowAssociation().
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 165256. dlls/dxgi/factory.c | 10 ++++++++-- dlls/dxgi/tests/dxgi.c | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 52c145bc6a8..6912fc180ea 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -181,9 +181,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFac static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) { - FIXME("iface %p, window %p stub!\n", iface, window); + TRACE("iface %p, window %p.\n", iface, window); - return E_NOTIMPL; + if (!window) + return DXGI_ERROR_INVALID_CALL; + + /* The tests show that this always returns NULL for some unknown reason. */ + *window = NULL; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d123e403ca4..c5e500692cc 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5064,7 +5064,7 @@ static void test_window_association(void) refcount = IDXGIAdapter_Release(adapter); hr = IDXGIFactory_GetWindowAssociation(factory, NULL); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); for (i = 0; i <= DXGI_MWA_VALID; ++i) { @@ -5080,11 +5080,11 @@ static void test_window_association(void) hwnd = (HWND)0xdeadbeef; hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); /* Apparently GetWindowAssociation() always returns NULL, even when * MakeWindowAssociation() and GetWindowAssociation() are both * successfully called. */ - todo_wine ok(!hwnd, "Expect null associated window.\n"); + ok(!hwnd, "Expect null associated window.\n"); } hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1); -- 2.11.0

2 1

[PATCH 1/5] dxgi/tests: Add window association tests.
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 165259. dlls/dxgi/tests/dxgi.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 79e4bc0c15c..d123e403ca4 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4985,6 +4985,185 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_window_association(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + LONG_PTR original_wndproc, wndproc; + IDXGIFactory *factory, *factory2; + IDXGISwapChain *swapchain; + IDXGIAdapter *adapter; + IDXGIDevice *device; + HWND hwnd, hwnd2; + BOOL fullscreen; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct + { + UINT flag; + BOOL expect_fullscreen; + BOOL broken_d3d10; + } + tests[] = + { + /* There are two reasons why VK_TAB and VK_ESC are not tested here: + * + * - Posting them to the window doesn't exit fullscreen like + * Alt+Enter does. Alt+Tab and Alt+Esc are handled somewhere else. + * E.g., not calling IDXGISwapChain::Present() will break Alt+Tab + * and Alt+Esc while Alt+Enter will still function. + * + * - Posting them hangs the posting thread. Another thread that keeps + * sending input is needed to avoid the hang. The hang is not + * because of flush_events(). */ + {0, TRUE}, + {0, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, + {0, TRUE}, + {0, FALSE} + }; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + swapchain_desc.BufferDesc.Width = 640; + swapchain_desc.BufferDesc.Height = 480; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + original_wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + + hwnd2 = CreateWindowA("static", "dxgi_test2", 0, 0, 0, 400, 200, 0, 0, 0, 0); + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGIAdapter_Release(adapter); + + hr = IDXGIFactory_GetWindowAssociation(factory, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i <= DXGI_MWA_VALID; ++i) + { + hr = IDXGIFactory_MakeWindowAssociation(factory, NULL, i); + ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, i); + ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + ok(wndproc == original_wndproc, "Got unexpected wndproc %#lx, expected %#lx for flags %#x.\n", + wndproc, original_wndproc, i); + + hwnd = (HWND)0xdeadbeef; + hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + /* Apparently GetWindowAssociation() always returns NULL, even when + * MakeWindowAssociation() and GetWindowAssociation() are both + * successfully called. */ + todo_wine ok(!hwnd, "Expect null associated window.\n"); + } + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + /* Alt+Enter tests. */ + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + ok(wndproc == original_wndproc, "Got unexpected wndproc %#lx, expected %#lx.\n", wndproc, original_wndproc); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Windows 7 testbot */, + "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not change fullscreen state.\n"); + } + else + { + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + /* First associate a window with the opposite flags. */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, ~tests[i].flag & DXGI_MWA_VALID); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Associate the current test window. */ + hwnd = tests[i].flag ? swapchain_desc.OutputWindow : NULL; + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd, tests[i].flag); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Associating a new test window doesn't override the old window. */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, ~tests[i].flag & DXGI_MWA_VALID); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Associations with a different factory don't affect the existing + * association. */ + hr = IDXGIFactory_MakeWindowAssociation(factory2, hwnd, ~tests[i].flag & DXGI_MWA_VALID); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Post synthesized Alt + VK_RETURN WM_SYSKEYDOWN. */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(tests[i].expect_fullscreen) + ok(fullscreen == tests[i].expect_fullscreen + || broken(tests[i].broken_d3d10 && fullscreen), + "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); + + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + ok(wndproc == original_wndproc, "Text %u: Got unexpected wndproc %#lx, expected %#lx.\n", + i, wndproc, original_wndproc); + } + } + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = IDXGIFactory_Release(factory2); + ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(hwnd2); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -5084,6 +5263,7 @@ START_TEST(dxgi) test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); + test_window_association(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); -- 2.11.0

2 1

[PATCH 5/5] dxgi: Implement Alt+Enter handling.
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patches 165255 and 165258. dlls/dxgi/factory.c | 16 ++- dlls/dxgi/tests/dxgi.c | 9 +- dlls/dxgi/utils.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 4 + dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_main.c | 293 +++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 3 +- include/wine/wined3d.h | 8 ++ 9 files changed, 291 insertions(+), 48 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 6912fc180ea..a0038b4fe77 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -174,7 +174,21 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, HWND window, UINT flags) { - FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); + struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); + + TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags); + + if (flags > DXGI_MWA_VALID) + return DXGI_ERROR_INVALID_CALL; + + if (!window) + { + wined3d_unregister_windows(factory->wined3d); + return S_OK; + } + + if (!wined3d_register_window(factory->wined3d, window, NULL, flags)) + return E_FAIL; return S_OK; } diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d0581223a6a..bff894773a5 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5086,7 +5086,7 @@ static void test_window_association(void) } hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); /* Alt+Enter tests. */ hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); @@ -5134,10 +5134,9 @@ static void test_window_association(void) flush_events(); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(tests[i].expect_fullscreen) - ok(fullscreen == tests[i].expect_fullscreen - || broken(tests[i].broken_d3d10 && fullscreen), - "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); + ok(fullscreen == tests[i].expect_fullscreen + || broken(tests[i].broken_d3d10 && fullscreen), + "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); ok(wndproc == original_wndproc, "Text %u: Got unexpected wndproc %#lx, expected %#lx.\n", diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 23f5188b011..be94bde8478 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -511,7 +511,7 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) } #define DXGI_WINED3D_SWAPCHAIN_FLAGS \ - (WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) + (WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT | WINED3D_SWAPCHAIN_HOOK) unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 09e3da31854..81b5a3ab620 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1015,7 +1015,7 @@ HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, { TRACE("device %p, window %p.\n", device, window); - if (!wined3d_register_window(window, device)) + if (!wined3d_register_window(NULL, window, device, 0)) { ERR("Failed to register window %p.\n", window); return E_FAIL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e4882bd4007..780734112fe 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -121,6 +121,7 @@ ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) device = swapchain->device; if (device->swapchain_count && device->swapchains[0] == swapchain) wined3d_device_uninit_3d(device); + wined3d_unhook_swapchain(swapchain); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain_cleanup(swapchain); @@ -1037,6 +1038,9 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win return hr; } + if (desc->flags & WINED3D_SWAPCHAIN_HOOK) + wined3d_hook_swapchain(object); + if (desc->flags & WINED3D_SWAPCHAIN_IMPLICIT) { wined3d_mutex_lock(); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 040b9fc4ac1..59f99c91e07 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -20,7 +20,9 @@ @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) +@ cdecl wined3d_register_window(ptr ptr ptr long) @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) +@ cdecl wined3d_unregister_windows(ptr) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 180e2d262e2..716a2b088c8 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -33,20 +33,47 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); struct wined3d_wndproc { + struct wined3d *wined3d; HWND window; BOOL unicode; WNDPROC proc; struct wined3d_device *device; + uint32_t flags; }; struct wined3d_wndproc_table { struct wined3d_wndproc *entries; - unsigned int count; + SIZE_T count; SIZE_T size; }; +struct wined3d_window_hook +{ + HHOOK hook; + DWORD thread_id; + unsigned int count; +}; + +struct wined3d_hooked_swapchain +{ + struct wined3d_swapchain *swapchain; + DWORD thread_id; +}; + +struct wined3d_hook_table +{ + struct wined3d_window_hook *hooks; + SIZE_T hooks_size; + SIZE_T hook_count; + + struct wined3d_hooked_swapchain *swapchains; + SIZE_T swapchains_size; + SIZE_T swapchain_count; +}; + static struct wined3d_wndproc_table wndproc_table; +static struct wined3d_hook_table hook_table; static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = @@ -396,6 +423,14 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) } heap_free(wndproc_table.entries); + heap_free(hook_table.swapchains); + for (i = 0; i < hook_table.hook_count; ++i) + { + WARN("Leftover hook table entry %p.\n", &hook_table.hooks[i]); + UnhookWindowsHookEx(hook_table.hooks[i].hook); + } + heap_free(hook_table.hooks); + heap_free(wined3d_settings.logo); UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); @@ -424,16 +459,16 @@ static void wined3d_wndproc_mutex_unlock(void) LeaveCriticalSection(&wined3d_wndproc_cs); } -static struct wined3d_wndproc *wined3d_find_wndproc(HWND window) +static struct wined3d_wndproc *wined3d_find_wndproc(HWND window, struct wined3d *wined3d) { unsigned int i; for (i = 0; i < wndproc_table.count; ++i) { - if (wndproc_table.entries[i].window == window) - { - return &wndproc_table.entries[i]; - } + struct wined3d_wndproc *entry = &wndproc_table.entries[i]; + + if (entry->window == window && entry->wined3d == wined3d) + return entry; } return NULL; @@ -447,9 +482,8 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam WNDPROC proc; wined3d_wndproc_mutex_lock(); - entry = wined3d_find_wndproc(window); - if (!entry) + if (!(entry = wined3d_find_wndproc(window, NULL))) { wined3d_wndproc_mutex_unlock(); ERR("Window %p is not registered with wined3d.\n", window); @@ -468,16 +502,62 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam return CallWindowProcA(proc, window, message, wparam, lparam); } -BOOL wined3d_register_window(HWND window, struct wined3d_device *device) +static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam) +{ + struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_swapchain *swapchain; + struct wined3d_wndproc *entry; + MSG *msg = (MSG *)lparam; + unsigned int i; + + /* Handle Alt+Enter. */ + if (code == HC_ACTION && msg->message == WM_SYSKEYDOWN + && msg->wParam == VK_RETURN && (msg->lParam & (KF_ALTDOWN << 16))) + { + wined3d_wndproc_mutex_lock(); + + for (i = 0; i < hook_table.swapchain_count; ++i) + { + swapchain = hook_table.swapchains[i].swapchain; + + if (swapchain->device_window != msg->hwnd) + continue; + + if ((entry = wined3d_find_wndproc(msg->hwnd, swapchain->device->wined3d)) + && (entry->flags & (WINED3D_REGISTER_WINDOW_NO_WINDOW_CHANGES + | WINED3D_REGISTER_WINDOW_NO_ALT_ENTER))) + continue; + + wined3d_swapchain_get_desc(swapchain, &swapchain_desc); + swapchain_desc.windowed = !swapchain_desc.windowed; + wined3d_swapchain_set_fullscreen(swapchain, &swapchain_desc, NULL); + + wined3d_wndproc_mutex_unlock(); + + return 1; + } + + wined3d_wndproc_mutex_unlock(); + } + + return CallNextHookEx(0, code, wparam, lparam); +} + +BOOL CDECL wined3d_register_window(struct wined3d *wined3d, HWND window, + struct wined3d_device *device, unsigned int flags) { struct wined3d_wndproc *entry; + TRACE("wined3d %p, window %p, device %p, flags %#x.\n", wined3d, window, device, flags); + wined3d_wndproc_mutex_lock(); - if (wined3d_find_wndproc(window)) + if ((entry = wined3d_find_wndproc(window, wined3d))) { + if (!wined3d) + WARN("Window %p is already registered with wined3d.\n", window); + entry->flags = flags; wined3d_wndproc_mutex_unlock(); - WARN("Window %p is already registered with wined3d.\n", window); return TRUE; } @@ -492,65 +572,200 @@ BOOL wined3d_register_window(HWND window, struct wined3d_device *device) entry = &wndproc_table.entries[wndproc_table.count++]; entry->window = window; entry->unicode = IsWindowUnicode(window); - /* Set a window proc that matches the window. Some applications (e.g. NoX) - * replace the window proc after we've set ours, and expect to be able to - * call the previous one (ours) directly, without using CallWindowProc(). */ - if (entry->unicode) - entry->proc = (WNDPROC)SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); + if (!wined3d) + { + /* Set a window proc that matches the window. Some applications (e.g. + * NoX) replace the window proc after we've set ours, and expect to be + * able to call the previous one (ours) directly, without using + * CallWindowProc(). */ + if (entry->unicode) + entry->proc = (WNDPROC)SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); + else + entry->proc = (WNDPROC)SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); + } else - entry->proc = (WNDPROC)SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); + { + entry->proc = NULL; + } entry->device = device; + entry->wined3d = wined3d; + entry->flags = flags; wined3d_wndproc_mutex_unlock(); return TRUE; } +static BOOL restore_wndproc(struct wined3d_wndproc *entry) +{ + LONG_PTR proc; + + if (entry->unicode) + { + proc = GetWindowLongPtrW(entry->window, GWLP_WNDPROC); + if (proc != (LONG_PTR)wined3d_wndproc) + return FALSE; + SetWindowLongPtrW(entry->window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + } + else + { + proc = GetWindowLongPtrA(entry->window, GWLP_WNDPROC); + if (proc != (LONG_PTR)wined3d_wndproc) + return FALSE; + SetWindowLongPtrA(entry->window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + } + + return TRUE; +} + void wined3d_unregister_window(HWND window) { struct wined3d_wndproc *entry, *last; - LONG_PTR proc; wined3d_wndproc_mutex_lock(); - if (!(entry = wined3d_find_wndproc(window))) + if (!(entry = wined3d_find_wndproc(window, NULL))) { wined3d_wndproc_mutex_unlock(); ERR("Window %p is not registered with wined3d.\n", window); return; } - if (entry->unicode) + if (entry->proc && !restore_wndproc(entry)) { - proc = GetWindowLongPtrW(window, GWLP_WNDPROC); - if (proc != (LONG_PTR)wined3d_wndproc) + entry->device = NULL; + WARN("Not unregistering window %p, current window proc doesn't match wined3d window proc.\n", window); + wined3d_wndproc_mutex_unlock(); + return; + } + + last = &wndproc_table.entries[--wndproc_table.count]; + if (entry != last) *entry = *last; + + wined3d_wndproc_mutex_unlock(); +} + +void CDECL wined3d_unregister_windows(struct wined3d *wined3d) +{ + struct wined3d_wndproc *entry, *last; + unsigned int i = 0; + + TRACE("wined3d %p.\n", wined3d); + + wined3d_wndproc_mutex_lock(); + + while (i < wndproc_table.count) + { + entry = &wndproc_table.entries[i]; + + if (entry->wined3d != wined3d) + { + ++i; + continue; + } + + if (entry->proc && !restore_wndproc(entry)) { entry->device = NULL; - wined3d_wndproc_mutex_unlock(); - WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", - window, proc, wined3d_wndproc); - return; + WARN("Not unregistering window %p, current window proc doesn't match wined3d window proc.\n", + entry->window); + ++i; + continue; } - SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + last = &wndproc_table.entries[--wndproc_table.count]; + if (entry != last) + *entry = *last; + else + ++i; } - else + + wined3d_wndproc_mutex_unlock(); +} + +static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) +{ + unsigned int i; + + for (i = 0; i < hook_table.hook_count; ++i) { - proc = GetWindowLongPtrA(window, GWLP_WNDPROC); - if (proc != (LONG_PTR)wined3d_wndproc) + if (hook_table.hooks[i].thread_id == thread_id) + return &hook_table.hooks[i]; + } + + return NULL; +} + +void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) +{ + struct wined3d_hooked_swapchain *swapchain_entry; + struct wined3d_window_hook *hook; + + wined3d_wndproc_mutex_lock(); + + if (!wined3d_array_reserve((void **)&hook_table.swapchains, &hook_table.swapchains_size, + hook_table.swapchain_count + 1, sizeof(*swapchain_entry))) + { + wined3d_wndproc_mutex_unlock(); + return; + } + + swapchain_entry = &hook_table.swapchains[hook_table.swapchain_count++]; + swapchain_entry->swapchain = swapchain; + swapchain_entry->thread_id = GetWindowThreadProcessId(swapchain->device_window, NULL); + + if ((hook = wined3d_find_hook(swapchain_entry->thread_id))) + { + ++hook->count; + wined3d_wndproc_mutex_unlock(); + return; + } + + if (!wined3d_array_reserve((void **)&hook_table.hooks, &hook_table.hooks_size, + hook_table.hook_count + 1, sizeof(*hook))) + { + --hook_table.swapchain_count; + wined3d_wndproc_mutex_unlock(); + return; + } + + hook = &hook_table.hooks[hook_table.hook_count++]; + hook->thread_id = swapchain_entry->thread_id; + hook->hook = SetWindowsHookExW(WH_GETMESSAGE, wined3d_hook_proc, 0, hook->thread_id); + hook->count = 1; + + wined3d_wndproc_mutex_unlock(); +} + +void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) +{ + struct wined3d_hooked_swapchain *swapchain_entry, *last_swapchain_entry; + struct wined3d_window_hook *hook, *last_hook; + unsigned int i; + + wined3d_wndproc_mutex_lock(); + + for (i = 0; i < hook_table.swapchain_count; ++i) + { + swapchain_entry = &hook_table.swapchains[i]; + + if (swapchain_entry->swapchain != swapchain) + continue; + + if ((hook = wined3d_find_hook(swapchain_entry->thread_id)) && !--hook->count) { - entry->device = NULL; - wined3d_wndproc_mutex_unlock(); - WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", - window, proc, wined3d_wndproc); - return; + UnhookWindowsHookEx(hook->hook); + last_hook = &hook_table.hooks[--hook_table.hook_count]; + if (hook != last_hook) + *hook = *last_hook; } - SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); - } + last_swapchain_entry = &hook_table.swapchains[--hook_table.swapchain_count]; + if (swapchain_entry != last_swapchain_entry) + *swapchain_entry = *last_swapchain_entry; - last = &wndproc_table.entries[--wndproc_table.count]; - if (entry != last) *entry = *last; + break; + } wined3d_wndproc_mutex_unlock(); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aebaa9ed2f2..75f27cebb27 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2974,8 +2974,9 @@ struct wined3d struct wined3d_adapter *adapters[1]; }; +void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; -BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) 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; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ada56365505..a0ff3f13354 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -903,6 +903,7 @@ enum wined3d_shader_type #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00004000u #define WINED3D_SWAPCHAIN_GDI_COMPATIBLE 0x00008000u #define WINED3D_SWAPCHAIN_IMPLICIT 0x00010000u +#define WINED3D_SWAPCHAIN_HOOK 0x00020000u #define WINED3DDP_MAXTEXCOORD 8 @@ -1584,6 +1585,10 @@ enum wined3d_shader_type #define WINED3D_MAX_VIEWPORTS 16 +#define WINED3D_REGISTER_WINDOW_NO_WINDOW_CHANGES 0x00000001u +#define WINED3D_REGISTER_WINDOW_NO_ALT_ENTER 0x00000002u +#define WINED3D_REGISTER_WINDOW_NO_PRINT_SCREEN 0x00000004u + struct wined3d_display_mode { UINT width; @@ -2210,8 +2215,11 @@ HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned struct wined3d_output_desc *desc); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function); +BOOL __cdecl wined3d_register_window(struct wined3d *wined3d, HWND window, + struct wined3d_device *device, unsigned int flags); HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); +void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, -- 2.11.0

1 0

[PATCH 3/5] dxgi: Retrieve swapchains' fullscreen state from wined3d.
by Henri Verbeet 19 Jun '19

19 Jun '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Once Alt+Enter handling is implemented, the fullscreen state may change without dxgi necessarily being aware of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 165257. dlls/dxgi/dxgi_private.h | 1 - dlls/dxgi/swapchain.c | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b6999c729a4..553eacee3b8 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -173,7 +173,6 @@ struct d3d11_swapchain IWineDXGIDevice *device; IDXGIFactory *factory; - BOOL fullscreen; IDXGIOutput *target; }; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e09df4862d8..030bb67c22d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -388,7 +388,6 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen if (SUCCEEDED(hr)) { - swapchain->fullscreen = fullscreen; if (swapchain->target) IDXGIOutput_Release(swapchain->target); swapchain->target = target; @@ -404,11 +403,17 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapCha BOOL *fullscreen, IDXGIOutput **target) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc swapchain_desc; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); if (fullscreen) - *fullscreen = swapchain->fullscreen; + { + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + wined3d_mutex_unlock(); + *fullscreen = !swapchain_desc.windowed; + } if (target) { @@ -781,6 +786,7 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { + BOOL fullscreen; HRESULT hr; /* A reference to the implicit swapchain is held by the wined3d device. In @@ -813,7 +819,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi if (!desc->windowed && (!desc->backbuffer_width || !desc->backbuffer_height)) FIXME("Fullscreen swapchain with back buffer width/height equal to 0 not supported properly.\n"); - swapchain->fullscreen = !desc->windowed; + fullscreen = !desc->windowed; desc->windowed = TRUE; if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) @@ -823,7 +829,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi } swapchain->target = NULL; - if (swapchain->fullscreen) + if (fullscreen) { desc->windowed = FALSE; if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, -- 2.11.0

1 0

[PATCH v3 01/10] kernel32/tests: Fix some NtMapViewOfSection tests expectations, and add results for w1064v1809
by Rémi Bernon 19 Jun '19

19 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 72 ++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0b718606d0e..e72192477c8 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -73,6 +73,30 @@ static HANDLE create_target_process(const char *arg) return pi.hProcess; } +static inline UINT_PTR get_zero_bits(UINT_PTR p) +{ + UINT_PTR z; + + if (p == 0) + return 32; +#ifdef __x86_64__ + if (p > 0xffffffff) + return (~(UINT_PTR)0) >> get_zero_bits(p >> 32); +#endif + +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) + z = __builtin_clz((UINT32)p); +#else + z = 31; + if (p >> 16) { z -= 16; p >>= 16; } + if (p >> 8) { z -= 8; p >>= 8; } + if (p >> 4) { z -= 4; p >>= 4; } + if (p >> 2) { z -= 2; p >>= 2; } + if (p >> 1) z -= 1; +#endif + return z; +} + static void test_VirtualAllocEx(void) { const unsigned int alloc_size = 1<<15; @@ -1260,24 +1284,12 @@ static void test_NtMapViewOfSection(void) ok( result == sizeof(buffer), "ReadProcessMemory didn't read all data (%lx)\n", result ); ok( !memcmp( buffer, data, sizeof(buffer) ), "Wrong data read\n" ); - /* for some unknown reason NtMapViewOfSection fails with STATUS_NO_MEMORY when zero_bits != 0 ? */ ptr2 = NULL; size = 0; offset.QuadPart = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine - ok( status == STATUS_NO_MEMORY, "NtMapViewOfSection returned %x\n", status ); - if (status == STATUS_SUCCESS) - { - status = pNtUnmapViewOfSection( hProcess, ptr2 ); - ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); - } - - ptr2 = NULL; - size = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine - ok( status == STATUS_NO_MEMORY, "NtMapViewOfSection returned %x\n", status ); + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 1, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { status = pNtUnmapViewOfSection( hProcess, ptr2 ); @@ -1288,7 +1300,8 @@ static void test_NtMapViewOfSection(void) ptr2 = NULL; size = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 22, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { status = pNtUnmapViewOfSection( hProcess, ptr2 ); @@ -1323,30 +1336,20 @@ static void test_NtMapViewOfSection(void) status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, 0, PAGE_READWRITE ); ok( status == STATUS_MAPPED_ALIGNMENT, "NtMapViewOfSection returned %x\n", status ); - /* zero_bits != 0 is not allowed when an address is set */ + /* when an address is passed, it has to satisfy the provided number of zero bits */ ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, get_zero_bits((UINT_PTR)ptr2) + 1, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); - - ptr2 = (char *)ptr + 0x1001; - size = 0; - offset.QuadPart = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); - - ptr2 = (char *)ptr + 0x1000; - size = 0; - offset.QuadPart = 1; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, get_zero_bits((UINT_PTR)ptr2), 0, &offset, &size, 1, 0, PAGE_READWRITE ); + todo_wine + ok( status == STATUS_MAPPED_ALIGNMENT, "NtMapViewOfSection returned %x\n", status ); if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) @@ -1409,7 +1412,8 @@ static void test_NtMapViewOfSection(void) status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); todo_wine - ok( status == STATUS_INVALID_PARAMETER_9, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_9 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); } status = pNtUnmapViewOfSection( hProcess, ptr ); -- 2.20.1

3 23

[PATCH] msi/tests: Accept case variations for path properties.
by Hans Leidekker 19 Jun '19

19 Jun '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/package.c | 65 +++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 7915798355..6f9c2ca8f1 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2146,14 +2146,17 @@ static void test_condition(void) DeleteFileA(msifile); } -static void check_prop(MSIHANDLE hpkg, const char *prop, const char *expect) +static void check_prop(MSIHANDLE hpkg, const char *prop, const char *expect, int match_case) { char buffer[MAX_PATH] = "x"; DWORD sz = sizeof(buffer); UINT r = MsiGetPropertyA(hpkg, prop, buffer, &sz); ok(!r, "'%s': got %u\n", prop, r); ok(sz == lstrlenA(buffer), "'%s': expected %u, got %u\n", prop, lstrlenA(buffer), sz); - ok(!strcmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer); + if (match_case) + ok(!strcmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer); + else + ok(!strcasecmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer); } static void test_props(void) @@ -2229,29 +2232,29 @@ static void test_props(void) r = MsiSetPropertyA( hpkg, "=", "asdf" ); ok(!r, "got %u\n", r); - check_prop(hpkg, "=", "asdf"); + check_prop(hpkg, "=", "asdf", 1); r = MsiSetPropertyA( hpkg, " ", "asdf" ); ok(!r, "got %u\n", r); - check_prop(hpkg, " ", "asdf"); + check_prop(hpkg, " ", "asdf", 1); r = MsiSetPropertyA( hpkg, "'", "asdf" ); ok(!r, "got %u\n", r); - check_prop(hpkg, "'", "asdf"); + check_prop(hpkg, "'", "asdf", 1); /* set empty values */ r = MsiSetPropertyA( hpkg, "boo", NULL ); ok(!r, "got %u\n", r); - check_prop(hpkg, "boo", ""); + check_prop(hpkg, "boo", "", 1); r = MsiSetPropertyA( hpkg, "boo", "" ); ok(!r, "got %u\n", r); - check_prop(hpkg, "boo", ""); + check_prop(hpkg, "boo", "", 1); /* set a non-empty value */ r = MsiSetPropertyA( hpkg, "boo", "xyz" ); ok(!r, "got %u\n", r); - check_prop(hpkg, "boo", "xyz"); + check_prop(hpkg, "boo", "xyz", 1); r = MsiGetPropertyA(hpkg, "boo", NULL, NULL); ok(!r, "got %u\n", r); @@ -2326,10 +2329,10 @@ static void test_props(void) ok(sz == 3, "got size %u\n", sz); /* properties are case-sensitive */ - check_prop(hpkg, "BOO", ""); + check_prop(hpkg, "BOO", "", 1); /* properties set in Property table should work */ - check_prop(hpkg, "MetadataCompName", "Photoshop.dll"); + check_prop(hpkg, "MetadataCompName", "Photoshop.dll", 1); MsiCloseHandle( hpkg ); DeleteFileA(msifile); @@ -5739,65 +5742,65 @@ static void test_installprops(void) if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { sprintf(buf, "%d", si.wProcessorLevel); - check_prop(hpkg, "Intel", buf); - check_prop(hpkg, "MsiAMD64", buf); - check_prop(hpkg, "Msix64", buf); + check_prop(hpkg, "Intel", buf, 1); + check_prop(hpkg, "MsiAMD64", buf, 1); + check_prop(hpkg, "Msix64", buf, 1); sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion()))); - check_prop(hpkg, "VersionNT64", buf); + check_prop(hpkg, "VersionNT64", buf, 1); GetSystemDirectoryA(path, MAX_PATH); strcat(path, "\\"); - check_prop(hpkg, "System64Folder", path); + check_prop(hpkg, "System64Folder", path, 0); GetSystemWow64DirectoryA(path, MAX_PATH); strcat(path, "\\"); - check_prop(hpkg, "SystemFolder", path); + check_prop(hpkg, "SystemFolder", path, 0); size = MAX_PATH; r = RegQueryValueExA(pathkey, "ProgramFilesDir (x86)", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "ProgramFilesFolder", path); + check_prop(hpkg, "ProgramFilesFolder", path, 0); size = MAX_PATH; RegQueryValueExA(pathkey, "ProgramFilesDir", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "ProgramFiles64Folder", path); + check_prop(hpkg, "ProgramFiles64Folder", path, 0); size = MAX_PATH; RegQueryValueExA(pathkey, "CommonFilesDir (x86)", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "CommonFilesFolder", path); + check_prop(hpkg, "CommonFilesFolder", path, 0); size = MAX_PATH; RegQueryValueExA(pathkey, "CommonFilesDir", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "CommonFiles64Folder", path); + check_prop(hpkg, "CommonFiles64Folder", path, 0); } else if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { sprintf(buf, "%d", si.wProcessorLevel); - check_prop(hpkg, "Intel", buf); + check_prop(hpkg, "Intel", buf, 1); GetSystemDirectoryA(path, MAX_PATH); strcat(path, "\\"); - check_prop(hpkg, "SystemFolder", path); + check_prop(hpkg, "SystemFolder", path, 0); size = MAX_PATH; RegQueryValueExA(pathkey, "ProgramFilesDir", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "ProgramFilesFolder", path); + check_prop(hpkg, "ProgramFilesFolder", path, 0); size = MAX_PATH; RegQueryValueExA(pathkey, "CommonFilesDir", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "CommonFilesFolder", path); - - check_prop(hpkg, "MsiAMD64", ""); - check_prop(hpkg, "Msix64", ""); - check_prop(hpkg, "VersionNT64", ""); - check_prop(hpkg, "System64Folder", ""); - check_prop(hpkg, "ProgramFiles64Dir", ""); - check_prop(hpkg, "CommonFiles64Dir", ""); + check_prop(hpkg, "CommonFilesFolder", path, 0); + + check_prop(hpkg, "MsiAMD64", "", 1); + check_prop(hpkg, "Msix64", "", 1); + check_prop(hpkg, "VersionNT64", "", 1); + check_prop(hpkg, "System64Folder", "", 0); + check_prop(hpkg, "ProgramFiles64Dir", "", 0); + check_prop(hpkg, "CommonFiles64Dir", "", 0); } CloseHandle(hkey1); -- 2.11.0

3 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel