September 2017 - Wine-Commits

Nikolay Sivov : dwrite/tests: Fix fallback builder test skip.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: f2090cb415bef834d5d8c993feee16cc6e071006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2090cb415bef834d5d8c993f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 22 15:34:50 2017 +0300 dwrite/tests: Fix fallback builder test skip. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ba3e852..493eaf3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4672,17 +4672,15 @@ static void test_FontFallbackBuilder(void) hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); IDWriteFactory_Release(factory); - if (factory2) { - EXPECT_REF(factory2, 1); - hr = IDWriteFactory2_CreateFontFallbackBuilder(factory2, &builder); - EXPECT_REF(factory2, 2); - } - if (hr != S_OK) { - skip("IDWriteFontFallbackBuilder is not supported\n"); + win_skip("IDWriteFontFallbackBuilder is not supported\n"); return; } + EXPECT_REF(factory2, 1); + hr = IDWriteFactory2_CreateFontFallbackBuilder(factory2, &builder); + EXPECT_REF(factory2, 2); + fallback = NULL; EXPECT_REF(factory2, 2); EXPECT_REF(builder, 1);

1 0

Nikolay Sivov : dwrite: Implement AddMapping().
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 8dc81ed2a42c1c4b1f9fdb83f8a2755afc552a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc81ed2a42c1c4b1f9fdb83f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 22 15:34:52 2017 +0300 dwrite: Implement AddMapping(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 136 ++++++++++++++++++++++++++++++++++++--------- dlls/dwrite/tests/layout.c | 15 +++-- 2 files changed, 121 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8dc81ed2a42c1c4b1f9fd…

1 0

Nikolay Sivov : dwrite: Add warning message for unsupported interfaces.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: e1a41faf76476c022a9a0d88c634acecdff101be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a41faf76476c022a9a0d88c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 22 15:34:51 2017 +0300 dwrite: Add warning message for unsupported interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 8 ++++++++ dlls/dwrite/font.c | 30 ++++++++++++++++++++++++++++-- dlls/dwrite/gdiinterop.c | 6 ++++++ dlls/dwrite/layout.c | 12 ++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index db488a0..e26892f 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -818,6 +818,8 @@ static HRESULT WINAPI dwritetextanalyzer_QueryInterface(IDWriteTextAnalyzer2 *if return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -1863,6 +1865,8 @@ static HRESULT WINAPI dwritenumbersubstitution_QueryInterface(IDWriteNumberSubst return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; @@ -1948,6 +1952,8 @@ static HRESULT WINAPI fontfallback_QueryInterface(IDWriteFontFallback *iface, RE return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -2235,6 +2241,8 @@ static HRESULT WINAPI fontfallbackbuilder_QueryInterface(IDWriteFontFallbackBuil return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 46dfd30..16bff9b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -473,6 +473,8 @@ static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace4 *iface, REF return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -1421,6 +1423,8 @@ static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont3 *iface, REFIID riid return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -1824,6 +1828,8 @@ static HRESULT WINAPI dwritefontlist_QueryInterface(IDWriteFontList1 *iface, REF return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -1961,6 +1967,8 @@ static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily1 *iface, return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -2295,6 +2303,8 @@ static HRESULT WINAPI dwritesystemfontcollection_QueryInterface(IDWriteFontColle if (IsEqualIID(riid, &IID_issystemcollection)) return S_OK; + WARN("%s not implemented.\n", debugstr_guid(riid)); + return E_NOINTERFACE; } @@ -2312,6 +2322,8 @@ static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection1 return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; @@ -3825,14 +3837,16 @@ static inline struct system_fontfile_enumerator *impl_from_IDWriteFontFileEnumer static HRESULT WINAPI systemfontfileenumerator_QueryInterface(IDWriteFontFileEnumerator *iface, REFIID riid, void **obj) { - *obj = NULL; - if (IsEqualIID(riid, &IID_IDWriteFontFileEnumerator) || IsEqualIID(riid, &IID_IUnknown)) { IDWriteFontFileEnumerator_AddRef(iface); *obj = iface; return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + + *obj = NULL; + return E_NOINTERFACE; } @@ -4180,6 +4194,8 @@ static HRESULT WINAPI dwritefontfile_QueryInterface(IDWriteFontFile *iface, REFI return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -4483,6 +4499,8 @@ static HRESULT WINAPI localfontfilestream_QueryInterface(IDWriteFontFileStream * return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -4610,6 +4628,8 @@ static HRESULT WINAPI localfontfileloader_QueryInterface(IDWriteLocalFontFileLoa return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -4828,6 +4848,8 @@ static HRESULT WINAPI glyphrunanalysis_QueryInterface(IDWriteGlyphRunAnalysis *i return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -5356,6 +5378,8 @@ static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerat return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -5672,6 +5696,8 @@ static HRESULT WINAPI fontfacereference_QueryInterface(IDWriteFontFaceReference return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index ac1fc32..ad95e94 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -121,6 +121,8 @@ static HRESULT WINAPI rendertarget_sink_QueryInterface(ID2D1SimplifiedGeometrySi return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; @@ -221,6 +223,8 @@ static HRESULT WINAPI rendertarget_QueryInterface(IDWriteBitmapRenderTarget1 *if return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; @@ -611,6 +615,8 @@ static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop1 *iface, REFII return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4b67ce0..7975651 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2823,6 +2823,8 @@ static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout3 *iface, return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + return E_NOINTERFACE; } @@ -4519,6 +4521,8 @@ static HRESULT WINAPI dwritetextlayout_sink_QueryInterface(IDWriteTextAnalysisSi return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -4659,6 +4663,8 @@ static HRESULT WINAPI dwritetextlayout_source_QueryInterface(IDWriteTextAnalysis return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -4991,6 +4997,8 @@ static HRESULT WINAPI dwritetrimmingsign_QueryInterface(IDWriteInlineObject *ifa return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -5162,6 +5170,8 @@ static HRESULT WINAPI dwritetextformat_QueryInterface(IDWriteTextFormat2 *iface, return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; @@ -5597,6 +5607,8 @@ static HRESULT WINAPI dwritetypography_QueryInterface(IDWriteTypography *iface, return S_OK; } + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE;

1 0

Alexandre Julliard : ntdll: Add helpers to lock the user output buffer during file reads.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 51d348c8c274b6930d9a5007316beda9062204d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d348c8c274b6930d9a50073… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 15:04:34 2017 +0200 ntdll: Add helpers to lock the user output buffer during file reads. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 12 ----------- dlls/ntdll/file.c | 6 +++--- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/virtual.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index ec2489f..d7d5124 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1840,13 +1840,10 @@ static DWORD CALLBACK read_pipe( void *arg ) "%u: ConnectNamedPipe failed %u\n", args->index, GetLastError() ); success = ReadFile( args->pipe, args->base, args->size, &num_bytes, NULL ); - todo_wine_if (!args->index) - { ok( success, "%u: ReadFile failed %u\n", args->index, GetLastError() ); ok( num_bytes == sizeof(testdata), "%u: wrong number of bytes read %u\n", args->index, num_bytes ); ok( !memcmp( args->base, testdata, sizeof(testdata)), "%u: didn't receive expected data\n", args->index ); - } return 0; } @@ -2056,22 +2053,16 @@ static void test_write_watch(void) num_bytes = 0; success = GetOverlappedResult( readpipe, &overlapped, &num_bytes, TRUE ); - todo_wine_if (!i) - { ok( success, "%u: GetOverlappedResult failed %u\n", i, GetLastError() ); ok( num_bytes == sizeof(testdata), "%u: wrong number of bytes read %u\n", i, num_bytes ); ok( !memcmp( base, testdata, sizeof(testdata)), "%u: didn't receive expected data\n", i ); - } count = 64; memset( results, 0, sizeof(results) ); ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "%u: GetWriteWatch failed %u\n", i, GetLastError() ); - todo_wine_if (!i) - { ok( count == 1, "%u: wrong count %lu\n", i, count ); ok( results[0] == base, "%u: wrong result %p\n", i, results[0] ); - } CloseHandle( readpipe ); CloseHandle( writepipe ); @@ -2120,11 +2111,8 @@ static void test_write_watch(void) memset( results, 0, sizeof(results) ); ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "%u: GetWriteWatch failed %u\n", i, GetLastError() ); - todo_wine_if (!i) - { ok( count == 1, "%u: wrong count %lu\n", i, count ); ok( results[0] == base, "%u: wrong result %p\n", i, results[0] ); - } CloseHandle( readpipe ); CloseHandle( writepipe ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index f0f5361..28a69ff 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -517,7 +517,7 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, NTSTAT &needs_close, NULL, NULL ))) break; - result = read(fd, &fileio->buffer[fileio->already], fileio->count - fileio->already); + result = virtual_locked_read(fd, &fileio->buffer[fileio->already], fileio->count-fileio->already); if (needs_close) close( fd ); if (result < 0) @@ -869,7 +869,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) { /* async I/O doesn't make sense on regular files */ - while ((result = pread( unix_handle, buffer, length, offset->QuadPart )) == -1) + while ((result = virtual_locked_pread( unix_handle, buffer, length, offset->QuadPart )) == -1) { if (errno != EINTR) { @@ -911,7 +911,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, for (;;) { - if ((result = read( unix_handle, (char *)buffer + total, length - total )) >= 0) + if ((result = virtual_locked_read( unix_handle, (char *)buffer + total, length - total )) >= 0) { total += result; if (!result || total == length) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index aad4546..907bbdd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -171,6 +171,8 @@ extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) DECLSPEC_HIDDEN; extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; +extern ssize_t virtual_locked_read( int fd, void *addr, size_t size ) DECLSPEC_HIDDEN; +extern ssize_t virtual_locked_pread( int fd, void *addr, size_t size, off_t offset ) DECLSPEC_HIDDEN; 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; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 68a61b5..2cdcca8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1863,6 +1863,56 @@ unsigned int virtual_locked_server_call( void *req_ptr ) } +/*********************************************************************** + * virtual_locked_read + */ +ssize_t virtual_locked_read( int fd, void *addr, size_t size ) +{ + sigset_t sigset; + BOOL has_write_watch = FALSE; + int err = EFAULT; + + ssize_t ret = read( fd, addr, size ); + if (ret != -1 || errno != EFAULT) return ret; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if (!check_write_access( addr, size, &has_write_watch )) + { + ret = read( fd, addr, size ); + err = errno; + if (has_write_watch) update_write_watches( addr, size, max( 0, ret )); + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + errno = err; + return ret; +} + + +/*********************************************************************** + * virtual_locked_pread + */ +ssize_t virtual_locked_pread( int fd, void *addr, size_t size, off_t offset ) +{ + sigset_t sigset; + BOOL has_write_watch = FALSE; + int err = EFAULT; + + ssize_t ret = pread( fd, addr, size, offset ); + if (ret != -1 || errno != EFAULT) return ret; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if (!check_write_access( addr, size, &has_write_watch )) + { + ret = pread( fd, addr, size, offset ); + err = errno; + if (has_write_watch) update_write_watches( addr, size, max( 0, ret )); + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + errno = err; + return ret; +} + + /*********************************************************************** * virtual_is_valid_code_address

1 0

Alexandre Julliard : ntdll: Add a helper to lock the user output buffer during a server call.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: a20c4e11dfe4d89fc0f7184616386e56354995df URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20c4e11dfe4d89fc0f718461… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 14:58:09 2017 +0200 ntdll: Add a helper to lock the user output buffer during a server call. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 10 ++++------ dlls/ntdll/file.c | 6 +++--- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/server.c | 17 ++++++++++++++--- dlls/ntdll/virtual.c | 25 +++++++++++++++++++++++++ 5 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 1d611cd..ec2489f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1840,7 +1840,7 @@ static DWORD CALLBACK read_pipe( void *arg ) "%u: ConnectNamedPipe failed %u\n", args->index, GetLastError() ); success = ReadFile( args->pipe, args->base, args->size, &num_bytes, NULL ); - todo_wine + todo_wine_if (!args->index) { ok( success, "%u: ReadFile failed %u\n", args->index, GetLastError() ); ok( num_bytes == sizeof(testdata), "%u: wrong number of bytes read %u\n", args->index, num_bytes ); @@ -2056,7 +2056,7 @@ static void test_write_watch(void) num_bytes = 0; success = GetOverlappedResult( readpipe, &overlapped, &num_bytes, TRUE ); - todo_wine + todo_wine_if (!i) { ok( success, "%u: GetOverlappedResult failed %u\n", i, GetLastError() ); ok( num_bytes == sizeof(testdata), "%u: wrong number of bytes read %u\n", i, num_bytes ); @@ -2067,7 +2067,7 @@ static void test_write_watch(void) memset( results, 0, sizeof(results) ); ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "%u: GetWriteWatch failed %u\n", i, GetLastError() ); - todo_wine + todo_wine_if (!i) { ok( count == 1, "%u: wrong count %lu\n", i, count ); ok( results[0] == base, "%u: wrong result %p\n", i, results[0] ); @@ -2076,7 +2076,6 @@ static void test_write_watch(void) CloseHandle( readpipe ); CloseHandle( writepipe ); CloseHandle( overlapped.hEvent ); - if (!success) break; /* don't try message mode if byte mode already doesn't work */ } for (i = 0; i < 2; i++) @@ -2121,7 +2120,7 @@ static void test_write_watch(void) memset( results, 0, sizeof(results) ); ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "%u: GetWriteWatch failed %u\n", i, GetLastError() ); - todo_wine + todo_wine_if (!i) { ok( count == 1, "%u: wrong count %lu\n", i, count ); ok( results[0] == base, "%u: wrong result %p\n", i, results[0] ); @@ -2130,7 +2129,6 @@ static void test_write_watch(void) CloseHandle( readpipe ); CloseHandle( writepipe ); CloseHandle( thread ); - if (!count) break; /* don't try message mode if byte mode already doesn't work */ } GetTempPathA( MAX_PATH, path ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0381e55..f0f5361 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -438,7 +438,7 @@ static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status { req->user_arg = wine_server_client_ptr( async ); wine_server_set_reply( req, async->buffer, async->size ); - status = wine_server_call( req ); + status = virtual_locked_server_call( req ); information = reply->size; } SERVER_END_REQ; @@ -577,7 +577,7 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a req->async = server_async( handle, &async->io, event, apc, apc_context, io ); req->pos = offset ? offset->QuadPart : 0; wine_server_set_reply( req, buffer, size ); - status = wine_server_call( req ); + status = virtual_locked_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; if (wait_handle && status != STATUS_PENDING) @@ -1540,7 +1540,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if ((code & 3) != METHOD_BUFFERED) wine_server_add_data( req, out_buffer, out_size ); wine_server_set_reply( req, out_buffer, out_size ); - status = wine_server_call( req ); + status = virtual_locked_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; if (wait_handle && status != STATUS_PENDING) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 8dae676..aad4546 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -88,6 +88,7 @@ extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN terminate_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN exit_thread( int status ) DECLSPEC_HIDDEN; extern sigset_t server_block_set DECLSPEC_HIDDEN; +extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern unsigned int server_select( const select_op_t *select_op, data_size_t size, @@ -169,6 +170,7 @@ extern void virtual_clear_thread_stack(void) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) DECLSPEC_HIDDEN; +extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; 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; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c3b878e..1e84fbf 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -278,6 +278,19 @@ static inline unsigned int wait_reply( struct __server_request_info *req ) /*********************************************************************** + * server_call_unlocked + */ +unsigned int server_call_unlocked( void *req_ptr ) +{ + struct __server_request_info * const req = req_ptr; + unsigned int ret; + + if ((ret = send_request( req ))) return ret; + return wait_reply( req ); +} + + +/*********************************************************************** * wine_server_call (NTDLL.@) * * Perform a server call. @@ -301,13 +314,11 @@ static inline unsigned int wait_reply( struct __server_request_info *req ) */ unsigned int wine_server_call( void *req_ptr ) { - struct __server_request_info * const req = req_ptr; sigset_t old_set; unsigned int ret; pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set ); - ret = send_request( req ); - if (!ret) ret = wait_reply( req ); + ret = server_call_unlocked( req_ptr ); pthread_sigmask( SIG_SETMASK, &old_set, NULL ); return ret; } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d36dd7d..68a61b5 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1838,6 +1838,31 @@ static NTSTATUS check_write_access( void *base, size_t size, BOOL *has_write_wat } +/*********************************************************************** + * virtual_locked_server_call + */ +unsigned int virtual_locked_server_call( void *req_ptr ) +{ + struct __server_request_info * const req = req_ptr; + sigset_t sigset; + void *addr = req->reply_data; + data_size_t size = req->u.req.request_header.reply_size; + BOOL has_write_watch = FALSE; + unsigned int ret = STATUS_ACCESS_VIOLATION; + + if (!size) return wine_server_call( req_ptr ); + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if (!(ret = check_write_access( addr, size, &has_write_watch ))) + { + ret = server_call_unlocked( req ); + if (has_write_watch) update_write_watches( addr, size, wine_server_reply_size( req )); + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + return ret; +} + + /*********************************************************************** * virtual_is_valid_code_address

1 0

Alexandre Julliard : ntdll: Add helper functions for verifying write access to a memory range.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: af045a52e294be2e2515491292e88483658a59f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af045a52e294be2e251549129… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 14:56:56 2017 +0200 ntdll: Add helper functions for verifying write access to a memory range. 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 1e6b8a7..d36dd7d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -838,9 +838,10 @@ static inline int mprotect_exec( void *base, size_t size, int unix_prot ) static void mprotect_range( void *base, size_t size, BYTE set, BYTE clear ) { size_t i, count; - char *addr = base; + char *addr = ROUND_ADDR( base, page_mask ); int prot, next; + size = ROUND_SIZE( base, size ); prot = VIRTUAL_GetUnixProt( (get_page_vprot( addr ) & ~clear ) | set ); for (count = i = 1; i < size >> page_shift; i++, count++) { @@ -925,6 +926,19 @@ static NTSTATUS set_protection( struct file_view *view, void *base, SIZE_T size, /*********************************************************************** + * update_write_watches + */ +static void update_write_watches( void *base, size_t size, size_t accessed_size ) +{ + TRACE( "updating watch %p-%p-%p\n", base, (char *)base + accessed_size, (char *)base + size ); + /* clear write watch flag on accessed pages */ + set_page_vprot_bits( base, accessed_size, 0, VPROT_WRITEWATCH ); + /* restore page protections on the entire range */ + mprotect_range( base, size, 0, 0 ); +} + + +/*********************************************************************** * reset_write_watches * * Reset write watches in a memory range. @@ -1800,6 +1814,30 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) } +/*********************************************************************** + * check_write_access + * + * Check if the memory range is writable, temporarily disabling write watches if necessary. + */ +static NTSTATUS check_write_access( void *base, size_t size, BOOL *has_write_watch ) +{ + size_t i; + char *addr = ROUND_ADDR( base, page_mask ); + + size = ROUND_SIZE( base, size ); + for (i = 0; i < size; i += page_size) + { + BYTE vprot = get_page_vprot( addr + i ); + if (vprot & VPROT_WRITEWATCH) *has_write_watch = TRUE; + if (!(VIRTUAL_GetUnixProt( vprot & ~VPROT_WRITEWATCH ) & PROT_WRITE)) + return STATUS_INVALID_USER_BUFFER; + } + if (*has_write_watch) + mprotect_range( addr, size, 0, VPROT_WRITEWATCH ); /* temporarily enable write access */ + return STATUS_SUCCESS; +} + + /*********************************************************************** * virtual_is_valid_code_address @@ -1963,32 +2001,18 @@ SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T */ NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) { - struct file_view *view; + BOOL has_write_watch = FALSE; sigset_t sigset; - NTSTATUS ret = STATUS_ACCESS_VIOLATION; + NTSTATUS ret; if (!size) return STATUS_SUCCESS; server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( addr, size )) && !(view->protect & VPROT_SYSTEM)) + if (!(ret = check_write_access( addr, size, &has_write_watch ))) { - char *page = ROUND_ADDR( addr, page_mask ); - size_t i, total = ROUND_SIZE( addr, 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( addr, size, 0, 0 ); - } memcpy( addr, buffer, size ); - ret = STATUS_SUCCESS; + if (has_write_watch) update_write_watches( addr, size, size ); } -done: server_leave_uninterrupted_section( &csVirtual, &sigset ); return ret; }

1 0

Fabian Maurer : evr: Add COM classfactory.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 3dddaba2d2985110ac10ca7ce8516f5f9274d388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dddaba2d2985110ac10ca7ce… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Sep 20 14:03:37 2017 +0200 evr: Add COM classfactory. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 1 + dlls/evr/evr.spec | 8 +-- dlls/evr/main.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+), 4 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 25cc961..9e52e11 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,4 +1,5 @@ MODULE = evr.dll +IMPORTS = uuid ole32 C_SRCS = \ main.c diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index 3f609b6..c78900c 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -1,7 +1,7 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub MFConvertColorInfoFromDXVA @ stub MFConvertColorInfoToDXVA @ stub MFConvertFromFP16Array diff --git a/dlls/evr/main.c b/dlls/evr/main.c index 1b223ad..641aed9 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#define COBJMACROS + #include "config.h" #include <stdarg.h> @@ -22,16 +25,169 @@ #include "windef.h" #include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(evr); + +static HINSTANCE instance_evr; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { + TRACE("(%p, %d, %p)\n", instance, reason, reserved); + switch (reason) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + instance_evr = instance; DisableThreadLibraryCalls(instance); break; } return TRUE; } + +typedef struct { + IClassFactory IClassFactory_iface; + + LONG ref; + HRESULT (*pfnCreateInstance)(IUnknown *unk_outer, void **ppobj); +} IClassFactoryImpl; + +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + +struct object_creation_info +{ + const CLSID *clsid; + HRESULT (*pfnCreateInstance)(IUnknown *unk_outer, void **ppobj); +}; + +static const struct object_creation_info object_creation[] = +{ + { &GUID_NULL, 0 }, +}; + +static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *ppobj = &This->IClassFactory_iface; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI classfactory_AddRef(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI classfactory_Release(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer_unk, REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + HRESULT hres; + IUnknown *unk; + + TRACE("(%p)->(%p,%s,%p)\n", This, outer_unk, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + hres = This->pfnCreateInstance(outer_unk, (void **) &unk); + if (SUCCEEDED(hres)) + { + hres = IUnknown_QueryInterface(unk, riid, ppobj); + IUnknown_Release(unk); + } + return hres; +} + +static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%d), stub!\n", This, dolock); + return S_OK; +} + +static const IClassFactoryVtbl classfactory_Vtbl = +{ + classfactory_QueryInterface, + classfactory_AddRef, + classfactory_Release, + classfactory_CreateInstance, + classfactory_LockServer +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + unsigned int i; + IClassFactoryImpl *factory; + + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (!IsEqualGUID(&IID_IClassFactory, riid) + && !IsEqualGUID( &IID_IUnknown, riid)) + return E_NOINTERFACE; + + for (i = 0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + { + if (IsEqualGUID(object_creation[i].clsid, rclsid)) + break; + } + + if (i == sizeof(object_creation)/sizeof(object_creation[0])) + { + FIXME("%s: no class found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); + if (factory == NULL) + return E_OUTOFMEMORY; + + factory->IClassFactory_iface.lpVtbl = &classfactory_Vtbl; + factory->ref = 1; + + factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; + + *ppv = &(factory->IClassFactory_iface); + return S_OK; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance_evr); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance_evr); +}

1 0

Alexandre Julliard : server: Always make pipes non-blocking.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 38d0aa68dadb8a45477622d6d6ff873e62dc9213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d0aa68dadb8a45477622d6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 15:11:55 2017 +0200 server: Always make pipes non-blocking. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 80363cb..9cd424f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -870,11 +870,6 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ) reselect_read_queue( pipe_end ); } -static inline int is_overlapped( unsigned int options ) -{ - return !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); -} - static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ) { return FD_TYPE_PIPE; @@ -1144,11 +1139,8 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc { assert( !server->pipe_end.fd ); - /* for performance reasons, only set nonblocking mode when using - * overlapped I/O. Otherwise, we will be doing too much busy - * looping */ - if (is_overlapped( options )) fcntl( fds[1], F_SETFL, O_NONBLOCK ); - if (is_overlapped( server->options )) fcntl( fds[0], F_SETFL, O_NONBLOCK ); + fcntl( fds[0], F_SETFL, O_NONBLOCK ); + fcntl( fds[1], F_SETFL, O_NONBLOCK ); if (pipe->insize) {

1 0

Alexandre Julliard : ntdll: Handle pages faults without fetching the view pointer when possible.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

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

Alexandre Julliard : ntdll: Handle stack faults without fetching the view pointer.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

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