August 2006 - Wine-Commits - list.winehq.org

H. Verbeet : wined3d: Improve float constant loading a bit.
by Alexandre Julliard Aug. 21, 2006

Aug. 21, 2006

Module: wine Branch: master Commit: 09eb0c40a63a09150c1c70308864017c27f72fbc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=09eb0c40a63a09150c1c703… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Aug 19 17:24:02 2006 +0200 wined3d: Improve float constant loading a bit. - Use a list to keep track of what constants are set. - Move TRACEs and checkGLcall calls out of the main constant loading loop. --- dlls/wined3d/arb_program_shader.c | 78 +++++++++++++++++++-------------- dlls/wined3d/device.c | 14 +++++- dlls/wined3d/glsl_shader.c | 87 +++++++++++++++++++++++++------------ dlls/wined3d/stateblock.c | 13 ++++++ dlls/wined3d/wined3d_private.h | 7 +++ 5 files changed, 135 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=09eb0c40a63a09150c1…

1 0

Roderick Colenbrander : wined3d: Better GPU detection.
by Alexandre Julliard Aug. 21, 2006

Aug. 21, 2006

Module: wine Branch: master Commit: de97fa7a3be906e06f99c730c52390f451b8a974 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de97fa7a3be906e06f99c73… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Aug 19 11:58:23 2006 +0200 wined3d: Better GPU detection. --- dlls/wined3d/directx.c | 205 +++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 6 + include/wine/wined3d_gl.h | 30 ++++-- 3 files changed, 177 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=de97fa7a3be906e06f9…

1 0

H. Verbeet : wined3d: Lookup GLSL float uniform locations only once per program.
by Alexandre Julliard Aug. 21, 2006

Aug. 21, 2006

Module: wine Branch: master Commit: 49f4c68e29a9eed401b8e0f3f33a03fbe0d47667 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=49f4c68e29a9eed401b8e0f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Aug 19 17:23:20 2006 +0200 wined3d: Lookup GLSL float uniform locations only once per program. --- dlls/wined3d/device.c | 29 ++++++++++++++++++++---- dlls/wined3d/drawprim.c | 11 +++++---- dlls/wined3d/glsl_shader.c | 49 +++++++++++++++++----------------------- dlls/wined3d/stateblock.c | 6 ++--- dlls/wined3d/wined3d_private.h | 4 ++- 5 files changed, 57 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=49f4c68e29a9eed401b…

1 0

H. Verbeet : wined3d: Free the float constant map arrays for all stateblocks.
by Alexandre Julliard Aug. 21, 2006

Aug. 21, 2006

Module: wine Branch: master Commit: efa5f785981bf90354bdea9ea3e4e1e6d81b876d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efa5f785981bf90354bdea9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Aug 19 17:23:02 2006 +0200 wined3d: Free the float constant map arrays for all stateblocks. --- dlls/wined3d/stateblock.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6242697..ea77ecd 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -254,14 +254,7 @@ static ULONG WINAPI IWineD3DStateBlockI if (NULL != This->vertexDecl) { IWineD3DVertexDeclaration_Release(This->vertexDecl); } - - HeapFree(GetProcessHeap(), 0, This->vertexShaderConstantF); - HeapFree(GetProcessHeap(), 0, This->set.vertexShaderConstantsF); - HeapFree(GetProcessHeap(), 0, This->changed.vertexShaderConstantsF); - HeapFree(GetProcessHeap(), 0, This->pixelShaderConstantF); - HeapFree(GetProcessHeap(), 0, This->set.pixelShaderConstantsF); - HeapFree(GetProcessHeap(), 0, This->changed.pixelShaderConstantsF); - + /* NOTE: according to MSDN: The application is responsible for making sure the texture references are cleared down */ for (counter = 0; counter < GL_LIMITS(sampler_stages); counter++) { if (This->textures[counter]) { @@ -273,6 +266,14 @@ static ULONG WINAPI IWineD3DStateBlockI } } + + HeapFree(GetProcessHeap(), 0, This->vertexShaderConstantF); + HeapFree(GetProcessHeap(), 0, This->set.vertexShaderConstantsF); + HeapFree(GetProcessHeap(), 0, This->changed.vertexShaderConstantsF); + HeapFree(GetProcessHeap(), 0, This->pixelShaderConstantF); + HeapFree(GetProcessHeap(), 0, This->set.pixelShaderConstantsF); + HeapFree(GetProcessHeap(), 0, This->changed.pixelShaderConstantsF); + HeapFree(GetProcessHeap(), 0, This); } return refCount;

1 0

H. Verbeet : wined3d: Fix indices for the float constant map.
by Alexandre Julliard Aug. 21, 2006

Aug. 21, 2006

Module: wine Branch: master Commit: 2358fbbb031e3ced2bc8d4f6e06aac17288fca47 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2358fbbb031e3ced2bc8d4f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Aug 19 17:22:46 2006 +0200 wined3d: Fix indices for the float constant map. Indices for the float constant map should be multiplied by 4 because we're loading 4 component float vectors, not because the size of a float is 4. --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/glsl_shader.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6700de3..7aa6691 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -60,10 +60,10 @@ void shader_arb_load_constantsF( for (i=0; i<max_constants; ++i) { if (NULL == constants_set || constants_set[i]) { TRACE("Loading constants %i: %f, %f, %f, %f\n", i, - constants[i * sizeof(float) + 0], constants[i * sizeof(float) + 1], - constants[i * sizeof(float) + 2], constants[i * sizeof(float) + 3]); + constants[i * 4 + 0], constants[i * 4 + 1], + constants[i * 4 + 2], constants[i * 4 + 3]); - GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, &constants[i * sizeof(float)])); + GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, &constants[i * 4])); checkGLcall("glProgramEnvParameter4fvARB"); } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0829e88..d222610 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -96,8 +96,8 @@ void shader_glsl_load_constantsF( if (NULL == constants_set || constants_set[i]) { TRACE("Loading constants %i: %f, %f, %f, %f\n", i, - constants[i * sizeof(float) + 0], constants[i * sizeof(float) + 1], - constants[i * sizeof(float) + 2], constants[i * sizeof(float) + 3]); + constants[i * 4 + 0], constants[i * 4 + 1], + constants[i * 4 + 2], constants[i * 4 + 3]); /* TODO: Benchmark and see if it would be beneficial to store the * locations of the constants to avoid looking up each time */ @@ -105,7 +105,7 @@ void shader_glsl_load_constantsF( tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); if (tmp_loc != -1) { /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform4fvARB(tmp_loc, 1, &constants[i * sizeof(float)])); + GL_EXTCALL(glUniform4fvARB(tmp_loc, 1, &constants[i * 4])); checkGLcall("glUniform4fvARB"); } }

1 0

Jacek Caban : mshtml: Added IDM_BOLD implementation.
by Alexandre Julliard Aug. 21, 2006

Aug. 21, 2006

Module: wine Branch: master Commit: 4e418499cafcb0d991bbf209a3f707e8f7541aac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e418499cafcb0d991bbf20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 18 23:14:44 2006 +0200 mshtml: Added IDM_BOLD implementation. --- dlls/mshtml/nsiface.idl | 17 +++++++++++++++++ dlls/mshtml/olecmd.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 46e0a23..5de6916 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -109,6 +109,7 @@ typedef nsISupports nsIDOMHTMLOptionsCol typedef nsISupports nsIDOMHTMLCollection; typedef nsISupports nsIDOMRange; typedef nsISupports nsIEditor; +typedef nsISupports nsICommandParams; [ object, @@ -1174,6 +1175,22 @@ interface nsIEditingSession : nsISupport nsresult SetEditorOnControllers(nsIDOMWindow *aWindow, nsIEditor *aEditor); } +[ + object, + uuid(080d2001-f91e-11d4-a73c-f9242928207c) +] +interface nsICommandManager : nsISupports +{ + nsresult AddCommandObserver(nsIObserver *aCommandObserver, const char *aCommandToObserve); + nsresult RemoveCommandObserver(nsIObserver *aCommandObserver, const char *aCommandObserved); + nsresult IsCommandSupported(const char *aCommandName, nsIDOMWindow *aTargetWindow, PRBool *_retval); + nsresult IsCommandEnabled(const char *aCommandName, nsIDOMWindow *aTargetWindow, PRBool *_retval); + nsresult GetCommandState(const char *aCommandName, nsIDOMWindow *aTargetWindow, + nsICommandParams *aCommandParams); + nsresult DoCommand(const char *aCommandName, nsICommandParams *aCommandParams, + nsIDOMWindow *aTargetWindow); +} + /* * NOTE: * This is a private Wine interface that is implemented by our implementation diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a95f5b1..ef0de64 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -238,6 +238,46 @@ static HRESULT exec_get_print_template(H return E_NOTIMPL; } +static void do_ns_command(NSContainer *This, const char *cmd) +{ + nsICommandManager *cmdmgr; + nsIInterfaceRequestor *iface_req; + nsresult nsres; + + FIXME("(%p)\n", This); + + nsres = nsIWebBrowser_QueryInterface(This->webbrowser, + &IID_nsIInterfaceRequestor, (void**)&iface_req); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIInterfaceRequestor: %08lx\n", nsres); + return; + } + + nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsICommandManager, + (void**)&cmdmgr); + nsIInterfaceRequestor_Release(iface_req); + if(NS_FAILED(nsres)) { + ERR("Could not get nsICommandManager: %08lx\n", nsres); + return; + } + + nsres = nsICommandManager_DoCommand(cmdmgr, cmd, NULL, NULL); + if(NS_FAILED(nsres)) + ERR("DoCommand(%s) failed: %08lx\n", debugstr_a(cmd), nsres); + + nsICommandManager_Release(cmdmgr); +} + +static HRESULT exec_bold(HTMLDocument *This) +{ + TRACE("(%p)\n", This); + + if(This->nscontainer) + do_ns_command(This->nscontainer, "cmd_bold"); + + return S_OK; +} + static HRESULT exec_browsemode(HTMLDocument *This) { WARN("(%p)\n", This); @@ -504,7 +544,13 @@ static HRESULT WINAPI OleCommandTarget_E return OLECMDERR_E_NOTSUPPORTED; }else if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { switch(nCmdID) { + case IDM_BOLD: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_bold(This); case IDM_BROWSEMODE: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); return exec_browsemode(This); case IDM_EDITMODE: if(pvaIn || pvaOut)

1 0

Paul Vriens : wintrust: Added stubbed CryptCATAdminEnumCatalogFromHash.
by Alexandre Julliard Aug. 21, 2006

Aug. 21, 2006

Module: wine Branch: master Commit: b20dad068a67693ae708ca0b579802733a904fa7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b20dad068a67693ae708ca0… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sun Aug 20 14:17:34 2006 +0200 wintrust: Added stubbed CryptCATAdminEnumCatalogFromHash. --- dlls/wintrust/wintrust.spec | 2 +- dlls/wintrust/wintrust_main.c | 14 ++++++++++++++ include/mscat.h | 3 ++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index a41c77d..58f5267 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -3,7 +3,7 @@ @ stdcall CryptCATAdminAcquireContext(long ptr long) @ stub CryptCATAdminAddCatalog @ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) -@ stub CryptCATAdminEnumCatalogFromHash +@ stdcall CryptCATAdminEnumCatalogFromHash(long ptr long long ptr) @ stub CryptCATAdminPauseServiceForBackup @ stub CryptCATAdminReleaseCatalogContext @ stdcall CryptCATAdminReleaseContext(long long) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index e7d0f42..4928116 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -73,6 +73,20 @@ BOOL WINAPI CryptCATAdminCalcHashFromFil } /*********************************************************************** + * CryptCATAdminEnumCatalogFromHash (WINTRUST.@) + */ +HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, + BYTE* pbHash, + DWORD cbHash, + DWORD dwFlags, + HCATINFO* phPrevCatInfo ) +{ + FIXME("%p %p %ld %ld %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/*********************************************************************** * CryptCATAdminReleaseContext (WINTRUST.@) */ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) diff --git a/include/mscat.h b/include/mscat.h index c98a35a..ad3eca0 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -20,7 +20,7 @@ #ifndef __WINE_MSCAT_H #define __WINE_MSCAT_H typedef HANDLE HCATADMIN; - +typedef HANDLE HCATINFO; #ifdef __cplusplus extern "C" { @@ -28,6 +28,7 @@ #endif BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); +HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*); BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); #ifdef __cplusplus

1 0

Dan Kegel : mpr: Fix bug in ProviderOrder comma processing in wnetInit().
by Alexandre Julliard Aug. 21, 2006

Aug. 21, 2006

Module: wine Branch: master Commit: 50ed26c358e74a0380c9514792e0de6fb844ce27 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50ed26c358e74a0380c9514… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Aug 19 21:45:10 2006 -0700 mpr: Fix bug in ProviderOrder comma processing in wnetInit(). --- dlls/mpr/wnet.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 804b457..c099c68 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -260,8 +260,10 @@ void wnetInit(HINSTANCE hInstDll) for (ptr = providers, numToAllocate = 1; ptr; ) { ptr = strchrW(ptr, ','); - if (ptr) + if (ptr) { numToAllocate++; + ptr++; + } } providerTable = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -287,7 +289,7 @@ void wnetInit(HINSTANCE hInstDll) ptrPrev = ptr; ptr = strchrW(ptr, ','); if (ptr) - *ptr = '\0'; + *ptr++ = '\0'; _tryLoadProvider(ptrPrev); } }

1 0

Matt Finnicum : riched20: Swap two lines that were in wrong order / caused notification not to be sent.
by Alexandre Julliard Aug. 21, 2006

Aug. 21, 2006

Module: wine Branch: master Commit: cba723836410bbd52b7b6af58db5d80331135b42 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cba723836410bbd52b7b6af… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Sat Aug 19 16:04:49 2006 -0500 riched20: Swap two lines that were in wrong order / caused notification not to be sent. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 048c892..95d11dc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2303,8 +2303,8 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case WM_MOUSEMOVE: if (GetCapture() == hWnd) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); - break; ME_LinkNotify(editor,msg,wParam,lParam); + break; case WM_LBUTTONUP: if (GetCapture() == hWnd) ReleaseCapture();

1 0

Kai Blin : secur32: Initial working implementation of EncryptMessage and DecryptMessage.
by Alexandre Julliard Aug. 21, 2006

Aug. 21, 2006

Module: wine Branch: master Commit: bfa596736665e71681ef46d7e0b6bd0afa840279 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bfa596736665e71681ef46d… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Aug 19 20:02:16 2006 +0200 secur32: Initial working implementation of EncryptMessage and DecryptMessage. --- dlls/secur32/ntlm.c | 87 +++++++++++++++++++++++++++++++++++++++++++-- dlls/secur32/tests/ntlm.c | 2 + 2 files changed, 84 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index a1011da..ce8da6f 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1360,12 +1360,66 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Fr static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { - TRACE("%p %ld %p %ld stub\n", phContext, fQOP, pMessage, MessageSeqNo); + PNegoHelper helper; + TRACE("(%p %ld %p %ld)\n", phContext, fQOP, pMessage, MessageSeqNo); if(!phContext) return SEC_E_INVALID_HANDLE; - return SEC_E_UNSUPPORTED_FUNCTION; + if(fQOP) + FIXME("Ignoring fQOP\n"); + + if(MessageSeqNo) + FIXME("Ignoring MessageSeqNo\n"); + + if(!pMessage || !pMessage->pBuffers || pMessage->cBuffers < 2 || + pMessage->pBuffers[0].BufferType != SECBUFFER_TOKEN || + !pMessage->pBuffers[0].pvBuffer) + return SEC_E_INVALID_TOKEN; + + if(pMessage->pBuffers[0].cbBuffer < 16) + return SEC_E_BUFFER_TOO_SMALL; + + helper = (PNegoHelper) phContext->dwLower; + + if(helper->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) + { + FIXME("Can't handle NTLMv2 encryption yet, aborting\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + else + { + PBYTE sig = pMessage->pBuffers[0].pvBuffer; + ULONG crc = ComputeCrc32(pMessage->pBuffers[1].pvBuffer, + pMessage->pBuffers[1].cbBuffer); + ULONG sign_version = 1l; + + sig[ 0] = (sign_version >> 0) & 0xff; + sig[ 1] = (sign_version >> 8) & 0xff; + sig[ 2] = (sign_version >> 16) & 0xff; + sig[ 3] = (sign_version >> 24) & 0xff; + memset(sig+4, 0, 4); + sig[ 8] = (crc >> 0) & 0xff; + sig[ 9] = (crc >> 8) & 0xff; + sig[10] = (crc >> 16) & 0xff; + sig[11] = (crc >> 24) & 0xff; + sig[12] = (helper->crypt.ntlm.seq_num >> 0) & 0xff; + sig[13] = (helper->crypt.ntlm.seq_num >> 8) & 0xff; + sig[14] = (helper->crypt.ntlm.seq_num >> 16) & 0xff; + sig[15] = (helper->crypt.ntlm.seq_num >> 24) & 0xff; + + SECUR32_arc4Process(helper->crypt.ntlm.a4i, pMessage->pBuffers[1].pvBuffer, + pMessage->pBuffers[1].cbBuffer); + SECUR32_arc4Process(helper->crypt.ntlm.a4i, sig+4, 12); + + if(helper->neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN || helper->neg_flags == 0) + memset(sig+4, 0, 4); + + ++(helper->crypt.ntlm.seq_num); + + } + + return SEC_E_OK; } /*********************************************************************** @@ -1374,12 +1428,37 @@ static SECURITY_STATUS SEC_ENTRY ntlm_En static SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { - TRACE("%p %p %ld %p stub\n", phContext, pMessage, MessageSeqNo, pfQOP); + PNegoHelper helper; + TRACE("(%p %p %ld %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); if(!phContext) return SEC_E_INVALID_HANDLE; - return SEC_E_UNSUPPORTED_FUNCTION; + if(MessageSeqNo) + FIXME("Ignoring MessageSeqNo\n"); + + if(!pMessage || !pMessage->pBuffers || pMessage->cBuffers < 2 || + pMessage->pBuffers[0].BufferType != SECBUFFER_TOKEN || + !pMessage->pBuffers[0].pvBuffer) + return SEC_E_INVALID_TOKEN; + + if(pMessage->pBuffers[0].cbBuffer < 16) + return SEC_E_BUFFER_TOO_SMALL; + + helper = (PNegoHelper) phContext->dwLower; + + if(helper->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) + { + FIXME("Can't handle NTLMv2 encryption yet, aborting\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + else + { + SECUR32_arc4Process(helper->crypt.ntlm.a4i, + pMessage->pBuffers[1].pvBuffer, pMessage->pBuffers[1].cbBuffer); + } + + return ntlm_VerifySignature(phContext, pMessage, MessageSeqNo, pfQOP); } static SecurityFunctionTableA ntlmTableA = { diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 240a01d..9128620 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -805,9 +805,9 @@ static void testSignSeal() getSecError(sec_status)); sec_status = pEncryptMessage(client.ctxt, 0, crypt, 0); - todo_wine{ ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); + todo_wine{ ok(!memcmp(crypt->pBuffers[0].pvBuffer, crypt_trailer_client, crypt->pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); ok(!memcmp(crypt->pBuffers[1].pvBuffer, crypt_message_client,

1 0