August 2016 - Wine-Commits - list.winehq.org

Austin English : hal: Add WRITE_PORT_ULONG stub.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 80d396530adb92e32a14076f4a29ce3008ca334e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d396530adb92e32a14076f4… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 25 23:47:28 2016 -0500 hal: Add WRITE_PORT_ULONG stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e507e59bce09ff1041571defbba4d1e3d6bf5160) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hal/hal.c | 5 +++++ dlls/hal/hal.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 79bbfed..0b2e422 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -167,3 +167,8 @@ ULONG WINAPI READ_PORT_ULONG(ULONG *port) FIXME("(%p) stub!\n", port); return 0; } + +void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) +{ + FIXME("(%p %d) stub!\n", port, value); +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 071eba5..c21806c 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -88,5 +88,5 @@ @ stub WRITE_PORT_BUFFER_ULONG @ stub WRITE_PORT_BUFFER_USHORT @ stub WRITE_PORT_UCHAR -@ stub WRITE_PORT_ULONG +@ stdcall WRITE_PORT_ULONG(ptr long) @ stub WRITE_PORT_USHORT

1 0

Austin English : kernel32: Add FreeUserPhysicalPages stub.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: a0d5c547ede55d1dd7ccebdb8e539bc2ed4856d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d5c547ede55d1dd7ccebdb8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 28 05:41:38 2016 +0200 kernel32: Add FreeUserPhysicalPages stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b0ce049cbbfecf747ffab6815bccbd59a20a2130) Conflicts: dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/heap.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index eeed785..fffd0e4 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1491,3 +1491,11 @@ BOOL WINAPI AllocateUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PT SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI FreeUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PTR *userarray) +{ + FIXME("stub: %p %p %p\n", process, pages, userarray); + *pages = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d29c5cb..bcbc50ed 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -154,7 +154,7 @@ @ stdcall AllocConsole() @ stub -i386 AllocLSCallback @ stdcall -i386 -private AllocSLCallback(ptr ptr) krnl386.exe16.AllocSLCallback -@ stdcall AllocateUserPhysicalPages(ptr ptr ptr) +@ stdcall AllocateUserPhysicalPages(long ptr ptr) @ stdcall ApplicationRecoveryFinished(long) @ stdcall ApplicationRecoveryInProgress(ptr) @ stdcall AreFileApisANSI() @@ -535,7 +535,7 @@ @ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) ntdll.TpCallbackUnloadDllOnCompletion @ stdcall FreeResource(long) @ stdcall -i386 -private FreeSLCallback(long) krnl386.exe16.FreeSLCallback -@ stub FreeUserPhysicalPages +@ stdcall FreeUserPhysicalPages(long ptr ptr) @ stub FreeVirtualBuffer @ stdcall GenerateConsoleCtrlEvent(long long) @ stdcall -i386 -private Get16DLLAddress(long str) krnl386.exe16.Get16DLLAddress

1 0

Austin English : hal: Add READ_PORT_ULONG stub.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: ea13beda0c527b8329cc493f070be290237a7968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea13beda0c527b8329cc493f0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 22 19:35:00 2015 -0600 hal: Add READ_PORT_ULONG stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3e16c3343ad6cf3e0ab076343dd651f5bbc73750) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hal/hal.c | 6 ++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 96bc895..bca688e 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -155,3 +155,9 @@ KIRQL WINAPI KeGetCurrentIrql(VOID) FIXME( " stub!\n"); return 0; } + +ULONG WINAPI READ_PORT_ULONG(ULONG *port) +{ + FIXME("(%p) stub!\n", port); + return 0; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 3046c65..02f778c 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -82,7 +82,7 @@ @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT @ stub READ_PORT_UCHAR -@ stub READ_PORT_ULONG +@ stdcall READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG

1 0

Alexandre Julliard : Wine release 1.9.17
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: website Branch: master Commit: 40038f0295f3ecdc3823947b8cbe2f3c67485ec8 URL: http://source.winehq.org/git/website.git/?a=commit;h=40038f0295f3ecdc382394… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 19 22:19:14 2016 +0900 Wine release 1.9.17 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016081901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2016081901.xml b/news/en/2016081901.xml new file mode 100644 index 0000000..c4cc0bc --- /dev/null +++ b/news/en/2016081901.xml @@ -0,0 +1,17 @@ +<news> +<date>August 19, 2016</date> +<title>Wine 1.9.17 Released</title> +<body> + The Wine development release 1.9.17 is now available. + <a href="{$root}/announce/1.9.17">What's new</a> in this release: +<ul> + <li>Better exception handling on 64-bit.</li> + <li>Various improvements in joystick support.</li> + <li>Some more stream support in the C++ runtime.</li> + <li>Font embedding improvements.</li> + <li>More metafile support in GDI+.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.17.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Hadrien Boizard : api-ms-win-core-console-l2-1-0: Add stub dll.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: dab03054e00f7306893d8dcdda8ab28b4c079a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab03054e00f7306893d8dcdd… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Wed Aug 17 12:39:05 2016 +0200 api-ms-win-core-console-l2-1-0: Add stub dll. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-console-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-console-l2-1-0.spec | 38 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 43 insertions(+) diff --git a/configure b/configure index dccacb4..4e1a980 100755 --- a/configure +++ b/configure @@ -874,6 +874,7 @@ enable_amstream enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_console_l1_1_0 +enable_api_ms_win_core_console_l2_1_0 enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_0 @@ -17408,6 +17409,7 @@ wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 +wine_fn_config_dll api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-0 enable_api_ms_win_core_debug_l1_1_0 diff --git a/configure.ac b/configure.ac index 3a24aab..24e5190 100644 --- a/configure.ac +++ b/configure.ac @@ -2639,6 +2639,7 @@ WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-console-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-0) diff --git a/dlls/api-ms-win-core-console-l2-1-0/Makefile.in b/dlls/api-ms-win-core-console-l2-1-0/Makefile.in new file mode 100644 index 0000000..d7168aa --- /dev/null +++ b/dlls/api-ms-win-core-console-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-console-l2-1-0.dll diff --git a/dlls/api-ms-win-core-console-l2-1-0/api-ms-win-core-console-l2-1-0.spec b/dlls/api-ms-win-core-console-l2-1-0/api-ms-win-core-console-l2-1-0.spec new file mode 100644 index 0000000..73dfbe5 --- /dev/null +++ b/dlls/api-ms-win-core-console-l2-1-0/api-ms-win-core-console-l2-1-0.spec @@ -0,0 +1,38 @@ +@ stdcall AttachConsole(long) kernel32.AttachConsole +@ stdcall CreateConsoleScreenBuffer(long long ptr long ptr) kernel32.CreateConsoleScreenBuffer +@ stdcall FillConsoleOutputAttribute(long long long long ptr) kernel32.FillConsoleOutputAttribute +@ stdcall FillConsoleOutputCharacterA(long long long long ptr) kernel32.FillConsoleOutputCharacterA +@ stdcall FillConsoleOutputCharacterW(long long long long ptr) kernel32.FillConsoleOutputCharacterW +@ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer +@ stdcall FreeConsole() kernel32.FreeConsole +@ stdcall GenerateConsoleCtrlEvent(long long) kernel32.GenerateConsoleCtrlEvent +@ stdcall GetConsoleCursorInfo(long ptr) kernel32.GetConsoleCursorInfo +@ stdcall GetConsoleScreenBufferInfo(long ptr) kernel32.GetConsoleScreenBufferInfo +@ stdcall GetConsoleScreenBufferInfoEx(long ptr) kernel32.GetConsoleScreenBufferInfoEx +@ stdcall GetConsoleTitleW(ptr long) kernel32.GetConsoleTitleW +@ stdcall GetLargestConsoleWindowSize(long) kernel32.GetLargestConsoleWindowSize +@ stdcall PeekConsoleInputW(ptr ptr long ptr) kernel32.PeekConsoleInputW +@ stdcall ReadConsoleOutputA(long ptr long long ptr) kernel32.ReadConsoleOutputA +@ stdcall ReadConsoleOutputAttribute(long ptr long long ptr) kernel32.ReadConsoleOutputAttribute +@ stdcall ReadConsoleOutputCharacterA(long ptr long long ptr) kernel32.ReadConsoleOutputCharacterA +@ stdcall ReadConsoleOutputCharacterW(long ptr long long ptr) kernel32.ReadConsoleOutputCharacterW +@ stdcall ReadConsoleOutputW(long ptr long long ptr) kernel32.ReadConsoleOutputW +@ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) kernel32.ScrollConsoleScreenBufferA +@ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr) kernel32.ScrollConsoleScreenBufferW +@ stdcall SetConsoleActiveScreenBuffer(long) kernel32.SetConsoleActiveScreenBuffer +@ stdcall SetConsoleCP(long) kernel32.SetConsoleCP +@ stdcall SetConsoleCursorInfo(long ptr) kernel32.SetConsoleCursorInfo +@ stdcall SetConsoleCursorPosition(long long) kernel32.SetConsoleCursorPosition +@ stdcall SetConsoleOutputCP(long) kernel32.SetConsoleOutputCP +@ stdcall SetConsoleScreenBufferInfoEx(long ptr) kernel32.SetConsoleScreenBufferInfoEx +@ stdcall SetConsoleScreenBufferSize(long long) kernel32.SetConsoleScreenBufferSize +@ stdcall SetConsoleTextAttribute(long long) kernel32.SetConsoleTextAttribute +@ stdcall SetConsoleTitleW(wstr) kernel32.SetConsoleTitleW +@ stdcall SetConsoleWindowInfo(long long ptr) kernel32.SetConsoleWindowInfo +@ stdcall WriteConsoleInputA(long ptr long ptr) kernel32.WriteConsoleInputA +@ stdcall WriteConsoleInputW(long ptr long ptr) kernel32.WriteConsoleInputW +@ stdcall WriteConsoleOutputA(long ptr long long ptr) kernel32.WriteConsoleOutputA +@ stdcall WriteConsoleOutputAttribute(long ptr long long ptr) kernel32.WriteConsoleOutputAttribute +@ stdcall WriteConsoleOutputCharacterA(long ptr long long ptr) kernel32.WriteConsoleOutputCharacterA +@ stdcall WriteConsoleOutputCharacterW(long ptr long long ptr) kernel32.WriteConsoleOutputCharacterW +@ stdcall WriteConsoleOutputW(long ptr long long ptr) kernel32.WriteConsoleOutputW diff --git a/tools/make_specfiles b/tools/make_specfiles index a965210..d658f30 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -142,6 +142,7 @@ my @dll_groups = "api-ms-win-core-synch-l1-1-0", "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-console-l1-1-0", + "api-ms-win-core-console-l2-1-0", "api-ms-win-core-file-l1-1-0", "api-ms-win-core-file-l1-2-1", "api-ms-win-core-file-l1-2-0",

1 0

Keno Fischer : kernel32: Fix RegisterWaitForSingleObject for console handles.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: ccc1d346a6cd4f2d12b6ce1c2f6bdcd92f8a0bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc1d346a6cd4f2d12b6ce1c2… Author: Keno Fischer <keno(a)juliacomputing.com> Date: Tue Aug 16 14:35:27 2016 -0400 kernel32: Fix RegisterWaitForSingleObject for console handles. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 37 +++++++++++++++-------------- dlls/kernel32/tests/console.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index c10fd01..b8222db 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -148,6 +148,23 @@ DWORD WINAPI WaitForMultipleObjects( DWORD count, const HANDLE *handles, return WaitForMultipleObjectsEx( count, handles, wait_all, timeout, FALSE ); } +static HANDLE normalize_handle_if_console(HANDLE handle) +{ + if ((handle == (HANDLE)STD_INPUT_HANDLE) || + (handle == (HANDLE)STD_OUTPUT_HANDLE) || + (handle == (HANDLE)STD_ERROR_HANDLE)) + handle = GetStdHandle( HandleToULong(handle) ); + + /* yes, even screen buffer console handles are waitable, and are + * handled as a handle to the console itself !! + */ + if (is_console_handle(handle)) + { + if (VerifyConsoleIoHandle(handle)) + handle = GetConsoleInputWaitHandle(); + } + return handle; +} /*********************************************************************** * WaitForMultipleObjectsEx (KERNEL32.@) @@ -167,23 +184,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, return WAIT_FAILED; } for (i = 0; i < count; i++) - { - if ((handles[i] == (HANDLE)STD_INPUT_HANDLE) || - (handles[i] == (HANDLE)STD_OUTPUT_HANDLE) || - (handles[i] == (HANDLE)STD_ERROR_HANDLE)) - hloc[i] = GetStdHandle( HandleToULong(handles[i]) ); - else - hloc[i] = handles[i]; - - /* yes, even screen buffer console handles are waitable, and are - * handled as a handle to the console itself !! - */ - if (is_console_handle(hloc[i])) - { - if (VerifyConsoleIoHandle(hloc[i])) - hloc[i] = GetConsoleInputWaitHandle(); - } - } + hloc[i] = normalize_handle_if_console(handles[i]); status = NtWaitForMultipleObjects( count, hloc, !wait_all, alertable, get_nt_timeout( &time, timeout ) ); @@ -209,6 +210,7 @@ BOOL WINAPI RegisterWaitForSingleObject(PHANDLE phNewWaitObject, HANDLE hObject, TRACE("%p %p %p %p %d %d\n", phNewWaitObject,hObject,Callback,Context,dwMilliseconds,dwFlags); + hObject = normalize_handle_if_console(hObject); status = RtlRegisterWait( phNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); if (status != STATUS_SUCCESS) { @@ -231,6 +233,7 @@ HANDLE WINAPI RegisterWaitForSingleObjectEx( HANDLE hObject, TRACE("%p %p %p %d %d\n", hObject,Callback,Context,dwMilliseconds,dwFlags); + hObject = normalize_handle_if_console(hObject); status = RtlRegisterWait( &hNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); if (status != STATUS_SUCCESS) { diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 24f15d4..c88db6a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -908,6 +908,58 @@ static void testScreenBuffer(HANDLE hConOut) SetConsoleOutputCP(oldcp); } +static void CALLBACK signaled_function(void *p, BOOLEAN timeout) +{ + HANDLE event = p; + SetEvent(event); + ok(!timeout, "wait shouldn't have timed out\n"); +} + +static void testWaitForConsoleInput(HANDLE input_handle) +{ + HANDLE wait_handle; + HANDLE complete_event; + INPUT_RECORD record; + DWORD events_written; + DWORD wait_ret; + BOOL ret; + + complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + /* Test success case */ + ret = RegisterWaitForSingleObject(&wait_handle, input_handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); + ok(ret == TRUE, "Expected RegisterWaitForSingleObject to return TRUE, got %d\n", ret); + /* give worker thread a chance to start up */ + Sleep(100); + record.EventType = KEY_EVENT; + record.Event.KeyEvent.bKeyDown = 1; + record.Event.KeyEvent.wRepeatCount = 1; + record.Event.KeyEvent.wVirtualKeyCode = VK_RETURN; + record.Event.KeyEvent.wVirtualScanCode = VK_RETURN; + record.Event.KeyEvent.uChar.UnicodeChar = '\r'; + record.Event.KeyEvent.dwControlKeyState = 0; + ret = WriteConsoleInputW(input_handle, &record, 1, &events_written); + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); + wait_ret = WaitForSingleObject(complete_event, INFINITE); + ok(wait_ret == WAIT_OBJECT_0, "Expected the handle to be signaled\n"); + ret = UnregisterWait(wait_handle); + /* If the callback is still running, this fails with ERROR_IO_PENDING, but + that's ok and expected. */ + ok(ret != 0 || GetLastError() == ERROR_IO_PENDING, + "UnregisterWait failed with error %d\n", GetLastError()); + + /* Test timeout case */ + FlushConsoleInputBuffer(input_handle); + ret = RegisterWaitForSingleObject(&wait_handle, input_handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); + wait_ret = WaitForSingleObject(complete_event, 100); + ok(wait_ret == WAIT_TIMEOUT, "Expected the wait to time out\n"); + ret = UnregisterWait(wait_handle); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + /* Clean up */ + ok(CloseHandle(complete_event), "Failed to close event handle, last error %d\n", GetLastError()); +} + static void test_GetSetConsoleInputExeName(void) { BOOL ret; @@ -3093,6 +3145,8 @@ START_TEST(console) testScroll(hConOut, sbi.dwSize); /* will test sb creation / modification / codepage handling */ testScreenBuffer(hConOut); + /* Test waiting for a console handle */ + testWaitForConsoleInput(hConIn); /* clear duplicated console font table */ CloseHandle(hConIn);

1 0

Austin English : ntdll: Add NtResumeProcess stub.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: 08f04c5a6e67dd83850a6b5d3c258842defd9b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f04c5a6e67dd83850a6b5d3… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 19 03:17:16 2016 -0500 ntdll: Add NtResumeProcess stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/process.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7a3edfa..5f8ee54 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -311,7 +311,7 @@ @ stdcall NtResetEvent(long ptr) @ stdcall NtResetWriteWatch(long ptr long) @ stdcall NtRestoreKey(long long long) -# @ stub NtResumeProcess +@ stdcall NtResumeProcess(long) @ stdcall NtResumeThread(long long) @ stdcall NtSaveKey(long long) # @ stub NtSaveKeyEx @@ -1236,7 +1236,7 @@ @ stdcall ZwResetEvent(long ptr) NtResetEvent @ stdcall ZwResetWriteWatch(long ptr long) NtResetWriteWatch @ stdcall ZwRestoreKey(long long long) NtRestoreKey -# @ stub ZwResumeProcess +@ stdcall ZwResumeProcess(long) NtResumeProcess @ stdcall ZwResumeThread(long long) NtResumeThread @ stdcall ZwSaveKey(long long) NtSaveKey # @ stub ZwSaveKeyEx diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 54f8168..adff826 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -644,6 +644,16 @@ NTSTATUS WINAPI NtOpenProcess(PHANDLE handle, ACCESS_MASK access, } /****************************************************************************** + * NtResumeProcess + * ZwResumeProcess + */ +NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) +{ + FIXME("stub: %p\n", handle); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** * NtSuspendProcess * ZwSuspendProcess */

1 0

Alistair Leslie-Hughes : d3d11: Support D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS in ID3D11Device CheckFeatureSupport.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: eedd9671c1bacd50f669711c3b97956e2c673e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedd9671c1bacd50f669711c3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 17 12:21:07 2016 +0000 d3d11: Support D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS in ID3D11Device CheckFeatureSupport. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++++++++++ dlls/d3d11/tests/d3d11.c | 18 ++++++++++++++++++ include/d3d11.idl | 5 +++++ 3 files changed, 35 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 187b3f0..9a42c8b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2784,6 +2784,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * threading_data->DriverCommandLists = FALSE; return S_OK; } + case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS: + { + D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + options->ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x = FALSE; + return S_OK; + } default: FIXME("Unhandled feature %#x.\n", feature); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 25ecad4..115600b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9190,6 +9190,7 @@ static void test_null_sampler(void) static void test_check_feature_support(void) { D3D11_FEATURE_DATA_THREADING threading[2]; + D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS hwopts; ID3D11Device *device; ULONG refcount; HRESULT hr; @@ -9231,6 +9232,23 @@ static void test_check_feature_support(void) ok(threading->DriverCommandLists == TRUE || threading->DriverCommandLists == FALSE, "Got unexpected command lists %#x.\n", threading->DriverCommandLists); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, NULL, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts) / 2); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts) * 2); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + trace("Shader support %#x.\n", hwopts.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } diff --git a/include/d3d11.idl b/include/d3d11.idl index cd177c2..767321b 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -445,6 +445,11 @@ typedef struct D3D11_FEATURE_DATA_THREADING BOOL DriverCommandLists; } D3D11_FEATURE_DATA_THREADING; +typedef struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS +{ + BOOL ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x; +} D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS; + typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS { BOOL OutputMergerLogicOp;

1 0

Alexandre Julliard : Release 1.9.17.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: a83d5d3b83042d2305de0595c0d03e4e7bf1e29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83d5d3b83042d2305de0595c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 19 22:17:09 2016 +0900 Release 1.9.17. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 857 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 7 + VERSION | 2 +- configure | 18 +- 4 files changed, 450 insertions(+), 434 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a83d5d3b83042d2305de0…

1 0

Sebastian Lackner : services: Allocate a separate status_changed_event for each service.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: 039471ec376b9c45d65811b222a18027bfc773fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=039471ec376b9c45d65811b22… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 19 08:01:03 2016 +0200 services: Allocate a separate status_changed_event for each service. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 20 ++++++++++---------- programs/services/services.c | 42 ++++++++++++++++++++---------------------- programs/services/services.h | 2 +- 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 4c6301c..688e4a0 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -758,21 +758,21 @@ DWORD __cdecl svcctl_SetServiceStatus( return err; service_lock(service->service_entry); + /* FIXME: be a bit more discriminant about what parts of the status we set * and check that fields are valid */ service->service_entry->status = *lpServiceStatus; - if ((process = service->service_entry->process)) + SetEvent(service->service_entry->status_changed_event); + + if ((process = service->service_entry->process) && + lpServiceStatus->dwCurrentState == SERVICE_STOPPED) { - if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) - { - service->service_entry->process = NULL; - if (!--process->use_count) - terminate_after_timeout(process, service_kill_timeout); - release_process(process); - } - else - SetEvent(process->status_changed_event); + service->service_entry->process = NULL; + if (!--process->use_count) + terminate_after_timeout(process, service_kill_timeout); + release_process(process); } + service_unlock(service->service_entry); return ERROR_SUCCESS; diff --git a/programs/services/services.c b/programs/services/services.c index 6164c45..cf5cb90 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -82,9 +82,6 @@ static DWORD process_create(const WCHAR *name, struct process_entry **entry) (*entry)->overlapped_event = CreateEventW(NULL, TRUE, FALSE, NULL); if (!(*entry)->overlapped_event) goto error; - (*entry)->status_changed_event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!(*entry)->status_changed_event) - goto error; (*entry)->control_pipe = CreateNamedPipeW(name, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE|PIPE_WAIT, 1, 256, 256, 10000, NULL); if ((*entry)->control_pipe == INVALID_HANDLE_VALUE) @@ -98,8 +95,6 @@ error: CloseHandle((*entry)->control_mutex); if ((*entry)->overlapped_event) CloseHandle((*entry)->overlapped_event); - if ((*entry)->status_changed_event) - CloseHandle((*entry)->status_changed_event); HeapFree(GetProcessHeap(), 0, *entry); return err; } @@ -110,7 +105,6 @@ static void free_process_entry(struct process_entry *entry) CloseHandle(entry->control_mutex); CloseHandle(entry->control_pipe); CloseHandle(entry->overlapped_event); - CloseHandle(entry->status_changed_event); HeapFree(GetProcessHeap(), 0, entry); } @@ -125,6 +119,13 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) HeapFree(GetProcessHeap(), 0, *entry); return ERROR_NOT_ENOUGH_SERVER_MEMORY; } + (*entry)->status_changed_event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!(*entry)->status_changed_event) + { + HeapFree(GetProcessHeap(), 0, (*entry)->name); + HeapFree(GetProcessHeap(), 0, *entry); + return GetLastError(); + } (*entry)->ref_count = 1; (*entry)->status.dwCurrentState = SERVICE_STOPPED; (*entry)->status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; @@ -135,6 +136,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) void free_service_entry(struct service_entry *entry) { + CloseHandle(entry->status_changed_event); HeapFree(GetProcessHeap(), 0, entry->name); HeapFree(GetProcessHeap(), 0, entry->config.lpBinaryPathName); HeapFree(GetProcessHeap(), 0, entry->config.lpDependencies); @@ -790,6 +792,9 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p } service_entry->status.dwCurrentState = SERVICE_START_PENDING; + service_entry->status.dwControlsAccepted = 0; + ResetEvent(service_entry->status_changed_event); + scmdatabase_add_process(service_entry->db, process); service_entry->process = grab_process(process); process->use_count++; @@ -814,24 +819,20 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p return ERROR_SUCCESS; } -static DWORD process_wait_for_startup(struct process_entry *process) +static DWORD service_wait_for_startup(struct service_entry *service, struct process_entry *process) { - HANDLE handles[2] = { process->status_changed_event, process->process }; - DWORD ret; + HANDLE handles[2] = { service->status_changed_event, process->process }; + DWORD result; - ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); - return (ret == WAIT_OBJECT_0) ? ERROR_SUCCESS : ERROR_SERVICE_REQUEST_TIMEOUT; -} - -static DWORD service_is_running(struct service_entry *service) -{ - DWORD state; + result = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); + if (result != WAIT_OBJECT_0) + return ERROR_SERVICE_REQUEST_TIMEOUT; service_lock(service); - state = service->status.dwCurrentState; + result = service->status.dwCurrentState; service_unlock(service); - return (state == SERVICE_START_PENDING || state == SERVICE_RUNNING) ? + return (result == SERVICE_START_PENDING || result == SERVICE_RUNNING) ? ERROR_SUCCESS : ERROR_SERVICE_REQUEST_TIMEOUT; } @@ -911,10 +912,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * err = process_send_start_message(process, service->name, service_argv, service_argc); if (err == ERROR_SUCCESS) - err = process_wait_for_startup(process); - - if (err == ERROR_SUCCESS) - err = service_is_running(service); + err = service_wait_for_startup(service, process); if (err == ERROR_SUCCESS) ReleaseMutex(process->control_mutex); diff --git a/programs/services/services.h b/programs/services/services.h index 417efcd..b03a157 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -43,7 +43,6 @@ struct process_entry HANDLE control_mutex; HANDLE control_pipe; HANDLE overlapped_event; - HANDLE status_changed_event; }; struct service_entry @@ -53,6 +52,7 @@ struct service_entry LONG ref_count; /* number of references - if goes to zero and the service is deleted the structure will be freed */ LPWSTR name; SERVICE_STATUS status; + HANDLE status_changed_event; QUERY_SERVICE_CONFIGW config; DWORD preshutdown_timeout; LPWSTR description;

1 0