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

Juan Lang : crypt32: Move decoding hash messages to a helper function.
by Alexandre Julliard July 23, 2007

July 23, 2007

Module: wine Branch: master Commit: 52cc727348a218ab42c35e3149b68532793ad02a URL: http://source.winehq.org/git/wine.git/?a=commit;h=52cc727348a218ab42c35e314… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 20 14:43:12 2007 -0700 crypt32: Move decoding hash messages to a helper function. --- dlls/crypt32/msg.c | 68 ++++++++++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 31 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index c3d7b96..67a4024 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -693,6 +693,41 @@ static inline void CRYPT_FixUpAlgorithmID(CRYPT_ALGORITHM_IDENTIFIER *id) id->Parameters.pbData = (BYTE *)id->pszObjId + strlen(id->pszObjId) + 1; } +static BOOL CDecodeMsg_DecodeHashedContent(CDecodeMsg *msg, + CRYPT_DER_BLOB *blob) +{ + BOOL ret; + CRYPT_DIGESTED_DATA *digestedData; + DWORD size; + + ret = CRYPT_AsnDecodePKCSDigestedData(blob->pbData, blob->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, (CRYPT_DIGESTED_DATA *)&digestedData, + &size); + if (ret) + { + msg->type = CMSG_HASHED; + 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, + 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); + } + 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 @@ -702,7 +737,6 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, DWORD type) { BOOL ret; - DWORD size; switch (type) { @@ -711,38 +745,9 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, msg->type = CMSG_DATA; break; case CMSG_HASHED: - { - CRYPT_DIGESTED_DATA *digestedData; - - ret = CRYPT_AsnDecodePKCSDigestedData(blob->pbData, blob->cbData, - CRYPT_DECODE_ALLOC_FLAG, NULL, (CRYPT_DIGESTED_DATA *)&digestedData, - &size); - if (ret) - { + if ((ret = CDecodeMsg_DecodeHashedContent(msg, blob))) msg->type = CMSG_HASHED; - 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, - 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; - } case CMSG_ENVELOPED: case CMSG_SIGNED: FIXME("unimplemented for type %s\n", MSG_TYPE_STR(type)); @@ -751,6 +756,7 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, default: { CRYPT_CONTENT_INFO *info; + DWORD size; ret = CryptDecodeObjectEx(X509_ASN_ENCODING, PKCS_CONTENT_INFO, msg->msg_data.pbData, msg->msg_data.cbData, CRYPT_DECODE_ALLOC_FLAG,

1 0

Paul Vriens : advapi32/tests: Run on NT4 again.
by Alexandre Julliard July 23, 2007

July 23, 2007

Module: wine Branch: master Commit: 12dbeef65508cf3bfdac82665a3f49eaef5fcdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12dbeef65508cf3bfdac82665… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jul 20 13:53:44 2007 +0200 advapi32/tests: Run on NT4 again. --- dlls/advapi32/tests/security.c | 46 +++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ce7b8f7..0a5722c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -51,6 +51,8 @@ typedef VOID (WINAPI *fnBuildTrusteeWithObjectsAndSidA)( PTRUSTEEA pTrustee, typedef LPSTR (WINAPI *fnGetTrusteeNameA)( PTRUSTEEA pTrustee ); typedef BOOL (WINAPI *fnConvertSidToStringSidA)( PSID pSid, LPSTR *str ); typedef BOOL (WINAPI *fnConvertStringSidToSidA)( LPCSTR str, PSID pSid ); +static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR, DWORD, + PSECURITY_DESCRIPTOR*, PULONG ); typedef BOOL (WINAPI *fnGetFileSecurityA)(LPCSTR, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD); typedef DWORD (WINAPI *fnRtlAdjustPrivilege)(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN); @@ -92,12 +94,16 @@ struct sidRef static void init(void) { - HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + HMODULE hntdll; + + hntdll = GetModuleHandleA("ntdll.dll"); + pNtQueryObject = (void *)GetProcAddress( hntdll, "NtQueryObject" ); hmod = GetModuleHandle("advapi32.dll"); - myARGC = winetest_get_mainargs( &myARGV ); + pConvertStringSecurityDescriptorToSecurityDescriptorA = + (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorA" ); - pNtQueryObject = (void *)GetProcAddress( hntdll, "NtQueryObject" ); + myARGC = winetest_get_mainargs( &myARGV ); } static void test_str_sid(const char *str_sid) @@ -1763,8 +1769,14 @@ static void test_ConvertStringSecurityDescriptor(void) BOOL ret; PSECURITY_DESCRIPTOR pSD; + if (!pConvertStringSecurityDescriptorToSecurityDescriptorA) + { + skip("ConvertStringSecurityDescriptorToSecurityDescriptor is not available\n"); + return; + } + SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;GA;;;WD)", 0xdeadbeef, &pSD, NULL); ok(!ret && GetLastError() == ERROR_UNKNOWN_REVISION, "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_UNKNOWN_REVISION instead of %d\n", @@ -1772,19 +1784,19 @@ static void test_ConvertStringSecurityDescriptor(void) /* test ACE string type */ SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(D;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "ERROR:(D;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_PARAMETER instead of %d\n", @@ -1792,47 +1804,47 @@ static void test_ConvertStringSecurityDescriptor(void) /* test ACE string access rights */ SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, &pSD, NULL); todo_wine ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, &pSD, NULL); todo_wine ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, &pSD, NULL); todo_wine ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); /* test ACE string access right error case */ SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;ROB;;;WD)", SDDL_REVISION_1, &pSD, NULL); todo_wine ok(!ret && GetLastError() == ERROR_INVALID_ACL, @@ -1841,13 +1853,13 @@ static void test_ConvertStringSecurityDescriptor(void) /* test ACE string SID */ SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); - ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(D;;GA;;;Non existant account)", SDDL_REVISION_1, &pSD, NULL); todo_wine ok(!ret && GetLastError() == ERROR_INVALID_ACL,

1 0

Paul Vriens : advapi32/service: Add tests for GetDisplayName.
by Alexandre Julliard July 23, 2007

July 23, 2007

Module: wine Branch: master Commit: b5a61cb492d6442344749effa56e283711c8c4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a61cb492d6442344749effa… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Jul 22 20:09:04 2007 +0200 advapi32/service: Add tests for GetDisplayName. --- dlls/advapi32/tests/service.c | 108 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 5c9c663..61d18dd 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -377,6 +377,104 @@ static void test_create_delete_svc(void) "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); } +static void test_get_displayname(void) +{ + SC_HANDLE scm_handle, svc_handle; + BOOL ret; + CHAR displayname[4096]; + WCHAR displaynameW[2048]; + DWORD displaysize, tempsize, tempsizeW; + static const CHAR spooler[] = "Spooler"; + static const WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; + + /* Having NULL for the size of the buffer will crash on W2K3 */ + + SetLastError(0xdeadbeef); + ret = GetServiceDisplayNameA(NULL, NULL, NULL, &displaysize); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + + SetLastError(0xdeadbeef); + ret = GetServiceDisplayNameA(scm_handle, NULL, NULL, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_ADDRESS /* W2K, XP, W2K3, Vista */ || + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, + "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + displaysize = sizeof(displayname); + ret = GetServiceDisplayNameA(scm_handle, NULL, displayname, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_ADDRESS /* W2K, XP, W2K3, Vista */ || + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, + "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Check if 'Spooler' exists */ + svc_handle = OpenServiceA(scm_handle, spooler, GENERIC_READ); + if (!svc_handle) + { + skip("Spooler service doesn't exist\n"); + return; + } + CloseServiceHandle(svc_handle); + + /* Retrieve the needed size for the buffer */ + SetLastError(0xdeadbeef); + displaysize = -1; + ret = GetServiceDisplayNameA(scm_handle, spooler, NULL, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + tempsize = displaysize; + displaysize *= 2; + ret = GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || + GetLastError() == ERROR_IO_PENDING /* W2K */ || + GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + /* Test that shows that if the buffersize is enough, it's not changed */ + ok(displaysize == tempsize * 2, "Didn't expect a change in the needed size of the buffer\n"); + todo_wine + ok(lstrlen(displayname) == tempsize/2, + "Expected the buffer to be twice the length of the string\n") ; + + /* Do the last 2 tests also for GetServiceDisplayNameW */ + SetLastError(0xdeadbeef); + displaysize = -1; + ret = GetServiceDisplayNameW(scm_handle, spoolerW, NULL, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + tempsizeW = displaysize; + displaysize *= 2; + ret = GetServiceDisplayNameW(scm_handle, spoolerW, displaynameW, &displaysize); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || + GetLastError() == ERROR_IO_PENDING /* W2K */ || + GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + /* Test that shows that the buffersize is changed to the needed size */ + todo_wine + { + ok(displaysize == tempsizeW, "Did expect a change in the needed size of the buffer\n"); + ok(lstrlenW(displaynameW) == displaysize, + "Expected the buffer to be the length of the string\n") ; + ok(tempsize / 2 == tempsizeW, + "Expected the needed buffersize (in bytes) to be the same for the A and W call\n"); + } + + CloseServiceHandle(scm_handle); +} + static void test_close(void) { SC_HANDLE handle; @@ -514,6 +612,10 @@ static void test_sequence(void) "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); CloseServiceHandle(svc_handle); + + /* Wait a while. The following test does a CreateService again */ + Sleep(1000); + CloseServiceHandle(scm_handle); } @@ -595,6 +697,11 @@ static void test_refcount(void) ret = CloseServiceHandle(svc_handle1); ok(ret, "Expected success\n"); + /* Wait a while. Doing a CreateService to soon will result again + * in an ERROR_SERVICE_MARKED_FOR_DELETE error. + */ + Sleep(1000); + /* 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, @@ -631,6 +738,7 @@ START_TEST(service) test_open_scm(); test_open_svc(); test_create_delete_svc(); + test_get_displayname(); test_close(); /* Test the creation, querying and deletion of a service */ test_sequence();

1 0

Rob Shearman : rpcrt4: Convert bind ack and nack reject reasons into RPC status codes when binding .
by Alexandre Julliard July 23, 2007

July 23, 2007

Module: wine Branch: master Commit: 8a87d916b41b256e3abe32ff240acfc1b39f2a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a87d916b41b256e3abe32ff2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jul 20 11:35:34 2007 +0100 rpcrt4: Convert bind ack and nack reject reasons into RPC status codes when binding. --- dlls/rpcrt4/rpc_defs.h | 22 ++++++++- dlls/rpcrt4/rpc_message.c | 1 + dlls/rpcrt4/rpc_server.c | 2 +- dlls/rpcrt4/rpc_transport.c | 103 +++++++++++++++++++++++++++++++++++++----- 4 files changed, 111 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_defs.h b/dlls/rpcrt4/rpc_defs.h index 7499dcd..c0c3609 100644 --- a/dlls/rpcrt4/rpc_defs.h +++ b/dlls/rpcrt4/rpc_defs.h @@ -177,9 +177,25 @@ typedef struct #define PKT_CO_CANCEL 18 #define PKT_ORPHANED 19 -#define RESULT_ACCEPT 0 - -#define NO_REASON 0 +#define RESULT_ACCEPT 0 +#define RESULT_USER_REJECTION 1 +#define RESULT_PROVIDER_REJECTION 2 + +#define REASON_NONE 0 +#define REASON_ABSTRACT_SYNTAX_NOT_SUPPORTED 1 +#define REASON_TRANSFER_SYNTAXES_NOT_SUPPORTED 2 +#define REASON_LOCAL_LIMIT_EXCEEDED 3 + +#define REJECT_REASON_NOT_SPECIFIED 0 +#define REJECT_TEMPORARY_CONGESTION 1 +#define REJECT_LOCAL_LIMIT_EXCEEDED 2 +#define REJECT_CALLED_PADDR_UNKNOWN 3 /* not used */ +#define REJECT_PROTOCOL_VERSION_NOT_SUPPORTED 4 +#define REJECT_DEFAULT_CONTEXT_NOT_SUPPORTED 5 /* not used */ +#define REJECT_USER_DATA_NOT_READABLE 6 /* not used */ +#define REJECT_NO_PSAP_AVAILABLE 7 /* not used */ +#define REJECT_UNKNOWN_AUTHN_SERVICE 8 +#define REJECT_INVALID_CHECKSUM 9 #define NCADG_IP_UDP 0x08 #define NCACN_IP_TCP 0x07 diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 03e0737..b19e7f1 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -230,6 +230,7 @@ RpcPktHdr *RPCRT4_BuildBindNackHeader(unsigned long DataRepresentation, RPCRT4_BuildCommonHeader(header, PKT_BIND_NACK, DataRepresentation); header->common.frag_len = sizeof(header->bind_nack); + header->bind_nack.reject_reason = REJECT_REASON_NOT_SPECIFIED; header->bind_nack.protocols_count = 1; header->bind_nack.protocols[0].rpc_ver = RpcVersion; header->bind_nack.protocols[0].rpc_ver_minor = RpcVersionMinor; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 328c0d0..8a72ab3 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -198,7 +198,7 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSA RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, conn->Endpoint, - RESULT_ACCEPT, NO_REASON, + RESULT_ACCEPT, REASON_NONE, &sif->If->TransferSyntax); /* save the interface for later use */ diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 413bcbb..cc33e5e 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1473,6 +1473,8 @@ ULONG RpcAssoc_Release(RpcAssoc *assoc) return refs; } +#define ROUND_UP(value, alignment) (((value) + ((alignment) - 1)) & ~((alignment)-1)) + static RPC_STATUS RpcAssoc_BindConnection(RpcAssoc *assoc, RpcConnection *conn, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax) @@ -1501,23 +1503,98 @@ static RPC_STATUS RpcAssoc_BindConnection(RpcAssoc *assoc, RpcConnection *conn, return status; } - if (response_hdr->common.ptype != PKT_BIND_ACK) + switch (response_hdr->common.ptype) + { + case PKT_BIND_ACK: { - ERR("failed to bind for interface %s, %d.%d\n", - debugstr_guid(&InterfaceId->SyntaxGUID), - InterfaceId->SyntaxVersion.MajorVersion, - InterfaceId->SyntaxVersion.MinorVersion); - RPCRT4_FreeHeader(response_hdr); - return RPC_S_PROTOCOL_ERROR; + RpcAddressString *server_address = msg.Buffer; + if ((msg.BufferLength >= FIELD_OFFSET(RpcAddressString, string[0])) || + (msg.BufferLength >= ROUND_UP(FIELD_OFFSET(RpcAddressString, string[server_address->length]), 4))) + { + unsigned short remaining = msg.BufferLength - + ROUND_UP(FIELD_OFFSET(RpcAddressString, string[server_address->length]), 4); + RpcResults *results = (RpcResults*)((ULONG_PTR)server_address + + ROUND_UP(FIELD_OFFSET(RpcAddressString, string[server_address->length]), 4)); + if ((results->num_results == 1) && (remaining >= sizeof(*results))) + { + switch (results->results[0].result) + { + case RESULT_ACCEPT: + conn->assoc_group_id = response_hdr->bind_ack.assoc_gid; + conn->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; + conn->ActiveInterface = *InterfaceId; + break; + case RESULT_PROVIDER_REJECTION: + switch (results->results[0].reason) + { + case REASON_ABSTRACT_SYNTAX_NOT_SUPPORTED: + ERR("syntax %s, %d.%d not supported\n", + debugstr_guid(&InterfaceId->SyntaxGUID), + InterfaceId->SyntaxVersion.MajorVersion, + InterfaceId->SyntaxVersion.MinorVersion); + status = RPC_S_UNKNOWN_IF; + break; + case REASON_TRANSFER_SYNTAXES_NOT_SUPPORTED: + ERR("transfer syntax not supported\n"); + status = RPC_S_SERVER_UNAVAILABLE; + break; + case REASON_NONE: + default: + status = RPC_S_CALL_FAILED_DNE; + } + break; + case RESULT_USER_REJECTION: + default: + ERR("rejection result %d\n", results->results[0].result); + status = RPC_S_CALL_FAILED_DNE; + } + } + else + { + ERR("incorrect results size\n"); + status = RPC_S_CALL_FAILED_DNE; + } + } + else + { + ERR("bind ack packet too small (%d)\n", msg.BufferLength); + status = RPC_S_PROTOCOL_ERROR; + } + break; + } + case PKT_BIND_NACK: + switch (response_hdr->bind_nack.reject_reason) + { + case REJECT_LOCAL_LIMIT_EXCEEDED: + case REJECT_TEMPORARY_CONGESTION: + ERR("server too busy\n"); + status = RPC_S_SERVER_TOO_BUSY; + break; + case REJECT_PROTOCOL_VERSION_NOT_SUPPORTED: + ERR("protocol version not supported\n"); + status = RPC_S_PROTOCOL_ERROR; + break; + case REJECT_UNKNOWN_AUTHN_SERVICE: + ERR("unknown authentication service\n"); + status = RPC_S_UNKNOWN_AUTHN_SERVICE; + break; + case REJECT_INVALID_CHECKSUM: + ERR("invalid checksum\n"); + status = ERROR_ACCESS_DENIED; + break; + default: + ERR("rejected bind for reason %d\n", response_hdr->bind_nack.reject_reason); + status = RPC_S_CALL_FAILED_DNE; + } + break; + default: + ERR("wrong packet type received %d\n", response_hdr->common.ptype); + status = RPC_S_PROTOCOL_ERROR; + break; } - /* FIXME: do more checks? */ - - conn->assoc_group_id = response_hdr->bind_ack.assoc_gid; - conn->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; - conn->ActiveInterface = *InterfaceId; RPCRT4_FreeHeader(response_hdr); - return RPC_S_OK; + return status; } static RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc,

1 0

Vitaliy Margolen : user32: Add test for SetForegroundWindow(desktop).
by Alexandre Julliard July 23, 2007

July 23, 2007

Module: wine Branch: master Commit: 9380eb31278796cdd7e5a7dcdac156477aaa6443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9380eb31278796cdd7e5a7dcd… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jul 20 07:15:36 2007 -0600 user32: Add test for SetForegroundWindow(desktop). --- dlls/user32/tests/win.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dc179f1..b5d2ad5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2211,6 +2211,15 @@ static void test_SetForegroundWindow(HWND hwnd) SetWindowPos(hwnd,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_SHOWWINDOW); check_wnd_state(hwnd, hwnd, hwnd, 0); + hwnd2 = GetForegroundWindow(); + ok(hwnd2 == hwnd, "Wrong foreground window %p\n", hwnd2); + todo_wine + { + ok(SetForegroundWindow( GetDesktopWindow() ), "SetForegroundWindow(desktop) error: %d\n", GetLastError()); + hwnd2 = GetForegroundWindow(); + ok(hwnd2 != hwnd, "Wrong foreground window %p\n", hwnd2); + } + ShowWindow(hwnd, SW_HIDE); check_wnd_state(0, 0, 0, 0);

1 0

appdb/include bugs.php
by WineHQ July 22, 2007

July 22, 2007

ChangeSet ID: 31259 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/21 19:49:15 Modified files: include : bugs.php Log message: Edwin Smulders <edwin.smulders(a)gmail.com> Hide RESOLVED and CLOSED bugs unless we are displaying all bugs. Patch: http://cvs.winehq.org/patch.py?id=31259 Old revision New revision Changes Path 1.26 1.27 +10 -2 appdb/include/bugs.php Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.26 appdb/include/bugs.php:1.27 --- appdb/include/bugs.php:1.26 22 Jul 2007 0:49:15 -0000 +++ appdb/include/bugs.php 22 Jul 2007 0:49:15 -0000 @@ -287,6 +287,11 @@ class Bug { return $sReturn; } + + function isOpen() + { + return ($this->sBug_status != 'RESOLVED' && $this->sBug_status != 'CLOSED'); + } } @@ -335,8 +340,11 @@ function view_version_bugs($iVersionId = { $oBuglink = new Bug($iBuglinkId); - if ( (!isset($aClean['sAllBugs']) && $oBuglink->sBug_status != 'RESOLVED') - || isset($aClean['sAllBugs']) ) + if ( + (!isset($aClean['sAllBugs']) && $oBuglink->isOpen() ) + || + isset($aClean['sAllBugs']) + ) { // set row color $bgcolor = ($c % 2 == 0) ? "color0" : "color1";

1 0

appdb/include testData.php
by WineHQ July 21, 2007

July 21, 2007

ChangeSet ID: 31258 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/21 18:58:06 Modified files: include : testData.php Log message: Edwin Smulders <edwin.smulders(a)gmail.com> Queued test results shouldn't be visible to maintainers of an application family or version that are themselves still queued. Add where condition that 'appMaintainers.queued = 'false''. Patch: http://cvs.winehq.org/patch.py?id=31258 Old revision New revision Changes Path 1.66 1.67 +2 -0 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.66 appdb/include/testData.php:1.67 --- appdb/include/testData.php:1.66 21 Jul 2007 23:58: 6 -0000 +++ appdb/include/testData.php 21 Jul 2007 23:58: 6 -0000 @@ -918,6 +918,8 @@ class testData{ ) ) AND + appMaintainers.queued = 'false' + AND testResults.queued = '?' ORDER BY '?'$sLimit"; } if($sLimit)

1 0

appdb/ include/maintainer.php admin/maintainer ...
by WineHQ July 21, 2007

July 21, 2007

ChangeSet ID: 31257 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/21 18:49:36 Modified files: include : maintainer.php Added files: admin : maintainerNotification.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Split maintainer::notifyMaintainerOfQueuedData() into two parts. maintainer::fetchNotificationUpdate() that retrieves much of the email to the maintainer and the target notification level, and maintainer::processNotificationUpdate() that acts on the target notification level and completes and optionally sends the email to the maintainer. Add admin/maintainerNotification.php to aid in debugging the notification system. Patch: http://cvs.winehq.org/patch.py?id=31257 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/admin/maintainerNotification.php 1.46 1.47 +65 -26 appdb/include/maintainer.php

1 0

appdb/include bugs.php
by WineHQ July 21, 2007

July 21, 2007

ChangeSet ID: 31256 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/21 18:32:10 Modified files: include : bugs.php Log message: Edwin Smulders <edwin.smulders(a)gmail.com> Hide resolved bugs by default, add link to toggle between hiding resolved bugs and showing all bugs. Patch: http://cvs.winehq.org/patch.py?id=31256 Old revision New revision Changes Path 1.25 1.26 +46 -25 appdb/include/bugs.php Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.25 appdb/include/bugs.php:1.26 --- appdb/include/bugs.php:1.25 21 Jul 2007 23:32:10 -0000 +++ appdb/include/bugs.php 21 Jul 2007 23:32:10 -0000 @@ -335,44 +335,65 @@ function view_version_bugs($iVersionId = { $oBuglink = new Bug($iBuglinkId); - // set row color - $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; - - //display row - echo "<tr class=$bgcolor>\n"; - echo "<td align=center><a href='".BUGZILLA_ROOT."show_bug.cgi?id=".$oBuglink->iBug_id."'>".$oBuglink->iBug_id."</a></td>\n"; - echo "<td>".$oBuglink->sShort_desc."</td>\n"; - echo "<td align=center>".$oBuglink->sBug_status."</td>","\n"; - echo "<td align=center>".$oBuglink->sResolution."</td>","\n"; - echo "<td align=center><a href='viewbugs.php?bug_id=".$oBuglink->iBug_id."'>View</a></td>\n"; - - - if($bCanEdit == true) + if ( (!isset($aClean['sAllBugs']) && $oBuglink->sBug_status != 'RESOLVED') + || isset($aClean['sAllBugs']) ) { - echo "<td align=center>[<a href='".$oVersion->objectMakeUrl()."&sSub=delete&iBuglinkId=".$oBuglink->iLinkId."'>delete</a>]</td>\n"; - if ($oBuglink->bQueued) - { - echo "<td align=center>[<a href='".$oVersion->objectMakeUrl()."&sSub=unqueue&iBuglinkId=".$oBuglink->iLinkId."'>OK</a>]</td>\n"; - } else + // set row color + $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; + + //display row + echo "<tr class=$bgcolor>\n"; + echo "<td align=center><a href='".BUGZILLA_ROOT."show_bug.cgi?id=".$oBuglink->iBug_id."'>".$oBuglink->iBug_id."</a></td>\n"; + echo "<td>".$oBuglink->sShort_desc."</td>\n"; + echo "<td align=center>".$oBuglink->sBug_status."</td>","\n"; + echo "<td align=center>".$oBuglink->sResolution."</td>","\n"; + echo "<td align=center><a href='viewbugs.php?bug_id=".$oBuglink->iBug_id."'>View</a></td>\n"; + + + if($bCanEdit == true) { - echo "<td align=center>Yes</td>\n"; + echo "<td align=center>[<a href='".$oVersion->objectMakeUrl()."&sSub=delete&iBuglinkId=".$oBuglink->iLinkId."'>delete</a>]</td>\n"; + if ($oBuglink->bQueued) + { + echo "<td align=center>[<a href='".$oVersion->objectMakeUrl()."&sSub=unqueue&iBuglinkId=".$oBuglink->iLinkId."'>OK</a>]</td>\n"; + } else + { + echo "<td align=center>Yes</td>\n"; + } + } - - } - echo "</tr>\n\n"; - + echo "</tr>\n\n"; + - $c++; + $c++; + } } + if($_SESSION['current']->isLoggedIn()) { echo '<input type="hidden" name="iVersionId" value="'.$iVersionId.'">',"\n"; echo '<tr class=color3><td align=center>',"\n"; - echo '<input type="text" name="iBuglinkId" value="'.$aClean['buglinkId'].'" size="8"></td>',"\n"; + $sBuglinkId = isset($aClean['buglinkId']) ? $aClean['buglinkId'] : ''; + echo '<input type="text" name="iBuglinkId" value="'.$sBuglinkId.'" size="8"></td>',"\n"; echo '<td><input type="submit" name="sSub" value="Submit a new bug link."></td>',"\n"; echo '<td colspan=6></td></tr></form>',"\n"; } echo '</table>',"\n"; + + // show only open link + if ( isset( $aClean['sAllBugs'] ) ) + { + $sURL = str_replace( '&sAllBugs', '', $_SERVER['REQUEST_URI'] ); + $sLink = '<a href="' . $sURL . '">Show Open Bugs</a>'; + } + // show all link + else + { + $sURL = $_SERVER['REQUEST_URI'] . '&sAllBugs'; + $sLink = '<a href="' . $sURL . '">Show All Bugs</a>'; + } + + echo '<div style="text-align:right;">' . $sLink .'</div>'; echo html_frame_end(); }

1 0

appdb/ cron/cleanup.php include/maintainer.php ...
by WineHQ July 20, 2007

July 20, 2007

ChangeSet ID: 31255 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/20 17:24:37 Modified files: cron : cleanup.php include : maintainer.php testData.php tables : maintainers.sql unit_test : run_tests.php test_common.php test_maintainer.php test_om_objects.php Added files: unit_test : test_maintainer_notify.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add the long awaited 'maintainer notification' system. This system, running from the cron cleanup scripts, will look for maintainers that have queued entries that the maintainer can process. If the queued entries aren't processed for X days an email is sent. In X*2 days another email is sent. After X*3 days the maintainer is stripped of their maintainership as they aren't really maintaining the application anyway. The hope is that this system lets maintainers know that they have pending queued entries to process to reduce the pressure on the appdb admins to handled hundreds of queued entries. Patch: http://cvs.winehq.org/patch.py?id=31255 Old revision New revision Changes Path 1.44 1.45 +13 -1 appdb/cron/cleanup.php 1.45 1.46 +439 -1 appdb/include/maintainer.php 1.65 1.66 +6 -1 appdb/include/testData.php 1.4 1.5 +10 -8 appdb/tables/maintainers.sql 1.14 1.15 +1 -0 appdb/unit_test/run_tests.php 1.1 1.2 +24 -1 appdb/unit_test/test_common.php 1.10 1.11 +16 -0 appdb/unit_test/test_maintainer.php 1.17 1.18 +6 -25 appdb/unit_test/test_om_objects.php Added 1.1 +0 -0 appdb/unit_test/test_maintainer_notify.php

1 0