October 2008 - Wine-Commits

Lei Zhang : shlwapi: Handle ASSOCSTR_FRIENDLYAPPNAME in IQueryAssociations_GetString.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 57122e4daa7fe7027d7975083057d87f052e2650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57122e4daa7fe7027d7975083… Author: Lei Zhang <thestig(a)google.com> Date: Mon Oct 13 18:15:54 2008 -0700 shlwapi: Handle ASSOCSTR_FRIENDLYAPPNAME in IQueryAssociations_GetString. --- dlls/shlwapi/assoc.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shlwapi/tests/assoc.c | 4 +- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 882b881..7f71708 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -27,6 +27,7 @@ #include "objbase.h" #include "shlguid.h" #include "shlwapi.h" +#include "ver.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -745,6 +746,59 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( break; } + case ASSOCSTR_FRIENDLYAPPNAME: + { + PVOID verinfoW = NULL; + DWORD size, retval = 0; + UINT flen; + WCHAR *bufW; + static const WCHAR translationW[] = { + '\\','V','a','r','F','i','l','e','I','n','f','o', + '\\','T','r','a','n','s','l','a','t','i','o','n',0 + }; + static const WCHAR fileDescFmtW[] = { + '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', + '\\','%','0','4','x','%','0','4','x', + '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0 + }; + WCHAR fileDescW[41]; + + hr = ASSOC_GetExecutable(This, pszExtra, path, MAX_PATH, &len); + if (FAILED(hr)) + return hr; + + retval = GetFileVersionInfoSizeW(path, &size); + if (!retval) + goto get_friendly_name_fail; + verinfoW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); + if (!verinfoW) + return E_OUTOFMEMORY; + if (!GetFileVersionInfoW(path, 0, retval, verinfoW)) + goto get_friendly_name_fail; + if (VerQueryValueW(verinfoW, translationW, (LPVOID *)&bufW, &flen)) + { + int i; + DWORD *langCodeDesc = (DWORD *)bufW; + for (i = 0; i < flen / sizeof(DWORD); i++) + { + sprintfW(fileDescW, fileDescFmtW, LOWORD(langCodeDesc[i]), + HIWORD(langCodeDesc[i])); + if (VerQueryValueW(verinfoW, fileDescW, (LPVOID *)&bufW, &flen)) + { + /* Does strlenW(bufW) == 0 mean we use the filename? */ + len = strlenW(bufW) + 1; + TRACE("found FileDescription: %s\n", debugstr_w(bufW)); + return ASSOC_ReturnData(pszOut, pcchOut, bufW, len); + } + } + } +get_friendly_name_fail: + PathRemoveExtensionW(path); + PathStripPathW(path); + TRACE("using filename: %s\n", debugstr_w(path)); + return ASSOC_ReturnData(pszOut, pcchOut, path, strlenW(path) + 1); + } + default: FIXME("assocstr %d unimplemented!\n", str); return E_NOTIMPL; diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index bb1c4d6..e5d40d1 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -59,7 +59,7 @@ static void test_getstring_bad(void) expect_hr(E_FAIL, hr); hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); - todo_wine expect_hr(0x80070002, hr); /* NOT FOUND */ + expect_hr(0x80070002, hr); /* NOT FOUND */ hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, NULL); expect_hr(E_UNEXPECTED, hr); @@ -98,7 +98,7 @@ static void test_getstring_basic(void) hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, &len); - todo_wine expect_hr(S_FALSE, hr); + expect_hr(S_FALSE, hr); if (hr != S_FALSE) { HeapFree(GetProcessHeap(), 0, executableName);

1 0

Lei Zhang : shlwapi: Refactor get executable code in IQueryAssociations_fnGetString.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 4e0c0ec1574d7c168a7fce6f3c0369abaeedba1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0c0ec1574d7c168a7fce6f3… Author: Lei Zhang <thestig(a)google.com> Date: Mon Oct 13 18:07:15 2008 -0700 shlwapi: Refactor get executable code in IQueryAssociations_fnGetString. --- dlls/shlwapi/assoc.c | 152 +++++++++++++++++++++++++++----------------------- 1 files changed, 82 insertions(+), 70 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 0d8baa0..61ac84b 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -590,6 +590,86 @@ static HRESULT ASSOC_GetValue(HKEY hkey, WCHAR ** pszText) return S_OK; } +static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, + LPCWSTR pszExtra, LPWSTR path, + DWORD pathlen, DWORD *len) +{ + HKEY hkeyCommand; + HKEY hkeyFile; + HKEY hkeyShell; + HKEY hkeyVerb; + HRESULT hr; + LONG ret; + WCHAR * pszCommand; + WCHAR * pszEnd; + WCHAR * pszExtraFromReg; + WCHAR * pszFileType; + WCHAR * pszStart; + static const WCHAR commandW[] = { 'c','o','m','m','a','n','d',0 }; + static const WCHAR shellW[] = { 's','h','e','l','l',0 }; + + assert(len); + + hr = ASSOC_GetValue(This->hkeySource, &pszFileType); + if (FAILED(hr)) + return hr; + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); + HeapFree(GetProcessHeap(), 0, pszFileType); + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + + ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); + RegCloseKey(hkeyFile); + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + + if (!pszExtra) + { + hr = ASSOC_GetValue(hkeyShell, &pszExtraFromReg); + if (FAILED(hr)) + { + RegCloseKey(hkeyShell); + return hr; + } + } + + ret = RegOpenKeyExW(hkeyShell, pszExtra ? pszExtra : pszExtraFromReg, 0, + KEY_READ, &hkeyVerb); + HeapFree(GetProcessHeap(), 0, pszExtraFromReg); + RegCloseKey(hkeyShell); + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + + ret = RegOpenKeyExW(hkeyVerb, commandW, 0, KEY_READ, &hkeyCommand); + RegCloseKey(hkeyVerb); + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + hr = ASSOC_GetValue(hkeyCommand, &pszCommand); + RegCloseKey(hkeyCommand); + if (FAILED(hr)) + return hr; + + /* cleanup pszCommand */ + if (pszCommand[0] == '"') + { + pszStart = pszCommand + 1; + pszEnd = strchrW(pszStart, '"'); + } + else + { + pszStart = pszCommand; + pszEnd = strchrW(pszStart, ' '); + } + if (pszEnd) + *pszEnd = 0; + + *len = SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL); + HeapFree(GetProcessHeap(), 0, pszCommand); + if (!*len) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + return S_OK; +} + /************************************************************************** * IQueryAssociations_GetString {SHLWAPI} * @@ -617,21 +697,9 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( { IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; const ASSOCF cfUnimplemented = ~(0); - DWORD len; - HKEY hkeyCommand; - HKEY hkeyFile; - HKEY hkeyShell; - HKEY hkeyVerb; + DWORD len = 0; HRESULT hr; - LONG ret; WCHAR path[MAX_PATH]; - WCHAR * pszCommand; - WCHAR * pszEnd; - WCHAR * pszExtraFromReg; - WCHAR * pszFileType; - WCHAR * pszStart; - static const WCHAR commandW[] = { 'c','o','m','m','a','n','d',0 }; - static const WCHAR shellW[] = { 's','h','e','l','l',0 }; TRACE("(%p,0x%8x,0x%8x,%s,%p,%p)\n", This, cfFlags, str, debugstr_w(pszExtra), pszOut, pcchOut); @@ -646,65 +714,9 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( { case ASSOCSTR_EXECUTABLE: { - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); - if (FAILED(hr)) - return hr; - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, - &hkeyFile); - HeapFree(GetProcessHeap(), 0, pszFileType); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - - ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); - RegCloseKey(hkeyFile); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - - if (!pszExtra) - { - hr = ASSOC_GetValue(hkeyShell, &pszExtraFromReg); - if (FAILED(hr)) - { - RegCloseKey(hkeyShell); - return hr; - } - } - - ret = RegOpenKeyExW(hkeyShell, pszExtra ? pszExtra : pszExtraFromReg, - 0, KEY_READ, &hkeyVerb); - HeapFree(GetProcessHeap(), 0, pszExtraFromReg); - RegCloseKey(hkeyShell); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - - ret = RegOpenKeyExW(hkeyVerb, commandW, 0, KEY_READ, &hkeyCommand); - RegCloseKey(hkeyVerb); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - hr = ASSOC_GetValue(hkeyCommand, &pszCommand); - RegCloseKey(hkeyCommand); + hr = ASSOC_GetExecutable(This, pszExtra, path, MAX_PATH, &len); if (FAILED(hr)) return hr; - - /* cleanup pszCommand */ - if (pszCommand[0] == '"') - { - pszStart = pszCommand + 1; - pszEnd = strchrW(pszStart, '"'); - } - else - { - pszStart = pszCommand; - pszEnd = strchrW(pszStart, ' '); - } - if (pszEnd) - *pszEnd = 0; - - len = SearchPathW(NULL, pszStart, NULL, MAX_PATH, path, NULL); - HeapFree(GetProcessHeap(), 0, pszCommand); - if (!len) - return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - len++; if (pszOut) {

1 0

Aric Stewart : user32: DrawText handling of 0 counts with string, empty strings and -1 counts with empty string and NULL strings.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 48ad706c08a9f166f72c86e909bf365137ca6e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ad706c08a9f166f72c86e90… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 13 10:51:52 2008 -0500 user32: DrawText handling of 0 counts with string, empty strings and -1 counts with empty string and NULL strings. --- dlls/user32/tests/text.c | 424 +++++++++++++++++++++++++++++++++++++++++++--- dlls/user32/text.c | 57 +++++-- 2 files changed, 438 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48ad706c08a9f166f72c8…

1 0

Aric Stewart : user32: In DrawTextW/ A make sure to properly initialize the cbSize of DRAWTEXTPARAMS.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 8b9ebc30c90ba065b4d08c76feaaffdb9d6d818c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9ebc30c90ba065b4d08c76f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 13 08:30:55 2008 -0500 user32: In DrawTextW/A make sure to properly initialize the cbSize of DRAWTEXTPARAMS. --- dlls/user32/text.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index da3444d..b28bd71 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1081,6 +1081,7 @@ INT WINAPI DrawTextW( HDC hdc, LPCWSTR str, INT count, LPRECT rect, UINT flags ) DRAWTEXTPARAMS dtp; memset (&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); if (flags & DT_TABSTOP) { dtp.iTabLength = (flags >> 8) & 0xff; @@ -1097,6 +1098,7 @@ INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags ) DRAWTEXTPARAMS dtp; memset (&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); if (flags & DT_TABSTOP) { dtp.iTabLength = (flags >> 8) & 0xff;

1 0

Juan Lang : rpcrt4: Add tests for UuidCreate.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: a504a79d65b2bd886ec645a882b278e46f38c690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a504a79d65b2bd886ec645a88… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 13 13:06:12 2008 -0700 rpcrt4: Add tests for UuidCreate. --- dlls/rpcrt4/tests/rpc.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 763d387..61155bd 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -761,6 +761,74 @@ static void test_RpcStringBindingFromBinding(void) ok(status == RPC_S_OK, "RpcBindingFree failed with error %lu\n", status); } +static char *printGuid(char *buf, const UUID *guid) +{ + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], + guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], + guid->Data4[6], guid->Data4[7]); + return buf; +} + +static void test_UuidCreate(void) +{ + UUID guid; + BYTE version; + + UuidCreate(&guid); + version = (guid.Data3 & 0xf000) >> 12; + todo_wine + ok(version == 4 || broken(version == 1), "unexpected version %d\n", + version); + if (version == 4) + { + static UUID v4and = { 0, 0, 0x4000, { 0x80,0,0,0,0,0,0,0 } }; + static UUID v4or = { 0xffffffff, 0xffff, 0x4fff, + { 0xbf,0xff,0xff,0xff,0xff,0xff,0xff,0xff } }; + UUID and, or; + RPC_STATUS rslt; + int i; + char buf[39]; + + memcpy(&and, &guid, sizeof(guid)); + memcpy(&or, &guid, sizeof(guid)); + /* Generate a bunch of UUIDs and mask them. By the end, we expect + * every randomly generated bit to have been zero at least once, + * resulting in no bits set in the and mask except those which are not + * randomly generated: the version number and the topmost bits of the + * Data4 field (treated as big-endian.) Similarly, we expect only + * the bits which are not randomly set to be cleared in the or mask. + */ + for (i = 0; i < 1000; i++) + { + LPBYTE src, dst; + + UuidCreate(&guid); + for (src = (LPBYTE)&guid, dst = (LPBYTE)&and; + src - (LPBYTE)&guid < sizeof(guid); src++, dst++) + *dst &= *src; + for (src = (LPBYTE)&guid, dst = (LPBYTE)&or; + src - (LPBYTE)&guid < sizeof(guid); src++, dst++) + *dst |= *src; + } + ok(UuidEqual(&and, &v4and, &rslt), + "unexpected bits set in V4 UUID: %s\n", printGuid(buf, &and)); + ok(UuidEqual(&or, &v4or, &rslt), + "unexpected bits set in V4 UUID: %s\n", printGuid(buf, &or)); + } + else + { + /* Older versions of Windows generate V1 UUIDs. For these, there are + * many stable bits, including at least the MAC address if one is + * present. Just check that Data4[0]'s most significant bits are + * set as expected. + */ + todo_wine + ok((guid.Data4[0] & 0xc0) == 0x80, + "unexpected value in Data4[0]: %02x\n", guid.Data4[0] & 0xc0); + } +} + START_TEST( rpc ) { static unsigned char ncacn_np[] = "ncacn_np"; @@ -779,4 +847,5 @@ START_TEST( rpc ) test_endpoint_mapper(ncacn_np, np_address, np_endpoint); test_endpoint_mapper(ncalrpc, NULL, lrpc_endpoint); test_RpcStringBindingFromBinding(); + test_UuidCreate(); }

1 0

Dylan Smith : runtest: Fixed regression that prevented using just the -h option.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: a9b2ee2afb5bfa69112cc38f92a0345898c4f43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9b2ee2afb5bfa69112cc38f9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Oct 13 19:59:25 2008 -0400 runtest: Fixed regression that prevented using just the -h option. --- tools/runtest | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/runtest b/tools/runtest index 65022f1..ad8ef72 100755 --- a/tools/runtest +++ b/tools/runtest @@ -48,7 +48,7 @@ platform=$WINETEST_PLATFORM WINETEST_DEBUG=${WINETEST_DEBUG:-1} # parse command-line options -while [ "$#" -gt 1 ]; do +while [ "$#" -gt 0 ]; do case "$1" in -h) usage @@ -76,7 +76,7 @@ while [ "$#" -gt 1 ]; do shift; topobjdir="$1" if [ ! -d "$topobjdir" ]; then usage; fi ;; - --) + *) break ;; esac

1 0

Reece Dunn : shell32: Print the correct GUIDs in the shellpath tests.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 17bf6ef8fc516e57f64d2d032bed004117ca0019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17bf6ef8fc516e57f64d2d032… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Sep 28 20:31:04 2008 +0100 shell32: Print the correct GUIDs in the shellpath tests. --- dlls/shell32/tests/shellpath.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index a1cf2d3..4d87e8d 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -272,10 +272,8 @@ static const char *getFolderName(int folder) } } -static const char *printGUID(const GUID *guid) +static const char *printGUID(const GUID *guid, char * guidSTR) { - static char guidSTR[39]; - if (!guid) return NULL; sprintf(guidSTR, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", @@ -551,10 +549,11 @@ static void matchGUID(int folder, const GUID *guid) pidlLast->mkid.abID[0] == PT_GUID)) { GUID *shellGuid = (GUID *)(pidlLast->mkid.abID + 2); + char shellGuidStr[39], guidStr[39]; ok(IsEqualIID(shellGuid, guid), "%s: got GUID %s, expected %s\n", getFolderName(folder), - printGUID(shellGuid), printGUID(guid)); + printGUID(shellGuid, shellGuidStr), printGUID(guid, guidStr)); } IMalloc_Free(pMalloc, pidl); }

1 0

Kai Blin : winmm: Use skip() instead of trace() when skipping tests.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: d9145df0da7f01a667c7980eecb0cfc0ef11b005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9145df0da7f01a667c7980ee… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Oct 14 10:13:39 2008 +0200 winmm: Use skip() instead of trace() when skipping tests. --- dlls/winmm/tests/mmio.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index f07ab8d..79ae031 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -59,7 +59,7 @@ static void test_mmioDescend(char *fname) hmmio = mmioOpen(fname, &mmio, MMIO_READ); if (fname && !hmmio) { - trace("%s file is missing, skipping the test\n", fname); + skip("%s file is missing, skipping the test\n", fname); return; } ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); @@ -211,7 +211,7 @@ static void test_mmioOpen(char *fname) hmmio = mmioOpen(fname, &mmio, MMIO_READ); if (fname && !hmmio) { - trace("%s file is missing, skipping the test\n", fname); + skip("%s file is missing, skipping the test\n", fname); return; } ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); @@ -374,7 +374,7 @@ static void test_mmioSetBuffer(char *fname) hmmio = mmioOpen(fname, &mmio, MMIO_READ); if (fname && !hmmio) { - trace("%s file is missing, skipping the test\n", fname); + skip("%s file is missing, skipping the test\n", fname); return; } ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet);

1 0

Henri Verbeet : comdlg32: Add a basic test for IShellView2_CreateViewWindow2.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 17096364e20497600033b8ba248dff351e3b8609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17096364e20497600033b8ba2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 14 09:45:41 2008 +0200 comdlg32: Add a basic test for IShellView2_CreateViewWindow2. --- dlls/comdlg32/tests/filedlg.c | 92 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index ea999f3..86895dc 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -22,6 +22,10 @@ #include <windows.h> #include <wine/test.h> +#include "initguid.h" +#include "shlguid.h" +#define COBJMACROS +#include "shobjidl.h" /* ##### */ @@ -131,9 +135,95 @@ static void test_DialogCancel(void) } } +static UINT CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_NOTIFY) + { + if (((LPNMHDR)lParam)->code == CDN_FOLDERCHANGE) + { + IShellBrowser *shell_browser = (IShellBrowser *)SendMessage(GetParent(dlg), WM_USER + 7 /* WM_GETISHELLBROWSER */, 0, 0); + IShellView *shell_view = NULL; + IShellView2 *shell_view2 = NULL; + SV2CVW2_PARAMS view_params; + FOLDERSETTINGS folder_settings; + HRESULT hr; + RECT rect = {0, 0, 0, 0}; + + hr = IShellBrowser_QueryActiveShellView(shell_browser, &shell_view); + ok(SUCCEEDED(hr), "QueryActiveShellView returned %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = IShellView_QueryInterface(shell_view, &IID_IShellView2, (void **)&shell_view2); + if (hr == E_NOINTERFACE) + { + skip("IShellView2 not supported\n"); + goto cleanup; + } + ok(SUCCEEDED(hr), "QueryInterface returned %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = IShellView2_DestroyViewWindow(shell_view2); + ok(SUCCEEDED(hr), "DestroyViewWindow returned %#x\n", hr); + + folder_settings.ViewMode = FVM_LIST; + folder_settings.fFlags = 0; + + view_params.cbSize = sizeof(view_params); + view_params.psvPrev = NULL; + view_params.pfs = &folder_settings; + view_params.psbOwner = shell_browser; + view_params.prcView = &rect; + view_params.pvid = NULL; + view_params.hwndView = NULL; + + hr = IShellView2_CreateViewWindow2(shell_view2, &view_params); + ok(SUCCEEDED(hr), "CreateViewWindow2 returned %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); + ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); + ok(folder_settings.ViewMode == FVM_LIST, "view mode is %d, expected %d\n", folder_settings.ViewMode, FVM_LIST); + + hr = IShellView2_DestroyViewWindow(shell_view2); + ok(SUCCEEDED(hr), "DestroyViewWindow returned %#x\n", hr); + + view_params.pvid = &VID_Details; + hr = IShellView2_CreateViewWindow2(shell_view2, &view_params); + ok(SUCCEEDED(hr), "CreateViewWindow2 returned %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); + ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); + ok(folder_settings.ViewMode == FVM_DETAILS, "view mode is %d, expected %d\n", folder_settings.ViewMode, FVM_DETAILS); + +cleanup: + if (shell_view2) IShellView2_Release(shell_view2); + if (shell_view) IShellView_Release(shell_view); + PostMessage(GetParent(dlg), WM_COMMAND, IDCANCEL, 0); + } + } + return 0; +} + +static void test_create_view_window2(void) +{ + OPENFILENAMEA ofn = {0}; + char filename[1024] = {0}; + DWORD ret; + + ofn.lStructSize = sizeof(ofn); + ofn.lpstrFile = filename; + ofn.nMaxFile = 1042; + ofn.lpfnHook = create_view_window2_hook; + ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ret = GetOpenFileNameA(&ofn); + ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); +} START_TEST(filedlg) { test_DialogCancel(); - + test_create_view_window2(); }

1 0

Henri Verbeet : shell32: Add a FIXME for unimplemented view modes.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: abb7f92b780e0baffd973f73f6f8df2150b44f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb7f92b780e0baffd973f73f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 14 09:01:08 2008 +0200 shell32: Add a FIXME for unimplemented view modes. --- dlls/shell32/shlview.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 20a1efb..e3727ba 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -316,7 +316,12 @@ static BOOL ShellView_CreateList (IShellViewImpl * This) case FVM_DETAILS: dwStyle |= LVS_REPORT; break; case FVM_SMALLICON: dwStyle |= LVS_SMALLICON; break; case FVM_LIST: dwStyle |= LVS_LIST; break; - default: dwStyle |= LVS_LIST; break; + default: + { + FIXME("ViewMode %d not implemented\n", This->FolderSettings.ViewMode); + dwStyle |= LVS_LIST; + break; + } } if (This->FolderSettings.fFlags & FWF_AUTOARRANGE) dwStyle |= LVS_AUTOARRANGE;

1 0