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

Huw Davies : dispex: Call the deferred fill in function before returning from the server.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 56e625b0daa21f7425b0e3489d7087e2137bd228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e625b0daa21f7425b0e3489… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 22 13:35:56 2010 +0000 dispex: Call the deferred fill in function before returning from the server. --- dlls/dispex/tests/marshal.c | 20 ++++++++++++++++++++ dlls/dispex/usrmarshal.c | 9 +++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 847f54e..b277719 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -232,6 +232,12 @@ static HRESULT WINAPI dispex_GetDispID(IDispatchEx* iface, return E_NOTIMPL; } +static HRESULT WINAPI defer_fn(EXCEPINFO *except) +{ + except->scode = E_OUTOFMEMORY; + return S_OK; +} + static HRESULT WINAPI dispex_InvokeEx(IDispatchEx* iface, DISPID id, LCID lcid, @@ -266,6 +272,11 @@ static HRESULT WINAPI dispex_InvokeEx(IDispatchEx* iface, { ok(wFlags == 0xf, "got %04x\n", wFlags); } + else if(id == 5) + { + if(pei) pei->pfnDeferredFillIn = defer_fn; + return DISP_E_EXCEPTION; + } return S_OK; } @@ -354,6 +365,7 @@ static void test_dispex(void) DISPPARAMS params; VARIANTARG args[10]; INT i; + EXCEPINFO excepinfo; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got %08x\n", hr); @@ -399,6 +411,14 @@ todo_wine hr = IDispatchEx_InvokeEx(dispex, 4, LOCALE_SYSTEM_DEFAULT, 0xffff, &params, NULL, NULL, NULL); ok(hr == S_OK, "got %08x\n", hr); + params.cArgs = 0; + hr = IDispatchEx_InvokeEx(dispex, 5, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); + ok(hr == DISP_E_EXCEPTION, "got %08x\n", hr); + hr = IDispatchEx_InvokeEx(dispex, 5, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, &excepinfo, NULL); + ok(hr == DISP_E_EXCEPTION, "got %08x\n", hr); + ok(excepinfo.scode == E_OUTOFMEMORY, "got scode %08x\n", excepinfo.scode); + ok(excepinfo.pfnDeferredFillIn == NULL, "got non-NULL pfnDeferredFillIn\n"); + IDispatchEx_Release(dispex); end_host_object(tid, thread); } diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c index c8c3563..915e5bc 100644 --- a/dlls/dispex/usrmarshal.c +++ b/dlls/dispex/usrmarshal.c @@ -133,6 +133,15 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID hr = IDispatchEx_InvokeEx(This, id, lcid, dwFlags & 0xffff, pdp, result, pei, pspCaller); + if(hr == DISP_E_EXCEPTION) + { + if(pei && pei->pfnDeferredFillIn) + { + pei->pfnDeferredFillIn(pei); + pei->pfnDeferredFillIn = NULL; + } + } + for(arg = 0; arg < byref_args; arg++) VariantInit(pdp->rgvarg + ref_idx[arg]);

1 0

Mike Kaplinskiy : ws2_32: Use ntstatus in overlapped functions.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 798c9e5161955c75231343eff0e92536cacb8360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=798c9e5161955c75231343eff… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Mar 22 14:56:21 2010 -0400 ws2_32: Use ntstatus in overlapped functions. --- dlls/ws2_32/socket.c | 148 +++++++++++++++++++++++++++++++++++++------------- server/sock.c | 69 ++++++++++++++++++++--- 2 files changed, 170 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=798c9e5161955c7523134…

1 0

Mike Kaplinskiy : ws2_32/tests: Test a WSARecv error condition.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 5d72f63bd71383343770e7a71c1730849dc627fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d72f63bd71383343770e7a71… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Mar 22 14:56:25 2010 -0400 ws2_32/tests: Test a WSARecv error condition. --- dlls/ws2_32/tests/sock.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5b519b8..a8baeeb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2778,6 +2778,62 @@ static void test_WSASendTo(void) "a successful call to WSASendTo()\n"); } +static void test_WSARecv(void) +{ + SOCKET src, dest; + char buf[20]; + WSABUF bufs; + WSAOVERLAPPED ov; + DWORD bytesReturned; + DWORD flags; + struct linger ling; + int iret; + DWORD dwret; + BOOL bret; + + tcp_socketpair(&src, &dest); + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) + { + skip("failed to create sockets\n"); + goto end; + } + + bufs.len = sizeof(buf); + bufs.buf = buf; + flags = 0; + + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); + if (!ov.hEvent) + goto end; + + ling.l_onoff = 1; + ling.l_linger = 0; + ok(!setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)), "Failed to set linger %d\n", GetLastError()); + + iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, &ov, NULL); + ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); + + closesocket(src); + src = INVALID_SOCKET; + + dwret = WaitForSingleObject(ov.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)dest, &ov, &bytesReturned, FALSE); + todo_wine ok(!bret && GetLastError() == ERROR_NETNAME_DELETED, "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); + ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); + +end: + if (dest != INVALID_SOCKET) + closesocket(dest); + if (src != INVALID_SOCKET) + closesocket(src); + if (ov.hEvent) + WSACloseEvent(ov.hEvent); +} + static void test_GetAddrInfoW(void) { static const WCHAR port[] = {'8','0',0}; @@ -3392,6 +3448,7 @@ START_TEST( sock ) test_write_events(); test_WSASendTo(); + test_WSARecv(); test_ipv6only(); test_GetAddrInfoW();

1 0

Alistair Leslie-Hughes : oleaut32: Add ISupportErrorInfo registry entry.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 25756b787300468504eeacc19e76055c42f4925c URL: http://source.winehq.org/git/wine.git/?a=commit;h=25756b787300468504eeacc19… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 20 21:39:27 2010 +1100 oleaut32: Add ISupportErrorInfo registry entry. --- dlls/oleaut32/regsvr.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/regsvr.c b/dlls/oleaut32/regsvr.c index 12f64fa..f97544f 100644 --- a/dlls/oleaut32/regsvr.c +++ b/dlls/oleaut32/regsvr.c @@ -480,6 +480,12 @@ static struct regsvr_coclass const coclass_list[] = { "Obsolete Font", "OldFont" }, + { &IID_ISupportErrorInfo, + "PSSupportErrorInfo", + "ole2disp.dll", + "oleaut32.dll", + NULL + }, { NULL } /* list terminator */ };

1 0

Hans Leidekker : msi: Display the file identifier instead of the filename in the SelfRegModules and SelfUnregModules actions .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: a4be941df99d93e9b8f5e79b7e85e187080fca1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4be941df99d93e9b8f5e79b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:45:33 2010 +0100 msi: Display the file identifier instead of the filename in the SelfRegModules and SelfUnregModules actions. --- dlls/msi/action.c | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 15730f0..db6c2cd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4152,21 +4152,16 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) CloseHandle(info.hProcess); } - msi_free(FullName); - - /* the UI chunk */ uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, filename ); uipath = strdupW( file->TargetPath ); - p = strrchrW(uipath,'\\'); - if (p) - p[0]=0; - MSI_RecordSetStringW( uirow, 1, &p[1] ); - MSI_RecordSetStringW( uirow, 2, uipath); - ui_actiondata( package, szSelfRegModules, uirow); + if ((p = strrchrW( uipath,'\\' ))) *p = 0; + MSI_RecordSetStringW( uirow, 2, uipath ); + ui_actiondata( package, szSelfRegModules, uirow ); msiobj_release( &uirow->hdr ); - msi_free( uipath ); - /* FIXME: call ui_progress? */ + msi_free( FullName ); + msi_free( uipath ); return ERROR_SUCCESS; } @@ -4235,21 +4230,16 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param ) CloseHandle( pi.hProcess ); } - msi_free( cmdline ); - uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, filename ); uipath = strdupW( file->TargetPath ); - if ((p = strrchrW( uipath, '\\' ))) - { - *p = 0; - MSI_RecordSetStringW( uirow, 1, ++p ); - } + if ((p = strrchrW( uipath,'\\' ))) *p = 0; MSI_RecordSetStringW( uirow, 2, uipath ); ui_actiondata( package, szSelfUnregModules, uirow ); msiobj_release( &uirow->hdr ); - msi_free( uipath ); - /* FIXME call ui_progress? */ + msi_free( cmdline ); + msi_free( uipath ); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: The AppSearch and CCPSearch actions must be run only once.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 8722d0c44a10bd7a2e82182b9a05e7ba415cea37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8722d0c44a10bd7a2e82182b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:46:00 2010 +0100 msi: The AppSearch and CCPSearch actions must be run only once. --- dlls/msi/action.c | 2 -- dlls/msi/appsearch.c | 16 ++++++++++++++++ dlls/msi/msipriv.h | 1 + dlls/msi/upgrade.c | 6 +++--- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index db6c2cd..0d0e333 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -96,8 +96,6 @@ static const WCHAR szAllocateRegistrySpace[] = {'A','l','l','o','c','a','t','e','R','e','g','i','s','t','r','y','S','p','a','c','e',0}; static const WCHAR szBindImage[] = {'B','i','n','d','I','m','a','g','e',0}; -static const WCHAR szCCPSearch[] = - {'C','C','P','S','e','a','r','c','h',0}; static const WCHAR szDeleteServices[] = {'D','e','l','e','t','e','S','e','r','v','i','c','e','s',0}; static const WCHAR szDisableRollback[] = diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 12c7411..6f00b14 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -1064,6 +1064,14 @@ UINT ACTION_AppSearch(MSIPACKAGE *package) MSIQUERY *view = NULL; UINT r; + if (check_unique_action(package, szAppSearch)) + { + TRACE("Skipping AppSearch action: already done in UI sequence\n"); + return ERROR_SUCCESS; + } + else + register_unique_action(package, szAppSearch); + r = MSI_OpenQuery( package->db, &view, query ); if (r != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1111,6 +1119,14 @@ UINT ACTION_CCPSearch(MSIPACKAGE *package) MSIQUERY *view = NULL; UINT r; + if (check_unique_action(package, szCCPSearch)) + { + TRACE("Skipping AppSearch action: already done in UI sequence\n"); + return ERROR_SUCCESS; + } + else + register_unique_action(package, szCCPSearch); + r = MSI_OpenQuery(package->db, &view, query); if (r != ERROR_SUCCESS) return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0516dd1..647eab7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1084,6 +1084,7 @@ static const WCHAR szHU[] = {'H','K','E','Y','_','U','S','E','R','S','\\',0}; static const WCHAR szWindowsFolder[] = {'W','i','n','d','o','w','s','F','o','l','d','e','r',0}; static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0}; static const WCHAR szMoveFiles[] = {'M','o','v','e','F','i','l','e','s',0}; +static const WCHAR szCCPSearch[] = {'C','C','P','S','e','a','r','c','h',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index a440070..3f40f55 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -209,13 +209,13 @@ UINT ACTION_FindRelatedProducts(MSIPACKAGE *package) return ERROR_SUCCESS; } - if (check_unique_action(package,szFindRelatedProducts)) + if (check_unique_action(package, szFindRelatedProducts)) { - TRACE("Skipping FindRelatedProducts action: already done on client side\n"); + TRACE("Skipping FindRelatedProducts action: already done in UI sequence\n"); return ERROR_SUCCESS; } else - register_unique_action(package,szFindRelatedProducts); + register_unique_action(package, szFindRelatedProducts); rc = MSI_DatabaseOpenViewW(package->db, Query, &view); if (rc != ERROR_SUCCESS)

1 0

Nikolay Sivov : shell32: Add IShellFolderView::RemoveObject for IShellView.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 0a32123d106284a5678f90182926af4acaa1363a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a32123d106284a5678f90182… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 03:30:04 2010 +0300 shell32: Add IShellFolderView::RemoveObject for IShellView. --- dlls/shell32/shlview.c | 73 ++++++++++++++++++++++------------------- dlls/shell32/tests/shlview.c | 6 +++ 2 files changed, 45 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 13b7c92..3049c1b 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -585,19 +585,6 @@ static BOOLEAN LV_AddItem(IShellViewImpl * This, LPCITEMIDLIST pidl) } /********************************************************** -* LV_DeleteItem() -*/ -static BOOLEAN LV_DeleteItem(IShellViewImpl * This, LPCITEMIDLIST pidl) -{ - int nIndex; - - TRACE("(%p)(pidl=%p)\n", This, pidl); - - nIndex = LV_FindItemByPidl(This, ILFindLastID(pidl)); - return (-1==SendMessageW(This->hWndList, LVM_DELETEITEM, nIndex, 0))? FALSE: TRUE; -} - -/********************************************************** * LV_RenameItem() */ static BOOLEAN LV_RenameItem(IShellViewImpl * This, LPCITEMIDLIST pidlOld, LPCITEMIDLIST pidlNew ) @@ -1608,28 +1595,33 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn * ShellView_OnChange() */ -static LRESULT ShellView_OnChange(IShellViewImpl * This, const LPCITEMIDLIST * Pidls, LONG wEventId) +static LRESULT ShellView_OnChange(IShellViewImpl * This, const LPCITEMIDLIST *pidls, LONG event) { + BOOL ret = TRUE; - TRACE("(%p)(%p,%p,0x%08x)\n", This, Pidls[0], Pidls[1], wEventId); - switch(wEventId) - { - case SHCNE_MKDIR: - case SHCNE_CREATE: - LV_AddItem(This, Pidls[0]); - break; - case SHCNE_RMDIR: - case SHCNE_DELETE: - LV_DeleteItem(This, Pidls[0]); - break; - case SHCNE_RENAMEFOLDER: - case SHCNE_RENAMEITEM: - LV_RenameItem(This, Pidls[0], Pidls[1]); - break; - case SHCNE_UPDATEITEM: + TRACE("(%p)->(%p, %p, 0x%08x)\n", This, pidls[0], pidls[1], event); + + switch (event) + { + case SHCNE_MKDIR: + case SHCNE_CREATE: + LV_AddItem(This, pidls[0]); + break; + case SHCNE_RMDIR: + case SHCNE_DELETE: + { + INT i = LV_FindItemByPidl(This, ILFindLastID(pidls[0])); + ret = SendMessageW(This->hWndList, LVM_DELETEITEM, i, 0); + break; + } + case SHCNE_RENAMEFOLDER: + case SHCNE_RENAMEITEM: + LV_RenameItem(This, pidls[0], pidls[1]); + break; + case SHCNE_UPDATEITEM: break; - } - return TRUE; + } + return ret; } /********************************************************** * ShellView_WndProc @@ -2989,8 +2981,21 @@ static HRESULT WINAPI IShellFolderView_fnRemoveObject( UINT *item) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%p %p) stub\n", This, pidl, item); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, pidl, item); + + if (pidl) + { + *item = LV_FindItemByPidl(This, ILFindLastID(pidl)); + SendMessageW(This->hWndList, LVM_DELETEITEM, *item, 0); + } + else + { + *item = 0; + SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); + } + + return S_OK; } static HRESULT WINAPI IShellFolderView_fnGetObjectCount( diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f3d3809..35b001a 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -581,6 +581,12 @@ static void test_IShellFolderView(void) ok(hr == S_OK, "got (0x%08x)\n", hr); ok(i == 0xdeadbeef, "got %d\n", i); + /* ::RemoveObject */ + i = 0xdeadbeef; + hr = IShellFolderView_RemoveObject(folderview, NULL, &i); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(i == 0, "got %d\n", i); + IShellFolderView_Release(folderview); IShellView_Release(view);

1 0

Nikolay Sivov : shell32/tests: Use strict comparison for return values.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: edcaf53f94be16e71714571eae55a8d602d849d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edcaf53f94be16e71714571ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 04:21:13 2010 +0300 shell32/tests: Use strict comparison for return values. --- dlls/shell32/tests/autocomplete.c | 10 +- dlls/shell32/tests/shelllink.c | 122 +++++++++++----------- dlls/shell32/tests/shellpath.c | 24 ++-- dlls/shell32/tests/shlexec.c | 2 +- dlls/shell32/tests/shlfolder.c | 210 ++++++++++++++++++------------------ 5 files changed, 184 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edcaf53f94be16e717145…

1 0

Nikolay Sivov : shell32: Add IFolderView::Item implementation.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 34577a84d967e1e93a94b565bb0b4f71e644afb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34577a84d967e1e93a94b565b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 05:08:10 2010 +0300 shell32: Add IFolderView::Item implementation. --- dlls/shell32/shlview.c | 21 ++++++++++++++++++--- dlls/shell32/tests/shlview.c | 12 +++++++++++- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 3049c1b..653e5f3 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2741,9 +2741,24 @@ static HRESULT WINAPI IFView_GetFolder(IFolderView *iface, REFIID riid, void **p static HRESULT WINAPI IFView_Item(IFolderView *iface, int index, PITEMID_CHILD *ppidl) { - IShellViewImpl *This = impl_from_IFolderView(iface); - FIXME("(%p)->(%d %p), stub\n", This, index, ppidl); - return E_NOTIMPL; + IShellViewImpl *This = impl_from_IFolderView(iface); + LVITEMW item; + + TRACE("(%p)->(%d %p)\n", This, index, ppidl); + + item.mask = LVIF_PARAM; + item.iItem = index; + + if (SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM)&item)) + { + *ppidl = ILClone((PITEMID_CHILD)item.lParam); + return S_OK; + } + else + { + *ppidl = 0; + return E_INVALIDARG; + } } static HRESULT WINAPI IFView_ItemCount(IFolderView *iface, UINT flags, int *items) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 35b001a..59716d5 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -370,6 +370,7 @@ static void test_IFolderView(void) IShellBrowser *browser; IFolderView *fv; HWND hwnd_view, hwnd_list; + PITEMID_CHILD pidl; HRESULT hr; INT ret; POINT pt; @@ -395,6 +396,11 @@ static void test_IFolderView(void) hr = IFolderView_GetSpacing(fv, NULL); ok(hr == S_FALSE || broken(hr == S_OK) /* win7 */, "got (0x%08x)\n", hr); + pidl = (void*)0xdeadbeef; + hr = IFolderView_Item(fv, 0, &pidl); + ok(hr == E_INVALIDARG || broken(hr == E_FAIL) /* < Vista */, "got (0x%08x)\n", hr); + ok(pidl == 0 || broken(pidl == (void*)0xdeadbeef) /* < Vista */, "got %p\n", pidl); + if (0) { /* crashes on Vista and Win2k8 - List not created yet case */ @@ -403,6 +409,9 @@ if (0) /* crashes on XP */ hr = IFolderView_GetSelectionMarkedItem(fv, NULL); hr = IFolderView_GetFocusedItem(fv, NULL); + + /* crashes on Vista+ */ + hr = IFolderView_Item(fv, 0, NULL); } browser = IShellBrowserImpl_Construct(); @@ -585,7 +594,8 @@ static void test_IShellFolderView(void) i = 0xdeadbeef; hr = IShellFolderView_RemoveObject(folderview, NULL, &i); ok(hr == S_OK, "got (0x%08x)\n", hr); - ok(i == 0, "got %d\n", i); + ok(i == 0 || i == -1 /* Win7 */ || broken(i == 0xdeadbeef) /* Vista, 2k8 */, + "got %d\n", i); IShellFolderView_Release(folderview);

1 0

Andrew Nguyen : dxdiagn: Fix return value of IDxDiagContainer:: GetProp on property search failure.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 61cb53e24d8fd4bc03a4985ab4be71ec00a5f815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cb53e24d8fd4bc03a4985ab… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Mar 22 23:56:51 2010 -0500 dxdiagn: Fix return value of IDxDiagContainer::GetProp on property search failure. --- dlls/dxdiagn/container.c | 2 +- dlls/dxdiagn/tests/container.c | 93 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 0682145..db1a336 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -227,7 +227,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWS } p = p->next; } - return S_OK; + return E_INVALIDARG; } HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pVarProp) { diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 6557e37..214e7dd 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -22,6 +22,7 @@ #include <stdio.h> #include "dxdiag.h" +#include "oleauto.h" #include "wine/test.h" static IDxDiagProvider *pddp; @@ -527,6 +528,97 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_GetProp(void) +{ + HRESULT hr; + WCHAR container[256], property[256]; + IDxDiagContainer *child = NULL; + DWORD count, index; + VARIANT var; + static const WCHAR emptyW[] = {0}; + static const WCHAR testW[] = {'t','e','s','t',0}; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + /* Find a container with a property. */ + hr = IDxDiagContainer_GetNumberOfChildContainers(pddc, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagContainer::GetNumberOfChildContainers failed\n"); + goto cleanup; + } + + for (index = 0; index < count; index++) + { + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagContainer::EnumChildContainerNames failed\n"); + goto cleanup; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IDxDiagContainer_EnumPropNames(child, 0, property, sizeof(property)/sizeof(WCHAR)); + ok(hr == S_OK || hr == E_INVALIDARG, + "Expected IDxDiagContainer::EnumPropNames to return S_OK or E_INVALIDARG, got 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + break; + else + { + IDxDiagContainer_Release(child); + child = NULL; + } + } + } + + if (!child) + { + skip("Unable to find a suitable container\n"); + goto cleanup; + } + + hr = IDxDiagContainer_GetProp(child, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + + V_VT(&var) = 0xdead; + hr = IDxDiagContainer_GetProp(child, NULL, &var); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); + + hr = IDxDiagContainer_GetProp(child, emptyW, NULL); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + + V_VT(&var) = 0xdead; + hr = IDxDiagContainer_GetProp(child, emptyW, &var); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); + + hr = IDxDiagContainer_GetProp(child, testW, NULL); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + + V_VT(&var) = 0xdead; + hr = IDxDiagContainer_GetProp(child, testW, &var); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); + + IDxDiagContainer_Release(child); + +cleanup: + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); @@ -536,5 +628,6 @@ START_TEST(container) test_GetChildContainer(); test_dot_parsing(); test_EnumPropNames(); + test_GetProp(); CoUninitialize(); }

1 0