January 2018 - Wine-devel - list.winehq.org

[PATCH 1/5] dxgi/tests: Introduce check_interface() function.
by Józef Kucia 24 Jan '18

24 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 62 +++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 899a06383ae0..dfbbab42f5ea 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -39,6 +39,35 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } +#define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, + BOOL supported, BOOL is_broken) +{ + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; + + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } + + out = (IUnknown *)0xdeadbeef; + hr = IUnknown_QueryInterface(unknown, iid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(out); + else + ok_(__FILE__, line)(!out, "Got unexpected pointer %p.\n", out); + return hr; +} + #define MODE_DESC_IGNORE_RESOLUTION 0x00000001u #define MODE_DESC_IGNORE_REFRESH_RATE 0x00000002u #define MODE_DESC_IGNORE_FORMAT 0x00000004u @@ -458,8 +487,6 @@ static void test_create_surface(void) DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; - IUnknown *surface1; - IUnknown *texture; ULONG refcount; HRESULT hr; @@ -478,19 +505,11 @@ static void test_create_surface(void) hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface); ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); - ok(SUCCEEDED(hr), "Surface should implement ID3D10Texture2D\n"); - IUnknown_Release(texture); - - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Surface should implement ID3D11Texture2D.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(texture); - - hr = IDXGISurface_QueryInterface(surface, &IID_IDXGISurface1, (void **)&surface1); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Surface should implement IDXGISurface1.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(surface1); + check_interface(surface, &IID_ID3D10Texture2D, TRUE, FALSE); + /* Not available on all Windows versions. */ + check_interface(surface, &IID_ID3D11Texture2D, TRUE, TRUE); + /* Not available on all Windows versions. */ + check_interface(surface, &IID_IDXGISurface1, TRUE, TRUE); IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); @@ -2341,7 +2360,6 @@ done: static void test_create_factory(void) { - IDXGIFactory1 *factory; IUnknown *iface; ULONG refcount; HRESULT hr; @@ -2359,12 +2377,9 @@ static void test_create_factory(void) ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr); IUnknown_Release(iface); - factory = (void *)0xdeadbeef; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); - hr = IUnknown_QueryInterface(iface, &IID_IDXGIFactory1, (void **)&factory); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); - ok(!factory, "Got unexpected factory %p.\n", factory); + check_interface(iface, &IID_IDXGIFactory1, FALSE, FALSE); IUnknown_Release(iface); iface = (void *)0xdeadbeef; @@ -2403,10 +2418,9 @@ static void test_create_factory(void) hr = pCreateDXGIFactory1(&IID_IDXGIFactory, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); - hr = IUnknown_QueryInterface(iface, &IID_IDXGIFactory1, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to query IDXGIFactory1 interface, hr %#x.\n", hr); - IDXGIFactory1_Release(factory); - IUnknown_Release(iface); + check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE); + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); hr = pCreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#x.\n", hr); -- 2.13.6

2 9

[PATCH vkd3d 1/5] libs/vkd3d: Allow library user to enable additional device extensions.
by Józef Kucia 24 Jan '18

24 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 3 +++ libs/vkd3d/device.c | 52 +++++++++++++++++++++++++++++++++++----------------- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 033017e78f2f..de75ee3a3894 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -66,6 +66,9 @@ struct vkd3d_device_create_info VkPhysicalDevice vk_physical_device; + const char * const *device_extensions; + uint32_t device_extension_count; + LUID adapter_luid; }; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e6210fc4dc9d..bec8f354c3d2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -50,9 +50,6 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, }; -#define MAX_DEVICE_EXTENSION_COUNT \ - (ARRAY_SIZE(required_device_extensions) + ARRAY_SIZE(optional_device_extensions)) - static bool is_extension_disabled(const char *extension_name) { const char *disabled_extensions; @@ -673,8 +670,9 @@ static void vkd3d_check_feature_level_11_requirements(const VkPhysicalDeviceLimi #undef CHECK_FEATURE } -static void vkd3d_init_device_caps(struct d3d12_device *device, - const VkPhysicalDeviceFeatures *features) +static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, + const struct vkd3d_device_create_info *create_info, + const VkPhysicalDeviceFeatures *features, uint32_t *device_extension_count) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; VkPhysicalDevice physical_device = device->vk_physical_device; @@ -684,6 +682,8 @@ static void vkd3d_init_device_caps(struct d3d12_device *device, uint32_t count; VkResult vr; + *device_extension_count = 0; + VK_CALL(vkGetPhysicalDeviceProperties(physical_device, &device_properties)); vulkan_info->device_limits = device_properties.limits; vulkan_info->sparse_properties = device_properties.sparseProperties; @@ -729,13 +729,13 @@ static void vkd3d_init_device_caps(struct d3d12_device *device, &count, NULL))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); - return; + return hresult_from_vk_result(vr); } if (!count) - return; + return S_OK; if (!(vk_extensions = vkd3d_calloc(count, sizeof(*vk_extensions)))) - return; + return E_OUTOFMEMORY; TRACE("Enumerating %u device extensions.\n", count); if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, @@ -743,15 +743,17 @@ static void vkd3d_init_device_caps(struct d3d12_device *device, { ERR("Failed to enumerate device extensions, vr %d.\n", vr); vkd3d_free(vk_extensions); - return; + return hresult_from_vk_result(vr); } - vkd3d_check_extensions(vk_extensions, count, + *device_extension_count = vkd3d_check_extensions(vk_extensions, count, required_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(optional_device_extensions), - NULL, 0, vulkan_info, "device"); + create_info->device_extensions, create_info->device_extension_count, + vulkan_info, "device"); vkd3d_free(vk_extensions); + return S_OK; } static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, @@ -855,24 +857,28 @@ static HRESULT d3d12_device_create_vkd3d_queues(struct d3d12_device *device, return S_OK; } -static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDevice physical_device) +static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, + const struct vkd3d_device_create_info *create_info) { uint32_t direct_queue_timestamp_bits, copy_queue_timestamp_bits, compute_queue_timestamp_bits; unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; - const char *extensions[MAX_DEVICE_EXTENSION_COUNT]; VkQueueFamilyProperties *queue_properties; VkPhysicalDeviceFeatures device_features; VkDeviceQueueCreateInfo *queue_info; + VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; uint32_t queue_family_count; + uint32_t extension_count; + const char **extensions; VkDevice vk_device; unsigned int i; VkResult vr; HRESULT hr; - TRACE("device %p, physical_device %p.\n", device, physical_device); + TRACE("device %p, create_info %p.\n", device, create_info); + physical_device = create_info->vk_physical_device; if (!physical_device && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) return hr; @@ -954,7 +960,17 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDev VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); device->vk_physical_device = physical_device; - vkd3d_init_device_caps(device, &device_features); + if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) + { + vkd3d_free(queue_info); + return E_FAIL; + } + + if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) + { + vkd3d_free(queue_info); + return E_OUTOFMEMORY; + } /* Create device */ device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; @@ -967,11 +983,13 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDev device_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, required_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(optional_device_extensions), - NULL, 0, &device->vk_info); + create_info->device_extensions, create_info->device_extension_count, + &device->vk_info); device_info.ppEnabledExtensionNames = extensions; device_info.pEnabledFeatures = &device_features; vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device)); + vkd3d_free(extensions); vkd3d_free(queue_info); if (vr < 0) { @@ -2137,7 +2155,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->adapter_luid = create_info->adapter_luid; - if (FAILED(hr = vkd3d_create_vk_device(device, create_info->vk_physical_device))) + if (FAILED(hr = vkd3d_create_vk_device(device, create_info))) { vkd3d_instance_decref(device->vkd3d_instance); return hr; -- 2.13.6

2 9

[PATCH 12/20] kerberos: Implement SpQueryContextAttributes.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 72 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 13 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 563ac47509..ddd48df5d1 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -67,6 +67,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(kerberos); | SECPKG_FLAG_RESTRICTED_TOKENS \ | SECPKG_FLAG_APPCONTAINER_CHECKS) +static WCHAR kerberos_name_W[] = MICROSOFT_KERBEROS_NAME_W; +static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; +static const SecPkgInfoW infoW = +{ + KERBEROS_CAPS, + 1, + RPC_C_AUTHN_GSS_KERBEROS, + KERBEROS_MAX_BUF, + kerberos_name_W, + kerberos_comment_W +}; + static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; @@ -158,18 +170,6 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) { - static WCHAR kerberos_name_W[] = MICROSOFT_KERBEROS_NAME_W; - static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; - static const SecPkgInfoW infoW = - { - KERBEROS_CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W - }; - TRACE("%p\n", info); /* LSA will make a copy before forwarding the structure, so @@ -608,6 +608,52 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) #endif } +static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, ULONG attribute, void *buffer ) +{ + TRACE( "(%lx %u %p)\n", context, attribute, buffer ); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + case SECPKG_ATTR_SIZES: + { + SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)buffer; + sizes->cbMaxToken = KERBEROS_MAX_BUF; + sizes->cbMaxSignature = 37; + sizes->cbBlockSize = 1; + sizes->cbSecurityTrailer = 49; + return SEC_E_OK; + } + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)buffer; + info->PackageInfo = (SecPkgInfoW *)&infoW; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -657,7 +703,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */ - NULL, /* SpQueryContextAttributes */ + kerberos_SpQueryContextAttributes, NULL, /* SpAddCredentials */ NULL, /* SetExtendedInformation */ NULL, /* SetContextAttributes */ -- 2.15.1

2 1

[PATCH 11/20] kerberos: Implement SpFreeCredentialsHandle.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 3e282a630e..563ac47509 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -192,6 +192,7 @@ MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); +MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_name); #undef MAKE_FUNCPTR @@ -216,6 +217,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) + LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_name) #undef LOAD_FUNCPTR @@ -419,6 +421,27 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( #endif } +static NTSTATUS NTAPI kerberos_SpFreeCredentialsHandle( LSA_SEC_HANDLE credential ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_cred_id_t cred_handle; + + TRACE( "(%lx)\n", credential ); + + if (!credential) return SEC_E_INVALID_HANDLE; + if (!(cred_handle = credhandle_sspi_to_gss( credential ))) return SEC_E_OK; + + ret = pgss_release_cred( &minor_status, &cred_handle ); + TRACE( "gss_release_cred returned %08x minor status %08x\n", ret, minor_status ); + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx)\n", credential ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, UNICODE_STRING *target_name, ULONG context_req, ULONG target_data_rep, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, @@ -624,7 +647,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* AcceptCredentials */ kerberos_SpAcquireCredentialsHandle, NULL, /* SpQueryCredentialsAttributes */ - NULL, /* FreeCredentialsHandle */ + kerberos_SpFreeCredentialsHandle, NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ -- 2.15.1

2 1

[PATCH 10/20] kerberos: Implement SpDeleteContext.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 8b2926ff15..3e282a630e 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -565,6 +565,26 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential #endif } +static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_ctx_id_t ctxt_handle; + + TRACE( "(%lx)\n", context ); + if (!context) return SEC_E_INVALID_HANDLE; + if (!(ctxt_handle = ctxthandle_sspi_to_gss( context ))) return SEC_E_OK; + + ret = pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + TRACE( "gss_delete_sec_context returned %08x minor status %08x\n", ret, minor_status ); + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx)\n", context ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -610,7 +630,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* DeleteCredentials */ kerberos_SpInitLsaModeContext, kerberos_SpAcceptLsaModeContext, - NULL, /* DeleteContext */ + kerberos_SpDeleteContext, NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */ -- 2.15.1

2 1

[PATCH 09/20] keberos: Implement SpAcceptLsaModeContext.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 204a0d8965..8b2926ff15 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -186,6 +186,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgssapi_krb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); @@ -209,6 +210,7 @@ static BOOL load_gssapi_krb5(void) goto fail; \ } + LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) LOAD_FUNCPTR(gss_import_name) @@ -336,6 +338,19 @@ static ULONG flags_gss_to_isc_ret( ULONG flags ) return ret; } +static ULONG flags_gss_to_asc_ret( ULONG flags ) +{ + ULONG ret = 0; + if (flags & GSS_C_DELEG_FLAG) ret |= ASC_RET_DELEGATE; + if (flags & GSS_C_MUTUAL_FLAG) ret |= ASC_RET_MUTUAL_AUTH; + if (flags & GSS_C_REPLAY_FLAG) ret |= ASC_RET_REPLAY_DETECT; + if (flags & GSS_C_SEQUENCE_FLAG) ret |= ASC_RET_SEQUENCE_DETECT; + if (flags & GSS_C_CONF_FLAG) ret |= ASC_RET_CONFIDENTIALITY; + if (flags & GSS_C_INTEG_FLAG) ret |= ASC_RET_INTEGRITY; + if (flags & GSS_C_ANON_FLAG) ret |= ASC_RET_NULL_SESSION; + return ret; +} + static int get_buffer_index( SecBufferDesc *desc, DWORD type ) { UINT i; @@ -483,6 +498,73 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, #endif } +static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, + SecBufferDesc *input, ULONG context_req, ULONG target_data_rep, LSA_SEC_HANDLE *new_context, + SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, BOOLEAN *mapped_context, SecBuffer *context_data ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status, ret_flags, expiry_time; + gss_cred_id_t cred_handle; + gss_ctx_id_t ctxt_handle; + gss_buffer_desc input_token, output_token; + gss_name_t target = GSS_C_NO_NAME; + int idx; + + TRACE( "(%lx %lx 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, context_req, + target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + if (context_req) FIXME( "ignoring flags 0x%08x\n", context_req ); + + if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; + cred_handle = credhandle_sspi_to_gss( credential ); + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if (!input) input_token.length = 0; + else + { + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } + + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + output_token.length = 0; + output_token.value = NULL; + + ret = pgss_accept_sec_context( &minor_status, &ctxt_handle, cred_handle, &input_token, GSS_C_NO_CHANNEL_BINDINGS, + &target, NULL, &output_token, &ret_flags, &expiry_time, NULL ); + TRACE( "gss_accept_sec_context returned %08x minor status %08x ctxt_handle %p\n", ret, minor_status, ctxt_handle ); + if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + { + if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ + { + TRACE( "buffer too small %u > %u\n", output_token.length, output->pBuffers[idx].cbBuffer ); + pgss_release_buffer( &minor_status, &output_token ); + pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + return SEC_E_BUFFER_TOO_SMALL; + } + output->pBuffers[idx].cbBuffer = output_token.length; + memcpy( output->pBuffers[idx].pvBuffer, output_token.value, output_token.length ); + pgss_release_buffer( &minor_status, &output_token ); + + ctxthandle_gss_to_sspi( ctxt_handle, new_context ); + if (context_attr) *context_attr = flags_gss_to_asc_ret( ret_flags ); + expirytime_gss_to_sspi( expiry_time, ts_expiry ); + } + + /* we do support user mode SSP/AP functions */ + *mapped_context = TRUE; + /* FIXME: initialize context_data */ + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %lx 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, context_req, + target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -527,7 +609,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ kerberos_SpInitLsaModeContext, - NULL, /* AcceptLsaModeContext */ + kerberos_SpAcceptLsaModeContext, NULL, /* DeleteContext */ NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ -- 2.15.1

2 1

[PATCH 08/20] kerberos: Implement SpInitLsaModeContext.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index a314f7030c..204a0d8965 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -187,7 +187,10 @@ static void *libgssapi_krb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gss_acquire_cred); +MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); +MAKE_FUNCPTR(gss_init_sec_context); +MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_name); #undef MAKE_FUNCPTR @@ -207,7 +210,10 @@ static BOOL load_gssapi_krb5(void) } LOAD_FUNCPTR(gss_acquire_cred) + LOAD_FUNCPTR(gss_delete_sec_context) LOAD_FUNCPTR(gss_import_name) + LOAD_FUNCPTR(gss_init_sec_context) + LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_name) #undef LOAD_FUNCPTR @@ -225,11 +231,28 @@ static void unload_gssapi_krb5(void) libgssapi_krb5_handle = NULL; } +static inline gss_cred_id_t credhandle_sspi_to_gss( LSA_SEC_HANDLE cred ) +{ + if (!cred) return GSS_C_NO_CREDENTIAL; + return (gss_cred_id_t)cred; +} + static inline void credhandle_gss_to_sspi( gss_cred_id_t handle, LSA_SEC_HANDLE *cred ) { *cred = (LSA_SEC_HANDLE)handle; } +static inline gss_ctx_id_t ctxthandle_sspi_to_gss( LSA_SEC_HANDLE ctxt ) +{ + if (!ctxt) return GSS_C_NO_CONTEXT; + return (gss_ctx_id_t)ctxt; +} + +static inline void ctxthandle_gss_to_sspi( gss_ctx_id_t handle, LSA_SEC_HANDLE *ctxt ) +{ + *ctxt = (LSA_SEC_HANDLE)handle; +} + static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) { switch (status) @@ -286,6 +309,43 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam HeapFree( GetProcessHeap(), 0, buf.value ); return status_gss_to_sspi( ret ); } + +static ULONG flags_isc_req_to_gss( ULONG flags ) +{ + ULONG ret = GSS_C_DCE_STYLE; + if (flags & ISC_REQ_DELEGATE) ret |= GSS_C_DELEG_FLAG; + if (flags & ISC_REQ_MUTUAL_AUTH) ret |= GSS_C_MUTUAL_FLAG; + if (flags & ISC_REQ_REPLAY_DETECT) ret |= GSS_C_REPLAY_FLAG; + if (flags & ISC_REQ_SEQUENCE_DETECT) ret |= GSS_C_SEQUENCE_FLAG; + if (flags & ISC_REQ_CONFIDENTIALITY) ret |= GSS_C_CONF_FLAG; + if (flags & ISC_REQ_INTEGRITY) ret |= GSS_C_INTEG_FLAG; + if (flags & ISC_REQ_NULL_SESSION) ret |= GSS_C_ANON_FLAG; + return ret; +} + +static ULONG flags_gss_to_isc_ret( ULONG flags ) +{ + ULONG ret = 0; + if (flags & GSS_C_DELEG_FLAG) ret |= ISC_RET_DELEGATE; + if (flags & GSS_C_MUTUAL_FLAG) ret |= ISC_RET_MUTUAL_AUTH; + if (flags & GSS_C_REPLAY_FLAG) ret |= ISC_RET_REPLAY_DETECT; + if (flags & GSS_C_SEQUENCE_FLAG) ret |= ISC_RET_SEQUENCE_DETECT; + if (flags & GSS_C_CONF_FLAG) ret |= ISC_RET_CONFIDENTIALITY; + if (flags & GSS_C_INTEG_FLAG) ret |= ISC_RET_INTEGRITY; + if (flags & GSS_C_ANON_FLAG) ret |= ISC_RET_NULL_SESSION; + return ret; +} + +static int get_buffer_index( SecBufferDesc *desc, DWORD type ) +{ + UINT i; + if (!desc) return -1; + for (i = 0; i < desc->cBuffers; i++) + { + if (desc->pBuffers[i].BufferType == type) return i; + } + return -1; +} #endif /* SONAME_LIBGSSAPI_KRB5 */ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( @@ -344,6 +404,85 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( #endif } +static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, + UNICODE_STRING *target_name, ULONG context_req, ULONG target_data_rep, SecBufferDesc *input, + LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, + BOOLEAN *mapped_context, SecBuffer *context_data ) +{ +#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 ); + gss_cred_id_t cred_handle; + gss_ctx_id_t ctxt_handle; + gss_buffer_desc input_token, output_token; + gss_name_t target = GSS_C_NO_NAME; + int idx; + + TRACE( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), + context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + if (context_req & ~supported) + { + FIXME( "flags 0x%08x not supported\n", context_req & ~supported ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; + cred_handle = credhandle_sspi_to_gss( credential ); + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if (!input) input_token.length = 0; + else + { + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } + + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + output_token.length = 0; + output_token.value = NULL; + + if (target_name && ((ret = name_sspi_to_gss( target_name, &target )) != SEC_E_OK)) return ret; + + ret = pgss_init_sec_context( &minor_status, cred_handle, &ctxt_handle, target, GSS_C_NO_OID, req_flags, 0, + GSS_C_NO_CHANNEL_BINDINGS, &input_token, NULL, &output_token, &ret_flags, + &expiry_time ); + TRACE( "gss_init_sec_context returned %08x minor status %08x ret_flags %08x\n", ret, minor_status, ret_flags ); + if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + { + if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ + { + TRACE( "buffer too small %u > %u\n", output_token.length, output->pBuffers[idx].cbBuffer ); + pgss_release_buffer( &minor_status, &output_token ); + pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + return SEC_E_INCOMPLETE_MESSAGE; + } + output->pBuffers[idx].cbBuffer = output_token.length; + memcpy( output->pBuffers[idx].pvBuffer, output_token.value, output_token.length ); + pgss_release_buffer( &minor_status, &output_token ); + + ctxthandle_gss_to_sspi( ctxt_handle, new_context ); + if (context_attr) *context_attr = flags_gss_to_isc_ret( ret_flags ); + expirytime_gss_to_sspi( expiry_time, ts_expiry ); + } + + if (target != GSS_C_NO_NAME) pgss_release_name( &minor_status, &target ); + + /* we do support user mode SSP/AP functions */ + *mapped_context = TRUE; + /* FIXME: initialize context_data */ + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), + context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -387,7 +526,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ - NULL, /* InitLsaModeContext */ + kerberos_SpInitLsaModeContext, NULL, /* AcceptLsaModeContext */ NULL, /* DeleteContext */ NULL, /* ApplyControlToken */ -- 2.15.1

2 1

[PATCH 07/20] kerberos: Implement SpAcquireCredentialsHandle.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure | 195 ++++++++++++++++++++++++++++++++++------- configure.ac | 18 ++++ dlls/kerberos/Makefile.in | 2 +- dlls/kerberos/krb5_ap.c | 216 ++++++++++++++++++++++++++++++++++++++++++---- include/config.h.in | 9 ++ 5 files changed, 394 insertions(+), 46 deletions(-) diff --git a/configure.ac b/configure.ac index 9aa32280f4..b04d210410 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,7 @@ AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU librar AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)])) AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06.10 codec support)]), [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi]) +AC_ARG_WITH(gssapi, AS_HELP_STRING([--without-gssapi],[do not use GSSAPI (Kerberos SSP support)])) AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreamer (codecs support)])) AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) @@ -1665,6 +1666,23 @@ fi WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], [libkrb5 ${notice_platform}development files not found, Kerberos won't be supported.]) +dnl **** Check for gssapi **** +if test "x$with_gssapi" != "xno" +then + WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],, + [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`], + [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`], + [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h]) + if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes" + then + WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_LIBS=""],[$GSSAPI_LIBS]) + else + GSSAPI_CFLAGS="" + fi]) +fi +WINE_WARNING_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"], + [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.]) + dnl **** Check for libjpeg **** if test "x$with_jpeg" != "xno" then diff --git a/dlls/kerberos/Makefile.in b/dlls/kerberos/Makefile.in index 253e944716..f67ba567fb 100644 --- a/dlls/kerberos/Makefile.in +++ b/dlls/kerberos/Makefile.in @@ -1,5 +1,5 @@ MODULE = kerberos.dll -EXTRAINCL = $(KRB5_CFLAGS) +EXTRAINCL = $(KRB5_CFLAGS) $(GSSAPI_CFLAGS) C_SRCS = \ krb5_ap.c diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 72c7027428..a314f7030c 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1,5 +1,7 @@ /* * Copyright 2017 Dmitry Timoshkov + * Copyright 2008 Robert Shearman for CodeWeavers + * Copyright 2017 Hans Leidekker for CodeWeavers * * Kerberos5 Authentication Package * @@ -25,6 +27,10 @@ #ifdef HAVE_KRB5_KRB5_H #include <krb5/krb5.h> #endif +#ifdef SONAME_LIBGSSAPI_KRB5 +# include <gssapi/gssapi.h> +# include <gssapi/gssapi_ext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -106,6 +112,12 @@ static void load_krb5(void) #endif /* SONAME_LIBKRB5 */ +static const char *debugstr_us( const UNICODE_STRING *us ) +{ + if (!us) return "<null>"; + return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); +} + static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DISPATCH_TABLE dispatch, PLSA_STRING database, PLSA_STRING confidentiality, PLSA_STRING *package_name) { @@ -144,21 +156,6 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, - LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) -{ - FIXME("%lu,%p,%p: stub\n", package_id, params, lsa_function_table); - - return STATUS_SUCCESS; -} - -static NTSTATUS NTAPI kerberos_SpShutdown(void) -{ - TRACE("\n"); - - return STATUS_SUCCESS; -} - static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) { static WCHAR kerberos_name_W[] = MICROSOFT_KERBEROS_NAME_W; @@ -183,6 +180,193 @@ static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) return STATUS_SUCCESS; } +#ifdef SONAME_LIBGSSAPI_KRB5 + +WINE_DECLARE_DEBUG_CHANNEL(winediag); +static void *libgssapi_krb5_handle; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(gss_acquire_cred); +MAKE_FUNCPTR(gss_import_name); +MAKE_FUNCPTR(gss_release_name); +#undef MAKE_FUNCPTR + +static BOOL load_gssapi_krb5(void) +{ + if (!(libgssapi_krb5_handle = wine_dlopen( SONAME_LIBGSSAPI_KRB5, RTLD_NOW, NULL, 0 ))) + { + ERR_(winediag)( "Failed to load libgssapi_krb5, Kerberos SSP support will not be available.\n" ); + return FALSE; + } + +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym( libgssapi_krb5_handle, #f, NULL, 0 ))) \ + { \ + ERR( "Failed to load %s\n", #f ); \ + goto fail; \ + } + + LOAD_FUNCPTR(gss_acquire_cred) + LOAD_FUNCPTR(gss_import_name) + LOAD_FUNCPTR(gss_release_name) +#undef LOAD_FUNCPTR + + return TRUE; + +fail: + wine_dlclose( libgssapi_krb5_handle, NULL, 0 ); + libgssapi_krb5_handle = NULL; + return FALSE; +} + +static void unload_gssapi_krb5(void) +{ + wine_dlclose( libgssapi_krb5_handle, NULL, 0 ); + libgssapi_krb5_handle = NULL; +} + +static inline void credhandle_gss_to_sspi( gss_cred_id_t handle, LSA_SEC_HANDLE *cred ) +{ + *cred = (LSA_SEC_HANDLE)handle; +} + +static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) +{ + switch (status) + { + case GSS_S_COMPLETE: return SEC_E_OK; + case GSS_S_BAD_MECH: return SEC_E_SECPKG_NOT_FOUND; + case GSS_S_BAD_SIG: return SEC_E_MESSAGE_ALTERED; + case GSS_S_NO_CRED: return SEC_E_NO_CREDENTIALS; + case GSS_S_NO_CONTEXT: return SEC_E_INVALID_HANDLE; + case GSS_S_DEFECTIVE_TOKEN: return SEC_E_INVALID_TOKEN; + case GSS_S_DEFECTIVE_CREDENTIAL: return SEC_E_NO_CREDENTIALS; + case GSS_S_CREDENTIALS_EXPIRED: return SEC_E_CONTEXT_EXPIRED; + case GSS_S_CONTEXT_EXPIRED: return SEC_E_CONTEXT_EXPIRED; + case GSS_S_BAD_QOP: return SEC_E_QOP_NOT_SUPPORTED; + case GSS_S_CONTINUE_NEEDED: return SEC_I_CONTINUE_NEEDED; + case GSS_S_DUPLICATE_TOKEN: return SEC_E_INVALID_TOKEN; + case GSS_S_OLD_TOKEN: return SEC_E_INVALID_TOKEN; + case GSS_S_UNSEQ_TOKEN: return SEC_E_OUT_OF_SEQUENCE; + case GSS_S_GAP_TOKEN: return SEC_E_OUT_OF_SEQUENCE; + + default: + FIXME( "couldn't convert status 0x%08x to SECURITY_STATUS\n", status ); + return SEC_E_INTERNAL_ERROR; + } +} + +static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) +{ + SYSTEMTIME time; + FILETIME filetime; + ULARGE_INTEGER tmp; + + GetLocalTime( &time ); + SystemTimeToFileTime( &time, &filetime ); + tmp.QuadPart = ((ULONGLONG)filetime.dwLowDateTime | (ULONGLONG)filetime.dwHighDateTime << 32) + expirytime; + timestamp->LowPart = tmp.QuadPart; + timestamp->HighPart = tmp.QuadPart >> 32; +} + +static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_name_t *name ) +{ + OM_uint32 ret, minor_status; + gss_OID type = GSS_C_NO_OID; /* FIXME: detect the appropriate value for this ourselves? */ + gss_buffer_desc buf; + + buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ) + 1; + if (!(buf.value = HeapAlloc( GetProcessHeap(), 0, buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; + WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), buf.value, buf.length, NULL, NULL ); + buf.length--; + + ret = pgss_import_name( &minor_status, &buf, type, name ); + TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status ); + + HeapFree( GetProcessHeap(), 0, buf.value ); + return status_gss_to_sspi( ret ); +} +#endif /* SONAME_LIBGSSAPI_KRB5 */ + +static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( + UNICODE_STRING *principal_us, ULONG credential_use, LUID *logon_id, void *auth_data, + void *get_key_fn, void *get_key_arg, LSA_SEC_HANDLE *credential, TimeStamp *ts_expiry ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status, expiry_time; + gss_name_t principal = GSS_C_NO_NAME; + gss_cred_usage_t cred_usage; + gss_cred_id_t cred_handle; + + TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, + logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); + + if (auth_data) + { + FIXME( "specific credentials not supported\n" ); + return SEC_E_UNKNOWN_CREDENTIALS; + } + + switch (credential_use) + { + case SECPKG_CRED_INBOUND: + cred_usage = GSS_C_ACCEPT; + break; + case SECPKG_CRED_OUTBOUND: + cred_usage = GSS_C_INITIATE; + break; + case SECPKG_CRED_BOTH: + cred_usage = GSS_C_BOTH; + break; + default: + return SEC_E_UNKNOWN_CREDENTIALS; + } + + if (principal_us && ((ret = name_sspi_to_gss( principal_us, &principal )) != SEC_E_OK)) return ret; + + ret = pgss_acquire_cred( &minor_status, principal, GSS_C_INDEFINITE, GSS_C_NULL_OID_SET, cred_usage, + &cred_handle, NULL, &expiry_time ); + TRACE( "gss_acquire_cred returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + { + credhandle_gss_to_sspi( cred_handle, credential ); + expirytime_gss_to_sspi( expiry_time, ts_expiry ); + } + + if (principal != GSS_C_NO_NAME) pgss_release_name( &minor_status, &principal ); + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, + logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); + FIXME( "Wine was built without Kerberos support.\n" ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + +static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, + LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) +{ + TRACE("%lu,%p,%p\n", package_id, params, lsa_function_table); + +#ifdef SONAME_LIBGSSAPI_KRB5 + if (load_gssapi_krb5()) return STATUS_SUCCESS; +#endif + + return STATUS_UNSUCCESSFUL; +} + +static NTSTATUS NTAPI kerberos_SpShutdown(void) +{ + TRACE("\n"); + +#ifdef SONAME_LIBGSSAPI_KRB5 + unload_gssapi_krb5(); +#endif + + return STATUS_SUCCESS; +} + static SECPKG_FUNCTION_TABLE kerberos_table = { kerberos_LsaApInitializePackage, /* InitializePackage */ @@ -197,7 +381,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = kerberos_SpShutdown, kerberos_SpGetInfo, NULL, /* AcceptCredentials */ - NULL, /* SpAcquireCredentialsHandle */ + kerberos_SpAcquireCredentialsHandle, NULL, /* SpQueryCredentialsAttributes */ NULL, /* FreeCredentialsHandle */ NULL, /* SaveCredentials */ -- 2.15.1

2 7

[PATCH 6/6] webervices/tests: Add tests for out of range string IDs.
by Hans Leidekker 24 Jan '18

24 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/reader.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 9879fac4cf..7064cf0f82 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5612,6 +5612,10 @@ static void test_dictionary(void) {0x40,0x01,'t',0x0a,0x0a,0x01}; static const char test8[] = {0x40,0x01,'t',0x0b,0x01,'p',0x0a,0x01}; + static const char test9[] = + {0x42,0x0c,0x01}; + static const char test10[] = + {0x42,0x04,0xab,0x0c,0x01}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; const WS_XML_ATTRIBUTE *attr; @@ -5940,6 +5944,23 @@ static void test_dictionary(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + /* element name string id out of range */ + hr = set_input_bin( reader, test9, sizeof(test9), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsReadNode( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + /* text string id out of range */ + hr = set_input_bin( reader, test10, sizeof(test10), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + hr = WsReadNode( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + hr = WsGetDictionary( 0, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); -- 2.11.0

1 0

[PATCH 5/6] webservices: Also set localname and value for xmlns attributes.
by Hans Leidekker 24 Jan '18

24 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 39 +++++++++++ dlls/webservices/tests/reader.c | 142 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 169 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index bdf950ec29..4c121d9f4a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1706,8 +1706,15 @@ static inline BOOL is_attribute_type( unsigned char type ) return (type >= RECORD_SHORT_ATTRIBUTE && type <= RECORD_PREFIX_ATTRIBUTE_Z); } +static WS_XML_STRING *get_xmlns_localname( struct reader *reader, const WS_XML_STRING *prefix ) +{ + if (!get_namespace( reader, prefix )) return alloc_xml_string( NULL, 0 ); + return alloc_xml_string( prefix->bytes, prefix->length ); +} + static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret ) { + WS_XML_UTF8_TEXT *utf8; WS_XML_ATTRIBUTE *attr; unsigned char type = 0; HRESULT hr; @@ -1780,6 +1787,11 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret hr = E_OUTOFMEMORY; goto error; } + if (!(attr->localName = get_xmlns_localname( reader, attr->prefix ))) + { + hr = E_OUTOFMEMORY; + goto error; + } if ((hr = read_string( reader, &attr->ns )) != S_OK) goto error; if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; attr->isXmlNs = 1; @@ -1787,6 +1799,11 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret case RECORD_XMLNS_ATTRIBUTE: if ((hr = read_string( reader, &attr->prefix )) != S_OK) goto error; + if (!(attr->localName = get_xmlns_localname( reader, attr->prefix ))) + { + hr = E_OUTOFMEMORY; + goto error; + } if ((hr = read_string( reader, &attr->ns )) != S_OK) goto error; if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; attr->isXmlNs = 1; @@ -1798,14 +1815,36 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret hr = E_OUTOFMEMORY; goto error; } + if (!(attr->localName = get_xmlns_localname( reader, attr->prefix ))) + { + hr = E_OUTOFMEMORY; + goto error; + } if ((hr = read_dict_string( reader, &attr->ns )) != S_OK) goto error; + if (!(utf8 = alloc_utf8_text( NULL, 0 ))) + { + hr = E_OUTOFMEMORY; + goto error; + } + attr->value = &utf8->text; if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; attr->isXmlNs = 1; break; case RECORD_DICTIONARY_XMLNS_ATTRIBUTE: if ((hr = read_string( reader, &attr->prefix )) != S_OK) goto error; + if (!(attr->localName = get_xmlns_localname( reader, attr->prefix ))) + { + hr = E_OUTOFMEMORY; + goto error; + } if ((hr = read_dict_string( reader, &attr->ns )) != S_OK) goto error; + if (!(utf8 = alloc_utf8_text( NULL, 0 ))) + { + hr = E_OUTOFMEMORY; + goto error; + } + attr->value = &utf8->text; if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; attr->isXmlNs = 1; break; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index fce34ed037..9879fac4cf 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4873,6 +4873,10 @@ static void test_binary_encoding(void) {0x40,0x01,'t',0xb1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; static const char test29[] = {0x40,0x01,'t',0xb3,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; + static const char test30[] = + {0x40,0x01,'t',0x08,0x02,'n','s',0x01}; + static const char test31[] = + {0x40,0x01,'t',0x09,0x01,'p',0x02,'n','s',0x01}; static const char test100[] = {0x40,0x01,'t',0x04,0x01,'t',0x98,0x00,0x01}; static const char test101[] = @@ -5285,6 +5289,58 @@ static void test_binary_encoding(void) uint64_text = (WS_XML_UINT64_TEXT *)text_node->text; ok( uint64_text->value == 1, "got %s\n", wine_dbgstr_longlong(uint64_text->value) ); + /* short xmlns attribute */ + hr = set_input_bin( reader, test30, sizeof(test30), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( elem->prefix->bytes == NULL, "bytes set\n" ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( attr->prefix->bytes == NULL, "bytes set\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + + /* xmlns attribute */ + hr = set_input_bin( reader, test31, sizeof(test31), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( elem->prefix->bytes == NULL, "bytes set\n" ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( elem->ns->bytes != NULL, "bytes not set\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + /* short attribute */ hr = set_input_bin( reader, test100, sizeof(test100), NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -5540,18 +5596,22 @@ static void test_dictionary(void) { static const GUID dict_static = {0xf93578f8,0x5852,0x4eb7,{0xa6,0xfc,0xe7,0x2b,0xb7,0x1d,0xb6,0x22}}; - static const char res[] = + static const char test[] = {0x42,0x04,0x01}; - static const char res2[] = + static const char test2[] = {0x53,0x06,0x0b,0x01,'p',0x0a,0x01}; - static const char res3[] = + static const char test3[] = {0x43,0x02,'p','2',0x06,0x0b,0x02,'p','2',0x0a,0x01}; - static const char res4[] = + static const char test4[] = {0x42,0x06,0x06,0x06,0x98,0x00,0x01}; - static const char res5[] = + static const char test5[] = {0x42,0x06,0x1b,0x06,0x98,0x00,0x0b,0x01,'p',0x0a,0x01}; - static const char res6[] = + static const char test6[] = {0x42,0x06,0x07,0x02,'p','2',0x06,0x98,0x00,0x0b,0x02,'p','2',0x0a,0x01}; + static const char test7[] = + {0x40,0x01,'t',0x0a,0x0a,0x01}; + static const char test8[] = + {0x40,0x01,'t',0x0b,0x01,'p',0x0a,0x01}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; const WS_XML_ATTRIBUTE *attr; @@ -5595,7 +5655,7 @@ static void test_dictionary(void) dict.isConst = TRUE; /* short dictionary element */ - hr = set_input_bin( reader, res, sizeof(res), &dict ); + hr = set_input_bin( reader, test, sizeof(test), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5622,7 +5682,7 @@ static void test_dictionary(void) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* single character prefix dictionary element */ - hr = set_input_bin( reader, res2, sizeof(res2), &dict ); + hr = set_input_bin( reader, test2, sizeof(test2), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5656,7 +5716,7 @@ static void test_dictionary(void) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* dictionary element */ - hr = set_input_bin( reader, res3, sizeof(res3), &dict ); + hr = set_input_bin( reader, test3, sizeof(test3), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5690,7 +5750,7 @@ static void test_dictionary(void) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* short dictionary attribute */ - hr = set_input_bin( reader, res4, sizeof(res4), &dict ); + hr = set_input_bin( reader, test4, sizeof(test4), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5729,7 +5789,7 @@ static void test_dictionary(void) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* single character prefix dictionary attribute */ - hr = set_input_bin( reader, res5, sizeof(res5), &dict ); + hr = set_input_bin( reader, test5, sizeof(test5), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5776,7 +5836,7 @@ static void test_dictionary(void) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* dictionary attribute */ - hr = set_input_bin( reader, res6, sizeof(res6), &dict ); + hr = set_input_bin( reader, test6, sizeof(test6), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5816,6 +5876,64 @@ static void test_dictionary(void) ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + /* short dictionary xmlns attribute */ + hr = set_input_bin( reader, test7, sizeof(test7), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( attr->prefix->bytes == NULL, "bytes set\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( attr->ns->dictionary == &dict, "unexpected dict\n" ); + ok( attr->ns->id == 5, "unexpected id %08x\n", attr->ns->id ); + utf8 = (const WS_XML_UTF8_TEXT *)attr->value; + ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); + ok( !utf8->value.length, "got %u\n", utf8->value.length ); + todo_wine ok( utf8->value.bytes != NULL, "bytes not set\n" ); + + /* dictionary xmlns attribute */ + hr = set_input_bin( reader, test8, sizeof(test8), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( attr->ns->dictionary == &dict, "unexpected dict\n" ); + ok( attr->ns->id == 5, "unexpected id %08x\n", attr->ns->id ); + utf8 = (const WS_XML_UTF8_TEXT *)attr->value; + ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); + ok( !utf8->value.length, "got %u\n", utf8->value.length ); + todo_wine ok( utf8->value.bytes != NULL, "bytes not set\n" ); + hr = WsReadNode( reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); -- 2.11.0

1 0