wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Alex Henrie : msvcrt: Note that __stdio_common functions are for ucrtbase.
by Alexandre Julliard 07 Sep '17

07 Sep '17

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

Nikolay Sivov : dwrite: Fix 8bpp bitmap copy.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: 899c6229340c1ec06e704fb03903e2c1d5d84549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899c6229340c1ec06e704fb03… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 7 04:15:28 2017 +0300 dwrite: Fix 8bpp bitmap copy. Spotted by Matteo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 2e1811b..ac1fc32 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -282,7 +282,7 @@ static void blit_8(struct dib_data *dib, const BYTE *src, const RECT *rect, DWOR for (y = rect->top; y < rect->bottom; y++) { for (x = 0; x < src_width; x++) { - if (src[x]) continue; + if (!src[x]) continue; if (src[x] == DWRITE_ALPHA_MAX) dst_ptr[x] = text_pixel; else

1 0

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

07 Sep '17

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

1 0

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

06 Sep '17

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

1 0

Alistair Leslie-Hughes : include: Add interfaces IMFMediaTypeHandler, IMFStreamDescriptor.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: a0989060190a6e875483b249586a3c0840757c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0989060190a6e875483b2495… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 6 07:38:49 2017 +0000 include: Add interfaces IMFMediaTypeHandler, IMFStreamDescriptor. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 3c33806..b0fadba 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -164,6 +164,54 @@ interface IMFSourceResolver : IUnknown [local] HRESULT CanceObjectCreation([in] IUnknown *cancel_cookie); } +[ + object, + uuid(e93dcf6c-4b07-4e1e-8123-aa16ed6eadf5) +] +interface IMFMediaTypeHandler : IUnknown +{ + [local] + HRESULT IsMediaTypeSupported([in] IMFMediaType *in_type, [out] IMFMediaType **out_type); + + [call_as(IsMediaTypeSupported)] + HRESULT RemoteIsMediaTypeSupported([in, size_is(size)] BYTE *data, [in] DWORD size, + [out, size_is(, *match_count)] BYTE **match, [out] DWORD *match_count); + + HRESULT GetMediaTypeCount([out] DWORD *count); + + [local] + HRESULT GetMediaTypeByIndex([in] DWORD index, [out] IMFMediaType **type); + + [call_as(GetMediaTypeByIndex)] + HRESULT RemoteGetMediaTypeByIndex([in] DWORD index, [out, size_is(, *count)] BYTE **data, + [out] DWORD *count); + + [local] + HRESULT SetCurrentMediaType([in] IMFMediaType *type); + + [call_as(SetCurrentMediaType)] + HRESULT RemoteSetCurrentMediaType([in, size_is(count)] BYTE *data, [in] DWORD count); + + [local] + HRESULT GetCurrentMediaType([out] IMFMediaType **type); + + [call_as(GetCurrentMediaType)] + HRESULT RemoteGetCurrentMediaType([out, size_is(, *count)] BYTE **data, [out] DWORD *count); + + HRESULT GetMajorType([out] GUID *type); +} + +[ + object, + uuid(56c03d9c-9dbb-45f5-ab4b-d80f47c05938) +] +interface IMFStreamDescriptor : IMFAttributes +{ + HRESULT GetStreamIdentifier([out] DWORD *identifier); + + HRESULT GetMediaTypeHandler([out] IMFMediaTypeHandler **handler); +} + cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);")

1 0

Alistair Leslie-Hughes : include: Added IMFMediaEventQueue interface.
by Alexandre Julliard 06 Sep '17

06 Sep '17

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 06 Sep '17

06 Sep '17

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

Hugh McMaster : reg/tests: Add basic tests for the export operation.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: 41236123bbcf0c3065fb528ebe82831357023fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=41236123bbcf0c3065fb528eb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Sep 6 12:31:41 2017 +0000 reg/tests: Add basic tests for the export operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8d103df..9d5eee9 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4223,6 +4223,48 @@ static void test_import_31(void) ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); } +static void test_export(void) +{ + LONG err; + DWORD r; + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + + run_reg_exe("reg export", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export /?", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg export \\remote-pc\\HKLM\\Wine file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_DYN_DATA file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKDD file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export file.reg HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg file2.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -4240,4 +4282,5 @@ START_TEST(reg) test_import_with_whitespace(); test_unicode_import_with_whitespace(); test_import_31(); + test_export(); }

1 0

Nikolay Sivov : dbgeng: Added DebugCreateEx() stub.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: 0d078dbc82208caef06273c51e46faabc5452828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d078dbc82208caef06273c51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 6 12:19:30 2017 +0300 dbgeng: Added DebugCreateEx() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 18 ++++++++++++++---- dlls/dbgeng/dbgeng.spec | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index b08be75..6ac9360 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -58,8 +58,8 @@ HRESULT WINAPI DebugExtensionInitialize(ULONG * pVersion, ULONG * pFlags) * Creating Debug Engine client object * * PARAMS -* InterfaceId [I] Interface Id of debugger client -* pInterface [O] Pointer to interface as requested via InterfaceId +* riid [I] Interface Id of debugger client +* obj [O] Pointer to interface as requested via riid * * RETURNS * Success: S_OK @@ -68,9 +68,9 @@ HRESULT WINAPI DebugExtensionInitialize(ULONG * pVersion, ULONG * pFlags) * BUGS * Unimplemented */ -HRESULT WINAPI DebugCreate(REFIID InterfaceId, PVOID * pInterface) +HRESULT WINAPI DebugCreate(REFIID riid, void **obj) { - FIXME("(%p,%p): stub\n", InterfaceId, pInterface); + FIXME("(%s, %p): stub\n", debugstr_guid(riid), obj); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -78,6 +78,16 @@ HRESULT WINAPI DebugCreate(REFIID InterfaceId, PVOID * pInterface) } /************************************************************ +* DebugCreateEx (DBGENG.@) +*/ +HRESULT WINAPI DebugCreateEx(REFIID riid, DWORD flags, void **obj) +{ + FIXME("(%s, %#x, %p): stub\n", debugstr_guid(riid), flags, obj); + + return E_NOTIMPL; +} + +/************************************************************ * DebugConnect (DBGENG.@) * * Creating Debug Engine client object and connecting it to remote host diff --git a/dlls/dbgeng/dbgeng.spec b/dlls/dbgeng/dbgeng.spec index f2f735c..14dbc33 100644 --- a/dlls/dbgeng/dbgeng.spec +++ b/dlls/dbgeng/dbgeng.spec @@ -2,5 +2,5 @@ @ stdcall DebugConnect(str ptr ptr) @ stub DebugConnectWide @ stdcall DebugCreate(ptr ptr) -@ stub DebugCreateEx +@ stdcall DebugCreateEx(ptr long ptr) @ stdcall DebugExtensionInitialize(ptr ptr)

1 0

Hans Leidekker : webservices: Include a RelatesTo header in reply messages.
by Alexandre Julliard 06 Sep '17

06 Sep '17

Module: wine Branch: master Commit: 2946dc71aaf1478d97c1427ef9da69ac4c80b4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2946dc71aaf1478d97c1427ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:14 2017 +0200 webservices: Include a RelatesTo header in reply messages. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 3 + dlls/webservices/msg.c | 161 ++++++++++++++++++++++++++------- dlls/webservices/webservices_private.h | 2 + 3 files changed, 131 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2946dc71aaf1478d97c14…

1 0

← Newer
1
...
37
38
39
40
41
42
43
44
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2017