wine-commits August 2014

wine-commits@winehq.org

2 participants
304 discussions

David Hedberg : comdlg32: Support browsing for folders.
by Alexandre Julliard 04 Aug '14

04 Aug '14

Module: wine Branch: master Commit: 3cf2fb3a9c83a1326e4c5a623f2d85e0aad76876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf2fb3a9c83a1326e4c5a623… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:26 2014 +0200 comdlg32: Support browsing for folders. --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/comdlg32.rc | 2 + dlls/comdlg32/filedlgbrowser.h | 1 + dlls/comdlg32/itemdlg.c | 46 ++++- po/ar.po | 378 ++++++++++++++++++++-------------------- po/bg.po | 381 +++++++++++++++++++++-------------------- po/ca.po | 378 ++++++++++++++++++++-------------------- po/cs.po | 378 ++++++++++++++++++++-------------------- po/da.po | 378 ++++++++++++++++++++-------------------- po/de.po | 378 ++++++++++++++++++++-------------------- po/el.po | 377 ++++++++++++++++++++-------------------- po/en.po | 376 ++++++++++++++++++++-------------------- po/en_US.po | 376 ++++++++++++++++++++-------------------- po/eo.po | 378 ++++++++++++++++++++-------------------- po/es.po | 378 ++++++++++++++++++++-------------------- po/fa.po | 377 ++++++++++++++++++++-------------------- po/fi.po | 378 ++++++++++++++++++++-------------------- po/fr.po | 378 ++++++++++++++++++++-------------------- po/he.po | 378 ++++++++++++++++++++-------------------- po/hi.po | 376 ++++++++++++++++++++-------------------- po/hr.po | 378 ++++++++++++++++++++-------------------- po/hu.po | 378 ++++++++++++++++++++-------------------- po/it.po | 378 ++++++++++++++++++++-------------------- po/ja.po | 378 ++++++++++++++++++++-------------------- po/ko.po | 378 ++++++++++++++++++++-------------------- po/lt.po | 378 ++++++++++++++++++++-------------------- po/ml.po | 376 ++++++++++++++++++++-------------------- po/nb_NO.po | 378 ++++++++++++++++++++-------------------- po/nl.po | 378 ++++++++++++++++++++-------------------- po/or.po | 376 ++++++++++++++++++++-------------------- po/pa.po | 376 ++++++++++++++++++++-------------------- po/pl.po | 378 ++++++++++++++++++++-------------------- po/pt_BR.po | 378 ++++++++++++++++++++-------------------- po/pt_PT.po | 378 ++++++++++++++++++++-------------------- po/rm.po | 376 ++++++++++++++++++++-------------------- po/ro.po | 378 ++++++++++++++++++++-------------------- po/ru.po | 378 ++++++++++++++++++++-------------------- po/sk.po | 378 ++++++++++++++++++++-------------------- po/sl.po | 378 ++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 378 ++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 378 ++++++++++++++++++++-------------------- po/sv.po | 378 ++++++++++++++++++++-------------------- po/te.po | 376 ++++++++++++++++++++-------------------- po/th.po | 377 ++++++++++++++++++++-------------------- po/tr.po | 378 ++++++++++++++++++++-------------------- po/uk.po | 378 ++++++++++++++++++++-------------------- po/wa.po | 378 ++++++++++++++++++++-------------------- po/wine.pot | 376 ++++++++++++++++++++-------------------- po/zh_CN.po | 378 ++++++++++++++++++++-------------------- po/zh_TW.po | 378 ++++++++++++++++++++-------------------- 50 files changed, 8952 insertions(+), 8468 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cf2fb3a9c83a1326e4c5…

1 0

David Hedberg : shell32: Implement IShellItemArray::GetAttributes.
by Alexandre Julliard 04 Aug '14

04 Aug '14

Module: wine Branch: master Commit: 27b45807a72e55f0ca8068a042595e7f715ac1fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b45807a72e55f0ca8068a04… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:25 2014 +0200 shell32: Implement IShellItemArray::GetAttributes. --- dlls/shell32/shellitem.c | 41 +++++++++++++++++- dlls/shell32/tests/shlfolder.c | 98 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 707a4c2..772023a 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -881,9 +881,46 @@ static HRESULT WINAPI IShellItemArray_fnGetAttributes(IShellItemArray *iface, SFGAOF *psfgaoAttribs) { IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); - FIXME("Stub: %p (%x, %x, %p)\n", This, AttribFlags, sfgaoMask, psfgaoAttribs); + HRESULT hr = S_OK; + SFGAOF attr; + UINT i; + TRACE("%p (%x, %x, %p)\n", This, AttribFlags, sfgaoMask, psfgaoAttribs); - return E_NOTIMPL; + if(AttribFlags & ~(SIATTRIBFLAGS_AND|SIATTRIBFLAGS_OR)) + FIXME("%08x contains unsupported attribution flags", AttribFlags); + + for(i = 0; i < This->item_count; i++) + { + hr = IShellItem_GetAttributes(This->array[i], sfgaoMask, &attr); + if(FAILED(hr)) + break; + + if(i == 0) + { + *psfgaoAttribs = attr; + continue; + } + + switch(AttribFlags & SIATTRIBFLAGS_MASK) + { + case SIATTRIBFLAGS_AND: + *psfgaoAttribs &= attr; + break; + case SIATTRIBFLAGS_OR: + *psfgaoAttribs |= attr; + break; + } + } + + if(SUCCEEDED(hr)) + { + if(*psfgaoAttribs == sfgaoMask) + return S_OK; + + return S_FALSE; + } + + return hr; } static HRESULT WINAPI IShellItemArray_fnGetCount(IShellItemArray *iface, diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 38d265a..6ea6813 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3984,6 +3984,103 @@ static void test_ShellItemGetAttributes(void) Cleanup(); } +static void test_ShellItemArrayGetAttributes(void) +{ + IShellItemArray *psia_files, *psia_folders1, *psia_folders2, *psia_all; + IShellFolder *pdesktopsf; + LPCITEMIDLIST pidl_array[5]; + SFGAOF attr; + HRESULT hr; + WCHAR curdirW[MAX_PATH]; + WCHAR buf[MAX_PATH]; + UINT i; + static const WCHAR testdir1W[] = {'t','e','s','t','d','i','r',0}; + static const WCHAR testdir2W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','d','i','r','2',0}; + static const WCHAR testdir3W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','d','i','r','3',0}; + static const WCHAR testfile1W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; + static const WCHAR testfile2W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','2','.','t','x','t',0}; + static const WCHAR *testfilesW[5] = { testdir1W, testdir2W, testdir3W, testfile1W, testfile2W }; + + if(!pSHCreateShellItemArrayFromShellItem) + { + win_skip("No SHCreateShellItemArrayFromShellItem, skipping test.."); + return; + } + + CreateFilesFolders(); + CreateDirectoryA(".\\testdir\\testdir3", NULL); + + SHGetDesktopFolder(&pdesktopsf); + + GetCurrentDirectoryW(MAX_PATH, curdirW); + myPathAddBackslashW(curdirW); + + for(i = 0; i < 5; i++) + { + lstrcpyW(buf, curdirW); + lstrcatW(buf, testfilesW[i]); + hr = IShellFolder_ParseDisplayName(pdesktopsf, NULL, NULL, buf, NULL, (LPITEMIDLIST*)&pidl_array[i], NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + } + IShellFolder_Release(pdesktopsf); + + hr = pSHCreateShellItemArrayFromIDLists(2, pidl_array, &psia_folders1); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pSHCreateShellItemArrayFromIDLists(2, &pidl_array[1], &psia_folders2); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pSHCreateShellItemArrayFromIDLists(2, &pidl_array[3], &psia_files); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pSHCreateShellItemArrayFromIDLists(4, &pidl_array[1], &psia_all); /* All except the first */ + ok(hr == S_OK, "got 0x%08x\n", hr); + + for(i = 0; i < 5; i++) + pILFree((LPITEMIDLIST)pidl_array[i]); + + /* [testfolder/, testfolder/testfolder2] seems to break in Vista */ + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_folders1, SIATTRIBFLAGS_AND, SFGAO_FOLDER, &attr); + ok(hr == S_OK || broken(hr == E_UNEXPECTED) /* Vista */, "Got 0x%08x\n", hr); + ok(attr == SFGAO_FOLDER || broken(attr == 0) /* Vista */, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_folders1, SIATTRIBFLAGS_OR, SFGAO_FOLDER, &attr); + ok(hr == S_OK || broken(hr == E_UNEXPECTED) /* Vista */, "Got 0x%08x\n", hr); + ok(attr == SFGAO_FOLDER || broken(attr == 0) /* Vista */, "Got 0x%08x\n", attr); + + /* [testfolder/testfolder2, testfolder/testfolder3] works */ + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_folders2, SIATTRIBFLAGS_AND, SFGAO_FOLDER, &attr); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(attr == SFGAO_FOLDER, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_files, SIATTRIBFLAGS_AND, SFGAO_FOLDER, &attr); + ok(hr == S_FALSE || broken(hr == S_OK) /* Vista */, "Got 0x%08x\n", hr); + ok(attr == 0, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_all, SIATTRIBFLAGS_AND, SFGAO_FOLDER, &attr); + ok(hr == S_FALSE || broken(hr == S_OK) /* Vista */, "Got 0x%08x\n", hr); + ok(attr == 0, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_folders2, SIATTRIBFLAGS_OR, SFGAO_FOLDER, &attr); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(attr == SFGAO_FOLDER, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_files, SIATTRIBFLAGS_OR, SFGAO_FOLDER, &attr); + ok(hr == S_FALSE || broken(hr == S_OK) /* Vista */, "Got 0x%08x\n", hr); + ok(attr == 0, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_all, SIATTRIBFLAGS_OR, SFGAO_FOLDER, &attr); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(attr == SFGAO_FOLDER, "Got 0x%08x\n", attr); + + IShellItemArray_Release(psia_folders1); + IShellItemArray_Release(psia_folders2); + IShellItemArray_Release(psia_files); + IShellItemArray_Release(psia_all); + + RemoveDirectoryA(".\\testdir\\testdir3"); + Cleanup(); +} + static void test_SHParseDisplayName(void) { LPITEMIDLIST pidl1, pidl2; @@ -5006,6 +5103,7 @@ START_TEST(shlfolder) test_SHChangeNotify(TRUE); test_ShellItemBindToHandler(); test_ShellItemGetAttributes(); + test_ShellItemArrayGetAttributes(); test_SHCreateDefaultContextMenu(); test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx();

1 0

David Hedberg : shell32: Implement SHCreateShellItemFromIDLists.
by Alexandre Julliard 04 Aug '14

04 Aug '14

Module: wine Branch: master Commit: a79be28e8c96b491ca4c431b4a51ba6cf581da87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79be28e8c96b491ca4c431b4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:24 2014 +0200 shell32: Implement SHCreateShellItemFromIDLists. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellitem.c | 45 ++++++++++ dlls/shell32/tests/shlfolder.c | 181 +++++++++++++++++++++++++++++++++++++++++ include/shobjidl.idl | 1 + include/shtypes.idl | 1 + 5 files changed, 229 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a79be28e8c96b491ca4c4…

1 0

David Hedberg : shell32: Always initialize shellitem to NULL in SHCreateShellItem.
by Alexandre Julliard 04 Aug '14

04 Aug '14

Module: wine Branch: master Commit: 815b532b6498e54acb30bc918af2301fe1bc5c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815b532b6498e54acb30bc918… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:23 2014 +0200 shell32: Always initialize shellitem to NULL in SHCreateShellItem. --- dlls/shell32/shellitem.c | 3 ++- dlls/shell32/tests/shlfolder.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 8236975..06b0783 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -555,6 +555,8 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, TRACE("(%p,%p,%p,%p)\n", pidlParent, psfParent, pidl, ppsi); + *ppsi = NULL; + if (!pidl) { return E_INVALIDARG; @@ -604,7 +606,6 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, } else { - *ppsi = NULL; ILFree(new_pidl); } return ret; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 4e20251..acb3517 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2236,8 +2236,10 @@ static void test_SHCreateShellItem(void) pidl_abstestfile = pILCombine(pidl_cwd, pidl_testfile); + shellitem = (void*)0xdeadbeef; ret = pSHCreateShellItem(NULL, NULL, NULL, &shellitem); ok(ret == E_INVALIDARG, "SHCreateShellItem returned %x\n", ret); + ok(shellitem == 0, "Got %p\n", shellitem); if (0) /* crashes on Windows XP */ {

1 0

David Hedberg : shell32: Return S_OK only if the flags matches the result exactly.
by Alexandre Julliard 04 Aug '14

04 Aug '14

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

David Hedberg : shell32: Mask out attributes we didn' t ask for in ShellItem::GetAttributes.
by Alexandre Julliard 04 Aug '14

04 Aug '14

Module: wine Branch: master Commit: 678434539ef7fd0009127ca5069bdef764c49d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=678434539ef7fd0009127ca50… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:21 2014 +0200 shell32: Mask out attributes we didn't ask for in ShellItem::GetAttributes. --- dlls/shell32/shellitem.c | 1 + dlls/shell32/tests/shlfolder.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index f58c566..21bf8a5 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -269,6 +269,7 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem2 *iface, SFGAOF sfgaoMa child_pidl = ILFindLastID(This->pidl); *psfgaoAttribs = sfgaoMask; ret = IShellFolder_GetAttributesOf(parent_folder, 1, (LPCITEMIDLIST*)&child_pidl, psfgaoAttribs); + *psfgaoAttribs &= sfgaoMask; IShellFolder_Release(parent_folder); } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index d3b965b..fa7219c 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3783,17 +3783,17 @@ static void test_ShellItemGetAttributes(void) sfgao = 0xdeadbeef; hr = IShellItem_GetAttributes(psi_folder1, 0, &sfgao); ok(hr == S_OK, "Got 0x%08x\n", hr); - todo_wine ok(sfgao == 0, "Got 0x%08x\n", sfgao); + ok(sfgao == 0, "Got 0x%08x\n", sfgao); sfgao = 0xdeadbeef; hr = IShellItem_GetAttributes(psi_folder1, SFGAO_FOLDER, &sfgao); ok(hr == S_OK, "Got 0x%08x\n", hr); - todo_wine ok(sfgao == SFGAO_FOLDER, "Got 0x%08x\n", sfgao); + ok(sfgao == SFGAO_FOLDER, "Got 0x%08x\n", sfgao); sfgao = 0xdeadbeef; hr = IShellItem_GetAttributes(psi_file1, SFGAO_FOLDER, &sfgao); todo_wine ok(hr == S_FALSE, "Got 0x%08x\n", hr); - todo_wine ok(sfgao == 0, "Got 0x%08x\n", sfgao); + ok(sfgao == 0, "Got 0x%08x\n", sfgao); IShellItem_Release(psi_folder1); IShellItem_Release(psi_file1);

1 0

David Hedberg : shell32/tests: Tests for IShellItemGetAttributes.
by Alexandre Julliard 04 Aug '14

04 Aug '14

Module: wine Branch: master Commit: 955b487b20b4436e8aade43d3bd5c8d27e25db6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=955b487b20b4436e8aade43d3… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:20 2014 +0200 shell32/tests: Tests for IShellItemGetAttributes. --- dlls/shell32/tests/shlfolder.c | 54 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e58a863..d3b965b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3711,10 +3711,15 @@ static void test_ShellItemBindToHandler(void) static void test_ShellItemGetAttributes(void) { - IShellItem *psi; - LPITEMIDLIST pidl_desktop; + IShellItem *psi, *psi_folder1, *psi_file1; + IShellFolder *pdesktopsf; + LPITEMIDLIST pidl_desktop, pidl; SFGAOF sfgao; HRESULT hr; + WCHAR curdirW[MAX_PATH]; + WCHAR buf[MAX_PATH]; + static const WCHAR testdir1W[] = {'t','e','s','t','d','i','r',0}; + static const WCHAR testfile1W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; if(!pSHCreateShellItem) { @@ -3749,6 +3754,51 @@ static void test_ShellItemGetAttributes(void) ok(sfgao == SFGAO_FOLDER || broken(sfgao == 0) /* <Vista */, "Got 0x%08x\n", sfgao); IShellItem_Release(psi); + + CreateFilesFolders(); + + SHGetDesktopFolder(&pdesktopsf); + + GetCurrentDirectoryW(MAX_PATH, curdirW); + myPathAddBackslashW(curdirW); + + lstrcpyW(buf, curdirW); + lstrcatW(buf, testdir1W); + hr = IShellFolder_ParseDisplayName(pdesktopsf, NULL, NULL, buf, NULL, &pidl, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_folder1); + ok(hr == S_OK, "Got 0x%08x\n", sfgao); + pILFree(pidl); + + lstrcpyW(buf, curdirW); + lstrcatW(buf, testfile1W); + hr = IShellFolder_ParseDisplayName(pdesktopsf, NULL, NULL, buf, NULL, &pidl, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_file1); + ok(hr == S_OK, "Got 0x%08x\n", sfgao); + pILFree(pidl); + + IShellFolder_Release(pdesktopsf); + + sfgao = 0xdeadbeef; + hr = IShellItem_GetAttributes(psi_folder1, 0, &sfgao); + ok(hr == S_OK, "Got 0x%08x\n", hr); + todo_wine ok(sfgao == 0, "Got 0x%08x\n", sfgao); + + sfgao = 0xdeadbeef; + hr = IShellItem_GetAttributes(psi_folder1, SFGAO_FOLDER, &sfgao); + ok(hr == S_OK, "Got 0x%08x\n", hr); + todo_wine ok(sfgao == SFGAO_FOLDER, "Got 0x%08x\n", sfgao); + + sfgao = 0xdeadbeef; + hr = IShellItem_GetAttributes(psi_file1, SFGAO_FOLDER, &sfgao); + todo_wine ok(hr == S_FALSE, "Got 0x%08x\n", hr); + todo_wine ok(sfgao == 0, "Got 0x%08x\n", sfgao); + + IShellItem_Release(psi_folder1); + IShellItem_Release(psi_file1); + + Cleanup(); } static void test_SHParseDisplayName(void)

1 0

Bruno Jesus : rsaenh: The RC2 algorithm from Base provider supports only 40 bit keys.
by Alexandre Julliard 04 Aug '14

04 Aug '14

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

Bruno Jesus : rsaenh: Use a helper to get the key container.
by Alexandre Julliard 04 Aug '14

04 Aug '14

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

Henri Verbeet : wined3d: Move the "draw_binding" field from struct wined3d_surface to struct wined3d_resource.
by Alexandre Julliard 04 Aug '14

04 Aug '14

Module: wine Branch: master Commit: 5ef8e974149176c145f6b51a806ed3ffd4d50398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef8e974149176c145f6b51a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 4 12:17:27 2014 +0200 wined3d: Move the "draw_binding" field from struct wined3d_surface to struct wined3d_resource. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/drawprim.c | 8 ++++---- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- dlls/wined3d/swapchain.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 7 files changed, 33 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ef8e974149176c145f6b…

1 0

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 August 2014