January 2012 - Wine-Commits

Aric Stewart : quartz: Implement IObjectWithSite and IAMGraphBuilderCallback for the FilterGraph.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 8c91f1bf5e5a22ad90e7c1723b62342c3734fda8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c91f1bf5e5a22ad90e7c1723… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 08:12:23 2012 -0600 quartz: Implement IObjectWithSite and IAMGraphBuilderCallback for the FilterGraph. --- dlls/quartz/filtergraph.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ include/axextend.idl | 16 +++++++ 2 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 64c2d06..32aa569 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -160,6 +160,7 @@ typedef struct _IFilterGraphImpl { IMediaEventSink IMediaEventSink_iface; IGraphConfig IGraphConfig_iface; IMediaPosition IMediaPosition_iface; + IObjectWithSite IObjectWithSite_iface; const IUnknownVtbl * IInner_vtbl; /* IAMGraphStreams */ /* IAMStats */ @@ -204,6 +205,7 @@ typedef struct _IFilterGraphImpl { REFERENCE_TIME pause_time; LONGLONG stop_position; LONG recursioncount; + IUnknown *pSite; } IFilterGraphImpl; static HRESULT Filtergraph_QueryInterface(IFilterGraphImpl *This, @@ -261,6 +263,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, } else if (IsEqualGUID(&IID_IMediaPosition, riid)) { *ppvObj = &This->IMediaPosition_iface; TRACE(" returning IMediaPosition interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IObjectWithSite, riid)) { + *ppvObj = &This->IObjectWithSite_iface; + TRACE(" returning IObjectWithSite interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper, riid)) { TRACE(" requesting IFilterMapper interface from aggregated filtermapper (%p)\n", *ppvObj); return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); @@ -327,6 +332,8 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) IFilterMapper2_Release(This->pFilterMapper2); IUnknown_Release(This->punkFilterMapper2); + if (This->pSite) IUnknown_Release(This->pSite); + CloseHandle(This->hEventCompletion); EventsQueue_Destroy(&This->evqueue); This->cs.DebugInfo->Spare[0] = 0; @@ -1020,6 +1027,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IPin** ppins; IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; + IAMGraphBuilderCallback *callback = NULL; hr = GetFilterInfo(pMoniker, &clsid, &var); IMoniker_Release(pMoniker); @@ -1033,12 +1041,42 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } + if (This->pSite) + { + IUnknown_QueryInterface(This->pSite, &IID_IAMGraphBuilderCallback, (LPVOID*)&callback); + if (callback) + { + HRESULT rc; + rc = IAMGraphBuilderCallback_SelectedFilter(callback, pMoniker); + if (FAILED(rc)) + { + TRACE("Filter rejected by IAMGraphBuilderCallback_SelectedFilter\n"); + IUnknown_Release(callback); + goto error; + } + } + } + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter); if (FAILED(hr)) { WARN("Unable to create filter (%x), trying next one\n", hr); goto error; } + if (callback) + { + HRESULT rc; + rc = IAMGraphBuilderCallback_CreatedFilter(callback, pfilter); + IUnknown_Release(callback); + if (FAILED(rc)) + { + IBaseFilter_Release(pfilter); + pfilter = NULL; + TRACE("Filter rejected by IAMGraphBuilderCallback_CreatedFilter\n"); + goto error; + } + } + hr = IFilterGraph2_AddFilter(iface, pfilter, V_UNION(&var, bstrVal)); if (FAILED(hr)) { WARN("Unable to add filter (%x)\n", hr); @@ -2768,6 +2806,71 @@ static const IMediaPositionVtbl IMediaPosition_VTable = MediaPosition_CanSeekBackward }; +static inline IFilterGraphImpl *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IObjectWithSite_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite* iface, REFIID riid, void** ppvObj) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + return Filtergraph_QueryInterface(This, riid, ppvObj); +} + +static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->()\n", This, iface); + return Filtergraph_AddRef(This); +} + +static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->()\n", This, iface); + return Filtergraph_Release(This); +} + +/*** IObjectWithSite methods ***/ + +static HRESULT WINAPI ObjectWithSite_SetSite(IObjectWithSite *iface, IUnknown *pUnkSite) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->()\n", This, iface); + if (This->pSite) IUnknown_Release(This->pSite); + This->pSite = pUnkSite; + IUnknown_AddRef(This->pSite); + return S_OK; +} + +static HRESULT WINAPI ObjectWithSite_GetSite(IObjectWithSite *iface, REFIID riid, PVOID *ppvSite) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->(%s)\n", This, iface,debugstr_guid(riid)); + + *ppvSite = NULL; + if (!This->pSite) + return E_FAIL; + else + return IUnknown_QueryInterface(This->pSite, riid, ppvSite); +} + +static const IObjectWithSiteVtbl IObjectWithSite_VTable = +{ + ObjectWithSite_QueryInterface, + ObjectWithSite_AddRef, + ObjectWithSite_Release, + ObjectWithSite_SetSite, + ObjectWithSite_GetSite, +}; + static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID* ppvObj) { HRESULT hr = E_NOINTERFACE; @@ -5506,6 +5609,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; fimpl->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; + fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; fimpl->ref = 1; fimpl->ppFiltersInGraph = NULL; fimpl->pFilterNames = NULL; @@ -5523,6 +5627,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->EcCompleteCount = 0; fimpl->refClockProvider = NULL; fimpl->state = State_Stopped; + fimpl->pSite = NULL; EventsQueue_Init(&fimpl->evqueue); InitializeCriticalSection(&fimpl->cs); fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); diff --git a/include/axextend.idl b/include/axextend.idl index c546a7e..bf87731 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -45,6 +45,7 @@ interface IAMVfwCompressDialogs; interface IAMVideoCompression; interface IAMVideoDecimationProperties; interface IAMVideoProcAmp; +interface IAMGraphBuilderCallback; interface ICaptureGraphBuilder; interface ICaptureGraphBuilder2; interface IConfigAviMux; @@ -1010,3 +1011,18 @@ interface IAMFilterMiscFlags : IUnknown { ULONG GetMiscFlags(); }; + +[ + local, + object, + uuid(4995f511-9ddb-4f12-bd3b-f04611807b79), + pointer_default(unique) +] +interface IAMGraphBuilderCallback : IUnknown +{ + HRESULT SelectedFilter( + [in] IMoniker *pMon); + + HRESULT CreatedFilter( + [in] IBaseFilter *pFil); +};

1 0

Piotr Caban : urlmon: Added Uri IMarshal implementation.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 991061e4619daff0e97253ffa9527339506580f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991061e4619daff0e97253ffa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 16 15:13:03 2012 +0100 urlmon: Added Uri IMarshal implementation. --- dlls/urlmon/uri.c | 295 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 271 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=991061e4619daff0e9725…

1 0

Aric Stewart : wineqtdecoder: Zero out the whole QTSplitter structure on creation.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 3ef34d77996914e55e9aef3ca6518db36dc8a0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef34d77996914e55e9aef3ca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 10:11:47 2012 -0600 wineqtdecoder: Zero out the whole QTSplitter structure on creation. --- dlls/wineqtdecoder/qtsplitter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 06709c3..a42f984 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -233,6 +233,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) *phr = E_OUTOFMEMORY; return NULL; } + ZeroMemory(This,sizeof(*This)); BaseFilter_Init(&This->filter, &QT_Vtbl, &CLSID_QTSplitter, (DWORD_PTR)(__FILE__ ": QTSplitter.csFilter"), &BaseFuncTable); @@ -250,7 +251,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pCritSec = &This->filter.csFilter; - ZeroMemory(&This->pInputPin.pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); *phr = S_OK; return obj; }

1 0

Dmitry Timoshkov : kernel32: Test MapViewOfFile and NtMapViewOfSection side by side.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 9bd55bc2f5363e3302bc0e390746b98b8603b243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd55bc2f5363e3302bc0e390… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 16 21:50:35 2012 +0800 kernel32: Test MapViewOfFile and NtMapViewOfSection side by side. --- dlls/kernel32/tests/virtual.c | 118 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 108 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 203a400..6a135c8 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -38,6 +38,8 @@ static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); static UINT (WINAPI *pResetWriteWatch)(LPVOID,SIZE_T); static NTSTATUS (WINAPI *pNtAreMappedFilesTheSame)(PVOID,PVOID); +static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); +static DWORD (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); /* ############################### */ @@ -778,12 +780,6 @@ static void test_MapViewOfFile(void) ok( VirtualFree(addr, 0, MEM_RELEASE), "VirtualFree failed\n" ); } -static DWORD (WINAPI *pNtMapViewOfSection)( HANDLE handle, HANDLE process, PVOID *addr_ptr, - ULONG zero_bits, SIZE_T commit_size, - const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, - ULONG inherit, ULONG alloc_type, ULONG protect ); -static DWORD (WINAPI *pNtUnmapViewOfSection)( HANDLE process, PVOID addr ); - static void test_NtMapViewOfSection(void) { HANDLE hProcess; @@ -798,8 +794,6 @@ static void test_NtMapViewOfSection(void) SIZE_T size, result; LARGE_INTEGER offset; - pNtMapViewOfSection = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtMapViewOfSection" ); - pNtUnmapViewOfSection = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection" ); if (!pNtMapViewOfSection || !pNtUnmapViewOfSection) { win_skip( "NtMapViewOfSection not available\n" ); @@ -1943,6 +1937,59 @@ static BOOL is_compatible_access(DWORD map_prot, DWORD view_prot) return (view_prot & access) == view_prot; } +static void *map_view_of_file(HANDLE handle, DWORD access) +{ + NTSTATUS status; + LARGE_INTEGER offset; + SIZE_T count; + ULONG protect; + BOOL exec; + void *addr; + + if (!pNtMapViewOfSection) return NULL; + + count = 0; + offset.u.LowPart = 0; + offset.u.HighPart = 0; + + exec = access & FILE_MAP_EXECUTE; + access &= ~FILE_MAP_EXECUTE; + + if (access == FILE_MAP_COPY) + { + if (exec) + protect = PAGE_EXECUTE_WRITECOPY; + else + protect = PAGE_WRITECOPY; + } + else if (access & FILE_MAP_WRITE) + { + if (exec) + protect = PAGE_EXECUTE_READWRITE; + else + protect = PAGE_READWRITE; + } + else if (access & FILE_MAP_READ) + { + if (exec) + protect = PAGE_EXECUTE_READ; + else + protect = PAGE_READONLY; + } + else protect = PAGE_NOACCESS; + + addr = NULL; + status = pNtMapViewOfSection(handle, GetCurrentProcess(), &addr, 0, 0, &offset, + &count, 1 /* ViewShare */, 0, protect); + if (status) + { + /* for simplicity */ + SetLastError(ERROR_ACCESS_DENIED); + addr = NULL; + } + return addr; +} + static void test_mapping(void) { static const DWORD page_prot[] = @@ -1988,13 +2035,13 @@ static void test_mapping(void) { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE, PAGE_EXECUTE_READWRITE }, /* 0x2e */ { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE | FILE_MAP_COPY, PAGE_EXECUTE_READWRITE } /* 0x2f */ }; - void *base; + void *base, *nt_base; DWORD i, j, k, ret, old_prot, prev_prot; SYSTEM_INFO si; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; HANDLE hfile, hmap; - MEMORY_BASIC_INFORMATION info; + MEMORY_BASIC_INFORMATION info, nt_info; GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -2053,9 +2100,30 @@ static void test_mapping(void) for (j = 0; j < sizeof(view)/sizeof(view[0]); j++) { + nt_base = map_view_of_file(hmap, view[j].access); + if (nt_base) + { + SetLastError(0xdeadbeef); + ret = VirtualQuery(nt_base, &nt_info, sizeof(nt_info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + UnmapViewOfFile(nt_base); + } + SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, view[j].access, 0, 0, 0); + /* FIXME: completely remove the condition below once Wine is fixed */ + if (!nt_base != !base) + todo_wine + /* Vista+ supports FILE_MAP_EXECUTE properly, earlier versions don't */ + ok(!nt_base == !base || + broken((view[j].access & FILE_MAP_EXECUTE) && !nt_base != !base), + "%d: (%04x/%04x) NT %p kernel %p\n", j, page_prot[i], view[j].access, nt_base, base); + else + ok(!nt_base == !base || + broken((view[j].access & FILE_MAP_EXECUTE) && !nt_base != !base), + "%d: (%04x/%04x) NT %p kernel %p\n", j, page_prot[i], view[j].access, nt_base, base); + if (!is_compatible_access(page_prot[i], view[j].access)) { ok(!base, "%d: MapViewOfFile(%04x/%04x) should fail\n", j, page_prot[i], view[j].access); @@ -2096,6 +2164,33 @@ static void test_mapping(void) ok(info.State == MEM_COMMIT, "%d: (%04x) got %#x, expected MEM_COMMIT\n", j, view[j].access, info.State); ok(info.Type == MEM_MAPPED, "%d: (%04x) got %#x, expected MEM_MAPPED\n", j, view[j].access, info.Type); + if (nt_base && base) + { + ok(nt_info.RegionSize == info.RegionSize, "%d: (%04x) got %#lx != expected %#lx\n", j, view[j].access, nt_info.RegionSize, info.RegionSize); + /* FIXME: completely remove the condition below once Wine is fixed */ + if (nt_info.Protect != info.Protect) + todo_wine + ok(nt_info.Protect == info.Protect /* Vista+ */ || + broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.Protect, info.Protect); + else + ok(nt_info.Protect == info.Protect /* Vista+ */ || + broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.Protect, info.Protect); + /* FIXME: completely remove the condition below once Wine is fixed */ + if (nt_info.AllocationProtect != info.AllocationProtect) + todo_wine + ok(nt_info.AllocationProtect == info.AllocationProtect /* Vista+ */ || + broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.AllocationProtect, info.AllocationProtect); + else + ok(nt_info.AllocationProtect == info.AllocationProtect /* Vista+ */ || + broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.AllocationProtect, info.AllocationProtect); + ok(nt_info.State == info.State, "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.State, info.State); + ok(nt_info.Type == info.Type, "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.Type, info.Type); + } + prev_prot = info.Protect; for (k = 0; k < sizeof(page_prot)/sizeof(page_prot[0]); k++) @@ -2197,6 +2292,9 @@ START_TEST(virtual) pResetWriteWatch = (void *) GetProcAddress(hkernel32, "ResetWriteWatch"); pNtAreMappedFilesTheSame = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtAreMappedFilesTheSame" ); + pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtMapViewOfSection"); + pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection"); + test_mapping(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection();

1 0

Detlef Riekenberg : shell32: Use SHFree for memory allocated with SHAlloc.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: fdeaf7c0b4fc5b28d1b76e650faee63848a40d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdeaf7c0b4fc5b28d1b76e650… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:12 2012 +0100 shell32: Use SHFree for memory allocated with SHAlloc. --- dlls/shell32/assoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index ce3434c..0e6b6ba 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -131,7 +131,7 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) TRACE("Destroying IQueryAssociations (%p)\n", This); RegCloseKey(This->hkeySource); RegCloseKey(This->hkeyProgID); - HeapFree(GetProcessHeap(), 0, This); + SHFree(This); } return refCount;

1 0

Detlef Riekenberg : shell32: Avoid crash on NULL pointer.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 48155b5df04d2c2fc6ced9734ce82ca046b0092f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48155b5df04d2c2fc6ced9734… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:14 2012 +0100 shell32: Avoid crash on NULL pointer. --- dlls/shell32/assoc.c | 3 +++ dlls/shell32/tests/assoc.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 0e6b6ba..942e796 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -84,6 +84,9 @@ static HRESULT WINAPI IQueryAssociations_fnQueryInterface( TRACE("(%p,%s,%p)\n",This, debugstr_guid(riid), ppvObj); + if (ppvObj == NULL) + return E_POINTER; + *ppvObj = NULL; if (IsEqualIID(riid, &IID_IUnknown) || diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 00d04ff..8d09ec2 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -54,6 +54,9 @@ static void test_IQueryAssociations_QueryInterface(void) IUnknown_Release(unk); } + hr = IUnknown_QueryInterface(qa, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + IQueryAssociations_Release(qa); }

1 0

Detlef Riekenberg : shell32/tests: Simple tests for IApplicationAssociationRegistration.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 49e1a1a5dc441b6ab6eead2bcf6782c29907d4e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e1a1a5dc441b6ab6eead2bc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:16 2012 +0100 shell32/tests: Simple tests for IApplicationAssociationRegistration. --- dlls/shell32/tests/assoc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 8d09ec2..488f8e9 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -23,6 +23,7 @@ #include "shlwapi.h" #include "shlguid.h" +#include "shobjidl.h" #include "wine/test.h" @@ -61,11 +62,47 @@ static void test_IQueryAssociations_QueryInterface(void) } +static void test_IApplicationAssociationRegistration_QueryInterface(void) +{ + IApplicationAssociationRegistration *appreg; + IApplicationAssociationRegistration *appreg2; + IUnknown *unk; + HRESULT hr; + + /* this works since Vista */ + hr = CoCreateInstance(&CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC_SERVER, + &IID_IApplicationAssociationRegistration, (LPVOID*)&appreg); + + if (FAILED(hr)) { + skip("IApplicationAssociationRegistration not created: 0x%x\n", hr); + return; + } + + hr = IUnknown_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, (void**)&appreg2); + ok(hr == S_OK, "QueryInterface (IApplicationAssociationRegistration) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(appreg2); + } + + hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(unk); + } + + hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + + IApplicationAssociationRegistration_Release(appreg); +} + + START_TEST(assoc) { CoInitialize(NULL); test_IQueryAssociations_QueryInterface(); + test_IApplicationAssociationRegistration_QueryInterface(); CoUninitialize(); }

1 0

Frédéric Delanoy : wineconsole: Don' t include spaces before colons in English strings.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

1 0

Alexandre Julliard : qedit: Avoid releasing an uninitialized object.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: dc880388e13b60f59c3b7ecfa4e3689b80eb0342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc880388e13b60f59c3b7ecfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 17:41:56 2012 +0100 qedit: Avoid releasing an uninitialized object. --- dlls/qedit/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 38a54ce..edb7be5 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -396,7 +396,7 @@ static HRESULT GetSplitter(MediaDetImpl *This) if (FAILED(hr)) { VariantClear(&var); - goto retry; + continue; } hr = IGraphBuilder_AddFilter(This->graph, splitter,

1 0

Alexandre Julliard : ntdll: Set the thread exit code when a thread is killed inside a wait.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 6d2063f41b5774f15ee399069962e5844357e755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2063f41b5774f15ee399069… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 14:04:39 2012 +0100 ntdll: Set the thread exit code when a thread is killed inside a wait. --- dlls/ntdll/sync.c | 4 +--- server/thread.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3e27d09..f759ce6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -807,7 +807,7 @@ static int wait_reply( void *cookie ) ret = read( ntdll_get_thread_data()->wait_fd[0], &reply, sizeof(reply) ); if (ret == sizeof(reply)) { - if (!reply.cookie) break; /* thread got killed */ + if (!reply.cookie) abort_thread( reply.signaled ); /* thread got killed */ if (wine_server_get_ptr(reply.cookie) == cookie) return reply.signaled; /* we stole another reply, wait for the real one */ signaled = wait_reply( cookie ); @@ -826,8 +826,6 @@ static int wait_reply( void *cookie ) if (errno == EINTR) continue; server_protocol_perror("wakeup read"); } - /* the server closed the connection; time to die... */ - abort_thread(0); } diff --git a/server/thread.c b/server/thread.c index f704473..f9a575e 100644 --- a/server/thread.c +++ b/server/thread.c @@ -986,7 +986,7 @@ void kill_thread( struct thread *thread, int violent_death ) if (thread->wait) { while (thread->wait) end_wait( thread ); - send_thread_wakeup( thread, 0, STATUS_PENDING ); + send_thread_wakeup( thread, 0, thread->exit_code ); /* if it is waiting on the socket, we don't need to send a SIGQUIT */ violent_death = 0; }

1 0