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
This commit is contained in:
parent
6f85816a81
commit
0f8efbf98f
1 changed files with 5 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue