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

Mike McCormack : advapi32: Test and implement SystemFunction024/025.
by Alexandre Julliard May 22, 2006

May 22, 2006

Module: wine Branch: refs/heads/master Commit: 500384b0ea4d4c3aa8ad464ee9d530ae6090afa2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=500384b0ea4d4c3aa8ad464… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun May 21 17:52:12 2006 +0900 advapi32: Test and implement SystemFunction024/025. --- dlls/advapi32/advapi32.spec | 4 +- dlls/advapi32/crypt_lmhash.c | 56 +++++++++++++++++++++++++++++++++ dlls/advapi32/tests/crypt_lmhash.c | 61 ++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index c11e57e..2c136c9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -618,8 +618,8 @@ # @ stub StopTraceW @ stdcall SystemFunction021(ptr ptr ptr) SystemFunction013 @ stdcall SystemFunction022(ptr ptr ptr) SystemFunction012 @ stdcall SystemFunction023(ptr ptr ptr) SystemFunction013 -@ stub SystemFunction024 -@ stub SystemFunction025 +@ stdcall SystemFunction024(ptr ptr ptr) +@ stdcall SystemFunction025(ptr ptr ptr) @ stub SystemFunction026 @ stub SystemFunction027 @ stub SystemFunction028 diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index fb01b5b..77583d1 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -348,3 +348,59 @@ NTSTATUS WINAPI SystemFunction013(const CRYPT_DESunhash(out+8, key+7, in+8); return STATUS_SUCCESS; } + +/****************************************************************************** + * SystemFunction024 [ADVAPI32.@] + * + * Encrypts two DES blocks with a 32 bit key... + * + * PARAMS + * data [I] data to encrypt (16 bytes) + * key [I] key data (4 bytes) + * output [O] buffer to receive encrypted data (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + */ +NTSTATUS WINAPI SystemFunction024(const LPBYTE in, const LPBYTE key, LPBYTE out) +{ + BYTE deskey[0x10]; + + memcpy(deskey, key, 4); + memcpy(deskey+4, key, 4); + memcpy(deskey+8, key, 4); + memcpy(deskey+12, key, 4); + + CRYPT_DEShash(out, deskey, in); + CRYPT_DEShash(out+8, deskey+7, in+8); + + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction025 [ADVAPI32.@] + * + * Decrypts two DES blocks with a 32 bit key... + * + * PARAMS + * data [I] data to encrypt (16 bytes) + * key [I] key data (4 bytes) + * output [O] buffer to receive encrypted data (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + */ +NTSTATUS WINAPI SystemFunction025(const LPBYTE in, const LPBYTE key, LPBYTE out) +{ + BYTE deskey[0x10]; + + memcpy(deskey, key, 4); + memcpy(deskey+4, key, 4); + memcpy(deskey+8, key, 4); + memcpy(deskey+12, key, 4); + + CRYPT_DESunhash(out, deskey, in); + CRYPT_DESunhash(out+8, deskey+7, in+8); + + return STATUS_SUCCESS; +} diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index c0b4b96..a6741f6 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -70,6 +70,8 @@ descrypt pSystemFunction019; descrypt pSystemFunction021; descrypt pSystemFunction023; +descrypt pSystemFunction024; +descrypt pSystemFunction025; fnSystemFunction032 pSystemFunction032; static void test_SystemFunction006(void) @@ -423,6 +425,57 @@ static void test_SystemFunction_decrypt( ok( !memcmp(des_plaintext, output, sizeof des_plaintext), "plaintext wrong (%d)\n", num); } +static void test_SystemFunction024(void) +{ + unsigned char key[0x10], output[0x20]; + int r; + + memset(output, 0, sizeof output); + memset(key, 0, sizeof key); + + /* two keys are generated using 4 bytes, repeated 4 times ... */ + memcpy(key, "foo", 4); + + r = pSystemFunction024(des_plaintext, key, output); + ok( r == STATUS_SUCCESS, "wrong error code\n"); + + memcpy(key, "foo", 4); + memcpy(key+4, "foo", 4); + memcpy(key+8, "foo", 4); + memcpy(key+12, "foo", 4); + + r = pSystemFunction022(des_plaintext, key, output+0x10); + ok( r == STATUS_SUCCESS, "wrong error code\n"); + + ok( !memcmp( output, output+0x10, 0x10), "ciphertext wrong\n"); +} + +static void test_SystemFunction025(void) +{ + unsigned char key[0x10], output[0x20]; + int r; + + memset(output, 0, sizeof output); + memset(key, 0, sizeof key); + + /* two keys are generated using 4 bytes, repeated 4 times ... */ + memcpy(key, "foo", 4); + + /* decrypts output of function 025 */ + r = pSystemFunction025(des_ciphertext, key, output); + ok( r == STATUS_SUCCESS, "wrong error code\n"); + + memcpy(key, "foo", 4); + memcpy(key+4, "foo", 4); + memcpy(key+8, "foo", 4); + memcpy(key+12, "foo", 4); + + r = pSystemFunction023(des_ciphertext, key, output+0x10); + ok( r == STATUS_SUCCESS, "wrong error code\n"); + + ok( !memcmp( output, output+0x10, 0x10), "plaintext wrong\n"); +} + START_TEST(crypt_lmhash) { HMODULE module; @@ -494,5 +547,13 @@ START_TEST(crypt_lmhash) test_SystemFunction_decrypt(pSystemFunction021, 21); test_SystemFunction_decrypt(pSystemFunction023, 23); + pSystemFunction024 = (descrypt) GetProcAddress( module, "SystemFunction024"); + if (pSystemFunction024) + test_SystemFunction024(); + + pSystemFunction025 = (descrypt) GetProcAddress( module, "SystemFunction025"); + if (pSystemFunction025) + test_SystemFunction025(); + FreeLibrary( module ); }

1 0

Mike McCormack : advapi32: Implement and test SystemFunction(012-023).
by Alexandre Julliard May 22, 2006

May 22, 2006

Module: wine Branch: refs/heads/master Commit: 6fad2cbaffa07094e7d65f68b7c584dc57a50d57 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6fad2cbaffa07094e7d65f6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun May 21 17:28:11 2006 +0900 advapi32: Implement and test SystemFunction(012-023). --- dlls/advapi32/advapi32.spec | 24 ++++----- dlls/advapi32/crypt_lmhash.c | 58 ++++++++++++++++++++++ dlls/advapi32/tests/crypt_lmhash.c | 97 ++++++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index becd80e..c11e57e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -606,18 +606,18 @@ # @ stub StopTraceW @ stdcall SystemFunction009(ptr ptr ptr) @ stdcall SystemFunction010(ptr ptr ptr) @ stub SystemFunction011 -@ stub SystemFunction012 -@ stub SystemFunction013 -@ stub SystemFunction014 -@ stub SystemFunction015 -@ stub SystemFunction016 -@ stub SystemFunction017 -@ stub SystemFunction018 -@ stub SystemFunction019 -@ stub SystemFunction020 -@ stub SystemFunction021 -@ stub SystemFunction022 -@ stub SystemFunction023 +@ stdcall SystemFunction012(ptr ptr ptr) +@ stdcall SystemFunction013(ptr ptr ptr) +@ stdcall SystemFunction014(ptr ptr ptr) SystemFunction012 +@ stdcall SystemFunction015(ptr ptr ptr) SystemFunction013 +@ stdcall SystemFunction016(ptr ptr ptr) SystemFunction012 +@ stdcall SystemFunction017(ptr ptr ptr) SystemFunction013 +@ stdcall SystemFunction018(ptr ptr ptr) SystemFunction012 +@ stdcall SystemFunction019(ptr ptr ptr) SystemFunction013 +@ stdcall SystemFunction020(ptr ptr ptr) SystemFunction012 +@ stdcall SystemFunction021(ptr ptr ptr) SystemFunction013 +@ stdcall SystemFunction022(ptr ptr ptr) SystemFunction012 +@ stdcall SystemFunction023(ptr ptr ptr) SystemFunction013 @ stub SystemFunction024 @ stub SystemFunction025 @ stub SystemFunction026 diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index 8200abc..fb01b5b 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -290,3 +290,61 @@ NTSTATUS WINAPI SystemFunction005(const return STATUS_SUCCESS; } + +/****************************************************************************** + * SystemFunction012 [ADVAPI32.@] + * SystemFunction014 [ADVAPI32.@] + * SystemFunction016 [ADVAPI32.@] + * SystemFunction018 [ADVAPI32.@] + * SystemFunction020 [ADVAPI32.@] + * SystemFunction022 [ADVAPI32.@] + * + * Encrypts two DES blocks with two keys + * + * PARAMS + * data [I] data to encrypt (16 bytes) + * key [I] key data (two lots of 7 bytes) + * output [O] buffer to receive encrypted data (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL if the input or output buffer is NULL + */ +NTSTATUS WINAPI SystemFunction012(const LPBYTE in, const LPBYTE key, LPBYTE out) +{ + if (!in || !out) + return STATUS_UNSUCCESSFUL; + + CRYPT_DEShash(out, key, in); + CRYPT_DEShash(out+8, key+7, in+8); + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction013 [ADVAPI32.@] + * SystemFunction015 [ADVAPI32.@] + * SystemFunction017 [ADVAPI32.@] + * SystemFunction019 [ADVAPI32.@] + * SystemFunction021 [ADVAPI32.@] + * SystemFunction023 [ADVAPI32.@] + * + * Decrypts two DES blocks with two keys + * + * PARAMS + * data [I] data to decrypt (16 bytes) + * key [I] key data (two lots of 7 bytes) + * output [O] buffer to receive decrypted data (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL if the input or output buffer is NULL + */ +NTSTATUS WINAPI SystemFunction013(const LPBYTE in, const LPBYTE key, LPBYTE out) +{ + if (!in || !out) + return STATUS_UNSUCCESSFUL; + + CRYPT_DESunhash(out, key, in); + CRYPT_DESunhash(out+8, key+7, in+8); + return STATUS_SUCCESS; +} diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 46f6ea4..c0b4b96 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -42,6 +42,7 @@ typedef NTSTATUS (WINAPI *fnSystemFuncti typedef VOID (WINAPI *fnSystemFunction006)( PCSTR passwd, PSTR lmhash ); typedef NTSTATUS (WINAPI *fnSystemFunction008)(const LPBYTE, const LPBYTE, LPBYTE); typedef NTSTATUS (WINAPI *fnSystemFunction009)(const LPBYTE, const LPBYTE, LPBYTE); +typedef int (WINAPI *descrypt)(unsigned char *, unsigned char *, unsigned char *); typedef NTSTATUS (WINAPI *fnSystemFunction032)(struct ustring *, struct ustring *); fnSystemFunction001 pSystemFunction001; @@ -52,6 +53,23 @@ fnSystemFunction004 pSystemFunction005; fnSystemFunction006 pSystemFunction006; fnSystemFunction008 pSystemFunction008; fnSystemFunction008 pSystemFunction009; + +/* encrypt two blocks */ +descrypt pSystemFunction012; +descrypt pSystemFunction014; +descrypt pSystemFunction016; +descrypt pSystemFunction018; +descrypt pSystemFunction020; +descrypt pSystemFunction022; + +/* decrypt two blocks */ +descrypt pSystemFunction013; +descrypt pSystemFunction015; +descrypt pSystemFunction017; +descrypt pSystemFunction019; +descrypt pSystemFunction021; +descrypt pSystemFunction023; + fnSystemFunction032 pSystemFunction032; static void test_SystemFunction006(void) @@ -355,6 +373,56 @@ static void test_SystemFunction009(void) ok(!memcmp(output, expected, sizeof expected), "response wrong\n"); } +static unsigned char des_key[] = { + 0xff, 0x37, 0x50, 0xbc, 0xc2, 0xb2, 0x24, + 0xff, 0x37, 0x50, 0xbc, 0xc2, 0xb2, 0x24, +}; +static unsigned char des_plaintext[] = { + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0 +}; +static unsigned char des_ciphertext[] = { + 0xc3, 0x37, 0xcd, 0x5c, 0xbd, 0x44, 0xfc, 0x97, + 0xc3, 0x37, 0xcd, 0x5c, 0xbd, 0x44, 0xfc, 0x97, 0 +}; + +/* test functions that encrypt two DES blocks */ +static void test_SystemFunction_encrypt(descrypt func, int num) +{ + unsigned char output[0x11]; + int r; + + if (!func) + return; + + r = func(NULL, NULL, NULL); + ok( r == STATUS_UNSUCCESSFUL, "wrong error code\n"); + + memset(output, 0, sizeof output); + r = func(des_plaintext, des_key, output); + ok( r == STATUS_SUCCESS, "wrong error code\n"); + ok( !memcmp(des_ciphertext, output, sizeof des_ciphertext), "ciphertext wrong (%d)\n", num); +} + +/* test functions that decrypt two DES blocks */ +static void test_SystemFunction_decrypt(descrypt func, int num) +{ + unsigned char output[0x11]; + int r; + + if (!func) + return; + + r = func(NULL, NULL, NULL); + ok( r == STATUS_UNSUCCESSFUL, "wrong error code\n"); + + memset(output, 0, sizeof output); + + r = func(des_ciphertext, des_key, output); + ok( r == STATUS_SUCCESS, "wrong error code\n"); + ok( !memcmp(des_plaintext, output, sizeof des_plaintext), "plaintext wrong (%d)\n", num); +} + START_TEST(crypt_lmhash) { HMODULE module; @@ -397,5 +465,34 @@ START_TEST(crypt_lmhash) if (pSystemFunction032) test_SystemFunction032(); + pSystemFunction012 = (descrypt) GetProcAddress( module, "SystemFunction012"); + pSystemFunction013 = (descrypt) GetProcAddress( module, "SystemFunction013"); + pSystemFunction014 = (descrypt) GetProcAddress( module, "SystemFunction014"); + pSystemFunction015 = (descrypt) GetProcAddress( module, "SystemFunction015"); + pSystemFunction016 = (descrypt) GetProcAddress( module, "SystemFunction016"); + pSystemFunction017 = (descrypt) GetProcAddress( module, "SystemFunction017"); + pSystemFunction018 = (descrypt) GetProcAddress( module, "SystemFunction018"); + pSystemFunction019 = (descrypt) GetProcAddress( module, "SystemFunction019"); + pSystemFunction020 = (descrypt) GetProcAddress( module, "SystemFunction020"); + pSystemFunction021 = (descrypt) GetProcAddress( module, "SystemFunction021"); + pSystemFunction022 = (descrypt) GetProcAddress( module, "SystemFunction022"); + pSystemFunction023 = (descrypt) GetProcAddress( module, "SystemFunction023"); + + /* these all encrypt two DES blocks */ + test_SystemFunction_encrypt(pSystemFunction012, 12); + test_SystemFunction_encrypt(pSystemFunction014, 14); + test_SystemFunction_encrypt(pSystemFunction016, 16); + test_SystemFunction_encrypt(pSystemFunction018, 18); + test_SystemFunction_encrypt(pSystemFunction020, 20); + test_SystemFunction_encrypt(pSystemFunction022, 22); + + /* these all decrypt two DES blocks */ + test_SystemFunction_decrypt(pSystemFunction013, 13); + test_SystemFunction_decrypt(pSystemFunction015, 15); + test_SystemFunction_decrypt(pSystemFunction017, 17); + test_SystemFunction_decrypt(pSystemFunction019, 19); + test_SystemFunction_decrypt(pSystemFunction021, 21); + test_SystemFunction_decrypt(pSystemFunction023, 23); + FreeLibrary( module ); }

1 0

Mike McCormack : advapi32: Implement and test SystemFunction010.
by Alexandre Julliard May 22, 2006

May 22, 2006

Module: wine Branch: refs/heads/master Commit: b4899f0712aba3e1eaae26abb7626cbe3cab8ea1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4899f0712aba3e1eaae26a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun May 21 17:27:50 2006 +0900 advapi32: Implement and test SystemFunction010. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt_md4.c | 27 +++++++++++++++++++++++++++ dlls/advapi32/tests/crypt_md4.c | 21 +++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 86a1b8d..becd80e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -604,7 +604,7 @@ # @ stub StopTraceW @ stdcall SystemFunction007(ptr ptr) @ stdcall SystemFunction008(ptr ptr ptr) @ stdcall SystemFunction009(ptr ptr ptr) -@ stub SystemFunction010 +@ stdcall SystemFunction010(ptr ptr ptr) @ stub SystemFunction011 @ stub SystemFunction012 @ stub SystemFunction013 diff --git a/dlls/advapi32/crypt_md4.c b/dlls/advapi32/crypt_md4.c index 2c2318f..f782ca0 100644 --- a/dlls/advapi32/crypt_md4.c +++ b/dlls/advapi32/crypt_md4.c @@ -296,3 +296,30 @@ NTSTATUS WINAPI SystemFunction007(PUNICO return STATUS_SUCCESS; } + +/****************************************************************************** + * SystemFunction010 [ADVAPI32.@] + * + * MD4 hashes 16 bytes of data + * + * PARAMS + * unknown [] seems to have no effect on the output + * data [I] pointer to data to hash (16 bytes) + * output [O] the md4 hash of the data (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + */ +NTSTATUS WINAPI SystemFunction010(LPVOID unknown, LPBYTE data, LPBYTE hash) +{ + MD4_CTX ctx; + + MD4Init( &ctx ); + MD4Update( &ctx, data, 0x10 ); + 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 3dfa294..0c72d2b 100644 --- a/dlls/advapi32/tests/crypt_md4.c +++ b/dlls/advapi32/tests/crypt_md4.c @@ -40,11 +40,13 @@ typedef VOID (WINAPI *fnMD4Init)( MD4_CT 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); +typedef int (WINAPI *fnSystemFunction010)(LPVOID, const LPBYTE, LPBYTE); fnMD4Init pMD4Init; fnMD4Update pMD4Update; fnMD4Final pMD4Final; fnSystemFunction007 pSystemFunction007; +fnSystemFunction010 pSystemFunction010; #define ctxcmp( a, b ) memcmp( (char*)a, (char*)b, FIELD_OFFSET( MD4_CTX, in ) ) @@ -124,6 +126,21 @@ #endif ok(!memcmp(output, expected, sizeof expected), "response wrong\n"); } +static void test_SystemFunction010(void) +{ + unsigned char expected[0x10] = { + 0x48, 0x7c, 0x3f, 0x5e, 0x2b, 0x0d, 0x6a, 0x79, + 0x32, 0x4e, 0xcd, 0xbe, 0x9c, 0x15, 0x16, 0x6f }; + unsigned char in[0x10], output[0x10]; + int r; + + memset(in, 0, sizeof in); + memset(output, 0, sizeof output); + r = pSystemFunction010(0, in, output); + ok( r == STATUS_SUCCESS, "wrong error code\n"); + ok( !memcmp(expected, output, sizeof output), "output wrong\n"); +} + START_TEST(crypt_md4) { HMODULE module; @@ -141,5 +158,9 @@ START_TEST(crypt_md4) if (pSystemFunction007) test_SystemFunction007(); + pSystemFunction010 = (fnSystemFunction010)GetProcAddress( module, "SystemFunction010" ); + if (pSystemFunction010) + test_SystemFunction010(); + FreeLibrary( module ); }

1 0

Mike McCormack : advapi32: Implement and test SystemFunction009.
by Alexandre Julliard May 22, 2006

May 22, 2006

Module: wine Branch: refs/heads/master Commit: 64ae8285cd79bc89cfefe986998f115e3052e76b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64ae8285cd79bc89cfefe98… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun May 21 17:27:19 2006 +0900 advapi32: Implement and test SystemFunction009. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt_lmhash.c | 10 ++++++++++ dlls/advapi32/tests/crypt_lmhash.c | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 1187696..86a1b8d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -603,7 +603,7 @@ # @ stub StopTraceW @ stdcall SystemFunction006(ptr ptr) @ stdcall SystemFunction007(ptr ptr) @ stdcall SystemFunction008(ptr ptr ptr) -@ stub SystemFunction009 +@ stdcall SystemFunction009(ptr ptr ptr) @ stub SystemFunction010 @ stub SystemFunction011 @ stub SystemFunction012 diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index 4760e97..8200abc 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -91,6 +91,16 @@ NTSTATUS WINAPI SystemFunction008(const } /****************************************************************************** + * SystemFunction009 [ADVAPI32.@] + * + * Seems to do the same as SystemFunction008 ... + */ +NTSTATUS WINAPI SystemFunction009(const LPBYTE challenge, const LPBYTE hash, LPBYTE response) +{ + return SystemFunction008(challenge, hash, response); +} + +/****************************************************************************** * SystemFunction001 [ADVAPI32.@] * * Encrypts a single block of data using DES diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 866bbde..46f6ea4 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -41,6 +41,7 @@ typedef NTSTATUS (WINAPI *fnSystemFuncti 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 *fnSystemFunction009)(const LPBYTE, const LPBYTE, LPBYTE); typedef NTSTATUS (WINAPI *fnSystemFunction032)(struct ustring *, struct ustring *); fnSystemFunction001 pSystemFunction001; @@ -50,6 +51,7 @@ fnSystemFunction004 pSystemFunction004; fnSystemFunction004 pSystemFunction005; fnSystemFunction006 pSystemFunction006; fnSystemFunction008 pSystemFunction008; +fnSystemFunction008 pSystemFunction009; fnSystemFunction032 pSystemFunction032; static void test_SystemFunction006(void) @@ -333,6 +335,26 @@ static void test_SystemFunction005(void) ok(r == STATUS_INVALID_PARAMETER_2, "function failed\n"); } +static void test_SystemFunction009(void) +{ + unsigned char hash[0x10] = { + 0xff, 0x37, 0x50, 0xbc, 0xc2, 0xb2, 0x24, 0x12, + 0xc2, 0x26, 0x5b, 0x23, 0x73, 0x4e, 0x0d, 0xac }; + unsigned char challenge[8] = { + 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]; + int r; + + memset(output, 0, sizeof output); + r = pSystemFunction009(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; @@ -367,6 +389,10 @@ START_TEST(crypt_lmhash) if (pSystemFunction008) test_SystemFunction008(); + pSystemFunction009 = (fnSystemFunction009)GetProcAddress( module, "SystemFunction009" ); + if (pSystemFunction009) + test_SystemFunction009(); + pSystemFunction032 = (fnSystemFunction032)GetProcAddress( module, "SystemFunction032" ); if (pSystemFunction032) test_SystemFunction032();

1 0

Dmitry Timoshkov : ntdsapi: Add DsMakeSpnA to the spec file.
by Alexandre Julliard May 22, 2006

May 22, 2006

Module: wine Branch: refs/heads/master Commit: 80c3a212a0e4240048f16b586c3b406bdadb825e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80c3a212a0e4240048f16b5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun May 21 23:07:26 2006 +0900 ntdsapi: Add DsMakeSpnA to the spec file. --- dlls/ntdsapi/ntdsapi.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index 4c16fcc..a9607ca 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -52,7 +52,7 @@ @ stub DsLogEntry @ stub DsMakePasswordCredentialsA @ stub DsMakePasswordCredentialsW -@ stub DsMakeSpnA +@ stdcall DsMakeSpnA(str str str long str ptr ptr) @ stdcall DsMakeSpnW(wstr wstr wstr long wstr ptr ptr) @ stub DsMapSchemaGuidsA @ stub DsMapSchemaGuidsW

1 0

Vitaliy Margolen : wine.inf: Create fake dlls for ADPCM codecs.
by Alexandre Julliard May 22, 2006

May 22, 2006

Module: wine Branch: refs/heads/master Commit: 78c0dd96b7525650f325f219c660bf4b5d5610fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78c0dd96b7525650f325f21… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat May 20 22:46:13 2006 -0600 wine.inf: Create fake dlls for ADPCM codecs. --- tools/wine.inf | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 83f0edd..9eca651 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2119,10 +2119,13 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,dbghelp.dll 11,,ddraw.dll 11,,gdi32.dll -11,,imagehlp.dll 11,,help.exe,winhelp.exe 11,,hhctrl.ocx +11,,imaadp32.acm +11,,imagehlp.dll 11,,kernel32.dll +11,,msadp32.acm +11,,msg711.acm 11,,msiexec.exe 11,,msvcrt.dll 11,,notepad.exe

1 0

Vitaliy Margolen : directx: Update file versions to dx9c (compared to win2k ).
by Alexandre Julliard May 22, 2006

May 22, 2006

Module: wine Branch: refs/heads/master Commit: 4054c06e5518c81ba938405f75f465da8d229820 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4054c06e5518c81ba938405… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun May 21 00:01:24 2006 -0600 directx: Update file versions to dx9c (compared to win2k). --- dlls/d3d8/version.rc | 8 ++++---- dlls/d3d9/version.rc | 8 ++++---- dlls/ddraw/version.rc | 8 ++++---- dlls/dmusic/version.rc | 8 ++++---- dlls/dplayx/version.rc | 8 ++++---- dlls/dsound/version.rc | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/version.rc b/dlls/d3d8/version.rc index 1b0c2a7..46d94af 100644 --- a/dlls/d3d8/version.rc +++ b/dlls/d3d8/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine Direct3D" #define WINE_FILENAME_STR "d3d8.dll" -#define WINE_FILEVERSION 5,3,0,900 -#define WINE_FILEVERSION_STR "5.3.0.900" -#define WINE_PRODUCTVERSION 5,3,0,900 -#define WINE_PRODUCTVERSION_STR "5.3.0.900" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" #include "wine/wine_common_ver.rc" diff --git a/dlls/d3d9/version.rc b/dlls/d3d9/version.rc index c8f210a..e742abd 100644 --- a/dlls/d3d9/version.rc +++ b/dlls/d3d9/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine Direct3D" #define WINE_FILENAME_STR "d3d9.dll" -#define WINE_FILEVERSION 5,3,1,902 -#define WINE_FILEVERSION_STR "5.3.1.902" -#define WINE_PRODUCTVERSION 5,3,1,902 -#define WINE_PRODUCTVERSION_STR "5.3" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" #include "wine/wine_common_ver.rc" diff --git a/dlls/ddraw/version.rc b/dlls/ddraw/version.rc index a756193..ce67a8a 100644 --- a/dlls/ddraw/version.rc +++ b/dlls/ddraw/version.rc @@ -19,9 +19,9 @@ #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine DirectDraw" #define WINE_FILENAME_STR "ddraw.dll" -#define WINE_FILEVERSION 5,3,0,900 -#define WINE_FILEVERSION_STR "5.3.0.900" -#define WINE_PRODUCTVERSION 5,3,0,900 -#define WINE_PRODUCTVERSION_STR "5.3" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" #include "wine/wine_common_ver.rc" diff --git a/dlls/dmusic/version.rc b/dlls/dmusic/version.rc index 9302c05..2643cde 100644 --- a/dlls/dmusic/version.rc +++ b/dlls/dmusic/version.rc @@ -19,9 +19,9 @@ #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine DirectMusic" #define WINE_FILENAME_STR "dmusic.dll" -#define WINE_FILEVERSION 5,3,0,900 -#define WINE_FILEVERSION_STR "5.3.0.900" -#define WINE_PRODUCTVERSION 5,3,0,900 -#define WINE_PRODUCTVERSION_STR "5.3" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" #include "wine/wine_common_ver.rc" diff --git a/dlls/dplayx/version.rc b/dlls/dplayx/version.rc index 4b0f15a..07bafb9 100644 --- a/dlls/dplayx/version.rc +++ b/dlls/dplayx/version.rc @@ -19,9 +19,9 @@ #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine DirectPlay" #define WINE_FILENAME_STR "dplayx.dll" -#define WINE_FILEVERSION 5,3,0,900 -#define WINE_FILEVERSION_STR "5.3.0.900" -#define WINE_PRODUCTVERSION 5,3,0,900 -#define WINE_PRODUCTVERSION_STR "5.3" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" #include "wine/wine_common_ver.rc" diff --git a/dlls/dsound/version.rc b/dlls/dsound/version.rc index a27e80c..008eb3c 100644 --- a/dlls/dsound/version.rc +++ b/dlls/dsound/version.rc @@ -19,9 +19,9 @@ #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine DirectSound" #define WINE_FILENAME_STR "dsound.dll" -#define WINE_FILEVERSION 5,3,0,900 -#define WINE_FILEVERSION_STR "5.3.0.900" -#define WINE_PRODUCTVERSION 5,3,0,900 -#define WINE_PRODUCTVERSION_STR "5.3" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" #include "wine/wine_common_ver.rc"

1 0

Vitaliy Margolen : d3d9: Add refcount tests for all objects created by device.
by Alexandre Julliard May 22, 2006

May 22, 2006

Module: wine Branch: refs/heads/master Commit: c5091d9d8dc431183c6605a26a641f808d4c0f82 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c5091d9d8dc431183c6605a… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat May 20 10:37:24 2006 -0600 d3d9: Add refcount tests for all objects created by device. --- dlls/d3d9/tests/.gitignore | 1 dlls/d3d9/tests/Makefile.in | 2 dlls/d3d9/tests/device.c | 200 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 203 insertions(+), 0 deletions(-) create mode 100644 dlls/d3d9/tests/device.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c5091d9d8dc431183c6…

1 0

Vitaliy Margolen : d3d8: Add refcount test.
by Alexandre Julliard May 22, 2006

May 22, 2006

Module: wine Branch: refs/heads/master Commit: 1175a2f3a26c3c2b6aa8dd9b523bcc1ceee3afa7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1175a2f3a26c3c2b6aa8dd9… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat May 20 10:36:13 2006 -0600 d3d8: Add refcount test. --- configure | 3 - configure.ac | 1 dlls/d3d8/Makefile.in | 2 dlls/d3d8/tests/.gitignore | 3 + dlls/d3d8/tests/Makefile.in | 14 +++ dlls/d3d8/tests/device.c | 193 +++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 4 + 7 files changed, 218 insertions(+), 2 deletions(-) create mode 100644 dlls/d3d8/tests/.gitignore create mode 100644 dlls/d3d8/tests/Makefile.in create mode 100644 dlls/d3d8/tests/device.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1175a2f3a26c3c2b6aa…

1 0

Vitaliy Margolen : d3d9: All objects created by device should keep reference to it.
by Alexandre Julliard May 22, 2006

May 22, 2006

Module: wine Branch: refs/heads/master Commit: 6dcae77cc981226f67de55746bf3a44c90037c4f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6dcae77cc981226f67de557… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat May 20 10:36:33 2006 -0600 d3d9: All objects created by device should keep reference to it. --- dlls/d3d9/cubetexture.c | 3 +++ dlls/d3d9/d3d9_private.h | 44 ++++++++++++++++++++++++++++++-------------- dlls/d3d9/indexbuffer.c | 3 +++ dlls/d3d9/pixelshader.c | 3 +++ dlls/d3d9/query.c | 3 +++ dlls/d3d9/stateblock.c | 7 +++++-- dlls/d3d9/swapchain.c | 5 ++++- dlls/d3d9/texture.c | 4 +++- dlls/d3d9/volumetexture.c | 3 +++ 9 files changed, 57 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6dcae77cc981226f67d…

1 0