[PATCH 0/1] MR2995: rpcrt4: Don't use GetProcAddress for ole32 functions.

[Alex Henrie (＠alexhenrie)]

It's more elegant to put ole32 in the DELAYIMPORTS.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2995

[PATCH 1/1] rpcrt4: Don't use GetProcAddress for ole32 functions.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

It's more elegant to put ole32 in the DELAYIMPORTS.
---
 dlls/rpcrt4/Makefile.in |  2 +-
 dlls/rpcrt4/ndr_ole.c   | 62 +++++++++--------------------------------
 2 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index 2aa2a5376aa..3542118d1a0 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -2,7 +2,7 @@ EXTRADEFS = -D_RPCRT4_ -DMSWMSG
 MODULE    = rpcrt4.dll
 IMPORTLIB = rpcrt4
 IMPORTS   = uuid advapi32
-DELAYIMPORTS = iphlpapi wininet secur32 user32 ws2_32 oleaut32
+DELAYIMPORTS = iphlpapi wininet secur32 user32 ws2_32 ole32 oleaut32
 
 ndr_types_EXTRAIDLFLAGS = -Oicf
 
diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c
index 2fdc7b55335..69ce3e1871b 100644
--- a/dlls/rpcrt4/ndr_ole.c
+++ b/dlls/rpcrt4/ndr_ole.c
@@ -44,33 +44,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-static HMODULE hOLE;
-
-static HRESULT (WINAPI *COM_GetMarshalSizeMax)(ULONG *,REFIID,LPUNKNOWN,DWORD,LPVOID,DWORD);
-static HRESULT (WINAPI *COM_MarshalInterface)(LPSTREAM,REFIID,LPUNKNOWN,DWORD,LPVOID,DWORD);
-static HRESULT (WINAPI *COM_UnmarshalInterface)(LPSTREAM,REFIID,LPVOID*);
-static HRESULT (WINAPI *COM_ReleaseMarshalData)(LPSTREAM);
-static HRESULT (WINAPI *COM_GetClassObject)(REFCLSID,DWORD,COSERVERINFO *,REFIID,LPVOID *);
-static HRESULT (WINAPI *COM_GetPSClsid)(REFIID,CLSID *);
-static LPVOID (WINAPI *COM_MemAlloc)(ULONG);
-static void (WINAPI *COM_MemFree)(LPVOID);
-
-static HMODULE LoadCOM(void)
-{
-  if (hOLE) return hOLE;
-  hOLE = LoadLibraryA("OLE32.DLL");
-  if (!hOLE) return 0;
-  COM_GetMarshalSizeMax  = (LPVOID)GetProcAddress(hOLE, "CoGetMarshalSizeMax");
-  COM_MarshalInterface   = (LPVOID)GetProcAddress(hOLE, "CoMarshalInterface");
-  COM_UnmarshalInterface = (LPVOID)GetProcAddress(hOLE, "CoUnmarshalInterface");
-  COM_ReleaseMarshalData = (LPVOID)GetProcAddress(hOLE, "CoReleaseMarshalData");
-  COM_GetClassObject     = (LPVOID)GetProcAddress(hOLE, "CoGetClassObject");
-  COM_GetPSClsid         = (LPVOID)GetProcAddress(hOLE, "CoGetPSClsid");
-  COM_MemAlloc = (LPVOID)GetProcAddress(hOLE, "CoTaskMemAlloc");
-  COM_MemFree  = (LPVOID)GetProcAddress(hOLE, "CoTaskMemFree");
-  return hOLE;
-}
-
 /* CoMarshalInterface/CoUnmarshalInterface works on streams,
  * so implement a simple stream on top of the RPC buffer
  * (which also implements the MInterfacePointer structure) */
@@ -313,14 +286,13 @@ unsigned char * WINAPI NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
 
   TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat);
   pStubMsg->MaxCount = 0;
-  if (!LoadCOM()) return NULL;
   if (pStubMsg->Buffer + sizeof(DWORD) <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) {
     hr = RpcStream_Create(pStubMsg, TRUE, NULL, &stream);
     if (hr == S_OK) {
       if (pMemory)
-        hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory,
-                                  pStubMsg->dwDestContext, pStubMsg->pvDestContext,
-                                  MSHLFLAGS_NORMAL);
+        hr = CoMarshalInterface(stream, riid, (IUnknown *)pMemory,
+                                pStubMsg->dwDestContext, pStubMsg->pvDestContext,
+                                MSHLFLAGS_NORMAL);
       IStream_Release(stream);
     }
 
@@ -343,7 +315,6 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg
   HRESULT hr;
 
   TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc);
-  if (!LoadCOM()) return NULL;
 
   /* Avoid reference leaks for [in, out] pointers. */
   if (pStubMsg->IsClient && *unk)
@@ -356,7 +327,7 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg
     hr = RpcStream_Create(pStubMsg, FALSE, &size, &stream);
     if (hr == S_OK) {
       if (size != 0)
-        hr = COM_UnmarshalInterface(stream, &IID_NULL, (void **)unk);
+        hr = CoUnmarshalInterface(stream, &IID_NULL, (void **)unk);
 
       IStream_Release(stream);
     }
@@ -378,10 +349,9 @@ void WINAPI NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
   ULONG size = 0;
 
   TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat);
-  if (!LoadCOM()) return;
-  COM_GetMarshalSizeMax(&size, riid, (LPUNKNOWN)pMemory,
-                        pStubMsg->dwDestContext, pStubMsg->pvDestContext,
-                        MSHLFLAGS_NORMAL);
+  CoGetMarshalSizeMax(&size, riid, (IUnknown *)pMemory,
+                      pStubMsg->dwDestContext, pStubMsg->pvDestContext,
+                      MSHLFLAGS_NORMAL);
   TRACE("size=%ld\n", size);
   pStubMsg->BufferLength += sizeof(DWORD) + size;
 }
@@ -422,8 +392,7 @@ void WINAPI NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg,
  */
 void * WINAPI NdrOleAllocate(SIZE_T Size)
 {
-  if (!LoadCOM()) return NULL;
-  return COM_MemAlloc(Size);
+  return CoTaskMemAlloc(Size);
 }
 
 /***********************************************************************
@@ -431,8 +400,7 @@ void * WINAPI NdrOleAllocate(SIZE_T Size)
  */
 void WINAPI NdrOleFree(void *NodeToFree)
 {
-  if (!LoadCOM()) return;
-  COM_MemFree(NodeToFree);
+  CoTaskMemFree(NodeToFree);
 }
 
 /***********************************************************************
@@ -445,12 +413,10 @@ HRESULT create_proxy(REFIID iid, IUnknown *pUnkOuter, IRpcProxyBuffer **pproxy,
     IPSFactoryBuffer *psfac;
     HRESULT r;
 
-    if(!LoadCOM()) return E_FAIL;
-
-    r = COM_GetPSClsid( iid, &clsid );
+    r = CoGetPSClsid(iid, &clsid);
     if(FAILED(r)) return r;
 
-    r = COM_GetClassObject( &clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IPSFactoryBuffer, (void**)&psfac );
+    r = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IPSFactoryBuffer, (void **)&psfac);
     if(FAILED(r)) return r;
 
     r = IPSFactoryBuffer_CreateProxy(psfac, pUnkOuter, iid, pproxy, ppv);
@@ -469,12 +435,10 @@ HRESULT create_stub(REFIID iid, IUnknown *pUnk, IRpcStubBuffer **ppstub)
     IPSFactoryBuffer *psfac;
     HRESULT r;
 
-    if(!LoadCOM()) return E_FAIL;
-
-    r = COM_GetPSClsid( iid, &clsid );
+    r = CoGetPSClsid(iid, &clsid);
     if(FAILED(r)) return r;
 
-    r = COM_GetClassObject( &clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IPSFactoryBuffer, (void**)&psfac );
+    r = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IPSFactoryBuffer, (void **)&psfac);
     if(FAILED(r)) return r;
 
     r = IPSFactoryBuffer_CreateStub(psfac, iid, pUnk, ppstub);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2995

[PATCH 0/1] MR2995: rpcrt4: Don't use GetProcAddress for ole32 functions. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2995