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

Clinton Stimpson : user32: Test processing of expose events.
by Alexandre Julliard March 15, 2008

March 15, 2008

Module: wine Branch: master Commit: 05a8974e95ea221079fd43620dc231e55f28571f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a8974e95ea221079fd43620… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Fri Mar 14 23:59:54 2008 -0600 user32: Test processing of expose events. --- dlls/user32/tests/win.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 661a7e8..2c4d113 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4563,6 +4563,61 @@ static void test_GetUpdateRect(void) DestroyWindow(hgrandparent); } + +static LRESULT CALLBACK TestExposedRegion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if(msg == WM_PAINT) + { + PAINTSTRUCT ps; + RECT updateRect; + DWORD waitResult; + HWND win; + const int waitTime = 2000; + + BeginPaint(hwnd, &ps); + + /* create and destroy window to create an exposed region on this window */ + win = CreateWindowA("static", "win", WS_VISIBLE, + 10,10,50,50, NULL, NULL, 0, NULL); + DestroyWindow(win); + + waitResult = MsgWaitForMultipleObjectsEx( 0, NULL, waitTime, QS_PAINT, 0 ); + + ValidateRect(hwnd, NULL); + EndPaint(hwnd, &ps); + + if(waitResult != WAIT_TIMEOUT) + { + GetUpdateRect(hwnd, &updateRect, FALSE); +todo_wine +{ + ok(!IsRectEmpty(&updateRect), "Exposed rect should not be empty\n"); +} + } + + return 1; + } + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +static void test_Expose(void) +{ + ATOM atom; + WNDCLASSA cls; + HWND mw; + memset(&cls, 0, sizeof(WNDCLASSA)); + cls.lpfnWndProc = TestExposedRegion_WndProc; + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszClassName = "TestExposeClass"; + atom = RegisterClassA(&cls); + + mw = CreateWindowA("TestExposeClass", "MainWindow", WS_VISIBLE|WS_OVERLAPPEDWINDOW, + 0, 0, 200, 100, NULL, NULL, 0, NULL); + + UpdateWindow(mw); + DestroyWindow(mw); +} + START_TEST(win) { pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); @@ -4645,6 +4700,7 @@ START_TEST(win) test_ShowWindow(); test_gettext(); test_GetUpdateRect(); + test_Expose(); /* add the tests above this line */ UnhookWindowsHookEx(hhook);

1 0

Maarten Lankhorst : quartz: Change some more stubs from traces to fixmes.
by Alexandre Julliard March 15, 2008

March 15, 2008

Module: wine Branch: master Commit: 18f42a6eb70678aef06cd10a5a8d7139f614c996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18f42a6eb70678aef06cd10a5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 14 13:29:28 2008 -0700 quartz: Change some more stubs from traces to fixmes. --- dlls/quartz/filtergraph.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index becbd72..2da1166 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1605,7 +1605,7 @@ static HRESULT WINAPI MediaControl_RenderFile(IMediaControl *iface, BSTR strFilename) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); - TRACE("(%p/%p)->(%s (%p)): stub !!!\n", This, iface, debugstr_w(strFilename), strFilename); + FIXME("(%p/%p)->(%s (%p)): stub !!!\n", This, iface, debugstr_w(strFilename), strFilename); return S_OK; } @@ -1615,7 +1615,7 @@ static HRESULT WINAPI MediaControl_AddSourceFilter(IMediaControl *iface, IDispatch **ppUnk) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); - TRACE("(%p/%p)->(%s (%p), %p): stub !!!\n", This, iface, debugstr_w(strFilename), strFilename, ppUnk); + FIXME("(%p/%p)->(%s (%p), %p): stub !!!\n", This, iface, debugstr_w(strFilename), strFilename, ppUnk); return S_OK; } @@ -1624,7 +1624,7 @@ static HRESULT WINAPI MediaControl_get_FilterCollection(IMediaControl *iface, IDispatch **ppUnk) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); - TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, ppUnk); + FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, ppUnk); return S_OK; } @@ -1633,7 +1633,7 @@ static HRESULT WINAPI MediaControl_get_RegFilterCollection(IMediaControl *iface, IDispatch **ppUnk) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); - TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, ppUnk); + FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, ppUnk); return S_OK; } @@ -1641,7 +1641,7 @@ static HRESULT WINAPI MediaControl_get_RegFilterCollection(IMediaControl *iface, static HRESULT WINAPI MediaControl_StopWhenReady(IMediaControl *iface) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); - TRACE("(%p/%p)->(): stub !!!\n", This, iface); + FIXME("(%p/%p)->(): stub !!!\n", This, iface); return S_OK; }

1 0

Maarten Lankhorst : quartz: Add initial support for time formats in IMediaSeeking.
by Alexandre Julliard March 15, 2008

March 15, 2008

Module: wine Branch: master Commit: b662a6a556c8144cf7586d5f17b92f59b9dce3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b662a6a556c8144cf7586d5f1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 14 12:35:42 2008 -0700 quartz: Add initial support for time formats in IMediaSeeking. Only support the SYSTEM_MEDIA_TIME for now. --- dlls/quartz/filtergraph.c | 46 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index cf89771..becbd72 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -198,6 +198,7 @@ typedef struct _IFilterGraphImpl { IUnknown * pUnkOuter; BOOL bUnkOuterValid; BOOL bAggregatable; + GUID timeformatseek; } IFilterGraphImpl; static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This, @@ -1717,7 +1718,16 @@ static HRESULT WINAPI MediaSeeking_IsFormatSupported(IMediaSeeking *iface, const GUID *pFormat) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pFormat); + if (!pFormat) + return E_POINTER; + + TRACE("(%p/%p)->(%s)\n", This, iface, debugstr_guid(pFormat)); + + if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat)) + { + FIXME("Unhandled time format %s\n", debugstr_guid(pFormat)); + return S_FALSE; + } return S_OK; } @@ -1726,7 +1736,11 @@ static HRESULT WINAPI MediaSeeking_QueryPreferredFormat(IMediaSeeking *iface, GUID *pFormat) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pFormat); + if (!pFormat) + return E_POINTER; + + FIXME("(%p/%p)->(%p): semi-stub !!!\n", This, iface, pFormat); + memcpy(pFormat, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); return S_OK; } @@ -1735,7 +1749,11 @@ static HRESULT WINAPI MediaSeeking_GetTimeFormat(IMediaSeeking *iface, GUID *pFormat) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pFormat); + if (!pFormat) + return E_POINTER; + + TRACE("(%p/%p)->(%p)\n", This, iface, pFormat); + memcpy(pFormat, &This->timeformatseek, sizeof(GUID)); return S_OK; } @@ -1744,7 +1762,12 @@ static HRESULT WINAPI MediaSeeking_IsUsingTimeFormat(IMediaSeeking *iface, const GUID *pFormat) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pFormat); + TRACE("(%p/%p)->(%p)\n", This, iface, pFormat); + if (!pFormat) + return E_POINTER; + + if (memcmp(pFormat, &This->timeformatseek, sizeof(GUID))) + return S_FALSE; return S_OK; } @@ -1753,7 +1776,19 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat(IMediaSeeking *iface, const GUID *pFormat) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pFormat); + if (!pFormat) + return E_POINTER; + + TRACE("(%p/%p)->(%s)\n", This, iface, debugstr_guid(pFormat)); + + if (This->state != State_Stopped) + return VFW_E_WRONG_STATE; + + if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat)) + { + FIXME("Unhandled time format %s\n", debugstr_guid(pFormat)); + return E_INVALIDARG; + } return S_OK; } @@ -4759,6 +4794,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) InitializeCriticalSection(&fimpl->cs); fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); fimpl->nItfCacheEntries = 0; + memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2); if (FAILED(hr)) {

1 0

Maarten Lankhorst : quartz: Implement a few MediaSeeking functions.
by Alexandre Julliard March 15, 2008

March 15, 2008

Module: wine Branch: master Commit: 0f8b16f117207a1f9e41963cb732cca44b492ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8b16f117207a1f9e41963cb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 14 16:22:55 2008 -0700 quartz: Implement a few MediaSeeking functions. --- dlls/quartz/filtergraph.c | 132 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 127 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 2da1166..887c682 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1695,22 +1695,119 @@ static ULONG WINAPI MediaSeeking_Release(IMediaSeeking *iface) { return Filtergraph_Release(This); } +typedef HRESULT WINAPI (*fnFoundSeek)(IFilterGraphImpl *This, IMediaSeeking*, DWORD_PTR arg); + +static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, DWORD_PTR arg) { + BOOL allnotimpl = TRUE; + int i; + IBaseFilter* pfilter; + IEnumPins* pEnum; + HRESULT hr, hr_return = S_OK; + IPin* pPin; + DWORD dummy; + PIN_DIRECTION dir; + + TRACE("(%p)->(%p %08lx)\n", This, FoundSeek, arg); + /* Send a message to all renderers, they are responsible for broadcasting it further */ + + for(i = 0; i < This->nFilters; i++) + { + BOOL renderer = TRUE; + pfilter = This->ppFiltersInGraph[i]; + hr = IBaseFilter_EnumPins(pfilter, &pEnum); + if (hr != S_OK) + { + ERR("Enum pins failed %x\n", hr); + continue; + } + /* Check if it is a source filter */ + while(IEnumPins_Next(pEnum, 1, &pPin, &dummy) == S_OK) + { + IPin_QueryDirection(pPin, &dir); + IPin_Release(pPin); + if (dir != PINDIR_INPUT) + { + renderer = FALSE; + break; + } + } + IEnumPins_Release(pEnum); + if (renderer) + { + IMediaSeeking *seek = NULL; + IBaseFilter_QueryInterface(pfilter, &IID_IMediaSeeking, (void**)&seek); + if (!seek) + continue; + hr = FoundSeek(This, seek, arg); + IMediaSeeking_Release(seek); + if (hr_return != E_NOTIMPL) + allnotimpl = FALSE; + if (hr_return == S_OK || (FAILED(hr) && hr != E_NOTIMPL && !FAILED(hr_return))) + hr_return = hr; + } + } + + if (allnotimpl) + return E_NOTIMPL; + return hr_return; +} + +static HRESULT WINAPI FoundCapabilities(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pcaps) +{ + HRESULT hr; + DWORD caps = 0; + + hr = IMediaSeeking_GetCapabilities(seek, &caps); + if (FAILED(hr)) + return hr; + + /* Only add common capabilities everything supports */ + *(DWORD*)pcaps &= caps; + + return hr; +} + /*** IMediaSeeking methods ***/ static HRESULT WINAPI MediaSeeking_GetCapabilities(IMediaSeeking *iface, DWORD *pCapabilities) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); + HRESULT hr; + TRACE("(%p/%p)->(%p)\n", This, iface, pCapabilities); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pCapabilities); + if (!pCapabilities) + return E_POINTER; - return S_OK; + EnterCriticalSection(&This->cs); + *pCapabilities = 0xffffffff; + + hr = all_renderers_seek(This, FoundCapabilities, (DWORD_PTR)pCapabilities); + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI MediaSeeking_CheckCapabilities(IMediaSeeking *iface, DWORD *pCapabilities) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); + DWORD originalcaps; + HRESULT hr; + TRACE("(%p/%p)->(%p)\n", This, iface, pCapabilities); + + if (!pCapabilities) + return E_POINTER; - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pCapabilities); + EnterCriticalSection(&This->cs); + originalcaps = *pCapabilities; + hr = all_renderers_seek(This, FoundCapabilities, (DWORD_PTR)pCapabilities); + LeaveCriticalSection(&This->cs); + + if (FAILED(hr)) + return hr; + if (!*pCapabilities) + return E_FAIL; + if (*pCapabilities != originalcaps) + return S_FALSE; return S_OK; } @@ -1793,13 +1890,38 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat(IMediaSeeking *iface, return S_OK; } +static HRESULT WINAPI FoundDuration(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pduration) +{ + HRESULT hr; + LONGLONG duration = 0, *pdur = (LONGLONG*)pduration; + + hr = IMediaSeeking_GetDuration(seek, &duration); + if (FAILED(hr)) + return hr; + + /* FIXME: Minimum or maximum duration? */ + if (!*pdur < duration) + *pdur = duration; + + return hr; +} + static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *pDuration) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); + HRESULT hr; - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pDuration); + TRACE("(%p/%p)->(%p)\n", This, iface, pDuration); - return S_OK; + if (!pDuration) + return E_POINTER; + + EnterCriticalSection(&This->cs); + *pDuration = 0; + hr = all_renderers_seek(This, FoundDuration, (DWORD_PTR)pDuration); + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface,

1 0

Maarten Lankhorst : quartz: Silence the directsound buffer on starting.
by Alexandre Julliard March 15, 2008

March 15, 2008

Module: wine Branch: master Commit: 6d965b8fb6cbb892662e5324155e6c5b2efb430d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d965b8fb6cbb892662e53241… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 14 11:47:42 2008 -0700 quartz: Silence the directsound buffer on starting. If the buffer is created and stopped, the contents of the buffer are indeterminate, by zeroing it you won't get leftovers from last play. --- dlls/quartz/dsoundrender.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index af9fb37..6c5d3f1 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -498,6 +498,15 @@ static HRESULT WINAPI DSoundRender_Run(IBaseFilter * iface, REFERENCE_TIME tStar /* It's okay if there's no buffer yet. It'll start when it's created */ if (This->dsbuffer) { + if (This->state == State_Stopped) + { + char *buf1; + DWORD size1; + + IDirectSoundBuffer_Lock(This->dsbuffer, 0, 0, (void**)&buf1, &size1, NULL, NULL, DSBLOCK_ENTIREBUFFER); + memset(buf1, 0, size1); + IDirectSoundBuffer_Unlock(This->dsbuffer, buf1, size1, NULL, 0); + } hr = IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); if (FAILED(hr)) ERR("Can't start playing! (%x)\n", hr);

1 0

Maarten Lankhorst : quartz: Set a default sync source on the filtergraph.
by Alexandre Julliard March 15, 2008

March 15, 2008

Module: wine Branch: master Commit: b1f9acc68862d28a934f5fa5a6e2ec2635af9df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f9acc68862d28a934f5fa5a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 14 11:02:01 2008 -0700 quartz: Set a default sync source on the filtergraph. Use the fallback system IReferenceClock, unless the app comes up with its own clock. --- dlls/quartz/filtergraph.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 762e3e2..f056421 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -620,10 +620,20 @@ static HRESULT WINAPI FilterGraph2_Disconnect(IFilterGraph2 *iface, static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) { ICOM_THIS_MULTI(IFilterGraphImpl, IFilterGraph2_vtbl, iface); + IReferenceClock *pClock = NULL; + HRESULT hr; - TRACE("(%p/%p)->(): stub !!!\n", iface, This); + TRACE("(%p/%p)->() semi-stub\n", iface, This); - return S_OK; + hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&pClock); + + if (SUCCEEDED(hr)) + { + hr = IMediaFilter_SetSyncSource((IMediaFilter*)&(This->IMediaFilter_vtbl), pClock); + IReferenceClock_Release(pClock); + } + + return hr; } static HRESULT GetFilterInfo(IMoniker* pMoniker, GUID* pclsid, VARIANT* pvar) @@ -4755,6 +4765,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) ERR("Unable to create filter mapper (%x)\n", hr); return hr; } + IFilterGraph2_SetDefaultSyncSource((IFilterGraph2*)fimpl); *ppObj = fimpl; return S_OK;

1 0

Tony Wasserka : d3dx9: Add stubs for the ID3DXFont functions.
by Alexandre Julliard March 15, 2008

March 15, 2008

Module: wine Branch: master Commit: e84b8b23f839cf5a73298ae052a5f9ffbd5ab999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84b8b23f839cf5a73298ae05… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Mar 14 14:12:30 2008 +0100 d3dx9: Add stubs for the ID3DXFont functions. --- dlls/d3dx9_36/Makefile.in | 3 +- dlls/d3dx9_36/d3dx9_36.spec | 8 +- dlls/d3dx9_36/d3dx9_36_main.c | 1 + dlls/d3dx9_36/d3dx9_36_private.h | 40 ++++++ dlls/d3dx9_36/font.c | 268 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 315 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e84b8b23f839cf5a73298…

1 0

Dan Hipschman : qmgr: Implement IBackgroundCopyJob_AddFileSet.
by Alexandre Julliard March 15, 2008

March 15, 2008

Module: wine Branch: master Commit: 136a4ebbb2237994c1289b35685d62666c50a66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=136a4ebbb2237994c1289b356… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Mar 14 15:51:40 2008 -0700 qmgr: Implement IBackgroundCopyJob_AddFileSet. --- dlls/qmgr/job.c | 11 +++++++++-- dlls/qmgr/tests/job.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index eb337c0..e8cd839 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -77,8 +77,15 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_AddFileSet( ULONG cFileCount, BG_FILE_INFO *pFileSet) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + ULONG i; + for (i = 0; i < cFileCount; ++i) + { + HRESULT hr = IBackgroundCopyJob_AddFile(iface, pFileSet[i].RemoteName, + pFileSet[i].LocalName); + if (!SUCCEEDED(hr)) + return hr; + } + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_AddFile( diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index f06a619..cc64b0c 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -191,6 +191,19 @@ static void test_AddFile(void) ok(hres == S_OK, "Second call to AddFile failed: 0x%08x\n", hres); } +/* Test adding a set of files */ +static void test_AddFileSet(void) +{ + HRESULT hres; + BG_FILE_INFO files[2] = + { + {test_remotePathA, test_localPathA}, + {test_remotePathB, test_localPathB} + }; + hres = IBackgroundCopyJob_AddFileSet(test_job, 2, files); + ok(hres == S_OK, "AddFileSet failed: 0x%08x\n", hres); +} + /* Test creation of a job enumerator */ static void test_EnumFiles(void) { @@ -466,6 +479,7 @@ START_TEST(job) test_GetType, test_GetName, test_AddFile, + test_AddFileSet, test_EnumFiles, test_GetProgress_preTransfer, test_GetState,

1 0

James Hawkins : msi: Don't publish the product for the custom action test.
by Alexandre Julliard March 15, 2008

March 15, 2008

Module: wine Branch: master Commit: 5e5c4a98093f5a54f5d23d487f0083cda49a063f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5c4a98093f5a54f5d23d487… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Mar 14 16:01:35 2008 -0500 msi: Don't publish the product for the custom action test. --- dlls/msi/tests/install.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0c3ae20..c6f22c5 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -621,12 +621,7 @@ static const CHAR ca51_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" - "ProcessComponents\t\t1600\n" - "UnpublishFeatures\t\t1800\n" "InstallFiles\t\t4000\n" - "RegisterProduct\t\t6100\n" - "PublishFeatures\t\t6300\n" - "PublishProduct\t\t6400\n" "InstallFinalize\t\t6600"; static const CHAR ca51_custom_action_dat[] = "Action\tType\tSource\tTarget\n"

1 0

Rob Shearman : dxerr{8,9}: Include wine/port.h for snprintf.
by Alexandre Julliard March 15, 2008

March 15, 2008

Module: wine Branch: master Commit: bbe1a0175119f71f58bce76376617c1620864791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe1a0175119f71f58bce7637… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 14 18:08:46 2008 +0000 dxerr{8,9}: Include wine/port.h for snprintf. --- dlls/dxerr8/dxerr8.c | 3 +++ dlls/dxerr9/dxerr9.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dxerr8/dxerr8.c b/dlls/dxerr8/dxerr8.c index 9207ae2..69d24e6 100644 --- a/dlls/dxerr8/dxerr8.c +++ b/dlls/dxerr8/dxerr8.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h> diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c index 63822d2..7939c99 100644 --- a/dlls/dxerr9/dxerr9.c +++ b/dlls/dxerr9/dxerr9.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h>

1 0