wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Nikolay Sivov : msxml3/tests: A test to show that writer flushes buffer to stream automatically.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 9a4d8c30d1b00d51bd74a366580cd485586828fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4d8c30d1b00d51bd74a3665… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 14:43:56 2012 +0400 msxml3/tests: A test to show that writer flushes buffer to stream automatically. --- dlls/msxml3/tests/saxreader.c | 82 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index b4d6f7f..003446f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2813,6 +2813,7 @@ static void test_mxwriter_properties(void) static void test_mxwriter_flush(void) { + static const WCHAR emptyW[] = {0}; ISAXContentHandler *content; IMXWriter *writer; LARGE_INTEGER pos; @@ -2820,6 +2821,7 @@ static void test_mxwriter_flush(void) IStream *stream; VARIANT dest; HRESULT hr; + char *buff; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -2886,9 +2888,89 @@ static void test_mxwriter_flush(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(pos2.QuadPart != 0, "expected stream position moved\n"); + IStream_Release(stream); + + /* auto-flush feature */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + EXPECT_HR(hr, S_OK); + EXPECT_REF(stream, 1); + + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_byteOrderMark(writer, VARIANT_FALSE); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + EXPECT_HR(hr, S_OK); + + /* internal buffer is flushed automatically on certain threshold */ + pos.QuadPart = 0; + pos2.QuadPart = 1; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); + + buff = HeapAlloc(GetProcessHeap(), 0, 2048); + memset(buff, 'A', 2048); + hr = ISAXContentHandler_characters(content, _bstr_(buff), 2048); + EXPECT_HR(hr, S_OK); + + pos.QuadPart = 0; + pos2.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); +todo_wine + ok(pos2.QuadPart != 0, "unexpected stream beginning\n"); + + hr = ISAXContentHandler_endDocument(content); + EXPECT_HR(hr, S_OK); + + IStream_Release(stream); + + /* test char count lower than threshold */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + EXPECT_HR(hr, S_OK); + EXPECT_REF(stream, 1); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + EXPECT_HR(hr, S_OK); + + pos.QuadPart = 0; + pos2.QuadPart = 1; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); + + memset(buff, 'A', 2048); + hr = ISAXContentHandler_characters(content, _bstr_(buff), 2040); + EXPECT_HR(hr, S_OK); + + pos.QuadPart = 0; + pos2.QuadPart = 1; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); + + hr = ISAXContentHandler_endDocument(content); + EXPECT_HR(hr, S_OK); + + HeapFree(GetProcessHeap(), 0, buff); ISAXContentHandler_Release(content); IStream_Release(stream); IMXWriter_Release(writer); + free_bstrs(); } static void test_mxwriter_startenddocument(void)

1 0

Nikolay Sivov : msxml3/tests: Fix test crashes running old versions.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: cce2b95a8f7dc1f8f74437a8822cfd1149a4dd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce2b95a8f7dc1f8f74437a88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 14:38:30 2012 +0400 msxml3/tests: Fix test crashes running old versions. --- dlls/msxml3/tests/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 49a6cb0..b4d6f7f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3760,7 +3760,7 @@ static void test_mxwriter_encoding(void) "%s: encoding not accepted\n", enc); if (hr != S_OK) { - enc = encoding_names[i++]; + enc = encoding_names[++i]; IStream_Release(stream); continue; }

1 0

Nikolay Sivov : msxml3: Support dumping VT_VARIANT|VT_BYREF variants.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 08d3b4b9fc0c17be3d03d3c428a92a8f708e5414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d3b4b9fc0c17be3d03d3c42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:52:14 2012 +0400 msxml3: Support dumping VT_VARIANT|VT_BYREF variants. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 93b5b10..bfb301e 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -287,6 +287,8 @@ const char *debugstr_variant(const VARIANT *v) V_BSTRREF(v), debugstr_w(V_BSTRREF(v) ? *V_BSTRREF(v) : NULL)); case VT_ERROR: return wine_dbg_sprintf("{VT_ERROR: 0x%08x}", V_ERROR(v)); + case VT_VARIANT|VT_BYREF: + return wine_dbg_sprintf("{VT_VARIANT|VT_BYREF: %s}", debugstr_variant(V_VARIANTREF(v))); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); }

1 0

Nikolay Sivov : urlmon: Implement TYMED_HGLOBAL case for CopyStgMedium.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 6c4bdf3bdf95718db25ccf67d16ee0e7bdf1a55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4bdf3bdf95718db25ccf67d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 02:06:06 2012 +0400 urlmon: Implement TYMED_HGLOBAL case for CopyStgMedium. --- dlls/urlmon/tests/misc.c | 33 ++++++++++++++++++++++++++++++++- dlls/urlmon/urlmon_main.c | 15 +++++++++++++++ 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 6af98f3..fb20509 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1219,8 +1219,10 @@ static void test_ReleaseBindInfo(void) static void test_CopyStgMedium(void) { STGMEDIUM src, dst; - HGLOBAL empty; + HGLOBAL empty, hg; + char *ptr1, *ptr2; HRESULT hres; + int size; static WCHAR fileW[] = {'f','i','l','e',0}; @@ -1257,6 +1259,35 @@ static void test_CopyStgMedium(void) ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease); ReleaseStgMedium(&dst); + /* TYMED_HGLOBAL */ + hg = GlobalAlloc(GMEM_MOVEABLE, 10); + ptr1 = GlobalLock(hg); + memset(ptr1, 0xfa, 10); + memset(&dst, 0xe0, sizeof(dst)); + src.tymed = TYMED_HGLOBAL; + src.u.hGlobal = hg; + hres = pCopyStgMedium(&src, &dst); + ok(hres == S_OK, "CopyStgMedium failed: %08x\n", hres); + ok(dst.tymed == TYMED_HGLOBAL, "tymed=%d\n", dst.tymed); + ok(dst.u.hGlobal != hg, "got %p, %p\n", dst.u.hGlobal, hg); + size = GlobalSize(dst.u.hGlobal); + ok(size == 10, "got size %d\n", size); + /* compare contents */ + ptr2 = GlobalLock(dst.u.hGlobal); + ok(!memcmp(ptr1, ptr2, 10), "got wrong data\n"); + GlobalUnlock(ptr2); + GlobalUnlock(ptr1); + ok(GlobalFlags(dst.u.hGlobal) == 0, "got 0x%08x\n", GlobalFlags(dst.u.hGlobal)); + GlobalFree(hg); + ReleaseStgMedium(&dst); + + memset(&dst, 0xe0, sizeof(dst)); + src.tymed = TYMED_HGLOBAL; + src.u.hGlobal = NULL; + hres = pCopyStgMedium(&src, &dst); + ok(hres == S_OK, "CopyStgMedium failed: %08x\n", hres); + ok(dst.u.hGlobal == NULL, "got %p\n", dst.u.hGlobal); + hres = pCopyStgMedium(&src, NULL); ok(hres == E_POINTER, "CopyStgMedium failed: %08x, expected E_POINTER\n", hres); hres = pCopyStgMedium(NULL, &dst); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 0cb72dd..f2abe13 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -544,6 +544,21 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) if(dst->u.pstg) IStorage_AddRef(dst->u.pstg); break; + case TYMED_HGLOBAL: + if(dst->u.hGlobal) { + SIZE_T size = GlobalSize(src->u.hGlobal); + char *src_ptr, *dst_ptr; + + dst->u.hGlobal = GlobalAlloc(GMEM_FIXED, size); + if(!dst->u.hGlobal) + return E_OUTOFMEMORY; + dst_ptr = GlobalLock(dst->u.hGlobal); + src_ptr = GlobalLock(src->u.hGlobal); + memcpy(dst_ptr, src_ptr, size); + GlobalUnlock(src_ptr); + GlobalUnlock(dst_ptr); + } + break; default: FIXME("Unimplemented tymed %d\n", src->tymed); }

1 0

Michael Stefaniuc : winhttp/tests: Remove wrong check for 'len'.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 6542c708ed51f90cf94366faa967eb88fc8c3408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6542c708ed51f90cf94366faa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:06:37 2012 +0200 winhttp/tests: Remove wrong check for 'len'. --- dlls/winhttp/tests/url.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index d447879..f0bd434 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -142,7 +142,6 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, 0, NULL, NULL ); ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0u, "expected len ~0u got %u\n", len ); /* valid components, NULL url */ SetLastError( 0xdeadbeef );

1 0

Michael Stefaniuc : ddraw/tests: Remove some stray ok() calls.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 7fcbf0736e5800fbd117cd994f600f342adcdd34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcbf0736e5800fbd117cd994… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:03:57 2012 +0200 ddraw/tests: Remove some stray ok() calls. --- dlls/ddraw/tests/d3d.c | 2 -- dlls/ddraw/tests/visual.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d4a344d..bdac379 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2849,9 +2849,7 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x103d, "Expected 0x103d, got %x\n", result[0]); - ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[1] == 0x3f, "Expected 0x3f, got %x\n", result[1]); - ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[2] == 0x3f, "Expected 0x3f, got %x\n", result[2]); view._11=1.0; view._12=0.0; view._13=0.0; view._14=0.0; diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 73d2b1a..1571b3a 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -560,8 +560,6 @@ static void fog_test(IDirect3DDevice7 *device) untransformed_2, 4, Indices, 6, 0); ok(hr == D3D_OK, "DrawIndexedPrimitive returned %08x\n", hr); - /* transformed verts */ - ok( hr == D3D_OK, "SetFVF returned %08x\n", hr); /* Transformed, vertex fog != NONE, pixel fog == NONE: Use specular color alpha component */ hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, transformed_1, 4, Indices, 6, 0);

1 0

Michael Stefaniuc : jscript/tests: Check the correct return value.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 8f4512f76324e27e8f84f82ecf4565860dfe6c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f4512f76324e27e8f84f82ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:02:02 2012 +0200 jscript/tests: Check the correct return value. --- dlls/jscript/tests/jscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 0ffb2a5..cdd29b6 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -255,7 +255,7 @@ static IDispatchEx *get_script_dispatch(IActiveScript *script) hres = IActiveScript_GetScriptDispatch(script, NULL, &disp); ok(hres == S_OK, "GetScriptDispatch failed: %08x\n", hres); - IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); IDispatch_Release(disp); ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres); return dispex;

1 0

Dmitry Timoshkov : gdiplus: Use font emSize to map to pixel size instead of using gdi32 font metrics.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: a4f79c347e1aa55516d0e8f3916f68b25483ed75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f79c347e1aa55516d0e8f39… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 21 14:40:53 2012 +0900 gdiplus: Use font emSize to map to pixel size instead of using gdi32 font metrics. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 70ddef6..51733f4 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -483,7 +483,7 @@ GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) { /* FIXME: use graphics */ - lf->lfHeight = -font->otm.otmTextMetrics.tmAscent; + lf->lfHeight = -em_size_to_pixel(font->emSize, font->unit, font->family->dpi); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0;

1 0

Francois Gouget : quartz/tests: Fix compilation on systems that don' t support nameless structs.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 0f504a17ced3bd7a481f5b1f217796d04c3cb60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f504a17ced3bd7a481f5b1f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 18:01:52 2012 +0200 quartz/tests: Fix compilation on systems that don't support nameless structs. --- dlls/quartz/tests/filtergraph.c | 6 +++--- dlls/quartz/tests/filtermapper.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 967a4ac..ea37b2f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1798,8 +1798,8 @@ static void test_render_filter_priority(void) rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = rgPins2; rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; rgPins2[0].cInstances = 1; rgPins2[0].nMediaTypes = 1; @@ -1825,7 +1825,7 @@ static void test_render_filter_priority(void) &CLSID_LegacyAmFilterCategory, NULL, &rgf2); ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); - S1(U(rgf2)).cPins2 = 2; + S2(U(rgf2)).cPins2 = 2; rgPins2[0].dwFlags = 0; rgPinType[0].clsMinorType = &mediasubtype1; diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 68918f2..b52d17e 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -104,8 +104,8 @@ static void test_fm2_enummatchingfilters(void) /* Test that a test renderer filter is returned when enumerating filters with bRender=FALSE */ rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = rgPins2; rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; rgPins2[0].cInstances = 1; @@ -136,7 +136,7 @@ static void test_fm2_enummatchingfilters(void) rgPins2[1].lpMedium = NULL; rgPins2[1].clsPinCategory = NULL; - S1(U(rgf2)).cPins2 = 2; + S2(U(rgf2)).cPins2 = 2; hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter2, wszFilterName2, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); @@ -418,8 +418,8 @@ static void test_register_filter_with_null_clsMinorType(void) ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 1; rgf2.dwMerit = MERIT_UNLIKELY; - S(U(rgf2)).cPins = 1; - S(U(rgf2)).rgPins = &rgPins; + S1(U(rgf2)).cPins = 1; + S1(U(rgf2)).rgPins = &rgPins; rgPins.strName = wszPinName; rgPins.bRendered = 1; @@ -447,8 +447,8 @@ static void test_register_filter_with_null_clsMinorType(void) ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = &rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = &rgPins2; rgPins2.dwFlags = REG_PINFLAG_B_RENDERER; rgPins2.cInstances = 1;

1 0

Francois Gouget : secur32: Make some SecurityFunction methods static.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 71945b76356c4772bd2d8012477755b22714aa1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71945b76356c4772bd2d80124… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 17:51:53 2012 +0200 secur32: Make some SecurityFunction methods static. --- dlls/secur32/negotiate.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index ac48a77..bf16258 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -407,7 +407,7 @@ static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, /*********************************************************************** * FreeCredentialsHandle */ -SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) +static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) { TRACE("%p\n", phCredential); @@ -417,7 +417,7 @@ SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) /*********************************************************************** * EncryptMessage */ -SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); @@ -428,7 +428,7 @@ SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, /*********************************************************************** * DecryptMessage */ -SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
74
Older →

Jump to page:

2025

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-commits May 2012