wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

Vincent Povirk : gdiplus: Check for invalid coordinate space in GdipTransformPoints.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 5c12cede8daece645fa5d6f7df644efa58725588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c12cede8daece645fa5d6f7d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 28 11:42:13 2017 -0500 gdiplus: Check for invalid coordinate space in GdipTransformPoints. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 +++- dlls/gdiplus/tests/graphics.c | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 80e565b..ce223aa 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6606,7 +6606,9 @@ GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace GpMatrix matrix; GpStatus stat; - if(!graphics || !points || count <= 0) + if(!graphics || !points || count <= 0 || + dst_space < 0 || dst_space > CoordinateSpaceDevice || + src_space < 0 || src_space > CoordinateSpaceDevice) return InvalidParameter; if(graphics->busy) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 6802184..9a6dd1b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1868,6 +1868,15 @@ static void test_transformpoints(void) status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, -1); expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice+1, CoordinateSpaceWorld, ptf, 2); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, -1, CoordinateSpaceWorld, ptf, 2); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceDevice+1, ptf, 2); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, -1, ptf, 2); + expect(InvalidParameter, status); + ptf[0].X = 1.0; ptf[0].Y = 0.0; ptf[1].X = 0.0;

1 0

Dmitry Timoshkov : gdiplus: Set correct color space flags for grayscale images.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 8c593bd37ad1177144d720d17b6b706d2ee619f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c593bd37ad1177144d720d17… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 28 11:30:16 2017 -0500 gdiplus: Set correct color space flags for grayscale images. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 9 ++++++++- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e3bc70e..80ad65f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3718,7 +3718,14 @@ static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, BOOL force_conversi if (status == Ok) { /* Native GDI+ used to be smarter, but since Win7 it just sets these flags. */ - bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI|ImageFlagsColorSpaceRGB; + bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI; + if (IsEqualGUID(&wic_format, &GUID_WICPixelFormat2bppGray) || + IsEqualGUID(&wic_format, &GUID_WICPixelFormat4bppGray) || + IsEqualGUID(&wic_format, &GUID_WICPixelFormat8bppGray) || + IsEqualGUID(&wic_format, &GUID_WICPixelFormat16bppGray)) + bitmap->image.flags |= ImageFlagsColorSpaceGRAY; + else + bitmap->image.flags |= ImageFlagsColorSpaceRGB; bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; bitmap->image.decoder = decoder; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9f7cf66..a1bd056 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5022,7 +5022,6 @@ static void test_png_color_formats(void) status = GdipGetImageFlags(image, &flags); expect(Ok, status); -todo_wine_if(td[i].bit_depth > 1 && td[i].color_type == 0) ok((flags & td[i].flags) == td[i].flags || broken(td[i].bit_depth == 1 && td[i].color_type == 0 && (flags & ImageFlagsColorSpaceGRAY)), /* XP */ "%d: expected %#x, got %#x\n", i, td[i].flags, flags);

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for image flags to PNG grayscale image tests.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 221c04d0dfb813750a458dfd6b40b828403ed958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221c04d0dfb813750a458dfd6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 28 11:30:15 2017 -0500 gdiplus/tests: Add a test for image flags to PNG grayscale image tests. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b9685c3..9f7cf66 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4980,22 +4980,24 @@ static void test_png_color_formats(void) { char bit_depth, color_type; PixelFormat format; + UINT flags; } td[] = { /* 2 - PNG_COLOR_TYPE_RGB */ - { 8, 2, PixelFormat24bppRGB }, + { 8, 2, PixelFormat24bppRGB, ImageFlagsColorSpaceRGB }, /* 0 - PNG_COLOR_TYPE_GRAY */ - { 1, 0, PixelFormat1bppIndexed }, - { 2, 0, PixelFormat32bppARGB }, - { 4, 0, PixelFormat32bppARGB }, - { 8, 0, PixelFormat32bppARGB }, - { 16, 0, PixelFormat32bppARGB }, + { 1, 0, PixelFormat1bppIndexed, ImageFlagsColorSpaceRGB }, + { 2, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, + { 4, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, + { 8, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, + { 16, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, }; BYTE buf[sizeof(png_1x1_data)]; GpStatus status; GpImage *image; ImageType type; PixelFormat format; + UINT flags; int i; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) @@ -5018,6 +5020,13 @@ static void test_png_color_formats(void) broken(td[i].bit_depth == 1 && td[i].color_type == 0 && format == PixelFormat32bppARGB), /* XP */ "%d: expected %#x, got %#x\n", i, td[i].format, format); + status = GdipGetImageFlags(image, &flags); + expect(Ok, status); +todo_wine_if(td[i].bit_depth > 1 && td[i].color_type == 0) + ok((flags & td[i].flags) == td[i].flags || + broken(td[i].bit_depth == 1 && td[i].color_type == 0 && (flags & ImageFlagsColorSpaceGRAY)), /* XP */ + "%d: expected %#x, got %#x\n", i, td[i].flags, flags); + GdipDisposeImage(image); } }

1 0

Alexandre Julliard : wintrust: Increase buffer size to silence a gcc warning.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 9369e800c0c42498d23d23ed0d4ee8d0a032c5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9369e800c0c42498d23d23ed0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 13:09:57 2017 +0200 wintrust: Increase buffer size to silence a gcc warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/asn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 035a59a..6406ba3 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1841,10 +1841,10 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, /* The largest possible string for the first two components * is 2.175 (= 2 * 40 + 175 = 255), so this is big enough. */ - char firstTwo[6]; + char firstTwo[8]; const BYTE *ptr; - snprintf(firstTwo, sizeof(firstTwo), "%d.%d", + sprintf(firstTwo, "%d.%d", pbEncoded[1 + lenBytes] / 40, pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] / 40) * 40);

1 0

Alexandre Julliard : rsaenh: Avoid potential buffer overflows in registry key name.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: f7eb53b1f9aac5a3d1252e31b649477dc050355d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7eb53b1f9aac5a3d1252e31b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 12:52:31 2017 +0200 rsaenh: Avoid potential buffer overflows in registry key name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 98bba16..3db8286 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1096,7 +1096,7 @@ static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpe */ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey) { - CHAR szRSABase[MAX_PATH]; + CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; HKEY hRootKey; sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); @@ -1127,7 +1127,7 @@ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY * */ static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM access, HKEY *phKey) { - CHAR szRSABase[MAX_PATH]; + CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; HKEY hRootKey; sprintf(szRSABase, RSAENH_REGKEY, pszContainerName); @@ -1154,24 +1154,21 @@ static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM ac */ static BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags) { - CHAR szRegKey[MAX_PATH]; + CHAR szRegKey[sizeof(RSAENH_REGKEY) + MAX_PATH]; + HKEY hRootKey; - if (snprintf(szRegKey, MAX_PATH, RSAENH_REGKEY, pszContainerName) >= MAX_PATH) { - SetLastError(NTE_BAD_KEYSET_PARAM); - return FALSE; + sprintf(szRegKey, RSAENH_REGKEY, pszContainerName); + + if (dwFlags & CRYPT_MACHINE_KEYSET) + hRootKey = HKEY_LOCAL_MACHINE; + else + hRootKey = HKEY_CURRENT_USER; + if (!RegDeleteKeyA(hRootKey, szRegKey)) { + SetLastError(ERROR_SUCCESS); + return TRUE; } else { - HKEY hRootKey; - if (dwFlags & CRYPT_MACHINE_KEYSET) - hRootKey = HKEY_LOCAL_MACHINE; - else - hRootKey = HKEY_CURRENT_USER; - if (!RegDeleteKeyA(hRootKey, szRegKey)) { - SetLastError(ERROR_SUCCESS); - return TRUE; - } else { - SetLastError(NTE_BAD_KEYSET); - return FALSE; - } + SetLastError(NTE_BAD_KEYSET); + return FALSE; } }

1 0

Alexandre Julliard : kernel32/tests: Add tests for SetSearchPathMode.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 5841521477b18d5f8d8af5032cec220d309ee57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5841521477b18d5f8d8af5032… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 15:50:40 2017 +0200 kernel32/tests: Add tests for SetSearchPathMode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 7eb9e75..632aefc 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -72,6 +72,7 @@ static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); static DWORD (WINAPI *pSearchPathA)(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*); static DWORD (WINAPI *pSearchPathW)(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); +static BOOL (WINAPI *pSetSearchPathMode)(DWORD); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); @@ -2119,6 +2120,7 @@ static void init_pointers(void) MAKEFUNC(NeedCurrentDirectoryForExePathW); MAKEFUNC(SearchPathA); MAKEFUNC(SearchPathW); + MAKEFUNC(SetSearchPathMode); MAKEFUNC(ActivateActCtx); MAKEFUNC(CreateActCtxW); MAKEFUNC(DeactivateActCtx); @@ -2276,6 +2278,112 @@ static void test_CheckNameLegalDOS8Dot3(void) } } +static void test_SetSearchPathMode(void) +{ + BOOL ret; + char orig[MAX_PATH], buf[MAX_PATH], dir[MAX_PATH], expect[MAX_PATH]; + HANDLE handle; + + if (!pSetSearchPathMode) + { + win_skip( "SetSearchPathMode isn't available\n" ); + return; + } + GetCurrentDirectoryA( MAX_PATH, orig ); + GetTempPathA( MAX_PATH, buf ); + GetTempFileNameA( buf, "path", 0, dir ); + DeleteFileA( dir ); + CreateDirectoryA( dir, NULL ); + ret = SetCurrentDirectoryA( dir ); + ok( ret, "failed to switch to %s\n", dir ); + if (!ret) + { + RemoveDirectoryA( dir ); + return; + } + + handle = CreateFileA( "kernel32.dll", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + CloseHandle( handle ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( 0 ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( 0x80 ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_PERMANENT ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetCurrentDirectoryA( MAX_PATH, expect ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetSystemDirectoryA( expect, MAX_PATH ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetCurrentDirectoryA( MAX_PATH, expect ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetSystemDirectoryA( expect, MAX_PATH ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + DeleteFileA( "kernel32.dll" ); + SetCurrentDirectoryA( orig ); + RemoveDirectoryA( dir ); +} + START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; @@ -2309,4 +2417,5 @@ START_TEST(path) test_GetFullPathNameA(); test_GetFullPathNameW(); test_CheckNameLegalDOS8Dot3(); + test_SetSearchPathMode(); }

1 0

Alexandre Julliard : kernel32: Implement safe search mode for SearchPath.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: a8d291c0c01ec9696e14417ade7c30d8f2056366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d291c0c01ec9696e14417ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 15:46:50 2017 +0200 kernel32: Implement safe search mode for SearchPath. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_private.h | 2 +- dlls/kernel32/module.c | 7 ++-- dlls/kernel32/path.c | 77 +++++++++++++++++++++++++++++++++++++++--- dlls/kernel32/process.c | 2 +- include/winbase.h | 7 ++++ 5 files changed, 85 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 76611d7..7382956 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -89,7 +89,7 @@ struct binary_info }; /* module.c */ -extern WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) DECLSPEC_HIDDEN; +extern WCHAR *MODULE_get_dll_load_path( LPCWSTR module, int safe_mode ) DECLSPEC_HIDDEN; extern void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) DECLSPEC_HIDDEN; extern BOOL NLS_IsUnicodeOnlyLcid(LCID) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 9bd11c77..02c94c5 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -921,7 +921,7 @@ static inline WCHAR *append_path( WCHAR *p, const WCHAR *str ) * Compute the load path to use for a given dll. * Returned pointer must be freed by caller. */ -WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) +WCHAR *MODULE_get_dll_load_path( LPCWSTR module, int safe_mode ) { static const WCHAR pathW[] = {'P','A','T','H',0}; static const WCHAR dotW[] = {'.',0}; @@ -929,7 +929,6 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) const WCHAR *system_path = get_dll_system_path(); const WCHAR *mod_end = NULL; UNICODE_STRING name, value; - BOOL safe_mode; WCHAR *p, *ret; int len = 0, path_len = 0; @@ -958,7 +957,7 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) path_len = value.Length; RtlEnterCriticalSection( &dlldir_section ); - safe_mode = get_dll_safe_mode(); + if (safe_mode == -1) safe_mode = get_dll_safe_mode(); if (dll_directory) len += strlenW(dll_directory) + 1; else len += 2; /* current directory */ if ((p = ret = HeapAlloc( GetProcessHeap(), 0, path_len + len * sizeof(WCHAR) ))) @@ -1137,7 +1136,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) if (flags & load_library_search_flags) load_path = get_dll_load_path_search_flags( libname->Buffer, flags ); else - load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); + load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL, -1 ); if (!load_path) return 0; if (flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ec7c53b..a389743 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); #define MAX_PATHNAME_LEN 1024 +static int path_safe_mode = -1; /* path mode set by SetSearchPathMode */ /* check if a file name is for an executable file (.exe or .com) */ static inline BOOL is_executable( const WCHAR *name ) @@ -753,6 +754,51 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR /*********************************************************************** + * get_path_safe_mode + */ +static BOOL get_path_safe_mode(void) +{ + static const WCHAR keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; + static const WCHAR valueW[] = {'S','a','f','e','P','r','o','c','e','s','s','S','e','a','r','c','h','M','o','d','e',0}; + + if (path_safe_mode == -1) + { + char buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE hkey; + DWORD size = sizeof(buffer); + BOOL mode = FALSE; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + RtlInitUnicodeString( &nameW, keyW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + RtlInitUnicodeString( &nameW, valueW ); + if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, size, &size ) && + info->Type == REG_DWORD && info->DataLength == sizeof(DWORD)) + mode = !!*(DWORD *)info->Data; + NtClose( hkey ); + } + InterlockedCompareExchange( &path_safe_mode, mode, -1 ); + } + return path_safe_mode != 0; +} + + +/*********************************************************************** * contains_pathW * * Check if the file name contains a path; helper for SearchPathW. @@ -991,7 +1037,7 @@ DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext, DWORD buflen, } else { - if ((dll_path = MODULE_get_dll_load_path( NULL ))) + if ((dll_path = MODULE_get_dll_load_path( NULL, get_path_safe_mode() ))) { ret = RtlDosSearchPath_U( dll_path, name, NULL, buflen * sizeof(WCHAR), buffer, lastpart ) / sizeof(WCHAR); @@ -2075,9 +2121,32 @@ BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR *name, char *oemname, DWORD oemn /************************************************************************* * SetSearchPathMode (KERNEL32.@) */ -BOOL WINAPI SetSearchPathMode(DWORD flags) +BOOL WINAPI SetSearchPathMode( DWORD flags ) { - FIXME("(%x): stub\n", flags); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + int val; + + switch (flags) + { + case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE: + val = 1; + break; + case BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE: + val = 0; + break; + case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT: + InterlockedExchange( &path_safe_mode, 2 ); + return TRUE; + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + for (;;) + { + int prev = path_safe_mode; + if (prev == 2) break; /* permanently set */ + if (InterlockedCompareExchange( &path_safe_mode, val, prev ) == prev) return TRUE; + } + SetLastError( ERROR_ACCESS_DENIED ); return FALSE; } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9097542..292317c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1258,7 +1258,7 @@ void CDECL __wine_kernel_init(void) debugstr_w(main_exe_name), debugstr_w(__wine_main_wargv[0]) ); RtlInitUnicodeString( &NtCurrentTeb()->Peb->ProcessParameters->DllPath, - MODULE_get_dll_load_path(main_exe_name) ); + MODULE_get_dll_load_path( main_exe_name, -1 )); if (boot_events[0]) { diff --git a/include/winbase.h b/include/winbase.h index f6a28c3..a4d545e 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1005,6 +1005,12 @@ DECL_WINELIB_TYPE_AW(ENUMRESLANGPROC) #define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2 #define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 4 +/* flags for SetSearchPathMode */ +#define BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE 0x00001 +#define BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE 0x10000 +#define BASE_SEARCH_PATH_PERMANENT 0x08000 +#define BASE_SEARCH_PATH_INVALID_FLAGS (~0x18001) + typedef PLDT_ENTRY LPLDT_ENTRY; typedef enum _GET_FILEEX_INFO_LEVELS { @@ -2551,6 +2557,7 @@ WINBASEAPI BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR); WINBASEAPI BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); WINBASEAPI BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD); WINBASEAPI BOOL WINAPI SetProcessWorkingSetSize(HANDLE,SIZE_T,SIZE_T); +WINBASEAPI BOOL WINAPI SetSearchPathMode(DWORD); WINADVAPI BOOL WINAPI SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,SECURITY_DESCRIPTOR_CONTROL,SECURITY_DESCRIPTOR_CONTROL); WINADVAPI BOOL WINAPI SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL); WINADVAPI BOOL WINAPI SetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR,PSID,BOOL);

1 0

Alexandre Julliard : kernel32/tests: Fix a dll reference leak.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 24e9dcb1b420695c3197ddb99cef89c50177c5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e9dcb1b420695c3197ddb99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 11:30:48 2017 +0200 kernel32/tests: Fix a dll reference leak. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1c44257..91a6ff0 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1486,6 +1486,7 @@ static void test_import_resolution(void) ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); ok( ptr->tls_index == 9999, "wrong tls index %d\n", ptr->tls_index ); + FreeLibrary( mod2 ); FreeLibrary( mod ); break; case 2: /* load without IMAGE_FILE_DLL doesn't resolve imports */

1 0

Alexandre Julliard : kernel32/tests: Add tests for the LOAD_LIBRARY_SEARCH_* flags.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 934cb440e0b8f07316aa6e9d0bf31e35ebdcc86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=934cb440e0b8f07316aa6e9d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 10:50:17 2017 +0200 kernel32/tests: Add tests for the LOAD_LIBRARY_SEARCH_* flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 214 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 560a147..bfe94b9 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -20,6 +20,7 @@ #include "wine/test.h" #include <windows.h> +#include <stdio.h> #include <psapi.h> static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); @@ -45,6 +46,89 @@ static BOOL cmpStrAW(const char* a, const WCHAR* b, DWORD lenA, DWORD lenB) return memcmp(aw, b, len * sizeof(WCHAR)) == 0; } +static const struct +{ + IMAGE_DOS_HEADER dos; + IMAGE_NT_HEADERS nt; + IMAGE_SECTION_HEADER section; +} dll_image = +{ + { IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 0 }, 0, 0, { 0 }, + sizeof(IMAGE_DOS_HEADER) }, + { + IMAGE_NT_SIGNATURE, /* Signature */ + { +#if defined __i386__ + IMAGE_FILE_MACHINE_I386, /* Machine */ +#elif defined __x86_64__ + IMAGE_FILE_MACHINE_AMD64, /* Machine */ +#elif defined __powerpc__ + IMAGE_FILE_MACHINE_POWERPC, /* Machine */ +#elif defined __arm__ + IMAGE_FILE_MACHINE_ARMNT, /* Machine */ +#elif defined __aarch64__ + IMAGE_FILE_MACHINE_ARM64, /* Machine */ +#else +# error You must specify the machine type +#endif + 1, /* NumberOfSections */ + 0, /* TimeDateStamp */ + 0, /* PointerToSymbolTable */ + 0, /* NumberOfSymbols */ + sizeof(IMAGE_OPTIONAL_HEADER), /* SizeOfOptionalHeader */ + IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_DLL /* Characteristics */ + }, + { IMAGE_NT_OPTIONAL_HDR_MAGIC, /* Magic */ + 1, /* MajorLinkerVersion */ + 0, /* MinorLinkerVersion */ + 0, /* SizeOfCode */ + 0, /* SizeOfInitializedData */ + 0, /* SizeOfUninitializedData */ + 0, /* AddressOfEntryPoint */ + 0x1000, /* BaseOfCode */ +#ifndef _WIN64 + 0, /* BaseOfData */ +#endif + 0x10000000, /* ImageBase */ + 0x1000, /* SectionAlignment */ + 0x1000, /* FileAlignment */ + 4, /* MajorOperatingSystemVersion */ + 0, /* MinorOperatingSystemVersion */ + 1, /* MajorImageVersion */ + 0, /* MinorImageVersion */ + 4, /* MajorSubsystemVersion */ + 0, /* MinorSubsystemVersion */ + 0, /* Win32VersionValue */ + 0x2000, /* SizeOfImage */ + sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS), /* SizeOfHeaders */ + 0, /* CheckSum */ + IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ + 0, /* DllCharacteristics */ + 0, /* SizeOfStackReserve */ + 0, /* SizeOfStackCommit */ + 0, /* SizeOfHeapReserve */ + 0, /* SizeOfHeapCommit */ + 0, /* LoaderFlags */ + 0, /* NumberOfRvaAndSizes */ + { { 0 } } /* DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] */ + } + }, + { ".rodata", { 0 }, 0x1000, 0x1000, 0, 0, 0, 0, 0, + IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ } +}; + +static void create_test_dll( const char *name ) +{ + DWORD dummy; + HANDLE handle = CreateFileA( name, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0 ); + + ok( handle != INVALID_HANDLE_VALUE, "failed to create file err %u\n", GetLastError() ); + WriteFile( handle, &dll_image, sizeof(dll_image), &dummy, NULL ); + SetFilePointer( handle, dll_image.nt.OptionalHeader.SizeOfImage, NULL, FILE_BEGIN ); + SetEndOfFile( handle ); + CloseHandle( handle ); +} + static void testGetModuleFileName(const char* name) { HMODULE hMod; @@ -410,6 +494,132 @@ static void testLoadLibraryEx(void) FreeLibrary(hmodule); } +static void test_LoadLibraryEx_search_flags(void) +{ + static const struct + { + int add_dirs[4]; + int dll_dir; + int expect; + } tests[] = + { + { { 1, 2, 3 }, 4, 3 }, /* 0 */ + { { 1, 3, 2 }, 4, 2 }, + { { 3, 1 }, 4, 1 }, + { { 5, 6 }, 4, 4 }, + { { 5, 2 }, 4, 2 }, + { { 0 }, 4, 4 }, /* 5 */ + { { 0 }, 0, 0 }, + { { 6, 5 }, 5, 0 }, + { { 1, 1, 2 }, 0, 2 }, + }; + char *p, path[MAX_PATH], buf[MAX_PATH]; + WCHAR bufW[MAX_PATH]; + DLL_DIRECTORY_COOKIE cookies[4]; + unsigned int i, j, k; + BOOL ret; + HMODULE mod; + + if (!pAddDllDirectory || !pSetDllDirectoryA) return; + + GetTempPathA( sizeof(path), path ); + GetTempFileNameA( path, "tmp", 0, buf ); + DeleteFileA( buf ); + ret = CreateDirectoryA( buf, NULL ); + ok( ret, "CreateDirectory failed err %u\n", GetLastError() ); + p = buf + strlen( buf ); + for (i = 1; i <= 6; i++) + { + sprintf( p, "\\%u", i ); + ret = CreateDirectoryA( buf, NULL ); + ok( ret, "CreateDirectory failed err %u\n", GetLastError() ); + if (i >= 5) continue; /* dirs 5 and 6 are left empty */ + sprintf( p, "\\%u\\winetestdll.dll", i ); + create_test_dll( buf ); + } + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_USER_DIRS ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "foo\\winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "\\windows\\winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + for (j = 0; j < sizeof(tests) / sizeof(tests[0]); j++) + { + for (k = 0; tests[j].add_dirs[k]; k++) + { + sprintf( p, "\\%u", tests[j].add_dirs[k] ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, bufW, MAX_PATH ); + cookies[k] = pAddDllDirectory( bufW ); + ok( cookies[k] != NULL, "failed to add %s\n", buf ); + } + if (tests[j].dll_dir) + { + sprintf( p, "\\%u", tests[j].dll_dir ); + pSetDllDirectoryA( buf ); + } + else pSetDllDirectoryA( NULL ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_USER_DIRS ); + if (tests[j].expect) + { + ok( mod != NULL, "%u: LoadLibrary failed err %u\n", j, GetLastError() ); + GetModuleFileNameA( mod, path, MAX_PATH ); + sprintf( p, "\\%u\\winetestdll.dll", tests[j].expect ); + ok( !lstrcmpiA( path, buf ), "%u: wrong module %s expected %s\n", j, path, buf ); + } + else + { + ok( !mod, "%u: LoadLibrary succeeded\n", j ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "%u: wrong error %u\n", j, GetLastError() ); + } + FreeLibrary( mod ); + + for (k = 0; tests[j].add_dirs[k]; k++) pRemoveDllDirectory( cookies[k] ); + } + + for (i = 1; i <= 6; i++) + { + sprintf( p, "\\%u\\winetestdll.dll", i ); + DeleteFileA( buf ); + sprintf( p, "\\%u", i ); + RemoveDirectoryA( buf ); + } + *p = 0; + RemoveDirectoryA( buf ); +} + static void testGetDllDirectory(void) { CHAR bufferA[MAX_PATH]; @@ -814,6 +1024,9 @@ static void test_SetDefaultDllDirectories(void) mod = LoadLibraryA( "authz.dll" ); ok( mod != NULL, "loading authz failed\n" ); FreeLibrary( mod ); + mod = LoadLibraryExA( "authz.dll", 0, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + todo_wine ok( !mod, "loading authz succeeded\n" ); + FreeLibrary( mod ); ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); mod = LoadLibraryA( "authz.dll" ); @@ -881,6 +1094,7 @@ START_TEST(module) testLoadLibraryA_Wrong(); testGetProcAddress_Wrong(); testLoadLibraryEx(); + test_LoadLibraryEx_search_flags(); testGetModuleHandleEx(); testK32GetModuleInformation(); test_AddDllDirectory();

1 0

Alexandre Julliard : kernel32: Implement LOAD_LIBRARY_SEARCH_* flags.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 3b399bbbf894b894f8ee753465ad90d7bfb7841d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b399bbbf894b894f8ee75346… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 09:37:06 2017 +0200 kernel32: Implement LOAD_LIBRARY_SEARCH_* flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 99 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 88 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 30f33a6..9bd11c77 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -67,11 +67,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION dlldir_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static const DWORD load_library_search_flags = (LOAD_LIBRARY_SEARCH_APPLICATION_DIR | - LOAD_LIBRARY_SEARCH_USER_DIRS | - LOAD_LIBRARY_SEARCH_SYSTEM32 | - LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); - /**************************************************************************** * GetDllDirectoryA (KERNEL32.@) */ @@ -212,6 +207,12 @@ BOOL WINAPI RemoveDllDirectory( DLL_DIRECTORY_COOKIE cookie ) */ BOOL WINAPI SetDefaultDllDirectories( DWORD flags ) { + /* LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR doesn't make sense in default dirs */ + const DWORD load_library_search_flags = (LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_USER_DIRS | + LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); + if (!flags || (flags & ~load_library_search_flags)) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -998,6 +999,75 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) /****************************************************************** + * get_dll_load_path_search_flags + */ +static WCHAR *get_dll_load_path_search_flags( LPCWSTR module, DWORD flags ) +{ + const WCHAR *image = NULL, *mod_end, *image_end; + struct dll_dir_entry *dir; + WCHAR *p, *ret; + int len = 1; + + if (flags & LOAD_LIBRARY_SEARCH_DEFAULT_DIRS) + flags |= (LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_USER_DIRS | + LOAD_LIBRARY_SEARCH_SYSTEM32); + + if (flags & LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR) + { + DWORD type = RtlDetermineDosPathNameType_U( module ); + if (type != ABSOLUTE_DRIVE_PATH && type != ABSOLUTE_PATH) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + mod_end = get_module_path_end( module ); + len += (mod_end - module) + 1; + } + else module = NULL; + + RtlEnterCriticalSection( &dlldir_section ); + + if (flags & LOAD_LIBRARY_SEARCH_APPLICATION_DIR) + { + image = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + image_end = get_module_path_end( image ); + len += (image_end - image) + 1; + } + + if (flags & LOAD_LIBRARY_SEARCH_USER_DIRS) + { + LIST_FOR_EACH_ENTRY( dir, &dll_dir_list, struct dll_dir_entry, entry ) + len += strlenW( dir->dir ) + 1; + if (dll_directory) len += strlenW(dll_directory) + 1; + } + + if (flags & LOAD_LIBRARY_SEARCH_SYSTEM32) len += GetSystemDirectoryW( NULL, 0 ); + + if ((p = ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + if (module) p = append_path_len( p, module, mod_end - module ); + if (image) p = append_path_len( p, image, image_end - image ); + if (flags & LOAD_LIBRARY_SEARCH_USER_DIRS) + { + LIST_FOR_EACH_ENTRY( dir, &dll_dir_list, struct dll_dir_entry, entry ) + p = append_path( p, dir->dir ); + if (dll_directory) p = append_path( p, dll_directory ); + } + if (flags & LOAD_LIBRARY_SEARCH_SYSTEM32) GetSystemDirectoryW( p, ret + len - p ); + else + { + if (p > ret) p--; + *p = 0; + } + } + + RtlLeaveCriticalSection( &dlldir_section ); + return ret; +} + + +/****************************************************************** * load_library_as_datafile */ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE *hmod, DWORD flags ) @@ -1050,18 +1120,25 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) NTSTATUS nts; HMODULE hModule; WCHAR *load_path; - static const DWORD unsupported_flags = load_library_search_flags | - LOAD_IGNORE_CODE_AUTHZ_LEVEL | - LOAD_LIBRARY_AS_IMAGE_RESOURCE | - LOAD_LIBRARY_REQUIRE_SIGNED_TARGET | - LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; + const DWORD load_library_search_flags = (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); + const DWORD unsupported_flags = (LOAD_IGNORE_CODE_AUTHZ_LEVEL | + LOAD_LIBRARY_AS_IMAGE_RESOURCE | + LOAD_LIBRARY_REQUIRE_SIGNED_TARGET); if (!(flags & load_library_search_flags)) flags |= default_search_flags; if( flags & unsupported_flags) FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags); - load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); + if (flags & load_library_search_flags) + load_path = get_dll_load_path_search_flags( libname->Buffer, flags ); + else + load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); + if (!load_path) return 0; if (flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) {

1 0

← Newer
1
2
3
4
5
6
7
8
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2017