wine-devel October 2019

wine-devel@winehq.org

80 participants
669 discussions

[PATCH 1/5] mf/tests: Use separate session instance for events tests.
by Nikolay Sivov 08 Oct '19

08 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2a5efc99e8..038bfeacd1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1041,8 +1041,6 @@ todo_wine IMFGetService_Release(gs); - test_session_events(session); - IMFMediaSession_Release(session); hr = MFCreateMediaSession(NULL, &session); @@ -1077,6 +1075,14 @@ todo_wine IMFAttributes_Release(attributes); + /* Basic events behavior. */ + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + + test_session_events(session); + + IMFMediaSession_Release(session); + hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } -- 2.23.0

2 7

[PATCH v2 1/2] wineserver: Implement thread priorities with sched_setscheduler / setpriority.
by Rémi Bernon 08 Oct '19

08 Oct '19

This does not report permission errors in order to avoid any breaking change, only the parameter checks that were already there are returning errors. We only call setpriority on Linux, as unix_tid is a Mach port on Mac OS. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure.ac | 19 ++++++ include/config.h.in | 6 ++ server/process.c | 20 +++++- server/thread.c | 154 ++++++++++++++++++++++++++++++++++++++++---- server/thread.h | 1 + 5 files changed, 186 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index b9339b90aa7..47c1f7c5315 100644 --- a/configure.ac +++ b/configure.ac @@ -2285,6 +2285,25 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi +AC_CACHE_CHECK([for sched_setscheduler],wine_cv_have_sched_setscheduler, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sched.h>]], [[sched_setscheduler(0, 0, 0);]])],[wine_cv_have_sched_setscheduler=yes],[wine_cv_have_sched_setscheduler=no])) +if test "$wine_cv_have_sched_setscheduler" = "yes" +then + AC_DEFINE(HAVE_SCHED_SETSCHEDULER, 1, [Define to 1 if you have the `sched_setscheduler' function.]) +fi + +AC_CACHE_CHECK([for setpriority],wine_cv_have_setpriority, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sys/resource.h> +#include <sys/time.h>]], [[setpriority(0, 0, 0);]])],[wine_cv_have_setpriority=yes],[wine_cv_have_setpriority=no])) +if test "$wine_cv_have_setpriority" = "yes" +then + AC_DEFINE(HAVE_SETPRIORITY, 1, [Define to 1 if you have the `setpriority' function.]) +fi + AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#define _GNU_SOURCE diff --git a/include/config.h.in b/include/config.h.in index 9c7a49ae9a2..929b11a8754 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -785,6 +785,9 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY +/* Define to 1 if you have the `sched_setscheduler' function. */ +#undef HAVE_SCHED_SETSCHEDULER + /* Define to 1 if you have the `sched_yield' function. */ #undef HAVE_SCHED_YIELD @@ -809,6 +812,9 @@ /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT +/* Define to 1 if you have the `setpriority' function. */ +#undef HAVE_SETPRIORITY + /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE diff --git a/server/process.c b/server/process.c index 16bb5d57e72..0c544b46096 100644 --- a/server/process.c +++ b/server/process.c @@ -1465,6 +1465,24 @@ DECL_HANDLER(get_process_vm_counters) release_object( process ); } +static void set_process_priority( struct process *process, int priority ) +{ + struct thread *thread; + + if (!process->running_threads) + { + set_error( STATUS_PROCESS_IS_TERMINATING ); + return; + } + + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { + set_thread_priority( thread, priority, thread->priority ); + } + + process->priority = priority; +} + static void set_process_affinity( struct process *process, affinity_t affinity ) { struct thread *thread; @@ -1490,7 +1508,7 @@ DECL_HANDLER(set_process_info) if ((process = get_process_from_handle( req->handle, PROCESS_SET_INFORMATION ))) { - if (req->mask & SET_PROCESS_INFO_PRIORITY) process->priority = req->priority; + if (req->mask & SET_PROCESS_INFO_PRIORITY) set_process_priority( process, req->priority ); if (req->mask & SET_PROCESS_INFO_AFFINITY) set_process_affinity( process, req->affinity ); release_object( process ); } diff --git a/server/thread.c b/server/thread.c index e753c8d0dda..36bd41e977f 100644 --- a/server/thread.c +++ b/server/thread.c @@ -38,6 +38,12 @@ #ifdef HAVE_SCHED_H #include <sched.h> #endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -515,28 +521,149 @@ affinity_t get_thread_affinity( struct thread *thread ) return mask; } +#if defined(HAVE_SCHED_SETSCHEDULER) || defined(HAVE_SETPRIORITY) +static int get_unix_priority( int priority_class, int priority ) +{ + switch (priority_class) { + case PROCESS_PRIOCLASS_IDLE: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 10; + case THREAD_PRIORITY_BELOW_NORMAL: return 8; + case THREAD_PRIORITY_NORMAL: return 6; + case THREAD_PRIORITY_ABOVE_NORMAL: return 4; + case THREAD_PRIORITY_HIGHEST: return 2; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_BELOW_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 8; + case THREAD_PRIORITY_BELOW_NORMAL: return 6; + case THREAD_PRIORITY_NORMAL: return 4; + case THREAD_PRIORITY_ABOVE_NORMAL: return 2; + case THREAD_PRIORITY_HIGHEST: return 0; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 4; + case THREAD_PRIORITY_BELOW_NORMAL: return 2; + case THREAD_PRIORITY_NORMAL: return 0; + case THREAD_PRIORITY_ABOVE_NORMAL: return -2; + case THREAD_PRIORITY_HIGHEST: return -4; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_ABOVE_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 0; + case THREAD_PRIORITY_BELOW_NORMAL: return -2; + case THREAD_PRIORITY_NORMAL: return -4; + case THREAD_PRIORITY_ABOVE_NORMAL: return -6; + case THREAD_PRIORITY_HIGHEST: return -8; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_HIGH: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return -2; + case THREAD_PRIORITY_BELOW_NORMAL: return -4; + case THREAD_PRIORITY_NORMAL: return -6; + case THREAD_PRIORITY_ABOVE_NORMAL: return -8; + case THREAD_PRIORITY_HIGHEST: return -10; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_REALTIME: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 1; + case -7: + case -6: + case -5: + case -4: + case -3: + case THREAD_PRIORITY_LOWEST: + case THREAD_PRIORITY_BELOW_NORMAL: + case THREAD_PRIORITY_NORMAL: + case THREAD_PRIORITY_ABOVE_NORMAL: + case THREAD_PRIORITY_HIGHEST: + case 3: + case 4: + case 5: + case 6: + return priority + 9; + case THREAD_PRIORITY_TIME_CRITICAL: + return 16; + } + } + return 0; +} +#endif + #define THREAD_PRIORITY_REALTIME_HIGHEST 6 #define THREAD_PRIORITY_REALTIME_LOWEST -7 +int set_thread_priority( struct thread* thread, int priority_class, int priority ) +{ + int max = THREAD_PRIORITY_HIGHEST; + int min = THREAD_PRIORITY_LOWEST; + if (priority_class == PROCESS_PRIOCLASS_REALTIME) + { + max = THREAD_PRIORITY_REALTIME_HIGHEST; + min = THREAD_PRIORITY_REALTIME_LOWEST; + } + + if ((priority < min || priority > max) && + priority != THREAD_PRIORITY_IDLE && + priority != THREAD_PRIORITY_TIME_CRITICAL) + { + errno = EINVAL; + return -1; + } + + if (thread->process->priority == priority_class && + thread->priority == priority) + return 0; + + thread->priority = priority; + if (thread->unix_tid == -1) + return 0; + +#ifdef __linux__ + if (priority_class == PROCESS_PRIOCLASS_REALTIME) + { +#ifdef HAVE_SCHED_SETSCHEDULER + struct sched_param param; + if (sched_getparam( thread->unix_tid, &param ) != 0) + return 0; /* ignore errors for now */ + + param.sched_priority = get_unix_priority( priority_class, priority ); + if (sched_setscheduler( thread->unix_tid, SCHED_RR|SCHED_RESET_ON_FORK, &param ) == 0) + return 0; +#endif + } + else + { +#ifdef HAVE_SETPRIORITY + if (setpriority( PRIO_PROCESS, thread->unix_tid, + get_unix_priority( priority_class, priority ) ) == 0) + return 0; +#endif + } +#endif + + return 0; /* ignore errors for now */ +} + /* set all information about a thread */ static void set_thread_info( struct thread *thread, const struct set_thread_info_request *req ) { if (req->mask & SET_THREAD_INFO_PRIORITY) { - int max = THREAD_PRIORITY_HIGHEST; - int min = THREAD_PRIORITY_LOWEST; - if (thread->process->priority == PROCESS_PRIOCLASS_REALTIME) - { - max = THREAD_PRIORITY_REALTIME_HIGHEST; - min = THREAD_PRIORITY_REALTIME_LOWEST; - } - if ((req->priority >= min && req->priority <= max) || - req->priority == THREAD_PRIORITY_IDLE || - req->priority == THREAD_PRIORITY_TIME_CRITICAL) - thread->priority = req->priority; - else - set_error( STATUS_INVALID_PARAMETER ); + if (set_thread_priority( thread, thread->process->priority, req->priority )) + file_set_error(); } if (req->mask & SET_THREAD_INFO_AFFINITY) { @@ -1367,6 +1494,7 @@ DECL_HANDLER(init_thread) process->unix_pid = -1; /* can happen with linuxthreads */ init_thread_context( current ); generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); + set_thread_priority( current, current->process->priority, current->priority ); set_thread_affinity( current, current->affinity ); } debug_level = max( debug_level, req->debug_level ); diff --git a/server/thread.h b/server/thread.h index e10120dcf6e..b81061aea11 100644 --- a/server/thread.h +++ b/server/thread.h @@ -125,6 +125,7 @@ extern int thread_add_inflight_fd( struct thread *thread, int client, int server extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); extern struct token *thread_get_impersonation_token( struct thread *thread ); +extern int set_thread_priority( struct thread *thread, int priority_class, int priority ); extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); extern int is_cpu_supported( enum cpu_type cpu ); extern unsigned int get_supported_cpu_mask(void); -- 2.23.0

2 3

[PATCH 1/4] dwrite/tests: Remove test failing on RTL locales.
by Nikolay Sivov 08 Oct '19

08 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/layout.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2c90e31a85..b153bcbb69 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1702,14 +1702,6 @@ static const struct drawcall_entry draw_ltr_reordered_run_seq[] = { { DRAW_LAST_KIND } }; -static const struct drawcall_entry draw_rtl_reordered_run_seq[] = { - { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6, 2 }, - { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7, 1 }, - { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2, 2 }, - { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1, 1 }, - { DRAW_LAST_KIND } -}; - static void test_Draw(void) { static const WCHAR str3W[] = {'1','2','3','-','5','2',0x64a,0x64f,0x633,0x627,0x648,0x650, @@ -1916,14 +1908,6 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, draw_ltr_reordered_run_seq, "draw test 11", FALSE); - hr = IDWriteTextLayout_SetReadingDirection(layout, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT); - ok(hr == S_OK, "Failed to set reading direction, hr %#x.\n", hr); - - flush_sequence(sequences, RENDERER_ID); - hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_rtl_reordered_run_seq, "draw test 12", FALSE); - IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); -- 2.23.0

1 3

[PATCH v3 00/10] winex11.drv: Improve ClipCursor handling.
by Rémi Bernon 08 Oct '19

08 Oct '19

This is another try at fixing the remaining cursor clipping issues. It uses same Focus* event delay mechanism from the previous version - with some codepath simplification for the UseTakeFocus option. (PATCH 1-3) In addition to this, it also reverts some previous patches that introduced unnecessary complexity to replace them with a simpler version once focus events are delayed. (PATCH 4-10) Rémi Bernon (10): winex11.drv: Make it possible to merge events across process_events calls. winex11.drv: Call XSetInputFocus only, whenever WM_TAKE_FOCUS is received. winex11.drv: Wait for the WM to release the cursor before handling FocusIn events. Revert "winex11.drv: Retry last ClipCursor when grab is released." Revert "winex11.drv: Only grab or warp the cursor when keyboard isn't grabbed." Revert "winex11.drv: Explicitly call XUngrabPointer when clipping is released." winex11.drv: Merge FocusIn/FocusOut NotifyGrab/NotifyUngrab cases. winex11.drv: Release clipping window on FocusOut events. winex11.drv: Use the current clipping rectangle when restoring grabs. winex11.drv: Retry calling XGrabPointer later if it failed. dlls/winex11.drv/event.c | 198 +++++++++++++++++++++++--------------- dlls/winex11.drv/mouse.c | 42 +------- dlls/winex11.drv/x11drv.h | 3 +- 3 files changed, 127 insertions(+), 116 deletions(-) -- 2.23.0

2 11

[PATCH website] Change words in Korean translation
by 김건우 08 Oct '19

08 Oct '19

<html><body>Signed-off-by: Kim Geonwoo (김건우)<rlarjsdn122(a)naver.com>

1 0

[PATCH] ddraw/tests: Don't expect emulation to always fail on 64-bit
by Alex Henrie 08 Oct '19

08 Oct '19

As far as I can tell, all 32-bit drivers and some 64-bit drivers support emulation. This patch fixes test failures both on several Windows VMs and on my Linux laptop with Intel graphics. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 6 +++++- dlls/ddraw/tests/ddraw2.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index a23e76e1f7..6bbea6f2f8 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12998,7 +12998,7 @@ static void test_caps(void) } hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw, NULL); - ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK || (hr == E_FAIL && is_ddraw64), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { memset(&hal_caps, 0, sizeof(hal_caps)); @@ -13022,6 +13022,10 @@ static void test_caps(void) IDirectDraw_Release(ddraw); } + else + { + skip("Driver does not support emulation\n"); + } } static void test_d32_support(void) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2156bd5849..113d5e6b05 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13878,7 +13878,7 @@ static void test_caps(void) } hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw1, NULL); - ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK || (hr == E_FAIL && is_ddraw64), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw); @@ -13906,6 +13906,10 @@ static void test_caps(void) IDirectDraw2_Release(ddraw); } + else + { + skip("Driver does not support emulation\n"); + } } static void test_d32_support(void) -- 2.23.0

2 1

[PATCH 1/5] strmbase: Fix implementation of IVideoWindow::get_Caption().
by Zebediah Figura 08 Oct '19

08 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/window.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index b7c0bae47b2..4ecc81c24e5 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -297,15 +297,24 @@ HRESULT WINAPI BaseControlWindowImpl_put_Caption(IVideoWindow *iface, BSTR strCa return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_get_Caption(IVideoWindow *iface, BSTR *strCaption) +HRESULT WINAPI BaseControlWindowImpl_get_Caption(IVideoWindow *iface, BSTR *caption) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); + WCHAR *str; + int len; - TRACE("(%p/%p)->(%p)\n", This, iface, strCaption); + TRACE("window %p, caption %p.\n", window, caption); - GetWindowTextW(This->baseWindow.hWnd, (LPWSTR)strCaption, 100); + *caption = NULL; - return S_OK; + len = GetWindowTextLengthW(window->baseWindow.hWnd) + 1; + if (!(str = heap_alloc(len * sizeof(WCHAR)))) + return E_OUTOFMEMORY; + + GetWindowTextW(window->baseWindow.hWnd, str, len); + *caption = SysAllocString(str); + heap_free(str); + return *caption ? S_OK : E_OUTOFMEMORY; } HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG WindowStyle) -- 2.23.0

2 7

Do we need a Mr Tests?
by Francois Gouget 08 Oct '19

08 Oct '19

I'm concerned by some of the recent events regarding WineTest: * A couple of times compilation of the official binaries broke. This got caught within a couple of days which is okayish. * But the winehq.org upgrade completely broke test.winehq.org and it took 10 days for anyone to notice! * Then there's the wininet:ftp, wininet:http & co breakage, also caused by the winehq.org upgrade. This time it took a whopping 24 days for anyone to notice! https://www.winehq.org/pipermail/wine-devel/2019-October/151834.html * There's also TestBot VMs that have almost completely stopped succeeding at posting WineTest results: vista, vistau64*, w8*, w864. I'm probably more to blame for this than anyone else but I would have expected someone to publicly wonder what's going on with these VMs. * Finally there's the gdi32:bitmap not-quite regression. I may have missed something but I did not see it mentioned before. https://www.winehq.org/pipermail/wine-devel/2019-October/152082.html My sinking feeling is: * Nobody looks at test.winehq.org. * Major WineTest regressions can sail through without anyone noticing. My feeling is that nobody feels responsible for making sure test.winehq.org works and for spotting regressions. Hence why I think we may need someone whose responsibility would be to monitor test.winehq.org, analyze the WineTest results, diagnose new issues and report them. I did something like that a few times but it takes quite a bit of time so I had to stop. Essentially it went something like this: * Every couple of weeks, open the results for the latest build: https://test.winehq.org/data/7d954f23356f0aaf49b1ef0c4bed83041cb41c08/ * For each line that has a failure on Windows, open the corresponding test page. For instance: https://test.winehq.org/data/tests/advapi32:service.html * If the tests start failing consistenly on a specific date on at least one platform, dig in to figure out why. For instance: https://test.winehq.org/data/tests/gdi32:bitmap.html https://test.winehq.org/data/tests/wininet:http.html * Likewise, if a test has been consistently getting 13 failures on a platform and now consistently gets 19 it may be because a commit introduced new failures. For instance: https://test.winehq.org/data/tests/advapi32:service.html This requires regular checks otherwise failure is the new normal and there is nothing to see. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ A black hole is just God dividing by zero.

5 6

[PATCH] d3dcompiler: Add missing defines, enums and declarations.
by Andrey Gusev 08 Oct '19

08 Oct '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- include/d3dcompiler.h | 86 ++++++++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 29 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 70bdfa273f..2df149424a 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -34,34 +34,48 @@ static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e #define D3DCOMPILER_DLL_A "d3dcompiler_47.dll" #define D3DCOMPILER_DLL WINELIB_NAME_AW(D3DCOMPILER_DLL_) -#define D3DCOMPILE_DEBUG 0x00000001 -#define D3DCOMPILE_SKIP_VALIDATION 0x00000002 -#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004 -#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x00000008 -#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x00000010 -#define D3DCOMPILE_PARTIAL_PRECISION 0x00000020 -#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x00000040 -#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x00000080 -#define D3DCOMPILE_NO_PRESHADER 0x00000100 -#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x00000200 -#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x00000400 -#define D3DCOMPILE_ENABLE_STRICTNESS 0x00000800 -#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x00001000 -#define D3DCOMPILE_IEEE_STRICTNESS 0x00002000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x00004000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 -#define D3DCOMPILE_RESERVED16 0x00010000 -#define D3DCOMPILE_RESERVED17 0x00020000 -#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 -#define D3DCOMPILE_RESOURCES_MAY_ALIAS 0x00080000 - -#define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 -#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002 -#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING 0x00000004 -#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE 0x00000008 -#define D3D_DISASM_DISABLE_DEBUG_INFO 0x00000010 +#define D3DCOMPILE_DEBUG 0x00000001 +#define D3DCOMPILE_SKIP_VALIDATION 0x00000002 +#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004 +#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x00000008 +#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x00000010 +#define D3DCOMPILE_PARTIAL_PRECISION 0x00000020 +#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x00000040 +#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x00000080 +#define D3DCOMPILE_NO_PRESHADER 0x00000100 +#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x00000200 +#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x00000400 +#define D3DCOMPILE_ENABLE_STRICTNESS 0x00000800 +#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x00001000 +#define D3DCOMPILE_IEEE_STRICTNESS 0x00002000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x00004000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 +#define D3DCOMPILE_RESERVED16 0x00010000 +#define D3DCOMPILE_RESERVED17 0x00020000 +#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 +#define D3DCOMPILE_RESOURCES_MAY_ALIAS 0x00080000 +#define D3DCOMPILE_ENABLE_UNBOUNDED_DESCRIPTOR_TABLES 0x00100000 +#define D3DCOMPILE_ALL_RESOURCES_BOUND 0x00200000 +#define D3DCOMPILE_DEBUG_NAME_FOR_SOURCE 0x00400000 +#define D3DCOMPILE_DEBUG_NAME_FOR_BINARY 0x00800000 + +#define D3DCOMPILE_EFFECT_CHILD_EFFECT 0x00000001 +#define D3DCOMPILE_EFFECT_ALLOW_SLOW_OPS 0x00000002 + +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_LATEST 0x00000000 +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_0 0x00000010 +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_1 0x00000020 + +#define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 +#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002 +#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING 0x00000004 +#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE 0x00000008 +#define D3D_DISASM_DISABLE_DEBUG_INFO 0x00000010 +#define D3D_DISASM_ENABLE_INSTRUCTION_OFFSET 0x00000020 +#define D3D_DISASM_INSTRUCTION_ONLY 0x00000040 +#define D3D_DISASM_PRINT_HEX_LITERALS 0x00000080 HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, @@ -69,12 +83,19 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena typedef HRESULT (WINAPI *pD3DCompile)(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, + ID3DBlob **error_messages); typedef enum D3DCOMPILER_STRIP_FLAGS { D3DCOMPILER_STRIP_REFLECTION_DATA = 1, D3DCOMPILER_STRIP_DEBUG_INFO = 2, D3DCOMPILER_STRIP_TEST_BLOBS = 4, + D3DCOMPILER_STRIP_PRIVATE_DATA = 8, + D3DCOMPILER_STRIP_ROOT_SIGNATURE = 10, D3DCOMPILER_STRIP_FORCE_DWORD = 0x7fffffff } D3DCOMPILER_STRIP_FLAGS; @@ -91,15 +112,22 @@ typedef enum D3D_BLOB_PART D3D_BLOB_LEGACY_SHADER, D3D_BLOB_XNA_PREPASS_SHADER, D3D_BLOB_XNA_SHADER, + D3D_BLOB_PDB, + D3D_BLOB_PRIVATE_DATA, + D3D_BLOB_ROOT_SIGNATURE, + D3D_BLOB_DEBUG_NAME, D3D_BLOB_TEST_ALTERNATE_SHADER = 0x8000, D3D_BLOB_TEST_COMPILE_DETAILS, - D3D_BLOB_TEST_COMPILE_PERF + D3D_BLOB_TEST_COMPILE_PERF, + D3D_BLOB_TEST_COMPILE_REPORT } D3D_BLOB_PART; HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size, UINT flags, const char *comments, ID3DBlob **disassembly); typedef HRESULT (WINAPI *pD3DDisassemble)(const void *data, SIZE_T data_size, UINT flags, const char *comments, ID3DBlob **disassembly); +HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, + const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); -- 2.21.0

3 2

[PATCH] dinput/tests: Add checks for Acquire/Unacquire.
by Alistair Leslie-Hughes 07 Oct '19

07 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- The linux runs are failing on ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); which would appear the window no longer has focus. Testing the Acquire/Unacquire results will hopefully prove this point. If it turns out to be focus issue, maybe the patches on the list might fix it. dlls/dinput/tests/mouse.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index e4d24e8916..11da951d10 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -148,15 +148,20 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); - IDirectInputDevice_Unacquire(pMouse); + hr = IDirectInputDevice_Unacquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); cnt = 1; hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - IDirectInputDevice_Acquire(pMouse); + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); - IDirectInputDevice_Unacquire(pMouse); - IDirectInputDevice_Acquire(pMouse); + hr = IDirectInputDevice_Unacquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); cnt = 1; hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); -- 2.17.1

2 1

← Newer
1
...
49
50
51
52
53
54
55
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2019