Jacek Caban : ieframe: Moved classes registration to ieframe.
Alexandre Julliard
julliard at winehq.org
Mon Aug 1 13:22:08 CDT 2011
Module: wine
Branch: master
Commit: 908d8333a8f03ae3c143dc613696791815571aaf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=908d8333a8f03ae3c143dc613696791815571aaf
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sun Jul 31 13:24:23 2011 +0200
ieframe: Moved classes registration to ieframe.
---
dlls/ieframe/Makefile.in | 1 +
dlls/ieframe/ieframe.rc | 3 ++
dlls/{shdocvw/shdocvw.rgs => ieframe/ieframe.rgs} | 2 +-
dlls/ieframe/ieframe_main.c | 9 +++---
dlls/ieframe/ieframe_v1.idl | 30 +++++++++++++++++++++
dlls/shdocvw/Makefile.in | 1 -
dlls/shdocvw/factory.c | 5 +--
dlls/shdocvw/shdocvw.rc | 3 --
dlls/shdocvw/shdocvw_v1.idl | 30 ---------------------
tools/wine.inf.in | 1 +
10 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in
index 7d730e6..7aec229 100644
--- a/dlls/ieframe/Makefile.in
+++ b/dlls/ieframe/Makefile.in
@@ -48,5 +48,6 @@ SVG_SRCS = \
ietoolbar.svg
IDL_TLB_SRCS = ieframe_v1.idl
+IDL_R_SRCS = ieframe_v1.idl
@MAKE_DLL_RULES@
diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc
index 58f6fb7..13b6a5f 100644
--- a/dlls/ieframe/ieframe.rc
+++ b/dlls/ieframe/ieframe.rc
@@ -90,3 +90,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* @makedep: ietoolbar.bmp */
IDB_IETOOLBAR BITMAP ietoolbar.bmp
+
+/* @makedep: ieframe.rgs */
+2 WINE_REGISTRY ieframe.rgs
diff --git a/dlls/shdocvw/shdocvw.rgs b/dlls/ieframe/ieframe.rgs
similarity index 96%
rename from dlls/shdocvw/shdocvw.rgs
rename to dlls/ieframe/ieframe.rgs
index 8f8bc53..f40dbd1 100644
--- a/dlls/shdocvw/shdocvw.rgs
+++ b/dlls/ieframe/ieframe.rgs
@@ -48,7 +48,7 @@ HKCR
{
open
{
- command = s 'rundll32.exe shdocvw.dll,OpenURL %%l'
+ command = s 'rundll32.exe ieframe.dll,OpenURL %%l'
}
print
{
diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c
index 4f4aaf8..bf6ac02 100644
--- a/dlls/ieframe/ieframe_main.c
+++ b/dlls/ieframe/ieframe_main.c
@@ -18,6 +18,7 @@
#include "ieframe.h"
+#include "rpcproxy.h"
#include "shlguid.h"
#include "isguids.h"
@@ -277,8 +278,8 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
- FIXME("()\n");
- return S_OK;
+ TRACE("()\n");
+ return __wine_register_resources(ieframe_instance, NULL);
}
/***********************************************************************
@@ -286,6 +287,6 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
- FIXME("()\n");
- return S_OK;
+ TRACE("()\n");
+ return __wine_unregister_resources(ieframe_instance, NULL);
}
diff --git a/dlls/ieframe/ieframe_v1.idl b/dlls/ieframe/ieframe_v1.idl
index 45b9111..f4f7954 100644
--- a/dlls/ieframe/ieframe_v1.idl
+++ b/dlls/ieframe/ieframe_v1.idl
@@ -17,3 +17,33 @@
*/
#include "exdisp.idl"
+
+[
+ threading(apartment),
+ uuid(871c5380-42a0-1069-a2ea-08002b30309d)
+] coclass Internet { }
+
+[
+ helpstring("Microsoft Url History Service"),
+ threading(apartment),
+ uuid(3c374a40-bae4-11cf-bf7d-00aa006946ee)
+] coclass CUrlHistory { interface IUrlHistoryStg2; }
+
+[
+ helpstring("Task Bar Communication"),
+ threading(apartment),
+ uuid(56fdf344-fd6d-11d0-958a-006097c9a090)
+] coclass TaskbarList { interface ITaskbarList; }
+
+[
+ helpstring("Internet Shortcut"),
+ threading(apartment),
+ progid("InternetShortcut"),
+ uuid(fbf23b40-e3f0-101b-8488-00aa003e56f8)
+] coclass InternetShortcut
+{
+ interface IUniformResourceLocatorA;
+ interface IUniformResourceLocatorW;
+ interface IPersistFile;
+ interface IPropertySetStorage;
+}
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in
index d7f160e..0a44a60 100644
--- a/dlls/shdocvw/Makefile.in
+++ b/dlls/shdocvw/Makefile.in
@@ -13,6 +13,5 @@ RC_SRCS = \
shdocvw.rc
IDL_TLB_SRCS = shdocvw_v1.idl
-IDL_R_SRCS = shdocvw_v1.idl
@MAKE_DLL_RULES@
diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c
index ce6ddb9..246b852 100644
--- a/dlls/shdocvw/factory.c
+++ b/dlls/shdocvw/factory.c
@@ -23,7 +23,6 @@
#include "shdocvw.h"
#include "winreg.h"
-#include "rpcproxy.h"
#include "isguids.h"
#include "winver.h"
@@ -79,7 +78,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
HRESULT WINAPI DllRegisterServer(void)
{
TRACE("\n");
- return __wine_register_resources( shdocvw_hinstance, NULL );
+ return S_OK;
}
/***********************************************************************
@@ -88,7 +87,7 @@ HRESULT WINAPI DllRegisterServer(void)
HRESULT WINAPI DllUnregisterServer(void)
{
TRACE("\n");
- return __wine_unregister_resources( shdocvw_hinstance, NULL );
+ return S_OK;
}
/******************************************************************
diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc
index 555eabd..0c7dd7a 100644
--- a/dlls/shdocvw/shdocvw.rc
+++ b/dlls/shdocvw/shdocvw.rc
@@ -32,6 +32,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* @makedep: shdocvw_v1.tlb */
1 TYPELIB shdocvw_v1.tlb
-
-/* @makedep: shdocvw.rgs */
-2 WINE_REGISTRY shdocvw.rgs
diff --git a/dlls/shdocvw/shdocvw_v1.idl b/dlls/shdocvw/shdocvw_v1.idl
index ad6b72b..45b9111 100644
--- a/dlls/shdocvw/shdocvw_v1.idl
+++ b/dlls/shdocvw/shdocvw_v1.idl
@@ -17,33 +17,3 @@
*/
#include "exdisp.idl"
-
-[
- threading(apartment),
- uuid(871c5380-42a0-1069-a2ea-08002b30309d)
-] coclass Internet { }
-
-[
- helpstring("Microsoft Url History Service"),
- threading(apartment),
- uuid(3c374a40-bae4-11cf-bf7d-00aa006946ee)
-] coclass CUrlHistory { interface IUrlHistoryStg2; }
-
-[
- helpstring("Task Bar Communication"),
- threading(apartment),
- uuid(56fdf344-fd6d-11d0-958a-006097c9a090)
-] coclass TaskbarList { interface ITaskbarList; }
-
-[
- helpstring("Internet Shortcut"),
- threading(apartment),
- progid("InternetShortcut"),
- uuid(fbf23b40-e3f0-101b-8488-00aa003e56f8)
-] coclass InternetShortcut
-{
- interface IUniformResourceLocatorA;
- interface IUniformResourceLocatorW;
- interface IPersistFile;
- interface IPropertySetStorage;
-}
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index 69124be..47c5824 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -2527,6 +2527,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,hhctrl.ocx,1
11,,hlink.dll,1
11,,hnetcfg.dll,1
+11,,ieframe.dll,1
11,,inetcomm.dll,1
11,,infosoft.dll,1
11,,inseng.dll,1
More information about the wine-cvs
mailing list