ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ieframe: Moved classes registration to ieframe.

This commit is contained in:
Jacek Caban 2011-07-31 13:24:23 +02:00 committed by Alexandre Julliard
parent 60f65e331f
commit 908d8333a8
10 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/ieframe/Makefile.in
View File

@ -48,5 +48,6 @@ SVG_SRCS = \
ietoolbar.svg
IDL_TLB_SRCS = ieframe_v1.idl
IDL_R_SRCS = ieframe_v1.idl
@MAKE_DLL_RULES@

3
dlls/ieframe/ieframe.rc
View File

@ -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

2
dlls/shdocvw/shdocvw.rgs → dlls/ieframe/ieframe.rgs
View File

@ -48,7 +48,7 @@ HKCR
{
open
{
command = s 'rundll32.exe shdocvw.dll,OpenURL %%l'
command = s 'rundll32.exe ieframe.dll,OpenURL %%l'
}
print
{

9
dlls/ieframe/ieframe_main.c
View File

@ -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);
}

30
dlls/ieframe/ieframe_v1.idl
View File

@ -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;
}

1
dlls/shdocvw/Makefile.in
View File

@ -13,6 +13,5 @@ RC_SRCS = \
shdocvw.rc
IDL_TLB_SRCS = shdocvw_v1.idl
IDL_R_SRCS = shdocvw_v1.idl
@MAKE_DLL_RULES@

5
dlls/shdocvw/factory.c
View File

@ -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;
}
/******************************************************************

3
dlls/shdocvw/shdocvw.rc
View File

@ -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

30
dlls/shdocvw/shdocvw_v1.idl
View File

@ -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;
}

1
tools/wine.inf.in
View File

@ -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