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

Nikolay Sivov : shell32: Stub IFolderView implementation for IShellView instance.
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: 8032ae704772aa7e6f7d4d13938dbe6d1dc11ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8032ae704772aa7e6f7d4d139… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 20:19:03 2010 +0300 shell32: Stub IFolderView implementation for IShellView instance. --- dlls/shell32/shlview.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++- include/shobjidl.idl | 46 ++++++++++++++ include/shtypes.idl | 3 + 3 files changed, 207 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index b14ba78..8c30d72 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -57,6 +57,7 @@ #include "wingdi.h" #include "winuser.h" #include "shlobj.h" +#include "shobjidl.h" #include "undocshell.h" #include "shresdef.h" #include "wine/debug.h" @@ -84,6 +85,7 @@ typedef struct const IDropTargetVtbl* lpvtblDropTarget; const IDropSourceVtbl* lpvtblDropSource; const IViewObjectVtbl* lpvtblViewObject; + const IFolderViewVtbl* lpvtblFolderView; IShellFolder* pSFParent; IShellFolder2* pSF2Parent; IShellBrowser* pShellBrowser; @@ -114,7 +116,7 @@ static const IOleCommandTargetVtbl ctvt; static const IDropTargetVtbl dtvt; static const IDropSourceVtbl dsvt; static const IViewObjectVtbl vovt; - +static const IFolderViewVtbl fviewvt; static inline IShellViewImpl *impl_from_IOleCommandTarget( IOleCommandTarget *iface ) { @@ -136,6 +138,11 @@ static inline IShellViewImpl *impl_from_IViewObject( IViewObject *iface ) return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblViewObject)); } +static inline IShellViewImpl *impl_from_IFolderView( IFolderView *iface ) +{ + return (IShellViewImpl *)((char*)iface - FIELD_OFFSET(IShellViewImpl, lpvtblFolderView)); +} + /* ListView Header ID's */ #define LISTVIEW_COLUMN_NAME 0 #define LISTVIEW_COLUMN_SIZE 1 @@ -192,6 +199,7 @@ IShellView * IShellView_Constructor( IShellFolder * pFolder) sv->lpvtblDropTarget=&dtvt; sv->lpvtblDropSource=&dsvt; sv->lpvtblViewObject=&vovt; + sv->lpvtblFolderView=&fviewvt; sv->pSFParent = pFolder; if(pFolder) IShellFolder_AddRef(pFolder); @@ -1692,6 +1700,10 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView2 * iface,REFIID rii { *ppvObj = This; } + else if(IsEqualIID(riid, &IID_IFolderView)) + { + *ppvObj = &This->lpvtblFolderView; + } else if(IsEqualIID(riid, &IID_IOleCommandTarget)) { *ppvObj = &This->lpvtblOleCommandTarget; @@ -2658,3 +2670,148 @@ static const IViewObjectVtbl vovt = ISVViewObject_SetAdvise, ISVViewObject_GetAdvise }; + +/* IFolderView */ +static HRESULT WINAPI IFView_QueryInterface( + IFolderView *iface, + REFIID riid, + LPVOID *ppvObj) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + TRACE("(%p)->(IID:%s,%p)\n", This, debugstr_guid(riid), ppvObj); + return IShellView2_QueryInterface((IShellView2*)This, riid, ppvObj); +} + +static ULONG WINAPI IFView_AddRef( IFolderView *iface) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + TRACE("(%p)->(count=%u)\n", This, This->ref); + return IShellView2_AddRef((IShellView2*)This); +} + +static ULONG WINAPI IFView_Release( IFolderView *iface) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + TRACE("(%p)->(count=%u)\n", This, This->ref); + return IShellView2_Release((IShellView2*)This); +} + +static HRESULT WINAPI IFView_GetCurrentViewMode(IFolderView *iface, UINT *mode) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + FIXME("(%p)->(%p), stub\n", This, mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI IFView_SetCurrentViewMode(IFolderView *iface, UINT mode) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + FIXME("(%p)->(%u), stub\n", This, mode); + return E_NOTIMPL; +} + +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; +} + +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; +} + +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; +} + +static HRESULT WINAPI IFView_Items(IFolderView *iface, UINT flags, REFIID riid, void **ppv) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + FIXME("(%p)->(%u %s %p), stub\n", This, flags, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI IFView_GetSelectionMarkedItem(IFolderView *iface, int *item) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + FIXME("(%p)->(%p), stub\n", This, item); + return E_NOTIMPL; +} + +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; +} + +static HRESULT WINAPI IFView_GetItemPosition(IFolderView *iface, PCUITEMID_CHILD pidl, POINT *ppt) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + FIXME("(%p)->(%p %p), stub\n", This, pidl, ppt); + return E_NOTIMPL; +} + +static HRESULT WINAPI IFView_GetSpacing(IFolderView *iface, POINT *pt) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + FIXME("(%p)->(%p), stub\n", This, pt); + return E_NOTIMPL; +} + +static HRESULT WINAPI IFView_GetDefaultSpacing(IFolderView *iface, POINT *pt) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + FIXME("(%p)->(%p), stub\n", This, pt); + return E_NOTIMPL; +} + +static HRESULT WINAPI IFView_GetAutoArrange(IFolderView *iface) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + FIXME("(%p), stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI IFView_SelectItem(IFolderView *iface, int item, DWORD flags) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + FIXME("(%p)->(%d, %x), stub\n", This, item, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI IFView_SelectAndPositionItems(IFolderView *iface, UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, POINT *apt, DWORD flags) +{ + IShellViewImpl *This = impl_from_IFolderView(iface); + FIXME("(%p)->(%u %p %p %x), stub\n", This, cidl, apidl, apt, flags); + return E_NOTIMPL; +} + +static const IFolderViewVtbl fviewvt = +{ + IFView_QueryInterface, + IFView_AddRef, + IFView_Release, + IFView_GetCurrentViewMode, + IFView_SetCurrentViewMode, + IFView_GetFolder, + IFView_Item, + IFView_ItemCount, + IFView_Items, + IFView_GetSelectionMarkedItem, + IFView_GetFocusedItem, + IFView_GetItemPosition, + IFView_GetSpacing, + IFView_GetDefaultSpacing, + IFView_GetAutoArrange, + IFView_SelectItem, + IFView_SelectAndPositionItems +}; diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 60da174..e1bf70b 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -535,6 +535,52 @@ cpp_quote("#include <poppack.h>") ); } +/***************************************************************************** + * IFolderView interface + */ +[ + uuid(cde725b0-ccc9-4519-917e-325d72fab4ce), + object, + pointer_default(unique) +] +interface IFolderView : IUnknown +{ + HRESULT GetCurrentViewMode( [out] UINT *mode ); + HRESULT SetCurrentViewMode( [in] UINT mode ); + HRESULT GetFolder( [in] REFIID riid, [out, iid_is(riid)] void **ppv ); + HRESULT Item( + [in] int index, + [out] PITEMID_CHILD *ppidl + ); + HRESULT ItemCount( + [in] UINT flags, + [out] int *items + ); + HRESULT Items( + [in] UINT flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv + ); + HRESULT GetSelectionMarkedItem( [out] int *item ); + HRESULT GetFocusedItem( [out] int *item ); + HRESULT GetItemPosition( + [in] PCUITEMID_CHILD pidl, + [out] POINT* ppt + ); + HRESULT GetSpacing( [in, out, unique] POINT* pt ); + HRESULT GetDefaultSpacing( [out] POINT* pt ); + HRESULT GetAutoArrange(); + HRESULT SelectItem( + [in] int item, + [in] DWORD flags + ); + HRESULT SelectAndPositionItems( + [in] UINT cidl, + [in, size_is(cidl)] PCUITEMID_CHILD_ARRAY apidl, + [in, unique, size_is(cidl)] POINT* apt, + [in] DWORD flags + ); +} /***************************************************************************** * IShellBrowser interface diff --git a/include/shtypes.idl b/include/shtypes.idl index 2433fb5..021d467 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -34,6 +34,9 @@ typedef struct _ITEMIDLIST SHITEMID mkid; /* first itemid in list */ } ITEMIDLIST,*LPITEMIDLIST; typedef const ITEMIDLIST *LPCITEMIDLIST; +typedef LPITEMIDLIST PITEMID_CHILD; +typedef LPCITEMIDLIST PCUITEMID_CHILD; +typedef LPCITEMIDLIST *PCUITEMID_CHILD_ARRAY; cpp_quote("#include <poppack.h>") #ifndef MAX_PATH

1 0

Paul Andrew Panon : wined3d: Update to add Mesa ATI card detection code.
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: 482fbe91e2860c2d3ca5062f30949af9ab72b142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=482fbe91e2860c2d3ca5062f3… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Fri Mar 5 02:30:04 2010 -0800 wined3d: Update to add Mesa ATI card detection code. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b3f0c20..abed2b6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1160,6 +1160,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s if (strstr(gl_vendor_string, "ATI") || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") + || strstr(gl_vendor_string, "X.Org R300 Project") || strstr(gl_vendor_string, "DRI R300 Project")) return HW_VENDOR_ATI;

1 0

Nikolay Sivov : shell32: Stub IShellView2::SelectAndPositionItem() over IFolderView::SelectAndPositionItems().
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: 072951e2f8a46269b46ca5acd42a6bd976f96d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=072951e2f8a46269b46ca5acd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 22:36:27 2010 +0300 shell32: Stub IShellView2::SelectAndPositionItem() over IFolderView::SelectAndPositionItems(). --- dlls/shell32/shlview.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 8114546..80c4c3a 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2111,10 +2111,26 @@ static HRESULT WINAPI IShellView2_fnHandleRename(IShellView2* iface, LPCITEMIDLI return E_NOTIMPL; } -static HRESULT WINAPI IShellView2_fnSelectAndPositionItem(IShellView2* iface, LPCITEMIDLIST item, UINT flags, POINT *point) +static HRESULT WINAPI IShellView2_fnSelectAndPositionItem( + IShellView2* iface, + LPCITEMIDLIST item, + UINT flags, + POINT *point) { - FIXME("(%p)->(item %p, flags %#x, point %p) stub!\n", iface, item, flags, point); - return E_NOTIMPL; + IShellViewImpl *This = (IShellViewImpl *)iface; + IFolderView *view; + HRESULT hr; + + TRACE("(%p)->(item %p, flags %#x, point %p)\n", This, item, flags, point); + + hr = IShellView2_QueryInterface(iface, &IID_IFolderView, (void**)&view); + if (hr == S_OK) + { + hr = IFolderView_SelectAndPositionItems(view, 1, &item, point, flags); + IFolderView_Release(view); + } + + return hr; } static const IShellView2Vtbl svvt =

1 0

Nikolay Sivov : shell32: Move SelectItem implementation to IFolderView and use it for IShellView:: SelectItem.
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: 04e527b31b3a5d02c83c60ea87973f315ff3b575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e527b31b3a5d02c83c60ea8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 22:29:23 2010 +0300 shell32: Move SelectItem implementation to IFolderView and use it for IShellView::SelectItem. --- dlls/shell32/shlview.c | 89 +++++++++++++++++++++++------------------------- 1 files changed, 43 insertions(+), 46 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 6d09771..8114546 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1960,54 +1960,26 @@ static HRESULT WINAPI IShellView_fnSaveViewState(IShellView2 * iface) static HRESULT WINAPI IShellView_fnSelectItem( IShellView2 * iface, LPCITEMIDLIST pidl, - UINT uFlags) + UINT flags) { - IShellViewImpl *This = (IShellViewImpl *)iface; - int i; - - TRACE("(%p)->(pidl=%p, 0x%08x) stub\n",This, pidl, uFlags); - - i = LV_FindItemByPidl(This, pidl); - - if (i != -1) - { - LVITEMW lvItem; - - if(uFlags & SVSI_ENSUREVISIBLE) - SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); - - lvItem.mask = LVIF_STATE; - lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED; - lvItem.iItem = 0; - lvItem.iSubItem = 0; - - while(SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem)) - { - if (lvItem.iItem == i) - { - if (uFlags & SVSI_SELECT) - lvItem.state |= LVIS_SELECTED; - else - lvItem.state &= ~LVIS_SELECTED; + IShellViewImpl *This = (IShellViewImpl *)iface; + IFolderView *view; + HRESULT hr; + int i; - if(uFlags & SVSI_FOCUSED) - lvItem.state &= ~LVIS_FOCUSED; - } - else - { - if (uFlags & SVSI_DESELECTOTHERS) - lvItem.state &= ~LVIS_SELECTED; - } - SendMessageW(This->hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem); - lvItem.iItem++; - } + TRACE("(%p)->(pidl=%p, 0x%08x)\n",This, pidl, flags); + i = LV_FindItemByPidl(This, pidl); + if (i == -1) return S_OK; - if(uFlags & SVSI_EDIT) - SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); + hr = IShellView2_QueryInterface(iface, &IID_IFolderView, (void**)&view); + if (hr == S_OK) + { + hr = IFolderView_SelectItem(view, i, flags); + IFolderView_Release(view); + } - } - return S_OK; + return hr; } static HRESULT WINAPI IShellView_fnGetItemObject(IShellView2 * iface, UINT uItem, REFIID riid, LPVOID *ppvOut) @@ -2783,9 +2755,34 @@ static HRESULT WINAPI IFView_GetAutoArrange(IFolderView *iface) static HRESULT WINAPI IFView_SelectItem(IFolderView *iface, int item, DWORD flags) { - IShellViewImpl *This = impl_from_IFolderView(iface); - FIXME("(%p)->(%d, %x), stub\n", This, item, flags); - return E_NOTIMPL; + IShellViewImpl *This = impl_from_IFolderView(iface); + LVITEMW lvItem; + + TRACE("(%p)->(%d, %x)\n", This, item, flags); + + lvItem.state = 0; + lvItem.stateMask = LVIS_SELECTED; + + if (flags & SVSI_ENSUREVISIBLE) + SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, item, 0); + + /* all items */ + if (flags & SVSI_DESELECTOTHERS) + SendMessageW(This->hWndList, LVM_SETITEMSTATE, -1, (LPARAM)&lvItem); + + /* this item */ + if (flags & SVSI_SELECT) + lvItem.state |= LVIS_SELECTED; + + if (flags & SVSI_FOCUSED) + lvItem.stateMask |= LVIS_FOCUSED; + + SendMessageW(This->hWndList, LVM_SETITEMSTATE, item, (LPARAM)&lvItem); + + if (flags & SVSI_EDIT) + SendMessageW(This->hWndList, LVM_EDITLABELW, item, 0); + + return S_OK; } static HRESULT WINAPI IFView_SelectAndPositionItems(IFolderView *iface, UINT cidl,

1 0

Alexandre Julliard : winetest: Refuse to run if we cannot create a window.
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: f47bcc22fcfc2bbc16f3f41886a55c2c9d4a9716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47bcc22fcfc2bbc16f3f4188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 5 13:10:16 2010 +0100 winetest: Refuse to run if we cannot create a window. --- programs/winetest/gui.c | 2 +- programs/winetest/main.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index 7a7b1e0..f13cc18 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -473,7 +473,7 @@ DlgThreadProc (LPVOID param) NULL, DlgProc); switch (ret) { case 0: - report (R_WARNING, "Invalid parent handle"); + report (R_FATAL, "Cannot display dialog"); break; case 1: report (R_WARNING, "DialogBox failed: %d", diff --git a/programs/winetest/main.c b/programs/winetest/main.c index e0b9ced..3eabf5f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -145,6 +145,18 @@ static int check_mount_mgr(void) return TRUE; } +static int check_display_driver(void) +{ + if (running_under_wine()) + { + HWND hwnd = CreateWindowA( "STATIC", "", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, + 0, 0, GetModuleHandleA(0), 0 ); + if (!hwnd) return FALSE; + DestroyWindow( hwnd ); + } + return TRUE; +} + static int running_on_visible_desktop (void) { HWND desktop; @@ -1052,7 +1064,10 @@ int main( int argc, char *argv[] ) report (R_FATAL, "Tests must be run on a visible desktop"); if (!check_mount_mgr()) - report (R_FATAL, "Mount manager not running, most likely your WINEPREFIX wasn't created correctly"); + report (R_FATAL, "Mount manager not running, most likely your WINEPREFIX wasn't created correctly."); + + if (!check_display_driver()) + report (R_FATAL, "Unable to create a window, the display driver is not working."); SetConsoleCtrlHandler(ctrl_handler, TRUE);

1 0

Paul Vriens : gdi32/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: b5738dcceb94930a20dc9e4333516a732884d619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5738dcceb94930a20dc9e433… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 5 11:06:52 2010 +0100 gdi32/tests: Fix a test failure on Win9x/WinMe. --- dlls/gdi32/tests/bitmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 23762c0..f6a4434 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -364,7 +364,9 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(ds.dsBmih.biSize == bmih->biSize, "%u != %u\n", ds.dsBmih.biSize, bmih->biSize); ok(ds.dsBmih.biWidth == bmih->biWidth, "%d != %d\n", ds.dsBmih.biWidth, bmih->biWidth); - ok(ds.dsBmih.biHeight == abs(bmih->biHeight), "%d != %d\n", ds.dsBmih.biHeight, abs(bmih->biHeight)); + ok(ds.dsBmih.biHeight == abs(bmih->biHeight) || + broken(ds.dsBmih.biHeight == bmih->biHeight), /* Win9x/WinMe */ + "%d != %d\n", ds.dsBmih.biHeight, abs(bmih->biHeight)); ok(ds.dsBmih.biPlanes == bmih->biPlanes, "%u != %u\n", ds.dsBmih.biPlanes, bmih->biPlanes); ok(ds.dsBmih.biBitCount == bmih->biBitCount, "%u != %u\n", ds.dsBmih.biBitCount, bmih->biBitCount); ok(ds.dsBmih.biCompression == bmih->biCompression, "%u != %u\n", ds.dsBmih.biCompression, bmih->biCompression);

1 0

Jeff Zaroyko : mmdevapi/tests: Fix a failing test for Vista/W2k8.
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: 0a6ac95736561d093d6b31d50f16f6a9fb573a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6ac95736561d093d6b31d50… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Mar 5 17:00:00 2010 +1100 mmdevapi/tests: Fix a failing test for Vista/W2k8. --- dlls/mmdevapi/tests/render.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 7813056..05d71b7 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -199,7 +199,9 @@ static void test_audioclient(IAudioClient *ac) ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, handle); - ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED, "SetEventHandle returns %08x\n", hr); + ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED || + hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) + , "SetEventHandle returns %08x\n", hr); CloseHandle(handle); CoTaskMemFree(pwfx);

1 0

Kusanagi Kouichi : wined3d: Fix a failure of card vendor detection.
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: f4bce098ea1cf2de382e8d53dec4addbf941a73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4bce098ea1cf2de382e8d53d… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Fri Mar 5 02:51:31 2010 +0900 wined3d: Fix a failure of card vendor detection. --- dlls/wined3d/directx.c | 47 ++++++++++++++++------------------------------- 1 files changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1cab94a..b3f0c20 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1982,7 +1982,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) struct wined3d_gl_info *gl_info = &adapter->gl_info; const char *GL_Extensions = NULL; const char *WGL_Extensions = NULL; - const char *gl_string = NULL; + const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; struct fragment_caps fragment_caps; enum wined3d_gl_vendor gl_vendor; enum wined3d_pci_vendor card_vendor; @@ -1992,7 +1992,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) unsigned i; HDC hdc; unsigned int vidmem=0; - char *gl_renderer; DWORD gl_version; size_t len; @@ -2000,46 +1999,34 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) ENTER_GL(); - gl_string = (const char *)glGetString(GL_RENDERER); - TRACE_(d3d_caps)("GL_RENDERER: %s.\n", debugstr_a(gl_string)); - if (!gl_string) + gl_renderer_str = (const char *)glGetString(GL_RENDERER); + TRACE_(d3d_caps)("GL_RENDERER: %s.\n", debugstr_a(gl_renderer_str)); + if (!gl_renderer_str) { LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_RENDERER.\n"); return FALSE; } - len = strlen(gl_string) + 1; - gl_renderer = HeapAlloc(GetProcessHeap(), 0, len); - if (!gl_renderer) - { - LEAVE_GL(); - ERR_(d3d_caps)("Failed to allocate gl_renderer memory.\n"); - return FALSE; - } - memcpy(gl_renderer, gl_string, len); - - gl_string = (const char *)glGetString(GL_VENDOR); - TRACE_(d3d_caps)("GL_VENDOR: %s.\n", debugstr_a(gl_string)); - if (!gl_string) + gl_vendor_str = (const char *)glGetString(GL_VENDOR); + TRACE_(d3d_caps)("GL_VENDOR: %s.\n", debugstr_a(gl_vendor_str)); + if (!gl_vendor_str) { LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_VENDOR.\n"); - HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; } /* Parse the GL_VERSION field into major and minor information */ - gl_string = (const char *)glGetString(GL_VERSION); - TRACE_(d3d_caps)("GL_VERSION: %s.\n", debugstr_a(gl_string)); - if (!gl_string) + gl_version_str = (const char *)glGetString(GL_VERSION); + TRACE_(d3d_caps)("GL_VERSION: %s.\n", debugstr_a(gl_version_str)); + if (!gl_version_str) { LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_VERSION.\n"); - HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; } - gl_version = wined3d_parse_gl_version(gl_string); + gl_version = wined3d_parse_gl_version(gl_version_str); /* * Initialize openGL extension related variables @@ -2087,7 +2074,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) { LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_EXTENSIONS.\n"); - HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; } @@ -2484,11 +2470,11 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) gl_info->limits.buffers = 1; } - gl_vendor = wined3d_guess_gl_vendor(gl_info, gl_string, gl_renderer); - card_vendor = wined3d_guess_card_vendor(gl_string, gl_renderer); - TRACE_(d3d_caps)("found GL_VENDOR (%s)->(0x%04x/0x%04x)\n", debugstr_a(gl_string), gl_vendor, card_vendor); + gl_vendor = wined3d_guess_gl_vendor(gl_info, gl_vendor_str, gl_renderer_str); + card_vendor = wined3d_guess_card_vendor(gl_vendor_str, gl_renderer_str); + TRACE_(d3d_caps)("found GL_VENDOR (%s)->(0x%04x/0x%04x)\n", debugstr_a(gl_vendor_str), gl_vendor, card_vendor); - device = wined3d_guess_card(gl_info, gl_renderer, &gl_vendor, &card_vendor, &vidmem); + device = wined3d_guess_card(gl_info, gl_renderer_str, &gl_vendor, &card_vendor, &vidmem); TRACE_(d3d_caps)("FOUND (fake) card: 0x%x (vendor id), 0x%x (device id)\n", card_vendor, device); /* If we have an estimate use it, else default to 64MB; */ @@ -2551,11 +2537,10 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) } } - fixup_extensions(gl_info, gl_renderer, gl_vendor, card_vendor, device); + fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device); init_driver_info(driver_info, card_vendor, device); add_gl_compat_wrappers(gl_info); - HeapFree(GetProcessHeap(), 0, gl_renderer); return TRUE; }

1 0

Stefan Dösinger : wined3d: Add wined3d_event_query_create and destroy.
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: bd0641d37fec8cc50d6f6774da30995757f5eaec URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd0641d37fec8cc50d6f6774d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 3 23:48:50 2010 +0100 wined3d: Add wined3d_event_query_create and destroy. This also moves the event query faking code back to the external interface and removes the temporary WINED3D_EVENT_QUERY_UNSUPPORTED return value since wined3d_event_query_create properly fails if no event query GL extension is supported. --- dlls/wined3d/query.c | 61 ++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 3 +- 2 files changed, 45 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 09a60bd..3860e2c 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -27,6 +27,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) +static HRESULT wined3d_event_query_init(const struct wined3d_gl_info *gl_info, struct wined3d_event_query **query) +{ + struct wined3d_event_query *ret; + *query = NULL; + if (!gl_info->supported[ARB_SYNC] && !gl_info->supported[NV_FENCE] + && !gl_info->supported[APPLE_FENCE]) return E_NOTIMPL; + + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(*ret)); + if (!ret) + { + ERR("Failed to allocate a wined3d event query structure.\n"); + return E_OUTOFMEMORY; + } + ret->context = NULL; + *query = ret; + return WINED3D_OK; +} + +static void wined3d_event_query_destroy(struct wined3d_event_query *query) +{ + if (query->context) context_free_event_query(query); + HeapFree(GetProcessHeap(), 0, query); +} + static enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) { struct wined3d_context *context; @@ -91,7 +115,8 @@ static enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_e } else { - ret = WINED3D_EVENT_QUERY_UNSUPPORTED; + ERR("Event query created despite lack of GL support\n"); + ret = WINED3D_EVENT_QUERY_ERROR; } LEAVE_GL(); @@ -194,17 +219,16 @@ static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) { if (This->type == WINED3DQUERYTYPE_EVENT) { struct wined3d_event_query *query = This->extendedData; - - if (query->context) context_free_event_query(query); + if (query) wined3d_event_query_destroy(query); } else if (This->type == WINED3DQUERYTYPE_OCCLUSION) { struct wined3d_occlusion_query *query = This->extendedData; if (query->context) context_free_occlusion_query(query); + HeapFree(GetProcessHeap(), 0, This->extendedData); } - HeapFree(GetProcessHeap(), 0, This->extendedData); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -309,6 +333,12 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void TRACE("(%p) : type D3DQUERY_EVENT, pData %p, dwSize %#x, dwGetDataFlags %#x\n", This, pData, dwSize, dwGetDataFlags); if (!pData || !dwSize) return S_OK; + if (!query) + { + WARN("(%p): Event query not supported by GL, reporting GPU idle\n", This); + *data = TRUE; + return S_OK; + } ret = wined3d_event_query_test(query, This->device); switch(ret) @@ -327,11 +357,6 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void *data = TRUE; break; - case WINED3D_EVENT_QUERY_UNSUPPORTED: - WARN("(%p): Event query not supported by GL, reporting GPU idle\n", This); - *data = TRUE; - break; - case WINED3D_EVENT_QUERY_ERROR: ERR("The GL event query failed, returning D3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; @@ -364,6 +389,10 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD if (dwIssueFlags & WINED3DISSUE_END) { struct wined3d_event_query *query = This->extendedData; + + /* Faked event query support */ + if (!query) return WINED3D_OK; + wined3d_event_query_issue(query, This->device); } else if(dwIssueFlags & WINED3DISSUE_BEGIN) @@ -496,6 +525,7 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type, IUnknown *parent) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + HRESULT hr; switch (type) { @@ -518,8 +548,9 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, case WINED3DQUERYTYPE_EVENT: TRACE("Event query.\n"); - if (!gl_info->supported[ARB_SYNC] && !gl_info->supported[NV_FENCE] - && !gl_info->supported[APPLE_FENCE]) + query->lpVtbl = &IWineD3DEventQuery_Vtbl; + hr = wined3d_event_query_init(gl_info, (struct wined3d_event_query **) &query->extendedData); + if (hr == E_NOTIMPL) { /* Half-Life 2 needs this query. It does not render the main * menu correctly otherwise. Pretend to support it, faking @@ -527,14 +558,10 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, * lowering performance. */ FIXME("Event query: Unimplemented, but pretending to be supported.\n"); } - query->lpVtbl = &IWineD3DEventQuery_Vtbl; - query->extendedData = HeapAlloc(GetProcessHeap(), 0, sizeof(struct wined3d_event_query)); - if (!query->extendedData) + else if(FAILED(hr)) { - ERR("Failed to allocate event query extended data.\n"); - return E_OUTOFMEMORY; + return hr; } - ((struct wined3d_event_query *)query->extendedData)->context = NULL; break; case WINED3DQUERYTYPE_VCACHE: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 616a391..1d5cd97 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1036,8 +1036,7 @@ enum wined3d_event_query_result WINED3D_EVENT_QUERY_WAITING, WINED3D_EVENT_QUERY_NOT_STARTED, WINED3D_EVENT_QUERY_WRONG_THREAD, - WINED3D_EVENT_QUERY_ERROR, - WINED3D_EVENT_QUERY_UNSUPPORTED + WINED3D_EVENT_QUERY_ERROR }; struct wined3d_context

1 0

Paul Vriens : shlwapi/tests: Skip some tests on Win9x/WinMe.
by Alexandre Julliard March 5, 2010

March 5, 2010

Module: wine Branch: master Commit: e271ac6f26e0047537c27cde1bbb59120d4a413c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e271ac6f26e0047537c27cde1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 5 11:35:12 2010 +0100 shlwapi/tests: Skip some tests on Win9x/WinMe. --- dlls/shlwapi/tests/ordinal.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index dd046aa..17201b5 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1688,7 +1688,13 @@ if (0) flags = FDTF_SHORTTIME; ret = pSHFormatDateTimeW(&filetime, &flags, buff, sizeof(buff)/sizeof(WCHAR)); ok(ret == lstrlenW(buff)+1, "got %d\n", ret); + SetLastError(0xdeadbeef); ret = GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, buff2, sizeof(buff2)/sizeof(WCHAR)); + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Needed W-functions are not implemented\n"); + return; + } ok(ret == lstrlenW(buff2)+1, "got %d\n", ret); ok(lstrcmpW(buff, buff2) == 0, "expected equal strings\n");

1 0