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.c... ============================================================================== --- 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/hhctrl... ============================================================================== --- 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/hhctrl... ============================================================================== --- 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/C... ============================================================================== --- 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/D... ============================================================================== --- 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/D... ============================================================================== --- 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/E... ============================================================================== --- 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/E... ============================================================================== --- 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/E... ============================================================================== --- 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/F... ============================================================================== --- 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/F... ============================================================================== --- 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/H... ============================================================================== --- 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/H... ============================================================================== --- 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/I... ============================================================================== --- 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/J... ============================================================================== --- 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/K... ============================================================================== --- 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/L... ============================================================================== --- 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/N... ============================================================================== --- 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/N... ============================================================================== --- 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/P... ============================================================================== --- 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/P... ============================================================================== --- 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/R... ============================================================================== --- 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/R... ============================================================================== --- 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/S... ============================================================================== --- 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/S... ============================================================================== --- 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/S... ============================================================================== --- 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/T... ============================================================================== --- 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/U... ============================================================================== --- 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/Z... ============================================================================== --- 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/resour... ============================================================================== --- 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/webbro... ============================================================================== --- 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=6... ============================================================================== --- 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
-
akhaldi＠svn.reactos.org