Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[akhaldi] 68434: [INETCOMM] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:24:54 2015 New Revision: 68434 URL: http://svn.reactos.org/svn/reactos?rev=68434&view=rev Log: [INETCOMM] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c trunk/reactos/media/doc/README.WINE 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 Jul 19 13:24:54 2015 @@ -1595,13 +1595,13 @@ if(overlap == buf) /* 1st iteration */ { - memcpy(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); + memmove(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); overlap = buf + overlap_no; start += read - overlap_no; } else { - memcpy(buf, buf + PARSER_BUF_SIZE, overlap_no); + memmove(buf, buf + PARSER_BUF_SIZE, overlap_no); start += read; } } while(1); 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 Jul 19 13:24:54 2015 @@ -81,7 +81,7 @@ reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.37 reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.37 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 -reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.37 +reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.47 reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.37 reactos/dll/win32/initpki # Synced to WineStaging-1.7.37 reactos/dll/win32/inseng # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68433: [IEFRAME] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:24:09 2015 New Revision: 68433 URL: http://svn.reactos.org/svn/reactos?rev=68433&view=rev Log: [IEFRAME] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/ieframe/ie.c trunk/reactos/dll/win32/ieframe/iehtmlwnd.c trunk/reactos/dll/win32/ieframe/intshcut.c trunk/reactos/dll/win32/ieframe/navigate.c trunk/reactos/dll/win32/ieframe/oleobject.c trunk/reactos/dll/win32/ieframe/shellbrowser.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ieframe/ie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ie.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] Sun Jul 19 13:24:09 2015 @@ -166,8 +166,8 @@ { InternetExplorer *This = impl_from_IWebBrowser2(iface); - TRACE("(%p)->(%s %p %p %p %p)\n", This, debugstr_w(szUrl), Flags, TargetFrameName, - PostData, Headers); + TRACE("(%p)->(%s %s %s %s %s)\n", This, debugstr_w(szUrl), debugstr_variant(Flags), + debugstr_variant(TargetFrameName), debugstr_variant(PostData), debugstr_variant(Headers)); return navigate_url(&This->doc_host, szUrl, Flags, TargetFrameName, PostData, Headers); } @@ -185,7 +185,7 @@ { InternetExplorer *This = impl_from_IWebBrowser2(iface); - TRACE("(%p)->(%p)\n", This, Level); + TRACE("(%p)->(%s)\n", This, debugstr_variant(Level)); return refresh_document(&This->doc_host, Level); } @@ -335,7 +335,7 @@ static HRESULT WINAPI InternetExplorer_PutProperty(IWebBrowser2 *iface, BSTR szProperty, VARIANT vtValue) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(szProperty)); + FIXME("(%p)->(%s %s)\n", This, debugstr_w(szProperty), debugstr_variant(&vtValue)); return E_NOTIMPL; } @@ -483,7 +483,8 @@ { InternetExplorer *This = impl_from_IWebBrowser2(iface); - TRACE("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers); + TRACE("(%p)->(%s %s %s %s %s)\n", This, debugstr_variant(URL), debugstr_variant(Flags), + debugstr_variant(TargetFrameName), debugstr_variant(PostData), debugstr_variant(Headers)); if(!URL) return S_OK; @@ -507,7 +508,7 @@ OLECMDEXECOPT cmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d %d %p %p)\n", This, cmdID, cmdexecopt, pvaIn, pvaOut); + FIXME("(%p)->(%d %d %s %p)\n", This, cmdID, cmdexecopt, debugstr_variant(pvaIn), pvaOut); return E_NOTIMPL; } @@ -515,7 +516,8 @@ VARIANT *pvarShow, VARIANT *pvarSize) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p %p %p)\n", This, pvaClsid, pvarShow, pvarSize); + FIXME("(%p)->(%s %s %s)\n", This, debugstr_variant(pvaClsid), debugstr_variant(pvarShow), + debugstr_variant(pvarSize)); return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/ieframe/iehtmlwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/iehtmlwn… ============================================================================== --- trunk/reactos/dll/win32/ieframe/iehtmlwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/iehtmlwnd.c [iso-8859-1] Sun Jul 19 13:24:09 2015 @@ -103,7 +103,7 @@ static HRESULT WINAPI IEHTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p %p)\n", This, pvarIndex, pvarResult); + FIXME("(%p)->(%s %p)\n", This, debugstr_variant(pvarIndex), pvarResult); return E_NOTIMPL; } @@ -153,7 +153,7 @@ LONG msec, VARIANT *language, LONG *timerID) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s %d %p %p)\n", This, debugstr_w(expression), msec, language, timerID); + FIXME("(%p)->(%s %d %s %p)\n", This, debugstr_w(expression), msec, debugstr_variant(language), timerID); return E_NOTIMPL; } @@ -223,7 +223,7 @@ static HRESULT WINAPI IEHTMLWindow2_put_opener(IHTMLWindow2 *iface, VARIANT v) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -302,7 +302,7 @@ static HRESULT WINAPI IEHTMLWindow2_put_onfocus(IHTMLWindow2 *iface, VARIANT v) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -316,7 +316,7 @@ static HRESULT WINAPI IEHTMLWindow2_put_onblur(IHTMLWindow2 *iface, VARIANT v) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -344,7 +344,7 @@ static HRESULT WINAPI IEHTMLWindow2_put_onbeforeunload(IHTMLWindow2 *iface, VARIANT v) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -358,7 +358,7 @@ static HRESULT WINAPI IEHTMLWindow2_put_onunload(IHTMLWindow2 *iface, VARIANT v) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -372,7 +372,7 @@ static HRESULT WINAPI IEHTMLWindow2_put_onhelp(IHTMLWindow2 *iface, VARIANT v) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -386,7 +386,7 @@ static HRESULT WINAPI IEHTMLWindow2_put_onerror(IHTMLWindow2 *iface, VARIANT v) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -414,7 +414,7 @@ static HRESULT WINAPI IEHTMLWindow2_put_onscroll(IHTMLWindow2 *iface, VARIANT v) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -450,7 +450,8 @@ VARIANT *varArgIn, VARIANT *varOptions, VARIANT *varArgOut) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s %p %p %p)\n", This, debugstr_w(dialog), varArgIn, varOptions, varArgOut); + FIXME("(%p)->(%s %s %s %p)\n", This, debugstr_w(dialog), debugstr_variant(varArgIn), + debugstr_variant(varOptions), varArgOut); return E_NOTIMPL; } @@ -458,7 +459,7 @@ BSTR features) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s v(%d) %s)\n", This, debugstr_w(helpURL), V_VT(&helpArg), debugstr_w(features)); + FIXME("(%p)->(%s %s %s)\n", This, debugstr_w(helpURL), debugstr_variant(&helpArg), debugstr_w(features)); return E_NOTIMPL; } @@ -515,7 +516,7 @@ LONG msec, VARIANT *language, LONG *timerID) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s %d %p %p)\n", This, debugstr_w(expression), msec, language, timerID); + FIXME("(%p)->(%s %d %s %p)\n", This, debugstr_w(expression), msec, debugstr_variant(language), timerID); return E_NOTIMPL; } @@ -529,7 +530,7 @@ static HRESULT WINAPI IEHTMLWindow2_put_offscreenBuffering(IHTMLWindow2 *iface, VARIANT v) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/ieframe/intshcut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/intshcut… ============================================================================== --- trunk/reactos/dll/win32/ieframe/intshcut.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/intshcut.c [iso-8859-1] Sun Jul 19 13:24:09 2015 @@ -490,7 +490,7 @@ STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStg); - r = get_profile_string(str_header, str_iconfile, pszFileName, &iconfile); + get_profile_string(str_header, str_iconfile, pszFileName, &iconfile); if (iconfile != NULL) { PROPSPEC ps; @@ -508,7 +508,7 @@ CoTaskMemFree(iconfile); } - r = get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring); + get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring); if (iconindexstring != NULL) { Modified: trunk/reactos/dll/win32/ieframe/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/navigate… ============================================================================== --- trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] Sun Jul 19 13:24:09 2015 @@ -931,6 +931,7 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, const VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { + SAFEARRAY *post_array = NULL; PBYTE post_data = NULL; ULONG post_data_len = 0; LPWSTR headers = NULL; @@ -942,9 +943,18 @@ || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY && V_VT(TargetFrameName) != VT_ERROR)) FIXME("Unsupported args (Flags %s; TargetFrameName %s)\n", debugstr_variant(Flags), debugstr_variant(TargetFrameName)); - if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1) && V_ARRAY(PostData)) { - SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); - post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; + if(PostData) { + if(V_VT(PostData) & VT_ARRAY) + post_array = V_ISBYREF(PostData) ? *V_ARRAYREF(PostData) : V_ARRAY(PostData); + else + WARN("Invalid post data %s\n", debugstr_variant(PostData)); + } + + if(post_array) { + LONG elem_max; + SafeArrayAccessData(post_array, (void**)&post_data); + SafeArrayGetUBound(post_array, 1, &elem_max); + post_data_len = (elem_max+1) * SafeArrayGetElemsize(post_array); } if(Headers && V_VT(Headers) == VT_BSTR) { @@ -983,7 +993,7 @@ } if(post_data) - SafeArrayUnaccessData(V_ARRAY(PostData)); + SafeArrayUnaccessData(post_array); return hres; } Modified: trunk/reactos/dll/win32/ieframe/oleobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/oleobjec… ============================================================================== --- trunk/reactos/dll/win32/ieframe/oleobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/oleobject.c [iso-8859-1] Sun Jul 19 13:24:09 2015 @@ -1089,8 +1089,8 @@ VARIANT *pvaOut) { WebBrowser *This = impl_from_IOleCommandTarget(iface); - FIXME("(%p)->(%s %d %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, - nCmdexecopt, pvaIn, pvaOut); + FIXME("(%p)->(%s %d %d %s %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, + nCmdexecopt, debugstr_variant(pvaIn), pvaOut); return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/ieframe/shellbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shellbro… ============================================================================== --- trunk/reactos/dll/win32/ieframe/shellbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/shellbrowser.c [iso-8859-1] Sun Jul 19 13:24:09 2015 @@ -534,7 +534,7 @@ VARIANT *pvarOut) { ShellBrowser *This = impl_from_IBrowserService(iface); - FIXME("%p %p %p\n", This, pvarIn, pvarOut); + FIXME("%p %s %p\n", This, debugstr_variant(pvarIn), pvarOut); return E_NOTIMPL; } @@ -546,7 +546,7 @@ VARIANT *pvarargOut) { ShellBrowser *This = impl_from_IBrowserService(iface); - FIXME("%p %p %d %p %p\n", This, psv, fDone, pvarargIn, pvarargOut); + FIXME("%p %p %d %s %p\n", This, psv, fDone, debugstr_variant(pvarargIn), pvarargOut); return E_NOTIMPL; } @@ -651,6 +651,8 @@ DISPPARAMS dp = {params, NULL, 7, 0}; VARIANT_BOOL cancel = VARIANT_FALSE; SAFEARRAY *post_data; + WCHAR file_path[MAX_PATH]; + DWORD file_path_len = sizeof(file_path) / sizeof(*file_path); TRACE("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), dwFlags, debugstr_w(lpszFrameName), pPostData, cbPostData, @@ -698,7 +700,10 @@ V_VT(params+5) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params+5) = &var_url; V_VT(&var_url) = VT_BSTR; - V_BSTR(&var_url) = SysAllocString(lpszUrl); + if(PathCreateFromUrlW(lpszUrl, file_path, &file_path_len, 0) == S_OK) + V_BSTR(&var_url) = SysAllocString(file_path); + else + V_BSTR(&var_url) = SysAllocString(lpszUrl); V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = (IDispatch*)This->doc_host->wb; 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 Jul 19 13:24:09 2015 @@ -77,7 +77,7 @@ reactos/dll/win32/httpapi # Synced to WineStaging-1.7.37 reactos/dll/win32/iccvid # Synced to WineStaging-1.7.37 reactos/dll/win32/icmp # Out of sync -reactos/dll/win32/ieframe # Synced to WineStaging-1.7.37 +reactos/dll/win32/ieframe # Synced to WineStaging-1.7.47 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.37 reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.37 reactos/dll/win32/imm32 # Synced to Wine-1.7.27

9 years, 5 months

[akhaldi] 68432: [HHCTRL.OCX] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:21:48 2015 New Revision: 68432 URL: http://svn.reactos.org/svn/reactos?rev=68432&view=rev Log: [HHCTRL.OCX] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Sq.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc trunk/reactos/dll/win32/hhctrl.ocx/resource.h trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -54,7 +54,7 @@ * Table mapping the conversion between HTML encoded symbols and their ANSI code page equivalent. * Note: Add additional entries in proper alphabetical order (a binary search is used on this table). */ -struct html_encoded_symbol html_encoded_symbols[] = +static struct html_encoded_symbol html_encoded_symbols[] = { {"AElig", 0xC6}, {"Aacute", 0xC1}, @@ -189,7 +189,7 @@ V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(surl); - hres = IWebBrowser2_Navigate2(info->web_browser, &url, 0, 0, 0, 0); + hres = IWebBrowser2_Navigate2(info->web_browser->web_browser, &url, 0, 0, 0, 0); VariantClear(&url); @@ -261,7 +261,7 @@ HRESULT hres; BSTR url; - hres = IWebBrowser2_get_LocationURL(info->web_browser, &url); + hres = IWebBrowser2_get_LocationURL(info->web_browser->web_browser, &url); if (FAILED(hres)) { @@ -867,22 +867,22 @@ switch (dwID) { case IDTB_STOP: - DoPageAction(info, WB_STOP); + DoPageAction(info->web_browser, WB_STOP); break; case IDTB_REFRESH: - DoPageAction(info, WB_REFRESH); + DoPageAction(info->web_browser, WB_REFRESH); break; case IDTB_BACK: - DoPageAction(info, WB_GOBACK); + DoPageAction(info->web_browser, WB_GOBACK); break; case IDTB_HOME: NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszHome); break; case IDTB_FORWARD: - DoPageAction(info, WB_GOFORWARD); + DoPageAction(info->web_browser, WB_GOFORWARD); break; case IDTB_PRINT: - DoPageAction(info, WB_PRINT); + DoPageAction(info->web_browser, WB_PRINT); break; case IDTB_EXPAND: case IDTB_CONTRACT: Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -26,7 +26,6 @@ HINSTANCE hhctrl_hinstance; BOOL hh_process = FALSE; -extern struct list window_list; BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) { Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -36,6 +36,7 @@ #include <htmlhelp.h> #include <ole2.h> #include <exdisp.h> +#include <mshtmhst.h> #include <commctrl.h> #include <wine/itss.h> @@ -175,9 +176,20 @@ }; typedef struct { - IOleClientSite *client_site; + IOleClientSite IOleClientSite_iface; + IOleInPlaceSite IOleInPlaceSite_iface; + IOleInPlaceFrame IOleInPlaceFrame_iface; + IDocHostUIHandler IDocHostUIHandler_iface; + + LONG ref; + + IOleObject *ole_obj; IWebBrowser2 *web_browser; - IOleObject *wb_object; + HWND hwndWindow; +} WebBrowserContainer; + +typedef struct { + WebBrowserContainer *web_browser; HH_WINTYPEW WinType; @@ -203,7 +215,7 @@ BOOL InitWebBrowser(HHInfo*,HWND) DECLSPEC_HIDDEN; void ReleaseWebBrowser(HHInfo*) DECLSPEC_HIDDEN; void ResizeWebBrowser(HHInfo*,DWORD,DWORD) DECLSPEC_HIDDEN; -void DoPageAction(HHInfo*,DWORD) DECLSPEC_HIDDEN; +void DoPageAction(WebBrowserContainer*,DWORD) DECLSPEC_HIDDEN; void InitContent(HHInfo*) DECLSPEC_HIDDEN; void ReleaseContent(HHInfo*) DECLSPEC_HIDDEN; @@ -220,6 +232,7 @@ LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN; WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN; +extern struct list window_list DECLSPEC_HIDDEN; HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND) DECLSPEC_HIDDEN; void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -64,3 +64,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -60,3 +60,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -62,3 +62,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -60,3 +60,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -61,3 +61,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -63,3 +63,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -60,3 +60,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -63,3 +63,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -62,3 +62,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -60,3 +60,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -64,3 +64,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -64,3 +64,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -61,3 +61,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -63,3 +63,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -60,3 +60,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -60,3 +60,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -61,3 +61,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -47,6 +47,32 @@ } } +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -64,3 +64,29 @@ MENUITEM "I&mprimÄâ¦", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -63,3 +63,29 @@ MENUITEM "&ÐÐµÑÐ°ÑÑ...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -62,3 +62,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Sq.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -63,3 +63,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -60,3 +60,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -60,3 +60,29 @@ MENUITEM "Y&azdÄ±r...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -65,3 +65,29 @@ MENUITEM "&Print...", IDTB_PRINT } } + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -20,6 +20,34 @@ /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_NEUTRAL + +MENU_WEBBROWSER MENU +{ + POPUP "" + { + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM SEPARATOR + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&View Source", MIID_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Print...", IDTB_PRINT + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM SEPARATOR + MENUITEM "Proper&ties", MIID_PROPERTIES + } + POPUP "" + { + MENUITEM "Cu&t", MIID_CUT + MENUITEM "&Copy", MIID_COPY + MENUITEM "Paste", MIID_PASTE + MENUITEM "Select &All", MIID_SELECTALL + MENUITEM "&Print", IDTB_PRINT + } +} LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED Modified: trunk/reactos/dll/win32/hhctrl.ocx/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/resou… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/resource.h [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -28,6 +28,7 @@ #define IDS_SHOWTABS 6 #define MENU_POPUP 1 +#define MENU_WEBBROWSER 2 #define IDB_HHTOOLBAR 1000 /* IDB_HHTOOLBAR bitmaps: */ @@ -39,6 +40,13 @@ #define HHTB_EXPAND 5 #define HHTB_NUMBITMAPS HHTB_EXPAND +#define MIID_SELECTALL 10 +#define MIID_VIEWSOURCE 11 +#define MIID_PROPERTIES 12 +#define MIID_CUT 13 +#define MIID_COPY 14 +#define MIID_PASTE 15 + #define IDB_HHTREEVIEW 1001 /* IDB_HHTREEVIEW bitmaps: */ #define HHTV_DOCUMENT 0 Modified: trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/webbr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c [iso-8859-1] Sun Jul 19 13:21:48 2015 @@ -22,31 +22,14 @@ #include <mshtmhst.h> -typedef struct IOleClientSiteImpl -{ - IOleClientSite IOleClientSite_iface; - IOleInPlaceSite IOleInPlaceSite_iface; - IOleInPlaceFrame IOleInPlaceFrame_iface; - IDocHostUIHandler IDocHostUIHandler_iface; - - /* IOleClientSiteImpl data */ - IOleObject *pBrowserObject; - LONG ref; - - /* IOleInPlaceFrame data */ - HWND hwndWindow; -} IOleClientSiteImpl; - -static inline IOleClientSiteImpl *impl_from_IOleClientSite(IOleClientSite *iface) -{ - return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleClientSite_iface); +static inline WebBrowserContainer *impl_from_IOleClientSite(IOleClientSite *iface) +{ + return CONTAINING_RECORD(iface, WebBrowserContainer, IOleClientSite_iface); } static HRESULT STDMETHODCALLTYPE Site_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppvObj) { - IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - - *ppvObj = NULL; + WebBrowserContainer *This = impl_from_IOleClientSite(iface); if (IsEqualIID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppvObj); @@ -65,6 +48,7 @@ *ppvObj = &This->IDocHostUIHandler_iface; }else { TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObj); + *ppvObj = NULL; return E_NOINTERFACE; } @@ -74,7 +58,7 @@ static ULONG STDMETHODCALLTYPE Site_AddRef(IOleClientSite *iface) { - IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); + WebBrowserContainer *This = impl_from_IOleClientSite(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -84,13 +68,18 @@ static ULONG STDMETHODCALLTYPE Site_Release(IOleClientSite *iface) { - IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); + WebBrowserContainer *This = impl_from_IOleClientSite(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + if(This->ole_obj) + IOleObject_Release(This->ole_obj); + if(This->web_browser) + IWebBrowser2_Release(This->web_browser); heap_free(This); + } return ref; } @@ -127,7 +116,7 @@ return E_NOTIMPL; } -static const IOleClientSiteVtbl MyIOleClientSiteTable = +static const IOleClientSiteVtbl OleClientSiteVtbl = { Site_QueryInterface, Site_AddRef, @@ -140,34 +129,87 @@ Site_RequestNewObjectLayout }; -static inline IOleClientSiteImpl *impl_from_IDocHostUIHandler(IDocHostUIHandler *iface) -{ - return CONTAINING_RECORD(iface, IOleClientSiteImpl, IDocHostUIHandler_iface); +static inline WebBrowserContainer *impl_from_IDocHostUIHandler(IDocHostUIHandler *iface) +{ + return CONTAINING_RECORD(iface, WebBrowserContainer, IDocHostUIHandler_iface); } static HRESULT STDMETHODCALLTYPE UI_QueryInterface(IDocHostUIHandler *iface, REFIID riid, LPVOID *ppvObj) { - IOleClientSiteImpl *This = impl_from_IDocHostUIHandler(iface); + WebBrowserContainer *This = impl_from_IDocHostUIHandler(iface); return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj); } static ULONG STDMETHODCALLTYPE UI_AddRef(IDocHostUIHandler *iface) { - IOleClientSiteImpl *This = impl_from_IDocHostUIHandler(iface); + WebBrowserContainer *This = impl_from_IDocHostUIHandler(iface); return IOleClientSite_AddRef(&This->IOleClientSite_iface); } static ULONG STDMETHODCALLTYPE UI_Release(IDocHostUIHandler * iface) { - IOleClientSiteImpl *This = impl_from_IDocHostUIHandler(iface); + WebBrowserContainer *This = impl_from_IDocHostUIHandler(iface); return IOleClientSite_Release(&This->IOleClientSite_iface); } static HRESULT STDMETHODCALLTYPE UI_ShowContextMenu(IDocHostUIHandler *iface, DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved) { + WebBrowserContainer *This = impl_from_IDocHostUIHandler(iface); + DWORD cmdid, menu_id = 0; + HMENU menu, submenu; + + TRACE("(%p)->(%d %s)\n", This, dwID, wine_dbgstr_point(ppt)); + + menu = LoadMenuW(hhctrl_hinstance, MAKEINTRESOURCEW(MENU_WEBBROWSER)); + if (!menu) + return S_OK; + + /* FIXME: Support more menu types. */ + if(dwID == CONTEXT_MENU_TEXTSELECT) + menu_id = 1; + + submenu = GetSubMenu(menu, menu_id); + + cmdid = TrackPopupMenu(submenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, + ppt->x, ppt->y, 0, This->hwndWindow, NULL); + DestroyMenu(menu); + + switch(cmdid) { + case IDTB_BACK: + DoPageAction(This, WB_GOBACK); + break; + case IDTB_FORWARD: + DoPageAction(This, WB_GOFORWARD); + break; + case MIID_SELECTALL: + IWebBrowser2_ExecWB(This->web_browser, OLECMDID_SELECTALL, 0, NULL, NULL); + break; + case MIID_VIEWSOURCE: + FIXME("View source\n"); + break; + case IDTB_PRINT: + DoPageAction(This, WB_PRINT); + break; + case IDTB_REFRESH: + DoPageAction(This, WB_REFRESH); + break; + case MIID_PROPERTIES: + FIXME("Properties\n"); + break; + case MIID_COPY: + IWebBrowser2_ExecWB(This->web_browser, OLECMDID_COPY, 0, NULL, NULL); + break; + case MIID_PASTE: + IWebBrowser2_ExecWB(This->web_browser, OLECMDID_PASTE, 0, NULL, NULL); + break; + case MIID_CUT: + IWebBrowser2_ExecWB(This->web_browser, OLECMDID_CUT, 0, NULL, NULL); + break; + } + return S_OK; } @@ -248,7 +290,7 @@ return S_FALSE; } -static const IDocHostUIHandlerVtbl MyIDocHostUIHandlerTable = +static const IDocHostUIHandlerVtbl DocHostUIHandlerVtbl = { UI_QueryInterface, UI_AddRef, @@ -270,37 +312,37 @@ UI_FilterDataObject }; -static inline IOleClientSiteImpl *impl_from_IOleInPlaceSite(IOleInPlaceSite *iface) -{ - return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleInPlaceSite_iface); +static inline WebBrowserContainer *impl_from_IOleInPlaceSite(IOleInPlaceSite *iface) +{ + return CONTAINING_RECORD(iface, WebBrowserContainer, IOleInPlaceSite_iface); } static HRESULT STDMETHODCALLTYPE InPlace_QueryInterface(IOleInPlaceSite *iface, REFIID riid, LPVOID *ppvObj) { - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + WebBrowserContainer *This = impl_from_IOleInPlaceSite(iface); return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj); } static ULONG STDMETHODCALLTYPE InPlace_AddRef(IOleInPlaceSite *iface) { - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + WebBrowserContainer *This = impl_from_IOleInPlaceSite(iface); return IOleClientSite_AddRef(&This->IOleClientSite_iface); } static ULONG STDMETHODCALLTYPE InPlace_Release(IOleInPlaceSite *iface) { - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + WebBrowserContainer *This = impl_from_IOleInPlaceSite(iface); return IOleClientSite_Release(&This->IOleClientSite_iface); } static HRESULT STDMETHODCALLTYPE InPlace_GetWindow(IOleInPlaceSite *iface, HWND *lphwnd) { - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + WebBrowserContainer *This = impl_from_IOleInPlaceSite(iface); + *lphwnd = This->hwndWindow; - return S_OK; } @@ -326,7 +368,7 @@ static HRESULT STDMETHODCALLTYPE InPlace_GetWindowContext(IOleInPlaceSite *iface, LPOLEINPLACEFRAME *lplpFrame, LPOLEINPLACEUIWINDOW *lplpDoc, LPRECT lprcPosRect, LPRECT lprcClipRect, LPOLEINPLACEFRAMEINFO lpFrameInfo) { - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + WebBrowserContainer *This = impl_from_IOleInPlaceSite(iface); *lplpFrame = &This->IOleInPlaceFrame_iface; IOleInPlaceFrame_AddRef(&This->IOleInPlaceFrame_iface); @@ -368,10 +410,10 @@ static HRESULT STDMETHODCALLTYPE InPlace_OnPosRectChange(IOleInPlaceSite *iface, LPCRECT lprcPosRect) { - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); + WebBrowserContainer *This = impl_from_IOleInPlaceSite(iface); IOleInPlaceObject *inplace; - if (IOleObject_QueryInterface(This->pBrowserObject, &IID_IOleInPlaceObject, + if (IOleObject_QueryInterface(This->ole_obj, &IID_IOleInPlaceObject, (void **)&inplace) == S_OK) { IOleInPlaceObject_SetObjectRects(inplace, lprcPosRect, lprcPosRect); @@ -381,7 +423,7 @@ return S_OK; } -static const IOleInPlaceSiteVtbl MyIOleInPlaceSiteTable = +static const IOleInPlaceSiteVtbl OleInPlaceSiteVtbl = { InPlace_QueryInterface, InPlace_AddRef, @@ -400,37 +442,37 @@ InPlace_OnPosRectChange }; -static inline IOleClientSiteImpl *impl_from_IOleInPlaceFrame(IOleInPlaceFrame *iface) -{ - return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleInPlaceFrame_iface); +static inline WebBrowserContainer *impl_from_IOleInPlaceFrame(IOleInPlaceFrame *iface) +{ + return CONTAINING_RECORD(iface, WebBrowserContainer, IOleInPlaceFrame_iface); } static HRESULT STDMETHODCALLTYPE Frame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, LPVOID *ppvObj) { - IOleClientSiteImpl *This = impl_from_IOleInPlaceFrame(iface); + WebBrowserContainer *This = impl_from_IOleInPlaceFrame(iface); return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj); } static ULONG STDMETHODCALLTYPE Frame_AddRef(IOleInPlaceFrame *iface) { - IOleClientSiteImpl *This = impl_from_IOleInPlaceFrame(iface); + WebBrowserContainer *This = impl_from_IOleInPlaceFrame(iface); return IOleClientSite_AddRef(&This->IOleClientSite_iface); } static ULONG STDMETHODCALLTYPE Frame_Release(IOleInPlaceFrame *iface) { - IOleClientSiteImpl *This = impl_from_IOleInPlaceFrame(iface); + WebBrowserContainer *This = impl_from_IOleInPlaceFrame(iface); return IOleClientSite_Release(&This->IOleClientSite_iface); } static HRESULT STDMETHODCALLTYPE Frame_GetWindow(IOleInPlaceFrame *iface, HWND *lphwnd) { - IOleClientSiteImpl *This = impl_from_IOleInPlaceFrame(iface); + WebBrowserContainer *This = impl_from_IOleInPlaceFrame(iface); + *lphwnd = This->hwndWindow; - return S_OK; } @@ -489,7 +531,7 @@ return E_NOTIMPL; } -static const IOleInPlaceFrameVtbl MyIOleInPlaceFrameTable = +static const IOleInPlaceFrameVtbl OleInPlaceFrameVtbl = { Frame_QueryInterface, Frame_AddRef, @@ -624,97 +666,76 @@ BOOL InitWebBrowser(HHInfo *info, HWND hwndParent) { - IOleClientSiteImpl *iOleClientSiteImpl; + WebBrowserContainer *container; IOleInPlaceObject *inplace; - IOleObject *browserObject; - IWebBrowser2 *webBrowser2; HRESULT hr; RECT rc; - iOleClientSiteImpl = heap_alloc_zero(sizeof(IOleClientSiteImpl)); - if (!iOleClientSiteImpl) + container = heap_alloc_zero(sizeof(*container)); + if (!container) return FALSE; - iOleClientSiteImpl->ref = 1; - iOleClientSiteImpl->IOleClientSite_iface.lpVtbl = &MyIOleClientSiteTable; - iOleClientSiteImpl->IOleInPlaceSite_iface.lpVtbl = &MyIOleInPlaceSiteTable; - iOleClientSiteImpl->IOleInPlaceFrame_iface.lpVtbl = &MyIOleInPlaceFrameTable; - iOleClientSiteImpl->hwndWindow = hwndParent; - iOleClientSiteImpl->IDocHostUIHandler_iface.lpVtbl = &MyIDocHostUIHandlerTable; + container->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; + container->IOleInPlaceSite_iface.lpVtbl = &OleInPlaceSiteVtbl; + container->IOleInPlaceFrame_iface.lpVtbl = &OleInPlaceFrameVtbl; + container->IDocHostUIHandler_iface.lpVtbl = &DocHostUIHandlerVtbl; + container->ref = 1; + container->hwndWindow = hwndParent; + + info->web_browser = container; hr = OleCreate(&CLSID_WebBrowser, &IID_IOleObject, OLERENDER_DRAW, 0, - &iOleClientSiteImpl->IOleClientSite_iface, &MyIStorage, - (void **)&browserObject); - - info->client_site = &iOleClientSiteImpl->IOleClientSite_iface; - info->wb_object = browserObject; + &container->IOleClientSite_iface, &MyIStorage, + (void **)&container->ole_obj); if (FAILED(hr)) goto error; - /* make the browser object accessible to the IOleClientSite implementation */ - iOleClientSiteImpl->pBrowserObject = browserObject; - GetClientRect(hwndParent, &rc); - hr = OleSetContainedObject((struct IUnknown *)browserObject, TRUE); + hr = OleSetContainedObject((struct IUnknown *)container->ole_obj, TRUE); if (FAILED(hr)) goto error; - hr = IOleObject_DoVerb(browserObject, OLEIVERB_SHOW, NULL, - &iOleClientSiteImpl->IOleClientSite_iface, - -1, hwndParent, &rc); + hr = IOleObject_DoVerb(container->ole_obj, OLEIVERB_SHOW, NULL, + &container->IOleClientSite_iface, -1, hwndParent, &rc); if (FAILED(hr)) goto error; - hr = IOleObject_QueryInterface(browserObject, &IID_IOleInPlaceObject, (void**)&inplace); + hr = IOleObject_QueryInterface(container->ole_obj, &IID_IOleInPlaceObject, (void**)&inplace); if (FAILED(hr)) goto error; IOleInPlaceObject_SetObjectRects(inplace, &rc, &rc); IOleInPlaceObject_Release(inplace); - hr = IOleObject_QueryInterface(browserObject, &IID_IWebBrowser2, - (void **)&webBrowser2); + hr = IOleObject_QueryInterface(container->ole_obj, &IID_IWebBrowser2, (void **)&container->web_browser); if (SUCCEEDED(hr)) - { - info->web_browser = webBrowser2; return TRUE; - } error: ReleaseWebBrowser(info); - heap_free(iOleClientSiteImpl); - return FALSE; } void ReleaseWebBrowser(HHInfo *info) { + WebBrowserContainer *container = info->web_browser; HRESULT hres; - if (info->web_browser) - { - IWebBrowser2_Release(info->web_browser); - info->web_browser = NULL; - } - - if (info->client_site) - { - IOleClientSite_Release(info->client_site); - info->client_site = NULL; - } - - if(info->wb_object) { + if(!container) + return; + + if(container->ole_obj) { IOleInPlaceSite *inplace; - hres = IOleObject_QueryInterface(info->wb_object, &IID_IOleInPlaceSite, (void**)&inplace); + hres = IOleObject_QueryInterface(container->ole_obj, &IID_IOleInPlaceSite, (void**)&inplace); if(SUCCEEDED(hres)) { IOleInPlaceSite_OnInPlaceDeactivate(inplace); IOleInPlaceSite_Release(inplace); } - IOleObject_SetClientSite(info->wb_object, NULL); - - IOleObject_Release(info->wb_object); - info->wb_object = NULL; + IOleObject_SetClientSite(container->ole_obj, NULL); } + + info->web_browser = NULL; + IOleClientSite_Release(&container->IOleClientSite_iface); } void ResizeWebBrowser(HHInfo *info, DWORD dwWidth, DWORD dwHeight) @@ -722,39 +743,37 @@ if (!info->web_browser) return; - IWebBrowser2_put_Width(info->web_browser, dwWidth); - IWebBrowser2_put_Height(info->web_browser, dwHeight); -} - -void DoPageAction(HHInfo *info, DWORD dwAction) -{ - IWebBrowser2 *pWebBrowser2 = info->web_browser; - - if (!pWebBrowser2) + IWebBrowser2_put_Width(info->web_browser->web_browser, dwWidth); + IWebBrowser2_put_Height(info->web_browser->web_browser, dwHeight); +} + +void DoPageAction(WebBrowserContainer *container, DWORD dwAction) +{ + if (!container || !container->web_browser) return; switch (dwAction) { case WB_GOBACK: - IWebBrowser2_GoBack(pWebBrowser2); + IWebBrowser2_GoBack(container->web_browser); break; case WB_GOFORWARD: - IWebBrowser2_GoForward(pWebBrowser2); + IWebBrowser2_GoForward(container->web_browser); break; case WB_GOHOME: - IWebBrowser2_GoHome(pWebBrowser2); + IWebBrowser2_GoHome(container->web_browser); break; case WB_SEARCH: - IWebBrowser2_GoSearch(pWebBrowser2); + IWebBrowser2_GoSearch(container->web_browser); break; case WB_REFRESH: - IWebBrowser2_Refresh(pWebBrowser2); + IWebBrowser2_Refresh(container->web_browser); break; case WB_STOP: - IWebBrowser2_Stop(pWebBrowser2); + IWebBrowser2_Stop(container->web_browser); break; case WB_PRINT: - IWebBrowser2_ExecWB(pWebBrowser2, OLECMDID_PRINT, OLECMDEXECOPT_DONTPROMPTUSER, 0, 0); + IWebBrowser2_ExecWB(container->web_browser, OLECMDID_PRINT, OLECMDEXECOPT_DONTPROMPTUSER, 0, 0); break; } } 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 Jul 19 13:21:48 2015 @@ -71,7 +71,7 @@ reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47 reactos/dll/win32/fusion # Synced to WineStaging-1.7.47 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.37 -reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.37 +reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.47 reactos/dll/win32/hlink # Synced to WineStaging-1.7.37 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.37 reactos/dll/win32/httpapi # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68431: [PSDK] Update wincodecsdk.idl. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:18:47 2015 New Revision: 68431 URL: http://svn.reactos.org/svn/reactos?rev=68431&view=rev Log: [PSDK] Update wincodecsdk.idl. CORE-9924 Modified: trunk/reactos/include/psdk/wincodecsdk.idl Modified: trunk/reactos/include/psdk/wincodecsdk.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincodecsdk.i… ============================================================================== --- trunk/reactos/include/psdk/wincodecsdk.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincodecsdk.idl [iso-8859-1] Sun Jul 19 13:18:47 2015 @@ -37,6 +37,7 @@ } WICMetadataCreationOptions; cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunkgAMA, 0xf00935a5,0x1d5d,0x4cd1,0x81,0xb2,0x93,0x24,0xd7,0xec,0xa7,0x81);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktIME, 0x6b00ae2d,0xe24b,0x460a,0x98,0xb6,0x87,0x8b,0xd0,0x30,0x72,0xfd);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatIfd, 0x537396c6,0x2d8a,0x4bb6,0x9b,0xf8,0x2f,0x0a,0x8e,0x2a,0x3a,0xdf);") @@ -51,6 +52,7 @@ cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") +cpp_quote("DEFINE_GUID(CLSID_WICPngGamaMetadataReader, 0x3692ca39,0xe082,0x4350,0x9e,0x1f,0x37,0x04,0xcb,0x08,0x3c,0xd5);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);") cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataReader, 0x8f914656,0x9d0a,0x4eb2,0x90,0x19,0x0b,0xf9,0x6d,0x8a,0x9e,0xe6);")

9 years, 5 months

[akhaldi] 68430: [FUSION_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:17:08 2015 New Revision: 68430 URL: http://svn.reactos.org/svn/reactos?rev=68430&view=rev Log: [FUSION_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/fusion/asmname.c Modified: trunk/rostests/winetests/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmname.… ============================================================================== --- trunk/rostests/winetests/fusion/asmname.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmname.c [iso-8859-1] Sun Jul 19 13:17:08 2015 @@ -430,12 +430,12 @@ broken(hr == E_INVALIDARG), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); - size = MAX_PATH; - str[0] = '\0'; - hr = IAssemblyName_GetName(name, &size, str); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!str[0], "Expected empty name\n"); - ok(size == 0, "Expected 0, got %d\n", size); + str[0] = 'a'; + size = MAX_PATH; + hr = IAssemblyName_GetName(name, &size, str); + ok(hr == S_OK, "got %08x\n", hr); + ok(str[0] == 'a', "got %c\n", str[0]); + ok(!size, "got %u\n", size); hi = 0xbeefcace; lo = 0xcafebabe; @@ -466,6 +466,26 @@ broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); + size = 0; + hr = IAssemblyName_GetName(name, &size, NULL); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(size == 1, "got %u\n", size); + + if (0) /* crash */ + { + str[0] = '\0'; + hr = IAssemblyName_GetName(name, NULL, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + } + + size = 0; + str[0] = '\0'; + hr = IAssemblyName_GetName(name, &size, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + ok(size == 1, "got %u\n", size); + size = MAX_PATH; str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); @@ -497,11 +517,35 @@ ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(name != NULL, "Expected non-NULL name\n"); + size = 0; + hr = IAssemblyName_GetDisplayName(name, NULL, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(size == 5, "got %u\n", size); + + size = 3; + hr = IAssemblyName_GetDisplayName(name, NULL, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER || broken(hr == E_INVALIDARG), "got %08x\n", hr); + ok(size == 5 || broken(size == 3), "got %u\n", size); + + size = 3; + str[0] = 'a'; + hr = IAssemblyName_GetDisplayName(name, str, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(str[0] == 'a', "got %c\n", str[0]); + ok(size == 5, "got %u\n", size); + size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok_aw("wine", str); ok(size == 5, "Expected 5, got %d\n", size); + + size = 0; + str[0] = 0; + hr = IAssemblyName_GetName(name, &size, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + ok(size == 5, "got %u\n", size); size = MAX_PATH; str[0] = '\0';

9 years, 5 months

[akhaldi] 68429: [FUSION] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:16:45 2015 New Revision: 68429 URL: http://svn.reactos.org/svn/reactos?rev=68429&view=rev Log: [FUSION] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/fusion/asmcache.c trunk/reactos/dll/win32/fusion/asmenum.c trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmcache.… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] Sun Jul 19 13:16:45 2015 @@ -151,7 +151,7 @@ IsEqualIID(riid, &IID_IAssemblyCache)) { IAssemblyCache_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyCache_iface; return S_OK; } @@ -580,7 +580,7 @@ IsEqualIID(riid, &IID_IAssemblyCacheItem)) { IAssemblyCacheItem_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyCacheItem_iface; return S_OK; } Modified: trunk/reactos/dll/win32/fusion/asmenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmenum.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] Sun Jul 19 13:16:45 2015 @@ -55,7 +55,7 @@ IsEqualIID(riid, &IID_IAssemblyEnum)) { IAssemblyEnum_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyEnum_iface; return S_OK; } Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Sun Jul 19 13:16:45 2015 @@ -70,7 +70,7 @@ IsEqualIID(riid, &IID_IAssemblyName)) { IAssemblyName_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyName_iface; return S_OK; } @@ -213,12 +213,10 @@ LPDWORD pccDisplayName, DWORD dwDisplayFlags) { + static const WCHAR equals[] = {'=',0}; IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); - WCHAR verstr[30]; + WCHAR verstr[30], *cultureval = NULL; DWORD size; - LPWSTR cultureval = 0; - - static const WCHAR equals[] = {'=',0}; TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName, pccDisplayName, dwDisplayFlags); @@ -228,9 +226,15 @@ if (!name->displayname || !*name->displayname) return FUSION_E_INVALID_NAME; - size = min(*pccDisplayName, lstrlenW(name->displayname) + 1); - - lstrcpynW(szDisplayName, name->displayname, size); + size = strlenW(name->displayname) + 1; + + if (*pccDisplayName < size) + { + *pccDisplayName = size; + return E_NOT_SUFFICIENT_BUFFER; + } + + if (szDisplayName) strcpyW(szDisplayName, name->displayname); *pccDisplayName = size; return S_OK; @@ -354,19 +358,24 @@ WCHAR *pwzName) { IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); + DWORD len; TRACE("(%p, %p, %p)\n", iface, lpcwBuffer, pwzName); - if (!name->name) - { - *pwzName = '\0'; - *lpcwBuffer = 0; - return S_OK; - } - - lstrcpyW(pwzName, name->name); - *lpcwBuffer = lstrlenW(pwzName) + 1; - + if (name->name) + len = strlenW(name->name) + 1; + else + len = 0; + + if (*lpcwBuffer < len) + { + *lpcwBuffer = len; + return E_NOT_SUFFICIENT_BUFFER; + } + if (!name->name) lpcwBuffer[0] = 0; + else strcpyW(pwzName, name->name); + + *lpcwBuffer = len; return S_OK; } 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 Jul 19 13:16:45 2015 @@ -69,7 +69,7 @@ reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.37 reactos/dll/win32/faultrep # Synced to WineStaging-1.7.37 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47 -reactos/dll/win32/fusion # Synced to WineStaging-1.7.37 +reactos/dll/win32/fusion # Synced to WineStaging-1.7.47 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.37 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.37 reactos/dll/win32/hlink # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68428: [FLTLIB] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:14:56 2015 New Revision: 68428 URL: http://svn.reactos.org/svn/reactos?rev=68428&view=rev Log: [FLTLIB] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/fltlib/fltlib.c trunk/reactos/dll/win32/fltlib/fltlib.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/fltlib/fltlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/fltlib.c?… ============================================================================== --- trunk/reactos/dll/win32/fltlib/fltlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fltlib/fltlib.c [iso-8859-1] Sun Jul 19 13:14:56 2015 @@ -79,13 +79,22 @@ } /********************************************************************** + * FilterLoad (FLTLIB.@) + */ +HRESULT WINAPI FilterLoad(LPCWSTR filtername) +{ + FIXME("(%s) stub\n", debugstr_w(filtername)); + return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); +} + +/********************************************************************** * FilterUnload (FLTLIB.@) */ -HRESULT WINAPI FilterUnload(LPCWSTR lpFilterName) +HRESULT WINAPI FilterUnload(LPCWSTR filtername) { - FIXME("(%s) stub\n", debugstr_w(lpFilterName)); + FIXME("(%s) stub\n", debugstr_w(filtername)); - if (!lpFilterName) + if (!filtername) return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); return S_OK; Modified: trunk/reactos/dll/win32/fltlib/fltlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/fltlib.sp… ============================================================================== --- trunk/reactos/dll/win32/fltlib/fltlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fltlib/fltlib.spec [iso-8859-1] Sun Jul 19 13:14:56 2015 @@ -16,7 +16,7 @@ @ stub FilterInstanceFindFirst @ stub FilterInstanceFindNext @ stub FilterInstanceGetInformation -@ stub FilterLoad +@ stdcall FilterLoad(wstr) @ stub FilterReplyMessage @ stub FilterSendMessage @ stdcall FilterUnload(wstr) 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 Jul 19 13:14:56 2015 @@ -68,7 +68,7 @@ reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.37 reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.37 reactos/dll/win32/faultrep # Synced to WineStaging-1.7.37 -reactos/dll/win32/fltlib # Synced to WineStaging-1.7.37 +reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47 reactos/dll/win32/fusion # Synced to WineStaging-1.7.37 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.37 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68427: [CRYPT32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:14:09 2015 New Revision: 68427 URL: http://svn.reactos.org/svn/reactos?rev=68427&view=rev Log: [CRYPT32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/crypt32/cert.c trunk/rostests/winetests/crypt32/chain.c trunk/rostests/winetests/crypt32/encode.c Modified: trunk/rostests/winetests/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/cert.c?… ============================================================================== --- trunk/rostests/winetests/crypt32/cert.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/cert.c [iso-8859-1] Sun Jul 19 13:14:09 2015 @@ -2874,7 +2874,7 @@ oids[i]); HeapFree(GetProcessHeap(), 0, oids); } - numOIDs = size = 0xdeadbeef; + numOIDs = 0xdeadbeef; /* Oddly enough, this crashes when the number of contexts is not 1: ret = pCertGetValidUsages(2, contexts, &numOIDs, NULL, &size); * but setting size to 0 allows it to succeed: Modified: trunk/rostests/winetests/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/chain.c… ============================================================================== --- trunk/rostests/winetests/crypt32/chain.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/chain.c [iso-8859-1] Sun Jul 19 13:14:09 2015 @@ -4508,6 +4508,8 @@ ignoredInvalidDateBasePolicyCheck, &oct2007, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_BASE, NULL, + ignoredInvalidUsageBasePolicyCheck, &oct2007, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG | CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG; Modified: trunk/rostests/winetests/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/encode.… ============================================================================== --- trunk/rostests/winetests/crypt32/encode.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/encode.c [iso-8859-1] Sun Jul 19 13:14:09 2015 @@ -7884,6 +7884,288 @@ } } +static const BYTE rsaPrivKeyDer[] = { +0x30,0x82,0x04,0xa5,0x02,0x01,0x00,0x02,0x82,0x01,0x01,0x00, +0xae,0xba,0x3c,0x41,0xeb,0x25,0x41,0xb0,0x1c,0x41,0xd4,0x26, +0xf9,0xf8,0x31,0x64,0x7e,0x97,0x65,0x54,0x9c,0x90,0xdf,0x34, +0x07,0xfb,0xb0,0x69,0x99,0x3b,0x45,0x39,0x06,0xe4,0x3a,0x7a, +0x01,0xe0,0xeb,0x3f,0xe1,0xd5,0x91,0xe0,0x16,0xe0,0xf2,0x35, +0x59,0xdf,0x32,0x2d,0x69,0x3a,0x4a,0xbc,0xd1,0xba,0x1b,0x3b, +0x7a,0x55,0x76,0xba,0x11,0xdd,0x2f,0xc7,0x58,0x66,0xf2,0x6c, +0xd1,0x68,0x27,0x6c,0x85,0x74,0x0b,0xc9,0x7b,0x1a,0xde,0x3c, +0x62,0x73,0xe2,0x9e,0x36,0x3a,0x29,0x3b,0x91,0x85,0x3d,0xd2, +0xe1,0xe5,0x61,0x84,0x1e,0x28,0xfd,0xb7,0x97,0x68,0xc1,0xbb, +0x0f,0x93,0x14,0xc2,0x03,0x60,0x41,0x11,0x7a,0xda,0x76,0x01, +0x65,0x08,0xe6,0x0c,0xf6,0xfc,0x1d,0x64,0x12,0x7b,0x42,0xb0, +0xb8,0xfe,0x61,0xe5,0xe2,0xe5,0x61,0x44,0xcc,0x94,0xe8,0xc0, +0x4f,0x58,0x9a,0xea,0x99,0xaf,0x9c,0xa4,0xf2,0xd7,0x2b,0x31, +0x90,0x3b,0x41,0x2e,0x4a,0x74,0x7c,0x1a,0xfc,0x42,0xa9,0x17, +0xff,0x53,0x20,0x76,0xa7,0xf0,0x2c,0xb9,0xd5,0x1f,0xa9,0x8a, +0x77,0xa8,0x09,0x5c,0x0e,0xd1,0x54,0xc5,0xf2,0x86,0xf1,0x2f, +0x23,0xd6,0x63,0xba,0xe9,0x2b,0x73,0xf9,0xf0,0xdc,0xcb,0xf9, +0xcb,0xe8,0x40,0x62,0x47,0x09,0x85,0xe1,0x9c,0xfd,0xcf,0x75, +0x5a,0x65,0xfd,0x86,0x1c,0x50,0xfa,0x24,0x36,0x0f,0x54,0x5e, +0x81,0xe7,0xf6,0x63,0x2d,0x87,0x0c,0x50,0x03,0x25,0x49,0xe7, +0xc5,0x20,0xaa,0xbc,0x6c,0xf9,0xbe,0x49,0x8f,0x4f,0xb8,0x9a, +0x73,0x9f,0x55,0x43,0x02,0x03,0x01,0x00,0x01,0x02,0x82,0x01, +0x01,0x00,0x99,0x03,0xcd,0x5b,0x69,0x03,0x32,0x98,0x78,0xd6, +0x89,0x65,0x2c,0xc9,0xd6,0xef,0x8c,0x11,0x27,0x93,0x46,0x9d, +0x74,0x6a,0xcb,0x86,0xf6,0x02,0x34,0x47,0xfc,0xa2,0x29,0x4f, +0xdb,0x8a,0x17,0x75,0x12,0x6f,0xda,0x65,0x3f,0x1f,0xc0,0xc9, +0x74,0x33,0x96,0xa5,0xe8,0xfa,0x6d,0xc9,0xb7,0xc3,0xcd,0xe3, +0x2e,0x90,0x12,0xdd,0x1f,0x61,0x69,0xdd,0x8b,0x47,0x07,0x3a, +0xf8,0x98,0xa5,0x76,0x91,0xf7,0xee,0x93,0x26,0xf3,0x66,0x54, +0xac,0x44,0xb3,0x6f,0x8b,0x09,0x44,0xb2,0x00,0x84,0x03,0x37, +0x6d,0x61,0xed,0xa4,0x04,0x97,0x40,0x16,0x63,0xc2,0xd0,0xdc, +0xd3,0xb3,0xee,0xba,0xbe,0x95,0xfd,0x80,0xe0,0xda,0xde,0xfc, +0xcc,0x15,0x02,0x97,0x1d,0x68,0x43,0x2f,0x9c,0xc8,0x20,0x23, +0xeb,0x00,0x4c,0x74,0x3d,0x27,0x20,0x14,0x23,0x95,0xfc,0x8c, +0xb7,0x7e,0x7f,0xb0,0xdb,0xaf,0x8a,0x48,0x1b,0xfe,0x59,0xab, +0x75,0xe2,0xbf,0x69,0xf2,0x73,0xe3,0xb9,0x92,0xa9,0x90,0x03, +0xe5,0xd4,0x2d,0x86,0xff,0x12,0x54,0xb3,0xbb,0xe2,0xce,0x81, +0x58,0x71,0xa4,0xde,0x45,0x05,0xf8,0x2d,0x45,0xf5,0xd8,0x5e, +0x4c,0x5d,0x06,0x69,0x0c,0x86,0x9f,0x66,0x9f,0xb1,0x60,0xfd, +0xf2,0x33,0x85,0x15,0xd5,0x18,0xf7,0xba,0x99,0x65,0x15,0x1d, +0xfa,0xaa,0x76,0xdd,0x25,0xed,0xdf,0x90,0x6e,0xba,0x61,0x96, +0x79,0xde,0xd2,0xda,0x66,0x03,0x74,0x3b,0x13,0x39,0x68,0xbc, +0x94,0x01,0x00,0x2d,0xf8,0xf0,0x8c,0xbd,0x4c,0x9c,0x7e,0x87, +0x9c,0x62,0x9f,0xb6,0x90,0x11,0x02,0x81,0x81,0x00,0xe3,0x5e, +0xfe,0xdd,0xed,0x76,0xb6,0x4e,0xfc,0x5b,0xe0,0x20,0x99,0x7b, +0x48,0x3b,0x1e,0x5f,0x7f,0x9f,0xa4,0x68,0xbe,0xc3,0x7f,0xb8, +0x62,0x98,0xb0,0x95,0x8a,0xfa,0x0d,0xa3,0x79,0x63,0x39,0xf7, +0xdb,0x76,0x3d,0x53,0x4a,0x0a,0x33,0xdf,0xe0,0x47,0x22,0xd5, +0x96,0x80,0xc7,0xcd,0x24,0xef,0xac,0x49,0x46,0x37,0x6c,0x25, +0xcf,0x6c,0x4d,0xe5,0x31,0xf8,0x2f,0xd2,0x59,0x74,0x00,0x38, +0xdb,0xce,0xd1,0x72,0xc3,0xa8,0x30,0x70,0xd8,0x02,0x20,0xe7, +0x56,0xe7,0xca,0xf0,0x3b,0x52,0x5d,0x11,0xbe,0x53,0x4e,0xd0, +0xd9,0x2e,0xa6,0xb8,0xe2,0xd9,0xbf,0xb9,0x77,0xe7,0x3b,0xed, +0x5e,0xd7,0x16,0x4a,0x3a,0xc5,0x86,0xd7,0x74,0x20,0xa7,0x8e, +0xbf,0xb7,0x33,0xdb,0x51,0xe9,0x02,0x81,0x81,0x00,0xc4,0xba, +0x57,0xf0,0x6e,0xcf,0xe8,0xce,0xce,0x9d,0x4a,0xe9,0x0f,0xe1, +0xab,0x91,0x62,0xaa,0x66,0x5d,0x82,0x66,0x1c,0x72,0x18,0x6f, +0x68,0x9c,0x7d,0x5e,0xfc,0xaf,0x4a,0xd6,0x8e,0xc6,0xae,0x40, +0xf2,0x40,0x84,0x93,0xee,0x7c,0x87,0xa9,0xa6,0xcd,0x2b,0xc3, +0xe6,0x29,0x3a,0xe2,0x4a,0xed,0xb0,0x4d,0x9f,0xc0,0xe9,0xd6, +0xa3,0xca,0x97,0xee,0xac,0xab,0xa4,0x32,0x05,0x40,0x4d,0xf2, +0x95,0x99,0xaf,0xa0,0xe1,0xe1,0xe7,0x3a,0x64,0xa4,0x70,0x6b, +0x3d,0x1d,0x7b,0xf1,0x53,0xfa,0xb0,0xe0,0xe2,0x68,0x1a,0x61, +0x2c,0x37,0xa5,0x39,0x7b,0xb2,0xcf,0xe6,0x5f,0x9b,0xc6,0x64, +0xaf,0x48,0x86,0xfb,0xc1,0xf3,0x39,0x97,0x10,0x36,0xf5,0xa9, +0x3d,0x08,0xa5,0x2f,0xe6,0x4b,0x02,0x81,0x81,0x00,0x86,0xe7, +0x02,0x08,0xe2,0xaf,0xa0,0x93,0x54,0x9f,0x9e,0x67,0x39,0x29, +0x30,0x3e,0x03,0x53,0x5e,0x01,0x76,0x26,0xbf,0xa8,0x76,0xcb, +0x0b,0x94,0xd4,0x90,0xa5,0x98,0x9f,0x26,0xf3,0x0a,0xb0,0x86, +0x22,0xac,0x10,0xce,0xae,0x0b,0x47,0xa3,0xf9,0x09,0xbb,0xdd, +0x46,0x22,0xba,0x69,0x39,0x15,0x0a,0xff,0x9e,0xad,0x9b,0x79, +0x03,0x8c,0x9a,0xda,0xf5,0xbe,0xef,0x80,0xba,0x9a,0x5c,0xd7, +0x5f,0x73,0x62,0x49,0xd9,0x54,0x9d,0x09,0x16,0xe0,0x8c,0x6d, +0x35,0xde,0xe9,0x45,0x87,0xac,0xe2,0x93,0x78,0x7d,0x2d,0x32, +0x34,0xe9,0xbc,0xf9,0xcd,0x7e,0xac,0x86,0x7a,0x61,0xb3,0xe8, +0xae,0x70,0xa7,0x44,0xfb,0x81,0xde,0xf3,0x4e,0x6f,0x61,0x7b, +0x0c,0xbc,0xc2,0x03,0xca,0xa1,0x02,0x81,0x80,0x69,0x5b,0x4a, +0xa1,0x4f,0x17,0x35,0x9d,0x1b,0xf6,0x0d,0x1a,0x48,0x11,0x19, +0xab,0x20,0xe6,0x15,0x30,0x5b,0x17,0x88,0x80,0x6a,0x29,0xb0, +0x22,0xae,0xd9,0xe2,0x05,0x96,0xd4,0xd5,0x5d,0xfe,0x10,0x76, +0x2c,0xab,0x53,0xf6,0x52,0xe6,0xec,0xaa,0x92,0x12,0xb0,0x35, +0x61,0x3b,0x51,0xd9,0xc2,0xf5,0xba,0x7c,0xa5,0xfa,0x15,0xa3, +0x5e,0x6a,0x83,0xbe,0x21,0xa6,0x2b,0xcb,0xb8,0x26,0x86,0x96, +0x2b,0xda,0x6d,0x14,0xcb,0xc0,0xe3,0xfa,0xe6,0x3d,0xf6,0x90, +0xa2,0x6b,0xb0,0x50,0xc3,0x5f,0x5a,0xf0,0xa5,0xc4,0x0a,0xea, +0x7d,0x5a,0x95,0x30,0x74,0x10,0xf7,0x55,0x98,0xbd,0x65,0x4a, +0xa2,0x52,0xf8,0x1d,0x64,0xbf,0x20,0xf1,0xe4,0x1d,0x28,0x67, +0xb1,0x6b,0x95,0xfd,0x85,0x02,0x81,0x81,0x00,0xda,0xb4,0x31, +0x34,0xe1,0xec,0x9a,0x1e,0x07,0xd7,0xda,0x20,0x46,0xbf,0x6b, +0xf0,0x45,0xbd,0x50,0xa2,0x0f,0x8a,0x14,0x51,0x52,0x83,0x7c, +0x47,0xc8,0x9c,0x4e,0x68,0x6b,0xae,0x00,0x25,0x63,0xdd,0x13, +0x2a,0x66,0x65,0xb6,0x74,0x91,0x5b,0xb6,0x47,0x3e,0x8e,0x46, +0x62,0xcd,0x9d,0xc1,0xf7,0x14,0x14,0xbc,0x60,0xd6,0x3c,0x7c, +0x3a,0xce,0xff,0x96,0x04,0x84,0xf6,0x44,0x1a,0xf8,0xdb,0x40, +0x1c,0xf2,0xf1,0x4d,0xb2,0x68,0x3e,0xa3,0x0b,0xc6,0xb1,0xd0, +0xa6,0x88,0x18,0x68,0xa1,0x05,0x2a,0xfc,0x2b,0x3a,0xa1,0xe6, +0x31,0x4a,0x46,0x88,0x39,0x1e,0x44,0x11,0x6c,0xc5,0x8b,0xb6, +0x8b,0xce,0x3d,0xd5,0xcb,0xbd,0xf0,0xd4,0xd9,0xfb,0x02,0x35, +0x96,0x39,0x26,0x85,0xf9 }; +static const BYTE rsaPrivKeyModulus[] = { +0x43,0x55,0x9f,0x73,0x9a,0xb8,0x4f,0x8f,0x49,0xbe,0xf9,0x6c, +0xbc,0xaa,0x20,0xc5,0xe7,0x49,0x25,0x03,0x50,0x0c,0x87,0x2d, +0x63,0xf6,0xe7,0x81,0x5e,0x54,0x0f,0x36,0x24,0xfa,0x50,0x1c, +0x86,0xfd,0x65,0x5a,0x75,0xcf,0xfd,0x9c,0xe1,0x85,0x09,0x47, +0x62,0x40,0xe8,0xcb,0xf9,0xcb,0xdc,0xf0,0xf9,0x73,0x2b,0xe9, +0xba,0x63,0xd6,0x23,0x2f,0xf1,0x86,0xf2,0xc5,0x54,0xd1,0x0e, +0x5c,0x09,0xa8,0x77,0x8a,0xa9,0x1f,0xd5,0xb9,0x2c,0xf0,0xa7, +0x76,0x20,0x53,0xff,0x17,0xa9,0x42,0xfc,0x1a,0x7c,0x74,0x4a, +0x2e,0x41,0x3b,0x90,0x31,0x2b,0xd7,0xf2,0xa4,0x9c,0xaf,0x99, +0xea,0x9a,0x58,0x4f,0xc0,0xe8,0x94,0xcc,0x44,0x61,0xe5,0xe2, +0xe5,0x61,0xfe,0xb8,0xb0,0x42,0x7b,0x12,0x64,0x1d,0xfc,0xf6, +0x0c,0xe6,0x08,0x65,0x01,0x76,0xda,0x7a,0x11,0x41,0x60,0x03, +0xc2,0x14,0x93,0x0f,0xbb,0xc1,0x68,0x97,0xb7,0xfd,0x28,0x1e, +0x84,0x61,0xe5,0xe1,0xd2,0x3d,0x85,0x91,0x3b,0x29,0x3a,0x36, +0x9e,0xe2,0x73,0x62,0x3c,0xde,0x1a,0x7b,0xc9,0x0b,0x74,0x85, +0x6c,0x27,0x68,0xd1,0x6c,0xf2,0x66,0x58,0xc7,0x2f,0xdd,0x11, +0xba,0x76,0x55,0x7a,0x3b,0x1b,0xba,0xd1,0xbc,0x4a,0x3a,0x69, +0x2d,0x32,0xdf,0x59,0x35,0xf2,0xe0,0x16,0xe0,0x91,0xd5,0xe1, +0x3f,0xeb,0xe0,0x01,0x7a,0x3a,0xe4,0x06,0x39,0x45,0x3b,0x99, +0x69,0xb0,0xfb,0x07,0x34,0xdf,0x90,0x9c,0x54,0x65,0x97,0x7e, +0x64,0x31,0xf8,0xf9,0x26,0xd4,0x41,0x1c,0xb0,0x41,0x25,0xeb, +0x41,0x3c,0xba,0xae }; +static const BYTE rsaPrivKeyPrime1[] = { +0xe9,0x51,0xdb,0x33,0xb7,0xbf,0x8e,0xa7,0x20,0x74,0xd7,0x86, +0xc5,0x3a,0x4a,0x16,0xd7,0x5e,0xed,0x3b,0xe7,0x77,0xb9,0xbf, +0xd9,0xe2,0xb8,0xa6,0x2e,0xd9,0xd0,0x4e,0x53,0xbe,0x11,0x5d, +0x52,0x3b,0xf0,0xca,0xe7,0x56,0xe7,0x20,0x02,0xd8,0x70,0x30, +0xa8,0xc3,0x72,0xd1,0xce,0xdb,0x38,0x00,0x74,0x59,0xd2,0x2f, +0xf8,0x31,0xe5,0x4d,0x6c,0xcf,0x25,0x6c,0x37,0x46,0x49,0xac, +0xef,0x24,0xcd,0xc7,0x80,0x96,0xd5,0x22,0x47,0xe0,0xdf,0x33, +0x0a,0x4a,0x53,0x3d,0x76,0xdb,0xf7,0x39,0x63,0x79,0xa3,0x0d, +0xfa,0x8a,0x95,0xb0,0x98,0x62,0xb8,0x7f,0xc3,0xbe,0x68,0xa4, +0x9f,0x7f,0x5f,0x1e,0x3b,0x48,0x7b,0x99,0x20,0xe0,0x5b,0xfc, +0x4e,0xb6,0x76,0xed,0xdd,0xfe,0x5e,0xe3 }; +static const BYTE rsaPrivKeyPrime2[] = { +0x4b,0xe6,0x2f,0xa5,0x08,0x3d,0xa9,0xf5,0x36,0x10,0x97,0x39, +0xf3,0xc1,0xfb,0x86,0x48,0xaf,0x64,0xc6,0x9b,0x5f,0xe6,0xcf, +0xb2,0x7b,0x39,0xa5,0x37,0x2c,0x61,0x1a,0x68,0xe2,0xe0,0xb0, +0xfa,0x53,0xf1,0x7b,0x1d,0x3d,0x6b,0x70,0xa4,0x64,0x3a,0xe7, +0xe1,0xe1,0xa0,0xaf,0x99,0x95,0xf2,0x4d,0x40,0x05,0x32,0xa4, +0xab,0xac,0xee,0x97,0xca,0xa3,0xd6,0xe9,0xc0,0x9f,0x4d,0xb0, +0xed,0x4a,0xe2,0x3a,0x29,0xe6,0xc3,0x2b,0xcd,0xa6,0xa9,0x87, +0x7c,0xee,0x93,0x84,0x40,0xf2,0x40,0xae,0xc6,0x8e,0xd6,0x4a, +0xaf,0xfc,0x5e,0x7d,0x9c,0x68,0x6f,0x18,0x72,0x1c,0x66,0x82, +0x5d,0x66,0xaa,0x62,0x91,0xab,0xe1,0x0f,0xe9,0x4a,0x9d,0xce, +0xce,0xe8,0xcf,0x6e,0xf0,0x57,0xba,0xc4 }; +static const BYTE rsaPrivKeyExponent1[] = { +0xa1,0xca,0x03,0xc2,0xbc,0x0c,0x7b,0x61,0x6f,0x4e,0xf3,0xde, +0x81,0xfb,0x44,0xa7,0x70,0xae,0xe8,0xb3,0x61,0x7a,0x86,0xac, +0x7e,0xcd,0xf9,0xbc,0xe9,0x34,0x32,0x2d,0x7d,0x78,0x93,0xe2, +0xac,0x87,0x45,0xe9,0xde,0x35,0x6d,0x8c,0xe0,0x16,0x09,0x9d, +0x54,0xd9,0x49,0x62,0x73,0x5f,0xd7,0x5c,0x9a,0xba,0x80,0xef, +0xbe,0xf5,0xda,0x9a,0x8c,0x03,0x79,0x9b,0xad,0x9e,0xff,0x0a, +0x15,0x39,0x69,0xba,0x22,0x46,0xdd,0xbb,0x09,0xf9,0xa3,0x47, +0x0b,0xae,0xce,0x10,0xac,0x22,0x86,0xb0,0x0a,0xf3,0x26,0x9f, +0x98,0xa5,0x90,0xd4,0x94,0x0b,0xcb,0x76,0xa8,0xbf,0x26,0x76, +0x01,0x5e,0x53,0x03,0x3e,0x30,0x29,0x39,0x67,0x9e,0x9f,0x54, +0x93,0xa0,0xaf,0xe2,0x08,0x02,0xe7,0x86 }; +static const BYTE rsaPrivKeyExponent2[] = { +0x85,0xfd,0x95,0x6b,0xb1,0x67,0x28,0x1d,0xe4,0xf1,0x20,0xbf, +0x64,0x1d,0xf8,0x52,0xa2,0x4a,0x65,0xbd,0x98,0x55,0xf7,0x10, +0x74,0x30,0x95,0x5a,0x7d,0xea,0x0a,0xc4,0xa5,0xf0,0x5a,0x5f, +0xc3,0x50,0xb0,0x6b,0xa2,0x90,0xf6,0x3d,0xe6,0xfa,0xe3,0xc0, +0xcb,0x14,0x6d,0xda,0x2b,0x96,0x86,0x26,0xb8,0xcb,0x2b,0xa6, +0x21,0xbe,0x83,0x6a,0x5e,0xa3,0x15,0xfa,0xa5,0x7c,0xba,0xf5, +0xc2,0xd9,0x51,0x3b,0x61,0x35,0xb0,0x12,0x92,0xaa,0xec,0xe6, +0x52,0xf6,0x53,0xab,0x2c,0x76,0x10,0xfe,0x5d,0xd5,0xd4,0x96, +0x05,0xe2,0xd9,0xae,0x22,0xb0,0x29,0x6a,0x80,0x88,0x17,0x5b, +0x30,0x15,0xe6,0x20,0xab,0x19,0x11,0x48,0x1a,0x0d,0xf6,0x1b, +0x9d,0x35,0x17,0x4f,0xa1,0x4a,0x5b,0x69 }; +static const BYTE rsaPrivKeyCoefficient[] = { +0xf9,0x85,0x26,0x39,0x96,0x35,0x02,0xfb,0xd9,0xd4,0xf0,0xbd, +0xcb,0xd5,0x3d,0xce,0x8b,0xb6,0x8b,0xc5,0x6c,0x11,0x44,0x1e, +0x39,0x88,0x46,0x4a,0x31,0xe6,0xa1,0x3a,0x2b,0xfc,0x2a,0x05, +0xa1,0x68,0x18,0x88,0xa6,0xd0,0xb1,0xc6,0x0b,0xa3,0x3e,0x68, +0xb2,0x4d,0xf1,0xf2,0x1c,0x40,0xdb,0xf8,0x1a,0x44,0xf6,0x84, +0x04,0x96,0xff,0xce,0x3a,0x7c,0x3c,0xd6,0x60,0xbc,0x14,0x14, +0xf7,0xc1,0x9d,0xcd,0x62,0x46,0x8e,0x3e,0x47,0xb6,0x5b,0x91, +0x74,0xb6,0x65,0x66,0x2a,0x13,0xdd,0x63,0x25,0x00,0xae,0x6b, +0x68,0x4e,0x9c,0xc8,0x47,0x7c,0x83,0x52,0x51,0x14,0x8a,0x0f, +0xa2,0x50,0xbd,0x45,0xf0,0x6b,0xbf,0x46,0x20,0xda,0xd7,0x07, +0x1e,0x9a,0xec,0xe1,0x34,0x31,0xb4,0xda }; +static const BYTE rsaPrivKeyPrivateExponent[] = { +0x11,0x90,0xb6,0x9f,0x62,0x9c,0x87,0x7e,0x9c,0x4c,0xbd,0x8c, +0xf0,0xf8,0x2d,0x00,0x01,0x94,0xbc,0x68,0x39,0x13,0x3b,0x74, +0x03,0x66,0xda,0xd2,0xde,0x79,0x96,0x61,0xba,0x6e,0x90,0xdf, +0xed,0x25,0xdd,0x76,0xaa,0xfa,0x1d,0x15,0x65,0x99,0xba,0xf7, +0x18,0xd5,0x15,0x85,0x33,0xf2,0xfd,0x60,0xb1,0x9f,0x66,0x9f, +0x86,0x0c,0x69,0x06,0x5d,0x4c,0x5e,0xd8,0xf5,0x45,0x2d,0xf8, +0x05,0x45,0xde,0xa4,0x71,0x58,0x81,0xce,0xe2,0xbb,0xb3,0x54, +0x12,0xff,0x86,0x2d,0xd4,0xe5,0x03,0x90,0xa9,0x92,0xb9,0xe3, +0x73,0xf2,0x69,0xbf,0xe2,0x75,0xab,0x59,0xfe,0x1b,0x48,0x8a, +0xaf,0xdb,0xb0,0x7f,0x7e,0xb7,0x8c,0xfc,0x95,0x23,0x14,0x20, +0x27,0x3d,0x74,0x4c,0x00,0xeb,0x23,0x20,0xc8,0x9c,0x2f,0x43, +0x68,0x1d,0x97,0x02,0x15,0xcc,0xfc,0xde,0xda,0xe0,0x80,0xfd, +0x95,0xbe,0xba,0xee,0xb3,0xd3,0xdc,0xd0,0xc2,0x63,0x16,0x40, +0x97,0x04,0xa4,0xed,0x61,0x6d,0x37,0x03,0x84,0x00,0xb2,0x44, +0x09,0x8b,0x6f,0xb3,0x44,0xac,0x54,0x66,0xf3,0x26,0x93,0xee, +0xf7,0x91,0x76,0xa5,0x98,0xf8,0x3a,0x07,0x47,0x8b,0xdd,0x69, +0x61,0x1f,0xdd,0x12,0x90,0x2e,0xe3,0xcd,0xc3,0xb7,0xc9,0x6d, +0xfa,0xe8,0xa5,0x96,0x33,0x74,0xc9,0xc0,0x1f,0x3f,0x65,0xda, +0x6f,0x12,0x75,0x17,0x8a,0xdb,0x4f,0x29,0xa2,0xfc,0x47,0x34, +0x02,0xf6,0x86,0xcb,0x6a,0x74,0x9d,0x46,0x93,0x27,0x11,0x8c, +0xef,0xd6,0xc9,0x2c,0x65,0x89,0xd6,0x78,0x98,0x32,0x03,0x69, +0x5b,0xcd,0x03,0x99 }; + +static void test_decodeRsaPrivateKey(DWORD dwEncoding) +{ + LPBYTE buf = NULL; + DWORD bufSize = 0; + BOOL ret; + + ret = pCryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, + rsaPrivKeyDer, sizeof(rsaPrivKeyDer)-10, + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD), + "Expected CRYPT_E_ASN1_EOD, got %08x\n", + GetLastError()); + + buf = NULL; + bufSize = 0; + ret = pCryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, + rsaPrivKeyDer, sizeof(rsaPrivKeyDer), + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + + if (ret) + { + BLOBHEADER *hdr = (BLOBHEADER *)buf; + RSAPUBKEY *rsaPubKey = (RSAPUBKEY *)(buf + sizeof(BLOBHEADER)); + static const int bitlen = 2048; + BYTE *modulus = (BYTE*)(rsaPubKey + 1); + BYTE *prime1 = modulus + bitlen/8; + BYTE *prime2 = prime1 + bitlen/16; + BYTE *exponent1 = prime2 + bitlen/16; + BYTE *exponent2 = exponent1 + bitlen/16; + BYTE *coefficient = exponent2 + bitlen/16; + BYTE *privateExponent = coefficient + bitlen/16; + + ok(bufSize >= sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + (bitlen * 9 / 16), + "Wrong size %d\n", bufSize); + + ok(hdr->bType == PRIVATEKEYBLOB, + "Expected type PRIVATEKEYBLOB (%d), got %d\n", PRIVATEKEYBLOB, + hdr->bType); + ok(hdr->bVersion == CUR_BLOB_VERSION, + "Expected version CUR_BLOB_VERSION (%d), got %d\n", + CUR_BLOB_VERSION, hdr->bVersion); + ok(hdr->reserved == 0, "Expected reserved 0, got %d\n", + hdr->reserved); + ok(hdr->aiKeyAlg == CALG_RSA_KEYX, + "Expected CALG_RSA_KEYX, got %08x\n", hdr->aiKeyAlg); + + ok(rsaPubKey->magic == 0x32415352, + "Expected magic 0x32415352, got 0x%x\n", rsaPubKey->magic); + ok(rsaPubKey->bitlen == bitlen, + "Expected bitlen %d, got %d\n", bitlen, rsaPubKey->bitlen); + ok(rsaPubKey->pubexp == 65537, + "Expected pubexp 65537, got %d\n", rsaPubKey->pubexp); + + ok(!memcmp(modulus, rsaPrivKeyModulus, bitlen/8), + "unexpected modulus\n"); + ok(!memcmp(prime1, rsaPrivKeyPrime1, bitlen/16), + "unexpected prime1\n"); + ok(!memcmp(prime2, rsaPrivKeyPrime2, bitlen/16), + "unexpected prime2\n"); + ok(!memcmp(exponent1, rsaPrivKeyExponent1, bitlen/16), + "unexpected exponent1\n"); + ok(!memcmp(exponent2, rsaPrivKeyExponent2, bitlen/16), + "unexpected exponent2\n"); + ok(!memcmp(coefficient, rsaPrivKeyCoefficient, bitlen/16), + "unexpected coefficient\n"); + ok(!memcmp(privateExponent, rsaPrivKeyPrivateExponent, bitlen/8), + "unexpected privateExponent\n"); + + LocalFree(buf); + } +} + /* Free *pInfo with HeapFree */ static void testExportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO *pInfo) { @@ -8160,6 +8442,7 @@ test_decodeCertPolicyMappings(encodings[i]); test_encodeCertPolicyConstraints(encodings[i]); test_decodeCertPolicyConstraints(encodings[i]); + test_decodeRsaPrivateKey(encodings[i]); } testPortPublicKeyInfo(); }

9 years, 5 months

[akhaldi] 68426: [CRYPT32] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:13:36 2015 New Revision: 68426 URL: http://svn.reactos.org/svn/reactos?rev=68426&view=rev Log: [CRYPT32] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/decode.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] Sun Jul 19 13:13:36 2015 @@ -459,7 +459,7 @@ void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) DECLSPEC_HIDDEN; -extern WINECRYPT_CERTSTORE empty_store; +extern WINECRYPT_CERTSTORE empty_store DECLSPEC_HIDDEN; void init_empty_store(void) DECLSPEC_HIDDEN; /** Modified: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/decode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/decode.c [iso-8859-1] Sun Jul 19 13:13:36 2015 @@ -3919,6 +3919,147 @@ return ret; } +#define RSA2_MAGIC 0x32415352 + +struct DECODED_RSA_PRIV_KEY +{ + DWORD version; + DWORD pubexp; + CRYPT_INTEGER_BLOB modulus; + CRYPT_INTEGER_BLOB privexp; + CRYPT_INTEGER_BLOB prime1; + CRYPT_INTEGER_BLOB prime2; + CRYPT_INTEGER_BLOB exponent1; + CRYPT_INTEGER_BLOB exponent2; + CRYPT_INTEGER_BLOB coefficient; +}; + +static BOOL WINAPI CRYPT_AsnDecodeRsaPrivKey(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + DWORD halflen; + + __TRY + { + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, version), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, modulus), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, modulus.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, pubexp), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, privexp), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, privexp.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, prime1), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, prime1.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, prime2), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, prime2.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, exponent1), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, exponent1.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, exponent2), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, exponent2.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, coefficient), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, coefficient.pbData), + 0 }, + }; + struct DECODED_RSA_PRIV_KEY *decodedKey = NULL; + DWORD size = 0; + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &decodedKey, + &size, NULL, NULL); + if (ret) + { + halflen = decodedKey->modulus.cbData / 2; + if ((decodedKey->modulus.cbData != halflen * 2) || + (decodedKey->prime1.cbData != halflen) || + (decodedKey->prime2.cbData != halflen) || + (decodedKey->exponent1.cbData != halflen) || + (decodedKey->exponent2.cbData != halflen) || + (decodedKey->coefficient.cbData != halflen) || + (decodedKey->privexp.cbData != halflen * 2)) + { + ret = FALSE; + SetLastError(CRYPT_E_BAD_ENCODE); + } + + if (ret) + { + DWORD bytesNeeded = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + (halflen * 9); + + if (!pvStructInfo) + { + *pcbStructInfo = bytesNeeded; + ret = TRUE; + } + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) + { + BLOBHEADER *hdr; + RSAPUBKEY *rsaPubKey; + BYTE *vardata; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + + hdr = pvStructInfo; + hdr->bType = PRIVATEKEYBLOB; + hdr->bVersion = CUR_BLOB_VERSION; + hdr->reserved = 0; + hdr->aiKeyAlg = CALG_RSA_KEYX; + + rsaPubKey = (RSAPUBKEY *)((BYTE *)pvStructInfo + + sizeof(BLOBHEADER)); + rsaPubKey->magic = RSA2_MAGIC; + rsaPubKey->pubexp = decodedKey->pubexp; + rsaPubKey->bitlen = halflen * 16; + + vardata = (BYTE*)(rsaPubKey + 1); + memcpy(vardata, + decodedKey->modulus.pbData, halflen * 2); + memcpy(vardata + halflen * 2, + decodedKey->prime1.pbData, halflen); + memcpy(vardata + halflen * 3, + decodedKey->prime2.pbData, halflen); + memcpy(vardata + halflen * 4, + decodedKey->exponent1.pbData, halflen); + memcpy(vardata + halflen * 5, + decodedKey->exponent2.pbData, halflen); + memcpy(vardata + halflen * 6, + decodedKey->coefficient.pbData, halflen); + memcpy(vardata + halflen * 7, + decodedKey->privexp.pbData, halflen * 2); + } + } + + LocalFree(decodedKey); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static BOOL CRYPT_AsnDecodeOctetsInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5485,6 +5626,9 @@ offsetof(CMSG_CMS_SIGNER_INFO, AuthAttrs), CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), TRUE, TRUE, offsetof(CMSG_CMS_SIGNER_INFO, AuthAttrs.rgAttr), 0 }, + /* FIXME: Tests show that CertOpenStore accepts such certificates, but + * how exactly should they be interpreted? */ + { ASN_CONSTRUCTOR | ASN_UNIVERSAL | 0x11, 0, NULL, 0, TRUE, FALSE, 0, 0 }, { ASN_SEQUENCEOF, offsetof(CMSG_CMS_SIGNER_INFO, HashEncryptionAlgorithm), CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), FALSE, TRUE, offsetof(CMSG_CMS_SIGNER_INFO, @@ -5599,8 +5743,8 @@ offsetof(CRYPT_SIGNED_INFO, rgSignerInfo), 0 }, }; - TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, - pDecodePara, signedInfo, *pcbSignedInfo); + TRACE("%p, %d, %08x, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, signedInfo, pcbSignedInfo); ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, signedInfo, pcbSignedInfo, @@ -5717,8 +5861,8 @@ offsetof(CRYPT_ENVELOPED_DATA, encryptedContentInfo.contentType), 0 }, }; - TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, - pDecodePara, envelopedData, *pcbEnvelopedData); + TRACE("%p, %d, %08x, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, envelopedData, pcbEnvelopedData); ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, envelopedData, @@ -5780,6 +5924,9 @@ break; case LOWORD(RSA_CSP_PUBLICKEYBLOB): decodeFunc = CRYPT_AsnDecodeRsaPubKey; + break; + case LOWORD(PKCS_RSA_PRIVATE_KEY): + decodeFunc = CRYPT_AsnDecodeRsaPrivKey; break; case LOWORD(X509_UNICODE_NAME): decodeFunc = CRYPT_AsnDecodeUnicodeName; 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 Jul 19 13:13:36 2015 @@ -59,7 +59,7 @@ reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.37 reactos/dll/win32/compstui # Synced to WineStaging-1.7.37 reactos/dll/win32/credui # Synced to WineStaging-1.7.37 -reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.47 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68425: [AVIFIL32] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:10:52 2015 New Revision: 68425 URL: http://svn.reactos.org/svn/reactos?rev=68425&view=rev Log: [AVIFIL32] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/avifil32/acmstream.c trunk/reactos/dll/win32/avifil32/icmstream.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/acmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/acmstream.c [iso-8859-1] Sun Jul 19 13:10:52 2015 @@ -127,7 +127,7 @@ if (IsEqualGUID(&IID_IUnknown, refiid) || IsEqualGUID(&IID_IAVIStream, refiid)) { - *obj = This; + *obj = &This->IAVIStream_iface; IAVIStream_AddRef(iface); return S_OK; Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] Sun Jul 19 13:10:52 2015 @@ -82,7 +82,7 @@ if (IsEqualGUID(&IID_IUnknown, refiid) || IsEqualGUID(&IID_IAVIStream, refiid)) { - *obj = This; + *obj = &This->IAVIStream_iface; IAVIStream_AddRef(iface); return S_OK; 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 Jul 19 13:10:52 2015 @@ -49,7 +49,7 @@ reactos/dll/win32/atl # Synced to WineStaging-1.7.47 reactos/dll/win32/atl80 # Synced to WineStaging-1.7.47 reactos/dll/win32/atl100 # Synced to WineStaging-1.7.47 -reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.47 reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.37 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-1.7.37

9 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015