January 2017 - Wine-Commits

André Hentschel : kernel32: Fix some spec file entries.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 92efdb108e2f911e40a35ca676d1f0d6860cf88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=92efdb108e2f911e40a35ca67… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:58:48 2017 +0100 kernel32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-sidebyside-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec index bad0023..0bf78e2 100644 --- a/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec +++ b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec @@ -1,7 +1,7 @@ @ stdcall ActivateActCtx(ptr ptr) kernel32.ActivateActCtx @ stdcall AddRefActCtx(ptr) kernel32.AddRefActCtx @ stdcall CreateActCtxW(ptr) kernel32.CreateActCtxW -@ stdcall DeactivateActCtx(long ptr) kernel32.DeactivateActCtx +@ stdcall DeactivateActCtx(long long) kernel32.DeactivateActCtx @ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) kernel32.FindActCtxSectionGuid @ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) kernel32.FindActCtxSectionStringW @ stdcall GetCurrentActCtx(ptr) kernel32.GetCurrentActCtx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 06b89de..a6cefef 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -348,7 +348,7 @@ @ stdcall CreateWaitableTimerExW(ptr wstr long long) @ stdcall CreateWaitableTimerW(ptr long wstr) # @ stub CtrlRoutine -@ stdcall DeactivateActCtx(long ptr) +@ stdcall DeactivateActCtx(long long) @ stdcall DebugActiveProcess(long) @ stdcall DebugActiveProcessStop(long) @ stdcall DebugBreak() @@ -564,7 +564,7 @@ # @ stub GetCalendarSupportedDateRange # @ stub GetCalendarWeekNumber # @ stub GetComPlusPackageInstallStatus -@ stdcall GetCommConfig(long ptr long) +@ stdcall GetCommConfig(long ptr ptr) @ stdcall GetCommMask(long ptr) @ stdcall GetCommModemStatus(long ptr) @ stdcall GetCommProperties(long ptr) @@ -640,8 +640,8 @@ @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) @ stdcall GetDateFormatW(long long ptr wstr ptr long) @ stdcall GetDaylightFlag() -@ stdcall GetDefaultCommConfigA(str ptr long) -@ stdcall GetDefaultCommConfigW(wstr ptr long) +@ stdcall GetDefaultCommConfigA(str ptr ptr) +@ stdcall GetDefaultCommConfigW(wstr ptr ptr) @ stub GetDefaultSortkeySize @ stdcall GetDevicePowerState(long ptr) @ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) @@ -1329,7 +1329,7 @@ # @ stub SetComPlusPackageInstallStatus @ stdcall SetCommBreak(long) @ stdcall SetCommConfig(long ptr long) -@ stdcall SetCommMask(long ptr) +@ stdcall SetCommMask(long long) @ stdcall SetCommState(long ptr) @ stdcall SetCommTimeouts(long ptr) @ stdcall SetComputerNameA(str)

1 0

Nikolay Sivov : oledb32: Fixed IDataInitialize definition.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 37fcb0d630545f4b8daf96d6da65a04cfd7dc85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=37fcb0d630545f4b8daf96d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 29 21:30:23 2017 +0300 oledb32: Fixed IDataInitialize definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 10 +++++----- include/msdasc.idl | 10 ++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 42d5dae..8d6b8ef 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -918,13 +918,13 @@ static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID return CoCreateInstance(provider, outer, clsctx, riid, (void**)datasource); } -static HRESULT WINAPI datainit_RemoteCreateDBInstanceEx(IDataInitialize *iface, REFCLSID clsidProvider, - IUnknown *pUnkOuter, DWORD dwClsCtx, LPWSTR pwszReserved, COSERVERINFO *pServerInfo, - DWORD cmq, GUID **rgpIID, IUnknown **rgpItf, HRESULT *rghr) +static HRESULT WINAPI datainit_CreateDBInstanceEx(IDataInitialize *iface, REFCLSID provider, IUnknown *outer, + DWORD clsctx, LPWSTR reserved, COSERVERINFO *server_info, DWORD cmq, MULTI_QI *results) { datainit *This = impl_from_IDataInitialize(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s %p %#x %s %p %u %p)\n", This, debugstr_guid(provider), outer, clsctx, + debugstr_w(reserved), server_info, cmq, results); return E_NOTIMPL; } @@ -958,7 +958,7 @@ static const struct IDataInitializeVtbl datainit_vtbl = datainit_GetDataSource, datainit_GetInitializationString, datainit_CreateDBInstance, - datainit_RemoteCreateDBInstanceEx, + datainit_CreateDBInstanceEx, datainit_LoadStringFromStorage, datainit_WriteStringToStorage }; diff --git a/include/msdasc.idl b/include/msdasc.idl index e3efb1d..6a904ba 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -102,10 +102,16 @@ library MSDASC [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] REFIID riid, [out] IUnknown** ppDataSource); + [local] + HRESULT CreateDBInstanceEx([in] REFCLSID clsidProvider, [in] IUnknown* pUnkOuter, + [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] COSERVERINFO* pServerInfo, + [in] DWORD cmq, [in, out, size_is(cmq)] MULTI_QI *results); + + [call_as(CreateDBInstanceEx)] HRESULT RemoteCreateDBInstanceEx([in] REFCLSID clsidProvider, [in] IUnknown* pUnkOuter, [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] COSERVERINFO* pServerInfo, - [in] DWORD cmq, [in] GUID** rgpIID, [out] IUnknown** rgpItf, - [out] HRESULT* rghr); + [in] DWORD cmq, [in, size_is(cmq)] const IID **iids, [out, size_is(cmq)] IUnknown **ifs, + [out, size_is(cmq)] HRESULT *hr); HRESULT LoadStringFromStorage([in] LPWSTR pwszFileName, [out] LPWSTR* ppwszInitializationString);

1 0

Jacek Caban : inetcomm: Return a new instance of stream in IMimeBody:: GetData.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 0b8066674b465c44642d6584a5e706d6c1a590f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8066674b465c44642d6584a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:59:35 2017 +0100 inetcomm: Return a new instance of stream in IMimeBody::GetData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 74b834c..0f0da61 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -442,6 +442,22 @@ static HRESULT create_sub_stream(IStream *stream, ULARGE_INTEGER start, ULARGE_I return S_OK; } +static HRESULT get_stream_size(IStream *stream, ULARGE_INTEGER *size) +{ + STATSTG statstg = {NULL}; + LARGE_INTEGER zero; + HRESULT hres; + + hres = IStream_Stat(stream, &statstg, STATFLAG_NONAME); + if(SUCCEEDED(hres)) { + *size = statstg.cbSize; + return S_OK; + } + + zero.QuadPart = 0; + return IStream_Seek(stream, zero, STREAM_SEEK_END, size); +} + static inline MimeBody *impl_from_IMimeBody(IMimeBody *iface) { return CONTAINING_RECORD(iface, MimeBody, IMimeBody_iface); @@ -1505,11 +1521,16 @@ static HRESULT WINAPI MimeBody_GetData( IStream** ppStream) { MimeBody *This = impl_from_IMimeBody(iface); + ULARGE_INTEGER start, size; + HRESULT hres; + FIXME("(%p)->(%d, %p). Ignoring encoding type.\n", This, ietEncoding, ppStream); - *ppStream = This->data; - IStream_AddRef(*ppStream); - return S_OK; + start.QuadPart = 0; + hres = get_stream_size(This->data, &size); + if(SUCCEEDED(hres)) + hres = create_sub_stream(This->data, start, size, ppStream); + return hres; } static HRESULT WINAPI MimeBody_SetData(

1 0

Jacek Caban : inetcomm: Moved sub_stream_t implementation before MimeBody implementation.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: bb5056eaf44629cc56305d5ec59a6e5ad4c5906c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5056eaf44629cc56305d5ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:59:08 2017 +0100 inetcomm: Moved sub_stream_t implementation before MimeBody implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 2287 +++++++++++++++++++++++------------------------ 1 file changed, 1142 insertions(+), 1145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb5056eaf44629cc56305…

1 0

Jacek Caban : inetcomm/tests: Added a helper for creating stream from string.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: c99b874a68a3ab9a6c767ae1993c633a99718713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99b874a68a3ab9a6c767ae19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:59:43 2017 +0100 inetcomm/tests: Added a helper for creating stream from string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 924e0e3..7e510c5 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -82,6 +82,25 @@ static void test_CreateSecurity(void) IMimeSecurity_Release(sec); } +static IStream *create_stream_from_string(const char *data) +{ + LARGE_INTEGER off; + IStream *stream; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IStream_Write(stream, data, strlen(data), NULL); + ok(hr == S_OK, "Write failed: %08x\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(stream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Seek failed: %08x\n", hr); + + return stream; +} + static void test_CreateBody(void) { HRESULT hr; @@ -103,11 +122,7 @@ static void test_CreateBody(void) ok(hr == MIME_E_NO_DATA, "ret %08x\n", hr); ok(handle == NULL, "handle %p\n", handle); - hr = CreateStreamOnHGlobal(NULL, TRUE, &in); - ok(hr == S_OK, "ret %08x\n", hr); - IStream_Write(in, msg1, sizeof(msg1) - 1, NULL); - off.QuadPart = 0; - IStream_Seek(in, off, STREAM_SEEK_SET, NULL); + in = create_stream_from_string(msg1); /* Need to call InitNew before Load otherwise Load crashes with native inetcomm */ hr = IMimeBody_InitNew(body); @@ -212,7 +227,6 @@ static void test_CreateMessage(void) HRESULT hr; IMimeMessage *msg; IStream *stream; - LARGE_INTEGER pos; LONG ref; HBODY hbody, hbody2; IMimeBody *body; @@ -230,10 +244,7 @@ static void test_CreateMessage(void) hr = MimeOleCreateMessage(NULL, &msg); ok(hr == S_OK, "ret %08x\n", hr); - CreateStreamOnHGlobal(NULL, TRUE, &stream); - IStream_Write(stream, msg1, sizeof(msg1) - 1, NULL); - pos.QuadPart = 0; - IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + stream = create_stream_from_string(msg1); hr = IMimeMessage_Load(msg, stream); ok(hr == S_OK, "ret %08x\n", hr);

1 0

Nikolay Sivov : xmllite/tests: Test Read() with NULL type argument.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 7e635876f41007aed18fa2c5b297fc9ae1fdd3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e635876f41007aed18fa2c5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 11:17:43 2017 +0300 xmllite/tests: Test Read() with NULL type argument. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7144df7..dc586e8 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1841,8 +1841,7 @@ static void test_read_attribute(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); + hr = IXmlReader_Read(reader, NULL); if (test->hr_broken) ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); @@ -1854,6 +1853,10 @@ static void test_read_attribute(void) WCHAR *str_exp; UINT len; + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "Failed to get node type, %#x\n", hr); + ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); hr = IXmlReader_MoveToFirstAttribute(reader);

1 0

Nikolay Sivov : xmllite/reader: Handle NULL argument in GetNodeType().
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 1ed0631e5dccd51a4209442fb4ef370acc8d9be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed0631e5dccd51a4209442fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 11:17:41 2017 +0300 xmllite/reader: Handle NULL argument in GetNodeType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 ++++ dlls/xmllite/tests/reader.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index de61d13..1bb1cab 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2786,8 +2786,12 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node_type) { xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, node_type); + if (!node_type) + return E_INVALIDARG; + *node_type = reader_get_nodetype(This); return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 8e50b13..7144df7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -427,6 +427,13 @@ static void test_reader_create(void) ok(hr == S_FALSE, "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); + /* crashes on XP, 2k3, works on newer versions */ + if (0) + { + hr = IXmlReader_GetNodeType(reader, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + } + resolver = (void*)0xdeadbeef; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Jacek Caban : inetcomm: Don' t restore base stream position in sub stream Read.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 393512d03b4f7c8d74137b78ed48f4c26552b13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=393512d03b4f7c8d74137b78e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:59:21 2017 +0100 inetcomm: Don't restore base stream position in sub stream Read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index c06b740..74b834c 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -230,13 +230,10 @@ static HRESULT WINAPI sub_stream_Read( { sub_stream_t *This = impl_from_IStream(iface); HRESULT hr; - ULARGE_INTEGER base_pos; LARGE_INTEGER tmp_pos; TRACE("(%p, %d, %p)\n", pv, cb, pcbRead); - tmp_pos.QuadPart = 0; - IStream_Seek(This->base, tmp_pos, STREAM_SEEK_CUR, &base_pos); tmp_pos.QuadPart = This->pos.QuadPart + This->start.QuadPart; IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL); @@ -247,9 +244,6 @@ static HRESULT WINAPI sub_stream_Read( This->pos.QuadPart += *pcbRead; - tmp_pos.QuadPart = base_pos.QuadPart; - IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL); - return hr; }

1 0

Jacek Caban : inetcomm/tests: Added more IMimeBody:: SetData and GetData tests.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: b0902a487d3c7de62f391e5599a89e63a0639d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0902a487d3c7de62f391e559… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 16:00:03 2017 +0100 inetcomm/tests: Added more IMimeBody::SetData and GetData tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 275 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 7e510c5..9fbaeec 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -32,6 +32,36 @@ #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + expect_ ## func = FALSE; \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(Stream_Read); +DEFINE_EXPECT(Stream_Stat); +DEFINE_EXPECT(Stream_Seek); +DEFINE_EXPECT(Stream_Seek_END); + static const char msg1[] = "MIME-Version: 1.0\r\n" "Content-Type: multipart/mixed;\r\n" @@ -212,6 +242,250 @@ static void test_CreateBody(void) IMimeBody_Release(body); } +typedef struct { + IStream IStream_iface; + LONG ref; + unsigned pos; +} TestStream; + +static inline TestStream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, TestStream, IStream_iface); +} + +static HRESULT WINAPI Stream_QueryInterface(IStream *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ISequentialStream, riid) || IsEqualGUID(&IID_IStream, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Stream_AddRef(IStream *iface) +{ + TestStream *This = impl_from_IStream(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI Stream_Release(IStream *iface) +{ + TestStream *This = impl_from_IStream(iface); + return InterlockedDecrement(&This->ref); +} + +static HRESULT WINAPI Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) +{ + TestStream *This = impl_from_IStream(iface); + BYTE *output = pv; + unsigned i; + + CHECK_EXPECT(Stream_Read); + + for(i = 0; i < cb; i++) + output[i] = '0' + This->pos++; + *pcbRead = i; + return S_OK; +} + +static HRESULT WINAPI Stream_Write(IStream *iface, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static DWORD expect_seek_pos; + +static HRESULT WINAPI Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, + ULARGE_INTEGER *plibNewPosition) +{ + TestStream *This = impl_from_IStream(iface); + + if(dwOrigin == STREAM_SEEK_END) { + CHECK_EXPECT(Stream_Seek_END); + ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %u\n", dlibMove.u.LowPart); + if(plibNewPosition) + plibNewPosition->QuadPart = 10; + return S_OK; + } + + CHECK_EXPECT(Stream_Seek); + + ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %u\n", dlibMove.u.LowPart); + ok(dwOrigin == STREAM_SEEK_SET, "dwOrigin = %d\n", dwOrigin); + This->pos = dlibMove.QuadPart; + if(plibNewPosition) + plibNewPosition->QuadPart = This->pos; + return S_OK; +} + +static HRESULT WINAPI Stream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER cb, + ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Commit(IStream *iface, DWORD grfCommitFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Revert(IStream *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_UnlockRegion(IStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Stat(IStream *iface, STATSTG *pstatstg, DWORD dwStatFlag) +{ + CHECK_EXPECT(Stream_Stat); + ok(dwStatFlag == STATFLAG_NONAME, "dwStatFlag = %x\n", dwStatFlag); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Clone(IStream *iface, IStream **ppstm) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl StreamVtbl = { + Stream_QueryInterface, + Stream_AddRef, + Stream_Release, + Stream_Read, + Stream_Write, + Stream_Seek, + Stream_SetSize, + Stream_CopyTo, + Stream_Commit, + Stream_Revert, + Stream_LockRegion, + Stream_UnlockRegion, + Stream_Stat, + Stream_Clone +}; + +static TestStream *create_test_stream(void) +{ + TestStream *stream; + stream = HeapAlloc(GetProcessHeap(), 0, sizeof(*stream)); + stream->IStream_iface.lpVtbl = &StreamVtbl; + stream->ref = 1; + stream->pos = 0; + return stream; +} + +#define test_stream_read(a,b,c,d) _test_stream_read(__LINE__,a,b,c,d) +static void _test_stream_read(unsigned line, IStream *stream, HRESULT exhres, const char *exdata, unsigned read_size) +{ + ULONG read = 0xdeadbeed, exread = strlen(exdata); + char buf[1024]; + HRESULT hres; + + if(read_size == -1) + read_size = sizeof(buf)-1; + + hres = IStream_Read(stream, buf, read_size, &read); + ok_(__FILE__,line)(hres == exhres, "Read returned %08x, expected %08x\n", hres, exhres); + ok_(__FILE__,line)(read == exread, "unexpected read size %u, expected %u\n", read, exread); + buf[read] = 0; + ok_(__FILE__,line)(read == exread && !memcmp(buf, exdata, read), "unexpected data %s\n", buf); +} + +static void test_SetData(void) +{ + IStream *stream, *stream2; + TestStream *test_stream; + IMimeBody *body; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + + /* Need to call InitNew before Load otherwise Load crashes with native inetcomm */ + hr = IMimeBody_InitNew(body); + ok(hr == S_OK, "ret %08x\n", hr); + + stream = create_stream_from_string(msg1); + hr = IMimeBody_Load(body, stream); + ok(hr == S_OK, "ret %08x\n", hr); + IStream_Release(stream); + + test_stream = create_test_stream(); + hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, &test_stream->IStream_iface); + + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_IsContentType(body, "text", "plain"); + todo_wine + ok(hr == S_OK, "ret %08x\n", hr); + + SET_EXPECT(Stream_Stat); + SET_EXPECT(Stream_Seek_END); + hr = IMimeBody_GetData(body, IET_BINARY, &stream); + CHECK_CALLED(Stream_Stat); + CHECK_CALLED(Stream_Seek_END); + ok(hr == S_OK, "GetData failed %08x\n", hr); + ok(stream != &test_stream->IStream_iface, "unexpected stream\n"); + + SET_EXPECT(Stream_Seek); + SET_EXPECT(Stream_Read); + test_stream_read(stream, S_OK, "012", 3); + CHECK_CALLED(Stream_Seek); + CHECK_CALLED(Stream_Read); + + SET_EXPECT(Stream_Stat); + SET_EXPECT(Stream_Seek_END); + hr = IMimeBody_GetData(body, IET_BINARY, &stream2); + CHECK_CALLED(Stream_Stat); + CHECK_CALLED(Stream_Seek_END); + ok(hr == S_OK, "GetData failed %08x\n", hr); + ok(stream2 != stream, "unexpected stream\n"); + + SET_EXPECT(Stream_Seek); + SET_EXPECT(Stream_Read); + test_stream_read(stream2, S_OK, "01", 2); + CHECK_CALLED(Stream_Seek); + CHECK_CALLED(Stream_Read); + + expect_seek_pos = 3; + SET_EXPECT(Stream_Seek); + SET_EXPECT(Stream_Read); + test_stream_read(stream, S_OK, "345", 3); + CHECK_CALLED(Stream_Seek); + CHECK_CALLED(Stream_Read); + + IStream_Release(stream); + IStream_Release(stream2); + IStream_Release(&test_stream->IStream_iface); + IMimeBody_Release(body); +} + static void test_Allocator(void) { HRESULT hr; @@ -844,6 +1118,7 @@ START_TEST(mimeole) test_CreateVirtualStream(); test_CreateSecurity(); test_CreateBody(); + test_SetData(); test_Allocator(); test_CreateMessage(); test_MessageSetProp();

1 0

Jacek Caban : inetcomm: Added support for decoding base64 in IMimeBody:: GetData.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 915acd68de3531348d36bd31a02413b122554221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915acd68de3531348d36bd31a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 16:01:07 2017 +0100 inetcomm: Added support for decoding base64 in IMimeBody::GetData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 95 ++++++++++++++++++++++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 22 ++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 0f0da61..90a5dd4 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1515,6 +1515,88 @@ static HRESULT WINAPI MimeBody_GetDataHere( return E_NOTIMPL; } +static const signed char base64_decode_table[] = +{ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00 */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10 */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20 */ + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30 */ + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40 */ + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50 */ + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60 */ + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 /* 0x70 */ +}; + +static HRESULT decode_base64(IStream *input, IStream **ret_stream) +{ + const unsigned char *ptr, *end; + unsigned char buf[1024]; + LARGE_INTEGER pos; + unsigned char *ret; + unsigned char in[4]; + IStream *output; + DWORD size; + int n = 0; + HRESULT hres; + + pos.QuadPart = 0; + hres = IStream_Seek(input, pos, STREAM_SEEK_SET, NULL); + if(FAILED(hres)) + return hres; + + hres = CreateStreamOnHGlobal(NULL, TRUE, &output); + if(FAILED(hres)) + return hres; + + while(1) { + hres = IStream_Read(input, buf, sizeof(buf), &size); + if(FAILED(hres) || !size) + break; + + ptr = ret = buf; + end = buf + size; + + while(1) { + /* skip invalid chars */ + while(ptr < end && + (*ptr >= sizeof(base64_decode_table)/sizeof(*base64_decode_table) + || base64_decode_table[*ptr] == -1)) + ptr++; + if(ptr == end) + break; + + in[n++] = base64_decode_table[*ptr++]; + switch(n) { + case 2: + *ret++ = in[0] << 2 | in[1] >> 4; + continue; + case 3: + *ret++ = in[1] << 4 | in[2] >> 2; + continue; + case 4: + *ret++ = ((in[2] << 6) & 0xc0) | in[3]; + n = 0; + } + } + + if(ret > buf) { + hres = IStream_Write(output, buf, ret - buf, NULL); + if(FAILED(hres)) + break; + } + } + + if(SUCCEEDED(hres)) + hres = IStream_Seek(output, pos, STREAM_SEEK_SET, NULL); + if(FAILED(hres)) { + IStream_Release(output); + return hres; + } + + *ret_stream = output; + return S_OK; +} + static HRESULT WINAPI MimeBody_GetData( IMimeBody* iface, ENCODINGTYPE ietEncoding, @@ -1524,7 +1606,18 @@ static HRESULT WINAPI MimeBody_GetData( ULARGE_INTEGER start, size; HRESULT hres; - FIXME("(%p)->(%d, %p). Ignoring encoding type.\n", This, ietEncoding, ppStream); + TRACE("(%p)->(%d %p)\n", This, ietEncoding, ppStream); + + if(This->encoding != ietEncoding) { + switch(This->encoding) { + case IET_BASE64: + if(ietEncoding != IET_BINARY) + FIXME("Encofing %d is not supported.\n", ietEncoding); + return decode_base64(This->data, ppStream); + default: + FIXME("Decoding %d is not supported.\n", This->encoding); + } + } start.QuadPart = 0; hres = get_stream_size(This->data, &size); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 5d7bb9a..0765396 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -494,6 +494,28 @@ static void test_SetData(void) IStream_Release(stream); IStream_Release(stream2); IStream_Release(&test_stream->IStream_iface); + + stream = create_stream_from_string(" \t\r\n|}~YWJj ZGV|}~mZw== \t"); /* "abcdefg" in base64 obscured by invalid chars */ + hr = IMimeBody_SetData(body, IET_BASE64, "text", "plain", &IID_IStream, stream); + IStream_Release(stream); + ok(hr == S_OK, "SetData failed: %08x\n", hr); + + test_current_encoding(body, IET_BASE64); + + hr = IMimeBody_GetData(body, IET_BINARY, &stream); + ok(hr == S_OK, "GetData failed %08x\n", hr); + + test_stream_read(stream, S_OK, "abc", 3); + test_stream_read(stream, S_OK, "defg", -1); + + IStream_Release(stream); + + hr = IMimeBody_GetData(body, IET_BASE64, &stream); + ok(hr == S_OK, "GetData failed %08x\n", hr); + + test_stream_read(stream, S_OK, " \t\r", 3); + IStream_Release(stream); + IMimeBody_Release(body); }

1 0