October 2007 - Wine-commits

Juan Lang : crypt32: Implement CertVerifyCertificateChain for the Microsoft root policy.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 136f0331585131c52b9271db5aaacc9ea893edf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=136f0331585131c52b9271db5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 15 13:16:24 2007 -0700 crypt32: Implement CertVerifyCertificateChain for the Microsoft root policy. --- dlls/crypt32/chain.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 3a38941..a64d951 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1523,6 +1523,120 @@ static BOOL WINAPI verify_basic_constraints_policy(LPCSTR szPolicyOID, return TRUE; } +static BYTE msPubKey1[] = { +0x30,0x82,0x01,0x0a,0x02,0x82,0x01,0x01,0x00,0xdf,0x08,0xba,0xe3,0x3f,0x6e, +0x64,0x9b,0xf5,0x89,0xaf,0x28,0x96,0x4a,0x07,0x8f,0x1b,0x2e,0x8b,0x3e,0x1d, +0xfc,0xb8,0x80,0x69,0xa3,0xa1,0xce,0xdb,0xdf,0xb0,0x8e,0x6c,0x89,0x76,0x29, +0x4f,0xca,0x60,0x35,0x39,0xad,0x72,0x32,0xe0,0x0b,0xae,0x29,0x3d,0x4c,0x16, +0xd9,0x4b,0x3c,0x9d,0xda,0xc5,0xd3,0xd1,0x09,0xc9,0x2c,0x6f,0xa6,0xc2,0x60, +0x53,0x45,0xdd,0x4b,0xd1,0x55,0xcd,0x03,0x1c,0xd2,0x59,0x56,0x24,0xf3,0xe5, +0x78,0xd8,0x07,0xcc,0xd8,0xb3,0x1f,0x90,0x3f,0xc0,0x1a,0x71,0x50,0x1d,0x2d, +0xa7,0x12,0x08,0x6d,0x7c,0xb0,0x86,0x6c,0xc7,0xba,0x85,0x32,0x07,0xe1,0x61, +0x6f,0xaf,0x03,0xc5,0x6d,0xe5,0xd6,0xa1,0x8f,0x36,0xf6,0xc1,0x0b,0xd1,0x3e, +0x69,0x97,0x48,0x72,0xc9,0x7f,0xa4,0xc8,0xc2,0x4a,0x4c,0x7e,0xa1,0xd1,0x94, +0xa6,0xd7,0xdc,0xeb,0x05,0x46,0x2e,0xb8,0x18,0xb4,0x57,0x1d,0x86,0x49,0xdb, +0x69,0x4a,0x2c,0x21,0xf5,0x5e,0x0f,0x54,0x2d,0x5a,0x43,0xa9,0x7a,0x7e,0x6a, +0x8e,0x50,0x4d,0x25,0x57,0xa1,0xbf,0x1b,0x15,0x05,0x43,0x7b,0x2c,0x05,0x8d, +0xbd,0x3d,0x03,0x8c,0x93,0x22,0x7d,0x63,0xea,0x0a,0x57,0x05,0x06,0x0a,0xdb, +0x61,0x98,0x65,0x2d,0x47,0x49,0xa8,0xe7,0xe6,0x56,0x75,0x5c,0xb8,0x64,0x08, +0x63,0xa9,0x30,0x40,0x66,0xb2,0xf9,0xb6,0xe3,0x34,0xe8,0x67,0x30,0xe1,0x43, +0x0b,0x87,0xff,0xc9,0xbe,0x72,0x10,0x5e,0x23,0xf0,0x9b,0xa7,0x48,0x65,0xbf, +0x09,0x88,0x7b,0xcd,0x72,0xbc,0x2e,0x79,0x9b,0x7b,0x02,0x03,0x01,0x00,0x01 }; +static BYTE msPubKey2[] = { +0x30,0x82,0x01,0x0a,0x02,0x82,0x01,0x01,0x00,0xa9,0x02,0xbd,0xc1,0x70,0xe6, +0x3b,0xf2,0x4e,0x1b,0x28,0x9f,0x97,0x78,0x5e,0x30,0xea,0xa2,0xa9,0x8d,0x25, +0x5f,0xf8,0xfe,0x95,0x4c,0xa3,0xb7,0xfe,0x9d,0xa2,0x20,0x3e,0x7c,0x51,0xa2, +0x9b,0xa2,0x8f,0x60,0x32,0x6b,0xd1,0x42,0x64,0x79,0xee,0xac,0x76,0xc9,0x54, +0xda,0xf2,0xeb,0x9c,0x86,0x1c,0x8f,0x9f,0x84,0x66,0xb3,0xc5,0x6b,0x7a,0x62, +0x23,0xd6,0x1d,0x3c,0xde,0x0f,0x01,0x92,0xe8,0x96,0xc4,0xbf,0x2d,0x66,0x9a, +0x9a,0x68,0x26,0x99,0xd0,0x3a,0x2c,0xbf,0x0c,0xb5,0x58,0x26,0xc1,0x46,0xe7, +0x0a,0x3e,0x38,0x96,0x2c,0xa9,0x28,0x39,0xa8,0xec,0x49,0x83,0x42,0xe3,0x84, +0x0f,0xbb,0x9a,0x6c,0x55,0x61,0xac,0x82,0x7c,0xa1,0x60,0x2d,0x77,0x4c,0xe9, +0x99,0xb4,0x64,0x3b,0x9a,0x50,0x1c,0x31,0x08,0x24,0x14,0x9f,0xa9,0xe7,0x91, +0x2b,0x18,0xe6,0x3d,0x98,0x63,0x14,0x60,0x58,0x05,0x65,0x9f,0x1d,0x37,0x52, +0x87,0xf7,0xa7,0xef,0x94,0x02,0xc6,0x1b,0xd3,0xbf,0x55,0x45,0xb3,0x89,0x80, +0xbf,0x3a,0xec,0x54,0x94,0x4e,0xae,0xfd,0xa7,0x7a,0x6d,0x74,0x4e,0xaf,0x18, +0xcc,0x96,0x09,0x28,0x21,0x00,0x57,0x90,0x60,0x69,0x37,0xbb,0x4b,0x12,0x07, +0x3c,0x56,0xff,0x5b,0xfb,0xa4,0x66,0x0a,0x08,0xa6,0xd2,0x81,0x56,0x57,0xef, +0xb6,0x3b,0x5e,0x16,0x81,0x77,0x04,0xda,0xf6,0xbe,0xae,0x80,0x95,0xfe,0xb0, +0xcd,0x7f,0xd6,0xa7,0x1a,0x72,0x5c,0x3c,0xca,0xbc,0xf0,0x08,0xa3,0x22,0x30, +0xb3,0x06,0x85,0xc9,0xb3,0x20,0x77,0x13,0x85,0xdf,0x02,0x03,0x01,0x00,0x01 }; +static BYTE msPubKey3[] = { +0x30,0x82,0x02,0x0a,0x02,0x82,0x02,0x01,0x00,0xf3,0x5d,0xfa,0x80,0x67,0xd4, +0x5a,0xa7,0xa9,0x0c,0x2c,0x90,0x20,0xd0,0x35,0x08,0x3c,0x75,0x84,0xcd,0xb7, +0x07,0x89,0x9c,0x89,0xda,0xde,0xce,0xc3,0x60,0xfa,0x91,0x68,0x5a,0x9e,0x94, +0x71,0x29,0x18,0x76,0x7c,0xc2,0xe0,0xc8,0x25,0x76,0x94,0x0e,0x58,0xfa,0x04, +0x34,0x36,0xe6,0xdf,0xaf,0xf7,0x80,0xba,0xe9,0x58,0x0b,0x2b,0x93,0xe5,0x9d, +0x05,0xe3,0x77,0x22,0x91,0xf7,0x34,0x64,0x3c,0x22,0x91,0x1d,0x5e,0xe1,0x09, +0x90,0xbc,0x14,0xfe,0xfc,0x75,0x58,0x19,0xe1,0x79,0xb7,0x07,0x92,0xa3,0xae, +0x88,0x59,0x08,0xd8,0x9f,0x07,0xca,0x03,0x58,0xfc,0x68,0x29,0x6d,0x32,0xd7, +0xd2,0xa8,0xcb,0x4b,0xfc,0xe1,0x0b,0x48,0x32,0x4f,0xe6,0xeb,0xb8,0xad,0x4f, +0xe4,0x5c,0x6f,0x13,0x94,0x99,0xdb,0x95,0xd5,0x75,0xdb,0xa8,0x1a,0xb7,0x94, +0x91,0xb4,0x77,0x5b,0xf5,0x48,0x0c,0x8f,0x6a,0x79,0x7d,0x14,0x70,0x04,0x7d, +0x6d,0xaf,0x90,0xf5,0xda,0x70,0xd8,0x47,0xb7,0xbf,0x9b,0x2f,0x6c,0xe7,0x05, +0xb7,0xe1,0x11,0x60,0xac,0x79,0x91,0x14,0x7c,0xc5,0xd6,0xa6,0xe4,0xe1,0x7e, +0xd5,0xc3,0x7e,0xe5,0x92,0xd2,0x3c,0x00,0xb5,0x36,0x82,0xde,0x79,0xe1,0x6d, +0xf3,0xb5,0x6e,0xf8,0x9f,0x33,0xc9,0xcb,0x52,0x7d,0x73,0x98,0x36,0xdb,0x8b, +0xa1,0x6b,0xa2,0x95,0x97,0x9b,0xa3,0xde,0xc2,0x4d,0x26,0xff,0x06,0x96,0x67, +0x25,0x06,0xc8,0xe7,0xac,0xe4,0xee,0x12,0x33,0x95,0x31,0x99,0xc8,0x35,0x08, +0x4e,0x34,0xca,0x79,0x53,0xd5,0xb5,0xbe,0x63,0x32,0x59,0x40,0x36,0xc0,0xa5, +0x4e,0x04,0x4d,0x3d,0xdb,0x5b,0x07,0x33,0xe4,0x58,0xbf,0xef,0x3f,0x53,0x64, +0xd8,0x42,0x59,0x35,0x57,0xfd,0x0f,0x45,0x7c,0x24,0x04,0x4d,0x9e,0xd6,0x38, +0x74,0x11,0x97,0x22,0x90,0xce,0x68,0x44,0x74,0x92,0x6f,0xd5,0x4b,0x6f,0xb0, +0x86,0xe3,0xc7,0x36,0x42,0xa0,0xd0,0xfc,0xc1,0xc0,0x5a,0xf9,0xa3,0x61,0xb9, +0x30,0x47,0x71,0x96,0x0a,0x16,0xb0,0x91,0xc0,0x42,0x95,0xef,0x10,0x7f,0x28, +0x6a,0xe3,0x2a,0x1f,0xb1,0xe4,0xcd,0x03,0x3f,0x77,0x71,0x04,0xc7,0x20,0xfc, +0x49,0x0f,0x1d,0x45,0x88,0xa4,0xd7,0xcb,0x7e,0x88,0xad,0x8e,0x2d,0xec,0x45, +0xdb,0xc4,0x51,0x04,0xc9,0x2a,0xfc,0xec,0x86,0x9e,0x9a,0x11,0x97,0x5b,0xde, +0xce,0x53,0x88,0xe6,0xe2,0xb7,0xfd,0xac,0x95,0xc2,0x28,0x40,0xdb,0xef,0x04, +0x90,0xdf,0x81,0x33,0x39,0xd9,0xb2,0x45,0xa5,0x23,0x87,0x06,0xa5,0x55,0x89, +0x31,0xbb,0x06,0x2d,0x60,0x0e,0x41,0x18,0x7d,0x1f,0x2e,0xb5,0x97,0xcb,0x11, +0xeb,0x15,0xd5,0x24,0xa5,0x94,0xef,0x15,0x14,0x89,0xfd,0x4b,0x73,0xfa,0x32, +0x5b,0xfc,0xd1,0x33,0x00,0xf9,0x59,0x62,0x70,0x07,0x32,0xea,0x2e,0xab,0x40, +0x2d,0x7b,0xca,0xdd,0x21,0x67,0x1b,0x30,0x99,0x8f,0x16,0xaa,0x23,0xa8,0x41, +0xd1,0xb0,0x6e,0x11,0x9b,0x36,0xc4,0xde,0x40,0x74,0x9c,0xe1,0x58,0x65,0xc1, +0x60,0x1e,0x7a,0x5b,0x38,0xc8,0x8f,0xbb,0x04,0x26,0x7c,0xd4,0x16,0x40,0xe5, +0xb6,0x6b,0x6c,0xaa,0x86,0xfd,0x00,0xbf,0xce,0xc1,0x35,0x02,0x03,0x01,0x00, +0x01 }; + +static BOOL WINAPI verify_ms_root_policy(LPCSTR szPolicyOID, + PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, + PCERT_CHAIN_POLICY_STATUS pPolicyStatus) +{ + BOOL ret = verify_base_policy(szPolicyOID, pChainContext, pPolicyPara, + pPolicyStatus); + + if (ret && !pPolicyStatus->dwError) + { + CERT_PUBLIC_KEY_INFO msPubKey = { { 0 } }; + BOOL isMSRoot = FALSE; + DWORD i; + CRYPT_DATA_BLOB keyBlobs[] = { + { sizeof(msPubKey1), msPubKey1 }, + { sizeof(msPubKey2), msPubKey2 }, + { sizeof(msPubKey3), msPubKey3 }, + }; + PCERT_SIMPLE_CHAIN rootChain = + pChainContext->rgpChain[pChainContext->cChain -1 ]; + PCCERT_CONTEXT root = + rootChain->rgpElement[rootChain->cElement - 1]->pCertContext; + + for (i = 0; !isMSRoot && i < sizeof(keyBlobs) / sizeof(keyBlobs[0]); + i++) + { + msPubKey.PublicKey.cbData = keyBlobs[i].cbData; + msPubKey.PublicKey.pbData = keyBlobs[i].pbData; + if (CertComparePublicKeyInfo( + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + &root->pCertInfo->SubjectPublicKeyInfo, &msPubKey)) + isMSRoot = TRUE; + } + if (isMSRoot) + pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = 0; + } + return ret; +} + typedef BOOL (WINAPI *CertVerifyCertificateChainPolicyFunc)(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus); @@ -1552,6 +1666,9 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, case (int)CERT_CHAIN_POLICY_BASIC_CONSTRAINTS: verifyPolicy = verify_basic_constraints_policy; break; + case (int)CERT_CHAIN_POLICY_MICROSOFT_ROOT: + verifyPolicy = verify_ms_root_policy; + break; default: FIXME("unimplemented for %d\n", LOWORD(szPolicyOID)); }

1 0

James Hawkins : user32: Increase the message timeout.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 8725b39003bdd24fbdb2c26b43897ee7c6d2941a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8725b39003bdd24fbdb2c26b4… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:11:56 2007 -0500 user32: Increase the message timeout. --- dlls/user32/tests/dde.c | 194 +++++++++++++++++++++-------------------------- 1 files changed, 86 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8725b39003bdd24fbdb2c…

1 0

Alexandre Julliard : user32: Fix message processing in dde test and go back to more reasonable timeouts .
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 9f3f51bad74ab97ad2cd91fccac1d48d4f1c5e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3f51bad74ab97ad2cd91fcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 21:19:22 2007 +0200 user32: Fix message processing in dde test and go back to more reasonable timeouts. --- dlls/user32/tests/dde.c | 77 +++++++++++++++++++++------------------------- 1 files changed, 35 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f3f51bad74ab97ad2cd9…

1 0

James Hawkins : user32: The server should release data sent with WM_DDE_POKE.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: dbad0ee62651a2d0b4308a091a07c688feabe147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbad0ee62651a2d0b4308a091… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:13:49 2007 -0500 user32: The server should release data sent with WM_DDE_POKE. --- dlls/user32/dde_client.c | 2 +- dlls/user32/tests/dde.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 50b00fa..cb9fbc8 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -725,7 +725,7 @@ static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPVOID pData, DWORD cbD if (ddePoke) { memcpy(ddePoke->Value, pData, cbData); - ddePoke->fRelease = FALSE; /* FIXME: app owned ? */ + ddePoke->fRelease = TRUE; ddePoke->cfFormat = wFmt; GlobalUnlock(pXAct->hMem); } diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 3ecab1f..cea7846 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -176,12 +176,8 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA if (msg_index == 7) todo_wine { ok(poke->unused == 0, "Expected 0, got %d\n", poke->unused); - ok(poke->cfFormat == CF_TEXT, "Expected CF_TEXT, got %d\n", poke->cfFormat); - } - - todo_wine - { ok(poke->fRelease == TRUE, "Expected TRUE, got %d\n", poke->fRelease); + ok(poke->cfFormat == CF_TEXT, "Expected CF_TEXT, got %d\n", poke->cfFormat); } if (msg_index == 5)

1 0

James Hawkins : user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 97dc03216183d803e73d30a8ad9d679c28f10c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dc03216183d803e73d30a8a… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:14:34 2007 -0500 user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL. --- dlls/user32/dde_client.c | 2 +- dlls/user32/tests/dde.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index cb9fbc8..78987c5 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1163,7 +1163,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS pXAct = WDML_ClientQueueUnadvise(pConv, wFmt, hszItem); break; case XTYP_REQUEST: - if (pData) + if (pData || !hszItem) { pConv->instance->lastError = DMLERR_INVALIDPARAMETER; return 0; diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index cea7846..9755cf4 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -353,10 +353,7 @@ static void test_ddeml_client(void) ret = DdeGetLastError(client_pid); ok(hdata == NULL, "Expected NULL hdata, got %p\n", hdata); ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %08x\n", res); - todo_wine - { - ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); - } + ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); DdeFreeStringHandle(client_pid, item);

1 0

James Hawkins : user32: Return DMLERR_MEMORY_ERROR instead of posting an ACK when fAckReq is returned by the server for WM_DDE_DATA .
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: ccabbeed60504351c52a7e2d24386660571851fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccabbeed60504351c52a7e2d2… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:15:27 2007 -0500 user32: Return DMLERR_MEMORY_ERROR instead of posting an ACK when fAckReq is returned by the server for WM_DDE_DATA. --- dlls/user32/dde_client.c | 2 +- dlls/user32/tests/dde.c | 30 +++++++----------------------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 78987c5..16e6daa 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -533,7 +533,7 @@ static WDML_QUEUE_STATE WDML_HandleRequestReply(WDML_CONV* pConv, MSG* msg, WDML } if (wdh.fAckReq) { - WDML_PostAck(pConv, WDML_CLIENT_SIDE, 0, FALSE, TRUE, uiHi, msg->lParam, WM_DDE_DATA); + pConv->instance->lastError = DMLERR_MEMORY_ERROR; } else { diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 9755cf4..5d0c915 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -109,7 +109,6 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA case WM_DDE_REQUEST: { - if (msg_index == 5) todo_wine ok((msg_index >= 2 && msg_index <= 4) || (msg_index >= 7 && msg_index <= 8), "Expected 2, 3, 4, 7 or 8, got %d\n", msg_index); @@ -161,7 +160,6 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA case WM_DDE_POKE: { - if (msg_index == 7) todo_wine ok(msg_index == 5 || msg_index == 6, "Expected 5 or 6, got %d\n", msg_index); ok(wparam == (WPARAM)client, "Expected client hwnd, got %08lx\n", wparam); @@ -173,7 +171,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA poke = GlobalLock((HGLOBAL)lo); ok(poke != NULL, "Expected non-NULL poke\n"); ok(poke->fReserved == 0, "Expected 0, got %d\n", poke->fReserved); - if (msg_index == 7) todo_wine + if (msg_index == 6) todo_wine { ok(poke->unused == 0, "Expected 0, got %d\n", poke->unused); ok(poke->fRelease == TRUE, "Expected TRUE, got %d\n", poke->fRelease); @@ -183,11 +181,9 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA if (msg_index == 5) ok(lstrcmpA((LPSTR)poke->Value, "poke data\r\n"), "Expected 'poke data\\r\\n', got %s\n", poke->Value); - else if (msg_index == 6) todo_wine - { + else ok(!lstrcmpA((LPSTR)poke->Value, "poke data\r\n"), "Expected 'poke data\\r\\n', got %s\n", poke->Value); - } GlobalUnlock((HGLOBAL)lo); @@ -199,10 +195,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA case WM_DDE_EXECUTE: { - todo_wine - { - ok(msg_index == 7, "Expected 7, got %d\n", msg_index); - } + ok(msg_index == 7, "Expected 7, got %d\n", msg_index); ok(wparam == (WPARAM)client, "Expected client hwnd, got %08lx\n", wparam); ptr = GlobalLock((HGLOBAL)lparam); @@ -219,10 +212,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA case WM_DDE_TERMINATE: { - todo_wine - { - ok(msg_index == 9, "Expected 9, got %d\n", msg_index); - } + ok(msg_index == 9, "Expected 9, got %d\n", msg_index); ok(wparam == (WPARAM)client, "Expected client hwnd, got %08lx\n", wparam); ok(lparam == 0, "Expected 0, got %08lx\n", lparam); @@ -232,10 +222,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA } default: - todo_wine - { - ok(FALSE, "Unhandled msg: %08x\n", msg); - } + ok(FALSE, "Unhandled msg: %08x\n", msg); } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -467,11 +454,8 @@ static void test_ddeml_client(void) } str = (LPSTR)DdeAccessData(hdata, &size); - todo_wine - { - ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str); - ok(size == 21, "Expected 21, got %d\n", size); - } + ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str); + ok(size == 21, "Expected 21, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret);

1 0

James Hawkins : user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 4fb3518e2ae8126c9c66f5546abadba6e9111ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb3518e2ae8126c9c66f5546… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:20:08 2007 -0500 user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL. --- dlls/user32/dde_client.c | 9 +++++++-- dlls/user32/tests/dde.c | 10 ++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 16e6daa..fe2dada 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1141,8 +1141,13 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS pXAct = WDML_ClientQueueExecute(pConv, pData, cbData); break; case XTYP_POKE: - pXAct = WDML_ClientQueuePoke(pConv, pData, cbData, wFmt, hszItem); - break; + if (!hszItem) + { + pConv->instance->lastError = DMLERR_INVALIDPARAMETER; + return 0; + } + pXAct = WDML_ClientQueuePoke(pConv, pData, cbData, wFmt, hszItem); + break; case XTYP_ADVSTART|XTYPF_NODATA: case XTYP_ADVSTART|XTYPF_NODATA|XTYPF_ACKREQ: case XTYP_ADVSTART: diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 5d0c915..1601cd1 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -358,10 +358,7 @@ static void test_ddeml_client(void) ret = DdeGetLastError(client_pid); ok(op == NULL, "Expected NULL, got %p\n", op); ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res); - todo_wine - { - ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); - } + ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); /* XTYP_POKE, no data */ res = 0xdeadbeef; @@ -370,10 +367,7 @@ static void test_ddeml_client(void) ret = DdeGetLastError(client_pid); ok(op == NULL, "Expected NULL, got %p\n", op); ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res); - todo_wine - { - ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); - } + ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); /* XTYP_POKE, wrong size */ res = 0xdeadbeef;

1 0

James Hawkins : user32: Add tests for DdeCreateDataHandle.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 88913f094bf90e146c71f9f5ec7e65f761585640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88913f094bf90e146c71f9f5e… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:22:54 2007 -0500 user32: Add tests for DdeCreateDataHandle. --- dlls/user32/tests/dde.c | 192 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 192 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 1601cd1..1388c34 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1454,6 +1454,197 @@ static void test_DdeCreateStringHandleW(DWORD dde_inst, int codepage) ok(DdeFreeStringHandle(dde_inst, str_handle), "DdeFreeStringHandle failed\n"); } +static void test_DdeCreateDataHandle(void) +{ + HDDEDATA hdata; + DWORD dde_inst; + DWORD size; + UINT res, err; + BOOL ret; + HSZ item; + LPBYTE ptr; + + dde_inst = 0; + res = DdeInitializeA(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0); + ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + + item = DdeCreateStringHandleA(dde_inst, "item", CP_WINANSI); + ok(item != NULL, "Expected non-NULL hsz\n"); + + /* invalid instance id */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(0xdeadbeef, (LPBYTE)"data", MAX_PATH, 0, item, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + todo_wine + { + ok(hdata == NULL, "Expected NULL, got %p\n", hdata); + ok(err == DMLERR_INVALIDPARAMETER, + "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + } + + /* 0 instance id */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(0, (LPBYTE)"data", MAX_PATH, 0, item, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + todo_wine + { + ok(hdata == NULL, "Expected NULL, got %p\n", hdata); + ok(err == DMLERR_INVALIDPARAMETER, + "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + } + + /* NULL pSrc */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, NULL, MAX_PATH, 0, item, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(lstrlenA((LPSTR)ptr) == 0, "Expected 0, got %d\n", lstrlenA((LPSTR)ptr)); + ok(size == 260, "Expected 260, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + /* cb is zero */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, (LPBYTE)"data", 0, 0, item, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(lstrlenA((LPSTR)ptr) != 0, "Expected non-empty string\n"); + ok(lstrcmpA((LPSTR)ptr, "data"), "Did not expect data\n"); + ok(size == 0, "Expected 0, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + /* cbOff is non-zero */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, (LPBYTE)"data", MAX_PATH, 2, item, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(size == 262, "Expected 262, got %d\n", size); + todo_wine + { + ok(lstrlenA((LPSTR)ptr) == 0, "Expected 0, got %d\n", lstrlenA((LPSTR)ptr)); + } + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + /* NULL item */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, (LPBYTE)"data", MAX_PATH, 0, 0, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr); + ok(size == 260, "Expected 260, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + /* NULL item */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, (LPBYTE)"data", MAX_PATH, 0, (HSZ)0xdeadbeef, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr); + ok(size == 260, "Expected 260, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + /* invalid clipboard format */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, (LPBYTE)"data", MAX_PATH, 0, item, 0xdeadbeef, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr); + ok(size == 260, "Expected 260, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeUninitialize(dde_inst); + ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); +} + static void test_DdeCreateStringHandle(void) { DWORD dde_inst, ret; @@ -1900,6 +2091,7 @@ START_TEST(dde) test_dde_aw_transaction(); + test_DdeCreateDataHandle(); test_DdeCreateStringHandle(); test_FreeDDElParam(); test_PackDDElParam();

1 0

Alexander Nicolaysen Sørnes : user menu: fix typo spotted by Ron Olgiati
by Chris Morgan 15 Oct '07

15 Oct '07

Module: appdb Branch: master Commit: 6c2a45f1067e156ffde6b6c180d0c1f31c56fa6a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6c2a45f1067e156ffde6b6c1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Oct 15 02:54:34 2007 +0200 user menu: fix typo spotted by Ron Olgiati --- include/sidebar_login.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/sidebar_login.php b/include/sidebar_login.php index 1521646..eb18ce2 100644 --- a/include/sidebar_login.php +++ b/include/sidebar_login.php @@ -52,7 +52,7 @@ function global_sidebar_login() { $iVersionsRejected = version::objectGetEntriesCount(true, true); if($iVersionsRejected && !$_SESSION['current']->hasPriv("admin")) { - $g->add("Review Rejected Versiosn ($iVersionsRejected)", + $g->add("Review Rejected Versions ($iVersionsRejected)", BASE."objectManager.php?sClass=version_queue&bIsRejected=true". "&bIsQueue=true&sTitle=Rejected+Versions", "center"); }

1 0

Gerald Pfeifer : gdi32: Avoid compiler warning in WineEngGetGlyphOutline().
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 4e60df85d87c00119d4a2af4ddc08b4b87f871e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e60df85d87c00119d4a2af4d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 14 13:52:00 2007 +0200 gdi32: Avoid compiler warning in WineEngGetGlyphOutline(). --- dlls/gdi32/freetype.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4ece12c..a79f41d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3837,10 +3837,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, mult = 16; else if(format == GGO_GRAY8_BITMAP) mult = 64; - else if(format == WINE_GGO_GRAY16_BITMAP) + else /* format == WINE_GGO_GRAY16_BITMAP */ return needed; - else - assert(0); + break; } default:

1 0