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

Robert Shearman : Check the return value from register_key_guid in all the DLL registering code .
by Alexandre Julliard May 10, 2006

May 10, 2006

1 0

Bernd Buschinski : ntdll: Stub implementation of FSCTL_LOCK_VOLUME/ FSCTL_UNLOCK_VOLUME.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: da6031fbabf37c2e58c274e7503f86f75e4b6615 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da6031fbabf37c2e58c274e… Author: Bernd Buschinski <b.buschinski(a)web.de> Date: Tue May 9 22:55:38 2006 +0200 ntdll: Stub implementation of FSCTL_LOCK_VOLUME/FSCTL_UNLOCK_VOLUME. --- dlls/ntdll/file.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index bbeb27f..a1ab4e8 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1029,6 +1029,13 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE h SERVER_END_REQ; break; + case FSCTL_LOCK_VOLUME: + case FSCTL_UNLOCK_VOLUME: + FIXME("stub! return success - Unsupported fsctl %lx (device=%lx access=%lx func=%lx method=%lx)\n", + code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + io->u.Status = STATUS_SUCCESS; + break; + default: FIXME("Unsupported fsctl %lx (device=%lx access=%lx func=%lx method=%lx)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3);

1 0

James Hawkins : ntdll: Add initial tests for the NT Ports API.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 86a32784e295929f765bfb8edeee6eda8be3edc4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86a32784e295929f765bfb8… Author: James Hawkins <truiken(a)gmail.com> Date: Tue May 9 21:18:40 2006 -0500 ntdll: Add initial tests for the NT Ports API. --- dlls/ntdll/tests/.gitignore | 1 dlls/ntdll/tests/Makefile.in | 3 dlls/ntdll/tests/port.c | 309 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 312 insertions(+), 1 deletions(-) create mode 100644 dlls/ntdll/tests/port.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=86a32784e295929f765…

1 0

Mike McCormack : advapi32: Implement and test SystemFunction032 ( arc4 encryption).
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 9e37591d209362f2aa174b3459a94590740188af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e37591d209362f2aa174b3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 10 21:41:48 2006 +0900 advapi32: Implement and test SystemFunction032 (arc4 encryption). --- dlls/advapi32/Makefile.in | 1 dlls/advapi32/advapi32.spec | 2 - dlls/advapi32/crypt_arc4.c | 109 ++++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/crypt_lmhash.c | 36 ++++++++++++ 4 files changed, 147 insertions(+), 1 deletions(-) create mode 100644 dlls/advapi32/crypt_arc4.c diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index cf969cf..19967c1 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -11,6 +11,7 @@ EXTRALIBS = $(LIBUNICODE) C_SRCS = \ advapi.c \ crypt.c \ + crypt_arc4.c \ crypt_des.c \ crypt_lmhash.c \ crypt_md4.c \ diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 742376c..c824421 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -626,7 +626,7 @@ # @ stub StopTraceW @ stub SystemFunction029 @ stub SystemFunction030 @ stub SystemFunction031 -@ stub SystemFunction032 +@ stdcall SystemFunction032(ptr ptr) @ stub SystemFunction033 @ stub SystemFunction034 @ stub SystemFunction035 diff --git a/dlls/advapi32/crypt_arc4.c b/dlls/advapi32/crypt_arc4.c new file mode 100644 index 0000000..2ba2b1a --- /dev/null +++ b/dlls/advapi32/crypt_arc4.c @@ -0,0 +1,109 @@ +/* + * Copyright 2006 Mike McCormack + * + * based on arc4.cpp - written and placed in the public domain by Wei Dai + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* http://cryptopp.sourceforge.net/docs/ref521/arc4_8cpp-source.html */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" + +typedef struct tag_arc4_info { + unsigned char state[256]; + unsigned char x, y; +} arc4_info; + +static void arc4_init(arc4_info *a4i, const BYTE *key, unsigned int keyLen) +{ + unsigned int keyIndex = 0, stateIndex = 0; + unsigned int i, a; + + a4i->x = a4i->y = 0; + + for (i=0; i<256; i++) + a4i->state[i] = i; + + for (i=0; i<256; i++) + { + a = a4i->state[i]; + stateIndex += key[keyIndex] + a; + stateIndex &= 0xff; + a4i->state[i] = a4i->state[stateIndex]; + a4i->state[stateIndex] = a; + if (++keyIndex >= keyLen) + keyIndex = 0; + } +} + +static void arc4_ProcessString(arc4_info *a4i, BYTE *inoutString, unsigned int length) +{ + BYTE *const s=a4i->state; + unsigned int x = a4i->x; + unsigned int y = a4i->y; + unsigned int a, b; + + while(length--) + { + x = (x+1) & 0xff; + a = s[x]; + y = (y+a) & 0xff; + b = s[y]; + s[x] = b; + s[y] = a; + *inoutString++ ^= s[(a+b) & 0xff]; + } + + a4i->x = x; + a4i->y = y; +} + +struct ustring { + DWORD Length; + DWORD MaximumLength; + unsigned char *Buffer; +}; + +/****************************************************************************** + * SystemFunction032 [ADVAPI32.@] + * + * Encrypts a string data using ARC4 + * + * PARAMS + * data [I/O] data to encrypt + * key [I] key data + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + * NOTES + * see http://web.it.kth.se/~rom/ntsec.html#crypto-strongavail + */ +NTSTATUS WINAPI SystemFunction032(struct ustring *data, struct ustring *key) +{ + arc4_info a4i; + + arc4_init(&a4i, key->Buffer, key->Length); + arc4_ProcessString(&a4i, data->Buffer, key->Length); + + return STATUS_SUCCESS; +} diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 5c26633..0e45ddc 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -28,13 +28,21 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +struct ustring { + DWORD Length; + DWORD MaximumLength; + unsigned char *Buffer; +}; + typedef VOID (WINAPI *fnSystemFunction006)( PCSTR passwd, PSTR lmhash ); typedef NTSTATUS (WINAPI *fnSystemFunction008)(const LPBYTE, const LPBYTE, LPBYTE); typedef NTSTATUS (WINAPI *fnSystemFunction001)(const LPBYTE, const LPBYTE, LPBYTE); +typedef NTSTATUS (WINAPI *fnSystemFunction032)(struct ustring *, struct ustring *); fnSystemFunction006 pSystemFunction006; fnSystemFunction008 pSystemFunction008; fnSystemFunction001 pSystemFunction001; +fnSystemFunction032 pSystemFunction032; static void test_SystemFunction006(void) { @@ -114,6 +122,30 @@ static void test_SystemFunction001(void) ok(!memcmp(output, expected, sizeof expected), "response wrong\n"); } +static void test_SystemFunction032(void) +{ + struct ustring key, data; + unsigned char szKey[] = { 'f','o','o',0 }; + unsigned char szData[8] = { 'b','a','r',0 }; + unsigned char expected[] = {0x28, 0xb9, 0xf8, 0xe1}; + int r; + + /* crashes: pSystemFunction032(NULL,NULL); */ + + key.Buffer = szKey; + key.Length = sizeof szKey; + key.MaximumLength = key.Length; + + data.Buffer = szData; + data.Length = 4; + data.MaximumLength = 8; + + r = pSystemFunction032(&data, &key); + ok(r == STATUS_SUCCESS, "function failed\n"); + + ok( !memcmp(expected, data.Buffer, data.Length), "wrong result\n"); +} + START_TEST(crypt_lmhash) { HMODULE module; @@ -132,5 +164,9 @@ START_TEST(crypt_lmhash) if (pSystemFunction001) test_SystemFunction001(); + pSystemFunction032 = (fnSystemFunction032)GetProcAddress( module, "SystemFunction032" ); + if (pSystemFunction032) + test_SystemFunction032(); + FreeLibrary( module ); }

1 0

Mike McCormack : advapi32: Implement and test SystemFunction007.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 72822c0fea07bc22cb51b882841054a4601ce005 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72822c0fea07bc22cb51b88… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 10 19:39:36 2006 +0900 advapi32: Implement and test SystemFunction007. --- dlls/advapi32/advapi32.spec | 2 + dlls/advapi32/crypt_md4.c | 29 ++++++++++++++++++++ dlls/advapi32/tests/crypt_md4.c | 58 ++++++++++++++++++++++++++++++++------- 3 files changed, 77 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index c729d3b..742376c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -601,7 +601,7 @@ # @ stub StopTraceW @ stub SystemFunction004 @ stub SystemFunction005 @ stdcall SystemFunction006(ptr ptr) -@ stub SystemFunction007 +@ stdcall SystemFunction007(ptr ptr) @ stdcall SystemFunction008(ptr ptr ptr) @ stub SystemFunction009 @ stub SystemFunction010 diff --git a/dlls/advapi32/crypt_md4.c b/dlls/advapi32/crypt_md4.c index a741963..2c2318f 100644 --- a/dlls/advapi32/crypt_md4.c +++ b/dlls/advapi32/crypt_md4.c @@ -35,7 +35,10 @@ #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" +#include "winternl.h" typedef struct { @@ -267,3 +270,29 @@ static void MD4Transform( unsigned int b buf[2] += c; buf[3] += d; } + +/****************************************************************************** + * SystemFunction007 [ADVAPI32.@] + * + * MD4 hash a unicode string + * + * PARAMS + * string [I] the string to hash + * output [O] the md4 hash of the string (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + */ +NTSTATUS WINAPI SystemFunction007(PUNICODE_STRING string, LPBYTE hash) +{ + MD4_CTX ctx; + + MD4Init( &ctx ); + MD4Update( &ctx, (BYTE*) string->Buffer, string->Length ); + MD4Final( &ctx ); + memcpy( hash, ctx.digest, 0x10 ); + + return STATUS_SUCCESS; +} diff --git a/dlls/advapi32/tests/crypt_md4.c b/dlls/advapi32/tests/crypt_md4.c index 3a68c88..3dfa294 100644 --- a/dlls/advapi32/tests/crypt_md4.c +++ b/dlls/advapi32/tests/crypt_md4.c @@ -20,10 +20,13 @@ #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" typedef struct { @@ -36,10 +39,12 @@ typedef struct typedef VOID (WINAPI *fnMD4Init)( MD4_CTX *ctx ); typedef VOID (WINAPI *fnMD4Update)( MD4_CTX *ctx, const unsigned char *src, const int len ); typedef VOID (WINAPI *fnMD4Final)( MD4_CTX *ctx ); +typedef int (WINAPI *fnSystemFunction007)(PUNICODE_STRING,LPBYTE); fnMD4Init pMD4Init; fnMD4Update pMD4Update; fnMD4Final pMD4Final; +fnSystemFunction007 pSystemFunction007; #define ctxcmp( a, b ) memcmp( (char*)a, (char*)b, FIELD_OFFSET( MD4_CTX, in ) ) @@ -52,7 +57,6 @@ static void test_md4_ctx(void) "In our bodies, there is Die"; int size = sizeof(message) - 1; - HMODULE module; MD4_CTX ctx; MD4_CTX ctx_initialized = @@ -77,13 +81,6 @@ static void test_md4_ctx(void) { 0x5f, 0xd3, 0x9b, 0x29, 0x47, 0x53, 0x47, 0xaf, 0xa5, 0xba, 0x0c, 0x05, 0xff, 0xc0, 0xc7, 0xda }; - if (!(module = LoadLibrary( "advapi32.dll" ))) return; - - pMD4Init = (fnMD4Init)GetProcAddress( module, "MD4Init" ); - pMD4Update = (fnMD4Update)GetProcAddress( module, "MD4Update" ); - pMD4Final = (fnMD4Final)GetProcAddress( module, "MD4Final" ); - - if (!pMD4Init || !pMD4Update || !pMD4Final) goto out; memset( &ctx, 0, sizeof(ctx) ); pMD4Init( &ctx ); @@ -99,11 +96,50 @@ static void test_md4_ctx(void) ok( ctxcmp( &ctx, &ctx_initialized ), "context has changed\n" ); ok( !memcmp( ctx.digest, expect, sizeof(expect) ), "incorrect result\n" ); -out: - FreeLibrary( module ); +} + +static void test_SystemFunction007(void) +{ + int r; + UNICODE_STRING str; + BYTE output[0x10]; + BYTE expected[0x10] = { 0x24, 0x0a, 0xf0, 0x9d, 0x84, 0x1c, 0xda, 0xcf, + 0x56, 0xeb, 0x6b, 0x96, 0x55, 0xec, 0xcf, 0x0a }; + WCHAR szFoo[] = {'f','o','o',0 }; + +#if 0 + /* crashes */ + r = pSystemFunction007(NULL, NULL); + ok( r == STATUS_UNSUCCESSFUL, "wrong error code\n"); +#endif + + str.Buffer = szFoo; + str.Length = 4*sizeof(WCHAR); + str.MaximumLength = str.Length; + + memset(output, 0, sizeof output); + r = pSystemFunction007(&str, output); + ok( r == STATUS_SUCCESS, "wrong error code\n"); + + ok(!memcmp(output, expected, sizeof expected), "response wrong\n"); } START_TEST(crypt_md4) { - test_md4_ctx(); + HMODULE module; + + if (!(module = LoadLibrary( "advapi32.dll" ))) return; + + pMD4Init = (fnMD4Init)GetProcAddress( module, "MD4Init" ); + pMD4Update = (fnMD4Update)GetProcAddress( module, "MD4Update" ); + pMD4Final = (fnMD4Final)GetProcAddress( module, "MD4Final" ); + + if (pMD4Init && pMD4Update && pMD4Final) + test_md4_ctx(); + + pSystemFunction007 = (fnSystemFunction007)GetProcAddress( module, "SystemFunction007" ); + if (pSystemFunction007) + test_SystemFunction007(); + + FreeLibrary( module ); }

1 0

Mike McCormack : advapi32: Implement and test SystemFunction001.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 6969cab5eeaa2d311ef8eb77f80bf4aed1fdd032 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6969cab5eeaa2d311ef8eb7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 10 18:16:58 2006 +0900 advapi32: Implement and test SystemFunction001. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt_lmhash.c | 23 +++++++++++++++++++++++ dlls/advapi32/tests/crypt_lmhash.c | 27 ++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index abec4e7..c729d3b 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -595,7 +595,7 @@ # @ stub StartTraceW # @ stub StopTraceA # @ stub StopTraceW @ stdcall SynchronizeWindows31FilesAndWindowsNTRegistry(long long long long) -@ stub SystemFunction001 +@ stdcall SystemFunction001(ptr ptr ptr) @ stub SystemFunction002 @ stub SystemFunction003 @ stub SystemFunction004 diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index dbe07ba..01f6049 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -89,3 +89,26 @@ NTSTATUS WINAPI SystemFunction008(const return STATUS_SUCCESS; } + +/****************************************************************************** + * SystemFunction001 [ADVAPI32.@] + * + * Encrypts a single block of data using DES + * + * PARAMS + * data [I] data to encrypt (8 bytes) + * key [I] key data (7 bytes) + * output [O] the encrypted data (8 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + */ +NTSTATUS WINAPI SystemFunction001(const LPBYTE data, const LPBYTE key, LPBYTE output) +{ + if (!data || !output) + return STATUS_UNSUCCESSFUL; + CRYPT_DEShash(output, key, data); + return STATUS_SUCCESS; +} diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index c389fb2..5c26633 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -29,10 +29,12 @@ #include "winbase.h" #include "winternl.h" typedef VOID (WINAPI *fnSystemFunction006)( PCSTR passwd, PSTR lmhash ); -typedef DWORD (WINAPI *fnSystemFunction008)(const LPBYTE, const LPBYTE, LPBYTE); +typedef NTSTATUS (WINAPI *fnSystemFunction008)(const LPBYTE, const LPBYTE, LPBYTE); +typedef NTSTATUS (WINAPI *fnSystemFunction001)(const LPBYTE, const LPBYTE, LPBYTE); fnSystemFunction006 pSystemFunction006; fnSystemFunction008 pSystemFunction008; +fnSystemFunction001 pSystemFunction001; static void test_SystemFunction006(void) { @@ -93,6 +95,25 @@ static void test_SystemFunction008(void) ok( !memcmp(output, expected, sizeof expected), "response wrong\n"); } +static void test_SystemFunction001(void) +{ + unsigned char key[8] = { 0xff, 0x37, 0x50, 0xbc, 0xc2, 0xb2, 0x24, 0 }; + unsigned char data[8] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }; + unsigned char expected[8] = { 0xc3, 0x37, 0xcd, 0x5c, 0xbd, 0x44, 0xfc, 0x97 }; + unsigned char output[16]; + NTSTATUS r; + + r = pSystemFunction001(0,0,0); + ok( r == STATUS_UNSUCCESSFUL, "wrong error code\n"); + + memset(output, 0, sizeof output); + + r = pSystemFunction001(data,key,output); + ok( r == STATUS_SUCCESS, "wrong error code\n"); + + ok(!memcmp(output, expected, sizeof expected), "response wrong\n"); +} + START_TEST(crypt_lmhash) { HMODULE module; @@ -107,5 +128,9 @@ START_TEST(crypt_lmhash) if (pSystemFunction008) test_SystemFunction008(); + pSystemFunction001 = (fnSystemFunction001)GetProcAddress( module, "SystemFunction001" ); + if (pSystemFunction001) + test_SystemFunction001(); + FreeLibrary( module ); }

1 0

Mike McCormack : advapi32: Implement and test SystemFunction008.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 4f520dbd06e2524263714359adcd41dd39355c5e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f520dbd06e252426371435… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 10 18:16:34 2006 +0900 advapi32: Implement and test SystemFunction008. --- dlls/advapi32/advapi32.spec | 2 + dlls/advapi32/crypt_lmhash.c | 35 ++++++++++++++++++++++ dlls/advapi32/tests/crypt_lmhash.c | 58 +++++++++++++++++++++++++++++++++--- 3 files changed, 89 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 1f23818..abec4e7 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -602,7 +602,7 @@ # @ stub StopTraceW @ stub SystemFunction005 @ stdcall SystemFunction006(ptr ptr) @ stub SystemFunction007 -@ stub SystemFunction008 +@ stdcall SystemFunction008(ptr ptr ptr) @ stub SystemFunction009 @ stub SystemFunction010 @ stub SystemFunction011 diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index c8a8b44..dbe07ba 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -54,3 +54,38 @@ NTSTATUS WINAPI SystemFunction006( LPCST return STATUS_SUCCESS; } + +/****************************************************************************** + * SystemFunction008 [ADVAPI32.@] + * + * Creates a LM response from a challenge and a password hash + * + * PARAMS + * challenge [I] Challenge from authentication server + * hash [I] NTLM hash (from SystemFunction006) + * response [O] response to send back to the server + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + * NOTES + * see http://davenport.sourceforge.net/ntlm.html#theLmResponse + * + */ +NTSTATUS WINAPI SystemFunction008(const LPBYTE challenge, const LPBYTE hash, LPBYTE response) +{ + BYTE key[7*3]; + + if (!challenge || !response) + return STATUS_UNSUCCESSFUL; + + memset(key, 0, sizeof key); + memcpy(key, hash, 0x10); + + CRYPT_DEShash(response, key, challenge); + CRYPT_DEShash(response+8, key+7, challenge); + CRYPT_DEShash(response+16, key+14, challenge); + + return STATUS_SUCCESS; +} diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index bf3eb47..c389fb2 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -1,7 +1,8 @@ /* - * Unit tests for SystemFunction006 (LMHash?) + * Unit tests for SystemFunctionXXX (LMHash?) * * Copyright 2004 Hans Leidekker + * Copyright 2006 Mike McCormack * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,12 +21,18 @@ #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include "windef.h" #include "winbase.h" +#include "winternl.h" typedef VOID (WINAPI *fnSystemFunction006)( PCSTR passwd, PSTR lmhash ); +typedef DWORD (WINAPI *fnSystemFunction008)(const LPBYTE, const LPBYTE, LPBYTE); + fnSystemFunction006 pSystemFunction006; +fnSystemFunction008 pSystemFunction008; static void test_SystemFunction006(void) { @@ -45,6 +52,47 @@ static void test_SystemFunction006(void) lmhash[12], lmhash[13], lmhash[14], lmhash[15] ); } +static void test_SystemFunction008(void) +{ + /* example data from http://davenport.sourceforge.net/ntlm.html */ + unsigned char hash[0x40] = { + 0xff, 0x37, 0x50, 0xbc, 0xc2, 0xb2, 0x24, 0x12, + 0xc2, 0x26, 0x5b, 0x23, 0x73, 0x4e, 0x0d, 0xac }; + unsigned char challenge[0x40] = { + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }; + unsigned char expected[0x18] = { + 0xc3, 0x37, 0xcd, 0x5c, 0xbd, 0x44, 0xfc, 0x97, + 0x82, 0xa6, 0x67, 0xaf, 0x6d, 0x42, 0x7c, 0x6d, + 0xe6, 0x7c, 0x20, 0xc2, 0xd3, 0xe7, 0x7c, 0x56 }; + unsigned char output[0x18]; + NTSTATUS r; + + r = pSystemFunction008(0,0,0); + ok( r == STATUS_UNSUCCESSFUL, "wrong error code\n"); + + r = pSystemFunction008(challenge,0,0); + ok( r == STATUS_UNSUCCESSFUL, "wrong error code\n"); + + r = pSystemFunction008(challenge, hash, 0); + ok( r == STATUS_UNSUCCESSFUL, "wrong error code\n"); + + /* crashes */ + if (0) + { + r = pSystemFunction008(challenge, 0, output); + ok( r == STATUS_UNSUCCESSFUL, "wrong error code\n"); + } + + r = pSystemFunction008(0, 0, output); + ok( r == STATUS_UNSUCCESSFUL, "wrong error code\n"); + + memset(output, 0, sizeof output); + r = pSystemFunction008(challenge, hash, output); + ok( r == STATUS_SUCCESS, "wrong error code\n"); + + ok( !memcmp(output, expected, sizeof expected), "response wrong\n"); +} + START_TEST(crypt_lmhash) { HMODULE module; @@ -52,12 +100,12 @@ START_TEST(crypt_lmhash) if (!(module = LoadLibrary("advapi32.dll"))) return; pSystemFunction006 = (fnSystemFunction006)GetProcAddress( module, "SystemFunction006" ); - - if (!pSystemFunction006) goto out; - if (pSystemFunction006) test_SystemFunction006(); -out: + pSystemFunction008 = (fnSystemFunction008)GetProcAddress( module, "SystemFunction008" ); + if (pSystemFunction008) + test_SystemFunction008(); + FreeLibrary( module ); }

1 0

Mike McCormack : rpcrt4: Cache the connection so we don' t rebind on every call.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 9088debbfb703d23a65e4d331191b53042471140 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9088debbfb703d23a65e4d3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 10 18:07:46 2006 +0900 rpcrt4: Cache the connection so we don't rebind on every call. --- dlls/rpcrt4/rpc_binding.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 58e5eef..5991eee 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -323,6 +323,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding (*Connection)->ActiveInterface = *InterfaceId; HeapFree(GetProcessHeap(), 0, response); } + Binding->FromConn = *Connection; return RPC_S_OK; }

1 0

Robert Shearman : ole32: Add a test for IMoniker_IsDirty.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 5a8536a18db0a784d2bfa1f1ba692a0fd071bf07 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5a8536a18db0a784d2bfa1f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 10 13:14:32 2006 +0100 ole32: Add a test for IMoniker_IsDirty. --- dlls/ole32/tests/moniker.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 6ae8cf1..9ca5ab8 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -337,6 +337,9 @@ static void test_moniker( CoTaskMemFree(display_name); IBindCtx_Release(bindctx); + hr = IMoniker_IsDirty(moniker); + ok(hr == S_FALSE, "%s: IMoniker_IsDirty should return S_FALSE, not 0x%08lx\n", testname, hr); + /* IROTData::GetComparisonData test */ hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata);

1 0

Robert Shearman : rpcrt4: Use the buffer passed in as an argument and don' t increment
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: ababfdef82764d4d73f708f9642c893facfb1e3b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ababfdef82764d4d73f708f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 10 13:13:45 2006 +0100 rpcrt4: Use the buffer passed in as an argument and don't increment the buffer in the MIDL_STUB_MESSAGE in the inner pointer marshalling/unmarshalling routines as these can be used for embedded pointers, which handle the allocating or finding of the buffer themselves. Do the incrementing in the outer NdrPointerMarshall/Unmarshall/BufferSize routines instead. --- dlls/rpcrt4/ndr_marshall.c | 55 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index bbf9dd3..6c9e852 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -754,8 +754,7 @@ #endif case RPC_FC_UP: /* unique pointer */ case RPC_FC_OP: /* object pointer - same as unique here */ TRACE("writing %p to buffer\n", Pointer); - NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, (unsigned long)Pointer); - pStubMsg->Buffer += 4; + NDR_LOCAL_UINT32_WRITE(Buffer, (unsigned long)Pointer); break; case RPC_FC_FP: default: @@ -803,12 +802,12 @@ void WINAPI PointerUnmarshall(PMIDL_STUB pointer_id = ~0UL; break; case RPC_FC_UP: /* unique pointer */ - pointer_id = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); - pStubMsg->Buffer += 4; + pointer_id = NDR_LOCAL_UINT32_READ(Buffer); + TRACE("pointer_id is 0x%08lx\n", pointer_id); break; case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ - pointer_id = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); - pStubMsg->Buffer += 4; + pointer_id = NDR_LOCAL_UINT32_READ(Buffer); + TRACE("pointer_id is 0x%08lx\n", pointer_id); if (*pPointer) FIXME("free object pointer %p\n", *pPointer); break; @@ -855,7 +854,6 @@ void WINAPI PointerBufferSize(PMIDL_STUB break; case RPC_FC_OP: case RPC_FC_UP: - pStubMsg->BufferLength += 4; /* NULL pointer has no further representation */ if (!Pointer) return; @@ -1285,9 +1283,22 @@ unsigned char * WINAPI NdrPointerMarshal unsigned char *pMemory, PFORMAT_STRING pFormat) { + unsigned char *Buffer; + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); - pStubMsg->BufferMark = pStubMsg->Buffer; + /* incremement the buffer here instead of in PointerMarshall, + * as that is used by embedded pointers which already handle the incrementing + * the buffer, and shouldn't write any additional pointer data to the wire */ + if (*pFormat != RPC_FC_RP) + { + ALIGN_POINTER(pStubMsg->Buffer, 4); + Buffer = pStubMsg->Buffer; + pStubMsg->Buffer += 4; + } + else + Buffer = pStubMsg->Buffer; + PointerMarshall(pStubMsg, pStubMsg->Buffer, pMemory, pFormat); STD_OVERFLOW_CHECK(pStubMsg); @@ -1303,10 +1314,24 @@ unsigned char * WINAPI NdrPointerUnmarsh PFORMAT_STRING pFormat, unsigned char fMustAlloc) { + unsigned char *Buffer; + TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); - pStubMsg->BufferMark = pStubMsg->Buffer; - PointerUnmarshall(pStubMsg, pStubMsg->Buffer, ppMemory, pFormat, fMustAlloc); + /* incremement the buffer here instead of in PointerUnmarshall, + * as that is used by embedded pointers which already handle the incrementing + * the buffer, and shouldn't read any additional pointer data from the + * buffer */ + if (*pFormat != RPC_FC_RP) + { + ALIGN_POINTER(pStubMsg->Buffer, 4); + Buffer = pStubMsg->Buffer; + pStubMsg->Buffer += 4; + } + else + Buffer = pStubMsg->Buffer; + + PointerUnmarshall(pStubMsg, Buffer, ppMemory, pFormat, fMustAlloc); return NULL; } @@ -1319,6 +1344,16 @@ void WINAPI NdrPointerBufferSize(PMIDL_S PFORMAT_STRING pFormat) { TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + + /* incremement the buffer length here instead of in PointerBufferSize, + * as that is used by embedded pointers which already handle the buffer + * length, and shouldn't write anything more to the wire */ + if (*pFormat != RPC_FC_RP) + { + ALIGN_LENGTH(pStubMsg->BufferLength, 4); + pStubMsg->BufferLength += 4; + } + PointerBufferSize(pStubMsg, pMemory, pFormat); }

1 0