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

winecrt0: Remove the clsid parameter in __wine_(un)register_resources.

This commit is contained in:
Alexandre Julliard 2011-08-02 15:51:55 +02:00
parent e76db63c02
commit b56dc9a6f7
59 changed files with 122 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/amstream/main.c
View File

@ -216,7 +216,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -224,5 +224,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/avifil32/factory.c
View File

@ -228,7 +228,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( AVIFILE_hModule, NULL );
return __wine_register_resources( AVIFILE_hModule );
}
/***********************************************************************
@ -236,5 +236,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( AVIFILE_hModule, NULL );
return __wine_unregister_resources( AVIFILE_hModule );
}

4
dlls/browseui/browseui_main.c
View File

@ -246,7 +246,7 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( BROWSEUI_hinstance, NULL );
return __wine_register_resources( BROWSEUI_hinstance );
}
/***********************************************************************
@ -254,5 +254,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( BROWSEUI_hinstance, NULL );
return __wine_unregister_resources( BROWSEUI_hinstance );
}

4
dlls/comdlg32/cdlg32.c
View File

@ -282,7 +282,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources(COMDLG32_hInstance, NULL);
return __wine_register_resources(COMDLG32_hInstance);
}
/***********************************************************************
@ -290,5 +290,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources(COMDLG32_hInstance, NULL);
return __wine_unregister_resources(COMDLG32_hInstance);
}

4
dlls/d3dxof/main.c
View File

@ -238,7 +238,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -246,5 +246,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/ddraw/main.c
View File

@ -721,7 +721,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -729,7 +729,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}
/*******************************************************************************

4
dlls/ddrawex/main.c
View File

@ -339,7 +339,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -347,5 +347,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/devenum/devenum_main.c
View File

@ -100,7 +100,7 @@ HRESULT WINAPI DllRegisterServer(void)
TRACE("\n");
res = __wine_register_resources( DEVENUM_hInstance, NULL );
res = __wine_register_resources( DEVENUM_hInstance );
/* Quartz is needed for IFilterMapper2 */
DEVENUM_RegisterQuartz();
@ -149,7 +149,7 @@ HRESULT WINAPI DllRegisterServer(void)
HRESULT WINAPI DllUnregisterServer(void)
{
FIXME("stub!\n");
return __wine_unregister_resources( DEVENUM_hInstance, NULL );
return __wine_unregister_resources( DEVENUM_hInstance );
}
typedef HRESULT (WINAPI *DllRegisterServer_func)(void);

4
dlls/dinput/dinput_main.c
View File

@ -1174,7 +1174,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( DINPUT_instance, NULL );
return __wine_register_resources( DINPUT_instance );
}
/***********************************************************************
@ -1182,7 +1182,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( DINPUT_instance, NULL );
return __wine_unregister_resources( DINPUT_instance );
}
/******************************************************************************

4
dlls/dinput8/dinput8_main.c
View File

@ -235,7 +235,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -243,5 +243,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/dmband/dmband_main.c
View File

@ -162,7 +162,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -170,5 +170,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/dmcompos/dmcompos_main.c
View File

@ -187,7 +187,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) {
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -195,7 +195,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}
/******************************************************************

4
dlls/dmime/dmime_main.c
View File

@ -232,7 +232,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -240,5 +240,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/dmloader/dmloader_main.c
View File

@ -156,7 +156,7 @@ HRESULT WINAPI DllGetClassObject (REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -164,5 +164,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/dmscript/dmscript_main.c
View File

@ -217,7 +217,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -225,7 +225,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}
/******************************************************************

4
dlls/dmstyle/dmstyle_main.c
View File

@ -199,7 +199,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) {
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -207,5 +207,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/dmsynth/dmsynth_main.c
View File

@ -167,7 +167,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -175,7 +175,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}
/******************************************************************

4
dlls/dmusic/dmusic_main.c
View File

@ -167,7 +167,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -175,7 +175,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}
/******************************************************************

4
dlls/dplayx/dplayx_main.c
View File

@ -120,7 +120,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -128,5 +128,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/dpnet/dpnet_main.c
View File

@ -167,7 +167,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -175,5 +175,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/dsound/dsound_main.c
View File

@ -700,7 +700,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -708,5 +708,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/dswave/dswave_main.c
View File

@ -153,7 +153,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -161,7 +161,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}
/******************************************************************

4
dlls/dxdiagn/dxdiag_main.c
View File

@ -152,7 +152,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( dxdiagn_instance, NULL );
return __wine_register_resources( dxdiagn_instance );
}
/***********************************************************************
@ -160,5 +160,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( dxdiagn_instance, NULL );
return __wine_unregister_resources( dxdiagn_instance );
}

4
dlls/explorerframe/explorerframe_main.c
View File

@ -213,7 +213,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( explorerframe_hinstance, NULL );
return __wine_register_resources( explorerframe_hinstance );
}
/*************************************************************************
@ -221,5 +221,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( explorerframe_hinstance, NULL );
return __wine_unregister_resources( explorerframe_hinstance );
}

4
dlls/gameux/main.c
View File

@ -64,7 +64,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -72,5 +72,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/hhctrl.ocx/hhctrl.c
View File

@ -396,7 +396,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( hhctrl_hinstance, NULL );
return __wine_register_resources( hhctrl_hinstance );
}
/***********************************************************************
@ -404,5 +404,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( hhctrl_hinstance, NULL );
return __wine_unregister_resources( hhctrl_hinstance );
}

4
dlls/hlink/hlink_main.c
View File

@ -590,7 +590,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -598,5 +598,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/hnetcfg/hnetcfg.c
View File

@ -159,7 +159,7 @@ HRESULT WINAPI DllCanUnloadNow( void )
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -167,5 +167,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/ieframe/ieframe_main.c
View File

@ -279,7 +279,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
HRESULT WINAPI DllRegisterServer(void)
{
TRACE("()\n");
return __wine_register_resources(ieframe_instance, NULL);
return __wine_register_resources(ieframe_instance);
}
/***********************************************************************
@ -288,5 +288,5 @@ HRESULT WINAPI DllRegisterServer(void)
HRESULT WINAPI DllUnregisterServer(void)
{
TRACE("()\n");
return __wine_unregister_resources(ieframe_instance, NULL);
return __wine_unregister_resources(ieframe_instance);
}

4
dlls/inetcomm/inetcomm_main.c
View File

@ -211,7 +211,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -219,5 +219,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/infosoft/infosoft_main.c
View File

@ -162,7 +162,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -170,5 +170,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/inseng/inseng_main.c
View File

@ -76,7 +76,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -84,7 +84,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}
BOOL WINAPI CheckTrustEx( LPVOID a, LPVOID b, LPVOID c, LPVOID d, LPVOID e )

4
dlls/itss/itss.c
View File

@ -393,7 +393,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( hInst, NULL );
return __wine_register_resources( hInst );
}
/***********************************************************************
@ -401,5 +401,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( hInst, NULL );
return __wine_unregister_resources( hInst );
}

4
dlls/jscript/jscript_main.c
View File

@ -143,7 +143,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
HRESULT WINAPI DllRegisterServer(void)
{
TRACE("()\n");
return __wine_register_resources(jscript_hinstance, NULL);
return __wine_register_resources(jscript_hinstance);
}
/***********************************************************************
@ -152,5 +152,5 @@ HRESULT WINAPI DllRegisterServer(void)
HRESULT WINAPI DllUnregisterServer(void)
{
TRACE("()\n");
return __wine_unregister_resources(jscript_hinstance, NULL);
return __wine_unregister_resources(jscript_hinstance);
}

4
dlls/mlang/mlang.c
View File

@ -3597,7 +3597,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -3605,7 +3605,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}
HRESULT WINAPI GetGlobalFontLinkObject(void **unknown)

4
dlls/mmdevapi/main.c
View File

@ -279,7 +279,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -287,5 +287,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/msctf/msctf.c
View File

@ -564,7 +564,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *ppvOut)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( MSCTF_hinstance, NULL );
return __wine_register_resources( MSCTF_hinstance );
}
/***********************************************************************
@ -572,7 +572,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( MSCTF_hinstance, NULL );
return __wine_unregister_resources( MSCTF_hinstance );
}
/***********************************************************************

4
dlls/mshtml/main.c
View File

@ -467,7 +467,7 @@ HRESULT WINAPI DllRegisterServer(void)
{
HRESULT hres;
hres = __wine_register_resources( hInst, NULL );
hres = __wine_register_resources( hInst );
if(SUCCEEDED(hres))
hres = register_server(TRUE);
if(SUCCEEDED(hres))
@ -481,7 +481,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
HRESULT hres = __wine_unregister_resources( hInst, NULL );
HRESULT hres = __wine_unregister_resources( hInst );
if(SUCCEEDED(hres)) hres = register_server(FALSE);
return hres;
}

4
dlls/msi/msi_main.c
View File

@ -232,7 +232,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( msi_hInstance, NULL );
return __wine_register_resources( msi_hInstance );
}
/***********************************************************************
@ -240,5 +240,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( msi_hInstance, NULL );
return __wine_unregister_resources( msi_hInstance );
}

4
dlls/msimtf/main.c
View File

@ -163,7 +163,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( msimtf_instance, NULL );
return __wine_register_resources( msimtf_instance );
}
/***********************************************************************
@ -171,5 +171,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( msimtf_instance, NULL );
return __wine_unregister_resources( msimtf_instance );
}

4
dlls/mstask/mstask_main.c
View File

@ -68,10 +68,10 @@ HRESULT WINAPI DllCanUnloadNow(void)
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( hInst, NULL );
return __wine_register_resources( hInst );
}
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( hInst, NULL );
return __wine_unregister_resources( hInst );
}

4
dlls/msxml/main.c
View File

@ -51,7 +51,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -59,5 +59,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/msxml2/main.c
View File

@ -51,7 +51,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -59,5 +59,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/msxml3/main.c
View File

@ -299,7 +299,7 @@ const char *debugstr_variant(const VARIANT *v)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( MSXML_hInstance, NULL );
return __wine_register_resources( MSXML_hInstance );
}
/***********************************************************************
@ -307,5 +307,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( MSXML_hInstance, NULL );
return __wine_unregister_resources( MSXML_hInstance );
}

4
dlls/msxml4/main.c
View File

@ -48,7 +48,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -56,5 +56,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/msxml6/main.c
View File

@ -48,7 +48,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -56,5 +56,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/objsel/objsel.c
View File

@ -75,7 +75,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( hInstance, NULL );
return __wine_register_resources( hInstance );
}
@ -84,7 +84,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( hInstance, NULL );
return __wine_unregister_resources( hInstance );
}

4
dlls/oledb32/main.c
View File

@ -157,7 +157,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -165,5 +165,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/qedit/main.c
View File

@ -193,7 +193,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -201,5 +201,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/rsaenh/rsaenh.c
View File

@ -4551,7 +4551,7 @@ static const WCHAR szDefaultKeys[3][65] = {
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/******************************************************************************
@ -4559,5 +4559,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/shell32/shell32_main.c
View File

@ -1238,7 +1238,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
HRESULT hr = __wine_register_resources( shell32_hInstance, NULL );
HRESULT hr = __wine_register_resources( shell32_hInstance );
if (SUCCEEDED(hr)) hr = SHELL_RegisterShellFolders();
return hr;
}
@ -1248,7 +1248,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( shell32_hInstance, NULL );
return __wine_unregister_resources( shell32_hInstance );
}
/***********************************************************************

4
dlls/vbscript/vbscript_main.c
View File

@ -134,7 +134,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
HRESULT WINAPI DllRegisterServer(void)
{
TRACE("()\n");
return __wine_register_resources(vbscript_hinstance, NULL);
return __wine_register_resources(vbscript_hinstance);
}
/***********************************************************************
@ -143,5 +143,5 @@ HRESULT WINAPI DllRegisterServer(void)
HRESULT WINAPI DllUnregisterServer(void)
{
TRACE("()\n");
return __wine_unregister_resources(vbscript_hinstance, NULL);
return __wine_unregister_resources(vbscript_hinstance);
}

4
dlls/wbemprox/main.c
View File

@ -160,7 +160,7 @@ HRESULT WINAPI DllCanUnloadNow( void )
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -168,5 +168,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/wiaservc/wiaservc_main.c
View File

@ -165,14 +165,14 @@ static HRESULT register_server(BOOL do_register)
HRESULT WINAPI DllRegisterServer(void)
{
HRESULT hr = __wine_register_resources( hInst, NULL );
HRESULT hr = __wine_register_resources( hInst );
if (FAILED(hr)) return hr;
return register_server(TRUE);
}
HRESULT WINAPI DllUnregisterServer(void)
{
HRESULT hr = __wine_unregister_resources( hInst, NULL );
HRESULT hr = __wine_unregister_resources( hInst );
if (FAILED(hr)) return hr;
return register_server(FALSE);
}

19
dlls/winecrt0/register.c
View File

@ -33,12 +33,10 @@
static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0};
static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0};
static const WCHAR moduleW[] = {'M','O','D','U','L','E',0};
static const WCHAR clsidW[] = {'C','L','S','I','D','_','P','S','F','a','c','t','o','r','y','B','u','f','f','e','r',0};
struct reg_info
{
IRegistrar *registrar;
const CLSID *clsid;
BOOL do_register;
BOOL uninit;
HRESULT result;
@ -48,17 +46,15 @@ static HMODULE ole32;
static HRESULT (WINAPI *pCoInitialize)(LPVOID);
static void (WINAPI *pCoUninitialize)(void);
static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*);
static INT (WINAPI *pStringFromGUID2)(REFGUID,LPOLESTR,INT);
static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info )
{
if (!pStringFromGUID2)
if (!pCoCreateInstance)
{
if (!(ole32 = LoadLibraryW( ole32W )) ||
!(pCoInitialize = (void *)GetProcAddress( ole32, "CoInitialize" )) ||
!(pCoUninitialize = (void *)GetProcAddress( ole32, "CoUninitialize" )) ||
!(pCoCreateInstance = (void *)GetProcAddress( ole32, "CoCreateInstance" )) ||
!(pStringFromGUID2 = (void *)GetProcAddress( ole32, "StringFromGUID2" )))
!(pCoCreateInstance = (void *)GetProcAddress( ole32, "CoCreateInstance" )))
{
info->result = E_NOINTERFACE;
return NULL;
@ -74,11 +70,6 @@ static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info )
GetModuleFileNameW( inst, str, MAX_PATH );
IRegistrar_AddReplacement( info->registrar, moduleW, str );
if (info->clsid)
{
pStringFromGUID2( info->clsid, str, MAX_PATH );
IRegistrar_AddReplacement( info->registrar, clsidW, str );
}
}
return info->registrar;
}
@ -111,12 +102,11 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam
return SUCCEEDED(info->result);
}
HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid )
HRESULT __wine_register_resources( HMODULE module )
{
struct reg_info info;
info.registrar = NULL;
info.clsid = clsid;
info.do_register = TRUE;
info.uninit = FALSE;
info.result = S_OK;
@ -126,12 +116,11 @@ HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid )
return info.result;
}
HRESULT __wine_unregister_resources( HMODULE module, const CLSID *clsid )
HRESULT __wine_unregister_resources( HMODULE module )
{
struct reg_info info;
info.registrar = NULL;
info.clsid = clsid;
info.do_register = FALSE;
info.uninit = FALSE;
info.result = S_OK;

4
dlls/winhttp/main.c
View File

@ -170,7 +170,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -178,5 +178,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/wmiutils/main.c
View File

@ -157,7 +157,7 @@ HRESULT WINAPI DllCanUnloadNow( void )
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -165,5 +165,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

4
dlls/wuapi/main.c
View File

@ -161,7 +161,7 @@ HRESULT WINAPI DllCanUnloadNow( void )
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
return __wine_register_resources( instance );
}
/***********************************************************************
@ -169,5 +169,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
return __wine_unregister_resources( instance );
}

8
include/rpcproxy.h
View File

@ -203,8 +203,8 @@ RPCRTAPI HRESULT RPC_ENTRY
RPCRTAPI HRESULT RPC_ENTRY
NdrDllUnregisterProxy( HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid );
HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid ) DECLSPEC_HIDDEN;
HRESULT __wine_unregister_resources( HMODULE module, const CLSID *clsid ) DECLSPEC_HIDDEN;
HRESULT __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN;
HRESULT __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN;
#define CSTDSTUBBUFFERRELEASE(pFactory) \
ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \
@ -289,8 +289,8 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \
#endif
#ifdef WINE_REGISTER_DLL
# define WINE_DO_REGISTER_DLL(pfl, clsid) return __wine_register_resources( hProxyDll, (clsid) )
# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return __wine_unregister_resources( hProxyDll, (clsid) )
# define WINE_DO_REGISTER_DLL(pfl, clsid) return __wine_register_resources( hProxyDll )
# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return __wine_unregister_resources( hProxyDll )
#else
# define WINE_DO_REGISTER_DLL(pfl, clsid) return NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) )
# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) )