July 2007 - Wine-Commits - list.winehq.org

Michael Stefaniuc : oleaut32: Remove a return after return.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 45d6d1c20b101083e0d3e26db6ddfbdf4ced3130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d6d1c20b101083e0d3e26db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 22:31:14 2007 +0200 oleaut32: Remove a return after return. --- dlls/oleaut32/vartype.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index fca8f8f..f3da281 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3523,7 +3523,6 @@ HRESULT WINAPI VarCyFromR8(double dblIn, CY* pCyOut) if (result_fpstatus & 0x9) /* Overflow | Invalid */ return DISP_E_OVERFLOW; - return S_OK; #else /* This version produces slightly different results for boundary cases */ if (dblIn < -922337203685477.5807 || dblIn >= 922337203685477.5807)

1 0

Paul Vriens : advapi32/service: Some 'refcount' tests.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: e50edb61f06eb4d7a2ae3c881228f6a622382972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50edb61f06eb4d7a2ae3c881… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 19 21:30:35 2007 +0200 advapi32/service: Some 'refcount' tests. --- dlls/advapi32/tests/service.c | 99 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 99 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 0bdb0bf..5c9c663 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -517,6 +517,101 @@ static void test_sequence(void) CloseServiceHandle(scm_handle); } +static void test_refcount(void) +{ + SC_HANDLE scm_handle, svc_handle1, svc_handle2, svc_handle3, svc_handle4, svc_handle5; + static const CHAR servicename [] = "Winetest"; + static const CHAR pathname [] = "we_dont_care.exe"; + BOOL ret; + + /* Get a handle to the Service Control Manager */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights to get a handle to the manager\n"); + return; + } + + /* Create a service */ + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, + SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, + SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(svc_handle1 != NULL, "Expected success\n"); + + /* Get a handle to this new service */ + svc_handle2 = OpenServiceA(scm_handle, servicename, GENERIC_READ); + ok(svc_handle2 != NULL, "Expected success\n"); + + /* Get another handle to this new service */ + svc_handle3 = OpenServiceA(scm_handle, servicename, GENERIC_READ); + ok(svc_handle3 != NULL, "Expected success\n"); + + /* Check if we can close the handle to the Service Control Manager */ + ret = CloseServiceHandle(scm_handle); + ok(ret, "Expected success\n"); + + /* Get a new handle to the Service Control Manager */ + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + ok(scm_handle != NULL, "Expected success\n"); + + /* Get a handle to this new service */ + svc_handle4 = OpenServiceA(scm_handle, servicename, GENERIC_ALL); + ok(svc_handle4 != NULL, "Expected success\n"); + + /* Delete the service */ + ret = DeleteService(svc_handle4); + ok(ret, "Expected success\n"); + + /* We cannot create the same service again as it's still marked as 'being deleted'. + * The reason is that we still have 4 open handles to this service eventhough we + * closed the handle to the Service Control Manager in between. + */ + SetLastError(0xdeadbeef); + svc_handle5 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, + SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, + SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); + todo_wine + { + ok(!svc_handle5, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_MARKED_FOR_DELETE, + "Expected ERROR_SERVICE_MARKED_FOR_DELETE, got %d\n", GetLastError()); + } + + /* FIXME: Remove this when Wine is fixed */ + if (svc_handle5) + { + DeleteService(svc_handle5); + CloseServiceHandle(svc_handle5); + } + + /* Close all the handles to the service and try again */ + ret = CloseServiceHandle(svc_handle4); + ok(ret, "Expected success\n"); + ret = CloseServiceHandle(svc_handle3); + ok(ret, "Expected success\n"); + ret = CloseServiceHandle(svc_handle2); + ok(ret, "Expected success\n"); + ret = CloseServiceHandle(svc_handle1); + ok(ret, "Expected success\n"); + + /* We succeed now as all handles are closed (tested this also with a long SLeep() */ + svc_handle5 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, + SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, + SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(svc_handle5 != NULL, "Expected success\n"); + + /* Delete the service */ + ret = DeleteService(svc_handle5); + ok(ret, "Expected success\n"); + + /* Wait a while. Just in case one of the following tests does a CreateService again */ + Sleep(1000); + + CloseServiceHandle(svc_handle5); + CloseServiceHandle(scm_handle); +} + START_TEST(service) { SC_HANDLE scm_handle; @@ -539,4 +634,8 @@ START_TEST(service) test_close(); /* Test the creation, querying and deletion of a service */ test_sequence(); + /* The main reason for this test is to check if any refcounting is used + * and what the rules are + */ + test_refcount(); }

1 0

Paul Vriens : advapi32/service: lpBinaryPathName is mandatory.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 4c24492d316143aca192992dc430931fd4cf3fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c24492d316143aca192992dc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 19 20:39:37 2007 +0200 advapi32/service: lpBinaryPathName is mandatory. --- dlls/advapi32/service.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 15fd4b2..eb1c30f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1448,8 +1448,7 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, service_set_dword( &val[n++], szStart, &dwStartType ); service_set_dword( &val[n++], szError, &dwErrorControl ); - if( lpBinaryPathName ) - service_set_string( &val[n++], szImagePath, lpBinaryPathName ); + service_set_string( &val[n++], szImagePath, lpBinaryPathName ); if( lpLoadOrderGroup ) service_set_string( &val[n++], szGroup, lpLoadOrderGroup );

1 0

Anatoly Lyutin : kernel32/tests: Add test for GetShortPathNameW.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 857ff080eb6ab302aa89c2c9f33c46674c128169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=857ff080eb6ab302aa89c2c9f… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Thu Jul 19 13:15:09 2007 +0400 kernel32/tests: Add test for GetShortPathNameW. --- dlls/kernel32/tests/path.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 47ec23f..17c90ee 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -961,6 +961,40 @@ static void test_GetLongPathNameW(void) } } +static void test_GetShortPathNameW(void) +{ + WCHAR test_path[] = { 'L', 'o', 'n', 'g', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', 'e', 0 }; + WCHAR path[MAX_PATH]; + WCHAR short_path[MAX_PATH]; + DWORD length; + HANDLE file; + int ret; + WCHAR name[] = { 't', 'e', 's', 't', 0 }; + WCHAR backSlash[] = { '\\', 0 }; + + GetTempPathW( MAX_PATH, path ); + lstrcatW( path, test_path ); + lstrcatW( path, backSlash ); + ret = CreateDirectoryW( path, NULL ); + ok( ret, "Directory was not created. LastError = %d\n", GetLastError() ); + + /* Starting a main part of test */ + length = GetShortPathNameW( path, short_path, 0 ); + ok( length, "GetShortPathNameW returned 0.\n" ); + ret = GetShortPathNameW( path, short_path, length ); + ok( ret, "GetShortPathNameW returned 0.\n" ); + lstrcatW( short_path, name ); + file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok( file != INVALID_HANDLE_VALUE, "File was not created.\n" ); + + /* End test */ + CloseHandle( file ); + ret = DeleteFileW( short_path ); + ok( ret, "Can not delete file.\n" ); + ret = RemoveDirectoryW( path ); + ok( ret, "Can not delete directory.\n" ); +} + static void test_GetSystemDirectory(void) { CHAR buffer[MAX_PATH + 4]; @@ -1136,6 +1170,7 @@ START_TEST(path) test_CleanupPathA(origdir,curdir); test_GetTempPath(); test_GetLongPathNameW(); + test_GetShortPathNameW(); test_GetSystemDirectory(); test_GetWindowsDirectory(); if (pNeedCurrentDirectoryForExePathA)

1 0

Anatoly Lyutin : cmd: Use toupperW instead of toupper.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 2364a87d1be4f98fc7d38bc86b7613aa1be7ddf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2364a87d1be4f98fc7d38bc86… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Thu Jul 19 16:39:51 2007 +0400 cmd: Use toupperW instead of toupper. --- programs/cmd/wcmdmain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 6d1e7d1..4cd8416 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1263,7 +1263,7 @@ int p = 0; case '/': *q++ = *s++; while ((*s != '\0') && (*s != ' ') && *s != '/') { - *q++ = toupper (*s++); + *q++ = toupperW (*s++); } *q = '\0'; break;

1 0

Anatoly Lyutin : user32: Add comment to a function.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: e8606d5694ecf48a842a7a1aa74f2f3efc45f3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8606d5694ecf48a842a7a1aa… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Thu Jul 19 13:19:11 2007 +0400 user32: Add comment to a function. --- dlls/user32/painting.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index c361610..30dddae 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -527,6 +527,18 @@ HWND WINAPI WindowFromDC( HDC hDC ) /*********************************************************************** * LockWindowUpdate (USER32.@) + * + * Enables or disables painting in the chosen window. + * + * PARAMS + * hwnd [I] handle to a window. + * + * RETURNS + * If successful, returns nonzero value. Otherwise, + * returns 0. + * + * NOTES + * You can lock only one window at a time. */ BOOL WINAPI LockWindowUpdate( HWND hwnd ) {

1 0

Juan Lang : crypt32: Implement querying computed hash of a decoded hash message.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 74bd61203daca013002c2fef988d846486b5b5c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74bd61203daca013002c2fef9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 19 07:32:10 2007 -0700 crypt32: Implement querying computed hash of a decoded hash message. --- dlls/crypt32/msg.c | 34 ++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 2 -- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 7565741..c3d7b96 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -594,6 +594,7 @@ typedef struct _CDecodeMsg CryptMsgBase base; DWORD type; HCRYPTPROV crypt_prov; + HCRYPTHASH hash; CRYPT_DATA_BLOB msg_data; PCONTEXT_PROPERTY_LIST properties; } CDecodeMsg; @@ -604,6 +605,7 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) if (msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(msg->crypt_prov, 0); + CryptDestroyHash(msg->hash); CryptMemFree(msg->msg_data.pbData); ContextPropertyList_Free(msg->properties); } @@ -835,6 +837,37 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; } + case CMSG_COMPUTED_HASH_PARAM: + if (!msg->hash) + { + CRYPT_ALGORITHM_IDENTIFIER *hashAlgoID = NULL; + DWORD size = 0; + ALG_ID algID = 0; + + CryptMsgGetParam(msg, CMSG_HASH_ALGORITHM_PARAM, 0, NULL, &size); + hashAlgoID = CryptMemAlloc(size); + ret = CryptMsgGetParam(msg, CMSG_HASH_ALGORITHM_PARAM, 0, + hashAlgoID, &size); + if (ret) + algID = CertOIDToAlgId(hashAlgoID->pszObjId); + ret = CryptCreateHash(msg->crypt_prov, algID, 0, 0, &msg->hash); + if (ret) + { + CRYPT_DATA_BLOB content; + + ret = ContextPropertyList_FindProperty(msg->properties, + CMSG_CONTENT_PARAM, &content); + if (ret) + ret = CryptHashData(msg->hash, content.pbData, + content.cbData, 0); + } + CryptMemFree(hashAlgoID); + } + else + ret = TRUE; + if (ret) + ret = CryptGetHashParam(msg->hash, HP_HASHVAL, pvData, pcbData, 0); + break; default: { CRYPT_DATA_BLOB blob; @@ -877,6 +910,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, msg->crypt_prov = CRYPT_GetDefaultProvider(); msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } + msg->hash = 0; msg->msg_data.cbData = 0; msg->msg_data.pbData = NULL; msg->properties = ContextPropertyList_Create(); diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 0ecc62b..04be05e 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1224,7 +1224,6 @@ static void test_decode_msg_get_param(void) ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); check_param("empty hash content", msg, CMSG_CONTENT_PARAM, NULL, 0); check_param("empty hash hash data", msg, CMSG_HASH_DATA_PARAM, NULL, 0); - todo_wine check_param("empty hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, emptyHashParam, sizeof(emptyHashParam)); CryptMsgClose(msg); @@ -1234,7 +1233,6 @@ static void test_decode_msg_get_param(void) sizeof(msgData)); check_param("hash hash data", msg, CMSG_HASH_DATA_PARAM, hashParam, sizeof(hashParam)); - todo_wine check_param("hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, hashParam, sizeof(hashParam)); size = strlen(szOID_RSA_data) + 1;

1 0

Juan Lang : crypt32: Store hash algorithm ID along with other parameters when decoding a hash message .
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 22e7c2f38e2303671b3db38b31264c1cab0f1fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e7c2f38e2303671b3db38b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 19 07:31:34 2007 -0700 crypt32: Store hash algorithm ID along with other parameters when decoding a hash message. --- dlls/crypt32/msg.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index a261455..7565741 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -649,6 +649,48 @@ static BOOL CDecodeMsg_DecodeDataContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob) return ret; } +static void CDecodeMsg_SaveAlgorithmID(CDecodeMsg *msg, DWORD param, + const CRYPT_ALGORITHM_IDENTIFIER *id) +{ + static const BYTE nullParams[] = { ASN_NULL, 0 }; + CRYPT_ALGORITHM_IDENTIFIER *copy; + DWORD len = sizeof(CRYPT_ALGORITHM_IDENTIFIER); + + /* Linearize algorithm id */ + len += strlen(id->pszObjId) + 1; + len += id->Parameters.cbData; + copy = CryptMemAlloc(len); + if (copy) + { + copy->pszObjId = + (LPSTR)((BYTE *)copy + sizeof(CRYPT_ALGORITHM_IDENTIFIER)); + strcpy(copy->pszObjId, id->pszObjId); + copy->Parameters.pbData = (BYTE *)copy->pszObjId + strlen(id->pszObjId) + + 1; + /* Trick: omit NULL parameters */ + if (id->Parameters.cbData == sizeof(nullParams) && + !memcmp(id->Parameters.pbData, nullParams, sizeof(nullParams))) + { + copy->Parameters.cbData = 0; + len -= sizeof(nullParams); + } + else + copy->Parameters.cbData = id->Parameters.cbData; + if (copy->Parameters.cbData) + memcpy(copy->Parameters.pbData, id->Parameters.pbData, + id->Parameters.cbData); + ContextPropertyList_SetProperty(msg->properties, param, (BYTE *)copy, + len); + CryptMemFree(copy); + } +} + +static inline void CRYPT_FixUpAlgorithmID(CRYPT_ALGORITHM_IDENTIFIER *id) +{ + id->pszObjId = (LPSTR)((BYTE *)id + sizeof(CRYPT_ALGORITHM_IDENTIFIER)); + id->Parameters.pbData = (BYTE *)id->pszObjId + strlen(id->pszObjId) + 1; +} + /* Decodes the content in blob as the type given, and updates the value * (type, parameters, etc.) of msg based on what blob contains. * It doesn't just use msg's type, to allow a recursive call from an implicitly @@ -679,6 +721,8 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, ContextPropertyList_SetProperty(msg->properties, CMSG_VERSION_PARAM, (const BYTE *)&digestedData->version, sizeof(digestedData->version)); + CDecodeMsg_SaveAlgorithmID(msg, CMSG_HASH_ALGORITHM_PARAM, + &digestedData->DigestAlgorithm); ContextPropertyList_SetProperty(msg->properties, CMSG_INNER_CONTENT_TYPE_PARAM, (const BYTE *)digestedData->ContentInfo.pszObjId, @@ -775,6 +819,22 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->type, sizeof(msg->type)); break; + case CMSG_HASH_ALGORITHM_PARAM: + { + CRYPT_DATA_BLOB blob; + + ret = ContextPropertyList_FindProperty(msg->properties, dwParamType, + &blob); + if (ret) + { + ret = CRYPT_CopyParam(pvData, pcbData, blob.pbData, blob.cbData); + if (ret && pvData) + CRYPT_FixUpAlgorithmID((CRYPT_ALGORITHM_IDENTIFIER *)pvData); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + } default: { CRYPT_DATA_BLOB blob;

1 0

Juan Lang : crypt32: Store (most) parameters of a decoded hash message.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 0e90cb9629e1bdfc979ff518b8b333712212e9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e90cb9629e1bdfc979ff518b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 19 07:30:44 2007 -0700 crypt32: Store (most) parameters of a decoded hash message. --- dlls/crypt32/msg.c | 51 +++++++++++++++++++++++++++++++++------------ dlls/crypt32/tests/msg.c | 6 ----- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 93cce83..a261455 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -631,6 +631,24 @@ static BOOL CDecodeMsg_CopyData(CDecodeMsg *msg, const BYTE *pbData, return ret; } +static BOOL CDecodeMsg_DecodeDataContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob) +{ + BOOL ret; + CRYPT_DATA_BLOB *data; + DWORD size; + + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, + blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, (LPBYTE)&data, + &size); + if (ret) + { + ret = ContextPropertyList_SetProperty(msg->properties, + CMSG_CONTENT_PARAM, data->pbData, data->cbData); + LocalFree(data); + } + return ret; +} + /* Decodes the content in blob as the type given, and updates the value * (type, parameters, etc.) of msg based on what blob contains. * It doesn't just use msg's type, to allow a recursive call from an implicitly @@ -645,21 +663,9 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, switch (type) { case CMSG_DATA: - { - CRYPT_DATA_BLOB *data; - - ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, - blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, - (LPBYTE)&data, &size); - if (ret) - { - ret = ContextPropertyList_SetProperty(msg->properties, - CMSG_CONTENT_PARAM, data->pbData, data->cbData); - LocalFree(data); + if ((ret = CDecodeMsg_DecodeDataContent(msg, blob))) msg->type = CMSG_DATA; - } break; - } case CMSG_HASHED: { CRYPT_DIGESTED_DATA *digestedData; @@ -669,7 +675,24 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, &size); if (ret) { - FIXME("need to store data for CMSG_HASHED\n"); + msg->type = CMSG_HASHED; + ContextPropertyList_SetProperty(msg->properties, + CMSG_VERSION_PARAM, (const BYTE *)&digestedData->version, + sizeof(digestedData->version)); + ContextPropertyList_SetProperty(msg->properties, + CMSG_INNER_CONTENT_TYPE_PARAM, + (const BYTE *)digestedData->ContentInfo.pszObjId, + digestedData->ContentInfo.pszObjId ? + strlen(digestedData->ContentInfo.pszObjId) + 1 : 0); + if (digestedData->ContentInfo.Content.cbData) + CDecodeMsg_DecodeDataContent(msg, + &digestedData->ContentInfo.Content); + else + ContextPropertyList_SetProperty(msg->properties, + CMSG_CONTENT_PARAM, NULL, 0); + ContextPropertyList_SetProperty(msg->properties, + CMSG_HASH_DATA_PARAM, digestedData->hash.pbData, + digestedData->hash.cbData); LocalFree(digestedData); } break; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index b80a74a..0ecc62b 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1222,9 +1222,7 @@ static void test_decode_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); - todo_wine check_param("empty hash content", msg, CMSG_CONTENT_PARAM, NULL, 0); - todo_wine check_param("empty hash hash data", msg, CMSG_HASH_DATA_PARAM, NULL, 0); todo_wine check_param("empty hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, @@ -1232,21 +1230,17 @@ static void test_decode_msg_get_param(void) CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); - todo_wine check_param("hash content", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); - todo_wine check_param("hash hash data", msg, CMSG_HASH_DATA_PARAM, hashParam, sizeof(hashParam)); todo_wine check_param("hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, hashParam, sizeof(hashParam)); size = strlen(szOID_RSA_data) + 1; - todo_wine check_param("hash inner OID", msg, CMSG_INNER_CONTENT_TYPE_PARAM, (const BYTE *)szOID_RSA_data, strlen(szOID_RSA_data) + 1); version = CMSG_HASHED_DATA_V0; - todo_wine check_param("hash version", msg, CMSG_VERSION_PARAM, (const BYTE *)&version, sizeof(version)); CryptMsgClose(msg);

1 0

Mikołaj Zalewski : user32/tests: Simplify a test.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 46a48c40add87b30daad043dfdb29ee2cb4e16c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a48c40add87b30daad043df… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 19 18:58:51 2007 +0200 user32/tests: Simplify a test. --- dlls/user32/tests/class.c | 37 +++++++++---------------------------- 1 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 2af4c2b..9878ac1 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -594,35 +594,16 @@ static void test_defwndproc() hwnd = CreateWindowA(classA, NULL, 0, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), NULL); ok(hwnd != NULL, "Couldn't create window i=%d\n", i); - if ((i & 1) && (i & 2)) - { - ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), pDefWindowProcA); - ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), pDefWindowProcA); - } - else - { - ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), pDefWindowProcA); - ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), pDefWindowProcA); - } - if (!(i & 1) && !(i & 2)) - { - ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), pDefWindowProcW); - ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), pDefWindowProcW); - } - else - { - ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), pDefWindowProcW); - ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), pDefWindowProcW); - } + ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), pDefWindowProcA); + ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), pDefWindowProcA); + + ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), pDefWindowProcW); + ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), pDefWindowProcW); DestroyWindow(hwnd); UnregisterClass((LPSTR)(DWORD_PTR)atom, GetModuleHandle(NULL));

1 0