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

Sebastian Lackner : ntdll/tests: Add tests for info struct size for FileDispositionInformation.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: bdef5c550894366f471d703e143da6332ede6c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdef5c550894366f471d703e1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jun 10 07:47:51 2015 +0200 ntdll/tests: Add tests for info struct size for FileDispositionInformation. --- dlls/ntdll/tests/file.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 2df0edc..86a4516 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1460,9 +1460,26 @@ static void test_file_disposition_information(void) IO_STATUS_BLOCK io; FILE_DISPOSITION_INFORMATION fdi; BOOL fileDeleted; + DWORD fdi2; GetTempPathA( MAX_PATH, tmp_path ); + /* tests for info struct size */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + res = pNtSetInformationFile( handle, &io, &fdi, 0, FileDispositionInformation ); + todo_wine + ok( res == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %x\n", res ); + fdi2 = 0x100; + res = pNtSetInformationFile( handle, &io, &fdi2, sizeof(fdi2), FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %x\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + DeleteFileA( buffer ); + /* cannot set disposition on file not opened with delete access */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);

1 0

Piotr Caban : msvcrt: Remove no longer needed global lock from functions using fd critical sections.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 725e4733cf83305ac3b4ae3cb949a68f5a75e773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725e4733cf83305ac3b4ae3cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 10 17:48:42 2015 +0200 msvcrt: Remove no longer needed global lock from functions using fd critical sections. --- dlls/msvcrt/file.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 802834c..1069cf7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1009,7 +1009,6 @@ int CDECL MSVCRT__close(int fd) ioinfo *info = get_ioinfo(fd); int ret; - LOCK_FILES(); TRACE(":fd (%d) handle (%p)\n", fd, info->handle); if (!(info->wxflag & WX_OPEN)) { ret = -1; @@ -1021,7 +1020,6 @@ int CDECL MSVCRT__close(int fd) msvcrt_set_errno(GetLastError()); } } - UNLOCK_FILES(); release_ioinfo(info); return ret; } @@ -1039,7 +1037,6 @@ int CDECL MSVCRT__dup2(int od, int nd) int ret; TRACE("(od=%d, nd=%d)\n", od, nd); - LOCK_FILES(); if (od < nd) { @@ -1086,7 +1083,6 @@ int CDECL MSVCRT__dup2(int od, int nd) release_ioinfo(info_od); release_ioinfo(info_nd); - UNLOCK_FILES(); return ret; } @@ -2065,7 +2061,6 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode) unsigned int wxflags = split_oflags(textmode); int fd; - LOCK_FILES(); fd = msvcrt_alloc_fd(readHandle, wxflags|WX_PIPE); if (fd != -1) { @@ -2089,7 +2084,6 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode) CloseHandle(writeHandle); *MSVCRT__errno() = MSVCRT_EMFILE; } - UNLOCK_FILES(); } else msvcrt_set_errno(GetLastError());

1 0

Piotr Caban : msvcrt: Avoid using global critical section while allocating new file descriptors.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 6ed69c107f82d127f6e87f654fbfcd023498ec52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed69c107f82d127f6e87f654… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 10 18:12:53 2015 +0200 msvcrt: Avoid using global critical section while allocating new file descriptors. --- dlls/msvcrt/file.c | 146 +++++++++++++++++------------------------------------ 1 file changed, 47 insertions(+), 99 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 36887fc..802834c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -114,9 +114,6 @@ ioinfo * MSVCRT___pioinfo[MSVCRT_MAX_FILES/MSVCRT_FD_BLOCK_SIZE] = { 0 }; */ ioinfo MSVCRT___badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT }; -static int MSVCRT_fdstart = 3; /* first unallocated fd */ -static int MSVCRT_fdend = 3; /* highest allocated fd */ - typedef struct { MSVCRT_FILE file; CRITICAL_SECTION crit; @@ -143,12 +140,9 @@ static const ULONGLONG WCBAT = TOUL('b') << 32 | TOUL('a') << 16 | TOUL('t'); static const ULONGLONG WCCMD = TOUL('c') << 32 | TOUL('m') << 16 | TOUL('d'); static const ULONGLONG WCCOM = TOUL('c') << 32 | TOUL('o') << 16 | TOUL('m'); -/* This critical section protects the tables MSVCRT___pioinfo and MSVCRT_fstreams, - * and their related indexes, MSVCRT_fdstart, MSVCRT_fdend, - * and MSVCRT_stream_idx, from race conditions. - * It doesn't protect against race conditions manipulating the underlying files - * or flags; doing so would probably be better accomplished with per-file - * protection, rather than locking the whole table for every change. +/* This critical section protects the MSVCRT_fstreams table + * and MSVCRT_stream_idx from race conditions. It also + * protects fd critical sections creation code. */ static CRITICAL_SECTION MSVCRT_file_cs; static CRITICAL_SECTION_DEBUG MSVCRT_file_cs_debug = @@ -257,19 +251,24 @@ static inline ioinfo* get_ioinfo_nolock(int fd) return ret + (fd%MSVCRT_FD_BLOCK_SIZE); } -static inline ioinfo* get_ioinfo(int fd) +static inline void init_ioinfo_cs(ioinfo *info) { - ioinfo *ret = get_ioinfo_nolock(fd); - if(ret == &MSVCRT___badioinfo) - return ret; - if(!(ret->exflag & EF_CRIT_INIT)) { + if(!(info->exflag & EF_CRIT_INIT)) { LOCK_FILES(); - if(!(ret->exflag & EF_CRIT_INIT)) { - InitializeCriticalSection(&ret->crit); - ret->exflag |= EF_CRIT_INIT; + if(!(info->exflag & EF_CRIT_INIT)) { + InitializeCriticalSection(&info->crit); + info->exflag |= EF_CRIT_INIT; } UNLOCK_FILES(); } +} + +static inline ioinfo* get_ioinfo(int fd) +{ + ioinfo *ret = get_ioinfo_nolock(fd); + if(ret == &MSVCRT___badioinfo) + return ret; + init_ioinfo_cs(ret); EnterCriticalSection(&ret->crit); return ret; } @@ -301,77 +300,49 @@ static inline BOOL alloc_pioinfo_block(int fd) static inline ioinfo* get_ioinfo_alloc_fd(int fd) { - ioinfo *ret, *info; + ioinfo *ret; ret = get_ioinfo(fd); if(ret != &MSVCRT___badioinfo) - { - LOCK_FILES(); - /* locate next free slot */ - if (fd == MSVCRT_fdstart && fd == MSVCRT_fdend) - MSVCRT_fdstart = MSVCRT_fdend + 1; - else if (fd == MSVCRT_fdstart) - { - MSVCRT_fdstart++; - while (MSVCRT_fdstart < MSVCRT_fdend && - ((info = get_ioinfo_nolock(MSVCRT_fdstart))->exflag & EF_CRIT_INIT)) - { - if (TryEnterCriticalSection(&info->crit)) - { - if (info->handle == INVALID_HANDLE_VALUE) - { - LeaveCriticalSection(&info->crit); - break; - } - LeaveCriticalSection(&info->crit); - } - MSVCRT_fdstart++; - } - } - /* update last fd in use */ - if (fd >= MSVCRT_fdend) - MSVCRT_fdend = fd + 1; - TRACE("fdstart is %d, fdend is %d\n", MSVCRT_fdstart, MSVCRT_fdend); - UNLOCK_FILES(); return ret; - } if(!alloc_pioinfo_block(fd)) return &MSVCRT___badioinfo; - ret = get_ioinfo(fd); - if(ret == &MSVCRT___badioinfo) - return ret; + return get_ioinfo(fd); +} - LOCK_FILES(); - /* locate next free slot */ - if (fd == MSVCRT_fdstart && fd == MSVCRT_fdend) - MSVCRT_fdstart = MSVCRT_fdend + 1; - else if (fd == MSVCRT_fdstart) +static inline ioinfo* get_ioinfo_alloc(int *fd) +{ + int i; + + *fd = -1; + for(i=0; i<MSVCRT_MAX_FILES; i++) { - MSVCRT_fdstart++; - while (MSVCRT_fdstart < MSVCRT_fdend && - ((info = get_ioinfo_nolock(MSVCRT_fdstart))->exflag & EF_CRIT_INIT)) + ioinfo *info = get_ioinfo_nolock(i); + + if(info == &MSVCRT___badioinfo) + { + if(!alloc_pioinfo_block(i)) + return &MSVCRT___badioinfo; + info = get_ioinfo_nolock(i); + } + + init_ioinfo_cs(info); + if(TryEnterCriticalSection(&info->crit)) { - if (TryEnterCriticalSection(&info->crit)) + if(info->handle == INVALID_HANDLE_VALUE) { - if (info->handle == INVALID_HANDLE_VALUE) - { - LeaveCriticalSection(&info->crit); - break; - } - LeaveCriticalSection(&info->crit); + *fd = i; + return info; } - MSVCRT_fdstart++; + LeaveCriticalSection(&info->crit); } } - /* update last fd in use */ - if (fd >= MSVCRT_fdend) - MSVCRT_fdend = fd + 1; - TRACE("fdstart is %d, fdend is %d\n", MSVCRT_fdstart, MSVCRT_fdend); - UNLOCK_FILES(); - return ret; + WARN(":files exhausted!\n"); + *MSVCRT__errno() = MSVCRT_ENFILE; + return &MSVCRT___badioinfo; } static inline void release_ioinfo(ioinfo *info) @@ -434,13 +405,6 @@ static void msvcrt_free_fd(int fd) } } release_ioinfo(fdinfo); - - LOCK_FILES(); - if (fd == MSVCRT_fdend - 1) - MSVCRT_fdend--; - if (fd < MSVCRT_fdstart) - MSVCRT_fdstart = fd; - UNLOCK_FILES(); } static void msvcrt_set_fd(ioinfo *fdinfo, HANDLE hand, int flag) @@ -463,23 +427,11 @@ static void msvcrt_set_fd(ioinfo *fdinfo, HANDLE hand, int flag) /* INTERNAL: Allocate an fd slot from a Win32 HANDLE */ static int msvcrt_alloc_fd(HANDLE hand, int flag) { - ioinfo *info; int fd; + ioinfo *info = get_ioinfo_alloc(&fd); - LOCK_FILES(); - fd = MSVCRT_fdstart; TRACE(":handle (%p) allocating fd (%d)\n", hand, fd); - if (fd >= MSVCRT_MAX_FILES) - { - UNLOCK_FILES(); - WARN(":files exhausted!\n"); - *MSVCRT__errno() = MSVCRT_ENFILE; - return -1; - } - - info = get_ioinfo_alloc_fd(fd); - UNLOCK_FILES(); if(info == &MSVCRT___badioinfo) return -1; @@ -623,9 +575,6 @@ void msvcrt_init_io(void) wxflag_ptr++; handle_ptr++; } - MSVCRT_fdend = max( 3, count ); - for (MSVCRT_fdstart = 3; MSVCRT_fdstart < MSVCRT_fdend; MSVCRT_fdstart++) - if (get_ioinfo_nolock(MSVCRT_fdstart)->handle == INVALID_HANDLE_VALUE) break; } fdinfo = get_ioinfo_alloc_fd(MSVCRT_STDIN_FILENO); @@ -1147,14 +1096,13 @@ int CDECL MSVCRT__dup2(int od, int nd) int CDECL MSVCRT__dup(int od) { int fd, ret; + ioinfo *info = get_ioinfo_alloc(&fd); - LOCK_FILES(); - fd = MSVCRT_fdstart; if (MSVCRT__dup2(od, fd) == 0) ret = fd; else ret = -1; - UNLOCK_FILES(); + release_ioinfo(info); return ret; } @@ -4377,7 +4325,7 @@ MSVCRT_FILE* CDECL MSVCRT__wfreopen(const MSVCRT_wchar_t *path, const MSVCRT_wch TRACE(":path (%s) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file ? file->_file : -1); LOCK_FILES(); - if (!file || ((fd = file->_file) < 0) || fd > MSVCRT_fdend) + if (!file || ((fd = file->_file) < 0)) file = NULL; else {

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::in_avail/out_waiting.
by Alexandre Julliard June 11, 2015

June 11, 2015

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

Zhenbo Li : mshtml: Implement IHTMLXMLHttpRequestFactory as a stub.
by Alexandre Julliard June 10, 2015

June 10, 2015

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

Nikolay Sivov : oledb32: Support provider-specific properties in GetDataSource().
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 795845ff3d1247f0d81628c0ce7d7e46ebc08b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=795845ff3d1247f0d81628c0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 10 10:41:28 2015 +0300 oledb32: Support provider-specific properties in GetDataSource(). --- dlls/oledb32/datainit.c | 259 +++++++++++++++++++++++++++++------------- dlls/oledb32/tests/database.c | 2 - 2 files changed, 181 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=795845ff3d1247f0d8162…

1 0

Stefan Dösinger : d3d8: Reject FBs with mismatching multisample settings.
by Alexandre Julliard June 10, 2015

June 10, 2015

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

Huw Davies : wshom/tests: Use RegQueryValueEx so that the tests run on Win 2k and XP.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 714abcb7cdd8cab7d9383bded5b5426e55d98791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714abcb7cdd8cab7d9383bded… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 10 15:14:21 2015 +0100 wshom/tests: Use RegQueryValueEx so that the tests run on Win 2k and XP. --- dlls/wshom.ocx/tests/wshom.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 46ffc58..a3d398e 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -223,7 +223,8 @@ if (0) /* crashes on native */ SysFreeString(str); hr = IWshShell3_put_CurrentDirectory(sh3, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG || + broken(hr == HRESULT_FROM_WIN32(ERROR_NOACCESS)), "got 0x%08x\n", hr); str = SysAllocString(emptyW); hr = IWshShell3_put_CurrentDirectory(sh3, str); @@ -490,7 +491,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); type = REG_NONE; - ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(type == REG_SZ, "got %d\n", type); @@ -503,7 +504,7 @@ static void test_registry(void) VariantClear(&value); type = REG_NONE; - ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(type == REG_SZ, "got %d\n", type); @@ -516,7 +517,7 @@ static void test_registry(void) VariantClear(&value); type = REG_NONE; - ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(type == REG_SZ, "got %d\n", type);

1 0

Stefan Dösinger : d3d9/tests: Test multisample mismatch.
by Alexandre Julliard June 10, 2015

June 10, 2015

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 : wined3d: Disable the depth stencil on multisample mismatch.
by Alexandre Julliard June 10, 2015

June 10, 2015

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