Module: wine Branch: master Commit: a2bcfa28d46563ab3d48eb3ba353583f6888e295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2bcfa28d46563ab3d48eb3ba3...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Fri Nov 22 20:45:03 2013 +0400
kernel32: Add more LoadLibraryEx() flags defines and mark them as unsupported.
---
dlls/kernel32/module.c | 7 ++++++- include/winbase.h | 5 +++++ 2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 63cf012..d1555f1 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -897,7 +897,12 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) LOAD_IGNORE_CODE_AUTHZ_LEVEL | LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | - LOAD_LIBRARY_REQUIRE_SIGNED_TARGET; + LOAD_LIBRARY_REQUIRE_SIGNED_TARGET | + LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | + LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_USER_DIRS | + LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS;
if( flags & unsupported_flags) FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags); diff --git a/include/winbase.h b/include/winbase.h index 8e51c0b..3c620e4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -884,6 +884,11 @@ DECL_WINELIB_TYPE_AW(ENUMRESLANGPROC) #define LOAD_LIBRARY_AS_IMAGE_RESOURCE 0x00000020 #define LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE 0x00000040 #define LOAD_LIBRARY_REQUIRE_SIGNED_TARGET 0x00000080 +#define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR 0x00000100 +#define LOAD_LIBRARY_SEARCH_APPLICATION_DIR 0x00000200 +#define LOAD_LIBRARY_SEARCH_USER_DIRS 0x00000400 +#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800 +#define LOAD_LIBRARY_SEARCH_DEFAULT_DIRS 0x00001000
#define GET_MODULE_HANDLE_EX_FLAG_PIN 1 #define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2