wine-devel December 2017

wine-devel@winehq.org

60 participants
368 discussions

crash due to weird freetype font in gdiplus/sse
by Marcus Meissner 14 Dec '17

14 Dec '17

Hi, we saw this during wineconf http://test.winehq.org/data/010119085b4cee3d7edbad2c5a46d35daa95000d/linux_… the actual instruction is: cvttsd2si $xmm0, $eax which receives a FPE trap as the content of $xmm0 does not fit into $eax. http://www.jaist.ac.jp/iscenter-new/mpc/altix/altixdata/opt/intel/vtune/doc… This means someone switched on FPE traps for XMM instructions in $CR4 register, which I would expect freetype2 the prime candidate if it is not Wine itself. Debugging shows that capEmHeight and capXHeight are both values < 0. long story short, in the loader we get these values: fixme:font:get_outline_text_metrics L"Goha-Tibeb Zemen" sCapHeight=-32768 fixme:font:get_outline_text_metrics L"Goha-Tibeb Zemen" sxHeight=-32768 The documentation does not give 0x8000 a specific meaning in the OS2 table. I can provide this font if needed for debugging. Ciao, Marcus

3 4

Code freeze got you down? Try fixing a test!
by Jeremy White 14 Dec '17

14 Dec '17

Just think how much you will brighten the solstice by finding and fixing one of our tests! Or, if you're a south hemispherean, it's way too hot to go out, so you should stay in and fix a test. A curated list test failures on our static Windows VMs and on a first Linux machine is here: https://www.winehq.org/~jwhite/latest.html We've made some good progress lately; we are down to 10 failures total on the Linux box, only 3 of which are consistent. Windows failures are way down; although we still have a nice bunch of Windows 8 and 10 failures left. In fact, the thing we have the *most* of are sporadic Windows 10 failures - everyone's favorite! Alexandre assures me that test fixes are welcome during code freeze, so bring some solstice joy and fix those tests! Cheers, Jeremy p.s. If you research a bug, and would like me to update the annotation I track for it, just shoot me an email to let me know.

2 1

[PATCH 2/2] ole32: Correctly save the remaining formats if their data has not been set.
by Huw Davies 14 Dec '17

14 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 48 +++++++++++++++++++++--------------------------- dlls/ole32/tests/ole2.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ae05b8e176..ad55c6e561 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -829,17 +829,16 @@ static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) if (hr == S_OK && data_size) hr = IStream_Write(stream, bmi, data_size, NULL); } - else + else if(data_size) { BITMAPFILEHEADER bmp_fhdr; bmp_fhdr.bfType = 0x4d42; bmp_fhdr.bfSize = data_size + sizeof(BITMAPFILEHEADER); bmp_fhdr.bfReserved1 = bmp_fhdr.bfReserved2 = 0; - if (data_size) - bmp_fhdr.bfOffBits = bitmap_info_size(bmi, DIB_RGB_COLORS) + sizeof(BITMAPFILEHEADER); + bmp_fhdr.bfOffBits = bitmap_info_size(bmi, DIB_RGB_COLORS) + sizeof(BITMAPFILEHEADER); hr = IStream_Write(stream, &bmp_fhdr, sizeof(BITMAPFILEHEADER), NULL); - if (hr == S_OK && data_size) + if (hr == S_OK) hr = IStream_Write(stream, bmi, data_size, NULL); } @@ -897,25 +896,22 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } - else + else if (entry->stgmedium.tymed != TYMED_NULL) { struct meta_placeable meta_place_rec; WORD *check; - if (entry->stgmedium.tymed != TYMED_NULL) + mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); + if (!mfpict) + return DV_E_STGMEDIUM; + data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); + data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!data) { - mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); - if (!mfpict) - return DV_E_STGMEDIUM; - data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); - data = HeapAlloc(GetProcessHeap(), 0, data_size); - if (!data) - { - GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - return E_OUTOFMEMORY; - } - GetMetaFileBitsEx(mfpict->hMF, data_size, data); + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + return E_OUTOFMEMORY; } + GetMetaFileBitsEx(mfpict->hMF, data_size, data); /* units are in 1/8th of a point (1 point is 1/72th of an inch) */ meta_place_rec.key = 0x9ac6cdd7; @@ -927,13 +923,12 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream meta_place_rec.bounding_box[3] = 0; meta_place_rec.checksum = 0; meta_place_rec.reserved = 0; - if (mfpict) - { - /* These values are rounded down so MulDiv won't do the right thing */ - meta_place_rec.bounding_box[2] = (LONGLONG)mfpict->xExt * meta_place_rec.inch / 2540; - meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; - GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - } + + /* These values are rounded down so MulDiv won't do the right thing */ + meta_place_rec.bounding_box[2] = (LONGLONG)mfpict->xExt * meta_place_rec.inch / 2540; + meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + for (check = (WORD *)&meta_place_rec; check != (WORD *)&meta_place_rec.checksum; check++) meta_place_rec.checksum ^= *check; hr = IStream_Write(stream, &meta_place_rec, sizeof(struct meta_placeable), NULL); @@ -982,7 +977,7 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } - else + else if (entry->stgmedium.tymed != TYMED_NULL) { data_size = GetEnhMetaFileBits(entry->stgmedium.u.hEnhMetaFile, 0, NULL); data = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) + sizeof(ENHMETAHEADER) + data_size); @@ -991,8 +986,7 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) GetEnhMetaFileBits(entry->stgmedium.u.hEnhMetaFile, data_size, data + sizeof(DWORD) + sizeof(ENHMETAHEADER)); memcpy(data + sizeof(DWORD), data + sizeof(DWORD) + sizeof(ENHMETAHEADER), sizeof(ENHMETAHEADER)); data_size += sizeof(DWORD) + sizeof(ENHMETAHEADER); - if (hr == S_OK && data_size) - hr = IStream_Write(stream, data, data_size, NULL); + hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f42ebe2330..fe45c6a73e 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4226,35 +4226,64 @@ static void test_data_cache_save_data(void) { { { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_WineTest, + 3, 3, &CLSID_WineTest, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } } }, + /* without setting data */ { { + { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, + }, + 3, 0, &CLSID_WineTest, + { + &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + } + }, + /* static picture clsids */ + { + { + { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, }, - 1, 1, &CLSID_WineTest, + 1, 1, &CLSID_Picture_Dib, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } + } + }, + { + { + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + }, + 1, 1, &CLSID_Picture_Metafile, + { + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } }, { { { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_WineTest, + 1, 1, &CLSID_Picture_EnhMetafile, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } }, + /* static picture clsids without setting any data */ { { { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, }, - 1, 1, &CLSID_Picture_Dib, + 1, 0, &CLSID_Picture_Dib, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } @@ -4263,7 +4292,7 @@ static void test_data_cache_save_data(void) { { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, }, - 1, 1, &CLSID_Picture_Metafile, + 1, 0, &CLSID_Picture_Metafile, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } @@ -4272,7 +4301,7 @@ static void test_data_cache_save_data(void) { { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_Picture_EnhMetafile, + 1, 0, &CLSID_Picture_EnhMetafile, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } -- 2.12.0

1 0

[PATCH 1/2] ole32: Correctly save the dib format if its data has not been set.
by Huw Davies 14 Dec '17

14 Dec '17

From: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Regression is reported at https://bugs.winehq.org/show_bug.cgi?id=44147 Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 75c961164e..ae05b8e176 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -792,8 +792,14 @@ static void init_stream_header(DataCacheEntry *entry, PresentationDataHeader *he static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) { HRESULT hr = S_OK; - int data_size = GlobalSize(entry->stgmedium.u.hGlobal); - BITMAPINFO *bmi = GlobalLock(entry->stgmedium.u.hGlobal); + int data_size = 0; + BITMAPINFO *bmi = NULL; + + if (entry->stgmedium.tymed != TYMED_NULL) + { + data_size = GlobalSize(entry->stgmedium.u.hGlobal); + bmi = GlobalLock(entry->stgmedium.u.hGlobal); + } if (!contents) { -- 2.12.0

1 0

[PATCH vkd3d 1/6] tests: Make sure that config.h is included before other headers.
by Józef Kucia 14 Dec '17

14 Dec '17

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_test.h | 3 +-- tests/d3d12.c | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 7eb72d3a29f2..c66b227d1e74 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -19,6 +19,7 @@ #ifndef __VKD3D_TEST_H #define __VKD3D_TEST_H +#include "vkd3d_common.h" #include <assert.h> #include <inttypes.h> #include <stdarg.h> @@ -27,8 +28,6 @@ #include <stdlib.h> #include <string.h> -#include "vkd3d_common.h" - static void vkd3d_test_main(int argc, char **argv); static const char *vkd3d_test_name; diff --git a/tests/d3d12.c b/tests/d3d12.c index 90f848f1d6a0..caf94d235148 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36,11 +36,6 @@ typedef int HRESULT; #endif -#include <inttypes.h> -#include <limits.h> -#include <math.h> -#include <time.h> - #define COBJMACROS #define INITGUID #include "vkd3d_test.h" @@ -48,6 +43,11 @@ typedef int HRESULT; #define WIDL_C_INLINE_WRAPPERS #include "d3d12.h" +#include <inttypes.h> +#include <limits.h> +#include <math.h> +#include <time.h> + #ifdef _WIN32 # include "dxgi1_4.h" #else -- 2.13.6

2 11

[PATCH v2] wsdapi/tests: Register an exception with the firewall to avoid a dialog.
by Hans Leidekker 14 Dec '17

14 Dec '17

v2: Include makefile changes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 140 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index cd4b41865c..c1e559e1ab 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wsdapi.dll -IMPORTS = wsdapi ole32 user32 ws2_32 +IMPORTS = wsdapi ole32 oleaut32 user32 ws2_32 advapi32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index db5947d605..f373510a76 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -27,6 +27,7 @@ #include "initguid.h" #include "objbase.h" #include "wsdapi.h" +#include <netfw.h> typedef struct IWSDiscoveryPublisherNotifyImpl { IWSDiscoveryPublisherNotify IWSDiscoveryPublisherNotify_iface; @@ -276,8 +277,146 @@ static void Publish_tests(void) IWSDiscoveryPublisherNotify_Release(sink2); } +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'w','s','d','a','p','i','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(discovery) { + BOOL firewall_enabled = is_firewall_enabled(); + HRESULT hr; + + if (firewall_enabled) + { + if (!is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + if ((hr = set_firewall(APP_ADD)) != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + CoInitialize(NULL); CreateDiscoveryPublisher_tests(); @@ -285,4 +424,5 @@ START_TEST(discovery) Publish_tests(); CoUninitialize(); + if (firewall_enabled) set_firewall(APP_REMOVE); } -- 2.11.0

2 1

[PATCH] secur32: Add a test for Schannel behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Dmitry Timoshkov 14 Dec '17

14 Dec '17

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/tests/schannel.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b5ed169a97..21ebb6283f 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -686,6 +686,7 @@ static void test_communication(void) SecPkgContext_ConnectionInfo conn_info; SecPkgContext_KeyInfoA key_info; CERT_CONTEXT *cert; + SecPkgContext_NegotiationInfoA info; SecBufferDesc buffers[2]; SecBuffer *buf; @@ -939,6 +940,9 @@ todo_wine status = pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_STREAM_SIZES) failed: %08x\n", status); + status = QueryContextAttributesA(&context, SECPKG_ATTR_NEGOTIATION_INFO, &info); + ok(status == SEC_E_UNSUPPORTED_FUNCTION, "QueryContextAttributesA returned %08x\n", status); + reset_buffers(&buffers[0]); /* Send a simple request so we get data for testing DecryptMessage */ -- 2.15.1

1 0

[PATCH] secur32: Add a test for NTLM behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Dmitry Timoshkov 14 Dec '17

14 Dec '17

... to show that QueryContextAttributes(SECPKG_ATTR_NEGOTIATION_INFO) allocates flat memory block for the PackageInfo structure. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/tests/ntlm.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 355af5ad6f..c060420a3f 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -36,6 +36,29 @@ #include "wine/test.h" +#define NEGOTIATE_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_EXTENDED_ERROR | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_GSS_COMPATIBLE | \ + SECPKG_FLAG_LOGON ) + +#define NTLM_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_LOGON ) + static HMODULE secdll; static PSecurityFunctionTableA (SEC_ENTRY * pInitSecurityInterfaceA)(void); static SECURITY_STATUS (SEC_ENTRY * pFreeContextBuffer)(PVOID pv); @@ -797,6 +820,8 @@ static void testAuth(ULONG data_rep, BOOL fake) SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; + SecPkgContext_NegotiationInfoA info; + SecPkgInfoA *pi; if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)!= SEC_E_OK) { @@ -889,6 +914,41 @@ static void testAuth(ULONG data_rep, BOOL fake) "cbBlockSize should be 0 but is %u\n", ctxt_sizes.cbBlockSize); + memset(&info, 0, sizeof(info)); + sec_status = QueryContextAttributesA(&client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info); +todo_wine + ok(sec_status == SEC_E_OK, "QueryContextAttributesA returned %08x\n", sec_status); + + pi = info.PackageInfo; + ok(info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState); +todo_wine + ok(pi != NULL, "expected non-NULL PackageInfo\n"); + if (pi) + { + UINT expected, got; + char *eob; + + ok(pi->fCapabilities == NTLM_BASE_CAPS || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), + "got %08x\n", pi->fCapabilities); + ok(pi->wVersion == 1, "got %u\n", pi->wVersion); + ok(pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID); + ok(!lstrcmpA( pi->Name, "NTLM" ), "got %s\n", pi->Name); + + expected = sizeof(*pi) + lstrlenA(pi->Name) + 1 + lstrlenA(pi->Comment) + 1; + got = HeapSize(GetProcessHeap(), 0, pi); + ok(got == expected, "got %u, expected %u\n", got, expected); + eob = (char *)pi + expected; + ok(pi->Name + lstrlenA(pi->Name) < eob, "Name doesn't fit into allocated block\n"); + ok(pi->Comment + lstrlenA(pi->Comment) < eob, "Comment doesn't fit into allocated block\n"); + + sec_status = FreeContextBuffer(pi); + ok(sec_status == SEC_E_OK, "FreeContextBuffer error %#x\n", sec_status); + } + tAuthend: cleanupBuffers(&client); cleanupBuffers(&server); -- 2.15.1

1 0

[PATCH] secur32: Add a test for Negotiate behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Dmitry Timoshkov 14 Dec '17

14 Dec '17

1 0

[PATCH] user32/tests: Release window DCs consistently
by Nikolay Sivov 14 Dec '17

14 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/cursoricon.c | 2 ++ dlls/user32/tests/static.c | 1 + dlls/user32/tests/sysparams.c | 3 ++- dlls/user32/tests/win.c | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 61b32e01b6..211376b180 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1070,6 +1070,8 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) ok(ret == bm.bmHeight, "%s: %d lines were converted, not %d\n", test_desc, ret, bm.bmHeight); ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); + + ReleaseDC(NULL, hdc); } static void test_LoadImageFile(const char * test_desc, const unsigned char * image_data, diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 929b50d694..8776c3a9e0 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -99,6 +99,7 @@ static void test_updates(int style, int flags) HDC hdc = GetDC( hStatic); COLORREF colour = GetPixel( hdc, 10, 10); ok ( colour != 0, "pixel should NOT be painted black!\n"); + ReleaseDC(hStatic, hdc); } if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index fa473c163a..5dd8e58ba5 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2918,7 +2918,8 @@ static void test_GetSystemMetrics( void) trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d screen %d,%d\n", avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidthfromreg, screen.cx, screen.cy); } - ReleaseDC( 0, hdc); + + DeleteDC(hdc); } static void test_EnumDisplaySettings(void) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6e72cbc28a..db27b6b755 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5242,6 +5242,7 @@ static void test_scrolldc( HWND parent) if (winetest_debug > 0) dump_region(hrgn); /* clean up */ + ReleaseDC(hwnd1, hdc); DeleteObject(hrgn); DeleteObject(exprgn); DeleteObject(tmprgn); -- 2.15.1

2 1

← Newer
1
...
13
14
15
16
17
18
19
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel December 2017