June 2015 - Wine-commits - list.winehq.org

Iván Matellanes : msvcirt: Add implementation of streambuf::seekoff/seekpos.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 6b6dc42d61ae08bb445f93e3ea00b20cf46fe827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6dc42d61ae08bb445f93e3e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 9 19:40:40 2015 +0200 msvcirt: Add implementation of streambuf::seekoff/seekpos. --- dlls/msvcirt/msvcirt.c | 9 +++++---- dlls/msvcirt/msvcirt.h | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index e20fb68..7a31699 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -354,9 +354,10 @@ int __thiscall streambuf_pbackfail(streambuf *this, int c) /* ?seekoff(a)streambuf@@UAEJJW4seek_dir(a)ios@@H(a)Z */ /* ?seekoff(a)streambuf@@UEAAJJW4seek_dir(a)ios@@H(a)Z */ DEFINE_THISCALL_WRAPPER(streambuf_seekoff, 16) -streampos __thiscall streambuf_seekoff(streambuf *this, streamoff offset, int dir, int mode) +#define call_streambuf_seekoff(this, off, dir, mode) CALL_VTBL_FUNC(this, 12, streampos, (streambuf*, streamoff, ios_seek_dir, int), (this, off, dir, mode)) +streampos __thiscall streambuf_seekoff(streambuf *this, streamoff offset, ios_seek_dir dir, int mode) { - FIXME("(%p %d %d %d): stub\n", this, offset, dir, mode); + TRACE("(%p %d %d %d)\n", this, offset, dir, mode); return EOF; } @@ -365,8 +366,8 @@ streampos __thiscall streambuf_seekoff(streambuf *this, streamoff offset, int di DEFINE_THISCALL_WRAPPER(streambuf_seekpos, 12) streampos __thiscall streambuf_seekpos(streambuf *this, streampos pos, int mode) { - FIXME("(%p %d %d): stub\n", this, pos, mode); - return EOF; + TRACE("(%p %d %d)\n", this, pos, mode); + return call_streambuf_seekoff(this, pos, SEEKDIR_beg, mode); } /* ?setb(a)streambuf@@IAEXPAD0H(a)Z */ diff --git a/dlls/msvcirt/msvcirt.h b/dlls/msvcirt/msvcirt.h index 5cf15de..4751e8c 100644 --- a/dlls/msvcirt/msvcirt.h +++ b/dlls/msvcirt/msvcirt.h @@ -23,6 +23,12 @@ typedef LONG streamoff; typedef LONG streampos; +typedef enum { + SEEKDIR_beg = 0, + SEEKDIR_cur = 1, + SEEKDIR_end = 2 +} ios_seek_dir; + extern void* (__cdecl *MSVCRT_operator_new)(SIZE_T); extern void (__cdecl *MSVCRT_operator_delete)(void*);

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::in_avail/out_waiting.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 44fbaf33422c65b261fb1cf8e67975416a239d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fbaf33422c65b261fb1cf8e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 9 19:40:49 2015 +0200 msvcirt: Add implementation of streambuf::in_avail/out_waiting. --- dlls/msvcirt/msvcirt.c | 18 ++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 8 ++++---- dlls/msvcrt20/msvcrt20.spec | 8 ++++---- dlls/msvcrt40/msvcrt40.spec | 8 ++++---- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7a31699..ae644b3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -335,6 +335,24 @@ void __thiscall streambuf_pbump(streambuf *this, int count) this->pptr += count; } +/* ?in_avail(a)streambuf@@QBEHXZ */ +/* ?in_avail(a)streambuf@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_in_avail, 4) +int __thiscall streambuf_in_avail(const streambuf *this) +{ + TRACE("(%p)\n", this); + return this->egptr - this->gptr; +} + +/* ?out_waiting(a)streambuf@@QBEHXZ */ +/* ?out_waiting(a)streambuf@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_out_waiting, 4) +int __thiscall streambuf_out_waiting(const streambuf *this) +{ + TRACE("(%p)\n", this); + return this->pptr - this->pbase; +} + /* Unexported */ DEFINE_THISCALL_WRAPPER(streambuf_overflow, 8) int __thiscall streambuf_overflow(streambuf *this, int c) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 576b905..c9f5c06 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -531,8 +531,8 @@ @ stub -arch=win64 ?hex@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?ignore(a)istream@@QAEAAV1(a)HH@Z # class istream & __thiscall istream::ignore(int,int) @ stub -arch=win64 ?ignore(a)istream@@QEAAAEAV1(a)HH@Z -@ stub -arch=win32 ?in_avail(a)streambuf@@QBEHXZ # int __thiscall streambuf::in_avail(void)const -@ stub -arch=win64 ?in_avail(a)streambuf@@QEBAHXZ +@ thiscall -arch=win32 ?in_avail(a)streambuf@@QBEHXZ(ptr) streambuf_in_avail +@ cdecl -arch=win64 ?in_avail(a)streambuf@@QEBAHXZ(ptr) streambuf_in_avail @ stub -arch=win32 ?init(a)ios@@IAEXPAVstreambuf@@@Z # void __thiscall ios::init(class streambuf *) @ stub -arch=win64 ?init(a)ios@@IEAAXPEAVstreambuf@@@Z @ stub -arch=win32 ?ipfx(a)istream@@QAEHH(a)Z # int __thiscall istream::ipfx(int) @@ -575,8 +575,8 @@ @ stub -arch=win64 ?opfx(a)ostream@@QEAAHXZ @ stub -arch=win32 ?osfx(a)ostream@@QAEXXZ # void __thiscall ostream::osfx(void) @ stub -arch=win64 ?osfx(a)ostream@@QEAAXXZ -@ stub -arch=win32 ?out_waiting(a)streambuf@@QBEHXZ # int __thiscall streambuf::out_waiting(void)const -@ stub -arch=win64 ?out_waiting(a)streambuf@@QEBAHXZ +@ thiscall -arch=win32 ?out_waiting(a)streambuf@@QBEHXZ(ptr) streambuf_out_waiting +@ cdecl -arch=win64 ?out_waiting(a)streambuf@@QEBAHXZ(ptr) streambuf_out_waiting @ stub -arch=win32 ?overflow(a)filebuf@@UAEHH(a)Z # virtual int __thiscall filebuf::overflow(int) @ stub -arch=win64 ?overflow(a)filebuf@@UEAAHH(a)Z @ stub -arch=win32 ?overflow(a)stdiobuf@@UAEHH(a)Z # virtual int __thiscall stdiobuf::overflow(int) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 5f43568..9d212fe 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -517,8 +517,8 @@ @ stub -arch=win64 ?hex@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?ignore(a)istream@@QAEAAV1(a)HH@Z @ stub -arch=win64 ?ignore(a)istream@@QEAAAEAV1(a)HH@Z -@ stub -arch=win32 ?in_avail(a)streambuf@@QBEHXZ -@ stub -arch=win64 ?in_avail(a)streambuf@@QEBAHXZ +@ thiscall -arch=win32 ?in_avail(a)streambuf@@QBEHXZ(ptr) msvcirt.?in_avail(a)streambuf@@QBEHXZ +@ cdecl -arch=win64 ?in_avail(a)streambuf@@QEBAHXZ(ptr) msvcirt.?in_avail(a)streambuf@@QEBAHXZ @ stub -arch=win32 ?init(a)ios@@IAEXPAVstreambuf@@@Z @ stub -arch=win64 ?init(a)ios@@IEAAXPEAVstreambuf@@@Z @ stub -arch=win32 ?ipfx(a)istream@@QAEHH(a)Z @@ -561,8 +561,8 @@ @ stub -arch=win64 ?opfx(a)ostream@@QEAAHXZ @ stub -arch=win32 ?osfx(a)ostream@@QAEXXZ @ stub -arch=win64 ?osfx(a)ostream@@QEAAXXZ -@ stub -arch=win32 ?out_waiting(a)streambuf@@QBEHXZ -@ stub -arch=win64 ?out_waiting(a)streambuf@@QEBAHXZ +@ thiscall -arch=win32 ?out_waiting(a)streambuf@@QBEHXZ(ptr) msvcirt.?out_waiting(a)streambuf@@QBEHXZ +@ cdecl -arch=win64 ?out_waiting(a)streambuf@@QEBAHXZ(ptr) msvcirt.?out_waiting(a)streambuf@@QEBAHXZ @ stub -arch=win32 ?overflow(a)filebuf@@UAEHH(a)Z @ stub -arch=win64 ?overflow(a)filebuf@@UEAAHH(a)Z @ stub -arch=win32 ?overflow(a)stdiobuf@@UAEHH(a)Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 81cdcf9..a1cabf9 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -584,8 +584,8 @@ @ stub -arch=win64 ?hex@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?ignore(a)istream@@QAEAAV1(a)HH@Z @ stub -arch=win64 ?ignore(a)istream@@QEAAAEAV1(a)HH@Z -@ stub -arch=win32 ?in_avail(a)streambuf@@QBEHXZ -@ stub -arch=win64 ?in_avail(a)streambuf@@QEBAHXZ +@ thiscall -arch=win32 ?in_avail(a)streambuf@@QBEHXZ(ptr) msvcirt.?in_avail(a)streambuf@@QBEHXZ +@ cdecl -arch=win64 ?in_avail(a)streambuf@@QEBAHXZ(ptr) msvcirt.?in_avail(a)streambuf@@QEBAHXZ @ stub -arch=win32 ?init(a)ios@@IAEXPAVstreambuf@@@Z @ stub -arch=win64 ?init(a)ios@@IEAAXPEAVstreambuf@@@Z @ stub -arch=win32 ?ipfx(a)istream@@QAEHH(a)Z @@ -630,8 +630,8 @@ @ stub -arch=win64 ?opfx(a)ostream@@QEAAHXZ @ stub -arch=win32 ?osfx(a)ostream@@QAEXXZ @ stub -arch=win64 ?osfx(a)ostream@@QEAAXXZ -@ stub -arch=win32 ?out_waiting(a)streambuf@@QBEHXZ -@ stub -arch=win64 ?out_waiting(a)streambuf@@QEBAHXZ +@ thiscall -arch=win32 ?out_waiting(a)streambuf@@QBEHXZ(ptr) msvcirt.?out_waiting(a)streambuf@@QBEHXZ +@ cdecl -arch=win64 ?out_waiting(a)streambuf@@QEBAHXZ(ptr) msvcirt.?out_waiting(a)streambuf@@QEBAHXZ @ stub -arch=win32 ?overflow(a)filebuf@@UAEHH(a)Z @ stub -arch=win64 ?overflow(a)filebuf@@UEAAHH(a)Z @ stub -arch=win32 ?overflow(a)stdiobuf@@UAEHH(a)Z

1 0

Louis Lenders : kernel32/tests: Add tests for GetSystemTimes.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 305a73bcb5a619079a65292aa814b7a1108aaef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305a73bcb5a619079a65292aa… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jul 27 11:42:28 2014 -0600 kernel32/tests: Add tests for GetSystemTimes. --- dlls/kernel32/tests/time.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 0bcde1e..febe366 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -22,9 +22,11 @@ #include "wine/test.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" static BOOL (WINAPI *pTzSpecificLocalTimeToSystemTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME); static BOOL (WINAPI *pSystemTimeToTzSpecificLocalTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME); +static BOOL (WINAPI *pGetSystemTimes)(LPFILETIME, LPFILETIME, LPFILETIME); static int (WINAPI *pGetCalendarInfoA)(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD); static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD); static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*); @@ -801,11 +803,77 @@ static void test_GetSystemTimePreciseAsFileTime(void) ok(diff < 10000 && diff > 0, "GetSystemTimePreciseAsFileTime incremented by more than 1 ms\n"); } +static void test_GetSystemTimes(void) +{ + + FILETIME idletime, kerneltime, usertime; + int i; + ULARGE_INTEGER ul1, ul2, ul3; + SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi; + SYSTEM_BASIC_INFORMATION sbi; + ULONG ReturnLength; + ULARGE_INTEGER total_usertime, total_kerneltime, total_idletime; + + if (!pGetSystemTimes) + { + win_skip("GetSystemTimes not available\n"); + return; + } + + todo_wine ok( pGetSystemTimes(NULL, NULL, NULL), "GetSystemTimes failed unexpectedly\n" ); + + total_usertime.QuadPart = 0; + total_kerneltime.QuadPart = 0; + total_idletime.QuadPart = 0; + memset( &idletime, 0x11, sizeof(idletime) ); + memset( &kerneltime, 0x11, sizeof(kerneltime) ); + memset( &usertime, 0x11, sizeof(usertime) ); + todo_wine ok( pGetSystemTimes(&idletime, &kerneltime , &usertime), + "GetSystemTimes failed unexpectedly\n" ); + + ul1.LowPart = idletime.dwLowDateTime; + ul1.HighPart = idletime.dwHighDateTime; + ul2.LowPart = kerneltime.dwLowDateTime; + ul2.HighPart = kerneltime.dwHighDateTime; + ul3.LowPart = usertime.dwLowDateTime; + ul3.HighPart = usertime.dwHighDateTime; + + ok( !NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength), + "NtQuerySystemInformation failed\n" ); + ok( sizeof(sbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength ); + + /* Check if we have some return values */ + trace( "Number of Processors : %d\n", sbi.NumberOfProcessors ); + ok( sbi.NumberOfProcessors > 0, "Expected more than 0 processors, got %d\n", + sbi.NumberOfProcessors ); + + sppi = HeapAlloc( GetProcessHeap(), 0, + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * sbi.NumberOfProcessors); + + ok( !NtQuerySystemInformation( SystemProcessorPerformanceInformation, sppi, + sizeof(*sppi), &ReturnLength), + "NtQuerySystemInformation failed\n" ); + + for (i = 0; i < sbi.NumberOfProcessors; i++) + { + total_usertime.QuadPart += sppi[i].UserTime.QuadPart; + total_kerneltime.QuadPart += sppi[i].KernelTime.QuadPart; + total_idletime.QuadPart += sppi[i].IdleTime.QuadPart; + } + + todo_wine ok( total_idletime.QuadPart - ul1.QuadPart < 10000000, "test idletime failed\n" ); + todo_wine ok( total_kerneltime.QuadPart - ul2.QuadPart < 10000000, "test kerneltime failed\n" ); + todo_wine ok( total_usertime.QuadPart - ul3.QuadPart < 10000000, "test usertime failed\n" ); + + HeapFree(GetProcessHeap(), 0, sppi); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandleA("kernel32"); pTzSpecificLocalTimeToSystemTime = (void *)GetProcAddress(hKernel, "TzSpecificLocalTimeToSystemTime"); pSystemTimeToTzSpecificLocalTime = (void *)GetProcAddress( hKernel, "SystemTimeToTzSpecificLocalTime"); + pGetSystemTimes = (void *)GetProcAddress( hKernel, "GetSystemTimes"); pGetCalendarInfoA = (void *)GetProcAddress(hKernel, "GetCalendarInfoA"); pGetCalendarInfoW = (void *)GetProcAddress(hKernel, "GetCalendarInfoW"); pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation"); @@ -817,6 +885,7 @@ START_TEST(time) test_FileTimeToSystemTime(); test_FileTimeToLocalFileTime(); test_TzSpecificLocalTimeToSystemTime(); + test_GetSystemTimes(); test_FileTimeToDosDateTime(); test_GetCalendarInfo(); test_GetDynamicTimeZoneInformation();

1 0

Erich E. Hoover : kernel32: Implement GetSystemTimes.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 5e817e93dedad99741a0637e5952e6f18590c866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e817e93dedad99741a0637e5… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Tue Jun 9 21:38:08 2015 -0600 kernel32: Implement GetSystemTimes. --- dlls/kernel32/tests/time.c | 12 ++++----- dlls/kernel32/time.c | 62 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index febe366..838d79c 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -820,7 +820,7 @@ static void test_GetSystemTimes(void) return; } - todo_wine ok( pGetSystemTimes(NULL, NULL, NULL), "GetSystemTimes failed unexpectedly\n" ); + ok( pGetSystemTimes(NULL, NULL, NULL), "GetSystemTimes failed unexpectedly\n" ); total_usertime.QuadPart = 0; total_kerneltime.QuadPart = 0; @@ -828,8 +828,8 @@ static void test_GetSystemTimes(void) memset( &idletime, 0x11, sizeof(idletime) ); memset( &kerneltime, 0x11, sizeof(kerneltime) ); memset( &usertime, 0x11, sizeof(usertime) ); - todo_wine ok( pGetSystemTimes(&idletime, &kerneltime , &usertime), - "GetSystemTimes failed unexpectedly\n" ); + ok( pGetSystemTimes(&idletime, &kerneltime , &usertime), + "GetSystemTimes failed unexpectedly\n" ); ul1.LowPart = idletime.dwLowDateTime; ul1.HighPart = idletime.dwHighDateTime; @@ -861,9 +861,9 @@ static void test_GetSystemTimes(void) total_idletime.QuadPart += sppi[i].IdleTime.QuadPart; } - todo_wine ok( total_idletime.QuadPart - ul1.QuadPart < 10000000, "test idletime failed\n" ); - todo_wine ok( total_kerneltime.QuadPart - ul2.QuadPart < 10000000, "test kerneltime failed\n" ); - todo_wine ok( total_usertime.QuadPart - ul3.QuadPart < 10000000, "test usertime failed\n" ); + ok( total_idletime.QuadPart - ul1.QuadPart < 10000000, "test idletime failed\n" ); + ok( total_kerneltime.QuadPart - ul2.QuadPart < 10000000, "test kerneltime failed\n" ); + ok( total_usertime.QuadPart - ul3.QuadPart < 10000000, "test usertime failed\n" ); HeapFree(GetProcessHeap(), 0, sppi); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index daafc7f..7dcf71f 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1104,9 +1104,67 @@ BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate, */ BOOL WINAPI GetSystemTimes(LPFILETIME lpIdleTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime) { - FIXME("(%p,%p,%p): Stub!\n", lpIdleTime, lpKernelTime, lpUserTime); + LARGE_INTEGER idle_time, kernel_time, user_time; + SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi; + SYSTEM_BASIC_INFORMATION sbi; + NTSTATUS status; + ULONG ret_size; + int i; - return FALSE; + TRACE("(%p,%p,%p)\n", lpIdleTime, lpKernelTime, lpUserTime); + + status = NtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), &ret_size ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + sppi = HeapAlloc( GetProcessHeap(), 0, + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * sbi.NumberOfProcessors); + if (!sppi) + { + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + + status = NtQuerySystemInformation( SystemProcessorPerformanceInformation, sppi, sizeof(*sppi) * sbi.NumberOfProcessors, + &ret_size ); + if (status != STATUS_SUCCESS) + { + HeapFree( GetProcessHeap(), 0, sppi ); + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + idle_time.QuadPart = 0; + kernel_time.QuadPart = 0; + user_time.QuadPart = 0; + for (i = 0; i < sbi.NumberOfProcessors; i++) + { + idle_time.QuadPart += sppi[i].IdleTime.QuadPart; + kernel_time.QuadPart += sppi[i].KernelTime.QuadPart; + user_time.QuadPart += sppi[i].UserTime.QuadPart; + } + + if (lpIdleTime) + { + lpIdleTime->dwLowDateTime = idle_time.u.LowPart; + lpIdleTime->dwHighDateTime = idle_time.u.HighPart; + } + if (lpKernelTime) + { + lpKernelTime->dwLowDateTime = kernel_time.u.LowPart; + lpKernelTime->dwHighDateTime = kernel_time.u.HighPart; + } + if (lpUserTime) + { + lpUserTime->dwLowDateTime = user_time.u.LowPart; + lpUserTime->dwHighDateTime = user_time.u.HighPart; + } + + HeapFree( GetProcessHeap(), 0, sppi ); + return TRUE; } /***********************************************************************

1 0

Alexandre Julliard : user32/tests: Add tests for SetClipboardData from a different thread.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: cce57e9e3ee7b9caa29c5f7697d540759be3c20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce57e9e3ee7b9caa29c5f769… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 10 18:37:34 2015 +0900 user32/tests: Add tests for SetClipboardData from a different thread. --- dlls/user32/tests/clipboard.c | 132 +++++++++++++++++++++++++++++++++++------- 1 file changed, 112 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index b9add86..be6c9bf 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -27,26 +27,84 @@ static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); +static int thread_from_line; + static DWORD WINAPI open_clipboard_thread(LPVOID arg) { HWND hWnd = arg; - ok(OpenClipboard(hWnd), "OpenClipboard failed\n"); + ok(OpenClipboard(hWnd), "%u: OpenClipboard failed\n", thread_from_line); return 0; } static DWORD WINAPI empty_clipboard_thread(LPVOID arg) { SetLastError( 0xdeadbeef ); - ok(!EmptyClipboard(), "EmptyClipboard succeeded\n" ); - ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError()); + ok(!EmptyClipboard(), "%u: EmptyClipboard succeeded\n", thread_from_line ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); return 0; } -static void test_ClipboardOwner(void) +static DWORD WINAPI open_and_empty_clipboard_thread(LPVOID arg) +{ + HWND hWnd = arg; + ok(OpenClipboard(hWnd), "%u: OpenClipboard failed\n", thread_from_line); + ok(EmptyClipboard(), "%u: EmptyClipboard failed\n", thread_from_line ); + return 0; +} + +static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) +{ + HWND hwnd = arg; + HANDLE ret; + + SetLastError( 0xdeadbeef ); + if (GetClipboardOwner() == hwnd) + { + SetClipboardData( CF_WAVE, 0 ); + todo_wine ok( IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData failed\n", thread_from_line ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + ok( ret != 0, "%u: SetClipboardData failed err %u\n", thread_from_line, GetLastError() ); + } + else + { + SetClipboardData( CF_WAVE, 0 ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); + ok( !IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData succeeded\n", thread_from_line ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + todo_wine ok( !ret, "%u: SetClipboardData succeeded\n", thread_from_line ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); + } + return 0; +} + +static void run_thread( LPTHREAD_START_ROUTINE func, void *arg, int line ) { + DWORD ret; HANDLE thread; + + thread_from_line = line; + thread = CreateThread(NULL, 0, func, arg, 0, NULL); + ok(thread != NULL, "%u: CreateThread failed with error %d\n", line, GetLastError()); + for (;;) + { + ret = MsgWaitForMultipleObjectsEx( 1, &thread, 1000, QS_ALLINPUT, 0 ); + if (ret == WAIT_OBJECT_0 + 1) + { + MSG msg; + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + } + else break; + } + ok(ret == WAIT_OBJECT_0, "%u: expected WAIT_OBJECT_0, got %u\n", line, ret); + CloseHandle(thread); +} + +static void test_ClipboardOwner(void) +{ HWND hWnd1, hWnd2; - DWORD dwret; BOOL ret; SetLastError(0xdeadbeef); @@ -76,16 +134,9 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); - thread = CreateThread(NULL, 0, open_clipboard_thread, hWnd1, 0, NULL); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - dwret = WaitForSingleObject(thread, 1000); - ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); - CloseHandle(thread); - thread = CreateThread(NULL, 0, empty_clipboard_thread, 0, 0, NULL); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - dwret = WaitForSingleObject(thread, 1000); - ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); - CloseHandle(thread); + run_thread( open_clipboard_thread, hWnd1, __LINE__ ); + run_thread( empty_clipboard_thread, 0, __LINE__ ); + run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -99,6 +150,8 @@ static void test_ClipboardOwner(void) ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); + run_thread( empty_clipboard_thread, 0, __LINE__ ); + run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); @@ -109,12 +162,54 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(GetClipboardOwner() == hWnd1, "clipboard should still be owned\n"); + /* any window will do, even from a different process */ + ret = OpenClipboard( GetDesktopWindow() ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + ret = EmptyClipboard(); + ok( ret, "EmptyClipboard error %d\n", GetLastError()); + ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner %p/%p\n", + GetClipboardOwner(), GetDesktopWindow() ); + run_thread( set_clipboard_data_thread, GetDesktopWindow(), __LINE__ ); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + + ret = OpenClipboard( hWnd1 ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + ret = EmptyClipboard(); + ok( ret, "EmptyClipboard error %d\n", GetLastError()); + ok( GetClipboardOwner() == hWnd1, "wrong owner %p/%p\n", GetClipboardOwner(), hWnd1 ); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + ret = DestroyWindow(hWnd1); ok( ret, "DestroyWindow error %d\n", GetLastError()); ret = DestroyWindow(hWnd2); ok( ret, "DestroyWindow error %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); + + ret = OpenClipboard( 0 ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + + run_thread( open_and_empty_clipboard_thread, 0, __LINE__ ); + + ret = OpenClipboard( 0 ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ret = EmptyClipboard(); + ok( ret, "EmptyClipboard error %d\n", GetLastError()); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + + SetLastError( 0xdeadbeef ); + todo_wine ok( !SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )), + "SetClipboardData succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); + todo_wine ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); + } static void test_RegisterClipboardFormatA(void) @@ -290,12 +385,9 @@ static void test_synthesized(void) ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); - ok(cf == CF_UNICODETEXT || - broken(cf == CF_METAFILEPICT), /* win9x and winME has no CF_UNICODETEXT */ - "cf %08x\n", cf); + ok(cf == CF_UNICODETEXT, "cf %08x\n", cf); - if(cf == CF_UNICODETEXT) - cf = EnumClipboardFormats(cf); + cf = EnumClipboardFormats(cf); ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); data = GetClipboardData(cf); todo_wine ok(data != NULL, "couldn't get data, cf %08x\n", cf);

1 0

Stefan Dösinger : wined3d: Disable the depth stencil on multisample mismatch.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 4e53faf77b34387f6e59946f71e57365f3f97e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e53faf77b34387f6e59946f7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 22:48:14 2015 +0200 wined3d: Disable the depth stencil on multisample mismatch. --- dlls/wined3d/context.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 27ce1bf..d88995b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -420,6 +420,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; GLuint read_binding, draw_binding; + struct wined3d_surface *depth_stencil = entry->depth_stencil; if (entry->attached) { @@ -437,10 +438,22 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ context_attach_surface_fbo(context, target, i, entry->render_targets[i], entry->color_location); } - /* Apply depth targets */ - if (entry->depth_stencil) - surface_set_compatible_renderbuffer(entry->depth_stencil, entry->render_targets[0]); - context_attach_depth_stencil_fbo(context, target, entry->depth_stencil, entry->ds_location); + if (depth_stencil && entry->render_targets[0] + && (depth_stencil->resource.multisample_type + != entry->render_targets[0]->resource.multisample_type + || depth_stencil->resource.multisample_quality + != entry->render_targets[0]->resource.multisample_quality)) + { + WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", + entry->render_targets[0]->resource.multisample_quality, + entry->render_targets[0]->resource.multisample_type, + depth_stencil->resource.multisample_quality, depth_stencil->resource.multisample_type); + depth_stencil = NULL; + } + + if (depth_stencil) + surface_set_compatible_renderbuffer(depth_stencil, entry->render_targets[0]); + context_attach_depth_stencil_fbo(context, target, depth_stencil, entry->ds_location); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility * GL contexts requirements. */

1 0

Stefan Dösinger : d3d9/tests: Test multisample mismatch.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 4d8bfe190cd3d214c0f5bdee8bf2ea7535481d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8bfe190cd3d214c0f5bdee8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 22:48:15 2015 +0200 d3d9/tests: Test multisample mismatch. --- dlls/d3d9/tests/visual.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d8bfe190cd3d214c0f5b…

1 0

Stefan Dösinger : d3d8: Reject FBs with mismatching multisample settings.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: e09f980c8367ddc90852f12a008b07ed6687ec16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09f980c8367ddc90852f12a0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 22:48:16 2015 +0200 d3d8: Reject FBs with mismatching multisample settings. --- dlls/d3d8/device.c | 8 ++++++++ dlls/d3d8/tests/visual.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 10c2103..26cc9ac 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1185,6 +1185,14 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } + if (ds_desc.multisample_type != rt_desc.multisample_type + || ds_desc.multisample_quality != rt_desc.multisample_quality) + { + WARN("Multisample settings do not match, returing D3DERR_INVALIDCALL\n"); + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + + } } original_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device); diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 41165a7..c180dfe 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6855,6 +6855,52 @@ done: DestroyWindow(window); } +static void test_multisample_mismatch(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + HWND window; + HRESULT hr; + ULONG refcount; + IDirect3DSurface8 *rt_multi, *ds; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisample mismatch test.\n"); + IDirect3D8_Release(d3d); + return; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_2_SAMPLES, FALSE, &rt_multi); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &ds); + ok(SUCCEEDED(hr), "Failed to get original depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt_multi, ds); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface8_Release(ds); + IDirect3DSurface8_Release(rt_multi); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -6911,4 +6957,5 @@ START_TEST(visual) test_table_fog_zw(); test_signed_formats(); test_pointsize(); + test_multisample_mismatch(); }

1 0

Joachim Priesner : ieframe: shellbrowser: Strip 'file://' from file URLs in BEFORENAVIGATE2 callbacks.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: ba2274c8bae67e9510ab24ca1caa6576874c8c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2274c8bae67e9510ab24ca1… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Tue Jun 9 16:42:42 2015 +0200 ieframe: shellbrowser: Strip 'file://' from file URLs in BEFORENAVIGATE2 callbacks. This is a straightforward port of commit 8eb70459a18f6d8a80c9570875e2c664e6afbb56 which does the same thing for the matching method in navigate.c. --- dlls/ieframe/shellbrowser.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 4d5a818..8145536 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -23,6 +23,7 @@ #include "ieframe.h" #include "exdispid.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -656,6 +657,8 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( DISPPARAMS dp = {params, NULL, 7, 0}; VARIANT_BOOL cancel = VARIANT_FALSE; SAFEARRAY *post_data; + WCHAR file_path[MAX_PATH]; + DWORD file_path_len = sizeof(file_path) / sizeof(*file_path); TRACE("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), dwFlags, debugstr_w(lpszFrameName), pPostData, cbPostData, @@ -703,7 +706,10 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( V_VT(params+5) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params+5) = &var_url; V_VT(&var_url) = VT_BSTR; - V_BSTR(&var_url) = SysAllocString(lpszUrl); + if(PathCreateFromUrlW(lpszUrl, file_path, &file_path_len, 0) == S_OK) + V_BSTR(&var_url) = SysAllocString(file_path); + else + V_BSTR(&var_url) = SysAllocString(lpszUrl); V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = (IDispatch*)This->doc_host->wb;

1 0

Zhenbo Li : mshtml: Implement IHTMLXMLHttpRequestFactory as a stub.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 0036b8bf2e401806efda411ae5ac570ba3fccab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0036b8bf2e401806efda411ae… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jun 9 23:21:02 2015 +0800 mshtml: Implement IHTMLXMLHttpRequestFactory as a stub. --- dlls/mshtml/Makefile.in | 3 +- dlls/mshtml/htmlwindow.c | 23 +++++- dlls/mshtml/mshtml_private.h | 10 +++ dlls/mshtml/tests/dom.c | 57 +++++++++++++++ dlls/mshtml/xmlhttprequest.c | 166 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 256 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0036b8bf2e401806efda4…

1 0