From 0f8efbf98f8d1176f130225716efa26bcaaa6266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Mon, 12 Jul 2004 11:58:02 +0000 Subject: [PATCH] INTEGRATION: CWS jl9 (1.16.38); FILE MERGED 2004/06/02 14:42:01 jl 1.16.38.1: #i29787# osl_loadModule now uses LoadLibraryEx with altered search path as fallback --- sal/osl/w32/module.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sal/osl/w32/module.c b/sal/osl/w32/module.c index 69438affb40a..3f41a9ecc906 100644 --- a/sal/osl/w32/module.c +++ b/sal/osl/w32/module.c @@ -2,9 +2,9 @@ * * $RCSfile: module.c,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2004-03-30 16:30:21 $ + * last change: $Author: rt $ $Date: 2004-07-12 12:58:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,9 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod rtl_uString_assign(&Module, strModuleName); hInstance = LoadLibraryW(Module->buffer); + if (hInstance == NULL) + hInstance = LoadLibraryExW(Module->buffer, NULL, + LOAD_WITH_ALTERED_SEARCH_PATH); if (hInstance <= (HINSTANCE)HINSTANCE_ERROR) hInstance = 0;