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

Damjan Jovanovic : usbd.sys: Implement URB building functions.
by Alexandre Julliard March 22, 2010

March 22, 2010

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

Nikolay Sivov : shell32: Implement IShellFolderView:: QuerySupport no-op method.
by Alexandre Julliard March 22, 2010

March 22, 2010

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 March 22, 2010

March 22, 2010

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

André Hentschel : kernel32: Fix return value of FlsFree.
by Alexandre Julliard March 22, 2010

March 22, 2010

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: Add IShellFolderView::SetRedraw implementation.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 9958b80e9d900a116bdb357eb50da2eca5bb5a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9958b80e9d900a116bdb357eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 22 03:04:49 2010 +0300 shell32: Add IShellFolderView::SetRedraw implementation. --- dlls/shell32/shlview.c | 12 ++++++++---- dlls/shell32/tests/shlview.c | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 4852fed..e60a765 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -644,6 +644,7 @@ static INT CALLBACK fill_list( LPVOID ptr, LPVOID arg ) static HRESULT ShellView_FillList(IShellViewImpl *This) { + IShellFolderView *folderview = (IShellFolderView*)&This->lpvtblShellFolderView; LPENUMIDLIST pEnumIDList; LPITEMIDLIST pidl; DWORD fetched; @@ -676,9 +677,9 @@ static HRESULT ShellView_FillList(IShellViewImpl *This) /* sort the array */ DPA_Sort(hdpa, ShellView_CompareItems, (LPARAM)This->pSFParent); - SendMessageW(This->hWndList, WM_SETREDRAW, FALSE, 0); + IShellFolderView_SetRedraw(folderview, FALSE); DPA_DestroyCallback(hdpa, fill_list, This); - SendMessageW(This->hWndList, WM_SETREDRAW, TRUE, 0); + IShellFolderView_SetRedraw(folderview, TRUE); IEnumIDList_Release(pEnumIDList); @@ -3041,8 +3042,11 @@ static HRESULT WINAPI IShellFolderView_fnSetRedraw( BOOL redraw) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%d) stub\n", This, redraw); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, redraw); + + SendMessageW(This->hWndList, WM_SETREDRAW, redraw, 0); + + return S_OK; } static HRESULT WINAPI IShellFolderView_fnGetSelectedCount( diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 077c491..6f08f18 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -568,6 +568,10 @@ static void test_IShellFolderView(void) hr = IShellFolderView_MoveIcons(folderview, NULL); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + /* ::SetRedraw without list created */ + hr = IShellFolderView_SetRedraw(folderview, TRUE); + ok(hr == S_OK, "got (0x%08x)\n", hr); + IShellFolderView_Release(folderview); IShellView_Release(view);

1 0

Nikolay Sivov : shell32: Add IShellFolderView:: GetSelectedObjects implementation for IShellView.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: fa3dd31a9c21efc199b58049d8f68dc96b59fa33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3dd31a9c21efc199b58049d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 22 01:32:02 2010 +0300 shell32: Add IShellFolderView::GetSelectedObjects implementation for IShellView. --- dlls/shell32/shlview.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index cd0fb3b..e3f170e 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3062,8 +3062,21 @@ static HRESULT WINAPI IShellFolderView_fnGetSelectedObjects( UINT *items) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%p %p) stub\n", This, pidl, items); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, pidl, items); + + *items = ShellView_GetSelections( This ); + + if (*items) + { + *pidl = LocalAlloc(0, *items*sizeof(LPITEMIDLIST)); + if (!*pidl) return E_OUTOFMEMORY; + + /* it's documented that caller shouldn't PIDLs, only array itself */ + memcpy((PITEMID_CHILD*)*pidl, This->apidl, *items*sizeof(LPITEMIDLIST)); + } + + return S_OK; } static HRESULT WINAPI IShellFolderView_fnIsDropOnSource(

1 0

Nikolay Sivov : shell32: Add a stub IShellFolderView for IShellView.
by Alexandre Julliard March 22, 2010

March 22, 2010

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

Nikolay Sivov : shell32: Properly fail for unsupported interfaces in IShellView::GetItemObject.
by Alexandre Julliard March 22, 2010

March 22, 2010

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: Add a note about a possible crash on NULL input.
by Alexandre Julliard March 22, 2010

March 22, 2010

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: Implement some IShellFolderView methods over IFolderView.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 61fc3f9004acd0c0e617fa8a201f7ea16174a221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fc3f9004acd0c0e617fa8a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 22 01:49:44 2010 +0300 shell32: Implement some IShellFolderView methods over IFolderView. --- dlls/shell32/shlview.c | 32 +++++++++++++++----------------- dlls/shell32/tests/shlview.c | 4 ++++ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index e3f170e..4852fed 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1980,8 +1980,7 @@ static HRESULT WINAPI IShellView_fnSelectItem( UINT flags) { IShellViewImpl *This = (IShellViewImpl *)iface; - IFolderView *view; - HRESULT hr; + IFolderView *view = (IFolderView*)&This->lpvtblFolderView; int i; TRACE("(%p)->(pidl=%p, 0x%08x)\n",This, pidl, flags); @@ -1989,14 +1988,7 @@ static HRESULT WINAPI IShellView_fnSelectItem( i = LV_FindItemByPidl(This, pidl); if (i == -1) return S_OK; - hr = IShellView2_QueryInterface(iface, &IID_IFolderView, (void**)&view); - if (hr == S_OK) - { - hr = IFolderView_SelectItem(view, i, flags); - IFolderView_Release(view); - } - - return hr; + return IFolderView_SelectItem(view, i, flags); } static HRESULT WINAPI IShellView_fnGetItemObject(IShellView2 * iface, UINT uItem, REFIID riid, LPVOID *ppvOut) @@ -2964,8 +2956,10 @@ static HRESULT WINAPI IShellFolderView_fnAutoArrange(IShellFolderView *iface) static HRESULT WINAPI IShellFolderView_fnGetAutoArrange(IShellFolderView *iface) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p) stub\n", This); - return E_NOTIMPL; + IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + + TRACE("(%p)\n", This); + return IFolderView_GetAutoArrange(view); } static HRESULT WINAPI IShellFolderView_fnAddObject( @@ -2984,8 +2978,10 @@ static HRESULT WINAPI IShellFolderView_fnGetObject( UINT item) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%p %d) stub\n", This, pidl, item); - return E_NOTIMPL; + IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + + TRACE("(%p)->(%p %d)\n", This, pidl, item); + return IFolderView_Item(view, item, pidl); } static HRESULT WINAPI IShellFolderView_fnRemoveObject( @@ -3003,8 +2999,10 @@ static HRESULT WINAPI IShellFolderView_fnGetObjectCount( UINT *count) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%p) stub\n", This, count); - return E_NOTIMPL; + IFolderView *view = (IFolderView*)&This->lpvtblFolderView; + + TRACE("(%p)->(%p)\n", This, count); + return IFolderView_ItemCount(view, SVGIO_ALLVIEW, (INT*)count); } static HRESULT WINAPI IShellFolderView_fnSetObjectCount( @@ -3111,7 +3109,7 @@ static HRESULT WINAPI IShellFolderView_fnMoveIcons( IDataObject *obj) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%p) stub\n", This, obj); + TRACE("(%p)->(%p)\n", This, obj); return E_NOTIMPL; } diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 50853d4..077c491 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -564,6 +564,10 @@ static void test_IShellFolderView(void) return; } + /* ::MoveIcons */ + hr = IShellFolderView_MoveIcons(folderview, NULL); + ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + IShellFolderView_Release(folderview); IShellView_Release(view);

1 0