wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Alexandre Julliard : winex11: Try harder to ignore broken raw motions events caused by pointer warping.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: adb86c5f2a2584dc8131b08d26aef7c82910d0b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb86c5f2a2584dc8131b08d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 19:31:05 2011 +0200 winex11: Try harder to ignore broken raw motions events caused by pointer warping. --- dlls/winex11.drv/mouse.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8456d67..0ff701f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1220,9 +1220,10 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) struct x11drv_thread_data *data = x11drv_init_thread_data(); wine_tsx11_lock(); - data->warp_serial = NextRequest( data->display ); XWarpPointer( data->display, root_window, root_window, 0, 0, 0, 0, x - virtual_screen_rect.left, y - virtual_screen_rect.top ); + data->warp_serial = NextRequest( data->display ); + XNoOp( data->display ); XFlush( data->display ); /* avoids bad mouse lag in games that do their own mouse warping */ wine_tsx11_unlock(); TRACE( "warped to %d,%d serial %lu\n", x, y, data->warp_serial ); @@ -1431,14 +1432,12 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) if (thread_data->warp_serial) { - long diff = xev->serial - thread_data->warp_serial; - - if (diff >= 0) thread_data->warp_serial = 0; /* we caught up now */ - if (diff <= 0) /* <= 0 because we also want to ignore the first event after the warp request */ + if ((long)(xev->serial - thread_data->warp_serial) < 0) { TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); return; } + thread_data->warp_serial = 0; /* we caught up now */ } TRACE( "pos %d,%d\n", input.u.mi.dx, input.u.mi.dy );

1 0

Michael Stefaniuc : quartz/tests: Simplify the file handling in filtergraph .c.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: d2910bb7faaf0ec11d70cbda510c6e7b25feeb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2910bb7faaf0ec11d70cbda5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 19 14:40:08 2011 +0200 quartz/tests: Simplify the file handling in filtergraph.c. --- dlls/quartz/tests/filtergraph.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index cd3daaf..596d115 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -41,9 +41,8 @@ typedef struct TestFilterImpl UINT nPins; } TestFilterImpl; -#define FILE_LEN 9 -static const char avifileA[FILE_LEN] = "test.avi"; -static const char mpegfileA[FILE_LEN] = "test.mpg"; +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; +static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; static IGraphBuilder *pgraph; @@ -53,17 +52,6 @@ static int createfiltergraph(void) &CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&pgraph); } -static void renderfile(const char * fileA) -{ - HRESULT hr; - WCHAR fileW[FILE_LEN]; - - MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); - - hr = IGraphBuilder_RenderFile(pgraph, fileW, NULL); - ok(hr==S_OK, "RenderFile returned: %x\n", hr); -} - static void rungraph(void) { HRESULT hr; @@ -155,17 +143,19 @@ static void releasefiltergraph(void) ok(hr==0, "Releasing filtergraph returned: %x\n", hr); } -static void test_render_run(const char * fileA) +static void test_render_run(const WCHAR *file) { HANDLE h; + HRESULT hr; if (!createfiltergraph()) return; - h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (h != INVALID_HANDLE_VALUE) { CloseHandle(h); - renderfile(fileA); + hr = IGraphBuilder_RenderFile(pgraph, file, NULL); + ok(hr==S_OK, "RenderFile returned: %x\n", hr); rungraph(); } @@ -1883,8 +1873,8 @@ static void test_render_filter_priority(void) START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); - test_render_run(avifileA); - test_render_run(mpegfileA); + test_render_run(avifile); + test_render_run(mpegfile); test_graph_builder(); test_graph_builder_addfilter(); test_mediacontrol();

1 0

Michael Stefaniuc : quartz/tests: Store the TestFilterImpl instead of its iface in IEnumPinsImpl.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: ee9ca54eba21df940d3f0896ce22ee266104211d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9ca54eba21df940d3f0896c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 19 14:36:29 2011 +0200 quartz/tests: Store the TestFilterImpl instead of its iface in IEnumPinsImpl. --- dlls/quartz/tests/filtergraph.c | 50 +++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 98445f2..cd3daaf 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -28,6 +28,19 @@ #include "dshow.h" #include "control.h" +typedef struct TestFilterImpl +{ + IBaseFilter IBaseFilter_iface; + + LONG refCount; + CRITICAL_SECTION csFilter; + FILTER_STATE state; + FILTER_INFO filterInfo; + CLSID clsid; + IPin **ppPins; + UINT nPins; +} TestFilterImpl; + #define FILE_LEN 9 static const char avifileA[FILE_LEN] = "test.avi"; static const char mpegfileA[FILE_LEN] = "test.mpg"; @@ -882,14 +895,14 @@ static HRESULT TestFilter_Pin_Construct(const IPinVtbl *Pin_Vtbl, const PIN_INFO /* IEnumPins implementation */ -typedef HRESULT (* FNOBTAINPIN)(IBaseFilter *iface, ULONG pos, IPin **pin, DWORD *lastsynctick); +typedef HRESULT (* FNOBTAINPIN)(TestFilterImpl *tf, ULONG pos, IPin **pin, DWORD *lastsynctick); typedef struct IEnumPinsImpl { IEnumPins IEnumPins_iface; LONG refCount; ULONG uIndex; - IBaseFilter *base; + TestFilterImpl *base; FNOBTAINPIN receive_pin; DWORD synctime; } IEnumPinsImpl; @@ -901,7 +914,7 @@ static inline IEnumPinsImpl *impl_from_IEnumPins(IEnumPins *iface) return CONTAINING_RECORD(iface, IEnumPinsImpl, IEnumPins_iface); } -static HRESULT IEnumPinsImpl_Construct(IEnumPins ** ppEnum, FNOBTAINPIN receive_pin, IBaseFilter *base) +static HRESULT createenumpins(IEnumPins ** ppEnum, FNOBTAINPIN receive_pin, TestFilterImpl *base) { IEnumPinsImpl * pEnumPins; @@ -919,7 +932,7 @@ static HRESULT IEnumPinsImpl_Construct(IEnumPins ** ppEnum, FNOBTAINPIN receive_ pEnumPins->uIndex = 0; pEnumPins->receive_pin = receive_pin; pEnumPins->base = base; - IBaseFilter_AddRef(base); + IBaseFilter_AddRef(&base->IBaseFilter_iface); *ppEnum = &pEnumPins->IEnumPins_iface; receive_pin(base, ~0, NULL, &pEnumPins->synctime); @@ -960,7 +973,7 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) if (!refCount) { - IBaseFilter_Release(This->base); + IBaseFilter_Release(&This->base->IBaseFilter_iface); CoTaskMemFree(This); return 0; } @@ -1042,7 +1055,7 @@ static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins * iface, IEnumPins ** ppEnum HRESULT hr; IEnumPinsImpl *This = impl_from_IEnumPins(iface); - hr = IEnumPinsImpl_Construct(ppEnum, This->receive_pin, This->base); + hr = createenumpins(ppEnum, This->receive_pin, This->base); if (FAILED(hr)) return hr; return IEnumPins_Skip(*ppEnum, This->uIndex); @@ -1068,19 +1081,6 @@ PIN_DIRECTION pinDir; const GUID *mediasubtype; } TestFilterPinData; -typedef struct TestFilterImpl -{ - IBaseFilter IBaseFilter_iface; - - LONG refCount; - CRITICAL_SECTION csFilter; - FILTER_STATE state; - FILTER_INFO filterInfo; - CLSID clsid; - IPin ** ppPins; - UINT nPins; -} TestFilterImpl; - static const IBaseFilterVtbl TestFilter_Vtbl; static inline TestFilterImpl *impl_from_IBaseFilter(IBaseFilter *iface) @@ -1285,24 +1285,24 @@ static HRESULT WINAPI TestFilter_GetSyncSource(IBaseFilter * iface, IReferenceCl /** IBaseFilter implementation **/ -static HRESULT TestFilter_GetPin(IBaseFilter *iface, ULONG pos, IPin **pin, DWORD *lastsynctick) +static HRESULT getpin_callback(TestFilterImpl *tf, ULONG pos, IPin **pin, DWORD *lastsynctick) { - TestFilterImpl *This = (TestFilterImpl *)iface; - /* Our pins are static, not changing so setting static tick count is ok */ *lastsynctick = 0; - if (pos >= This->nPins) + if (pos >= tf->nPins) return S_FALSE; - *pin = This->ppPins[pos]; + *pin = tf->ppPins[pos]; IPin_AddRef(*pin); return S_OK; } static HRESULT WINAPI TestFilter_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) { - return IEnumPinsImpl_Construct(ppEnum, TestFilter_GetPin, iface); + TestFilterImpl *This = impl_from_IBaseFilter(iface); + + return createenumpins(ppEnum, getpin_callback, This); } static HRESULT WINAPI TestFilter_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin)

1 0

Michael Stefaniuc : quatz/tests: Pass back the object instead of the iface in createtestfilter().
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 9f52e80055389fea41f4d2a3bc151b3a6bf8b7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f52e80055389fea41f4d2a3b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 19 14:30:39 2011 +0200 quatz/tests: Pass back the object instead of the iface in createtestfilter(). --- dlls/quartz/tests/filtergraph.c | 159 ++++++++++++++++++++------------------- 1 files changed, 80 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f52e80055389fea41f4d…

1 0

Michael Stefaniuc : quartz/tests: Finish the COM cleanup in filtergraph.c.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: b9d5a5007a6c17381c770d51f040b6abd57d7350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d5a5007a6c17381c770d51f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 19 14:25:46 2011 +0200 quartz/tests: Finish the COM cleanup in filtergraph.c. --- dlls/quartz/tests/filtergraph.c | 72 +++++++++++++++++++++++--------------- 1 files changed, 43 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9d5a5007a6c17381c770…

1 0

Michael Stefaniuc : quartz/tests: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: b21c2d652244257669198575b4020a4205d3a088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21c2d652244257669198575b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 19 14:24:43 2011 +0200 quartz/tests: COM cleanup for the IClassFactory iface. --- dlls/quartz/tests/filtergraph.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e95aa5b..582e2cc 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1354,11 +1354,16 @@ static const IBaseFilterVtbl TestFilter_Vtbl = typedef struct TestClassFactoryImpl { - IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; const TestFilterPinData *filterPinData; const CLSID *clsid; } TestClassFactoryImpl; +static inline TestClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, TestClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI Test_IClassFactory_QueryInterface( LPCLASSFACTORY iface, REFIID riid, @@ -1394,7 +1399,7 @@ static HRESULT WINAPI Test_IClassFactory_CreateInstance( REFIID riid, LPVOID *ppvObj) { - TestClassFactoryImpl *This = (TestClassFactoryImpl *)iface; + TestClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hr; IUnknown *punk = NULL; @@ -1522,9 +1527,18 @@ static void test_render_filter_priority(void) { PINDIR_INPUT, &mediasubtype2 }, { 0, 0 } }; - TestClassFactoryImpl Filter1ClassFactory = { &TestClassFactory_Vtbl, PinData2, &CLSID_TestFilter2 }; - TestClassFactoryImpl Filter2ClassFactory = { &TestClassFactory_Vtbl, PinData4, &CLSID_TestFilter3 }; - TestClassFactoryImpl Filter3ClassFactory = { &TestClassFactory_Vtbl, PinData5, &CLSID_TestFilter4 }; + TestClassFactoryImpl Filter1ClassFactory = { + { &TestClassFactory_Vtbl }, + PinData2, &CLSID_TestFilter2 + }; + TestClassFactoryImpl Filter2ClassFactory = { + { &TestClassFactory_Vtbl }, + PinData4, &CLSID_TestFilter3 + }; + TestClassFactoryImpl Filter3ClassFactory = { + { &TestClassFactory_Vtbl }, + PinData5, &CLSID_TestFilter4 + }; char ConnectedFilterName1[MAX_FILTER_NAME]; char ConnectedFilterName2[MAX_FILTER_NAME]; REGFILTER2 rgf2; @@ -1760,16 +1774,19 @@ static void test_render_filter_priority(void) ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); /* Register our filters with COM and with Filtermapper. */ - hr = CoRegisterClassObject(Filter1ClassFactory.clsid, (IUnknown *)&Filter1ClassFactory, - CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie1); + hr = CoRegisterClassObject(Filter1ClassFactory.clsid, + (IUnknown *)&Filter1ClassFactory.IClassFactory_iface, CLSCTX_INPROC_SERVER, + REGCLS_MULTIPLEUSE, &cookie1); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = CoRegisterClassObject(Filter2ClassFactory.clsid, (IUnknown *)&Filter2ClassFactory, - CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie2); + hr = CoRegisterClassObject(Filter2ClassFactory.clsid, + (IUnknown *)&Filter2ClassFactory.IClassFactory_iface, CLSCTX_INPROC_SERVER, + REGCLS_MULTIPLEUSE, &cookie2); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = CoRegisterClassObject(Filter3ClassFactory.clsid, (IUnknown *)&Filter3ClassFactory, - CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie3); + hr = CoRegisterClassObject(Filter3ClassFactory.clsid, + (IUnknown *)&Filter3ClassFactory.IClassFactory_iface, CLSCTX_INPROC_SERVER, + REGCLS_MULTIPLEUSE, &cookie3); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); if (FAILED(hr)) goto out;

1 0

Michael Stefaniuc : quartz/tests: COM cleanup for the IPin iface.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 6009ed4b6fdf63fae740e668c516f901f77eadaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6009ed4b6fdf63fae740e668c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 19 14:21:26 2011 +0200 quartz/tests: COM cleanup for the IPin iface. --- dlls/quartz/tests/filtergraph.c | 57 +++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 9b08494..e95aa5b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -22,6 +22,7 @@ #include <assert.h> #define COBJMACROS +#define CONST_VTABLE #include "wine/test.h" #include "dshow.h" @@ -526,15 +527,20 @@ static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) typedef struct ITestPinImpl { - const struct IPinVtbl * lpVtbl; - LONG refCount; - LPCRITICAL_SECTION pCritSec; - PIN_INFO pinInfo; - IPin * pConnectedTo; - AM_MEDIA_TYPE mtCurrent; - LPVOID pUserData; + IPin IPin_iface; + LONG refCount; + LPCRITICAL_SECTION pCritSec; + PIN_INFO pinInfo; + IPin * pConnectedTo; + AM_MEDIA_TYPE mtCurrent; + LPVOID pUserData; } ITestPinImpl; +static inline ITestPinImpl *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, ITestPinImpl, IPin_iface); +} + static HRESULT WINAPI TestFilter_Pin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { *ppv = NULL; @@ -555,20 +561,19 @@ static HRESULT WINAPI TestFilter_Pin_QueryInterface(IPin * iface, REFIID riid, static ULONG WINAPI TestFilter_Pin_AddRef(IPin * iface) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); ULONG refCount = InterlockedIncrement(&This->refCount); return refCount; } static ULONG WINAPI TestFilter_Pin_Release(IPin * iface) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); ULONG refCount = InterlockedDecrement(&This->refCount); if (!refCount) { FreeMediaType(&This->mtCurrent); - This->lpVtbl = NULL; CoTaskMemFree(This); return 0; } @@ -583,7 +588,7 @@ static HRESULT WINAPI TestFilter_InputPin_Connect(IPin * iface, IPin * pConnecto static HRESULT WINAPI TestFilter_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); PIN_DIRECTION pindirReceive; HRESULT hr = S_OK; @@ -621,7 +626,7 @@ static HRESULT WINAPI TestFilter_InputPin_ReceiveConnection(IPin * iface, IPin * static HRESULT WINAPI TestFilter_Pin_Disconnect(IPin * iface) { HRESULT hr; - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); EnterCriticalSection(This->pCritSec); { @@ -642,7 +647,7 @@ static HRESULT WINAPI TestFilter_Pin_Disconnect(IPin * iface) static HRESULT WINAPI TestFilter_Pin_ConnectedTo(IPin * iface, IPin ** ppPin) { HRESULT hr; - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); EnterCriticalSection(This->pCritSec); { @@ -666,7 +671,7 @@ static HRESULT WINAPI TestFilter_Pin_ConnectedTo(IPin * iface, IPin ** ppPin) static HRESULT WINAPI TestFilter_Pin_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt) { HRESULT hr; - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); EnterCriticalSection(This->pCritSec); { @@ -688,7 +693,7 @@ static HRESULT WINAPI TestFilter_Pin_ConnectionMediaType(IPin * iface, AM_MEDIA_ static HRESULT WINAPI TestFilter_Pin_QueryPinInfo(IPin * iface, PIN_INFO * pInfo) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); Copy_PinInfo(pInfo, &This->pinInfo); IBaseFilter_AddRef(pInfo->pFilter); @@ -698,7 +703,7 @@ static HRESULT WINAPI TestFilter_Pin_QueryPinInfo(IPin * iface, PIN_INFO * pInfo static HRESULT WINAPI TestFilter_Pin_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); *pPinDir = This->pinInfo.dir; @@ -712,7 +717,7 @@ static HRESULT WINAPI TestFilter_Pin_QueryId(IPin * iface, LPWSTR * Id) static HRESULT WINAPI TestFilter_Pin_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); if (IsEqualIID(&pmt->majortype, &This->mtCurrent.majortype) && (IsEqualIID(&pmt->subtype, &This->mtCurrent.subtype) || IsEqualIID(&GUID_NULL, &This->mtCurrent.subtype))) @@ -723,7 +728,7 @@ static HRESULT WINAPI TestFilter_Pin_QueryAccept(IPin * iface, const AM_MEDIA_TY static HRESULT WINAPI TestFilter_Pin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); return IEnumMediaTypesImpl_Construct(&This->mtCurrent, 1, ppEnum); } @@ -781,15 +786,15 @@ static HRESULT WINAPI TestFilter_OutputPin_ReceiveConnection(IPin * iface, IPin } /* Private helper function */ -static HRESULT TestFilter_OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +static HRESULT TestFilter_OutputPin_ConnectSpecific(ITestPinImpl * This, IPin * pReceivePin, + const AM_MEDIA_TYPE * pmt) { - ITestPinImpl *This = (ITestPinImpl *)iface; HRESULT hr; This->pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); - hr = IPin_ReceiveConnection(pReceivePin, iface, pmt); + hr = IPin_ReceiveConnection(pReceivePin, &This->IPin_iface, pmt); if (FAILED(hr)) { @@ -802,7 +807,7 @@ static HRESULT TestFilter_OutputPin_ConnectSpecific(IPin * iface, IPin * pReceiv static HRESULT WINAPI TestFilter_OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); HRESULT hr; EnterCriticalSection(This->pCritSec); @@ -810,11 +815,11 @@ static HRESULT WINAPI TestFilter_OutputPin_Connect(IPin * iface, IPin * pReceive /* if we have been a specific type to connect with, then we can either connect * with that or fail. We cannot choose different AM_MEDIA_TYPE */ if (pmt && !IsEqualGUID(&pmt->majortype, &GUID_NULL) && !IsEqualGUID(&pmt->subtype, &GUID_NULL)) - hr = TestFilter_OutputPin_ConnectSpecific(iface, pReceivePin, pmt); + hr = TestFilter_OutputPin_ConnectSpecific(This, pReceivePin, pmt); else { if (( !pmt || CompareMediaTypes(pmt, &This->mtCurrent, TRUE) ) && - (TestFilter_OutputPin_ConnectSpecific(iface, pReceivePin, &This->mtCurrent) == S_OK)) + (TestFilter_OutputPin_ConnectSpecific(This, pReceivePin, &This->mtCurrent) == S_OK)) hr = S_OK; else hr = VFW_E_NO_ACCEPTABLE_TYPES; } /* if negotiate media type */ @@ -864,9 +869,9 @@ static HRESULT TestFilter_Pin_Construct(const IPinVtbl *Pin_Vtbl, const PIN_INFO Copy_PinInfo(&pPinImpl->pinInfo, pPinInfo); pPinImpl->mtCurrent = *pinmt; - pPinImpl->lpVtbl = Pin_Vtbl; + pPinImpl->IPin_iface.lpVtbl = Pin_Vtbl; - *ppPin = (IPin *)pPinImpl; + *ppPin = &pPinImpl->IPin_iface; return S_OK; }

1 0

Alistair Leslie-Hughes : xmllite: Added interface IXmlWriter.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 89a094569bd6caa216e9e726c16a9a2d63784d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a094569bd6caa216e9e726c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 21:09:40 2011 +1000 xmllite: Added interface IXmlWriter. --- include/xmllite.idl | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/include/xmllite.idl b/include/xmllite.idl index 552b5d6..d416d21 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -109,3 +109,65 @@ cpp_quote("typedef IUnknown IXmlReaderInput;") cpp_quote("STDAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,") cpp_quote(" LPCWSTR encoding, BOOL hint,") cpp_quote(" LPCWSTR base_uri, IXmlReaderInput **ppInput);") + +typedef enum XmlStandalone +{ + XmlStandalone_Omit, + XmlStandalone_Yes, + XmlStandalone_No, + _XmlStandalone_Last = XmlStandalone_No +} XmlStandalone; + +typedef enum XmlWriterProperty +{ + XmlWriterProperty_MultiLanguage, + XmlWriterProperty_Indent, + XmlWriterProperty_ByteOrderMark, + XmlWriterProperty_OmitXmlDeclaration, + XmlWriterProperty_ConformanceLevel, + _XmlWriterProperty_Last = XmlWriterProperty_OmitXmlDeclaration +} XmlWriterProperty; + +/* IXmlWriter */ +[ + local, + object, + uuid(7279FC88-709D-4095-B63D-69FE4B0D9030), + pointer_default(unique) +] +interface IXmlWriter : IUnknown +{ + HRESULT SetOutput([in] IUnknown *pOutput); + HRESULT GetProperty([in] UINT nProperty, [out] LONG_PTR *ppValue); + HRESULT SetProperty([in] UINT nProperty, [in] LONG_PTR pValue); + HRESULT WriteAttributes([in] IXmlReader *pReader, [in] BOOL fWriteDefaultAttributes); + HRESULT WriteAttributeString([in] LPCWSTR pwszPrefix, [in] LPCWSTR pwszLocalName, + [in] LPCWSTR pwszNamespaceUri, [in] LPCWSTR pwszValue); + HRESULT WriteCData([in] LPCWSTR pwszText); + HRESULT WriteCharEntity([in] WCHAR wch); + HRESULT WriteChars([in] const WCHAR *pwch, [in] UINT cwch); + HRESULT WriteComment([in] LPCWSTR pwszComment); + HRESULT WriteDocType([in] LPCWSTR pwszName, [in] LPCWSTR pwszPublicId, + [in] LPCWSTR pwszSystemId, [in] LPCWSTR pwszSubset); + HRESULT WriteElementString([in] LPCWSTR pwszPrefix, [in] LPCWSTR pwszLocalName, + [in] LPCWSTR pwszNamespaceUri, [in] LPCWSTR pwszValue); + HRESULT WriteEndDocument(); + HRESULT WriteEndElement(); + HRESULT WriteEntityRef([in] LPCWSTR pwszName); + HRESULT WriteFullEndElement(); + HRESULT WriteName([in] LPCWSTR pwszName); + HRESULT WriteNmToken([in] LPCWSTR pwszNmToken); + HRESULT WriteNode([in] IXmlReader *pReader, [in] BOOL fWriteDefaultAttributes); + HRESULT WriteNodeShallow([in] IXmlReader *pReader, [in] BOOL fWriteDefaultAttributes); + HRESULT WriteProcessingInstruction([in] LPCWSTR pwszName, [in] LPCWSTR pwszText); + HRESULT WriteQualifiedName([in] LPCWSTR pwszLocalName, [in] LPCWSTR pwszNamespaceUri); + HRESULT WriteRaw([in] LPCWSTR pwszData); + HRESULT WriteRawChars([in] const WCHAR *pwch, [in] UINT cwch); + HRESULT WriteStartDocument([in] XmlStandalone standalone); + HRESULT WriteStartElement([in] LPCWSTR pwszPrefix, [in] LPCWSTR pwszLocalName, + [in] LPCWSTR pwszNamespaceUri); + HRESULT WriteString([in] LPCWSTR pwszText); + HRESULT WriteSurrogateCharEntity([in] WCHAR wchLow, [in] WCHAR wchHigh); + HRESULT WriteWhitespace([in] LPCWSTR pwszWhitespace); + HRESULT Flush(); +}

1 0

Alexandre Julliard : rpcrt4: Make sure we don't try to free a pointer twice .
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 781ff545cfbdcfd5e91a9308ef6dc7fde8ac032a URL: http://source.winehq.org/git/wine.git/?a=commit;h=781ff545cfbdcfd5e91a9308e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 14:07:59 2011 +0200 rpcrt4: Make sure we don't try to free a pointer twice. --- dlls/rpcrt4/ndr_stubless.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index bbc9c19..c5f3074 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1241,18 +1241,18 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, else call_freer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); } - - if (pParam->param_attributes.IsOut && - !pParam->param_attributes.IsIn && - !pParam->param_attributes.IsByValue && - !pParam->param_attributes.ServerAllocSize) + else if (pParam->param_attributes.ServerAllocSize) + { + HeapFree(GetProcessHeap(), 0, *(void **)pArg); + } + else if (pParam->param_attributes.IsOut && + !pParam->param_attributes.IsIn && + !pParam->param_attributes.IsByValue) { if (*pTypeFormat != RPC_FC_BIND_CONTEXT) pStubMsg->pfnFree(*(void **)pArg); } - if (pParam->param_attributes.ServerAllocSize) - HeapFree(GetProcessHeap(), 0, *(void **)pArg); break; case STUBLESS_INITOUT: if (!pParam->param_attributes.IsIn &&

1 0

Alexandre Julliard : widl: Use NdrPointerFree instead of freeing by hand where possible.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 809810eb28739307a53915325eb23d76f4483eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809810eb28739307a53915325… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 13:51:27 2011 +0200 widl: Use NdrPointerFree instead of freeing by hand where possible. --- tools/widl/typegen.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0096c32..847e10b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4189,19 +4189,18 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type != RPC_FC_RP) { - if (pointer_type == RPC_FC_RP && phase == PHASE_FREE && + /* strings returned are assumed to be global and hence don't + * need freeing */ + if (is_declptr(type) && !(phase == PHASE_FREE && pass == PASS_RETURN)) + print_phase_function(file, indent, "Pointer", local_var_prefix, + phase, var, start_offset); + else if (pointer_type == RPC_FC_RP && phase == PHASE_FREE && !in_attr && is_conformant_array(type)) { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); } - /* strings returned are assumed to be global and hence don't - * need freeing */ - else if (is_declptr(type) && - !(phase == PHASE_FREE && pass == PASS_RETURN)) - print_phase_function(file, indent, "Pointer", local_var_prefix, - phase, var, start_offset); } else { @@ -4257,7 +4256,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const } if (pointer_type != RPC_FC_RP) array_type = "Pointer"; - print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); + if (phase == PHASE_FREE && pointer_type == RPC_FC_RP) { /* these are all unmarshalled by allocating memory */ @@ -4266,11 +4265,20 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const ((tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY) && in_attr) || (tc == RPC_FC_CARRAY && !in_attr)) { + if (type_array_is_decl_as_ptr(type) && type->details.array.ptr_tfsoff) + { + print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, + type->details.array.ptr_tfsoff); + break; + } + print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + break; } } + print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); break; } case TGT_BASIC:

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011