March 2010 - Wine-Commits - list.winehq.org

Nikolay Sivov : quartz: Don't cast WSTR to BSTR, convert properly instead.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: da550ed25731eb6f0c46041da39e2e371c8ebe5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da550ed25731eb6f0c46041da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 19:29:12 2010 +0300 quartz: Don't cast WSTR to BSTR, convert properly instead. --- dlls/quartz/filtermapper.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 7b8d954..bacb729 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -479,11 +479,16 @@ static HRESULT WINAPI FilterMapper2_UnregisterFilter( static HRESULT FM2_WriteFriendlyName(IPropertyBag * pPropBag, LPCWSTR szName) { VARIANT var; + HRESULT ret; + BSTR value; V_VT(&var) = VT_BSTR; - V_UNION(&var, bstrVal) = (BSTR)szName; + V_UNION(&var, bstrVal) = value = SysAllocString(szName); - return IPropertyBag_Write(pPropBag, wszFriendlyName, &var); + ret = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); + SysFreeString(value); + + return ret; } static HRESULT FM2_WriteClsid(IPropertyBag * pPropBag, REFCLSID clsid)

1 0

Nikolay Sivov : shlwapi: Don't cast WCHAR string to BSTR.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: c8cd1502589a489130a92b96d09568b013fc686a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8cd1502589a489130a92b96d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 18:53:36 2010 +0300 shlwapi: Don't cast WCHAR string to BSTR. --- dlls/shlwapi/ordinal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 412dac1..364bbfe 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -402,7 +402,9 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)pIEnumFormatEtc; - hRet = IWebBrowserApp_PutProperty(pBrowser, (BSTR)szProperty, var); + property = SysAllocString(szProperty); + hRet = IWebBrowserApp_PutProperty(pBrowser, property, var); + SysFreeString(property); if (FAILED(hRet)) { IEnumFORMATETC_Release(pIEnumFormatEtc);

1 0

Nikolay Sivov : shell32/shellview: Don't crash on :: DragLeave called without droptraget.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 345ab7d591bcc9c5d308a18f00d3f67aa6e887ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=345ab7d591bcc9c5d308a18f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 11 17:39:48 2010 +0300 shell32/shellview: Don't crash on ::DragLeave called without droptraget. --- dlls/shell32/shlview.c | 22 +++++++++++++++------- dlls/shell32/tests/shlview.c | 8 ++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index cf90982..7809344 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2407,17 +2407,25 @@ static HRESULT WINAPI ISVDropTarget_DragOver(IDropTarget *iface, DWORD grfKeySta return drag_notify_subitem(This, grfKeyState, pt, pdwEffect); } -static HRESULT WINAPI ISVDropTarget_DragLeave(IDropTarget *iface) { +static HRESULT WINAPI ISVDropTarget_DragLeave(IDropTarget *iface) +{ IShellViewImpl *This = impl_from_IDropTarget(iface); - IDropTarget_DragLeave(This->pCurDropTarget); + if (This->pCurDropTarget) + { + IDropTarget_DragLeave(This->pCurDropTarget); + IDropTarget_Release(This->pCurDropTarget); + This->pCurDropTarget = NULL; + } + + if (This->pCurDataObject) + { + IDataObject_Release(This->pCurDataObject); + This->pCurDataObject = NULL; + } - IDropTarget_Release(This->pCurDropTarget); - IDataObject_Release(This->pCurDataObject); - This->pCurDataObject = NULL; - This->pCurDropTarget = NULL; This->iDragOverItem = 0; - + return S_OK; } diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index ac603c1..31f47c1 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -318,6 +318,7 @@ static void test_IShellView_CreateViewWindow(void) IShellFolder *desktop; FOLDERSETTINGS settings; IShellView *view; + IDropTarget *dt; HWND hwnd_view; HRESULT hr; RECT r = {0}; @@ -346,6 +347,13 @@ if (0) ok(hr == E_UNEXPECTED, "got (0x%08x)\n", hr); ok(hwnd_view == 0, "got %p\n", hwnd_view); + /* ::DragLeave without drag operation */ + hr = IShellView_QueryInterface(view, &IID_IDropTarget, (void**)&dt); + ok(hr == S_OK, "got (0x%08x)\n", hr); + hr = IDropTarget_DragLeave(dt); + ok(hr == S_OK, "got (0x%08x)\n", hr); + IDropTarget_Release(dt); + IShellView_Release(view); IShellFolder_Release(desktop); }

1 0

Nikolay Sivov : avifil32: Registry access calls don't return HRESULT codes.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: bc87dd6026a0d2633d54bc55e3dbb39e7156cf0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc87dd6026a0d2633d54bc55e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 02:22:13 2010 +0300 avifil32: Registry access calls don't return HRESULT codes. --- dlls/avifil32/api.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index dd1c2e2..ac3c35e 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1030,14 +1030,14 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) * First filter is named "All multimedia files" and its filter is a * collection of all possible extensions except "*.*". */ - if (RegOpenKeyW(HKEY_CLASSES_ROOT, szAVIFileExtensions, &hKey) != S_OK) { + if (RegOpenKeyW(HKEY_CLASSES_ROOT, szAVIFileExtensions, &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } - for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == S_OK;n++) { + for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == ERROR_SUCCESS;n++) { /* get CLSID to extension */ size = sizeof(szValue); - if (RegQueryValueW(hKey, szFileExt, szValue, &size) != S_OK) + if (RegQueryValueW(hKey, szFileExt, szValue, &size) != ERROR_SUCCESS) break; /* search if the CLSID is already known */ @@ -1078,7 +1078,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) RegCloseKey(hKey); /* 2. get descriptions for the CLSIDs and fill out szFilter */ - if (RegOpenKeyW(HKEY_CLASSES_ROOT, szClsid, &hKey) != S_OK) { + if (RegOpenKeyW(HKEY_CLASSES_ROOT, szClsid, &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } @@ -1086,7 +1086,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) /* first the description */ if (n != 0) { size = sizeof(szValue); - if (RegQueryValueW(hKey, lp[n].szClsid, szValue, &size) == S_OK) { + if (RegQueryValueW(hKey, lp[n].szClsid, szValue, &size) == ERROR_SUCCESS) { size = lstrlenW(szValue); lstrcpynW(szFilter, szValue, cbFilter); }

1 0

Nikolay Sivov : shlwapi: Partially implement SHGetObjectCompatFlags with tests.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 533f7558aa8de258b37a87b3faf21328acc201a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533f7558aa8de258b37a87b3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 02:16:00 2010 +0300 shlwapi: Partially implement SHGetObjectCompatFlags with tests. --- dlls/shlwapi/ordinal.c | 124 ++++++++++++++++++++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/tests/ordinal.c | 87 +++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 375ddaf..412dac1 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4854,3 +4854,127 @@ BOOL WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLON } return hr; } + +/* return flags for SHGetObjectCompatFlags, names derived from registry value names */ +#define OBJCOMPAT_OTNEEDSSFCACHE 0x00000001 +#define OBJCOMPAT_NO_WEBVIEW 0x00000002 +#define OBJCOMPAT_UNBINDABLE 0x00000004 +#define OBJCOMPAT_PINDLL 0x00000008 +#define OBJCOMPAT_NEEDSFILESYSANCESTOR 0x00000010 +#define OBJCOMPAT_NOTAFILESYSTEM 0x00000020 +#define OBJCOMPAT_CTXMENU_NOVERBS 0x00000040 +#define OBJCOMPAT_CTXMENU_LIMITEDQI 0x00000080 +#define OBJCOMPAT_COCREATESHELLFOLDERONLY 0x00000100 +#define OBJCOMPAT_NEEDSSTORAGEANCESTOR 0x00000200 +#define OBJCOMPAT_NOLEGACYWEBVIEW 0x00000400 +#define OBJCOMPAT_CTXMENU_XPQCMFLAGS 0x00001000 +#define OBJCOMPAT_NOIPROPERTYSTORE 0x00002000 + +/* a search table for compatibility flags */ +struct objcompat_entry { + const WCHAR name[30]; + DWORD value; +}; + +/* expected to be sorted by name */ +static const struct objcompat_entry objcompat_table[] = { + { {'C','O','C','R','E','A','T','E','S','H','E','L','L','F','O','L','D','E','R','O','N','L','Y',0}, + OBJCOMPAT_COCREATESHELLFOLDERONLY }, + { {'C','T','X','M','E','N','U','_','L','I','M','I','T','E','D','Q','I',0}, + OBJCOMPAT_CTXMENU_LIMITEDQI }, + { {'C','T','X','M','E','N','U','_','N','O','V','E','R','B','S',0}, + OBJCOMPAT_CTXMENU_LIMITEDQI }, + { {'C','T','X','M','E','N','U','_','X','P','Q','C','M','F','L','A','G','S',0}, + OBJCOMPAT_CTXMENU_XPQCMFLAGS }, + { {'N','E','E','D','S','F','I','L','E','S','Y','S','A','N','C','E','S','T','O','R',0}, + OBJCOMPAT_NEEDSFILESYSANCESTOR }, + { {'N','E','E','D','S','S','T','O','R','A','G','E','A','N','C','E','S','T','O','R',0}, + OBJCOMPAT_NEEDSSTORAGEANCESTOR }, + { {'N','O','I','P','R','O','P','E','R','T','Y','S','T','O','R','E',0}, + OBJCOMPAT_NOIPROPERTYSTORE }, + { {'N','O','L','E','G','A','C','Y','W','E','B','V','I','E','W',0}, + OBJCOMPAT_NOLEGACYWEBVIEW }, + { {'N','O','T','A','F','I','L','E','S','Y','S','T','E','M',0}, + OBJCOMPAT_NOTAFILESYSTEM }, + { {'N','O','_','W','E','B','V','I','E','W',0}, + OBJCOMPAT_NO_WEBVIEW }, + { {'O','T','N','E','E','D','S','S','F','C','A','C','H','E',0}, + OBJCOMPAT_OTNEEDSSFCACHE }, + { {'P','I','N','D','L','L',0}, + OBJCOMPAT_PINDLL }, + { {'U','N','B','I','N','D','A','B','L','E',0}, + OBJCOMPAT_UNBINDABLE } +}; + +/************************************************************************** + * SHGetObjectCompatFlags (SHLWAPI.476) + * + * Function returns an integer representation of compatibility flags stored + * in registry for CLSID under ShellCompatibility subkey. + * + * PARAMS + * pUnk: pointer to object IUnknown interface, idetifies CLSID + * clsid: pointer to CLSID to retrieve data for + * + * RETURNS + * 0 on failure, flags set on success + */ +DWORD WINAPI SHGetObjectCompatFlags(IUnknown *pUnk, const CLSID *clsid) +{ + static const WCHAR compatpathW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'S','h','e','l','l','C','o','m','p','a','t','i','b','i','l','i','t','y','\\', + 'O','b','j','e','c','t','s','\\','%','s',0}; + WCHAR strW[sizeof(compatpathW)/sizeof(WCHAR) + 38 /* { CLSID } */]; + DWORD ret, length = sizeof(strW)/sizeof(WCHAR); + OLECHAR *clsid_str; + HKEY key; + INT i; + + TRACE("%p %s\n", pUnk, debugstr_guid(clsid)); + + if (!pUnk && !clsid) return 0; + + if (pUnk && !clsid) + { + FIXME("iface not handled\n"); + return 0; + } + + StringFromCLSID(clsid, &clsid_str); + sprintfW(strW, compatpathW, clsid_str); + CoTaskMemFree(clsid_str); + + ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, strW, &key); + if (ret != ERROR_SUCCESS) return 0; + + /* now collect flag values */ + ret = 0; + for (i = 0; RegEnumValueW(key, i, strW, &length, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; i++) + { + INT left, right, res, x; + + /* search in table */ + left = 0; + right = sizeof(objcompat_table) / sizeof(struct objcompat_entry) - 1; + + while (right >= left) { + x = (left + right) / 2; + res = strcmpW(strW, objcompat_table[x].name); + if (res == 0) + { + ret |= objcompat_table[x].value; + break; + } + else if (res < 0) + right = x - 1; + else + left = x + 1; + } + + length = sizeof(strW)/sizeof(WCHAR); + } + + return ret; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 3091783..6047646 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -473,7 +473,7 @@ 473 stub -noname SHGetIniStringUTF7W 474 stub -noname SHSetIniStringUTF7W 475 stdcall -noname GetShellSecurityDescriptor(ptr long) -476 stub -noname SHGetObjectCompatFlags +476 stdcall -noname SHGetObjectCompatFlags(ptr ptr) 477 stub -noname SHCreatePropertyBagOnMemory 478 stdcall -noname IUnknown_TranslateAcceleratorIO(ptr ptr) 479 stdcall -noname IUnknown_UIActivateIO(ptr long ptr) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 083934b..223aac4 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -47,6 +47,8 @@ static HRESULT(WINAPI *pSHPropertyBag_ReadLONG)(IPropertyBag *,LPCWSTR,LPLONG); static LONG (WINAPI *pSHSetWindowBits)(HWND, INT, UINT, UINT); static INT (WINAPI *pSHFormatDateTimeA)(const FILETIME UNALIGNED*, DWORD*, LPSTR, UINT); static INT (WINAPI *pSHFormatDateTimeW)(const FILETIME UNALIGNED*, DWORD*, LPWSTR, UINT); +static DWORD (WINAPI *pSHGetObjectCompatFlags)(IUnknown*, const CLSID*); +static BOOL (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -1787,6 +1789,88 @@ if (0) ok(lstrcmpW(buff, buff2) == 0, "expected equal strings\n"); } +static void test_SHGetObjectCompatFlags(void) +{ + struct compat_value { + CHAR nameA[30]; + DWORD value; + }; + + struct compat_value values[] = { + { "OTNEEDSSFCACHE", 0x1 }, + { "NO_WEBVIEW", 0x2 }, + { "UNBINDABLE", 0x4 }, + { "PINDLL", 0x8 }, + { "NEEDSFILESYSANCESTOR", 0x10 }, + { "NOTAFILESYSTEM", 0x20 }, + { "CTXMENU_NOVERBS", 0x40 }, + { "CTXMENU_LIMITEDQI", 0x80 }, + { "COCREATESHELLFOLDERONLY", 0x100 }, + { "NEEDSSTORAGEANCESTOR", 0x200 }, + { "NOLEGACYWEBVIEW", 0x400 }, + { "CTXMENU_XPQCMFLAGS", 0x1000 }, + { "NOIPROPERTYSTORE", 0x2000 } + }; + + static const char compat_path[] = "Software\\Microsoft\\Windows\\CurrentVersion\\ShellCompatibility\\Objects"; + CHAR keyA[39]; /* {CLSID} */ + HKEY root; + DWORD ret; + int i; + + if (!pSHGetObjectCompatFlags) + { + win_skip("SHGetObjectCompatFlags isn't available\n"); + return; + } + + /* null args */ + ret = pSHGetObjectCompatFlags(NULL, NULL); + ok(ret == 0, "got %d\n", ret); + + ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, compat_path, &root); + if (ret != ERROR_SUCCESS) + { + skip("No compatibility class data found\n"); + return; + } + + for (i = 0; RegEnumKeyA(root, i, keyA, sizeof(keyA)) == ERROR_SUCCESS; i++) + { + HKEY clsid_key; + + if (RegOpenKeyA(root, keyA, &clsid_key) == ERROR_SUCCESS) + { + CHAR valueA[30]; + DWORD expected = 0, got, length = sizeof(valueA); + CLSID clsid; + int v; + + for (v = 0; RegEnumValueA(clsid_key, v, valueA, &length, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; v++) + { + int j; + + for (j = 0; j < sizeof(values)/sizeof(struct compat_value); j++) + if (lstrcmpA(values[j].nameA, valueA) == 0) + { + expected |= values[j].value; + break; + } + + length = sizeof(valueA); + } + + pGUIDFromStringA(keyA, &clsid); + got = pSHGetObjectCompatFlags(NULL, &clsid); + ok(got == expected, "got 0x%08x, expected 0x%08x. Key %s\n", got, expected, keyA); + + RegCloseKey(clsid_key); + } + } + + RegCloseKey(root); +} + static void init_pointers(void) { #define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) @@ -1798,11 +1882,13 @@ static void init_pointers(void) MAKEFUNC(SHSetWindowBits, 165); MAKEFUNC(ConnectToConnectionPoint, 168); MAKEFUNC(SHSearchMapInt, 198); + MAKEFUNC(GUIDFromStringA, 269); MAKEFUNC(SHPackDispParams, 282); MAKEFUNC(IConnectionPoint_InvokeWithCancel, 283); MAKEFUNC(IConnectionPoint_SimpleInvoke, 284); MAKEFUNC(SHFormatDateTimeA, 353); MAKEFUNC(SHFormatDateTimeW, 354); + MAKEFUNC(SHGetObjectCompatFlags, 476); MAKEFUNC(SHPropertyBag_ReadLONG, 496); #undef MAKEFUNC } @@ -1827,4 +1913,5 @@ START_TEST(ordinal) test_SHSetWindowBits(); test_SHFormatDateTimeA(); test_SHFormatDateTimeW(); + test_SHGetObjectCompatFlags(); }

1 0

Nikolay Sivov : shell32/shellview: Implement IFolderView::GetFolder() for IID_IShellFolder.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: b8220e727c54181750d904d90c677dad744df9db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8220e727c54181750d904d90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 6 23:55:55 2010 +0300 shell32/shellview: Implement IFolderView::GetFolder() for IID_IShellFolder. --- dlls/shell32/shlview.c | 16 +++++++++++++--- dlls/shell32/tests/shlview.c | 23 ++++++++++++++++++++++- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index f718c2b..af14604 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2711,9 +2711,19 @@ static HRESULT WINAPI IFView_SetCurrentViewMode(IFolderView *iface, UINT mode) static HRESULT WINAPI IFView_GetFolder(IFolderView *iface, REFIID riid, void **ppv) { - IShellViewImpl *This = impl_from_IFolderView(iface); - FIXME("(%p)->(%s, %p), stub\n", This, debugstr_guid(riid), ppv); - return E_NOTIMPL; + IShellViewImpl *This = impl_from_IFolderView(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) return E_POINTER; + + if (IsEqualIID(riid, &IID_IShellFolder)) + { + *ppv = This->pSFParent; + return S_OK; + } + + return E_NOINTERFACE; } static HRESULT WINAPI IFView_Item(IFolderView *iface, int index, PITEMID_CHILD *ppidl) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 2cd4c4b..c8cd4cf 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -347,7 +347,7 @@ if (0) static void test_IFolderView(void) { - IShellFolder *desktop; + IShellFolder *desktop, *folder; FOLDERSETTINGS settings; IShellView *view; IShellBrowser *browser; @@ -356,6 +356,7 @@ static void test_IFolderView(void) HRESULT hr; INT ret; POINT pt; + LONG ref1, ref2; RECT r; hr = SHGetDesktopFolder(&desktop); @@ -448,6 +449,26 @@ if (0) ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getfocused_seq, "IFolderView::GetFocusedItem", FALSE); + /* IFolderView::GetFolder, just return pointer */ +if (0) +{ + /* crashes on XP */ + hr = IFolderView_GetFolder(fv, NULL, (void**)&folder); + hr = IFolderView_GetFolder(fv, NULL, NULL); +} + + hr = IFolderView_GetFolder(fv, &IID_IShellFolder, NULL); + ok(hr == E_POINTER, "got (0x%08x)\n", hr); + + ref1 = IShellFolder_AddRef(desktop); + IShellFolder_Release(desktop); + hr = IFolderView_GetFolder(fv, &IID_IShellFolder, (void**)&folder); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ref2 = IShellFolder_AddRef(desktop); + IShellFolder_Release(desktop); + ok(ref1 == ref2, "expected same refcount, got %d\n", ref2); + ok(desktop == folder, "\n"); + IShellBrowser_Release(browser); IFolderView_Release(fv); IShellView_Release(view);

1 0

Nikolay Sivov : shell32/shellview: Implement IFolderView:: ItemCount for SVGIO_ALLVIEW flag.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 78c909fb08c9168ac679a47b2df6d4249ae20fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c909fb08c9168ac679a47b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 9 13:57:34 2010 +0300 shell32/shellview: Implement IFolderView::ItemCount for SVGIO_ALLVIEW flag. --- dlls/shell32/shlview.c | 13 ++++++++++--- dlls/shell32/tests/shlview.c | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index af14604..cf90982 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2735,9 +2735,16 @@ static HRESULT WINAPI IFView_Item(IFolderView *iface, int index, PITEMID_CHILD * static HRESULT WINAPI IFView_ItemCount(IFolderView *iface, UINT flags, int *items) { - IShellViewImpl *This = impl_from_IFolderView(iface); - FIXME("(%p)->(%u %p), stub\n", This, flags, items); - return E_NOTIMPL; + IShellViewImpl *This = impl_from_IFolderView(iface); + + TRACE("(%p)->(%u %p)\n", This, flags, items); + + if (flags != SVGIO_ALLVIEW) + FIXME("some flags unsupported, %x\n", flags & ~SVGIO_ALLVIEW); + + *items = SendMessageW(This->hWndList, LVM_GETITEMCOUNT, 0, 0); + + return S_OK; } static HRESULT WINAPI IFView_Items(IFolderView *iface, UINT flags, REFIID riid, void **ppv) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index c8cd4cf..ac603c1 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -308,6 +308,11 @@ static const struct message folderview_getfocused_seq[] = { { 0 } }; +static const struct message folderview_itemcount_seq[] = { + { LVM_GETITEMCOUNT, sent }, + { 0 } +}; + static void test_IShellView_CreateViewWindow(void) { IShellFolder *desktop; @@ -469,6 +474,19 @@ if (0) ok(ref1 == ref2, "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); + /* IFolderView::ItemCount */ +if (0) +{ + /* crashes on XP */ + hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, NULL); +} + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &ret); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_itemcount_seq, + "IFolderView::ItemCount", FALSE); + IShellBrowser_Release(browser); IFolderView_Release(fv); IShellView_Release(view);

1 0

Nikolay Sivov : shell32: Add SHCreateFileExtractIconW stub.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 82a4b85424302cefeabe3cc64cfddc45b0bc9757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a4b85424302cefeabe3cc64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 9 15:10:08 2010 +0300 shell32: Add SHCreateFileExtractIconW stub. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index fc1347e..7a5d4ed 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -258,6 +258,7 @@ 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall -noname RestartDialogEx(long wstr long long) + 743 stdcall SHCreateFileExtractIconW(wstr long ptr ptr) 1217 stub FOOBAR1217 # no joke! This is the real name!! diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 969dfad..db63e16 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -795,6 +795,13 @@ HICON WINAPI ExtractIconW(HINSTANCE hInstance, LPCWSTR lpszFile, UINT nIconIndex return NULL; } +HRESULT WINAPI SHCreateFileExtractIconW(LPCWSTR file, DWORD attribs, REFIID riid, void **ppv) +{ + FIXME("%s, %x, %s, %p\n", debugstr_w(file), attribs, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOTIMPL; +} + /************************************************************************* * Printer_LoadIconsW [SHELL32.205] */

1 0

Nikolay Sivov : msi: Convert IWineMsiRemoteDatabase BSTR parameters to LPCWSTR to avoid typecast .
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 5c6de7957e1a0c7a8f2c80f350ec81047e31b57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6de7957e1a0c7a8f2c80f35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 18:48:38 2010 +0300 msi: Convert IWineMsiRemoteDatabase BSTR parameters to LPCWSTR to avoid typecast. --- dlls/msi/database.c | 6 +++--- dlls/msi/msiquery.c | 6 +++--- dlls/msi/msiserver.idl | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 8ec2411..cfa11e9 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -2057,7 +2057,7 @@ static ULONG WINAPI mrd_Release( IWineMsiRemoteDatabase *iface ) } static HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface, - BSTR table, MSICONDITION *persistent ) + LPCWSTR table, MSICONDITION *persistent ) { msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); *persistent = MsiDatabaseIsTablePersistentW(This->database, table); @@ -2065,7 +2065,7 @@ static HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface, } static HRESULT WINAPI mrd_GetPrimaryKeys( IWineMsiRemoteDatabase *iface, - BSTR table, MSIHANDLE *keys ) + LPCWSTR table, MSIHANDLE *keys ) { msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiDatabaseGetPrimaryKeysW(This->database, table, keys); @@ -2081,7 +2081,7 @@ static HRESULT WINAPI mrd_GetSummaryInformation( IWineMsiRemoteDatabase *iface, } static HRESULT WINAPI mrd_OpenView( IWineMsiRemoteDatabase *iface, - BSTR query, MSIHANDLE *view ) + LPCWSTR query, MSIHANDLE *view ) { msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiDatabaseOpenViewW(This->database, query, view); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index b673832..f2723af 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -262,7 +262,7 @@ UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE hdb, if ( !remote_database ) return ERROR_INVALID_HANDLE; - hr = IWineMsiRemoteDatabase_OpenView( remote_database, (BSTR)szQuery, phView ); + hr = IWineMsiRemoteDatabase_OpenView( remote_database, szQuery, phView ); IWineMsiRemoteDatabase_Release( remote_database ); if (FAILED(hr)) @@ -943,7 +943,7 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb, if ( !remote_database ) return ERROR_INVALID_HANDLE; - hr = IWineMsiRemoteDatabase_GetPrimaryKeys( remote_database, (BSTR)table, phRec ); + hr = IWineMsiRemoteDatabase_GetPrimaryKeys( remote_database, table, phRec ); IWineMsiRemoteDatabase_Release( remote_database ); if (FAILED(hr)) @@ -1030,7 +1030,7 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( return MSICONDITION_ERROR; hr = IWineMsiRemoteDatabase_IsTablePersistent( remote_database, - (BSTR)szTableName, &condition ); + szTableName, &condition ); IWineMsiRemoteDatabase_Release( remote_database ); if (FAILED(hr)) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 25210fe..e74c22c 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -38,10 +38,10 @@ cpp_quote("#endif") ] interface IWineMsiRemoteDatabase : IUnknown { - HRESULT IsTablePersistent( [in] BSTR table, [out] MSICONDITION *persistent ); - HRESULT GetPrimaryKeys( [in] BSTR table, [out] MSIHANDLE *keys ); + HRESULT IsTablePersistent( [in] LPCWSTR table, [out] MSICONDITION *persistent ); + HRESULT GetPrimaryKeys( [in] LPCWSTR table, [out] MSIHANDLE *keys ); HRESULT GetSummaryInformation( [in] UINT updatecount, [out] MSIHANDLE *suminfo ); - HRESULT OpenView( [in] BSTR query, [out] MSIHANDLE *view ); + HRESULT OpenView( [in] LPCWSTR query, [out] MSIHANDLE *view ); HRESULT SetMsiHandle( [in] MSIHANDLE handle ); }

1 0

Nikolay Sivov : shell32/shellview: Implemented IFolderView::GetFocusedItem.
by Alexandre Julliard March 15, 2010

March 15, 2010

Module: wine Branch: master Commit: 8c92ba009d2aec43df3d483abf30f3c09d850f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c92ba009d2aec43df3d483ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 6 23:55:32 2010 +0300 shell32/shellview: Implemented IFolderView::GetFocusedItem. --- dlls/shell32/shlview.c | 10 +++++++--- dlls/shell32/tests/shlview.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 8778dbd..f718c2b 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2750,9 +2750,13 @@ static HRESULT WINAPI IFView_GetSelectionMarkedItem(IFolderView *iface, int *ite static HRESULT WINAPI IFView_GetFocusedItem(IFolderView *iface, int *item) { - IShellViewImpl *This = impl_from_IFolderView(iface); - FIXME("(%p)->(%p), stub\n", This, item); - return E_NOTIMPL; + IShellViewImpl *This = impl_from_IFolderView(iface); + + TRACE("(%p)->(%p)\n", This, item); + + *item = SendMessageW(This->hWndList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + + return S_OK; } static HRESULT WINAPI IFView_GetItemPosition(IFolderView *iface, PCUITEMID_CHILD pidl, POINT *ppt) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index fd65e49..2cd4c4b 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -303,6 +303,11 @@ static const struct message folderview_getselectionmarked_seq[] = { { 0 } }; +static const struct message folderview_getfocused_seq[] = { + { LVM_GETNEXTITEM, sent|wparam|lparam, -1, LVNI_FOCUSED }, + { 0 } +}; + static void test_IShellView_CreateViewWindow(void) { IShellFolder *desktop; @@ -379,6 +384,7 @@ if (0) /* crashes on XP */ hr = IFolderView_GetSelectionMarkedItem(fv, NULL); + hr = IFolderView_GetFocusedItem(fv, NULL); } browser = IShellBrowserImpl_Construct(); @@ -435,6 +441,13 @@ if (0) ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getselectionmarked_seq, "IFolderView::GetSelectionMarkedItem", FALSE); + /* IFolderView::GetFocusedItem */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + hr = IFolderView_GetFocusedItem(fv, &ret); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getfocused_seq, + "IFolderView::GetFocusedItem", FALSE); + IShellBrowser_Release(browser); IFolderView_Release(fv); IShellView_Release(view);

1 0