October 2015 - Wine-commits

Andrew Eikum : xaudio2: Call OnStreamEnd callback.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 8366165e4069dd761f3c5bf386b13d675a593327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8366165e4069dd761f3c5bf38… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 13:56:02 2015 -0500 xaudio2: Call OnStreamEnd callback. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/tests/xaudio2.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/xaudio2_7/xaudio_dll.c | 5 +++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 2cea7af..716fe23 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -374,9 +374,11 @@ static const IXAudio2VoiceCallbackVtbl vcb_buf_vtbl = { static IXAudio2VoiceCallback vcb_buf = { &vcb_buf_vtbl }; static int nloopends = 0; +static int nstreamends = 0; static void WINAPI loop_buf_OnStreamEnd(IXAudio2VoiceCallback *This) { + ++nstreamends; } static void WINAPI loop_buf_OnBufferStart(IXAudio2VoiceCallback *This, @@ -421,7 +423,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) XAUDIO2_BUFFER buf; XAUDIO2_VOICE_STATE state; struct vcb_buf_testdata testdata[5]; - int i; + int i, timeout; obs_calls = 0; obe_calls = 0; @@ -434,6 +436,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + /* test OnBufferStart/End callbacks */ fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; fmt.nChannels = 2; fmt.nSamplesPerSec = 44100; @@ -487,14 +490,48 @@ static void test_buffer_callbacks(IXAudio2 *xa) ok(state.SamplesPlayed == 4410 * 5, "Got wrong samples played\n"); - HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); + if(xaudio27) + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); + else + IXAudio2SourceVoice_DestroyVoice(src); + + + /* test OnStreamEnd callback */ + XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &loop_buf, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + buf.Flags = XAUDIO2_END_OF_STREAM; + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + timeout = 0; + while(nstreamends == 0 && timeout < 1000){ + Sleep(100); + timeout += 100; + } + + ok(nstreamends == 1, "Got wrong number of OnStreamEnd calls: %u\n", nstreamends); + + /* xaudio resets SamplesPlayed after processing an end-of-stream buffer */ + if(xaudio27) + IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); + else + IXAudio2SourceVoice_GetState(src, &state, 0); + ok(state.SamplesPlayed == 0, "Got wrong samples played\n"); if(xaudio27) IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); else IXAudio2SourceVoice_DestroyVoice(src); + IXAudio2MasteringVoice_DestroyVoice(master); + + HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); } static UINT32 play_to_completion(IXAudio2SourceVoice *src, UINT32 max_samples) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 673f53d..41d1d21 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -3092,9 +3092,14 @@ static void update_source_state(XA2SourceImpl *src) TRACE("%p: done with buffer %u\n", src, old_buf); + if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) + src->played_frames = 0; + if(src->cb){ IXAudio2VoiceCallback_OnBufferEnd(src->cb, src->buffers[old_buf].xa2buffer.pContext); + if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) + IXAudio2VoiceCallback_OnStreamEnd(src->cb); if(src->nbufs > 0) IXAudio2VoiceCallback_OnBufferStart(src->cb,

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::Discontinuity.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: b0a9d16cfba262ab92cfc33294336581d1d81bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a9d16cfba262ab92cfc3329… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 13:56:14 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::Discontinuity. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 41d1d21..835426f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -748,7 +748,18 @@ static HRESULT WINAPI XA2SRC_FlushSourceBuffers(IXAudio2SourceVoice *iface) static HRESULT WINAPI XA2SRC_Discontinuity(IXAudio2SourceVoice *iface) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p\n", This); + + EnterCriticalSection(&This->lock); + + if(This->nbufs > 0){ + DWORD last = (This->first_buf + This->nbufs - 1) % XAUDIO2_MAX_QUEUED_BUFFERS; + This->buffers[last].xa2buffer.Flags |= XAUDIO2_END_OF_STREAM; + } + + LeaveCriticalSection(&This->lock); + return S_OK; }

1 0

Austin English : ntoskrnl.exe: Add KeEnterCriticalRegion/ KeLeaveCriticalRegion stubs.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 1a45f75dedf895d32c348ed460258048e65c25c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a45f75dedf895d32c348ed46… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 28 23:03:06 2015 -0400 ntoskrnl.exe: Add KeEnterCriticalRegion/KeLeaveCriticalRegion stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a4a37d9..96af772 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2304,3 +2304,19 @@ PLIST_ENTRY WINAPI ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lo FIXME("(%p %p) stub\n", head, lock); return ExInterlockedRemoveHeadList( head, lock ); } + +/*********************************************************************** + * KeEnterCriticalRegion (NTOSKRNL.EXE.@) + */ +void WINAPI KeEnterCriticalRegion(void) +{ + FIXME(": stub\n"); +} + +/*********************************************************************** + * KeLeaveCriticalRegion (NTOSKRNL.EXE.@) + */ +void WINAPI KeLeaveCriticalRegion(void) +{ + FIXME(": stub\n"); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0bb7d04..58ad879 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -523,7 +523,7 @@ @ stub KeDeregisterBugCheckReasonCallback @ stub KeDetachProcess @ stub KeDisconnectInterrupt -@ stub KeEnterCriticalRegion +@ stdcall KeEnterCriticalRegion() @ stub KeEnterKernelDebugger @ stub KeFindConfigurationEntry @ stub KeFindConfigurationNextEntry @@ -563,7 +563,7 @@ @ stub KeInsertQueueDpc @ stub KeIsAttachedProcess @ stub KeIsExecutingDpc -@ stub KeLeaveCriticalRegion +@ stdcall KeLeaveCriticalRegion() @ stub KeLoaderBlock @ stub KeNumberProcessors @ stub KeProfileInterrupt

1 0

Ken Thomases : gdi32: Antialias fake bold or italic fonts regardless of GASP table.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: a05cdaa1b87d0337bbf5a171c6afd6b776218887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05cdaa1b87d0337bbf5a171c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Sep 29 02:27:15 2015 -0500 gdi32: Antialias fake bold or italic fonts regardless of GASP table. If the client requests a bold typeface of a font which doesn't actually provide a bold typeface, Wine fakes it using FT_Outline_Embolden(). Likewise, it fakes italic by apply a shear transform. These techniques work passably when antialiasing is in effect. However, when antialiasing is disabled at small sizes by the font's GASP table, the results are horrible. The glyphs have many spurs or appear furry. On the theory that fonts disable antialiasing via the GASP table at small sizes because hinting should produce pixel-perfect results and that that rationale is voided by the application of procedural bolding or italicizing, we ignore the GASP table and always antialias for fake bold or italic fonts. There is a new registry setting to disable this and revert to the previous behavior: [HKEY_CURRENT_USER\Software\Wine\Fonts] "AntialiasFakeBoldOrItalic"="n" Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/gdi32/freetype.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8e89cc5..d870b8c5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -503,6 +503,7 @@ static struct list mappings_list = LIST_INIT( mappings_list ); static UINT default_aa_flags; static HKEY hkey_font_cache; +static BOOL antialias_fakes = TRUE; static CRITICAL_SECTION freetype_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -4143,6 +4144,7 @@ static void reorder_font_list(void) */ BOOL WineEngInit(void) { + HKEY hkey; DWORD disposition; HANDLE font_mutex; @@ -4155,6 +4157,23 @@ BOOL WineEngInit(void) init_fontconfig(); #endif + if (!RegOpenKeyExW(HKEY_CURRENT_USER, wine_fonts_key, 0, KEY_READ, &hkey)) + { + static const WCHAR antialias_fake_bold_or_italic[] = { 'A','n','t','i','a','l','i','a','s','F','a','k','e', + 'B','o','l','d','O','r','I','t','a','l','i','c',0 }; + static const WCHAR true_options[] = { 'y','Y','t','T','1',0 }; + DWORD type, size; + WCHAR buffer[20]; + + size = sizeof(buffer); + if (!RegQueryValueExW(hkey, antialias_fake_bold_or_italic, NULL, &type, (BYTE*)buffer, &size) && + type == REG_SZ && size >= 1) + { + antialias_fakes = (strchrW(true_options, buffer[0]) != NULL); + } + RegCloseKey(hkey); + } + if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL) { ERR("Failed to create font mutex\n"); @@ -5534,7 +5553,7 @@ done: case GGO_GRAY4_BITMAP: case GGO_GRAY8_BITMAP: case WINE_GGO_GRAY16_BITMAP: - if (is_hinting_enabled()) + if ((!antialias_fakes || (!ret->fake_bold && !ret->fake_italic)) && is_hinting_enabled()) { WORD gasp_flags; if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY))

1 0

Piotr Caban : msvcrt: Add i386 __CxxExceptionFilter implementation.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 07762576c42c680f573482eb7369f58461c979eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=07762576c42c680f573482eb7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 29 12:23:13 2015 +0200 msvcrt: Add i386 __CxxExceptionFilter implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except_arm.c | 9 +++ dlls/msvcrt/except_i386.c | 71 +++++++++++++++++++--- dlls/msvcrt/except_x86_64.c | 9 +++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 14 files changed, 93 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07762576c42c680f57348…

1 0

Nikolay Sivov : shell32: Added dll manifest file.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 972a74ddfe5d06325338196a26e5b9d295205101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=972a74ddfe5d06325338196a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 30 15:02:01 2015 +0300 shell32: Added dll manifest file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shell32.manifest | 4 ++++ dlls/shell32/shell32.rc | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/shell32/shell32.manifest b/dlls/shell32/shell32.manifest new file mode 100644 index 0000000..1314f18 --- /dev/null +++ b/dlls/shell32/shell32.manifest @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.Shell.Shell32" version="5.1.0.0" processorArchitecture="" /> +</assembly> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 847d2ce..bfba962 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -457,6 +457,9 @@ IDR_AVI_FILEDELETE AVI searching.avi /* @makedep: AUTHORS */ AUTHORS RCDATA AUTHORS +/* @makedep: shell32.manifest */ +124 RT_MANIFEST shell32.manifest + /* please keep in sync with version.h values */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Bruno Jesus : msadpcm32.acm: Stop converting data instead of crashing.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 72528be84fdc0dcfe75e361f4bf7c09fc27b638d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72528be84fdc0dcfe75e361f4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 29 22:06:21 2015 +0800 msadpcm32.acm: Stop converting data instead of crashing. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/msadp32.acm/msadp32.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 2c61575..24e0c6a 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -249,9 +249,17 @@ static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, { const unsigned char* in_src = src; - assert(*src <= 6); + /* Catch a problem from Tomb Raider III (bug 21000) where it passes + * invalid data after a valid sequence of blocks */ + if (*src > 6 || *(src + 1) > 6) + { + /* Recalculate the amount of used output buffer. We are not changing + * nsrc, let's assume the bad data was parsed */ + *ndst -= nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; + WARN("Invalid ADPCM data, stopping conversion\n"); + break; + } coeffL = MSADPCM_CoeffSet[*src++]; - assert(*src <= 6); coeffR = MSADPCM_CoeffSet[*src++]; ideltaL = R16(src); src += 2;

1 0

Aric Stewart : windowscodecs/tests: Handle failure to create PNG decoder.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: dc3bf7d85b7e4dd5884dbb1e32a7f0dee17ba3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3bf7d85b7e4dd5884dbb1e3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 30 10:54:15 2015 -0500 windowscodecs/tests: Handle failure to create PNG decoder. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/windowscodecs/tests/pngformat.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index bf370a3..34cb533 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -295,6 +295,7 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + if (FAILED(hr)) return NULL; hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); @@ -342,6 +343,7 @@ static void test_color_contexts(void) decoder = create_decoder(png_no_color_profile, sizeof(png_no_color_profile)); ok(decoder != 0, "Failed to load PNG image data\n"); + if (!decoder) return; /* global color context */ hr = IWICBitmapDecoder_GetColorContexts(decoder, 0, NULL, NULL); @@ -369,6 +371,7 @@ static void test_color_contexts(void) decoder = create_decoder(png_color_profile, sizeof(png_color_profile)); ok(decoder != 0, "Failed to load PNG image data\n"); + if (!decoder) return; /* global color context */ count = 0xdeadbeef; @@ -546,6 +549,7 @@ static void test_png_palette(void) decoder = create_decoder(png_PLTE_tRNS, sizeof(png_PLTE_tRNS)); ok(decoder != 0, "Failed to load PNG image data\n"); + if (!decoder) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr);

1 0

Aric Stewart : windowscodecs/tests: Handle failure to create TIFF decoder.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: af6413aaeb1d67db9ec77545ccef6d402756cf02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6413aaeb1d67db9ec77545c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 30 10:54:19 2015 -0500 windowscodecs/tests: Handle failure to create TIFF decoder. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/windowscodecs/tests/tiffformat.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index d07caa3..e4a4b66 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -170,6 +170,7 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + if (FAILED(hr)) return NULL; hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guid); ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); @@ -190,6 +191,7 @@ static void test_tiff_palette(void) decoder = create_decoder(&tiff_1bpp_data, sizeof(tiff_1bpp_data)); ok(decoder != 0, "Failed to load TIFF image data\n"); + if (!decoder) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); @@ -231,6 +233,7 @@ static void test_QueryCapability(void) hr = IWICImagingFactory_CreateDecoder(factory, &GUID_ContainerFormatTiff, NULL, &decoder); ok(hr == S_OK, "CreateDecoder error %#x\n", hr); + if (FAILED(hr)) return; frame_count = 0xdeadbeef; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); @@ -322,6 +325,7 @@ static void test_tiff_8bpp_alpha(void) decoder = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha)); ok(decoder != 0, "Failed to load TIFF image data\n"); + if (!decoder) return; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok(hr == S_OK, "GetFrameCount error %#x\n", hr);

1 0

Aric Stewart : secur32/tests: Handle skip cleanup in negotiate more cleanly.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: e8d54db727fd7c38c47157a94790018c0e1a131e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d54db727fd7c38c47157a94… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 30 11:04:59 2015 -0500 secur32/tests: Handle skip cleanup in negotiate more cleanly. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/secur32/tests/negotiate.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index 91c3fa1..4f07dbe 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -262,6 +262,9 @@ static void test_authentication(void) SecPkgInfoA *pi; BOOL first = TRUE; + memset(&client, 0, sizeof(client)); + memset(&server, 0, sizeof(server)); + id.User = (unsigned char *)"user"; id.UserLength = strlen( "user" ); id.Domain = (unsigned char *)"domain"; @@ -342,17 +345,29 @@ done: cleanup_buffers( &client ); cleanup_buffers( &server ); - status_c = pDeleteSecurityContext( &client.ctxt ); - ok( status_c == SEC_E_OK, "DeleteSecurityContext returned %08x\n", status_c ); + if (client.ctxt.dwLower || client.ctxt.dwUpper) + { + status_c = pDeleteSecurityContext( &client.ctxt ); + ok( status_c == SEC_E_OK, "DeleteSecurityContext returned %08x\n", status_c ); + } - status_s = pDeleteSecurityContext( &server.ctxt ); - ok( status_s == SEC_E_OK, "DeleteSecurityContext returned %08x\n", status_s ); + if (server.ctxt.dwLower || server.ctxt.dwUpper) + { + status_s = pDeleteSecurityContext( &server.ctxt ); + ok( status_s == SEC_E_OK, "DeleteSecurityContext returned %08x\n", status_s ); + } - status_c = pFreeCredentialsHandle( &client.cred ); - ok( status_c == SEC_E_OK, "FreeCredentialsHandle returned %08x\n", status_c ); + if (client.cred.dwLower || client.cred.dwUpper) + { + status_c = pFreeCredentialsHandle( &client.cred ); + ok( status_c == SEC_E_OK, "FreeCredentialsHandle returned %08x\n", status_c ); + } - status_s = pFreeCredentialsHandle(&server.cred); - ok( status_s == SEC_E_OK, "FreeCredentialsHandle returned %08x\n", status_s ); + if (server.cred.dwLower || server.cred.dwUpper) + { + status_s = pFreeCredentialsHandle(&server.cred); + ok( status_s == SEC_E_OK, "FreeCredentialsHandle returned %08x\n", status_s ); + } } START_TEST(negotiate)

1 0