Module: wine Branch: master Commit: 19c2b0bb6acb0c1ddd816da13be947874a58a659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c2b0bb6acb0c1ddd816da13b...
Author: Andrey Turkin pancha@mail.nnov.ru Date: Sat Nov 11 00:06:10 2006 +0300
atl: Fix incorrect prototypes.
---
dlls/atl/atl_main.c | 14 +++++++------- dlls/atl/atlbase.h | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 547a5cf..e1cc058 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -55,7 +55,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,
#define ATLVer1Size 100
-HRESULT WINAPI AtlModuleInit(_ATL_MODULEA* pM, _ATL_OBJMAP_ENTRYA* p, HINSTANCE h) +HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h) { INT i; UINT size; @@ -63,7 +63,7 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULE FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h);
size = pM->cbSize; - if (size != sizeof(_ATL_MODULEA) && size != ATLVer1Size) + if (size != sizeof(_ATL_MODULEW) && size != ATLVer1Size) { FIXME("Unknown structure version (size %i)\n",size); return E_INVALIDARG; @@ -97,14 +97,14 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULE return S_OK; }
-HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEA *pM, LPCOLESTR lpszIndex, +HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib) { FIXME("(%p, %s, %p, %p): stub\n", pM, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); return E_FAIL; }
-HRESULT WINAPI AtlModuleTerm(_ATL_MODULEA* pM) +HRESULT WINAPI AtlModuleTerm(_ATL_MODULEW* pM) { _ATL_TERMFUNC_ELEM *iter = pM->m_pTermFuncs, *tmp;
@@ -138,7 +138,7 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL return S_OK; }
-HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEA *pM, DWORD dwClsContext, +HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContext, DWORD dwFlags) { HRESULT hRes = S_OK; @@ -152,7 +152,7 @@ HRESULT WINAPI AtlModuleRegisterClassObj while(pM->m_pObjMap[i].pclsid != NULL) { IUnknown* pUnknown; - _ATL_OBJMAP_ENTRYA *obj = &(pM->m_pObjMap[i]); + _ATL_OBJMAP_ENTRYW *obj = &(pM->m_pObjMap[i]); HRESULT rc;
TRACE("Registering object %i\n",i); @@ -174,7 +174,7 @@ HRESULT WINAPI AtlModuleRegisterClassObj return hRes; }
-HRESULT WINAPI AtlModuleUnregisterServerEx(_ATL_MODULEA* pM, BOOL bUnRegTypeLib, const CLSID* pCLSID) +HRESULT WINAPI AtlModuleUnregisterServerEx(_ATL_MODULEW* pM, BOOL bUnRegTypeLib, const CLSID* pCLSID) { FIXME("(%p, %i, %p) stub\n", pM, bUnRegTypeLib, pCLSID); return S_OK; diff --git a/dlls/atl/atlbase.h b/dlls/atl/atlbase.h index c0a556f..809a89f 100644 --- a/dlls/atl/atlbase.h +++ b/dlls/atl/atlbase.h @@ -151,13 +151,13 @@ HRESULT WINAPI AtlMarshalPtrInProc(IUnkn void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, LPVOID pvObject); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); LPVOID WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM); -HRESULT WINAPI AtlModuleInit(_ATL_MODULEA* pM, _ATL_OBJMAP_ENTRYA* p, HINSTANCE h); -HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEA* pM, DWORD dwClsContext, DWORD dwFlags); +HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); +HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW* pM, DWORD dwClsContext, DWORD dwFlags); HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const CLSID* pCLSID); HRESULT WINAPI AtlModuleUnregisterServer(_ATL_MODULEW* pM, const CLSID* pCLSID); HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW *pM, LPCOLESTR lpszRes, BOOL bRegister, struct _ATL_REGMAP_ENTRY *pMapEntries, IRegistrar *pReg ); -HRESULT WINAPI AtlModuleUnregisterServerEx(_ATL_MODULEA* pM, BOOL bUnRegTypeLib, const CLSID* pCLSID); -HRESULT WINAPI AtlModuleTerm(_ATL_MODULEA* pM); +HRESULT WINAPI AtlModuleUnregisterServerEx(_ATL_MODULEW* pM, BOOL bUnRegTypeLib, const CLSID* pCLSID); +HRESULT WINAPI AtlModuleTerm(_ATL_MODULEW* pM); HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID * iid, DWORD dw); HRESULT WINAPI AtlUnmarshalPtr(IStream *pStream, const IID *iid, IUnknown **ppUnk);