July 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : ole32: Standardize COM aggregation for the DataCache.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: d17e760cb37a5f0a64fe631c799f4f923388880b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17e760cb37a5f0a64fe631c7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 08:49:39 2016 +0200 ole32: Standardize COM aggregation for the DataCache. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 67 +++++++++++++++++--------------------------------- 1 file changed, 22 insertions(+), 45 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 21f63d3..441a874 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -131,8 +131,8 @@ struct DataCache /* * List all interface here */ + IUnknown IUnknown_inner; IDataObject IDataObject_iface; - IUnknown IUnknown_iface; IPersistStorage IPersistStorage_iface; IViewObject2 IViewObject2_iface; IOleCache2 IOleCache2_iface; @@ -150,7 +150,7 @@ struct DataCache /* * IUnknown implementation of the outer object. */ - IUnknown* outerUnknown; + IUnknown *outer_unk; /* * The user of this object can setup ONE advise sink @@ -188,7 +188,7 @@ static inline DataCache *impl_from_IDataObject( IDataObject *iface ) static inline DataCache *impl_from_IUnknown( IUnknown *iface ) { - return CONTAINING_RECORD(iface, DataCache, IUnknown_iface); + return CONTAINING_RECORD(iface, DataCache, IUnknown_inner); } static inline DataCache *impl_from_IPersistStorage( IPersistStorage *iface ) @@ -970,7 +970,7 @@ static HRESULT WINAPI DataCache_IDataObject_QueryInterface( { DataCache *this = impl_from_IDataObject(iface); - return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject); + return IUnknown_QueryInterface(this->outer_unk, riid, ppvObject); } /************************************************************************ @@ -981,7 +981,7 @@ static ULONG WINAPI DataCache_IDataObject_AddRef( { DataCache *this = impl_from_IDataObject(iface); - return IUnknown_AddRef(this->outerUnknown); + return IUnknown_AddRef(this->outer_unk); } /************************************************************************ @@ -992,7 +992,7 @@ static ULONG WINAPI DataCache_IDataObject_Release( { DataCache *this = impl_from_IDataObject(iface); - return IUnknown_Release(this->outerUnknown); + return IUnknown_Release(this->outer_unk); } /************************************************************************ @@ -1150,7 +1150,7 @@ static HRESULT WINAPI DataCache_IPersistStorage_QueryInterface( { DataCache *this = impl_from_IPersistStorage(iface); - return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject); + return IUnknown_QueryInterface(this->outer_unk, riid, ppvObject); } /************************************************************************ @@ -1161,7 +1161,7 @@ static ULONG WINAPI DataCache_IPersistStorage_AddRef( { DataCache *this = impl_from_IPersistStorage(iface); - return IUnknown_AddRef(this->outerUnknown); + return IUnknown_AddRef(this->outer_unk); } /************************************************************************ @@ -1172,7 +1172,7 @@ static ULONG WINAPI DataCache_IPersistStorage_Release( { DataCache *this = impl_from_IPersistStorage(iface); - return IUnknown_Release(this->outerUnknown); + return IUnknown_Release(this->outer_unk); } /************************************************************************ @@ -1511,7 +1511,7 @@ static HRESULT WINAPI DataCache_IViewObject2_QueryInterface( { DataCache *this = impl_from_IViewObject2(iface); - return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject); + return IUnknown_QueryInterface(this->outer_unk, riid, ppvObject); } /************************************************************************ @@ -1522,7 +1522,7 @@ static ULONG WINAPI DataCache_IViewObject2_AddRef( { DataCache *this = impl_from_IViewObject2(iface); - return IUnknown_AddRef(this->outerUnknown); + return IUnknown_AddRef(this->outer_unk); } /************************************************************************ @@ -1533,7 +1533,7 @@ static ULONG WINAPI DataCache_IViewObject2_Release( { DataCache *this = impl_from_IViewObject2(iface); - return IUnknown_Release(this->outerUnknown); + return IUnknown_Release(this->outer_unk); } /************************************************************************ @@ -1935,7 +1935,7 @@ static HRESULT WINAPI DataCache_IOleCache2_QueryInterface( { DataCache *this = impl_from_IOleCache2(iface); - return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject); + return IUnknown_QueryInterface(this->outer_unk, riid, ppvObject); } /************************************************************************ @@ -1946,7 +1946,7 @@ static ULONG WINAPI DataCache_IOleCache2_AddRef( { DataCache *this = impl_from_IOleCache2(iface); - return IUnknown_AddRef(this->outerUnknown); + return IUnknown_AddRef(this->outer_unk); } /************************************************************************ @@ -1957,7 +1957,7 @@ static ULONG WINAPI DataCache_IOleCache2_Release( { DataCache *this = impl_from_IOleCache2(iface); - return IUnknown_Release(this->outerUnknown); + return IUnknown_Release(this->outer_unk); } /***************************************************************************** @@ -2134,7 +2134,7 @@ static HRESULT WINAPI DataCache_IOleCacheControl_QueryInterface( { DataCache *this = impl_from_IOleCacheControl(iface); - return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject); + return IUnknown_QueryInterface(this->outer_unk, riid, ppvObject); } /************************************************************************ @@ -2145,7 +2145,7 @@ static ULONG WINAPI DataCache_IOleCacheControl_AddRef( { DataCache *this = impl_from_IOleCacheControl(iface); - return IUnknown_AddRef(this->outerUnknown); + return IUnknown_AddRef(this->outer_unk); } /************************************************************************ @@ -2156,7 +2156,7 @@ static ULONG WINAPI DataCache_IOleCacheControl_Release( { DataCache *this = impl_from_IOleCacheControl(iface); - return IUnknown_Release(this->outerUnknown); + return IUnknown_Release(this->outer_unk); } /************************************************************************ @@ -2378,31 +2378,16 @@ static DataCache* DataCache_Construct( * Initialize the virtual function table. */ newObject->IDataObject_iface.lpVtbl = &DataCache_IDataObject_VTable; - newObject->IUnknown_iface.lpVtbl = &DataCache_NDIUnknown_VTable; + newObject->IUnknown_inner.lpVtbl = &DataCache_NDIUnknown_VTable; newObject->IPersistStorage_iface.lpVtbl = &DataCache_IPersistStorage_VTable; newObject->IViewObject2_iface.lpVtbl = &DataCache_IViewObject2_VTable; newObject->IOleCache2_iface.lpVtbl = &DataCache_IOleCache2_VTable; newObject->IOleCacheControl_iface.lpVtbl = &DataCache_IOleCacheControl_VTable; newObject->IAdviseSink_iface.lpVtbl = &DataCache_IAdviseSink_VTable; - - /* - * Start with one reference count. The caller of this function - * must release the interface pointer when it is done. - */ + newObject->outer_unk = pUnkOuter ? pUnkOuter : &newObject->IUnknown_inner; newObject->ref = 1; /* - * Initialize the outer unknown - * We don't keep a reference on the outer unknown since, the way - * aggregation works, our lifetime is at least as large as its - * lifetime. - */ - if (pUnkOuter==NULL) - pUnkOuter = &newObject->IUnknown_iface; - - newObject->outerUnknown = pUnkOuter; - - /* * Initialize the other members of the structure. */ newObject->sinkAspects = 0; @@ -2475,16 +2460,8 @@ HRESULT WINAPI CreateDataCache( if (newCache == 0) return E_OUTOFMEMORY; - /* - * Make sure it supports the interface required by the caller. - */ - hr = IUnknown_QueryInterface(&newCache->IUnknown_iface, riid, ppvObj); - - /* - * Release the reference obtained in the constructor. If - * the QueryInterface was unsuccessful, it will free the class. - */ - IUnknown_Release(&newCache->IUnknown_iface); + hr = IUnknown_QueryInterface(&newCache->IUnknown_inner, riid, ppvObj); + IUnknown_Release(&newCache->IUnknown_inner); return hr; }

1 0

Alistair Leslie-Hughes : propsys: Add semi-stub for PropVariantToStringAlloc.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 1807e5346f106b8cf55b176e4df9e9de2ca5d93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1807e5346f106b8cf55b176e4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:56:42 2016 +0000 propsys: Add semi-stub for PropVariantToStringAlloc. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/propsys/tests/propsys.c | 28 +++++++++++++++++++++++++++- include/propvarutil.h | 2 ++ 4 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 92b6d7c..674df2cb 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -134,7 +134,7 @@ @ stub PropVariantToInt64WithDefault @ stub PropVariantToStrRet @ stub PropVariantToString -@ stub PropVariantToStringAlloc +@ stdcall PropVariantToStringAlloc(ptr ptr) @ stub PropVariantToStringVector @ stub PropVariantToStringVectorAlloc @ stub PropVariantToStringWithDefault diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index fd22c9d..7b1cec5 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -209,6 +209,43 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) return hr; } +HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) +{ + WCHAR *res = NULL; + HRESULT hr = S_OK; + + TRACE("%p,%p semi-stub\n", propvarIn, ret); + + switch(propvarIn->vt) + { + case VT_NULL: + res = CoTaskMemAlloc(1*sizeof(WCHAR)); + res[0] = '\0'; + break; + case VT_LPSTR: + if(propvarIn->u.pszVal) + { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, propvarIn->u.pszVal, -1, NULL, 0); + res = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!res) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, propvarIn->u.pszVal, -1, res, len); + } + break; + default: + FIXME("Unsupported conversion (%d)\n", propvarIn->vt); + hr = E_FAIL; + break; + } + + *ret = res; + + return hr; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) */ diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 0dd052c..d7d83d8 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -38,6 +38,10 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(dummy_guid, 0xdeadbeef, 0xdead, 0xbeef, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0xba, 0xbe); DEFINE_GUID(expect_guid, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12); +static const char topic[] = "wine topic"; +static const WCHAR topicW[] = {'w','i','n','e',' ','t','o','p','i','c',0}; +static const WCHAR emptyW[] = {0}; + static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -150,7 +154,6 @@ static void test_PSStringFromPropertyKey(void) static void test_PSPropertyKeyFromString(void) { - static const WCHAR emptyW[] = {0}; static const WCHAR fmtid_clsidW[] = {'S','t','d','F','o','n','t',' ','1',0}; static const WCHAR fmtid_truncatedW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', '1','2','3','4','-',0}; @@ -616,6 +619,28 @@ static void test_PropVariantToGUID(void) PropVariantClear(&propvar); } +static void test_PropVariantToStringAlloc(void) +{ + PROPVARIANT prop; + WCHAR *str; + HRESULT hres; + + prop.vt = VT_NULL; + hres = PropVariantToStringAlloc(&prop, &str); + ok(hres == S_OK, "returned %x\n", hres); + ok(!lstrcmpW(str, emptyW), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(prop.u.pszVal, topic); + hres = PropVariantToStringAlloc(&prop, &str); + ok(hres == S_OK, "returned %x\n", hres); + ok(!lstrcmpW(str, topicW), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + PropVariantClear(&prop); +} + static void test_PropVariantCompare(void) { PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b; @@ -874,6 +899,7 @@ START_TEST(propsys) test_InitPropVariantFromGUIDAsString(); test_InitPropVariantFromBuffer(); test_PropVariantToGUID(); + test_PropVariantToStringAlloc(); test_PropVariantCompare(); test_intconversions(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 4791543..d0aecdb 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -77,6 +77,8 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); +HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); + #ifdef __cplusplus HRESULT InitPropVariantFromBoolean(BOOL fVal, PROPVARIANT *ppropvar);

1 0

Alistair Leslie-Hughes : propsys: Support VT_LPWSTR in PropVariantChangeType.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 173515e7333e6c06405c2999f93825aa96c82452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173515e7333e6c06405c2999f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:56:55 2016 +0000 propsys: Support VT_LPWSTR in PropVariantChangeType. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 14 ++++++++++++++ dlls/propsys/tests/propsys.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 7b1cec5..002555e 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -257,6 +257,9 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p FIXME("(%p, %p, %d, %d, %d): semi-stub!\n", ppropvarDest, propvarSrc, propvarSrc->vt, flags, vt); + if(vt == propvarSrc->vt) + return PropVariantCopy(ppropvarDest, propvarSrc); + switch (vt) { case VT_I2: @@ -325,6 +328,17 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p } return hr; } + case VT_LPWSTR: + { + WCHAR *res; + hr = PropVariantToStringAlloc(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_LPWSTR; + ppropvarDest->u.pwszVal = res; + } + return hr; + } } switch (propvarSrc->vt) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index d7d83d8..b658678 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -891,6 +891,42 @@ static void test_intconversions(void) ok(llval == -7, "got wrong value %s\n", debugstr_longlong(llval)); } +static void test_PropVariantChangeType_LPWSTR(void) +{ + PROPVARIANT dest, src; + HRESULT hr; + + PropVariantInit(&dest); + + src.vt = VT_NULL; + hr = PropVariantChangeType(&dest, &src, 0, VT_LPWSTR); + ok(hr == S_OK, "hr=%x\n", hr); + ok(dest.vt == VT_LPWSTR, "got %d\n", dest.vt); + ok(!lstrcmpW(dest.u.pwszVal, emptyW), "got %s\n", wine_dbgstr_w(dest.u.pwszVal)); + PropVariantClear(&dest); + PropVariantClear(&src); + + src.vt = VT_LPSTR; + src.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(src.u.pszVal, topic); + hr = PropVariantChangeType(&dest, &src, 0, VT_LPWSTR); + ok(hr == S_OK, "hr=%x\n", hr); + ok(dest.vt == VT_LPWSTR, "got %d\n", dest.vt); + ok(!lstrcmpW(dest.u.pwszVal, topicW), "got %s\n", wine_dbgstr_w(dest.u.pwszVal)); + PropVariantClear(&dest); + PropVariantClear(&src); + + src.vt = VT_LPWSTR; + src.u.pwszVal = CoTaskMemAlloc( (lstrlenW(topicW)+1) * sizeof(WCHAR)); + lstrcpyW(src.u.pwszVal, topicW); + hr = PropVariantChangeType(&dest, &src, 0, VT_LPWSTR); + ok(hr == S_OK, "hr=%x\n", hr); + ok(dest.vt == VT_LPWSTR, "got %d\n", dest.vt); + ok(!lstrcmpW(dest.u.pwszVal, topicW), "got %s\n", wine_dbgstr_w(dest.u.pwszVal)); + PropVariantClear(&dest); + PropVariantClear(&src); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -902,4 +938,5 @@ START_TEST(propsys) test_PropVariantToStringAlloc(); test_PropVariantCompare(); test_intconversions(); + test_PropVariantChangeType_LPWSTR(); }

1 0

Alistair Leslie-Hughes : inetcomm: Implement IMimeBody DeleteProp.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 2854c92d6315ae9a550092fa2273be96f34393f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2854c92d6315ae9a550092fa2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:57:07 2016 +0000 inetcomm: Implement IMimeBody DeleteProp. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 23 +++++++++++++++++-- dlls/inetcomm/tests/mimeole.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 766503d..2ccc162 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -898,8 +898,27 @@ static HRESULT WINAPI MimeBody_DeleteProp( LPCSTR pszName) { MimeBody *This = impl_from_IMimeBody(iface); - FIXME("(%p)->(%s) stub\n", This, debugstr_a(pszName)); - return E_NOTIMPL; + header_t *cursor; + BOOL found; + + TRACE("(%p)->(%s) stub\n", This, debugstr_a(pszName)); + + LIST_FOR_EACH_ENTRY(cursor, &This->headers, header_t, entry) + { + if(ISPIDSTR(pszName)) + found = STRTOPID(pszName) == cursor->prop->id; + else + found = !lstrcmpiA(pszName, cursor->prop->name); + + if(found) + { + list_remove(&cursor->entry); + HeapFree(GetProcessHeap(), 0, cursor); + return S_OK; + } + } + + return MIME_E_NOT_FOUND; } static HRESULT WINAPI MimeBody_CopyProps( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 8063b86..46fd1d5 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -604,6 +604,58 @@ static void test_BindToObject(void) IMimeMessage_Release(msg); } +static void test_BodyDeleteProp(void) +{ + static const char topic[] = "wine topic"; + HRESULT hr; + IMimeMessage *msg; + IMimeBody *body; + PROPVARIANT prop; + + hr = MimeOleCreateMessage(NULL, &msg); + ok(hr == S_OK, "ret %08x\n", hr); + + PropVariantInit(&prop); + + hr = IMimeMessage_BindToObject(msg, HBODY_ROOT, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_DeleteProp(body, "Subject"); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + + hr = IMimeBody_DeleteProp(body, PIDTOSTR(PID_HDR_SUBJECT)); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(prop.u.pszVal, topic); + hr = IMimeBody_SetProp(body, "Subject", 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + hr = IMimeBody_DeleteProp(body, "Subject"); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_GetProp(body, "Subject", 0, &prop); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(prop.u.pszVal, topic); + hr = IMimeBody_SetProp(body, PIDTOSTR(PID_HDR_SUBJECT), 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + hr = IMimeBody_DeleteProp(body, PIDTOSTR(PID_HDR_SUBJECT)); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_GetProp(body, PIDTOSTR(PID_HDR_SUBJECT), 0, &prop); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + + IMimeBody_Release(body); + IMimeMessage_Release(msg); +} + static void test_MimeOleGetPropertySchema(void) { HRESULT hr; @@ -627,6 +679,7 @@ START_TEST(mimeole) test_MessageGetPropInfo(); test_MessageOptions(); test_BindToObject(); + test_BodyDeleteProp(); test_MimeOleGetPropertySchema(); OleUninitialize(); }

1 0

Alistair Leslie-Hughes : inetcomm: Ignore option OID_CLEANUP_TREE_ON_SAVE.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 6e6a6ff9d5217f80547f26196346f2d3d191a0b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6a6ff9d5217f80547f26196… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:57:18 2016 +0000 inetcomm: Ignore option OID_CLEANUP_TREE_ON_SAVE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 2ccc162..f98c2db 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2509,6 +2509,9 @@ static HRESULT WINAPI MimeMessage_SetOption( case OID_SAVEBODY_KEEPBOUNDARY: FIXME("OID_SAVEBODY_KEEPBOUNDARY (value %d): ignoring\n", pValue->u.boolVal); break; + case OID_CLEANUP_TREE_ON_SAVE: + FIXME("OID_CLEANUP_TREE_ON_SAVE (value %d): ignoring\n", pValue->u.boolVal); + break; default: FIXME("Unhandled oid %08x\n", oid); hr = MIME_E_INVALID_OPTION_ID;

1 0

Alistair Leslie-Hughes : inetcomm: Return S_OK from IMimeMessgae Commit.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: bf026723597747663ae3e872051a483bdf5b7c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf026723597747663ae3e8720… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:57:30 2016 +0000 inetcomm: Return S_OK from IMimeMessgae Commit. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f98c2db..486ac57 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2077,7 +2077,7 @@ static HRESULT WINAPI MimeMessage_Commit( DWORD dwFlags) { FIXME("(%p)->(0x%x)\n", iface, dwFlags); - return E_NOTIMPL; + return S_OK; }

1 0

Alistair Leslie-Hughes : inetcomm: Support LPSTR to LPWSTR conversion in GetProp.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 16231678ca6fa3a2d9c404a0e99897ed62c77a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16231678ca6fa3a2d9c404a0e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:57:42 2016 +0000 inetcomm: Support LPSTR to LPWSTR conversion in GetProp. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/Makefile.in | 2 +- dlls/inetcomm/mimeole.c | 7 ++++++- dlls/inetcomm/tests/mimeole.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in index d3d1ded..d00aa67 100644 --- a/dlls/inetcomm/Makefile.in +++ b/dlls/inetcomm/Makefile.in @@ -1,6 +1,6 @@ MODULE = inetcomm.dll IMPORTLIB = inetcomm -IMPORTS = uuid oleaut32 ole32 ws2_32 user32 advapi32 +IMPORTS = uuid propsys oleaut32 ole32 ws2_32 user32 advapi32 C_SRCS = \ imaptransport.c \ diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 486ac57..f4537f3 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -31,6 +31,7 @@ #include "objbase.h" #include "ole2.h" #include "mimeole.h" +#include "propvarutil.h" #include "wine/list.h" #include "wine/debug.h" @@ -785,7 +786,11 @@ static HRESULT WINAPI MimeBody_GetProp( hr = find_prop(This, pszName, &header); if(hr == S_OK) { - PropVariantCopy(pValue, &header->value); + TRACE("type %d->%d\n", header->value.vt, pValue->vt); + + hr = PropVariantChangeType(pValue, &header->value, 0, pValue->vt); + if(FAILED(hr)) + FIXME("Conversion not currently supported (%d->%d)\n", header->value.vt, pValue->vt); } return hr; diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 46fd1d5..84b2c8d 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -335,6 +335,7 @@ static void test_CreateMessage(void) static void test_MessageSetProp(void) { static const char topic[] = "wine topic"; + static const WCHAR topicW[] = {'w','i','n','e',' ','t','o','p','i','c',0}; HRESULT hr; IMimeMessage *msg; IMimeBody *body; @@ -370,6 +371,7 @@ static void test_MessageSetProp(void) hr = IMimeBody_GetProp(body, "Wine-Topic", 0, &prop); ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + prop.vt = VT_LPSTR; hr = IMimeBody_GetProp(body, "Thread-Topic", 0, &prop); ok(hr == S_OK, "ret %08x\n", hr); if(hr == S_OK) @@ -386,6 +388,7 @@ static void test_MessageSetProp(void) ok(hr == S_OK, "ret %08x\n", hr); PropVariantClear(&prop); + prop.vt = VT_LPSTR; hr = IMimeBody_GetProp(body, PIDTOSTR(PID_HDR_SUBJECT), 0, &prop); ok(hr == S_OK, "ret %08x\n", hr); if(hr == S_OK) @@ -396,6 +399,7 @@ static void test_MessageSetProp(void) } /* Using the name or PID returns the same result. */ + prop.vt = VT_LPSTR; hr = IMimeBody_GetProp(body, "Subject", 0, &prop); ok(hr == S_OK, "ret %08x\n", hr); if(hr == S_OK) @@ -405,6 +409,16 @@ static void test_MessageSetProp(void) PropVariantClear(&prop); } + prop.vt = VT_LPWSTR; + hr = IMimeBody_GetProp(body, "Subject", 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + if(hr == S_OK) + { + ok(prop.vt == VT_LPWSTR, "type %d\n", prop.vt); + ok(!lstrcmpW(prop.u.pwszVal, topicW), "got %s\n", wine_dbgstr_w(prop.u.pwszVal)); + PropVariantClear(&prop); + } + prop.vt = VT_LPSTR; prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); strcpy(prop.u.pszVal, topic);

1 0

Alistair Leslie-Hughes : include: Complete IMimeAddressTable interface definition.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: b77aa5cafb81890833a4d09e35b30b07bdc69221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77aa5cafb81890833a4d09e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:58:00 2016 +0000 include: Complete IMimeAddressTable interface definition. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 437781d..9b7826d 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -705,6 +705,22 @@ cpp_quote("#endif") AFT_RFC822_TRANSMIT, } ADDRESSFORMAT; + cpp_quote("#define IAT_UNKNOWN 0x00000000") + cpp_quote("#define IAT_FROM 0x00000001") + cpp_quote("#define IAT_SENDER 0x00000002") + cpp_quote("#define IAT_TO 0x00000004") + cpp_quote("#define IAT_CC 0x00000008") + cpp_quote("#define IAT_BCC 0x00000010") + cpp_quote("#define IAT_REPLYTO 0x00000020") + cpp_quote("#define IAT_RETURNPATH 0x00000040") + cpp_quote("#define IAT_RETRCPTTO 0x00000080") + cpp_quote("#define IAT_RR 0x00000100") + cpp_quote("#define IAT_APPARTO 0x00000200") + cpp_quote("#define IAT_DISP_NOTIFICATION_TO 0x00000400") + cpp_quote("#define IAT_ALL 0xffffffff") + cpp_quote("#define IAT_KNOWN (IAT_FROM | IAT_TO | IAT_CC | IAT_BCC | IAT_REPLYTO | IAT_SENDER)") + cpp_quote("#define IAT_RECIPS (IAT_TO | IAT_CC | IAT_BCC)") + typedef struct tagADDRESSPROPS { DWORD dwProps; @@ -723,13 +739,89 @@ cpp_quote("#endif") DWORD dwReserved2; } ADDRESSPROPS, *LPADDRESSPROPS; + cpp_quote("#define IAP_CHARSET 0x00000001") + cpp_quote("#define IAP_HANDLE 0x00000002") + cpp_quote("#define IAP_ADRTYPE 0x00000004") + cpp_quote("#define IAP_FRIENDLY 0x00000008") + cpp_quote("#define IAP_EMAIL 0x00000020") + cpp_quote("#define IAP_CERTSTATE 0x00000100") + cpp_quote("#define IAP_SIGNING_PRINT 0x00000200") + cpp_quote("#define IAP_ENCRYPTION_PRINT 0x00000400") + cpp_quote("#define IAP_ENCODING 0x00000800") + cpp_quote("#define IAP_COOKIE 0x00001000") + cpp_quote("#define IAP_FRIENDLYW 0x00002000") + cpp_quote("#define IAP_ALL 0xffffffff") + typedef struct tagADDRESSLIST { ULONG cAdrs; LPADDRESSPROPS prgAdr; } ADDRESSLIST, *LPADDRESSLIST; - /* FIXME: fill this in */ + HRESULT Append( + [in] DWORD addrtype, + [in] ENCODINGTYPE encoding, + [in] const char *friendly, + [in,unique] const char *email, + [in,out,unique] HADDRESS *address); + + HRESULT Insert( + [in] ADDRESSPROPS *addressprop, + [in,out,unique] HADDRESS *address); + + HRESULT SetProps( + [in] HADDRESS address, + [in] ADDRESSPROPS *addressprop); + + HRESULT GetProps( + [in] HADDRESS address, + [in] ADDRESSPROPS *addressprop); + + HRESULT GetSender( + [in,out] ADDRESSPROPS *addressprop); + + HRESULT CountTypes( + [in] DWORD addrtype, + [out] ULONG *count); + + HRESULT GetTypes( + [in] DWORD addrtype, + [in] DWORD dwProps, + [in,out] ADDRESSLIST *list); + + HRESULT EnumTypes( + [in] DWORD addrtype, + [in] DWORD props, + [out] IMimeEnumAddressTypes **types); + + HRESULT Delete( + [in] HADDRESS hAddress); + + HRESULT DeleteTypes( + [in] DWORD addrtype); + + HRESULT GetFormat( + [in] DWORD addrtype, + [in] ADDRESSFORMAT addrformat, + [out] char **format); + + HRESULT AppendRfc822( + [in] DWORD addrtype, + [in] ENCODINGTYPE encoding, + [in] const char *rfcaddr); + + HRESULT ParseRfc822( + [in] DWORD addrtype, + [in] ENCODINGTYPE encoding, + [in] const char *rfcaddr, + [in,out] ADDRESSLIST *list); + + HRESULT Clone( + [out] IMimeAddressTable **table); + + HRESULT BindToObject( + [in] REFIID riid, + [out, iid_is(riid)] void **obj); } [

1 0

Andrey Gusev : wined3d: Fix a typo in comment.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 83f72793f06c3b539b80b346fbb39839423f38e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f72793f06c3b539b80b346f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jul 5 15:38:25 2016 +0300 wined3d: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b157389..98e78da 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3736,7 +3736,7 @@ void clipplane(struct wined3d_context *context, const struct wined3d_state *stat gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW]._11); else /* With vertex shaders, clip planes are not transformed in Direct3D, - * while in OpenGL they are still transformed by the model view matix. */ + * while in OpenGL they are still transformed by the model view matrix. */ gl_info->gl_ops.gl.p_glLoadIdentity(); plane[0] = state->clip_planes[index].x;

1 0

Józef Kucia : wined3d: Implement d3d11_immediate_context_Begin().
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: ed9b4ca3b7b04d3a47e149add50197a91d5a51df URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9b4ca3b7b04d3a47e149add… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:29 2016 +0200 wined3d: Implement d3d11_immediate_context_Begin(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 5 +++++ dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 10 +++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index c100e73..f91a053 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -171,6 +171,11 @@ struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) return CONTAINING_RECORD(iface, struct d3d_query, ID3D11Query_iface); } +struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) +{ + return unsafe_impl_from_ID3D11Query((ID3D11Query *)iface); +} + /* ID3D10Query methods */ static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 8fde578..6fd5210 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -464,6 +464,7 @@ HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc struct d3d_query **query) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; +struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) DECLSPEC_HIDDEN; /* ID3D11DeviceContext - immediate context */ struct d3d11_immediate_context diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2fa0f9d..ed902c7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -492,7 +492,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_Begin(ID3D11DeviceContext *iface, ID3D11Asynchronous *asynchronous) { - FIXME("iface %p, asynchronous %p stub!\n", iface, asynchronous); + struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); + HRESULT hr; + + TRACE("iface %p, asynchronous %p.\n", iface, asynchronous); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_BEGIN))) + ERR("Failed to issue query, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_End(ID3D11DeviceContext *iface,

1 0