[Libreoffice-commits] core.git: embedserv/source

[Mike Kaganski (via logerrit)]

 embedserv/source/inprocserv/dllentry.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit eb31b387ac4b679e4da851b8b17e9b4e35722c04
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Jan 5 13:58:46 2022 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Jan 5 16:20:36 2022 +0100

    Use GetModuleHandleExW instead of GetModuleHandleW
    
    ... following commit d75bf2c7703d6a741f04e4a3fc5a6180428f53b2
        Date:       Wed Jan 05 13:20:09 2022 +0300
        tdf#146554: use GetModuleHandleExW instead of GetModuleHandleW
    
    Change-Id: I37c989de37c28123ca692145a429b6ba03202f99
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128002
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/embedserv/source/inprocserv/dllentry.cxx 
b/embedserv/source/inprocserv/dllentry.cxx
index dc7829c54ba1..6c06fae47f59 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -203,7 +203,10 @@ STDAPI DllCanUnloadNow()
 
 STDAPI DllRegisterServer()
 {
-    HMODULE aCurModule = GetModuleHandleW( L"inprocserv.dll" );
+    HMODULE aCurModule{};
+    GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
+                           | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                       reinterpret_cast<LPCWSTR>(&DllRegisterServer), 
&aCurModule);
     if( aCurModule )
     {
         wchar_t aLibPath[1024];