August 2014 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add constant buffer support to the GLSL shader backend.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 80bca9bc9ce95cbcff894f516eefe497b5096a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bca9bc9ce95cbcff894f516… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 4 12:17:23 2014 +0200 wined3d: Add constant buffer support to the GLSL shader backend. --- dlls/wined3d/context.c | 11 +++++++- dlls/wined3d/cs.c | 2 ++ dlls/wined3d/directx.c | 31 +++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 40 ++++++++++++++++++++++++++- dlls/wined3d/state.c | 62 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_gl.h | 12 ++++++++ dlls/wined3d/wined3d_private.h | 8 +++++- 8 files changed, 164 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80bca9bc9ce95cbcff894…

1 0

Bruno Jesus : rsaenh: Use a helper to get the key container.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: a8b1fee2ea9c663f9b698011b168635c1d24a023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b1fee2ea9c663f9b698011b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 30 23:21:07 2014 -0300 rsaenh: Use a helper to get the key container. --- dlls/rsaenh/rsaenh.c | 56 +++++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 3ad28f9..fce9f1a 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -412,6 +412,19 @@ static inline BOOL copy_param(BYTE *pbBuffer, DWORD *pdwBufferSize, const BYTE * return TRUE; } +static inline KEYCONTAINER* get_key_container(HCRYPTPROV hProv) +{ + KEYCONTAINER *pKeyContainer; + + if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, + (OBJECTHDR**)&pKeyContainer)) + { + SetLastError(NTE_BAD_UID); + return NULL; + } + return pKeyContainer; +} + /****************************************************************************** * get_algid_info [Internal] * @@ -429,10 +442,7 @@ static inline const PROV_ENUMALGS_EX* get_algid_info(HCRYPTPROV hProv, ALG_ID al const PROV_ENUMALGS_EX *iterator; KEYCONTAINER *pKeyContainer; - if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { - SetLastError(NTE_BAD_UID); - return NULL; - } + if (!(pKeyContainer = get_key_container(hProv))) return NULL; for (iterator = aProvEnumAlgsEx[pKeyContainer->dwPersonality]; iterator->aiAlgid; iterator++) { if (iterator->aiAlgid == algid) return iterator; @@ -2698,8 +2708,7 @@ static void release_and_install_key(HCRYPTPROV hProv, HCRYPTKEY src, { KEYCONTAINER *pKeyContainer; - if (lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, - (OBJECTHDR**)&pKeyContainer)) + if ((pKeyContainer = get_key_container(hProv))) { store_key_container_keys(pKeyContainer); store_key_container_permissions(pKeyContainer); @@ -2745,12 +2754,8 @@ static BOOL import_private_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDat SetLastError(NTE_BAD_FLAGS); return FALSE; } - if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, - (OBJECTHDR**)&pKeyContainer)) - { - SetLastError(NTE_BAD_UID); + if (!(pKeyContainer = get_key_container(hProv))) return FALSE; - } if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY))) { @@ -2843,12 +2848,8 @@ static BOOL import_public_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwData SetLastError(NTE_BAD_FLAGS); return FALSE; } - if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, - (OBJECTHDR**)&pKeyContainer)) - { - SetLastError(NTE_BAD_UID); + if (!(pKeyContainer = get_key_container(hProv))) return FALSE; - } if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY)) || (pRSAPubKey->magic != RSAENH_MAGIC_RSA1) || @@ -3066,12 +3067,8 @@ static BOOL import_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HC KEYCONTAINER *pKeyContainer; const BLOBHEADER *pBlobHeader = (const BLOBHEADER*)pbData; - if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, - (OBJECTHDR**)&pKeyContainer)) - { - SetLastError(NTE_BAD_UID); + if (!(pKeyContainer = get_key_container(hProv))) return FALSE; - } if (dwDataLen < sizeof(BLOBHEADER) || pBlobHeader->bVersion != CUR_BLOB_VERSION || @@ -3168,11 +3165,9 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP TRACE("(hProv=%08lx, aiAlgid=%d, dwFlags=%08x, phKey=%p)\n", hProv, Algid, dwFlags, phKey); - if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, - (OBJECTHDR**)&pKeyContainer)) + if (!(pKeyContainer = get_key_container(hProv))) { /* MSDN: hProv not containing valid context handle */ - SetLastError(NTE_BAD_UID); return FALSE; } @@ -3722,11 +3717,9 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, return FALSE; } - if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, - (OBJECTHDR**)&pKeyContainer)) + if (!(pKeyContainer = get_key_container(hProv))) { /* MSDN: hProv not containing valid context handle */ - SetLastError(NTE_BAD_UID); return FALSE; } @@ -4081,11 +4074,9 @@ BOOL WINAPI RSAENH_CPGetUserKey(HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *ph TRACE("(hProv=%08lx, dwKeySpec=%08x, phUserKey=%p)\n", hProv, dwKeySpec, phUserKey); - if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, - (OBJECTHDR**)&pKeyContainer)) + if (!(pKeyContainer = get_key_container(hProv))) { /* MSDN: hProv not containing valid context handle */ - SetLastError(NTE_BAD_UID); return FALSE; } @@ -4373,11 +4364,8 @@ BOOL WINAPI RSAENH_CPSetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, TRACE("(hProv=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, dwParam, pbData, dwFlags); - if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR **)&pKeyContainer)) - { - SetLastError(NTE_BAD_UID); + if (!(pKeyContainer = get_key_container(hProv))) return FALSE; - } switch (dwParam) {

1 0

David Hedberg : shell32: Return S_OK only if the flags matches the result exactly.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 9ff6853478db1faad565dbbb414892d033895f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff6853478db1faad565dbbb4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:22 2014 +0200 shell32: Return S_OK only if the flags matches the result exactly. --- dlls/shell32/shellitem.c | 5 +++++ dlls/shell32/tests/shlfolder.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 21bf8a5..8236975 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -271,6 +271,11 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem2 *iface, SFGAOF sfgaoMa ret = IShellFolder_GetAttributesOf(parent_folder, 1, (LPCITEMIDLIST*)&child_pidl, psfgaoAttribs); *psfgaoAttribs &= sfgaoMask; IShellFolder_Release(parent_folder); + + if(sfgaoMask == *psfgaoAttribs) + return S_OK; + else + return S_FALSE; } return ret; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index fa7219c..4e20251 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3792,7 +3792,7 @@ static void test_ShellItemGetAttributes(void) sfgao = 0xdeadbeef; hr = IShellItem_GetAttributes(psi_file1, SFGAO_FOLDER, &sfgao); - todo_wine ok(hr == S_FALSE, "Got 0x%08x\n", hr); + ok(hr == S_FALSE, "Got 0x%08x\n", hr); ok(sfgao == 0, "Got 0x%08x\n", sfgao); IShellItem_Release(psi_folder1);

1 0

Bruno Jesus : rsaenh: The RC2 algorithm from Base provider supports only 40 bit keys.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 86dd877f4e5d6b1652501b53c8648e017b8a03c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86dd877f4e5d6b1652501b53c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 30 23:21:11 2014 -0300 rsaenh: The RC2 algorithm from Base provider supports only 40 bit keys. --- dlls/rsaenh/rsaenh.c | 11 +++++++++-- dlls/rsaenh/tests/rsaenh.c | 1 - 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fce9f1a..dc9e70f 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3495,22 +3495,29 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam case KP_EFFECTIVE_KEYLEN: switch (pCryptKey->aiAlgid) { case CALG_RC2: + { + DWORD keylen; + KEYCONTAINER *pKeyContainer = get_key_container(pCryptKey->hProv); + if (!pbData) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - else if (!*(DWORD *)pbData || *(DWORD *)pbData > 1024) + keylen = *(DWORD *)pbData; + if (!keylen || keylen > 1024 || (keylen != 40 && + pKeyContainer->dwPersonality == RSAENH_PERSONALITY_BASE)) { SetLastError(NTE_BAD_DATA); return FALSE; } else { - pCryptKey->dwEffectiveKeyLen = *(DWORD *)pbData; + pCryptKey->dwEffectiveKeyLen = keylen; setup_key(pCryptKey); } break; + } default: SetLastError(NTE_BAD_TYPE); return FALSE; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 1dfca3c..46d0451 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1529,7 +1529,6 @@ static void test_rc2(void) if (!BASE_PROV) ok(result, "expected success, got error 0x%08X\n", GetLastError()); else - todo_wine ok(!result, "expected error\n"); dwLen = sizeof(dwKeyLen);

1 0