wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

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 : 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

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

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 : 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

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

Nikolay Sivov : shell32: Get rid of some casts by using IShellFolder2 internally.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 1c86f97985d96ae499a57bd682c25992dbfa2352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c86f97985d96ae499a57bd68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 17:01:48 2016 +0300 shell32: Get rid of some casts by using IShellFolder2 internally. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/shfldr.h | 2 +- dlls/shell32/shfldr_desktop.c | 6 ++---- dlls/shell32/shfldr_fs.c | 16 +++++++--------- dlls/shell32/shfldr_mycomp.c | 13 ++++++------- dlls/shell32/shfldr_netplaces.c | 13 ++++++------- dlls/shell32/shlfolder.c | 5 ++--- 7 files changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 1a3b379..206ce13 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -561,7 +561,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 *iface, U while(cidl > 0 && *apidl) { pdump(*apidl); - SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, *apidl, rgfInOut); + SHELL32_GetItemAttributes(&This->IShellFolder2_iface, *apidl, rgfInOut); apidl++; cidl--; } diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index b6ebfb2..1f4194e 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -39,7 +39,7 @@ BOOL SHELL32_GetCustomFolderAttribute (LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) DECLSPEC_HIDDEN; HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes) DECLSPEC_HIDDEN; -HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) DECLSPEC_HIDDEN; +HRESULT SHELL32_GetItemAttributes (IShellFolder2 *folder, LPCITEMIDLIST pidl, DWORD *attributes) DECLSPEC_HIDDEN; HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPWSTR szOut, DWORD dwOutLen) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 40cd752..8721a9a 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -155,7 +155,6 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - IShellFolder *shell_folder = (IShellFolder*)iface; WCHAR szElement[MAX_PATH]; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; @@ -268,7 +267,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, else { if (pdwAttributes && *pdwAttributes) - hr = SHELL32_GetItemAttributes(shell_folder, pidlTemp, pdwAttributes); + hr = SHELL32_GetItemAttributes(iface, pidlTemp, pdwAttributes); } } @@ -454,7 +453,6 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - IShellFolder *shell_folder = (IShellFolder*)iface; static const DWORD dwDesktopAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | @@ -484,7 +482,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface, } else if (_ILIsMyComputer(*apidl)) { *rgfInOut &= dwMyComputerAttributes; } else { - SHELL32_GetItemAttributes ( shell_folder, *apidl, rgfInOut); + SHELL32_GetItemAttributes(iface, *apidl, rgfInOut); } apidl++; cidl--; diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 2f49eb2..c725927 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -342,10 +342,8 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); } else { /* it's the last element */ - if (pdwAttributes && *pdwAttributes) { - hr = SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, - pidlTemp, pdwAttributes); - } + if (pdwAttributes && *pdwAttributes) + hr = SHELL32_GetItemAttributes(&This->IShellFolder2_iface, pidlTemp, pdwAttributes); } } } @@ -511,19 +509,19 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, *rgfInOut = ~0; if(cidl == 0){ - IShellFolder *psfParent = NULL; + IShellFolder2 *parent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, &rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder2, (void **)&parent, &rpidl); if(SUCCEEDED(hr)) { - SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); - IShellFolder_Release(psfParent); + SHELL32_GetItemAttributes(parent, rpidl, rgfInOut); + IShellFolder2_Release(parent); } } else { while (cidl > 0 && *apidl) { pdump (*apidl); - SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, *apidl, rgfInOut); + SHELL32_GetItemAttributes(&This->IShellFolder2_iface, *apidl, rgfInOut); apidl++; cidl--; } diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 767509b..4022c8d 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -232,8 +232,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, else { if (pdwAttributes && *pdwAttributes) - SHELL32_GetItemAttributes ((IShellFolder*)&This->IShellFolder2_iface, pidlTemp, - pdwAttributes); + SHELL32_GetItemAttributes (&This->IShellFolder2_iface, pidlTemp, pdwAttributes); hr = S_OK; } @@ -477,18 +476,18 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, *rgfInOut = ~0; if(cidl == 0){ - IShellFolder *psfParent = NULL; + IShellFolder2 *parent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, &rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder2, (void **)&parent, &rpidl); if(SUCCEEDED(hr)) { - SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); - IShellFolder_Release(psfParent); + SHELL32_GetItemAttributes(parent, rpidl, rgfInOut); + IShellFolder2_Release(parent); } } else { while (cidl > 0 && *apidl) { pdump (*apidl); - SHELL32_GetItemAttributes ((IShellFolder*)&This->IShellFolder2_iface, *apidl, rgfInOut); + SHELL32_GetItemAttributes(&This->IShellFolder2_iface, *apidl, rgfInOut); apidl++; cidl--; } diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 16e7cd5..b9513a9 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -220,8 +220,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnParseDisplayName (IShellFolder2 * ifac else { if (pdwAttributes && *pdwAttributes) - hr = SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, pidlTemp, - pdwAttributes); + hr = SHELL32_GetItemAttributes(&This->IShellFolder2_iface, pidlTemp, pdwAttributes); } } @@ -364,14 +363,14 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetAttributesOf (IShellFolder2 * iface if (cidl == 0) { - IShellFolder *psfParent = NULL; + IShellFolder2 *parent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (void**)&psfParent, &rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder2, (void **)&parent, &rpidl); if(SUCCEEDED(hr)) { - SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); - IShellFolder_Release(psfParent); + SHELL32_GetItemAttributes(parent, rpidl, rgfInOut); + IShellFolder2_Release(parent); } } else @@ -379,7 +378,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetAttributesOf (IShellFolder2 * iface while (cidl > 0 && *apidl) { pdump (*apidl); - SHELL32_GetItemAttributes ((IShellFolder *)&This->IShellFolder2_iface, *apidl, rgfInOut); + SHELL32_GetItemAttributes(&This->IShellFolder2_iface, *apidl, rgfInOut); apidl++; cidl--; } diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index c39d968..8688c5d 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -389,7 +389,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, * According to the MSDN documentation this function should not set flags. It claims only to reset flags when necessary. * However it turns out the native shell32.dll _sets_ flags in several cases - so do we. */ -HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) +HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) { DWORD dwAttributes; BOOL has_guid; @@ -435,8 +435,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO /* File attributes are not present in the internal PIDL structure, so get them from the file system. */ - HRESULT hr = IShellFolder_GetDisplayNameOf(psf, pidl, SHGDN_FORPARSING, &strret); - + HRESULT hr = IShellFolder2_GetDisplayNameOf(psf, pidl, SHGDN_FORPARSING, &strret); if (SUCCEEDED(hr)) { hr = StrRetToBufW(&strret, pidl, path, MAX_PATH);

1 0

Nikolay Sivov : shell32: Remove a couple more casts of object pointers.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: e49878289b364f6795dbd8ae10251f70be57ecb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49878289b364f6795dbd8ae1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 17:01:47 2016 +0300 shell32: Remove a couple more casts of object pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 3bdd205..4560162 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1218,7 +1218,7 @@ static LRESULT ShellView_OnSetFocus(IShellViewImpl * This) should always be done before merging menus (OnActivate merges the menus) if one of our windows has the focus.*/ - IShellBrowser_OnViewWindowActive(This->pShellBrowser,(IShellView*) This); + IShellBrowser_OnViewWindowActive(This->pShellBrowser, (IShellView *)&This->IShellView3_iface); ShellView_OnActivate(This, SVUIA_ACTIVATE_FOCUS); /* Set the focus to the listview */ @@ -1594,7 +1594,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn case VK_F5: /* Initiate a refresh */ - IShellView_Refresh((IShellView*)This); + IShellView3_Refresh(&This->IShellView3_iface); break; case VK_BACK:

1 0

Donat Enikeev : crypt32/tests: Certificates update to fix chain failures on Fedora 25.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 8068462bffac436b786348f5091e0ba00eb4445d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8068462bffac436b786348f50… Author: Donat Enikeev <donat(a)enikeev.net> Date: Sat Nov 26 13:07:02 2016 +0300 crypt32/tests: Certificates update to fix chain failures on Fedora 25. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 463 ++++++++++++++++++++++++++++----------------- 1 file changed, 287 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8068462bffac436b78634…

1 0

Nikolay Sivov : msctf: Use interface pointer instead of object pointer.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 137166ff0a3afa7ab3b00a59ff076275e6b31d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=137166ff0a3afa7ab3b00a59f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 00:58:06 2016 +0300 msctf: Use interface pointer instead of object pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index aa838da..e1f56f1 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1336,7 +1336,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TlsSetValue(tlsIndex,This); - CompartmentMgr_Constructor((IUnknown*)This, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + CompartmentMgr_Constructor((IUnknown*)&This->ITfThreadMgrEx_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); list_init(&This->CurrentPreservedKeys); list_init(&This->CreatedDocumentMgrs);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2016