September 2017 - Wine-Commits

Alex Henrie : ucrtbase: Add __stdio_common_vfprintf_s.
by Alexandre Julliard Sept. 7, 2017

Sept. 7, 2017

Module: wine Branch: master Commit: a116f4a7abfe09182eb488a033dbbf0c20e2f9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a116f4a7abfe09182eb488a03… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 4 12:06:57 2017 -0600 ucrtbase: Add __stdio_common_vfprintf_s. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/file.c | 27 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 6acd08e..6196fb4 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl __p__fmode() ucrtbase.__p__fmode @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p -@ stub __stdio_common_vfprintf_s +@ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf_s @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfscanf @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6dcb194..1c63202 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5132,6 +5132,33 @@ int CDECL MSVCRT__stdio_common_vfprintf(unsigned __int64 options, MSVCRT_FILE *f } /********************************************************************* + * __stdio_common_vfprintf_s (UCRTBASE.@) + */ +int CDECL MSVCRT__stdio_common_vfprintf_s(unsigned __int64 options, MSVCRT_FILE *file, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + BOOL tmp_buf; + int ret; + + if (!MSVCRT_CHECK_PMT(file != NULL)) return -1; + + MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); + + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + + ret = pf_printf_a(puts_clbk_file_a, file, format, locale, + (options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + arg_clbk_valist, NULL, &valist); + + if (tmp_buf) remove_std_buffer(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* * __stdio_common_vfwprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfwprintf(unsigned __int64 options, MSVCRT_FILE *file, const MSVCRT_wchar_t *format, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ce1e24e..6ba0ae0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -148,7 +148,7 @@ @ cdecl __std_type_info_name(ptr ptr) MSVCRT_type_info_name_list @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p -@ stub __stdio_common_vfprintf_s +@ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf_s @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfscanf @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p

1 0

Alex Henrie : msvcrt: Note that __stdio_common functions are for ucrtbase.
by Alexandre Julliard Sept. 7, 2017

Sept. 7, 2017

Module: wine Branch: master Commit: 5074bb9a4bf77d23dfcf11cf019ea4264f021928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5074bb9a4bf77d23dfcf11cf0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 4 12:06:56 2017 -0600 msvcrt: Note that __stdio_common functions are for ucrtbase. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/scanf.c | 8 ++++---- dlls/msvcrt/wcs.c | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 62b06eb..6dcb194 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5108,7 +5108,7 @@ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ } /********************************************************************* - * __stdio_common_vfprintf (MSVCRT.@) + * __stdio_common_vfprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfprintf(unsigned __int64 options, MSVCRT_FILE *file, const char *format, MSVCRT__locale_t locale, __ms_va_list valist) @@ -5132,7 +5132,7 @@ int CDECL MSVCRT__stdio_common_vfprintf(unsigned __int64 options, MSVCRT_FILE *f } /********************************************************************* - * __stdio_common_vfwprintf (MSVCRT.@) + * __stdio_common_vfwprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfwprintf(unsigned __int64 options, MSVCRT_FILE *file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 3642307..fd776a6 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -663,7 +663,7 @@ int CDECL MSVCRT__snscanf_s_l(char *input, MSVCRT_size_t length, /********************************************************************* - * __stdio_common_vsscanf (MSVCRT.@) + * __stdio_common_vsscanf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, const char *input, MSVCRT_size_t length, @@ -683,7 +683,7 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, } /********************************************************************* - * __stdio_common_vswscanf (MSVCRT.@) + * __stdio_common_vswscanf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, const MSVCRT_wchar_t *input, MSVCRT_size_t length, @@ -703,7 +703,7 @@ int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, } /********************************************************************* - * __stdio_common_vfscanf (MSVCRT.@) + * __stdio_common_vfscanf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options, MSVCRT_FILE *file, @@ -720,7 +720,7 @@ int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options, } /********************************************************************* - * __stdio_common_vfwscanf (MSVCRT.@) + * __stdio_common_vfwscanf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, MSVCRT_FILE *file, diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a3429ea..cd87f21 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -749,7 +749,7 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) } /********************************************************************* - * __stdio_common_vsprintf (MSVCRT.@) + * __stdio_common_vsprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) @@ -918,7 +918,7 @@ int CDECL MSVCRT_vsnprintf_s( char *str, MSVCRT_size_t sizeOfBuffer, } /********************************************************************* - * __stdio_common_vsnprintf_s (MSVCRT.@) + * __stdio_common_vsnprintf_s (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vsnprintf_s( unsigned __int64 options, char *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, @@ -930,7 +930,7 @@ int CDECL MSVCRT__stdio_common_vsnprintf_s( unsigned __int64 options, } /********************************************************************* - * __stdio_common_vsnwprintf_s (MSVCRT.@) + * __stdio_common_vsnwprintf_s (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, @@ -942,7 +942,7 @@ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, } /********************************************************************* - * __stdio_common_vswprintf_s (MSVCRT.@) + * __stdio_common_vswprintf_s (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vswprintf_s( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t count, const MSVCRT_wchar_t *format, @@ -952,7 +952,7 @@ int CDECL MSVCRT__stdio_common_vswprintf_s( unsigned __int64 options, } /********************************************************************* - * __stdio_common_vsprintf_s (MSVCRT.@) + * __stdio_common_vsprintf_s (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, char *str, MSVCRT_size_t count, const char *format, @@ -1159,7 +1159,7 @@ int CDECL MSVCRT__vswprintf_p(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, /********************************************************************* - * __stdio_common_vswprintf_p (MSVCRT.@) + * __stdio_common_vswprintf_p (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vswprintf_p( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t count, const MSVCRT_wchar_t *format, @@ -1266,7 +1266,7 @@ static int puts_clbk_str_c99_w(void *ctx, int len, const MSVCRT_wchar_t *str) } /********************************************************************* - * __stdio_common_vswprintf (MSVCRT.@) + * __stdio_common_vswprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format,

1 0

Rosanne DiMesio : Add deleteOldComments to admin control center
by Jeremy Newman Sept. 7, 2017

Sept. 7, 2017

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 Sept. 6, 2017

Sept. 6, 2017

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

Alistair Leslie-Hughes : include: Added IMFMediaEventQueue interface.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 90d4f7f30043ea9802e0367b1de245cad2c27076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d4f7f30043ea9802e0367b1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 6 07:38:40 2017 +0000 include: Added IMFMediaEventQueue interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfobjects.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 467535d..67055d3 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -583,3 +583,21 @@ interface IMFPluginControl : IUnknown HRESULT GetDisabledByIndex(DWORD pluginType, DWORD index, CLSID *clsid); HRESULT SetDisabled(DWORD pluginType, REFCLSID clsid, BOOL disabled); } + +[ + object, + uuid(36f846fc-2256-48b6-b58e-e2b638316581), + local +] +interface IMFMediaEventQueue : IUnknown +{ + HRESULT GetEvent([in] DWORD flags, [out] IMFMediaEvent **event); + HRESULT BeginGetEvent([in] IMFAsyncCallback *callback, [in] IUnknown *state); + HRESULT EndGetEvent([in] IMFAsyncResult *result, [out] IMFMediaEvent **event); + HRESULT QueueEvent([in] IMFMediaEvent *event); + HRESULT QueueEventParamVar([in] MediaEventType met, [in] REFGUID type, + [in] HRESULT status, [in, unique] const PROPVARIANT *value); + HRESULT QueueEventParamUnk([in] MediaEventType met, [in] REFGUID type, + [in] HRESULT status, [in, unique] IUnknown *unk); + HRESULT Shutdown(); +}

1 0

Stefan Dösinger : ntdll: Make RtlDeregisterWaitEx( handle, INVALID_HANDLE_VALUE) thread safe.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: af35aada9b078f8dc71dcc85e505da8eee4571da URL: http://source.winehq.org/git/wine.git/?a=commit;h=af35aada9b078f8dc71dcc85e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 5 17:34:03 2017 +0200 ntdll: Make RtlDeregisterWaitEx(handle, INVALID_HANDLE_VALUE) thread safe. Chromium signals the wait semaphore and calls DeregisterWaitEx with CompletionHandle = INVALID_HANDLE_VALUE in close succession. Sometimes the worker thread decides to run the callback, but before it sets CallbackInProgress RtlDeregisterWaitEx decides that the callback is not running and returns STATUS_SUCCESS. Chromium then releases resources that the callback needs to run, resulting in random crashes. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 59 +++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 6063d51..1b0546a 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -541,11 +541,13 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) break; } - completion_event = wait_work_item->CompletionEvent; - if (completion_event) NtSetEvent( completion_event, NULL ); if (interlocked_inc( &wait_work_item->DeleteCount ) == 2 ) + { + completion_event = wait_work_item->CompletionEvent; delete_wait_work_item( wait_work_item ); + if (completion_event) NtSetEvent( completion_event, NULL ); + } return 0; } @@ -633,44 +635,47 @@ NTSTATUS WINAPI RtlRegisterWait(PHANDLE NewWaitObject, HANDLE Object, NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) { struct wait_work_item *wait_work_item = WaitHandle; - NTSTATUS status = STATUS_SUCCESS; + NTSTATUS status; + HANDLE LocalEvent = NULL; + BOOLEAN CallbackInProgress; - TRACE( "(%p)\n", WaitHandle ); + TRACE( "(%p %p)\n", WaitHandle, CompletionEvent ); if (WaitHandle == NULL) return STATUS_INVALID_HANDLE; - NtSetEvent( wait_work_item->CancelEvent, NULL ); - if (wait_work_item->CallbackInProgress) + CallbackInProgress = wait_work_item->CallbackInProgress; + if (CompletionEvent == INVALID_HANDLE_VALUE || !CallbackInProgress) { - if (CompletionEvent != NULL) - { - if (CompletionEvent == INVALID_HANDLE_VALUE) - { - status = NtCreateEvent( &CompletionEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); - if (status != STATUS_SUCCESS) - return status; - interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent ); - if (wait_work_item->CallbackInProgress) - NtWaitForSingleObject( CompletionEvent, FALSE, NULL ); - NtClose( CompletionEvent ); - } - else - { - interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent ); - if (wait_work_item->CallbackInProgress) - status = STATUS_PENDING; - } - } - else - status = STATUS_PENDING; + status = NtCreateEvent( &LocalEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); + if (status != STATUS_SUCCESS) + return status; + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, LocalEvent ); + } + else if (CompletionEvent != NULL) + { + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent ); } + NtSetEvent( wait_work_item->CancelEvent, NULL ); + if (interlocked_inc( &wait_work_item->DeleteCount ) == 2 ) { status = STATUS_SUCCESS; delete_wait_work_item( wait_work_item ); } + else if (LocalEvent) + { + NtWaitForSingleObject( LocalEvent, FALSE, NULL ); + status = STATUS_SUCCESS; + } + else + { + status = STATUS_PENDING; + } + + if (LocalEvent) + NtClose( LocalEvent ); return status; }

1 0

Hans Leidekker : webservices: Add support for multiple message descriptions in WsReceiveMessage.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: f9ae3097678814408a2f1988db1e00c4aac42d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ae3097678814408a2f1988d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:12 2017 +0200 webservices: Add support for multiple message descriptions in WsReceiveMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 29c8108..2b2415a 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1665,26 +1665,12 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M { struct channel *channel = (struct channel *)handle; HRESULT hr; + ULONG i; TRACE( "%p %p %p %u %08x %08x %p %p %u %p %p %p\n", handle, msg, desc, count, option, read_option, heap, value, size, index, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); - if (index) - { - FIXME( "index parameter not supported\n" ); - return E_NOTIMPL; - } - if (count != 1) - { - FIXME( "no support for multiple descriptions\n" ); - return E_NOTIMPL; - } - if (option != WS_RECEIVE_REQUIRED_MESSAGE) - { - FIXME( "receive option %08x not supported\n", option ); - return E_NOTIMPL; - } if (!channel || !msg || !desc || !count) return E_INVALIDARG; @@ -1696,8 +1682,22 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M return E_INVALIDARG; } - if ((hr = receive_message( channel )) != S_OK) goto done; - hr = read_message( msg, channel->reader, desc[0]->bodyElementDescription, read_option, heap, value, size ); + if (!channel->read_size) hr = receive_message( channel ); + else if (option == WS_RECEIVE_OPTIONAL_MESSAGE) hr = WS_S_END; + else hr = WS_E_INVALID_FORMAT; + + if (hr != S_OK) goto done; + + for (i = 0; i < count; i++) + { + if ((hr = read_message( msg, channel->reader, desc[i]->bodyElementDescription, read_option, heap, + value, size )) == S_OK) + { + if (index) *index = i; + break; + } + if ((hr = init_reader( channel )) != S_OK) break; + } done: LeaveCriticalSection( &channel->cs );

1 0

Hans Leidekker : webservices: Build a session dictionary for strings not present in the static dictionary.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: e5704b4e1d4280899bce3b714a0729be9b13db81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5704b4e1d4280899bce3b714… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:11 2017 +0200 webservices: Build a session dictionary for strings not present in the static dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 1300da8..29c8108 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1055,6 +1055,22 @@ HRESULT channel_send_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) return hr; } +static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *found, ULONG *id, WS_ERROR *error ) +{ + struct dictionary *dict = state; + HRESULT hr = S_OK; + int index; + + if ((index = find_string( dict, str->bytes, str->length, id )) == -1 || + (hr = insert_string( dict, str->bytes, str->length, index, id )) == S_OK) + { + *found = TRUE; + return S_OK; + } + *found = FALSE; + return hr; +} + static HRESULT init_writer( struct channel *channel ) { WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; @@ -1073,8 +1089,13 @@ static HRESULT init_writer( struct channel *channel ) break; case WS_ENCODING_XML_BINARY_SESSION_1: - bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; - /* fall through */ + if ((hr = writer_enable_lookup( channel->writer )) != S_OK) return hr; + clear_dict( &channel->dict ); + bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; + bin.dynamicStringCallback = dict_cb; + bin.dynamicStringCallbackState = &channel->dict; + encoding = &bin.encoding; + break; case WS_ENCODING_XML_BINARY_1: encoding = &bin.encoding;

1 0

Matteo Bruni : wined3d: Don' t take the upload path for blits to formats requiring conversion.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: a55d384264fae9741ed3eb901bafe6ff19c75a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55d384264fae9741ed3eb901… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 6 01:39:19 2017 +0200 wined3d: Don't take the upload path for blits to formats requiring conversion. 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/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 11438c4..608447f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3716,6 +3716,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst TRACE("Not doing upload because of scaling.\n"); else if (convert) TRACE("Not doing upload because of format conversion.\n"); + else if (dst_texture->resource.format->convert) + TRACE("Not doing upload because the destination format needs conversion.\n"); else { POINT dst_point = {dst_rect->left, dst_rect->top};

1 0

Matteo Bruni : wined3d: Return the up-to-date locations from blitters.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

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