Zebediah Figura : winecrt0: Make __wine_(un)register_resources() cdecl.

Alexandre Julliard julliard at winehq.org
Tue Feb 11 15:44:53 CST 2020


Module: wine
Branch: master
Commit: 5c414922b4ae04a34a90afebaf5177682b6826aa
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5c414922b4ae04a34a90afebaf5177682b6826aa

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Mon Feb 10 15:25:57 2020 -0600

winecrt0: Make __wine_(un)register_resources() cdecl.

This fixes a bug where 64-bit winegstreamer.dll would fail to (un)register
CLSID_VideoProcessorMFT when run manually with regsvr32.

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winecrt0/register.c | 4 ++--
 include/rpcproxy.h       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c
index 8c15d1be72..cb5e7a50f7 100644
--- a/dlls/winecrt0/register.c
+++ b/dlls/winecrt0/register.c
@@ -94,7 +94,7 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam
     return SUCCEEDED(info->result);
 }
 
-HRESULT __wine_register_resources( HMODULE module )
+HRESULT __cdecl __wine_register_resources( HMODULE module )
 {
     struct reg_info info;
 
@@ -106,7 +106,7 @@ HRESULT __wine_register_resources( HMODULE module )
     return info.result;
 }
 
-HRESULT __wine_unregister_resources( HMODULE module )
+HRESULT __cdecl __wine_unregister_resources( HMODULE module )
 {
     struct reg_info info;
 
diff --git a/include/rpcproxy.h b/include/rpcproxy.h
index 4d2c63e62d..5b184329bd 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 ) DECLSPEC_HIDDEN;
-HRESULT __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN;
+HRESULT __cdecl __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN;
+HRESULT __cdecl __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN;
 
 #define CSTDSTUBBUFFERRELEASE(pFactory) \
 ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \




More information about the wine-cvs mailing list