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

Oldřich Jedlička : ddraw/tests: New visual back buffer flipping tests.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 964500a61a7ff036d871be942a0cd2f685b30098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=964500a61a7ff036d871be942… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Wed Aug 25 22:07:06 2010 +0200 ddraw/tests: New visual back buffer flipping tests. --- dlls/ddraw/tests/visual.c | 122 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 290cb76..2616a36 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2920,6 +2920,127 @@ static void depth_clamp_test(IDirect3DDevice7 *device) ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); } +static void DX1_BackBufferFlipTest(void) +{ + HRESULT hr; + IDirectDraw *DirectDraw1 = NULL; + IDirectDrawSurface *Primary = NULL; + IDirectDrawSurface *Backbuffer = NULL; + WNDCLASS wc = {0}; + DDSURFACEDESC ddsd; + DDBLTFX ddbltfx; + COLORREF color; + const DWORD white = 0xffffff; + const DWORD red = 0xff0000; + BOOL attached = FALSE; + + wc.lpfnWndProc = DefWindowProc; + wc.lpszClassName = "DX1_BackBufferFlipTest_wc"; + RegisterClass(&wc); + window = CreateWindow("DX1_BackBufferFlipTest_wc", "DX1_BackBufferFlipTest", + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + + hr = DirectDrawCreate( NULL, &DirectDraw1, NULL ); + ok(hr==DD_OK || hr==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreate returned: %x\n", hr); + if(FAILED(hr)) goto out; + + hr = IDirectDraw_SetCooperativeLevel(DirectDraw1, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr==DD_OK, "SetCooperativeLevel returned: %x\n", hr); + if(FAILED(hr)) goto out; + + hr = IDirectDraw_SetDisplayMode(DirectDraw1, 640, 480, 32); + if(FAILED(hr)) { + /* 24 bit is fine too */ + hr = IDirectDraw_SetDisplayMode(DirectDraw1, 640, 480, 24); + } + ok(hr==DD_OK || hr == DDERR_UNSUPPORTED, "SetDisplayMode returned: %x\n", hr); + if (FAILED(hr)) { + goto out; + } + + memset(&ddsd, 0, sizeof(DDSURFACEDESC)); + ddsd.dwSize = sizeof(DDSURFACEDESC); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Primary, NULL); + ok(hr==DD_OK, "IDirectDraw_CreateSurface returned: %08x\n", hr); + + memset(&ddsd, 0, sizeof(DDSURFACEDESC)); + ddsd.dwSize = sizeof(DDSURFACEDESC); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; + ddsd.dwWidth = 640; + ddsd.dwHeight = 480; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Backbuffer, NULL); + todo_wine ok(hr==DD_OK, "IDirectDraw_CreateSurface returned: %08x\n", hr); + if(FAILED(hr)) goto out; + + hr = IDirectDrawSurface_AddAttachedSurface(Primary, Backbuffer); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a back buffer to a front buffer returned %08x\n", hr); + if (FAILED(hr)) goto out; + + attached = TRUE; + + memset(&ddbltfx, 0, sizeof(ddbltfx)); + ddbltfx.dwSize = sizeof(ddbltfx); + U5(ddbltfx).dwFillColor = red; + hr = IDirectDrawSurface_Blt(Backbuffer, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); + ok(hr == DD_OK, "IDirectDrawSurface_Blt returned: %x\n", hr); + + U5(ddbltfx).dwFillColor = white; + hr = IDirectDrawSurface_Blt(Primary, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); + ok(hr == DD_OK, "IDirectDrawSurface_Blt returned: %x\n", hr); + + /* Check it out */ + color = getPixelColor_GDI(Primary, 5, 5); + ok(GetRValue(color) == 0xFF && GetGValue(color) == 0xFF && GetBValue(color) == 0xFF, + "got R %02X G %02X B %02X, expected R FF G FF B FF\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + + color = getPixelColor_GDI(Backbuffer, 5, 5); + ok(GetRValue(color) == 0xFF && GetGValue(color) == 0 && GetBValue(color) == 0, + "got R %02X G %02X B %02X, expected R FF G 00 B 00\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + + hr = IDirectDrawSurface_Flip(Primary, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DD_OK, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + + if (hr == DD_OK) + { + color = getPixelColor_GDI(Primary, 5, 5); + ok(GetRValue(color) == 0xFF && GetGValue(color) == 0 && GetBValue(color) == 0, + "got R %02X G %02X B %02X, expected R FF G 00 B 00\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + + color = getPixelColor_GDI(Backbuffer, 5, 5); + ok((GetRValue(color) == 0xFF && GetGValue(color) == 0xFF && GetBValue(color) == 0xFF) || + broken(GetRValue(color) == 0xFF && GetGValue(color) == 0 && GetBValue(color) == 0), /* broken driver */ + "got R %02X G %02X B %02X, expected R FF G FF B FF\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + } + + out: + + if (Backbuffer) + { + if (attached) + IDirectDrawSurface_DeleteAttachedSurface(Primary, 0, Backbuffer); + IDirectDrawSurface_Release(Backbuffer); + } + if (Primary) IDirectDrawSurface_Release(Primary); + if (DirectDraw1) IDirectDraw_Release(DirectDraw1); + if (window) DestroyWindow(window); +} + START_TEST(visual) { HRESULT hr; @@ -2983,6 +3104,7 @@ START_TEST(visual) D3D3_ViewportClearTest(); p8_primary_test(); + DX1_BackBufferFlipTest(); return ;

1 0

David Hedberg : shell32: Add a navigation pane to the ExplorerBrowser control.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 91c5c0bab34917e0a3f2818264b1816b6926b96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c5c0bab34917e0a3f281826… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Aug 26 13:58:20 2010 +0200 shell32: Add a navigation pane to the ExplorerBrowser control. --- dlls/shell32/ebrowser.c | 354 ++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/ebrowser.c | 2 +- 2 files changed, 352 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91c5c0bab34917e0a3f28…

1 0

Stefan Dösinger : user32: Make GetMessage and PeekMessage patchable.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: c2934243194b0c0109dc7437d207b7eddd5f0ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2934243194b0c0109dc7437d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 25 13:46:03 2010 +0200 user32: Make GetMessage and PeekMessage patchable. --- dlls/user32/message.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 312d54c..b073e1c 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3442,7 +3442,7 @@ void WINAPI PostQuitMessage( INT exit_code ) /*********************************************************************** * PeekMessageW (USER32.@) */ -BOOL WINAPI PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT flags ) +BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT flags ) { MSG msg; @@ -3474,7 +3474,7 @@ BOOL WINAPI PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT f /*********************************************************************** * PeekMessageA (USER32.@) */ -BOOL WINAPI PeekMessageA( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags ) +BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageA( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags ) { if (get_pending_wmchar( msg, first, last, (flags & PM_REMOVE) )) return TRUE; if (!PeekMessageW( msg, hwnd, first, last, flags )) return FALSE; @@ -3486,7 +3486,7 @@ BOOL WINAPI PeekMessageA( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags /*********************************************************************** * GetMessageW (USER32.@) */ -BOOL WINAPI GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) +BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) { HANDLE server_queue = get_server_queue_handle(); unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ @@ -3519,7 +3519,7 @@ BOOL WINAPI GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) /*********************************************************************** * GetMessageA (USER32.@) */ -BOOL WINAPI GetMessageA( MSG *msg, HWND hwnd, UINT first, UINT last ) +BOOL WINAPI DECLSPEC_HOTPATCH GetMessageA( MSG *msg, HWND hwnd, UINT first, UINT last ) { if (get_pending_wmchar( msg, first, last, TRUE )) return TRUE; GetMessageW( msg, hwnd, first, last );

1 0

David Hedberg : shell32: Add INameSpaceTreeControlEvents stub to the ExplorerBrowser control.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 209526088cca19dd42ea5e6a072e5c0dd5724110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209526088cca19dd42ea5e6a0… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Aug 26 13:58:19 2010 +0200 shell32: Add INameSpaceTreeControlEvents stub to the ExplorerBrowser control. --- dlls/shell32/ebrowser.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 223 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 40d6739..5666926 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -53,6 +53,7 @@ typedef struct _ExplorerBrowserImpl { const IShellBrowserVtbl *lpsbVtbl; const ICommDlgBrowser3Vtbl *lpcdb3Vtbl; const IObjectWithSiteVtbl *lpowsVtbl; + const INameSpaceTreeControlEventsVtbl *lpnstceVtbl; LONG ref; BOOL destroyed; @@ -1378,6 +1379,227 @@ static const IObjectWithSiteVtbl vt_IObjectWithSite = { IObjectWithSite_fnGetSite }; +/************************************************************************** + * INameSpaceTreeControlEvents Implementation + */ +static inline ExplorerBrowserImpl *impl_from_INameSpaceTreeControlEvents(INameSpaceTreeControlEvents *iface) +{ + return (ExplorerBrowserImpl *)((char*)iface - FIELD_OFFSET(ExplorerBrowserImpl, lpnstceVtbl)); +} + +static HRESULT WINAPI NSTCEvents_fnQueryInterface(INameSpaceTreeControlEvents *iface, + REFIID riid, void **ppvObject) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%s, %p)\n", This, shdebugstr_guid(riid), ppvObject); + + *ppvObject = NULL; + if(IsEqualIID(riid, &IID_INameSpaceTreeControlEvents) || + IsEqualIID(riid, &IID_IUnknown)) + { + *ppvObject = iface; + } + + if(*ppvObject) + { + IUnknown_AddRef((IUnknown*)*ppvObject); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI NSTCEvents_fnAddRef(INameSpaceTreeControlEvents *iface) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p\n", This); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI NSTCEvents_fnRelease(INameSpaceTreeControlEvents *iface) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p\n", This); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI NSTCEvents_fnOnItemClick(INameSpaceTreeControlEvents *iface, + IShellItem *psi, + NSTCEHITTEST nstceHitTest, + NSTCECLICKTYPE nstceClickType) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p, 0x%x, 0x%x)\n", This, psi, nstceHitTest, nstceClickType); + return S_OK; +} + +static HRESULT WINAPI NSTCEvents_fnOnPropertyItemCommit(INameSpaceTreeControlEvents *iface, + IShellItem *psi) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p)\n", This, psi); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnItemStateChanging(INameSpaceTreeControlEvents *iface, + IShellItem *psi, + NSTCITEMSTATE nstcisMask, + NSTCITEMSTATE nstcisState) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p, 0x%x, 0x%x)\n", This, psi, nstcisMask, nstcisState); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnItemStateChanged(INameSpaceTreeControlEvents *iface, + IShellItem *psi, + NSTCITEMSTATE nstcisMask, + NSTCITEMSTATE nstcisState) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p, 0x%x, 0x%x)\n", This, psi, nstcisMask, nstcisState); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnSelectionChanged(INameSpaceTreeControlEvents *iface, + IShellItemArray *psiaSelection) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p)\n", This, psiaSelection); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnKeyboardInput(INameSpaceTreeControlEvents *iface, + UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%d, 0x%lx, 0x%lx)\n", This, uMsg, wParam, lParam); + return S_OK; +} + +static HRESULT WINAPI NSTCEvents_fnOnBeforeExpand(INameSpaceTreeControlEvents *iface, + IShellItem *psi) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p)\n", This, psi); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnAfterExpand(INameSpaceTreeControlEvents *iface, + IShellItem *psi) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p)\n", This, psi); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnBeginLabelEdit(INameSpaceTreeControlEvents *iface, + IShellItem *psi) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p)\n", This, psi); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnEndLabelEdit(INameSpaceTreeControlEvents *iface, + IShellItem *psi) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p)\n", This, psi); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnGetToolTip(INameSpaceTreeControlEvents *iface, + IShellItem *psi, LPWSTR pszTip, int cchTip) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p, %p, %d)\n", This, psi, pszTip, cchTip); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnBeforeItemDelete(INameSpaceTreeControlEvents *iface, + IShellItem *psi) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p)\n", This, psi); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnItemAdded(INameSpaceTreeControlEvents *iface, + IShellItem *psi, BOOL fIsRoot) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p, %d)\n", This, psi, fIsRoot); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnItemDeleted(INameSpaceTreeControlEvents *iface, + IShellItem *psi, BOOL fIsRoot) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p, %d)\n", This, psi, fIsRoot); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnBeforeContextMenu(INameSpaceTreeControlEvents *iface, + IShellItem *psi, REFIID riid, void **ppv) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p, %s, %p)\n", This, psi, shdebugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnAfterContextMenu(INameSpaceTreeControlEvents *iface, + IShellItem *psi, IContextMenu *pcmIn, + REFIID riid, void **ppv) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p, %p, %s, %p)\n", This, psi, pcmIn, shdebugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnBeforeStateImageChange(INameSpaceTreeControlEvents *iface, + IShellItem *psi) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p)\n", This, psi); + return E_NOTIMPL; +} + +static HRESULT WINAPI NSTCEvents_fnOnGetDefaultIconIndex(INameSpaceTreeControlEvents* iface, + IShellItem *psi, + int *piDefaultIcon, int *piOpenIcon) +{ + ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + TRACE("%p (%p, %p, %p)\n", This, psi, piDefaultIcon, piOpenIcon); + return E_NOTIMPL; +} + + +const INameSpaceTreeControlEventsVtbl vt_INameSpaceTreeControlEvents = { + NSTCEvents_fnQueryInterface, + NSTCEvents_fnAddRef, + NSTCEvents_fnRelease, + NSTCEvents_fnOnItemClick, + NSTCEvents_fnOnPropertyItemCommit, + NSTCEvents_fnOnItemStateChanging, + NSTCEvents_fnOnItemStateChanged, + NSTCEvents_fnOnSelectionChanged, + NSTCEvents_fnOnKeyboardInput, + NSTCEvents_fnOnBeforeExpand, + NSTCEvents_fnOnAfterExpand, + NSTCEvents_fnOnBeginLabelEdit, + NSTCEvents_fnOnEndLabelEdit, + NSTCEvents_fnOnGetToolTip, + NSTCEvents_fnOnBeforeItemDelete, + NSTCEvents_fnOnItemAdded, + NSTCEvents_fnOnItemDeleted, + NSTCEvents_fnOnBeforeContextMenu, + NSTCEvents_fnOnAfterContextMenu, + NSTCEvents_fnOnBeforeStateImageChange, + NSTCEvents_fnOnGetDefaultIconIndex +}; + HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { ExplorerBrowserImpl *eb; @@ -1396,6 +1618,7 @@ HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, voi eb->lpsbVtbl = &vt_IShellBrowser; eb->lpcdb3Vtbl = &vt_ICommDlgBrowser3; eb->lpowsVtbl = &vt_IObjectWithSite; + eb->lpnstceVtbl = &vt_INameSpaceTreeControlEvents; list_init(&eb->event_clients); list_init(&eb->travellog);

1 0

David Hedberg : shell32: Check for ICommDlgBrowser from site and use it in the IExplorerBrowser control .
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: ddcd619f6c23252e940b24c2fc3fa4810ff40236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddcd619f6c23252e940b24c2f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Aug 26 13:58:16 2010 +0200 shell32: Check for ICommDlgBrowser from site and use it in the IExplorerBrowser control. --- dlls/shell32/ebrowser.c | 94 ++++++++++++++++++---- dlls/shell32/tests/ebrowser.c | 174 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 247 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddcd619f6c23252e940b2…

1 0

Vincent Povirk : ole32: Cache data and block locations in BigBlockStream objects.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 89646084ba281366d69b1cd8fb168d9440cf3569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89646084ba281366d69b1cd8f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 16 17:38:14 2010 -0500 ole32: Cache data and block locations in BigBlockStream objects. --- dlls/ole32/storage32.c | 228 ++++++++++++++++++++++++++++++++++++++---------- dlls/ole32/storage32.h | 14 +++ 2 files changed, 196 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89646084ba281366d69b1…

1 0

Louis Lenders : mscoree: Improve GetRequestedRuntimeInfo.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 9ea1d13d1443568fa1bcb244d65a7316b9d90afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea1d13d1443568fa1bcb244d… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Aug 26 00:14:41 2010 +0200 mscoree: Improve GetRequestedRuntimeInfo. --- dlls/mscoree/mscoree_main.c | 32 ++++++++++++++++++++++++++++++-- dlls/mscoree/tests/mscoree.c | 8 ++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index e64f9b0..1269f9c 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "cor.h" +#include "corerror.h" #include "mscoree.h" #include "mscoree_private.h" @@ -414,10 +415,37 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) { - FIXME("(%s, %s, %s, 0x%08x, 0x%08x, %p, 0x%08x, %p, %p, 0x%08x, %p) stub\n", debugstr_w(pExe), + HRESULT ret; + DWORD ver_len, dir_len; + WCHAR dirW[MAX_PATH], verW[MAX_PATH]; + + FIXME("(%s, %s, %s, 0x%08x, 0x%08x, %p, 0x%08x, %p, %p, 0x%08x, %p) semi-stub\n", debugstr_w(pExe), debugstr_w(pwszVersion), debugstr_w(pConfigurationFile), startupFlags, runtimeInfoFlags, pDirectory, dwDirectory, dwDirectoryLength, pVersion, cchBuffer, dwlength); - return GetCORVersion(pVersion, cchBuffer, dwlength); + + if (!pwszVersion && !(runtimeInfoFlags & RUNTIME_INFO_UPGRADE_VERSION)) + return CLR_E_SHIM_RUNTIME; + + ret = GetCORSystemDirectory(dirW, dwDirectory, &dir_len); + + if (ret == S_OK) + { + if (dwDirectoryLength) + *dwDirectoryLength = dir_len; + if (pDirectory) + lstrcpyW(pDirectory, dirW); + + ret = GetCORVersion(verW, cchBuffer, &ver_len); + + if (ret == S_OK) + { + if (dwlength) + *dwlength = ver_len; + if (pVersion) + lstrcpyW(pVersion, verW); + } + } + return ret; } HRESULT WINAPI LoadLibraryShim( LPCWSTR szDllName, LPCWSTR szVersion, LPVOID pvReserved, HMODULE * phModDll) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index c8776f6..59ba58e 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -103,13 +103,13 @@ static void test_versioninfo(void) trace(" installed in directory %s is .net version %s \n", wine_dbgstr_w(path), wine_dbgstr_w(version)); /* version number NULL not allowed without RUNTIME_INFO_UPGRADE_VERSION flag */ hr = pGetRequestedRuntimeInfo( NULL, NULL, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size); - todo_wine ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); /* with RUNTIME_INFO_UPGRADE_VERSION flag and version number NULL, latest installed version is returned */ hr = pGetRequestedRuntimeInfo( NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, &size); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, 1, &path_len, version, MAX_PATH, &size); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetRequestedRuntimeInfo returned %08x\n", hr); /* if one of the buffers is NULL, the other one is still happily filled */ memset(version, 0, sizeof(version)); @@ -119,8 +119,8 @@ static void test_versioninfo(void) /* With NULL-pointer for bufferlength, the buffer itsself still gets filled with correct string */ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - todo_wine ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - todo_wine ok(!lstrcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!lstrcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); } START_TEST(mscoree)

1 0

David Hedberg : shell32: Get ExplorerPaneVisibility from site of the ExplorerBrowser control.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 555c5190aa7b7bbd03a5cff0876a72ac6c9720e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=555c5190aa7b7bbd03a5cff08… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Aug 26 13:58:17 2010 +0200 shell32: Get ExplorerPaneVisibility from site of the ExplorerBrowser control. --- dlls/shell32/ebrowser.c | 11 ++++ dlls/shell32/tests/ebrowser.c | 102 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 112 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index d7b2b3d..40d6739 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -76,6 +76,7 @@ typedef struct _ExplorerBrowserImpl { ICommDlgBrowser *pcdb_site; ICommDlgBrowser2 *pcdb2_site; ICommDlgBrowser3 *pcdb3_site; + IExplorerPaneVisibility *pepv_site; } ExplorerBrowserImpl; /************************************************************************** @@ -354,6 +355,12 @@ static void get_interfaces_from_site(ExplorerBrowserImpl *This) This->pcdb3_site = NULL; } + if(This->pepv_site) + { + IExplorerPaneVisibility_Release(This->pepv_site); + This->pepv_site = NULL; + } + if(!This->punk_site) return; @@ -372,6 +379,10 @@ static void get_interfaces_from_site(ExplorerBrowserImpl *This) IServiceProvider_QueryService(psp, &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser3, (void**)&This->pcdb3_site); + /* IExplorerPaneVisibility */ + IServiceProvider_QueryService(psp, &SID_ExplorerPaneVisibility, &IID_IExplorerPaneVisibility, + (void**)&This->pepv_site); + IServiceProvider_Release(psp); } diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 1710d93..9636c8d 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -188,6 +188,91 @@ static const IExplorerBrowserEventsVtbl ebevents = }; /********************************************************************* + * IExplorerPaneVisibility implementation + */ +typedef struct +{ + const IExplorerPaneVisibilityVtbl *lpVtbl; + LONG ref; + LONG count; + LONG np, cp, cp_o, cp_v, dp, pp, qp, aqp, unk; /* The panes */ +} IExplorerPaneVisibilityImpl; + +static HRESULT WINAPI IExplorerPaneVisibility_fnQueryInterface(IExplorerPaneVisibility *iface, + REFIID riid, LPVOID *ppvObj) +{ + ok(0, "Not called.\n"); + trace("REFIID:"); dbg_print_guid(riid); + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI IExplorerPaneVisibility_fnAddRef(IExplorerPaneVisibility *iface) +{ + IExplorerPaneVisibilityImpl *This = (IExplorerPaneVisibilityImpl *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI IExplorerPaneVisibility_fnRelease(IExplorerPaneVisibility *iface) +{ + IExplorerPaneVisibilityImpl *This = (IExplorerPaneVisibilityImpl *)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI IExplorerPaneVisibility_fnGetPaneState(IExplorerPaneVisibility *iface, + REFEXPLORERPANE ep, + EXPLORERPANESTATE *peps) +{ + IExplorerPaneVisibilityImpl *This = (IExplorerPaneVisibilityImpl *)iface; + This->count++; + + ok(ep != NULL, "ep is NULL.\n"); + ok(peps != NULL, "peps is NULL.\n"); + ok(*peps == 0, "got %d\n", *peps); + + *peps = EPS_FORCE; + if(IsEqualGUID(&EP_NavPane, ep)) This->np++; + else if(IsEqualGUID(&EP_Commands, ep)) This->cp++; + else if(IsEqualGUID(&EP_Commands_Organize, ep)) This->cp_o++; + else if(IsEqualGUID(&EP_Commands_View, ep)) This->cp_v++; + else if(IsEqualGUID(&EP_DetailsPane, ep)) This->dp++; + else if(IsEqualGUID(&EP_PreviewPane, ep)) This->pp++; + else if(IsEqualGUID(&EP_QueryPane, ep)) This->qp++; + else if(IsEqualGUID(&EP_AdvQueryPane, ep)) This->aqp++; + else + { + trace("Unknown explorer pane: "); dbg_print_guid(ep); + This->unk++; + } + + return S_OK; +} + +static const IExplorerPaneVisibilityVtbl epvvt = +{ + IExplorerPaneVisibility_fnQueryInterface, + IExplorerPaneVisibility_fnAddRef, + IExplorerPaneVisibility_fnRelease, + IExplorerPaneVisibility_fnGetPaneState +}; + +static IExplorerPaneVisibilityImpl *create_explorerpanevisibility(void) +{ + IExplorerPaneVisibilityImpl *epv; + + epv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IExplorerPaneVisibilityImpl)); + epv->lpVtbl = &epvvt; + epv->ref = 1; + + return epv; +} + +/********************************************************************* * ICommDlgBrowser3 implementation */ typedef struct @@ -787,6 +872,7 @@ static void test_SetSite(void) IExplorerBrowser *peb; IServiceProviderImpl *spimpl = create_serviceprovider(); ICommDlgBrowser3Impl *cdbimpl = create_commdlgbrowser3(); + IExplorerPaneVisibilityImpl *epvimpl = create_explorerpanevisibility(); IObjectWithSite *pow; HRESULT hr; LONG ref; @@ -800,7 +886,7 @@ static void test_SetSite(void) { &SID_STopLevelBrowser, &IID_IConnectionPointContainer, 0, NULL }, { &SID_STopLevelBrowser, &IID_IProfferService, 0, NULL }, { &SID_STopLevelBrowser, &IID_UnknownInterface9, 0, NULL }, - { &SID_ExplorerPaneVisibility, &IID_IExplorerPaneVisibility, 0, NULL }, + { &SID_ExplorerPaneVisibility, &IID_IExplorerPaneVisibility, 0, epvimpl }, { &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser2, 0, cdbimpl }, { &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser3, 0, cdbimpl }, { &IID_IFileDialogPrivate, &IID_IFileDialogPrivate, 0, NULL }, @@ -856,6 +942,7 @@ static void test_SetSite(void) IServiceProvider_Release((IServiceProvider*)spimpl); ICommDlgBrowser3_Release((ICommDlgBrowser3*)cdbimpl); + IExplorerPaneVisibility_Release((IExplorerPaneVisibility*)epvimpl); IExplorerBrowser_Destroy(peb); ref = IExplorerBrowser_Release(peb); ok(ref == 0, "Got ref %d\n", ref); @@ -885,6 +972,17 @@ static void test_SetSite(void) ok(!cdbimpl->GetCurrentFilter, "Got %d\n", cdbimpl->GetCurrentFilter); todo_wine ok(cdbimpl->OnPreviewCreated, "Got %d\n", cdbimpl->OnPreviewCreated); + /* IExplorerPaneVisibility */ + todo_wine ok(epvimpl->np, "Got %d\n", epvimpl->np); + todo_wine ok(epvimpl->cp, "Got %d\n", epvimpl->cp); + todo_wine ok(epvimpl->cp_o, "Got %d\n", epvimpl->cp_o); + todo_wine ok(epvimpl->cp_v, "Got %d\n", epvimpl->cp_v); + todo_wine ok(epvimpl->dp, "Got %d\n", epvimpl->dp); + todo_wine ok(epvimpl->pp, "Got %d\n", epvimpl->pp); + ok(!epvimpl->qp, "Got %d\n", epvimpl->qp); + ok(!epvimpl->aqp, "Got %d\n", epvimpl->aqp); + ok(!epvimpl->unk, "Got %d\n", epvimpl->unk); + if(0) { for(i = 0; expected[i].service != NULL; i++) @@ -925,6 +1023,8 @@ static void test_SetSite(void) ref = ICommDlgBrowser3_Release((ICommDlgBrowser3*)cdbimpl); ok(ref == 0, "Got ref %d\n", ref); + ref = IExplorerPaneVisibility_Release((IExplorerPaneVisibility*)epvimpl); + ok(ref == 0, "Got ref %d\n", ref); } static void test_basics(void)

1 0

Vincent Povirk : ole32: Flush before returning from any storage API call that writes.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 101de22a1a09643c43cd01e281a9fdf926b03535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101de22a1a09643c43cd01e28… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 25 14:55:21 2010 -0500 ole32: Flush before returning from any storage API call that writes. --- dlls/ole32/stg_stream.c | 7 +++++++ dlls/ole32/storage32.c | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 1fdb963..b09ba5b 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -295,6 +295,9 @@ static HRESULT WINAPI StgStreamImpl_Write( */ This->currentPosition.u.LowPart += *pcbWritten; + if (SUCCEEDED(res)) + res = StorageBaseImpl_Flush(This->parentStorage); + TRACE("<-- S_OK, written %u\n", *pcbWritten); return res; } @@ -417,6 +420,10 @@ static HRESULT WINAPI StgStreamImpl_SetSize( } hr = StorageBaseImpl_StreamSetSize(This->parentStorage, This->dirEntry, libNewSize); + + if (SUCCEEDED(hr)) + hr = StorageBaseImpl_Flush(This->parentStorage); + return hr; } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 185b8b0..21cac58 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -856,7 +856,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( return STG_E_FILENOTFOUND; } - return S_OK; + return StorageBaseImpl_Flush(This); } /************************************************************************ @@ -1011,7 +1011,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( return STG_E_INSUFFICIENTMEMORY; } - return S_OK; + return StorageBaseImpl_Flush(This); } /************************************************************************ @@ -1047,6 +1047,9 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( &currentEntry); } + if (SUCCEEDED(hRes)) + hRes = StorageBaseImpl_Flush(This); + return hRes; } @@ -1203,6 +1206,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( return hr; } + if (SUCCEEDED(hr)) + hr = StorageBaseImpl_Flush(This); return S_OK; } @@ -1916,6 +1921,9 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( if (SUCCEEDED(hr)) StorageBaseImpl_DestroyDirEntry(This, entryToDeleteRef); + if (SUCCEEDED(hr)) + hr = StorageBaseImpl_Flush(This); + return hr; }

1 0

David Hedberg : include: Fix INameSpaceTreeControlEvents interface declaration.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 479a9ee11eb391f6b40470b8a3699ee2a6bfc488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479a9ee11eb391f6b40470b8a… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Aug 26 13:58:18 2010 +0200 include: Fix INameSpaceTreeControlEvents interface declaration. --- dlls/explorerframe/tests/nstc.c | 4 +--- include/shobjidl.idl | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index d5dd5cd..c329311 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -277,9 +277,7 @@ static HRESULT WINAPI NSTCEvents_fnOnAfterContextMenu( static HRESULT WINAPI NSTCEvents_fnOnBeforeStateImageChange( INameSpaceTreeControlEvents* iface, - IShellItem *psi, - int *piDefaultIcon, - int *piOpenIcon) + IShellItem *psi) { ok(psi != NULL, "NULL IShellItem\n"); NSTCE_IMPL(iface)->count[OnBeforeStateImageChange]++; diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 82d8aaf..7e2dde2 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2213,9 +2213,7 @@ interface INameSpaceTreeControlEvents : IUnknown [out, iid_is(riid)] void **ppv); HRESULT OnBeforeStateImageChange( - [in] IShellItem *psi, - [out] int *piDefaultIcon, - [out] int *piOpenIcon); + [in] IShellItem *psi); HRESULT OnGetDefaultIconIndex( [in] IShellItem *psi,

1 0