September 2017 - Wine-commits

Zebediah Figura : shlwapi: URL schemes may contain hyphen, plus, or period.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 3559c261c142eff8d500c6ca443672b17ea162db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3559c261c142eff8d500c6ca4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 21 14:49:46 2017 -0500 shlwapi: URL schemes may contain hyphen, plus, or period. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 1 + dlls/shlwapi/url.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index f1c0965..ac896b0 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1483,6 +1483,7 @@ static const struct parse_url_test_t { {"ab-://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN}, {" http://www.winehq.org/",URL_E_INVALID_SYNTAX}, {"HTTP://www.winehq.org/",S_OK,4,URL_SCHEME_HTTP}, + {"a+-.://www.winehq.org/",S_OK,4,URL_SCHEME_UNKNOWN}, }; static void test_ParseURL(void) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index bda4eb2..c7d717b 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -169,7 +169,7 @@ HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y) if(y->cbSize != sizeof(*y)) return E_INVALIDARG; - while(*ptr && (isalnum(*ptr) || *ptr == '-')) + while(*ptr && (isalnum(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) ptr++; if (*ptr != ':' || ptr <= x+1) { @@ -203,7 +203,7 @@ HRESULT WINAPI ParseURLW(LPCWSTR x, PARSEDURLW *y) if(y->cbSize != sizeof(*y)) return E_INVALIDARG; - while(*ptr && (isalnumW(*ptr) || *ptr == '-')) + while(*ptr && (isalnumW(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) ptr++; if (*ptr != ':' || ptr <= x+1) {

1 0

Zebediah Figura : mshtml: Don' t query for an INewWindowManager if the client site is NULL.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 02641e33a98c68435eb70a240f640bdfa2e5fd22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02641e33a98c68435eb70a240… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 21 09:59:43 2017 -0500 mshtml: Don't query for an INewWindowManager if the client site is NULL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 423d650..1597de9 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2246,9 +2246,14 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam nsChannelBSC *bsc; HRESULT hres; - hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager, - (void**)&new_window_mgr); - if(SUCCEEDED(hres)) { + if (window->doc_obj->client) { + hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, + &IID_INewWindowManager, (void**)&new_window_mgr); + if (FAILED(hres)) { + FIXME("No INewWindowManager\n"); + return hres; + } + hres = IUri_GetDisplayUri(window->uri_nofrag, &context_url); if(FAILED(hres)) return hres; @@ -2270,9 +2275,6 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam *ret = NULL; return S_OK; } - }else { - FIXME("No INewWindowManager\n"); - return E_NOTIMPL; }

1 0

Fabian Maurer : propsys: Added PropVariantToBoolean with some tests.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 58ea6bddaef5deced2c7f81c6df0668408e99656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ea6bddaef5deced2c7f81c6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Sep 22 10:00:46 2017 +0300 propsys: Added PropVariantToBoolean with some tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 60 ++++++++++++ dlls/propsys/tests/propsys.c | 215 +++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 277 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58ea6bddaef5deced2c7f…

1 0

Alexandre Julliard : ntdll: Remove some unnecessary parameters in helper functions.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 872228da4c0000459ac1cc883fb2b3a2620ddb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=872228da4c0000459ac1cc883… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 09:52:29 2017 +0200 ntdll: Remove some unnecessary parameters in helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a452c58..ceb4216 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -804,7 +804,7 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image * * Wrapper for mprotect, adds PROT_EXEC if forced by force_exec_prot */ -static inline int mprotect_exec( void *base, size_t size, int unix_prot, unsigned int view_protect ) +static inline int mprotect_exec( void *base, size_t size, int unix_prot ) { if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { @@ -823,7 +823,7 @@ static inline int mprotect_exec( void *base, size_t size, int unix_prot, unsigne * * Call mprotect on a page range, applying the protections from the per-page byte. */ -static void mprotect_range( struct file_view *view, void *base, size_t size, BYTE set, BYTE clear ) +static void mprotect_range( void *base, size_t size, BYTE set, BYTE clear ) { size_t i, count; char *addr = base; @@ -834,12 +834,12 @@ static void mprotect_range( struct file_view *view, void *base, size_t size, BYT { next = VIRTUAL_GetUnixProt( (get_page_vprot( addr + (count << page_shift) ) & ~clear) | set ); if (next == prot) continue; - mprotect_exec( addr, count << page_shift, prot, view->protect ); + mprotect_exec( addr, count << page_shift, prot ); addr += count << page_shift; prot = next; count = 0; } - if (count) mprotect_exec( addr, count << page_shift, prot, view->protect ); + if (count) mprotect_exec( addr, count << page_shift, prot ); } @@ -863,7 +863,7 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ { /* each page may need different protections depending on write watch flag */ set_page_vprot_bits( base, size, vprot & ~VPROT_WRITEWATCH, ~vprot & ~VPROT_WRITEWATCH ); - mprotect_range( view, base, size, 0, 0 ); + mprotect_range( base, size, 0, 0 ); return TRUE; } @@ -878,7 +878,7 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ return TRUE; } - if (mprotect_exec( base, size, unix_prot, view->protect )) /* FIXME: last error */ + if (mprotect_exec( base, size, unix_prot )) /* FIXME: last error */ return FALSE; set_page_vprot( base, size, vprot ); @@ -917,10 +917,10 @@ static NTSTATUS set_protection( struct file_view *view, void *base, SIZE_T size, * * Reset write watches in a memory range. */ -static void reset_write_watches( struct file_view *view, void *base, SIZE_T size ) +static void reset_write_watches( void *base, SIZE_T size ) { set_page_vprot_bits( base, size, VPROT_WRITEWATCH, 0 ); - mprotect_range( view, base, size, 0, 0 ); + mprotect_range( base, size, 0, 0 ); } @@ -1769,7 +1769,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) if (vprot & VPROT_WRITEWATCH) { set_page_vprot_bits( page, page_size, 0, VPROT_WRITEWATCH ); - mprotect_range( view, page, page_size, 0, 0 ); + mprotect_range( page, page_size, 0, 0 ); } /* ignore fault if page is writable now */ if (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_WRITE) ret = STATUS_SUCCESS; @@ -1777,7 +1777,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) if (!on_signal_stack && (vprot & VPROT_GUARD)) { set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); - mprotect_range( view, page, page_size, 0, 0 ); + mprotect_range( page, page_size, 0, 0 ); ret = STATUS_GUARD_PAGE_VIOLATION; } } @@ -1972,7 +1972,7 @@ NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZ if (view->protect & VPROT_WRITEWATCH) /* enable write access by clearing write watches */ { set_page_vprot_bits( addr, size, 0, VPROT_WRITEWATCH ); - mprotect_range( view, addr, size, 0, 0 ); + mprotect_range( addr, size, 0, 0 ); } memcpy( addr, buffer, size ); ret = STATUS_SUCCESS; @@ -2003,7 +2003,7 @@ void VIRTUAL_SetForceExec( BOOL enable ) /* file mappings are always accessible */ BYTE commit = is_view_valloc( view ) ? 0 : VPROT_COMMITTED; - mprotect_range( view, view->base, view->size, commit, 0 ); + mprotect_range( view->base, view->size, commit, 0 ); } } server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -3090,7 +3090,7 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T if (!(get_page_vprot( addr ) & VPROT_WRITEWATCH)) addresses[pos++] = addr; addr += page_size; } - if (flags & WRITE_WATCH_FLAG_RESET) reset_write_watches( view, base, addr - (char *)base ); + if (flags & WRITE_WATCH_FLAG_RESET) reset_write_watches( base, addr - (char *)base ); *count = pos; *granularity = page_size; } @@ -3121,7 +3121,7 @@ NTSTATUS WINAPI NtResetWriteWatch( HANDLE process, PVOID base, SIZE_T size ) server_enter_uninterrupted_section( &csVirtual, &sigset ); if ((view = VIRTUAL_FindView( base, size )) && (view->protect & VPROT_WRITEWATCH)) - reset_write_watches( view, base, size ); + reset_write_watches( base, size ); else status = STATUS_INVALID_PARAMETER;

1 0

Alexandre Julliard : ntdll: Handle stack faults without fetching the view pointer.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 1049acc28f522cbb6f622b65cd1b54ea285fba27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1049acc28f522cbb6f622b65c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 12:13:50 2017 +0200 ntdll: Handle stack faults without fetching the view pointer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ceb4216..7d6b36d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -183,6 +183,7 @@ static BYTE get_page_vprot( const void *addr ) size_t idx = (size_t)addr >> page_shift; #ifdef _WIN64 + if (!pages_vprot[idx >> pages_vprot_shift]) return 0; return pages_vprot[idx >> pages_vprot_shift][idx & pages_vprot_mask]; #else return pages_vprot[idx]; @@ -671,6 +672,7 @@ static struct file_view *alloc_view(void) static void delete_view( struct file_view *view ) /* [in] View */ { if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size ); + set_page_vprot( view->base, view->size, 0 ); wine_rb_remove( &views_tree, &view->entry ); if (view->mapping) close_handle( view->mapping ); *(struct file_view **)view = next_free_view; @@ -1720,9 +1722,10 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi #endif /* setup no access guard page */ - VIRTUAL_SetProt( view, view->base, page_size, VPROT_COMMITTED ); - VIRTUAL_SetProt( view, (char *)view->base + page_size, page_size, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED | VPROT_GUARD ); + set_page_vprot( view->base, page_size, VPROT_COMMITTED ); + set_page_vprot( (char *)view->base + page_size, page_size, + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED | VPROT_GUARD ); + mprotect_range( view->base, 2 * page_size, 0, 0 ); VIRTUAL_DEBUG_DUMP_VIEW( view ); /* note: limit is lower than base since the stack grows down */ @@ -1812,25 +1815,22 @@ BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) */ BOOL virtual_handle_stack_fault( void *addr ) { - struct file_view *view; BOOL ret = FALSE; RtlEnterCriticalSection( &csVirtual ); /* no need for signal masking inside signal handler */ - if ((view = VIRTUAL_FindView( addr, 0 ))) + if (get_page_vprot( addr ) & VPROT_GUARD) { - void *page = ROUND_ADDR( addr, page_mask ); - BYTE vprot = get_page_vprot( page ); - if (vprot & VPROT_GUARD) + char *page = ROUND_ADDR( addr, page_mask ); + set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); + mprotect_range( page, page_size, 0, 0 ); + NtCurrentTeb()->Tib.StackLimit = page; + if (page >= (char *)NtCurrentTeb()->DeallocationStack + 2*page_size) { - VIRTUAL_SetProt( view, page, page_size, vprot & ~VPROT_GUARD ); - NtCurrentTeb()->Tib.StackLimit = page; - if ((char *)page >= (char *)NtCurrentTeb()->DeallocationStack + 2*page_size) - { - vprot = get_page_vprot( (char *)page - page_size ); - VIRTUAL_SetProt( view, (char *)page - page_size, page_size, vprot | VPROT_COMMITTED | VPROT_GUARD ); - } - ret = TRUE; + page -= page_size; + set_page_vprot_bits( page, page_size, VPROT_COMMITTED | VPROT_GUARD, 0 ); + mprotect_range( page, page_size, 0, 0 ); } + ret = TRUE; } RtlLeaveCriticalSection( &csVirtual ); return ret;

1 0

Alexandre Julliard : ntdll: Handle pages faults without fetching the view pointer when possible.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 8bc95aa74be74d7ba9ce558d42902e55ece2a197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc95aa74be74d7ba9ce558d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 12:15:27 2017 +0200 ntdll: Handle pages faults without fetching the view pointer when possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7d6b36d..1e6b8a7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -416,6 +416,16 @@ static inline UINT_PTR get_mask( ULONG zero_bits ) /*********************************************************************** + * is_write_watch_range + */ +static inline BOOL is_write_watch_range( const void *addr, size_t size ) +{ + struct file_view *view = VIRTUAL_FindView( addr, size ); + return view && (view->protect & VPROT_WRITEWATCH); +} + + +/*********************************************************************** * find_view_range * * Find the first view overlapping at least part of the specified range. @@ -1758,30 +1768,31 @@ void virtual_clear_thread_stack(void) */ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) { - struct file_view *view; NTSTATUS ret = STATUS_ACCESS_VIOLATION; + void *page = ROUND_ADDR( addr, page_mask ); sigset_t sigset; + BYTE vprot; server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( addr, 0 ))) + vprot = get_page_vprot( page ); + if (!on_signal_stack && (vprot & VPROT_GUARD)) + { + set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); + mprotect_range( page, page_size, 0, 0 ); + ret = STATUS_GUARD_PAGE_VIOLATION; + } + else if (err & EXCEPTION_WRITE_FAULT) { - void *page = ROUND_ADDR( addr, page_mask ); - BYTE vprot = get_page_vprot( page ); - if ((err & EXCEPTION_WRITE_FAULT) && (view->protect & VPROT_WRITEWATCH)) + if (vprot & VPROT_WRITEWATCH) { - if (vprot & VPROT_WRITEWATCH) - { - set_page_vprot_bits( page, page_size, 0, VPROT_WRITEWATCH ); - mprotect_range( page, page_size, 0, 0 ); - } - /* ignore fault if page is writable now */ - if (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_WRITE) ret = STATUS_SUCCESS; + set_page_vprot_bits( page, page_size, 0, VPROT_WRITEWATCH ); + mprotect_range( page, page_size, 0, 0 ); } - if (!on_signal_stack && (vprot & VPROT_GUARD)) + /* ignore fault if page is writable now */ + if (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_WRITE) { - set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); - mprotect_range( page, page_size, 0, 0 ); - ret = STATUS_GUARD_PAGE_VIOLATION; + if ((vprot & VPROT_WRITEWATCH) || is_write_watch_range( page, page_size )) + ret = STATUS_SUCCESS; } } server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -3061,7 +3072,6 @@ NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr, NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T size, PVOID *addresses, ULONG_PTR *count, ULONG *granularity ) { - struct file_view *view; NTSTATUS status = STATUS_SUCCESS; sigset_t sigset; @@ -3079,7 +3089,7 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( base, size )) && (view->protect & VPROT_WRITEWATCH)) + if (is_write_watch_range( base, size )) { ULONG_PTR pos = 0; char *addr = base; @@ -3107,7 +3117,6 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T */ NTSTATUS WINAPI NtResetWriteWatch( HANDLE process, PVOID base, SIZE_T size ) { - struct file_view *view; NTSTATUS status = STATUS_SUCCESS; sigset_t sigset; @@ -3120,7 +3129,7 @@ NTSTATUS WINAPI NtResetWriteWatch( HANDLE process, PVOID base, SIZE_T size ) server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( base, size )) && (view->protect & VPROT_WRITEWATCH)) + if (is_write_watch_range( base, size )) reset_write_watches( base, size ); else status = STATUS_INVALID_PARAMETER;

1 0

Rosanne DiMesio : Fix Extra comments field
by Jeremy Newman 22 Sep '17

22 Sep '17

Module: appdb Branch: master Commit: 2bc14bd60f0a804e10a98e2f3c2fc38619c7d503 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2bc14bd60f0a804e10a98e2f… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Sep 22 11:48:26 2017 -0500 Fix Extra comments field Fixes bug 43755. Also fixes a typo in the Hardware section. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/testData.php b/include/testData.php index 86771d2..baf69f3 100644 --- a/include/testData.php +++ b/include/testData.php @@ -21,7 +21,7 @@ class testData{ var $sUsedWorkaround; var $shWorkarounds; var $sTestedRating; - var $sComments; + var $shComments; var $sSubmitTime; var $iSubmitterId; var $sGpuMfr; @@ -61,7 +61,7 @@ class testData{ $this->sUsedWorkaround = $oRow->usedWorkaround; $this->shWorkarounds = $oRow->workarounds; $this->sTestedRating = $oRow->testedRating; - $this->sComments = $oRow->comments; + $this->shComments = $oRow->comments; $this->sSubmitTime = $oRow->submitTime; $this->iSubmitterId = $oRow->submitterId; $this->sState = $oRow->state; @@ -102,7 +102,7 @@ class testData{ $this->sUsedWorkaround, $this->shWorkarounds, $this->sTestedRating, - $this->sComments, + $this->shComments, date("Y-m-d H:i:s"), $_SESSION['current']->iUserId, $this->sState, @@ -176,10 +176,10 @@ class testData{ $oOldTest->shWhatNotTested."'\nto\n'$this->shWhatNotTested'.\n"; } - if($this->sComments != $oOldTest->sComments) + if($this->shComments != $oOldTest->shComments) { $sWhatChanged .= "Extra comments was changed from\n'". - $oOldTest->sComments."'\nto\n'$this->sComments'.\n"; + $oOldTest->shComments."'\nto\n'$this->shComments'.\n"; } if($this->iDistributionId != $oOldTest->iDistributionId) @@ -271,7 +271,7 @@ class testData{ $this->sUsedWorkaround, $this->shWorkarounds, $this->sTestedRating, - $this->sComments, + $this->shComments, $this->sState, $this->sGpuMfr, $this->sGraphicsDriver, @@ -583,8 +583,8 @@ class testData{ "What does not\n{$this->shWhatDoesnt}\n". "Workarounds\n{$this->shWorkarounds}\n". "What was not tested\n{$this->shWhatNotTested}\n". - "Hardware tested\nGraphics: </ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul>". - "Additional Comments\n{$this->sComments}\n"; + "Hardware tested\nGraphics: <ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul>". + "Additional Comments\n{$this->shComments}\n"; } function CreateTestTable() @@ -907,8 +907,8 @@ class testData{ echo '<a href="https://wiki.winehq.org/AppDB_Maintainer_Rating_Definitions" target="_blank">Rating definitions</a></td></tr>',"\n"; // extra comments echo '<tr valign=top><td>Extra comments</td>',"\n"; - echo '<td><textarea name="sComments" id="extra_comments" rows=20 cols=80 class="wysiwyg">'; - echo $this->sComments.'</textarea></td></tr>',"\n"; + echo '<td><textarea name="shComments" id="extra_comments" rows=20 cols=80 class="wysiwyg">'; + echo $this->shComments.'</textarea></td></tr>',"\n"; /* Graphics hardware/driver this section could be expanded to include info on other hardware (e.g., CPU, audio) */ @@ -1100,7 +1100,7 @@ class testData{ $this->sRuns = $aValues['sRuns']; $this->sUsedWorkaround = $aValues['sUsedWorkaround']; $this->sTestedRating = $aValues['sTestedRating']; - $this->sComments = $aValues['sComments']; + $this->shComments = $aValues['shComments']; $this->sGpuMfr = $aValues['sGpuMfr']; $this->sGraphicsDriver = $aValues['sGraphicsDriver']; }

1 0

Alexandre Julliard : ws2_32/tests: Add some tests for write watches.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 1c72e594e32714d12f086714d6d0b37c188e50dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c72e594e32714d12f086714d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 19:41:17 2017 +0200 ws2_32/tests: Add some tests for write watches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 195 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 897839a..02f7473 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6849,6 +6849,200 @@ end: WSACloseEvent(event); } +struct write_watch_thread_args +{ + int func; + SOCKET dest; + void *base; + DWORD size; + const char *expect; +}; + +static DWORD CALLBACK write_watch_thread( void *arg ) +{ + struct write_watch_thread_args *args = arg; + struct sockaddr addr; + int addr_len, ret; + DWORD bytes, flags = 0; + WSABUF buf[1]; + + switch (args->func) + { + case 0: + ret = recv( args->dest, args->base, args->size, 0 ); + ok( ret == strlen(args->expect) + 1, "wrong len %d\n", ret ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + case 1: + ret = recvfrom( args->dest, args->base, args->size, 0, &addr, &addr_len ); + ok( ret == strlen(args->expect) + 1, "wrong len %d\n", ret ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + case 2: + buf[0].len = args->size; + buf[0].buf = args->base; + ret = WSARecv( args->dest, buf, 1, &bytes, &flags, NULL, NULL ); + ok( !ret, "WSARecv failed %u\n", GetLastError() ); + ok( bytes == strlen(args->expect) + 1, "wrong len %d\n", bytes ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + case 3: + buf[0].len = args->size; + buf[0].buf = args->base; + ret = WSARecvFrom( args->dest, buf, 1, &bytes, &flags, &addr, &addr_len, NULL, NULL ); + ok( !ret, "WSARecvFrom failed %u\n", GetLastError() ); + ok( bytes == strlen(args->expect) + 1, "wrong len %d\n", bytes ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + } + return 0; +} + +static void test_write_watch(void) +{ + SOCKET src, dest; + WSABUF bufs[2]; + WSAOVERLAPPED ov; + struct write_watch_thread_args args; + DWORD bytesReturned, flags, size; + struct sockaddr addr; + int addr_len, ret; + HANDLE thread, event; + char *base; + void *results[64]; + ULONG_PTR count; + ULONG pagesize; + UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); + + pGetWriteWatch = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), "GetWriteWatch" ); + if (!pGetWriteWatch) + { + win_skip( "write watched not supported\n" ); + return; + } + + tcp_socketpair(&src, &dest); + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) + { + skip("failed to create sockets\n"); + return; + } + + memset(&ov, 0, sizeof(ov)); + ov.hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); + + flags = 0; + + size = 0x10000; + base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE ); + ok( base != NULL, "VirtualAlloc failed %u\n", GetLastError() ); + + memset( base, 0, size ); + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + bufs[0].len = 5; + bufs[0].buf = base; + bufs[1].len = 0x8000; + bufs[1].buf = base + 0x4000; + + ret = WSARecv( dest, bufs, 2, NULL, &flags, &ov, NULL); + ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, + "WSARecv failed - %d error %d\n", ret, GetLastError()); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 9, "wrong count %lu\n", count ); + ok( !base[0], "data set\n" ); + + send(src, "test message", sizeof("test message"), 0); + + ret = GetOverlappedResult( (HANDLE)dest, &ov, &bytesReturned, TRUE ); + todo_wine + { + ok( ret, "GetOverlappedResult failed %u\n", GetLastError() ); + ok( bytesReturned == sizeof("test message"), "wrong size %u\n", bytesReturned ); + ok( !memcmp( base, "test ", 5 ), "wrong data %s\n", base ); + ok( !memcmp( base + 0x4000, "message", 8 ), "wrong data %s\n", base + 0x4000 ); + } + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 0, "wrong count %lu\n", count ); + + memset( base, 0, size ); + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + bufs[1].len = 0x4000; + bufs[1].buf = base + 0x2000; + ret = WSARecvFrom( dest, bufs, 2, NULL, &flags, &addr, &addr_len, &ov, NULL); + todo_wine + ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, + "WSARecv failed - %d error %d\n", ret, GetLastError()); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 5, "wrong count %lu\n", count ); + todo_wine + ok( !base[0], "data set\n" ); + + send(src, "test message", sizeof("test message"), 0); + + ret = GetOverlappedResult( (HANDLE)dest, &ov, &bytesReturned, TRUE ); + ok( ret, "GetOverlappedResult failed %u\n", GetLastError() ); + ok( bytesReturned == sizeof("test message"), "wrong size %u\n", bytesReturned ); + ok( !memcmp( base, "test ", 5 ), "wrong data %s\n", base ); + ok( !memcmp( base + 0x2000, "message", 8 ), "wrong data %s\n", base + 0x2000 ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 0, "wrong count %lu\n", count ); + + memset( base, 0, size ); + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + args.dest = dest; + args.base = base; + args.size = 0x7002; + args.expect = "test message"; + for (args.func = 0; args.func < 4; args.func++) + { + thread = CreateThread( NULL, 0, write_watch_thread, &args, 0, NULL ); + Sleep( 200 ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 8, "wrong count %lu\n", count ); + + send(src, "test message", sizeof("test message"), 0); + WaitForSingleObject( thread, 10000 ); + CloseHandle( thread ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 0, "wrong count %lu\n", count ); + } + WSACloseEvent( event ); + closesocket( dest ); + closesocket( src ); + VirtualFree( base, 0, MEM_FREE ); +} + #define POLL_CLEAR() ix = 0 #define POLL_SET(s, ev) {fds[ix].fd = s; fds[ix++].events = ev;} #define POLL_ISSET(s, rev) poll_isset(fds, ix, s, rev) @@ -10662,6 +10856,7 @@ START_TEST( sock ) test_WSASendTo(); test_WSARecv(); test_WSAPoll(); + test_write_watch(); test_events(0); test_events(1);

1 0

Ihsan Akmal : dxgiformat.h: Add missing DXGI_FORMAT enums.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 7babc38c235aeecbc56b2db2992bd99b2fac183f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7babc38c235aeecbc56b2db29… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Wed Sep 20 18:43:33 2017 +0800 dxgiformat.h: Add missing DXGI_FORMAT enums. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgiformat.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dxgiformat.h b/include/dxgiformat.h index 6bb9d00..4c315cb 100644 --- a/include/dxgiformat.h +++ b/include/dxgiformat.h @@ -138,6 +138,9 @@ typedef enum DXGI_FORMAT { DXGI_FORMAT_P8 = 113, DXGI_FORMAT_A8P8 = 114, DXGI_FORMAT_B4G4R4A4_UNORM = 115, + DXGI_FORMAT_P208 = 130, + DXGI_FORMAT_V208 = 131, + DXGI_FORMAT_V408 = 132, DXGI_FORMAT_FORCE_UINT = 0xffffffff } DXGI_FORMAT;

1 0

Matteo Bruni : wined3d: Accept creation flags for 3D textures.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: e4365e5ba32773282ecd0c9a65f0f53720cc29f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4365e5ba32773282ecd0c9a6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 20 19:53:42 2017 +0200 wined3d: Accept creation flags for 3D textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 230f94c..ef8545d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2547,7 +2547,7 @@ static const struct wined3d_texture_ops texture3d_ops = }; static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, - UINT layer_count, UINT level_count, struct wined3d_device *device, void *parent, + UINT layer_count, UINT level_count, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops) { struct wined3d_device_parent *device_parent = device->device_parent; @@ -2627,7 +2627,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, level_count, desc, - 0, device, parent, parent_ops, &texture_resource_ops))) + flags, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -2967,7 +2967,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct break; case WINED3D_RTYPE_TEXTURE_3D: - hr = volumetexture_init(object, desc, layer_count, level_count, device, parent, parent_ops); + hr = volumetexture_init(object, desc, layer_count, level_count, flags, device, parent, parent_ops); break; default:

1 0