September 2017 - Wine-commits

Alexandre Julliard : rbtree.h: Add a wine_rb_prev iteration helper function.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: c1d46149e0bdaf59aa2251fc6b9c692b8c2f52e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d46149e0bdaf59aa2251fc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 7 19:31:26 2017 +0200 rbtree.h: Add a wine_rb_prev iteration helper function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index 65d9a90..bb4edf5 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -101,6 +101,13 @@ static inline struct wine_rb_entry *wine_rb_head(struct wine_rb_entry *iter) return iter; } +static inline struct wine_rb_entry *wine_rb_tail(struct wine_rb_entry *iter) +{ + if (!iter) return NULL; + while (iter->right) iter = iter->right; + return iter; +} + static inline struct wine_rb_entry *wine_rb_next(struct wine_rb_entry *iter) { if (iter->right) return wine_rb_head(iter->right); @@ -108,6 +115,13 @@ static inline struct wine_rb_entry *wine_rb_next(struct wine_rb_entry *iter) return iter->parent; } +static inline struct wine_rb_entry *wine_rb_prev(struct wine_rb_entry *iter) +{ + if (iter->left) return wine_rb_tail(iter->left); + while (iter->parent && iter->parent->left == iter) iter = iter->parent; + return iter->parent; +} + static inline struct wine_rb_entry *wine_rb_postorder_head(struct wine_rb_entry *iter) { if (!iter) return NULL;

1 0

Alexandre Julliard : ntdll: Store memory views in a binary tree instead of a list.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: 2967e3efb6cb83decfa75e5d2e1d9e7da44130c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2967e3efb6cb83decfa75e5d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 7 19:31:42 2017 +0200 ntdll: Store memory views in a binary tree instead of a list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 150 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 90 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2967e3efb6cb83decfa75…

1 0

Rosanne DiMesio : Add deleteOldComments to admin control center
by Jeremy Newman 07 Sep '17

07 Sep '17

Module: appdb Branch: master Commit: 9ea0d15fdbc4c36c9791d87adaa6ccfb8b390fdb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9ea0d15fdbc4c36c9791d87a… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Sep 7 09:38:56 2017 -0500 Add deleteOldComments to admin control center Adds a function to delete comments older than one year from unmaintained entries. Fixes bug 18287. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/admin.php b/admin.php index 11e3aba..81fa430 100644 --- a/admin.php +++ b/admin.php @@ -262,6 +262,14 @@ function purgeRejectedVendors() echo "Removed " .query_affected_rows()." rejected vendors from database.<br>"; } +function deleteOldComments() +{ + $sQuery = "DELETE FROM appComments USING appComments, appVersion WHERE appComments.versionId = appVersion.versionId AND appVersion.hasMaintainer = 'false' AND appComments.time <= DATE_SUB(CURDATE(), INTERVAL '12' MONTH)"; + $hResult = query_parameters($sQuery); + + echo "Deleted " .query_affected_rows()." comments older than 12 months from unmaintained entries.<br>"; +} + function deleteOldErrorLogs() { $sQuery = "DELETE FROM error_log WHERE submitTime <= DATE_SUB(CURDATE(), INTERVAL '12' MONTH)"; @@ -337,6 +345,8 @@ function showChoices() echo '<a href="admin.php?sAction=purgeRejectedVendors" class="list-group-item"><h4>Purge rejected vendors</h4></a>'; + echo '<a href="admin.php?sAction=deleteOldComments" class="list-group-item"><h4>Delete old comments</h4></a>'; + echo '<a href="admin.php?sAction=deleteOldErrorLogs" class="list-group-item"><h4>Delete old error logs</h4></a>'; echo '<a href ="'.BASE.'objectManager.php?sClass=error_log&sTitle=View+Error_log" class="list-group-item"><h4>View Error log entries</h4></a>'; @@ -385,6 +395,10 @@ switch(getInput('sAction', $aClean)) purgeRejectedVendors(); break; + case 'deleteOldComments': + deleteOldComments(); + break; + case 'deleteOldErrorLogs': deleteOldErrorLogs(); break;

1 0

Alistair Leslie-Hughes : mfplat: Added MFCreateEventQueue stub.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: d003ed3b1743985282c8c8e9c597d77c4b47bb15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d003ed3b1743985282c8c8e9c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 6 07:38:58 2017 +0000 mfplat: Added MFCreateEventQueue stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 13 +++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e6616c8..7e12be4 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1513,3 +1513,16 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **type) *type = &object->IMFMediaType_iface; return S_OK; } + +/*********************************************************************** + * MFCreateEventQueue (mfplat.@) + */ +HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue) +{ + FIXME("%p\n", queue); + + if(queue) + *queue = NULL; + + return E_FAIL; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index efcb143..e9c0eec 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -42,7 +42,7 @@ @ stdcall MFCreateAttributes(ptr long) @ stub MFCreateAudioMediaType @ stub MFCreateCollection -@ stub MFCreateEventQueue +@ stdcall MFCreateEventQueue(ptr) @ stub MFCreateFile @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer @ stub MFCreateMFByteStreamOnStream diff --git a/include/mfapi.h b/include/mfapi.h index 2be0638..5aead1e 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -65,6 +65,7 @@ typedef unsigned __int64 MFWORKITEM_KEY; HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); +HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type,

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: CopyPalette in PNG decoder.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: 2ea95f895be3d07600cc2f8654c7e85ec174b952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea95f895be3d07600cc2f865… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 5 13:57:31 2017 -0500 windowscodecs: Implement IWICBitmapDecoder::CopyPalette in PNG decoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 815125fd..821e2c3 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -857,10 +857,10 @@ static HRESULT WINAPI PngDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, } static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, palette); + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI PngDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Fix IWICBitmapEncoder:: SetPalette for a not initialized case in PNG encoder.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: eb3eff90be46aada7faa1af36eb68b25f3087a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3eff90be46aada7faa1af36… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 5 13:57:32 2017 -0500 windowscodecs: Fix IWICBitmapEncoder::SetPalette for a not initialized case in PNG encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 821e2c3..b4fd346 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1952,10 +1952,20 @@ static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface, return E_NOTIMPL; } -static HRESULT WINAPI PngEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) +static HRESULT WINAPI PngEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *palette) { - TRACE("(%p,%p)\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, palette); + + EnterCriticalSection(&This->lock); + + hr = This->stream ? WINCODEC_ERR_UNSUPPORTEDOPERATION : WINCODEC_ERR_NOTINITIALIZED; + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI PngEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail)

1 0

Alexandre Julliard : ntdll: Allocate views out of a memory block instead of using a heap.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: a0f64e1231a88417fe8b6e3eb459b2c8a098aec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f64e1231a88417fe8b6e3eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 6 09:58:18 2017 +0200 ntdll: Allocate views out of a memory block instead of using a heap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 62 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9f1b6da..9a69a15 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -143,8 +143,6 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); #define VIRTUAL_DEBUG_DUMP_VIEW(view) \ do { if (TRACE_ON(virtual)) VIRTUAL_DumpView(view); } while (0) -#define VIRTUAL_HEAP_SIZE (sizeof(void*)*1024*1024) - #ifdef _WIN64 /* on 64-bit the page protection bytes use a 2-level table */ static const size_t pages_vprot_shift = 20; static const size_t pages_vprot_mask = (1 << 20) - 1; @@ -154,7 +152,8 @@ static BYTE **pages_vprot; static BYTE *pages_vprot; #endif -static HANDLE virtual_heap; +static struct file_view *view_block_start, *view_block_end, *next_free_view; +static const size_t view_block_size = 0x100000; static void *preload_reserve_start; static void *preload_reserve_end; static BOOL use_locks; @@ -587,6 +586,30 @@ static inline void unmap_area( void *addr, size_t size ) /*********************************************************************** + * alloc_view + * + * Allocate a new view. The csVirtual section must be held by caller. + */ +static struct file_view *alloc_view(void) +{ + if (next_free_view) + { + struct file_view *ret = next_free_view; + next_free_view = *(struct file_view **)ret; + return ret; + } + if (view_block_start == view_block_end) + { + void *ptr = wine_anon_mmap( NULL, view_block_size, PROT_READ | PROT_WRITE, 0 ); + if (ptr == (void *)-1) return NULL; + view_block_start = ptr; + view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); + } + return view_block_start++; +} + + +/*********************************************************************** * delete_view * * Deletes a view. The csVirtual section must be held by caller. @@ -596,7 +619,8 @@ static void delete_view( struct file_view *view ) /* [in] View */ if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size ); list_remove( &view->entry ); if (view->mapping) close_handle( view->mapping ); - RtlFreeHeap( virtual_heap, 0, view ); + *(struct file_view **)view = next_free_view; + next_free_view = view; } @@ -618,9 +642,9 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz /* Create the view structure */ - if (!(view = RtlAllocateHeap( virtual_heap, 0, sizeof(*view) ))) + if (!(view = alloc_view())) { - FIXME( "out of memory in virtual heap for %p-%p\n", base, (char *)base + size ); + FIXME( "out of memory for %p-%p\n", base, (char *)base + size ); return STATUS_NO_MEMORY; } @@ -1490,9 +1514,8 @@ static int alloc_virtual_heap( void *base, size_t size, void *arg ) void virtual_init(void) { const char *preload; - struct alloc_virtual_heap alloc_heap; + struct alloc_virtual_heap alloc_views; size_t size; - struct file_view *heap_view; #if !defined(__i386__) && !defined(__x86_64__) page_size = sysconf( _SC_PAGESIZE ); @@ -1518,21 +1541,22 @@ void virtual_init(void) } } - /* try to find space in a reserved area for the virtual heap and pages protection table */ + /* try to find space in a reserved area for the views and pages protection table */ #ifdef _WIN64 pages_vprot_size = ((size_t)address_space_limit >> page_shift >> pages_vprot_shift) + 1; - alloc_heap.size = VIRTUAL_HEAP_SIZE + pages_vprot_size * sizeof(*pages_vprot); + alloc_views.size = view_block_size + pages_vprot_size * sizeof(*pages_vprot); #else - alloc_heap.size = VIRTUAL_HEAP_SIZE + (1U << (32 - page_shift)); + alloc_views.size = view_block_size + (1U << (32 - page_shift)); #endif - if (!wine_mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_heap, 1 )) - alloc_heap.base = wine_anon_mmap( NULL, alloc_heap.size, PROT_READ|PROT_WRITE, 0 ); - - assert( alloc_heap.base != (void *)-1 ); - pages_vprot = (void *)((char *)alloc_heap.base + VIRTUAL_HEAP_SIZE); - virtual_heap = RtlCreateHeap( HEAP_NO_SERIALIZE, alloc_heap.base, VIRTUAL_HEAP_SIZE, - VIRTUAL_HEAP_SIZE, NULL, NULL ); - create_view( &heap_view, alloc_heap.base, alloc_heap.size, VPROT_COMMITTED|VPROT_READ|VPROT_WRITE ); + if (wine_mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_views, 1 )) + wine_mmap_remove_reserved_area( alloc_views.base, alloc_views.size, 0 ); + else + alloc_views.base = wine_anon_mmap( NULL, alloc_views.size, PROT_READ | PROT_WRITE, 0 ); + + assert( alloc_views.base != (void *)-1 ); + view_block_start = alloc_views.base; + view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); + pages_vprot = (void *)((char *)alloc_views.base + view_block_size); /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */ size = (char *)address_space_start - (char *)0x10000;

1 0

Alexandre Julliard : ntdll: Don' t do partial writes in virtual_uninterrupted_write_memory.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: 3bfd7973a432450492607a4dfe54f774370e9318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bfd7973a432450492607a4df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 6 17:16:25 2017 +0200 ntdll: Don't do partial writes in virtual_uninterrupted_write_memory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_i386.c | 7 +++--- dlls/ntdll/virtual.c | 56 ++++++++++++++++-------------------------------- 3 files changed, 23 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c97b1e1..7b13448 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -171,7 +171,7 @@ extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_st extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; -extern SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; extern void VIRTUAL_SetForceExec( BOOL enable ) DECLSPEC_HIDDEN; extern void virtual_release_address_space(void) DECLSPEC_HIDDEN; extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f33c43f..ab8d114 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1808,8 +1808,8 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) if (thunk_len >= sizeof(thunk_copy.t1) && thunk_copy.t1.movl == 0x042444c7 && thunk_copy.t1.jmp == 0xe9) { - if (virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, - &thunk_copy.t1.this, sizeof(DWORD) ) == sizeof(DWORD)) + if (!virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, + &thunk_copy.t1.this, sizeof(DWORD) )) { context->Eip = (DWORD_PTR)(&thunk->t1.func + 1) + thunk_copy.t1.func; TRACE( "emulating ATL thunk type 1 at %p, func=%08x arg=%08x\n", @@ -1856,8 +1856,7 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) stack, sizeof(stack) ) == sizeof(stack) && virtual_uninterrupted_read_memory( (DWORD *)stack[1] + 1, &func, sizeof(DWORD) ) == sizeof(DWORD) && - virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, - &stack[0], sizeof(stack[0]) ) == sizeof(stack[0])) + !virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, &stack[0], sizeof(stack[0]) )) { context->Ecx = stack[0]; context->Eax = stack[1]; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9a69a15..a730417 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1907,54 +1907,36 @@ SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T * permissions are checked before accessing each page, to ensure that no * exceptions can happen. */ -SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) +NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) { struct file_view *view; sigset_t sigset; - SIZE_T bytes_written = 0; + NTSTATUS ret = STATUS_ACCESS_VIOLATION; - if (!size) return 0; + if (!size) return STATUS_SUCCESS; server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( addr, size ))) + if ((view = VIRTUAL_FindView( addr, size )) && !(view->protect & VPROT_SYSTEM)) { - if (!(view->protect & VPROT_SYSTEM)) - { - while (bytes_written < size) - { - void *page = ROUND_ADDR( addr, page_mask ); - BYTE vprot = get_page_vprot( page ); - SIZE_T block_size; - - /* If the page is not writable then check for write watches - * before giving up. This can be done without raising a real - * exception. Similar to virtual_handle_fault. */ - if (!(VIRTUAL_GetUnixProt( vprot ) & PROT_WRITE)) - { - if (!(view->protect & VPROT_WRITEWATCH)) - break; - - if (vprot & VPROT_WRITEWATCH) - { - set_page_vprot_bits( page, page_size, 0, VPROT_WRITEWATCH ); - mprotect_range( view, page, page_size, 0, 0 ); - } - /* ignore fault if page is writable now */ - if (!(VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_WRITE)) - break; - } - - block_size = min( size, page_size - ((UINT_PTR)addr & page_mask) ); - memcpy( addr, buffer, block_size ); + char *page = ROUND_ADDR( addr, page_mask ); + size_t i, total = ROUND_SIZE( addr, size ); - addr = (void *)((char *)addr + block_size); - buffer = (const void *)((const char *)buffer + block_size); - bytes_written += block_size; - } + for (i = 0; i < total; i += page_size) + { + int prot = VIRTUAL_GetUnixProt( get_page_vprot( page + i ) & ~VPROT_WRITEWATCH ); + if (!(prot & PROT_WRITE)) goto done; } + 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 ); + } + memcpy( addr, buffer, size ); + ret = STATUS_SUCCESS; } +done: server_leave_uninterrupted_section( &csVirtual, &sigset ); - return bytes_written; + return ret; }

1 0

Matteo Bruni : d3d9/tests: Add a test for "NULL" FourCC format.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: 99168377865927cf4f93d65cfea8d7de7e511018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99168377865927cf4f93d65cf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 6 01:39:16 2017 +0200 d3d9/tests: Add a test for "NULL" FourCC format. 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/d3d9/tests/visual.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 194 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ef91296..822e6e4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16101,7 +16101,7 @@ static void resz_test(void) 0x02000001, 0x800f0800, 0x80e40001, /* mov oC0, r1 */ 0x0000ffff, /* end */ }; - struct + static const struct { float x, y, z; float s, t, p, q; @@ -16113,7 +16113,7 @@ static void resz_test(void) { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.5f}, }; - struct + static const struct { UINT x, y; D3DCOLOR color; @@ -22850,7 +22850,198 @@ static void test_mvp_software_vertex_shaders(void) done: IDirect3D9_Release(d3d); DestroyWindow(window); +} + +static void test_null_format(void) +{ + static const D3DVIEWPORT9 vp_lower = {0, 60, 640, 420, 0.0f, 1.0f}; + static const D3DVIEWPORT9 vp_560 = {0, 180, 560, 300, 0.0f, 1.0f}; + static const D3DVIEWPORT9 vp_full = {0, 0, 640, 480, 0.0f, 1.0f}; + static const DWORD null_fourcc = MAKEFOURCC('N','U','L','L'); + static const struct + { + struct vec3 pos; + DWORD diffuse; + } + quad_partial[] = + { + {{-1.0f, 0.5f, 0.1f}, 0x000000ff}, + {{ 0.5f, 0.5f, 0.1f}, 0x000000ff}, + {{-1.0f, -1.0f, 0.1f}, 0x000000ff}, + {{ 0.5f, -1.0f, 0.1f}, 0x000000ff}, + }, + quad[] = + { + {{-1.0f, 1.0f, 0.5f}, 0x00ff0000}, + {{ 1.0f, 1.0f, 0.5f}, 0x00ff0000}, + {{-1.0f, -1.0f, 0.5f}, 0x00ff0000}, + {{ 1.0f, -1.0f, 0.5f}, 0x00ff0000}, + }, + quad_far[] = + { + {{-1.0f, 1.0f, 1.0f}, 0x0000ff00}, + {{ 1.0f, 1.0f, 1.0f}, 0x0000ff00}, + {{-1.0f, -1.0f, 1.0f}, 0x0000ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0x0000ff00}, + }; + static const struct + { + unsigned int x, y; + D3DCOLOR color; + BOOL todo; + } + expected_colors[] = + { + {200, 30, 0x0000ff00, FALSE}, + {440, 30, 0x0000ff00, FALSE}, + {520, 30, 0x0000ff00, FALSE}, + {600, 30, 0x0000ff00, FALSE}, + {200, 90, 0x00000000, FALSE}, + {440, 90, 0x0000ff00, FALSE}, + {520, 90, 0x0000ff00, FALSE}, + {600, 90, 0x0000ff00, FALSE}, + {200, 150, 0x000000ff, FALSE}, + {440, 150, 0x000000ff, FALSE}, + {520, 150, 0x0000ff00, FALSE}, + {600, 150, 0x0000ff00, FALSE}, + {200, 320, 0x000000ff, FALSE}, + {440, 320, 0x000000ff, FALSE}, + {520, 320, 0x00000000, TRUE}, + {600, 320, 0x0000ff00, FALSE}, + }; + IDirect3DSurface9 *original_rt, *small_rt, *null_rt, *small_null_rt; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + unsigned int i; + D3DCOLOR color; + HWND window; + HRESULT hr; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, null_fourcc))) + { + skip("No NULL format support, skipping NULL test.\n"); + IDirect3D9_Release(d3d); + return; + } + + window = create_window(); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 400, 300, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &small_rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, null_fourcc, + D3DMULTISAMPLE_NONE, 0, FALSE, &null_rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 400, 300, null_fourcc, + D3DMULTISAMPLE_NONE, 0, FALSE, &small_null_rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "Failed to enable depth test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "Failed to set depth function, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable depth write, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Clear extends to viewport size > RT size even if format is not + * "NULL". */ + hr = IDirect3DDevice9_SetRenderTarget(device, 0, small_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetViewport(device, &vp_full); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.2f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, null_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + /* Draw only extends to viewport size > RT size if format is "NULL". */ + hr = IDirect3DDevice9_SetRenderTarget(device, 0, small_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetViewport(device, &vp_lower); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, small_null_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetViewport(device, &vp_560); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad_partial, sizeof(*quad_partial)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad_far, sizeof(*quad_far)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + { + color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + todo_wine_if(expected_colors[i].todo) ok(color_match(color, expected_colors[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + IDirect3DSurface9_Release(small_null_rt); + IDirect3DSurface9_Release(null_rt); + IDirect3DSurface9_Release(small_rt); + IDirect3DSurface9_Release(original_rt); + cleanup_device(device); + IDirect3D9_Release(d3d); } START_TEST(visual) @@ -22984,4 +23175,5 @@ START_TEST(visual) test_drawindexedprimitiveup(); test_vertex_texture(); test_mvp_software_vertex_shaders(); + test_null_format(); }

1 0

Matteo Bruni : wined3d: Return the up-to-date locations from blitters.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: c50090cb6eeb1abd1d10665d7c9b04fe43f633e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50090cb6eeb1abd1d10665d7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 6 01:39:18 2017 +0200 wined3d: Return the up-to-date locations from blitters. 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/arb_program_shader.c | 7 ++++--- dlls/wined3d/surface.c | 36 ++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 25 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c50090cb6eeb1abd1d106…

1 0