February 2018 - Wine-Commits

Matteo Bruni : wined3d: Get rid of legacy mipmap autogeneration support.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 9a13d48e4eddff7708506e72ee3c737131b6a507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a13d48e4eddff7708506e72… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:44 2018 +0100 wined3d: Get rid of legacy mipmap autogeneration support. 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/d3d11/device.c | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/wined3d/directx.c | 13 ++++----- dlls/wined3d/resource.c | 1 - dlls/wined3d/texture.c | 62 ------------------------------------------ dlls/wined3d/utils.c | 4 +-- dlls/wined3d/wined3d.spec | 2 -- dlls/wined3d/wined3d_gl.h | 2 -- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 13 ++++----- 10 files changed, 14 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a13d48e4eddff770850…

1 0

Nikolay Sivov : comctl32/button: Fix paint handler check when theming is on.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 389c3add0ad93f3b2180c636363b25f6c78757a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=389c3add0ad93f3b2180c636… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 14:05:15 2018 +0300 comctl32/button: Fix paint handler check when theming is on. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7184d19..6458ba1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -393,7 +393,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L theme = GetWindowTheme( hWnd ); hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); - if (theme && btnPaintFunc[btn_type]) + if (theme && btnThemedPaintFunc[btn_type]) { ButtonState drawState; UINT dtflags;

1 0

Matteo Bruni : d3d9: Handle D3DUSAGE_AUTOGENMIPMAP textures entirely in d3d9.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 3d6eb8cf1dc1e509a74f85fd2356c6946372ecc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d6eb8cf1dc1e509a74f85fd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:42 2018 +0100 d3d9: Handle D3DUSAGE_AUTOGENMIPMAP textures entirely in d3d9. 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/d3d9/d3d9_private.h | 25 ++++- dlls/d3d9/device.c | 75 +++++++++++++ dlls/d3d9/surface.c | 4 + dlls/d3d9/tests/device.c | 5 +- dlls/d3d9/texture.c | 270 ++++++++++++++++++++++++++++++++++++----------- 5 files changed, 313 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d6eb8cf1dc1e509a74f…

1 0

Józef Kucia : d3d12: Add dll.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 8d6f7ed292f051f541b8a53df2fd07477f41a082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d6f7ed292f051f541b8a53d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:52 2018 +0100 d3d12: Add dll. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/d3d12/Makefile.in | 5 +++++ dlls/d3d12/d3d12.spec | 8 ++++++++ dlls/d3d12/d3d12_main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+) diff --git a/configure b/configure index 57577da..126de30 100755 --- a/configure +++ b/configure @@ -1128,6 +1128,7 @@ enable_d3d10 enable_d3d10_1 enable_d3d10core enable_d3d11 +enable_d3d12 enable_d3d8 enable_d3d9 enable_d3dcompiler_33 @@ -18588,6 +18589,7 @@ wine_fn_config_dll d3d10core enable_d3d10core implib wine_fn_config_test dlls/d3d10core/tests d3d10core_test wine_fn_config_dll d3d11 enable_d3d11 implib wine_fn_config_test dlls/d3d11/tests d3d11_test +wine_fn_config_dll d3d12 enable_d3d12 implib wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 58ce104..92c8952 100644 --- a/configure.ac +++ b/configure.ac @@ -3068,6 +3068,7 @@ WINE_CONFIG_DLL(d3d10core,,[implib]) WINE_CONFIG_TEST(dlls/d3d10core/tests) WINE_CONFIG_DLL(d3d11,,[implib]) WINE_CONFIG_TEST(dlls/d3d11/tests) +WINE_CONFIG_DLL(d3d12,,[implib]) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in new file mode 100644 index 0000000..d7ee1b5 --- /dev/null +++ b/dlls/d3d12/Makefile.in @@ -0,0 +1,5 @@ +MODULE = d3d12.dll +IMPORTLIB = d3d12 + +C_SRCS = \ + d3d12_main.c diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec new file mode 100644 index 0000000..613092b --- /dev/null +++ b/dlls/d3d12/d3d12.spec @@ -0,0 +1,8 @@ +100 stub GetBehaviorValue +101 stdcall D3D12CreateDevice(ptr long ptr ptr) +102 stdcall D3D12GetDebugInterface(ptr ptr) +103 stub D3D12CoreCreateLayeredDevice +104 stub D3D12CoreGetLayeredDeviceSize +105 stub D3D12CoreRegisterLayers +106 stub D3D12CreateRootSignatureDeserializer +107 stub D3D12SerializeRootSignature diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c new file mode 100644 index 0000000..c1598ca --- /dev/null +++ b/dlls/d3d12/d3d12_main.c @@ -0,0 +1,42 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "wine/debug.h" +#include "d3d12.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d12); + +HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) +{ + FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, + REFIID iid, void **device) +{ + FIXME("adapter %p, minimum_feature_level %#x, iid %s, device %p stub!\n", + adapter, minimum_feature_level, debugstr_guid(iid), device); + + return E_NOTIMPL; +}

1 0

Józef Kucia : d3d12/tests: Add test for COM interfaces.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: d626aac6c0536517e14ba159ca2f27dfaccc9990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d626aac6c0536517e14ba159… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:53 2018 +0100 d3d12/tests: Add test for COM interfaces. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3d12/tests/Makefile.in | 5 ++ dlls/d3d12/tests/d3d12.c | 107 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+) diff --git a/configure b/configure index 126de30..06551fa 100755 --- a/configure +++ b/configure @@ -18590,6 +18590,7 @@ wine_fn_config_test dlls/d3d10core/tests d3d10core_test wine_fn_config_dll d3d11 enable_d3d11 implib wine_fn_config_test dlls/d3d11/tests d3d11_test wine_fn_config_dll d3d12 enable_d3d12 implib +wine_fn_config_test dlls/d3d12/tests d3d12_test wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 92c8952..925def2 100644 --- a/configure.ac +++ b/configure.ac @@ -3069,6 +3069,7 @@ WINE_CONFIG_TEST(dlls/d3d10core/tests) WINE_CONFIG_DLL(d3d11,,[implib]) WINE_CONFIG_TEST(dlls/d3d11/tests) WINE_CONFIG_DLL(d3d12,,[implib]) +WINE_CONFIG_TEST(dlls/d3d12/tests) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d12/tests/Makefile.in b/dlls/d3d12/tests/Makefile.in new file mode 100644 index 0000000..d055aba --- /dev/null +++ b/dlls/d3d12/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = d3d12.dll +IMPORTS = d3d12 + +C_SRCS = \ + d3d12.c diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c new file mode 100644 index 0000000..cc37a86 --- /dev/null +++ b/dlls/d3d12/tests/d3d12.c @@ -0,0 +1,107 @@ +/* + * Copyright 2017 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdlib.h> +#define COBJMACROS +#include "initguid.h" +#include "d3d12.h" +#include "dxgi1_6.h" +#include "wine/test.h" + +static ID3D12Device *create_device(void) +{ + ID3D12Device *device; + + if (FAILED(D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) + return NULL; + + return device; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + D3D12_COMMAND_QUEUE_DESC desc; + ID3D12CommandQueue *queue; + ID3D12Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + check_interface(device, &IID_ID3D12Object, TRUE); + check_interface(device, &IID_ID3D12DeviceChild, FALSE); + check_interface(device, &IID_ID3D12Pageable, FALSE); + check_interface(device, &IID_ID3D12Device, TRUE); + + check_interface(device, &IID_IDXGIObject, FALSE); + check_interface(device, &IID_IDXGIDeviceSubObject, FALSE); + check_interface(device, &IID_IDXGIDevice, FALSE); + check_interface(device, &IID_IDXGIDevice1, FALSE); + check_interface(device, &IID_IDXGIDevice2, FALSE); + check_interface(device, &IID_IDXGIDevice3, FALSE); + check_interface(device, &IID_IDXGIDevice4, FALSE); + + desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&queue); + ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + + check_interface(queue, &IID_ID3D12Object, TRUE); + check_interface(queue, &IID_ID3D12DeviceChild, TRUE); + check_interface(queue, &IID_ID3D12Pageable, TRUE); + check_interface(queue, &IID_ID3D12CommandQueue, TRUE); + + check_interface(queue, &IID_IDXGIObject, FALSE); + check_interface(queue, &IID_IDXGIDeviceSubObject, FALSE); + check_interface(queue, &IID_IDXGIDevice, FALSE); + check_interface(queue, &IID_IDXGIDevice1, FALSE); + check_interface(queue, &IID_IDXGIDevice2, FALSE); + check_interface(queue, &IID_IDXGIDevice3, FALSE); + check_interface(queue, &IID_IDXGIDevice4, FALSE); + + refcount = ID3D12CommandQueue_Release(queue); + ok(!refcount, "Command queue has %u references left.\n", refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +START_TEST(d3d12) +{ + test_interfaces(); +}

1 0

Michael Müller : imm32: Add stub for ImmDisableLegacyIME.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 478c8b0eb1d51c52edd2f7b12aac1aa3853e1a43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=478c8b0eb1d51c52edd2f7b1… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 14 04:35:04 2018 +0000 imm32: Add stub for ImmDisableLegacyIME. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 9 +++++++++ dlls/imm32/imm32.spec | 1 + include/imm.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3f8ad18..377a277 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3145,3 +3145,12 @@ BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); return FALSE; } + +/*********************************************************************** + * IMMDisableLegacyIME(IMM32.@) + */ +BOOL WINAPI ImmDisableLegacyIME(void) +{ + FIXME("stub\n"); + return TRUE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 2be5d92..4197bb8 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -11,6 +11,7 @@ @ stdcall ImmDestroySoftKeyboard(long) @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME +@ stdcall ImmDisableLegacyIME() @ stdcall ImmDisableTextFrameService(long) @ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) diff --git a/include/imm.h b/include/imm.h index aa2fa1d..500aea9 100644 --- a/include/imm.h +++ b/include/imm.h @@ -493,6 +493,7 @@ BOOL WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID); HIMC WINAPI ImmCreateContext(void); BOOL WINAPI ImmDestroyContext(HIMC hIMC); BOOL WINAPI ImmDisableIME(DWORD idThread); +BOOL WINAPI ImmDisableLegacyIME(void); BOOL WINAPI ImmEnumInputContext(DWORD, IMCENUMPROC, LPARAM); UINT WINAPI ImmEnumRegisterWordA(HKL, REGISTERWORDENUMPROCA, LPCSTR, DWORD, LPCSTR, LPVOID); UINT WINAPI ImmEnumRegisterWordW(HKL, REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID);

1 0

Józef Kucia : include: Add d3d12.idl.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 6d202658f23e0150ba4c5433cac8ebfeeed84ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d202658f23e0150ba4c5433… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:50 2018 +0100 include: Add d3d12.idl. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3d12.idl | 2177 +++++++++++++++++++++++++++++++++++++++++++++++++ include/d3dcommon.idl | 4 +- 3 files changed, 2181 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d202658f23e0150ba4c…

1 0

Józef Kucia : dxgi: Use assignment instead of memcpy( ).
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: d4daa14802b73705baf7919fe6c0d2cbfe8213c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4daa14802b73705baf7919f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:54 2018 +0100 dxgi: Use assignment instead of memcpy(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 7116f3f..b7d7a0a 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -184,7 +184,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, desc->DedicatedVideoMemory = adapter_id.video_memory; desc->DedicatedSystemMemory = 0; /* FIXME */ desc->SharedSystemMemory = 0; /* FIXME */ - memcpy(&desc->AdapterLuid, &adapter_id.adapter_luid, sizeof(desc->AdapterLuid)); + desc->AdapterLuid = adapter_id.adapter_luid; desc->Flags = 0; return hr;

1 0

Hans Leidekker : secur32: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: f0db56775e4231821404b416428b3865c24bd0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0db56775e4231821404b416… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 14 14:13:09 2018 +0100 secur32: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/dispatcher.c | 15 +- dlls/secur32/lsa.c | 50 ++--- dlls/secur32/negotiate.c | 48 ++--- dlls/secur32/ntlm.c | 460 +++++++++++++++++------------------------ dlls/secur32/schannel.c | 55 +++-- dlls/secur32/schannel_macosx.c | 6 +- dlls/secur32/secur32.c | 43 ++-- dlls/secur32/secur32_priv.h | 1 + dlls/secur32/thunks.c | 16 +- dlls/secur32/util.c | 12 +- dlls/secur32/wrapper.c | 10 +- 11 files changed, 311 insertions(+), 405 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0db56775e4231821404…

1 0

Hans Leidekker : kerberos: ISC_REQ_USE_DCE_STYLE is supported.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: ab43b7cb2493cf57255a8f5c7d034676aaec6eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab43b7cb2493cf57255a8f5c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 14 14:13:06 2018 +0100 kerberos: ISC_REQ_USE_DCE_STYLE is supported. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 767a86e..ea9c687 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -902,8 +902,8 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, { #ifdef SONAME_LIBGSSAPI_KRB5 static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | - ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH; - OM_uint32 ret, minor_status, ret_flags, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); + ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE; + OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle; gss_ctx_id_t ctxt_handle; gss_buffer_desc input_token, output_token;

1 0