April 2013 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dplayx: Introduce impl_from_IDirectPlayLobby3A().
by Alexandre Julliard April 12, 2013

April 12, 2013

Module: wine Branch: master Commit: 9f10f092f6e6736d2861fdcc274356e0c8e1be14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f10f092f6e6736d2861fdcc2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 11 23:50:53 2013 +0200 dplayx: Introduce impl_from_IDirectPlayLobby3A(). --- dlls/dplayx/dplobby.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 7ea3e05..f5c2e41 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -93,6 +93,11 @@ typedef struct IDirectPlayLobbyImpl DirectPlayLobbyData* dpl; } IDirectPlayLobbyImpl; +static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLobby3A *iface ) +{ + return (IDirectPlayLobbyImpl*)iface; /* What you gonna do? */ +} + /* Forward declarations of virtual tables */ static const IDirectPlayLobby3Vtbl directPlayLobby3WVT; static const IDirectPlayLobby3Vtbl directPlayLobby3AVT; @@ -497,7 +502,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddress( IDirectPlayLobby3A *if LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, const void *lpAddress, DWORD dwAddressSize, void *lpContext ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); TRACE("(%p)->(%p,%p,0x%08x,%p)\n", This, lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext ); @@ -559,7 +564,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 LPDPLENUMADDRESSTYPESCALLBACK lpEnumAddressTypeCallback, REFGUID guidSP, void *lpContext, DWORD dwFlags ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); HKEY hkResult; LPCSTR searchSubKey = "SOFTWARE\\Microsoft\\DirectPlay\\Service Providers"; @@ -711,7 +716,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_EnumLocalApplications static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayLobby3A *iface, LPDPLENUMLOCALAPPLICATIONSCALLBACK lpEnumLocalAppCallback, void *lpContext, DWORD dwFlags ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); HKEY hkResult; LPCSTR searchSubKey = "SOFTWARE\\Microsoft\\DirectPlay\\Applications"; @@ -810,7 +815,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL static HRESULT WINAPI IDirectPlayLobby3AImpl_GetConnectionSettings( IDirectPlayLobby3A *iface, DWORD dwAppID, void *lpData, DWORD *lpdwDataSize ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); HRESULT hr; TRACE("(%p)->(0x%08x,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize ); @@ -860,7 +865,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_ReceiveLobbyMessage( IDirectPlayLob DWORD dwFlags, DWORD dwAppID, DWORD *lpdwMessageFlags, void *lpData, DWORD *lpdwDataSize ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); FIXME(":stub %p %08x %08x %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData, lpdwDataSize ); return DPERR_OUTOFMEMORY; @@ -1028,7 +1033,7 @@ static BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestPro static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A *iface, DWORD dwFlags, DWORD *lpdwAppID, DPLCONNECTION *lpConn, HANDLE hReceiveEvent ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); HRESULT hr; RunApplicationEnumStruct enumData; char temp[200]; @@ -1230,7 +1235,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_SetConnectionSettings static HRESULT WINAPI IDirectPlayLobby3AImpl_SetConnectionSettings( IDirectPlayLobby3A *iface, DWORD dwFlags, DWORD dwAppID, DPLCONNECTION *lpConn ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); HRESULT hr; TRACE("(%p)->(0x%08x,0x%08x,%p)\n", This, dwFlags, dwAppID, lpConn ); @@ -1480,7 +1485,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_ConnectEx ( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, REFIID riid, LPVOID* lplpDP, IUnknown* pUnk ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface ; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); return DPL_ConnectEx( This, dwFlags, riid, lplpDP, pUnk ); }

1 0

Sergey Guralnik : user32/tests: SetWindowPos() propagates update region from WS_CLIPCHILDREN child to its children.
by Alexandre Julliard April 12, 2013

April 12, 2013

Module: wine Branch: master Commit: 108173fd09be545133a829b62777b821d01ba353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108173fd09be545133a829b62… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Apr 10 14:18:40 2013 +0300 user32/tests: SetWindowPos() propagates update region from WS_CLIPCHILDREN child to its children. --- dlls/user32/tests/win.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a977ac2..37d210e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7326,6 +7326,73 @@ static void test_map_points(void) DestroyWindow(wnd0); } +static void test_update_region(void) +{ + HWND hwnd, parent, child; + HRGN rgn1, rgn2; + const RECT rc = {15, 15, 40, 40}; + const POINT wnd_orig = {30, 20}; + const POINT child_orig = {10, 5}; + + parent = CreateWindowExA(0, "MainWindowClass", NULL, + WS_VISIBLE | WS_CLIPCHILDREN, + 0, 0, 300, 150, NULL, NULL, GetModuleHandleA(0), 0); + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, + WS_VISIBLE | WS_CLIPCHILDREN | WS_CHILD, + 0, 0, 200, 100, parent, NULL, GetModuleHandleA(0), 0); + child = CreateWindowExA(0, "MainWindowClass", NULL, + WS_VISIBLE | WS_CHILD, + child_orig.x, child_orig.y, 100, 50, + hwnd, NULL, GetModuleHandleA(0), 0); + assert(parent && hwnd && child); + + ValidateRgn(parent, NULL); + ValidateRgn(hwnd, NULL); + InvalidateRect(hwnd, &rc, FALSE); + ValidateRgn(child, NULL); + + rgn1 = CreateRectRgn(0, 0, 0, 0); + ok(GetUpdateRgn(parent, rgn1, FALSE) == NULLREGION, + "has invalid area after ValidRgn(NULL)\n"); + GetUpdateRgn(hwnd, rgn1, FALSE); + rgn2 = CreateRectRgnIndirect(&rc); + ok(EqualRgn(rgn1, rgn2), "assigned and retrieved update regions are different\n"); + ok(GetUpdateRgn(child, rgn2, FALSE) == NULLREGION, + "has invalid area after ValidRgn(NULL)\n"); + + SetWindowPos(hwnd, 0, wnd_orig.x, wnd_orig.y, 0, 0, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE); + + /* parent now has non-simple update region, it consist of + * two rects, that was exposed after hwnd moving ... */ + SetRectRgn(rgn1, 0, 0, 200, wnd_orig.y); + SetRectRgn(rgn2, 0, 0, wnd_orig.x, 100); + CombineRgn(rgn1, rgn1, rgn2, RGN_OR); + /* ... and mapped hwnd's invalid area, that hwnd has before moving */ + SetRectRgn(rgn2, rc.left + wnd_orig.x, rc.top + wnd_orig.y, + rc.right + wnd_orig.x, rc.bottom + wnd_orig.y); + CombineRgn(rgn1, rgn1, rgn2, RGN_OR); + GetUpdateRgn(parent, rgn2, FALSE); +todo_wine + ok(EqualRgn(rgn1, rgn2), "wrong update region\n"); + + /* hwnd has the same invalid region as before moving */ + SetRectRgn(rgn1, rc.left, rc.top, rc.right, rc.bottom); + GetUpdateRgn(hwnd, rgn2, FALSE); + ok(EqualRgn(rgn1, rgn2), "wrong update region\n"); + + /* hwnd's invalid area maps to child during moving */ + SetRectRgn(rgn1, rc.left - child_orig.x , rc.top - child_orig.y, + rc.right - child_orig.x, rc.bottom - child_orig.y); + GetUpdateRgn(child, rgn2, FALSE); +todo_wine + ok(EqualRgn(rgn1, rgn2), "wrong update region\n"); + + DeleteObject(rgn1); + DeleteObject(rgn2); + DestroyWindow(parent); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -7435,6 +7502,7 @@ START_TEST(win) test_handles( hwndMain ); test_winregion(); test_map_points(); + test_update_region(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Michael Stefaniuc : dplayx: Cleanup the DirectPlayLobby object creation.
by Alexandre Julliard April 12, 2013

April 12, 2013

Module: wine Branch: master Commit: dc89f4faa5aef327622904d6683130759e19fc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc89f4faa5aef327622904d66… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 11 23:56:31 2013 +0200 dplayx: Cleanup the DirectPlayLobby object creation. --- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dplay_global.h | 2 +- dlls/dplayx/dplobby.c | 119 +++++++++++------------------------------ 3 files changed, 34 insertions(+), 89 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index c64c5fc..6accab6 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -102,7 +102,7 @@ static const IClassFactoryVtbl cf_vt = { }; static IClassFactoryImpl dplay_cf = {{&cf_vt}, dplay_create}; -static IClassFactoryImpl dplaylobby_cf = {{&cf_vt}, DPL_CreateInterface}; +static IClassFactoryImpl dplaylobby_cf = {{&cf_vt}, dplobby_create}; /******************************************************************************* diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 1255519..7fde277 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -207,7 +207,7 @@ extern HRESULT DP_SetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void *l extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN; extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; -extern HRESULT DPL_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN; +extern HRESULT dplobby_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; extern HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; extern HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 9cffd56..12444cc 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -98,10 +98,6 @@ static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLob return CONTAINING_RECORD( iface, IDirectPlayLobbyImpl, IDirectPlayLobby3A_iface ); } -/* Forward declarations of virtual tables */ -static const IDirectPlayLobby3Vtbl directPlayLobby3WVT; -static const IDirectPlayLobby3Vtbl directPlayLobby3AVT; - static BOOL DPL_CreateLobby1( LPVOID lpDPL ) { IDirectPlayLobbyAImpl *This = lpDPL; @@ -134,76 +130,6 @@ static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) return TRUE; } - -/* The COM interface for upversioning an interface - * We've been given a GUID (riid) and we need to replace the present - * interface with that of the requested interface. - * - * Snip from some Microsoft document: - * There are four requirements for implementations of QueryInterface (In these - * cases, "must succeed" means "must succeed barring catastrophic failure."): - * - * * The set of interfaces accessible on an object through - * IUnknown::QueryInterface must be static, not dynamic. This means that - * if a call to QueryInterface for a pointer to a specified interface - * succeeds the first time, it must succeed again, and if it fails the - * first time, it must fail on all subsequent queries. - * * It must be symmetric ~W if a client holds a pointer to an interface on - * an object, and queries for that interface, the call must succeed. - * * It must be reflexive ~W if a client holding a pointer to one interface - * queries successfully for another, a query through the obtained pointer - * for the first interface must succeed. - * * It must be transitive ~W if a client holding a pointer to one interface - * queries successfully for a second, and through that pointer queries - * successfully for a third interface, a query for the first interface - * through the pointer for the third interface must succeed. - */ -HRESULT DPL_CreateInterface - ( REFIID riid, LPVOID* ppvObj ) -{ - IDirectPlayLobbyImpl *This; - - TRACE( " for %s\n", debugstr_guid( riid ) ); - - This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *This ) ); - if ( !This ) - return DPERR_OUTOFMEMORY; - - This->IDirectPlayLobby3_iface.lpVtbl = &directPlayLobby3WVT; - This->IDirectPlayLobby3A_iface.lpVtbl = &directPlayLobby3AVT; - - if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) || - IsEqualGUID( &IID_IDirectPlayLobby2, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) - *ppvObj = &This->IDirectPlayLobby3_iface; - else if ( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) || - IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) - *ppvObj = &This->IDirectPlayLobby3A_iface; - else - { - /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return E_NOINTERFACE; - } - - /* Initialize it */ - if ( DPL_CreateLobby1( This ) ) - { - InitializeCriticalSection( &This->lock ); - This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayLobbyImpl.lock"); - IDirectPlayLobby_AddRef( (LPDIRECTPLAYLOBBY)*ppvObj ); - return S_OK; - } - - /* Initialize failed, destroy it */ - DPL_DestroyLobby1( This ); - HeapFree( GetProcessHeap(), 0, This ); - - *ppvObj = NULL; - return DPERR_NOMEMORY; -} - static HRESULT WINAPI DPL_QueryInterface( IDirectPlayLobbyImpl *This, REFIID riid, void **ppvObj ) { TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); @@ -1526,7 +1452,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings } -static const IDirectPlayLobby3Vtbl directPlayLobby3AVT = +static const IDirectPlayLobby3Vtbl dpl3A_vt = { IDirectPlayLobby3AImpl_QueryInterface, IDirectPlayLobby3AImpl_AddRef, @@ -1552,13 +1478,9 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT = /* Direct Play Lobby 3 (unicode) Virtual Table for methods */ /* Note: Hack so we can reuse the old functions without compiler warnings */ -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobby3WVT.fun)) -#else # define XCAST(fun) (void*) -#endif -static const IDirectPlayLobby3Vtbl directPlayLobby3WVT = +static const IDirectPlayLobby3Vtbl dpl3_vt = { IDirectPlayLobby3Impl_QueryInterface, IDirectPlayLobby3Impl_AddRef, @@ -1584,12 +1506,35 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3WVT = }; #undef XCAST +HRESULT dplobby_create( REFIID riid, void **ppv ) +{ + IDirectPlayLobbyImpl *obj; + HRESULT hr; + + TRACE( "(%s, %p)\n", debugstr_guid( riid ), ppv ); + + *ppv = NULL; + obj = HeapAlloc( GetProcessHeap(), 0, sizeof( *obj ) ); + if ( !obj ) + return DPERR_OUTOFMEMORY; + + obj->IDirectPlayLobby3_iface.lpVtbl = &dpl3_vt; + obj->IDirectPlayLobby3A_iface.lpVtbl = &dpl3A_vt; + obj->ulInterfaceRef = 1; + + InitializeCriticalSection( &obj->lock ); + obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayLobbyImpl.lock"); + + if ( DPL_CreateLobby1( obj ) ) + hr = IDirectPlayLobby_QueryInterface( &obj->IDirectPlayLobby3_iface, riid, ppv ); + else + hr = DPERR_NOMEMORY; + IDirectPlayLobby_Release( &obj->IDirectPlayLobby3_iface ); + + return hr; +} + -/********************************************************* - * - * Direct Play Lobby Interface Implementation - * - *********************************************************/ /*************************************************************************** * DirectPlayLobbyCreateA (DPLAYX.4) @@ -1620,7 +1565,7 @@ HRESULT WINAPI DirectPlayLobbyCreateA( LPGUID lpGUIDDSP, return CLASS_E_NOAGGREGATION; } - return DPL_CreateInterface( &IID_IDirectPlayLobbyA, (void**)lplpDPL ); + return dplobby_create( &IID_IDirectPlayLobbyA, (void**)lplpDPL ); } /*************************************************************************** @@ -1653,5 +1598,5 @@ HRESULT WINAPI DirectPlayLobbyCreateW( LPGUID lpGUIDDSP, return CLASS_E_NOAGGREGATION; } - return DPL_CreateInterface( &IID_IDirectPlayLobby, (void**)lplpDPL ); + return dplobby_create( &IID_IDirectPlayLobby, (void**)lplpDPL ); }

1 0

Michael Stefaniuc : dplayx: Move the lock into the DirectPlayLobby object.
by Alexandre Julliard April 12, 2013

April 12, 2013

Module: wine Branch: master Commit: d6345bacdcb2cd98a0d9f46f4c8760cdeac88a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6345bacdcb2cd98a0d9f46f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 11 23:54:45 2013 +0200 dplayx: Move the lock into the DirectPlayLobby object. --- dlls/dplayx/dplobby.c | 72 ++++++++++++++---------------------------------- 1 files changed, 21 insertions(+), 51 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 1335a6d..9cffd56 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -72,11 +72,6 @@ struct DPLMSG }; typedef struct DPLMSG* LPDPLMSG; -typedef struct tagDirectPlayLobbyIUnknownData -{ - CRITICAL_SECTION DPL_lock; -} DirectPlayLobbyIUnknownData; - typedef struct tagDirectPlayLobbyData { HKEY hkCallbackKeyHack; @@ -89,7 +84,7 @@ typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3 IDirectPlayLobby3_iface; IDirectPlayLobby3A IDirectPlayLobby3A_iface; LONG ulInterfaceRef; - DirectPlayLobbyIUnknownData* unk; + CRITICAL_SECTION lock; DirectPlayLobbyData* dpl; } IDirectPlayLobbyImpl; @@ -107,33 +102,6 @@ static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLob static const IDirectPlayLobby3Vtbl directPlayLobby3WVT; static const IDirectPlayLobby3Vtbl directPlayLobby3AVT; -static BOOL DPL_CreateIUnknown( LPVOID lpDPL ) -{ - IDirectPlayLobbyAImpl *This = lpDPL; - - This->unk = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->unk) ) ); - if ( This->unk == NULL ) - { - return FALSE; - } - - InitializeCriticalSection( &This->unk->DPL_lock ); - This->unk->DPL_lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayLobbyAImpl*->DirectPlayLobbyIUnknownData*->DPL_lock"); - - return TRUE; -} - -static BOOL DPL_DestroyIUnknown( LPVOID lpDPL ) -{ - IDirectPlayLobbyAImpl *This = lpDPL; - - This->unk->DPL_lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &This->unk->DPL_lock ); - HeapFree( GetProcessHeap(), 0, This->unk ); - - return TRUE; -} - static BOOL DPL_CreateLobby1( LPVOID lpDPL ) { IDirectPlayLobbyAImpl *This = lpDPL; @@ -220,15 +188,16 @@ HRESULT DPL_CreateInterface } /* Initialize it */ - if ( DPL_CreateIUnknown( This ) && DPL_CreateLobby1( This ) ) + if ( DPL_CreateLobby1( This ) ) { + InitializeCriticalSection( &This->lock ); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayLobbyImpl.lock"); IDirectPlayLobby_AddRef( (LPDIRECTPLAYLOBBY)*ppvObj ); return S_OK; } /* Initialize failed, destroy it */ DPL_DestroyLobby1( This ); - DPL_DestroyIUnknown( This ); HeapFree( GetProcessHeap(), 0, This ); *ppvObj = NULL; @@ -285,7 +254,8 @@ static ULONG WINAPI DPL_Release( IDirectPlayLobbyImpl *This ) if( ulInterfaceRefCount == 0 ) { DPL_DestroyLobby1( This ); - DPL_DestroyIUnknown( This ); + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &This->lock ); HeapFree( GetProcessHeap(), 0, This ); } @@ -790,17 +760,17 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL dplAppInfo.guidApplication = serviceProviderGUID; dplAppInfo.u.lpszAppNameA = subKeyName; - EnterCriticalSection( &This->unk->DPL_lock ); + EnterCriticalSection( &This->lock ); memcpy( &This->dpl->hkCallbackKeyHack, &hkServiceProvider, sizeof( hkServiceProvider ) ); if( !lpEnumLocalAppCallback( &dplAppInfo, lpContext, dwFlags ) ) { - LeaveCriticalSection( &This->unk->DPL_lock ); + LeaveCriticalSection( &This->lock ); break; } - LeaveCriticalSection( &This->unk->DPL_lock ); + LeaveCriticalSection( &This->lock ); } return DP_OK; @@ -824,14 +794,14 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_GetConnectionSettings( IDirectPlayL TRACE("(%p)->(0x%08x,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize ); - EnterCriticalSection( &This->unk->DPL_lock ); + EnterCriticalSection( &This->lock ); hr = DPLAYX_GetConnectionSettingsA( dwAppID, lpData, lpdwDataSize ); - LeaveCriticalSection( &This->unk->DPL_lock ); + LeaveCriticalSection( &This->lock ); return hr; } @@ -847,14 +817,14 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_GetConnectionSettings TRACE("(%p)->(0x%08x,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize ); - EnterCriticalSection( &This->unk->DPL_lock ); + EnterCriticalSection( &This->lock ); hr = DPLAYX_GetConnectionSettingsW( dwAppID, lpData, lpdwDataSize ); - LeaveCriticalSection( &This->unk->DPL_lock ); + LeaveCriticalSection( &This->lock ); return hr; } @@ -1060,7 +1030,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A FIXME( "Waiting lobby not being handled correctly\n" ); } - EnterCriticalSection( &This->unk->DPL_lock ); + EnterCriticalSection( &This->lock ); ZeroMemory( &enumData, sizeof( enumData ) ); enumData.This = This; @@ -1111,7 +1081,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A HeapFree( GetProcessHeap(), 0, enumData.lpszCommandLine ); HeapFree( GetProcessHeap(), 0, enumData.lpszCurrentDirectory ); - LeaveCriticalSection( &This->unk->DPL_lock ); + LeaveCriticalSection( &This->lock ); return DPERR_CANTCREATEPROCESS; } @@ -1131,7 +1101,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A if( hr != DP_OK ) { ERR( "SetConnectionSettings failure %s\n", DPLAYX_HresultToString( hr ) ); - LeaveCriticalSection( &This->unk->DPL_lock ); + LeaveCriticalSection( &This->lock ); return hr; } @@ -1146,7 +1116,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A DPLAYX_SetLobbyMsgThreadId( newProcessInfo.dwProcessId, This->dpl->dwMsgThread ); - LeaveCriticalSection( &This->unk->DPL_lock ); + LeaveCriticalSection( &This->lock ); /* Everything seems to have been set correctly, update the dwAppID */ *lpdwAppID = newProcessInfo.dwProcessId; @@ -1213,7 +1183,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_SetConnectionSettings TRACE("(%p)->(0x%08x,0x%08x,%p)\n", This, dwFlags, dwAppID, lpConn ); - EnterCriticalSection( &This->unk->DPL_lock ); + EnterCriticalSection( &This->lock ); hr = DPLAYX_SetConnectionSettingsW( dwFlags, dwAppID, lpConn ); @@ -1231,7 +1201,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_SetConnectionSettings hr = DPLAYX_SetConnectionSettingsW( dwFlags, dwAppID, lpConn ); } - LeaveCriticalSection( &This->unk->DPL_lock ); + LeaveCriticalSection( &This->lock ); return hr; } @@ -1244,7 +1214,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_SetConnectionSettings( IDirectPlayL TRACE("(%p)->(0x%08x,0x%08x,%p)\n", This, dwFlags, dwAppID, lpConn ); - EnterCriticalSection( &This->unk->DPL_lock ); + EnterCriticalSection( &This->lock ); hr = DPLAYX_SetConnectionSettingsA( dwFlags, dwAppID, lpConn ); @@ -1259,7 +1229,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_SetConnectionSettings( IDirectPlayL hr = DPLAYX_SetConnectionSettingsA( dwFlags, dwAppID, lpConn ); } - LeaveCriticalSection( &This->unk->DPL_lock ); + LeaveCriticalSection( &This->lock ); return hr; }

1 0

Michael Stefaniuc : dplayx: Add both interfaces to the DirectPlayLobby object and stop cloning the object .
by Alexandre Julliard April 12, 2013

April 12, 2013

Module: wine Branch: master Commit: 1e22d293039ed284475ffe454c165d04997a319d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e22d293039ed284475ffe454… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 11 23:53:38 2013 +0200 dplayx: Add both interfaces to the DirectPlayLobby object and stop cloning the object. --- dlls/dplayx/dplobby.c | 79 +++++++++++++------------------------------ dlls/dplayx/tests/dplayx.c | 1 + 2 files changed, 25 insertions(+), 55 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 54d55d3..1335a6d 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -74,7 +74,6 @@ typedef struct DPLMSG* LPDPLMSG; typedef struct tagDirectPlayLobbyIUnknownData { - LONG ulObjRef; CRITICAL_SECTION DPL_lock; } DirectPlayLobbyIUnknownData; @@ -87,7 +86,8 @@ typedef struct tagDirectPlayLobbyData typedef struct IDirectPlayLobbyImpl { - const void *lpVtbl; + IDirectPlayLobby3 IDirectPlayLobby3_iface; + IDirectPlayLobby3A IDirectPlayLobby3A_iface; LONG ulInterfaceRef; DirectPlayLobbyIUnknownData* unk; DirectPlayLobbyData* dpl; @@ -95,12 +95,12 @@ typedef struct IDirectPlayLobbyImpl static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3( IDirectPlayLobby3 *iface ) { - return (IDirectPlayLobbyImpl*)iface; /* What you gonna do? */ + return CONTAINING_RECORD( iface, IDirectPlayLobbyImpl, IDirectPlayLobby3_iface ); } static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLobby3A *iface ) { - return (IDirectPlayLobbyImpl*)iface; /* What you gonna do? */ + return CONTAINING_RECORD( iface, IDirectPlayLobbyImpl, IDirectPlayLobby3A_iface ); } /* Forward declarations of virtual tables */ @@ -201,12 +201,15 @@ HRESULT DPL_CreateInterface if ( !This ) return DPERR_OUTOFMEMORY; + This->IDirectPlayLobby3_iface.lpVtbl = &directPlayLobby3WVT; + This->IDirectPlayLobby3A_iface.lpVtbl = &directPlayLobby3AVT; + if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) || IsEqualGUID( &IID_IDirectPlayLobby2, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) - This->lpVtbl = &directPlayLobby3WVT; + *ppvObj = &This->IDirectPlayLobby3_iface; else if ( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) || IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) - This->lpVtbl = &directPlayLobby3AVT; + *ppvObj = &This->IDirectPlayLobby3A_iface; else { /* Unsupported interface */ @@ -217,19 +220,16 @@ HRESULT DPL_CreateInterface } /* Initialize it */ - *ppvObj = This; - if ( DPL_CreateIUnknown( *ppvObj ) && - DPL_CreateLobby1( *ppvObj ) - ) + if ( DPL_CreateIUnknown( This ) && DPL_CreateLobby1( This ) ) { IDirectPlayLobby_AddRef( (LPDIRECTPLAYLOBBY)*ppvObj ); return S_OK; } /* Initialize failed, destroy it */ - DPL_DestroyLobby1( *ppvObj ); - DPL_DestroyIUnknown( *ppvObj ); - HeapFree( GetProcessHeap(), 0, *ppvObj ); + DPL_DestroyLobby1( This ); + DPL_DestroyIUnknown( This ); + HeapFree( GetProcessHeap(), 0, This ); *ppvObj = NULL; return DPERR_NOMEMORY; @@ -239,35 +239,16 @@ static HRESULT WINAPI DPL_QueryInterface( IDirectPlayLobbyImpl *This, REFIID rii { TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( *This ) ); - - if( *ppvObj == NULL ) - { - return DPERR_OUTOFMEMORY; - } - - CopyMemory( *ppvObj, This, sizeof( *This ) ); - (*(IDirectPlayLobbyAImpl**)ppvObj)->ulInterfaceRef = 0; - if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) || IsEqualGUID( &IID_IDirectPlayLobby2, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) - { - IDirectPlayLobby3WImpl *This = *ppvObj; - This->lpVtbl = &directPlayLobby3WVT; - } + *ppvObj = &This->IDirectPlayLobby3_iface; else if ( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) || IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) - { - IDirectPlayLobby3AImpl *This = *ppvObj; - This->lpVtbl = &directPlayLobby3AVT; - } + *ppvObj = &This->IDirectPlayLobby3A_iface; else { /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); *ppvObj = NULL; - return E_NOINTERFACE; } @@ -282,15 +263,11 @@ static HRESULT WINAPI DPL_QueryInterface( IDirectPlayLobbyImpl *This, REFIID rii */ static ULONG WINAPI DPL_AddRef( IDirectPlayLobbyImpl *This ) { - ULONG ulInterfaceRefCount, ulObjRefCount; - - ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); - ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); + ULONG ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); - TRACE( "ref count incremented to %u:%u for %p\n", - ulInterfaceRefCount, ulObjRefCount, This ); + TRACE( "ref count incremented to %u for %p\n", ulInterfaceRefCount, This ); - return ulObjRefCount; + return ulInterfaceRefCount; } /* @@ -300,24 +277,16 @@ static ULONG WINAPI DPL_AddRef( IDirectPlayLobbyImpl *This ) */ static ULONG WINAPI DPL_Release( IDirectPlayLobbyImpl *This ) { - ULONG ulInterfaceRefCount, ulObjRefCount; - - ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); - ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); + ULONG ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); - TRACE( "ref count decremented to %u:%u for %p\n", - ulInterfaceRefCount, ulObjRefCount, This ); + TRACE( "ref count decremented to %u for %p\n", ulInterfaceRefCount, This ); /* Deallocate if this is the last reference to the object */ - if( ulObjRefCount == 0 ) + if( ulInterfaceRefCount == 0 ) { DPL_DestroyLobby1( This ); DPL_DestroyIUnknown( This ); - } - - if( ulInterfaceRefCount == 0 ) - { - HeapFree( GetProcessHeap(), 0, This ); + HeapFree( GetProcessHeap(), 0, This ); } return ulInterfaceRefCount; @@ -403,7 +372,7 @@ static HRESULT DPL_ConnectEx } /* FIXME: Is it safe/correct to use appID of 0? */ - hr = IDirectPlayLobby_GetConnectionSettings( (LPDIRECTPLAYLOBBY)This, + hr = IDirectPlayLobby_GetConnectionSettings( &This->IDirectPlayLobby3_iface, 0, NULL, &dwConnSize ); if( hr != DPERR_BUFFERTOOSMALL ) { @@ -418,7 +387,7 @@ static HRESULT DPL_ConnectEx } /* FIXME: Is it safe/correct to use appID of 0? */ - hr = IDirectPlayLobby_GetConnectionSettings( (LPDIRECTPLAYLOBBY)This, + hr = IDirectPlayLobby_GetConnectionSettings( &This->IDirectPlayLobby3_iface, 0, lpConn, &dwConnSize ); if( FAILED( hr ) ) { diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 1b871d0..6ed864c 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6526,6 +6526,7 @@ static void test_COM_dplobby(void) IDirectPlayLobby_Release(dpl3A); IDirectPlayLobby_Release(dpl2); IDirectPlayLobby_Release(dpl2A); + IDirectPlayLobby_Release(dplA); IDirectPlayLobby_Release(dpl); refcount = IDirectPlayLobby_Release(dpl); ok(refcount == 0, "refcount == %u, expected 0\n", refcount);

1 0

Michael Stefaniuc : dplayx: Use separate QueryInterface, AddRef and Release methods for IDirectPlayLobby3 + 3A.
by Alexandre Julliard April 12, 2013

April 12, 2013

Module: wine Branch: master Commit: 91ae663c5917956fe78b67aca1b58738775cf814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ae663c5917956fe78b67aca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 11 23:52:18 2013 +0200 dplayx: Use separate QueryInterface, AddRef and Release methods for IDirectPlayLobby3 + 3A. --- dlls/dplayx/dplobby.c | 81 +++++++++++++++++++++++++++++++----------------- 1 files changed, 52 insertions(+), 29 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index f5c2e41..54d55d3 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -93,6 +93,11 @@ typedef struct IDirectPlayLobbyImpl DirectPlayLobbyData* dpl; } IDirectPlayLobbyImpl; +static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3( IDirectPlayLobby3 *iface ) +{ + return (IDirectPlayLobbyImpl*)iface; /* What you gonna do? */ +} + static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLobby3A *iface ) { return (IDirectPlayLobbyImpl*)iface; /* What you gonna do? */ @@ -230,12 +235,8 @@ HRESULT DPL_CreateInterface return DPERR_NOMEMORY; } -static HRESULT WINAPI DPL_QueryInterface -( LPDIRECTPLAYLOBBYA iface, - REFIID riid, - LPVOID* ppvObj ) +static HRESULT WINAPI DPL_QueryInterface( IDirectPlayLobbyImpl *This, REFIID riid, void **ppvObj ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -279,11 +280,9 @@ static HRESULT WINAPI DPL_QueryInterface * Simple procedure. Just increment the reference count to this * structure and return the new reference count. */ -static ULONG WINAPI DPL_AddRef -( LPDIRECTPLAYLOBBY iface ) +static ULONG WINAPI DPL_AddRef( IDirectPlayLobbyImpl *This ) { ULONG ulInterfaceRefCount, ulObjRefCount; - IDirectPlayLobbyWImpl *This = (IDirectPlayLobbyWImpl *)iface; ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); @@ -299,11 +298,9 @@ static ULONG WINAPI DPL_AddRef * If the object no longer has any reference counts, free up the associated * memory. */ -static ULONG WINAPI DPL_Release -( LPDIRECTPLAYLOBBYA iface ) +static ULONG WINAPI DPL_Release( IDirectPlayLobbyImpl *This ) { ULONG ulInterfaceRefCount, ulObjRefCount; - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); @@ -326,6 +323,44 @@ static ULONG WINAPI DPL_Release return ulInterfaceRefCount; } +static HRESULT WINAPI IDirectPlayLobby3AImpl_QueryInterface( IDirectPlayLobby3A *iface, REFIID riid, + void **ppv ) +{ + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); + return DPL_QueryInterface( This, riid, ppv ); +} + +static HRESULT WINAPI IDirectPlayLobby3Impl_QueryInterface( IDirectPlayLobby3 *iface, REFIID riid, + void **ppv ) +{ + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); + return DPL_QueryInterface( This, riid, ppv ); +} + +static ULONG WINAPI IDirectPlayLobby3AImpl_AddRef(IDirectPlayLobby3A *iface) +{ + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); + return DPL_AddRef( This ); +} + +static ULONG WINAPI IDirectPlayLobby3Impl_AddRef(IDirectPlayLobby3 *iface) +{ + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); + return DPL_AddRef( This ); +} + +static ULONG WINAPI IDirectPlayLobby3AImpl_Release(IDirectPlayLobby3A *iface) +{ + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); + return DPL_Release( This ); +} + +static ULONG WINAPI IDirectPlayLobby3Impl_Release(IDirectPlayLobby3 *iface) +{ + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); + return DPL_Release( This ); +} + /******************************************************************** * @@ -1552,21 +1587,11 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings } -/* Direct Play Lobby 3 (ascii) Virtual Table for methods */ - -/* Note: Hack so we can reuse the old functions without compiler warnings */ -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobby3AVT.fun)) -#else -# define XCAST(fun) (void*) -#endif - static const IDirectPlayLobby3Vtbl directPlayLobby3AVT = { - XCAST(QueryInterface)DPL_QueryInterface, - XCAST(AddRef)DPL_AddRef, - XCAST(Release)DPL_Release, - + IDirectPlayLobby3AImpl_QueryInterface, + IDirectPlayLobby3AImpl_AddRef, + IDirectPlayLobby3AImpl_Release, IDirectPlayLobby3AImpl_Connect, IDirectPlayLobby3AImpl_CreateAddress, IDirectPlayLobby3AImpl_EnumAddress, @@ -1584,7 +1609,6 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT = IDirectPlayLobby3AImpl_UnregisterApplication, IDirectPlayLobby3AImpl_WaitForConnectionSettings }; -#undef XCAST /* Direct Play Lobby 3 (unicode) Virtual Table for methods */ @@ -1597,10 +1621,9 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT = static const IDirectPlayLobby3Vtbl directPlayLobby3WVT = { - XCAST(QueryInterface)DPL_QueryInterface, - XCAST(AddRef)DPL_AddRef, - XCAST(Release)DPL_Release, - + IDirectPlayLobby3Impl_QueryInterface, + IDirectPlayLobby3Impl_AddRef, + IDirectPlayLobby3Impl_Release, IDirectPlayLobby3Impl_Connect, XCAST(CreateAddress)IDirectPlayLobbyWImpl_CreateAddress, XCAST(EnumAddress)IDirectPlayLobbyWImpl_EnumAddress,

1 0

Dmitry Timoshkov : kernel32: Add a test for threads state when a process is being terminated.
by Alexandre Julliard April 12, 2013

April 12, 2013

Module: wine Branch: master Commit: 521cf664d3172f948ae1eacb2ffbc9c2948539f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521cf664d3172f948ae1eacb2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 12 18:00:58 2013 +0900 kernel32: Add a test for threads state when a process is being terminated. --- dlls/kernel32/tests/loader.c | 459 +++++++++++++++++++++++++++++++++++++++++- include/wine/test.h | 6 + 2 files changed, 462 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=521cf664d3172f948ae1e…

1 0

Jacek Caban : mshtml: Added parser compatMode tests.
by Alexandre Julliard April 12, 2013

April 12, 2013

Module: wine Branch: master Commit: c54a989430d71db763c06eec4083dc22a1d21f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54a989430d71db763c06eec4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 12 15:07:17 2013 +0200 mshtml: Added parser compatMode tests. --- dlls/mshtml/tests/dom.c | 56 +++++++++++++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5bd0ff1..5cb0a94 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -781,6 +781,17 @@ static IHTMLDOMNode2 *_get_node2_iface(unsigned line, IUnknown *unk) return node; } +#define get_htmldoc5_iface(u) _get_htmldoc5_iface(__LINE__,u) +static IHTMLDocument5 *_get_htmldoc5_iface(unsigned line, IUnknown *unk) +{ + IHTMLDocument5 *doc; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument5, (void**)&doc); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument5: %08x\n", hres); + return doc; +} + #define get_img_iface(u) _get_img_iface(__LINE__,u) static IHTMLImgElement *_get_img_iface(unsigned line, IUnknown *unk) { @@ -4478,22 +4489,18 @@ static void test_txtrange2(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); } -static void test_compatmode(IHTMLDocument2 *doc) +#define test_compatmode(a,b) _test_compatmode(__LINE__,a,b) +static void _test_compatmode(unsigned line, IHTMLDocument2 *doc2, const char *excompat) { - IHTMLDocument5 *doc5; - BSTR mode; + IHTMLDocument5 *doc = get_htmldoc5_iface((IUnknown*)doc2); + BSTR str; HRESULT hres; - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); - ok(hres == S_OK, "Could not get IHTMLDocument5 interface: %08x\n", hres); - if(FAILED(hres)) - return; + hres = IHTMLDocument5_get_compatMode(doc, &str); + ok_(__FILE__,line)(hres == S_OK, "get_compatMode failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, excompat), "compatMode = %s, expected %s\n", wine_dbgstr_w(str), excompat); - hres = IHTMLDocument5_get_compatMode(doc5, &mode); - IHTMLDocument5_Release(doc5); - ok(hres == S_OK, "get_compatMode failed: %08x\n", hres); - ok(!strcmp_wa(mode, "BackCompat"), "compatMode=%s\n", wine_dbgstr_w(mode)); - SysFreeString(mode); + IHTMLDocument5_Release(doc); } static void test_location(IHTMLDocument2 *doc) @@ -5313,7 +5320,7 @@ static void test_defaults(IHTMLDocument2 *doc) SysFreeString(str); test_window(doc); - test_compatmode(doc); + test_compatmode(doc, "BackCompat"); test_location(doc); test_navigator(doc); test_plugins_col(doc); @@ -6652,9 +6659,8 @@ static void test_create_elems(IHTMLDocument2 *doc) test_elem_innertext(body, "insert test Test"); IHTMLDOMNode_Release(node); - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); - if(hres == S_OK) - { + doc5 = get_htmldoc5_iface((IUnknown*)doc); + if(doc5) { str = a2bstr("testing"); hres = IHTMLDocument5_createComment(doc5, str, &comment); SysFreeString(str); @@ -7168,6 +7174,16 @@ static void test_docfrag(IHTMLDocument2 *doc) IHTMLDocument2_Release(frag); } +static void check_quirks_mode(IHTMLDocument2 *doc) +{ + test_compatmode(doc, "BackCompat"); +} + +static void check_strict_mode(IHTMLDocument2 *doc) +{ + test_compatmode(doc, "CSS1Compat"); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -7299,6 +7315,12 @@ static void run_domtest(const char *str, domtest_t test) "ref = %d\n", ref); } +static void test_quirks_mode(void) +{ + run_domtest("<html></html>", check_quirks_mode); + run_domtest("<!DOCTYPE html>\n<html></html>", check_strict_mode); +} + START_TEST(dom) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -7329,5 +7351,7 @@ START_TEST(dom) run_domtest(doc_blank, test_replacechild_elems); run_domtest(doctype_str, test_doctype); + test_quirks_mode(); + CoUninitialize(); }

1 0

Piotr Caban : msvcrt: Add forwards to __pioinfo structure.
by Alexandre Julliard April 12, 2013

April 12, 2013

Module: wine Branch: master Commit: 3f39f69f41721d51dfa42dc435d643dd3b8bb508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f39f69f41721d51dfa42dc43… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 12 12:42:45 2013 +0200 msvcrt: Add forwards to __pioinfo structure. --- dlls/msvcr100/msvcr100.spec | 3 ++- dlls/msvcr110/msvcr110.spec | 3 ++- dlls/msvcr80/msvcr80.spec | 3 ++- dlls/msvcr90/msvcr90.spec | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1531da9..1982668 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -644,7 +644,8 @@ @ cdecl __p__wenviron() msvcrt.__p__wenviron @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pctype_func() msvcrt.__pctype_func -### extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size +#FIXME: add correct __pioinfo implementation +@ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ stub __report_gsfailure diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c851928..62631f7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -997,7 +997,8 @@ @ cdecl __p__wenviron() msvcrt.__p__wenviron @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pctype_func() msvcrt.__pctype_func -### extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size +#FIXME: add correct __pioinfo implementation +@ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ stub __report_gsfailure diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e33c694..fb76449 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -284,7 +284,8 @@ @ cdecl __p__winver() msvcrt.__p__winver @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pctype_func() msvcrt.__pctype_func -### extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size +#FIXME: add correct __pioinfo implementation +@ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ stub __report_gsfailure diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fb549cf..aec46f7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -276,7 +276,8 @@ @ cdecl __p__wenviron() msvcrt.__p__wenviron @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pctype_func() msvcrt.__pctype_func -### extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size +#FIXME: add correct __pioinfo implementation +@ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ stub __report_gsfailure

1 0

Dmitry Timoshkov : kernel32: Add a shared memory test.
by Alexandre Julliard April 12, 2013

April 12, 2013

Module: wine Branch: master Commit: 54e2211db07d4036121a397040bb2b8c9177977b URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e2211db07d4036121a39704… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 12 18:00:10 2013 +0900 kernel32: Add a shared memory test. --- dlls/kernel32/tests/virtual.c | 48 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d02ca34..c0c1a89 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2386,6 +2386,48 @@ static void test_mapping(void) DeleteFile(file_name); } +static void test_shared_memory(int is_child) +{ + HANDLE mapping; + LONG *p; + + SetLastError(0xdeadbef); + mapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "winetest_virtual.c"); + ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); + if (is_child) + ok(GetLastError() == ERROR_ALREADY_EXISTS, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + + SetLastError(0xdeadbef); + p = MapViewOfFile(mapping, FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, 4096); + ok(p != NULL, "MapViewOfFile error %d\n", GetLastError()); + + if (is_child) + { + ok(*p == 0x1a2b3c4d, "expected 0x1a2b3c4d in child, got %#x\n", *p); + } + else + { + char **argv; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFO si = { sizeof(si) }; + DWORD ret; + + *p = 0x1a2b3c4d; + + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" virtual sharedmem", argv[0]); + ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); + winetest_wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } + + UnmapViewOfFile(p); + CloseHandle(mapping); +} + START_TEST(virtual) { int argc; @@ -2399,6 +2441,11 @@ START_TEST(virtual) Sleep(5000); /* spawned process runs for at most 5 seconds */ return; } + if (!strcmp(argv[2], "sharedmem")) + { + test_shared_memory(1); + return; + } while (1) { void *mem; @@ -2424,6 +2471,7 @@ START_TEST(virtual) pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtMapViewOfSection"); pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection"); + test_shared_memory(0); test_mapping(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection();

1 0