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

Austin English : hal: Add READ_PORT_UCHAR stub.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: f3c399fb70513b287b041608462119af5c82eb52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c399fb70513b287b0416084… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 25 23:47:05 2016 -0500 hal: Add READ_PORT_UCHAR stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d830f508834c2d55c0a58a2340f9585863425193) 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 bca688e..79bbfed 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -156,6 +156,12 @@ KIRQL WINAPI KeGetCurrentIrql(VOID) return 0; } +UCHAR WINAPI READ_PORT_UCHAR(UCHAR *port) +{ + FIXME("(%p) stub!\n", port); + return 0; +} + ULONG WINAPI READ_PORT_ULONG(ULONG *port) { FIXME("(%p) stub!\n", port); diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 02f778c..071eba5 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -81,7 +81,7 @@ @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT -@ stub READ_PORT_UCHAR +@ stdcall READ_PORT_UCHAR(ptr) @ stdcall READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR

1 0

Austin English : hal: Add WRITE_PORT_ULONG stub.
by Alexandre Julliard 22 Aug '16

22 Aug '16

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 : hal: Add READ_PORT_ULONG stub.
by Alexandre Julliard 22 Aug '16

22 Aug '16

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 19 Aug '16

19 Aug '16

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 19 Aug '16

19 Aug '16

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

Daniel Lehman : kernel32: Add GetNumberFormatEx.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: e9e538abff06116165a12851f49dce0dbb2cdc72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e538abff06116165a12851f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 15 10:54:20 2016 -0700 kernel32: Add GetNumberFormatEx. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 19 +++++ dlls/kernel32/tests/locale.c | 185 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 206 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e538abff06116165a12…

1 0

Austin English : wlanapi: Add WlanCloseHandle() stub.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: 4227eb417dd0fabb7a1d6000a49a234b05e37be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4227eb417dd0fabb7a1d6000a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 19 02:14:19 2016 -0500 wlanapi: Add WlanCloseHandle() stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 6 ++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/wlanapi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 3674f79..c9fbae0 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -34,6 +34,12 @@ DWORD WINAPI WlanEnumInterfaces(HANDLE client, void *reserved, WLAN_INTERFACE_IN return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanCloseHandle(HANDLE client_handle, VOID *reserved) +{ + FIXME("(%p, %p) stub\n", client_handle, reserved); + return ERROR_CALL_NOT_IMPLEMENTED; +} + DWORD WINAPI WlanOpenHandle(DWORD clientVersion, PVOID reserved, PDWORD negotiatedVersion, PHANDLE clientHandle) { diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index e55bf06..59454f4 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -1,5 +1,5 @@ @ stub WlanAllocateMemory -@ stub WlanCloseHandle +@ stdcall WlanCloseHandle(ptr ptr) @ stub WlanConnect @ stub WlanDeleteProfile @ stub WlanDisconnect diff --git a/include/wlanapi.h b/include/wlanapi.h index 63922be..73b4583 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -45,6 +45,7 @@ typedef struct _WLAN_INTERFACE_INFO_LIST WLAN_INTERFACE_INFO InterfaceInfo[1]; } WLAN_INTERFACE_INFO_LIST, *PWLAN_INTERFACE_INFO_LIST; +DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Austin English : ntdll: Add NtResumeProcess stub.
by Alexandre Julliard 19 Aug '16

19 Aug '16

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 19 Aug '16

19 Aug '16

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

Aaryaman Vasishta : d3drm: Implement IDirect3DRMViewport*::Clear.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: 7297d4a863bd5a0d9a57f254f84f3c01e236ba47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7297d4a863bd5a0d9a57f254f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Aug 18 00:16:41 2016 +0530 d3drm: Implement IDirect3DRMViewport*::Clear. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 672 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/viewport.c | 79 ++++-- 2 files changed, 734 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7297d4a863bd5a0d9a57f…

1 0