Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 01/01: [RAPPS] Don't leak handle on success CID 1419256

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b539380dac8fff5520475… commit b539380dac8fff5520475dd98e2727e2a3ccce43 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 21 10:49:02 2017 +0200 [RAPPS] Don't leak handle on success CID 1419256 --- base/applications/rapps/available.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index fd1ba2bce3..6fa51ad820 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -297,6 +297,7 @@ BOOL CAvailableApps::UpdateAppsDB() hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); if (hFind != INVALID_HANDLE_VALUE) { + FindClose(hFind); return TRUE; }

7 years

[reactos] 01/01: [FLOPPY] Fix broken loop CID 1419440

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c274b25c9560ef4d4d2dd… commit c274b25c9560ef4d4d2dd8ee4ea71bdde368c4cc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 21 10:28:00 2017 +0200 [FLOPPY] Fix broken loop CID 1419440 --- drivers/storage/floppy/readwrite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/floppy/readwrite.c b/drivers/storage/floppy/readwrite.c index aff69ca8d0..594d9c7e8b 100644 --- a/drivers/storage/floppy/readwrite.c +++ b/drivers/storage/floppy/readwrite.c @@ -266,7 +266,7 @@ RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) DriveInfo->BytesPerSectorCode = HW_512_BYTES_PER_SECTOR; return STATUS_SUCCESS; } - while(FALSE); + while(TRUE); TRACE_(FLOPPY, "RWDetermineMediaType(): failed to find media\n"); return STATUS_UNRECOGNIZED_MEDIA;

7 years

[reactos] 01/01: [TRAVIS-CI] Increase the git clone depth a bit.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c15036cf3cff822a044d0… commit c15036cf3cff822a044d0c4b4c721e17504efd60 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Oct 19 22:32:41 2017 +0100 [TRAVIS-CI] Increase the git clone depth a bit. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b34c8c3683..447a77b553 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: bash git: - depth: 1 + depth: 5 before_script: - wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz -O RosBE.tar.gz

7 years

[reactos] 02/02: [SHELL32_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68eadadcc6fab0b8d637a… commit 68eadadcc6fab0b8d637a9ff6eb1e1bd5b0fe0c6 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Oct 19 12:36:19 2017 +0100 [SHELL32_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/shell32/CMakeLists.txt | 2 + modules/rostests/winetests/shell32/recyclebin.c | 16 +- modules/rostests/winetests/shell32/shellpath.c | 28 +++- modules/rostests/winetests/shell32/shlexec.c | 14 +- modules/rostests/winetests/shell32/shlfolder.c | 195 ++++++++++++++++++++++ 5 files changed, 232 insertions(+), 23 deletions(-) diff --git a/modules/rostests/winetests/shell32/CMakeLists.txt b/modules/rostests/winetests/shell32/CMakeLists.txt index 47b0397920..7d33d85e3e 100644 --- a/modules/rostests/winetests/shell32/CMakeLists.txt +++ b/modules/rostests/winetests/shell32/CMakeLists.txt @@ -1,4 +1,6 @@ +add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG) + remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) list(APPEND SOURCE diff --git a/modules/rostests/winetests/shell32/recyclebin.c b/modules/rostests/winetests/shell32/recyclebin.c index a5ac1dc68a..50e262e918 100644 --- a/modules/rostests/winetests/shell32/recyclebin.c +++ b/modules/rostests/winetests/shell32/recyclebin.c @@ -28,18 +28,6 @@ static int (WINAPI *pSHQueryRecycleBinA)(LPCSTR,LPSHQUERYRBINFO); static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); -static char int64_buffer[65]; -/* Note: This function uses a single buffer for the return value.*/ -static const char* str_from_int64(__int64 ll) -{ - - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(int64_buffer,"%lx%08lx",(unsigned long)(ll >> 32),(unsigned long)ll); - else - sprintf(int64_buffer,"%lx",(unsigned long)ll); - return int64_buffer; -} - static void setup_pointers(void) { HMODULE hshell32 = GetModuleHandleA("shell32.dll"); @@ -88,8 +76,8 @@ static void test_query_recyclebin(void) ok(!pSHFileOperationA(&shfo), "Deletion was not successful\n"); hr = pSHQueryRecycleBinA(buf,&info2); ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); - ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); - ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); + ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",wine_dbgstr_longlong(info1.i64Size+written)); + ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",wine_dbgstr_longlong(info1.i64NumItems+1)); } diff --git a/modules/rostests/winetests/shell32/shellpath.c b/modules/rostests/winetests/shell32/shellpath.c index 3292c54435..9fea876e8b 100644 --- a/modules/rostests/winetests/shell32/shellpath.c +++ b/modules/rostests/winetests/shell32/shellpath.c @@ -2781,9 +2781,33 @@ if (0) { /* crashes on native */ hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + pidl = (void*)0xdeadbeef; hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, &pidl); - ok(hr == S_OK, "got 0x%08x\n", hr); - CoTaskMemFree(pidl); + ok(hr == S_OK, "SHGetKnownFolderIDList failed: 0x%08x\n", hr); + ok(ILIsEmpty(pidl), "pidl should be empty.\n"); + ok(pidl->mkid.cb == 0, "get wrong value: %d\n", pidl->mkid.cb); + ILFree(pidl); + + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, KF_FLAG_NO_ALIAS, NULL, &pidl); + ok(hr == S_OK, "SHGetKnownFolderIDList failed: 0x%08x\n", hr); + todo_wine ok(!ILIsEmpty(pidl), "pidl should not be empty.\n"); + todo_wine ok(pidl->mkid.cb == 20, "get wrong value: %d\n", pidl->mkid.cb); + ILFree(pidl); + + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(&FOLDERID_Documents, 0, NULL, &pidl); + ok(hr == S_OK, "SHGetKnownFolderIDList failed: 0x%08x\n", hr); + ok(!ILIsEmpty(pidl), "pidl should not be empty.\n"); + ok(pidl->mkid.cb == 20, "get wrong value: %d\n", pidl->mkid.cb); + ILFree(pidl); + + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(&FOLDERID_Documents, KF_FLAG_NO_ALIAS, NULL, &pidl); + ok(hr == S_OK, "SHGetKnownFolderIDList failed: 0x%08x\n", hr); + ok(!ILIsEmpty(pidl), "pidl should not be empty.\n"); + ok(pidl->mkid.cb == 20, "get wrong value: %d\n", pidl->mkid.cb); + ILFree(pidl); } START_TEST(shellpath) diff --git a/modules/rostests/winetests/shell32/shlexec.c b/modules/rostests/winetests/shell32/shlexec.c index 9db12ce42a..f0f51f5456 100755 --- a/modules/rostests/winetests/shell32/shlexec.c +++ b/modules/rostests/winetests/shell32/shlexec.c @@ -1827,7 +1827,7 @@ static fileurl_tests_t fileurl_tests[]= {"file:///", "%%TMPDIR%%\\test file.shlexec", 0, 0}, /* Test shortcuts vs. URLs */ - {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d}, + {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1c}, /* Confuse things by mixing protocols */ {"file://", "shlproto://foo/bar", USE_COLON, 0}, @@ -1973,11 +1973,11 @@ static void test_urls(void) } /* A .lnk ending does not turn a URL into a shortcut */ - todo_wait rc = shell_execute(NULL, "shlproto://foo/bar.lnk", NULL, NULL); + rc = shell_execute(NULL, "shlproto://foo/bar.lnk", NULL, NULL); ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "URL"); - todo_wine okChildString("argvA4", "shlproto://foo/bar.lnk"); + okChildString("argvA3", "URL"); + okChildString("argvA4", "shlproto://foo/bar.lnk"); /* Neither does a .exe extension */ rc = shell_execute(NULL, "shlproto://foo/bar.exe", NULL, NULL); @@ -2180,13 +2180,13 @@ static void test_lnks(void) get_long_path_name(params, filename, sizeof(filename)); okChildPath("argvA4", filename); - todo_wait rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); okShell(rc > 32, "failed: rc=%lu err=%u\n", rc, GetLastError()); okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "Open"); + okChildString("argvA3", "Open"); sprintf(params, "%s\\test file.shlexec", tmpdir); get_long_path_name(params, filename, sizeof(filename)); - todo_wine okChildPath("argvA4", filename); + okChildPath("argvA4", filename); } /* Should just run our executable */ diff --git a/modules/rostests/winetests/shell32/shlfolder.c b/modules/rostests/winetests/shell32/shlfolder.c index 27a2a408d4..1e03978dbc 100644 --- a/modules/rostests/winetests/shell32/shlfolder.c +++ b/modules/rostests/winetests/shell32/shlfolder.c @@ -58,6 +58,8 @@ static void (WINAPI *pILFree)(LPITEMIDLIST); static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); +static HRESULT (WINAPI *pSHCreateItemFromRelativeName)(IShellItem*,PCWSTR,IBindCtx*,REFIID,void**); +static HRESULT (WINAPI *pSHCreateItemInKnownFolder)(REFKNOWNFOLDERID,DWORD,PCWSTR,REFIID,void **); static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); static HRESULT (WINAPI *pSHCreateShellItemArray)(LPCITEMIDLIST,IShellFolder*,UINT,LPCITEMIDLIST*,IShellItemArray**); static HRESULT (WINAPI *pSHCreateShellItemArrayFromIDLists)(UINT, PCIDLIST_ABSOLUTE*, IShellItemArray**); @@ -66,6 +68,7 @@ static HRESULT (WINAPI *pSHCreateShellItemArrayFromShellItem)(IShellItem*, REFII static LPITEMIDLIST (WINAPI *pILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); static HRESULT (WINAPI *pSHParseDisplayName)(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); static LPITEMIDLIST (WINAPI *pSHSimpleIDListFromPathAW)(LPCVOID); +static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_FLAGS,REFIID,void**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); @@ -115,6 +118,8 @@ static void init_function_pointers(void) MAKEFUNC(SHBindToParent); MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); + MAKEFUNC(SHCreateItemFromRelativeName); + MAKEFUNC(SHCreateItemInKnownFolder); MAKEFUNC(SHCreateShellItem); MAKEFUNC(SHCreateShellItemArray); MAKEFUNC(SHCreateShellItemArrayFromIDLists); @@ -127,6 +132,7 @@ static void init_function_pointers(void) MAKEFUNC(SHGetSpecialFolderPathW); MAKEFUNC(SHGetSpecialFolderLocation); MAKEFUNC(SHParseDisplayName); + MAKEFUNC(SHGetKnownFolderPath); MAKEFUNC(SHGetNameFromIDList); MAKEFUNC(SHGetItemFromDataObject); MAKEFUNC(SHGetIDListFromObject); @@ -2519,6 +2525,195 @@ static void test_SHCreateShellItem(void) else win_skip("No SHCreateItemFromIDList\n"); + /* SHCreateItemFromRelativeName */ + if(pSHCreateItemFromRelativeName && pSHGetKnownFolderPath) + { + IShellItem *shellitem_desktop = NULL; + WCHAR *desktop_path, *displayname; + WCHAR testfile_path[MAX_PATH] = {0}; + HANDLE file; + LPITEMIDLIST pidl_desktop_testfile = NULL; + int order; + + ret = pSHCreateShellItem(NULL, NULL, pidl_desktop, &shellitem_desktop); + ok(ret == S_OK, "SHCreateShellItem failed: 0x%08x.\n", ret); + + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemFromRelativeName(shellitem_desktop, NULL, NULL, &IID_IShellItem, + (void**)&shellitem); + ok(ret == E_INVALIDARG, "Expected 0x%08x but SHCreateItemFromRelativeName return: 0x%08x.\n", + E_INVALIDARG, ret); + ok(shellitem == NULL, "shellitem was %p.\n", shellitem); + + /* Test with a non-existent file */ + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemFromRelativeName(shellitem_desktop, testfileW, NULL, &IID_IShellItem, + (void**)&shellitem); + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected 0x%08x but SHCreateItemFromRelativeName return: 0x%08x.\n", + HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), ret); + ok(shellitem == NULL, "shellitem was %p.\n", shellitem); + + /* Create a file for testing in desktop folder */ + pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &desktop_path); + lstrcatW(testfile_path, desktop_path); + myPathAddBackslashW(testfile_path); + lstrcatW(testfile_path, testfileW); + file = CreateFileW(testfile_path, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed! Last error: 0x%08x.\n", GetLastError()); + CloseHandle(file); + + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemFromRelativeName(shellitem_desktop, testfileW, NULL, &IID_IShellItem, + (void**)&shellitem); + ok(ret == S_OK, "SHCreateItemFromRelativeName failed: 0x%08x.\n", ret); + ok(shellitem != NULL, "shellitem was %p.\n", shellitem); + if(SUCCEEDED(ret)) + { + ret = IShellItem_GetDisplayName(shellitem, 0, &displayname); + ok(ret == S_OK, "IShellItem_GetDisplayName failed: 0x%08x.\n", ret); + ok(!lstrcmpW(displayname, testfileW), "got wrong display name: %s.\n", wine_dbgstr_w(displayname)); + CoTaskMemFree(displayname); + + shellitem2 = (void*)0xdeadbeef; + ret = pSHCreateItemFromRelativeName(shellitem_desktop, testfileW, NULL, &IID_IShellItem, + (void**)&shellitem2); + ok(ret == S_OK, "SHCreateItemFromRelativeName failed: 0x%08x.\n", ret); + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); + ok(!order, "order got wrong value: %d.\n", order); + IShellItem_Release(shellitem2); + + shellitem2 = (void*)0xdeadbeef; + ret = IShellFolder_ParseDisplayName(desktopfolder, NULL, NULL, testfileW, NULL, + &pidl_desktop_testfile, NULL); + ok(ret == S_OK, "ParseDisplayName failed 0x%08x.\n", ret); + ret = pSHCreateItemFromIDList(pidl_desktop_testfile, &IID_IShellItem, (void**)&shellitem2); + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); + ok(ret == S_OK, "IShellItem_Compare fail: 0x%08x.\n", ret); + ok(!order, "order got wrong value: %d.\n", order); + pILFree(pidl_desktop_testfile); + IShellItem_Release(shellitem2); + + IShellItem_Release(shellitem); + } + + DeleteFileW(testfile_path); + CoTaskMemFree(desktop_path); + IShellItem_Release(shellitem_desktop); + } + else + win_skip("No SHCreateItemFromRelativeName or SHGetKnownFolderPath\n"); + + /* SHCreateItemInKnownFolder */ + if(pSHCreateItemInKnownFolder && pSHGetKnownFolderPath) + { + WCHAR *desktop_path; + WCHAR testfile_path[MAX_PATH] = {0}; + HANDLE file; + WCHAR *displayname = NULL; + int order; + LPITEMIDLIST pidl_desktop_testfile = NULL; + + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, NULL, &IID_IShellItem, + (void**)&shellitem); + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); + ok(shellitem != NULL, "shellitem was %p.\n", shellitem); + if(SUCCEEDED(ret)) + { + shellitem2 = (void*)0xdeadbeef; + ret = pSHCreateShellItem(NULL, NULL, pidl_desktop, &shellitem2); + ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + if(SUCCEEDED(ret)) + { + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); + ok(!order, "order got wrong value: %d.\n", order); + IShellItem_Release(shellitem2); + } + IShellItem_Release(shellitem); + } + + /* Test with a non-existent file */ + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, testfileW, &IID_IShellItem, + (void**)&shellitem); + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected 0x%08x but SHCreateItemInKnownFolder return: 0x%08x.\n", + HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), ret); + ok(shellitem == NULL, "shellitem was %p.\n", shellitem); + + pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &desktop_path); + lstrcatW(testfile_path, desktop_path); + myPathAddBackslashW(testfile_path); + lstrcatW(testfile_path, testfileW); + file = CreateFileW(testfile_path, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed! Last error: 0x%08x.\n", GetLastError()); + CloseHandle(file); + + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, testfileW, &IID_IShellItem, + (void**)&shellitem); + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); + ok(shellitem != NULL, "shellitem was %p.\n", shellitem); + if(SUCCEEDED(ret)) + { + ret = IShellItem_GetDisplayName(shellitem, 0, &displayname); + ok(ret == S_OK, "IShellItem_GetDisplayName failed: 0x%08x.\n", ret); + ok(!lstrcmpW(displayname, testfileW), "got wrong display name: %s.\n", + wine_dbgstr_w(displayname)); + CoTaskMemFree(displayname); + + shellitem2 = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, testfileW, &IID_IShellItem, + (void**)&shellitem2); + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); + ok(shellitem2 != NULL, "shellitem was %p.\n", shellitem); + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); + ok(!order, "order got wrong value: %d.\n", order); + IShellItem_Release(shellitem2); + + shellitem2 = (void*)0xdeadbeef; + ret = IShellFolder_ParseDisplayName(desktopfolder, NULL, NULL, testfileW, NULL, + &pidl_desktop_testfile, NULL); + ok(SUCCEEDED(ret), "ParseDisplayName returned %x.\n", ret); + ret = pSHCreateItemFromIDList(pidl_desktop_testfile, &IID_IShellItem, (void**)&shellitem2); + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); + ok(!order, "order got wrong value: %d.\n", order); + pILFree(pidl_desktop_testfile); + IShellItem_Release(shellitem2); + + IShellItem_Release(shellitem); + } + + shellitem = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Documents, 0, NULL, &IID_IShellItem, + (void**)&shellitem); + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); + ok(shellitem != NULL, "shellitem was %p.\n", shellitem); + if(SUCCEEDED(ret)) + { + shellitem2 = (void*)0xdeadbeef; + ret = pSHCreateItemInKnownFolder(&FOLDERID_Documents, 0, NULL, &IID_IShellItem, + (void**)&shellitem2); + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); + ok(shellitem2 != NULL, "shellitem was %p.\n", shellitem); + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); + ok(!order, "order got wrong value: %d.\n", order); + IShellItem_Release(shellitem2); + + IShellItem_Release(shellitem); + } + DeleteFileW(testfile_path); + CoTaskMemFree(desktop_path); + } + else + win_skip("No SHCreateItemInKnownFolder or SHGetKnownFolderPath\n"); + DeleteFileA(".\\testfile"); pILFree(pidl_abstestfile); pILFree(pidl_testfile);

7 years

[reactos] 01/02: [PSDK] Add missing KNOWN_FOLDER_FLAG and ILIsEmpty(). CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6bf4abd2ef6b62c14b36… commit a6bf4abd2ef6b62c14b36eb9d3ee7384b5fc3c53 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Oct 19 12:35:55 2017 +0100 [PSDK] Add missing KNOWN_FOLDER_FLAG and ILIsEmpty(). CORE-13762 --- sdk/include/psdk/shlobj.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 1c36e4751c..3b5f73ef10 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -84,6 +84,21 @@ typedef struct DECLARE_HANDLE(HPSXA); #endif +typedef enum +{ + KF_FLAG_DEFAULT = 0x00000000, + KF_FLAG_SIMPLE_IDLIST = 0x00000100, + KF_FLAG_NOT_PARENT_RELATIVE = 0x00000200, + KF_FLAG_DEFAULT_PATH = 0x00000400, + KF_FLAG_INIT = 0x00000800, + KF_FLAG_NO_ALIAS = 0x00001000, + KF_FLAG_DONT_UNEXPAND = 0x00002000, + KF_FLAG_DONT_VERIFY = 0x00004000, + KF_FLAG_CREATE = 0x00008000, + KF_FLAG_NO_APPCONTAINER_REDIRECTION = 0x00010000, + KF_FLAG_ALIAS_ONLY = 0x80000000 +} KNOWN_FOLDER_FLAG; + typedef int GPFIDL_FLAGS; UINT @@ -2161,6 +2176,10 @@ HRESULT WINAPI ILLoadFromStream(_In_ LPSTREAM, _Inout_ LPITEMIDLIST*); BOOL WINAPI ILRemoveLastID(_Inout_opt_ LPITEMIDLIST); HRESULT WINAPI ILSaveToStream(_In_ LPSTREAM, _In_ LPCITEMIDLIST); +static inline BOOL ILIsEmpty(_In_opt_ LPCITEMIDLIST pidl) +{ + return !(pidl && pidl->mkid.cb); +} #include <poppack.h>

7 years

[reactos] 01/01: [MSVCRT_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=867a81a46b961ce272632… commit 867a81a46b961ce272632ab026f9274ff4920e9a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Oct 19 12:22:20 2017 +0100 [MSVCRT_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/msvcrt/CMakeLists.txt | 1 + modules/rostests/winetests/msvcrt/file.c | 4 +- modules/rostests/winetests/msvcrt/heap.c | 4 +- modules/rostests/winetests/msvcrt/string.c | 73 +++++++++++++++++++++++- 4 files changed, 76 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index 062870d937..ecd725d42f 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -1,5 +1,6 @@ add_definitions( + -DWINETEST_USE_DBGSTR_LONGLONG -D_CRT_NONSTDC_NO_DEPRECATE -D__msvcrt_ulong=ULONG) diff --git a/modules/rostests/winetests/msvcrt/file.c b/modules/rostests/winetests/msvcrt/file.c index 2c356ea964..d92a6e459a 100644 --- a/modules/rostests/winetests/msvcrt/file.c +++ b/modules/rostests/winetests/msvcrt/file.c @@ -184,11 +184,11 @@ static void test_fileops( void ) rewind(file); ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); - ok(pos == 0, "Unexpected result of fgetpos %x%08x for bufmode=%x\n", (DWORD)(pos >> 32), (DWORD)pos, bufmodes[bufmode]); + ok(pos == 0, "Unexpected result of fgetpos %s for bufmode=%x\n", wine_dbgstr_longlong(pos), bufmodes[bufmode]); pos = sizeof (outbuffer); ok(fsetpos(file, &pos) == 0, "fsetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); - ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %x%08x for bufmode=%x\n", (DWORD)(pos >> 32), (DWORD)pos, bufmodes[bufmode]); + ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %s for bufmode=%x\n", wine_dbgstr_longlong(pos), bufmodes[bufmode]); fclose (file); } diff --git a/modules/rostests/winetests/msvcrt/heap.c b/modules/rostests/winetests/msvcrt/heap.c index 3d75cf1823..4a3c7a8170 100644 --- a/modules/rostests/winetests/msvcrt/heap.c +++ b/modules/rostests/winetests/msvcrt/heap.c @@ -443,11 +443,11 @@ static void test_sbheap(void) mem = malloc(1); ok(mem != NULL, "malloc failed\n"); - ok(!((UINT_PTR)mem & 0xf), "incorrect alignement (%p)\n", mem); + ok(!((UINT_PTR)mem & 0xf), "incorrect alignment (%p)\n", mem); mem = realloc(mem, 10); ok(mem != NULL, "realloc failed\n"); - ok(!((UINT_PTR)mem & 0xf), "incorrect alignement (%p)\n", mem); + ok(!((UINT_PTR)mem & 0xf), "incorrect alignment (%p)\n", mem); ok(_set_sbh_threshold(0), "_set_sbh_threshold failed\n"); threshold = _get_sbh_threshold(); diff --git a/modules/rostests/winetests/msvcrt/string.c b/modules/rostests/winetests/msvcrt/string.c index a59ed91f09..1681001a86 100644 --- a/modules/rostests/winetests/msvcrt/string.c +++ b/modules/rostests/winetests/msvcrt/string.c @@ -56,6 +56,7 @@ static void* (__cdecl *pmemcpy)(void *, const void *, size_t n); static int (__cdecl *p_memcpy_s)(void *, size_t, const void *, size_t); static int (__cdecl *p_memmove_s)(void *, size_t, const void *, size_t); static int* (__cdecl *pmemcmp)(void *, const void *, size_t n); +static int (__cdecl *p_strcpy)(char *dst, const char *src); static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbscat_s)(unsigned char *dst, size_t size, const unsigned char *src); @@ -493,8 +494,8 @@ static void test_strdup(void) static void test_strcpy_s(void) { char dest[8]; - const char *small = "small"; - const char *big = "atoolongstringforthislittledestination"; + const char small[] = "small"; + const char big[] = "atoolongstringforthislittledestination"; int ret; if(!pstrcpy_s) @@ -543,6 +544,15 @@ static void test_strcpy_s(void) ret = pstrcpy_s(NULL, sizeof(dest), small); ok(ret == EINVAL, "Copying a big string a NULL dest returned %d, expected EINVAL\n", ret); + + /* strcpy overlapping buffers test */ + memset(dest, 'X', sizeof(dest)); + memcpy(dest+1, small, sizeof(small)); + p_strcpy(dest, dest+1); + ok(dest[0] == 's' && dest[1] == 'm' && dest[2] == 'a' && dest[3] == 'l' && + dest[4] == 'l' && dest[5] == '\0' && dest[6] == '\0' && dest[7] == 'X', + "Unexpected return data from strcpy: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } #define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) @@ -1833,8 +1843,10 @@ static void test_mbstowcs(void) { static const wchar_t wSimple[] = { 't','e','x','t',0 }; static const wchar_t wHiragana[] = { 0x3042,0x3043,0 }; + static const wchar_t wEmpty[] = { 0 }; static const char mSimple[] = "text"; static const char mHiragana[] = { 0x82,0xa0,0x82,0xa1,0 }; + static const char mEmpty[] = { 0 }; const wchar_t *pwstr; wchar_t wOut[6]; @@ -1863,6 +1875,13 @@ static void test_mbstowcs(void) ok(!memcmp(wOut, wSimple, 4*sizeof(wchar_t)), "wOut = %s\n", wine_dbgstr_w(wOut)); ok(wOut[4] == '!', "wOut[4] != \'!\'\n"); + ret = mbstowcs(NULL, mEmpty, 1); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + + ret = mbstowcs(wOut, mEmpty, 1); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = wcstombs(NULL, wSimple, 0); ok(ret == 4, "wcstombs did not return 4\n"); @@ -1874,6 +1893,13 @@ static void test_mbstowcs(void) ok(ret == 2, "wcstombs did not return 2\n"); ok(!memcmp(mOut, mSimple, 5*sizeof(char)), "mOut = %s\n", mOut); + ret = wcstombs(NULL, wEmpty, 1); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + + ret = wcstombs(mOut, wEmpty, 1); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return; @@ -1883,10 +1909,18 @@ static void test_mbstowcs(void) ok(ret == 2, "mbstowcs did not return 2\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = mbstowcs(wOut, mEmpty, 6); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ret = wcstombs(mOut, wHiragana, 6); ok(ret == 4, "wcstombs did not return 4\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + ret = wcstombs(mOut, wEmpty, 6); + ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + if(!pmbstowcs_s || !pwcstombs_s) { setlocale(LC_ALL, "C"); win_skip("mbstowcs_s or wcstombs_s not available\n"); @@ -1903,6 +1937,11 @@ static void test_mbstowcs(void) ok(ret == 3, "mbstowcs_s did not return 3\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, wOut, 6, mEmpty, _TRUNCATE); + ok(err == 0, "err = %d\n", err); + ok(ret == 1, "mbstowcs_s did not return 1, got %d\n", (int)ret); + ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1); ok(err == 0, "err = %d\n", err); ok(ret == 3, "mbstowcs_s did not return 3\n"); @@ -1917,6 +1956,11 @@ static void test_mbstowcs(void) ok(ret == 5, "wcstombs_s did not return 5\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + err = pwcstombs_s(&ret, mOut, 6, wEmpty, _TRUNCATE); + ok(err == 0, "err = %d\n", err); + ok(ret == 1, "wcstombs_s did not return 1, got %d\n", (int)ret); + ok(!memcmp(mOut, mEmpty, sizeof(mEmpty)), "mOut = %s\n", mOut); + err = pwcstombs_s(&ret, NULL, 0, wHiragana, 1); ok(err == 0, "err = %d\n", err); ok(ret == 5, "wcstombs_s did not return 5\n"); @@ -3149,6 +3193,29 @@ static void test__mbscmp(void) ok(ret == 1, "got %d\n", ret); } +static void test__ismbclx(void) +{ + int cp, ret; + + ret = _ismbcl0(0); + ok(!ret, "got %d\n", ret); + + cp = _setmbcp(1252); + + ret = _ismbcl0(0x8140); + ok(!ret, "got %d\n", ret); + + _setmbcp(932); + + ret = _ismbcl0(0); + ok(!ret, "got %d\n", ret); + + ret = _ismbcl0(0x8140); + ok(ret, "got %d\n", ret); + + _setmbcp(cp); +} + START_TEST(string) { char mem[100]; @@ -3165,6 +3232,7 @@ START_TEST(string) SET(pmemcmp,"memcmp"); SET(p_mbctype,"_mbctype"); SET(p__mb_cur_max,"__mb_cur_max"); + SET(p_strcpy, "strcpy"); pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbscat_s = (void*)GetProcAddress( hMsvcrt, "_mbscat_s" ); @@ -3263,4 +3331,5 @@ START_TEST(string) test__strnset_s(); test__wcsset_s(); test__mbscmp(); + test__ismbclx(); }

7 years

[reactos] 01/01: [FONTS] Sync Tahoma and Symbol fonts with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd5b3048615428524ed3b… commit cd5b3048615428524ed3be57aeeaa04e41545fc1 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Oct 19 10:56:44 2017 +0100 [FONTS] Sync Tahoma and Symbol fonts with Wine Staging 2.16. CORE-13762 --- media/fonts/symbol.ttf | Bin 26040 -> 26028 bytes media/fonts/tahoma.ttf | Bin 143652 -> 143884 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/symbol.ttf b/media/fonts/symbol.ttf index bb54fb82aa..1fd5b4e446 100644 Binary files a/media/fonts/symbol.ttf and b/media/fonts/symbol.ttf differ diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index 4f68d1edfa..8bee8ad35c 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

7 years

[reactos] 02/02: [KERNEL32_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a436e2dfad5bf923a9bd… commit 9a436e2dfad5bf923a9bd27b1438e3cc9c80b5bd Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Oct 19 11:27:47 2017 +0100 [KERNEL32_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/kernel32/comm.c | 12 + modules/rostests/winetests/kernel32/heap.c | 12 +- modules/rostests/winetests/kernel32/loader.c | 40 +++- modules/rostests/winetests/kernel32/module.c | 331 ++++++++++++++++++++++++++ modules/rostests/winetests/kernel32/path.c | 109 +++++++++ modules/rostests/winetests/kernel32/virtual.c | 28 +++ 6 files changed, 526 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/kernel32/comm.c b/modules/rostests/winetests/kernel32/comm.c index 52a4e4fdb6..9230850d3c 100755 --- a/modules/rostests/winetests/kernel32/comm.c +++ b/modules/rostests/winetests/kernel32/comm.c @@ -1506,6 +1506,8 @@ static void test_WaitCts(void) args[1] = CLRRTS; CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } /* Change the Comm Mask while a Wait is going on @@ -1588,6 +1590,8 @@ static void test_AbortWaitCts(void) "Unexpected time %d, expected around %d\n", diff, TIMEOUT>>1); CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } /* @@ -1668,6 +1672,8 @@ static void test_WaitDsr(void) args[1] = CLRDTR; CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } /* @@ -1754,6 +1760,8 @@ static void test_WaitRing(void) args[1] = CLRDTR; CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } /* * Wait for a change in DCD @@ -1833,6 +1841,8 @@ static void test_WaitDcd(void) args[1] = CLRDTR; CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } /* @@ -1914,6 +1924,8 @@ static void test_WaitBreak(void) ok(ClearCommBreak(hcom), "ClearCommBreak failed\n"); CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } static void test_stdio(void) diff --git a/modules/rostests/winetests/kernel32/heap.c b/modules/rostests/winetests/kernel32/heap.c index 16d599e15d..7c1c89dd5a 100755 --- a/modules/rostests/winetests/kernel32/heap.c +++ b/modules/rostests/winetests/kernel32/heap.c @@ -89,6 +89,12 @@ static void test_heap(void) HGLOBAL hsecond; SIZE_T size, size2; const SIZE_T max_size = 1024, init_size = 10; + /* use function pointers to avoid warnings for invalid parameter tests */ + LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); + LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); + + pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); + pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -111,12 +117,12 @@ static void test_heap(void) /* test some border cases of HeapAlloc and HeapReAlloc */ mem = HeapAlloc(GetProcessHeap(), 0, 0); ok(mem != NULL, "memory not allocated for size 0\n"); - msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0 - 7); + msecond = pHeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0 - 7); ok(msecond == NULL, "HeapReAlloc(~0 - 7) should have failed\n"); - msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0); + msecond = pHeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0); ok(msecond == NULL, "HeapReAlloc(~0) should have failed\n"); HeapFree(GetProcessHeap(), 0, mem); - mem = HeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); + mem = pHeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); ok(mem == NULL, "memory allocated for size ~0\n"); mem = HeapAlloc(GetProcessHeap(), 0, 17); msecond = HeapReAlloc(GetProcessHeap(), 0, mem, 0); diff --git a/modules/rostests/winetests/kernel32/loader.c b/modules/rostests/winetests/kernel32/loader.c index 9e5983430b..90e790f5c6 100644 --- a/modules/rostests/winetests/kernel32/loader.c +++ b/modules/rostests/winetests/kernel32/loader.c @@ -548,6 +548,7 @@ static void test_Loader(void) }; int i; DWORD file_size; + HANDLE h; HMODULE hlib, hlib_as_data_file; char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; @@ -730,10 +731,38 @@ static void test_Loader(void) hlib = GetModuleHandleA(dll_name); ok(!hlib, "GetModuleHandle should fail\n"); + SetLastError(0xdeadbeef); + h = CreateFileA( dll_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + ok( h != INVALID_HANDLE_VALUE, "open failed err %u\n", GetLastError() ); + CloseHandle( h ); + SetLastError(0xdeadbeef); ret = FreeLibrary(hlib_as_data_file); ok(ret, "FreeLibrary error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + hlib_as_data_file = LoadLibraryExA(dll_name, 0, LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE); + if (!((ULONG_PTR)hlib_as_data_file & 1) || /* winxp */ + (!hlib_as_data_file && GetLastError() == ERROR_INVALID_PARAMETER)) /* w2k3 */ + { + win_skip( "LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE not supported\n" ); + FreeLibrary(hlib_as_data_file); + } + else + { + ok(hlib_as_data_file != 0, "LoadLibraryEx error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + h = CreateFileA( dll_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + todo_wine ok( h == INVALID_HANDLE_VALUE, "open succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_SHARING_VIOLATION, "wrong error %u\n", GetLastError() ); + CloseHandle( h ); + + SetLastError(0xdeadbeef); + ret = FreeLibrary(hlib_as_data_file); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + } + SetLastError(0xdeadbeef); ret = DeleteFileA(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); @@ -869,7 +898,7 @@ static void test_Loader(void) static void test_FakeDLL(void) { -#ifdef __i386__ +#if defined(__i386__) || defined(__x86_64__) NTSTATUS (WINAPI *pNtSetEvent)(HANDLE, ULONG *) = NULL; IMAGE_EXPORT_DIRECTORY *dir; HMODULE module = GetModuleHandleA("ntdll.dll"); @@ -911,8 +940,13 @@ static void test_FakeDLL(void) dll_func = (BYTE *)GetProcAddress(module, func_name); ok(dll_func != NULL, "%s: GetProcAddress returned NULL\n", func_name); +#if defined(__i386__) if (dll_func[0] == 0x90 && dll_func[1] == 0x90 && dll_func[2] == 0x90 && dll_func[3] == 0x90) +#elif defined(__x86_64__) + if (dll_func[0] == 0x48 && dll_func[1] == 0x83 && + dll_func[2] == 0xec && dll_func[3] == 0x08) +#endif { todo_wine ok(0, "%s: Export is a stub-function, skipping\n", func_name); continue; @@ -2321,9 +2355,9 @@ static void child_process(const char *dll_name, DWORD target_offset) } else { - ret = WaitForSingleObject(attached_thread[0], 1000); + ret = WaitForSingleObject(attached_thread[0], 2000); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - ret = WaitForSingleObject(attached_thread[1], 1000); + ret = WaitForSingleObject(attached_thread[1], 2000); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } diff --git a/modules/rostests/winetests/kernel32/module.c b/modules/rostests/winetests/kernel32/module.c index bb22c24316..108d0cb999 100755 --- a/modules/rostests/winetests/kernel32/module.c +++ b/modules/rostests/winetests/kernel32/module.c @@ -20,11 +20,15 @@ #include "wine/test.h" #include <windows.h> +#include <stdio.h> #include <psapi.h> static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); static DWORD (WINAPI *pGetDllDirectoryW)(DWORD,LPWSTR); static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); +static DLL_DIRECTORY_COOKIE (WINAPI *pAddDllDirectory)(const WCHAR*); +static BOOL (WINAPI *pRemoveDllDirectory)(DLL_DIRECTORY_COOKIE); +static BOOL (WINAPI *pSetDefaultDllDirectories)(DWORD); static BOOL (WINAPI *pGetModuleHandleExA)(DWORD,LPCSTR,HMODULE*); static BOOL (WINAPI *pGetModuleHandleExW)(DWORD,LPCWSTR,HMODULE*); static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, @@ -42,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; @@ -407,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]; @@ -515,6 +728,9 @@ static void init_pointers(void) MAKEFUNC(GetDllDirectoryA); MAKEFUNC(GetDllDirectoryW); MAKEFUNC(SetDllDirectoryA); + MAKEFUNC(AddDllDirectory); + MAKEFUNC(RemoveDllDirectory); + MAKEFUNC(SetDefaultDllDirectories); MAKEFUNC(GetModuleHandleExA); MAKEFUNC(GetModuleHandleExW); MAKEFUNC(K32GetModuleInformation); @@ -739,6 +955,118 @@ static void testK32GetModuleInformation(void) ok(info.EntryPoint != NULL, "Expected nonzero entrypoint\n"); } +static void test_AddDllDirectory(void) +{ + static const WCHAR tmpW[] = {'t','m','p',0}; + static const WCHAR dotW[] = {'.','\\','.',0}; + static const WCHAR rootW[] = {'\\',0}; + WCHAR path[MAX_PATH], buf[MAX_PATH]; + DLL_DIRECTORY_COOKIE cookie; + BOOL ret; + + if (!pAddDllDirectory || !pRemoveDllDirectory) + { + win_skip( "AddDllDirectory not available\n" ); + return; + } + + buf[0] = '\0'; + GetTempPathW( sizeof(path)/sizeof(path[0]), path ); + GetTempFileNameW( path, tmpW, 0, buf ); + SetLastError( 0xdeadbeef ); + cookie = pAddDllDirectory( buf ); + ok( cookie != NULL, "AddDllDirectory failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pRemoveDllDirectory( cookie ); + ok( ret, "RemoveDllDirectory failed err %u\n", GetLastError() ); + + DeleteFileW( buf ); + SetLastError( 0xdeadbeef ); + cookie = pAddDllDirectory( buf ); + ok( !cookie, "AddDllDirectory succeeded\n" ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError() ); + cookie = pAddDllDirectory( dotW ); + ok( !cookie, "AddDllDirectory succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + cookie = pAddDllDirectory( rootW ); + ok( cookie != NULL, "AddDllDirectory failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pRemoveDllDirectory( cookie ); + ok( ret, "RemoveDllDirectory failed err %u\n", GetLastError() ); + GetWindowsDirectoryW( buf, MAX_PATH ); + lstrcpyW( buf + 2, tmpW ); + cookie = pAddDllDirectory( buf ); + ok( !cookie, "AddDllDirectory succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); +} + +static void test_SetDefaultDllDirectories(void) +{ + HMODULE mod; + BOOL ret; + + if (!pSetDefaultDllDirectories) + { + win_skip( "SetDefaultDllDirectories not available\n" ); + return; + } + + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_USER_DIRS ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + todo_wine ok( !mod, "loading authz succeeded\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + 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" ); + todo_wine ok( !mod, "loading authz succeeded\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( 0 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( 3 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_APPLICATION_DIR | 0x8000 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR ); + ok( !ret || broken(ret) /* win7 */, "SetDefaultDllDirectories succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_USER_DIRS ); + ok( !ret || broken(ret) /* win7 */, "SetDefaultDllDirectories succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + /* restore some sane defaults */ + pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -766,6 +1094,9 @@ START_TEST(module) testLoadLibraryA_Wrong(); testGetProcAddress_Wrong(); testLoadLibraryEx(); + test_LoadLibraryEx_search_flags(); testGetModuleHandleEx(); testK32GetModuleInformation(); + test_AddDllDirectory(); + test_SetDefaultDllDirectories(); } diff --git a/modules/rostests/winetests/kernel32/path.c b/modules/rostests/winetests/kernel32/path.c index ff6480c839..c9afb1bee5 100755 --- a/modules/rostests/winetests/kernel32/path.c +++ b/modules/rostests/winetests/kernel32/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); @@ -2158,6 +2159,7 @@ static void init_pointers(void) MAKEFUNC(NeedCurrentDirectoryForExePathW); MAKEFUNC(SearchPathA); MAKEFUNC(SearchPathW); + MAKEFUNC(SetSearchPathMode); MAKEFUNC(ActivateActCtx); MAKEFUNC(CreateActCtxW); MAKEFUNC(DeactivateActCtx); @@ -2315,6 +2317,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; @@ -2348,4 +2456,5 @@ START_TEST(path) test_GetFullPathNameA(); test_GetFullPathNameW(); test_CheckNameLegalDOS8Dot3(); + test_SetSearchPathMode(); } diff --git a/modules/rostests/winetests/kernel32/virtual.c b/modules/rostests/winetests/kernel32/virtual.c index 8824f32992..018b7e9ae0 100755 --- a/modules/rostests/winetests/kernel32/virtual.c +++ b/modules/rostests/winetests/kernel32/virtual.c @@ -403,6 +403,23 @@ static void test_VirtualAlloc(void) ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* 21 zero bits is valid */ + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + + /* 22 zero bits is invalid */ + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); @@ -1163,6 +1180,17 @@ static void test_NtMapViewOfSection(void) ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); } + /* 22 zero bits isn't acceptable */ + ptr2 = NULL; + size = 0; + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 22, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + if (status == STATUS_SUCCESS) + { + status = pNtUnmapViewOfSection( hProcess, ptr2 ); + ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); + } + /* mapping at the same page conflicts */ ptr2 = ptr; size = 0;

7 years

[reactos] 01/02: [PSDK] Add some missing definitions to winbase.h. Import libloaderapi.h from Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f61627e540ca929882df4… commit f61627e540ca929882df4ea594c29e3894424e7c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Oct 19 11:06:20 2017 +0100 [PSDK] Add some missing definitions to winbase.h. Import libloaderapi.h from Wine Staging 2.16. CORE-13762 --- sdk/include/psdk/libloaderapi.h | 36 ++++++++++++++++++++++++++++++++++++ sdk/include/psdk/winbase.h | 26 ++++++++++++++++++++------ 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/sdk/include/psdk/libloaderapi.h b/sdk/include/psdk/libloaderapi.h new file mode 100644 index 0000000000..8f112a7d60 --- /dev/null +++ b/sdk/include/psdk/libloaderapi.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _APISETLIBLOADER_ +#define _APISETLIBLOADER_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *DLL_DIRECTORY_COOKIE, **PDLL_DIRECTORY_COOKIE; + +WINBASEAPI DLL_DIRECTORY_COOKIE WINAPI AddDllDirectory(const WCHAR *); +WINBASEAPI BOOL WINAPI RemoveDllDirectory(DLL_DIRECTORY_COOKIE); +WINBASEAPI BOOL WINAPI SetDefaultDllDirectories(DWORD); + +#ifdef __cplusplus +} +#endif + +#endif /* _APISETLIBLOADER_ */ diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 09812fc128..ec3615aa3e 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -11,6 +11,8 @@ extern "C" { #endif +#include <libloaderapi.h> + #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable:4201) @@ -331,12 +333,19 @@ extern "C" { #define PROCESS_HEAP_ENTRY_BUSY 4 #define PROCESS_HEAP_ENTRY_MOVEABLE 16 #define PROCESS_HEAP_ENTRY_DDESHARE 32 -#define DONT_RESOLVE_DLL_REFERENCES 1 -#define LOAD_LIBRARY_AS_DATAFILE 2 -#define LOAD_WITH_ALTERED_SEARCH_PATH 8 -#define LOAD_IGNORE_CODE_AUTHZ_LEVEL 16 -#define LOAD_LIBRARY_AS_IMAGE_RESOURCE 32 -#define LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE 64 + +#define DONT_RESOLVE_DLL_REFERENCES 1 +#define LOAD_LIBRARY_AS_DATAFILE 2 +#define LOAD_WITH_ALTERED_SEARCH_PATH 8 +#define LOAD_IGNORE_CODE_AUTHZ_LEVEL 16 +#define LOAD_LIBRARY_AS_IMAGE_RESOURCE 32 +#define LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE 64 +#define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR 256 +#define LOAD_LIBRARY_SEARCH_APPLICATION_DIR 512 +#define LOAD_LIBRARY_SEARCH_USER_DIRS 1024 +#define LOAD_LIBRARY_SEARCH_SYSTEM32 2048 +#define LOAD_LIBRARY_SEARCH_DEFAULT_DIRS 4096 + #define LMEM_FIXED 0 #define LMEM_MOVEABLE 2 #define LMEM_NONZEROLHND 2 @@ -576,6 +585,11 @@ extern "C" { #define CONDITION_VARIABLE_LOCKMODE_SHARED RTL_CONDITION_VARIABLE_LOCKMODE_SHARED #endif +#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) + #define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT #if (_WIN32_WINNT >= 0x0600)

7 years

[reactos] 01/01: [NTOSKRNL] Add ASSERTs to make sure, we never use an uninitialized variable

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c66b66656bde3d35028ae… commit c66b66656bde3d35028aefe64e8900482ee65af5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Oct 11 18:35:54 2017 +0200 [NTOSKRNL] Add ASSERTs to make sure, we never use an uninitialized variable --- ntoskrnl/mm/ARM3/vadnode.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/ARM3/vadnode.c b/ntoskrnl/mm/ARM3/vadnode.c index 4ada3ad6c0..b20839ab62 100644 --- a/ntoskrnl/mm/ARM3/vadnode.c +++ b/ntoskrnl/mm/ARM3/vadnode.c @@ -601,7 +601,7 @@ MiFindEmptyAddressRangeDownTree(IN SIZE_T Length, OUT PULONG_PTR Base, OUT PMMADDRESS_NODE *Parent) { - PMMADDRESS_NODE Node, OldNode, Child; + PMMADDRESS_NODE Node, OldNode = NULL, Child; ULONG_PTR LowVpn, HighVpn, AlignmentVpn; PFN_NUMBER PageCount; @@ -670,8 +670,14 @@ MiFindEmptyAddressRangeDownTree(IN SIZE_T Length, } else { - /* Node has a right child, the node we had before is the most - left grandchild of that right child, use it as parent. */ + /* Node has a right child. This means we must have already + moved one node left from the right-most node we started + with, thus we already have an OldNode! */ + ASSERT(OldNode != NULL); + + /* The node we had before is the most left grandchild of + that right child, use it as parent. */ + ASSERT(RtlLeftChildAvl(OldNode) == NULL); *Parent = OldNode; return TableInsertAsLeft; }

7 years

← Newer
1
...
9
10
11
12
13
14
15
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2017