September 2017 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLDocument7:: get_defaultView implementation and use it for get_parentWindow implementation.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 697f1cb60fc182cc65a8dec2ce278182923fafa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697f1cb60fc182cc65a8dec2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:14:32 2017 +0200 mshtml: Added IHTMLDocument7::get_defaultView implementation and use it for get_parentWindow implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f9775f8..ea6bb20 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1632,9 +1632,7 @@ static HRESULT WINAPI HTMLDocument_get_parentWindow(IHTMLDocument2 *iface, IHTML TRACE("(%p)->(%p)\n", This, p); - *p = &This->window->base.IHTMLWindow2_iface; - IHTMLWindow2_AddRef(*p); - return S_OK; + return IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p); } static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, @@ -3254,8 +3252,12 @@ static HRESULT WINAPI HTMLDocument7_Invoke(IHTMLDocument7 *iface, DISPID dispIdM static HRESULT WINAPI HTMLDocument7_get_defaultView(IHTMLDocument7 *iface, IHTMLWindow2 **p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = &This->window->base.IHTMLWindow2_iface; + IHTMLWindow2_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLDocument7_createCDATASection(IHTMLDocument7 *iface, BSTR text, IHTMLDOMNode **newCDATASectionNode) @@ -3977,8 +3979,10 @@ static HRESULT WINAPI HTMLDocument7_importNode(IHTMLDocument7 *iface, IHTMLDOMNo static HRESULT WINAPI HTMLDocument7_get_parentWindow(IHTMLDocument7 *iface, IHTMLWindow2 **p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p); } static HRESULT WINAPI HTMLDocument7_put_body(IHTMLDocument7 *iface, IHTMLElement *v)

1 0

Daniel Lehman : msvcrt: Protect onexit table with critical section.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 67012e8300d7520ed34ee433dbed48ddfdf25e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67012e8300d7520ed34ee433d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Aug 31 14:59:12 2017 -0700 msvcrt: Protect onexit table with critical section. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 9fd373e..4eff073 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -41,6 +41,15 @@ typedef struct MSVCRT__onexit_table_t MSVCRT__onexit_t *_end; } MSVCRT__onexit_table_t; +static CRITICAL_SECTION MSVCRT_onexit_cs; +static CRITICAL_SECTION_DEBUG MSVCRT_onexit_cs_debug = +{ + 0, 0, &MSVCRT_onexit_cs, + { &MSVCRT_onexit_cs_debug.ProcessLocksList, &MSVCRT_onexit_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": MSVCRT_onexit_cs") } +}; +static CRITICAL_SECTION MSVCRT_onexit_cs = { &MSVCRT_onexit_cs_debug, -1, 0, 0, 0, 0 }; + extern int MSVCRT_app_type; extern MSVCRT_wchar_t *MSVCRT__wpgmptr; @@ -368,12 +377,14 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT if (!table) return -1; + EnterCriticalSection(&MSVCRT_onexit_cs); if (!table->_first) { table->_first = MSVCRT_calloc(32, sizeof(void *)); if (!table->_first) { WARN("failed to allocate initial table.\n"); + LeaveCriticalSection(&MSVCRT_onexit_cs); return -1; } table->_last = table->_first; @@ -388,6 +399,7 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT if (!tmp) { WARN("failed to grow table.\n"); + LeaveCriticalSection(&MSVCRT_onexit_cs); return -1; } table->_first = tmp; @@ -397,6 +409,7 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT *table->_last = func; table->_last++; + LeaveCriticalSection(&MSVCRT_onexit_cs); return 0; } @@ -406,24 +419,33 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT int CDECL MSVCRT__execute_onexit_table(MSVCRT__onexit_table_t *table) { MSVCRT__onexit_t *func; + MSVCRT__onexit_table_t copy; TRACE("(%p)\n", table); if (!table) return -1; + EnterCriticalSection(&MSVCRT_onexit_cs); if (!table->_first || table->_first >= table->_last) + { + LeaveCriticalSection(&MSVCRT_onexit_cs); return 0; + } + copy._first = table->_first; + copy._last = table->_last; + copy._end = table->_end; + memset(table, 0, sizeof(*table)); + MSVCRT__initialize_onexit_table(table); + LeaveCriticalSection(&MSVCRT_onexit_cs); - for (func = table->_last - 1; func >= table->_first; func--) + for (func = copy._last - 1; func >= copy._first; func--) { if (*func) (*func)(); } - MSVCRT_free(table->_first); - memset(table, 0, sizeof(*table)); - MSVCRT__initialize_onexit_table(table); + MSVCRT_free(copy._first); return 0; }

1 0

Alexandre Julliard : ntdll: Pass the mapping file access instead of the protection bits to the server.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 1c8a36a91c552f5b8cf2142ab925c7bc2a392e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8a36a91c552f5b8cf2142ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 11:42:04 2017 +0200 ntdll: Pass the mapping file access instead of the protection bits to the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 18 ++++++++++++++++-- include/wine/server_protocol.h | 17 +++-------------- server/mapping.c | 26 ++++++++++---------------- server/protocol.def | 14 +------------- server/request.h | 7 +++---- server/trace.c | 3 +-- 6 files changed, 34 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c8a36a91c552f5b8cf21…

1 0

Dmitry Timoshkov : windowscodecs: Fix IWICBitmapEncoder:: SetPalette for a not initialized case in JPEG encoder.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 3bd1b570398ae7bc38b9c87119cb65007c3ed9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd1b570398ae7bc38b9c8711… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 11 15:38:18 2017 -0500 windowscodecs: Fix IWICBitmapEncoder::SetPalette for a not initialized case in JPEG encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 69d1187..ef050ba 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1409,8 +1409,18 @@ static HRESULT WINAPI JpegEncoder_SetColorContexts(IWICBitmapEncoder *iface, static HRESULT WINAPI JpegEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) { + JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); + HRESULT hr; + TRACE("(%p,%p)\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + + EnterCriticalSection(&This->lock); + + hr = This->initialized ? WINCODEC_ERR_UNSUPPORTEDOPERATION : WINCODEC_ERR_NOTINITIALIZED; + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI JpegEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail)

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateEventQueue.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 19d57982ecb4520453a1b77ace386c625312e265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d57982ecb4520453a1b77ac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 8 11:00:20 2017 +0000 mfplat: Implement MFCreateEventQueue. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 149 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4745094..7c5be65 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1514,17 +1514,162 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **type) return S_OK; } +typedef struct _mfeventqueue +{ + IMFMediaEventQueue IMFMediaEventQueue_iface; + LONG ref; +} mfeventqueue; + +static inline mfeventqueue *impl_from_IMFMediaEventQueue(IMFMediaEventQueue *iface) +{ + return CONTAINING_RECORD(iface, mfeventqueue, IMFMediaEventQueue_iface); +} + +static HRESULT WINAPI mfeventqueue_QueryInterface(IMFMediaEventQueue *iface, REFIID riid, void **out) +{ + mfeventqueue *This = impl_from_IMFMediaEventQueue(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFMediaEventQueue)) + { + *out = &This->IMFMediaEventQueue_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfeventqueue_AddRef(IMFMediaEventQueue *iface) +{ + mfeventqueue *This = impl_from_IMFMediaEventQueue(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfeventqueue_Release(IMFMediaEventQueue *iface) +{ + mfeventqueue *This = impl_from_IMFMediaEventQueue(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfeventqueue_GetEvent(IMFMediaEventQueue *iface, DWORD flags, IMFMediaEvent **event) +{ + mfeventqueue *This = impl_from_IMFMediaEventQueue(iface); + + FIXME("%p, %p\n", This, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfeventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + mfeventqueue *This = impl_from_IMFMediaEventQueue(iface); + + FIXME("%p, %p, %p\n", This, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfeventqueue_EndGetEvent(IMFMediaEventQueue *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + mfeventqueue *This = impl_from_IMFMediaEventQueue(iface); + + FIXME("%p, %p, %p\n", This, result, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfeventqueue_QueueEvent(IMFMediaEventQueue *iface, IMFMediaEvent *event) +{ + mfeventqueue *This = impl_from_IMFMediaEventQueue(iface); + + FIXME("%p, %p\n", This, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfeventqueue_QueueEventParamVar(IMFMediaEventQueue *iface, MediaEventType met, + REFGUID type, HRESULT status, const PROPVARIANT *value) +{ + mfeventqueue *This = impl_from_IMFMediaEventQueue(iface); + + FIXME("%p, %d, %s, 0x%08x, %p\n", This, met, debugstr_guid(type), status, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfeventqueue_QueueEventParamUnk(IMFMediaEventQueue *iface, MediaEventType met, REFGUID type, + HRESULT status, IUnknown *unk) +{ + mfeventqueue *This = impl_from_IMFMediaEventQueue(iface); + + FIXME("%p, %d, %s, 0x%08x, %p\n", This, met, debugstr_guid(type), status, unk); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfeventqueue_Shutdown(IMFMediaEventQueue *iface) +{ + mfeventqueue *This = impl_from_IMFMediaEventQueue(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFMediaEventQueueVtbl mfeventqueue_vtbl = +{ + mfeventqueue_QueryInterface, + mfeventqueue_AddRef, + mfeventqueue_Release, + mfeventqueue_GetEvent, + mfeventqueue_BeginGetEvent, + mfeventqueue_EndGetEvent, + mfeventqueue_QueueEvent, + mfeventqueue_QueueEventParamVar, + mfeventqueue_QueueEventParamUnk, + mfeventqueue_Shutdown +}; + /*********************************************************************** * MFCreateEventQueue (mfplat.@) */ HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue) { - FIXME("%p\n", queue); + mfeventqueue *object; - if(queue) - *queue = NULL; + TRACE("%p\n", queue); - return E_FAIL; + object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFMediaEventQueue_iface.lpVtbl = &mfeventqueue_vtbl; + + *queue = &object->IMFMediaEventQueue_iface; + + return S_OK; } typedef struct _mfdescriptor

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateStreamDescriptor.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 32ff8ea63e70593f23552b61a3f88d12a82367d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ff8ea63e70593f23552b61a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 8 11:00:12 2017 +0000 mfplat: Implement MFCreateStreamDescriptor. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 411 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfidl.idl | 2 + 3 files changed, 414 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32ff8ea63e70593f23552…

1 0

Vincent Povirk : sane.ds: Add support for word list options.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 31a4a58f81caf2aa6ee7a1e0540917b1b8ad7e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a4a58f81caf2aa6ee7a1e05… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 11 13:47:55 2017 -0500 sane.ds: Add support for word list options. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/ui.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 5574c5a..9a9bcb0 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -716,6 +716,23 @@ static BOOL UpdateSaneBoolOption(int index, BOOL position) return FALSE; } +static BOOL UpdateSaneIntOption(int index, SANE_Int value) +{ + SANE_Status rc = SANE_STATUS_GOOD; + SANE_Int result = 0; + + rc = psane_control_option (activeDS.deviceHandle,index, + SANE_ACTION_SET_VALUE, &value, &result); + + if(rc == SANE_STATUS_GOOD) + { + if (result & SANE_INFO_RELOAD_OPTIONS || + result & SANE_INFO_RELOAD_PARAMS || result & SANE_INFO_INEXACT) + return TRUE; + } + return FALSE; +} + static BOOL UpdateSaneStringOption(int index, SANE_String value) { SANE_Status rc = SANE_STATUS_GOOD; @@ -791,6 +808,21 @@ static INT_PTR InitializeDialog(HWND hwnd) SendMessageA(control,BM_SETCHECK,BST_CHECKED,0); } + else if (opt->type == SANE_TYPE_INT && + opt->constraint_type == SANE_CONSTRAINT_WORD_LIST) + { + int j, count = opt->constraint.word_list[0]; + CHAR buffer[16]; + SANE_Int val; + for (j=1; j<=count; j++) + { + sprintf(buffer, "%d", opt->constraint.word_list[j]); + SendMessageA(control, CB_ADDSTRING, 0, (LPARAM)buffer); + } + psane_control_option(activeDS.deviceHandle, i, SANE_ACTION_GET_VALUE, &val, NULL); + sprintf(buffer, "%d", val); + SendMessageA(control,CB_SELECTSTRING,0,(LPARAM)buffer); + } else if (opt->constraint_type == SANE_CONSTRAINT_RANGE) { if (opt->type == SANE_TYPE_INT) @@ -977,6 +1009,11 @@ static void ComboChanged(HWND hwnd, INT id, HWND control) if (UpdateSaneStringOption(index, value)) InitializeDialog(hwnd); } + else if (opt->type == SANE_TYPE_INT) + { + if (UpdateSaneIntOption(index, atoi(value))) + InitializeDialog(hwnd); + } }

1 0

Daniel Lehman : msvcrt: Use exception base to create copy constructor pointer.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 3ea70fa1e2c37df94c6c89e15d8f8fc06bbb22e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea70fa1e2c37df94c6c89e15… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Sep 8 10:32:07 2017 -0700 msvcrt: Use exception base to create copy constructor pointer. The exception base (exc_base) from the ExceptionRecord is used in find_caught_type to find the type info for the exception. All related type information is relative to this base, including the offset for the copy constructor. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 7e9c38d..0820aad 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -248,7 +248,7 @@ static const cxx_type_info *find_caught_type(cxx_exception_type *exc_type, ULONG static inline void copy_exception(void *object, ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const catchblock_info *catchblock, - const cxx_type_info *type) + const cxx_type_info *type, ULONG64 exc_base) { const type_info *catch_ti = rva_to_ptr(catchblock->type_info, dispatch->ImageBase); void **dest = rva_to_ptr(catchblock->offset, frame); @@ -273,13 +273,13 @@ static inline void copy_exception(void *object, ULONG64 frame, if (type->flags & CLASS_HAS_VIRTUAL_BASE_CLASS) { void (__cdecl *copy_ctor)(void*, void*, int) = - rva_to_ptr(type->copy_ctor, dispatch->ImageBase); + rva_to_ptr(type->copy_ctor, exc_base); copy_ctor(dest, get_this_pointer(&type->offsets, object), 1); } else { void (__cdecl *copy_ctor)(void*, void*) = - rva_to_ptr(type->copy_ctor, dispatch->ImageBase); + rva_to_ptr(type->copy_ctor, exc_base); copy_ctor(dest, get_this_pointer(&type->offsets, object)); } } @@ -462,7 +462,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, EXCEPTION_RECORD *unt /* copy the exception to its destination on the stack */ copy_exception((void*)rec->ExceptionInformation[1], - orig_frame, dispatch, catchblock, type); + orig_frame, dispatch, catchblock, type, exc_base); } else {

1 0

Alexandre Julliard : ntdll: Trace views once they are properly initialized.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 78ab8aa46af48cb2189715537297068dc0199dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ab8aa46af48cb2189715537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 19:51:43 2017 +0200 ntdll: Trace views once they are properly initialized. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 6065b79..bcd9680 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -312,13 +312,15 @@ static void VIRTUAL_DumpView( struct file_view *view ) TRACE( "View: %p - %p", addr, addr + view->size - 1 ); if (view->protect & VPROT_SYSTEM) - TRACE( " (system)\n" ); - else if (view->protect & VPROT_VALLOC) - TRACE( " (valloc)\n" ); - else if (view->mapping) - TRACE( " %p\n", view->mapping ); + TRACE( " (builtin image)\n" ); + else if (view->protect & SEC_IMAGE) + TRACE( " (image) %p\n", view->mapping ); + else if (view->protect & SEC_FILE) + TRACE( " (file) %p\n", view->mapping ); + else if (view->protect & (SEC_RESERVE | SEC_COMMIT)) + TRACE( " (anonymous) %p\n", view->mapping ); else - TRACE( " (anonymous)\n"); + TRACE( " (valloc)\n"); for (count = i = 1; i < view->size >> page_shift; i++, count++) { @@ -711,7 +713,6 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz wine_rb_put( &views_tree, view->base, &view->entry ); *view_ret = view; - VIRTUAL_DEBUG_DUMP_VIEW( view ); if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { @@ -849,15 +850,11 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ { int unix_prot = VIRTUAL_GetUnixProt(vprot); - TRACE("%p-%p %s\n", - base, (char *)base + size - 1, VIRTUAL_GetProtStr( vprot ) ); - if (view->protect & VPROT_WRITEWATCH) { /* 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 ); - VIRTUAL_DEBUG_DUMP_VIEW( view ); return TRUE; } @@ -869,7 +866,6 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ { set_page_vprot( base, size, vprot ); mprotect( base, size, unix_prot ); - VIRTUAL_DEBUG_DUMP_VIEW( view ); return TRUE; } @@ -877,7 +873,6 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ return FALSE; set_page_vprot( base, size, vprot ); - VIRTUAL_DEBUG_DUMP_VIEW( view ); return TRUE; } @@ -1482,6 +1477,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz done: view->mapping = dup_mapping; view->map_protect = map_vprot; + VIRTUAL_DEBUG_DUMP_VIEW( view ); server_leave_uninterrupted_section( &csVirtual, &sigset ); *addr_ptr = ptr; @@ -1651,6 +1647,7 @@ NTSTATUS virtual_create_builtin_view( void *module ) if (sec[i].Characteristics & IMAGE_SCN_MEM_WRITE) flags |= VPROT_WRITE; set_page_vprot( (char *)base + sec[i].VirtualAddress, sec[i].Misc.VirtualSize, flags ); } + VIRTUAL_DEBUG_DUMP_VIEW( view ); } server_leave_uninterrupted_section( &csVirtual, &sigset ); return status; @@ -1692,6 +1689,7 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi 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 ); + VIRTUAL_DEBUG_DUMP_VIEW( view ); /* note: limit is lower than base since the stack grows down */ teb->DeallocationStack = view->base; @@ -2119,6 +2117,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ status = allocate_dos_memory( &view, vprot ); if (status == STATUS_SUCCESS) { + VIRTUAL_DEBUG_DUMP_VIEW( view ); *ret = view->base; *size_ptr = view->size; } @@ -2180,6 +2179,8 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ } } + if (!status) VIRTUAL_DEBUG_DUMP_VIEW( view ); + if (use_locks) server_leave_uninterrupted_section( &csVirtual, &sigset ); if (status == STATUS_SUCCESS) @@ -2378,6 +2379,8 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T } else status = STATUS_INVALID_PARAMETER; + if (!status) VIRTUAL_DEBUG_DUMP_VIEW( view ); + server_leave_uninterrupted_section( &csVirtual, &sigset ); if (status == STATUS_SUCCESS) @@ -2891,6 +2894,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p view->mapping = dup_mapping; view->map_protect = map_vprot; dup_mapping = 0; /* don't close it */ + VIRTUAL_DEBUG_DUMP_VIEW( view ); } else {

1 0

Vincent Povirk : loader/wine.inf: Put 32-bit .ds fakedlls in windows/ twain_32.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 72e5f1af3d4a3a8230081d74fff52f0dacb6be9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e5f1af3d4a3a8230081d74f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 11 12:44:48 2017 -0500 loader/wine.inf: Put 32-bit .ds fakedlls in windows/twain_32. Some programs search for TWAIN devices by listing this directory. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0b3c940..d22137f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2517,6 +2517,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,rundll.exe,rundll.exe16 10,,twain.dll,twain.dll16 10,,twain_32.dll +10,twain_32,sane.ds +10,twain_32,gphoto2.ds 10,,winhelp.exe,winhelp.exe16 10,,winhlp32.exe 10,command,start.exe

1 0