Don't prefix the functions DllCanUnloadNow, DllGetClassObject and

Dll(Un)RegisterServer with the dll name so that the compiler can check
the prototypes.
This commit is contained in:
Alexandre Julliard 2005-08-08 17:35:28 +00:00
parent 964815bc42
commit d37f0abf07
88 changed files with 258 additions and 245 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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