ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Support device paths in LdrGetDllPath. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48698
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-03-25 14:15:36 +01:00 committed by Alexandre Julliard
parent d0f4487c61
commit 1a05b7da63
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/kernel32/tests/path.c
View File

@ -2635,6 +2635,24 @@ static void test_LdrGetDllPath(void)
ret = pLdrGetDllPath( fooW, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); ret = pLdrGetDllPath( fooW, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr );
ok( ret == STATUS_INVALID_PARAMETER, "LdrGetDllPath failed %x\n", ret ); ok( ret == STATUS_INVALID_PARAMETER, "LdrGetDllPath failed %x\n", ret );
lstrcpyW( buffer, L"\\\\?\\" );
lstrcatW( buffer, dlldir );
p = buffer + lstrlenW(buffer);
*p++ = '\\';
lstrcpyW( p, fooW );
ret = pLdrGetDllPath( buffer, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr );
ok( !ret, "LdrGetDllPath failed %x\n", ret );
ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr );
ok( !memcmp( path, L"\\\\?\\", 4 * sizeof(WCHAR) ) && path_equal( path + 4, dlldir ),
"got %s expected \\\\?\\%s\n", wine_dbgstr_w(path), wine_dbgstr_w(dlldir));
pRtlReleasePath( path );
ret = pLdrGetDllPath( L"\\\\?\\c:\\test.dll", LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr );
ok( !ret, "LdrGetDllPath failed %x\n", ret );
ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr );
ok( !lstrcmpW( path, L"\\\\?\\c:" ), "got %s expected \\\\?\\c:\n", wine_dbgstr_w(path));
pRtlReleasePath( path );
lstrcpyW( buffer, dlldir ); lstrcpyW( buffer, dlldir );
p = buffer + lstrlenW(buffer); p = buffer + lstrlenW(buffer);
*p++ = '\\'; *p++ = '\\';

2
dlls/ntdll/loader.c
View File

@ -2204,7 +2204,7 @@ static NTSTATUS get_dll_load_path_search_flags( LPCWSTR module, DWORD flags, WCH
if (flags & LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR) if (flags & LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR)
{ {
DWORD type = RtlDetermineDosPathNameType_U( module ); DWORD type = RtlDetermineDosPathNameType_U( module );
if (type != ABSOLUTE_DRIVE_PATH && type != ABSOLUTE_PATH) if (type != ABSOLUTE_DRIVE_PATH && type != ABSOLUTE_PATH && type != DEVICE_PATH)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
mod_end = get_module_path_end( module ); mod_end = get_module_path_end( module );
len += (mod_end - module) + 1; len += (mod_end - module) + 1;