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

[PATCH 2/4] vbscript: Call OnScriptError for runtime errors.
by Jacek Caban 04 Oct '19

04 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 8 ++- dlls/vbscript/tests/run.c | 22 +++---- dlls/vbscript/vbscript.c | 118 ++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 137 insertions(+), 12 deletions(-)

1 0

[PATCH 1/4] vbscript: Move OnEnterScript/OnLeaveScript calls to exec_script.
by Jacek Caban 04 Oct '19

04 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 10 ++++++++-- dlls/vbscript/vbdisp.c | 23 +++++++---------------- dlls/vbscript/vbscript.c | 9 +-------- dlls/vbscript/vbscript.h | 2 +- 4 files changed, 17 insertions(+), 27 deletions(-)

1 0

[PATCH] secur32/tests: Fix test failures.
by Hans Leidekker 04 Oct '19

04 Oct '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/tests/negotiate.c | 4 +++- dlls/secur32/tests/ntlm.c | 4 +++- dlls/secur32/tests/schannel.c | 18 +++++++++++------- include/sspi.h | 1 + 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index 095aee6cb5..5e5beed7f7 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -297,7 +297,9 @@ static void test_authentication(void) ok( pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || - pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPCONTAINER_CHECKS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK| SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", pi->fCapabilities ); ok( pi->wVersion == 1, "got %u\n", pi->wVersion ); diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 6b1249d201..930a49e451 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -929,7 +929,9 @@ static void testAuth(ULONG data_rep, BOOL fake) ok(pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || - pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPCONTAINER_CHECKS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK| SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", pi->fCapabilities); ok(pi->wVersion == 1, "got %u\n", pi->wVersion); diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 426bf66014..217dbe8dfa 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -435,11 +435,13 @@ static void testAcquireSecurityContext(void) ok(ret, "CertSetCertificateContextProperty failed: %08x\n", GetLastError()); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */ || + st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */ || + st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, @@ -489,12 +491,13 @@ static void testAcquireSecurityContext(void) schanCred.dwVersion = SCH_CRED_V3; st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); + ok(st == SEC_E_OK || st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, + "AcquireCredentialsHandleA failed: %08x\n", st); FreeCredentialsHandle(&cred); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_OK || - st == SEC_E_UNKNOWN_CREDENTIALS, /* win2k3 */ + ok(st == SEC_E_OK || st == SEC_E_UNKNOWN_CREDENTIALS /* win2k3 */ || + st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, "AcquireCredentialsHandleA failed: %08x\n", st); FreeCredentialsHandle(&cred); schanCred.dwVersion = SCHANNEL_CRED_VERSION; @@ -533,7 +536,7 @@ static void testAcquireSecurityContext(void) st == SEC_E_INVALID_TOKEN /* WinNT */, "st = %08x\n", st); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); /* FIXME: what about two valid certs? */ @@ -866,7 +869,8 @@ todo_wine } ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); - ok(status == SEC_E_OK, "InitializeSecurityContext failed: %08x\n", status); + ok(status == SEC_E_OK || broken(status == SEC_E_ILLEGAL_MESSAGE) /* winxp */, + "InitializeSecurityContext failed: %08x\n", status); if(status != SEC_E_OK) { skip("Handshake failed\n"); return; diff --git a/include/sspi.h b/include/sspi.h index ad423eed90..036d2cf2f8 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -174,6 +174,7 @@ SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR,SECURITY_PACKAGE_OPTIONS*); #define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 #define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 #define SECPKG_FLAG_CREDENTIAL_ISOLATION_ENABLED 0x01000000 +#define SECPKG_FLAG_APPLY_LOOPBACK 0x02000000 #define SECPKG_ID_NONE 0xffff -- 2.20.1

1 0

[PATCH] comctl32: replace lstrlenW() with return value.
by Carlo Bramini 04 Oct '19

04 Oct '19

Function get_localized_dayname() already returns the number of characters written, so the lstrlenW() into DrawTextW() could just replaced with that return value. Sincerely. Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net>

2 1

[v2 PATCH] msvcrt: Implement %h format for strftime
by Vijay Kiran Kamuju 04 Oct '19

04 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 3 +++ dlls/ucrtbase/tests/misc.c | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 9795c92baf8..7eea78367db 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -628,6 +628,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%h", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index cbffd77f32e..6108ad17cce 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1142,6 +1142,9 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; case 'b': +#if _MSVCR_VER>=140 + case 'h': +#endif if(mstm->tm_mon<0 || mstm->tm_mon>11) goto einval_error; if(!strftime_str(str, &ret, max, time_data->str.names.short_mon[mstm->tm_mon])) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index aecbc9dca52..cbdfa97c128 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -27,6 +27,7 @@ #include <sys/stat.h> #include <share.h> #include <fcntl.h> +#include <locale.h> #include <time.h> #include <direct.h> @@ -938,6 +939,12 @@ static void test_strftime(void) retA = p_strftime(bufA, sizeof(bufA), "%#T", &epoch); ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); + + setlocale(LC_TIME, "C"); + + retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); } static LONG* get_failures_counter(HANDLE *map) -- 2.21.0

3 2

[PATCH] msvcrt: Implement %h format for strftime
by Vijay Kiran Kamuju 04 Oct '19

04 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 3 +++ dlls/ucrtbase/tests/misc.c | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 9795c92baf8..7eea78367db 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -628,6 +628,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%h", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index cbffd77f32e..6108ad17cce 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1142,6 +1142,9 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; case 'b': +#if _MSVCR_VER>=140 + case 'h': +#endif if(mstm->tm_mon<0 || mstm->tm_mon>11) goto einval_error; if(!strftime_str(str, &ret, max, time_data->str.names.short_mon[mstm->tm_mon])) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index aecbc9dca52..61b18115819 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -938,6 +938,12 @@ static void test_strftime(void) retA = p_strftime(bufA, sizeof(bufA), "%#T", &epoch); ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); + + setlocale(LC_TIME, "C"); + + retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); } static LONG* get_failures_counter(HANDLE *map) -- 2.21.0

2 1

[PATCH v2 1/5] strmbase: Move tracking of the stream start time to the renderer.
by Zebediah Figura 04 Oct '19

04 Oct '19

Only renderers should ever need to care about this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 6 +++--- dlls/strmbase/renderer.c | 10 +++++----- dlls/strmbase/transform.c | 3 --- dlls/winegstreamer/gstdemux.c | 5 ----- dlls/wineqtdecoder/qtsplitter.c | 1 - include/wine/strmbase.h | 2 +- 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index b6eb7ba2587..d3c382f1663 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -158,10 +158,10 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write if (This->renderer.filter.pClock == &This->IReferenceClock_iface) { max_lag = min_lag; cur = This->play_time + time_from_pos(This, playpos); - cur -= This->renderer.filter.rtStreamStart; + cur -= This->renderer.stream_start; } else if (This->renderer.filter.pClock) { IReferenceClock_GetTime(This->renderer.filter.pClock, &cur); - cur -= This->renderer.filter.rtStreamStart; + cur -= This->renderer.stream_start; } else write_at = -1; @@ -384,7 +384,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam REFERENCE_TIME jitter, now = 0; Quality q; IReferenceClock_GetTime(This->renderer.filter.pClock, &now); - jitter = now - This->renderer.filter.rtStreamStart - tStart; + jitter = now - This->renderer.stream_start - tStart; if (jitter <= -DSoundRenderer_Max_Fill) jitter += DSoundRenderer_Max_Fill; else if (jitter < 0) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 25534154e95..7d8420e73c1 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -363,11 +363,11 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp IReferenceClock_GetTime(This->filter.pClock, &now); - if (now - This->filter.rtStreamStart - start <= -10000) + if (now - This->stream_start - start <= -10000) { HANDLE handles[2] = {This->advise_event, This->flush_event}; - IReferenceClock_AdviseTime(This->filter.pClock, This->filter.rtStreamStart, + IReferenceClock_AdviseTime(This->filter.pClock, This->stream_start, start, (HEVENT)This->advise_event, &cookie); LeaveCriticalSection(&This->csRenderLock); @@ -429,7 +429,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->csRenderLock); - This->filter.rtStreamStart = tStart; + This->stream_start = tStart; if (This->filter.state == State_Running) goto out; @@ -440,7 +440,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) This->sink.end_of_stream = FALSE; } - QualityControlRender_Start(This->qcimpl, This->filter.rtStreamStart); + QualityControlRender_Start(This->qcimpl, This->stream_start); if (This->sink.pin.peer && This->pFuncsTable->renderer_start_stream) This->pFuncsTable->renderer_start_stream(This); if (This->filter.state == State_Stopped) @@ -547,7 +547,7 @@ HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); - QualityControlRender_Start(iface->qcimpl, iface->filter.rtStreamStart); + QualityControlRender_Start(iface->qcimpl, iface->stream_start); RendererPosPassThru_ResetMediaTime(iface->pPosition); ResetEvent(iface->flush_event); return S_OK; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 77de1227dd9..abf5ed34b3c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -268,10 +268,7 @@ static HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME } if (SUCCEEDED(hr)) - { - This->filter.rtStreamStart = tStart; This->filter.state = State_Running; - } } LeaveCriticalSection(&This->csReceive); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 66b7114c520..4a685b1bd5a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1406,10 +1406,6 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) if (!This->container) return VFW_E_NOT_CONNECTED; - EnterCriticalSection(&This->filter.csFilter); - This->filter.rtStreamStart = tStart; - LeaveCriticalSection(&This->filter.csFilter); - gst_element_get_state(This->container, &now, NULL, -1); if (now == GST_STATE_PLAYING) return S_OK; @@ -1423,7 +1419,6 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) EnterCriticalSection(&This->filter.csFilter); gst_element_set_state(This->container, GST_STATE_PLAYING); - This->filter.rtStreamStart = tStart; for (i = 0; i < This->cStreams; i++) { hr = BaseOutputPinImpl_Active(&This->ppPins[i]->pin); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 218ed5dad70..99539e5c895 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -753,7 +753,6 @@ static HRESULT WINAPI QT_Run(IBaseFilter *iface, REFERENCE_TIME tStart) TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->csReceive); - This->filter.rtStreamStart = tStart; if (This->pVideo_Pin) hr = BaseOutputPinImpl_Active(&This->pVideo_Pin->pin); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 5eaf204f471..99d680a365b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -155,7 +155,6 @@ struct strmbase_filter CRITICAL_SECTION csFilter; FILTER_STATE state; - REFERENCE_TIME rtStreamStart; IReferenceClock * pClock; FILTER_INFO filterInfo; CLSID clsid; @@ -538,6 +537,7 @@ typedef struct BaseRendererTag * to immediately unblock the streaming thread. */ HANDLE flush_event; IMediaSample *pMediaSample; + REFERENCE_TIME stream_start; IQualityControl *pQSink; struct QualityControlImpl *qcimpl; -- 2.23.0

2 8

[PATCH vkd3d 1/2] vkd3d-shader: Optimize get_opcode_info with direct opcode_table access.
by Rémi Bernon 04 Oct '19

04 Oct '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The shader_sm4_read_instruction function shows up in perf report when running SOTTR on Intel because of this loop. The commented enumeration entries are mostly here to help the reader validate that the opcode_table matches the enumeration. libs/vkd3d-shader/dxbc.c | 54 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 98c51e42..794c6c66 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -117,10 +117,13 @@ enum vkd3d_sm4_opcode { + VKD3D_SM4_OP_INVALID = -1, VKD3D_SM4_OP_ADD = 0x00, VKD3D_SM4_OP_AND = 0x01, VKD3D_SM4_OP_BREAK = 0x02, VKD3D_SM4_OP_BREAKC = 0x03, + /* VKD3D_SM4_OP_? = 0x04, */ + /* VKD3D_SM4_OP_? = 0x05, */ VKD3D_SM4_OP_CASE = 0x06, VKD3D_SM4_OP_CONTINUE = 0x07, VKD3D_SM4_OP_CONTINUEC = 0x08, @@ -135,6 +138,7 @@ enum vkd3d_sm4_opcode VKD3D_SM4_OP_DP4 = 0x11, VKD3D_SM4_OP_ELSE = 0x12, VKD3D_SM4_OP_EMIT = 0x13, + /* VKD3D_SM4_OP_? = 0x14, */ VKD3D_SM4_OP_ENDIF = 0x15, VKD3D_SM4_OP_ENDLOOP = 0x16, VKD3D_SM4_OP_ENDSWITCH = 0x17, @@ -196,6 +200,7 @@ enum vkd3d_sm4_opcode VKD3D_SM4_OP_ULT = 0x4f, VKD3D_SM4_OP_UGE = 0x50, VKD3D_SM4_OP_UMUL = 0x51, + /* VKD3D_SM4_OP_? = 0x52, */ VKD3D_SM4_OP_UMAX = 0x53, VKD3D_SM4_OP_UMIN = 0x54, VKD3D_SM4_OP_USHR = 0x55, @@ -215,20 +220,24 @@ enum vkd3d_sm4_opcode VKD3D_SM4_OP_DCL_INPUT_PS_SGV = 0x63, VKD3D_SM4_OP_DCL_INPUT_PS_SIV = 0x64, VKD3D_SM4_OP_DCL_OUTPUT = 0x65, + /* VKD3D_SM4_OP_? = 0x66, */ VKD3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, VKD3D_SM4_OP_DCL_TEMPS = 0x68, VKD3D_SM4_OP_DCL_INDEXABLE_TEMP = 0x69, VKD3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, + /* VKD3D_SM4_OP_? = 0x6b, */ VKD3D_SM4_OP_LOD = 0x6c, VKD3D_SM4_OP_GATHER4 = 0x6d, VKD3D_SM4_OP_SAMPLE_POS = 0x6e, VKD3D_SM4_OP_SAMPLE_INFO = 0x6f, + /* VKD3D_SM5_OP_? = 0x70, */ VKD3D_SM5_OP_HS_DECLS = 0x71, VKD3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, VKD3D_SM5_OP_HS_FORK_PHASE = 0x73, VKD3D_SM5_OP_HS_JOIN_PHASE = 0x74, VKD3D_SM5_OP_EMIT_STREAM = 0x75, VKD3D_SM5_OP_CUT_STREAM = 0x76, + /* VKD3D_SM5_OP_? = 0x77, */ VKD3D_SM5_OP_FCALL = 0x78, VKD3D_SM5_OP_BUFINFO = 0x79, VKD3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, @@ -241,6 +250,8 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_RCP = 0x81, VKD3D_SM5_OP_F32TOF16 = 0x82, VKD3D_SM5_OP_F16TOF32 = 0x83, + /* VKD3D_SM5_OP_? = 0x84, */ + /* VKD3D_SM5_OP_? = 0x85, */ VKD3D_SM5_OP_COUNTBITS = 0x86, VKD3D_SM5_OP_FIRSTBIT_HI = 0x87, VKD3D_SM5_OP_FIRSTBIT_LO = 0x88, @@ -298,6 +309,19 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, + /* VKD3D_SM5_OP_? = 0xbf, */ + /* VKD3D_SM5_OP_? = 0xc0, */ + /* VKD3D_SM5_OP_? = 0xc1, */ + /* VKD3D_SM5_OP_? = 0xc2, */ + /* VKD3D_SM5_OP_? = 0xc3, */ + /* VKD3D_SM5_OP_? = 0xc4, */ + /* VKD3D_SM5_OP_? = 0xc5, */ + /* VKD3D_SM5_OP_? = 0xc6, */ + /* VKD3D_SM5_OP_? = 0xc7, */ + /* VKD3D_SM5_OP_? = 0xc8, */ + /* VKD3D_SM5_OP_? = 0xc9, */ + /* VKD3D_SM5_OP_? = 0xca, */ + /* VKD3D_SM5_OP_? = 0xcb, */ VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, @@ -947,6 +971,8 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM4_OP_BREAK, VKD3DSIH_BREAK, "", ""}, {VKD3D_SM4_OP_BREAKC, VKD3DSIH_BREAKP, "", "u", shader_sm4_read_conditional_op}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, {VKD3D_SM4_OP_CASE, VKD3DSIH_CASE, "", "u"}, {VKD3D_SM4_OP_CONTINUE, VKD3DSIH_CONTINUE, "", ""}, {VKD3D_SM4_OP_CONTINUEC, VKD3DSIH_CONTINUEP, "", "u", @@ -963,6 +989,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM4_OP_DP4, VKD3DSIH_DP4, "f", "ff"}, {VKD3D_SM4_OP_ELSE, VKD3DSIH_ELSE, "", ""}, {VKD3D_SM4_OP_EMIT, VKD3DSIH_EMIT, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, {VKD3D_SM4_OP_ENDIF, VKD3DSIH_ENDIF, "", ""}, {VKD3D_SM4_OP_ENDLOOP, VKD3DSIH_ENDLOOP, "", ""}, {VKD3D_SM4_OP_ENDSWITCH, VKD3DSIH_ENDSWITCH, "", ""}, @@ -1027,6 +1054,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM4_OP_ULT, VKD3DSIH_ULT, "u", "uu"}, {VKD3D_SM4_OP_UGE, VKD3DSIH_UGE, "u", "uu"}, {VKD3D_SM4_OP_UMUL, VKD3DSIH_UMUL, "uu", "uu"}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, {VKD3D_SM4_OP_UMAX, VKD3DSIH_UMAX, "u", "uu"}, {VKD3D_SM4_OP_UMIN, VKD3DSIH_UMIN, "u", "uu"}, {VKD3D_SM4_OP_USHR, VKD3DSIH_USHR, "u", "uu"}, @@ -1060,6 +1088,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_input_ps_siv}, {VKD3D_SM4_OP_DCL_OUTPUT, VKD3DSIH_DCL_OUTPUT, "", "", shader_sm4_read_declaration_dst}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, {VKD3D_SM4_OP_DCL_OUTPUT_SIV, VKD3DSIH_DCL_OUTPUT_SIV, "", "", shader_sm4_read_declaration_register_semantic}, {VKD3D_SM4_OP_DCL_TEMPS, VKD3DSIH_DCL_TEMPS, "", "", @@ -1068,16 +1097,19 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_indexable_temp}, {VKD3D_SM4_OP_DCL_GLOBAL_FLAGS, VKD3DSIH_DCL_GLOBAL_FLAGS, "", "", shader_sm4_read_dcl_global_flags}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, {VKD3D_SM4_OP_LOD, VKD3DSIH_LOD, "f", "fRS"}, {VKD3D_SM4_OP_GATHER4, VKD3DSIH_GATHER4, "u", "fRS"}, {VKD3D_SM4_OP_SAMPLE_POS, VKD3DSIH_SAMPLE_POS, "f", "Ru"}, {VKD3D_SM4_OP_SAMPLE_INFO, VKD3DSIH_SAMPLE_INFO, "f", "R"}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, {VKD3D_SM5_OP_HS_DECLS, VKD3DSIH_HS_DECLS, "", ""}, {VKD3D_SM5_OP_HS_CONTROL_POINT_PHASE, VKD3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {VKD3D_SM5_OP_HS_FORK_PHASE, VKD3DSIH_HS_FORK_PHASE, "", ""}, {VKD3D_SM5_OP_HS_JOIN_PHASE, VKD3DSIH_HS_JOIN_PHASE, "", ""}, {VKD3D_SM5_OP_EMIT_STREAM, VKD3DSIH_EMIT_STREAM, "", "f"}, {VKD3D_SM5_OP_CUT_STREAM, VKD3DSIH_CUT_STREAM, "", "f"}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, {VKD3D_SM5_OP_FCALL, VKD3DSIH_FCALL, "", "O", shader_sm5_read_fcall}, {VKD3D_SM5_OP_BUFINFO, VKD3DSIH_BUFINFO, "i", "U"}, @@ -1091,6 +1123,8 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_RCP, VKD3DSIH_RCP, "f", "f"}, {VKD3D_SM5_OP_F32TOF16, VKD3DSIH_F32TOF16, "u", "f"}, {VKD3D_SM5_OP_F16TOF32, VKD3DSIH_F16TOF32, "f", "u"}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, {VKD3D_SM5_OP_COUNTBITS, VKD3DSIH_COUNTBITS, "u", "u"}, {VKD3D_SM5_OP_FIRSTBIT_HI, VKD3DSIH_FIRSTBIT_HI, "u", "u"}, {VKD3D_SM5_OP_FIRSTBIT_LO, VKD3DSIH_FIRSTBIT_LO, "u", "u"}, @@ -1168,6 +1202,19 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_IMM_ATOMIC_UMIN, VKD3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, + {VKD3D_SM4_OP_INVALID, VKD3DSIH_NOP, "", ""}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", @@ -1220,11 +1267,10 @@ static const enum vkd3d_shader_register_type register_type_table[] = static const struct vkd3d_sm4_opcode_info *get_opcode_info(enum vkd3d_sm4_opcode opcode) { - unsigned int i; - - for (i = 0; i < sizeof(opcode_table) / sizeof(*opcode_table); ++i) + if (opcode < ARRAY_SIZE(opcode_table) && opcode_table[opcode].opcode != VKD3D_SM4_OP_INVALID) { - if (opcode == opcode_table[i].opcode) return &opcode_table[i]; + assert(opcode_table[opcode].opcode == opcode); + return &opcode_table[opcode]; } return NULL; -- 2.23.0

2 4

[PATCH] dmime/tests: Break out of loop if we fail to get segment pointer
by Alistair Leslie-Hughes 04 Oct '19

04 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- This stop the crash which can be seen. Strange that it worked yesterday. https://source.winehq.org/patches/data/171018 dlls/dmime/tests/performance.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index e4e5dc1b58..962a632875 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -454,6 +454,11 @@ static void test_notification_type(void) hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); ok(hr == S_OK, "Failed: %08x\n", hr); + if (FAILED(hr)) + { + IDirectMusicSegmentState8_Release(segmentstate); + break; + } hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); ok(hr == S_OK, "Failed: %08x\n", hr); -- 2.17.1

1 0

[PATCH v2 1/5] strmbase: Move tracking of the stream start time to the renderer.
by Zebediah Figura 04 Oct '19

04 Oct '19

Only renderers should ever need to care about this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 6 +++--- dlls/strmbase/renderer.c | 10 +++++----- dlls/strmbase/transform.c | 3 --- dlls/winegstreamer/gstdemux.c | 5 ----- dlls/wineqtdecoder/qtsplitter.c | 1 - include/wine/strmbase.h | 2 +- 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index b6eb7ba2587..d3c382f1663 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -158,10 +158,10 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write if (This->renderer.filter.pClock == &This->IReferenceClock_iface) { max_lag = min_lag; cur = This->play_time + time_from_pos(This, playpos); - cur -= This->renderer.filter.rtStreamStart; + cur -= This->renderer.stream_start; } else if (This->renderer.filter.pClock) { IReferenceClock_GetTime(This->renderer.filter.pClock, &cur); - cur -= This->renderer.filter.rtStreamStart; + cur -= This->renderer.stream_start; } else write_at = -1; @@ -384,7 +384,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam REFERENCE_TIME jitter, now = 0; Quality q; IReferenceClock_GetTime(This->renderer.filter.pClock, &now); - jitter = now - This->renderer.filter.rtStreamStart - tStart; + jitter = now - This->renderer.stream_start - tStart; if (jitter <= -DSoundRenderer_Max_Fill) jitter += DSoundRenderer_Max_Fill; else if (jitter < 0) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 25534154e95..7d8420e73c1 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -363,11 +363,11 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp IReferenceClock_GetTime(This->filter.pClock, &now); - if (now - This->filter.rtStreamStart - start <= -10000) + if (now - This->stream_start - start <= -10000) { HANDLE handles[2] = {This->advise_event, This->flush_event}; - IReferenceClock_AdviseTime(This->filter.pClock, This->filter.rtStreamStart, + IReferenceClock_AdviseTime(This->filter.pClock, This->stream_start, start, (HEVENT)This->advise_event, &cookie); LeaveCriticalSection(&This->csRenderLock); @@ -429,7 +429,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->csRenderLock); - This->filter.rtStreamStart = tStart; + This->stream_start = tStart; if (This->filter.state == State_Running) goto out; @@ -440,7 +440,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) This->sink.end_of_stream = FALSE; } - QualityControlRender_Start(This->qcimpl, This->filter.rtStreamStart); + QualityControlRender_Start(This->qcimpl, This->stream_start); if (This->sink.pin.peer && This->pFuncsTable->renderer_start_stream) This->pFuncsTable->renderer_start_stream(This); if (This->filter.state == State_Stopped) @@ -547,7 +547,7 @@ HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); - QualityControlRender_Start(iface->qcimpl, iface->filter.rtStreamStart); + QualityControlRender_Start(iface->qcimpl, iface->stream_start); RendererPosPassThru_ResetMediaTime(iface->pPosition); ResetEvent(iface->flush_event); return S_OK; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 77de1227dd9..abf5ed34b3c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -268,10 +268,7 @@ static HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME } if (SUCCEEDED(hr)) - { - This->filter.rtStreamStart = tStart; This->filter.state = State_Running; - } } LeaveCriticalSection(&This->csReceive); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 66b7114c520..4a685b1bd5a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1406,10 +1406,6 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) if (!This->container) return VFW_E_NOT_CONNECTED; - EnterCriticalSection(&This->filter.csFilter); - This->filter.rtStreamStart = tStart; - LeaveCriticalSection(&This->filter.csFilter); - gst_element_get_state(This->container, &now, NULL, -1); if (now == GST_STATE_PLAYING) return S_OK; @@ -1423,7 +1419,6 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) EnterCriticalSection(&This->filter.csFilter); gst_element_set_state(This->container, GST_STATE_PLAYING); - This->filter.rtStreamStart = tStart; for (i = 0; i < This->cStreams; i++) { hr = BaseOutputPinImpl_Active(&This->ppPins[i]->pin); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 218ed5dad70..99539e5c895 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -753,7 +753,6 @@ static HRESULT WINAPI QT_Run(IBaseFilter *iface, REFERENCE_TIME tStart) TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->csReceive); - This->filter.rtStreamStart = tStart; if (This->pVideo_Pin) hr = BaseOutputPinImpl_Active(&This->pVideo_Pin->pin); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 5eaf204f471..99d680a365b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -155,7 +155,6 @@ struct strmbase_filter CRITICAL_SECTION csFilter; FILTER_STATE state; - REFERENCE_TIME rtStreamStart; IReferenceClock * pClock; FILTER_INFO filterInfo; CLSID clsid; @@ -538,6 +537,7 @@ typedef struct BaseRendererTag * to immediately unblock the streaming thread. */ HANDLE flush_event; IMediaSample *pMediaSample; + REFERENCE_TIME stream_start; IQualityControl *pQSink; struct QualityControlImpl *qcimpl; -- 2.23.0

2 7