Module: wine Branch: master Commit: 932cc2678c15d9297ae899e699e6d3e41aaeb752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=932cc2678c15d9297ae899e699...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Jul 27 14:45:34 2011 +0200
ieframe: Moved dialog resources to ieframe.
---
dlls/{shdocvw => ieframe}/De.rc | 0 dlls/{shdocvw => ieframe}/En.rc | 0 dlls/{shdocvw => ieframe}/Es.rc | 0 dlls/{shdocvw => ieframe}/Fr.rc | 0 dlls/{shdocvw => ieframe}/He.rc | 0 dlls/{shdocvw => ieframe}/It.rc | 0 dlls/{shdocvw => ieframe}/Ja.rc | 0 dlls/{shdocvw => ieframe}/Ko.rc | 0 dlls/{shdocvw => ieframe}/Lt.rc | 0 dlls/ieframe/Makefile.in | 18 ++++++++++++++++++ dlls/{shdocvw => ieframe}/Nl.rc | 0 dlls/{shdocvw => ieframe}/Pl.rc | 0 dlls/{shdocvw => ieframe}/Pt.rc | 0 dlls/{shdocvw => ieframe}/Ro.rc | 0 dlls/{shdocvw => ieframe}/Ru.rc | 0 dlls/{shdocvw => ieframe}/Si.rc | 0 dlls/{shdocvw => ieframe}/Sr.rc | 0 dlls/{shdocvw => ieframe}/Sv.rc | 0 dlls/{shdocvw => ieframe}/Uk.rc | 0 dlls/{shdocvw/En.rc => ieframe/resource.h} | 20 ++++++-------------- dlls/shdocvw/Makefile.in | 18 ------------------ dlls/shdocvw/iexplore.c | 2 +- 22 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/dlls/shdocvw/De.rc b/dlls/ieframe/De.rc similarity index 100% rename from dlls/shdocvw/De.rc rename to dlls/ieframe/De.rc diff --git a/dlls/shdocvw/En.rc b/dlls/ieframe/En.rc similarity index 100% copy from dlls/shdocvw/En.rc copy to dlls/ieframe/En.rc diff --git a/dlls/shdocvw/Es.rc b/dlls/ieframe/Es.rc similarity index 100% rename from dlls/shdocvw/Es.rc rename to dlls/ieframe/Es.rc diff --git a/dlls/shdocvw/Fr.rc b/dlls/ieframe/Fr.rc similarity index 100% rename from dlls/shdocvw/Fr.rc rename to dlls/ieframe/Fr.rc diff --git a/dlls/shdocvw/He.rc b/dlls/ieframe/He.rc similarity index 100% rename from dlls/shdocvw/He.rc rename to dlls/ieframe/He.rc diff --git a/dlls/shdocvw/It.rc b/dlls/ieframe/It.rc similarity index 100% rename from dlls/shdocvw/It.rc rename to dlls/ieframe/It.rc diff --git a/dlls/shdocvw/Ja.rc b/dlls/ieframe/Ja.rc similarity index 100% rename from dlls/shdocvw/Ja.rc rename to dlls/ieframe/Ja.rc diff --git a/dlls/shdocvw/Ko.rc b/dlls/ieframe/Ko.rc similarity index 100% rename from dlls/shdocvw/Ko.rc rename to dlls/ieframe/Ko.rc diff --git a/dlls/shdocvw/Lt.rc b/dlls/ieframe/Lt.rc similarity index 100% rename from dlls/shdocvw/Lt.rc rename to dlls/ieframe/Lt.rc diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 4e2f58a..3a0f688 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -9,6 +9,24 @@ C_SRCS = \ urlhist.c
RC_SRCS = \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + He.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sr.rc \ + Sv.rc \ + Uk.rc \ ieframe.rc
@MAKE_DLL_RULES@ diff --git a/dlls/shdocvw/Nl.rc b/dlls/ieframe/Nl.rc similarity index 100% rename from dlls/shdocvw/Nl.rc rename to dlls/ieframe/Nl.rc diff --git a/dlls/shdocvw/Pl.rc b/dlls/ieframe/Pl.rc similarity index 100% rename from dlls/shdocvw/Pl.rc rename to dlls/ieframe/Pl.rc diff --git a/dlls/shdocvw/Pt.rc b/dlls/ieframe/Pt.rc similarity index 100% rename from dlls/shdocvw/Pt.rc rename to dlls/ieframe/Pt.rc diff --git a/dlls/shdocvw/Ro.rc b/dlls/ieframe/Ro.rc similarity index 100% rename from dlls/shdocvw/Ro.rc rename to dlls/ieframe/Ro.rc diff --git a/dlls/shdocvw/Ru.rc b/dlls/ieframe/Ru.rc similarity index 100% rename from dlls/shdocvw/Ru.rc rename to dlls/ieframe/Ru.rc diff --git a/dlls/shdocvw/Si.rc b/dlls/ieframe/Si.rc similarity index 100% rename from dlls/shdocvw/Si.rc rename to dlls/ieframe/Si.rc diff --git a/dlls/shdocvw/Sr.rc b/dlls/ieframe/Sr.rc similarity index 100% rename from dlls/shdocvw/Sr.rc rename to dlls/ieframe/Sr.rc diff --git a/dlls/shdocvw/Sv.rc b/dlls/ieframe/Sv.rc similarity index 100% rename from dlls/shdocvw/Sv.rc rename to dlls/ieframe/Sv.rc diff --git a/dlls/shdocvw/Uk.rc b/dlls/ieframe/Uk.rc similarity index 100% rename from dlls/shdocvw/Uk.rc rename to dlls/ieframe/Uk.rc diff --git a/dlls/shdocvw/En.rc b/dlls/ieframe/resource.h similarity index 64% rename from dlls/shdocvw/En.rc rename to dlls/ieframe/resource.h index e685b15..ba82f52 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/ieframe/resource.h @@ -1,4 +1,6 @@ /* + * Resource identifiers for ieframe.dll + * * Copyright 2010 Alexander N. Sørnes alex@thehandofagony.com * * This library is free software; you can redistribute it and/or @@ -16,18 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "resource.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +#include <windef.h> +#include <winuser.h>
-IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 -STYLE DS_MODALFRAME | WS_CAPTION -CAPTION "Open URL" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Specify the URL you wish to open in Internet Explorer",-1,25, 5, 150,15 - LTEXT "Open:", -1, 2, 32, 20, 15 - EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 - DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 85, 50, 50, 15 -} +#define IDD_BROWSE_OPEN 1001 +#define IDC_BROWSE_OPEN_URL 1002 diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index b3c3156..41a8a76 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -23,24 +23,6 @@ C_SRCS = \ webbrowser.c
RC_SRCS = \ - De.rc \ - En.rc \ - Es.rc \ - Fr.rc \ - He.rc \ - It.rc \ - Ja.rc \ - Ko.rc \ - Lt.rc \ - Nl.rc \ - Pl.rc \ - Pt.rc \ - Ro.rc \ - Ru.rc \ - Si.rc \ - Sr.rc \ - Sv.rc \ - Uk.rc \ shdocvw.rc
PO_SRCS = shdocvw.rc diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 0ad1e89..815b7d1 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -566,7 +566,7 @@ static LRESULT iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPAR switch(LOWORD(wparam)) { case ID_BROWSE_OPEN: - DialogBoxParamW(shdocvw_hinstance, MAKEINTRESOURCEW(IDD_BROWSE_OPEN), hwnd, ie_dialog_open_proc, (LPARAM)This); + DialogBoxParamW(get_ieframe_instance(), MAKEINTRESOURCEW(IDD_BROWSE_OPEN), hwnd, ie_dialog_open_proc, (LPARAM)This); break;
case ID_BROWSE_PRINT: