From 932cc2678c15d9297ae899e699e6d3e41aaeb752 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Wed, 27 Jul 2011 14:45:34 +0200
Subject: [PATCH] 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/ieframe/resource.h         | 25 +++++++++++++++++++++++++
 dlls/shdocvw/Makefile.in        | 18 ------------------
 dlls/shdocvw/iexplore.c         |  2 +-
 22 files changed, 44 insertions(+), 19 deletions(-)
 rename dlls/{shdocvw => ieframe}/De.rc (100%)
 rename dlls/{shdocvw => ieframe}/En.rc (100%)
 rename dlls/{shdocvw => ieframe}/Es.rc (100%)
 rename dlls/{shdocvw => ieframe}/Fr.rc (100%)
 rename dlls/{shdocvw => ieframe}/He.rc (100%)
 rename dlls/{shdocvw => ieframe}/It.rc (100%)
 rename dlls/{shdocvw => ieframe}/Ja.rc (100%)
 rename dlls/{shdocvw => ieframe}/Ko.rc (100%)
 rename dlls/{shdocvw => ieframe}/Lt.rc (100%)
 rename dlls/{shdocvw => ieframe}/Nl.rc (100%)
 rename dlls/{shdocvw => ieframe}/Pl.rc (100%)
 rename dlls/{shdocvw => ieframe}/Pt.rc (100%)
 rename dlls/{shdocvw => ieframe}/Ro.rc (100%)
 rename dlls/{shdocvw => ieframe}/Ru.rc (100%)
 rename dlls/{shdocvw => ieframe}/Si.rc (100%)
 rename dlls/{shdocvw => ieframe}/Sr.rc (100%)
 rename dlls/{shdocvw => ieframe}/Sv.rc (100%)
 rename dlls/{shdocvw => ieframe}/Uk.rc (100%)
 create mode 100644 dlls/ieframe/resource.h

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%
rename from dlls/shdocvw/En.rc
rename 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 4e2f58a82f5..3a0f6888dd0 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/ieframe/resource.h b/dlls/ieframe/resource.h
new file mode 100644
index 00000000000..ba82f52e0fe
--- /dev/null
+++ b/dlls/ieframe/resource.h
@@ -0,0 +1,25 @@
+/*
+ * 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
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windef.h>
+#include <winuser.h>
+
+#define IDD_BROWSE_OPEN                1001
+#define IDC_BROWSE_OPEN_URL            1002
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in
index b3c3156d7e3..41a8a76e8f7 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 0ad1e894353..815b7d1f2b5 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:
-- 
GitLab