Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[akhaldi] 74107: [INETCOMM_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:37:58 2017 New Revision: 74107 URL: http://svn.reactos.org/svn/reactos?rev=74107&view=rev Log: [INETCOMM_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/inetcomm/CMakeLists.txt trunk/rostests/winetests/inetcomm/mimeole.c Modified: trunk/rostests/winetests/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/CMakeL… ============================================================================== --- trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] Sun Mar 5 21:37:58 2017 @@ -8,5 +8,5 @@ add_executable(inetcomm_winetest ${SOURCE}) set_module_type(inetcomm_winetest win32cui) -add_importlibs(inetcomm_winetest inetcomm oleaut32 ole32 msvcrt kernel32) +add_importlibs(inetcomm_winetest inetcomm oleaut32 ole32 urlmon msvcrt kernel32) add_rostests_file(TARGET inetcomm_winetest) Modified: trunk/rostests/winetests/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/mimeol… ============================================================================== --- trunk/rostests/winetests/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/rostests/winetests/inetcomm/mimeole.c [iso-8859-1] Sun Mar 5 21:37:58 2017 @@ -27,10 +27,46 @@ #include "ocidl.h" #include "mimeole.h" +#include "wininet.h" #include <stdio.h> #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); +DEFINE_EXPECT(GetBindInfo); +DEFINE_EXPECT(ReportProgress_MIMETYPEAVAILABLE); +DEFINE_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); +DEFINE_EXPECT(ReportData); +DEFINE_EXPECT(ReportResult); static const char msg1[] = "MIME-Version: 1.0\r\n" @@ -60,6 +96,43 @@ "More stuff\r\n" "--------------1.5.0.6--\r\n"; +static const char mhtml_page1[] = + "MIME-Version: 1.0\r\n" + "Content-Type: multipart/related; type:=\"text/html\"; boundary=\"----=_NextPart_000_00\"\r\n" + "\r\n" + "------=_NextPart_000_00\r\n" + "Content-Type: text/html; charset=\"Windows-1252\"\r\n" + "Content-Transfer-Encoding: quoted-printable\r\n" + "\r\n" + "<HTML></HTML>\r\n" + "------=_NextPart_000_00\r\n" + "Content-Type: Image/Jpeg\r\n" + "Content-Transfer-Encoding: base64\r\n" + "Content-Location: http://winehq.org/mhtmltest.html\r\n" + "\r\n\t\t\t\tVGVzdA==\r\n\r\n" + "------=_NextPart_000_00--"; + +static WCHAR *a2w(const char *str) +{ + WCHAR *ret; + int len; + + if(!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static int strcmp_wa(const WCHAR *strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + static void test_CreateVirtualStream(void) { HRESULT hr; @@ -80,6 +153,36 @@ ok(hr == S_OK, "ret %08x\n", hr); 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; +} + +#define test_current_encoding(a,b) _test_current_encoding(__LINE__,a,b) +static void _test_current_encoding(unsigned line, IMimeBody *mime_body, ENCODINGTYPE encoding) +{ + ENCODINGTYPE current_encoding; + HRESULT hres; + + hres = IMimeBody_GetCurrentEncoding(mime_body, &current_encoding); + ok_(__FILE__,line)(hres == S_OK, "GetCurrentEncoding failed: %08x\n", hres); + ok_(__FILE__,line)(current_encoding == encoding, "encoding = %d, expected %d\n", current_encoding, encoding); } static void test_CreateBody(void) @@ -90,7 +193,6 @@ IStream *in; LARGE_INTEGER off; ULARGE_INTEGER pos; - ENCODINGTYPE enc; ULONG count, found_param, i; MIMEPARAMINFO *param_info; IMimeAllocator *alloc; @@ -103,19 +205,13 @@ 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); ok(hr == S_OK, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(body, &enc); - ok(hr == S_OK, "ret %08x\n", hr); - ok(enc == IET_7BIT, "encoding %d\n", enc); + test_current_encoding(body, IET_7BIT); hr = IMimeBody_Load(body, in); ok(hr == S_OK, "ret %08x\n", hr); @@ -137,9 +233,7 @@ hr = IMimeBody_IsContentType(body, "text", "plain"); todo_wine ok(hr == S_OK, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(body, &enc); - ok(hr == S_OK, "ret %08x\n", hr); - ok(enc == IET_8BIT, "encoding %d\n", enc); + test_current_encoding(body, IET_8BIT); memset(&offsets, 0xcc, sizeof(offsets)); hr = IMimeBody_GetOffsets(body, &offsets); @@ -197,6 +291,288 @@ 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); + + test_current_encoding(body, IET_BINARY); + + 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); + + 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); + + stream = create_stream_from_string(" =3d=3D\"one\" \t=\r\ntw= o=\nx3\n=34\r\n5"); + hr = IMimeBody_SetData(body, IET_QP, "text", "plain", &IID_IStream, stream); + IStream_Release(stream); + ok(hr == S_OK, "SetData failed: %08x\n", hr); + + test_current_encoding(body, IET_QP); + + hr = IMimeBody_GetData(body, IET_BINARY, &stream); + ok(hr == S_OK, "GetData failed %08x\n", hr); + + test_stream_read(stream, S_OK, " ==\"one\" \ttw=o=3\n4\r\n5", -1); + + IStream_Release(stream); + + IMimeBody_Release(body); +} + static void test_Allocator(void) { HRESULT hr; @@ -212,7 +588,6 @@ HRESULT hr; IMimeMessage *msg; IStream *stream; - LARGE_INTEGER pos; LONG ref; HBODY hbody, hbody2; IMimeBody *body; @@ -230,10 +605,7 @@ 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); @@ -340,7 +712,6 @@ ok(count == 2, "got %d\n", count); if(count == 2) { - ENCODINGTYPE encoding; IMimeBody *attachment; PROPVARIANT prop; @@ -352,9 +723,7 @@ hr = IMimeBody_IsContentType(attachment, "multipart", NULL); ok(hr == S_FALSE, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(attachment, &encoding); - ok(hr == S_OK, "ret %08x\n", hr); - todo_wine ok(encoding == IET_8BIT, "ret %d\n", encoding); + test_current_encoding(attachment, IET_8BIT); prop.vt = VT_LPSTR; hr = IMimeBody_GetProp(attachment, "Content-Transfer-Encoding", 0, &prop); @@ -375,9 +744,7 @@ hr = IMimeBody_IsContentType(attachment, "multipart", NULL); ok(hr == S_FALSE, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(attachment, &encoding); - ok(hr == S_OK, "ret %08x\n", hr); - todo_wine ok(encoding == IET_7BIT, "ret %d\n", encoding); + test_current_encoding(attachment, IET_7BIT); prop.vt = VT_LPSTR; hr = IMimeBody_GetProp(attachment, "Content-Transfer-Encoding", 0, &prop); @@ -409,6 +776,60 @@ IStream_Release(stream); IStream_Release(stream); +} + +static void test_mhtml_message(void) +{ + IMimeMessage *mime_message; + IMimeBody *mime_body; + HBODY *body_list; + IStream *stream; + ULONG count; + HRESULT hres; + + hres = MimeOleCreateMessage(NULL, &mime_message); + ok(hres == S_OK, "MimeOleCreateMessage failed: %08x\n", hres); + + stream = create_stream_from_string(mhtml_page1); + hres = IMimeMessage_Load(mime_message, stream); + IStream_Release(stream); + ok(hres == S_OK, "Load failed: %08x\n", hres); + + hres = IMimeMessage_CountBodies(mime_message, HBODY_ROOT, TRUE, &count); + ok(hres == S_OK, "CountBodies failed: %08x\n", hres); + ok(count == 3, "got %d\n", count); + + hres = IMimeMessage_GetAttachments(mime_message, &count, &body_list); + ok(hres == S_OK, "GetAttachments failed: %08x\n", hres); + ok(count == 2, "count = %u\n", count); + + hres = IMimeMessage_BindToObject(mime_message, body_list[0], &IID_IMimeBody, (void**)&mime_body); + ok(hres == S_OK, "BindToObject failed: %08x\n", hres); + + hres = IMimeBody_GetData(mime_body, IET_BINARY, &stream); + ok(hres == S_OK, "GetData failed: %08x\n", hres); + test_stream_read(stream, S_OK, "<HTML></HTML>", -1); + IStream_Release(stream); + + test_current_encoding(mime_body, IET_QP); + + IMimeBody_Release(mime_body); + + hres = IMimeMessage_BindToObject(mime_message, body_list[1], &IID_IMimeBody, (void**)&mime_body); + ok(hres == S_OK, "BindToObject failed: %08x\n", hres); + + test_current_encoding(mime_body, IET_BASE64); + + hres = IMimeBody_GetData(mime_body, IET_BINARY, &stream); + ok(hres == S_OK, "GetData failed: %08x\n", hres); + test_stream_read(stream, S_OK, "Test", -1); + IStream_Release(stream); + + IMimeBody_Release(mime_body); + + CoTaskMemFree(body_list); + + IMimeMessage_Release(mime_message); } static void test_MessageSetProp(void) @@ -760,12 +1181,475 @@ IMimePropertySchema_Release(schema); } +typedef struct { + const char *url; + const char *content; + const char *mime; + const char *data; +} mhtml_binding_test_t; + +static const mhtml_binding_test_t binding_tests[] = { + { + "mhtml:file://%s", + mhtml_page1, + "text/html", + "<HTML></HTML>" + }, + { + "mhtml:file://%s!http://winehq.org/mhtmltest.html", + mhtml_page1, + "Image/Jpeg", + "Test" + } +}; + +static const mhtml_binding_test_t *current_binding_test; +static IInternetProtocol *current_binding_protocol; + +static HRESULT WINAPI BindInfo_QueryInterface(IInternetBindInfo *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetBindInfo, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI BindInfo_AddRef(IInternetBindInfo *iface) +{ + return 2; +} + +static ULONG WINAPI BindInfo_Release(IInternetBindInfo *iface) +{ + return 1; +} + +static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) +{ + CHECK_EXPECT(GetBindInfo); + + ok(grfBINDF != NULL, "grfBINDF == NULL\n"); + ok(pbindinfo != NULL, "pbindinfo == NULL\n"); + ok(pbindinfo->cbSize == sizeof(BINDINFO), "wrong size of pbindinfo: %d\n", pbindinfo->cbSize); + + *grfBINDF = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NEEDFILE; + return S_OK; +} + +static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulStringType, LPOLESTR *ppwzStr, + ULONG cEl, ULONG *pcElFetched) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IInternetBindInfoVtbl InternetBindInfoVtbl = { + BindInfo_QueryInterface, + BindInfo_AddRef, + BindInfo_Release, + BindInfo_GetBindInfo, + BindInfo_GetBindString +}; + +static IInternetBindInfo bind_info = { + &InternetBindInfoVtbl +}; + +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(&CLSID_MimeEdit, guidService)) { + *ppv = NULL; + return E_NOINTERFACE; + } + + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); + return E_FAIL; +} + +static /* const */ IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + +static IServiceProvider service_provider = { &ServiceProviderVtbl }; + +static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { + *ppv = iface; + return S_OK; + } + + if(IsEqualGUID(&IID_IServiceProvider, riid)) { + *ppv = &service_provider; + return S_OK; + } + + *ppv = NULL; + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ProtocolSink_AddRef(IInternetProtocolSink *iface) +{ + return 2; +} + +static ULONG WINAPI ProtocolSink_Release(IInternetProtocolSink *iface) +{ + return 1; +} + +static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOLDATA *pProtocolData) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, + const WCHAR *szStatusText) +{ + switch(ulStatusCode) { + case BINDSTATUS_MIMETYPEAVAILABLE: + CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + ok(!strcmp_wa(szStatusText, current_binding_test->mime), "status text %s\n", wine_dbgstr_w(szStatusText)); + return S_OK; + case BINDSTATUS_CACHEFILENAMEAVAILABLE: + CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); + return S_OK; + default: + ok(0, "unexpected call %u %s\n", ulStatusCode, wine_dbgstr_w(szStatusText)); + } + + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, + ULONG ulProgressMax) +{ + char buf[1024]; + DWORD read; + HRESULT hres; + + CHECK_EXPECT(ReportData); + + ok(!ulProgress, "ulProgress = %u\n", ulProgress); + ok(ulProgress == ulProgressMax, "ulProgress != ulProgressMax\n"); + ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_INTERMEDIATEDATANOTIFICATION + | BSCF_LASTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE | BSCF_AVAILABLEDATASIZEUNKNOWN), + "grcf = %08x\n", grfBSCF); + + hres = IInternetProtocol_Read(current_binding_protocol, buf, sizeof(buf), &read); + ok(hres == S_OK, "Read failed: %08x\n", hres); + buf[read] = 0; + ok(!strcmp(buf, current_binding_test->data), "unexpected data: %s\n", buf); + + hres = IInternetProtocol_Read(current_binding_protocol, buf, sizeof(buf), &read); + ok(hres == S_FALSE, "Read failed: %08x\n", hres); + return S_OK; +} + +static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, + LPCWSTR szResult) +{ + CHECK_EXPECT(ReportResult); + ok(hrResult == S_OK, "hrResult = %08x\n", hrResult); + ok(!dwError, "dwError = %u\n", dwError); + ok(!szResult, "szResult = %s\n", wine_dbgstr_w(szResult)); + return S_OK; +} + +static IInternetProtocolSinkVtbl InternetProtocolSinkVtbl = { + ProtocolSink_QueryInterface, + ProtocolSink_AddRef, + ProtocolSink_Release, + ProtocolSink_Switch, + ProtocolSink_ReportProgress, + ProtocolSink_ReportData, + ProtocolSink_ReportResult +}; + +static IInternetProtocolSink protocol_sink = { &InternetProtocolSinkVtbl }; + +static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) +{ + char file_name[MAX_PATH+32], *p, urla[INTERNET_MAX_URL_LENGTH]; + WCHAR test_url[INTERNET_MAX_URL_LENGTH]; + IInternetProtocol *protocol; + IUnknown *unk; + HRESULT hres; + HANDLE file; + DWORD size; + + p = file_name + GetCurrentDirectoryA(sizeof(file_name), file_name); + *p++ = '\\'; + strcpy(p, "winetest.mht"); + + file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + + WriteFile(file, test->content, strlen(test->content), &size, NULL); + CloseHandle(file); + + sprintf(urla, test->url, file_name); + MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, sizeof(test_url)/sizeof(WCHAR)); + + hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); + ok(hres == S_OK, "Could not create protocol handler: %08x\n", hres); + + hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetProtocolEx, (void**)&unk); + ok(hres == E_NOINTERFACE, "Could get IInternetProtocolEx\n"); + + current_binding_test = test; + current_binding_protocol = protocol; + + SET_EXPECT(GetBindInfo); + SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); + SET_EXPECT(ReportData); + SET_EXPECT(ReportResult); + hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); + ok(hres == S_OK, "Start failed: %08x\n", hres); + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + todo_wine CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); + CHECK_CALLED(ReportData); + CHECK_CALLED(ReportResult); + + IInternetProtocol_Release(protocol); + ok(DeleteFileA("winetest.mht"), "DeleteFile failed: %u\n", GetLastError()); +} + +static const struct { + const char *base_url; + const char *relative_url; + const char *expected_result; + BOOL todo; +} combine_tests[] = { + { + "mhtml:file:///c:/dir/test.mht", "http://test.org", + "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org" + }, { + "mhtml:file:///c:/dir/test.mht", "3D\"http://test.org\"", + "mhtml:file:///c:/dir/test.mht!x-usc:3D\"http://test.org\"" + }, { + "mhtml:file:///c:/dir/test.mht", "123abc", + "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + }, { + "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "123abc", + "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + }, { + "MhtMl:file:///c:/dir/test.mht!x-usc:http://test.org/dir/dir2/file.html", "../..", + "mhtml:file:///c:/dir/test.mht!x-usc:../.." + }, {"mhtml:file:///c:/dir/test.mht!x-usc:file:///c:/dir/dir2/file.html", "../..", + "mhtml:file:///c:/dir/test.mht!x-usc:../.." + }, { + "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "", + "mhtml:file:///c:/dir/test.mht" + }, { + "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///d:/file.html", + "file:///d:/file.html", TRUE + }, { + "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", + "mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", TRUE + }, { + "mhtml:file:///c:/dir/test.mht!http://test.org", "123abc", + "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + }, { + "mhtml:file:///c:/dir/test.mht!http://test.org", "", + "mhtml:file:///c:/dir/test.mht" + } +}; + +static void test_mhtml_protocol_info(void) +{ + WCHAR *base_url, *relative_url, combined_url[INTERNET_MAX_URL_LENGTH]; + IInternetProtocolInfo *protocol_info; + DWORD combined_len; + unsigned i, exlen; + HRESULT hres; + + static const WCHAR http_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','o','r','g',0}; + + hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, + &IID_IInternetProtocolInfo, (void**)&protocol_info); + ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); + + for(i = 0; i < sizeof(combine_tests)/sizeof(*combine_tests); i++) { + base_url = a2w(combine_tests[i].base_url); + relative_url = a2w(combine_tests[i].relative_url); + + combined_len = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, + combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + todo_wine_if(combine_tests[i].todo) + ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres); + if(SUCCEEDED(hres)) { + exlen = strlen(combine_tests[i].expected_result); + ok(combined_len == exlen, "[%u] combined len is %u, expected %u\n", i, combined_len, exlen); + ok(!strcmp_wa(combined_url, combine_tests[i].expected_result), "[%u] combined URL is %s, expected %s\n", + i, wine_dbgstr_w(combined_url), combine_tests[i].expected_result); + + combined_len = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, + combined_url, exlen, &combined_len, 0); + ok(hres == E_FAIL, "[%u] CombineUrl returned: %08x\n", i, hres); + ok(!combined_len, "[%u] combined_len = %u\n", i, combined_len); + } + + HeapFree(GetProcessHeap(), 0, base_url); + HeapFree(GetProcessHeap(), 0, relative_url); + } + + hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, + combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres); + + IInternetProtocolInfo_Release(protocol_info); +} + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return 1; +} + +static /* const */ IUnknownVtbl outer_vtbl = { + outer_QueryInterface, + outer_AddRef, + outer_Release +}; + +static BOOL broken_mhtml_resolver; + +static void test_mhtml_protocol(void) +{ + IUnknown outer = { &outer_vtbl }; + IClassFactory *class_factory; + IUnknown *unk, *unk2; + unsigned i; + HRESULT hres; + + /* test class factory */ + hres = CoGetClassObject(&CLSID_IMimeHtmlProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&unk2); + ok(hres == E_NOINTERFACE, "IInternetProtocolInfo supported\n"); + + hres = IUnknown_QueryInterface(unk, &IID_IClassFactory, (void**)&class_factory); + ok(hres == S_OK, "Could not get IClassFactory iface: %08x\n", hres); + IUnknown_Release(unk); + + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + IUnknown_Release(unk2); + IUnknown_Release(unk); + + hres = IClassFactory_CreateInstance(class_factory, (IUnknown*)0xdeadbeef, &IID_IInternetProtocol, (void**)&unk2); + ok(hres == CLASS_E_NOAGGREGATION, "CreateInstance returned: %08x\n", hres); + + IClassFactory_Release(class_factory); + + if(!broken_mhtml_resolver) + test_mhtml_protocol_info(); + + for(i = 0; i < sizeof(binding_tests)/sizeof(*binding_tests); i++) + test_mhtml_protocol_binding(binding_tests + i); +} + +static void test_MimeOleObjectFromMoniker(void) +{ + IMoniker *mon, *new_mon; + WCHAR *mhtml_url, *url; + IBindCtx *bind_ctx; + IUnknown *unk; + unsigned i; + HRESULT hres; + + static const struct { + const char *url; + const char *mhtml_url; + } tests[] = { + {"file:///x:\\dir\\file.mht", "mhtml:file://x:\\dir\\file.mht"}, + {"file:///x:/dir/file.mht", "mhtml:file://x:\\dir\\file.mht"}, + {"http://www.winehq.org/index.html?query#hash", "mhtml:http://www.winehq.org/index.html?query#hash"}, + {"../test.mht", "mhtml:../test.mht"} + }; + + for(i = 0; i < sizeof(tests)/sizeof(*tests); i++) { + url = a2w(tests[i].url); + hres = CreateURLMoniker(NULL, url, &mon); + ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); + HeapFree(GetProcessHeap(), 0, url); + + hres = CreateBindCtx(0, &bind_ctx); + ok(hres == S_OK, "CreateBindCtx failed: %08x\n", hres); + + hres = MimeOleObjectFromMoniker(0, mon, bind_ctx, &IID_IUnknown, (void**)&unk, &new_mon); + ok(hres == S_OK || broken(!i && hres == INET_E_RESOURCE_NOT_FOUND), "MimeOleObjectFromMoniker failed: %08x\n", hres); + IBindCtx_Release(bind_ctx); + if(hres == INET_E_RESOURCE_NOT_FOUND) { /* winxp */ + win_skip("Broken MHTML behaviour found. Skipping some tests.\n"); + broken_mhtml_resolver = TRUE; + return; + } + + hres = IMoniker_GetDisplayName(new_mon, NULL, NULL, &mhtml_url); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); + ok(!strcmp_wa(mhtml_url, tests[i].mhtml_url), "[%d] unexpected mhtml URL: %s\n", i, wine_dbgstr_w(mhtml_url)); + CoTaskMemFree(mhtml_url); + + IUnknown_Release(unk); + IMoniker_Release(new_mon); + IMoniker_Release(mon); + } +} + START_TEST(mimeole) { OleInitialize(NULL); test_CreateVirtualStream(); test_CreateSecurity(); test_CreateBody(); + test_SetData(); test_Allocator(); test_CreateMessage(); test_MessageSetProp(); @@ -774,5 +1658,8 @@ test_BindToObject(); test_BodyDeleteProp(); test_MimeOleGetPropertySchema(); + test_mhtml_message(); + test_MimeOleObjectFromMoniker(); + test_mhtml_protocol(); OleUninitialize(); }

1 0

[akhaldi] 74106: [INETCOMM] I guess I asked too much from svn when I renamed the existing file and then added a new one with the same name as the old.
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:36:38 2017 New Revision: 74106 URL: http://svn.reactos.org/svn/reactos?rev=74106&view=rev Log: [INETCOMM] I guess I asked too much from svn when I renamed the existing file and then added a new one with the same name as the old. Added: trunk/reactos/dll/win32/inetcomm/inetcomm.rgs (with props) Added: trunk/reactos/dll/win32/inetcomm/inetcomm.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm.rgs (added) +++ trunk/reactos/dll/win32/inetcomm/inetcomm.rgs [iso-8859-1] Sun Mar 5 21:36:38 2017 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove PROTOCOLS + { + NoRemove Handler + { + ForceRemove mhtml = s 'MHTML Asynchronous Pluggable Protocol Handler' + { + val CLSID = s '{05300401-bcbc-11d0-85e3-00c04fd85ab4}' + } + } + } +} Propchange: trunk/reactos/dll/win32/inetcomm/inetcomm.rgs ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 74105: [INETCOMM] Sync with Wine Staging 2.2. CORE-12823 51e1a08 inetcomm: Return S_FALSE if no data is returned in IInternetProtocol::Read. 0672bfa inetcomm: Added support for decoding q...
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:33:13 2017 New Revision: 74105 URL: http://svn.reactos.org/svn/reactos?rev=74105&view=rev Log: [INETCOMM] Sync with Wine Staging 2.2. CORE-12823 51e1a08 inetcomm: Return S_FALSE if no data is returned in IInternetProtocol::Read. 0672bfa inetcomm: Added support for decoding quoted-printable data. 07af9d0 inetcomm: Added mhtml binding tests. cf8e259 inetcomm: Added support for binding mhtml protocol handler. 3f644cb inetcomm: Added IInternetProtocolInfo::CombineUrl implementation. 37792a2 inetcomm: Added MimeOleObjectFromMoniker semi-stub implementation. 242cbb1 inetcomm: Added tests reading MHTML page as MIME message. eb0bd22 inetcomm: Removed unneeded type check in init_content_type. 56dc246 inetcomm: Read content encoding from MIME header. dec243f inetcomm: Don't include headers in data stream in create_sub_body. 3ccba10 inetcomm: Properly handle boundary in the beginning of body stream in create_body_offset_list. 9c01a94 inetcomm: Use relative seek in copy_headers_to_buf. 915acd6 inetcomm: Added support for decoding base64 in IMimeBody::GetData. 0b80666 inetcomm: Return a new instance of stream in IMimeBody::GetData. 393512d inetcomm: Don't restore base stream position in sub stream Read. bb5056e inetcomm: Moved sub_stream_t implementation before MimeBody implementation. a1d0c6d inetcomm: Added COM aggregation support to MimeHtmlProtocol object. fe3e5b9 inetcomm: Added IInternetProtocolInfo stub implementation. 6832273 inetcomm: Added MimeHtmlProtocol stub implementation. d5d9aa3 inetcomm: Register mhtml protocol handler. Added: trunk/reactos/dll/win32/inetcomm/inetcomm_r.rgs - copied, changed from r74104, trunk/reactos/dll/win32/inetcomm/inetcomm.rgs trunk/reactos/dll/win32/inetcomm/protocol.c (with props) Removed: trunk/reactos/dll/win32/inetcomm/inetcomm.rgs Modified: trunk/reactos/dll/win32/inetcomm/CMakeLists.txt trunk/reactos/dll/win32/inetcomm/inetcomm.idl trunk/reactos/dll/win32/inetcomm/inetcomm.rc trunk/reactos/dll/win32/inetcomm/inetcomm_main.c trunk/reactos/dll/win32/inetcomm/inetcomm_private.h trunk/reactos/dll/win32/inetcomm/mimeole.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] Sun Mar 5 21:33:13 2017 @@ -10,6 +10,7 @@ mimeintl.c mimeole.c pop3transport.c + protocol.c smtptransport.c inetcomm_private.h) @@ -22,6 +23,6 @@ set_module_type(inetcomm win32dll) target_link_libraries(inetcomm uuid wine) -add_importlibs(inetcomm ole32 oleaut32 ws2_32 user32 propsys msvcrt kernel32 ntdll) +add_importlibs(inetcomm ole32 oleaut32 ws2_32 user32 propsys urlmon msvcrt kernel32 ntdll) add_pch(inetcomm inetcomm_private.h SOURCE) add_cd_file(TARGET inetcomm DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/inetcomm/inetcomm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm.idl [iso-8859-1] Sun Mar 5 21:33:13 2017 @@ -124,3 +124,10 @@ uuid(ea678830-235d-11d2-a8b6-0000f8084f96) ] coclass IPropPatchRequest { interface IPropPatchRequest; } + +[ + helpstring("MHTML Asynchronous Pluggable Protocol Handler"), + threading(both), + uuid(05300401-bcbc-11d0-85e3-00c04fd85ab4) +] +coclass MimeHtmlProtocol { interface IInternetProtocol; } Modified: trunk/reactos/dll/win32/inetcomm/inetcomm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm.rc [iso-8859-1] Sun Mar 5 21:33:13 2017 @@ -1 +1,22 @@ -1 WINE_REGISTRY "inetcomm.rgs" +/* + * Copyright 2016 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: inetcomm.rgs */ +1 WINE_REGISTRY inetcomm.rgs + +2 WINE_REGISTRY inetcomm_r.rgs Removed: trunk/reactos/dll/win32/inetcomm/inetcomm.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm.rgs (removed) @@ -1,69 +0,0 @@ -HKCR -{ - NoRemove Interface - { - } - NoRemove CLSID - { - '{FD853CDB-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IMimeBody' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{FD853CDD-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IMimeAllocator' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{FD853CDE-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IMimeSecurity' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{FD853CDF-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IVirtualStream' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{FD853CE3-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IMimeMessage' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{FD853CE6-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_ISMTPTransport' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{FD853CE7-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IPOP3Transport' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{FD853CE8-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_INNTPTransport' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{FD853CE9-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IRASTransport' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{FD853CEA-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IRangeList' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{FD853CEB-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IIMAPTransport' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{5A580C11-E5EB-11D1-A86E-0000F8084F96}' = s 'CLSID_IHTTPMailTransport' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{0DF2C7EC-3435-11D0-81D0-00C04FD85AB4}' = s 'CLSID_ISMTPTransport2' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{BB847B8A-054A-11D2-A894-0000F8084F96}' = s 'CLSID_IPropFindRequest' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{EA678830-235D-11D2-A8B6-0000F8084F96}' = s 'CLSID_IPropPatchRequest' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - } -} Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_main.c [iso-8859-1] Sun Mar 5 21:33:13 2017 @@ -74,7 +74,9 @@ return S_OK; } - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + if (!IsEqualGUID(riid, &IID_IInternetProtocolInfo)) + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; } @@ -99,13 +101,20 @@ *ppobj = NULL; + if (pOuter && !IsEqualGUID(&IID_IUnknown, riid)) + return CLASS_E_NOAGGREGATION; + r = This->create_object( pOuter, (LPVOID*) &punk ); if (FAILED(r)) return r; + if (IsEqualGUID(&IID_IUnknown, riid)) { + *ppobj = punk; + return S_OK; + } + r = IUnknown_QueryInterface( punk, riid, ppobj ); IUnknown_Release( punk ); - return r; } @@ -129,6 +138,7 @@ static cf mime_message_cf = { { &cf_vtbl }, MimeMessage_create }; static cf mime_security_cf = { { &cf_vtbl }, MimeSecurity_create }; static cf virtual_stream_cf = { { &cf_vtbl }, VirtualStream_create }; +static cf mhtml_protocol_cf = { { &cf_vtbl }, MimeHtmlProtocol_create }; /*********************************************************************** * DllGetClassObject (INETCOMM.@) @@ -171,6 +181,10 @@ { cf = &virtual_stream_cf.IClassFactory_iface; } + else if( IsEqualCLSID( rclsid, &CLSID_IMimeHtmlProtocol )) + { + cf = &mhtml_protocol_cf.IClassFactory_iface; + } if ( !cf ) { Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] Sun Mar 5 21:33:13 2017 @@ -38,6 +38,7 @@ #include <imnxport.h> #include <wine/list.h> +#include <wine/unicode.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); @@ -95,6 +96,7 @@ HRESULT MimeMessage_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT MimeSecurity_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT VirtualStream_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT MimeHtmlProtocol_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT MimeInternational_Construct(IMimeInternational **internat) DECLSPEC_HIDDEN; @@ -102,4 +104,14 @@ HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + #endif /* _INETCOMM_PRIVATE_H_ */ Copied: trunk/reactos/dll/win32/inetcomm/inetcomm_r.rgs (from r74104, trunk/reactos/dll/win32/inetcomm/inetcomm.rgs) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_r.rgs [iso-8859-1] Sun Mar 5 21:33:13 2017 @@ -65,5 +65,9 @@ { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } } + '{05300401-BCBC-11D0-85E3-00C04FD85AB4}' = s 'MHTML Asynchronous Pluggable Protocol Handler' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } } } Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeole… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] Sun Mar 5 21:33:13 2017 @@ -150,6 +150,298 @@ BODYOFFSETS body_offsets; } MimeBody; +typedef struct +{ + IStream IStream_iface; + LONG ref; + IStream *base; + ULARGE_INTEGER pos, start, length; +} sub_stream_t; + +static inline sub_stream_t *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, sub_stream_t, IStream_iface); +} + +static HRESULT WINAPI sub_stream_QueryInterface(IStream *iface, REFIID riid, void **ppv) +{ + sub_stream_t *This = impl_from_IStream(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISequentialStream) || + IsEqualIID(riid, &IID_IStream)) + { + IStream_AddRef(iface); + *ppv = iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI sub_stream_AddRef(IStream *iface) +{ + sub_stream_t *This = impl_from_IStream(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI sub_stream_Release(IStream *iface) +{ + sub_stream_t *This = impl_from_IStream(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + { + IStream_Release(This->base); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI sub_stream_Read( + IStream* iface, + void *pv, + ULONG cb, + ULONG *pcbRead) +{ + sub_stream_t *This = impl_from_IStream(iface); + HRESULT hr; + LARGE_INTEGER tmp_pos; + + TRACE("(%p, %d, %p)\n", pv, cb, pcbRead); + + tmp_pos.QuadPart = This->pos.QuadPart + This->start.QuadPart; + IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL); + + if(This->pos.QuadPart + cb > This->length.QuadPart) + cb = This->length.QuadPart - This->pos.QuadPart; + + hr = IStream_Read(This->base, pv, cb, pcbRead); + + This->pos.QuadPart += *pcbRead; + + return hr; +} + +static HRESULT WINAPI sub_stream_Write( + IStream* iface, + const void *pv, + ULONG cb, + ULONG *pcbWritten) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_Seek( + IStream* iface, + LARGE_INTEGER dlibMove, + DWORD dwOrigin, + ULARGE_INTEGER *plibNewPosition) +{ + sub_stream_t *This = impl_from_IStream(iface); + LARGE_INTEGER new_pos; + + TRACE("(%08x.%08x, %x, %p)\n", dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + + switch(dwOrigin) + { + case STREAM_SEEK_SET: + new_pos = dlibMove; + break; + case STREAM_SEEK_CUR: + new_pos.QuadPart = This->pos.QuadPart + dlibMove.QuadPart; + break; + case STREAM_SEEK_END: + new_pos.QuadPart = This->length.QuadPart + dlibMove.QuadPart; + break; + default: + return STG_E_INVALIDFUNCTION; + } + + if(new_pos.QuadPart < 0) new_pos.QuadPart = 0; + else if(new_pos.QuadPart > This->length.QuadPart) new_pos.QuadPart = This->length.QuadPart; + + This->pos.QuadPart = new_pos.QuadPart; + + if(plibNewPosition) *plibNewPosition = This->pos; + return S_OK; +} + +static HRESULT WINAPI sub_stream_SetSize( + IStream* iface, + ULARGE_INTEGER libNewSize) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_CopyTo( + IStream* iface, + IStream *pstm, + ULARGE_INTEGER cb, + ULARGE_INTEGER *pcbRead, + ULARGE_INTEGER *pcbWritten) +{ + HRESULT hr = S_OK; + BYTE tmpBuffer[128]; + ULONG bytesRead, bytesWritten, copySize; + ULARGE_INTEGER totalBytesRead; + ULARGE_INTEGER totalBytesWritten; + + TRACE("(%p)->(%p, %d, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten); + + totalBytesRead.QuadPart = 0; + totalBytesWritten.QuadPart = 0; + + while ( cb.QuadPart > 0 ) + { + if ( cb.QuadPart >= sizeof(tmpBuffer) ) + copySize = sizeof(tmpBuffer); + else + copySize = cb.u.LowPart; + + hr = IStream_Read(iface, tmpBuffer, copySize, &bytesRead); + if (FAILED(hr)) break; + + totalBytesRead.QuadPart += bytesRead; + + if (bytesRead) + { + hr = IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten); + if (FAILED(hr)) break; + totalBytesWritten.QuadPart += bytesWritten; + } + + if (bytesRead != copySize) + cb.QuadPart = 0; + else + cb.QuadPart -= bytesRead; + } + + if (pcbRead) pcbRead->QuadPart = totalBytesRead.QuadPart; + if (pcbWritten) pcbWritten->QuadPart = totalBytesWritten.QuadPart; + + return hr; +} + +static HRESULT WINAPI sub_stream_Commit( + IStream* iface, + DWORD grfCommitFlags) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_Revert( + IStream* iface) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_LockRegion( + IStream* iface, + ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, + DWORD dwLockType) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_UnlockRegion( + IStream* iface, + ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, + DWORD dwLockType) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI sub_stream_Stat( + IStream* iface, + STATSTG *pstatstg, + DWORD grfStatFlag) +{ + sub_stream_t *This = impl_from_IStream(iface); + FIXME("(%p)->(%p, %08x)\n", This, pstatstg, grfStatFlag); + memset(pstatstg, 0, sizeof(*pstatstg)); + pstatstg->cbSize = This->length; + return S_OK; +} + +static HRESULT WINAPI sub_stream_Clone( + IStream* iface, + IStream **ppstm) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static struct IStreamVtbl sub_stream_vtbl = +{ + sub_stream_QueryInterface, + sub_stream_AddRef, + sub_stream_Release, + sub_stream_Read, + sub_stream_Write, + sub_stream_Seek, + sub_stream_SetSize, + sub_stream_CopyTo, + sub_stream_Commit, + sub_stream_Revert, + sub_stream_LockRegion, + sub_stream_UnlockRegion, + sub_stream_Stat, + sub_stream_Clone +}; + +static HRESULT create_sub_stream(IStream *stream, ULARGE_INTEGER start, ULARGE_INTEGER length, IStream **out) +{ + sub_stream_t *This; + + *out = NULL; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if(!This) return E_OUTOFMEMORY; + + This->IStream_iface.lpVtbl = &sub_stream_vtbl; + This->ref = 1; + This->start = start; + This->length = length; + This->pos.QuadPart = 0; + IStream_AddRef(stream); + This->base = stream; + + *out = &This->IStream_iface; + 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); @@ -224,8 +516,8 @@ if(new_end - last_end == 2) { LARGE_INTEGER off; - off.QuadPart = new_end; - IStream_Seek(stm, off, STREAM_SEEK_SET, NULL); + off.QuadPart = (LONGLONG)new_end - offset; + IStream_Seek(stm, off, STREAM_SEEK_CUR, NULL); buf[new_end] = '\0'; done = TRUE; } @@ -438,12 +730,6 @@ char *slash; DWORD len; - if(header->prop->id != PID_HDR_CNTTYPE) - { - ERR("called with header %s\n", header->prop->name); - return; - } - slash = strchr(header->value.u.pszVal, '/'); if(!slash) { @@ -457,6 +743,22 @@ body->content_sub_type = strdupA(slash + 1); } +static void init_content_encoding(MimeBody *body, header_t *header) +{ + const char *encoding = header->value.u.pszVal; + + if(!strcasecmp(encoding, "base64")) + body->encoding = IET_BASE64; + else if(!strcasecmp(encoding, "quoted-printable")) + body->encoding = IET_QP; + else if(!strcasecmp(encoding, "7bit")) + body->encoding = IET_7BIT; + else if(!strcasecmp(encoding, "8bit")) + body->encoding = IET_8BIT; + else + FIXME("unknown encoding %s\n", debugstr_a(encoding)); +} + static HRESULT parse_headers(MimeBody *body, IStream *stm) { char *header_buf, *cur_header_ptr; @@ -472,8 +774,14 @@ read_value(header, &cur_header_ptr); list_add_tail(&body->headers, &header->entry); - if(header->prop->id == PID_HDR_CNTTYPE) + switch(header->prop->id) { + case PID_HDR_CNTTYPE: init_content_type(body, header); + break; + case PID_HDR_CNTXFER: + init_content_encoding(body, header); + break; + } } HeapFree(GetProcessHeap(), 0, header_buf); @@ -1207,17 +1515,206 @@ 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 int hex_digit(char c) +{ + if('0' <= c && c <= '9') + return c - '0'; + if('A' <= c && c <= 'F') + return c - 'A' + 10; + if('a' <= c && c <= 'f') + return c - 'a' + 10; + return -1; +} + +static HRESULT decode_qp(IStream *input, IStream **ret_stream) +{ + const unsigned char *ptr, *end; + unsigned char *ret, prev = 0; + unsigned char buf[1024]; + LARGE_INTEGER pos; + IStream *output; + DWORD size; + int n = -1; + 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(ptr < end) { + unsigned char byte = *ptr++; + + switch(n) { + case -1: + if(byte == '=') + n = 0; + else + *ret++ = byte; + continue; + case 0: + prev = byte; + n = 1; + continue; + case 1: + if(prev != '\r' || byte != '\n') { + int h1 = hex_digit(prev), h2 = hex_digit(byte); + if(h1 != -1 && h2 != -1) + *ret++ = (h1 << 4) | h2; + else + *ret++ = '='; + } + n = -1; + continue; + } + } + + 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, IStream** ppStream) { MimeBody *This = impl_from_IMimeBody(iface); - FIXME("(%p)->(%d, %p). Ignoring encoding type.\n", This, ietEncoding, ppStream); - - *ppStream = This->data; - IStream_AddRef(*ppStream); - return S_OK; + ULARGE_INTEGER start, size; + HRESULT hres; + + TRACE("(%p)->(%d %p)\n", This, ietEncoding, ppStream); + + if(This->encoding != ietEncoding) { + switch(This->encoding) { + case IET_BASE64: + hres = decode_base64(This->data, ppStream); + break; + case IET_QP: + hres = decode_qp(This->data, ppStream); + break; + default: + FIXME("Decoding %d is not supported.\n", This->encoding); + hres = S_FALSE; + } + if(ietEncoding != IET_BINARY) + FIXME("Encoding %d is not supported.\n", ietEncoding); + if(hres != S_FALSE) + return hres; + } + + 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( @@ -1410,291 +1907,6 @@ } } - - -typedef struct -{ - IStream IStream_iface; - LONG ref; - IStream *base; - ULARGE_INTEGER pos, start, length; -} sub_stream_t; - -static inline sub_stream_t *impl_from_IStream(IStream *iface) -{ - return CONTAINING_RECORD(iface, sub_stream_t, IStream_iface); -} - -static HRESULT WINAPI sub_stream_QueryInterface(IStream *iface, REFIID riid, void **ppv) -{ - sub_stream_t *This = impl_from_IStream(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_ISequentialStream) || - IsEqualIID(riid, &IID_IStream)) - { - IStream_AddRef(iface); - *ppv = iface; - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI sub_stream_AddRef(IStream *iface) -{ - sub_stream_t *This = impl_from_IStream(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; -} - -static ULONG WINAPI sub_stream_Release(IStream *iface) -{ - sub_stream_t *This = impl_from_IStream(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) - { - IStream_Release(This->base); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} - -static HRESULT WINAPI sub_stream_Read( - IStream* iface, - void *pv, - ULONG cb, - ULONG *pcbRead) -{ - 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); - - if(This->pos.QuadPart + cb > This->length.QuadPart) - cb = This->length.QuadPart - This->pos.QuadPart; - - hr = IStream_Read(This->base, pv, cb, pcbRead); - - This->pos.QuadPart += *pcbRead; - - tmp_pos.QuadPart = base_pos.QuadPart; - IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL); - - return hr; -} - -static HRESULT WINAPI sub_stream_Write( - IStream* iface, - const void *pv, - ULONG cb, - ULONG *pcbWritten) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI sub_stream_Seek( - IStream* iface, - LARGE_INTEGER dlibMove, - DWORD dwOrigin, - ULARGE_INTEGER *plibNewPosition) -{ - sub_stream_t *This = impl_from_IStream(iface); - LARGE_INTEGER new_pos; - - TRACE("(%08x.%08x, %x, %p)\n", dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition); - - switch(dwOrigin) - { - case STREAM_SEEK_SET: - new_pos = dlibMove; - break; - case STREAM_SEEK_CUR: - new_pos.QuadPart = This->pos.QuadPart + dlibMove.QuadPart; - break; - case STREAM_SEEK_END: - new_pos.QuadPart = This->length.QuadPart + dlibMove.QuadPart; - break; - default: - return STG_E_INVALIDFUNCTION; - } - - if(new_pos.QuadPart < 0) new_pos.QuadPart = 0; - else if(new_pos.QuadPart > This->length.QuadPart) new_pos.QuadPart = This->length.QuadPart; - - This->pos.QuadPart = new_pos.QuadPart; - - if(plibNewPosition) *plibNewPosition = This->pos; - return S_OK; -} - -static HRESULT WINAPI sub_stream_SetSize( - IStream* iface, - ULARGE_INTEGER libNewSize) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI sub_stream_CopyTo( - IStream* iface, - IStream *pstm, - ULARGE_INTEGER cb, - ULARGE_INTEGER *pcbRead, - ULARGE_INTEGER *pcbWritten) -{ - HRESULT hr = S_OK; - BYTE tmpBuffer[128]; - ULONG bytesRead, bytesWritten, copySize; - ULARGE_INTEGER totalBytesRead; - ULARGE_INTEGER totalBytesWritten; - - TRACE("(%p)->(%p, %d, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten); - - totalBytesRead.QuadPart = 0; - totalBytesWritten.QuadPart = 0; - - while ( cb.QuadPart > 0 ) - { - if ( cb.QuadPart >= sizeof(tmpBuffer) ) - copySize = sizeof(tmpBuffer); - else - copySize = cb.u.LowPart; - - hr = IStream_Read(iface, tmpBuffer, copySize, &bytesRead); - if (FAILED(hr)) break; - - totalBytesRead.QuadPart += bytesRead; - - if (bytesRead) - { - hr = IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten); - if (FAILED(hr)) break; - totalBytesWritten.QuadPart += bytesWritten; - } - - if (bytesRead != copySize) - cb.QuadPart = 0; - else - cb.QuadPart -= bytesRead; - } - - if (pcbRead) pcbRead->QuadPart = totalBytesRead.QuadPart; - if (pcbWritten) pcbWritten->QuadPart = totalBytesWritten.QuadPart; - - return hr; -} - -static HRESULT WINAPI sub_stream_Commit( - IStream* iface, - DWORD grfCommitFlags) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI sub_stream_Revert( - IStream* iface) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI sub_stream_LockRegion( - IStream* iface, - ULARGE_INTEGER libOffset, - ULARGE_INTEGER cb, - DWORD dwLockType) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI sub_stream_UnlockRegion( - IStream* iface, - ULARGE_INTEGER libOffset, - ULARGE_INTEGER cb, - DWORD dwLockType) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI sub_stream_Stat( - IStream* iface, - STATSTG *pstatstg, - DWORD grfStatFlag) -{ - sub_stream_t *This = impl_from_IStream(iface); - FIXME("(%p)->(%p, %08x)\n", This, pstatstg, grfStatFlag); - memset(pstatstg, 0, sizeof(*pstatstg)); - pstatstg->cbSize = This->length; - return S_OK; -} - -static HRESULT WINAPI sub_stream_Clone( - IStream* iface, - IStream **ppstm) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -static struct IStreamVtbl sub_stream_vtbl = -{ - sub_stream_QueryInterface, - sub_stream_AddRef, - sub_stream_Release, - sub_stream_Read, - sub_stream_Write, - sub_stream_Seek, - sub_stream_SetSize, - sub_stream_CopyTo, - sub_stream_Commit, - sub_stream_Revert, - sub_stream_LockRegion, - sub_stream_UnlockRegion, - sub_stream_Stat, - sub_stream_Clone -}; - -static HRESULT create_sub_stream(IStream *stream, ULARGE_INTEGER start, ULARGE_INTEGER length, IStream **out) -{ - sub_stream_t *This; - - *out = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if(!This) return E_OUTOFMEMORY; - - This->IStream_iface.lpVtbl = &sub_stream_vtbl; - This->ref = 1; - This->start = start; - This->length = length; - This->pos.QuadPart = 0; - IStream_AddRef(stream); - This->base = stream; - - *out = &This->IStream_iface; - return S_OK; -} - - typedef struct body_t { struct list entry; @@ -1821,18 +2033,16 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struct list *body_offsets) { HRESULT hr; - DWORD read; + DWORD read, boundary_start; int boundary_len = strlen(boundary); - char *buf, *nl_boundary, *ptr, *overlap; + char *buf, *ptr, *overlap; DWORD start = 0, overlap_no; offset_entry_t *cur_body = NULL; + BOOL is_first_line = TRUE; ULARGE_INTEGER cur; LARGE_INTEGER zero; list_init(body_offsets); - nl_boundary = HeapAlloc(GetProcessHeap(), 0, 4 + boundary_len + 1); - memcpy(nl_boundary, "\r\n--", 4); - memcpy(nl_boundary + 4, boundary, boundary_len + 1); overlap_no = boundary_len + 5; @@ -1849,39 +2059,44 @@ overlap[read] = '\0'; ptr = buf; - do { - ptr = strstr(ptr, nl_boundary); - if(ptr) - { - DWORD boundary_start = start + ptr - buf; - char *end = ptr + boundary_len + 4; - - if(*end == '\0' || *(end + 1) == '\0') + while(1) { + if(is_first_line) { + is_first_line = FALSE; + }else { + ptr = strstr(ptr, "\r\n"); + if(!ptr) break; - - if(*end == '\r' && *(end + 1) == '\n') + ptr += 2; + } + + boundary_start = start + ptr - buf; + + if(*ptr == '-' && *(ptr + 1) == '-' && !memcmp(ptr + 2, boundary, boundary_len)) { + ptr += boundary_len + 2; + + if(*ptr == '\r' && *(ptr + 1) == '\n') + { + ptr += 2; + if(cur_body) + { + cur_body->offsets.cbBodyEnd = boundary_start - 2; + list_add_tail(body_offsets, &cur_body->entry); + } + cur_body = HeapAlloc(GetProcessHeap(), 0, sizeof(*cur_body)); + cur_body->offsets.cbBoundaryStart = boundary_start; + cur_body->offsets.cbHeaderStart = start + ptr - buf; + } + else if(*ptr == '-' && *(ptr + 1) == '-') { if(cur_body) { - cur_body->offsets.cbBodyEnd = boundary_start; - list_add_tail(body_offsets, &cur_body->entry); - } - cur_body = HeapAlloc(GetProcessHeap(), 0, sizeof(*cur_body)); - cur_body->offsets.cbBoundaryStart = boundary_start + 2; /* doesn't including the leading \r\n */ - cur_body->offsets.cbHeaderStart = boundary_start + boundary_len + 6; - } - else if(*end == '-' && *(end + 1) == '-') - { - if(cur_body) - { - cur_body->offsets.cbBodyEnd = boundary_start; + cur_body->offsets.cbBodyEnd = boundary_start - 2; list_add_tail(body_offsets, &cur_body->entry); goto end; } } - ptr = end + 2; } - } while(ptr); + } if(overlap == buf) /* 1st iteration */ { @@ -1897,26 +2112,33 @@ } while(1); end: - HeapFree(GetProcessHeap(), 0, nl_boundary); HeapFree(GetProcessHeap(), 0, buf); return hr; } static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *offset, body_t *parent) { + ULARGE_INTEGER start, length; MimeBody *mime_body; HRESULT hr; body_t *body; - ULARGE_INTEGER cur; - LARGE_INTEGER zero; + LARGE_INTEGER pos; + + pos.QuadPart = offset->cbHeaderStart; + IStream_Seek(pStm, pos, STREAM_SEEK_SET, NULL); mime_body = mimebody_create(); IMimeBody_Load(&mime_body->IMimeBody_iface, pStm); - zero.QuadPart = 0; - hr = IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &cur); - offset->cbBodyStart = cur.u.LowPart + offset->cbHeaderStart; + + pos.QuadPart = 0; + hr = IStream_Seek(pStm, pos, STREAM_SEEK_CUR, &start); + offset->cbBodyStart = start.QuadPart; if (parent) MimeBody_set_offsets(mime_body, offset); - IMimeBody_SetData(&mime_body->IMimeBody_iface, IET_BINARY, NULL, NULL, &IID_IStream, pStm); + + length.QuadPart = offset->cbBodyEnd - offset->cbBodyStart; + create_sub_stream(pStm, start, length, (IStream**)&mime_body->data); + mime_body->data_iid = IID_IStream; + body = new_body_entry(mime_body, msg->next_index++, parent); if(IMimeBody_IsContentType(&mime_body->IMimeBody_iface, "multipart", NULL) == S_OK) @@ -1941,14 +2163,8 @@ LIST_FOR_EACH_ENTRY_SAFE(cur, cursor2, &offset_list, offset_entry_t, entry) { body_t *sub_body; - IStream *sub_stream; - ULARGE_INTEGER start, length; - - start.QuadPart = cur->offsets.cbHeaderStart; - length.QuadPart = cur->offsets.cbBodyEnd - cur->offsets.cbHeaderStart; - create_sub_stream(pStm, start, length, &sub_stream); - sub_body = create_sub_body(msg, sub_stream, &cur->offsets, body); - IStream_Release(sub_stream); + + sub_body = create_sub_body(msg, pStm, &cur->offsets, body); list_add_tail(&body->children, &sub_body->entry); list_remove(&cur->entry); HeapFree(GetProcessHeap(), 0, cur); @@ -3421,10 +3637,70 @@ return E_NOTIMPL; } +static HRESULT WINAPI mime_obj_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + FIXME("(%s %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI mime_obj_AddRef(IUnknown *iface) +{ + TRACE("\n"); + return 2; +} + +static ULONG WINAPI mime_obj_Release(IUnknown *iface) +{ + TRACE("\n"); + return 1; +} + +static const IUnknownVtbl mime_obj_vtbl = { + mime_obj_QueryInterface, + mime_obj_AddRef, + mime_obj_Release +}; + +static IUnknown mime_obj = { &mime_obj_vtbl }; + HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx *binding, REFIID riid, void **out, IMoniker **moniker_new) { - FIXME("(0x%08x, %p, %p, %s, %p, %p) stub\n", bindf, moniker, binding, debugstr_guid(riid), out, moniker_new); - - return E_NOTIMPL; -} + WCHAR *display_name, *mhtml_url; + size_t len; + HRESULT hres; + + static const WCHAR mhtml_prefixW[] = {'m','h','t','m','l',':'}; + + WARN("(0x%08x, %p, %p, %s, %p, %p) semi-stub\n", bindf, moniker, binding, debugstr_guid(riid), out, moniker_new); + + if(!IsEqualGUID(&IID_IUnknown, riid)) { + FIXME("Unsupported riid %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + hres = IMoniker_GetDisplayName(moniker, NULL, NULL, &display_name); + if(FAILED(hres)) + return hres; + + TRACE("display name %s\n", debugstr_w(display_name)); + + len = strlenW(display_name); + mhtml_url = heap_alloc((len+1)*sizeof(WCHAR) + sizeof(mhtml_prefixW)); + if(!mhtml_url) + return E_OUTOFMEMORY; + + memcpy(mhtml_url, mhtml_prefixW, sizeof(mhtml_prefixW)); + strcpyW(mhtml_url + sizeof(mhtml_prefixW)/sizeof(WCHAR), display_name); + HeapFree(GetProcessHeap(), 0, display_name); + + hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); + heap_free(mhtml_url); + if(FAILED(hres)) + return hres; + + /* FIXME: We most likely should start binding here and return something more meaningful as mime object. */ + *out = &mime_obj; + return S_OK; +} Added: trunk/reactos/dll/win32/inetcomm/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/protoco… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/protocol.c (added) +++ trunk/reactos/dll/win32/inetcomm/protocol.c [iso-8859-1] Sun Mar 5 21:33:13 2017 @@ -0,0 +1,738 @@ +/* + * Copyright 2017 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "inetcomm_private.h" + +#include <assert.h> + +typedef struct { + IUnknown IUnknown_inner; + IInternetProtocol IInternetProtocol_iface; + IInternetProtocolInfo IInternetProtocolInfo_iface; + + LONG ref; + IUnknown *outer_unk; + + WCHAR *location; + IStream *stream; + IInternetProtocolSink *sink; +} MimeHtmlProtocol; + +typedef struct { + const WCHAR *mhtml; + size_t mhtml_len; + const WCHAR *location; +} mhtml_url_t; + +typedef struct { + IBindStatusCallback IBindStatusCallback_iface; + + LONG ref; + + MimeHtmlProtocol *protocol; + HRESULT status; + IStream *stream; + WCHAR url[1]; +} MimeHtmlBinding; + +static const WCHAR mhtml_prefixW[] = {'m','h','t','m','l',':'}; +static const WCHAR mhtml_separatorW[] = {'!','x','-','u','s','c',':'}; + +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + if(ret) + memcpy(ret, str, size); + } + + return ret; +} + +static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r) +{ + const WCHAR *p; + + if(strncmpiW(url, mhtml_prefixW, sizeof(mhtml_prefixW)/sizeof(WCHAR))) + return E_FAIL; + + r->mhtml = url + sizeof(mhtml_prefixW)/sizeof(WCHAR); + p = strchrW(r->mhtml, '!'); + if(p) { + r->mhtml_len = p - r->mhtml; + /* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */ + if(!strncmpW(p, mhtml_separatorW, sizeof(mhtml_separatorW)/sizeof(WCHAR))) + p += sizeof(mhtml_separatorW)/sizeof(WCHAR); + else + p++; + }else { + r->mhtml_len = strlenW(r->mhtml); + } + + r->location = p; + return S_OK; +} + +static HRESULT report_result(MimeHtmlProtocol *protocol, HRESULT result) +{ + if(protocol->sink) { + IInternetProtocolSink_ReportResult(protocol->sink, result, ERROR_SUCCESS, NULL); + IInternetProtocolSink_Release(protocol->sink); + protocol->sink = NULL; + } + + return result; +} + +static HRESULT on_mime_message_available(MimeHtmlProtocol *protocol, IMimeMessage *mime_message) +{ + FINDBODY find = {NULL}; + IMimeBody *mime_body; + PROPVARIANT value; + HBODY body; + HRESULT hres; + + hres = IMimeMessage_FindFirst(mime_message, &find, &body); + if(FAILED(hres)) + return report_result(protocol, hres); + + if(protocol->location) { + BOOL found = FALSE; + do { + hres = IMimeMessage_FindNext(mime_message, &find, &body); + if(FAILED(hres)) { + WARN("location %s not found\n", debugstr_w(protocol->location)); + return report_result(protocol, hres); + } + + value.vt = VT_LPWSTR; + hres = IMimeMessage_GetBodyProp(mime_message, body, "content-location", 0, &value); + if(hres == MIME_E_NOT_FOUND) + continue; + if(FAILED(hres)) + return report_result(protocol, hres); + + found = !strcmpW(protocol->location, value.u.pwszVal); + PropVariantClear(&value); + }while(!found); + }else { + hres = IMimeMessage_FindNext(mime_message, &find, &body); + if(FAILED(hres)) { + WARN("location %s not found\n", debugstr_w(protocol->location)); + return report_result(protocol, hres); + } + } + + hres = IMimeMessage_BindToObject(mime_message, body, &IID_IMimeBody, (void**)&mime_body); + if(FAILED(hres)) + return report_result(protocol, hres); + + value.vt = VT_LPWSTR; + hres = IMimeBody_GetProp(mime_body, "content-type", 0, &value); + if(SUCCEEDED(hres)) { + hres = IInternetProtocolSink_ReportProgress(protocol->sink, BINDSTATUS_MIMETYPEAVAILABLE, value.u.pwszVal); + PropVariantClear(&value); + } + + /* FIXME: Create and report cache file. */ + + hres = IMimeBody_GetData(mime_body, IET_DECODED, &protocol->stream); + if(FAILED(hres)) + return report_result(protocol, hres); + + IInternetProtocolSink_ReportData(protocol->sink, BSCF_FIRSTDATANOTIFICATION + | BSCF_INTERMEDIATEDATANOTIFICATION + | BSCF_LASTDATANOTIFICATION + | BSCF_DATAFULLYAVAILABLE + | BSCF_AVAILABLEDATASIZEUNKNOWN, 0, 0); + + return report_result(protocol, S_OK); +} + +static HRESULT load_mime_message(IStream *stream, IMimeMessage **ret) +{ + IMimeMessage *mime_message; + HRESULT hres; + + hres = MimeMessage_create(NULL, (void**)&mime_message); + if(FAILED(hres)) + return hres; + + IMimeMessage_InitNew(mime_message); + + hres = IMimeMessage_Load(mime_message, stream); + if(FAILED(hres)) { + IMimeMessage_Release(mime_message); + return hres; + } + + *ret = mime_message; + return S_OK; +} + +static inline MimeHtmlBinding *impl_from_IBindStatusCallback(IBindStatusCallback *iface) +{ + return CONTAINING_RECORD(iface, MimeHtmlBinding, IBindStatusCallback_iface); +} + +static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, + REFIID riid, void **ppv) +{ + MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IBindStatusCallback_iface; + }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) { + TRACE("(%p)->(IID_IBindStatusCallback %p)\n", This, ppv); + *ppv = &This->IBindStatusCallback_iface; + }else { + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface) +{ + MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) +{ + MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->protocol) + IInternetProtocol_Release(&This->protocol->IInternetProtocol_iface); + if(This->stream) + IStream_Release(This->stream); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *iface, + DWORD dwReserved, IBinding *pib) +{ + MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); + + TRACE("(%p)->(%x %p)\n", This, dwReserved, pib); + + assert(!This->stream); + return CreateStreamOnHGlobal(NULL, TRUE, &This->stream); +} + +static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD dwReserved) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, + ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) +{ + MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%u/%u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); + return S_OK; +} + +static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) +{ + MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); + IMimeMessage *mime_message = NULL; + + TRACE("(%p)->(%x %s)\n", This, hresult, debugstr_w(szError)); + + if(SUCCEEDED(hresult)) { + hresult = load_mime_message(This->stream, &mime_message); + IStream_Release(This->stream); + This->stream = NULL; + } + + This->status = hresult; + + if(mime_message) + on_mime_message_available(This->protocol, mime_message); + else + report_result(This->protocol, hresult); + + if(mime_message) + IMimeMessage_Release(mime_message); + IInternetProtocol_Release(&This->protocol->IInternetProtocol_iface); + This->protocol = NULL; + return S_OK; +} + +static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, + DWORD* grfBINDF, BINDINFO* pbindinfo) +{ + MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); + + TRACE("(%p)\n", This); + + *grfBINDF = BINDF_ASYNCHRONOUS; + return S_OK; +} + +static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, + DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) +{ + MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); + BYTE buf[4*1024]; + DWORD read; + HRESULT hres; + + TRACE("(%p)\n", This); + + assert(pstgmed->tymed == TYMED_ISTREAM); + + while(1) { + hres = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read); + if(FAILED(hres)) + return hres; + if(!read) + break; + hres = IStream_Write(This->stream, buf, read, NULL); + if(FAILED(hres)) + return hres; + } + return S_OK; +} + +static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, + REFIID riid, IUnknown* punk) +{ + ERR("\n"); + return E_NOTIMPL; +} + +static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { + BindStatusCallback_QueryInterface, + BindStatusCallback_AddRef, + BindStatusCallback_Release, + BindStatusCallback_OnStartBinding, + BindStatusCallback_GetPriority, + BindStatusCallback_OnLowResource, + BindStatusCallback_OnProgress, + BindStatusCallback_OnStopBinding, + BindStatusCallback_GetBindInfo, + BindStatusCallback_OnDataAvailable, + BindStatusCallback_OnObjectAvailable +}; + +static inline MimeHtmlProtocol *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, MimeHtmlProtocol, IUnknown_inner); +} + +static HRESULT WINAPI MimeHtmlProtocol_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + MimeHtmlProtocol *This = impl_from_IUnknown(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IInternetProtocol_iface; + }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { + TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); + *ppv = &This->IInternetProtocol_iface; + }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { + TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); + *ppv = &This->IInternetProtocol_iface; + }else if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { + TRACE("(%p)->(IID_IInternetProtocolInfo %p)\n", This, ppv); + *ppv = &This->IInternetProtocolInfo_iface; + }else { + FIXME("unknown interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MimeHtmlProtocol_AddRef(IUnknown *iface) +{ + MimeHtmlProtocol *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI MimeHtmlProtocol_Release(IUnknown *iface) +{ + MimeHtmlProtocol *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%x\n", This, ref); + + if(!ref) { + if(This->sink) + IInternetProtocolSink_Release(This->sink); + if(This->stream) + IStream_Release(This->stream); + heap_free(This->location); + heap_free(This); + } + + return ref; +} + +static const IUnknownVtbl MimeHtmlProtocolInnerVtbl = { + MimeHtmlProtocol_QueryInterface, + MimeHtmlProtocol_AddRef, + MimeHtmlProtocol_Release +}; + +static inline MimeHtmlProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface) +{ + return CONTAINING_RECORD(iface, MimeHtmlProtocol, IInternetProtocol_iface); +} + +static HRESULT WINAPI InternetProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI InternetProtocol_AddRef(IInternetProtocol *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI InternetProtocol_Release(IInternetProtocol *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_Release(This->outer_unk); +} + +static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCHAR *szUrl, + IInternetProtocolSink* pOIProtSink, IInternetBindInfo* pOIBindInfo, + DWORD grfPI, HANDLE_PTR dwReserved) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + BINDINFO bindinfo = { sizeof(bindinfo) }; + MimeHtmlBinding *binding; + IBindCtx *bind_ctx; + IStream *stream; + mhtml_url_t url; + DWORD bindf = 0; + IMoniker *mon; + HRESULT hres; + + TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); + + hres = parse_mhtml_url(szUrl, &url); + if(FAILED(hres)) + return hres; + + if(url.location && !(This->location = heap_strdupW(url.location))) + return E_OUTOFMEMORY; + + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); + if(FAILED(hres)) { + WARN("GetBindInfo failed: %08x\n", hres); + return hres; + } + if((bindf & (BINDF_ASYNCHRONOUS|BINDF_FROMURLMON|BINDF_NEEDFILE)) != (BINDF_ASYNCHRONOUS|BINDF_FROMURLMON|BINDF_NEEDFILE)) + FIXME("unsupported bindf %x\n", bindf); + + This->sink = pOIProtSink; + IInternetProtocolSink_AddRef(This->sink); + + binding = heap_alloc(FIELD_OFFSET(MimeHtmlBinding, url[url.mhtml_len+1])); + if(!binding) + return E_OUTOFMEMORY; + memcpy(binding->url, url.mhtml, url.mhtml_len*sizeof(WCHAR)); + binding->url[url.mhtml_len] = 0; + + hres = CreateURLMoniker(NULL, binding->url, &mon); + if(FAILED(hres)) + return hres; + + binding->IBindStatusCallback_iface.lpVtbl = &BindStatusCallbackVtbl; + binding->ref = 1; + binding->status = E_PENDING; + binding->stream = NULL; + binding->protocol = NULL; + + hres = CreateAsyncBindCtx(0, &binding->IBindStatusCallback_iface, NULL, &bind_ctx); + if(FAILED(hres)) { + IMoniker_Release(mon); + IBindStatusCallback_Release(&binding->IBindStatusCallback_iface); + return hres; + } + + IInternetProtocol_AddRef(&This->IInternetProtocol_iface); + binding->protocol = This; + + hres = IMoniker_BindToStorage(mon, bind_ctx, NULL, &IID_IStream, (void**)&stream); + IBindCtx_Release(bind_ctx); + IMoniker_Release(mon); + if(stream) + IStream_Release(stream); + hres = binding->status; + IBindStatusCallback_Release(&binding->IBindStatusCallback_iface); + if(FAILED(hres) && hres != E_PENDING) + report_result(This, hres); + return hres; +} + +static HRESULT WINAPI MimeHtmlProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + FIXME("(%p)->(%p)\n", This, pProtocolData); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeHtmlProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, DWORD dwOptions) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeHtmlProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + TRACE("(%p)->(%08x)\n", This, dwOptions); + return S_OK; +} + +static HRESULT WINAPI MimeHtmlProtocol_Suspend(IInternetProtocol *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeHtmlProtocol_Resume(IInternetProtocol *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeHtmlProtocol_Read(IInternetProtocol *iface, void* pv, ULONG cb, ULONG* pcbRead) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + ULONG read = 0; + HRESULT hres; + + TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + + hres = IStream_Read(This->stream, pv, cb, &read); + if(pcbRead) + *pcbRead = read; + if(hres != S_OK) + return hres; + + return read ? S_OK : S_FALSE; +} + +static HRESULT WINAPI MimeHtmlProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, + DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeHtmlProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + FIXME("(%p)->(%d)\n", This, dwOptions); + return S_OK; +} + +static HRESULT WINAPI MimeHtmlProtocol_UnlockRequest(IInternetProtocol *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + FIXME("(%p)\n", This); + return S_OK; +} + +static const IInternetProtocolVtbl MimeHtmlProtocolVtbl = { + InternetProtocol_QueryInterface, + InternetProtocol_AddRef, + InternetProtocol_Release, + MimeHtmlProtocol_Start, + MimeHtmlProtocol_Continue, + MimeHtmlProtocol_Abort, + MimeHtmlProtocol_Terminate, + MimeHtmlProtocol_Suspend, + MimeHtmlProtocol_Resume, + MimeHtmlProtocol_Read, + MimeHtmlProtocol_Seek, + MimeHtmlProtocol_LockRequest, + MimeHtmlProtocol_UnlockRequest +}; + +static inline MimeHtmlProtocol *impl_from_IInternetProtocolInfo(IInternetProtocolInfo *iface) +{ + return CONTAINING_RECORD(iface, MimeHtmlProtocol, IInternetProtocolInfo_iface); +} + +static HRESULT WINAPI MimeHtmlProtocolInfo_QueryInterface(IInternetProtocolInfo *iface, REFIID riid, void **ppv) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI MimeHtmlProtocolInfo_AddRef(IInternetProtocolInfo *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI MimeHtmlProtocolInfo_Release(IInternetProtocolInfo *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + return IUnknown_Release(This->outer_unk); +} + +static HRESULT WINAPI MimeHtmlProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, + PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, + DWORD* pcchResult, DWORD dwReserved) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + FIXME("(%p)->(%s %d %x %p %d %p %d)\n", This, debugstr_w(pwzUrl), ParseAction, + dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); + return INET_E_DEFAULT_ACTION; +} + +static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, + LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult, + DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + size_t len = sizeof(mhtml_prefixW)/sizeof(WCHAR); + mhtml_url_t url; + WCHAR *p; + HRESULT hres; + + TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl), + debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, + pcchResult, dwReserved); + + hres = parse_mhtml_url(pwzBaseUrl, &url); + if(FAILED(hres)) + return hres; + + if(!strncmpiW(pwzRelativeUrl, mhtml_prefixW, sizeof(mhtml_prefixW)/sizeof(WCHAR))) { + FIXME("Relative URL is mhtml protocol\n"); + return INET_E_USE_DEFAULT_PROTOCOLHANDLER; + } + + len += url.mhtml_len; + if(*pwzRelativeUrl) + len += strlenW(pwzRelativeUrl) + sizeof(mhtml_separatorW)/sizeof(WCHAR); + if(len >= cchResult) { + *pcchResult = 0; + return E_FAIL; + } + + memcpy(pwzResult, mhtml_prefixW, sizeof(mhtml_prefixW)); + p = pwzResult + sizeof(mhtml_prefixW)/sizeof(WCHAR); + memcpy(p, url.mhtml, url.mhtml_len*sizeof(WCHAR)); + p += url.mhtml_len; + if(*pwzRelativeUrl) { + memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); + p += sizeof(mhtml_separatorW)/sizeof(WCHAR); + strcpyW(p, pwzRelativeUrl); + }else { + *p = 0; + } + + *pcchResult = len; + return S_OK; +} + +static HRESULT WINAPI MimeHtmlProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1, + LPCWSTR pwzUrl2, DWORD dwCompareFlags) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + FIXME("(%p)->(%s %s %08x)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeHtmlProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, + QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, + DWORD dwReserved) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + FIXME("(%p)->(%s %08x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, + cbBuffer, pcbBuf, dwReserved); + return INET_E_USE_DEFAULT_PROTOCOLHANDLER; +} + +static const IInternetProtocolInfoVtbl MimeHtmlProtocolInfoVtbl = { + MimeHtmlProtocolInfo_QueryInterface, + MimeHtmlProtocolInfo_AddRef, + MimeHtmlProtocolInfo_Release, + MimeHtmlProtocolInfo_ParseUrl, + MimeHtmlProtocolInfo_CombineUrl, + MimeHtmlProtocolInfo_CompareUrl, + MimeHtmlProtocolInfo_QueryInfo +}; + +HRESULT MimeHtmlProtocol_create(IUnknown *outer, void **obj) +{ + MimeHtmlProtocol *protocol; + + protocol = heap_alloc(sizeof(*protocol)); + if(!protocol) + return E_OUTOFMEMORY; + + protocol->IUnknown_inner.lpVtbl = &MimeHtmlProtocolInnerVtbl; + protocol->IInternetProtocol_iface.lpVtbl = &MimeHtmlProtocolVtbl; + protocol->IInternetProtocolInfo_iface.lpVtbl = &MimeHtmlProtocolInfoVtbl; + protocol->ref = 1; + protocol->outer_unk = outer ? outer : &protocol->IUnknown_inner; + protocol->location = NULL; + protocol->stream = NULL; + protocol->sink = NULL; + + *obj = &protocol->IUnknown_inner; + return S_OK; +} Propchange: trunk/reactos/dll/win32/inetcomm/protocol.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 5 21:33:13 2017 @@ -78,7 +78,7 @@ reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.2 reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 -reactos/dll/win32/inetcomm # Synced to WineStaging-1.9.23 +reactos/dll/win32/inetcomm # Synced to WineStaging-2.2 reactos/dll/win32/inetmib1 # Synced to WineStaging-1.9.11 reactos/dll/win32/initpki # Synced to WineStaging-1.9.11 reactos/dll/win32/inseng # Synced to WineStaging-2.2

1 0

[akhaldi] 74104: [PSDK] Update mimeole.idl. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:29:40 2017 New Revision: 74104 URL: http://svn.reactos.org/svn/reactos?rev=74104&view=rev Log: [PSDK] Update mimeole.idl. CORE-12823 Modified: trunk/reactos/sdk/include/psdk/mimeole.idl Modified: trunk/reactos/sdk/include/psdk/mimeole.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/mimeole.i… ============================================================================== --- trunk/reactos/sdk/include/psdk/mimeole.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/mimeole.idl [iso-8859-1] Sun Mar 5 21:29:40 2017 @@ -34,6 +34,8 @@ cpp_quote("DEFINE_GUID(CLSID_IMimeMessage, 0xfd853ce3, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IMimeSecurity, 0xfd853cde, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IVirtualStream, 0xfd853cdf, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_IMimeHtmlProtocol,0x5300401,0xbcbc, 0x11d0, 0x85, 0xe3, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_MimeEdit, 0x1c82ead9, 0x508e, 0x11d1, 0x8d, 0xcf, 0x0, 0xc0, 0x4f, 0xb9, 0x51, 0xf9);") cpp_quote("#define MIME_E_REG_CREATE_KEY 0x800cce01") cpp_quote("#define MIME_E_REG_QUERY_INFO 0x800cce02")

1 0

[ekohl] 74103: [NTOS:OB] - Define and use a pool tag for directory security descriptors. - Use a custom security descriptor to create the KernelObjects directory.
by ekohl＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: ekohl Date: Sun Mar 5 21:28:10 2017 New Revision: 74103 URL: http://svn.reactos.org/svn/reactos?rev=74103&view=rev Log: [NTOS:OB] - Define and use a pool tag for directory security descriptors. - Use a custom security descriptor to create the KernelObjects directory. Modified: trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Sun Mar 5 21:28:10 2017 @@ -150,6 +150,8 @@ /* Object Manager Tags */ #define OB_NAME_TAG 'mNbO' #define OB_DIR_TAG 'iDbO' +#define TAG_OB_DIR_SD 'sDbO' + /* formerly located in ps/cid.c */ #define TAG_CIDOBJECT 'ODIC' Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Sun Mar 5 21:28:10 2017 @@ -53,6 +53,82 @@ ULONG ObpInitializationPhase; /* PRIVATE FUNCTIONS *********************************************************/ + +static +NTSTATUS +NTAPI +INIT_FUNCTION +ObpCreateKernelObjectsSD(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + ULONG AclLength; + PACL Dacl; + NTSTATUS Status; + + /* Initialize the SD */ + Status = RtlCreateSecurityDescriptor(SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + return Status; + + /* Allocate the DACL */ + AclLength = sizeof(ACL) + + sizeof(ACE) + RtlLengthSid(SeWorldSid) + + sizeof(ACE) + RtlLengthSid(SeAliasAdminsSid) + + sizeof(ACE) + RtlLengthSid(SeLocalSystemSid); + + Dacl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_OB_DIR_SD); + if (Dacl == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize the DACL */ + RtlCreateAcl(Dacl, AclLength, ACL_REVISION); + + /* Add the ACEs */ + RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_READ, + SeWorldSid); + + RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeAliasAdminsSid); + + RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeLocalSystemSid); + + /* Attach the DACL to the SD */ + Status = RtlSetDaclSecurityDescriptor(SecurityDescriptor, + TRUE, + Dacl, + FALSE); + + return Status; +} + +static +VOID +NTAPI +INIT_FUNCTION +ObpFreeKernelObjectsSD(IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + PACL Dacl = NULL; + BOOLEAN DaclPresent, Defaulted; + NTSTATUS Status; + + Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, + &DaclPresent, + &Dacl, + &Defaulted); + if (NT_SUCCESS(Status) && Dacl != NULL) + { + ExFreePool(Dacl); + } +} BOOLEAN INIT_FUNCTION @@ -136,6 +212,7 @@ POBJECT_HEADER Header; POBJECT_HEADER_CREATOR_INFO CreatorInfo; POBJECT_HEADER_NAME_INFO NameInfo; + SECURITY_DESCRIPTOR KernelObjectsSD; NTSTATUS Status; /* Check if this is actually Phase 1 initialization */ @@ -258,25 +335,31 @@ Status = NtClose(Handle); if (!NT_SUCCESS(Status)) return FALSE; - /* Initialize Object Types directory attributes */ + /* Create a custom security descriptor for the KernelObjects directory */ + Status = ObpCreateKernelObjectsSD(&KernelObjectsSD); + if (!NT_SUCCESS(Status)) + return FALSE; + + /* Initialize the KernelObjects directory attributes */ RtlInitUnicodeString(&Name, L"\\KernelObjects"); InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, - NULL); - + &KernelObjectsSD); + /* Create the directory */ Status = NtCreateDirectoryObject(&Handle, DIRECTORY_ALL_ACCESS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) return FALSE; - + ObpFreeKernelObjectsSD(&KernelObjectsSD); + if (!NT_SUCCESS(Status)) return FALSE; + /* Close the extra handle */ Status = NtClose(Handle); if (!NT_SUCCESS(Status)) return FALSE; - /* Initialize Object Types directory attributes */ + /* Initialize ObjectTypes directory attributes */ RtlInitUnicodeString(&Name, L"\\ObjectTypes"); InitializeObjectAttributes(&ObjectAttributes, &Name, Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Sun Mar 5 21:28:10 2017 @@ -55,10 +55,10 @@ sizeof(ACE) + RtlLengthSid(SeLocalSystemSid) + sizeof(ACE) + RtlLengthSid(SeCreatorOwnerSid); - Dacl = ExAllocatePool(PagedPool, AclLength); + Dacl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_OB_DIR_SD); if (Dacl == NULL) { - return STATUS_NO_MEMORY; + return STATUS_INSUFFICIENT_RESOURCES; } /* Initialize the DACL */

1 0

[akhaldi] 74102: [CRYPT32_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:22:31 2017 New Revision: 74102 URL: http://svn.reactos.org/svn/reactos?rev=74102&view=rev Log: [CRYPT32_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/crypt32/base64.c trunk/rostests/winetests/crypt32/chain.c trunk/rostests/winetests/crypt32/sip.c trunk/rostests/winetests/crypt32/store.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/base64.… Modified: trunk/rostests/winetests/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/chain.c… Modified: trunk/rostests/winetests/crypt32/sip.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/sip.c?r… Modified: trunk/rostests/winetests/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/store.c…

1 0

[akhaldi] 74101: [CRYPT32] Sync with Wine Staging 2.2. CORE-12823 a7d1d77 crypt32: Recognize sha256/384/512 KEY OIDs. e376123 crypt32: Remove unused parameter and dead code. 254eb21 crypt32: Fix wr...
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:21:36 2017 New Revision: 74101 URL: http://svn.reactos.org/svn/reactos?rev=74101&view=rev Log: [CRYPT32] Sync with Wine Staging 2.2. CORE-12823 a7d1d77 crypt32: Recognize sha256/384/512 KEY OIDs. e376123 crypt32: Remove unused parameter and dead code. 254eb21 crypt32: Fix wrong Base64 trailer WCHAR constants. a2f2de1 crypt32: CryptStringToBinary accepts any header. 552820a crypt32: Fix Base64 issues in CryptStringToBinary. e353ab6 crypt32: Base64 header requires a space. Modified: trunk/reactos/dll/win32/crypt32/base64.c trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/base64.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/base64.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/base64.c [iso-8859-1] Sun Mar 5 21:21:36 2017 @@ -24,10 +24,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); #define CERT_HEADER "-----BEGIN CERTIFICATE-----" -#define CERT_HEADER_START "-----BEGIN" +#define CERT_HEADER_START "-----BEGIN " #define CERT_DELIMITER "-----" #define CERT_TRAILER "-----END CERTIFICATE-----" -#define CERT_TRAILER_START "-----END" +#define CERT_TRAILER_START "-----END " #define CERT_REQUEST_HEADER "-----BEGIN NEW CERTIFICATE REQUEST-----" #define CERT_REQUEST_TRAILER "-----END NEW CERTIFICATE REQUEST-----" #define X509_HEADER "-----BEGIN X509 CRL-----" @@ -37,14 +37,14 @@ '-','-','-','-','-','B','E','G','I','N',' ','C','E','R','T','I','F','I','C', 'A','T','E','-','-','-','-','-',0 }; static const WCHAR CERT_HEADER_START_W[] = { -'-','-','-','-','-','B','E','G','I','N',0 }; +'-','-','-','-','-','B','E','G','I','N',' ',0 }; static const WCHAR CERT_DELIMITER_W[] = { '-','-','-','-','-',0 }; static const WCHAR CERT_TRAILER_W[] = { -'-','-','-','-','-','E','N','D',0 }; -static const WCHAR CERT_TRAILER_START_W[] = { '-','-','-','-','-','E','N','D',' ','C','E','R','T','I','F','I','C','A','T', 'E','-','-','-','-','-',0 }; +static const WCHAR CERT_TRAILER_START_W[] = { +'-','-','-','-','-','E','N','D',' ',0 }; static const WCHAR CERT_REQUEST_HEADER_W[] = { '-','-','-','-','-','B','E','G','I','N',' ','N','E','W',' ','C','E','R','T', 'I','F','I','C','A','T','E','R','E','Q','U','E','S','T','-','-','-','-','-',0 }; @@ -477,9 +477,13 @@ return encoder(pbBinary, cbBinary, dwFlags, pszString, pcchString); } -static inline BYTE decodeBase64Byte(int c) -{ - BYTE ret; +#define BASE64_DECODE_PADDING 0x100 +#define BASE64_DECODE_WHITESPACE 0x200 +#define BASE64_DECODE_INVALID 0x300 + +static inline int decodeBase64Byte(int c) +{ + int ret = BASE64_DECODE_INVALID; if (c >= 'A' && c <= 'Z') ret = c - 'A'; @@ -491,76 +495,11 @@ ret = 62; else if (c == '/') ret = 63; - else - ret = 64; - return ret; -} - -static LONG decodeBase64Block(const char *in_buf, int in_len, - const char **nextBlock, PBYTE out_buf, DWORD *out_len) -{ - int len = in_len; - const char *d = in_buf; - int ip0, ip1, ip2, ip3; - - if (len < 4) - return ERROR_INVALID_DATA; - - if (d[2] == '=') - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - out_buf[0] = (ip0 << 2) | (ip1 >> 4); - *out_len = 1; - } - else if (d[3] == '=') - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - if ((ip2 = decodeBase64Byte(d[2])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - { - out_buf[0] = (ip0 << 2) | (ip1 >> 4); - out_buf[1] = (ip1 << 4) | (ip2 >> 2); - } - *out_len = 2; - } - else - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - if ((ip2 = decodeBase64Byte(d[2])) > 63) - return ERROR_INVALID_DATA; - if ((ip3 = decodeBase64Byte(d[3])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - { - out_buf[0] = (ip0 << 2) | (ip1 >> 4); - out_buf[1] = (ip1 << 4) | (ip2 >> 2); - out_buf[2] = (ip2 << 6) | ip3; - } - *out_len = 3; - } - if (len >= 6 && d[4] == '\r' && d[5] == '\n') - *nextBlock = d + 6; - else if (len >= 5 && d[4] == '\n') - *nextBlock = d + 5; - else if (len >= 4 && d[4]) - *nextBlock = d + 4; - else - *nextBlock = NULL; - return ERROR_SUCCESS; + else if (c == '=') + ret = BASE64_DECODE_PADDING; + else if (c == ' ' || c == '\t' || c == '\r' || c == '\n') + ret = BASE64_DECODE_WHITESPACE; + return ret; } /* Unlike CryptStringToBinaryA, cchString is guaranteed to be the length of the @@ -569,46 +508,101 @@ typedef LONG (*StringToBinaryAFunc)(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags); +static LONG Base64ToBinary(const void* pszString, BOOL wide, DWORD cchString, + BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) +{ + DWORD cbIn, cbValid, cbOut, hasPadding; + BYTE block[4]; + for (cbIn = cbValid = cbOut = hasPadding = 0; cbIn < cchString; ++cbIn) + { + int c = wide ? (int)((WCHAR*)pszString)[cbIn] : (int)((char*)pszString)[cbIn]; + int d = decodeBase64Byte(c); + if (d == BASE64_DECODE_INVALID) + goto invalid; + if (d == BASE64_DECODE_WHITESPACE) + continue; + + /* When padding starts, data is not acceptable */ + if (hasPadding && d != BASE64_DECODE_PADDING) + goto invalid; + + /* Padding after a full block (like "VVVV=") is ok and stops decoding */ + if (d == BASE64_DECODE_PADDING && (cbValid & 3) == 0) + break; + + cbValid += 1; + + if (d == BASE64_DECODE_PADDING) + { + hasPadding = 1; + /* When padding reaches a full block, stop decoding */ + if ((cbValid & 3) == 0) + break; + continue; + } + + /* cbOut is incremented in the 4-char block as follows: "1-23" */ + if ((cbValid & 3) != 2) + cbOut += 1; + } + /* Fail if the block has bad padding; omitting padding is fine */ + if ((cbValid & 3) != 0 && hasPadding) + goto invalid; + /* Check available buffer size */ + if (pbBinary && *pcbBinary && cbOut > *pcbBinary) + goto overflow; + /* Convert the data; this step depends on the validity checks above! */ + if (pbBinary) for (cbIn = cbValid = cbOut = 0; cbIn < cchString; ++cbIn) + { + int c = wide ? (int)((WCHAR*)pszString)[cbIn] : (int)((char*)pszString)[cbIn]; + int d = decodeBase64Byte(c); + if (d == BASE64_DECODE_WHITESPACE) + continue; + if (d == BASE64_DECODE_PADDING) + break; + block[cbValid & 3] = d; + cbValid += 1; + switch (cbValid & 3) { + case 1: + pbBinary[cbOut++] = (block[0] << 2); + break; + case 2: + pbBinary[cbOut-1] = (block[0] << 2) | (block[1] >> 4); + break; + case 3: + pbBinary[cbOut++] = (block[1] << 4) | (block[2] >> 2); + break; + case 0: + pbBinary[cbOut++] = (block[2] << 6) | (block[3] >> 0); + break; + } + } + *pcbBinary = cbOut; + if (pdwSkip) + *pdwSkip = 0; + if (pdwFlags) + *pdwFlags = CRYPT_STRING_BASE64; + return ERROR_SUCCESS; +overflow: + return ERROR_INSUFFICIENT_BUFFER; +invalid: + *pcbBinary = cbOut; + return ERROR_INVALID_DATA; +} + static LONG Base64ToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { - LONG ret = ERROR_SUCCESS; - const char *nextBlock; - DWORD outLen = 0; - - nextBlock = pszString; - while (nextBlock && !ret) - { - DWORD len = 0; - - ret = decodeBase64Block(nextBlock, cchString - (nextBlock - pszString), - &nextBlock, pbBinary ? pbBinary + outLen : NULL, &len); - if (!ret) - outLen += len; - if (cchString - (nextBlock - pszString) <= 0) - nextBlock = NULL; - } - *pcbBinary = outLen; - if (!ret) - { - if (pdwSkip) - *pdwSkip = 0; - if (pdwFlags) - *pdwFlags = CRYPT_STRING_BASE64; - } - else if (ret == ERROR_INSUFFICIENT_BUFFER) - { - if (!pbBinary) - ret = ERROR_SUCCESS; - } - return ret; + return Base64ToBinary(pszString, FALSE, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags); } static LONG Base64WithHeaderAndTrailerToBinaryA(LPCSTR pszString, - DWORD cchString, LPCSTR header, LPCSTR trailer, BYTE *pbBinary, - DWORD *pcbBinary, DWORD *pdwSkip, BOOL exactHeaderAndTrailerMatch) + DWORD cchString, BYTE *pbBinary, + DWORD *pcbBinary, DWORD *pdwSkip) { LONG ret; + LPCSTR header = CERT_HEADER_START; + LPCSTR trailer = CERT_TRAILER_START; LPCSTR headerBegins; LPCSTR dataBegins; @@ -627,43 +621,20 @@ } dataBegins = headerBegins + strlen(header); - if (!exactHeaderAndTrailerMatch) - { - if ((dataBegins = strstr(dataBegins, CERT_DELIMITER))) - { - dataBegins += strlen(CERT_DELIMITER); - } - else - { - return ERROR_INVALID_DATA; - } - } + if (!(dataBegins = strstr(dataBegins, CERT_DELIMITER))) + { + return ERROR_INVALID_DATA; + } + dataBegins += strlen(CERT_DELIMITER); if (*dataBegins == '\r') dataBegins++; if (*dataBegins == '\n') dataBegins++; - if (exactHeaderAndTrailerMatch) - { - trailerBegins = pszString + cchString - strlen(trailer); - if (pszString[cchString - 1] == '\n') trailerBegins--; - if (pszString[cchString - 2] == '\r') trailerBegins--; - - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; - - if (!strncmp(trailerBegins, trailer, strlen(trailer))) - { - return ERROR_INVALID_DATA; - } - } - else - { - if (!(trailerBegins = strstr(dataBegins, trailer))) - { - return ERROR_INVALID_DATA; - } - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; - } + if (!(trailerBegins = strstr(dataBegins, trailer))) + { + return ERROR_INVALID_DATA; + } + if (*(trailerBegins-1) == '\n') trailerBegins--; + if (*(trailerBegins-1) == '\r') trailerBegins--; if (pdwSkip) *pdwSkip = headerBegins - pszString; @@ -680,7 +651,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - CERT_HEADER_START, CERT_TRAILER_START, pbBinary, pcbBinary, pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64HEADER; @@ -691,7 +662,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - CERT_REQUEST_HEADER, CERT_REQUEST_TRAILER, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64REQUESTHEADER; @@ -702,7 +673,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - X509_HEADER, X509_TRAILER, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64X509CRLHEADER; @@ -824,75 +795,6 @@ return ret == ERROR_SUCCESS; } -static LONG decodeBase64BlockW(const WCHAR *in_buf, int in_len, - const WCHAR **nextBlock, PBYTE out_buf, DWORD *out_len) -{ - int len = in_len, i; - const WCHAR *d = in_buf; - int ip0, ip1, ip2, ip3; - - if (len < 4) - return ERROR_INVALID_DATA; - - i = 0; - if (d[2] == '=') - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - out_buf[i] = (ip0 << 2) | (ip1 >> 4); - i++; - } - else if (d[3] == '=') - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - if ((ip2 = decodeBase64Byte(d[2])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - { - out_buf[i + 0] = (ip0 << 2) | (ip1 >> 4); - out_buf[i + 1] = (ip1 << 4) | (ip2 >> 2); - } - i += 2; - } - else - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - if ((ip2 = decodeBase64Byte(d[2])) > 63) - return ERROR_INVALID_DATA; - if ((ip3 = decodeBase64Byte(d[3])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - { - out_buf[i + 0] = (ip0 << 2) | (ip1 >> 4); - out_buf[i + 1] = (ip1 << 4) | (ip2 >> 2); - out_buf[i + 2] = (ip2 << 6) | ip3; - } - i += 3; - } - if (len >= 6 && d[4] == '\r' && d[5] == '\n') - *nextBlock = d + 6; - else if (len >= 5 && d[4] == '\n') - *nextBlock = d + 5; - else if (len >= 4 && d[4]) - *nextBlock = d + 4; - else - *nextBlock = NULL; - *out_len = i; - return ERROR_SUCCESS; -} - /* Unlike CryptStringToBinaryW, cchString is guaranteed to be the length of the * string to convert. */ @@ -902,43 +804,16 @@ static LONG Base64ToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { - LONG ret = ERROR_SUCCESS; - const WCHAR *nextBlock; - DWORD outLen = 0; - - nextBlock = pszString; - while (nextBlock && !ret) - { - DWORD len = 0; - - ret = decodeBase64BlockW(nextBlock, cchString - (nextBlock - pszString), - &nextBlock, pbBinary ? pbBinary + outLen : NULL, &len); - if (!ret) - outLen += len; - if (cchString - (nextBlock - pszString) <= 0) - nextBlock = NULL; - } - *pcbBinary = outLen; - if (!ret) - { - if (pdwSkip) - *pdwSkip = 0; - if (pdwFlags) - *pdwFlags = CRYPT_STRING_BASE64; - } - else if (ret == ERROR_INSUFFICIENT_BUFFER) - { - if (!pbBinary) - ret = ERROR_SUCCESS; - } - return ret; + return Base64ToBinary(pszString, TRUE, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags); } static LONG Base64WithHeaderAndTrailerToBinaryW(LPCWSTR pszString, - DWORD cchString, LPCWSTR header, LPCWSTR trailer, BYTE *pbBinary, - DWORD *pcbBinary, DWORD *pdwSkip, BOOL exactHeaderAndTrailerMatch) + DWORD cchString, BYTE *pbBinary, + DWORD *pcbBinary, DWORD *pdwSkip) { LONG ret; + LPCWSTR header = CERT_HEADER_START_W; + LPCWSTR trailer = CERT_TRAILER_START_W; LPCWSTR headerBegins; LPCWSTR dataBegins; @@ -957,43 +832,20 @@ } dataBegins = headerBegins + strlenW(header); - if (!exactHeaderAndTrailerMatch) - { - if ((dataBegins = strstrW(dataBegins, CERT_DELIMITER_W))) - { - dataBegins += strlenW(CERT_DELIMITER_W); - } - else - { - return ERROR_INVALID_DATA; - } - } + if (!(dataBegins = strstrW(dataBegins, CERT_DELIMITER_W))) + { + return ERROR_INVALID_DATA; + } + dataBegins += strlenW(CERT_DELIMITER_W); if (*dataBegins == '\r') dataBegins++; if (*dataBegins == '\n') dataBegins++; - if (exactHeaderAndTrailerMatch) - { - trailerBegins = pszString + cchString - strlenW(trailer); - if (pszString[cchString - 1] == '\n') trailerBegins--; - if (pszString[cchString - 2] == '\r') trailerBegins--; - - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; - - if (!strncmpW(trailerBegins, trailer, strlenW(trailer))) - { - return ERROR_INVALID_DATA; - } - } - else - { - if (!(trailerBegins = strstrW(dataBegins, trailer))) - { - return ERROR_INVALID_DATA; - } - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; - } + if (!(trailerBegins = strstrW(dataBegins, trailer))) + { + return ERROR_INVALID_DATA; + } + if (*(trailerBegins-1) == '\n') trailerBegins--; + if (*(trailerBegins-1) == '\r') trailerBegins--; if (pdwSkip) *pdwSkip = headerBegins - pszString; @@ -1010,8 +862,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - CERT_HEADER_START_W, CERT_TRAILER_START_W, pbBinary, pcbBinary, - pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64HEADER; @@ -1022,8 +873,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - CERT_REQUEST_HEADER_W, CERT_REQUEST_TRAILER_W, pbBinary, pcbBinary, - pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64REQUESTHEADER; @@ -1034,7 +884,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - X509_HEADER_W, X509_TRAILER_W, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64X509CRLHEADER; Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Sun Mar 5 21:21:36 2017 @@ -1039,6 +1039,9 @@ static const WCHAR rc4[] = { 'r','c','4',0 }; static const WCHAR sha[] = { 's','h','a',0 }; static const WCHAR sha1[] = { 's','h','a','1',0 }; +static const WCHAR sha256[] = { 's','h','a','2','5','6',0 }; +static const WCHAR sha384[] = { 's','h','a','3','8','4',0 }; +static const WCHAR sha512[] = { 's','h','a','5','1','2',0 }; static const WCHAR RSA[] = { 'R','S','A',0 }; static const WCHAR RSA_KEYX[] = { 'R','S','A','_','K','E','Y','X',0 }; static const WCHAR RSA_SIGN[] = { 'R','S','A','_','S','I','G','N',0 }; @@ -1143,6 +1146,9 @@ { 1, szOID_RSA_MD5, CALG_MD5, md5, NULL }, { 1, szOID_RSA_MD4, CALG_MD4, md4, NULL }, { 1, szOID_RSA_MD2, CALG_MD2, md2, NULL }, + { 1, szOID_NIST_sha256, CALG_SHA_256, sha256, NULL }, + { 1, szOID_NIST_sha384, CALG_SHA_384, sha384, NULL }, + { 1, szOID_NIST_sha512, CALG_SHA_512, sha512, NULL }, { 2, szOID_OIWSEC_desCBC, CALG_DES, des, NULL }, { 2, szOID_RSA_DES_EDE3_CBC, CALG_3DES, tripledes, NULL }, Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 5 21:21:36 2017 @@ -58,7 +58,7 @@ reactos/dll/win32/comdlg32 # Synced to WineStaging-2.2 reactos/dll/win32/compstui # Synced to WineStaging-2.2 reactos/dll/win32/credui # Synced to WineStaging-2.2 -reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.23 +reactos/dll/win32/crypt32 # Synced to WineStaging-2.2 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.11

1 0

[akhaldi] 74100: [PSDK] Update wincrypt.h. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:19:15 2017 New Revision: 74100 URL: http://svn.reactos.org/svn/reactos?rev=74100&view=rev Log: [PSDK] Update wincrypt.h. CORE-12823 Modified: trunk/reactos/sdk/include/psdk/wincrypt.h Modified: trunk/reactos/sdk/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/wincrypt.… ============================================================================== --- trunk/reactos/sdk/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/wincrypt.h [iso-8859-1] Sun Mar 5 21:19:15 2017 @@ -3294,6 +3294,10 @@ #define szOID_NETSCAPE_DATA_TYPE "2.16.840.1.113730.2" #define szOID_NETSCAPE_CERT_SEQUENCE "2.16.840.1.113730.2.5" +#define szOID_NIST_sha256 "2.16.840.1.101.3.4.2.1" +#define szOID_NIST_sha384 "2.16.840.1.101.3.4.2.2" +#define szOID_NIST_sha512 "2.16.840.1.101.3.4.2.3" + /* Bits for szOID_NETSCAPE_CERT_TYPE */ #define NETSCAPE_SSL_CLIENT_AUTH_CERT_TYPE 0x80 #define NETSCAPE_SSL_SERVER_AUTH_CERT_TYPE 0x40 @@ -4018,6 +4022,22 @@ DWORD dwRecipientIndex; } CMSG_CTRL_KEY_TRANS_DECRYPT_PARA, *PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA; +typedef struct _CERT_STRONG_SIGN_SERIALIZED_INFO { + DWORD dwFlags; + WCHAR *pwszCNGSignHashAlgids; + WCHAR *pwszCNGPubKeyMinBitLengths; +} CERT_STRONG_SIGN_SERIALIZED_INFO, *PCERT_STRONG_SIGN_SERIALIZED_INFO; + +typedef struct _CERT_STRONG_SIGN_PARA { + DWORD cbSize; + DWORD dwInfoChoice; + union { + void *pvInfo; + CERT_STRONG_SIGN_SERIALIZED_INFO *pSerializedInfo; + char *pszOID; + } DUMMYUNIONNAME; +} CERT_STRONG_SIGN_PARA, *PCERT_STRONG_SIGN_PARA; + typedef BOOL (WINAPI *PFN_CMSG_GEN_CONTENT_ENCRYPT_KEY)( _Inout_ PCMSG_CONTENT_ENCRYPT_INFO pContentEncryptInfo,

1 0

[akhaldi] 74099: [GDIPLUS_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:16:17 2017 New Revision: 74099 URL: http://svn.reactos.org/svn/reactos?rev=74099&view=rev Log: [GDIPLUS_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/gdiplus/customlinecap.c trunk/rostests/winetests/gdiplus/image.c trunk/rostests/winetests/gdiplus/pen.c Modified: trunk/rostests/winetests/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/customl… ============================================================================== --- trunk/rostests/winetests/gdiplus/customlinecap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/customlinecap.c [iso-8859-1] Sun Mar 5 21:16:17 2017 @@ -223,6 +223,100 @@ GdipDeletePath(path); } +static void test_create_adjustable_cap(void) +{ + GpAdjustableArrowCap *cap; + REAL inset, scale; + GpLineJoin join; + GpStatus stat; + GpLineCap base; + + stat = GdipCreateAdjustableArrowCap(10.0, 10.0, TRUE, NULL); +todo_wine + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipCreateAdjustableArrowCap(17.0, 15.0, TRUE, &cap); +todo_wine + ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); + if (stat != Ok) + return; + + stat = GdipGetAdjustableArrowCapMiddleInset(cap, NULL); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipGetAdjustableArrowCapMiddleInset(cap, &inset); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(inset == 0.0f, "Unexpected middle inset %f\n", inset); + + stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(base == LineCapTriangle, "Unexpected base cap %d\n", base); + + stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquare); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(base == LineCapSquare, "Unexpected base cap %d\n", base); + + stat = GdipGetCustomLineCapBaseInset((GpCustomLineCap*)cap, &inset); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipGetCustomLineCapWidthScale((GpCustomLineCap*)cap, &scale); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(scale == 1.0f, "Unexpected width scale %f\n", scale); + + stat = GdipGetCustomLineCapStrokeJoin((GpCustomLineCap*)cap, &join); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(join == LineJoinMiter, "Unexpected stroke join %d\n", join); + + GdipDeleteCustomLineCap((GpCustomLineCap*)cap); +} + +static void test_captype(void) +{ + GpAdjustableArrowCap *arrowcap; + GpCustomLineCap *custom; + CustomLineCapType type; + GpStatus stat; + GpPath *path; + + stat = GdipGetCustomLineCapType(NULL, NULL); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + type = 10; + stat = GdipGetCustomLineCapType(NULL, &type); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + ok(type == 10, "Unexpected cap type, %d\n", type); + + /* default cap */ + stat = GdipCreatePath(FillModeAlternate, &path); + ok(stat == Ok, "Failed to create path, %d\n", stat); + stat = GdipAddPathRectangle(path, 5.0, 5.0, 10.0, 10.0); + ok(stat == Ok, "AddPathRectangle failed, %d\n", stat); + + stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, &custom); + ok(stat == Ok, "Failed to create cap, %d\n", stat); + stat = GdipGetCustomLineCapType(custom, &type); + ok(stat == Ok, "Failed to get cap type, %d\n", stat); + ok(type == CustomLineCapTypeDefault, "Unexpected cap type %d\n", stat); + GdipDeleteCustomLineCap(custom); + GdipDeletePath(path); + + /* arrow cap */ + stat = GdipCreateAdjustableArrowCap(17.0, 15.0, TRUE, &arrowcap); +todo_wine + ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); + if (stat != Ok) + return; + + stat = GdipGetCustomLineCapType((GpCustomLineCap*)arrowcap, &type); + ok(stat == Ok, "Failed to get cap type, %d\n", stat); + ok(type == CustomLineCapTypeAdjustableArrow, "Unexpected cap type %d\n", stat); + + GdipDeleteCustomLineCap((GpCustomLineCap*)arrowcap); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -239,6 +333,8 @@ test_linejoin(); test_inset(); test_scale(); + test_create_adjustable_cap(); + test_captype(); GdiplusShutdown(gdiplusToken); } Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Sun Mar 5 21:16:17 2017 @@ -1688,6 +1688,7 @@ HDC hdc; COLORREF pixel; BYTE bits[640]; + BitmapData lockeddata; memset(bits, 0x68, 640); @@ -1872,6 +1873,30 @@ stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); + + /* create HBITMAP from locked data */ + memset(bits, 0x68, 640); + stat = GdipCreateBitmapFromScan0(10, 20, 32, PixelFormat24bppRGB, bits, &bitmap); + expect(Ok, stat); + + memset(&lockeddata, 0, sizeof(lockeddata)); + stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead | ImageLockModeWrite, + PixelFormat32bppRGB, &lockeddata); + expect(Ok, stat); + ((DWORD*)lockeddata.Scan0)[0] = 0xff242424; + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0); + expect(Ok, stat); + stat = GdipBitmapUnlockBits(bitmap, &lockeddata); + expect(Ok, stat); + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + hdc = CreateCompatibleDC(NULL); + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 0, 0); + expect(0x686868, pixel); + SelectObject(hdc, oldhbitmap); + DeleteDC(hdc); } static void test_getthumbnail(void) @@ -3107,8 +3132,6 @@ ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount); status = GdipLoadImageFromStream(stream, &image); - ok(status == Ok || broken(status == InvalidParameter), /* XP */ - "GdipLoadImageFromStream error %d\n", status); if (status != Ok) { IStream_Release(stream); @@ -5168,6 +5191,186 @@ GdipDisposeImage((GpImage *)bitmap); } +#include "pshpack2.h" +static const struct tiff_1x1_data +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[12]; + ULONG next_IFD; + struct IFD_rational res; + short palette_data[3][256]; + short bps_data[4]; + BYTE pixel_data[32]; +} tiff_1x1_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_1x1_data, number_of_entries), + 12, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 1 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 3, FIELD_OFFSET(struct tiff_1x1_data, bps_data) }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_1x1_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 3 }, /* SAMPLESPERPIXEL */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1x1_data, res) }, + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1x1_data, res) }, + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + { 0x140, IFD_SHORT, 256*3, FIELD_OFFSET(struct tiff_1x1_data, palette_data) } /* COLORMAP */ + }, + 0, + { 96, 1 }, + { { 0 } }, + { 8,8,8,0 }, + { 1,0,2,3,4,5,6,7,8,9,0,1,2,3,4,5 } +}; +#include "poppack.h" + +static void test_tiff_color_formats(void) +{ + static const struct + { + int photometric; /* PhotometricInterpretation */ + int samples; /* SamplesPerPixel */ + int bps; /* BitsPerSample */ + PixelFormat format; + } td[] = + { + /* 2 - RGB */ + { 2, 3, 1, PixelFormat24bppRGB }, + { 2, 3, 4, PixelFormat24bppRGB }, + { 2, 3, 8, PixelFormat24bppRGB }, + { 2, 3, 16, PixelFormat48bppRGB }, + { 2, 3, 24, 0 }, +#if 0 /* FIXME */ + { 2, 3, 32, 0 }, +#endif + { 2, 4, 1, PixelFormat32bppARGB }, + { 2, 4, 4, PixelFormat32bppARGB }, + { 2, 4, 8, PixelFormat32bppARGB }, + { 2, 4, 16, PixelFormat48bppRGB }, + { 2, 4, 24, 0 }, + { 2, 4, 32, 0 }, + /* 1 - BlackIsZero (Bilevel) */ + { 1, 1, 1, PixelFormat1bppIndexed }, +#if 0 /* FIXME: PNG vs TIFF mismatch */ + { 1, 1, 4, PixelFormat8bppIndexed }, +#endif + { 1, 1, 8, PixelFormat8bppIndexed }, + { 1, 1, 16, PixelFormat32bppARGB }, + { 1, 1, 24, 0 }, + { 1, 1, 32, PixelFormat32bppARGB }, + /* 3 - Palette Color */ + { 3, 1, 1, PixelFormat1bppIndexed }, + { 3, 1, 4, PixelFormat4bppIndexed }, + { 3, 1, 8, PixelFormat8bppIndexed }, +#if 0 /* FIXME: for some reason libtiff replaces photometric 3 by 1 for bps > 8 */ + { 3, 1, 16, 0 }, + { 3, 1, 24, 0 }, + { 3, 1, 32, 0 }, +#endif + /* 5 - Separated */ + { 5, 4, 1, 0 }, + { 5, 4, 4, 0 }, + { 5, 4, 8, PixelFormat32bppCMYK }, + { 5, 4, 16, PixelFormat48bppRGB }, + { 5, 4, 24, 0 }, + { 5, 4, 32, 0 }, + }; + BYTE buf[sizeof(tiff_1x1_data)]; + GpStatus status; + GpImage *image; + UINT count, i; + struct IFD_entry *tag, *tag_photo = NULL, *tag_bps = NULL, *tag_samples = NULL, *tag_colormap = NULL; + short *bps; + ImageType type; + PixelFormat format; + + memcpy(buf, &tiff_1x1_data, sizeof(tiff_1x1_data)); + + count = *(short *)(buf + tiff_1x1_data.dir_offset); + tag = (struct IFD_entry *)(buf + tiff_1x1_data.dir_offset + sizeof(short)); + + /* verify the TIFF structure */ + for (i = 0; i < count; i++) + { + if (tag[i].id == 0x102) /* BitsPerSample */ + tag_bps = &tag[i]; + else if (tag[i].id == 0x106) /* PhotometricInterpretation */ + tag_photo = &tag[i]; + else if (tag[i].id == 0x115) /* SamplesPerPixel */ + tag_samples = &tag[i]; + else if (tag[i].id == 0x140) /* ColorMap */ + tag_colormap = &tag[i]; + } + + ok(tag_bps && tag_photo && tag_samples && tag_colormap, "tag 0x102,0x106,0x115 or 0x140 is missing\n"); + if (!tag_bps || !tag_photo || !tag_samples || !tag_colormap) return; + + ok(tag_bps->type == IFD_SHORT, "tag 0x102 should have type IFD_SHORT\n"); + bps = (short *)(buf + tag_bps->value); + ok(bps[0] == 8 && bps[1] == 8 && bps[2] == 8 && bps[3] == 0, + "expected bps 8,8,8,0 got %d,%d,%d,%d\n", bps[0], bps[1], bps[2], bps[3]); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + tag_colormap->count = (1 << td[i].bps) * 3; + tag_photo->value = td[i].photometric; + tag_bps->count = td[i].samples; + tag_samples->value = td[i].samples; + + if (td[i].samples == 1) + tag_bps->value = td[i].bps; + else if (td[i].samples == 2) + tag_bps->value = MAKELONG(td[i].bps, td[i].bps); + else if (td[i].samples == 3) + { + tag_bps->value = (BYTE *)bps - buf; + bps[0] = bps[1] = bps[2] = td[i].bps; + } + else if (td[i].samples == 4) + { + tag_bps->value = (BYTE *)bps - buf; + bps[0] = bps[1] = bps[2] = bps[3] = td[i].bps; + } + else + { + ok(0, "%u: unsupported samples count %d\n", i, td[i].samples); + continue; + } + + image = load_image(buf, sizeof(buf)); + if (!td[i].format) + ok(!image, + "%u: (%d,%d,%d) TIFF image loading should have failed\n", i, td[i].photometric, td[i].samples, td[i].bps); + else + ok(image != NULL || broken(!image) /* XP */, "%u: failed to load TIFF image data (%d,%d,%d)\n", + i, td[i].photometric, td[i].samples, td[i].bps); + if (!image) continue; + + status = GdipGetImageType(image, &type); + ok(status == Ok, "%u: GdipGetImageType error %d\n", i, status); + ok(type == ImageTypeBitmap, "%u: wrong image type %d\n", i, type); + + status = GdipGetImagePixelFormat(image, &format); + expect(Ok, status); + ok(format == td[i].format, + "%u: expected %#x, got %#x\n", i, td[i].format, format); + + GdipDisposeImage(image); + } +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -5185,6 +5388,7 @@ pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort"); + test_tiff_color_formats(); test_GdipInitializePalette(); test_png_color_formats(); test_supported_encoders(); Modified: trunk/rostests/winetests/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/pen.c?r… ============================================================================== --- trunk/rostests/winetests/gdiplus/pen.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/pen.c [iso-8859-1] Sun Mar 5 21:16:17 2017 @@ -350,6 +350,7 @@ GpStatus status; GpPen *pen; static const REAL testvalues[] = {0.2, 0.4, 0.6, 0.8}; + INT count; status = GdipSetPenCompoundArray(NULL, testvalues, 4); expect(InvalidParameter, status); @@ -357,6 +358,20 @@ status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); expect(Ok, status); + status = GdipGetPenCompoundCount(NULL, NULL); + expect(InvalidParameter, status); + + status = GdipGetPenCompoundCount(pen, NULL); + expect(InvalidParameter, status); + + count = 10; + status = GdipGetPenCompoundCount(pen, &count); +todo_wine { + expect(Ok, status); + ok(count == 0, "Unexpected compound count %d\n", count); +} + status = GdipSetPenCompoundArray(pen, NULL, 0); + expect(InvalidParameter, status); status = GdipSetPenCompoundArray(pen, NULL, 4); expect(InvalidParameter, status); status = GdipSetPenCompoundArray(pen, testvalues, 3); @@ -368,7 +383,15 @@ status = GdipSetPenCompoundArray(pen, testvalues, 4); todo_wine expect(Ok, status); - + status = GdipSetPenCompoundArray(pen, NULL, 0); + expect(InvalidParameter, status); + + count = 0; + status = GdipGetPenCompoundCount(pen, &count); +todo_wine { + expect(Ok, status); + ok(count == 4, "Unexpected compound count %d\n", count); +} GdipDeletePen(pen); }

1 0

[akhaldi] 74098: [GDIPLUS] Sync with Wine Staging 2.2. CORE-12823 818b141 gdiplus: Add support for more image color formats. f8f0a35 gdiplus: Implement GdipInitializePalette. (v2) 973bba9 gdiplus: ...
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:15:16 2017 New Revision: 74098 URL: http://svn.reactos.org/svn/reactos?rev=74098&view=rev Log: [GDIPLUS] Sync with Wine Staging 2.2. CORE-12823 818b141 gdiplus: Add support for more image color formats. f8f0a35 gdiplus: Implement GdipInitializePalette. (v2) 973bba9 gdiplus: Ignore an externally set DC clipping region. 650b8d0 gdiplus: Ignore an externally set DC origin. e100661 gdiplus: Add GdipCreateHBITMAPFromBitmap tests when bitmap bits are locked. b58276a gdiplus: Reimplement GdipCreateHBITMAPFromBitmap so it can work on locked bitmaps. 5673d82 gdiplus: GpBitmap can be only locked once, get rid of numlocks field. 0eaaa15 gdiplus: Make GpBitmap->bitmapbits access thread safe. 4e685eb gdiplus: Added GdipGetCustomLineCapType(). 36bb9d9 gdiplus: Fix some spec file entries. f870708 gdiplus: Make some GdipDraw*Path() functions static. 046fc19 gdiplus: Fix memory leak in format_string_callback error path. 5018594 gdiplus: Create the FontFamily before checking for duplicates. 0d6a4b0 gdiplus: Don't include rotated fonts in the installed font collection. Modified: trunk/reactos/dll/win32/gdiplus/customlinecap.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/customli… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -65,6 +65,7 @@ *customCap = heap_alloc_zero(sizeof(GpCustomLineCap)); if(!*customCap) return OutOfMemory; + (*customCap)->type = CustomLineCapTypeDefault; if(strokePath){ (*customCap)->fill = FALSE; pathdata = &strokePath->pathdata; @@ -233,6 +234,17 @@ return Ok; } +GpStatus WINGDIPAPI GdipGetCustomLineCapType(GpCustomLineCap *customCap, CustomLineCapType *type) +{ + TRACE("(%p, %p)\n", customCap, type); + + if(!customCap || !type) + return InvalidParameter; + + *type = customCap->type; + return Ok; +} + GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL fill, GpAdjustableArrowCap **cap) { Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -1584,15 +1584,18 @@ DWORD type, LPARAM lParam) { GpFontCollection* fonts = (GpFontCollection*)lParam; + GpFontFamily* family; int i; if (type == RASTER_FONTTYPE) return 1; - /* skip duplicates */ - for (i=0; i<fonts->count; i++) - if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0) - return 1; + /* skip rotated fonts */ + if (lfw->lfFaceName[0] == '@') + return 1; + + if (fonts->count && strcmpiW(lfw->lfFaceName, fonts->FontFamilies[fonts->count-1]->FamilyName) == 0) + return 1; if (fonts->allocated == fonts->count) { @@ -1608,10 +1611,20 @@ fonts->allocated = new_alloc_count; } - if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &fonts->FontFamilies[fonts->count]) == Ok) - fonts->count++; - else + if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family) != Ok) return 0; + + /* skip duplicates */ + for (i=0; i<fonts->count; i++) + { + if (strcmpiW(family->FamilyName, fonts->FontFamilies[i]->FamilyName) == 0) + { + GdipDeleteFontFamily(family); + return 1; + } + } + + fonts->FontFamilies[fonts->count++] = family; return 1; } Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -172,8 +172,8 @@ 172 stdcall GdipDrawImagePointsRectI(ptr ptr ptr long long long long long long ptr ptr ptr) 173 stdcall GdipDrawImageRect(ptr ptr float float float float) 174 stdcall GdipDrawImageRectI(ptr ptr long long long long) -175 stdcall GdipDrawImageRectRect(ptr ptr float float float float float float float float long ptr long ptr) -176 stdcall GdipDrawImageRectRectI(ptr ptr long long long long long long long long long ptr long ptr) +175 stdcall GdipDrawImageRectRect(ptr ptr float float float float float float float float long ptr ptr ptr) +176 stdcall GdipDrawImageRectRectI(ptr ptr long long long long long long long long long ptr ptr ptr) 177 stdcall GdipDrawLine(ptr ptr float float float float) 178 stdcall GdipDrawLineI(ptr ptr long long long long) 179 stdcall GdipDrawLines(ptr ptr ptr long) @@ -189,7 +189,7 @@ 189 stdcall GdipDrawRectanglesI(ptr ptr ptr long) 190 stdcall GdipDrawString(ptr wstr long ptr ptr ptr ptr) 191 stdcall GdipEmfToWmfBits(ptr long ptr long long) -192 stdcall GdipEndContainer(ptr ptr) +192 stdcall GdipEndContainer(ptr long) 193 stdcall GdipEnumerateMetafileDestPoint(ptr ptr ptr ptr ptr ptr) 194 stdcall GdipEnumerateMetafileDestPointI(ptr ptr ptr ptr ptr ptr) 195 stub GdipEnumerateMetafileDestPoints @@ -240,7 +240,7 @@ 240 stdcall GdipGetCustomLineCapBaseInset(ptr ptr) 241 stub GdipGetCustomLineCapStrokeCaps 242 stdcall GdipGetCustomLineCapStrokeJoin(ptr ptr) -243 stub GdipGetCustomLineCapType +243 stdcall GdipGetCustomLineCapType(ptr ptr) 244 stdcall GdipGetCustomLineCapWidthScale(ptr ptr) 245 stdcall GdipGetDC(ptr ptr) 246 stdcall GdipGetDpiX(ptr ptr) @@ -563,7 +563,7 @@ 563 stdcall GdipSetPropertyItem(ptr ptr) 564 stdcall GdipSetRenderingOrigin(ptr long long) 565 stdcall GdipSetSmoothingMode(ptr long) -566 stdcall GdipSetSolidFillColor(ptr ptr) +566 stdcall GdipSetSolidFillColor(ptr long) 567 stdcall GdipSetStringFormatAlign(ptr long) 568 stdcall GdipSetStringFormatDigitSubstitution(ptr long long) 569 stdcall GdipSetStringFormatFlags(ptr long) @@ -604,8 +604,8 @@ 604 stdcall GdipWidenPath(ptr ptr ptr float) 605 stdcall GdipWindingModeOutline(ptr ptr float) 606 stdcall GdiplusNotificationHook(ptr) -607 stdcall GdiplusNotificationUnhook(ptr) -608 stdcall GdiplusShutdown(ptr) GdiplusShutdown_wrapper +607 stdcall GdiplusNotificationUnhook(long) +608 stdcall GdiplusShutdown(long) GdiplusShutdown_wrapper 609 stdcall GdiplusStartup(ptr ptr ptr) 610 stdcall GdipFindFirstImageItem(ptr ptr) 611 stub GdipFindNextImageItem Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -335,6 +335,7 @@ }; struct GpCustomLineCap{ + CustomLineCapType type; GpPathData pathdata; BOOL fill; /* TRUE for fill, FALSE for stroke */ GpLineCap cap; /* as far as I can tell, this value is ignored */ @@ -355,6 +356,7 @@ UINT frame_count, current_frame; ColorPalette *palette; REAL xres, yres; + LONG busy; }; struct GpMetafile{ @@ -397,7 +399,6 @@ INT height; PixelFormat format; ImageLockMode lockmode; - INT numlocks; BYTE *bitmapbits; /* pointer to the buffer we passed in BitmapLockBits */ HBITMAP hbitmap; HDC hdc; @@ -522,4 +523,17 @@ void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN; +static inline BOOL image_lock(GpImage *image, BOOL *unlock) +{ + LONG tid = GetCurrentThreadId(), owner_tid; + owner_tid = InterlockedCompareExchange(&image->busy, tid, 0); + *unlock = !owner_tid; + return !owner_tid || owner_tid==tid; +} + +static inline void image_unlock(GpImage *image, BOOL unlock) +{ + if (unlock) image->busy = 0; +} + #endif /* __WINE_GP_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -493,8 +493,9 @@ save = SaveDC(graphics->hdc); - if (hrgn) - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + SetViewportOrgEx(graphics->hdc, 0, 0, NULL); + + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); if (hregion) ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); @@ -3371,7 +3372,7 @@ return retval; } -GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +static GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { INT save_state; GpStatus retval; @@ -3397,7 +3398,7 @@ return retval; } -GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { GpStatus stat; GpPath* flat_path; @@ -3695,7 +3696,7 @@ return stat; } -GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { GpStatus stat; GpPath *wide_path; Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -867,6 +867,7 @@ start = (char *)ph; if (!ph || !lengthen_path(path, len / sizeof(POINTFX))) { + heap_free(ph); status = OutOfMemory; break; } Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -38,13 +38,19 @@ { { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, + { &GUID_WICPixelFormat32bppGrayFloat, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat48bppRGB, PixelFormat48bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat32bppCMYK, PixelFormat32bppCMYK, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat64bppCMYK, PixelFormat48bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat64bppRGBA, PixelFormat48bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { NULL } }; @@ -1010,16 +1016,22 @@ INT bitspp = PIXELFORMATBPP(format); GpRect act_rect; /* actual rect to be used */ GpStatus stat; + BOOL unlock; TRACE("%p %p %d 0x%x %p\n", bitmap, rect, flags, format, lockeddata); if(!lockeddata || !bitmap) return InvalidParameter; + if(!image_lock(&bitmap->image, &unlock)) + return ObjectBusy; if(rect){ if(rect->X < 0 || rect->Y < 0 || (rect->X + rect->Width > bitmap->width) || (rect->Y + rect->Height > bitmap->height) || !flags) + { + image_unlock(&bitmap->image, unlock); return InvalidParameter; + } act_rect = *rect; } @@ -1032,6 +1044,7 @@ if(bitmap->lockmode) { WARN("bitmap is already locked and cannot be locked again\n"); + image_unlock(&bitmap->image, unlock); return WrongState; } @@ -1047,8 +1060,8 @@ bitmap->stride * act_rect.Y; bitmap->lockmode = flags | ImageLockModeRead; - bitmap->numlocks++; - + + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1059,6 +1072,7 @@ if (stat == NotImplemented) { FIXME("cannot read bitmap from %x to %x\n", bitmap->format, format); + image_unlock(&bitmap->image, unlock); return NotImplemented; } } @@ -1071,6 +1085,7 @@ if (stat == NotImplemented) { FIXME("cannot write bitmap from %x to %x\n", format, bitmap->format); + image_unlock(&bitmap->image, unlock); return NotImplemented; } } @@ -1086,7 +1101,11 @@ bitmap->bitmapbits = heap_alloc_zero(lockeddata->Stride * act_rect.Height); - if (!bitmap->bitmapbits) return OutOfMemory; + if (!bitmap->bitmapbits) + { + image_unlock(&bitmap->image, unlock); + return OutOfMemory; + } lockeddata->Scan0 = bitmap->bitmapbits; } @@ -1111,15 +1130,16 @@ { heap_free(bitmap->bitmapbits); bitmap->bitmapbits = NULL; + image_unlock(&bitmap->image, unlock); return stat; } } bitmap->lockmode = flags | ImageLockModeRead; - bitmap->numlocks++; bitmap->lockx = act_rect.X; bitmap->locky = act_rect.Y; + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1141,21 +1161,26 @@ { GpStatus stat; static BOOL fixme = FALSE; + BOOL unlock; TRACE("(%p,%p)\n", bitmap, lockeddata); if(!bitmap || !lockeddata) return InvalidParameter; + if(!image_lock(&bitmap->image, &unlock)) + return ObjectBusy; if(!bitmap->lockmode) + { + image_unlock(&bitmap->image, unlock); return WrongState; + } if(!(lockeddata->Reserved & ImageLockModeWrite)){ - if(!(--bitmap->numlocks)) - bitmap->lockmode = 0; - + bitmap->lockmode = 0; heap_free(bitmap->bitmapbits); bitmap->bitmapbits = NULL; + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1163,7 +1188,7 @@ { /* we passed a direct reference; no need to do anything */ bitmap->lockmode = 0; - bitmap->numlocks = 0; + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1187,8 +1212,8 @@ heap_free(bitmap->bitmapbits); bitmap->bitmapbits = NULL; bitmap->lockmode = 0; - bitmap->numlocks = 0; - + + image_unlock(&bitmap->image, unlock); return stat; } @@ -1441,10 +1466,12 @@ UINT width, height; BITMAPINFOHEADER bih; LPBYTE bits; - BitmapData lockeddata; + BOOL unlock; + TRACE("(%p,%p,%x)\n", bitmap, hbmReturn, background); if (!bitmap || !hbmReturn) return InvalidParameter; + if (!image_lock(&bitmap->image, &unlock)) return ObjectBusy; GdipGetImageWidth(&bitmap->image, &width); GdipGetImageHeight(&bitmap->image, &height); @@ -1462,41 +1489,36 @@ bih.biClrImportant = 0; result = CreateDIBSection(0, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&bits, NULL, 0); - - if (result) - { - lockeddata.Stride = -width * 4; - lockeddata.Scan0 = bits + (width * 4 * (height - 1)); - - stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead|ImageLockModeUserInputBuf, - PixelFormat32bppPARGB, &lockeddata); - - if (stat == Ok) - stat = GdipBitmapUnlockBits(bitmap, &lockeddata); - - if (stat == Ok && (background & 0xffffff)) - { - DWORD *ptr; - UINT i; - for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) - { - if ((*ptr & 0xff000000) == 0xff000000) continue; - *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); - } - } - } - else - stat = GenericError; - - if (stat != Ok && result) + if (!result) + { + image_unlock(&bitmap->image, unlock); + return GenericError; + } + + stat = convert_pixels(width, height, -width*4, + bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, + bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); + if (stat != Ok) { DeleteObject(result); - result = NULL; + image_unlock(&bitmap->image, unlock); + return stat; + } + + if (background & 0xffffff) + { + DWORD *ptr; + UINT i; + for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) + { + if ((*ptr & 0xff000000) == 0xff000000) continue; + *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); + } } *hbmReturn = result; - - return stat; + image_unlock(&bitmap->image, unlock); + return Ok; } GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, @@ -3736,6 +3758,7 @@ if(status != Ok) return status; + new_image->busy = image->busy; memcpy(&new_image->format, &image->format, sizeof(GUID)); free_image_data(image); if (image->type == ImageTypeBitmap) @@ -4239,30 +4262,39 @@ { GpStatus stat; const struct image_codec *codec = NULL; + BOOL unlock; TRACE("(%p,%s,%u)\n", image, debugstr_guid(dimensionID), frame); if (!image || !dimensionID) return InvalidParameter; + if(!image_lock(image, &unlock)) + return ObjectBusy; if (frame >= image->frame_count) { WARN("requested frame %u, but image has only %u\n", frame, image->frame_count); + image_unlock(image, unlock); return InvalidParameter; } if (image->type != ImageTypeBitmap && image->type != ImageTypeMetafile) { WARN("invalid image type %d\n", image->type); + image_unlock(image, unlock); return InvalidParameter; } if (image->current_frame == frame) + { + image_unlock(image, unlock); return Ok; + } if (!image->decoder) { TRACE("image doesn't have an associated decoder\n"); + image_unlock(image, unlock); return Ok; } @@ -4271,10 +4303,13 @@ if (stat != Ok) { WARN("can't find decoder info\n"); + image_unlock(image, unlock); return stat; } - return codec->select_func(image, frame); + stat = codec->select_func(image, frame); + image_unlock(image, unlock); + return stat; } GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *stream, GpImage **image) @@ -5284,11 +5319,14 @@ UINT x, y, width, height; BitmapData src_lock, dst_lock; GpStatus stat; + BOOL unlock; TRACE("(%p, %u)\n", image, type); if (!image) return InvalidParameter; + if (!image_lock(image, &unlock)) + return ObjectBusy; rotate_90 = type&1; flip_x = (type&6) == 2 || (type&6) == 4; @@ -5297,6 +5335,7 @@ if (image->type != ImageTypeBitmap) { FIXME("Not implemented for type %i\n", image->type); + image_unlock(image, unlock); return NotImplemented; } @@ -5306,6 +5345,7 @@ if (bpp < 8) { FIXME("Not implemented for %i bit images\n", bpp); + image_unlock(image, unlock); return NotImplemented; } @@ -5325,7 +5365,10 @@ stat = GdipCreateBitmapFromScan0(width, height, 0, bitmap->format, NULL, &new_bitmap); if (stat != Ok) + { + image_unlock(image, unlock); return stat; + } stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, bitmap->format, &src_lock); @@ -5385,6 +5428,7 @@ else GdipDisposeImage(&new_bitmap->image); + image_unlock(image, unlock); return stat; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -68,7 +68,7 @@ reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11 reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 reactos/dll/win32/fusion # Synced to WineStaging-1.9.23 -reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.23 +reactos/dll/win32/gdiplus # Synced to WineStaging-2.2 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.2 reactos/dll/win32/hlink # Synced to WineStaging-2.2 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2017