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

Nikolay Sivov : shell32: Implement IShellFolderView:: QuerySupport no-op method.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 01ebc665357af6dbacec86308b49ef11aacdee87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ebc665357af6dbacec86308… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 22 03:25:11 2010 +0300 shell32: Implement IShellFolderView::QuerySupport no-op method. --- dlls/shell32/shlview.c | 4 ++-- dlls/shell32/tests/shlview.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index e60a765..8e9323a 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3188,8 +3188,8 @@ static HRESULT WINAPI IShellFolderView_fnQuerySupport( UINT *support) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%p) stub\n", This, support); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, support); + return S_OK; } static HRESULT WINAPI IShellFolderView_fnSetAutomationObject( diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 6f08f18..82e198b 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -547,6 +547,7 @@ static void test_IShellFolderView(void) IShellFolderView *folderview; IShellFolder *desktop; IShellView *view; + UINT i; HRESULT hr; hr = SHGetDesktopFolder(&desktop); @@ -572,6 +573,14 @@ static void test_IShellFolderView(void) hr = IShellFolderView_SetRedraw(folderview, TRUE); ok(hr == S_OK, "got (0x%08x)\n", hr); + /* ::QuerySupport */ + hr = IShellFolderView_QuerySupport(folderview, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + i = 0xdeadbeef; + hr = IShellFolderView_QuerySupport(folderview, &i); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(i == 0xdeadbeef, "got %d\n", i); + IShellFolderView_Release(folderview); IShellView_Release(view);

1 0

Paul Vriens : shell32/tests: Fix test failures on Win95, Win98 and NT4.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: d57f05f062dc51edd35b7302f8b8e4c36d8ef2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57f05f062dc51edd35b7302f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Mar 22 13:29:06 2010 +0100 shell32/tests: Fix test failures on Win95, Win98 and NT4. --- dlls/shell32/tests/shelllink.c | 52 +++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 52a21f1..8685e67 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -421,8 +421,6 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) lok(SUCCEEDED(r), "no IID_IPersistFile (0x%08x)\n", r); if (SUCCEEDED(r)) { - CHAR buff[MAX_PATH], buff2[MAX_PATH]; - IMalloc *pmalloc; LPOLESTR str; if (0) @@ -434,8 +432,10 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); - lok(r == S_FALSE, "got 0x%08x\n", r); - ok(str == NULL, "got %p\n", str); + lok(r == S_FALSE || + broken(r == S_OK), /* shell32 < 5.0 */ + "got 0x%08x\n", r); + lok(str == NULL, "got %p\n", str); r = IPersistFile_Save(pf, path, TRUE); if (save_fails) @@ -452,14 +452,22 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL || + broken(str == NULL), /* shell32 < 5.0 */ + "Didn't expect NULL\n"); + if (str != NULL) + { + IMalloc *pmalloc; - WideCharToMultiByte( CP_ACP, 0, str, -1, buff, sizeof(buff), NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, path, -1, buff2, sizeof(buff2), NULL, NULL ); + lok(!winetest_strcmpW(path, str), "Expected %s, got %s\n", + wine_dbgstr_w(path), wine_dbgstr_w(str)); - lok(!strcmp(buff, buff2), "Expected %s, got %s\n", buff2, buff); + SHGetMalloc(&pmalloc); + IMalloc_Free(pmalloc, str); + } + else + win_skip("GetCurFile fails on shell32 < 5.0\n"); - SHGetMalloc(&pmalloc); - IMalloc_Free(pmalloc, str); IPersistFile_Release(pf); } @@ -472,8 +480,6 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) IShellLinkA *sl; IPersistFile *pf; char buffer[INFOTIPSIZE]; - CHAR buff[MAX_PATH], buff2[MAX_PATH]; - IMalloc *pmalloc; LPOLESTR str; r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, @@ -490,12 +496,12 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) return; } - SHGetMalloc(&pmalloc); - /* test GetCurFile before ::Load */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); - lok(r == S_FALSE, "got 0x%08x\n", r); + lok(r == S_FALSE || + broken(r == S_OK), /* shell32 < 5.0 */ + "got 0x%08x\n", r); lok(str == NULL, "got %p\n", str); r = IPersistFile_Load(pf, path, STGM_READ); @@ -504,13 +510,21 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL || + broken(str == NULL), /* shell32 < 5.0 */ + "Didn't expect NULL\n"); + if (str != NULL) + { + IMalloc *pmalloc; - WideCharToMultiByte( CP_ACP, 0, str, -1, buff, sizeof(buff), NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, path, -1, buff2, sizeof(buff2), NULL, NULL ); - - lok(!strcmp(buff, buff2), "Expected %s, got %s\n", buff2, buff); + lok(!winetest_strcmpW(path, str), "Expected %s, got %s\n", + wine_dbgstr_w(path), wine_dbgstr_w(str)); - IMalloc_Free(pmalloc, str); + SHGetMalloc(&pmalloc); + IMalloc_Free(pmalloc, str); + } + else + win_skip("GetCurFile fails on shell32 < 5.0\n"); IPersistFile_Release(pf); if (FAILED(r))

1 0

Damjan Jovanovic : usbd.sys: Implement URB building functions.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 3f02dee355cac18a5b7d9589108007aa92298abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f02dee355cac18a5b7d95891… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Mar 22 14:41:14 2010 +0200 usbd.sys: Implement URB building functions. --- dlls/usbd.sys/usbd.c | 122 +++++++++++++++++++++++++++++++++++++++++++ dlls/usbd.sys/usbd.sys.spec | 8 ++-- include/ddk/usb100.h | 6 ++ include/ddk/usbdlib.h | 5 ++- 4 files changed, 136 insertions(+), 5 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index daeb5c0..4727512 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -33,6 +33,128 @@ WINE_DEFAULT_DEBUG_CHANNEL(usbd); +PURB WINAPI USBD_CreateConfigurationRequest( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, PUSHORT Siz ) +{ + URB *urb = NULL; + USBD_INTERFACE_LIST_ENTRY *interfaceList; + ULONG interfaceListSize; + USB_INTERFACE_DESCRIPTOR *interfaceDesc; + int i; + + TRACE( "(%p, %p)\n", ConfigurationDescriptor, Siz ); + + /* http://www.microsoft.com/whdc/archive/usbfaq.mspx + * claims USBD_CreateConfigurationRequest doesn't support > 1 interface, + * but is this on Windows 98 only or all versions? + */ + + *Siz = 0; + interfaceListSize = (ConfigurationDescriptor->bNumInterfaces + 1) * sizeof(USBD_INTERFACE_LIST_ENTRY); + interfaceList = ExAllocatePool( NonPagedPool, interfaceListSize ); + if (interfaceList) + { + RtlZeroMemory( interfaceList, interfaceListSize ); + interfaceDesc = (PUSB_INTERFACE_DESCRIPTOR) USBD_ParseDescriptors( + ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, + ConfigurationDescriptor, USB_INTERFACE_DESCRIPTOR_TYPE ); + for (i = 0; i < ConfigurationDescriptor->bNumInterfaces && interfaceDesc != NULL; i++) + { + interfaceList[i].InterfaceDescriptor = interfaceDesc; + interfaceDesc = (PUSB_INTERFACE_DESCRIPTOR) USBD_ParseDescriptors( + ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, + interfaceDesc + 1, USB_INTERFACE_DESCRIPTOR_TYPE ); + } + urb = USBD_CreateConfigurationRequestEx( ConfigurationDescriptor, interfaceList ); + if (urb) + *Siz = urb->u.UrbHeader.Length; + ExFreePool( interfaceList ); + } + return urb; +} + +PURB WINAPI USBD_CreateConfigurationRequestEx( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + PUSBD_INTERFACE_LIST_ENTRY InterfaceList ) +{ + URB *urb; + ULONG size = 0; + USBD_INTERFACE_LIST_ENTRY *interfaceEntry; + ULONG interfaceCount = 0; + + TRACE( "(%p, %p)\n", ConfigurationDescriptor, InterfaceList ); + + size = sizeof(struct _URB_SELECT_CONFIGURATION); + for (interfaceEntry = InterfaceList; interfaceEntry->InterfaceDescriptor; interfaceEntry++) + { + ++interfaceCount; + size += (interfaceEntry->InterfaceDescriptor->bNumEndpoints - 1) * + sizeof(USBD_PIPE_INFORMATION); + } + size += (interfaceCount - 1) * sizeof(USBD_INTERFACE_INFORMATION); + + urb = ExAllocatePool( NonPagedPool, size ); + if (urb) + { + USBD_INTERFACE_INFORMATION *interfaceInfo; + + RtlZeroMemory( urb, size ); + urb->u.UrbSelectConfiguration.Hdr.Length = size; + urb->u.UrbSelectConfiguration.Hdr.Function = URB_FUNCTION_SELECT_CONFIGURATION; + urb->u.UrbSelectConfiguration.ConfigurationDescriptor = ConfigurationDescriptor; + interfaceInfo = &urb->u.UrbSelectConfiguration.Interface; + for (interfaceEntry = InterfaceList; interfaceEntry->InterfaceDescriptor; interfaceEntry++) + { + int i; + USB_INTERFACE_DESCRIPTOR *currentInterface; + USB_ENDPOINT_DESCRIPTOR *endpointDescriptor; + interfaceInfo->InterfaceNumber = interfaceEntry->InterfaceDescriptor->bInterfaceNumber; + interfaceInfo->AlternateSetting = interfaceEntry->InterfaceDescriptor->bAlternateSetting; + interfaceInfo->Class = interfaceEntry->InterfaceDescriptor->bInterfaceClass; + interfaceInfo->SubClass = interfaceEntry->InterfaceDescriptor->bInterfaceSubClass; + interfaceInfo->Protocol = interfaceEntry->InterfaceDescriptor->bInterfaceProtocol; + interfaceInfo->NumberOfPipes = interfaceEntry->InterfaceDescriptor->bNumEndpoints; + currentInterface = USBD_ParseConfigurationDescriptorEx( + ConfigurationDescriptor, ConfigurationDescriptor, + interfaceEntry->InterfaceDescriptor->bInterfaceNumber, -1, -1, -1, -1 ); + endpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) USBD_ParseDescriptors( + ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, + currentInterface, USB_ENDPOINT_DESCRIPTOR_TYPE ); + for (i = 0; i < interfaceInfo->NumberOfPipes && endpointDescriptor; i++) + { + interfaceInfo->Pipes[i].MaximumPacketSize = endpointDescriptor->wMaxPacketSize; + interfaceInfo->Pipes[i].EndpointAddress = endpointDescriptor->bEndpointAddress; + interfaceInfo->Pipes[i].Interval = endpointDescriptor->bInterval; + if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_CONTROL) + interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeControl; + else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_BULK) + interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeBulk; + else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_INTERRUPT) + interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeInterrupt; + else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_ISOCHRONOUS) + interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeIsochronous; + endpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) USBD_ParseDescriptors( + ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, + endpointDescriptor + 1, USB_ENDPOINT_DESCRIPTOR_TYPE ); + } + interfaceInfo->Length = sizeof(USBD_INTERFACE_INFORMATION) + + (i - 1) * sizeof(USBD_PIPE_INFORMATION); + interfaceEntry->Interface = interfaceInfo; + interfaceInfo = (USBD_INTERFACE_INFORMATION*)(((char*)interfaceInfo)+interfaceInfo->Length); + } + } + return urb; +} + +VOID WINAPI USBD_GetUSBDIVersion( + PUSBD_VERSION_INFORMATION VersionInformation ) +{ + TRACE( "(%p)\n", VersionInformation ); + /* Emulate Windows 2000 (= 0x300) for now */ + VersionInformation->USBDI_Version = 0x300; + VersionInformation->Supported_USB_Version = 0x200; +} + PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx( PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, PVOID StartPosition, LONG InterfaceNumber, diff --git a/dlls/usbd.sys/usbd.sys.spec b/dlls/usbd.sys/usbd.sys.spec index 47e0bdb..1cb507e 100644 --- a/dlls/usbd.sys/usbd.sys.spec +++ b/dlls/usbd.sys/usbd.sys.spec @@ -1,11 +1,11 @@ -@ stub USBD_CreateConfigurationRequestEx +@ stdcall USBD_CreateConfigurationRequestEx(ptr ptr) @ stdcall USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long) @ stdcall USBD_ParseDescriptors(ptr long ptr long) @ stub USBD_AllocateDeviceName @ stub USBD_CalculateUsbBandwidth @ stub USBD_CompleteRequest -@ stub USBD_CreateConfigurationRequest -@ stub _USBD_CreateConfigurationRequestEx(a)8 +@ stdcall USBD_CreateConfigurationRequest(ptr ptr) +@ stdcall _USBD_CreateConfigurationRequestEx(a)8(ptr ptr) USBD_CreateConfigurationRequestEx @ stub USBD_CreateDevice @ stub USBD_Debug_GetHeap @ stub USBD_Debug_LogEntry @@ -17,7 +17,7 @@ @ stdcall USBD_GetInterfaceLength(ptr ptr) @ stub USBD_GetPdoRegistryParameter @ stub USBD_GetSuspendPowerState -@ stub USBD_GetUSBDIVersion +@ stdcall USBD_GetUSBDIVersion(ptr) @ stub USBD_InitializeDevice @ stub USBD_MakePdoName @ stub USBD_ParseConfigurationDescriptor diff --git a/include/ddk/usb100.h b/include/ddk/usb100.h index 534dca1..b013f21 100644 --- a/include/ddk/usb100.h +++ b/include/ddk/usb100.h @@ -48,6 +48,12 @@ typedef struct _USB_DEVICE_DESCRIPTOR { } USB_DEVICE_DESCRIPTOR; typedef struct _USB_DEVICE_DESCRIPTOR *PUSB_DEVICE_DESCRIPTOR; +#define USB_ENDPOINT_TYPE_MASK 0x03 +#define USB_ENDPOINT_TYPE_CONTROL 0x00 +#define USB_ENDPOINT_TYPE_ISOCHRONOUS 0x01 +#define USB_ENDPOINT_TYPE_BULK 0x02 +#define USB_ENDPOINT_TYPE_INTERRUPT 0x03 + typedef struct _USB_ENDPOINT_DESCRIPTOR { UCHAR bLength; UCHAR bDescriptorType; diff --git a/include/ddk/usbdlib.h b/include/ddk/usbdlib.h index ce3cc86..0003816 100644 --- a/include/ddk/usbdlib.h +++ b/include/ddk/usbdlib.h @@ -25,8 +25,11 @@ typedef struct _USBD_INTERFACE_LIST_ENTRY { } USBD_INTERFACE_LIST_ENTRY; typedef struct _USBD_INTERFACE_LIST_ENTRY *PUSBD_INTERFACE_LIST_ENTRY; -PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(PUSB_CONFIGURATION_DESCRIPTOR,PVOID,LONG,LONG,LONG,LONG,LONG); +PURB WINAPI USBD_CreateConfigurationRequest(PUSB_CONFIGURATION_DESCRIPTOR,PUSHORT); +PURB WINAPI USBD_CreateConfigurationRequestEx(PUSB_CONFIGURATION_DESCRIPTOR,PUSBD_INTERFACE_LIST_ENTRY); ULONG WINAPI USBD_GetInterfaceLength(PUSB_INTERFACE_DESCRIPTOR,PUCHAR); +VOID WINAPI USBD_GetUSBDIVersion(PUSBD_VERSION_INFORMATION); PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors(PVOID,ULONG,PVOID,LONG); +PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(PUSB_CONFIGURATION_DESCRIPTOR,PVOID,LONG,LONG,LONG,LONG,LONG); #endif

1 0

André Hentschel : kernel32: Fix return value of FlsFree.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: e9be1b40940df79427d8cd563d7e35e35ad5a00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9be1b40940df79427d8cd563… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 22 15:43:20 2010 +0100 kernel32: Fix return value of FlsFree. --- dlls/kernel32/fiber.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index f6bebf8..ca4c8f9 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -271,7 +271,7 @@ BOOL WINAPI FlsFree( DWORD index ) } else SetLastError( ERROR_INVALID_PARAMETER ); RtlReleasePebLock(); - return TRUE; + return ret; } /***********************************************************************

1 0

Nikolay Sivov : shell32: Properly fail for unsupported interfaces in IShellView::GetItemObject.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 1168b79266bdf372f1865959c8efb1c743ff9ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=1168b79266bdf372f1865959c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 20 21:46:41 2010 +0300 shell32: Properly fail for unsupported interfaces in IShellView::GetItemObject. --- dlls/shell32/shlview.c | 42 ++++++++++++++++++++++++++---------------- dlls/shell32/tests/shlview.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 7809344..bf8f979 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1989,28 +1989,38 @@ static HRESULT WINAPI IShellView_fnSelectItem( static HRESULT WINAPI IShellView_fnGetItemObject(IShellView2 * iface, UINT uItem, REFIID riid, LPVOID *ppvOut) { - IShellViewImpl *This = (IShellViewImpl *)iface; + IShellViewImpl *This = (IShellViewImpl *)iface; + HRESULT hr = E_NOINTERFACE; - TRACE("(%p)->(uItem=0x%08x,\n\tIID=%s, ppv=%p)\n",This, uItem, debugstr_guid(riid), ppvOut); + TRACE("(%p)->(0x%08x, %s, %p)\n",This, uItem, debugstr_guid(riid), ppvOut); - *ppvOut = NULL; + *ppvOut = NULL; - switch(uItem) - { - case SVGIO_BACKGROUND: - *ppvOut = ISvBgCm_Constructor(This->pSFParent, FALSE); - break; + switch(uItem) + { + case SVGIO_BACKGROUND: - case SVGIO_SELECTION: - ShellView_GetSelections(This); - IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, (LPCITEMIDLIST*)This->apidl, riid, 0, ppvOut); - break; - } - TRACE("-- (%p)->(interface=%p)\n",This, *ppvOut); + if (IsEqualIID(&IID_IContextMenu, riid)) + { + *ppvOut = ISvBgCm_Constructor(This->pSFParent, FALSE); + hr = S_OK; + } + else + FIXME("unsupported interface requested %s\n", debugstr_guid(riid)); - if(!*ppvOut) return E_OUTOFMEMORY; + break; - return S_OK; + case SVGIO_SELECTION: + ShellView_GetSelections(This); + hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, (LPCITEMIDLIST*)This->apidl, riid, 0, ppvOut); + break; + + default: + FIXME("unimplemented for uItem = 0x%08x\n", uItem); + } + TRACE("-- (%p)->(interface=%p)\n",This, *ppvOut); + + return hr; } static HRESULT WINAPI IShellView2_fnGetView(IShellView2* iface, SHELLVIEWID *view_guid, ULONG view_type) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 31f47c1..e941ff4 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -36,6 +36,8 @@ #include "ocidl.h" #include "oleauto.h" +#include "initguid.h" + #include "wine/test.h" #include "msg.h" @@ -43,6 +45,8 @@ #define LISTVIEW_SEQ_INDEX 0 #define NUM_MSG_SEQUENCES 1 +DEFINE_GUID(IID_IPersistHistory, 0x91a565c1, 0xe38f, 0x11d0, 0x94, 0xbf, 0x00, 0xa0, 0xc9, 0x05, 0x5c, 0xbf); + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -501,6 +505,43 @@ if (0) IShellFolder_Release(desktop); } +static void test_GetItemObject(void) +{ + IShellFolder *desktop; + IShellView *view; + IUnknown *unk; + HRESULT hr; + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + /* from documentation three interfaces are supported for SVGIO_BACKGROUND: + IContextMenu, IDispatch, IPersistHistory */ + hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IContextMenu, (void**)&unk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + IUnknown_Release(unk); + + unk = NULL; + hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IDispatch, (void**)&unk); + todo_wine ok(hr == S_OK || broken(hr == E_NOTIMPL) /* NT4 */, "got (0x%08x)\n", hr); + if (unk) IUnknown_Release(unk); + + unk = NULL; + hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IPersistHistory, (void**)&unk); + todo_wine ok(hr == S_OK || broken(hr == E_NOTIMPL) /* W9x, NT4 */, "got (0x%08x)\n", hr); + if (unk) IUnknown_Release(unk); + + /* example of unsupported interface, base for IPersistHistory */ + hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IPersist, (void**)&unk); + ok(hr == E_NOINTERFACE || broken(hr == E_NOTIMPL) /* W2K */, "got (0x%08x)\n", hr); + + IShellView_Release(view); + IShellFolder_Release(desktop); +} + START_TEST(shlview) { OleInitialize(NULL); @@ -509,6 +550,7 @@ START_TEST(shlview) test_IShellView_CreateViewWindow(); test_IFolderView(); + test_GetItemObject(); OleUninitialize(); }

1 0

Nikolay Sivov : shell32: Some debug tracing improvements.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 0f794f9510c039b4363b679ef4e85c03dad639ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f794f9510c039b4363b679ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 21 04:42:59 2010 +0300 shell32: Some debug tracing improvements. --- dlls/shell32/classes.c | 2 +- dlls/shell32/debughlp.c | 21 +++++++++------------ dlls/shell32/shellole.c | 10 ++++++---- dlls/shell32/shlfolder.c | 17 +++++++++-------- dlls/shell32/shlview.c | 12 ++++++------ 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 0556f97..9fbdf0e 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -386,7 +386,7 @@ BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len) } } - TRACE("-- %s\n", szDest); + TRACE("-- (%s)\n", szDest); return ret; } diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index 98d7899..3cab8bb 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -422,16 +422,13 @@ const char * shdebugstr_guid( const struct _GUID *id ) if (!id) return "(null)"; - for (i=0;InterfaceDesc[i].riid && !name;i++) { - if (IsEqualIID(InterfaceDesc[i].riid, id)) name = InterfaceDesc[i].name; - } - if (!name) { - if (HCR_GetClassNameA(id, clsidbuf, 100)) - name = clsidbuf; - } - - return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7], name ? name : "unknown" ); + for (i = 0; InterfaceDesc[i].riid && !name; i++) { + if (IsEqualIID(InterfaceDesc[i].riid, id)) name = InterfaceDesc[i].name; + } + if (!name) { + if (HCR_GetClassNameA(id, clsidbuf, 100)) + name = clsidbuf; + } + + return wine_dbg_sprintf( "%s (%s)", debugstr_guid(id), name ? name : "unknown" ); } diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 4bb7ee4..8d09d9c 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -330,14 +330,16 @@ void WINAPI SHFree(LPVOID pv) */ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) { - HRESULT hres = S_OK; - TRACE("\n"); + HRESULT hres; + + TRACE("(%p)\n", psf); if(!psf) return E_INVALIDARG; + *psf = NULL; - hres = ISF_Desktop_Constructor(NULL, &IID_IShellFolder,(LPVOID*)psf); + hres = ISF_Desktop_Constructor(NULL, &IID_IShellFolder, (LPVOID*)psf); - TRACE("-- %p->(%p)\n",psf, *psf); + TRACE("-- %p->(%p) 0x%08x\n", psf, *psf, hres); return hres; } /************************************************************************** diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 19ab6e1..894fc56 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -125,9 +125,9 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) LPCWSTR pszTail = pszNext; DWORD dwCopy; - TRACE ("(%s %p 0x%08x)\n", debugstr_w (pszNext), pszOut, dwOut); + TRACE ("(%s %p 0x%08x)\n", debugstr_w(pszNext), pszOut, dwOut); - *pszOut = 0x0000; + *pszOut = 0; if (!pszNext || !*pszNext) return NULL; @@ -150,10 +150,9 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes) { - HRESULT hr = E_INVALIDARG; - LPITEMIDLIST pidlOut = NULL, - pidlTemp = NULL; + LPITEMIDLIST pidlOut = NULL, pidlTemp = NULL; IShellFolder *psfChild; + HRESULT hr; TRACE ("(%p, %p, %p, %s)\n", psf, pbc, pidlInOut ? *pidlInOut : NULL, debugstr_w (szNext)); @@ -197,7 +196,7 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, { HRESULT hr; - TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild); + TRACE ("(%p %s %p %s %p)\n", pidlRoot, debugstr_w(pathRoot), pidlChild, debugstr_guid(clsid), ppvOut); hr = SHCoCreateInstance(NULL, clsid, NULL, &IID_IShellFolder, ppvOut); if (SUCCEEDED (hr)) @@ -268,6 +267,8 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, HRESULT hr; LPITEMIDLIST pidlChild; + TRACE("(%p %s %p %s %p)\n", pidlRoot, debugstr_w(pathRoot), pidlComplete, debugstr_guid(riid), ppvOut); + if (!pidlRoot || !ppvOut || !pidlComplete || !pidlComplete->mkid.cb) return E_INVALIDARG; @@ -312,7 +313,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, IShellFolder_Release (pSF); } - TRACE ("-- returning (%p) %08x\n", *ppvOut, hr); + TRACE ("-- returning (%p) 0x%08x\n", *ppvOut, hr); return hr; } @@ -335,7 +336,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPWSTR szOut, DWORD dwOutLen) { LPITEMIDLIST pidlFirst; - HRESULT hr = E_INVALIDARG; + HRESULT hr; TRACE ("(%p)->(pidl=%p 0x%08x %p 0x%08x)\n", psf, pidl, dwFlags, szOut, dwOutLen); pdump (pidl); diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index bf8f979..633d767 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2218,16 +2218,16 @@ static ULONG WINAPI ISVOleCmdTarget_Release( */ static HRESULT WINAPI ISVOleCmdTarget_QueryStatus( IOleCommandTarget *iface, - const GUID* pguidCmdGroup, + const GUID *pguidCmdGroup, ULONG cCmds, - OLECMD * prgCmds, - OLECMDTEXT* pCmdText) + OLECMD *prgCmds, + OLECMDTEXT *pCmdText) { - UINT i; IShellViewImpl *This = impl_from_IOleCommandTarget(iface); + UINT i; - FIXME("(%p)->(%p(%s) 0x%08x %p %p\n", - This, pguidCmdGroup, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); + FIXME("(%p)->(%s %d %p %p)\n", + This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); if (!prgCmds) return E_POINTER;

1 0

Nikolay Sivov : shell32: Add IPersist support for desktop IShellFolder.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 53ae4e2ba06ae30e3b4fd90cfc44a0a44c418703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ae4e2ba06ae30e3b4fd90cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 21 18:44:44 2010 +0300 shell32: Add IPersist support for desktop IShellFolder. --- dlls/shell32/shfldr_desktop.c | 49 +++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlfolder.c | 31 +++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index d6ccb72..e744fd3 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -65,6 +65,7 @@ extern HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisp typedef struct { const IShellFolder2Vtbl *lpVtbl; + const IPersistVtbl *lpVtblIPersist; LONG ref; /* both paths are parsible from the desktop */ @@ -78,6 +79,11 @@ typedef struct { #define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl) #define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) +static inline IGenericSFImpl *impl_from_IPersist( IPersist *iface ) +{ + return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblIPersist)); +} + static const shvheader DesktopSFHeader[] = { {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, {IDS_SHV_COLUMN2, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, @@ -91,7 +97,7 @@ static const shvheader DesktopSFHeader[] = { /************************************************************************** * ISF_Desktop_fnQueryInterface * - * NOTES supports not IPersist/IPersistFolder + * NOTES supports not IPersistFolder */ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj) @@ -108,6 +114,10 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( { *ppvObj = This; } + else if (IsEqualIID (riid, &IID_IPersist)) + { + *ppvObj = &This->lpVtblIPersist; + } if (*ppvObj) { @@ -862,6 +872,42 @@ static const IShellFolder2Vtbl vt_MCFldr_ShellFolder2 = }; /************************************************************************** + * IPersist + */ +static HRESULT WINAPI ISF_Desktop_IPersist_fnQueryInterface( + IPersist *iface, REFIID riid, LPVOID *ppvObj) +{ + IGenericSFImpl *This = impl_from_IPersist( iface ); + return IShellFolder2_QueryInterface((IShellFolder2*)This, riid, ppvObj); +} + +static ULONG WINAPI ISF_Desktop_IPersist_fnAddRef(IPersist *iface) +{ + IGenericSFImpl *This = impl_from_IPersist( iface ); + return IShellFolder2_AddRef((IShellFolder2*)This); +} + +static ULONG WINAPI ISF_Desktop_IPersist_fnRelease(IPersist *iface) +{ + IGenericSFImpl *This = impl_from_IPersist( iface ); + return IShellFolder2_Release((IShellFolder2*)This); +} + +static HRESULT WINAPI ISF_Desktop_IPersist_fnGetClassID(IPersist *iface, CLSID *clsid) +{ + *clsid = CLSID_ShellDesktop; + return S_OK; +} + +static const IPersistVtbl vt_IPersist = +{ + ISF_Desktop_IPersist_fnQueryInterface, + ISF_Desktop_IPersist_fnAddRef, + ISF_Desktop_IPersist_fnRelease, + ISF_Desktop_IPersist_fnGetClassID +}; + +/************************************************************************** * ISF_Desktop_Constructor */ HRESULT WINAPI ISF_Desktop_Constructor ( @@ -890,6 +936,7 @@ HRESULT WINAPI ISF_Desktop_Constructor ( sf->ref = 1; sf->lpVtbl = &vt_MCFldr_ShellFolder2; + sf->lpVtblIPersist = &vt_IPersist; sf->pidlRoot = _ILCreateDesktop(); /* my qualified pidl */ sf->sPathTarget = SHAlloc( (lstrlenW(szMyPath) + 1)*sizeof(WCHAR) ); lstrcpyW( sf->sPathTarget, szMyPath ); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index bce7c3e..560033b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2044,6 +2044,36 @@ if (0) IShellFolder_Release(desktop); } +static void test_desktop_IPersist(void) +{ + IShellFolder *desktop; + IPersist *persist; + CLSID clsid; + HRESULT hr; + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "failed %08x\n", hr); + + hr = IShellFolder_QueryInterface(desktop, &IID_IPersist, (void**)&persist); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* NT4, W9X */, "failed %08x\n", hr); + + if (hr == S_OK) + { + if (0) + { + /* crashes on native */ + hr = IPersist_GetClassID(persist, NULL); + } + memset(&clsid, 0, sizeof(clsid)); + hr = IPersist_GetClassID(persist, &clsid); + ok(hr == S_OK, "failed %08x\n", hr); + ok(IsEqualIID(&CLSID_ShellDesktop, &clsid), "Expected CLSID_ShellDesktop\n"); + IPersist_Release(persist); + } + + IShellFolder_Release(desktop); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -2064,6 +2094,7 @@ START_TEST(shlfolder) test_SHGetFolderPathAndSubDirA(); test_LocalizedNames(); test_SHCreateShellItem(); + test_desktop_IPersist(); OleUninitialize(); }

1 0

Nikolay Sivov : shell32: Add a note about a possible crash on NULL input.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 6a0bdddfc416a99084ac21c9ea1b6672b2670f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0bdddfc416a99084ac21c9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 21 18:55:34 2010 +0300 shell32: Add a note about a possible crash on NULL input. --- dlls/shell32/tests/autocomplete.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 569625f..76da0ea 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -59,6 +59,11 @@ static IAutoComplete *test_init(void) } ok(SUCCEEDED(r), "no IID_IACList (0x%08x)\n", r); +if (0) +{ + /* crashes on native */ + r = IAutoComplete_Init(ac, hEdit, NULL, NULL, NULL); +} /* bind to edit control */ r = IAutoComplete_Init(ac, hEdit, acSource, NULL, NULL); ok(SUCCEEDED(r), "Init failed (0x%08x)\n", r);

1 0

Nikolay Sivov : shell32: Remove a useless debug switch, fix prototype.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 9e80570a3bde8db80412579279b6c27aabb0316a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e80570a3bde8db8041257927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 21 20:08:33 2010 +0300 shell32: Remove a useless debug switch, fix prototype. --- dlls/shell32/dialogs.c | 2 +- dlls/shell32/shell32_main.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 0d8dbac..fb43390 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -60,7 +60,7 @@ static void FillList (HWND, char *, BOOL) ; * PickIconDlg [SHELL32.62] * */ -BOOL WINAPI PickIconDlg( +INT WINAPI PickIconDlg( HWND hwndOwner, LPSTR lpstrFile, DWORD nMaxFile, diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index db63e16..dc71022 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -52,7 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); extern const char * const SHELL_Authors[]; -#define MORE_DEBUG 1 /************************************************************************* * CommandLineToArgvW [SHELL32.@] * @@ -607,7 +606,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, GetSystemMetrics( SM_CXICON), GetSystemMetrics( SM_CYICON), &psfi->hIcon, 0, 1, 0); - if (ret != 0 && ret != 0xFFFFFFFF) + if (ret != 0 && ret != (UINT)-1) { IconNotYetLoaded=FALSE; psfi->iIcon = icon_idx; @@ -653,11 +652,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, SHFree(pidlLast); -#ifdef MORE_DEBUG TRACE ("icon=%p index=0x%08x attr=0x%08x name=%s type=%s ret=0x%08lx\n", psfi->hIcon, psfi->iIcon, psfi->dwAttributes, debugstr_w(psfi->szDisplayName), debugstr_w(psfi->szTypeName), ret); -#endif return ret; } @@ -777,17 +774,17 @@ HICON WINAPI ExtractIconW(HINSTANCE hInstance, LPCWSTR lpszFile, UINT nIconIndex TRACE("%p %s %d\n", hInstance, debugstr_w(lpszFile), nIconIndex); - if (nIconIndex == 0xFFFFFFFF) + if (nIconIndex == (UINT)-1) { ret = PrivateExtractIconsW(lpszFile, 0, cx, cy, NULL, NULL, 0, LR_DEFAULTCOLOR); - if (ret != 0xFFFFFFFF && ret) + if (ret != (UINT)-1 && ret) return (HICON)(UINT_PTR)ret; return NULL; } else ret = PrivateExtractIconsW(lpszFile, nIconIndex, cx, cy, &hIcon, NULL, 1, LR_DEFAULTCOLOR); - if (ret == 0xFFFFFFFF) + if (ret == (UINT)-1) return (HICON)1; else if (ret > 0 && hIcon) return hIcon;

1 0

Nikolay Sivov : shell32: Add a stub IShellFolderView for IShellView.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: a3d0877ed6b5d3dd7e52c86c7bbaef89cdfa289e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d0877ed6b5d3dd7e52c86c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 22 00:45:21 2010 +0300 shell32: Add a stub IShellFolderView for IShellView. --- dlls/shell32/shlview.c | 325 ++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlview.c | 29 ++++ include/shlobj.h | 93 ++++++++++++ include/shtypes.idl | 1 + 4 files changed, 448 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3d0877ed6b5d3dd7e52c…

1 0