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

Robert Shearman : rpcrt4: Fix NdrFullPointerQueryRefId to make more tests pass.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: 7af506b2b48e5f3b28f09b4ad730fd8da6cb5038 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7af506b2b48e5f3b28f09b4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 26 19:56:23 2006 +0100 rpcrt4: Fix NdrFullPointerQueryRefId to make more tests pass. --- dlls/rpcrt4/ndr_fullpointer.c | 9 +++++++++ dlls/rpcrt4/tests/ndr_marshall.c | 12 +++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index 8b2e6dd..983bd51 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -145,8 +145,17 @@ int WINAPI NdrFullPointerQueryRefId(PFUL expand_pointer_table_if_necessary(pXlatTables, RefId); + pXlatTables->NextRefId = max(RefId + 1, pXlatTables->NextRefId); + if (pXlatTables->RefIdToPointer.NumberOfEntries > RefId) + { *ppPointer = pXlatTables->RefIdToPointer.XlatTable[RefId]; + if (QueryType) + return pXlatTables->RefIdToPointer.StateTable[RefId]; + else + return 0; + } + *ppPointer = NULL; return 0; } diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index e39decb..f9cf602 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -762,21 +762,17 @@ static void test_fullpointer_xlat(void) ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xcafebeef, 1, &RefId); ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); - todo_wine { - ok(RefId == 0x3, "RefId should be 0x1 instead of 0x%lx\n", RefId); - } + ok(RefId == 0x3, "RefId should be 0x3 instead of 0x%lx\n", RefId); ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xcafebeef, 1, &RefId); ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); - todo_wine { - ok(RefId == 0x3, "RefId should be 0x1 instead of 0x%lx\n", RefId); - } + ok(RefId == 0x3, "RefId should be 0x3 instead of 0x%lx\n", RefId); ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xcafebeef, 0, &RefId); todo_wine { ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); - ok(RefId == 0x3, "RefId should be 0x1 instead of 0x%lx\n", RefId); } + ok(RefId == 0x3, "RefId should be 0x3 instead of 0x%lx\n", RefId); ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xcafebabe, 0, &RefId); ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); @@ -784,9 +780,7 @@ static void test_fullpointer_xlat(void) ret = NdrFullPointerQueryPointer(pXlatTables, (void *)0xdeadbeef, 0, &RefId); ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); - todo_wine { ok(RefId == 0x4, "RefId should be 0x4 instead of 0x%lx\n", RefId); - } /* "freeing" phase */

1 0

Robert Shearman : rpcrt4: Implement remaining part of NdrFullPointerQueryPointer and implement NdrFullPointerInsertRefId .
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: 767631d85318c8bb93b7c33a89d21ec2419f90b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=767631d85318c8bb93b7c33… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 26 19:56:11 2006 +0100 rpcrt4: Implement remaining part of NdrFullPointerQueryPointer and implement NdrFullPointerInsertRefId. --- dlls/rpcrt4/ndr_fullpointer.c | 35 ++++++++++++++++++++++++++++++----- dlls/rpcrt4/tests/ndr_marshall.c | 8 +------- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index f88c299..8b2e6dd 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -108,8 +108,6 @@ int WINAPI NdrFullPointerQueryPointer(PF for (i = 0; i < sizeof(pPointer); i++) Hash = (Hash * 3) ^ ((unsigned char *)&pPointer)[i]; - TRACE("pXlatTables->PointerToRefId.XlatTable = %p\n", pXlatTables->PointerToRefId.XlatTable); - TRACE("Hash = 0x%lx, pXlatTables->PointerToRefId.HashMask = 0x%lx\n", Hash, pXlatTables->PointerToRefId.HashMask); XlatTableEntry = pXlatTables->PointerToRefId.XlatTable[Hash & pXlatTables->PointerToRefId.HashMask]; for (; XlatTableEntry; XlatTableEntry = XlatTableEntry->Next) if (pPointer == XlatTableEntry->Pointer) @@ -128,7 +126,13 @@ int WINAPI NdrFullPointerQueryPointer(PF XlatTableEntry->State = QueryType; pXlatTables->PointerToRefId.XlatTable[Hash & pXlatTables->PointerToRefId.HashMask] = XlatTableEntry; - /* FIXME: insert pointer into mapping table */ + /* insert pointer into mapping table */ + expand_pointer_table_if_necessary(pXlatTables, XlatTableEntry->RefId); + if (pXlatTables->RefIdToPointer.NumberOfEntries > XlatTableEntry->RefId) + { + pXlatTables->RefIdToPointer.XlatTable[XlatTableEntry->RefId] = pPointer; + pXlatTables->RefIdToPointer.StateTable[XlatTableEntry->RefId] = QueryType; + } return 0; } @@ -141,14 +145,35 @@ int WINAPI NdrFullPointerQueryRefId(PFUL expand_pointer_table_if_necessary(pXlatTables, RefId); - *ppPointer = pXlatTables->RefIdToPointer.XlatTable[RefId]; + if (pXlatTables->RefIdToPointer.NumberOfEntries > RefId) + *ppPointer = pXlatTables->RefIdToPointer.XlatTable[RefId]; return 0; } void WINAPI NdrFullPointerInsertRefId(PFULL_PTR_XLAT_TABLES pXlatTables, unsigned long RefId, void *pPointer) { - FIXME("(%p, 0x%lx, %p)\n", pXlatTables, RefId, pPointer); + unsigned long Hash = 0; + int i; + PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry; + + TRACE("(%p, 0x%lx, %p)\n", pXlatTables, RefId, pPointer); + + /* simple hashing algorithm, don't know whether it matches native */ + for (i = 0; i < sizeof(pPointer); i++) + Hash = (Hash * 3) ^ ((unsigned char *)&pPointer)[i]; + + XlatTableEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(*XlatTableEntry)); + XlatTableEntry->Next = pXlatTables->PointerToRefId.XlatTable[Hash & pXlatTables->PointerToRefId.HashMask]; + XlatTableEntry->Pointer = pPointer; + XlatTableEntry->RefId = RefId; + XlatTableEntry->State = 0; + pXlatTables->PointerToRefId.XlatTable[Hash & pXlatTables->PointerToRefId.HashMask] = XlatTableEntry; + + /* insert pointer into mapping table */ + expand_pointer_table_if_necessary(pXlatTables, RefId); + if (pXlatTables->RefIdToPointer.NumberOfEntries > RefId) + pXlatTables->RefIdToPointer.XlatTable[XlatTableEntry->RefId] = pPointer; } int WINAPI NdrFullPointerFree(PFULL_PTR_XLAT_TABLES pXlatTables, void *Pointer) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 26fcdb6..e39decb 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -724,9 +724,7 @@ static void test_fullpointer_xlat(void) ret = NdrFullPointerQueryRefId(pXlatTables, 0x2, 0, &Pointer); ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); - todo_wine { ok(Pointer == (void *)0xcafebabe, "Pointer should be 0xcafebabe instead of %p\n", Pointer); - } ret = NdrFullPointerQueryRefId(pXlatTables, 0x4, 0, &Pointer); ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); @@ -736,9 +734,7 @@ static void test_fullpointer_xlat(void) ret = NdrFullPointerQueryRefId(pXlatTables, 0x4, 1, &Pointer); ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); - todo_wine { ok(Pointer == (void *)0xdeadbabe, "Pointer should be (void *)0xdeadbabe instead of %p\n", Pointer); - } NdrFullPointerXlatFree(pXlatTables); @@ -754,15 +750,13 @@ static void test_fullpointer_xlat(void) ret = NdrFullPointerQueryRefId(pXlatTables, 0x2, 0, &Pointer); ok(ret == 0, "ret should be 0 instead of 0x%x\n", ret); - todo_wine { ok(Pointer == (void *)0xcafebabe, "Pointer should be (void *)0xcafebabe instead of %p\n", Pointer); - } ret = NdrFullPointerQueryRefId(pXlatTables, 0x2, 1, &Pointer); todo_wine { ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); - ok(Pointer == (void *)0xcafebabe, "Pointer should be (void *)0xcafebabe instead of %p\n", Pointer); } + ok(Pointer == (void *)0xcafebabe, "Pointer should be (void *)0xcafebabe instead of %p\n", Pointer); /* "marshaling" phase */

1 0

Robert Shearman : rpcrt4: Implement some full pointer functions and add stubs for others.
by Alexandre Julliard 27 May '06

27 May '06

Module: wine Branch: refs/heads/master Commit: eb0fe9e6e33d9eaac9ef0473b7ce95392c964817 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb0fe9e6e33d9eaac9ef047… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 26 19:56:00 2006 +0100 rpcrt4: Implement some full pointer functions and add stubs for others. Add some tests. --- dlls/rpcrt4/Makefile.in | 1 dlls/rpcrt4/ndr_fullpointer.c | 159 ++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 12 +-- dlls/rpcrt4/tests/ndr_marshall.c | 122 +++++++++++++++++++++++++++++ 4 files changed, 288 insertions(+), 6 deletions(-) create mode 100644 dlls/rpcrt4/ndr_fullpointer.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=eb0fe9e6e33d9eaac9e…

1 0

appdb/. testResults.php
by WineHQ 27 May '06

27 May '06

ChangeSet ID: 25221 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/05/26 20:42:45 Modified files: . : testResults.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Fix typo on the test results page Patch: http://cvs.winehq.org/patch.py?id=25221 Old revision New revision Changes Path 1.3 1.4 +1 -1 appdb/testResults.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.3 appdb/testResults.php:1.4 --- appdb/testResults.php:1.3 27 May 2006 1:42:45 -0000 +++ appdb/testResults.php 27 May 2006 1:42:45 -0000 @@ -170,7 +170,7 @@ else // if ($_REQUEST['sub']) is not def { // no Tests in queue echo html_frame_start("Submitted Testing Results","90%"); - echo 'The Submitted Testng Results Queue is empty.',"\n"; + echo 'The Submitted Testing Results Queue is empty.',"\n"; echo html_frame_end(" "); } else

1 0

lostwages/wwn wn20060526_314.xml
by WineHQ 26 May '06

26 May '06

ChangeSet ID: 25220 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/05/26 15:11:04 Modified files: wwn : wn20060526_314.xml Log message: Edit of WWN #314 Patch: http://cvs.winehq.org/patch.py?id=25220 Old revision New revision Changes Path 1.1 1.2 +14 -9 lostwages/wwn/wn20060526_314.xml Index: lostwages/wwn/wn20060526_314.xml diff -u -p lostwages/wwn/wn20060526_314.xml:1.1 lostwages/wwn/wn20060526_314.xml:1.2 --- lostwages/wwn/wn20060526_314.xml:1.1 26 May 2006 20:11: 4 -0000 +++ lostwages/wwn/wn20060526_314.xml 26 May 2006 20:11: 4 -0000 @@ -89,7 +89,7 @@ Its main goal is to <a href="http://www. <section title="News: Picasa, Wine 0.9.14, LJ Article" subject="News" - archive="http://www.winehq.org/?announce=1.118"> + archive="http://www.winehq.org/?announce=1.118" posts="3" > <topic>News</topic> @@ -112,7 +112,7 @@ After that, work began to port Direct3D used by D3D9. Since then, work has branched out into many areas. We've picked up some new developers along the way, which is great. -I mentioned the following in wine-devel about a recent Linux Journal +I mentioned the following on wine-devel about a recent Linux Journal article: <quote who="Brian Vincent"> I just saw the May issue of Linux Journal and it has an article titled @@ -143,7 +143,7 @@ tested with Wine 0.9.6 and then has a pa <tt>~/.wine/config</tt>. I think it's a remnant of an old installation.] </quote> -Uwe Bonnes, Stefan Maunz, and Marcus Meissner attended Linuxtag in +Finally, Uwe Bonnes, Stefan Maunz, and Marcus Meissner attended Linuxtag in Wiesbaden a few weeks ago. Marcus provided <a href="http://gallery.kuschelt.net/main.php?g2_view=core.ShowItem&g2_itemId=93…">a picture</a> showing Stefan on the left and Uwe next to him. Check out the nice Wine @@ -165,8 +165,9 @@ You might have missed some of this if yo wine-devel. First, one of the most interesting revelations came from Linux Today and -<a href="http://www.linuxtoday.com/infrastructure/2006052601826NWSWRL">a -description</a> of the port by Chris DiBona. Chris revealed that Google +Chris DiBona's +<a href="http://www.linuxtoday.com/infrastructure/2006052601826NWSWRL"> +description</a> of the port. Chris revealed that Google Earth is slated to be the next app ported. From that report: <quote who="Chris Dibona"> Picasa, founded in 2001, was purchased by Google in July of 2004, and the photo @@ -193,9 +194,12 @@ verson of Google Earth to see if it'll r Now, back in February I conjectured that Google would probably provide a copy of Wine to run Picasa with and that it would be a straight up Windows app rather -than a traditional Winelib port. Expect the same for Google Earth. Even +than a traditional Winelib port. That proved to be the case and you can expect +the same for Google Earth. Even more important, Google Earth and Picasa will likely be able to share the same -version of Wine libraries, so we may see a collection of desktop apps appearing. +version of Wine libraries, so we may see a collection of desktop apps appearing +for Linux similar to the <a href="http://pack.google.com/">Google +Pack</a> available for Windows. Okay, back to the news about Picasa. If you're unfamiliar with this program it's an image archive/management tool. Besides just storing pictures and making them searchable, there's a lot of features like mail @@ -217,7 +221,7 @@ an open line of communication from the b <a href="http://picasa.google.com/linux/">Picasa on Linux</a> page describes some of the features of the port. Slashdot <a href="http://slashdot.org/article.pl?sid=06/05/26/0310229">covered</a> -the story with a post by Chris and some positive comments, +the story with a post by Chris and included some positive comments, <quote who="Chris DiBona"> Picasa for Linux uses Wine internally; this shows a bit in the interface, but it works even better than we had hoped. ... @@ -515,7 +519,8 @@ wine's msi innerworkings. <ul> <li><a href="http://msdn.microsoft.com/library/en-us/msi/setup/ordering_file_sequence_nu…"> -http://msdn.microsoft.com/library/en-us/msi/setup/ordering_file_sequence_numbers_in_a_cabinet_file_table_and_media_table.asp</a> +http://msdn.microsoft.com/library/en-us/msi/setup/ +ordering_file_sequence_numbers_in_a_cabinet_file_table_and_media_table.asp</a> </li> <li><a href="http://msdn.microsoft.com/library/en-us/msi/setup/file_table.asp?frame=true"> http://msdn.microsoft.com/library/en-us/msi/setup/file_table.asp?frame=true</a>

1 0

lostwages/ news/2006052602.xml wwn/wn20060526_ ...
by WineHQ 26 May '06

26 May '06

ChangeSet ID: 25219 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/05/26 14:33:25 Added files: news : 2006052602.xml wwn : wn20060526_314.xml Log message: WWN #314 Patch: http://cvs.winehq.org/patch.py?id=25219 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006052602.xml Added 1.1 +0 -0 lostwages/wwn/wn20060526_314.xml

1 0

Stefan Dösinger : wined3d: Implement IWineD3DSurface:: BltFast.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: 34a959c6ebe159fb6aca5251cd6c813c47208cbc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34a959c6ebe159fb6aca525… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 26 12:19:28 2006 +0200 wined3d: Implement IWineD3DSurface::BltFast. --- dlls/wined3d/surface.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c21e715..054eecc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2481,8 +2481,38 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Resto } HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, IWineD3DSurface *Source, RECT *rsrc, DWORD trans) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DSurfaceImpl *srcImpl = (IWineD3DSurfaceImpl *) Source; + TRACE("(%p)->(%ld, %ld, %p, %p, %08lx\n", iface, dstx, dsty, Source, rsrc, trans); + + /* Special cases for RenderTargets */ + if( (This->resource.usage & WINED3DUSAGE_RENDERTARGET) || + ( srcImpl && (srcImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) )) { + + RECT SrcRect, DstRect; + + if(rsrc) { + SrcRect.left = rsrc->left; + SrcRect.top= rsrc->top; + SrcRect.bottom = rsrc->bottom; + SrcRect.right = rsrc->right; + } else { + SrcRect.left = 0; + SrcRect.top = 0; + SrcRect.right = srcImpl->currentDesc.Width; + SrcRect.bottom = srcImpl->currentDesc.Height; + } + + DstRect.left = dstx; + DstRect.top=dsty; + DstRect.right = dstx + SrcRect.right - SrcRect.left; + DstRect.bottom = dsty + SrcRect.bottom - SrcRect.top; + + if(IWineD3DSurfaceImpl_BltOverride(This, &DstRect, Source, &SrcRect, 0, NULL) == WINED3D_OK) return WINED3D_OK; + } + + + return IWineGDISurfaceImpl_BltFast(iface, dstx, dsty, Source, rsrc, trans); } HRESULT WINAPI IWineD3DSurfaceImpl_SetPixelFormat(IWineD3DSurface *iface, WINED3DFORMAT Format, BYTE *Surface, DWORD Size) {

1 0

Mike McCormack : secur32: Avoid some code duplication.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: f8dea2d803a7a21fc404ab34e664434cf065f7d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8dea2d803a7a21fc404ab3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri May 26 16:44:09 2006 +0900 secur32: Avoid some code duplication. --- dlls/secur32/ntlm.c | 66 ++++++++++++++++----------------------------------- 1 files changed, 21 insertions(+), 45 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index bfef216..5cb44d2 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -129,69 +129,45 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac LPWKSTA_USER_INFO_1 ui = NULL; NET_API_STATUS status; - if((status = NetWkstaUserGetInfo(NULL, 1, (LPBYTE *)&ui)) != - NERR_Success) + status = NetWkstaUserGetInfo(NULL, 1, (LPBYTE *)&ui); + if (status != NERR_Success || ui == NULL) { ret = SEC_E_NO_CREDENTIALS; phCredential = NULL; break; } - if(ui != NULL) - { - username = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(ui->wkui1_username)+1) * - sizeof(SEC_WCHAR)); - lstrcpyW(username, ui->wkui1_username); + username = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(ui->wkui1_username)+1) * + sizeof(SEC_WCHAR)); + lstrcpyW(username, ui->wkui1_username); - /* same for the domain */ - domain = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(ui->wkui1_logon_domain)+1) * - sizeof(SEC_WCHAR)); - lstrcpyW(domain, ui->wkui1_logon_domain); - NetApiBufferFree(ui); - } - else - { - ret = SEC_E_NO_CREDENTIALS; - phCredential = NULL; - break; - } - - + /* same for the domain */ + domain = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(ui->wkui1_logon_domain)+1) * + sizeof(SEC_WCHAR)); + lstrcpyW(domain, ui->wkui1_logon_domain); + NetApiBufferFree(ui); } else { PSEC_WINNT_AUTH_IDENTITY_W auth_data = (PSEC_WINNT_AUTH_IDENTITY_W)pAuthData; - if(auth_data->UserLength != 0) - { - /* Get username and domain from pAuthData */ - username = HeapAlloc(GetProcessHeap(), 0, - (auth_data->UserLength + 1) * sizeof(SEC_WCHAR)); - lstrcpyW(username, auth_data->User); - } - else + if (!auth_data->UserLength || !auth_data->DomainLength) { ret = SEC_E_NO_CREDENTIALS; phCredential = NULL; break; } - if(auth_data->DomainLength != 0) - { - domain = HeapAlloc(GetProcessHeap(), 0, - (auth_data->DomainLength + 1) * sizeof(SEC_WCHAR)); - lstrcpyW(domain, auth_data->Domain); - - } - else - { - ret = SEC_E_NO_CREDENTIALS; - phCredential = NULL; - break; - } - + /* Get username and domain from pAuthData */ + username = HeapAlloc(GetProcessHeap(), 0, + (auth_data->UserLength + 1) * sizeof(SEC_WCHAR)); + lstrcpyW(username, auth_data->User); + + domain = HeapAlloc(GetProcessHeap(), 0, + (auth_data->DomainLength + 1) * sizeof(SEC_WCHAR)); + lstrcpyW(domain, auth_data->Domain); } TRACE("Username is %s\n", debugstr_w(username)); unixcp_size = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS,

1 0

Juan Lang : crypt32: Implement CertVerifyCRLTimeValidity and partially implement CertVerifySubjectCertificateContext .
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: b29c2335b8370786647913e4fc5eac052c2b282c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b29c2335b8370786647913e… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri May 26 09:48:13 2006 -0700 crypt32: Implement CertVerifyCRLTimeValidity and partially implement CertVerifySubjectCertificateContext. --- dlls/crypt32/cert.c | 66 ++++++++++++++++++++++++++++++-------------- dlls/crypt32/crl.c | 23 +++++++++++++++ dlls/crypt32/crypt32.spec | 4 +-- dlls/crypt32/tests/cert.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 5 +++ 5 files changed, 143 insertions(+), 23 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f529668..f4c7a42 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -195,8 +195,7 @@ static BOOL WINAPI CertContext_GetProper TRACE("(%p, %ld, %p, %p)\n", context, dwPropId, pvData, pcbData); if (properties) - ret = ContextPropertyList_FindProperty(properties, dwPropId, - &blob); + ret = ContextPropertyList_FindProperty(properties, dwPropId, &blob); else ret = FALSE; if (ret) @@ -737,44 +736,69 @@ PCCERT_CONTEXT WINAPI CertGetSubjectCert CERT_FIND_SUBJECT_CERT, pCertId, NULL); } +BOOL WINAPI CertVerifySubjectCertificateContext(PCCERT_CONTEXT pSubject, + PCCERT_CONTEXT pIssuer, DWORD *pdwFlags) +{ + static const DWORD supportedFlags = CERT_STORE_REVOCATION_FLAG | + CERT_STORE_SIGNATURE_FLAG | CERT_STORE_TIME_VALIDITY_FLAG; + + if (*pdwFlags & ~supportedFlags) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (*pdwFlags & CERT_STORE_REVOCATION_FLAG) + { + PCCRL_CONTEXT crl = CertFindCRLInStore(pSubject->hCertStore, + pSubject->dwCertEncodingType, 0, CRL_FIND_ISSUED_BY, pSubject, NULL); + + if (crl) + { + FIXME("check CRL for subject\n"); + } + else + *pdwFlags |= CERT_STORE_NO_CRL_FLAG; + } + if (*pdwFlags & CERT_STORE_TIME_VALIDITY_FLAG) + { + if (0 == CertVerifyTimeValidity(NULL, pSubject->pCertInfo)) + *pdwFlags &= ~CERT_STORE_TIME_VALIDITY_FLAG; + } + if (*pdwFlags & CERT_STORE_SIGNATURE_FLAG) + { + if (CryptVerifyCertificateSignatureEx(0, pSubject->dwCertEncodingType, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT, (void *)pSubject, + CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)pIssuer, 0, NULL)) + *pdwFlags &= ~CERT_STORE_SIGNATURE_FLAG; + } + return TRUE; +} + PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pSubjectContext, PCCERT_CONTEXT pPrevIssuerContext, DWORD *pdwFlags) { - static const DWORD supportedFlags = CERT_STORE_REVOCATION_FLAG | - CERT_STORE_SIGNATURE_FLAG | CERT_STORE_TIME_VALIDITY_FLAG; PCCERT_CONTEXT ret; TRACE("(%p, %p, %p, %08lx)\n", hCertStore, pSubjectContext, pPrevIssuerContext, *pdwFlags); - if (*pdwFlags & ~supportedFlags) + if (!pSubjectContext) { SetLastError(E_INVALIDARG); return NULL; } + ret = CertFindCertificateInStore(hCertStore, pSubjectContext->dwCertEncodingType, 0, CERT_FIND_ISSUER_OF, pSubjectContext, pPrevIssuerContext); if (ret) { - if (*pdwFlags & CERT_STORE_REVOCATION_FLAG) - { - FIXME("revocation check requires CRL support\n"); - *pdwFlags |= CERT_STORE_NO_CRL_FLAG; - } - if (*pdwFlags & CERT_STORE_TIME_VALIDITY_FLAG) - { - if (0 == CertVerifyTimeValidity(NULL, pSubjectContext->pCertInfo)) - *pdwFlags &= ~CERT_STORE_TIME_VALIDITY_FLAG; - } - if (*pdwFlags & CERT_STORE_SIGNATURE_FLAG) + if (!CertVerifySubjectCertificateContext(pSubjectContext, ret, + pdwFlags)) { - if (CryptVerifyCertificateSignatureEx(0, - pSubjectContext->dwCertEncodingType, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT, (void *)pSubjectContext, - CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)ret, 0, NULL)) - *pdwFlags &= ~CERT_STORE_SIGNATURE_FLAG; + CertFreeCertificateContext(ret); + ret = NULL; } } diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 3c60578..dd2918c 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -443,3 +443,26 @@ BOOL WINAPI CertSetCRLContextProperty(PC TRACE("returning %d\n", ret); return ret; } + +LONG WINAPI CertVerifyCRLTimeValidity(LPFILETIME pTimeToVerify, + PCRL_INFO pCrlInfo) +{ + FILETIME fileTime; + LONG ret; + + if (!pTimeToVerify) + { + SYSTEMTIME sysTime; + + GetSystemTime(&sysTime); + SystemTimeToFileTime(&sysTime, &fileTime); + pTimeToVerify = &fileTime; + } + if ((ret = CompareFileTime(pTimeToVerify, &pCrlInfo->ThisUpdate)) >= 0) + { + ret = CompareFileTime(pTimeToVerify, &pCrlInfo->NextUpdate); + if (ret < 0) + ret = 0; + } + return ret; +} diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 8900bec..a525c65 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -81,10 +81,10 @@ @ stub CertStrToNameA @ stub CertStrToNameW @ stub CertVerifyCRLRevocation -@ stub CertVerifyCRLTimeValidity +@ stdcall CertVerifyCRLTimeValidity(ptr ptr) @ stub CertVerifyCTLUsage @ stub CertVerifyRevocation -@ stub CertVerifySubjectCertificateContext +@ stdcall CertVerifySubjectCertificateContext(ptr ptr ptr) @ stdcall CertVerifyTimeValidity(ptr ptr) @ stub CertVerifyValidityNesting @ stub CreateFileU diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 656fb94..776d117 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -836,6 +836,73 @@ void testCompareCert(void) ok(!ret, "Expected certs not to be equal\n"); } +static const BYTE bigCertWithDifferentSubject[] = { 0x30, 0x7a, 0x02, 0x01, 0x02, + 0x30, 0x02, 0x06, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, + 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, + 0x00, 0x30, 0x22, 0x18, 0x0f, 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x31, 0x36, 0x30, 0x31, + 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x30, 0x15, + 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x41, 0x6c, + 0x65, 0x78, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x07, 0x30, 0x02, 0x06, + 0x00, 0x03, 0x01, 0x00, 0xa3, 0x16, 0x30, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, + 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, + 0x01, 0x01 }; + +static void testVerifySubjectCert(void) +{ + BOOL ret; + DWORD flags; + PCCERT_CONTEXT context1, context2; + + /* Crashes + ret = CertVerifySubjectCertificateContext(NULL, NULL, NULL); + */ + flags = 0; + ret = CertVerifySubjectCertificateContext(NULL, NULL, &flags); + ok(ret, "CertVerifySubjectCertificateContext failed; %08lx\n", + GetLastError()); + flags = CERT_STORE_NO_CRL_FLAG; + ret = CertVerifySubjectCertificateContext(NULL, NULL, &flags); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); + + flags = 0; + context1 = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, + sizeof(bigCert)); + ret = CertVerifySubjectCertificateContext(NULL, context1, &flags); + ok(ret, "CertVerifySubjectCertificateContext failed; %08lx\n", + GetLastError()); + ret = CertVerifySubjectCertificateContext(context1, NULL, &flags); + ok(ret, "CertVerifySubjectCertificateContext failed; %08lx\n", + GetLastError()); + ret = CertVerifySubjectCertificateContext(context1, context1, &flags); + ok(ret, "CertVerifySubjectCertificateContext failed; %08lx\n", + GetLastError()); + + context2 = CertCreateCertificateContext(X509_ASN_ENCODING, + bigCertWithDifferentSubject, sizeof(bigCertWithDifferentSubject)); + SetLastError(0xdeadbeef); + ret = CertVerifySubjectCertificateContext(context1, context2, &flags); + ok(ret, "CertVerifySubjectCertificateContext failed; %08lx\n", + GetLastError()); + flags = CERT_STORE_REVOCATION_FLAG; + ret = CertVerifySubjectCertificateContext(context1, context2, &flags); + ok(ret, "CertVerifySubjectCertificateContext failed; %08lx\n", + GetLastError()); + ok(flags == (CERT_STORE_REVOCATION_FLAG | CERT_STORE_NO_CRL_FLAG), + "Expected CERT_STORE_REVOCATION_FLAG | CERT_STORE_NO_CRL_FLAG, got %08lx\n", + flags); + flags = CERT_STORE_SIGNATURE_FLAG; + ret = CertVerifySubjectCertificateContext(context1, context2, &flags); + ok(ret, "CertVerifySubjectCertificateContext failed; %08lx\n", + GetLastError()); + ok(flags == CERT_STORE_SIGNATURE_FLAG, + "Expected CERT_STORE_SIGNATURE_FLAG, got %08lx\n", flags); + CertFreeCertificateContext(context2); + + CertFreeCertificateContext(context1); +} + START_TEST(cert) { init_function_pointers(); @@ -847,4 +914,5 @@ START_TEST(cert) testCompareIntegerBlob(); testComparePublicKeyInfo(); testCompareCert(); + testVerifySubjectCert(); } diff --git a/include/wincrypt.h b/include/wincrypt.h index a5f4269..771ec99 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2840,6 +2840,11 @@ PCERT_EXTENSION WINAPI CertFindExtension CERT_EXTENSION rgExtensions[]); PCERT_RDN_ATTR WINAPI CertFindRDNAttr(LPCSTR pszObjId, PCERT_NAME_INFO pName); +BOOL WINAPI CertVerifySubjectCertificateContext(PCCERT_CONTEXT pSubject, + PCCERT_CONTEXT pIssuer, DWORD *pdwFlags); + +LONG WINAPI CertVerifyCRLTimeValidity(LPFILETIME pTimeToVerify, + PCRL_INFO pCrlInfo); LONG WINAPI CertVerifyTimeValidity(LPFILETIME pTimeToVerify, PCERT_INFO pCertInfo);

1 0

Mike McCormack : rpcrt4: Implement NdrClientContext(Un)Marshall.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: refs/heads/master Commit: a534fdec3217b5bddbd86f42a3ef9ff55706143a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a534fdec3217b5bddbd86f4… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri May 26 17:56:49 2006 +0900 rpcrt4: Implement NdrClientContext(Un)Marshall. --- dlls/rpcrt4/ndr_marshall.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 7516edd..f9164df 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4294,7 +4294,10 @@ void WINAPI NdrClientContextMarshall(PMI NDR_CCONTEXT ContextHandle, int fCheck) { - FIXME("(%p, %p, %d): stub\n", pStubMsg, ContextHandle, fCheck); + TRACE("(%p, %p, %d): stub\n", pStubMsg, ContextHandle, fCheck); + /* FIXME: what does fCheck do? */ + return NDRCContextMarshall(ContextHandle, + pStubMsg->Buffer); } /*********************************************************************** @@ -4304,7 +4307,11 @@ void WINAPI NdrClientContextUnmarshall(P NDR_CCONTEXT * pContextHandle, RPC_BINDING_HANDLE BindHandle) { - FIXME("(%p, %p, %p): stub\n", pStubMsg, pContextHandle, BindHandle); + TRACE("(%p, %p, %p): stub\n", pStubMsg, pContextHandle, BindHandle); + return NDRCContextUnmarshall(pContextHandle, + BindHandle, + pStubMsg->Buffer, + pStubMsg->RpcMsg->DataRepresentation); } void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,

1 0