February 2014 - Wine-Commits

Matteo Bruni : d3dx9/tests: Create A8L8 and DXTn textures instead of plain surfaces.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: e5d9be5eaf38b6b01b29185443069497fef97531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d9be5eaf38b6b01b2918544… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 18 22:16:59 2014 +0100 d3dx9/tests: Create A8L8 and DXTn textures instead of plain surfaces. Creating them as plain surfaces fails on my Nvidia Win7 system. --- dlls/d3dx9_36/tests/surface.c | 55 +++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 283fc96..2ddc704 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -981,11 +981,14 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) } /* A8L8 */ - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_A8L8, D3DPOOL_DEFAULT, &surf, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8L8, D3DPOOL_MANAGED, &tex, NULL); if (FAILED(hr)) - skip("Failed to create A8L8 surface, hr %#x.\n", hr); + skip("Failed to create A8L8 texture, hr %#x.\n", hr); else { + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &surf); + ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8r3g3b2, D3DFMT_A8R3G3B2, 4, NULL, &rect, D3DX_FILTER_NONE, 0); ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); @@ -1070,7 +1073,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = IDirect3DSurface9_UnlockRect(surf); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); - check_release((IUnknown*)surf, 0); + check_release((IUnknown*)surf, 1); + check_release((IUnknown*)tex, 0); } /* DXT1, DXT2, DXT3, DXT4, DXT5 */ @@ -1082,58 +1086,73 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, dds_24bit, sizeof(dds_24bit), NULL, D3DX_FILTER_NONE, 0, NULL); ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT2, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_DXT2, D3DPOOL_SYSTEMMEM, &tex, NULL); if (FAILED(hr)) - skip("Failed to create DXT2 surface, hr %#x.\n", hr); + skip("Failed to create DXT2 texture, hr %#x.\n", hr); else { + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT2 format.\n"); - check_release((IUnknown*)newsurf, 0); + check_release((IUnknown*)newsurf, 1); + check_release((IUnknown*)tex, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT3, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_DXT3, D3DPOOL_SYSTEMMEM, &tex, NULL); if (FAILED(hr)) - skip("Failed to create DXT3 surface, hr %#x.\n", hr); + skip("Failed to create DXT3 texture, hr %#x.\n", hr); else { + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT3 format.\n"); - check_release((IUnknown*)newsurf, 0); + check_release((IUnknown*)newsurf, 1); + check_release((IUnknown*)tex, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT4, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_DXT4, D3DPOOL_SYSTEMMEM, &tex, NULL); if (FAILED(hr)) - skip("Failed to create DXT4 surface, hr %#x.\n", hr); + skip("Failed to create DXT4 texture, hr %#x.\n", hr); else { + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT4 format.\n"); - check_release((IUnknown*)newsurf, 0); + check_release((IUnknown*)newsurf, 1); + check_release((IUnknown*)tex, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &tex, NULL); if (FAILED(hr)) - skip("Failed to create DXT5 surface, hr %#x.\n", hr); + skip("Failed to create DXT5 texture, hr %#x.\n", hr); else { + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT5 format.\n"); - check_release((IUnknown*)newsurf, 0); + check_release((IUnknown*)newsurf, 1); + check_release((IUnknown*)tex, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &tex, NULL); if (FAILED(hr)) - skip("Failed to create DXT1 surface, hr %#x.\n", hr); + skip("Failed to create DXT1 texture, hr %#x.\n", hr); else { + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT1 format.\n"); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels from DXT1 format.\n"); - check_release((IUnknown*)newsurf, 0); + check_release((IUnknown*)newsurf, 1); + check_release((IUnknown*)tex, 0); } check_release((IUnknown*)surf, 0);

1 0

Dmitry Timoshkov : taskschd: Delay creation of ITaskSettings until it' s required.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 9c6e7dea5bd4abb296a8798beacbd03ae1ebb9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6e7dea5bd4abb296a8798be… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 19 12:12:59 2014 +0900 taskschd: Delay creation of ITaskSettings until it's required. --- dlls/taskschd/task.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 0c96748..fbf4ae1 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -966,11 +966,18 @@ static HRESULT WINAPI TaskDefinition_put_Triggers(ITaskDefinition *iface, ITrigg static HRESULT WINAPI TaskDefinition_get_Settings(ITaskDefinition *iface, ITaskSettings **settings) { TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + HRESULT hr; TRACE("%p,%p\n", iface, settings); if (!settings) return E_POINTER; + if (!taskdef->taskset) + { + hr = TaskSettings_create(&taskdef->taskset); + if (hr != S_OK) return hr; + } + ITaskSettings_AddRef(taskdef->taskset); *settings = taskdef->taskset; @@ -985,7 +992,8 @@ static HRESULT WINAPI TaskDefinition_put_Settings(ITaskDefinition *iface, ITaskS if (!settings) return E_POINTER; - ITaskSettings_Release(taskdef->taskset); + if (taskdef->taskset) + ITaskSettings_Release(taskdef->taskset); ITaskSettings_AddRef(settings); taskdef->taskset = settings; @@ -1524,7 +1532,6 @@ static const ITaskDefinitionVtbl TaskDefinition_vtbl = HRESULT TaskDefinition_create(ITaskDefinition **obj) { - HRESULT hr; TaskDefinition *taskdef; taskdef = heap_alloc_zero(sizeof(*taskdef)); @@ -1532,13 +1539,6 @@ HRESULT TaskDefinition_create(ITaskDefinition **obj) taskdef->ITaskDefinition_iface.lpVtbl = &TaskDefinition_vtbl; taskdef->ref = 1; - hr = TaskSettings_create(&taskdef->taskset); - if (hr != S_OK) - { - ITaskDefinition_Release(&taskdef->ITaskDefinition_iface); - return hr; - } - *obj = &taskdef->ITaskDefinition_iface; TRACE("created %p\n", *obj);

1 0

Dmitry Timoshkov : taskschd: Make ITaskDefinition a part of IRegisteredTask implementation.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 734417a4813acb56d63ad1f66afacf163b85ac3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=734417a4813acb56d63ad1f66… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 19 12:13:03 2014 +0900 taskschd: Make ITaskDefinition a part of IRegisteredTask implementation. --- dlls/taskschd/regtask.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 7ed3c2a..b7eea52 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -37,6 +37,7 @@ typedef struct IRegisteredTask IRegisteredTask_iface; LONG ref; WCHAR *path; + ITaskDefinition *taskdef; } RegisteredTask; static inline RegisteredTask *impl_from_IRegisteredTask(IRegisteredTask *iface) @@ -58,6 +59,7 @@ static ULONG WINAPI regtask_Release(IRegisteredTask *iface) if (!ref) { TRACE("destroying %p\n", iface); + ITaskDefinition_Release(regtask->taskdef); heap_free(regtask->path); heap_free(regtask); } @@ -262,6 +264,8 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit regtask->IRegisteredTask_iface.lpVtbl = &RegisteredTask_vtbl; regtask->path = heap_strdupW(path); regtask->ref = 1; + ITaskDefinition_AddRef(definition); + regtask->taskdef = definition; *obj = &regtask->IRegisteredTask_iface; TRACE("created %p\n", *obj);

1 0

Jacek Caban : wmp: Added IOleObject::Close implementation.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 543905f4d2fc6c4becc7985550d2260b52554fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=543905f4d2fc6c4becc798555… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 16:01:54 2014 +0100 wmp: Added IOleObject::Close implementation. --- dlls/wmp/oleobj.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 7074bd6..d82cb41 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -347,8 +347,15 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%08x)\n", This, dwSaveOption); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwSaveOption); + + if(dwSaveOption) + FIXME("Unsupported option %d\n", dwSaveOption); + + if(This->hwnd) /* FIXME: Possibly hide window */ + deactivate_window(This); + return S_OK; } static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk)

1 0

Dmitry Timoshkov : xmllite/tests: Add a test for parsing an empty element after XML declaration.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: f41f8af0212161a7b377b024fc822a197cd5764d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41f8af0212161a7b377b024f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 20 19:28:09 2014 +0900 xmllite/tests: Add a test for parsing an empty element after XML declaration. --- dlls/xmllite/tests/reader.c | 50 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 312516b..992d15c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -55,7 +55,7 @@ static void free_str(WCHAR *str) } static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; -static const char xmldecl_short[] = "<?xml version=\"1.0\"?>\n"; +static const char xmldecl_short[] = "<?xml version=\"1.0\"?><RegistrationInfo/>"; static IStream *create_stream_on_data(const char *data, int size) { @@ -644,6 +644,8 @@ if (0) static void test_read_xmldeclaration(void) { + static const WCHAR xmlW[] = {'x','m','l',0}; + static const WCHAR RegistrationInfoW[] = {'R','e','g','i','s','t','r','a','t','i','o','n','I','n','f','o',0}; static const struct { WCHAR name[12]; @@ -659,6 +661,7 @@ static void test_read_xmldeclaration(void) HRESULT hr; XmlNodeType type; UINT count = 0, len, i; + BOOL ret; const WCHAR *val; hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); @@ -793,10 +796,22 @@ todo_wine { ok_pos(reader, 1, 3, 1, 21, TRUE); test_read_state(reader, XmlReadState_Interactive, -1, TRUE); + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(count == 1, "expected 1, got %d\n", count); + + ret = IXmlReader_IsEmptyElement(reader); + ok(!ret, "element should not be empty\n"); + hr = IXmlReader_GetValue(reader, &val, NULL); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + hr = IXmlReader_GetLocalName(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); +todo_wine + ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); + /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); @@ -811,6 +826,39 @@ todo_wine { hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); + type = -1; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(type == XmlNodeType_Element, "expected Element, got %s\n", type_to_str(type)); + ok_pos(reader, 1, 23, 1, 40, TRUE); + test_read_state(reader, XmlReadState_Interactive, -1, TRUE); + + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + + ret = IXmlReader_IsEmptyElement(reader); +todo_wine + ok(ret, "element should be empty\n"); + + hr = IXmlReader_GetValue(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); +todo_wine + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + + hr = IXmlReader_GetLocalName(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(val, RegistrationInfoW), "got %s\n", wine_dbgstr_w(val)); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine + ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); +todo_wine + ok(type == XmlNodeType_None, "expected None, got %s\n", type_to_str(type)); + ok_pos(reader, 1, 41, -1, -1, TRUE); + test_read_state(reader, XmlReadState_Error, -1, TRUE); + IStream_Release(stream); IXmlReader_Release(reader); }

1 0

Dmitry Timoshkov : taskschd: Add IRegistrationInfo stub implementation.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 257a3bb17c41ef46d466014063c764380f5ae29b URL: http://source.winehq.org/git/wine.git/?a=commit;h=257a3bb17c41ef46d46601406… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 19 12:12:51 2014 +0900 taskschd: Add IRegistrationInfo stub implementation. --- dlls/taskschd/task.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index c0b8141..d51e4ae 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -35,6 +35,237 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); typedef struct { + IRegistrationInfo IRegistrationInfo_iface; + LONG ref; +} registration_info; + +static inline registration_info *impl_from_IRegistrationInfo(IRegistrationInfo *iface) +{ + return CONTAINING_RECORD(iface, registration_info, IRegistrationInfo_iface); +} + +static ULONG WINAPI RegistrationInfo_AddRef(IRegistrationInfo *iface) +{ + registration_info *reginfo = impl_from_IRegistrationInfo(iface); + return InterlockedIncrement(&reginfo->ref); +} + +static ULONG WINAPI RegistrationInfo_Release(IRegistrationInfo *iface) +{ + registration_info *reginfo = impl_from_IRegistrationInfo(iface); + LONG ref = InterlockedDecrement(&reginfo->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(reginfo); + } + + return ref; +} + +static HRESULT WINAPI RegistrationInfo_QueryInterface(IRegistrationInfo *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IRegistrationInfo) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IRegistrationInfo_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI RegistrationInfo_GetTypeInfoCount(IRegistrationInfo *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_GetTypeInfo(IRegistrationInfo *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_GetIDsOfNames(IRegistrationInfo *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_Invoke(IRegistrationInfo *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Description(IRegistrationInfo *iface, BSTR *description) +{ + FIXME("%p,%p: stub\n", iface, description); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Description(IRegistrationInfo *iface, BSTR description) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(description)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR *author) +{ + FIXME("%p,%p: stub\n", iface, author); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Author(IRegistrationInfo *iface, BSTR author) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(author)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BSTR *version) +{ + FIXME("%p,%p: stub\n", iface, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Version(IRegistrationInfo *iface, BSTR version) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(version)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Date(IRegistrationInfo *iface, BSTR *date) +{ + FIXME("%p,%p: stub\n", iface, date); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Date(IRegistrationInfo *iface, BSTR date) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(date)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Documentation(IRegistrationInfo *iface, BSTR *doc) +{ + FIXME("%p,%p: stub\n", iface, doc); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Documentation(IRegistrationInfo *iface, BSTR doc) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(doc)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_XmlText(IRegistrationInfo *iface, BSTR *xml) +{ + FIXME("%p,%p: stub\n", iface, xml); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_XmlText(IRegistrationInfo *iface, BSTR xml) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(xml)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_URI(IRegistrationInfo *iface, BSTR *uri) +{ + FIXME("%p,%p: stub\n", iface, uri); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_URI(IRegistrationInfo *iface, BSTR uri) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(uri)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_SecurityDescriptor(IRegistrationInfo *iface, VARIANT *sddl) +{ + FIXME("%p,%p: stub\n", iface, sddl); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_SecurityDescriptor(IRegistrationInfo *iface, VARIANT sddl) +{ + FIXME("%p,%p: stub\n", iface, debugstr_variant(&sddl)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR *source) +{ + FIXME("%p,%p: stub\n", iface, source); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Source(IRegistrationInfo *iface, BSTR source) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(source)); + return E_NOTIMPL; +} + +static const IRegistrationInfoVtbl RegistrationInfo_vtbl = +{ + RegistrationInfo_QueryInterface, + RegistrationInfo_AddRef, + RegistrationInfo_Release, + RegistrationInfo_GetTypeInfoCount, + RegistrationInfo_GetTypeInfo, + RegistrationInfo_GetIDsOfNames, + RegistrationInfo_Invoke, + RegistrationInfo_get_Description, + RegistrationInfo_put_Description, + RegistrationInfo_get_Author, + RegistrationInfo_put_Author, + RegistrationInfo_get_Version, + RegistrationInfo_put_Version, + RegistrationInfo_get_Date, + RegistrationInfo_put_Date, + RegistrationInfo_get_Documentation, + RegistrationInfo_put_Documentation, + RegistrationInfo_get_XmlText, + RegistrationInfo_put_XmlText, + RegistrationInfo_get_URI, + RegistrationInfo_put_URI, + RegistrationInfo_get_SecurityDescriptor, + RegistrationInfo_put_SecurityDescriptor, + RegistrationInfo_get_Source, + RegistrationInfo_put_Source +}; + +HRESULT RegistrationInfo_create(IRegistrationInfo **obj) +{ + registration_info *reginfo; + + reginfo = heap_alloc_zero(sizeof(*reginfo)); + if (!reginfo) return E_OUTOFMEMORY; + + reginfo->IRegistrationInfo_iface.lpVtbl = &RegistrationInfo_vtbl; + reginfo->ref = 1; + *obj = &reginfo->IRegistrationInfo_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ ITaskSettings ITaskSettings_iface; LONG ref; WCHAR *restart_interval;

1 0

Vincent Povirk : gdiplus: Improve GdipFillRectangles parameter validation.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 78459aea0dcce1e5b7dd9d30b1e516646f33722d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78459aea0dcce1e5b7dd9d30b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 19 15:16:48 2014 -0600 gdiplus: Improve GdipFillRectangles parameter validation. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 47 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2608bf4..1f01b82 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3747,7 +3747,7 @@ GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics *graphics, GpBrush *brush, GDI TRACE("(%p, %p, %p, %d)\n", graphics, brush, rects, count); - if(!rects) + if(!graphics || !brush || !rects || count <= 0) return InvalidParameter; if (graphics->image && graphics->image->type == ImageTypeMetafile) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 4d74081..9fb1347 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -5493,6 +5493,52 @@ static void test_clipping_2(void) DeleteDC(hdc); } + +static void test_GdipFillRectangles(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpBrush *brush = NULL; + HDC hdc = GetDC( hwnd ); + GpRectF rects[2] = {{0,0,10,10}, {10,10,10,10}}; + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreateSolidFill((ARGB)0xffff00ff, (GpSolidFill**)&brush); + expect(Ok, status); + ok(brush != NULL, "Expected brush to be initialized\n"); + + status = GdipFillRectangles(NULL, brush, rects, 2); + expect(InvalidParameter, status); + + status = GdipFillRectangles(graphics, NULL, rects, 2); + expect(InvalidParameter, status); + + status = GdipFillRectangles(graphics, brush, NULL, 2); + expect(InvalidParameter, status); + + status = GdipFillRectangles(graphics, brush, rects, 0); + expect(InvalidParameter, status); + + status = GdipFillRectangles(graphics, brush, rects, -1); + expect(InvalidParameter, status); + + status = GdipFillRectangles(graphics, brush, rects, 1); + expect(Ok, status); + + status = GdipFillRectangles(graphics, brush, rects, 2); + expect(Ok, status); + + GdipDeleteBrush(brush); + GdipDeleteGraphics(graphics); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -5563,6 +5609,7 @@ START_TEST(graphics) test_getdc_scaled(); test_alpha_hdc(); test_bitmapfromgraphics(); + test_GdipFillRectangles(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Michael Stefaniuc : qedit: Use the generic BaseFilter implementation in SampleGrabber.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 147cf6cc4ecfc860017c4699ee85c7cb19515a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147cf6cc4ecfc860017c4699e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 20 00:13:09 2014 +0100 qedit: Use the generic BaseFilter implementation in SampleGrabber. --- dlls/qedit/Makefile.in | 2 +- dlls/qedit/samplegrabber.c | 157 +++++++++++--------------------------------- 2 files changed, 39 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=147cf6cc4ecfc860017c4…

1 0

Nikolay Sivov : ole32/tests: Handle context generation failure better.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: ffcced0f3906534e6765730d44d8e9d82bbf864e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffcced0f3906534e6765730d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 12:59:34 2014 +0400 ole32/tests: Handle context generation failure better. --- dlls/ole32/tests/compobj.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index c96dfe0..b85842b 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -192,7 +192,13 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) actctx.lpSource = path; handle = pCreateActCtxW(&actctx); - ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE || broken(handle == INVALID_HANDLE_VALUE) /* some old XP/2k3 versions */, + "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + if (handle == INVALID_HANDLE_VALUE) + { + win_skip("activation context generation failed, some tests will be skipped\n"); + handle = NULL; + } ok(actctx.cbSize == sizeof(ACTCTXW), "actctx.cbSize=%d\n", actctx.cbSize); ok(actctx.dwFlags == 0, "actctx.dwFlags=%d\n", actctx.dwFlags); @@ -206,8 +212,11 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) DeleteFileA("file.manifest"); - ret = pActivateActCtx(handle, cookie); - ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + if (handle) + { + ret = pActivateActCtx(handle, cookie); + ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + } return handle; }

1 0

Frédéric Delanoy : cabarc: Use BOOL type where appropriate.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 8bd2eb3e78fb28241dcd5d34b5e6c44207b722b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd2eb3e78fb28241dcd5d34b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 19 22:13:29 2014 +0100 cabarc: Use BOOL type where appropriate. --- programs/cabarc/cabarc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index c49796d..04f2a9f 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -75,8 +75,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); static int opt_cabinet_size = CB_MAX_DISK; static int opt_cabinet_id; static int opt_compression = tcompTYPE_MSZIP; -static int opt_recurse; -static int opt_preserve_paths; +static BOOL opt_recurse; +static BOOL opt_preserve_paths; static int opt_reserve_space; static int opt_verbose; static char *opt_cab_file; @@ -672,10 +672,10 @@ int wmain( int argc, WCHAR *argv[] ) } break; case 'p': - opt_preserve_paths = 1; + opt_preserve_paths = TRUE; break; case 'r': - opt_recurse = 1; + opt_recurse = TRUE; break; case 's': argv++; argc--;

1 0