diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c
index 7beb27c664f..067a929a80a 100644
--- a/dlls/amstream/main.c
+++ b/dlls/amstream/main.c
@@ -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 );
 }
diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c
index 427454c9b12..295f11fd986 100644
--- a/dlls/avifil32/factory.c
+++ b/dlls/avifil32/factory.c
@@ -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 );
 }
diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c
index 18af4618fe5..78ce3260428 100644
--- a/dlls/browseui/browseui_main.c
+++ b/dlls/browseui/browseui_main.c
@@ -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 );
 }
diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c
index 539174e4bdc..25b519848ab 100644
--- a/dlls/comdlg32/cdlg32.c
+++ b/dlls/comdlg32/cdlg32.c
@@ -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);
 }
diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c
index 3b43ec8044a..d0ba37d8323 100644
--- a/dlls/d3dxof/main.c
+++ b/dlls/d3dxof/main.c
@@ -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 );
 }
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index d2d2c9da4d3..f7713c59787 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -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 );
 }
 
 /*******************************************************************************
diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c
index 7b32323fa35..1b9c6de4041 100644
--- a/dlls/ddrawex/main.c
+++ b/dlls/ddrawex/main.c
@@ -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 );
 }
diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c
index e19e1e087be..c4bec2efc74 100644
--- a/dlls/devenum/devenum_main.c
+++ b/dlls/devenum/devenum_main.c
@@ -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);
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index d07295d8b61..c461c073cf2 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -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 );
 }
 
 /******************************************************************************
diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c
index 661e01adc81..679e7fde72e 100644
--- a/dlls/dinput8/dinput8_main.c
+++ b/dlls/dinput8/dinput8_main.c
@@ -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 );
 }
diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c
index e727ea68976..43d102297db 100644
--- a/dlls/dmband/dmband_main.c
+++ b/dlls/dmband/dmband_main.c
@@ -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 );
 }
diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c
index 49f129ebeaa..e82ca945f5b 100644
--- a/dlls/dmcompos/dmcompos_main.c
+++ b/dlls/dmcompos/dmcompos_main.c
@@ -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 );
 }
 
 /******************************************************************
diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c
index eed52c312a6..58fe3bf2f9d 100644
--- a/dlls/dmime/dmime_main.c
+++ b/dlls/dmime/dmime_main.c
@@ -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 );
 }
diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c
index 95a3936adec..30bc31b645d 100644
--- a/dlls/dmloader/dmloader_main.c
+++ b/dlls/dmloader/dmloader_main.c
@@ -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 );
 }
diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c
index 95362a1c9aa..11f3f97a59f 100644
--- a/dlls/dmscript/dmscript_main.c
+++ b/dlls/dmscript/dmscript_main.c
@@ -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 );
 }
 
 /******************************************************************
diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c
index 539274852d1..2daa599de59 100644
--- a/dlls/dmstyle/dmstyle_main.c
+++ b/dlls/dmstyle/dmstyle_main.c
@@ -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 );
 }
diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c
index 87cc3c7bbff..966fafca272 100644
--- a/dlls/dmsynth/dmsynth_main.c
+++ b/dlls/dmsynth/dmsynth_main.c
@@ -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 );
 }
 
 /******************************************************************
diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c
index 3a2db891182..723b90a6957 100644
--- a/dlls/dmusic/dmusic_main.c
+++ b/dlls/dmusic/dmusic_main.c
@@ -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 );
 }
 
 /******************************************************************
diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c
index c49f0d612f6..9abdc151588 100644
--- a/dlls/dplayx/dplayx_main.c
+++ b/dlls/dplayx/dplayx_main.c
@@ -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 );
 }
diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c
index 83175184c7f..9b328b91959 100644
--- a/dlls/dpnet/dpnet_main.c
+++ b/dlls/dpnet/dpnet_main.c
@@ -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 );
 }
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index d14a141816e..81dd7dd91b7 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -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 );
 }
diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c
index d9b16d6a943..06b7a4374a9 100644
--- a/dlls/dswave/dswave_main.c
+++ b/dlls/dswave/dswave_main.c
@@ -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 );
 }
 
 /******************************************************************
diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c
index 9f10a607285..0745df6957b 100644
--- a/dlls/dxdiagn/dxdiag_main.c
+++ b/dlls/dxdiagn/dxdiag_main.c
@@ -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 );
 }
diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c
index a62d8858f78..e26082fc5f8 100644
--- a/dlls/explorerframe/explorerframe_main.c
+++ b/dlls/explorerframe/explorerframe_main.c
@@ -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 );
 }
diff --git a/dlls/gameux/main.c b/dlls/gameux/main.c
index 171c8a9287f..2497a3add9c 100644
--- a/dlls/gameux/main.c
+++ b/dlls/gameux/main.c
@@ -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 );
 }
diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c
index f93feccbae6..02d3b7d001d 100644
--- a/dlls/hhctrl.ocx/hhctrl.c
+++ b/dlls/hhctrl.ocx/hhctrl.c
@@ -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 );
 }
diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c
index d547daa66af..a6bc1edff7d 100644
--- a/dlls/hlink/hlink_main.c
+++ b/dlls/hlink/hlink_main.c
@@ -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 );
 }
diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c
index 1bb1e8f8c8d..fe65a78a3f7 100644
--- a/dlls/hnetcfg/hnetcfg.c
+++ b/dlls/hnetcfg/hnetcfg.c
@@ -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 );
 }
diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c
index bf6ac027d4b..0296e5b9108 100644
--- a/dlls/ieframe/ieframe_main.c
+++ b/dlls/ieframe/ieframe_main.c
@@ -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);
 }
diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c
index 1e45c2292dc..8f5eca6ecc1 100644
--- a/dlls/inetcomm/inetcomm_main.c
+++ b/dlls/inetcomm/inetcomm_main.c
@@ -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 );
 }
diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c
index 518e44c860e..edd3759d455 100644
--- a/dlls/infosoft/infosoft_main.c
+++ b/dlls/infosoft/infosoft_main.c
@@ -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 );
 }
diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c
index 0d2cc1078b7..94e19101dff 100644
--- a/dlls/inseng/inseng_main.c
+++ b/dlls/inseng/inseng_main.c
@@ -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 )
diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c
index a085fc67234..fc2eb37d31c 100644
--- a/dlls/itss/itss.c
+++ b/dlls/itss/itss.c
@@ -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 );
 }
diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c
index e46835bd26e..b97e2589f5e 100644
--- a/dlls/jscript/jscript_main.c
+++ b/dlls/jscript/jscript_main.c
@@ -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);
 }
diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 8ead9158110..e8fa09b97da 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -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)
diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c
index b262e07b221..3063a11ce59 100644
--- a/dlls/mmdevapi/main.c
+++ b/dlls/mmdevapi/main.c
@@ -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 );
 }
diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c
index f69c46e80f2..bc12a296359 100644
--- a/dlls/msctf/msctf.c
+++ b/dlls/msctf/msctf.c
@@ -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 );
 }
 
 /***********************************************************************
diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index f7a2d7174e6..00bf0ef4f68 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -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;
 }
diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c
index ab3e68f90bc..669d93bce3e 100644
--- a/dlls/msi/msi_main.c
+++ b/dlls/msi/msi_main.c
@@ -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 );
 }
diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c
index 972429adf28..cfd7443a709 100644
--- a/dlls/msimtf/main.c
+++ b/dlls/msimtf/main.c
@@ -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 );
 }
diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c
index 000833d3852..2a13bae6e75 100644
--- a/dlls/mstask/mstask_main.c
+++ b/dlls/mstask/mstask_main.c
@@ -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 );
 }
diff --git a/dlls/msxml/main.c b/dlls/msxml/main.c
index 008c0a9673f..55e4ecd4050 100644
--- a/dlls/msxml/main.c
+++ b/dlls/msxml/main.c
@@ -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 );
 }
diff --git a/dlls/msxml2/main.c b/dlls/msxml2/main.c
index a5acf7193ec..096ddc2f73b 100644
--- a/dlls/msxml2/main.c
+++ b/dlls/msxml2/main.c
@@ -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 );
 }
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index 01eabab8647..2363008b967 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -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 );
 }
diff --git a/dlls/msxml4/main.c b/dlls/msxml4/main.c
index 0f55f2295ec..fbe7f9eb469 100644
--- a/dlls/msxml4/main.c
+++ b/dlls/msxml4/main.c
@@ -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 );
 }
diff --git a/dlls/msxml6/main.c b/dlls/msxml6/main.c
index 4b5d6e1a57e..9c6f9876dec 100644
--- a/dlls/msxml6/main.c
+++ b/dlls/msxml6/main.c
@@ -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 );
 }
diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c
index f258e1d0dd8..83a845dc8eb 100644
--- a/dlls/objsel/objsel.c
+++ b/dlls/objsel/objsel.c
@@ -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 );
 }
 
 
diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c
index 2669d3e1d2e..af81d7792e4 100644
--- a/dlls/oledb32/main.c
+++ b/dlls/oledb32/main.c
@@ -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 );
 }
diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c
index 79c4b8a0c75..734f3269745 100644
--- a/dlls/qedit/main.c
+++ b/dlls/qedit/main.c
@@ -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 );
 }
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 2516af61504..f309cd3a197 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -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 );
 }
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index dd042801975..981a24591c1 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -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 );
 }
 
 /***********************************************************************
diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c
index 3389bf4cb57..093019acb48 100644
--- a/dlls/vbscript/vbscript_main.c
+++ b/dlls/vbscript/vbscript_main.c
@@ -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);
 }
diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c
index c6bb240046f..c9bff5dc71a 100644
--- a/dlls/wbemprox/main.c
+++ b/dlls/wbemprox/main.c
@@ -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 );
 }
diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c
index 0302a48248a..8ffb2158b42 100644
--- a/dlls/wiaservc/wiaservc_main.c
+++ b/dlls/wiaservc/wiaservc_main.c
@@ -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);
 }
diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c
index 275ed32e7a6..407dfbdfa13 100644
--- a/dlls/winecrt0/register.c
+++ b/dlls/winecrt0/register.c
@@ -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;
diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c
index d80998f3955..5348d4d4677 100644
--- a/dlls/winhttp/main.c
+++ b/dlls/winhttp/main.c
@@ -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 );
 }
diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c
index 4f761bbf681..edc7c71f0fd 100644
--- a/dlls/wmiutils/main.c
+++ b/dlls/wmiutils/main.c
@@ -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 );
 }
diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c
index 06b271ea4de..c553ea21363 100644
--- a/dlls/wuapi/main.c
+++ b/dlls/wuapi/main.c
@@ -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 );
 }
diff --git a/include/rpcproxy.h b/include/rpcproxy.h
index 991ace8dfac..4d2c63e62d6 100644
--- a/include/rpcproxy.h
+++ b/include/rpcproxy.h
@@ -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) )