wine/dlls/atl atl_main.c atliface.idl

[Alexandre Julliard]

ChangeSet ID:	21628
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/12/02 07:15:33

Modified files:
    dlls/atl       : atl_main.c atliface.idl

Log message:
    Francois Gouget 
    Fix the AtlAxWinInit() prototype.
    Also make it return FALSE to indicate failure instead of E_FAIL.
    Define AtlAxWinInit() and AtlAxCreateControl() in atliface.idl.

Patch: http://cvs.winehq.org/patch.py?id=21628

Old revision  New revision  Changes     Path
 1.17          1.18          +2 -2       wine/dlls/atl/atl_main.c
 1.1           1.2           +3 -0       wine/dlls/atl/atliface.idl

Index: wine/dlls/atl/atl_main.c
diff -u -p wine/dlls/atl/atl_main.c:1.17 wine/dlls/atl/atl_main.c:1.18
--- wine/dlls/atl/atl_main.c:1.17	2 Dec 2005 13:15:33 -0000
+++ wine/dlls/atl/atl_main.c	2 Dec 2005 13:15:33 -0000
@@ -174,10 +174,10 @@ HRESULT WINAPI AtlModuleUnregisterServer
  *  TRUE or FALSE
  */

-HRESULT WINAPI AtlAxWinInit(void)
+BOOL WINAPI AtlAxWinInit(void)
 {
     FIXME("Try use native atl.dll if possible\n");
-    return E_FAIL;
+    return FALSE;
 }

Index: wine/dlls/atl/atliface.idl
diff -u -p wine/dlls/atl/atliface.idl:1.1 wine/dlls/atl/atliface.idl:1.2
--- wine/dlls/atl/atliface.idl:1.1	2 Dec 2005 13:15:33 -0000
+++ wine/dlls/atl/atliface.idl	2 Dec 2005 13:15:33 -0000
@@ -69,3 +69,6 @@ interface IRegistrar : IUnknown
 }

cpp_quote("DEFINE_GUID(CLSID_ATLRegistrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3);")
+
+cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);")
+cpp_quote("BOOL WINAPI AtlAxWinInit(void);")