January 2014 - Wine-Commits

Bruno Jesus : ws2_32/tests: Add missing closesocket calls (Coverity).
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 84d91bb93d97a79b63d7f81ebc828e9eeb66efd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d91bb93d97a79b63d7f81eb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 19:07:52 2014 -0200 ws2_32/tests: Add missing closesocket calls (Coverity). --- dlls/ws2_32/tests/sock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0abf732..8cee632 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1061,6 +1061,9 @@ static void test_WithWSAStartup(void) ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); } + closesocket(src); + closesocket(dst); + WSACleanup(); }

1 0

Sebastian Lackner : kernel32/tests: Add tests for SleepConditionVariableSRW.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 2ff6bd271bca5110d4531f03f32337d820715a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff6bd271bca5110d4531f03f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 26 01:29:04 2014 +0100 kernel32/tests: Add tests for SleepConditionVariableSRW. --- dlls/kernel32/tests/sync.c | 91 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 61dd7e1..74f1a84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -44,6 +44,7 @@ static BOOL (WINAPI *pInitOnceComplete)(PINIT_ONCE,DWORD,LPVOID); static VOID (WINAPI *pInitializeConditionVariable)(PCONDITION_VARIABLE); static BOOL (WINAPI *pSleepConditionVariableCS)(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); +static BOOL (WINAPI *pSleepConditionVariableSRW)(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); static VOID (WINAPI *pWakeAllConditionVariable)(PCONDITION_VARIABLE); static VOID (WINAPI *pWakeConditionVariable)(PCONDITION_VARIABLE); @@ -1547,6 +1548,7 @@ static void test_condvars_consumer_producer(void) static DWORD condvar_seq = 0; static CONDITION_VARIABLE condvar_base = CONDITION_VARIABLE_INIT; static CRITICAL_SECTION condvar_crit; +static SRWLOCK condvar_srwlock; /* Sequence of wake/sleep to check boundary conditions: * 0: init @@ -1558,7 +1560,14 @@ static CRITICAL_SECTION condvar_crit; * 6: a wakeall is handed to a SleepConditionVariableCS * 7: sleep after above should timeout * 8: wake with crit section locked into the sleep timeout - * 9: end + * + * the following tests will only be executed if InitializeSRWLock is available + * + * 9: producer (exclusive) wakes up consumer (exclusive) + * 10: producer (exclusive) wakes up consumer (shared) + * 11: producer (shared) wakes up consumer (exclusive) + * 12: producer (shared) wakes up consumer (shared) + * 13: end */ static DWORD WINAPI condvar_base_producer(LPVOID x) { while (condvar_seq < 1) Sleep(1); @@ -1585,6 +1594,31 @@ static DWORD WINAPI condvar_base_producer(LPVOID x) { Sleep(50); LeaveCriticalSection (&condvar_crit); + /* skip over remaining tests if InitializeSRWLock is not available */ + if (!pInitializeSRWLock) + return 0; + + while (condvar_seq < 9) Sleep(1); + pAcquireSRWLockExclusive(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockExclusive(&condvar_srwlock); + + while (condvar_seq < 10) Sleep(1); + pAcquireSRWLockExclusive(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockExclusive(&condvar_srwlock); + + while (condvar_seq < 11) Sleep(1); + pAcquireSRWLockShared(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockShared(&condvar_srwlock); + + while (condvar_seq < 12) Sleep(1); + Sleep(50); /* ensure that consumer waits for cond variable */ + pAcquireSRWLockShared(&condvar_srwlock); + pWakeConditionVariable(&condvar_base); + pReleaseSRWLockShared(&condvar_srwlock); + return 0; } @@ -1634,8 +1668,40 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 20); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should still return TRUE on crit unlock delay\n"); - condvar_seq = 9; + /* skip over remaining tests if InitializeSRWLock is not available */ + if (!pInitializeSRWLock) + { + win_skip("no srw lock support.\n"); + condvar_seq = 13; /* end */ + return 0; + } + + pAcquireSRWLockExclusive(&condvar_srwlock); + condvar_seq = 9; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + pReleaseSRWLockExclusive(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + pAcquireSRWLockShared(&condvar_srwlock); + condvar_seq = 10; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + pReleaseSRWLockShared(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + pAcquireSRWLockExclusive(&condvar_srwlock); + condvar_seq = 11; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + pReleaseSRWLockExclusive(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + pAcquireSRWLockShared(&condvar_srwlock); + condvar_seq = 12; + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + pReleaseSRWLockShared(&condvar_srwlock); + ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); + + condvar_seq = 13; return 0; } @@ -1653,6 +1719,9 @@ static void test_condvars_base(void) { InitializeCriticalSection (&condvar_crit); + if (pInitializeSRWLock) + pInitializeSRWLock(&condvar_srwlock); + EnterCriticalSection (&condvar_crit); ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); @@ -1660,6 +1729,23 @@ static void test_condvars_base(void) { ok (!ret, "SleepConditionVariableCS should return FALSE on untriggered condvar\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + if (pInitializeSRWLock) + { + pAcquireSRWLockExclusive(&condvar_srwlock); + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, 0); + pReleaseSRWLockExclusive(&condvar_srwlock); + + ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); + ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + + pAcquireSRWLockShared(&condvar_srwlock); + ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); + pReleaseSRWLockShared(&condvar_srwlock); + + ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); + ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + } + hp = CreateThread(NULL, 0, condvar_base_producer, NULL, 0, &dummy); hc = CreateThread(NULL, 0, condvar_base_consumer, NULL, 0, &dummy); @@ -2216,6 +2302,7 @@ START_TEST(sync) pInitOnceComplete = (void *)GetProcAddress(hdll, "InitOnceComplete"); pInitializeConditionVariable = (void *)GetProcAddress(hdll, "InitializeConditionVariable"); pSleepConditionVariableCS = (void *)GetProcAddress(hdll, "SleepConditionVariableCS"); + pSleepConditionVariableSRW = (void *)GetProcAddress(hdll, "SleepConditionVariableSRW"); pWakeAllConditionVariable = (void *)GetProcAddress(hdll, "WakeAllConditionVariable"); pWakeConditionVariable = (void *)GetProcAddress(hdll, "WakeConditionVariable"); pInitializeSRWLock = (void *)GetProcAddress(hdll, "InitializeSRWLock");

1 0

Sebastian Lackner : ntdll: Implement RtlSleepConditionVariableSRW.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: fad29fc5d997cfc13d75c0a5b5563c85188ba2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad29fc5d997cfc13d75c0a5b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 01:05:15 2014 +0100 ntdll: Implement RtlSleepConditionVariableSRW. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/sync.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 3 files changed, 46 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4140ff9..3c751ea 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -869,6 +869,7 @@ @ stub RtlSetUserValueHeap @ stdcall RtlSizeHeap(long long ptr) @ stdcall RtlSleepConditionVariableCS(ptr ptr ptr) +@ stdcall RtlSleepConditionVariableSRW(ptr ptr ptr long) @ stub RtlSplay @ stub RtlStartRXact # @ stub RtlStatMemoryStream diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 6404ac5..8ef16cc 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1696,3 +1696,47 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R RtlEnterCriticalSection( crit ); return status; } + +/*********************************************************************** + * RtlSleepConditionVariableSRW (NTDLL.@) + * + * Atomically releases the SRWLock and suspends the thread, + * waiting for a Wake(All)ConditionVariable event. Afterwards it enters + * the SRWLock again with the same access rights and returns. + * + * PARAMS + * variable [I/O] condition variable + * lock [I/O] SRWLock to leave temporarily + * timeout [I] timeout + * flags [I] type of the current lock (exclusive / shared) + * + * RETURNS + * see NtWaitForKeyedEvent for all possible return values. + * + * NOTES + * the behaviour is undefined if the thread doesn't own the lock. + */ +NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, + const LARGE_INTEGER *timeout, ULONG flags ) +{ + NTSTATUS status; + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + return status; +} diff --git a/include/winternl.h b/include/winternl.h index d3a02bf..22ee8e8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2503,6 +2503,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableCS(RTL_CONDITION_VARIABLE*,RTL_CRITICAL_SECTION*,const LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableSRW(RTL_CONDITION_VARIABLE*,RTL_SRWLOCK*,const LARGE_INTEGER*,ULONG); NTSYSAPI NTSTATUS WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING); NTSYSAPI LPDWORD WINAPI RtlSubAuthoritySid(PSID,DWORD); NTSYSAPI LPBYTE WINAPI RtlSubAuthorityCountSid(PSID);

1 0

Jacek Caban : wmp: Added WindowsMediaPlayer object stub implementation.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: dcdfb7d8a0fa86cc408785e3ee7c3725921b3c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcdfb7d8a0fa86cc408785e3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 25 18:22:08 2014 +0100 wmp: Added WindowsMediaPlayer object stub implementation. --- dlls/wmp/Makefile.in | 1 + dlls/wmp/oleobj.c | 272 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_main.c | 13 +-- dlls/wmp/wmp_private.h | 35 +++++++ 4 files changed, 309 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcdfb7d8a0fa86cc40878…

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::CreateFolder.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: d6f6b6b798c51119f91a815b8720033ae3e99a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f6b6b798c51119f91a815b8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:07:46 2014 +0900 taskschd: Implement ITaskFolder::CreateFolder. --- dlls/taskschd/folder.c | 72 ++++++++++++++++++++++++++++++++------ dlls/taskschd/task.c | 2 +- dlls/taskschd/taskschd_private.h | 2 +- dlls/taskschd/tests/scheduler.c | 15 ++------ 4 files changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 6871138..4eb7b8a 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -134,6 +134,30 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) return S_OK; } +static HRESULT reg_create_folder(const WCHAR *path, HKEY *hfolder) +{ + HKEY hroot; + DWORD ret, disposition; + + ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); + if (ret) return HRESULT_FROM_WIN32(ret); + + while (*path == '\\') path++; + ret = RegCreateKeyExW(hroot, path, 0, NULL, 0, KEY_ALL_ACCESS, NULL, hfolder, &disposition); + if (ret == ERROR_FILE_NOT_FOUND) + ret = ERROR_PATH_NOT_FOUND; + + if (ret == ERROR_SUCCESS && disposition == REG_OPENED_EXISTING_KEY) + { + RegCloseKey(*hfolder); + ret = ERROR_ALREADY_EXISTS; + } + + RegCloseKey(hroot); + + return HRESULT_FROM_WIN32(ret); +} + static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) { HKEY hroot; @@ -203,7 +227,7 @@ static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskF if (!path) return E_INVALIDARG; if (!new_folder) return E_POINTER; - return TaskFolder_create(folder->path, path, new_folder); + return TaskFolder_create(folder->path, path, new_folder, FALSE); } static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITaskFolderCollection **folders) @@ -212,10 +236,32 @@ static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITas return E_NOTIMPL; } -static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR name, VARIANT sddl, ITaskFolder **folder) +static inline BOOL is_variant_null(const VARIANT *var) { - FIXME("%p,%s,%s,%p: stub\n", iface, debugstr_w(name), debugstr_variant(&sddl), folder); - return E_NOTIMPL; + return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL || + (V_VT(var) == VT_BSTR && (V_BSTR(var) == NULL || !*V_BSTR(var))); +} + +static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR path, VARIANT sddl, ITaskFolder **new_folder) +{ + TaskFolder *folder = impl_from_ITaskFolder(iface); + ITaskFolder *tmp_folder = NULL; + HRESULT hr; + + TRACE("%p,%s,%s,%p\n", iface, debugstr_w(path), debugstr_variant(&sddl), folder); + + if (!path) return E_INVALIDARG; + + if (!new_folder) new_folder = &tmp_folder; + + if (!is_variant_null(&sddl)) + FIXME("security descriptor %s is ignored\n", debugstr_variant(&sddl)); + + hr = TaskFolder_create(folder->path, path, new_folder, TRUE); + if (tmp_folder) + ITaskFolder_Release(tmp_folder); + + return hr; } static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LONG flags) @@ -302,7 +348,7 @@ static const ITaskFolderVtbl TaskFolder_vtbl = TaskFolder_SetSecurityDescriptor }; -HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj) +HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) { static const WCHAR bslash[] = { '\\', 0 }; TaskFolder *folder; @@ -328,17 +374,21 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (parent) strcpyW(folder_path, parent); - len = strlenW(folder_path); - if (!len || folder_path[len - 1] != '\\') - strcatW(folder_path, bslash); - - if (path) + if (path && *path) { + len = strlenW(folder_path); + if (!len || folder_path[len - 1] != '\\') + strcatW(folder_path, bslash); + while (*path == '\\') path++; strcatW(folder_path, path); } - hr = reg_open_folder(folder_path, &hfolder); + len = strlenW(folder_path); + if (!len) + strcatW(folder_path, bslash); + + hr = create ? reg_create_folder(folder_path, &hfolder) : reg_open_folder(folder_path, &hfolder); if (hr) { HeapFree(GetProcessHeap(), 0, folder_path); diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 632cabb..a13a968 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -117,7 +117,7 @@ static HRESULT WINAPI TaskService_GetFolder(ITaskService *iface, BSTR path, ITas if (!folder) return E_POINTER; - return TaskFolder_create(path, NULL, folder); + return TaskFolder_create(path, NULL, folder, FALSE); } static HRESULT WINAPI TaskService_GetRunningTasks(ITaskService *iface, LONG flags, IRunningTaskCollection **tasks) diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index deebc41..4ef348f 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -17,6 +17,6 @@ */ HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; -HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj) DECLSPEC_HIDDEN; +HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index a976de2..61e4a04 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -185,7 +185,6 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_CreateFolder(folder, NULL, v_null, &subfolder); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); /* Just in case something was left from previous runs */ @@ -205,20 +204,14 @@ todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); -todo_wine ok(hr == S_OK, "CreateFolder error %#x\n", hr); - if (hr != S_OK) - { - ITaskFolder_Release(folder); - ITaskService_Release(service); - return; - } ITaskFolder_Release(subfolder); hr = ITaskFolder_CreateFolder(folder, Wine, v_null, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_, v_null, &subfolder); +todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine, v_null, &subfolder); @@ -239,11 +232,6 @@ todo_wine hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); ok(hr == S_OK, "GetFolder error %#x\n", hr); - if (hr != S_OK) - { - ITaskService_Release(service); - return; - } hr = ITaskFolder_get_Name(subfolder, &bstr); ok (hr == S_OK, "get_Name error %#x\n", hr); @@ -303,6 +291,7 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_GetFolder(subfolder, bslash, &subfolder2); +todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_GetFolder(subfolder, NULL, &subfolder2);

1 0

Piotr Caban : msvcp110: Fix sprintf argument size in num_put:: do_put_double.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e7c9e32d7d3c6ae235a52f811e0ce753ecc54e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c9e32d7d3c6ae235a52f811… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 21 15:18:34 2014 +0100 msvcp110: Fix sprintf argument size in num_put::do_put_double. --- dlls/msvcp90/locale.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2cdd002..606d6ca 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7350,9 +7350,12 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); } -static inline streamsize get_precision(const ios_base *base) +static inline unsigned get_precision(const ios_base *base) { - return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec; + streamsize ret = base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec; + if(ret > UINT_MAX) + ret = UINT_MAX; + return ret; } /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DN(a)Z */ @@ -7385,7 +7388,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; - streamsize prec; + unsigned prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); @@ -8304,7 +8307,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_double(const num_put char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; - streamsize prec; + unsigned prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); @@ -8339,7 +8342,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; - streamsize prec; + unsigned prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::GetFolder.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: efced588616da1ac8153b3d7da40a3dd6dd14bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efced588616da1ac8153b3d7d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:06:28 2014 +0900 taskschd: Implement ITaskFolder::GetFolder. --- dlls/taskschd/folder.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 6d69002..6871138 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -194,10 +194,16 @@ static HRESULT WINAPI TaskFolder_get_Path(ITaskFolder *iface, BSTR *path) return S_OK; } -static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskFolder **folder) +static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskFolder **new_folder) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_w(path), folder); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%s,%p\n", iface, debugstr_w(path), folder); + + if (!path) return E_INVALIDARG; + if (!new_folder) return E_POINTER; + + return TaskFolder_create(folder->path, path, new_folder); } static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITaskFolderCollection **folders)

1 0

Vincent Povirk : gdiplus: Add test for page transform in metafiles.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 3f8864ea822117a8dfb6a1f73ac554931febf13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f8864ea822117a8dfb6a1f73… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 14:58:50 2014 -0600 gdiplus: Add test for page transform in metafiles. --- dlls/gdiplus/tests/metafile.c | 203 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index d4d7adb..16c440b 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -18,11 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "objbase.h" #include "gdiplus.h" #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) typedef struct emfplus_record { @@ -709,6 +712,205 @@ static void test_fillrect(void) expect(Ok, stat); } +static const emfplus_record pagetransform_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSetPageTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSetPageTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSetPageTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSetPageTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_pagetransform(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc; + static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpBitmap *bitmap; + ARGB color; + GpBrush *brush; + GpUnit unit; + REAL scale, dpix, dpiy; + UINT width, height; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitInch, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &dpix); + todo_wine expect(InvalidParameter, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &dpiy); + todo_wine expect(InvalidParameter, stat); + + stat = GdipGetImageWidth((GpImage*)metafile, &width); + todo_wine expect(InvalidParameter, stat); + + stat = GdipGetImageHeight((GpImage*)metafile, &height); + todo_wine expect(InvalidParameter, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + /* initial scale */ + stat = GdipGetPageUnit(graphics, &unit); + expect(Ok, stat); + expect(UnitDisplay, unit); + + stat = GdipGetPageScale(graphics, &scale); + expect(Ok, stat); + expectf(1.0, scale); + + stat = GdipGetDpiX(graphics, &dpix); + expect(Ok, stat); + expectf(96.0, dpix); + + stat = GdipGetDpiY(graphics, &dpiy); + expect(Ok, stat); + expectf(96.0, dpiy); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 1, 2, 1, 1); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + /* page unit = pixels */ + stat = GdipSetPageUnit(graphics, UnitPixel); + expect(Ok, stat); + + stat = GdipGetPageUnit(graphics, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + + stat = GdipCreateSolidFill((ARGB)0xff00ff00, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 0, 1, 1, 1); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + /* page scale = 3, unit = pixels */ + stat = GdipSetPageScale(graphics, 3.0); + expect(Ok, stat); + + stat = GdipGetPageScale(graphics, &scale); + expect(Ok, stat); + expectf(3.0, scale); + + stat = GdipCreateSolidFill((ARGB)0xff00ffff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 0, 1, 2, 2); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + /* page scale = 3, unit = inches */ + stat = GdipSetPageUnit(graphics, UnitInch); + expect(Ok, stat); + + stat = GdipGetPageUnit(graphics, &unit); + expect(Ok, stat); + expect(UnitInch, unit); + + stat = GdipCreateSolidFill((ARGB)0xffff0000, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 1.0/96.0, 0, 1, 1); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + /* page scale = 3, unit = display */ + stat = GdipSetPageUnit(graphics, UnitDisplay); + expect(Ok, stat); + + stat = GdipGetPageUnit(graphics, &unit); + expect(Ok, stat); + expect(UnitDisplay, unit); + + stat = GdipCreateSolidFill((ARGB)0xffff00ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 3, 3, 2, 2); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, pagetransform_records, "pagetransform metafile", dst_points, &frame, UnitPixel); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, pagetransform_records, "pagetransform playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 30, 50, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 10, 30, &color); + expect(Ok, stat); + expect(0xff00ff00, color); + + stat = GdipBitmapGetPixel(bitmap, 20, 80, &color); + expect(Ok, stat); + expect(0xff00ffff, color); + + stat = GdipBitmapGetPixel(bitmap, 80, 20, &color); + expect(Ok, stat); + expect(0xffff0000, color); + + stat = GdipBitmapGetPixel(bitmap, 80, 80, &color); + expect(Ok, stat); + expect(0xffff00ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -725,6 +927,7 @@ START_TEST(metafile) test_getdc(); test_emfonly(); test_fillrect(); + test_pagetransform(); GdiplusShutdown(gdiplusToken); }

1 0

Sebastian Lackner : winex11: Catch invalid values from broken QX11EmbedContainer implementations.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: f3568a5e1222ce2a85a05efeb417c141fceb0d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3568a5e1222ce2a85a05efeb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 23 20:19:41 2014 +0100 winex11: Catch invalid values from broken QX11EmbedContainer implementations. --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f60e845..ea24471 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1662,7 +1662,7 @@ static void handle_xembed_protocol( HWND hwnd, XClientMessageEvent *event ) data->embedder = event->data.l[3]; /* window has been marked as embedded before (e.g. systray) */ - if (data->embedded) + if (data->embedded || !data->embedder /* broken QX11EmbedContainer implementation */) { release_win_data( data ); break;

1 0

Piotr Caban : msvcrt: Fix wcs*coll functions behavior in C locale.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 965d3acc6d0147b1cf1465ef814f4134031cf978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965d3acc6d0147b1cf1465ef8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 23 15:10:30 2014 +0100 msvcrt: Fix wcs*coll functions behavior in C locale. --- dlls/msvcrt/wcs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 12458a8..1b00b41 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -105,6 +105,8 @@ int CDECL MSVCRT__wcsicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strcmpiW(str1, str2); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -130,6 +132,8 @@ int CDECL MSVCRT__wcsnicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strncmpiW(str1, str2, count); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, count, str2, count)-CSTR_EQUAL; } @@ -258,6 +262,8 @@ int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strncmpW(str1, str2, count); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; } @@ -1182,6 +1188,8 @@ int CDECL MSVCRT__wcscoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* st else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strcmpW(str1, str2); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; }

1 0