May 2012 - Wine-Commits - list.winehq.org

Vincent Povirk : windowscodecs: Add wrapper functions for IWICBitmapLock methods.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: f745f48bdfecdb2ed265a3f65720443d0965a363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f745f48bdfecdb2ed265a3f65… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:35:20 2012 -0500 windowscodecs: Add wrapper functions for IWICBitmapLock methods. --- dlls/windowscodecs/proxy.c | 12 ++++++++++++ dlls/windowscodecs/windowscodecs.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index f6d9649..5d45167 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -36,6 +36,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IWICBitmapLock_GetDataPointer_Proxy_W(IWICBitmapLock *iface, + UINT *pcbBufferSize, BYTE **ppbData) +{ + return IWICBitmapLock_GetDataPointer(iface, pcbBufferSize, ppbData); +} + +HRESULT WINAPI IWICBitmapLock_GetStride_Proxy_W(IWICBitmapLock *iface, + UINT *pcbStride) +{ + return IWICBitmapLock_GetStride(iface, pcbStride); +} + HRESULT WINAPI IWICBitmapSource_GetSize_Proxy_W(IWICBitmapSource *iface, UINT *puiWidth, UINT *puiHeight) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index c4b8873..4c30c43 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -41,8 +41,8 @@ @ stub IWICBitmapFrameEncode_SetSize_Proxy @ stub IWICBitmapFrameEncode_SetThumbnail_Proxy @ stub IWICBitmapFrameEncode_WriteSource_Proxy -@ stub IWICBitmapLock_GetDataPointer_STA_Proxy -@ stub IWICBitmapLock_GetStride_Proxy +@ stdcall IWICBitmapLock_GetDataPointer_STA_Proxy(ptr ptr ptr) IWICBitmapLock_GetDataPointer_Proxy_W +@ stdcall IWICBitmapLock_GetStride_Proxy(ptr ptr) IWICBitmapLock_GetStride_Proxy_W @ stub IWICBitmapScaler_Initialize_Proxy @ stdcall IWICBitmapSource_CopyPalette_Proxy(ptr ptr) IWICBitmapSource_CopyPalette_Proxy_W @ stdcall IWICBitmapSource_CopyPixels_Proxy(ptr ptr long long ptr) IWICBitmapSource_CopyPixels_Proxy_W

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICComponentInfo methods.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: de9d18c6ff4ba90bf6ed8e655949a48caabc95c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9d18c6ff4ba90bf6ed8e655… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:55:30 2012 -0500 windowscodecs: Add wrapper functions for IWICComponentInfo methods. --- dlls/windowscodecs/proxy.c | 30 ++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 10 +++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index ec3ed9b..c1c99ca 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -108,6 +108,36 @@ HRESULT WINAPI IWICColorContext_InitializeFromMemory_Proxy_W(IWICColorContext *i return IWICColorContext_InitializeFromMemory(iface, pbBuffer, cbBufferSize); } +HRESULT WINAPI IWICComponentInfo_GetCLSID_Proxy_W(IWICComponentInfo *iface, + CLSID *pclsid) +{ + return IWICComponentInfo_GetCLSID(iface, pclsid); +} + +HRESULT WINAPI IWICComponentInfo_GetAuthor_Proxy_W(IWICComponentInfo *iface, + UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual) +{ + return IWICComponentInfo_GetAuthor(iface, cchAuthor, wzAuthor, pcchActual); +} + +HRESULT WINAPI IWICComponentInfo_GetVersion_Proxy_W(IWICComponentInfo *iface, + UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual) +{ + return IWICComponentInfo_GetVersion(iface, cchVersion, wzVersion, pcchActual); +} + +HRESULT WINAPI IWICComponentInfo_GetSpecVersion_Proxy_W(IWICComponentInfo *iface, + UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) +{ + return IWICComponentInfo_GetSpecVersion(iface, cchSpecVersion, wzSpecVersion, pcchActual); +} + +HRESULT WINAPI IWICComponentInfo_GetFriendlyName_Proxy_W(IWICComponentInfo *iface, + UINT cchFriendlyName, WCHAR *wzFriendlyName, UINT *pcchActual) +{ + return IWICComponentInfo_GetFriendlyName(iface, cchFriendlyName, wzFriendlyName, pcchActual); +} + HRESULT WINAPI IWICFastMetadataEncoder_Commit_Proxy_W(IWICFastMetadataEncoder *iface) { return IWICFastMetadataEncoder_Commit(iface); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 8636343..930f2c4 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -55,11 +55,11 @@ @ stdcall IWICColorContext_InitializeFromMemory_Proxy(ptr ptr long) IWICColorContext_InitializeFromMemory_Proxy_W @ stub IWICComponentFactory_CreateMetadataWriterFromReader_Proxy @ stub IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy -@ stub IWICComponentInfo_GetAuthor_Proxy -@ stub IWICComponentInfo_GetCLSID_Proxy -@ stub IWICComponentInfo_GetFriendlyName_Proxy -@ stub IWICComponentInfo_GetSpecVersion_Proxy -@ stub IWICComponentInfo_GetVersion_Proxy +@ stdcall IWICComponentInfo_GetAuthor_Proxy(ptr long ptr ptr) IWICComponentInfo_GetAuthor_Proxy_W +@ stdcall IWICComponentInfo_GetCLSID_Proxy(ptr ptr) IWICComponentInfo_GetCLSID_Proxy_W +@ stdcall IWICComponentInfo_GetFriendlyName_Proxy(ptr long ptr ptr) IWICComponentInfo_GetFriendlyName_Proxy_W +@ stdcall IWICComponentInfo_GetSpecVersion_Proxy(ptr long ptr ptr) IWICComponentInfo_GetSpecVersion_Proxy_W +@ stdcall IWICComponentInfo_GetVersion_Proxy(ptr long ptr ptr) IWICComponentInfo_GetVersion_Proxy_W @ stdcall IWICFastMetadataEncoder_Commit_Proxy(ptr) IWICFastMetadataEncoder_Commit_Proxy_W @ stdcall IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy(ptr ptr) IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy_W @ stub IWICFormatConverter_Initialize_Proxy

1 0

Hans Leidekker : secur32/tests: Add tests for the Negotiate provider.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: cb90e6b1a643f35ba31c6e2790986dfcf0ac3c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb90e6b1a643f35ba31c6e279… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:06:46 2012 +0200 secur32/tests: Add tests for the Negotiate provider. --- dlls/secur32/tests/Makefile.in | 1 + dlls/secur32/tests/negotiate.c | 383 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 384 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb90e6b1a643f35ba31c6…

1 0

Hans Leidekker : secur32: Fix potential leaks of the NTLM session key.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 81213a88e83b19c73e244e00bffac2e4057d513c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81213a88e83b19c73e244e00b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:04:53 2012 +0200 secur32: Fix potential leaks of the NTLM session key. --- dlls/secur32/dispatcher.c | 1 + dlls/secur32/ntlm.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 33b0512..5a9e26a 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -281,6 +281,7 @@ void cleanup_helper(PNegoHelper helper) return; HeapFree(GetProcessHeap(), 0, helper->com_buf); + HeapFree(GetProcessHeap(), 0, helper->session_key); /* closing stdin will terminate ntlm_auth */ close(helper->pipe_out); diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index d002b37..524eec3 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -825,7 +825,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_BUFFER_TOO_SMALL; if ((phContext == NULL) && (pInput == NULL)) { - HeapFree(GetProcessHeap(), 0, helper->session_key); cleanup_helper(helper); phNewContext->dwUpper = 0; phNewContext->dwLower = 0; @@ -844,7 +843,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_BUFFER_TOO_SMALL; if ((phContext == NULL) && (pInput == NULL)) { - HeapFree(GetProcessHeap(), 0, helper->session_key); cleanup_helper(helper); phNewContext->dwUpper = 0; phNewContext->dwLower = 0; @@ -858,7 +856,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_INTERNAL_ERROR; if ((phContext == NULL) && (pInput == NULL)) { - HeapFree(GetProcessHeap(), 0, helper->session_key); cleanup_helper(helper); phNewContext->dwUpper = 0; phNewContext->dwLower = 0; @@ -907,8 +904,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( helper->session_key = HeapAlloc(GetProcessHeap(), 0, bin_len); if(!helper->session_key) { - TRACE("Failed to allocate memory for session key\n"); - ret = SEC_E_INTERNAL_ERROR; + ret = SEC_E_INSUFFICIENT_MEMORY; goto isc_end; } memcpy(helper->session_key, bin, bin_len); @@ -1288,7 +1284,13 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( if(strncmp(buffer, "BH ", 3) == 0) { TRACE("Helper sent %s\n", debugstr_a(buffer+3)); + HeapFree(GetProcessHeap(), 0, helper->session_key); helper->session_key = HeapAlloc(GetProcessHeap(), 0, 16); + if (!helper->session_key) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + goto asc_end; + } /*FIXME: Generate the dummy session key = MD4(MD4(password))*/ memset(helper->session_key, 0 , 16); } @@ -1300,11 +1302,11 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( TRACE("Failed to decode session key\n"); } TRACE("Session key is %s\n", debugstr_a(buffer+3)); + HeapFree(GetProcessHeap(), 0, helper->session_key); helper->session_key = HeapAlloc(GetProcessHeap(), 0, 16); if(!helper->session_key) { - TRACE("Failed to allocate memory for session key\n"); - ret = SEC_E_INTERNAL_ERROR; + ret = SEC_E_INSUFFICIENT_MEMORY; goto asc_end; } memcpy(helper->session_key, bin, 16); @@ -1356,7 +1358,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContex phContext->dwLower = 0; SECUR32_arc4Cleanup(helper->crypt.ntlm.a4i); - HeapFree(GetProcessHeap(), 0, helper->session_key); SECUR32_arc4Cleanup(helper->crypt.ntlm2.send_a4i); SECUR32_arc4Cleanup(helper->crypt.ntlm2.recv_a4i); HeapFree(GetProcessHeap(), 0, helper->crypt.ntlm2.send_sign_key);

1 0

Christian Costa : d3drm/tests: Fix error message.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 3e24242618047ae9a1be5fa71953def16c3c55cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e24242618047ae9a1be5fa71… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 10 07:52:12 2012 +0200 d3drm/tests: Fix error message. --- dlls/d3drm/tests/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c48cc2c..64f93cf 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -779,7 +779,7 @@ static const GUID* refiids[] = static void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) { ok(object != NULL, "Arg 1 should not be null\n"); - ok(IsEqualGUID(objectguid, refiids[nb_objects]), "Arg 2 should is incorrect\n"); + ok(IsEqualGUID(objectguid, refiids[nb_objects]), "Arg 2 is incorrect\n"); ok(arg == (LPVOID)0xdeadbeef, "Arg 3 should be 0xdeadbeef (got %p)\n", arg); nb_objects++; }

1 0

Hans Leidekker : secur32: Implement a Negotiate provider that forwards to NTLM.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 19f8c79f9eaff076edd959a0187657633216f0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f8c79f9eaff076edd959a01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:06:20 2012 +0200 secur32: Implement a Negotiate provider that forwards to NTLM. --- dlls/secur32/negotiate.c | 484 ++++++++++++++++++++++++------------------- dlls/secur32/ntlm.c | 95 ++------- dlls/secur32/secur32_priv.h | 30 +++ 3 files changed, 318 insertions(+), 291 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19f8c79f9eaff076edd95…

1 0

Akihiro Sagawa : po: Refine Japanese translation to aid understanding.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 08c552a0bdac7bbd2ad961612f8124996d0abdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c552a0bdac7bbd2ad961612… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 9 23:16:27 2012 +0900 po: Refine Japanese translation to aid understanding. --- po/ja.po | 306 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 153 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08c552a0bdac7bbd2ad96…

1 0

Christian Costa : dmsynth: Display new ref in trace for AddRef and Release.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 90085afebf8966dbc2bb17fc645e8397d5cdb2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=90085afebf8966dbc2bb17fc6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 10 07:53:34 2012 +0200 dmsynth: Display new ref in trace for AddRef and Release. --- dlls/dmsynth/synth.c | 32 ++++++++++++++++---------------- dlls/dmsynth/synthsink.c | 30 +++++++++++++++--------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 9c088af..657f3bd 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -59,32 +59,32 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(LPDIRECTMUSICSYNTH8 static ULONG WINAPI IDirectMusicSynth8Impl_AddRef(LPDIRECTMUSICSYNTH8 iface) { - IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - DMSYNTH_LockModule(); + DMSYNTH_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusicSynth8Impl_Release(LPDIRECTMUSICSYNTH8 iface) { - IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!refCount) { - if (This->pLatencyClock) - IReferenceClock_Release(This->pLatencyClock); - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) { + if (This->pLatencyClock) + IReferenceClock_Release(This->pLatencyClock); + HeapFree(GetProcessHeap(), 0, This); + } - DMSYNTH_UnlockModule(); - - return refCount; + DMSYNTH_UnlockModule(); + + return ref; } /* IDirectMusicSynth8Impl IDirectMusicSynth part: */ diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index e5e164f..42c2d4c 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -53,32 +53,32 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNT static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK iface) { - IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - DMSYNTH_LockModule(); + DMSYNTH_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK iface) { - IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!refCount) { - if (This->latency_clock) - IReferenceClock_Release(This->latency_clock); - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) { + if (This->latency_clock) + IReferenceClock_Release(This->latency_clock); + HeapFree(GetProcessHeap(), 0, This); + } - DMSYNTH_UnlockModule(); + DMSYNTH_UnlockModule(); - return refCount; + return ref; } /* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */

1 0

Dan Kegel : riched20: Don' t need to redraw when changing selection from none to none.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 499604337461d0fbd9f922022fa86a9fc0434317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499604337461d0fbd9f922022… Author: Dan Kegel <dank(a)kegel.com> Date: Wed May 9 14:53:01 2012 -0700 riched20: Don't need to redraw when changing selection from none to none. --- dlls/riched20/caret.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 093bd20..7decff2 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -146,8 +146,11 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { int start, end; ME_GetSelectionOfs(editor, &start, &end); - editor->pCursors[1] = editor->pCursors[0]; - ME_Repaint(editor); + if (start != end) + { + editor->pCursors[1] = editor->pCursors[0]; + ME_Repaint(editor); + } ME_ClearTempStyle(editor); return end; }

1 0

Hans Leidekker : secur32: Remove some unused variables.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: ebab1c72cf4bf6a5bc250b3d6228b6fdb2f2bb4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebab1c72cf4bf6a5bc250b3d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:05:07 2012 +0200 secur32: Remove some unused variables. --- dlls/secur32/ntlm.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 524eec3..da02366 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -142,7 +142,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( { SECURITY_STATUS ret; PNtlmCredentials ntlm_cred = NULL; - SEC_WCHAR *username = NULL, *domain = NULL; TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, @@ -222,10 +221,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( phCredential = NULL; ret = SEC_E_UNKNOWN_CREDENTIALS; } - - HeapFree(GetProcessHeap(), 0, username); - HeapFree(GetProcessHeap(), 0, domain); - return ret; } @@ -433,7 +428,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { SECURITY_STATUS ret; - PNtlmCredentials ntlm_cred = NULL; + PNtlmCredentials ntlm_cred; PNegoHelper helper = NULL; ULONG ctxt_attr = 0; char* buffer, *want_flags = NULL; @@ -1783,9 +1778,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, if(helper->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCHANGE) SECUR32_arc4Process(helper->crypt.ntlm2.send_a4i, ((BYTE *)pMessage->pBuffers[token_idx].pvBuffer)+4, 8); - - - return SEC_E_OK; } else { @@ -1808,9 +1800,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, if(helper->neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN || helper->neg_flags == 0) memset(sig+4, 0, 4); - } - return SEC_E_OK; }

1 0