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

Stefan Dösinger : wined3d: Add missing render states to the dumping function.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 2a35f769e38240601aaeb19ad883c7ac5c166696 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a35f769e38240601aaeb19… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 15 20:28:13 2006 +0200 wined3d: Add missing render states to the dumping function. --- dlls/wined3d/utils.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 32a5991..e562f41 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -169,15 +169,27 @@ #undef PRIM_TO_STR const char* debug_d3drenderstate(DWORD state) { switch (state) { #define D3DSTATE_TO_STR(u) case u: return #u + D3DSTATE_TO_STR(WINED3DRS_TEXTUREHANDLE ); + D3DSTATE_TO_STR(WINED3DRS_ANTIALIAS ); + D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESS ); + D3DSTATE_TO_STR(WINED3DRS_TEXTUREPERSPECTIVE ); + D3DSTATE_TO_STR(WINED3DRS_WRAPU ); + D3DSTATE_TO_STR(WINED3DRS_WRAPV ); D3DSTATE_TO_STR(WINED3DRS_ZENABLE ); D3DSTATE_TO_STR(WINED3DRS_FILLMODE ); D3DSTATE_TO_STR(WINED3DRS_SHADEMODE ); D3DSTATE_TO_STR(WINED3DRS_LINEPATTERN ); + D3DSTATE_TO_STR(WINED3DRS_MONOENABLE ); + D3DSTATE_TO_STR(WINED3DRS_ROP2 ); + D3DSTATE_TO_STR(WINED3DRS_PLANEMASK ); D3DSTATE_TO_STR(WINED3DRS_ZWRITEENABLE ); D3DSTATE_TO_STR(WINED3DRS_ALPHATESTENABLE ); D3DSTATE_TO_STR(WINED3DRS_LASTPIXEL ); + D3DSTATE_TO_STR(WINED3DRS_TEXTUREMAG ); + D3DSTATE_TO_STR(WINED3DRS_TEXTUREMIN ); D3DSTATE_TO_STR(WINED3DRS_SRCBLEND ); D3DSTATE_TO_STR(WINED3DRS_DESTBLEND ); + D3DSTATE_TO_STR(WINED3DRS_TEXTUREMAPBLEND ); D3DSTATE_TO_STR(WINED3DRS_CULLMODE ); D3DSTATE_TO_STR(WINED3DRS_ZFUNC ); D3DSTATE_TO_STR(WINED3DRS_ALPHAREF ); @@ -187,14 +199,26 @@ #define D3DSTATE_TO_STR(u) case u: retur D3DSTATE_TO_STR(WINED3DRS_FOGENABLE ); D3DSTATE_TO_STR(WINED3DRS_SPECULARENABLE ); D3DSTATE_TO_STR(WINED3DRS_ZVISIBLE ); + D3DSTATE_TO_STR(WINED3DRS_SUBPIXEL ); + D3DSTATE_TO_STR(WINED3DRS_SUBPIXELX ); + D3DSTATE_TO_STR(WINED3DRS_STIPPLEDALPHA ); D3DSTATE_TO_STR(WINED3DRS_FOGCOLOR ); D3DSTATE_TO_STR(WINED3DRS_FOGTABLEMODE ); D3DSTATE_TO_STR(WINED3DRS_FOGSTART ); D3DSTATE_TO_STR(WINED3DRS_FOGEND ); D3DSTATE_TO_STR(WINED3DRS_FOGDENSITY ); + D3DSTATE_TO_STR(WINED3DRS_STIPPLEENABLE ); D3DSTATE_TO_STR(WINED3DRS_EDGEANTIALIAS ); + D3DSTATE_TO_STR(WINED3DRS_COLORKEYENABLE ); + D3DSTATE_TO_STR(WINED3DRS_BORDERCOLOR ); + D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESSU ); + D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESSV ); + D3DSTATE_TO_STR(WINED3DRS_MIPMAPLODBIAS ); D3DSTATE_TO_STR(WINED3DRS_ZBIAS ); D3DSTATE_TO_STR(WINED3DRS_RANGEFOGENABLE ); + D3DSTATE_TO_STR(WINED3DRS_ANISOTROPY ); + D3DSTATE_TO_STR(WINED3DRS_FLUSHBATCH ); + D3DSTATE_TO_STR(WINED3DRS_TRANSLUCENTSORTINDEPENDENT); D3DSTATE_TO_STR(WINED3DRS_STENCILENABLE ); D3DSTATE_TO_STR(WINED3DRS_STENCILFAIL ); D3DSTATE_TO_STR(WINED3DRS_STENCILZFAIL ); @@ -214,11 +238,13 @@ #define D3DSTATE_TO_STR(u) case u: retur D3DSTATE_TO_STR(WINED3DRS_WRAP7 ); D3DSTATE_TO_STR(WINED3DRS_CLIPPING ); D3DSTATE_TO_STR(WINED3DRS_LIGHTING ); + D3DSTATE_TO_STR(WINED3DRS_EXTENTS ); D3DSTATE_TO_STR(WINED3DRS_AMBIENT ); D3DSTATE_TO_STR(WINED3DRS_FOGVERTEXMODE ); D3DSTATE_TO_STR(WINED3DRS_COLORVERTEX ); D3DSTATE_TO_STR(WINED3DRS_LOCALVIEWER ); D3DSTATE_TO_STR(WINED3DRS_NORMALIZENORMALS ); + D3DSTATE_TO_STR(WINED3DRS_COLORKEYBLENDENABLE ); D3DSTATE_TO_STR(WINED3DRS_DIFFUSEMATERIALSOURCE ); D3DSTATE_TO_STR(WINED3DRS_SPECULARMATERIALSOURCE ); D3DSTATE_TO_STR(WINED3DRS_AMBIENTMATERIALSOURCE );

1 0

Stefan Dösinger : wined3d: Implement IWineD3DDevice:: SetFrontBackBuffers.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 7cd41b944ba57914521f3502714802fd805a360f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7cd41b944ba57914521f350… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 15 20:09:07 2006 +0200 wined3d: Implement IWineD3DDevice::SetFrontBackBuffers. --- dlls/wined3d/device.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed50b26..943e38f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6474,8 +6474,70 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetR } HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *iface, IWineD3DSurface *Front, IWineD3DSurface *Back) { - FIXME("This call is a d3d7 merge stub. It will be implemented later\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DSurfaceImpl *FrontImpl = (IWineD3DSurfaceImpl *) Front; + IWineD3DSurfaceImpl *BackImpl = (IWineD3DSurfaceImpl *) Back; + IWineD3DSwapChainImpl *Swapchain; + HRESULT hr; + + TRACE("(%p)->(%p,%p)\n", This, FrontImpl, BackImpl); + + hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **) &Swapchain); + if(hr != WINED3D_OK) { + ERR("Can't get the swapchain\n"); + return hr; + } + + /* Make sure to release the swapchain */ + IWineD3DSwapChain_Release((IWineD3DSwapChain *) Swapchain); + + if(FrontImpl && !(FrontImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) ) { + ERR("Trying to set a front buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage\n"); + return WINED3DERR_INVALIDCALL; + } + else if(BackImpl && !(BackImpl->resource.usage & WINED3DUSAGE_RENDERTARGET)) { + ERR("Trying to set a back buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage\n"); + return WINED3DERR_INVALIDCALL; + } + + if(Swapchain->frontBuffer != Front) { + TRACE("Changing the front buffer from %p to %p\n", Swapchain->frontBuffer, Front); + + if(Swapchain->frontBuffer) + IWineD3DSurface_SetContainer(Swapchain->frontBuffer, NULL); + Swapchain->frontBuffer = Front; + + if(Swapchain->frontBuffer) { + IWineD3DSurface_SetContainer(Swapchain->frontBuffer, (IWineD3DBase *) Swapchain); + } + } + if(Swapchain->backBuffer != Back) { + TRACE("Changing the back buffer from %p to %p\n", Swapchain->backBuffer, Back); + ENTER_GL(); + if(!Swapchain->backBuffer) { + /* GL was told to draw to the front buffer at creation, + * undo that + */ + glDrawBuffer(GL_BACK); + checkGLcall("glDrawBuffer(GL_BACK)"); + } else if (!Back) { + /* That makes problems - disable for now */ + /* glDrawBuffer(GL_FRONT); */ + checkGLcall("glDrawBuffer(GL_FRONT)"); + } + LEAVE_GL(); + + if(Swapchain->backBuffer) + IWineD3DSurface_SetContainer(Swapchain->backBuffer, NULL); + Swapchain->backBuffer = Back; + + if(Swapchain->backBuffer) { + IWineD3DSurface_SetContainer(Swapchain->backBuffer, (IWineD3DBase *) Swapchain); + } + + } + + return WINED3D_OK; } HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice* iface, IWineD3DSurface **ppZStencilSurface) {

1 0

Matt Finnicum : riched20: Implement EM_SETUNDOLIMIT and its conformance tests.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: a379ac9ef5b987d7071593daf0a63af31c89499c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a379ac9ef5b987d7071593d… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Mon May 15 14:00:15 2006 -0400 riched20: Implement EM_SETUNDOLIMIT and its conformance tests. --- dlls/riched20/editor.c | 21 ++++++++++++-- dlls/riched20/editstr.h | 4 ++- dlls/riched20/tests/editor.c | 65 ++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/undo.c | 27 +++++++++++++++++ 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d73690c..3e8c834 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -117,7 +117,7 @@ + EM_SETTEXTEX 3.0 (unicode only, no rich text insertion handling, proper style?) - EM_SETTEXTMODE 2.0 - EM_SETTYPOGRAPHYOPTIONS 3.0 - - EM_SETUNDOLIMIT 2.0 + + EM_SETUNDOLIMIT 2.0 + EM_SETWORDBREAKPROC (used only for word movement at the moment) - EM_SETWORDBREAKPROCEX - EM_SETWORDWRAPMODE 1.0asian @@ -229,6 +229,9 @@ #include "shlwapi.h" #include "imm.h" #include "textserv.h" #include "rtf.h" + +#define STACK_SIZE_DEFAULT 100 +#define STACK_SIZE_MAX 1000 WINE_DEFAULT_DEBUG_CHANNEL(richedit); @@ -1119,7 +1122,9 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) ed->bCaretAtEnd = FALSE; ed->nEventMask = 0; ed->nModifyStep = 0; - ed->pUndoStack = ed->pRedoStack = NULL; + ed->pUndoStack = ed->pRedoStack = ed->pUndoStackBottom = NULL; + ed->nUndoStackSize = 0; + ed->nUndoLimit = STACK_SIZE_DEFAULT; ed->nUndoMode = umAddToUndo; ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; @@ -1426,7 +1431,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_SETTABSTOPS) UNSUPPORTED_MSG(EM_SETTARGETDEVICE) UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) - UNSUPPORTED_MSG(EM_SETUNDOLIMIT) UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) UNSUPPORTED_MSG(EM_SHOWSCROLLBAR) UNSUPPORTED_MSG(WM_SETFONT) @@ -1477,6 +1481,17 @@ LRESULT WINAPI RichEditANSIWndProc(HWND TRACE("EM_EXGETSEL = (%ld,%ld)\n", pRange->cpMin, pRange->cpMax); return 0; } + case EM_SETUNDOLIMIT: + { + if ((int)wParam < 0) + editor->nUndoLimit = STACK_SIZE_DEFAULT; + else + editor->nUndoLimit = min(wParam, STACK_SIZE_MAX); + /* Setting a max stack size keeps wine from getting killed + for hogging memory. Windows allocates all this memory at once, so + no program would realisticly set a value above our maxiumum. */ + return editor->nUndoLimit; + } case EM_CANUNDO: return editor->pUndoStack != NULL; case EM_CANREDO: diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 0911e90..bb151fa 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -298,7 +298,9 @@ typedef struct tagME_TextEditor BOOL bCaretAtEnd; int nEventMask; int nModifyStep; - ME_DisplayItem *pUndoStack, *pRedoStack; + ME_DisplayItem *pUndoStack, *pRedoStack, *pUndoStackBottom; + int nUndoStackSize; + int nUndoLimit; ME_UndoMode nUndoMode; int nParagraphs; int nLastSelStart, nLastSelEnd; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6b80903..837fb15 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -747,6 +747,70 @@ static void test_EM_SCROLL() DestroyWindow(hwndRichEdit); } +static void test_EM_SETUNDOLIMIT() +{ + /* cases we test for: + * default behaviour - limiting at 100 undo's + * undo disabled - setting a limit of 0 + * undo limited - undo limit set to some to some number, like 2 + * bad input - sending a negative number should default to 100 undo's */ + + HWND hwndRichEdit = new_richedit(NULL); + CHARRANGE cr; + int i; + int result; + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "x"); + cr.cpMin = 0; + cr.cpMax = 1; + SendMessage(hwndRichEdit, WM_COPY, 0, 0); + /*Load "x" into the clipboard. Paste is an easy, undo'able operation. + also, multiple pastes don't combine like WM_CHAR would */ + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); + + /* first case - check the default */ + SendMessage(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0,0); + for (i=0; i<101; i++) /* Put 101 undo's on the stack */ + SendMessage(hwndRichEdit, WM_PASTE, 0, 0); + for (i=0; i<100; i++) /* Undo 100 of them */ + SendMessage(hwndRichEdit, WM_UNDO, 0, 0); + ok(!SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0), + "EM_SETUNDOLIMIT allowed more than a hundred undo's by default.\n"); + + /* second case - cannot undo */ + SendMessage(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0, 0); + SendMessage(hwndRichEdit, EM_SETUNDOLIMIT, 0, 0); + SendMessage(hwndRichEdit, + WM_PASTE, 0, 0); /* Try to put something in the undo stack */ + ok(!SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0), + "EM_SETUNDOLIMIT allowed undo with UNDOLIMIT set to 0\n"); + + /* third case - set it to an arbitrary number */ + SendMessage(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0, 0); + SendMessage(hwndRichEdit, EM_SETUNDOLIMIT, 2, 0); + SendMessage(hwndRichEdit, WM_PASTE, 0, 0); + SendMessage(hwndRichEdit, WM_PASTE, 0, 0); + SendMessage(hwndRichEdit, WM_PASTE, 0, 0); + /* If SETUNDOLIMIT is working, there should only be two undo's after this */ + ok(SendMessage(hwndRichEdit, EM_CANUNDO, 0,0), + "EM_SETUNDOLIMIT didn't allow the first undo with UNDOLIMIT set to 2\n"); + SendMessage(hwndRichEdit, WM_UNDO, 0, 0); + ok(SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0), + "EM_SETUNDOLIMIT didn't allow a second undo with UNDOLIMIT set to 2\n"); + SendMessage(hwndRichEdit, WM_UNDO, 0, 0); + ok(!SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0), + "EM_SETUNDOLIMIT allowed a third undo with UNDOLIMIT set to 2\n"); + + /* fourth case - setting negative numbers should default to 100 undos */ + SendMessage(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0,0); + result = SendMessage(hwndRichEdit, EM_SETUNDOLIMIT, -1, 0); + ok (result == 100, + "EM_SETUNDOLIMIT returned %d when set to -1, instead of 100",result); + + DestroyWindow(hwndRichEdit); +} + + START_TEST( editor ) { MSG msg; @@ -764,6 +828,7 @@ START_TEST( editor ) test_EM_SETOPTIONS(); test_WM_GETTEXT(); test_EM_AUTOURLDETECT(); + test_EM_SETUNDOLIMIT(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging. diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 916dcb3..f8895cb 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -32,7 +32,8 @@ void ME_EmptyUndoStack(ME_TextEditor *ed TRACE("Emptying undo stack\n"); p = editor->pUndoStack; - editor->pUndoStack = NULL; + editor->pUndoStack = editor->pUndoStackBottom = NULL; + editor->nUndoStackSize = 0; while(p) { pNext = p->next; ME_DestroyDisplayItem(p); @@ -50,6 +51,8 @@ void ME_EmptyUndoStack(ME_TextEditor *ed ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, ME_DisplayItem *pdi) { if (editor->nUndoMode == umIgnore) return NULL; + else if (editor->nUndoLimit == 0) + return NULL; else { ME_DisplayItem *pItem = (ME_DisplayItem *)ALLOC_OBJ(ME_UndoItem); @@ -93,10 +96,31 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEdito TRACE("Pushing id=%s to undo stack, deleting redo stack\n", ME_GetDITypeName(type)); else TRACE("Pushing id=%s to undo stack\n", ME_GetDITypeName(type)); + pItem->next = editor->pUndoStack; + if (type == diUndoEndTransaction) + editor->nUndoStackSize++; if (editor->pUndoStack) editor->pUndoStack->prev = pItem; + else + editor->pUndoStackBottom = pItem; editor->pUndoStack = pItem; + + if (editor->nUndoStackSize > editor->nUndoLimit) + { /* remove oldest undo from stack */ + ME_DisplayItem *p = editor->pUndoStackBottom; + while (p->type !=diUndoEndTransaction) + p = p->prev; /*find new stack bottom */ + editor->pUndoStackBottom = p->prev; + editor->pUndoStackBottom->next = NULL; + do + { + ME_DisplayItem *pp = p->next; + ME_DestroyDisplayItem(p); + p = pp; + } while (p); + editor->nUndoStackSize--; + } /* any new operation (not redo) clears the redo stack */ if (editor->nUndoMode == umAddToUndo) { ME_DisplayItem *p = editor->pRedoStack; @@ -233,6 +257,7 @@ void ME_Undo(ME_TextEditor *editor) { } while(p && p->type != diUndoEndTransaction); ME_AddUndoItem(editor, diUndoEndTransaction, NULL); editor->pUndoStack = p; + editor->nUndoStackSize--; if (p) p->prev = NULL; editor->nUndoMode = nMode;

1 0

Juan Lang : crypt32: Test importing public keys from a certificate.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 24157e0f74aa9c15a255b052e23f8b70c0e078bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24157e0f74aa9c15a255b05… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon May 15 17:02:17 2006 -0700 crypt32: Test importing public keys from a certificate. --- dlls/crypt32/tests/encode.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 01a12bd..c1331e7 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2981,10 +2981,37 @@ static void testExportPublicKey(HCRYPTPR } } +static const BYTE expiredCert[] = { 0x30, 0x82, 0x01, 0x33, 0x30, 0x81, 0xe2, + 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x10, 0xc4, 0xd7, 0x7f, 0x0e, 0x6f, 0xa6, + 0x8c, 0xaa, 0x47, 0x47, 0x40, 0xe7, 0xb7, 0x0b, 0x4a, 0x7f, 0x30, 0x09, 0x06, + 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1d, 0x05, 0x00, 0x30, 0x1f, 0x31, 0x1d, 0x30, + 0x1b, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x14, 0x61, 0x72, 0x69, 0x63, 0x40, + 0x63, 0x6f, 0x64, 0x65, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x73, 0x2e, 0x63, + 0x6f, 0x6d, 0x30, 0x1e, 0x17, 0x0d, 0x36, 0x39, 0x30, 0x31, 0x30, 0x31, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x17, 0x0d, 0x37, 0x30, 0x30, 0x31, 0x30, + 0x31, 0x30, 0x36, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x30, 0x1f, 0x31, 0x1d, 0x30, + 0x1b, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x14, 0x61, 0x72, 0x69, 0x63, 0x40, + 0x63, 0x6f, 0x64, 0x65, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x73, 0x2e, 0x63, + 0x6f, 0x6d, 0x30, 0x5c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, + 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30, 0x48, 0x02, 0x41, + 0x00, 0xa1, 0xaf, 0x4a, 0xea, 0xa7, 0x83, 0x57, 0xc0, 0x37, 0x33, 0x7e, 0x29, + 0x5e, 0x0d, 0xfc, 0x44, 0x74, 0x3a, 0x1d, 0xc3, 0x1b, 0x1d, 0x96, 0xed, 0x4e, + 0xf4, 0x1b, 0x98, 0xec, 0x69, 0x1b, 0x04, 0xea, 0x25, 0xcf, 0xb3, 0x2a, 0xf5, + 0xd9, 0x22, 0xd9, 0x8d, 0x08, 0x39, 0x81, 0xc6, 0xe0, 0x4f, 0x12, 0x37, 0x2a, + 0x3f, 0x80, 0xa6, 0x6c, 0x67, 0x43, 0x3a, 0xdd, 0x95, 0x0c, 0xbb, 0x2f, 0x6b, + 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, + 0x1d, 0x05, 0x00, 0x03, 0x41, 0x00, 0x8f, 0xa2, 0x5b, 0xd6, 0xdf, 0x34, 0xd0, + 0xa2, 0xa7, 0x47, 0xf1, 0x13, 0x79, 0xd3, 0xf3, 0x39, 0xbd, 0x4e, 0x2b, 0xa3, + 0xf4, 0x63, 0x37, 0xac, 0x5a, 0x0c, 0x5e, 0x4d, 0x0d, 0x54, 0x87, 0x4f, 0x31, + 0xfb, 0xa0, 0xce, 0x8f, 0x9a, 0x2f, 0x4d, 0x48, 0xc6, 0x84, 0x8d, 0xf5, 0x70, + 0x74, 0x17, 0xa5, 0xf3, 0x66, 0x47, 0x06, 0xd6, 0x64, 0x45, 0xbc, 0x52, 0xef, + 0x49, 0xe5, 0xf9, 0x65, 0xf3 }; + static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) { BOOL ret; HCRYPTKEY key; + PCCERT_CONTEXT context; /* These crash ret = CryptImportPublicKeyInfoEx(0, 0, NULL, 0, 0, NULL, NULL); @@ -3007,6 +3034,24 @@ static void testImportPublicKey(HCRYPTPR &key); ok(ret, "CryptImportPublicKeyInfoEx failed: %08lx\n", GetLastError()); CryptDestroyKey(key); + + /* Test importing a public key from a certificate context */ + context = CertCreateCertificateContext(X509_ASN_ENCODING, expiredCert, + sizeof(expiredCert)); + ok(context != NULL, "CertCreateCertificateContext failed: %08lx\n", + GetLastError()); + if (context) + { + ok(!strcmp(szOID_RSA_RSA, + context->pCertInfo->SubjectPublicKeyInfo.Algorithm.pszObjId), + "Expected %s, got %s\n", szOID_RSA_RSA, + context->pCertInfo->SubjectPublicKeyInfo.Algorithm.pszObjId); + ret = CryptImportPublicKeyInfoEx(csp, X509_ASN_ENCODING, + &context->pCertInfo->SubjectPublicKeyInfo, 0, 0, NULL, &key); + ok(ret, "CryptImportPublicKeyInfoEx failed: %08lx\n", GetLastError()); + CryptDestroyKey(key); + CertFreeCertificateContext(context); + } } static const char cspName[] = "WineCryptTemp";

1 0

Juan Lang : crypt32: Avoid a use-after-free bug in tests.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 769a52f8319668f2f717c1341b0760964637767d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=769a52f8319668f2f717c13… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon May 15 17:00:06 2006 -0700 crypt32: Avoid a use-after-free bug in tests. --- dlls/crypt32/tests/store.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index e798ce4..6df1ea2 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -149,6 +149,10 @@ static void testAddCert(void) CRYPT_DATA_BLOB hash = { sizeof(bigCert2Hash), (LPBYTE)bigCert2Hash }; + /* Duplicate (AddRef) the context so we can still use it after + * deleting it from the store. + */ + CertDuplicateCertificateContext(context); CertDeleteCertificateFromStore(context); /* Set the same hash as bigCert2, and try to readd it */ ret = CertSetCertificateContextProperty(context, CERT_HASH_PROP_ID,

1 0

Mike McCormack : wininet: Return correct errors in InternetOpenUrlW.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 2eec6b04c04807617d5a5dc33905abba60c6cf08 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2eec6b04c04807617d5a5dc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon May 15 22:02:34 2006 +0900 wininet: Return correct errors in InternetOpenUrlW. --- dlls/wininet/internet.c | 7 +++++++ dlls/wininet/tests/internet.c | 8 ++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e58fca1..42b0255 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2934,6 +2934,7 @@ HINTERNET WINAPI INTERNET_InternetOpenUr /* gopher doesn't seem to be implemented in wine, but it's supposed * to be supported by InternetOpenUrlA. */ default: + INTERNET_SetLastError(ERROR_INTERNET_UNRECOGNIZED_SCHEME); break; } @@ -2963,6 +2964,12 @@ HINTERNET WINAPI InternetOpenUrlW(HINTER dump_INTERNET_FLAGS(dwFlags); } + if (!lpszUrl) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + hIC = (LPWININETAPPINFOW) WININET_GetObject( hInternet ); if (NULL == hIC || hIC->hdr.htype != WH_HINIT) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 43d17d6..a0737e3 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -143,6 +143,14 @@ static void test_null(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error\n"); ok(hc == NULL, "connect failed\n"); + hc = InternetOpenUrlW(hi, NULL, NULL, 0, 0, 0); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); + ok(hc == NULL, "connect failed\n"); + + hc = InternetOpenUrlW(hi, szServer, NULL, 0, 0, 0); + ok(GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "wrong error\n"); + ok(hc == NULL, "connect failed\n"); + InternetCloseHandle(hi); }

1 0

Mike McCormack : wininet: Return correct errors in InternetConnectW
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: f57360af523bd138e1bcfdd2239a239be350a5a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f57360af523bd138e1bcfdd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon May 15 22:01:55 2006 +0900 wininet: Return correct errors in InternetConnectW --- dlls/wininet/internet.c | 11 ++++++++++- dlls/wininet/tests/internet.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7642625..e58fca1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -812,17 +812,26 @@ HINTERNET WINAPI InternetConnectW(HINTER DWORD dwService, DWORD dwFlags, DWORD dwContext) { LPWININETAPPINFOW hIC; - HINTERNET rc = (HINTERNET) NULL; + HINTERNET rc = NULL; TRACE("(%p, %s, %i, %s, %s, %li, %li, %li)\n", hInternet, debugstr_w(lpszServerName), nServerPort, debugstr_w(lpszUserName), debugstr_w(lpszPassword), dwService, dwFlags, dwContext); + if (!lpszServerName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + /* Clear any error information */ INTERNET_SetLastError(0); hIC = (LPWININETAPPINFOW) WININET_GetObject( hInternet ); if ( (hIC == NULL) || (hIC->hdr.htype != WH_HINIT) ) + { + SetLastError(ERROR_INVALID_HANDLE); goto lend; + } switch (dwService) { diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 293656c..43d17d6 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -119,8 +119,36 @@ static void test_get_cookie(void) ret ? "TRUE" : "FALSE", GetLastError()); } +static void test_null(void) +{ + HINTERNET hi, hc; + static const WCHAR szServer[] = { 's','e','r','v','e','r',0 }; + + hi = InternetOpenW(NULL, 0, NULL, NULL, 0); + ok(hi != NULL, "open failed\n"); + + hc = InternetConnectW(hi, NULL, 0, NULL, NULL, 0, 0, 0); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); + ok(hc == NULL, "connect failed\n"); + + hc = InternetConnectW(hi, NULL, 0, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); + ok(hc == NULL, "connect failed\n"); + + hc = InternetConnectW(hi, NULL, 0, NULL, NULL, INTERNET_SERVICE_FTP, 0, 0); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); + ok(hc == NULL, "connect failed\n"); + + hc = InternetConnectW(NULL, szServer, 0, NULL, NULL, INTERNET_SERVICE_FTP, 0, 0); + ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error\n"); + ok(hc == NULL, "connect failed\n"); + + InternetCloseHandle(hi); +} + START_TEST(internet) { InternetQueryOptionA_test(); test_get_cookie(); + test_null(); }

1 0

Mike McCormack : rpcrt4: Implemented NTLM authentication for rpcrt4 connections.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 336e67e2d1b7b7c46a456f21db68886b39f26d40 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=336e67e2d1b7b7c46a456f2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon May 15 23:04:25 2006 +0900 rpcrt4: Implemented NTLM authentication for rpcrt4 connections. --- dlls/rpcrt4/Makefile.in | 2 - dlls/rpcrt4/rpc_binding.c | 42 ++++++++++++- dlls/rpcrt4/rpc_binding.h | 12 ++++ dlls/rpcrt4/rpc_message.c | 146 +++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 193 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index a4b0f63..b4ff100 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rpcrt4.dll IMPORTLIB = librpcrt4.$(IMPLIBEXT) -IMPORTS = iphlpapi advapi32 kernel32 ntdll +IMPORTS = secur32 iphlpapi advapi32 kernel32 ntdll EXTRALIBS = -luuid C_SRCS = \ diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 36187ef..dc22be3 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -981,9 +981,45 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA RPC_AUTH_IDENTITY_HANDLE AuthIdentity, unsigned long AuthzSvr, RPC_SECURITY_QOS *SecurityQos ) { - FIXME("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_a((const char*)ServerPrincName), - AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); - return RPC_S_OK; + RpcBinding* bind = (RpcBinding*)Binding; + RPC_STATUS r; + + TRACE("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_a((const char*)ServerPrincName), + AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); + + if (!AuthIdentity) + return RPC_S_INVALID_AUTH_IDENTITY; + + if (AuthnLevel != RPC_C_AUTHN_LEVEL_CONNECT) + { + FIXME("unsupported AuthnLevel %lu\n", AuthnLevel); + return RPC_S_UNKNOWN_AUTHN_LEVEL; + } + + if (AuthnSvc != RPC_C_AUTHN_WINNT) + { + FIXME("unsupported AuthnSvc %lu\n", AuthnSvc); + return RPC_S_UNKNOWN_AUTHN_SERVICE; + } + + if (AuthzSvr) + { + FIXME("unsupported AuthzSvr %lu\n", AuthzSvr); + return RPC_S_UNKNOWN_AUTHZ_SERVICE; + } + + if (SecurityQos) + FIXME("SecurityQos ignored\n"); + + r = AcquireCredentialsHandleA(NULL, "NTLM", SECPKG_CRED_OUTBOUND, NULL, + AuthIdentity, NULL, NULL, &bind->cred, &bind->exp); + if (r == ERROR_SUCCESS) + { + bind->AuthnSvc = AuthnSvc; + bind->AuthnLevel = AuthnLevel; + } + TRACE("AcquireCredentialsHandleA returned %08lx\n", r); + return r; } /*********************************************************************** diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 2d656cc..99916a5 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -22,6 +22,7 @@ #ifndef __WINE_RPC_BINDING_H #define __WINE_RPC_BINDING_H #include "wine/rpcss_shared.h" +#include "security.h" struct protseq_ops; @@ -36,6 +37,11 @@ typedef struct _RpcConnection USHORT MaxTransmissionSize; /* The active interface bound to server. */ RPC_SYNTAX_IDENTIFIER ActiveInterface; + + /* authentication */ + CtxtHandle ctx; + TimeStamp exp; + ULONG attr; } RpcConnection; struct protseq_ops { @@ -62,6 +68,12 @@ typedef struct _RpcBinding RPC_BLOCKING_FN BlockingFn; ULONG ServerTid; RpcConnection* FromConn; + + /* authentication */ + unsigned long AuthnLevel; + unsigned long AuthnSvc; + CredHandle cred; + TimeStamp exp; } RpcBinding; LPSTR RPCRT4_strndupA(LPCSTR src, INT len); diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 014d60a..daeb668 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -173,6 +173,22 @@ RpcPktHdr *RPCRT4_BuildBindHeader(unsign return header; } +RpcPktHdr *RPCRT4_BuildAuthHeader(unsigned long DataRepresentation) +{ + RpcPktHdr *header; + + header = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(header->common) + 12); + if (header == NULL) + return NULL; + + RPCRT4_BuildCommonHeader(header, PKT_AUTH3, DataRepresentation); + header->common.frag_len = 0x14; + header->common.auth_len = 0; + + return header; +} + RpcPktHdr *RPCRT4_BuildBindNackHeader(unsigned long DataRepresentation, unsigned char RpcVersion, unsigned char RpcVersionMinor) @@ -279,13 +295,12 @@ static RPC_STATUS RPCRT4_SendAuth(RpcCon memcpy(pkt + hdr_size, buffer_pos, Header->common.frag_len - hdr_size - alen); /* add the authorization info */ - if (AuthLength) + if (Connection->Used && AuthLength) { auth_hdr = &pkt[Header->common.frag_len - alen]; - /* FIXME: is this per fragment or per message? */ - auth_hdr[0] = RPC_C_AUTHN_WINNT; - auth_hdr[1] = RPC_C_AUTHN_LEVEL_CONNECT; + auth_hdr[0] = Connection->Used->AuthnSvc; + auth_hdr[1] = Connection->Used->AuthnLevel; auth_hdr[2] = 0x00; /* FIXME: add padding */ auth_hdr[3] = 0x00; @@ -311,6 +326,87 @@ write: } /*********************************************************************** + * RPCRT4_AuthNegotiate (internal) + */ +static void RPCRT4_AuthNegotiate(RpcConnection *conn, SecBuffer *out) +{ + SECURITY_STATUS r; + SecBufferDesc out_desc; + unsigned char *buffer; + RpcBinding *bind = conn->Used; + + buffer = HeapAlloc(GetProcessHeap(), 0, 0x100); + + out->BufferType = SECBUFFER_TOKEN; + out->cbBuffer = 0x100; + out->pvBuffer = buffer; + + out_desc.ulVersion = 0; + out_desc.cBuffers = 1; + out_desc.pBuffers = out; + + conn->attr = 0; + conn->ctx.dwLower = 0; + conn->ctx.dwUpper = 0; + + r = InitializeSecurityContextA(&bind->cred, NULL, NULL, + ISC_REQ_CONNECTION | ISC_REQ_USE_DCE_STYLE | ISC_REQ_MUTUAL_AUTH | + ISC_REQ_DELEGATE, 0, SECURITY_NETWORK_DREP, + NULL, 0, &conn->ctx, &out_desc, &conn->attr, &bind->exp); + + TRACE("r = %08lx cbBuffer = %ld attr = %08lx\n", r, out->cbBuffer, conn->attr); +} + +/*********************************************************************** + * RPCRT4_AuthorizeBinding (internal) + */ +static RPC_STATUS RPCRT_AuthorizeConnection(RpcConnection* conn, + BYTE *challenge, ULONG count) +{ + SecBufferDesc inp_desc, out_desc; + SecBuffer inp, out; + SECURITY_STATUS r; + unsigned char buffer[0x100]; + RpcPktHdr *resp_hdr; + RPC_STATUS status; + + TRACE("challenge %s, %ld bytes\n", challenge, count); + + out.BufferType = SECBUFFER_TOKEN; + out.cbBuffer = sizeof buffer; + out.pvBuffer = buffer; + + out_desc.ulVersion = 0; + out_desc.cBuffers = 1; + out_desc.pBuffers = &out; + + inp.BufferType = SECBUFFER_TOKEN; + inp.pvBuffer = challenge; + inp.cbBuffer = count; + + inp_desc.cBuffers = 1; + inp_desc.pBuffers = &inp; + inp_desc.ulVersion = 0; + + r = InitializeSecurityContextA(&conn->Used->cred, &conn->ctx, NULL, + ISC_REQ_CONNECTION | ISC_REQ_USE_DCE_STYLE | ISC_REQ_MUTUAL_AUTH | + ISC_REQ_DELEGATE, 0, SECURITY_NETWORK_DREP, + &inp_desc, 0, &conn->ctx, &out_desc, &conn->attr, &conn->exp); + if (r) + return r; + + resp_hdr = RPCRT4_BuildAuthHeader(NDR_LOCAL_DATA_REPRESENTATION); + if (!resp_hdr) + return E_OUTOFMEMORY; + + status = RPCRT4_SendAuth(conn, resp_hdr, NULL, 0, out.pvBuffer, out.cbBuffer); + + RPCRT4_FreeHeader(resp_hdr); + + return status; +} + +/*********************************************************************** * RPCRT4_Send (internal) * * Transmit a packet over connection in acceptable fragments. @@ -318,7 +414,37 @@ write: RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, void *Buffer, unsigned int BufferLength) { - return RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, NULL, 0); + RPC_STATUS r; + SecBuffer out; + + /* if we've already authenticated, just send the context */ + if (Connection->ctx.dwUpper || Connection->ctx.dwLower) + { + unsigned char buffer[0x10]; + + memset(buffer, 0, sizeof buffer); + buffer[0] = 1; /* version number lsb */ + + return RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, buffer, sizeof buffer); + } + + if (Connection->Used == NULL || + Connection->Used->AuthnLevel == RPC_C_AUTHN_LEVEL_DEFAULT || + Connection->Used->AuthnLevel == RPC_C_AUTHN_LEVEL_NONE) + { + return RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, NULL, 0); + } + + out.BufferType = SECBUFFER_TOKEN; + out.cbBuffer = 0; + out.pvBuffer = NULL; + + /* tack on a negotiate packet */ + RPCRT4_AuthNegotiate(Connection, &out); + r = RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, out.pvBuffer, out.cbBuffer); + HeapFree(GetProcessHeap(), 0, out.pvBuffer); + + return r; } /*********************************************************************** @@ -439,6 +565,16 @@ RPC_STATUS RPCRT4_Receive(RpcConnection } } + /* respond to authorization request */ + if (common_hdr.ptype == PKT_BIND_ACK && common_hdr.auth_len > 8) + { + unsigned int offset; + + offset = common_hdr.frag_len - hdr_length - common_hdr.auth_len; + RPCRT_AuthorizeConnection(Connection, (LPBYTE)pMsg->Buffer + offset, + common_hdr.auth_len); + } + /* success */ status = RPC_S_OK;

1 0

Mike McCormack : rpcrt4: Use RPCRT4_Receive rather than accessing the transport directly.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: f20cfdfa8474f183b59acd66573c1475497f69c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f20cfdfa8474f183b59acd6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon May 15 22:51:30 2006 +0900 rpcrt4: Use RPCRT4_Receive rather than accessing the transport directly. --- dlls/rpcrt4/rpc_binding.c | 39 ++++++++++----------------------------- 1 files changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 219b2ee..36187ef 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -267,9 +267,8 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding /* we need to send a binding packet if we are client. */ if (!(*Connection)->server) { RpcPktHdr *hdr; - LONG count; - BYTE *response; RpcPktHdr *response_hdr; + RPC_MESSAGE msg; TRACE("sending bind request to server\n"); @@ -284,35 +283,17 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding return status; } - response = HeapAlloc(GetProcessHeap(), 0, RPC_MAX_PACKET_SIZE); - if (response == NULL) { - WARN("Can't allocate memory for binding response\n"); - RPCRT4_DestroyConnection(*Connection); - return E_OUTOFMEMORY; - } - - count = rpcrt4_conn_read(NewConnection, response, RPC_MAX_PACKET_SIZE); - if (count < sizeof(response_hdr->common)) { - WARN("received invalid header\n"); - HeapFree(GetProcessHeap(), 0, response); - RPCRT4_DestroyConnection(*Connection); - return RPC_S_PROTOCOL_ERROR; - } - - response_hdr = (RpcPktHdr*)response; - - if (response_hdr->common.rpc_ver != RPC_VER_MAJOR || - response_hdr->common.rpc_ver_minor != RPC_VER_MINOR || - response_hdr->common.ptype != PKT_BIND_ACK) { - WARN("invalid protocol version or rejection packet\n"); - HeapFree(GetProcessHeap(), 0, response); + status = RPCRT4_Receive(NewConnection, &response_hdr, &msg); + if (status != RPC_S_OK) { + ERR("receive failed\n"); RPCRT4_DestroyConnection(*Connection); - return RPC_S_PROTOCOL_ERROR; + return status; } - if (response_hdr->bind_ack.max_tsize < RPC_MIN_PACKET_SIZE) { - WARN("server doesn't allow large enough packets\n"); - HeapFree(GetProcessHeap(), 0, response); + if (response_hdr->common.ptype != PKT_BIND_ACK || + response_hdr->bind_ack.max_tsize < RPC_MIN_PACKET_SIZE) { + ERR("failed to bind\n"); + RPCRT4_FreeHeader(response_hdr); RPCRT4_DestroyConnection(*Connection); return RPC_S_PROTOCOL_ERROR; } @@ -321,7 +302,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding (*Connection)->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; (*Connection)->ActiveInterface = *InterfaceId; - HeapFree(GetProcessHeap(), 0, response); + RPCRT4_FreeHeader(response_hdr); } Binding->FromConn = *Connection;

1 0

Mike McCormack : advapi32: Implement and test SystemFunction005.
by Alexandre Julliard May 16, 2006

May 16, 2006

Module: wine Branch: refs/heads/master Commit: 9b3d8a3527352e9ad2927b608987246b53dddd9b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b3d8a3527352e9ad2927b6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon May 15 22:03:41 2006 +0900 advapi32: Implement and test SystemFunction005. --- dlls/advapi32/advapi32.spec | 2 + dlls/advapi32/crypt_lmhash.c | 61 +++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/crypt_lmhash.c | 63 ++++++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 9f815f5..abdab0b 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -599,7 +599,7 @@ # @ stub StopTraceW @ stdcall SystemFunction002(ptr ptr ptr) @ stdcall SystemFunction003(ptr ptr) @ stdcall SystemFunction004(ptr ptr ptr) -@ stub SystemFunction005 +@ stdcall SystemFunction005(ptr ptr ptr) @ stdcall SystemFunction006(ptr ptr) @ stdcall SystemFunction007(ptr ptr) @ stdcall SystemFunction008(ptr ptr ptr) diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index 7070154..4760e97 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -219,3 +219,64 @@ NTSTATUS WINAPI SystemFunction004(const return STATUS_SUCCESS; } + +/****************************************************************************** + * SystemFunction005 [ADVAPI32.@] + * + * Decrypts a block of data with DES in ECB mode + * + * PARAMS + * data [I] data to decrypt + * key [I] key data (up to 7 bytes) + * output [O] buffer to receive decrypted data + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_BUFFER_TOO_SMALL if the output buffer is too small + * Failure: STATUS_INVALID_PARAMETER_2 if the key is zero length + * + */ +NTSTATUS WINAPI SystemFunction005(const struct ustring *in, + const struct ustring *key, + struct ustring *out) +{ + union { + unsigned char uc[8]; + unsigned int ui[2]; + } data; + unsigned char deskey[7]; + int ofs, crypt_len; + + if (key->Length<=0) + return STATUS_INVALID_PARAMETER_2; + + if (key->Length<sizeof deskey) + { + memset(deskey, 0, sizeof deskey); + memcpy(deskey, key->Buffer, key->Length); + } + else + memcpy(deskey, key->Buffer, sizeof deskey); + + CRYPT_DESunhash(data.uc, deskey, in->Buffer); + + if (data.ui[1] != 1) + return STATUS_UNKNOWN_REVISION; + + crypt_len = data.ui[0]; + if (crypt_len > out->MaximumLength) + return STATUS_BUFFER_TOO_SMALL; + + for (ofs=0; (ofs+8)<crypt_len; ofs+=8) + CRYPT_DESunhash(out->Buffer+ofs, deskey, in->Buffer+ofs+8); + + if (ofs<crypt_len) + { + CRYPT_DESunhash(data.uc, deskey, in->Buffer+ofs+8); + memcpy(out->Buffer+ofs, data.uc, crypt_len-ofs); + } + + out->Length = crypt_len; + + return STATUS_SUCCESS; +} diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 2edb843..866bbde 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -38,6 +38,7 @@ typedef NTSTATUS (WINAPI *fnSystemFuncti typedef NTSTATUS (WINAPI *fnSystemFunction002)(const LPBYTE, const LPBYTE, LPBYTE); typedef NTSTATUS (WINAPI *fnSystemFunction003)(const LPBYTE, LPBYTE); typedef NTSTATUS (WINAPI *fnSystemFunction004)(const struct ustring *, const struct ustring *, struct ustring *); +typedef NTSTATUS (WINAPI *fnSystemFunction005)(const struct ustring *, const struct ustring *, struct ustring *); typedef VOID (WINAPI *fnSystemFunction006)( PCSTR passwd, PSTR lmhash ); typedef NTSTATUS (WINAPI *fnSystemFunction008)(const LPBYTE, const LPBYTE, LPBYTE); typedef NTSTATUS (WINAPI *fnSystemFunction032)(struct ustring *, struct ustring *); @@ -46,6 +47,7 @@ fnSystemFunction001 pSystemFunction001; fnSystemFunction002 pSystemFunction002; fnSystemFunction003 pSystemFunction003; fnSystemFunction004 pSystemFunction004; +fnSystemFunction004 pSystemFunction005; fnSystemFunction006 pSystemFunction006; fnSystemFunction008 pSystemFunction008; fnSystemFunction032 pSystemFunction032; @@ -274,6 +276,63 @@ static void test_SystemFunction004(void) ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); } +static void test_SystemFunction005(void) +{ + char output[0x40], result[0x40]; + int r; + struct ustring in, key, out, res; + char *datastr = "twinkle twinkle little star"; + char *keystr = "byolnim"; + + in.Buffer = (unsigned char *) datastr; + in.Length = strlen(datastr); + in.MaximumLength = 0; + + key.Buffer = (unsigned char *)keystr; + key.Length = strlen(keystr); + key.MaximumLength = 0; + + out.Buffer = (unsigned char *)output; + out.Length = out.MaximumLength = sizeof output; + + r = pSystemFunction004(&in, &key, &out); + ok(r == STATUS_SUCCESS, "function failed\n"); + + memset(result, 0, sizeof result); + res.Buffer = (unsigned char *)result; + res.Length = 0; + res.MaximumLength = sizeof result; + + r = pSystemFunction005(&out, &key, &res); + ok(r == STATUS_SUCCESS, "function failed\n"); + + r = pSystemFunction005(&out, &key, &res); + ok(r == STATUS_SUCCESS, "function failed\n"); + + ok(res.Length == in.Length, "Length wrong\n"); + ok(!memcmp(res.Buffer, in.Buffer, in.Length), "data wrong\n"); + + out.Length = 0; + out.MaximumLength = 0; + r = pSystemFunction005(&out, &key, &res); + ok(r == STATUS_SUCCESS, "function failed\n"); + + ok(res.Length == in.Length, "Length wrong\n"); + ok(!memcmp(res.Buffer, in.Buffer, in.Length), "data wrong\n"); + + res.MaximumLength = 0; + r = pSystemFunction005(&out, &key, &res); + ok(r == STATUS_BUFFER_TOO_SMALL, "function failed\n"); + + key.Length = 1; + r = pSystemFunction005(&out, &key, &res); + ok(r == STATUS_UNKNOWN_REVISION, "function failed\n"); + + key.Length = 0; + r = pSystemFunction005(&out, &key, &res); + ok(r == STATUS_INVALID_PARAMETER_2, "function failed\n"); +} + START_TEST(crypt_lmhash) { HMODULE module; @@ -296,6 +355,10 @@ START_TEST(crypt_lmhash) if (pSystemFunction004) test_SystemFunction004(); + pSystemFunction005 = (fnSystemFunction005)GetProcAddress( module, "SystemFunction005" ); + if (pSystemFunction005) + test_SystemFunction005(); + pSystemFunction006 = (fnSystemFunction006)GetProcAddress( module, "SystemFunction006" ); if (pSystemFunction006) test_SystemFunction006();

1 0