November 2016 - Wine-commits

Nikolay Sivov : shell32: Limit displayed volume label length to 32.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 960b5996fc61833f7927dcf214e1f95d5539c8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960b5996fc61833f7927dcf21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 28 12:56:52 2016 +0300 shell32: Limit displayed volume label length to 32. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_mycomp.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 4022c8d..d47d2af 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -695,15 +695,12 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, /* long view "lw_name (C:)" */ if (!(dwFlags & SHGDN_FORPARSING)) { - DWORD dwVolumeSerialNumber, dwMaximumComponetLength, dwFileSystemFlags; - WCHAR wszDrive[18] = {0}; static const WCHAR wszOpenBracket[] = {' ','(',0}; static const WCHAR wszCloseBracket[] = {')',0}; + WCHAR wszDrive[32 /* label */ + 6 /* ' (C:)'\0 */] = {0}; - GetVolumeInformationW (pszPath, wszDrive, - sizeof(wszDrive)/sizeof(wszDrive[0]) - 6, - &dwVolumeSerialNumber, - &dwMaximumComponetLength, &dwFileSystemFlags, NULL, 0); + GetVolumeInformationW (pszPath, wszDrive, sizeof(wszDrive)/sizeof(wszDrive[0]) - 5, + NULL, NULL, NULL, NULL, 0); strcatW (wszDrive, wszOpenBracket); lstrcpynW (wszDrive + strlenW(wszDrive), pszPath, 3); strcatW (wszDrive, wszCloseBracket);

1 0

Huw Davies : include: Add new members to WINTRUST_DATA and CRYPT_PROVIDER_DATA.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 9430954c8a7d35ab1372376358b7b41a6451e7b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9430954c8a7d35ab137237635… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 28 13:10:10 2016 +0000 include: Add new members to WINTRUST_DATA and CRYPT_PROVIDER_DATA. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincrypt.h | 22 ++++++++++++++++++++++ include/wintrust.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/include/wincrypt.h b/include/wincrypt.h index 55c9509..88b4b65 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3869,6 +3869,28 @@ typedef struct _CMSG_CTRL_KEY_TRANS_DECRYPT_PARA { DWORD dwRecipientIndex; } CMSG_CTRL_KEY_TRANS_DECRYPT_PARA, *PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA; +typedef struct _CERT_STRONG_SIGN_SERIALIZED_INFO { + DWORD dwFlags; + WCHAR *pwszCNGSignHashAlgids; + WCHAR *pwszCNGPubKeyMinBitLengths; +} CERT_STRONG_SIGN_SERIALIZED_INFO, *PCERT_STRONG_SIGN_SERIALIZED_INFO; + +typedef struct _CERT_STRONG_SIGN_PARA { + DWORD cbSize; + DWORD dwInfoChoice; + union { + void *pvInfo; + CERT_STRONG_SIGN_SERIALIZED_INFO *pSerializedInfo; + char *pszOID; + } DUMMYUNIONNAME; +} CERT_STRONG_SIGN_PARA, *PCERT_STRONG_SIGN_PARA; + +#define CERT_STRONG_SIGN_SERIALIZED_INFO_CHOICE 1 +#define CERT_STRONG_SIGN_OID_INFO_CHOICE 2 + +#define CERT_STRONG_SIGN_ENABLE_CRL_CHECK 0x1 +#define CERT_STRONG_SIGN_ENABLE_OCSP_CHECK 0x2 + typedef BOOL (WINAPI *PFN_CMSG_GEN_CONTENT_ENCRYPT_KEY)( PCMSG_CONTENT_ENCRYPT_INFO pContentEncryptInfo, DWORD dwFlags, void *pvReserved); diff --git a/include/wintrust.h b/include/wintrust.h index 228d868..5da3720 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -116,6 +116,7 @@ typedef struct _WINTRUST_DATA WCHAR* pwszURLReference; DWORD dwProvFlags; DWORD dwUIContext; + struct WINTRUST_SIGNATURE_SETTINGS_ *pSignatureSettings; } WINTRUST_DATA, *PWINTRUST_DATA; #define WTD_STATEACTION_IGNORE 0 @@ -141,6 +142,26 @@ typedef struct _WINTRUST_DATA #define WTD_UICONTEXT_EXECUTE 0 #define WTD_UICONTEXT_INSTALL 1 +typedef struct WINTRUST_SIGNATURE_SETTINGS_ +{ + DWORD cbStruct; + DWORD dwIndex; + DWORD dwFlags; + DWORD cSecondarySigs; + DWORD dwVerifiedSigIndex; + CERT_STRONG_SIGN_PARA *pCryptoPolicy; +} WINTRUST_SIGNATURE_SETTINGS, *PWINTRUST_SIGNATURE_SETTINGS; + +#define WSS_VERIFY_SPECIFIC 0x00000001 +#define WSS_GET_SECONDARY_SIG_COUNT 0x00000002 +#define WSS_VERIFY_SEALING 0x00000004 +#define WSS_INPUT_FLAG_MASK 0x00000007 + +#define WSS_OUT_SEALING_STATUS_VERIFIED 0x80000000 +#define WSS_OUT_HAS_SEALING_INTENT 0x40000000 +#define WSS_OUT_FILE_SUPPORTS_SEAL 0x20000000 +#define WSS_OUTPUT_FLAG_MASK 0xe0000000 + typedef struct _CRYPT_TRUST_REG_ENTRY { DWORD cbStruct; @@ -356,6 +377,8 @@ typedef struct _CRYPT_PROVIDER_DATA { PCERT_USAGE_MATCH pRequestUsage; DWORD dwTrustPubSettings; DWORD dwUIStateFlags; + struct _CRYPT_PROVIDER_SIGSTATE *pSigState; + struct WINTRUST_SIGNATURE_SETTINGS_ *pSigSettings; } CRYPT_PROVIDER_DATA, *PCRYPT_PROVIDER_DATA; #define CPD_CHOICE_SIP 1 @@ -371,6 +394,27 @@ typedef struct _CRYPT_PROVIDER_DATA { #define CPD_UISTATE_MODE_ALLOW 0x00000002 #define CPD_UISTATE_MODE_MASK 0x00000003 +typedef struct _CRYPT_PROVIDER_SIGSTATE +{ + DWORD cbStruct; + HCRYPTMSG *rhSecondarySigs; + HCRYPTMSG hPrimarySig; + BOOL fFirstAttemptMade; + BOOL fNoMoreSigs; + DWORD cSecondarySigs; + DWORD dwCurrentIndex; + BOOL fSupportMultiSig; + DWORD dwCryptoPolicySupport; + DWORD iAttemptCount; + BOOL fCheckedSealing; + struct _SEALING_SIGNATURE_ATTRIBUTE *pSealingSignature; +} CRYPT_PROVIDER_SIGSTATE, *PCRYPT_PROVIDER_SIGSTATE; + +/* Flags for dwCryptoPolicySupport */ +#define WSS_OBJTRUST_SUPPORT 0x00000001 +#define WSS_SIGTRUST_SUPPORT 0x00000002 +#define WSS_CERTTRUST_SUPPORT 0x00000004 + typedef BOOL (*PFN_PROVUI_CALL)(HWND hWndSecurityDialog, struct _CRYPT_PROVIDER_DATA *pProvData);

1 0

Huw Davies : wintrust/tests: Remove a test that crashes on Windows 8 amd 10.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 098aa2be84b78c1557af59512eb5e3d4bd181689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098aa2be84b78c1557af59512… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 28 13:10:12 2016 +0000 wintrust/tests: Remove a test that crashes on Windows 8 amd 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 624371d..3bb615e 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -776,15 +776,6 @@ static void test_sip_create_indirect_data(void) ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = CryptSIPCreateIndirectData_p(&subjinfo, &count, NULL); - todo_wine - ok(!ret && (GetLastError() == NTE_BAD_ALGID || - GetLastError() == ERROR_INVALID_PARAMETER /* Win7 */), - "expected NTE_BAD_ALGID or ERROR_INVALID_PARAMETER, got %08x\n", - GetLastError()); - ok(count == 0xdeadbeef, "expected count to be unmodified, got %d\n", count); subjinfo.DigestAlgorithm.pszObjId = oid_sha1; count = 0xdeadbeef; ret = CryptSIPCreateIndirectData_p(&subjinfo, &count, NULL);

1 0

Huw Davies : wintrust/tests: Initialize the pSigState member to prevent Windows 8 and 10 from crashing.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: efd063f5c569fe704a29f247ad53e4226872e704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd063f5c569fe704a29f247a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 28 13:10:11 2016 +0000 wintrust/tests: Initialize the pSigState member to prevent Windows 8 and 10 from crashing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 3bb615e..9ac15e1 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -300,6 +300,7 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { HRESULT ret; CRYPT_PROVIDER_DATA data = { 0 }; + CRYPT_PROVIDER_SIGSTATE sig_state = { 0 }; WINTRUST_DATA wintrust_data = { 0 }; WINTRUST_CERT_INFO certInfo = { sizeof(WINTRUST_CERT_INFO), 0 }; WINTRUST_FILE_INFO fileInfo = { sizeof(WINTRUST_FILE_INFO), 0 }; @@ -313,6 +314,7 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) /* Crashes ret = funcs->pfnObjectTrust(NULL); */ + data.pSigState = &sig_state; data.pWintrustData = &wintrust_data; data.padwTrustStepErrors = funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); @@ -541,6 +543,7 @@ static const BYTE selfSignedCert[] = { static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { CRYPT_PROVIDER_DATA data = { 0 }; + CRYPT_PROVIDER_SIGSTATE sig_state = { 0 }; CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; HRESULT ret; BOOL b; @@ -551,6 +554,7 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) return; } + data.pSigState = &sig_state; data.padwTrustStepErrors = funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); if (!data.padwTrustStepErrors)

1 0

Akihiro Sagawa : quartz: Add tests for IBasicVideo.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 97405fc805d455ce4e8e8762e57b338723a05b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97405fc805d455ce4e8e8762e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 25 01:08:50 2016 +0900 quartz: Add tests for IBasicVideo. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 208 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97405fc805d455ce4e8e8…

1 0

Akihiro Sagawa : strmbase: Fix copy-paste error where calculating video destination height.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 96d2593ead88f834d69405c97ca1c206cc0edf96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d2593ead88f834d69405c97… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 25 01:10:03 2016 +0900 strmbase: Fix copy-paste error where calculating video destination height. Spotted by Andrew Eikum. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 4 ++-- dlls/strmbase/video.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fa11d3f..307bba9 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -215,7 +215,7 @@ static void test_basic_video(void) ok(width==video_width/3+1, "expected %d, got %d\n", video_width/3+1, width); hr = IBasicVideo_get_DestinationHeight(pbv, &height); ok(hr==S_OK, "Cannot get destination height returned: %x\n", hr); - todo_wine ok(height==video_height/3+1, "expected %d, got %d\n", video_height/3+1, height); + ok(height==video_height/3+1, "expected %d, got %d\n", video_height/3+1, height); hr = IBasicVideo_put_DestinationLeft(pbv, video_width/3); ok(hr==S_OK, "Cannot put destination left returned: %x\n", hr); @@ -243,7 +243,7 @@ static void test_basic_video(void) hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, &width, &height); ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); ok(top == video_height/3, "expected %d, got %d\n", video_height/3, top); - todo_wine ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height); + ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height); /* reset source rectangle */ hr = IBasicVideo_SetDefaultSourcePosition(pbv); diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index be65886..1b8e3f3 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -368,7 +368,7 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationHeight(IBasicVideo *iface, LO TRACE("(%p/%p)->(%d)\n", This, iface, DestinationHeight); This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - DestRect.right = DestRect.left + DestinationHeight; + DestRect.bottom = DestRect.top + DestinationHeight; This->pFuncsTable->pfnSetTargetRect(This, &DestRect); return S_OK; @@ -383,7 +383,7 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationHeight(IBasicVideo *iface, LO if (!pDestinationHeight) return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - *pDestinationHeight = DestRect.right - DestRect.left; + *pDestinationHeight = DestRect.bottom - DestRect.top; return S_OK; }

1 0

Akihiro Sagawa : strmbase: Shift source/ destination rectangle when updating top or left property.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 69761ae71c6b5cec58b05e02a961c3d09697cc39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69761ae71c6b5cec58b05e02a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 25 01:10:04 2016 +0900 strmbase: Shift source/destination rectangle when updating top or left property. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 8 ++++---- dlls/strmbase/video.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 307bba9..93fb2a0 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -134,14 +134,14 @@ static void test_basic_video(void) hr = IBasicVideo_GetSourcePosition(pbv, &left, &top, &width, &height); ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); ok(left == video_width/3, "expected %d, got %d\n", video_width/3, left); - todo_wine ok(width == video_width/3+1, "expected %d, got %d\n", video_width/3+1, width); + ok(width == video_width/3+1, "expected %d, got %d\n", video_width/3+1, width); hr = IBasicVideo_put_SourceTop(pbv, video_height/3); ok(hr==S_OK, "Cannot put source top returned: %x\n", hr); hr = IBasicVideo_GetSourcePosition(pbv, &left, &top, &width, &height); ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); ok(top == video_height/3, "expected %d, got %d\n", video_height/3, top); - todo_wine ok(height == video_height/3+1, "expected %d, got %d\n", video_height/3+1, height); + ok(height == video_height/3+1, "expected %d, got %d\n", video_height/3+1, height); hr = IBasicVideo_put_SourceWidth(pbv, video_width/4+1); ok(hr==S_OK, "Cannot put source width returned: %x\n", hr); @@ -222,14 +222,14 @@ static void test_basic_video(void) hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, &width, &height); ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); ok(left == video_width/3, "expected %d, got %d\n", video_width/3, left); - todo_wine ok(width == video_width/3+1, "expected %d, got %d\n", video_width/3+1, width); + ok(width == video_width/3+1, "expected %d, got %d\n", video_width/3+1, width); hr = IBasicVideo_put_DestinationTop(pbv, video_height/3); ok(hr==S_OK, "Cannot put destination top returned: %x\n", hr); hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, &width, &height); ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); ok(top == video_height/3, "expected %d, got %d\n", video_height/3, top); - todo_wine ok(height == video_height/3+1, "expected %d, got %d\n", video_height/3+1, height); + ok(height == video_height/3+1, "expected %d, got %d\n", video_height/3+1, height); hr = IBasicVideo_put_DestinationWidth(pbv, video_width/4+1); ok(hr==S_OK, "Cannot put destination width returned: %x\n", hr); diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 1b8e3f3..ce7d26e 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -178,6 +178,7 @@ HRESULT WINAPI BaseControlVideoImpl_put_SourceLeft(IBasicVideo *iface, LONG Sour TRACE("(%p/%p)->(%d)\n", This, iface, SourceLeft); This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); + SourceRect.right = (SourceRect.right - SourceRect.left) + SourceLeft; SourceRect.left = SourceLeft; This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); @@ -232,6 +233,7 @@ HRESULT WINAPI BaseControlVideoImpl_put_SourceTop(IBasicVideo *iface, LONG Sourc TRACE("(%p/%p)->(%d)\n", This, iface, SourceTop); This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); + SourceRect.bottom = (SourceRect.bottom - SourceRect.top) + SourceTop; SourceRect.top = SourceTop; This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); @@ -287,6 +289,7 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationLeft(IBasicVideo *iface, LONG TRACE("(%p/%p)->(%d)\n", This, iface, DestinationLeft); This->pFuncsTable->pfnGetTargetRect(This, &DestRect); + DestRect.right = (DestRect.right - DestRect.left) + DestinationLeft; DestRect.left = DestinationLeft; This->pFuncsTable->pfnSetTargetRect(This, &DestRect); @@ -341,6 +344,7 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationTop(IBasicVideo *iface, LONG TRACE("(%p/%p)->(%d)\n", This, iface, DestinationTop); This->pFuncsTable->pfnGetTargetRect(This, &DestRect); + DestRect.bottom = (DestRect.bottom - DestRect.top) + DestinationTop; DestRect.top = DestinationTop; This->pFuncsTable->pfnSetTargetRect(This, &DestRect);

1 0

Akihiro Sagawa : strmbase: Add validation checks when updating source rectangle.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 547f4bc2cf3263c880c99498d4a1ebde7daaf6a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547f4bc2cf3263c880c99498d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 25 01:10:05 2016 +0900 strmbase: Add validation checks when updating source rectangle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 24 ++++++------ dlls/strmbase/video.c | 85 +++++++++++++++++++++++++++++++---------- 2 files changed, 76 insertions(+), 33 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 93fb2a0..1b72008 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -85,33 +85,33 @@ static void test_basic_video(void) ok(height == video_height, "expected %d, got %d\n", video_height, height); hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, 0, 0); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, video_width*2, video_height*2); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); hr = IBasicVideo_put_SourceTop(pbv, -1); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_put_SourceTop returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_put_SourceTop returned: %x\n", hr); hr = IBasicVideo_put_SourceTop(pbv, 0); ok(hr==S_OK, "Cannot put source top returned: %x\n", hr); hr = IBasicVideo_put_SourceTop(pbv, 1); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_put_SourceTop returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_put_SourceTop returned: %x\n", hr); hr = IBasicVideo_SetSourcePosition(pbv, video_width, 0, video_width, video_height); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); hr = IBasicVideo_SetSourcePosition(pbv, 0, video_height, video_width, video_height); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); hr = IBasicVideo_SetSourcePosition(pbv, -1, 0, video_width, video_height); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); hr = IBasicVideo_SetSourcePosition(pbv, 0, -1, video_width, video_height); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); hr = IBasicVideo_SetSourcePosition(pbv, video_width/2, video_height/2, video_width, video_height); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); hr = IBasicVideo_SetSourcePosition(pbv, video_width/2, video_height/2, video_width, video_height); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, video_width, video_height+1); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, video_width+1, video_height); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); hr = IBasicVideo_SetSourcePosition(pbv, video_width/2, video_height/2, video_width/3+1, video_height/3+1); ok(hr==S_OK, "Cannot set source position returned: %x\n", hr); diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index ce7d26e..3f4d207 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -53,6 +53,25 @@ HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) return BaseDispatch_Destroy(&pControlVideo->baseDispatch); } +static HRESULT BaseControlVideoImpl_CheckSourceRect(BaseControlVideo *This, RECT *pSourceRect) +{ + LONG VideoWidth, VideoHeight; + HRESULT hr; + + if (IsRectEmpty(pSourceRect)) + return E_INVALIDARG; + + hr = BaseControlVideoImpl_GetVideoSize((IBasicVideo *)This, &VideoWidth, &VideoHeight); + if (FAILED(hr)) + return hr; + + if (pSourceRect->top < 0 || pSourceRect->left < 0 || + pSourceRect->bottom > VideoHeight || pSourceRect->right > VideoWidth) + return E_INVALIDARG; + + return S_OK; +} + HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *pctinfo) { BaseControlVideo *This = impl_from_IBasicVideo(iface); @@ -175,14 +194,20 @@ HRESULT WINAPI BaseControlVideoImpl_put_SourceLeft(IBasicVideo *iface, LONG Sour { RECT SourceRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, SourceLeft); - This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); - SourceRect.right = (SourceRect.right - SourceRect.left) + SourceLeft; - SourceRect.left = SourceLeft; - This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); + hr = This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); + if (SUCCEEDED(hr)) + { + SourceRect.right = (SourceRect.right - SourceRect.left) + SourceLeft; + SourceRect.left = SourceLeft; + hr = BaseControlVideoImpl_CheckSourceRect(This, &SourceRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_SourceLeft(IBasicVideo *iface, LONG *pSourceLeft) @@ -203,13 +228,19 @@ HRESULT WINAPI BaseControlVideoImpl_put_SourceWidth(IBasicVideo *iface, LONG Sou { RECT SourceRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, SourceWidth); - This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); - SourceRect.right = SourceRect.left + SourceWidth; - This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); + hr = This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); + if (SUCCEEDED(hr)) + { + SourceRect.right = SourceRect.left + SourceWidth; + hr = BaseControlVideoImpl_CheckSourceRect(This, &SourceRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_SourceWidth(IBasicVideo *iface, LONG *pSourceWidth) @@ -230,14 +261,20 @@ HRESULT WINAPI BaseControlVideoImpl_put_SourceTop(IBasicVideo *iface, LONG Sourc { RECT SourceRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, SourceTop); - This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); - SourceRect.bottom = (SourceRect.bottom - SourceRect.top) + SourceTop; - SourceRect.top = SourceTop; - This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); + hr = This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); + if (SUCCEEDED(hr)) + { + SourceRect.bottom = (SourceRect.bottom - SourceRect.top) + SourceTop; + SourceRect.top = SourceTop; + hr = BaseControlVideoImpl_CheckSourceRect(This, &SourceRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_SourceTop(IBasicVideo *iface, LONG *pSourceTop) @@ -258,13 +295,19 @@ HRESULT WINAPI BaseControlVideoImpl_put_SourceHeight(IBasicVideo *iface, LONG So { RECT SourceRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, SourceHeight); - This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); - SourceRect.bottom = SourceRect.top + SourceHeight; - This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); + hr = This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); + if (SUCCEEDED(hr)) + { + SourceRect.bottom = SourceRect.top + SourceHeight; + hr = BaseControlVideoImpl_CheckSourceRect(This, &SourceRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_SourceHeight(IBasicVideo *iface, LONG *pSourceHeight) @@ -400,9 +443,9 @@ HRESULT WINAPI BaseControlVideoImpl_SetSourcePosition(IBasicVideo *iface, LONG L TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); SetRect(&SourceRect, Left, Top, Left + Width, Top + Height); - This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); - - return S_OK; + if (FAILED(BaseControlVideoImpl_CheckSourceRect(This, &SourceRect))) + return E_INVALIDARG; + return This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); } HRESULT WINAPI BaseControlVideoImpl_GetSourcePosition(IBasicVideo *iface, LONG *pLeft, LONG *pTop, LONG *pWidth, LONG *pHeight)

1 0

Akihiro Sagawa : strmbase: Add validation checks when updating destination rectangle.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 40a596fa86f11fc2cf0d7481254692e07571418a URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a596fa86f11fc2cf0d74812… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 25 01:10:07 2016 +0900 strmbase: Add validation checks when updating destination rectangle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 2 +- dlls/strmbase/video.c | 74 +++++++++++++++++++++++++++++------------ 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 1b72008..3077b38 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -172,7 +172,7 @@ static void test_basic_video(void) todo_wine ok(height == video_height, "expected %d, got %d\n", video_height, height); hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, 0, 0); - todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_SetDestinationPosition returned: %x\n", hr); + ok(hr==E_INVALIDARG, "IBasicVideo_SetDestinationPosition returned: %x\n", hr); hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, video_width*2, video_height*2); ok(hr==S_OK, "Cannot put destination position returned: %x\n", hr); diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 3f4d207..0f05d63 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -72,6 +72,14 @@ static HRESULT BaseControlVideoImpl_CheckSourceRect(BaseControlVideo *This, RECT return S_OK; } +static HRESULT BaseControlVideoImpl_CheckTargetRect(BaseControlVideo *This, RECT *pTargetRect) +{ + if (IsRectEmpty(pTargetRect)) + return E_INVALIDARG; + + return S_OK; +} + HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *pctinfo) { BaseControlVideo *This = impl_from_IBasicVideo(iface); @@ -329,14 +337,20 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationLeft(IBasicVideo *iface, LONG { RECT DestRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, DestinationLeft); - This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - DestRect.right = (DestRect.right - DestRect.left) + DestinationLeft; - DestRect.left = DestinationLeft; - This->pFuncsTable->pfnSetTargetRect(This, &DestRect); + hr = This->pFuncsTable->pfnGetTargetRect(This, &DestRect); + if (SUCCEEDED(hr)) + { + DestRect.right = (DestRect.right - DestRect.left) + DestinationLeft; + DestRect.left = DestinationLeft; + hr = BaseControlVideoImpl_CheckTargetRect(This, &DestRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetTargetRect(This, &DestRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_DestinationLeft(IBasicVideo *iface, LONG *pDestinationLeft) @@ -357,13 +371,19 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationWidth(IBasicVideo *iface, LON { RECT DestRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, DestinationWidth); - This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - DestRect.right = DestRect.left + DestinationWidth; - This->pFuncsTable->pfnSetTargetRect(This, &DestRect); + hr = This->pFuncsTable->pfnGetTargetRect(This, &DestRect); + if (SUCCEEDED(hr)) + { + DestRect.right = DestRect.left + DestinationWidth; + hr = BaseControlVideoImpl_CheckTargetRect(This, &DestRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetTargetRect(This, &DestRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_DestinationWidth(IBasicVideo *iface, LONG *pDestinationWidth) @@ -384,14 +404,20 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationTop(IBasicVideo *iface, LONG { RECT DestRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, DestinationTop); - This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - DestRect.bottom = (DestRect.bottom - DestRect.top) + DestinationTop; - DestRect.top = DestinationTop; - This->pFuncsTable->pfnSetTargetRect(This, &DestRect); + hr = This->pFuncsTable->pfnGetTargetRect(This, &DestRect); + if (SUCCEEDED(hr)) + { + DestRect.bottom = (DestRect.bottom - DestRect.top) + DestinationTop; + DestRect.top = DestinationTop; + hr = BaseControlVideoImpl_CheckTargetRect(This, &DestRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetTargetRect(This, &DestRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_DestinationTop(IBasicVideo *iface, LONG *pDestinationTop) @@ -412,13 +438,19 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationHeight(IBasicVideo *iface, LO { RECT DestRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, DestinationHeight); - This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - DestRect.bottom = DestRect.top + DestinationHeight; - This->pFuncsTable->pfnSetTargetRect(This, &DestRect); + hr = This->pFuncsTable->pfnGetTargetRect(This, &DestRect); + if (SUCCEEDED(hr)) + { + DestRect.bottom = DestRect.top + DestinationHeight; + hr = BaseControlVideoImpl_CheckTargetRect(This, &DestRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetTargetRect(This, &DestRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_DestinationHeight(IBasicVideo *iface, LONG *pDestinationHeight) @@ -482,9 +514,9 @@ HRESULT WINAPI BaseControlVideoImpl_SetDestinationPosition(IBasicVideo *iface, L TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); SetRect(&DestRect, Left, Top, Left + Width, Top + Height); - This->pFuncsTable->pfnSetTargetRect(This, &DestRect); - - return S_OK; + if (FAILED(BaseControlVideoImpl_CheckTargetRect(This, &DestRect))) + return E_INVALIDARG; + return This->pFuncsTable->pfnSetTargetRect(This, &DestRect); } HRESULT WINAPI BaseControlVideoImpl_GetDestinationPosition(IBasicVideo *iface, LONG *pLeft, LONG *pTop, LONG *pWidth, LONG *pHeight)

1 0

Nikolay Sivov : wincodecs: Trigger conversion to target format in WriteSource().
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 62830143d107be38342c27cfb45f30f0fe6d2d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62830143d107be38342c27cfb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 02:43:37 2016 +0300 wincodecs: Trigger conversion to target format in WriteSource(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/main.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 442976f..3bed565 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -122,30 +122,20 @@ HRESULT configure_write_source(IWICBitmapFrameEncode *iface, const WICPixelFormatGUID *format, INT width, INT height, double xres, double yres) { - HRESULT hr=S_OK; - WICPixelFormatGUID src_format, dst_format; + HRESULT hr = S_OK; if (width == 0 || height == 0) return WINCODEC_ERR_WRONGSTATE; - hr = IWICBitmapSource_GetPixelFormat(source, &src_format); - if (FAILED(hr)) return hr; - if (!format) { - dst_format = src_format; + WICPixelFormatGUID src_format; - hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &dst_format); + hr = IWICBitmapSource_GetPixelFormat(source, &src_format); if (FAILED(hr)) return hr; - format = &dst_format; - } - - if (!IsEqualGUID(&src_format, format)) - { - /* FIXME: should use WICConvertBitmapSource to convert */ - ERR("format %s unsupported\n", debugstr_guid(&src_format)); - return E_FAIL; + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &src_format); + if (FAILED(hr)) return hr; } if (xres == 0.0 || yres == 0.0) @@ -164,6 +154,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, const WICPixelFormatGUID *format, UINT bpp, INT width, INT height) { + IWICBitmapSource *converted_source; HRESULT hr=S_OK; WICRect rc; UINT stride; @@ -184,12 +175,23 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, if (prc->Width != width || prc->Height <= 0) return E_INVALIDARG; + hr = WICConvertBitmapSource(format, source, &converted_source); + if (FAILED(hr)) + { + ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr); + return hr; + } + stride = (bpp * width + 7)/8; pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); - if (!pixeldata) return E_OUTOFMEMORY; + if (!pixeldata) + { + IWICBitmapSource_Release(converted_source); + return E_OUTOFMEMORY; + } - hr = IWICBitmapSource_CopyPixels(source, prc, stride, + hr = IWICBitmapSource_CopyPixels(converted_source, prc, stride, stride*prc->Height, pixeldata); if (SUCCEEDED(hr)) @@ -199,6 +201,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, } HeapFree(GetProcessHeap(), 0, pixeldata); + IWICBitmapSource_Release(converted_source); return hr; }

1 0