Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 75904: * Get rid of the old branch where I did my shell work. It was merged 3 years ago.
by dquintana＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: dquintana Date: Mon Sep 18 08:46:17 2017 New Revision: 75904 URL: http://svn.reactos.org/svn/reactos?rev=75904&view=rev Log: * Get rid of the old branch where I did my shell work. It was merged 3 years ago. Removed: branches/shell-experiments/

1 0

[akhaldi] 75903: [URLMON_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:58:07 2017 New Revision: 75903 URL: http://svn.reactos.org/svn/reactos?rev=75903&view=rev Log: [URLMON_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/urlmon/protocol.c Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Sun Sep 17 22:58:07 2017 @@ -99,6 +99,7 @@ DEFINE_EXPECT(QueryService_HttpNegotiate); DEFINE_EXPECT(QueryService_InternetProtocol); DEFINE_EXPECT(QueryService_HttpSecurity); +DEFINE_EXPECT(QueryService_IBindCallbackRedirect); DEFINE_EXPECT(QueryInterface_IWinInetInfo); DEFINE_EXPECT(QueryInterface_IWinInetHttpInfo); DEFINE_EXPECT(BeginningTransaction); @@ -128,6 +129,7 @@ DEFINE_EXPECT(MimeFilter_Continue); DEFINE_EXPECT(Stream_Seek); DEFINE_EXPECT(Stream_Read); +DEFINE_EXPECT(Redirect); static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static const WCHAR index_url[] = @@ -145,9 +147,9 @@ static HRESULT expect_hrResult; static LPCWSTR file_name, http_url, expect_wsz; static IInternetProtocol *async_protocol = NULL; -static BOOL first_data_notif, http_is_first, test_redirect; +static BOOL first_data_notif, http_is_first, test_redirect, redirect_on_continue; static int prot_state, read_report_data, post_stream_read; -static DWORD bindf, ex_priority , pi; +static DWORD bindf, ex_priority , pi, bindinfo_options; static IInternetProtocol *binding_protocol, *filtered_protocol; static IInternetBindInfo *prot_bind_info; static IInternetProtocolSink *binding_sink, *filtered_sink; @@ -372,6 +374,39 @@ static IHttpNegotiate2 http_negotiate = { &HttpNegotiateVtbl }; +static HRESULT WINAPI BindCallbackRedirect_QueryInterface(IBindCallbackRedirect *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI BindCallbackRedirect_AddRef(IBindCallbackRedirect *iface) +{ + return 2; +} + +static ULONG WINAPI BindCallbackRedirect_Release(IBindCallbackRedirect *iface) +{ + return 1; +} + +static HRESULT WINAPI BindCallbackRedirect_Redirect(IBindCallbackRedirect *iface, const WCHAR *url, VARIANT_BOOL *cancel) +{ + CHECK_EXPECT(Redirect); + *cancel = VARIANT_FALSE; + return S_OK; +} + +static const IBindCallbackRedirectVtbl BindCallbackRedirectVtbl = { + BindCallbackRedirect_QueryInterface, + BindCallbackRedirect_AddRef, + BindCallbackRedirect_Release, + BindCallbackRedirect_Redirect +}; + +static IBindCallbackRedirect redirect_callback = { &BindCallbackRedirectVtbl }; + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) @@ -407,6 +442,13 @@ ok(IsEqualGUID(&IID_IHttpSecurity, riid), "unexpected riid\n"); CHECK_EXPECT(QueryService_HttpSecurity); return IHttpSecurity_QueryInterface(&http_security, riid, ppv); + } + + if(IsEqualGUID(&IID_IBindCallbackRedirect, guidService)) { + CHECK_EXPECT(QueryService_IBindCallbackRedirect); + ok(IsEqualGUID(&IID_IBindCallbackRedirect, riid), "riid = %s\n", wine_dbgstr_guid(riid)); + *ppv = &redirect_callback; + return S_OK; } if(IsEqualGUID(&IID_IGetBindHandle, guidService)) { @@ -600,7 +642,7 @@ todo_wine CHECK_CALLED(ReportProgress_SENDINGREQUEST); else if (tested_protocol != HTTPS_TEST) CHECK_CALLED(ReportProgress_SENDINGREQUEST); - if(test_redirect) + if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) CHECK_CALLED(ReportProgress_REDIRECTING); state = test_async_req ? STATE_SENDINGREQUEST : STATE_STARTDOWNLOADING; } @@ -611,7 +653,8 @@ SET_EXPECT(ReportProgress_SENDINGREQUEST); break; case STATE_STARTDOWNLOADING: - if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { + if((tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) + && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) { SET_EXPECT(OnResponse); if(tested_protocol == HTTPS_TEST || test_redirect || test_abort || empty_file) SET_EXPECT(ReportProgress_ACCEPTRANGES); @@ -624,13 +667,13 @@ break; } - if(state != STATE_SENDINGREQUEST) + if(state != STATE_SENDINGREQUEST && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) SET_EXPECT(ReportData); hres = IInternetProtocol_Continue(async_protocol, protocol_data); ok(hres == S_OK, "Continue failed: %08x\n", hres); if(tested_protocol == FTP_TEST || security_problem) CLEAR_CALLED(ReportData); - else if(state != STATE_SENDINGREQUEST) + else if(state != STATE_SENDINGREQUEST && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) CHECK_CALLED(ReportData); switch(state) { @@ -640,10 +683,10 @@ state = STATE_STARTDOWNLOADING; break; case STATE_STARTDOWNLOADING: - if (! security_problem) - { + if(!security_problem) { state = STATE_DOWNLOADING; - if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { + if((tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) + && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) { CHECK_CALLED(OnResponse); if(tested_protocol == HTTPS_TEST || empty_file) CHECK_CALLED(ReportProgress_ACCEPTRANGES); @@ -1093,13 +1136,17 @@ exit(1); } #endif - if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST || test_abort) + if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST || test_abort || hrResult == INET_E_REDIRECT_FAILED) ok(dwError == ERROR_SUCCESS, "dwError = %d, expected ERROR_SUCCESS\n", dwError); else ok(dwError != ERROR_SUCCESS || broken(tested_protocol == MK_TEST), /* WinME and NT4 */ "dwError == ERROR_SUCCESS\n"); - ok(!szResult, "szResult != NULL\n"); + + if(hrResult == INET_E_REDIRECT_FAILED) + ok(!strcmp_wa(szResult, "http://test.winehq.org/tests/hello.html"), "szResult = %s\n", wine_dbgstr_w(szResult)); + else + ok(!szResult, "szResult = %s\n", wine_dbgstr_w(szResult)); if(direct_read) SET_EXPECT(ReportData); /* checked after main loop */ @@ -1328,6 +1375,7 @@ cbSize = pbindinfo->cbSize; memset(pbindinfo, 0, cbSize); pbindinfo->cbSize = cbSize; + pbindinfo->dwOptions = bindinfo_options; if(http_post_test) { @@ -1343,21 +1391,6 @@ memcpy(data, post_data, sizeof(post_data)); U(pbindinfo->stgmedData).hGlobal = data; }else { - IStream *post_stream; - HGLOBAL data; - HRESULT hres; - - if(0) { - /* Must be GMEM_FIXED, GMEM_MOVABLE does not work properly */ - data = GlobalAlloc(GPTR, sizeof(post_data)); - memcpy(data, post_data, sizeof(post_data)); - U(pbindinfo->stgmedData).hGlobal = data; - - hres = CreateStreamOnHGlobal(data, FALSE, &post_stream); - ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); - - U(pbindinfo->stgmedData).pstm =post_stream;/* &Stream; */ - } U(pbindinfo->stgmedData).pstm = &Stream; } } @@ -1567,6 +1600,7 @@ static DWORD WINAPI thread_proc(PVOID arg) { + BOOL redirect_only = redirect_on_continue; HRESULT hres; memset(&protocoldata, -1, sizeof(protocoldata)); @@ -1596,6 +1630,11 @@ hres = IInternetProtocolSink_Switch(binding_sink, &protocoldata); CHECK_CALLED(Switch); ok(hres == S_OK, "Switch failed: %08x\n", hres); + + if(redirect_only) { + prot_state = 0; + return 0; + } if(!short_read) { prot_state = 2; @@ -1663,8 +1702,14 @@ memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(bindinfo); memcpy(&exp_bindinfo, &bindinfo, sizeof(bindinfo)); + if(test_redirect) + exp_bindinfo.dwOptions = bindinfo_options; SET_EXPECT(GetBindInfo); + if(redirect_on_continue && (bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) + SET_EXPECT(QueryService_IBindCallbackRedirect); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &cbindf, &bindinfo); + if(redirect_on_continue && (bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) + CHECK_CALLED(QueryService_IBindCallbackRedirect); ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); CHECK_CALLED(GetBindInfo); ok(cbindf == (bindf|BINDF_FROMURLMON), "bindf = %x, expected %x\n", @@ -1848,6 +1893,35 @@ IServiceProvider *service_provider; IHttpNegotiate *http_negotiate; static const WCHAR header[] = {'?',0}; + static const WCHAR redirect_urlW[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; + + if(redirect_on_continue) { + redirect_on_continue = FALSE; + + if(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) + SET_EXPECT(Redirect); + SET_EXPECT(ReportProgress_REDIRECTING); + SET_EXPECT(Terminate); + SET_EXPECT(QueryService_InternetProtocol); + SET_EXPECT(CreateInstance); + SET_EXPECT(ReportProgress_PROTOCOLCLASSID); + SET_EXPECT(SetPriority); + SET_EXPECT(Start); + hres = IInternetProtocolSink_ReportResult(binding_sink, INET_E_REDIRECT_FAILED, ERROR_SUCCESS, redirect_urlW); + ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + if(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) + CHECK_CALLED(Redirect); + CHECK_CALLED(ReportProgress_REDIRECTING); + CHECK_CALLED(Terminate); + CHECK_CALLED(QueryService_InternetProtocol); + CHECK_CALLED(CreateInstance); + CHECK_CALLED(ReportProgress_PROTOCOLCLASSID); + todo_wine CHECK_NOT_CALLED(SetPriority); + CHECK_CALLED(Start); + + return S_OK; + } hres = IInternetProtocolSink_QueryInterface(binding_sink, &IID_IServiceProvider, (void**)&service_provider); @@ -2283,9 +2357,73 @@ static IInternetProtocolEx MimeProtocol = { &MimeProtocolVtbl }; +static HRESULT WINAPI InternetProtocolInfo_QueryInterface(IInternetProtocolInfo *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI InternetProtocolInfo_AddRef(IInternetProtocolInfo *iface) +{ + return 2; +} + +static ULONG WINAPI InternetProtocolInfo_Release(IInternetProtocolInfo *iface) +{ + return 1; +} + +static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, + PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, + DWORD *pcchResult, DWORD dwReserved) +{ + ok(0, "unexpected call %d\n", ParseAction); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, + LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, + LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, + LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, + LPCWSTR pwzUrl, QUERYOPTION OueryOption, DWORD dwQueryFlags, LPVOID pBuffer, + DWORD cbBuffer, DWORD *pcbBuf, DWORD dwReserved) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IInternetProtocolInfoVtbl InternetProtocolInfoVtbl = { + InternetProtocolInfo_QueryInterface, + InternetProtocolInfo_AddRef, + InternetProtocolInfo_Release, + InternetProtocolInfo_ParseUrl, + InternetProtocolInfo_CombineUrl, + InternetProtocolInfo_CompareUrl, + InternetProtocolInfo_QueryInfo +}; + +static IInternetProtocolInfo protocol_info = { &InternetProtocolInfoVtbl }; + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call\n"); + if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { + *ppv = &protocol_info; + return S_OK; + } + + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -2364,6 +2502,7 @@ #define TEST_EMPTY 0x1000 #define TEST_NOMIME 0x2000 #define TEST_FROMCACHE 0x4000 +#define TEST_DISABLEAUTOREDIRECT 0x8000 static void register_filter(BOOL do_register) { @@ -2415,12 +2554,16 @@ wait_for_switch = TRUE; short_read = (flags & TEST_SHORT_READ) != 0; http_post_test = TYMED_NULL; - test_redirect = (flags & TEST_REDIRECT) != 0; + redirect_on_continue = test_redirect = (flags & TEST_REDIRECT) != 0; test_abort = (flags & TEST_ABORT) != 0; impl_protex = (flags & TEST_IMPLPROTEX) != 0; empty_file = (flags & TEST_EMPTY) != 0; bind_from_cache = (flags & TEST_FROMCACHE) != 0; file_with_hash = FALSE; + + bindinfo_options = 0; + if(flags & TEST_DISABLEAUTOREDIRECT) + bindinfo_options |= BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS; register_filter(mimefilter_test); } @@ -3022,7 +3165,6 @@ init_test(prot, flags); http_url = url; http_post_test = tymed; - if(flags & TEST_FROMCACHE) create_cache_entry(url); @@ -3060,7 +3202,7 @@ SET_EXPECT(ReportProgress_CONNECTING); } SET_EXPECT(ReportProgress_SENDINGREQUEST); - if(test_redirect) + if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) SET_EXPECT(ReportProgress_REDIRECTING); SET_EXPECT(ReportProgress_PROXYDETECTING); if(prot == HTTP_TEST) @@ -3083,7 +3225,13 @@ if(!direct_read && !test_abort && !bind_from_cache) SET_EXPECT(ReportResult); - expect_hrResult = test_abort ? E_ABORT : S_OK; + + if(flags & TEST_DISABLEAUTOREDIRECT) + expect_hrResult = INET_E_REDIRECT_FAILED; + else if(test_abort) + expect_hrResult = E_ABORT; + else + expect_hrResult = S_OK; if(direct_read) { SET_EXPECT(Switch); @@ -3233,6 +3381,10 @@ trace("Testing http protocol (redirected)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT, TYMED_NULL); + + trace("Testing http protocol (redirected, disable auto redirect)...\n"); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; + test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT | TEST_DISABLEAUTOREDIRECT, TYMED_NULL); trace("Testing http protocol empty file...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; @@ -3837,6 +3989,10 @@ test_binding(ITS_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT); trace("Testing http binding (mime verification, emulate prot, short read, direct read)...\n"); test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_SHORT_READ|TEST_DIRECT_READ); + trace("Testing http binding (mime verification, redirect, emulate prot)...\n"); + test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_REDIRECT); + trace("Testing http binding (mime verification, redirect, disable auto redirect, emulate prot)...\n"); + test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_REDIRECT|TEST_DISABLEAUTOREDIRECT); trace("Testing file binding (mime verification, emulate prot, mime filter)...\n"); test_binding(FILE_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_FILTER); trace("Testing http binding (mime verification, emulate prot, mime filter)...\n");

1 0

[akhaldi] 75902: [URLMON] Sync with Wine Staging 2.16. CORE-13762 5660a9b urlmon: Remove a redundant NULL check before SysFreeString(). acb1f03 urlmon: Support BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS...
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:58:01 2017 New Revision: 75902 URL: http://svn.reactos.org/svn/reactos?rev=75902&view=rev Log: [URLMON] Sync with Wine Staging 2.16. CORE-13762 5660a9b urlmon: Remove a redundant NULL check before SysFreeString(). acb1f03 urlmon: Support BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS in BindProtocol object. ccc5ba2 urlmon: Added a helper function for releasing protocol handler. cded077 urlmon: Release previously set URI in BindProtocol::StartEx. 9e92254 urlmon: Added support for BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS in http protocol handler. Modified: trunk/reactos/dll/win32/urlmon/bindprot.c trunk/reactos/dll/win32/urlmon/http.c trunk/reactos/dll/win32/urlmon/protocol.c trunk/reactos/dll/win32/urlmon/urlmon_main.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] Sun Sep 17 22:58:01 2017 @@ -325,6 +325,31 @@ return ref; } +static void release_protocol_handler(BindProtocol *This) +{ + if(This->wininet_info) { + IWinInetInfo_Release(This->wininet_info); + This->wininet_info = NULL; + } + if(This->wininet_http_info) { + IWinInetHttpInfo_Release(This->wininet_http_info); + This->wininet_http_info = NULL; + } + if(This->protocol) { + IInternetProtocol_Release(This->protocol); + This->protocol = NULL; + } + if(This->protocol_handler && This->protocol_handler != &This->default_protocol_handler.IInternetProtocol_iface) { + IInternetProtocol_Release(This->protocol_handler); + This->protocol_handler = &This->default_protocol_handler.IInternetProtocol_iface; + } + if(This->protocol_sink_handler && + This->protocol_sink_handler != &This->default_protocol_handler.IInternetProtocolSink_iface) { + IInternetProtocolSink_Release(This->protocol_sink_handler); + This->protocol_sink_handler = &This->default_protocol_handler.IInternetProtocolSink_iface; + } +} + static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) { BindProtocol *This = impl_from_IInternetProtocolEx(iface); @@ -333,19 +358,11 @@ TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->wininet_info) - IWinInetInfo_Release(This->wininet_info); - if(This->wininet_http_info) - IWinInetHttpInfo_Release(This->wininet_http_info); - if(This->protocol) - IInternetProtocol_Release(This->protocol); + release_protocol_handler(This); + if(This->redirect_callback) + IBindCallbackRedirect_Release(This->redirect_callback); if(This->bind_info) IInternetBindInfo_Release(This->bind_info); - if(This->protocol_handler && This->protocol_handler != &This->default_protocol_handler.IInternetProtocol_iface) - IInternetProtocol_Release(This->protocol_handler); - if(This->protocol_sink_handler && - This->protocol_sink_handler != &This->default_protocol_handler.IInternetProtocolSink_iface) - IInternetProtocolSink_Release(This->protocol_sink_handler); if(This->uri) IUri_Release(This->uri); SysFreeString(This->display_uri); @@ -489,6 +506,10 @@ This->pi = grfPI; + if(This->uri) { + SysFreeString(This->display_uri); + IUri_Release(This->uri); + } IUri_AddRef(pUri); This->uri = pUri; @@ -707,6 +728,11 @@ This->bind_info = NULL; } + if(This->redirect_callback) { + IBindCallbackRedirect_Release(This->redirect_callback); + This->redirect_callback = NULL; + } + IInternetProtocolEx_Release(&This->IInternetProtocolEx_iface); return S_OK; } @@ -969,12 +995,42 @@ return IInternetProtocolSink_ReportData(This->protocol_sink, bscf, progress, progress_max); } +static HRESULT handle_redirect(BindProtocol *This, const WCHAR *url) +{ + HRESULT hres; + + if(This->redirect_callback) { + VARIANT_BOOL cancel = VARIANT_FALSE; + IBindCallbackRedirect_Redirect(This->redirect_callback, url, &cancel); + if(cancel) + return INET_E_REDIRECT_FAILED; + } + + if(This->protocol_sink) { + hres = IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_REDIRECTING, url); + if(FAILED(hres)) + return hres; + } + + IInternetProtocol_Terminate(This->protocol, 0); /* should this be done in StartEx? */ + release_protocol_handler(This); + + return IInternetProtocolEx_Start(&This->IInternetProtocolEx_iface, url, This->protocol_sink, This->bind_info, This->pi, 0); +} + static HRESULT WINAPI ProtocolSinkHandler_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { BindProtocol *This = impl_from_IInternetProtocolSinkHandler(iface); TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + + if(hrResult == INET_E_REDIRECT_FAILED) { + hrResult = handle_redirect(This, szResult); + if(hrResult == S_OK) + return S_OK; + szResult = NULL; + } if(This->protocol_sink) return IInternetProtocolSink_ReportResult(This->protocol_sink, hrResult, dwError, szResult); @@ -1029,6 +1085,17 @@ return hres; } + if((pbindinfo->dwOptions & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) && !This->redirect_callback) { + IServiceProvider *service_provider; + + hres = IInternetProtocolSink_QueryInterface(This->protocol_sink, &IID_IServiceProvider, (void**)&service_provider); + if(SUCCEEDED(hres)) { + hres = IServiceProvider_QueryService(service_provider, &IID_IBindCallbackRedirect, &IID_IBindCallbackRedirect, + (void**)&This->redirect_callback); + IServiceProvider_Release(service_provider); + } + } + *grfBINDF |= BINDF_FROMURLMON; return hres; } Modified: trunk/reactos/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/http.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] Sun Sep 17 22:58:01 2017 @@ -475,6 +475,18 @@ return S_OK; } +static BOOL is_redirect_response(DWORD status_code) +{ + switch(status_code) { + case HTTP_STATUS_REDIRECT: + case HTTP_STATUS_MOVED: + case HTTP_STATUS_REDIRECT_KEEP_VERB: + case HTTP_STATUS_REDIRECT_METHOD: + return TRUE; + } + return FALSE; +} + static HRESULT HttpProtocol_start_downloading(Protocol *prot) { HttpProtocol *This = impl_from_Protocol(prot); @@ -495,7 +507,21 @@ res = HttpQueryInfoW(This->base.request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status_code, &len, NULL); if(res) { - LPWSTR response_headers = query_http_info(This, HTTP_QUERY_RAW_HEADERS_CRLF); + WCHAR *response_headers; + + if((This->base.bind_info.dwOptions & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) && is_redirect_response(status_code)) { + WCHAR *location; + + TRACE("Got redirect with disabled auto redirects\n"); + + location = query_http_info(This, HTTP_QUERY_LOCATION); + This->base.flags |= FLAG_RESULT_REPORTED | FLAG_LAST_DATA_REPORTED; + IInternetProtocolSink_ReportResult(This->base.protocol_sink, INET_E_REDIRECT_FAILED, 0, location); + heap_free(location); + return INET_E_REDIRECT_FAILED; + } + + response_headers = query_http_info(This, HTTP_QUERY_RAW_HEADERS_CRLF); if(response_headers) { hres = IHttpNegotiate_OnResponse(This->http_negotiate, status_code, response_headers, NULL, NULL); Modified: trunk/reactos/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protocol.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] Sun Sep 17 22:58:01 2017 @@ -72,6 +72,8 @@ hres = protocol->vtbl->start_downloading(protocol); if(FAILED(hres)) { + if(hres == INET_E_REDIRECT_FAILED) + return S_OK; protocol_close_connection(protocol); report_result(protocol, hres); return hres; @@ -334,6 +336,8 @@ request_flags |= INTERNET_FLAG_NO_CACHE_WRITE; if(protocol->bindf & BINDF_NEEDFILE) request_flags |= INTERNET_FLAG_NEED_FILE; + if(protocol->bind_info.dwOptions & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) + request_flags |= INTERNET_FLAG_NO_AUTO_REDIRECT; hres = protocol->vtbl->open_request(protocol, uri, request_flags, internet_session, bind_info); if(FAILED(hres)) { Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] Sun Sep 17 22:58:01 2017 @@ -189,11 +189,13 @@ LONG ref; IInternetProtocol *protocol; + IWinInetInfo *wininet_info; + IWinInetHttpInfo *wininet_http_info; + IInternetBindInfo *bind_info; IInternetProtocolSink *protocol_sink; IServiceProvider *service_provider; - IWinInetInfo *wininet_info; - IWinInetHttpInfo *wininet_http_info; + IBindCallbackRedirect *redirect_callback; struct { IInternetProtocol IInternetProtocol_iface; 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 Sep 17 22:58:01 2017 @@ -188,7 +188,7 @@ reactos/dll/win32/twain_32 # Synced to WineStaging-2.9 reactos/dll/win32/updspapi # Synced to WineStaging-2.9 reactos/dll/win32/url # Synced to WineStaging-2.9 -reactos/dll/win32/urlmon # Synced to WineStaging-2.9 +reactos/dll/win32/urlmon # Synced to WineStaging-2.16 reactos/dll/win32/usp10 # Synced to WineStaging-2.9 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-2.9

1 0

[akhaldi] 75901: [PSDK] Update urlmon.idl. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:57:54 2017 New Revision: 75901 URL: http://svn.reactos.org/svn/reactos?rev=75901&view=rev Log: [PSDK] Update urlmon.idl. CORE-13762 Modified: trunk/reactos/sdk/include/psdk/urlmon.idl Modified: trunk/reactos/sdk/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/urlmon.id… ============================================================================== --- trunk/reactos/sdk/include/psdk/urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/urlmon.idl [iso-8859-1] Sun Sep 17 22:57:54 2017 @@ -193,6 +193,25 @@ LONG lindex; DWORD tymed; } RemFORMATETC, *LPREMFORMATETC; + + typedef enum + { + BINDINFO_OPTIONS_WININETFLAG = 0x00010000, + BINDINFO_OPTIONS_ENABLE_UTF8 = 0x00020000, + BINDINFO_OPTIONS_DISABLE_UTF8 = 0x00040000, + BINDINFO_OPTIONS_USE_IE_ENCODING = 0x00080000, + BINDINFO_OPTIONS_BINDTOOBJECT = 0x00100000, + BINDINFO_OPTIONS_SECURITYOPTOUT = 0x00200000, + BINDINFO_OPTIONS_IGNOREMIMETEXTPLAIN = 0x00400000, + BINDINFO_OPTIONS_USEBINDSTRINGCREDS = 0x00800000, + BINDINFO_OPTIONS_IGNOREHTTPHTTPSREDIRECTS = 0x01000000, + BINDINFO_OPTIONS_IGNORE_SSLERRORS_ONCE = 0x02000000, + BINDINFO_WPC_DOWNLOADBLOCKED = 0x08000000, + BINDINFO_WPC_LOGGING_ENABLED = 0x10000000, + BINDINFO_OPTIONS_ALLOWCONNECTDATA = 0x20000000, + BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS = 0x40000000, + BINDINFO_OPTIONS_SHDOCVW_NAVIGATE = (int)0x80000000 + } BINDINFO_OPTIONS; typedef enum { @@ -2048,6 +2067,24 @@ [out] HANDLE *pRetHandle); } +/***************************************************************************** + * IBindCallbackRedirect interface + */ +[ + local, + object, + uuid(11c81bc2-121e-4ed5-b9c4-b430bd54f2c0), + pointer_default(unique) +] +interface IBindCallbackRedirect : IUnknown +{ + typedef [unique] IBindCallbackRedirect *LPBINDCALLBACKREDIRECT; + + HRESULT Redirect( + [in] LPCWSTR lpcUrl, + [out] VARIANT_BOOL *vbCancel); +} + cpp_quote("#define CONFIRMSAFETYACTION_LOADOBJECT 0x00000001") struct CONFIRMSAFETY

1 0

[akhaldi] 75900: [SXS] Sync with Wine Staging 2.16. CORE-13762 3c4f6ed sxs: Use standard wine_dbgstr_longlong.
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:57:49 2017 New Revision: 75900 URL: http://svn.reactos.org/svn/reactos?rev=75900&view=rev Log: [SXS] Sync with Wine Staging 2.16. CORE-13762 3c4f6ed sxs: Use standard wine_dbgstr_longlong. Modified: trunk/reactos/dll/win32/sxs/name.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sxs/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/name.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/sxs/name.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/name.c [iso-8859-1] Sun Sep 17 22:57:49 2017 @@ -160,9 +160,9 @@ DWORD cbReserved, LPVOID *ppReserved ) { - FIXME("%p, %s, %p, %p, %s, %x%08x, %p, %d, %p\n", iface, + FIXME("%p, %s, %p, %p, %s, %s, %p, %d, %p\n", iface, debugstr_guid(riid), pUnkReserved1, pUnkReserved2, - debugstr_w(szReserved), (DWORD)(llReserved >> 32), (DWORD)llReserved, + debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), pvReserved, cbReserved, ppReserved); return E_NOTIMPL; } 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 Sep 17 22:57:49 2017 @@ -181,7 +181,7 @@ reactos/dll/win32/stdole2.tlb # Synced to WineStaging-2.9 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-2.9 reactos/dll/win32/sti # Synced to WineStaging-2.9 -reactos/dll/win32/sxs # Synced to WineStaging-2.9 +reactos/dll/win32/sxs # Synced to WineStaging-2.16 reactos/dll/win32/t2embed # Synced to WineStaging-2.9 reactos/dll/win32/tapi32 # Synced to WineStaging-2.9 reactos/dll/win32/traffic # Synced to WineStaging-2.9

1 0

[akhaldi] 75899: [RPCRT4_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:57:43 2017 New Revision: 75899 URL: http://svn.reactos.org/svn/reactos?rev=75899&view=rev Log: [RPCRT4_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/rpcrt4/server.c Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Sun Sep 17 22:57:43 2017 @@ -1,7 +1,10 @@ remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) -add_definitions(-DUSE_WINE_TODOS) +add_definitions( + -DUSE_WINE_TODOS + -DWINETEST_USE_DBGSTR_LONGLONG) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_) add_rpc_files(client server.idl) Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Sun Sep 17 22:57:43 2017 @@ -41,7 +41,7 @@ static const char *progname; static BOOL old_windows_version; -static HANDLE stop_event; +static HANDLE stop_event, stop_wait_event; static void (WINAPI *pNDRSContextMarshall2)(RPC_BINDING_HANDLE, NDR_SCONTEXT, void*, NDR_RUNDOWN, void*, ULONG); static NDR_SCONTEXT (WINAPI *pNDRSContextUnmarshall2)(RPC_BINDING_HANDLE, void*, ULONG, void*, ULONG); @@ -830,9 +830,18 @@ void __cdecl s_stop(void) { - ok(RPC_S_OK == RpcMgmtStopServerListening(NULL), "RpcMgmtStopServerListening\n"); - ok(RPC_S_OK == RpcServerUnregisterIf(NULL, NULL, FALSE), "RpcServerUnregisterIf\n"); + if (!stop_wait_event) + { + ok(RPC_S_OK == RpcMgmtStopServerListening(NULL), "RpcMgmtStopServerListening\n"); + ok(RPC_S_OK == RpcServerUnregisterIf(NULL, NULL, FALSE), "RpcServerUnregisterIf\n"); + } ok(SetEvent(stop_event), "SetEvent\n"); + if (stop_wait_event) + { + DWORD ret; + ret = WaitForSingleObject(stop_wait_event, 10000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + } } static void @@ -903,7 +912,7 @@ x = sum_double_int(-78, 148.46); ok(x == 70, "RPC sum_double_int got %d\n", x); y = sum_hyper((hyper)0x12345678 << 16, (hyper)0x33557799 << 16); - ok(y == (hyper)0x4589ce11 << 16, "RPC hyper got %x%08x\n", (DWORD)(y >> 32), (DWORD)y); + ok(y == (hyper)0x4589ce11 << 16, "RPC hyper got %s\n", wine_dbgstr_longlong(y)); x = sum_hyper_int((hyper)0x24242424 << 16, -((hyper)0x24241212 << 16)); ok(x == 0x12120000, "RPC hyper_int got 0x%x\n", x); x = sum_char_hyper( 12, ((hyper)0x42424242 << 32) | 0x33334444 ); @@ -1759,10 +1768,87 @@ stop_event = NULL; } +static DWORD WINAPI listen_test_client_thread(void *binding) +{ + RPC_STATUS status; + + status = RpcBindingFromStringBindingA(binding, &IServer_IfHandle); + ok(status == RPC_S_OK, "RpcBindingFromStringBinding\n"); + + test_is_server_listening(IServer_IfHandle, RPC_S_OK); + stop(); + trace("stopped\n"); + + status = RpcBindingFree(&IServer_IfHandle); + ok(status == RPC_S_OK, "RpcBindingFree\n"); + return 0; +} + +static DWORD WINAPI wait_listen_proc(void *arg) +{ + RPC_STATUS status; + + trace("waiting\n"); + status = RpcMgmtWaitServerListen(); + ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %d\n", status); + trace("done\n"); + + return 0; +} + +static void test_stop_wait_for_call(unsigned char *binding) +{ + HANDLE client_thread, wait_listen_thread; + RPC_STATUS status; + DWORD ret; + + status = RpcServerListen(1, 20, TRUE); + ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); + test_is_server_listening(NULL, RPC_S_OK); + + stop_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(stop_wait_event != NULL, "CreateEvent failed with error %d\n", GetLastError()); + stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(stop_event != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + wait_listen_thread = CreateThread(NULL, 0, wait_listen_proc, 0, 0, NULL); + ok(wait_listen_thread != NULL, "CreateThread failed\n"); + + client_thread = CreateThread(NULL, 0, listen_test_client_thread, binding, 0, NULL); + ok(client_thread != NULL, "CreateThread failed\n"); + CloseHandle(client_thread); + + ret = WaitForSingleObject(stop_event, 10000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + + status = RpcMgmtStopServerListening(NULL); + ok(status == RPC_S_OK, "RpcMgmtStopServerListening\n"); + test_is_server_listening(NULL, RPC_S_NOT_LISTENING); + + ret = WaitForSingleObject(wait_listen_thread, 500); + ok(WAIT_TIMEOUT == ret, "WaitForSingleObject\n"); + + SetEvent(stop_wait_event); + + ret = WaitForSingleObject(wait_listen_thread, 10000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject returned %u\n", ret); + + CloseHandle(wait_listen_thread); + + CloseHandle(stop_wait_event); + stop_wait_event = NULL; + CloseHandle(stop_event); + stop_event = NULL; +} + static void test_server_listening(void) { static unsigned char np[] = "ncacn_np"; + static unsigned char address_np[] = "\\\\."; static unsigned char pipe[] = PIPE "listen_test"; + static unsigned char ncalrpc[] = "ncalrpc"; + static unsigned char guid[] = "00000000-4114-0704-2302-000000000000"; + unsigned char *binding; RPC_STATUS status; status = RpcServerUseProtseqEpA(np, 0, pipe, NULL); @@ -1788,6 +1874,27 @@ status = RpcMgmtWaitServerListen(); ok(status == RPC_S_NOT_LISTENING, "RpcMgmtWaitServerListening failed with status %d\n", status); + + /* test that server stop waits for a call in progress */ + status = RpcStringBindingComposeA(NULL, np, address_np, pipe, NULL, &binding); + ok(status == RPC_S_OK, "RpcStringBindingCompose\n"); + + test_stop_wait_for_call(binding); + + status = RpcStringFreeA(&binding); + ok(status == RPC_S_OK, "RpcStringFree\n"); + + /* repeat the test using ncalrpc */ + status = RpcServerUseProtseqEpA(ncalrpc, 0, guid, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); + + status = RpcStringBindingComposeA(NULL, ncalrpc, NULL, guid, NULL, &binding); + ok(status == RPC_S_OK, "RpcStringBindingCompose\n"); + + test_stop_wait_for_call(binding); + + status = RpcStringFreeA(&binding); + ok(status == RPC_S_OK, "RpcStringFree\n"); } static BOOL is_process_elevated(void)

1 0

[akhaldi] 75898: [RPCRT4] Sync with Wine Staging 2.16. CORE-13762 2d9e894 rpcrt4: Always protect ref access for connections associated with protseq in RPCRT4_ReleaseConnection. aea6d23 rpcrt4: Mark...
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:57:32 2017 New Revision: 75898 URL: http://svn.reactos.org/svn/reactos?rev=75898&view=rev Log: [RPCRT4] Sync with Wine Staging 2.16. CORE-13762 2d9e894 rpcrt4: Always protect ref access for connections associated with protseq in RPCRT4_ReleaseConnection. aea6d23 rpcrt4: Mark function that are only called from assembly as hidden. bea5c0c rpcrt4: Spelling fixes in comments. 2cb32b2 rpcrt4: Change RPCRT4_ReleaseConnection return type to void. e889b02 rpcrt4: Fix a race when server grabs a connection from the list of active connections. 09e98be rpcrt4: Wait for server threads to finish in RpcMgmtWaitServerListen. e98c7a5 rpcrt4: Wait for all active connections to be released before quiting server thread. 10a6b33 rpcrt4: Recreate listening pipe in rpcrt4_protseq_np_get_wait_array if needed. 5c2083f rpcrt4: Store listening pipe name in RpcConnection_np. 5c81f82 rpcrt4: Store server thread handle in RpcServerProtseq. Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_server.h trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Sun Sep 17 22:57:32 2017 @@ -2929,7 +2929,7 @@ { /* for some reason interface pointers aren't generated as * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet - * they still need the derefencing treatment that pointers are + * they still need the dereferencing treatment that pointers are * given */ if (*desc == RPC_FC_IP) m(pStubMsg, *(unsigned char **)pMemory, desc); @@ -3105,7 +3105,7 @@ { /* for some reason interface pointers aren't generated as * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet - * they still need the derefencing treatment that pointers are + * they still need the dereferencing treatment that pointers are * given */ if (*desc == RPC_FC_IP) m(pStubMsg, (unsigned char **)pMemory, desc, FALSE); @@ -3229,7 +3229,7 @@ { /* for some reason interface pointers aren't generated as * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet - * they still need the derefencing treatment that pointers are + * they still need the dereferencing treatment that pointers are * given */ if (*desc == RPC_FC_IP) m(pStubMsg, *(unsigned char **)pMemory, desc); @@ -3330,7 +3330,7 @@ { /* for some reason interface pointers aren't generated as * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet - * they still need the derefencing treatment that pointers are + * they still need the dereferencing treatment that pointers are * given */ if (*desc == RPC_FC_IP) m(pStubMsg, *(unsigned char **)pMemory, desc); Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Sun Sep 17 22:57:32 2017 @@ -581,8 +581,8 @@ return (PFORMAT_STRING)args; } -LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, - void **stack_top, void **fpu_stack ) +LONG_PTR CDECL DECLSPEC_HIDDEN ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, + void **stack_top, void **fpu_stack ) { /* pointer to start of stack where arguments start */ RPC_MESSAGE rpcMsg; @@ -1511,7 +1511,8 @@ ULONG_PTR NdrCorrCache[256]; }; -LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) +LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, + void **stack_top ) { /* pointer to start of stack where arguments start */ PRPC_MESSAGE pRpcMsg; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] Sun Sep 17 22:57:32 2017 @@ -279,14 +279,13 @@ if (!Connection) return RPC_S_OK; if (Binding->server) { /* don't destroy a connection that is cached in the binding */ - if (Binding->FromConn == Connection) - return RPC_S_OK; - return RPCRT4_ReleaseConnection(Connection); + if (Binding->FromConn != Connection) + RPCRT4_ReleaseConnection(Connection); } else { RpcAssoc_ReleaseIdleConnection(Binding->Assoc, Connection); - return RPC_S_OK; - } + } + return RPC_S_OK; } static LPSTR RPCRT4_strconcatA(LPSTR dst, LPCSTR src) Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] Sun Sep 17 22:57:32 2017 @@ -59,6 +59,7 @@ { LONG ref; BOOL server; + HANDLE wait_release; LPSTR NetworkAddr; LPSTR Endpoint; LPWSTR NetworkOptions; @@ -158,7 +159,7 @@ LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, LPCWSTR CookieAuth) DECLSPEC_HIDDEN; RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) DECLSPEC_HIDDEN; -RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; +void RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint) DECLSPEC_HIDDEN; @@ -172,6 +173,8 @@ const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection) DECLSPEC_HIDDEN; +void rpcrt4_conn_release_and_wait(RpcConnection *connection) DECLSPEC_HIDDEN; + static inline const char *rpcrt4_conn_get_name(const RpcConnection *Connection) { return Connection->ops->name; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] Sun Sep 17 22:57:32 2017 @@ -647,21 +647,44 @@ { /* cleanup */ cps->ops->free_wait_array(cps, objs); - - EnterCriticalSection(&cps->cs); - LIST_FOR_EACH_ENTRY(conn, &cps->listeners, RpcConnection, protseq_entry) - RPCRT4_CloseConnection(conn); - LIST_FOR_EACH_ENTRY(conn, &cps->connections, RpcConnection, protseq_entry) - rpcrt4_conn_close_read(conn); - LeaveCriticalSection(&cps->cs); - - if (res == 0 && !std_listen) - SetEvent(cps->server_ready_event); break; } else if (res == 0) set_ready_event = TRUE; } + + TRACE("closing connections\n"); + + EnterCriticalSection(&cps->cs); + LIST_FOR_EACH_ENTRY(conn, &cps->listeners, RpcConnection, protseq_entry) + RPCRT4_CloseConnection(conn); + LIST_FOR_EACH_ENTRY(conn, &cps->connections, RpcConnection, protseq_entry) + { + RPCRT4_GrabConnection(conn); + rpcrt4_conn_close_read(conn); + } + LeaveCriticalSection(&cps->cs); + + if (res == 0 && !std_listen) + SetEvent(cps->server_ready_event); + + TRACE("waiting for active connections to close\n"); + + EnterCriticalSection(&cps->cs); + while (!list_empty(&cps->connections)) + { + conn = LIST_ENTRY(list_head(&cps->connections), RpcConnection, protseq_entry); + LeaveCriticalSection(&cps->cs); + rpcrt4_conn_release_and_wait(conn); + EnterCriticalSection(&cps->cs); + } + LeaveCriticalSection(&cps->cs); + + EnterCriticalSection(&listen_cs); + CloseHandle(cps->server_thread); + cps->server_thread = NULL; + LeaveCriticalSection(&listen_cs); + TRACE("done\n"); return 0; } @@ -685,21 +708,15 @@ static RPC_STATUS RPCRT4_start_listen_protseq(RpcServerProtseq *ps, BOOL auto_listen) { RPC_STATUS status = RPC_S_OK; - HANDLE server_thread; EnterCriticalSection(&listen_cs); - if (ps->is_listening) goto done; + if (ps->server_thread) goto done; if (!ps->mgr_mutex) ps->mgr_mutex = CreateMutexW(NULL, FALSE, NULL); if (!ps->server_ready_event) ps->server_ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); - server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, ps, 0, NULL); - if (!server_thread) - { + ps->server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, ps, 0, NULL); + if (!ps->server_thread) status = RPC_S_OUT_OF_RESOURCES; - goto done; - } - ps->is_listening = TRUE; - CloseHandle(server_thread); done: LeaveCriticalSection(&listen_cs); @@ -767,8 +784,10 @@ if (stop_listen) { RpcServerProtseq *cps; + EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) RPCRT4_sync_with_server_thread(cps); + LeaveCriticalSection(&server_cs); } if (!auto_listen) @@ -1503,7 +1522,8 @@ */ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) { - HANDLE event; + RpcServerProtseq *protseq; + HANDLE event, wait_thread; TRACE("()\n"); @@ -1519,6 +1539,28 @@ TRACE( "done waiting\n" ); EnterCriticalSection(&listen_cs); + /* wait for server threads to finish */ + while(1) + { + if (listen_count) + break; + + wait_thread = NULL; + EnterCriticalSection(&server_cs); + LIST_FOR_EACH_ENTRY(protseq, &protseqs, RpcServerProtseq, entry) + { + if ((wait_thread = protseq->server_thread)) + break; + } + LeaveCriticalSection(&server_cs); + if (!wait_thread) + break; + + TRACE("waiting for thread %u\n", GetThreadId(wait_thread)); + LeaveCriticalSection(&listen_cs); + WaitForSingleObject(wait_thread, INFINITE); + EnterCriticalSection(&listen_cs); + } if (listen_done_event == event) { listen_done_event = NULL; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_server.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.h [iso-8859-1] Sun Sep 17 22:57:32 2017 @@ -36,8 +36,8 @@ struct list connections; /* CS cs */ CRITICAL_SECTION cs; - /* is the server currently listening? */ - BOOL is_listening; /* CS ::listen_cs */ + /* handle to listening thread */ + HANDLE server_thread; /* CS ::listen_cs */ /* mutex for ensuring only one thread can change state at a time */ HANDLE mgr_mutex; /* set when server thread has finished opening connections */ Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Sun Sep 17 22:57:32 2017 @@ -65,6 +65,7 @@ RpcConnection common; HANDLE pipe; HANDLE listen_event; + char *listen_pipe; IO_STATUS_BLOCK io_status; HANDLE event_cache; BOOL read_closed; @@ -89,26 +90,26 @@ CloseHandle(event); } -static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) -{ - RpcConnection_np *npc = (RpcConnection_np *) Connection; - TRACE("listening on %s\n", pname); - - npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, - PIPE_UNLIMITED_INSTANCES, - RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); - if (npc->pipe == INVALID_HANDLE_VALUE) { - WARN("CreateNamedPipe failed with error %d\n", GetLastError()); - if (GetLastError() == ERROR_FILE_EXISTS) - return RPC_S_DUPLICATE_ENDPOINT; - else - return RPC_S_CANT_CREATE_ENDPOINT; - } - - /* Note: we don't call ConnectNamedPipe here because it must be done in the - * server thread as the thread must be alertable */ - return RPC_S_OK; +static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *conn) +{ + RpcConnection_np *connection = (RpcConnection_np *) conn; + + TRACE("listening on %s\n", connection->listen_pipe); + + connection->pipe = CreateNamedPipeA(connection->listen_pipe, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, + PIPE_UNLIMITED_INSTANCES, + RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); + if (connection->pipe == INVALID_HANDLE_VALUE) + { + WARN("CreateNamedPipe failed with error %d\n", GetLastError()); + if (GetLastError() == ERROR_FILE_EXISTS) + return RPC_S_DUPLICATE_ENDPOINT; + else + return RPC_S_CANT_CREATE_ENDPOINT; + } + + return RPC_S_OK; } static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, BOOL wait) @@ -201,7 +202,6 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq, const char *endpoint) { RPC_STATUS r; - LPSTR pname; RpcConnection *Connection; char generated_endpoint[22]; @@ -220,9 +220,8 @@ if (r != RPC_S_OK) return r; - pname = ncalrpc_pipe_name(Connection->Endpoint); - r = rpcrt4_conn_create_pipe(Connection, pname); - I_RpcFree(pname); + ((RpcConnection_np*)Connection)->listen_pipe = ncalrpc_pipe_name(Connection->Endpoint); + r = rpcrt4_conn_create_pipe(Connection); EnterCriticalSection(&protseq->cs); list_add_head(&protseq->listeners, &Connection->protseq_entry); @@ -263,7 +262,6 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protseq, const char *endpoint) { RPC_STATUS r; - LPSTR pname; RpcConnection *Connection; char generated_endpoint[26]; @@ -282,9 +280,8 @@ if (r != RPC_S_OK) return r; - pname = ncacn_pipe_name(Connection->Endpoint); - r = rpcrt4_conn_create_pipe(Connection, pname); - I_RpcFree(pname); + ((RpcConnection_np*)Connection)->listen_pipe = ncacn_pipe_name(Connection->Endpoint); + r = rpcrt4_conn_create_pipe(Connection); EnterCriticalSection(&protseq->cs); list_add_head(&protseq->listeners, &Connection->protseq_entry); @@ -308,13 +305,9 @@ { DWORD len = MAX_COMPUTERNAME_LENGTH + 1; RPC_STATUS status; - LPSTR pname; rpcrt4_conn_np_handoff((RpcConnection_np *)old_conn, (RpcConnection_np *)new_conn); - - pname = ncacn_pipe_name(old_conn->Endpoint); - status = rpcrt4_conn_create_pipe(old_conn, pname); - I_RpcFree(pname); + status = rpcrt4_conn_create_pipe(old_conn); /* Store the local computer name as the NetworkAddr for ncacn_np as long as * we don't support named pipes over the network. */ @@ -359,15 +352,11 @@ { DWORD len = MAX_COMPUTERNAME_LENGTH + 1; RPC_STATUS status; - LPSTR pname; TRACE("%s\n", old_conn->Endpoint); rpcrt4_conn_np_handoff((RpcConnection_np *)old_conn, (RpcConnection_np *)new_conn); - - pname = ncalrpc_pipe_name(old_conn->Endpoint); - status = rpcrt4_conn_create_pipe(old_conn, pname); - I_RpcFree(pname); + status = rpcrt4_conn_create_pipe(old_conn); /* Store the local computer name as the NetworkAddr for ncalrpc. */ new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); @@ -672,6 +661,8 @@ *count = 1; LIST_FOR_EACH_ENTRY(conn, &protseq->listeners, RpcConnection_np, common.protseq_entry) { + if (!conn->pipe && rpcrt4_conn_create_pipe(&conn->common) != RPC_S_OK) + continue; if (!conn->listen_event) { NTSTATUS status; @@ -3372,38 +3363,69 @@ return connection; } -RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) -{ - InterlockedIncrement( &conn->ref ); - return conn; -} - -RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) -{ - if (InterlockedDecrement( &Connection->ref ) > 0) return RPC_S_OK; - - TRACE("destroying connection %p\n", Connection); - - RPCRT4_CloseConnection(Connection); - RPCRT4_strfree(Connection->Endpoint); - RPCRT4_strfree(Connection->NetworkAddr); - HeapFree(GetProcessHeap(), 0, Connection->NetworkOptions); - HeapFree(GetProcessHeap(), 0, Connection->CookieAuth); - if (Connection->AuthInfo) RpcAuthInfo_Release(Connection->AuthInfo); - if (Connection->QOS) RpcQualityOfService_Release(Connection->QOS); - - /* server-only */ - if (Connection->server_binding) RPCRT4_ReleaseBinding(Connection->server_binding); - - if (Connection->protseq) - { - EnterCriticalSection(&Connection->protseq->cs); - list_remove(&Connection->protseq_entry); - LeaveCriticalSection(&Connection->protseq->cs); - } - - HeapFree(GetProcessHeap(), 0, Connection); - return RPC_S_OK; +void rpcrt4_conn_release_and_wait(RpcConnection *connection) +{ + HANDLE event = NULL; + + if (connection->ref > 1) + event = connection->wait_release = CreateEventW(NULL, TRUE, FALSE, NULL); + + RPCRT4_ReleaseConnection(connection); + + if(event) + { + WaitForSingleObject(event, INFINITE); + CloseHandle(event); + } +} + +RpcConnection *RPCRT4_GrabConnection(RpcConnection *connection) +{ + LONG ref = InterlockedIncrement(&connection->ref); + TRACE("%p ref=%u\n", connection, ref); + return connection; +} + +void RPCRT4_ReleaseConnection(RpcConnection *connection) +{ + LONG ref; + + /* protseq stores a list of active connections, but does not own references to them. + * It may need to grab a connection from the list, which could lead to a race if + * connection is being released, but not yet removed from the list. We handle that + * by synchronizing on CS here. */ + if (connection->protseq) + { + EnterCriticalSection(&connection->protseq->cs); + ref = InterlockedDecrement(&connection->ref); + if (!ref) + list_remove(&connection->protseq_entry); + LeaveCriticalSection(&connection->protseq->cs); + } + else + { + ref = InterlockedDecrement(&connection->ref); + } + + TRACE("%p ref=%u\n", connection, ref); + + if (!ref) + { + RPCRT4_CloseConnection(connection); + RPCRT4_strfree(connection->Endpoint); + RPCRT4_strfree(connection->NetworkAddr); + HeapFree(GetProcessHeap(), 0, connection->NetworkOptions); + HeapFree(GetProcessHeap(), 0, connection->CookieAuth); + if (connection->AuthInfo) RpcAuthInfo_Release(connection->AuthInfo); + if (connection->QOS) RpcQualityOfService_Release(connection->QOS); + + /* server-only */ + if (connection->server_binding) RPCRT4_ReleaseBinding(connection->server_binding); + + if (connection->wait_release) SetEvent(connection->wait_release); + + HeapFree(GetProcessHeap(), 0, connection); + } } RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint) 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 Sep 17 22:57:32 2017 @@ -160,7 +160,7 @@ reactos/dll/win32/resutils # Synced to WineStaging-2.9 reactos/dll/win32/riched20 # Synced to WineStaging-2.16 reactos/dll/win32/riched32 # Synced to WineStaging-2.9 -reactos/dll/win32/rpcrt4 # Synced to WineStaging-2.9 +reactos/dll/win32/rpcrt4 # Synced to WineStaging-2.16 reactos/dll/win32/rsabase # Synced to WineStaging-2.9 reactos/dll/win32/rsaenh # Synced to WineStaging-2.9 reactos/dll/win32/sccbase # Synced to WineStaging-2.9

1 0

[akhaldi] 75897: [RICHED20_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:57:24 2017 New Revision: 75897 URL: http://svn.reactos.org/svn/reactos?rev=75897&view=rev Log: [RICHED20_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/riched20/editor.c Modified: trunk/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/editor… ============================================================================== --- trunk/rostests/winetests/riched20/editor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/editor.c [iso-8859-1] Sun Sep 17 22:57:24 2017 @@ -8537,19 +8537,23 @@ DestroyWindow(hwndRichEdit); } -static void test_rtf_specials(void) +static void test_rtf(void) { const char *specials = "{\\rtf1\\emspace\\enspace\\bullet\\lquote" "\\rquote\\ldblquote\\rdblquote\\ltrmark\\rtlmark\\zwj\\zwnj}"; const WCHAR expect_specials[] = {' ',' ',0x2022,0x2018,0x2019,0x201c, 0x201d,0x200e,0x200f,0x200d,0x200c}; const char *pard = "{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"; + const char *highlight = "{\\rtf1{\\colortbl;\\red0\\green0\\blue0;\\red128\\green128\\blue128;\\red192\\green192\\blue192;}\\cf2\\highlight3 foo\\par}"; + HWND edit = new_richeditW( NULL ); EDITSTREAM es; WCHAR buf[80]; LRESULT result; PARAFORMAT2 fmt; - + CHARFORMAT2W cf; + + /* Test rtf specials */ es.dwCookie = (DWORD_PTR)&specials; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; @@ -8579,6 +8583,18 @@ SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); ok( !(fmt.wEffects & PFE_RTLPARA), "rtl para set\n" ); + + /* Test \highlight */ + es.dwCookie = (DWORD_PTR)&highlight; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 3, "got %ld\n", result ); + SendMessageW( edit, EM_SETSEL, 1, 1 ); + memset( &cf, 0, sizeof(cf) ); + cf.cbSize = sizeof(cf); + SendMessageW( edit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf ); + ok( (cf.dwEffects & (CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)) == 0, "got %08x\n", cf.dwEffects ); + ok( cf.crTextColor == RGB(128,128,128), "got %08x\n", cf.crTextColor ); + ok( cf.crBackColor == RGB(192,192,192), "got %08x\n", cf.crBackColor ); DestroyWindow( edit ); } @@ -8802,7 +8818,7 @@ test_EM_SETREADONLY(); test_EM_SETFONTSIZE(); test_alignment_style(); - test_rtf_specials(); + test_rtf(); test_background(); test_eop_char_fmt(); test_para_numbering();

1 0

[akhaldi] 75896: [RICHED20] Sync with Wine Staging 2.16. CORE-13762 58cac9c riched20: Remove the separate implementation of IOleWindow as IOleInPlaceSite inherits from IOleWindow. adf53a9 riched20:...
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:57:18 2017 New Revision: 75896 URL: http://svn.reactos.org/svn/reactos?rev=75896&view=rev Log: [RICHED20] Sync with Wine Staging 2.16. CORE-13762 58cac9c riched20: Remove the separate implementation of IOleWindow as IOleInPlaceSite inherits from IOleWindow. adf53a9 riched20: Add support for pasting EMFs. bbf34a4 riched20: Use the implementation of EM_PASTESPECIAL for EM_CANPASTE. 46fef3d riched20: Use the implementation of EM_PASTESPECIAL for WM_PASTE. 9bec53f riched20: Add support for EM_PASTESPECIAL. 417c80d riched20: Don't create a special richedit ole instance for the RTF parser. 1bc48be riched20: Initialize ME_TextEditor members in ME_MakeEditor(). 5cc8c9f riched20: Retrieve the default paragraph alignment from the text host. 4cb7578 riched20: Move the editor initialization out of CreateTextHost(). 2d91663 riched20: New high resolution cursor generated from SVG. 17b7cde riched20: The background colour is set using \highlight. Modified: trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/ocr_reverse.cur trunk/reactos/dll/win32/riched20/para.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/txthost.c trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/dll/win32/riched20/writer.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sun Sep 17 22:57:18 2017 @@ -1119,8 +1119,8 @@ } } -static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbmp, - const SIZEL* sz) +static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HBITMAP hbmp, + const SIZEL* sz) { LPOLEOBJECT lpObject = NULL; LPSTORAGE lpStorage = NULL; @@ -1130,7 +1130,7 @@ STGMEDIUM stgm; FORMATETC fm; CLSID clsid; - BOOL ret = FALSE; + HRESULT hr = E_FAIL; DWORD conn; if (hemf) @@ -1152,13 +1152,14 @@ fm.lindex = -1; fm.tymed = stgm.tymed; - if (!info->lpRichEditOle) - { - CreateIRichEditOle(NULL, info->editor, (VOID**)&info->lpRichEditOle); + if (!editor->reOle) + { + if (!CreateIRichEditOle(NULL, editor, (LPVOID *)&editor->reOle)) + return hr; } if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && - IRichEditOle_GetClientSite(info->lpRichEditOle, &lpClientSite) == S_OK && + IRichEditOle_GetClientSite(editor->reOle, &lpClientSite) == S_OK && IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && @@ -1181,8 +1182,8 @@ reobject.dwFlags = 0; /* FIXME */ reobject.dwUser = 0; - ME_InsertOLEFromCursor(info->editor, &reobject, 0); - ret = TRUE; + ME_InsertOLEFromCursor(editor, &reobject, 0); + hr = S_OK; } if (lpObject) IOleObject_Release(lpObject); @@ -1191,7 +1192,7 @@ if (lpDataObject) IDataObject_Release(lpDataObject); if (lpOleCache) IOleCache_Release(lpOleCache); - return ret; + return hr; } static void ME_RTFReadShpPictGroup( RTF_Info *info ) @@ -1350,11 +1351,11 @@ { case gfx_enhmetafile: if ((hemf = SetEnhMetaFileBits( size, buffer ))) - ME_RTFInsertOleObject( info, hemf, NULL, &sz ); + insert_static_object( info->editor, hemf, NULL, &sz ); break; case gfx_metafile: if ((hemf = SetWinMetaFileBits( size, buffer, NULL, &mfp ))) - ME_RTFInsertOleObject( info, hemf, NULL, &sz ); + insert_static_object( info->editor, hemf, NULL, &sz ); break; case gfx_dib: { @@ -1368,7 +1369,7 @@ if ((hbmp = CreateDIBitmap( hdc, &bi->bmiHeader, CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD), bi, DIB_RGB_COLORS)) ) - ME_RTFInsertOleObject( info, NULL, hbmp, &sz ); + insert_static_object( info->editor, NULL, hbmp, &sz ); ReleaseDC( 0, hdc ); break; } @@ -1724,8 +1725,6 @@ } ME_CheckTablesForCorruption(editor); RTFDestroy(&parser); - if (parser.lpRichEditOle) - IRichEditOle_Release(parser.lpRichEditOle); if (parser.stackTop > 0) { @@ -2207,31 +2206,122 @@ return 0; } -static BOOL ME_Paste(ME_TextEditor *editor) -{ - DWORD dwFormat = 0; - EDITSTREAM es; - ME_GlobalDestStruct gds; - UINT nRTFFormat = RegisterClipboardFormatA("Rich Text Format"); - UINT cf = 0; - - if (IsClipboardFormatAvailable(nRTFFormat)) - cf = nRTFFormat, dwFormat = SF_RTF; - else if (IsClipboardFormatAvailable(CF_UNICODETEXT)) - cf = CF_UNICODETEXT, dwFormat = SF_TEXT|SF_UNICODE; - else - return FALSE; - - if (!OpenClipboard(editor->hWnd)) - return FALSE; - gds.hData = GetClipboardData(cf); - gds.nLength = 0; - es.dwCookie = (DWORD_PTR)&gds; - es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; - ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); - - CloseClipboard(); - return TRUE; +static const WCHAR rtfW[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; + +static HRESULT paste_rtf(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) +{ + EDITSTREAM es; + ME_GlobalDestStruct gds; + HRESULT hr; + + gds.hData = med->u.hGlobal; + gds.nLength = 0; + es.dwCookie = (DWORD_PTR)&gds; + es.pfnCallback = ME_ReadFromHGLOBALRTF; + hr = ME_StreamIn( editor, SF_RTF | SFF_SELECTION, &es, FALSE ) == 0 ? E_FAIL : S_OK; + ReleaseStgMedium( med ); + return hr; +} + +static HRESULT paste_text(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) +{ + EDITSTREAM es; + ME_GlobalDestStruct gds; + HRESULT hr; + + gds.hData = med->u.hGlobal; + gds.nLength = 0; + es.dwCookie = (DWORD_PTR)&gds; + es.pfnCallback = ME_ReadFromHGLOBALUnicode; + hr = ME_StreamIn( editor, SF_TEXT | SF_UNICODE | SFF_SELECTION, &es, FALSE ) == 0 ? E_FAIL : S_OK; + ReleaseStgMedium( med ); + return hr; +} + +static HRESULT paste_emf(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) +{ + HRESULT hr; + SIZEL sz = {0, 0}; + + hr = insert_static_object( editor, med->u.hEnhMetaFile, NULL, &sz ); + if (SUCCEEDED(hr)) + { + ME_CommitUndo( editor ); + ME_UpdateRepaint( editor, FALSE ); + } + else + ReleaseStgMedium( med ); + + return hr; +} + +static struct paste_format +{ + FORMATETC fmt; + HRESULT (*paste)(ME_TextEditor *, FORMATETC *, STGMEDIUM *); + const WCHAR *name; +} paste_formats[] = +{ + {{ -1, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_rtf, rtfW }, + {{ CF_UNICODETEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_text }, + {{ CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF }, paste_emf }, + {{ 0 }} +}; + +static void init_paste_formats(void) +{ + struct paste_format *format; + static int done; + + if (!done) + { + for (format = paste_formats; format->fmt.cfFormat; format++) + { + if (format->name) + format->fmt.cfFormat = RegisterClipboardFormatW( format->name ); + } + done = 1; + } +} + +static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BOOL check_only) +{ + HRESULT hr; + STGMEDIUM med; + struct paste_format *format; + IDataObject *data; + + init_paste_formats(); + + if (ps && ps->dwAspect != DVASPECT_CONTENT) + FIXME("Ignoring aspect %x\n", ps->dwAspect); + + hr = OleGetClipboard( &data ); + if (hr != S_OK) return FALSE; + + if (cf == CF_TEXT) cf = CF_UNICODETEXT; + + hr = S_FALSE; + for (format = paste_formats; format->fmt.cfFormat; format++) + { + if (cf && cf != format->fmt.cfFormat) continue; + hr = IDataObject_QueryGetData( data, &format->fmt ); + if (hr == S_OK) + { + if (!check_only) + { + hr = IDataObject_GetData( data, &format->fmt, &med ); + if (hr != S_OK) goto done; + hr = format->paste( editor, &format->fmt, &med ); + } + break; + } + } + +done: + IDataObject_Release( data ); + + return hr == S_OK; } static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) @@ -2547,7 +2637,7 @@ break; case 'V': if (ctrl_is_down) - return ME_Paste(editor); + return paste_special( editor, 0, NULL, FALSE ); break; case 'C': case 'X': @@ -2881,7 +2971,7 @@ return TRUE; } -ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10, DWORD csStyle) +ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) { ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); int i; @@ -2895,11 +2985,7 @@ ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; - ed->alignStyle = PFA_LEFT; - if (csStyle & ES_RIGHT) - ed->alignStyle = PFA_RIGHT; - if (csStyle & ES_CENTER) - ed->alignStyle = PFA_CENTER; + ed->exStyleFlags = 0; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| TXTBIT_READONLY|TXTBIT_USEPASSWORD| @@ -2960,6 +3046,7 @@ } ME_CheckCharOffsets(ed); + SetRectEmpty(&ed->rcFormat); ed->bDefaultFormatRect = TRUE; ITextHost_TxGetSelectionBarWidth(ed->texthost, &selbarwidth); if (selbarwidth) { @@ -3411,7 +3498,6 @@ UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) UNSUPPORTED_MSG(EM_GETWORDBREAKPROCEX) - UNSUPPORTED_MSG(EM_PASTESPECIAL) UNSUPPORTED_MSG(EM_SELECTIONTYPE) UNSUPPORTED_MSG(EM_SETBIDIOPTIONS) UNSUPPORTED_MSG(EM_SETEDITSTYLE) @@ -3968,17 +4054,14 @@ return 1; } case EM_CANPASTE: - { - UINT nRTFFormat = RegisterClipboardFormatA("Rich Text Format"); - if (IsClipboardFormatAvailable(nRTFFormat)) - return TRUE; - if (IsClipboardFormatAvailable(CF_UNICODETEXT)) - return TRUE; - return FALSE; - } + return paste_special( editor, 0, NULL, TRUE ); case WM_PASTE: case WM_MBUTTONDOWN: - ME_Paste(editor); + wParam = 0; + lParam = 0; + /* fall through */ + case EM_PASTESPECIAL: + paste_special( editor, wParam, (REPASTESPECIAL *)lParam, FALSE ); return 0; case WM_CUT: case WM_COPY: @@ -4789,6 +4872,30 @@ return 0L; } +static BOOL create_windowed_editor(HWND hwnd, CREATESTRUCTW *create, BOOL emulate_10) +{ + ITextHost *host = ME_CreateTextHost( hwnd, create, emulate_10 ); + ME_TextEditor *editor; + + if (!host) return FALSE; + + editor = ME_MakeEditor( host, emulate_10 ); + if (!editor) + { + ITextHost_Release( host ); + return FALSE; + } + + editor->exStyleFlags = GetWindowLongW( hwnd, GWL_EXSTYLE ); + editor->styleFlags |= GetWindowLongW( hwnd, GWL_STYLE ) & ES_WANTRETURN; + editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ + editor->hwndParent = create->hwndParent; + + SetWindowLongPtrW( hwnd, 0, (LONG_PTR)editor ); + + return TRUE; +} + static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) { @@ -4805,11 +4912,9 @@ if (msg == WM_NCCREATE) { CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam; - ITextHost *texthost; TRACE("WM_NCCREATE: hWnd %p style 0x%08x\n", hWnd, pcs->style); - texthost = ME_CreateTextHost(hWnd, pcs, FALSE); - return texthost != NULL; + return create_windowed_editor( hWnd, pcs, FALSE ); } else { @@ -4935,12 +5040,10 @@ { if (msg == WM_NCCREATE && !GetWindowLongPtrW(hWnd, 0)) { - ITextHost *texthost; CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam; TRACE("WM_NCCREATE: hWnd %p style 0x%08x\n", hWnd, pcs->style); - texthost = ME_CreateTextHost(hWnd, pcs, TRUE); - return texthost != NULL; + return create_windowed_editor( hWnd, pcs, TRUE ); } return RichEditANSIWndProc(hWnd, msg, wParam, lParam); } Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Sun Sep 17 22:57:18 2017 @@ -290,7 +290,7 @@ void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; /* editor.c */ -ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10, DWORD csStyle) DECLSPEC_HIDDEN; +ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; void ME_DestroyEditor(ME_TextEditor *editor) DECLSPEC_HIDDEN; LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode, HRESULT* phresult) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… ============================================================================== --- trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] Sun Sep 17 22:57:18 2017 @@ -353,7 +353,6 @@ ME_TextBuffer *pBuffer; ME_Cursor *pCursors; DWORD styleFlags; - DWORD alignStyle; DWORD exStyleFlags; int nCursors; SIZE sizeWindow; Modified: trunk/reactos/dll/win32/riched20/ocr_reverse.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/ocr_rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/para.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] Sun Sep 17 22:57:18 2017 @@ -863,10 +863,22 @@ void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) { + const PARAFORMAT2 *host_fmt; + HRESULT hr; + ZeroMemory(pFmt, sizeof(PARAFORMAT2)); pFmt->cbSize = sizeof(PARAFORMAT2); pFmt->dwMask = PFM_ALL2; - pFmt->wAlignment = editor->alignStyle; + pFmt->wAlignment = PFA_LEFT; pFmt->sStyle = -1; pFmt->bOutlineLevel = TRUE; -} + + hr = ITextHost_TxGetParaFormat( editor->texthost, (const PARAFORMAT **)&host_fmt ); + if (SUCCEEDED(hr)) + { + /* Just use the alignment for now */ + if (host_fmt->dwMask & PFM_ALIGNMENT) + pFmt->wAlignment = host_fmt->wAlignment; + ITextHost_OnTxParaFormatChange( editor->texthost, (PARAFORMAT *)pFmt ); + } +} Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] Sun Sep 17 22:57:18 2017 @@ -1366,7 +1366,7 @@ { rtfCharAttr, rtfSuperScrShrink, "super", 0 }, { rtfCharAttr, rtfInvisible, "v", 0 }, { rtfCharAttr, rtfForeColor, "cf", 0 }, - { rtfCharAttr, rtfBackColor, "cb", 0 }, + { rtfCharAttr, rtfBackColor, "highlight", 0 }, { rtfCharAttr, rtfRTLChar, "rtlch", 0 }, { rtfCharAttr, rtfLTRChar, "ltrch", 0 }, { rtfCharAttr, rtfCharStyleNum, "cs", 0 }, Modified: trunk/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole… ============================================================================== --- trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] Sun Sep 17 22:57:18 2017 @@ -244,7 +244,6 @@ struct IOleClientSiteImpl { struct reole_child child; IOleClientSite IOleClientSite_iface; - IOleWindow IOleWindow_iface; IOleInPlaceSite IOleInPlaceSite_iface; LONG ref; }; @@ -262,11 +261,6 @@ static inline IRichEditOleImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, IRichEditOleImpl, IUnknown_inner); -} - -static inline IOleClientSiteImpl *impl_from_IOleWindow(IOleWindow *iface) -{ - return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleWindow_iface); } static inline IOleClientSiteImpl *impl_from_IOleInPlaceSite(IOleInPlaceSite *iface) @@ -1062,9 +1056,8 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleClientSite)) *ppvObj = me; - else if (IsEqualGUID(riid, &IID_IOleWindow)) - *ppvObj = &This->IOleWindow_iface; - else if (IsEqualGUID(riid, &IID_IOleInPlaceSite)) + else if (IsEqualGUID(riid, &IID_IOleWindow) || + IsEqualGUID(riid, &IID_IOleInPlaceSite)) *ppvObj = &This->IOleInPlaceSite_iface; if (*ppvObj) { @@ -1175,35 +1168,28 @@ IOleClientSite_fnRequestNewObjectLayout }; -/* IOleWindow interface */ -static HRESULT WINAPI IOleWindow_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObj) -{ - IOleClientSiteImpl *This = impl_from_IOleWindow(iface); +/* IOleInPlaceSite interface */ +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnQueryInterface(IOleInPlaceSite *iface, REFIID riid, void **ppvObj) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj); } -static ULONG WINAPI IOleWindow_fnAddRef(IOleWindow *iface) -{ - IOleClientSiteImpl *This = impl_from_IOleWindow(iface); +static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnAddRef(IOleInPlaceSite *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); return IOleClientSite_AddRef(&This->IOleClientSite_iface); } -static ULONG WINAPI IOleWindow_fnRelease(IOleWindow *iface) -{ - IOleClientSiteImpl *This = impl_from_IOleWindow(iface); +static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnRelease(IOleInPlaceSite *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); return IOleClientSite_Release(&This->IOleClientSite_iface); } -static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) -{ - IOleClientSiteImpl *This = impl_from_IOleWindow(iface); - FIXME("not implemented: (%p)->(%d)\n", This, fEnterMode); - return E_NOTIMPL; -} - -static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) -{ - IOleClientSiteImpl *This = impl_from_IOleWindow(iface); +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow(IOleInPlaceSite *iface, HWND *phwnd) +{ + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); TRACE("(%p)->(%p)\n", This, phwnd); @@ -1217,43 +1203,11 @@ return S_OK; } -static const IOleWindowVtbl olewinvt = { - IOleWindow_fnQueryInterface, - IOleWindow_fnAddRef, - IOleWindow_fnRelease, - IOleWindow_fnGetWindow, - IOleWindow_fnContextSensitiveHelp -}; - -/* IOleInPlaceSite interface */ -static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnQueryInterface(IOleInPlaceSite *iface, REFIID riid, void **ppvObj) +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode) { IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj); -} - -static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnAddRef(IOleInPlaceSite *iface) -{ - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - return IOleClientSite_AddRef(&This->IOleClientSite_iface); -} - -static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnRelease(IOleInPlaceSite *iface) -{ - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - return IOleClientSite_Release(&This->IOleClientSite_iface); -} - -static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow(IOleInPlaceSite *iface, HWND *phwnd) -{ - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - return IOleWindow_GetWindow(&This->IOleWindow_iface, phwnd); -} - -static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode) -{ - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - return IOleWindow_ContextSensitiveHelp(&This->IOleWindow_iface, fEnterMode); + FIXME("not implemented: (%p)->(%d)\n", This, fEnterMode); + return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnCanInPlaceActivate(IOleInPlaceSite *iface) @@ -1355,7 +1309,6 @@ return E_OUTOFMEMORY; clientSite->IOleClientSite_iface.lpVtbl = &ocst; - clientSite->IOleWindow_iface.lpVtbl = &olewinvt; clientSite->IOleInPlaceSite_iface.lpVtbl = &olestvt; clientSite->ref = 1; clientSite->child.reole = reOle; Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] Sun Sep 17 22:57:18 2017 @@ -1165,7 +1165,6 @@ RTFState stack[maxStack]; int stackTop; BOOL styleChanged; - LPRICHEDITOLE lpRichEditOle; RTFTable *tableDef; int nestingLevel; Modified: trunk/reactos/dll/win32/riched20/txthost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txthost… ============================================================================== --- trunk/reactos/dll/win32/riched20/txthost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txthost.c [iso-8859-1] Sun Sep 17 22:57:18 2017 @@ -27,6 +27,7 @@ LONG ref; HWND hWnd; BOOL bEmulateVersion10; + PARAFORMAT2 para_fmt; } ITextHostImpl; static const ITextHostVtbl textHostVtbl; @@ -34,23 +35,22 @@ ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion10) { ITextHostImpl *texthost; + texthost = CoTaskMemAlloc(sizeof(*texthost)); - if (texthost) - { - ME_TextEditor *editor; - - texthost->ITextHost_iface.lpVtbl = &textHostVtbl; - texthost->ref = 1; - texthost->hWnd = hwnd; - texthost->bEmulateVersion10 = bEmulateVersion10; - - editor = ME_MakeEditor(&texthost->ITextHost_iface, bEmulateVersion10, cs->style); - editor->exStyleFlags = GetWindowLongW(hwnd, GWL_EXSTYLE); - editor->styleFlags |= GetWindowLongW(hwnd, GWL_STYLE) & ES_WANTRETURN; - editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ - editor->hwndParent = cs->hwndParent; - SetWindowLongPtrW(hwnd, 0, (LONG_PTR)editor); - } + if (!texthost) return NULL; + + texthost->ITextHost_iface.lpVtbl = &textHostVtbl; + texthost->ref = 1; + texthost->hWnd = hwnd; + texthost->bEmulateVersion10 = bEmulateVersion10; + memset( &texthost->para_fmt, 0, sizeof(texthost->para_fmt) ); + texthost->para_fmt.cbSize = sizeof(texthost->para_fmt); + texthost->para_fmt.dwMask = PFM_ALIGNMENT; + texthost->para_fmt.wAlignment = PFA_LEFT; + if (cs->style & ES_RIGHT) + texthost->para_fmt.wAlignment = PFA_RIGHT; + if (cs->style & ES_CENTER) + texthost->para_fmt.wAlignment = PFA_CENTER; return &texthost->ITextHost_iface; } @@ -258,9 +258,11 @@ } DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, - const PARAFORMAT **ppPF) -{ - return E_NOTIMPL; + const PARAFORMAT **fmt) +{ + ITextHostImpl *This = impl_from_ITextHost(iface); + *fmt = (const PARAFORMAT *)&This->para_fmt; + return S_OK; } DECLSPEC_HIDDEN COLORREF WINAPI ITextHostImpl_TxGetSysColor(ITextHost *iface, Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… ============================================================================== --- trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] Sun Sep 17 22:57:18 2017 @@ -401,9 +401,7 @@ ITextImpl->pMyHost = pITextHost; ITextImpl->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; - ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE, ES_LEFT); - ITextImpl->editor->exStyleFlags = 0; - SetRectEmpty(&ITextImpl->editor->rcFormat); + ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); if (pUnkOuter) ITextImpl->outer_unk = pUnkOuter; Modified: trunk/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/writer.… ============================================================================== --- trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] Sun Sep 17 22:57:18 2017 @@ -770,7 +770,7 @@ { if (fmt->dwEffects & CFE_AUTOBACKCOLOR) i = 0; else find_color_in_colortbl( pStream, fmt->crBackColor, &i ); - sprintf(props + strlen(props), "\\cb%u", i); + sprintf(props + strlen(props), "\\highlight%u", i); } if ((old_fmt->dwEffects ^ fmt->dwEffects) & CFE_AUTOCOLOR || (!(fmt->dwEffects & CFE_AUTOCOLOR) && old_fmt->crTextColor != fmt->crTextColor)) 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 Sep 17 22:57:18 2017 @@ -158,7 +158,7 @@ reactos/dll/win32/query # Synced to WineStaging-2.9 reactos/dll/win32/rasapi32 # Synced to WineStaging-2.9 reactos/dll/win32/resutils # Synced to WineStaging-2.9 -reactos/dll/win32/riched20 # Synced to WineStaging-2.9 +reactos/dll/win32/riched20 # Synced to WineStaging-2.16 reactos/dll/win32/riched32 # Synced to WineStaging-2.9 reactos/dll/win32/rpcrt4 # Synced to WineStaging-2.9 reactos/dll/win32/rsabase # Synced to WineStaging-2.9

1 0

[akhaldi] 75895: [PROPSYS_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:57:07 2017 New Revision: 75895 URL: http://svn.reactos.org/svn/reactos?rev=75895&view=rev Log: [PROPSYS_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/propsys/CMakeLists.txt trunk/rostests/winetests/propsys/propsys.c Modified: trunk/rostests/winetests/propsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/propsys/CMakeLi… ============================================================================== --- trunk/rostests/winetests/propsys/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/propsys/CMakeLists.txt [iso-8859-1] Sun Sep 17 22:57:07 2017 @@ -1,5 +1,5 @@ -add_definitions(-DUSE_WINE_TODOS) +add_definitions(-DUSE_WINE_TODOS -DWINETEST_USE_DBGSTR_LONGLONG) add_executable(propsys_winetest propstore.c propsys.c testlist.c) set_module_type(propsys_winetest win32cui) add_importlibs(propsys_winetest propsys ole32 oleaut32 msvcrt kernel32) Modified: trunk/rostests/winetests/propsys/propsys.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/propsys/propsys… ============================================================================== --- trunk/rostests/winetests/propsys/propsys.c [iso-8859-1] (original) +++ trunk/rostests/winetests/propsys/propsys.c [iso-8859-1] Sun Sep 17 22:57:07 2017 @@ -770,16 +770,6 @@ SysFreeString(str_b.u.bstrVal); } -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - static char string[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string, "%lx", (unsigned long)ll); - return string; -} - static void test_intconversions(void) { PROPVARIANT propvar; @@ -803,7 +793,7 @@ hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr); @@ -825,11 +815,11 @@ hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 5, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 5, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == S_OK, "hr=%x\n", hr); - ok(ullval == 5, "got wrong value %s\n", debugstr_longlong(ullval)); + ok(ullval == 5, "got wrong value %s\n", wine_dbgstr_longlong(ullval)); hr = PropVariantToInt32(&propvar, &lval); ok(hr == S_OK, "hr=%x\n", hr); @@ -852,7 +842,7 @@ hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -5, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -5, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr); @@ -876,28 +866,28 @@ hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 6, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 6, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_I4; propvar.u.lVal = -6; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -6, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -6, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_UI2; propvar.u.uiVal = 7; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 7, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 7, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_I2; propvar.u.iVal = -7; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -7, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -7, "got wrong value %s\n", wine_dbgstr_longlong(llval)); } static void test_PropVariantChangeType_LPWSTR(void)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs