September 2022 - Wine-commits

Alexandre Julliard : kernel32/tests: Don't assume that notifications are instantaneous.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: 7c7e7e916309c229cff9b83394a7473f07251db4 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c7e7e916309c229cff9b83394a747… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 11:58:18 2022 +0200 kernel32/tests: Don't assume that notifications are instantaneous. --- dlls/kernel32/tests/change.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 609cf30bcfa..15d5a4e0fe6 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -290,7 +290,7 @@ static void test_ffcn(void) ok( file != INVALID_HANDLE_VALUE, "CreateFile error %lu\n", GetLastError() ); CloseHandle(file); - r = WaitForSingleObject( handle, 0 ); + r = WaitForSingleObject( handle, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n"); r = WaitForSingleObject( handle, 0 ); @@ -305,7 +305,7 @@ static void test_ffcn(void) r = DeleteFileW( filename ); ok( r == TRUE, "failed to remove file\n"); - r = WaitForSingleObject( handle, 0 ); + r = WaitForSingleObject( handle, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n"); r = WaitForSingleObject( handle, 0 ); @@ -320,7 +320,7 @@ static void test_ffcn(void) r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create subdir\n"); - r = WaitForSingleObject( handle, 0 ); + r = WaitForSingleObject( handle, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n"); r = WaitForSingleObject( handle, 0 ); @@ -335,7 +335,7 @@ static void test_ffcn(void) r = RemoveDirectoryW( subdir ); ok( r == TRUE, "failed to remove subdir\n"); - r = WaitForSingleObject( handle, 0 ); + r = WaitForSingleObject( handle, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n"); r = WaitForSingleObject( handle, 0 );

1 0

Alexandre Julliard : ntdll/tests: Fix some race conditions.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: e4e26bbc3eff51a3afe63fbd7eea1f4a837218ae URL: https://gitlab.winehq.org/wine/wine/-/commit/e4e26bbc3eff51a3afe63fbd7eea1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 11:58:50 2022 +0200 ntdll/tests: Fix some race conditions. --- dlls/ntdll/tests/threadpool.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 18ccca11874..008755e6e5d 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -1163,11 +1163,6 @@ static void CALLBACK instance_semaphore_completion_cb(TP_CALLBACK_INSTANCE *inst static void CALLBACK instance_finalization_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) { HANDLE *semaphores = userdata; - DWORD result; - - Sleep(50); - result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); ReleaseSemaphore(semaphores[1], 1, NULL); } @@ -1926,7 +1921,7 @@ static void test_tp_multi_wait(void) multi_wait_info.result = 0; ReleaseSemaphore(semaphores[i], 1, NULL); - result = WaitForSingleObject(semaphore, 100); + result = WaitForSingleObject(semaphore, 2000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); ok(multi_wait_info.result == i, "expected result %d, got %lu\n", i, multi_wait_info.result); @@ -1939,7 +1934,7 @@ static void test_tp_multi_wait(void) multi_wait_info.result = 0; ReleaseSemaphore(semaphores[i], 1, NULL); - result = WaitForSingleObject(semaphore, 100); + result = WaitForSingleObject(semaphore, 2000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); ok(multi_wait_info.result == i, "expected result %d, got %lu\n", i, multi_wait_info.result); @@ -1956,7 +1951,7 @@ static void test_tp_multi_wait(void) for (i = 0; i < ARRAY_SIZE(semaphores); i++) { - result = WaitForSingleObject(semaphore, 150); + result = WaitForSingleObject(semaphore, 2000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); }

1 0

Alexandre Julliard : shell32: Fix sharing modes when loading/saving link files.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: f49a30167a945062e197dcbd8848c9f46ef3da26 URL: https://gitlab.winehq.org/wine/wine/-/commit/f49a30167a945062e197dcbd8848c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 15:59:41 2022 +0200 shell32: Fix sharing modes when loading/saving link files. --- dlls/shell32/shelllink.c | 5 ++--- dlls/shell32/tests/shelllink.c | 49 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 042b3bf5829..2827b700372 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -277,8 +277,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p, %s, %lx)\n",This, debugstr_w(pszFileName), dwMode); - if( dwMode == 0 ) - dwMode = STGM_READ | STGM_SHARE_DENY_WRITE; + if( dwMode == 0 ) dwMode = STGM_READ; r = SHCreateStreamOnFileW(pszFileName, dwMode, &stm); if( SUCCEEDED( r ) ) { @@ -371,7 +370,7 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile fRemember = FALSE; } - r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); + r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_DENY_WRITE, &stm ); if( SUCCEEDED( r ) ) { r = IPersistStream_Save(StreamThis, stm, FALSE); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 345484d9a5d..e7cc3c51aba 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -26,6 +26,7 @@ #include "shlguid.h" #include "shobjidl.h" #include "shlobj.h" +#include "shlwapi.h" #include "shellapi.h" #include "commoncontrols.h" @@ -619,6 +620,9 @@ static void test_load_save(void) char mypath[MAX_PATH]; char mydir[MAX_PATH]; char realpath[MAX_PATH]; + IPersistFile *pf; + IShellLinkA *sl; + IStream *stm; char* p; HANDLE hf; DWORD r; @@ -809,13 +813,52 @@ static void test_load_save(void) r = DeleteFileA(realpath); ok(r, "failed to delete file %s (%ld)\n", realpath, GetLastError()); + /* test sharing modes */ + r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkA, (LPVOID*)&sl); + ok( r == S_OK, "no IID_IShellLinkA (0x%08lx)\n", r ); + r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (void**)&pf); + ok( r == S_OK, "no IID_IPersistFile (0x%08lx)\n", r ); + + r = SHCreateStreamOnFileW(lnkfile, STGM_READ, &stm); + ok( !r, "SHCreateStreamOnFileW failed %lx\n", r ); + r = IPersistFile_Save(pf, lnkfile, FALSE); + ok(r == S_OK, "IPersistFile_Save failed (0x%08lx)\n", r); + r = IPersistFile_Load(pf, lnkfile, 0); + ok(r == S_OK, "IPersistFile_Load failed (0x%08lx)\n", r); + IStream_Release( stm ); + + r = SHCreateStreamOnFileW(lnkfile, STGM_READ | STGM_SHARE_DENY_WRITE, &stm); + ok( r == S_OK, "SHCreateStreamOnFileW failed %lx\n", r ); + r = IPersistFile_Save(pf, lnkfile, FALSE); + ok( r == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "IPersistFile_Save failed (0x%08lx)\n", r ); + r = IPersistFile_Load(pf, lnkfile, 0); + ok(r == S_OK, "IPersistFile_Load failed (0x%08lx)\n", r); + IStream_Release( stm ); + + r = SHCreateStreamOnFileW(lnkfile, STGM_READWRITE | STGM_SHARE_DENY_WRITE, &stm); + ok( r == S_OK, "SHCreateStreamOnFileW failed %lx\n", r ); + r = IPersistFile_Save(pf, lnkfile, FALSE); + ok( r == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "IPersistFile_Save failed (0x%08lx)\n", r ); + r = IPersistFile_Load(pf, lnkfile, 0); + ok(r == S_OK, "IPersistFile_Load failed (0x%08lx)\n", r); + IStream_Release( stm ); + + r = SHCreateStreamOnFileW(lnkfile, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &stm); + ok( r == S_OK, "SHCreateStreamOnFileW failed %lx\n", r ); + r = IPersistFile_Save(pf, lnkfile, FALSE); + ok( r == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "IPersistFile_Save failed (0x%08lx)\n", r ); + r = IPersistFile_Load(pf, lnkfile, 0); + ok( r == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "IPersistFile_Load failed (0x%08lx)\n", r ); + IStream_Release( stm ); + + IShellLinkA_Release( sl ); + IPersistFile_Release( pf ); + /* FIXME: Also test saving a .lnk pointing to a pidl that cannot be * represented as a path. */ - /* DeleteFileW is not implemented on Win9x */ - r=DeleteFileA(lnkfileA); - ok(r, "failed to delete link '%s' (%ld)\n", lnkfileA, GetLastError()); + DeleteFileW(lnkfile); } static void test_datalink(void)

1 0