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

[PATCH 1/2] winhttp/tests: Fix some test failures.
by Hans Leidekker 02 Oct '19

02 Oct '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b005514dfa..552f6ce778 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1139,7 +1139,7 @@ static void test_secure_connection(void) ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); err = GetLastError(); if (!ret && (err == ERROR_WINHTTP_SECURE_FAILURE || err == ERROR_WINHTTP_CANNOT_CONNECT || - err == ERROR_WINHTTP_TIMEOUT)) + err == ERROR_WINHTTP_TIMEOUT || err == SEC_E_ILLEGAL_MESSAGE)) { skip("secure connection failed, skipping remaining secure tests\n"); goto cleanup; @@ -1172,6 +1172,11 @@ static void test_secure_connection(void) } ret = WinHttpReceiveResponse(req, NULL); + if (!ret && GetLastError() == ERROR_WINHTTP_CONNECTION_ERROR) + { + skip("connection error, skipping remaining secure tests\n"); + goto cleanup; + } ok(ret, "failed to receive response %u\n", GetLastError()); available_size = 0; @@ -3780,9 +3785,9 @@ static void test_IWinHttpRequest(int port) V_VT( &data ) = VT_BSTR; V_BSTR( &data ) = SysAllocString( test_dataW ); hr = IWinHttpRequest_Send( req, data ); - ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32(ERROR_WINHTTP_INVALID_SERVER_RESPONSE)), - "got %08x\n", hr ); + ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %08x\n", hr ); SysFreeString( V_BSTR( &data ) ); + if (hr != S_OK) goto done; hr = IWinHttpRequest_Open( req, NULL, NULL, empty ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -4250,14 +4255,14 @@ static void test_IWinHttpRequest(int port) SysFreeString( url ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE )), "got %08x\n", hr ); - if (hr == S_OK) - { - hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); - SysFreeString( response ); - } + ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ) || + hr == SEC_E_ILLEGAL_MESSAGE /* winxp */, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); + SysFreeString( response ); IWinHttpRequest_Release( req ); @@ -4294,8 +4299,8 @@ static void test_IWinHttpRequest(int port) ok( hr == S_OK, "got %08x\n", hr ); ok( status == HTTP_STATUS_DENIED, "got %d\n", status ); +done: IWinHttpRequest_Release( req ); - CoUninitialize(); } -- 2.20.1

2 1

[PATCH 2/2] winhttp: Propagate request errors in request_wait.
by Hans Leidekker 02 Oct '19

02 Oct '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 409ef68b5a..46a47f3bc2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3799,7 +3799,9 @@ static void CALLBACK wait_status_callback( HINTERNET handle, DWORD_PTR context, request->error = result->dwError; break; } - default: break; + default: + request->error = ERROR_SUCCESS; + break; } SetEvent( request->wait ); } @@ -4012,18 +4014,17 @@ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) switch (err) { case WAIT_OBJECT_0: - ret = ERROR_SUCCESS; + ret = request->error; break; case WAIT_TIMEOUT: ret = ERROR_TIMEOUT; break; - case WAIT_FAILED: default: ret = GetLastError(); break; } EnterCriticalSection( &request->cs ); - if (!ret) request->proc_running = FALSE; + if (err == WAIT_OBJECT_0) request->proc_running = FALSE; return ret; } @@ -4547,11 +4548,9 @@ static HRESULT WINAPI winhttp_request_WaitForResponse( err = ERROR_SUCCESS; break; - case ERROR_SUCCESS: + default: if (succeeded) *succeeded = VARIANT_TRUE; break; - - default: break; } LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( err ); -- 2.20.1

2 1

msvcrt: add missing tokens in strftime_helper (except %r)
by Chuck Ricketts 02 Oct '19

02 Oct '19

I've been working on this patch for a few days now to fulfill my bug report (#47809). However, every time I've gone to try to submit it somebody has proposed a commit that I can't see. So, I know that this patch is already outdated but I wanted to drop it here for the record. Some notes on this patch: * I know it's not as trivial as most of the other stuff going on this file. Sorry about that, but I couldn't think of a cleaner way to do it. I don't think I did anything unorthodox as far as code calls, but I packaged all the ISO 8601 stuff in a block with its own variables to keep it self-contained. * This is my first Wine patch (and only my second ever software patch) so if you have some constructive criticism, I'm all for it. >From a5e1742f944a5c857283b33653265a8d702b06fc Mon Sep 17 00:00:00 2001 From: Chuck Ricketts <chuck.the.pc.guy+winehq(a)gmail.com> Date: Tue, 1 Oct 2019 01:28:07 -0500 Subject: [PATCH] msvcrt: add missing tokens in strftime_helper (except %r) --- dlls/msvcrt/time.c | 264 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 264 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index c72b3ed21e..cfe1463996 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1141,6 +1141,7 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_str(str, &ret, max, time_data->str.names.wday[mstm->tm_wday])) return 0; break; + case 'h': case 'b': if(mstm->tm_mon<0 || mstm->tm_mon>11) goto einval_error; @@ -1153,10 +1154,142 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_str(str, &ret, max, time_data->str.names.mon[mstm->tm_mon])) return 0; break; + case 'C': + if(!strftime_int(str, &ret, max, (mstm->tm_year+1900)/100, alternate ? 0: 2, 0, 99)) + return 0; + break; case 'd': if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; break; + case 'D': + { + char* tmp_str = 0; + + if(mstm->tm_mon<0 || mstm->tm_mon>11) + goto einval_error; + if(mstm->tm_mday<1 || mstm->tm_mday>31) + goto einval_error; + + if(!(tmp_str == MSVCRT_malloc(9))) + return 0; + MSVCRT__snprintf(tmp_str, 9, "%0*d/%0*d/%0*d", 2, mstm->tm_mon, 2, mstm->tm_mday, + 2, (mstm->tm_year+1900)%100); + if(!strftime_str(str, &ret, max, tmp_str)) { + MSVCRT_free(tmp_str); + return 0; + } + MSVCRT_free(tmp_str); + } + break; + case 'e': + if(mstm->tm_mday<1 || mstm->tm_mday>31) + goto einval_error; + if(!strftime_int(str, &ret, max, mstm->tm_mday, 2, 1, 31)) + return 0; + if(str[ret-2] == '0') + str[ret-2] = ' '; + break; + case 'F': + { + char* tmp_str = 0; + + if(mstm->tm_mon<0 || mstm->tm_mon>11) + goto einval_error; + if(mstm->tm_mday<1 || mstm->tm_mday>31) + goto einval_error; + + if(!(tmp_str = MSVCRT_malloc(12))) + return 0; + + MSVCRT__snprintf(tmp_str, 12, "%d-%0*d-%0*d", mstm->tm_year+1900, 2, + mstm->tm_mon+1, 2, mstm->tm_mday); + if(!strftime_str(str, &ret, max, tmp_str)) { + MSVCRT_free(tmp_str); + return 0; + } + MSVCRT_free(tmp_str); + } + break; + case 'G': + { +#ifdef _WIN64 + MSVCRT___time64_t firstmontime = 0; + MSVCRT___time64_t temp_time = 0; +#else + MSVCRT___time32_t firstmontime = 0; + MSVCRT___time32_t temp_time = 0; +#endif + struct MSVCRT_tm* tmp_mstm = 0; + struct MSVCRT_tm* oldstate = 0; + struct MSVCRT_tm* firstmontm = 0; + int iso8601yr = -1; + int iso8601wk = -1; + char* tmp_str = 0; + + if(!(tmp_mstm = MSVCRT_malloc(sizeof(struct MSVCRT_tm)))) + return 0; + if(msvcrt_get_thread_data()->time_buffer && + !(oldstate = MSVCRT_malloc(sizeof(struct MSVCRT_tm)))) { + MSVCRT_free(tmp_mstm); + return 0; + } + + if(oldstate) + memcpy(oldstate, msvcrt_get_thread_data()->time_buffer, + sizeof(struct MSVCRT_tm)); + + memcpy(tmp_mstm, mstm, sizeof(struct MSVCRT_tm)); + + temp_time = MSVCRT_mktime(tmp_mstm); + MSVCRT_free(tmp_mstm); + tmp_mstm = MSVCRT_gmtime(&temp_time); + + iso8601yr = tmp_mstm->tm_year + 1900; + iso8601wk = (tmp_mstm->tm_yday+1-(tmp_mstm->tm_wday==0?7:tmp_mstm->tm_wday)+10)/7; + if(iso8601wk == 53) { + if(!(firstmontm = MSVCRT_malloc(sizeof(struct MSVCRT_tm)))) { + MSVCRT_free(oldstate); + return 0; + } + memset(firstmontm, '\0', sizeof(struct MSVCRT_tm)); + firstmontm->tm_mon = 0; + firstmontm->tm_mday = 4; + firstmontm->tm_year = tmp_mstm->tm_year+1; + firstmontime = MSVCRT_mktime(firstmontm); + MSVCRT_free(firstmontm); + firstmontm = MSVCRT_gmtime(&firstmontime); + firstmontime = firstmontime-((firstmontm->tm_wday-1==-1?6:firstmontm->tm_wday-1)*86400); + if(firstmontime <= temp_time) + iso8601yr += 1; + } + if(iso8601wk == 0) + iso8601yr -= 1; + + if(!(tmp_str = MSVCRT_malloc(6))) { + MSVCRT_free(oldstate); + return 0; + } + memset(tmp_str, '\0', 6); + + MSVCRT__snprintf(tmp_str, 6, "%d", iso8601yr); + if(!strftime_str(str, &ret, max, tmp_str)) { + if(oldstate) { + memcpy(msvcrt_get_thread_data()->time_buffer, oldstate, + sizeof(struct MSVCRT_tm)); + MSVCRT_free(oldstate); + } + MSVCRT_free(tmp_str); + return 0; + } + if(oldstate) { + memcpy(msvcrt_get_thread_data()->time_buffer, oldstate, + sizeof(struct MSVCRT_tm)); + MSVCRT_free(oldstate); + } + MSVCRT_free(tmp_str); + } + break; case 'H': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; @@ -1217,6 +1350,137 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; #endif + case 'u': + { +#ifdef _WIN64 + MSVCRT___time64_t tmp_time = 0; +#else + MSVCRT___time32_t tmp_time = 0; +#endif + struct MSVCRT_tm* tmp_mstm = 0; + struct MSVCRT_tm* oldstate = 0; + + if(!(tmp_mstm = MSVCRT_malloc(sizeof(struct MSVCRT_tm)))) + return 0; + if( msvcrt_get_thread_data()->time_buffer && + !(oldstate = MSVCRT_malloc(sizeof(struct MSVCRT_tm)))) { + MSVCRT_free(tmp_mstm); + return 0; + } + + if( oldstate ) + memcpy(oldstate, msvcrt_get_thread_data()->time_buffer, + sizeof(struct MSVCRT_tm)); + memcpy(tmp_mstm, mstm, sizeof(struct MSVCRT_tm)); + + tmp_time = MSVCRT_mktime(tmp_mstm); + MSVCRT_free(tmp_mstm); + tmp_mstm = MSVCRT_gmtime(&tmp_time); + + if(!strftime_int(str, &ret, max, (tmp_mstm->tm_wday-1==-1?6:tmp_mstm->tm_wday-1)+1, + 0, 1, 7)) { + if( oldstate ) { + memcpy(msvcrt_get_thread_data()->time_buffer, oldstate, + sizeof(struct MSVCRT_tm)); + MSVCRT_free(oldstate); + } + return 0; + } + + if( oldstate ) { + memcpy(msvcrt_get_thread_data()->time_buffer, oldstate, + sizeof(struct MSVCRT_tm)); + MSVCRT_free(oldstate); + } + } + break; + case 'V': + { +#ifdef _WIN64 + MSVCRT___time64_t tmp_time = 0; + MSVCRT___time64_t tmp_time_mon = 0; +#else + MSVCRT___time32_t tmp_time = 0; + MSVCRT___time32_t tmp_time_mon = 0; +#endif + int iso8601wk; + + struct MSVCRT_tm* tmp_mstm = 0; + struct MSVCRT_tm* oldstate = 0; + + if(!(tmp_mstm = MSVCRT_malloc(sizeof(struct MSVCRT_tm)))) + return 0; + if(msvcrt_get_thread_data()->time_buffer && + !(oldstate = MSVCRT_malloc(sizeof(struct MSVCRT_tm)))) { + MSVCRT_free(tmp_mstm); + return 0; + } + + if( oldstate ) + memcpy(oldstate, msvcrt_get_thread_data()->time_buffer, + sizeof(struct MSVCRT_tm)); + + memcpy(tmp_mstm, mstm, sizeof(struct MSVCRT_tm)); + + tmp_time = MSVCRT_mktime(tmp_mstm); + MSVCRT_free(tmp_mstm); + tmp_mstm = MSVCRT_gmtime(&tmp_time); + + iso8601wk = ((tmp_mstm->tm_yday+1-(tmp_mstm->tm_wday==0?7:tmp_mstm->tm_wday)+10)/7); + if (iso8601wk == 53 ) { + if(!(tmp_mstm = MSVCRT_malloc(sizeof(struct MSVCRT_tm)))) { + if(oldstate) + MSVCRT_free(oldstate); + return 0; + } + + memset(tmp_mstm, '\0', sizeof(struct MSVCRT_tm)); + + tmp_mstm->tm_mday = 4; + tmp_mstm->tm_mon = 0; + tmp_mstm->tm_year = (mstm->tm_year+1); + tmp_time_mon = MSVCRT_mktime(tmp_mstm); + MSVCRT_free(tmp_mstm); + tmp_time_mon = tmp_time_mon-((tmp_mstm->tm_wday-1==-1?6:tmp_mstm->tm_wday-1)*86400); + if(tmp_time_mon <= tmp_time) + iso8601wk = 1; + else + iso8601wk = 53; + } + if(iso8601wk == 0) { + if(!(tmp_mstm = MSVCRT_malloc(sizeof(struct MSVCRT_tm)))) { + if(oldstate) + MSVCRT_free(oldstate); + return 0; + } + + memset(tmp_mstm, '\0', sizeof(struct MSVCRT_tm)); + + tmp_mstm->tm_mday = 4; + tmp_mstm->tm_mon = 0; + tmp_mstm->tm_year = mstm->tm_year; + tmp_time_mon = MSVCRT_mktime(tmp_mstm); + tmp_time_mon = (tmp_time_mon-((tmp_mstm->tm_wday-1==-1?6:tmp_mstm->tm_wday-1)*86400))-604800; + MSVCRT_free(tmp_mstm); + tmp_mstm = MSVCRT_gmtime(&tmp_time_mon); + iso8601wk = (tmp_mstm->tm_yday+1-(tmp_mstm->tm_wday==0?7:tmp_mstm->tm_wday)+10)/7; + } + + if(!strftime_int(str, &ret, max, iso8601wk, 2, 0, 53)) { + if( oldstate ) { + memcpy(msvcrt_get_thread_data()->time_buffer, oldstate, + sizeof(struct MSVCRT_tm)); + MSVCRT_free(oldstate); + } + return 0; + } + if( oldstate ) { + memcpy(msvcrt_get_thread_data()->time_buffer, oldstate, + sizeof(struct MSVCRT_tm)); + MSVCRT_free(oldstate); + } + } + break; case 'w': if(!strftime_int(str, &ret, max, mstm->tm_wday, 0, 0, 6)) return 0; -- 2.17.1

3 2

[PATCH] msscript.ocx: Fix the idl output parameters.
by Gabriel Ivăncescu 02 Oct '19

02 Oct '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.idl | 6 +++--- dlls/msscript.ocx/tests/msscript.idl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msscript.ocx/msscript.idl b/dlls/msscript.ocx/msscript.idl index efc00ff..715b257 100644 --- a/dlls/msscript.ocx/msscript.idl +++ b/dlls/msscript.ocx/msscript.idl @@ -63,7 +63,7 @@ library MSScriptControl ] interface IScriptProcedureCollection : IDispatch { [id(DISPID_NEWENUM), propget] - HRESULT _NewEnum([out, retval] IUnknown *ppenumProcedures); + HRESULT _NewEnum([out, retval] IUnknown **ppenumProcedures); [id(DISPID_VALUE), propget] HRESULT Item( @@ -87,7 +87,7 @@ library MSScriptControl HRESULT Name([out, retval] BSTR *pbstrName); [id(0x03e8), propget] - HRESULT CodeObject([out, retval] IDispatch *ppdispObject); + HRESULT CodeObject([out, retval] IDispatch **ppdispObject); [id(0x03e9), propget] HRESULT Procedures([out, retval] IScriptProcedureCollection **ppdispProcedures); @@ -120,7 +120,7 @@ library MSScriptControl ] interface IScriptModuleCollection : IDispatch { [id(DISPID_NEWENUM), propget] - HRESULT _NewEnum([out, retval] IUnknown *ppenumContexts); + HRESULT _NewEnum([out, retval] IUnknown **ppenumContexts); [id(DISPID_VALUE), propget] HRESULT Item( diff --git a/dlls/msscript.ocx/tests/msscript.idl b/dlls/msscript.ocx/tests/msscript.idl index c8929be..1f87f31 100644 --- a/dlls/msscript.ocx/tests/msscript.idl +++ b/dlls/msscript.ocx/tests/msscript.idl @@ -63,7 +63,7 @@ library MSScriptControl ] interface IScriptProcedureCollection : IDispatch { [id(DISPID_NEWENUM), propget] - HRESULT _NewEnum([out, retval] IUnknown *ppenumProcedures); + HRESULT _NewEnum([out, retval] IUnknown **ppenumProcedures); [id(DISPID_VALUE), propget] HRESULT Item( @@ -87,7 +87,7 @@ library MSScriptControl HRESULT Name([out, retval] BSTR *pbstrName); [id(0x03e8), propget] - HRESULT CodeObject([out, retval] IDispatch *ppdispObject); + HRESULT CodeObject([out, retval] IDispatch **ppdispObject); [id(0x03e9), propget] HRESULT Procedures([out, retval] IScriptProcedureCollection **ppdispProcedures); @@ -120,7 +120,7 @@ library MSScriptControl ] interface IScriptModuleCollection : IDispatch { [id(DISPID_NEWENUM), propget] - HRESULT _NewEnum([out, retval] IUnknown *ppenumContexts); + HRESULT _NewEnum([out, retval] IUnknown **ppenumContexts); [id(DISPID_VALUE), propget] HRESULT Item( -- 2.21.0

1 0

[PATCH] msscript.ocx: Supply the ServiceProvider in IScriptControl::Run.
by Gabriel Ivăncescu 02 Oct '19

02 Oct '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Even though it's a stub for now, it's the reason Windows uses InvokeEx in the first place. Sorry for the oversight. dlls/msscript.ocx/msscript.c | 2 +- dlls/msscript.ocx/tests/msscript.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c4c6485..0086ec2 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1105,7 +1105,7 @@ static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_na else { hr = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_USER_DEFAULT, - DISPATCH_METHOD, &dp, res, NULL, NULL); + DISPATCH_METHOD, &dp, res, NULL, &This->host->IServiceProvider_iface); IDispatchEx_Release(dispex); } } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7693f0b..c835d64 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -329,6 +329,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %u.\n", lcid); ok(wFlags == DISPATCH_METHOD, "unexpected wFlags %u.\n", wFlags); ok(id == 0xdeadbeef, "unexpected id %d.\n", id); + ok(!!pspCaller, "unexpected NULL ServiceProvider.\n"); ok(pdp->cNamedArgs == 0, "unexpected number of named args %u.\n", pdp->cNamedArgs); ok(!pdp->rgdispidNamedArgs, "unexpected named args array %p.\n", pdp->rgdispidNamedArgs); ok(pdp->cArgs == 2, "unexpected number of args %u.\n", pdp->cArgs); -- 2.21.0

1 0

[PATCH 1/2] include: Add IDWriteFontSet3 definition.
by Nikolay Sivov 02 Oct '19

02 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite_3.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 5958e6fb1b..dc8bf0e959 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -84,6 +84,15 @@ typedef enum DWRITE_FONT_AXIS_TAG DWRITE_FONT_AXIS_TAG_ITALIC = 0x6c617469, /* 'ital' */ } DWRITE_FONT_AXIS_TAG; +typedef enum DWRITE_FONT_SOURCE_TYPE +{ + DWRITE_FONT_SOURCE_TYPE_UNKNOWN, + DWRITE_FONT_SOURCE_TYPE_PER_MACHINE, + DWRITE_FONT_SOURCE_TYPE_PER_USER, + DWRITE_FONT_SOURCE_TYPE_APPX_PACKAGE, + DWRITE_FONT_SOURCE_TYPE_REMOTE_FONT_PROVIDER +} DWRITE_FONT_SOURCE_TYPE; + typedef struct DWRITE_FONT_AXIS_VALUE { DWRITE_FONT_AXIS_TAG axisTag; @@ -441,6 +450,18 @@ interface IDWriteFontSet2 : IDWriteFontSet1 HANDLE GetExpirationEvent(); } +[ + local, + object, + uuid(7c073ef2-a7f4-4045-8c32-8ab8ae640f90) +] +interface IDWriteFontSet3 : IDWriteFontSet2 +{ + DWRITE_FONT_SOURCE_TYPE GetFontSourceType(UINT32 index); + UINT32 GetFontSourceNameLength(UINT32 index); + HRESULT GetFontSourceName(UINT32 index, WCHAR *buffer, UINT32 buffer_size); +} + [ local, object, -- 2.23.0

1 1

[v2 PATCH 1/2] msvcrt: Implement %C format for strftime
by Vijay Kiran Kamuju 02 Oct '19

02 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 7 +++++++ dlls/ucrtbase/tests/misc.c | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 016c9775de7..86799c900f7 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%C", 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, "%D", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 450663fd1f5..b9fcde79789 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1153,6 +1153,13 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_str(str, &ret, max, time_data->str.names.mon[mstm->tm_mon])) return 0; break; +#if _MSVCR_VER>=140 + case 'C': + tmp = (1900+mstm->tm_year)/100; + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99)) + return 0; + break; +#endif case 'd': if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c58b6315656..1ba4280a546 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -895,6 +895,10 @@ static void test_strftime(void) char bufA[256]; size_t retA; + retA = p_strftime(bufA, sizeof(bufA), "%C", &epoch); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, "19"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%D", &epoch); ok(retA == 8, "expected 8, got %d\n", (int)retA); ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); -- 2.21.0

2 2

[PATCH 1/2] msvcrt: Implement %C format for strftime
by Vijay Kiran Kamuju 02 Oct '19

02 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 7 +++++++ dlls/ucrtbase/tests/misc.c | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 016c9775de7..86799c900f7 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%C", 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, "%D", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 450663fd1f5..b9fcde79789 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1153,6 +1153,13 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_str(str, &ret, max, time_data->str.names.mon[mstm->tm_mon])) return 0; break; +#if _MSVCR_VER>=140 + case 'C': + tmp = (1900+mstm->tm_year)/100; + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99)) + return 0; + break; +#endif case 'd': if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c58b6315656..1ba4280a546 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -895,6 +895,10 @@ static void test_strftime(void) char bufA[256]; size_t retA; + retA = p_strftime(bufA, sizeof(bufA), "%C", &epoch); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, "19"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%D", &epoch); ok(retA == 8, "expected 8, got %d\n", (int)retA); ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); -- 2.21.0

2 3

[PATCH vkd3d v3 1/2] vkd3d: Avoid relying on void pointer arithmetic.
by Rémi Bernon 02 Oct '19

02 Oct '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index aebe1fa..94eeb50 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1388,7 +1388,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour size = (box.right - box.left) / format->block_width * format->byte_count * format->block_byte_count; for (z = box.front; z < box.back; ++z) { - dst = dst_data + (z - box.front) * dst_slice_pitch; + dst = (BYTE*)dst_data + (z - box.front) * dst_slice_pitch; src = src_data + z * vk_layout.depthPitch + box.top / format->block_height * vk_layout.rowPitch; for (y = box.top; y < box.bottom; y += format->block_height) { -- 2.23.0

1 1

[PATCH v2 1/6] quartz/tests: Add some tests for IPin::EndOfStream() on the video renderer.
by Zebediah Figura 02 Oct '19

02 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Fix test failures. dlls/quartz/tests/videorenderer.c | 139 ++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 3919b419e14..54275cc234a 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -991,6 +991,144 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *grap IMediaControl_Release(control); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + IMediaEvent *eventsrc; + OAFilterState state; + HRESULT hr; + BOOL ret; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* We do not receive an EC_COMPLETE notification until the last sample is + * done rendering. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ret = check_ec_complete(eventsrc, 1600); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS while flushing. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS and then flushing or stopping. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + IMediaEvent_Release(eventsrc); + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -1097,6 +1235,7 @@ static void test_connect_pin(void) test_filter_state(input, graph); test_flushing(pin, input, graph); test_sample_time(pin, input, graph); + test_eos(pin, input, graph); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.23.0

2 8