diff --git a/dlls/amstream/amstream.spec b/dlls/amstream/amstream.spec index 575f4cd6bf70b01a0c993208078d98f58d3da0a9..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/amstream/amstream.spec +++ b/dlls/amstream/amstream.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() AMSTREAM_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) AMSTREAM_DllGetClassObject -@ stdcall -private DllRegisterServer() AMSTREAM_DllRegisterServer -@ stdcall -private DllUnregisterServer() AMSTREAM_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 9b69d7806db84e9dd8d09740f89cced876c1f334..7546ed1657b8713ecccc25b8b6e94d5140867aa5 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -167,7 +167,7 @@ static const IClassFactoryVtbl DSCF_Vtbl = * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, * E_UNEXPECTED */ -HRESULT WINAPI AMSTREAM_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { int i; IClassFactoryImpl *factory; @@ -205,7 +205,7 @@ HRESULT WINAPI AMSTREAM_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * /*********************************************************************** * DllCanUnloadNow (AMSTREAM.@) */ -HRESULT WINAPI AMSTREAM_DllCanUnloadNow() +HRESULT WINAPI DllCanUnloadNow(void) { return dll_ref != 0 ? S_FALSE : S_OK; } diff --git a/dlls/amstream/regsvr.c b/dlls/amstream/regsvr.c index dfa8ff058780f7a61e90c3288d1ce93318167805..99e70af909f3939601426168e6d7edac1b83f86f 100644 --- a/dlls/amstream/regsvr.c +++ b/dlls/amstream/regsvr.c @@ -526,7 +526,7 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (AMSTREAM.@) */ -HRESULT WINAPI AMSTREAM_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -541,7 +541,7 @@ HRESULT WINAPI AMSTREAM_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (AMSTREAM.@) */ -HRESULT WINAPI AMSTREAM_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index e33804b671e38a4413a3b2c4c3f24a838cd188e8..d0966c1f70dc9df5afa1573171d023a01a0569e4 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -1,7 +1,7 @@ -1 stdcall -private DllCanUnloadNow() ATL_DllCanUnloadNow -2 stdcall -private DllGetClassObject(ptr ptr ptr) ATL_DllGetClassObject -3 stdcall -private DllRegisterServer() ATL_DllRegisterServer -4 stdcall -private DllUnregisterServer() ATL_DllUnregisterServer +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetClassObject(ptr ptr ptr) +3 stdcall -private DllRegisterServer() +4 stdcall -private DllUnregisterServer() 10 stdcall AtlAdvise(ptr ptr ptr ptr) 11 stdcall AtlUnadvise(ptr ptr long) 12 stdcall AtlFreeMarshalStream(ptr) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 924d4210e2b12dd6ac23b0acc9cf4d3256b9de26..91f127e41a60b0a953271e57f69bf2fb7c4ed2a7 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -739,7 +739,7 @@ static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; /************************************************************** * DllGetClassObject implementation */ -HRESULT WINAPI ATL_DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) { TRACE("(%s %s %p)", debugstr_guid(clsid), debugstr_guid(riid), ppvObject); @@ -820,7 +820,7 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR /*********************************************************************** * DllRegisterServer (ATL.@) */ -HRESULT WINAPI ATL_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { TRACE("\n"); return do_register_server(TRUE); @@ -829,7 +829,7 @@ HRESULT WINAPI ATL_DllRegisterServer(void) /*********************************************************************** * DllRegisterServer (ATL.@) */ -HRESULT WINAPI ATL_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { TRACE("\n"); return do_register_server(FALSE); @@ -838,7 +838,7 @@ HRESULT WINAPI ATL_DllUnregisterServer(void) /*********************************************************************** * DllCanUnloadNow (ATL.@) */ -HRESULT WINAPI ATL_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { TRACE("dll_count = %lu\n", dll_count); return dll_count ? S_FALSE : S_OK; diff --git a/dlls/avifil32/avifil32.spec b/dlls/avifil32/avifil32.spec index aecc2ce9317dddcc5c49a6e41ea00b1f57b9bc4f..9eae7495fc957d02752a758aca0e617cd1b5b687 100644 --- a/dlls/avifil32/avifil32.spec +++ b/dlls/avifil32/avifil32.spec @@ -59,10 +59,10 @@ @ stdcall AVIStreamWriteData(ptr long ptr long) @ extern CLSID_AVISimpleUnMarshal @ stdcall CreateEditableStream(ptr ptr) -@ stdcall -private DllCanUnloadNow() AVIFILE_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) AVIFILE_DllGetClassObject -@ stdcall -private DllRegisterServer() AVIFILE_DllRegisterServer -@ stdcall -private DllUnregisterServer() AVIFILE_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stdcall EditStreamClone(ptr ptr) @ stdcall EditStreamCopy(ptr ptr ptr ptr) @ stdcall EditStreamCut(ptr ptr ptr ptr) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 10427f230962f01ec8a839bb6bfa28cf05368697..7c8a1d86a55da094d5e6af796eabad8bb4ccfd2b 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -182,7 +182,7 @@ LPCWSTR AVIFILE_BasenameW(LPCWSTR szPath) /*********************************************************************** * DllGetClassObject (AVIFIL32.@) */ -HRESULT WINAPI AVIFILE_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) { TRACE("(%s,%s,%p)\n", debugstr_guid(pclsid), debugstr_guid(piid), ppv); @@ -195,7 +195,7 @@ HRESULT WINAPI AVIFILE_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *p /***************************************************************************** * DllCanUnloadNow (AVIFIL32.@) */ -DWORD WINAPI AVIFILE_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { return ((AVIFILE_bLocked || AVIFILE_uUseCount) ? S_FALSE : S_OK); } diff --git a/dlls/avifil32/regsvr.c b/dlls/avifil32/regsvr.c index 2d97b12e8524b40a082111213bbb5a0f82181c34..bc3d3aa45531847842e6181ca38724e0f9d42a1f 100644 --- a/dlls/avifil32/regsvr.c +++ b/dlls/avifil32/regsvr.c @@ -552,7 +552,7 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (AVIFILE.@) */ -HRESULT WINAPI AVIFILE_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -567,7 +567,7 @@ HRESULT WINAPI AVIFILE_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (AVIFILE.@) */ -HRESULT WINAPI AVIFILE_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/cabinet/cabinet.spec b/dlls/cabinet/cabinet.spec index 015085869c06c4809753f58f54c9c488298dbd01..96127cfc4290f74da16cff4e9f6f39ca93d74927 100644 --- a/dlls/cabinet/cabinet.spec +++ b/dlls/cabinet/cabinet.spec @@ -1,5 +1,5 @@ 1 stub GetDllVersion -2 stdcall DllGetVersion (ptr) CABINET_DllGetVersion +2 stdcall -private DllGetVersion (ptr) 3 stdcall Extract(ptr str) 4 stub DeleteExtractedFiles 10 cdecl FCICreate(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index cd92357ba0d670eb6c0e24896c2747d0a15737a5..5d61324cd56d422c713ab5533de277ddb6ee8e3c 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabinet); * NOTES * Supposedly returns version from IE6SP1RP1 */ -HRESULT WINAPI CABINET_DllGetVersion (DLLVERSIONINFO *pdvi) +HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) { WARN("hmmm... not right version number \"5.1.1106.1\"?\n"); diff --git a/dlls/comcat/comcat.spec b/dlls/comcat/comcat.spec index 3b14c7ed7833ada724f18808a545ab8759c9a192..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/comcat/comcat.spec +++ b/dlls/comcat/comcat.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() COMCAT_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) COMCAT_DllGetClassObject -@ stdcall -private DllRegisterServer() COMCAT_DllRegisterServer -@ stdcall -private DllUnregisterServer() COMCAT_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/comcat/comcat_main.c b/dlls/comcat/comcat_main.c index 6c892357f0e03e7ea7f8e6240f98e7015efe3c74..d07835894efed40fba72cec704d99c50d765aedd 100644 --- a/dlls/comcat/comcat_main.c +++ b/dlls/comcat/comcat_main.c @@ -34,7 +34,7 @@ const WCHAR clsid_keyname[6] = { 'C', 'L', 'S', 'I', 'D', 0 }; /*********************************************************************** * DllGetClassObject (COMCAT.@) */ -HRESULT WINAPI COMCAT_DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { *ppv = NULL; if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) { @@ -47,7 +47,7 @@ HRESULT WINAPI COMCAT_DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv /*********************************************************************** * DllCanUnloadNow (COMCAT.@) */ -HRESULT WINAPI COMCAT_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { return dll_ref != 0 ? S_FALSE : S_OK; } diff --git a/dlls/comcat/regsvr.c b/dlls/comcat/regsvr.c index 7335a673c72d4ffdf179b9a45a41d12c4d1c68ad..00a3421dfe5708e6d3c6095c1a88f560cdc00587 100644 --- a/dlls/comcat/regsvr.c +++ b/dlls/comcat/regsvr.c @@ -447,7 +447,7 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (COMCAT.@) */ -HRESULT WINAPI COMCAT_DllRegisterServer() +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -462,7 +462,7 @@ HRESULT WINAPI COMCAT_DllRegisterServer() /*********************************************************************** * DllUnregisterServer (COMCAT.@) */ -HRESULT WINAPI COMCAT_DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index cb9f63a19d660b60922ef9e0d5cf934f4a8ca631..4770a46757970c0befc675bb377371e5f7f5f9c6 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -123,8 +123,8 @@ @ stdcall CreateStatusWindowW(long wstr long long) @ stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) @ stdcall DestroyPropertySheetPage(long) -@ stdcall DllGetVersion(ptr) COMCTL32_DllGetVersion -@ stdcall DllInstall(long ptr) COMCTL32_DllInstall +@ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllInstall(long wstr) @ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA @ stdcall DrawStatusTextW(long ptr wstr long) @ stdcall FlatSB_EnableScrollBar (long long long) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 697aabed54ce761df5e98e3f48fa6b9f291dd085..20af98703b7c8f7cfded78e3484615a7d3137234 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -934,8 +934,7 @@ CreateToolbar (HWND hwnd, DWORD style, UINT wID, INT nBitmaps, * Returns version of a comctl32.dll from IE4.01 SP1. */ -HRESULT WINAPI -COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi) +HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) { if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) { WARN("wrong DLLVERSIONINFO size from app\n"); @@ -963,7 +962,7 @@ COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi) * Success: S_OK * Failure: A HRESULT error */ -HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline) +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", debugstr_w(cmdline)); diff --git a/dlls/d3dxof/d3dxof.spec b/dlls/d3dxof/d3dxof.spec index 8ce85463cb7c76a5f0405dd20e2bab28d72730c4..0406d548110c995528d25ffe4b6818a7b1993196 100644 --- a/dlls/d3dxof/d3dxof.spec +++ b/dlls/d3dxof/d3dxof.spec @@ -1,3 +1,3 @@ @ stdcall DirectXFileCreate(ptr) -@ stdcall -private DllCanUnloadNow() D3DXOF_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) D3DXOF_DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index 0a586986fef3911f186f6066e2d9789b557589ea..3b55b6ba567c228004611bff9c741293a0df984b 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -183,7 +183,7 @@ HRESULT WINAPI DirectXFileCreate(LPDIRECTXFILE* lplpDirectXFile) * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, * E_UNEXPECTED */ -HRESULT WINAPI D3DXOF_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { int i; IClassFactoryImpl *factory; @@ -221,7 +221,7 @@ HRESULT WINAPI D3DXOF_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *pp /*********************************************************************** * DllCanUnloadNow (D3DXOF.@) */ -HRESULT WINAPI D3DXOF_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { return dll_ref != 0 ? S_FALSE : S_OK; } diff --git a/dlls/d3dxof/regsvr.c b/dlls/d3dxof/regsvr.c index 2ebec449e490856035e03ddc09331d126b899e1b..c76ba6ac7ed53b828daa087033cfd2f435178a86 100644 --- a/dlls/d3dxof/regsvr.c +++ b/dlls/d3dxof/regsvr.c @@ -526,7 +526,7 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (D3DXOF.@) */ -HRESULT WINAPI D3DXOF_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -541,7 +541,7 @@ HRESULT WINAPI D3DXOF_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (D3DXOF.@) */ -HRESULT WINAPI D3DXOF_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/ddraw/ddraw.spec b/dlls/ddraw/ddraw.spec index e2ebf0ed976ce0e18c4309151769357fc03311f8..75750910e48604c109262de783327b1df65b2d2a 100644 --- a/dlls/ddraw/ddraw.spec +++ b/dlls/ddraw/ddraw.spec @@ -10,10 +10,10 @@ @ stdcall DirectDrawEnumerateExA(ptr ptr long) @ stdcall DirectDrawEnumerateExW(ptr ptr long) @ stdcall DirectDrawEnumerateW(ptr ptr) -@ stdcall -private DllCanUnloadNow() DDRAW_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) DDRAW_DllGetClassObject -@ stdcall -private DllRegisterServer() DDRAW_DllRegisterServer -@ stdcall -private DllUnregisterServer() DDRAW_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub GetNextMipMap @ stub GetSurfaceFromDC @ stub HeapVidMemAllocAligned diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 7e76752640de4348b2f39d8ceb2abc39aaca90f1..e2912b660d4759c0ba4e1140a67b7d92943dd718 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -560,7 +560,7 @@ static const IClassFactoryVtbl DDCF_Vtbl = * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, * E_UNEXPECTED */ -HRESULT WINAPI DDRAW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { unsigned int i; IClassFactoryImpl *factory; @@ -603,7 +603,8 @@ HRESULT WINAPI DDRAW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv * Success: S_OK * Failure: S_FALSE */ -DWORD WINAPI DDRAW_DllCanUnloadNow(void) { +HRESULT WINAPI DllCanUnloadNow(void) +{ FIXME("(void): stub\n"); return S_FALSE; } diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c index 7df583b8e5717fcc4c949b0ed489a113e354ab44..661eb124048432046080fccd7c7f4717a8d86172 100644 --- a/dlls/ddraw/regsvr.c +++ b/dlls/ddraw/regsvr.c @@ -467,7 +467,7 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DDRAW.@) */ -HRESULT WINAPI DDRAW_DllRegisterServer() +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -482,7 +482,7 @@ HRESULT WINAPI DDRAW_DllRegisterServer() /*********************************************************************** * DllUnregisterServer (DDRAW.@) */ -HRESULT WINAPI DDRAW_DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/dinput/dinput.spec b/dlls/dinput/dinput.spec index f7af5e3ca7a59f14fb204859fda23e8e42d850f2..619079526c6c90575c242924cde69ee5f1944b3e 100644 --- a/dlls/dinput/dinput.spec +++ b/dlls/dinput/dinput.spec @@ -1,7 +1,7 @@ @ stdcall DirectInputCreateA(long long ptr ptr) @ stdcall DirectInputCreateEx(long long ptr ptr ptr) @ stdcall DirectInputCreateW(long long ptr ptr) -@ stdcall -private DllCanUnloadNow() DINPUT_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) DINPUT_DllGetClassObject -@ stdcall -private DllRegisterServer() DINPUT_DllRegisterServer -@ stdcall -private DllUnregisterServer() DINPUT_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index f79dd20d0687475ec5f40b542d49873d5fed1da2..79eb621032d3aa617cd67d7f4b9a143600a2767a 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -678,7 +678,7 @@ static IClassFactoryImpl DINPUT_CF = {&DICF_Vtbl, 1 }; /*********************************************************************** * DllCanUnloadNow (DINPUT.@) */ -HRESULT WINAPI DINPUT_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { FIXME("(void): stub\n"); @@ -688,8 +688,7 @@ HRESULT WINAPI DINPUT_DllCanUnloadNow(void) /*********************************************************************** * DllGetClassObject (DINPUT.@) */ -HRESULT WINAPI DINPUT_DllGetClassObject(REFCLSID rclsid, REFIID riid, - LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { diff --git a/dlls/dinput/regsvr.c b/dlls/dinput/regsvr.c index 6bdd46a0e3c0230b546a56fb09c148d92b76a085..e005f7273965df507b97d826ac0d68dbdc71f6c5 100644 --- a/dlls/dinput/regsvr.c +++ b/dlls/dinput/regsvr.c @@ -530,7 +530,7 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DINPUT.@) */ -HRESULT WINAPI DINPUT_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -545,7 +545,7 @@ HRESULT WINAPI DINPUT_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (DINPUT.@) */ -HRESULT WINAPI DINPUT_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/dinput8/dinput8.spec b/dlls/dinput8/dinput8.spec index 571ab331c75d51f99b41070cd9e9dc09ff11e951..e8b15fdec7c01f7822ab0727fcec4ba8b8b32746 100644 --- a/dlls/dinput8/dinput8.spec +++ b/dlls/dinput8/dinput8.spec @@ -1,5 +1,5 @@ @ stdcall DirectInput8Create(long long ptr ptr ptr) -@ stdcall -private DllCanUnloadNow() DINPUT8_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) DINPUT8_DllGetClassObject -@ stdcall -private DllRegisterServer() DINPUT8_DllRegisterServer -@ stdcall -private DllUnregisterServer() DINPUT8_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 7de9b95079b493261feaf958ef9e7d2526fa199a..432d3f184a238ff49928cbcbfec9e77709c45e9f 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -43,7 +43,7 @@ HRESULT WINAPI DirectInput8Create( /*********************************************************************** * DllCanUnloadNow (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { FIXME("(void): stub\n"); @@ -53,8 +53,7 @@ HRESULT WINAPI DINPUT8_DllCanUnloadNow(void) /*********************************************************************** * DllGetClassObject (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllGetClassObject(REFCLSID rclsid, REFIID riid, - LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { FIXME("(%p, %p, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); @@ -65,7 +64,7 @@ HRESULT WINAPI DINPUT8_DllGetClassObject(REFCLSID rclsid, REFIID riid, /*********************************************************************** * DllRegisterServer (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { FIXME("(void): stub\n"); @@ -75,7 +74,7 @@ HRESULT WINAPI DINPUT8_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { FIXME("(void): stub\n"); diff --git a/dlls/dmband/dmband.spec b/dlls/dmband/dmband.spec index e0d2dfd162c253b442802673c29bd4d9fc7f5006..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/dmband/dmband.spec +++ b/dlls/dmband/dmband.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() DMBAND_DllCanUnloadNow -@ stdcall -private DllGetClassObject(long long ptr) DMBAND_DllGetClassObject -@ stdcall -private DllRegisterServer() DMBAND_DllRegisterServer -@ stdcall -private DllUnregisterServer() DMBAND_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index ed9eedd543ff82c0ac50228b7db22533d74e332e..e89d645391ccfbbcf478a28b64c0948db95b12aa 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -152,7 +152,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { * * */ -HRESULT WINAPI DMBAND_DllCanUnloadNow(void) { +HRESULT WINAPI DllCanUnloadNow(void) +{ return DMBAND_refCount != 0 ? S_FALSE : S_OK; } @@ -162,7 +163,8 @@ HRESULT WINAPI DMBAND_DllCanUnloadNow(void) { * * */ -HRESULT WINAPI DMBAND_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBand) && IsEqualIID (riid, &IID_IClassFactory)) { diff --git a/dlls/dmband/regsvr.c b/dlls/dmband/regsvr.c index 8afc220618a849da776b5ca8a62103d63652d281..802a488de8dee0ac44b479e345a643cf755fd3be 100644 --- a/dlls/dmband/regsvr.c +++ b/dlls/dmband/regsvr.c @@ -507,7 +507,8 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DMBAND.3) */ -HRESULT WINAPI DMBAND_DllRegisterServer(void) { +HRESULT WINAPI DllRegisterServer(void) +{ HRESULT hr; TRACE("\n"); @@ -521,7 +522,8 @@ HRESULT WINAPI DMBAND_DllRegisterServer(void) { /*********************************************************************** * DllUnregisterServer (DMBAND.4) */ -HRESULT WINAPI DMBAND_DllUnregisterServer(void) { +HRESULT WINAPI DllUnregisterServer(void) +{ HRESULT hr; TRACE("\n"); diff --git a/dlls/dmloader/dmloader.spec b/dlls/dmloader/dmloader.spec index 5a0433d5724990c2e4c47c0fbd142103dbf44037..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/dmloader/dmloader.spec +++ b/dlls/dmloader/dmloader.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() DMLOADER_DllCanUnloadNow -@ stdcall -private DllGetClassObject(long long ptr) DMLOADER_DllGetClassObject -@ stdcall -private DllRegisterServer() DMLOADER_DllRegisterServer -@ stdcall -private DllUnregisterServer() DMLOADER_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index 55095d70dfcb1476d7371708dd4cc44fb51713f4..54b1113d68818c46d22879da0b3809cf98d187e6 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -41,7 +41,8 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { /****************************************************************** * DllCanUnloadNow (DMLOADER.1) */ -HRESULT WINAPI DMLOADER_DllCanUnloadNow (void) { +HRESULT WINAPI DllCanUnloadNow (void) +{ TRACE("(void)\n"); /* if there are no instances left, it's safe to release */ if (!dwDirectMusicContainer && !dwDirectMusicLoader) @@ -54,7 +55,8 @@ HRESULT WINAPI DMLOADER_DllCanUnloadNow (void) { /****************************************************************** * DllGetClassObject (DMLOADER.2) */ -HRESULT WINAPI DMLOADER_DllGetClassObject (REFCLSID rclsid, REFIID riid, LPVOID *ppv) { +HRESULT WINAPI DllGetClassObject (REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusicLoader) && IsEqualIID (riid, &IID_IClassFactory)) { return DMUSIC_CreateDirectMusicLoaderCF (riid, ppv, NULL); diff --git a/dlls/dmloader/regsvr.c b/dlls/dmloader/regsvr.c index 9e8fefa575e010c743e67fb3e4cd5c24b082ce8c..4f654962497d8a43bcd1b7258427c67ec6829ac5 100644 --- a/dlls/dmloader/regsvr.c +++ b/dlls/dmloader/regsvr.c @@ -507,7 +507,8 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DMLOADER.3) */ -HRESULT WINAPI DMLOADER_DllRegisterServer(void) { +HRESULT WINAPI DllRegisterServer(void) +{ HRESULT hr; TRACE("\n"); @@ -521,7 +522,8 @@ HRESULT WINAPI DMLOADER_DllRegisterServer(void) { /*********************************************************************** * DllUnregisterServer (DMLOADER.4) */ -HRESULT WINAPI DMLOADER_DllUnregisterServer(void) { +HRESULT WINAPI DllUnregisterServer(void) +{ HRESULT hr; TRACE("\n"); diff --git a/dlls/dmscript/dmscript.spec b/dlls/dmscript/dmscript.spec index ba65a8f1b7ee831027d6267c400a3cecc70edfcc..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/dmscript/dmscript.spec +++ b/dlls/dmscript/dmscript.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() DMSCRIPT_DllCanUnloadNow -@ stdcall -private DllGetClassObject(long long ptr) DMSCRIPT_DllGetClassObject -@ stdcall -private DllRegisterServer() DMSCRIPT_DllRegisterServer -@ stdcall -private DllUnregisterServer() DMSCRIPT_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 908d7b8502f285947a820adaec19b9f7a2761bd0..35503e3ab80bcc9b98b3a6f290a47bb06020f02c 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -564,7 +564,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { * * */ -HRESULT WINAPI DMSCRIPT_DllCanUnloadNow(void) { +HRESULT WINAPI DllCanUnloadNow(void) +{ return DMSCRIPT_refCount != 0 ? S_FALSE : S_OK; } @@ -574,7 +575,8 @@ HRESULT WINAPI DMSCRIPT_DllCanUnloadNow(void) { * * */ -HRESULT WINAPI DMSCRIPT_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpSegment) && IsEqualIID (riid, &IID_IClassFactory)) { *ppv = (LPVOID) &ScriptAutoImplSegment_CF; diff --git a/dlls/dmscript/regsvr.c b/dlls/dmscript/regsvr.c index 78a4807a3733f07210ecf036932335ab3f9090ac..64b186d87eb301c506846a562141f1cdc8b3e865 100644 --- a/dlls/dmscript/regsvr.c +++ b/dlls/dmscript/regsvr.c @@ -572,7 +572,8 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DMSCRIPT.3) */ -HRESULT WINAPI DMSCRIPT_DllRegisterServer(void) { +HRESULT WINAPI DllRegisterServer(void) +{ HRESULT hr; TRACE("\n"); @@ -586,7 +587,8 @@ HRESULT WINAPI DMSCRIPT_DllRegisterServer(void) { /*********************************************************************** * DllUnregisterServer (DMSCRIPT.4) */ -HRESULT WINAPI DMSCRIPT_DllUnregisterServer(void) { +HRESULT WINAPI DllUnregisterServer(void) +{ HRESULT hr; TRACE("\n"); diff --git a/dlls/dmsynth/dmsynth.spec b/dlls/dmsynth/dmsynth.spec index d238f7dbbe797888ffcabe8c24e2925d677031c6..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/dmsynth/dmsynth.spec +++ b/dlls/dmsynth/dmsynth.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() DMSYNTH_DllCanUnloadNow -@ stdcall -private DllGetClassObject(long long ptr) DMSYNTH_DllGetClassObject -@ stdcall -private DllRegisterServer() DMSYNTH_DllRegisterServer -@ stdcall -private DllUnregisterServer() DMSYNTH_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index bbf7e583f49931079ca45558f99c942df55d9f24..7a18214d66ffd0808bae714094b35047d5836999 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -149,7 +149,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { * * */ -HRESULT WINAPI DMSYNTH_DllCanUnloadNow(void) { +HRESULT WINAPI DllCanUnloadNow(void) +{ return DMSYNTH_refCount != 0 ? S_FALSE : S_OK; } @@ -159,7 +160,8 @@ HRESULT WINAPI DMSYNTH_DllCanUnloadNow(void) { * * */ -HRESULT WINAPI DMSYNTH_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSynth) && IsEqualIID (riid, &IID_IClassFactory)) { *ppv = (LPVOID) &Synth_CF; diff --git a/dlls/dmsynth/regsvr.c b/dlls/dmsynth/regsvr.c index 401033d869a72b29268886ef253dfcd68b49bf74..6f7aac991520e5809642180663e9eef23694c859 100644 --- a/dlls/dmsynth/regsvr.c +++ b/dlls/dmsynth/regsvr.c @@ -507,7 +507,8 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DMSYNTH.3) */ -HRESULT WINAPI DMSYNTH_DllRegisterServer(void) { +HRESULT WINAPI DllRegisterServer(void) +{ HRESULT hr; TRACE("\n"); @@ -521,7 +522,8 @@ HRESULT WINAPI DMSYNTH_DllRegisterServer(void) { /*********************************************************************** * DllUnregisterServer (DMSYNTH.4) */ -HRESULT WINAPI DMSYNTH_DllUnregisterServer(void) { +HRESULT WINAPI DllUnregisterServer(void) +{ HRESULT hr; TRACE("\n"); diff --git a/dlls/dmusic/dmusic.spec b/dlls/dmusic/dmusic.spec index 216013a31ec9583ad6bf54ed1ba6f0b08f8b34b8..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/dmusic/dmusic.spec +++ b/dlls/dmusic/dmusic.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() DMUSIC_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) DMUSIC_DllGetClassObject -@ stdcall -private DllRegisterServer() DMUSIC_DllRegisterServer -@ stdcall -private DllUnregisterServer() DMUSIC_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index f0967613e01ff508fc353e9c12c519d107b44b8e..85ecf1590503bee8c611bed9174249788970d5c5 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -149,7 +149,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { * * */ -HRESULT WINAPI DMUSIC_DllCanUnloadNow(void) { +HRESULT WINAPI DllCanUnloadNow(void) +{ return DMUSIC_refCount != 0 ? S_FALSE : S_OK; } @@ -159,7 +160,8 @@ HRESULT WINAPI DMUSIC_DllCanUnloadNow(void) { * * */ -HRESULT WINAPI DMUSIC_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusic) && IsEqualIID (riid, &IID_IClassFactory)) { *ppv = (LPVOID) &DirectMusic_CF; diff --git a/dlls/dmusic/regsvr.c b/dlls/dmusic/regsvr.c index 62a285392e9929774cb2b394ef88cea15630a0e5..fccd9bc46c20afd7b5faf1789b628636ba101904 100644 --- a/dlls/dmusic/regsvr.c +++ b/dlls/dmusic/regsvr.c @@ -507,7 +507,8 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DMUSIC.3) */ -HRESULT WINAPI DMUSIC_DllRegisterServer(void) { +HRESULT WINAPI DllRegisterServer(void) +{ HRESULT hr; TRACE("\n"); @@ -521,7 +522,8 @@ HRESULT WINAPI DMUSIC_DllRegisterServer(void) { /*********************************************************************** * DllUnregisterServer (DMUSIC.4) */ -HRESULT WINAPI DMUSIC_DllUnregisterServer(void) { +HRESULT WINAPI DllUnregisterServer(void) +{ HRESULT hr; TRACE("\n"); diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index 3881e3f9acd4e26c6f7f75411a861d2c517be810..0c2f456ff2cf8d9e27ab9f078f07e31059f78662 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -117,7 +117,7 @@ static IClassFactoryImpl DP_and_DPL_CF = {&DP_and_DPL_Vtbl, 1 }; * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, * E_UNEXPECTED */ -HRESULT WINAPI DPLAYX_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%p,%p,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); diff --git a/dlls/dplayx/dplayx.spec b/dlls/dplayx/dplayx.spec index 2e5e62271d99c13b40488343501345185b041014..683e3b1bd52833c674228a2b0b6d125bc60afbbe 100644 --- a/dlls/dplayx/dplayx.spec +++ b/dlls/dplayx/dplayx.spec @@ -5,7 +5,7 @@ 5 stdcall DirectPlayLobbyCreateW(ptr ptr ptr ptr long) 6 extern gdwDPlaySPRefCount 9 stdcall DirectPlayEnumerate(ptr ptr) DirectPlayEnumerateA - 10 stdcall -private DllCanUnloadNow() DPLAYX_DllCanUnloadNow - 11 stdcall -private DllGetClassObject(ptr ptr ptr) DPLAYX_DllGetClassObject -@ stdcall -private DllRegisterServer() DPLAYX_DllRegisterServer -@ stdcall -private DllUnregisterServer() DPLAYX_DllUnregisterServer + 10 stdcall -private DllCanUnloadNow() + 11 stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c index 9eb9cb153fd4161761e30ed563998fd6d36dfe64..f11ae99da5850b5f6a55619d504e8779e1702dc0 100644 --- a/dlls/dplayx/dplayx_main.c +++ b/dlls/dplayx/dplayx_main.c @@ -97,7 +97,7 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) /*********************************************************************** * DllCanUnloadNow (DPLAYX.10) */ -HRESULT WINAPI DPLAYX_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { HRESULT hr = ( gdwDPlaySPRefCount > 0 ) ? S_FALSE : S_OK; diff --git a/dlls/dplayx/regsvr.c b/dlls/dplayx/regsvr.c index 4e634727a6ef8018961787bb22b4f53661dd43a8..abaa33dd813e4f7bc868133ed7e076418121aade 100644 --- a/dlls/dplayx/regsvr.c +++ b/dlls/dplayx/regsvr.c @@ -528,7 +528,7 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DPLAYX.@) */ -HRESULT WINAPI DPLAYX_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -543,7 +543,7 @@ HRESULT WINAPI DPLAYX_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (DPLAYX.@) */ -HRESULT WINAPI DPLAYX_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/dpnet/dpnet.spec b/dlls/dpnet/dpnet.spec index 8b1eaf0eef10f1391f818c53bcb84f91383cbe62..8921dc40e0659fee21d2cdb81eaf05f34495b45e 100644 --- a/dlls/dpnet/dpnet.spec +++ b/dlls/dpnet/dpnet.spec @@ -1,5 +1,5 @@ @ stdcall DirectPlay8Create(ptr ptr ptr) -@ stdcall -private DllCanUnloadNow() DPNET_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) DPNET_DllGetClassObject -@ stdcall -private DllRegisterServer() DPNET_DllRegisterServer -@ stdcall -private DllUnregisterServer() DPNET_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 05bd9e4c49de6a46e7f2bc8fe981d0814ccbd0b5..1f12f0a4c2f909d736330ea4138ac38d7856aa79 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -121,7 +121,7 @@ static IClassFactoryImpl DPNET_CFS[] = { /*********************************************************************** * DllCanUnloadNow (DPNET.@) */ -BOOL WINAPI DPNET_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; } @@ -129,7 +129,7 @@ BOOL WINAPI DPNET_DllCanUnloadNow(void) /*********************************************************************** * DllGetClassObject (DPNET.@) */ -HRESULT WINAPI DPNET_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { int i = 0; diff --git a/dlls/dpnet/regsvr.c b/dlls/dpnet/regsvr.c index 3318a6f3254a083985f5621ad327f85825980119..0f65ab89dc3d734196f873f9af6dd1950bcec290 100644 --- a/dlls/dpnet/regsvr.c +++ b/dlls/dpnet/regsvr.c @@ -557,7 +557,7 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DPNET.@) */ -HRESULT WINAPI DPNET_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -572,7 +572,7 @@ HRESULT WINAPI DPNET_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (DPNET.@) */ -HRESULT WINAPI DPNET_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/dpnhpast/dpnhpast.spec b/dlls/dpnhpast/dpnhpast.spec index 71fad548187bb92626854a7f0cf5165451622f0f..c6848c0975936dada5cec81cbf2cd02d24eb35b3 100644 --- a/dlls/dpnhpast/dpnhpast.spec +++ b/dlls/dpnhpast/dpnhpast.spec @@ -1,5 +1,5 @@ 1 stub DirectPlayNATHelpCreate -2 stdcall -private DllRegisterServer() DPNHPAST_DllRegisterServer -3 stdcall -private DllCanUnloadNow() DPNHPAST_DllCanUnloadNow -4 stdcall -private DllGetClassObject( long long ptr ) DPNHPAST_DllGetClassObject -5 stdcall -private DllUnregisterServer() DPNHPAST_DllUnregisterServer +2 stdcall -private DllRegisterServer() +3 stdcall -private DllCanUnloadNow() +4 stdcall -private DllGetClassObject(ptr ptr ptr) +5 stdcall -private DllUnregisterServer() diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 2d8f536d743e27f2e0122bc0aaf0b9e7753da5b7..1d639c4af39ad507ae1ef94b8450f48fbb7132d7 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -67,7 +67,7 @@ HRESULT WINAPI DPNHPAST_DirectPlayNATHelpCreate() * * */ -HRESULT WINAPI DPNHPAST_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { FIXME(":stub\n"); return S_OK; @@ -79,7 +79,7 @@ HRESULT WINAPI DPNHPAST_DllRegisterServer(void) * * */ -HRESULT WINAPI DPNHPAST_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { FIXME(":stub\n"); return S_OK; @@ -91,7 +91,7 @@ HRESULT WINAPI DPNHPAST_DllCanUnloadNow(void) * * */ -HRESULT WINAPI DPNHPAST_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { FIXME(":stub\n"); return E_FAIL; @@ -103,7 +103,7 @@ HRESULT WINAPI DPNHPAST_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * * * */ -HRESULT WINAPI DPNHPAST_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { FIXME(":stub\n"); return S_OK; diff --git a/dlls/dswave/dswave.spec b/dlls/dswave/dswave.spec index 7bbacee28855167325e562afb350a8efee576017..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/dswave/dswave.spec +++ b/dlls/dswave/dswave.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() DSWAVE_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) DSWAVE_DllGetClassObject -@ stdcall -private DllRegisterServer() DSWAVE_DllRegisterServer -@ stdcall -private DllUnregisterServer() DSWAVE_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 537ab6b553c779080c84a35530690a029cbf04e6..09b2ff03ee59c314c73e5474f6078d7d3fba934c 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -101,7 +101,8 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { * * */ -HRESULT WINAPI DSWAVE_DllCanUnloadNow(void) { +HRESULT WINAPI DllCanUnloadNow(void) +{ return DSWAVE_refCount != 0 ? S_FALSE : S_OK; } @@ -111,7 +112,8 @@ HRESULT WINAPI DSWAVE_DllCanUnloadNow(void) { * * */ -HRESULT WINAPI DSWAVE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectSoundWave) && IsEqualIID (riid, &IID_IClassFactory)) { *ppv = (LPVOID) &Wave_CF; diff --git a/dlls/dswave/regsvr.c b/dlls/dswave/regsvr.c index 12d1ca7854a302b596148aae0e78799b937c4ca6..565030f138aadaef7261fe16b95de28f121b7cde 100644 --- a/dlls/dswave/regsvr.c +++ b/dlls/dswave/regsvr.c @@ -499,7 +499,8 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DSWAVE.3) */ -HRESULT WINAPI DSWAVE_DllRegisterServer(void) { +HRESULT WINAPI DllRegisterServer(void) +{ HRESULT hr; TRACE("\n"); @@ -513,7 +514,8 @@ HRESULT WINAPI DSWAVE_DllRegisterServer(void) { /*********************************************************************** * DllUnregisterServer (DSWAVE.4) */ -HRESULT WINAPI DSWAVE_DllUnregisterServer(void) { +HRESULT WINAPI DllUnregisterServer(void) +{ HRESULT hr; TRACE("\n"); diff --git a/dlls/dxdiagn/dxdiagn.spec b/dlls/dxdiagn/dxdiagn.spec index 9da6bf3e2e999d9c4256a33b0de4ed199f7fc308..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/dxdiagn/dxdiagn.spec +++ b/dlls/dxdiagn/dxdiagn.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) DllGetClassObject -@ stdcall -private DllRegisterServer() DllRegisterServer -@ stdcall -private DllUnregisterServer() DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 91082135236487b4647ecc5e03198dd00bb2f8a8..f40b7274a253b62ead10e8f46755408fa0c70511 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -17,7 +17,7 @@ 25 stub LAUNCHWIZARD 26 stub LaunchWizard@20 27 stub DllGetClassObject - 28 stdcall -private DllCanUnloadNow() MAPI32_DllCanUnloadNow + 28 stdcall -private DllCanUnloadNow() 29 stub MAPIOpenFormMgr 30 stub MAPIOpenFormMgr@8 31 stub MAPIOpenLocalFormContainer diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index c9d0c00183553cb44d31d467a8ba2b1e6b5f1c83..c05d7108c2d1ecb955619ce8882ab6ce0ea29ad6 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -62,7 +62,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) * S_OK, if the dll can be unloaded, * S_FALSE, otherwise. */ -HRESULT WINAPI MAPI32_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { return MAPI_ObjectCount == 0 ? S_OK : S_FALSE; } diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 5c8515265cd8990c192a41539a17e6d6a15b6156..8f20269947fea896baaab504976ee7609fc71f1a 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -745,7 +745,7 @@ static const IClassFactoryVtbl MLANGCF_Vtbl = MLANGCF_LockServer }; -HRESULT WINAPI MLANG_DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { int i; IClassFactoryImpl *factory; @@ -1992,7 +1992,7 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) /******************************************************************************/ -HRESULT WINAPI MLANG_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { FIXME("\n"); return S_FALSE; diff --git a/dlls/mlang/mlang.spec b/dlls/mlang/mlang.spec index f3b3c39d3060f4037808c8dd07ffffa0f1e99b85..5b067ed27196a5f5e9a426d42c164fec4eae0a84 100644 --- a/dlls/mlang/mlang.spec +++ b/dlls/mlang/mlang.spec @@ -2,10 +2,10 @@ @ stub ConvertINetReset @ stdcall ConvertINetString(ptr long long ptr ptr ptr ptr) @ stdcall ConvertINetUnicodeToMultiByte(ptr long ptr ptr ptr ptr) -@ stdcall -private DllCanUnloadNow() MLANG_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) MLANG_DllGetClassObject -@ stdcall -private DllRegisterServer() MLANG_DllRegisterServer -@ stdcall -private DllUnregisterServer() MLANG_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stdcall GetGlobalFontLinkObject() @ stdcall IsConvertINetStringAvailable(long long) @ stdcall LcidToRfc1766A(long ptr long) diff --git a/dlls/mlang/regsvr.c b/dlls/mlang/regsvr.c index 1e97583c8404812de6aaca0fda242a6ab65177a7..b412eaece70e57b222e640a5a8032386e58dc82d 100644 --- a/dlls/mlang/regsvr.c +++ b/dlls/mlang/regsvr.c @@ -543,7 +543,7 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (MLANG.@) */ -HRESULT WINAPI MLANG_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -558,7 +558,7 @@ HRESULT WINAPI MLANG_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (MLANG.@) */ -HRESULT WINAPI MLANG_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec index 799288dde4715813ac70bbdf61fd3eb5e12fb299..c383c75966aef2bd39b3cb36715419a5b57662fd 100644 --- a/dlls/mpr/mpr.spec +++ b/dlls/mpr/mpr.spec @@ -23,7 +23,7 @@ 24 stdcall @(ptr) MPR_Free 25 stdcall @(ptr long) _MPR_25 -@ stdcall -private DllCanUnloadNow() MPR_DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stdcall MultinetGetConnectionPerformanceA(ptr ptr) @ stdcall MultinetGetConnectionPerformanceW(ptr ptr) diff --git a/dlls/mpr/mpr_main.c b/dlls/mpr/mpr_main.c index 2c8eee766402526a037c5530623d70e8ccc8bd7d..36feb6818ffde6ef6ec4fd519f819f97d06202c7 100644 --- a/dlls/mpr/mpr_main.c +++ b/dlls/mpr/mpr_main.c @@ -75,7 +75,7 @@ BOOL WINAPI _MPR_25( LPBYTE lpMem, INT len ) /***************************************************************** * DllCanUnloadNow [MPR.@] */ -DWORD WINAPI MPR_DllCanUnloadNow(void) +DWORD WINAPI DllCanUnloadNow(void) { FIXME("Stub\n"); return S_OK; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 052f70355d0adfc94dc5a50ee787ac5a786330eb..e044fbee1f07ca0d8758c89e6e4c8e625cb8c93b 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -155,7 +155,7 @@ static HRESULT ClassFactory_Create(REFIID riid, void **ppv, CreateInstanceFunc f return hres; } -HRESULT WINAPI MSHTML_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { if(IsEqualGUID(&CLSID_HTMLDocument, rclsid)) { TRACE("(CLSID_HTMLDocument %s %p)\n", debugstr_guid(riid), ppv); @@ -181,7 +181,7 @@ HRESULT WINAPI MSHTML_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *pp return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT WINAPI MSHTML_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { TRACE("() ref=%ld\n", module_ref); return module_ref ? S_FALSE : S_OK; @@ -202,7 +202,7 @@ HRESULT WINAPI RunHTMLApplication( HINSTANCE hinst, HINSTANCE hPrevInst, /*********************************************************************** * DllInstall (MSHTML.@) */ -HRESULT WINAPI MSHTML_DllInstall(BOOL bInstall, LPCWSTR cmdline) +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { FIXME("stub %d %s: returning S_OK\n", bInstall, debugstr_w(cmdline)); return S_OK; @@ -320,7 +320,7 @@ static HRESULT register_server(BOOL do_register) /*********************************************************************** * DllRegisterServer (MSHTML.@) */ -HRESULT WINAPI MSHTML_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { return register_server(TRUE); } @@ -328,7 +328,7 @@ HRESULT WINAPI MSHTML_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (MSHTML.@) */ -HRESULT WINAPI MSHTML_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { return register_server(FALSE); } diff --git a/dlls/mshtml/mshtml.spec b/dlls/mshtml/mshtml.spec index ab8a6f5c865adb24f823a582570827a02747c261..665fde88073285f3e2fa1c7e4d3fd86344f49e9f 100644 --- a/dlls/mshtml/mshtml.spec +++ b/dlls/mshtml/mshtml.spec @@ -1,10 +1,10 @@ @ stub CreateHTMLPropertyPage -@ stdcall -private DllCanUnloadNow() MSHTML_DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllEnumClassObjects -@ stdcall -private DllGetClassObject(ptr ptr ptr) MSHTML_DllGetClassObject -@ stdcall DllInstall(long wstr) MSHTML_DllInstall -@ stdcall -private DllRegisterServer() MSHTML_DllRegisterServer -@ stdcall -private DllUnregisterServer() MSHTML_DllUnregisterServer +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub MatchExactGetIDsOfNames @ stub PrintHTML @ stub RNIGetCompatibleVersion diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7721bf59cf0b2628a8bcfe5ba631ca27cf7f72fa..0d58d3c95c0ba1cf0e8a2a58419c2650f65e1e2b 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1342,7 +1342,7 @@ static IClassFactoryImpl Msi_CF = { &MsiCF_Vtbl }; /****************************************************************** * DllGetClassObject [MSI.@] */ -HRESULT WINAPI MSI_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); @@ -1361,7 +1361,7 @@ HRESULT WINAPI MSI_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) /****************************************************************** * DllGetVersion [MSI.@] */ -HRESULT WINAPI MSI_DllGetVersion(DLLVERSIONINFO *pdvi) +HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *pdvi) { TRACE("%p\n",pdvi); @@ -1379,7 +1379,7 @@ HRESULT WINAPI MSI_DllGetVersion(DLLVERSIONINFO *pdvi) /****************************************************************** * DllCanUnloadNow [MSI.@] */ -BOOL WINAPI MSI_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; } diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 37bc3c8641965af1b66648a57a5cddc742f2dc8b..1bc738bb4d43d69de878e41b1d5f796eabd8c5ae 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -1,7 +1,7 @@ -1 stdcall -private DllCanUnloadNow() MSI_DllCanUnloadNow -2 stdcall -private DllGetClassObject(ptr ptr ptr) MSI_DllGetClassObject -3 stdcall -private DllRegisterServer() MSI_DllRegisterServer -4 stdcall -private DllUnregisterServer() MSI_DllUnregisterServer +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetClassObject(ptr ptr ptr) +3 stdcall -private DllRegisterServer() +4 stdcall -private DllUnregisterServer() 5 stdcall MsiAdvertiseProductA(str str str long) 6 stdcall MsiAdvertiseProductW(wstr wstr wstr long) 7 stdcall MsiCloseAllHandles() @@ -179,7 +179,7 @@ 179 stub MsiGetPatchInfoW 180 stub MsiEnumPatchesA 181 stub MsiEnumPatchesW -182 stdcall DllGetVersion(ptr) MSI_DllGetVersion +182 stdcall -private DllGetVersion(ptr) 183 stub MsiGetProductCodeFromPackageCodeA 184 stub MsiGetProductCodeFromPackageCodeW 185 stub MsiCreateTransformSummaryInfoA diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 849252e85015332c1fb6d6edbff5310e5b1ca0c0..6731010c371eb9e8adb5e1a7571e0d3d31bf7994 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -411,11 +411,6 @@ UINT WINAPI MsiDecomposeDescriptorA( LPCSTR, LPSTR, LPSTR, LPSTR, DWORD * ); LANGID WINAPI MsiLoadStringW( MSIHANDLE, UINT, LPWSTR, int, LANGID ); LANGID WINAPI MsiLoadStringA( MSIHANDLE, UINT, LPSTR, int, LANGID ); -HRESULT WINAPI MSI_DllGetClassObject( REFCLSID, REFIID, LPVOID * ); -HRESULT WINAPI MSI_DllRegisterServer( void ); -HRESULT WINAPI MSI_DllUnregisterServer( void ); -BOOL WINAPI MSI_DllCanUnloadNow( void ); - /* UI globals */ extern INSTALLUILEVEL gUILevel; extern HWND gUIhwnd; diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c index fa3cf503a1c9c76e8555162530db04481bbe3928..dff338375db8c23bdcd14ccb5e4508db96b3d108 100644 --- a/dlls/msi/regsvr.c +++ b/dlls/msi/regsvr.c @@ -598,7 +598,8 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer */ -HRESULT WINAPI MSI_DllRegisterServer(void) { +HRESULT WINAPI DllRegisterServer(void) +{ HRESULT hr; TRACE("\n"); @@ -612,7 +613,8 @@ HRESULT WINAPI MSI_DllRegisterServer(void) { /*********************************************************************** * DllUnregisterServer */ -HRESULT WINAPI MSI_DllUnregisterServer(void) { +HRESULT WINAPI DllUnregisterServer(void) +{ HRESULT hr; TRACE("\n"); diff --git a/dlls/msisys/msisys.c b/dlls/msisys/msisys.c index 686515e929dae82670d73ad60189839e6216c98b..b17308a50d5e6291609e64839b5c2cb16bfea7cc 100644 --- a/dlls/msisys/msisys.c +++ b/dlls/msisys/msisys.c @@ -84,7 +84,7 @@ BOOL WINAPI DllMain( * Success: S_OK * Failure: S_FALSE */ -HRESULT WINAPI MSISYS_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { return S_OK; } @@ -92,8 +92,7 @@ HRESULT WINAPI MSISYS_DllCanUnloadNow(void) /*********************************************************************** * DllGetClassObject (MSISYS.@) */ -HRESULT WINAPI MSISYS_DllGetClassObject( - REFCLSID pclsid, const IID* piid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, const IID* piid, LPVOID *ppv) { FIXME("\n"); @@ -104,7 +103,7 @@ HRESULT WINAPI MSISYS_DllGetClassObject( * DllRegisterServer (MSISYS.@) */ -HRESULT WINAPI MSISYS_DllRegisterServer( void ) +HRESULT WINAPI DllRegisterServer( void ) { FIXME( "(): stub\n" ); return E_FAIL; @@ -114,7 +113,7 @@ HRESULT WINAPI MSISYS_DllRegisterServer( void ) * DllUnregisterServer (MSISYS.@) */ -HRESULT WINAPI MSISYS_DllUnregisterServer( void ) +HRESULT WINAPI DllUnregisterServer( void ) { FIXME( "(): stub\n" ); return E_FAIL; diff --git a/dlls/msisys/msisys.ocx.spec b/dlls/msisys/msisys.ocx.spec index cacdf5278d6fd0c6e1598a1e67cd496bebce1739..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/msisys/msisys.ocx.spec +++ b/dlls/msisys/msisys.ocx.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() MSISYS_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) MSISYS_DllGetClassObject -@ stdcall -private DllRegisterServer() MSISYS_DllRegisterServer -@ stdcall -private DllUnregisterServer() MSISYS_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 14448789fd9798d387e355dc28f956f3df466b12..2485e351c6a0435e618b29dca44a985d1776ae01 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -127,7 +127,7 @@ const struct IClassFactoryVtbl xmlcf_vtbl = static xmlcf domdoccf = { &xmlcf_vtbl, DOMDocument_create }; -HRESULT WINAPI MSXML_DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { IClassFactory *cf = NULL; diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index a44cab61c3c5e79dc06b5d1f1fc789ebd47373ec..dc351b98b0e9bac8ada126af140712612632da35 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); -HRESULT WINAPI MSXML_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { FIXME("\n"); return S_FALSE; @@ -48,7 +48,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } -HRESULT WINAPI MSXML_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { FIXME("\n"); return S_OK; diff --git a/dlls/msxml3/msxml3.spec b/dlls/msxml3/msxml3.spec index 8acb88952780ba5a5b4fe4230dac9c0901509bce..77bf086d07cfadc39f3e421e94016862de68a401 100644 --- a/dlls/msxml3/msxml3.spec +++ b/dlls/msxml3/msxml3.spec @@ -6,7 +6,7 @@ 11 stub @ 12 stub @ -@ stdcall -private DllCanUnloadNow() MSXML_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) MSXML_DllGetClassObject -@ stdcall -private DllRegisterServer() MSXML_DllRegisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() @ stub DllUnregisterServer diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 86477c116e69804b926c450dc3665a4ece4c094a..4d87e3d06bc6389fa67d3c02b04de8496f26dd5c 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -90,7 +90,7 @@ @ stub CreatePointerMoniker #@ stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED @ stdcall CreateStreamOnHGlobal(ptr long ptr) @ stdcall DllDebugObjectRPCHook(long ptr) -@ stdcall -private DllGetClassObject (ptr ptr ptr) OLE32_DllGetClassObject +@ stdcall -private DllGetClassObject (ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 8bf83bbf59491833f4c16810bf2d779b0d2aeccb..62f5daa00f4c5c18c5dea5948ef7c8c01291c5c4 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -988,7 +988,7 @@ static const IPSFactoryBufferVtbl *lppsfac = &psfacbufvtbl; /*********************************************************************** * DllGetClassObject [OLE32.@] */ -HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) { *ppv = NULL; if (IsEqualIID(rclsid, &CLSID_PSFactoryBuffer)) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index b30ac7c7884b0bb9c55367e7c9d16f70245bdd7b..aeb15165a04d9f5c3dd3e96837f9206138485d3e 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -50,13 +50,13 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, return E_NOTIMPL; } -HRESULT WINAPI OLEACC_DllRegisterServer() +HRESULT WINAPI DllRegisterServer(void) { FIXME("\n"); return S_OK; } -HRESULT WINAPI OLEACC_DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer(void) { FIXME("\n"); return S_OK; diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index a41b9698a5c61afcf65af65a4129fdb3afe45ae2..1f19f5c4da537251aca7326f88c6ee1e3e408a65 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -5,8 +5,8 @@ @ stdcall CreateStdAccessibleObject(ptr long ptr ptr) @ stub CreateStdAccessibleProxyA @ stub CreateStdAccessibleProxyW -@ stdcall -private DllRegisterServer() OLEACC_DllRegisterServer -@ stdcall -private DllUnregisterServer() OLEACC_DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub GetOleaccVersionInfo @ stub GetRoleTextA @ stub GetRoleTextW diff --git a/dlls/qcap/qcap.spec b/dlls/qcap/qcap.spec index 94000c31845fbaa45098cbf139ff537eee36db1c..b16365d0c9fc216f15ba2cbb479440656177b77e 100644 --- a/dlls/qcap/qcap.spec +++ b/dlls/qcap/qcap.spec @@ -1,4 +1,4 @@ -@ stdcall -private DllCanUnloadNow() QCAP_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) QCAP_DllGetClassObject -@ stdcall -private DllRegisterServer() QCAP_DllRegisterServer -@ stdcall -private DllUnregisterServer() QCAP_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 43d07d200680d12398121df90505c4ea8104849c..648f9a04f264aa9065d0825660b61baedc0a6c2e 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -171,7 +171,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) /*********************************************************************** * DllRegisterServer (QCAP.@) */ -HRESULT WINAPI QCAP_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { TRACE("()\n"); @@ -181,7 +181,7 @@ HRESULT WINAPI QCAP_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (QCAP.@) */ -HRESULT WINAPI QCAP_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { TRACE("\n"); @@ -191,7 +191,7 @@ HRESULT WINAPI QCAP_DllUnregisterServer(void) /*********************************************************************** * DllCanUnloadNow (QCAP.@) */ -HRESULT WINAPI QCAP_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { TRACE("\n"); @@ -306,7 +306,7 @@ static const IClassFactoryVtbl DSCF_Vtbl = /*********************************************************************** * DllGetClassObject (QCAP.@) */ -HRESULT WINAPI QCAP_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { const CFactoryTemplate *pList = g_cTemplates; IClassFactoryImpl *factory; diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 186096dea28ff322ab1af77b6d160b193a74d45a..97c7609ac16e6f79bd7253df1970d0c53bd2cc66 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -12,7 +12,7 @@ @ stub CreateServerInterfaceFromStub # wxp @ stdcall DceErrorInqTextA (long ptr) @ stdcall DceErrorInqTextW (long ptr) -@ stdcall -private DllRegisterServer() RPCRT4_DllRegisterServer +@ stdcall -private DllRegisterServer() @ stub GlobalMutexClearExternal @ stub GlobalMutexRequestExternal @ stdcall IUnknown_AddRef_Proxy(ptr) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 0974b19dcb83319b2e0a420f9ee472b2042fc931..9dcc9a105738ba38c16f36e83d15c74e11dde99b 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -650,7 +650,7 @@ RPC_STATUS WINAPI UuidFromStringW(unsigned short* s, UUID *uuid) * DllRegisterServer (RPCRT4.@) */ -HRESULT WINAPI RPCRT4_DllRegisterServer( void ) +HRESULT WINAPI DllRegisterServer( void ) { FIXME( "(): stub\n" ); return S_OK; diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index ebe5361d6b31a9a9ef71356e6e8890afa2c6de4a..2ca32b15a92a02f4b7f37400f09b053ad71bef9c 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -650,7 +650,7 @@ static struct regsvr_namespace const namespace_extensions_list[] = { /*********************************************************************** * DllRegisterServer (SHELL32.@) */ -HRESULT WINAPI SHELL32_DllRegisterServer() +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -669,7 +669,7 @@ HRESULT WINAPI SHELL32_DllRegisterServer() /*********************************************************************** * DllUnregisterServer (SHELL32.@) */ -HRESULT WINAPI SHELL32_DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index afd3aee72fcf2b9f9a8fc6199e2423ca1a0108b7..7d172c93b33831347bb04797a96de8be05c0eb46 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -260,12 +260,12 @@ @ stdcall Control_RunDLLA(ptr ptr str long) @ stub Control_RunDLLAsUserW @ stdcall Control_RunDLLW(ptr ptr wstr long) -@ stdcall -private DllCanUnloadNow() SHELL32_DllCanUnloadNow -@ stdcall -private DllGetClassObject(long long ptr) SHELL32_DllGetClassObject -@ stdcall DllGetVersion(ptr)SHELL32_DllGetVersion -@ stdcall DllInstall(long wstr)SHELL32_DllInstall -@ stdcall -private DllRegisterServer() SHELL32_DllRegisterServer -@ stdcall -private DllUnregisterServer() SHELL32_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stdcall DoEnvironmentSubstA(str str) @ stdcall DoEnvironmentSubstW(wstr wstr) @ stdcall DragAcceptFiles(long long) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 7bb731b74003fc9e04e98a9c1d87c53aeb20f431..52d6ddc8ee81c4c75bc63a5178353227ed85443e 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1058,7 +1058,7 @@ void WINAPI FreeIconList( DWORD dw ) * Returns version of a shell32.dll from IE4.01 SP1. */ -HRESULT WINAPI SHELL32_DllGetVersion (DLLVERSIONINFO *pdvi) +HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) { /* FIXME: shouldn't these values come from the version resource? */ if (pdvi->cbSize == sizeof(DLLVERSIONINFO) || @@ -1145,7 +1145,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) * LPCWSTR pszCmdLine - command line (unused by shell32?) */ -HRESULT WINAPI SHELL32_DllInstall(BOOL bInstall, LPCWSTR cmdline) +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { FIXME("%s %s: stub\n", bInstall ? "TRUE":"FALSE", debugstr_w(cmdline)); return S_OK; /* indicate success */ @@ -1154,7 +1154,7 @@ HRESULT WINAPI SHELL32_DllInstall(BOOL bInstall, LPCWSTR cmdline) /*********************************************************************** * DllCanUnloadNow (SHELL32.@) */ -HRESULT WINAPI SHELL32_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { FIXME("stub\n"); return S_FALSE; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 2d8750c536d2bf66783c7316a3470a493d598fb3..d9a3090c3f45de0fbd240d3e28c6a81b2365b48c 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -103,11 +103,6 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST); LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST); -/* FIXME: rename the functions when the shell32.dll has it's own exports namespace */ -HRESULT WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv); -HRESULT WINAPI SHELL32_DllCanUnloadNow(void); - - /* menu merging */ #define MM_ADDSEPARATOR 0x00000001L #define MM_SUBMENUSHAVEIDS 0x00000002L diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 2002359f68096ab9a5d845bb31fb3d9e0fbd82e7..36c3ddba33ff9053177e67faac465b0379505e5d 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -165,7 +165,7 @@ HRESULT WINAPI SHCoCreateInstance( /* now we create an instance */ if (bLoadFromShell32) { - if (! SUCCEEDED(SHELL32_DllGetClassObject(myclsid, &IID_IClassFactory,(LPVOID*)&pcf))) { + if (! SUCCEEDED(DllGetClassObject(myclsid, &IID_IClassFactory,(LPVOID*)&pcf))) { ERR("LoadFromShell failed for CLSID=%s\n", shdebugstr_guid(myclsid)); } } else if (bLoadWithoutCOM) { @@ -216,7 +216,7 @@ end: /************************************************************************* * DllGetClassObject [SHELL32.@] */ -HRESULT WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { HRESULT hres = E_OUTOFMEMORY; IClassFactory * pcf = NULL; diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index af5333a2fc2afdf210efc965b3752522baf6a5b8..ed819891e5439ad8c48b64fb7a5e0fc4fe2bcb3d 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -624,7 +624,7 @@ static HRESULT register_inf(BOOL doregister) /*********************************************************************** * DllRegisterServer (URLMON.@) */ -HRESULT WINAPI URLMON_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -641,7 +641,7 @@ HRESULT WINAPI URLMON_DllRegisterServer(void) /*********************************************************************** * DllUnregisterServer (URLMON.@) */ -HRESULT WINAPI URLMON_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 91e2b0d29536d7823f0109c4e7dcf15fa26c3e72..81bf6b22de4683a6c802e8a710514507782d5ea6 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -26,12 +26,12 @@ @ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) @ stub CreateFormatEnumerator @ stdcall CreateURLMoniker(ptr wstr ptr) -@ stdcall -private DllCanUnloadNow() URLMON_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) URLMON_DllGetClassObject -@ stdcall DllInstall(long ptr) URLMON_DllInstall -@ stdcall -private DllRegisterServer() URLMON_DllRegisterServer -@ stdcall -private DllRegisterServerEx() URLMON_DllRegisterServerEx -@ stdcall -private DllUnregisterServer() URLMON_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllRegisterServerEx() +@ stdcall -private DllUnregisterServer() @ stdcall Extract(long ptr) cabinet.Extract @ stdcall FaultInIEFeature(long ptr ptr long) @ stub FindMediaType diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 52272679e0b3154681bfdd71cd1ad5d2c59a4adc..3dcda86e451e8adf1c08646396fb0a03dc1f6310 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -65,7 +65,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) /*********************************************************************** * DllInstall (URLMON.@) */ -HRESULT WINAPI URLMON_DllInstall(BOOL bInstall, LPCWSTR cmdline) +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", debugstr_w(cmdline)); @@ -76,7 +76,7 @@ HRESULT WINAPI URLMON_DllInstall(BOOL bInstall, LPCWSTR cmdline) /*********************************************************************** * DllCanUnloadNow (URLMON.@) */ -HRESULT WINAPI URLMON_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { return URLMON_refCount != 0 ? S_FALSE : S_OK; } @@ -199,7 +199,7 @@ static const IClassFactoryVtbl CF_Vtbl = * E_UNEXPECTED */ -HRESULT WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { int i; IClassFactoryImpl *factory; @@ -240,7 +240,7 @@ HRESULT WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *pp /*********************************************************************** * DllRegisterServerEx (URLMON.@) */ -HRESULT WINAPI URLMON_DllRegisterServerEx(void) +HRESULT WINAPI DllRegisterServerEx(void) { FIXME("(void): stub\n");