October 2009 - Wine-Commits

Juan Lang : crypt32: Add key usage extension to non-root CA certs.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: a700e0556fa5c92365809f20028b65998f121156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a700e0556fa5c92365809f200… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 20 18:02:20 2009 -0700 crypt32: Add key usage extension to non-root CA certs. --- dlls/crypt32/tests/chain.c | 72 ++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 076b8ea..1197853 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -491,7 +491,7 @@ static const BYTE chain3_0[] = { 0x36,0xe1,0xf1,0x67,0x3a,0x25,0xf3,0x47,0x83,0xce,0x4f,0xb0,0x74,0x7a,0x35, 0xa0,0x7f,0x70,0x64,0x8a,0x14,0x66,0x03,0xf6,0xae,0xdf,0x1b,0xf5,0x80,0x87, 0x06,0x39,0x76,0x70,0x7b,0xd2,0x83,0xe9,0xce,0x1f,0xf8,0x66,0xc1 }; -/* chain4_0 -> chain0_1 -> chain4_2: +/* chain4_0 -> chain4_1 -> chain4_2: * A chain whose path length constraint is violated. */ static const BYTE chain4_0[] = { @@ -525,6 +525,37 @@ static const BYTE chain4_0[] = { 0x9a,0xf6,0x1e,0x98,0x64,0x14,0x2e,0xbd,0x8a,0xaf,0xac,0x52,0xd2,0x2c,0xdd, 0xcd,0x1b,0x3d,0x28,0x43,0xea,0x25,0x91,0x15,0xb8,0x54,0x72,0x33,0xca,0xd8, 0x5f,0x06,0x4c,0x97 }; +static const BYTE chain4_1[] = { +0x30,0x82,0x01,0xb3,0x30,0x82,0x01,0x1e,0xa0,0x03,0x02,0x01,0x02,0x02,0x01, +0x01,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x30, +0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72, +0x74,0x31,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x31,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x32,0x33,0x31,0x32,0x33,0x35, +0x39,0x35,0x39,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03, +0x13,0x05,0x43,0x65,0x72,0x74,0x32,0x30,0x81,0x9d,0x30,0x0b,0x06,0x09,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x03,0x81,0x8d,0x00,0x30,0x81,0x89, +0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f,0xe5,0x33,0x0e,0x67,0x5f, +0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4,0xc6,0xdc,0xb6,0x17,0x8e, +0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5,0xa7,0x48,0x9f,0x6e,0xfe, +0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6,0x8b,0x47,0xd1,0x57,0x71, +0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf,0x6b,0x05,0x72,0xa7,0x87, +0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40,0xfc,0x6a,0x80,0x83,0x68, +0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac,0x85,0x85,0xb5,0x46,0x36, +0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23,0xb2,0xd3,0x51,0x9a,0x22, +0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98,0x72,0xa3,0x02,0x03,0x01, +0x00,0x01,0xa3,0x23,0x30,0x21,0x30,0x0e,0x06,0x03,0x55,0x1d,0x0f,0x01,0x01, +0xff,0x04,0x04,0x03,0x02,0x00,0x04,0x30,0x0f,0x06,0x03,0x55,0x1d,0x13,0x01, +0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x0b,0x06,0x09,0x2a,0x86, +0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x03,0x81,0x81,0x00,0x26,0x56,0x31,0x53, +0x65,0xe3,0xd8,0x59,0xc8,0x6f,0xa3,0x5b,0x8a,0x11,0x53,0xde,0x8d,0x6f,0x6d, +0x8c,0xe1,0x79,0x25,0xb2,0xbf,0xc6,0x3b,0xa1,0x8b,0x6b,0xcd,0x99,0xcf,0x0c, +0x6f,0xaa,0xbc,0xd0,0x3d,0xb2,0xf8,0x1c,0x6f,0xb0,0x84,0x7b,0xb1,0x88,0xec, +0xd6,0x77,0xbe,0xb1,0x0b,0x8c,0x18,0x85,0xb7,0x38,0x81,0x12,0xc9,0xc7,0x4a, +0xf6,0x83,0xc4,0xd9,0xae,0xb6,0x1d,0xbb,0xd2,0x08,0x01,0x4a,0xe1,0xdc,0x8f, +0x67,0xa9,0xed,0xe2,0x3f,0x96,0xf6,0x72,0x7e,0x4a,0x63,0x46,0xc4,0x82,0x89, +0x0a,0x81,0xc8,0x3a,0x9c,0xe7,0x23,0x5f,0x8d,0xd9,0x6c,0xb2,0x5d,0x9a,0x40, +0x04,0x04,0xd5,0x4a,0x29,0x57,0xbd,0x18,0xd8,0xca,0x1f,0xf7,0xf8,0x23,0x07, +0x4b,0x03,0xa3,0xd9 }; static const BYTE chain4_2[] = { 0x30,0x82,0x01,0x98,0x30,0x82,0x01,0x01,0xa0,0x03,0x02,0x01,0x02,0x02,0x01, 0x01,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05, @@ -619,39 +650,9 @@ static const BYTE chain5_1[] = { 0xe7,0x8b,0x3b,0x2a,0x2f,0x46,0xed,0xda,0x96,0x1a,0xc1,0x5c,0xfe,0xe0,0xef, 0xdb,0xe0,0x11,0xc4,0x56,0x12,0xe2,0x4b,0x84,0xde,0xaf,0x7f,0x3c,0x9f,0xcb, 0xb6,0xac,0x92 }; -/* chain0_0 -> chain6_1: +/* chain0_0 -> chain4_1: * A chain whose end certificate is a CA. */ -static const BYTE chain6_1[] = { -0x30,0x82,0x01,0xa9,0x30,0x82,0x01,0x12,0xa0,0x03,0x02,0x01,0x02,0x02,0x01, -0x01,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05, -0x00,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43, -0x65,0x72,0x74,0x31,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x31,0x30,0x31,0x30, -0x30,0x30,0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x32,0x33,0x31,0x32, -0x33,0x35,0x39,0x35,0x39,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55, -0x04,0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x32,0x30,0x81,0x9f,0x30,0x0d,0x06, -0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x81,0x8d, -0x00,0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f,0xe5, -0x33,0x0e,0x67,0x5f,0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4,0xc6, -0xdc,0xb6,0x17,0x8e,0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5,0xa7, -0x48,0x9f,0x6e,0xfe,0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6,0x8b, -0x47,0xd1,0x57,0x71,0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf,0x6b, -0x05,0x72,0xa7,0x87,0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40,0xfc, -0x6a,0x80,0x83,0x68,0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac,0x85, -0x85,0xb5,0x46,0x36,0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23,0xb2, -0xd3,0x51,0x9a,0x22,0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98,0x72, -0xa3,0x02,0x03,0x01,0x00,0x01,0xa3,0x13,0x30,0x11,0x30,0x0f,0x06,0x03,0x55, -0x1d,0x13,0x01,0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x0d,0x06, -0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81, -0x00,0x08,0x71,0x6d,0x6c,0xbf,0xf1,0x0f,0xe9,0x5b,0x9f,0x9c,0x9d,0xa5,0x07, -0x83,0x28,0xa1,0x05,0x0b,0x92,0x73,0xb9,0x8a,0x99,0xbe,0x1e,0x21,0x53,0x9f, -0xae,0x44,0x7b,0x89,0x09,0x36,0x4a,0xef,0xe7,0x73,0x9f,0x84,0x8d,0x9a,0xec, -0x52,0xcd,0x58,0x14,0x2d,0x22,0x5c,0x03,0x6a,0xb3,0x35,0x40,0x35,0x66,0xba, -0xc5,0xe2,0x32,0x72,0x60,0x52,0x86,0xbc,0x6a,0xc3,0x24,0x05,0x6b,0x02,0xe3, -0x70,0xa3,0xad,0x09,0x88,0x1e,0xd1,0x34,0xca,0x52,0x6a,0x55,0x38,0x88,0x60, -0xfa,0x9a,0x1f,0xe9,0x29,0x47,0x54,0x96,0x53,0x65,0x27,0xb1,0x66,0xd0,0x11, -0x1c,0xf6,0x20,0x07,0xb4,0x66,0x88,0x18,0xdc,0x0c,0x57,0x7e,0x1f,0x8a,0x49, -0x7a,0xe2,0x34,0x52,0x0b,0x46,0x6b,0xfd,0x27 }; /* chain0_0 -> chain 7_1: * A chain with a bad critical extension. */ @@ -1221,13 +1222,12 @@ static const SimpleChainStatusCheck simpleStatus3[] = { }; static CONST_DATA_BLOB chain4[] = { { sizeof(chain4_0), chain4_0 }, - { sizeof(chain0_1), chain0_1 }, + { sizeof(chain4_1), chain4_1 }, { sizeof(chain4_2), chain4_2 }, }; static const CERT_TRUST_STATUS elementStatus4[] = { { CERT_TRUST_IS_NOT_TIME_VALID, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_NOT_TIME_VALID, - CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + { CERT_TRUST_INVALID_BASIC_CONSTRAINTS, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; @@ -1249,7 +1249,7 @@ static const SimpleChainStatusCheck simpleStatus5[] = { }; static CONST_DATA_BLOB chain6[] = { { sizeof(chain0_0), chain0_0 }, - { sizeof(chain6_1), chain6_1 }, + { sizeof(chain4_1), chain4_1 }, }; static const CERT_TRUST_STATUS elementStatus6[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER },

1 0

Juan Lang : crypt32: Get CA flag from basic constraints extension of every cert in the chain.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: cbabc9d689c950f975c0f3af1b8369f2958dfbf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbabc9d689c950f975c0f3af1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 19 12:02:34 2009 -0700 crypt32: Get CA flag from basic constraints extension of every cert in the chain. --- dlls/crypt32/chain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 6c44d4c..1dc7a74 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -441,6 +441,7 @@ static BOOL CRYPT_CheckBasicConstraintsForCA(PCCERT_CONTEXT cert, if ((validBasicConstraints = CRYPT_DecodeBasicConstraints(cert, &constraints, isRoot))) { + chainConstraints->fCA = constraints.fCA; if (!constraints.fCA) { TRACE_(chain)("chain element %d can't be a CA\n", remainingCAs + 1); @@ -858,7 +859,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, PCERT_CHAIN_ELEMENT rootElement = chain->rgpElement[chain->cElement - 1]; int i; BOOL pathLengthConstraintViolated = FALSE; - CERT_BASIC_CONSTRAINTS2_INFO constraints = { TRUE, FALSE, 0 }; + CERT_BASIC_CONSTRAINTS2_INFO constraints = { FALSE, FALSE, 0 }; TRACE_(chain)("checking chain with %d elements for time %s\n", chain->cElement, debugstr_w(filetime_to_str(time)));

1 0

Juan Lang : crypt32: Check basic constraints extension for end certs too.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: f348e3feb7113dd208e05f2e6e9bace628608b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f348e3feb7113dd208e05f2e6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 20 18:00:45 2009 -0700 crypt32: Check basic constraints extension for end certs too. --- dlls/crypt32/chain.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c9f7618..6c44d4c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -905,6 +905,14 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, constraints.dwPathLenConstraint--; } } + else + { + /* Check whether end cert has a basic constraints extension */ + if (!CRYPT_DecodeBasicConstraints( + chain->rgpElement[i]->pCertContext, &constraints, FALSE)) + chain->rgpElement[i]->TrustStatus.dwErrorStatus |= + CERT_TRUST_INVALID_BASIC_CONSTRAINTS; + } if (CRYPT_IsSimpleChainCyclic(chain)) { /* If the chain is cyclic, then the path length constraints

1 0

Nikolay Sivov : user32/win: Release scroll window data on window destruction.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 77fe22b226629ddc4bd160e4e59eeae4f1a263c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77fe22b226629ddc4bd160e4e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 20 21:58:12 2009 +0400 user32/win: Release scroll window data on window destruction. --- dlls/user32/win.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 333b6b6..3e6dc37 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -769,6 +769,8 @@ LRESULT WIN_DestroyWindow( HWND hwnd ) free_dce( wndPtr->dce, hwnd ); wndPtr->dce = NULL; icon_title = wndPtr->icon_title; + HeapFree(GetProcessHeap(), 0, wndPtr->pScroll); + wndPtr->pScroll = NULL; WIN_ReleasePtr( wndPtr ); if (icon_title) DestroyWindow( icon_title );

1 0

Nikolay Sivov : comctl32/tests: Release activation context handle when we' re done with tests.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: ebea81f13135a01ca09f2beecddfdeeb2a43a5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebea81f13135a01ca09f2beec… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 20 21:57:48 2009 +0400 comctl32/tests: Release activation context handle when we're done with tests. --- dlls/comctl32/tests/header.c | 7 ++++--- dlls/comctl32/tests/imagelist.c | 5 +++-- dlls/comctl32/tests/listview.c | 7 ++++--- dlls/comctl32/tests/v6util.h | 16 +++++++++------- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3039a91..b7fe8e5 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1814,6 +1814,7 @@ START_TEST(header) { HWND parent_hwnd; ULONG_PTR ctx_cookie; + HANDLE hCtx; HWND hwnd; if (!init()) @@ -1841,7 +1842,7 @@ START_TEST(header) test_hdm_unicodeformatMessages(parent_hwnd); test_hdm_bitmapmarginMessages(parent_hwnd); - if (!load_v6_module(&ctx_cookie)) + if (!load_v6_module(&ctx_cookie, &hCtx)) { DestroyWindow(parent_hwnd); return; @@ -1856,7 +1857,7 @@ START_TEST(header) if (!IsWindow(hwnd)) { win_skip("FIXME: failed to create Header window.\n"); - unload_v6_module(ctx_cookie); + unload_v6_module(ctx_cookie, hCtx); DestroyWindow(parent_hwnd); return; } @@ -1867,7 +1868,7 @@ START_TEST(header) test_hdf_fixedwidth(parent_hwnd); test_hds_nosizing(parent_hwnd); - unload_v6_module(ctx_cookie); + unload_v6_module(ctx_cookie, hCtx); DestroyWindow(parent_hwnd); } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index da3da42..944e4ec 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1247,6 +1247,7 @@ cleanup: START_TEST(imagelist) { ULONG_PTR ctx_cookie; + HANDLE hCtx; HMODULE hComCtl32 = GetModuleHandle("comctl32.dll"); pImageList_Create = NULL; /* These are not needed for non-v6.0 tests*/ @@ -1270,7 +1271,7 @@ START_TEST(imagelist) /* Now perform v6 tests */ - if (!load_v6_module(&ctx_cookie)) + if (!load_v6_module(&ctx_cookie, &hCtx)) return; /* Reload comctl32 */ @@ -1284,5 +1285,5 @@ START_TEST(imagelist) test_ImageList_DrawIndirect(); test_shell_imagelist(); - unload_v6_module(ctx_cookie); + unload_v6_module(ctx_cookie, hCtx); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index f6c5bf9..44c5eb2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4064,6 +4064,7 @@ START_TEST(listview) BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); ULONG_PTR ctx_cookie; + HANDLE hCtx; HWND hwnd; hComctl32 = GetModuleHandleA("comctl32.dll"); @@ -4116,7 +4117,7 @@ START_TEST(listview) test_getcolumnwidth(); test_ApproximateViewRect(); - if (!load_v6_module(&ctx_cookie)) + if (!load_v6_module(&ctx_cookie, &hCtx)) { DestroyWindow(hwndparent); return; @@ -4130,7 +4131,7 @@ START_TEST(listview) if (!IsWindow(hwnd)) { win_skip("FIXME: failed to create ListView window.\n"); - unload_v6_module(ctx_cookie); + unload_v6_module(ctx_cookie, hCtx); DestroyWindow(hwndparent); return; } @@ -4144,7 +4145,7 @@ START_TEST(listview) test_scrollnotify(); test_LVS_EX_TRANSPARENTBKGND(); - unload_v6_module(ctx_cookie); + unload_v6_module(ctx_cookie, hCtx); DestroyWindow(hwndparent); } diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h index 21a8e4f..848e95b 100644 --- a/dlls/comctl32/tests/v6util.h +++ b/dlls/comctl32/tests/v6util.h @@ -56,32 +56,34 @@ static const CHAR manifest[] = "</dependency>\n" "</assembly>\n"; -static void unload_v6_module(ULONG_PTR cookie) +static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) { HANDLE hKernel32; BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); + VOID (WINAPI *pReleaseActCtx)(HANDLE); hKernel32 = GetModuleHandleA("kernel32.dll"); pDeactivateActCtx = (void*)GetProcAddress(hKernel32, "DeactivateActCtx"); - if (!pDeactivateActCtx) + pReleaseActCtx = (void*)GetProcAddress(hKernel32, "ReleaseActCtx"); + if (!pDeactivateActCtx || !pReleaseActCtx) { win_skip("Activation contexts unsupported\n"); return; } pDeactivateActCtx(0, cookie); + pReleaseActCtx(hCtx); DeleteFileA(manifest_name); } -static BOOL load_v6_module(ULONG_PTR *pcookie) +static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) { HANDLE hKernel32; HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*); BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); ACTCTXA ctx; - HANDLE hCtx; BOOL ret; HANDLE file; DWORD written; @@ -121,10 +123,10 @@ static BOOL load_v6_module(ULONG_PTR *pcookie) ctx.cbSize = sizeof(ctx); ctx.lpSource = manifest_name; - hCtx = pCreateActCtxA(&ctx); - ok(hCtx != 0, "Expected context handle\n"); + *hCtx = pCreateActCtxA(&ctx); + ok(*hCtx != 0, "Expected context handle\n"); - ret = pActivateActCtx(hCtx, pcookie); + ret = pActivateActCtx(*hCtx, pcookie); expect(TRUE, ret); if (!ret)

1 0

Nikolay Sivov : user32/edit: Properly clean up on failure inside WM_NCCREATE handler.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: e72ed1c42123b0b1b6dc6a0eaae7e80215199927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72ed1c42123b0b1b6dc6a0ea… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 20 21:56:44 2009 +0400 user32/edit: Properly clean up on failure inside WM_NCCREATE handler. --- dlls/user32/edit.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 437862b..38622cc 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4599,16 +4599,16 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode) alloc_size = ROUND_TO_GROW((es->buffer_size + 1) * sizeof(WCHAR)); if(!(es->hloc32W = LocalAlloc(LMEM_MOVEABLE | LMEM_ZEROINIT, alloc_size))) - return FALSE; + goto cleanup; es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; if (!(es->undo_text = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (es->buffer_size + 1) * sizeof(WCHAR)))) - return FALSE; + goto cleanup; es->undo_buffer_size = es->buffer_size; if (es->style & ES_MULTILINE) if (!(es->first_line_def = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINEDEF)))) - return FALSE; + goto cleanup; es->line_count = 1; /* @@ -4628,6 +4628,14 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode) SetWindowLongW(hwnd, GWL_STYLE, es->style & ~WS_BORDER); return TRUE; + +cleanup: + SetWindowLongPtrW(es->hwndSelf, 0, 0); + HeapFree(GetProcessHeap(), 0, es->first_line_def); + HeapFree(GetProcessHeap(), 0, es->undo_text); + if (es->hloc32W) LocalFree(es->hloc32W); + HeapFree(GetProcessHeap(), 0, es); + return FALSE; }

1 0

Nikolay Sivov : comctl32/header: Don't leak Imagelist handle.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 57577fb20baf58e1c7836817d5b78304e50e0544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57577fb20baf58e1c7836817d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 20 21:57:11 2009 +0400 comctl32/header: Don't leak Imagelist handle. --- dlls/comctl32/tests/header.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 283c568..3039a91 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -954,7 +954,7 @@ static void test_hdm_sethotdivider(HWND hParent) static void test_hdm_imageMessages(HWND hParent) { HIMAGELIST hImageList = ImageList_Create (4, 4, 0, 1, 0); - HIMAGELIST hImageListRetVal; + HIMAGELIST hIml; HWND hChild; flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -964,14 +964,15 @@ static void test_hdm_imageMessages(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); - hImageListRetVal = (HIMAGELIST) SendMessage(hChild, HDM_SETIMAGELIST, 0, (LPARAM) hImageList); - ok(hImageListRetVal == NULL, "Expected NULL, got %p\n", hImageListRetVal); + hIml = (HIMAGELIST) SendMessage(hChild, HDM_SETIMAGELIST, 0, (LPARAM) hImageList); + ok(hIml == NULL, "Expected NULL, got %p\n", hIml); - hImageListRetVal = (HIMAGELIST) SendMessage(hChild, HDM_GETIMAGELIST, 0, 0); - ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %p\n", hImageListRetVal); + hIml = (HIMAGELIST) SendMessage(hChild, HDM_GETIMAGELIST, 0, 0); + ok(hIml != NULL, "Expected non-NULL handle, got %p\n", hIml); - hImageListRetVal = (HIMAGELIST) SendMessage(hChild, HDM_CREATEDRAGIMAGE, 0, 0); - ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %p\n", hImageListRetVal); + hIml = (HIMAGELIST) SendMessage(hChild, HDM_CREATEDRAGIMAGE, 0, 0); + ok(hIml != NULL, "Expected non-NULL handle, got %p\n", hIml); + ImageList_Destroy(hIml); ok_sequence(sequences, HEADER_SEQ_INDEX, imageMessages_seq, "imageMessages sequence testing", FALSE);

1 0

Nikolay Sivov : user32/edit: Don't leak undo buffer.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: a60966068bcd9d7e131e741e5a13b7e4fbccedb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60966068bcd9d7e131e741e5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 20 21:56:23 2009 +0400 user32/edit: Don't leak undo buffer. --- dlls/user32/edit.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 8ad945b..437862b 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4714,7 +4714,8 @@ static LRESULT EDIT_WM_Destroy(EDITSTATE *es) pc = pp; } - SetWindowLongPtrW( es->hwndSelf, 0, 0 ); + SetWindowLongPtrW( es->hwndSelf, 0, 0 ); + HeapFree(GetProcessHeap(), 0, es->undo_text); HeapFree(GetProcessHeap(), 0, es); return 0;

1 0

Nikolay Sivov : comctl32/syslink: Implement LWS_TRANSPARENT style.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: b853de803877bd471b9a0397289be711c0fad1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b853de803877bd471b9a03972… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 20 21:54:40 2009 +0400 comctl32/syslink: Implement LWS_TRANSPARENT style. --- dlls/comctl32/syslink.c | 9 +++++++-- include/commctrl.h | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 1b940c0..a1a6039 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -94,6 +94,7 @@ typedef struct COLORREF TextColor; /* Color of the text */ COLORREF LinkColor; /* Color of links */ COLORREF VisitedColor; /* Color of visited links */ + COLORREF BackColor; /* Background color, set on creation */ WCHAR BreakChar; /* Break Character for the current font */ } SYSLINK_INFO; @@ -831,7 +832,7 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) hOldFont = SelectObject(hdc, infoPtr->Font); OldTextColor = SetTextColor(hdc, infoPtr->TextColor); - OldBkColor = SetBkColor(hdc, comctl32_color.clrBtnFace); + OldBkColor = SetBkColor(hdc, infoPtr->BackColor); GetClientRect(infoPtr->Self, &rc); rc.right -= SL_RIGHTMARGIN + SL_LEFTMARGIN; @@ -916,7 +917,7 @@ static LRESULT SYSLINK_EraseBkgnd (const SYSLINK_INFO *infoPtr, HDC hdc) RECT r; GetClientRect(infoPtr->Self, &r); - hbr = CreateSolidBrush(comctl32_color.clrBtnFace); + hbr = CreateSolidBrush(infoPtr->BackColor); FillRect(hdc, &r, hbr); DeleteObject(hbr); @@ -1749,6 +1750,8 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->TextColor = comctl32_color.clrWindowText; infoPtr->LinkColor = comctl32_color.clrHighlight; infoPtr->VisitedColor = comctl32_color.clrHighlight; + infoPtr->BackColor = infoPtr->Style & LWS_TRANSPARENT ? + comctl32_color.clrWindow : comctl32_color.clrBtnFace; infoPtr->BreakChar = ' '; TRACE("SysLink Ctrl creation, hwnd=%p\n", hwnd); SYSLINK_SetText(infoPtr, ((LPCREATESTRUCTW)lParam)->lpszName); @@ -1765,6 +1768,8 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); + if (infoPtr->Style & LWS_TRANSPARENT) + infoPtr->BackColor = comctl32_color.clrWindow; return 0; default: diff --git a/include/commctrl.h b/include/commctrl.h index b8ebe94..ffda1f1 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5052,6 +5052,9 @@ BOOL WINAPI Str_SetPtrW (LPWSTR *, LPCWSTR); static const WCHAR WC_LINK[] = { 'S','y','s','L','i','n','k',0 }; #endif +/* SysLink styles */ +#define LWS_TRANSPARENT 0x0001 + /* SysLink messages */ #define LM_HITTEST (WM_USER + 768) #define LM_GETIDEALHEIGHT (WM_USER + 769)

1 0

Nikolay Sivov : comctl32/syslink: Implement LWS_IGNORERETURN.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: e98687f42538198e3d4a37b9af7ddc1a00ab0e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98687f42538198e3d4a37b9a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 20 21:55:12 2009 +0400 comctl32/syslink: Implement LWS_IGNORERETURN. --- dlls/comctl32/syslink.c | 6 ++++-- include/commctrl.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index a1a6039..490d0ea 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -96,6 +96,7 @@ typedef struct COLORREF VisitedColor; /* Color of visited links */ COLORREF BackColor; /* Background color, set on creation */ WCHAR BreakChar; /* Break Character for the current font */ + BOOL IgnoreReturn; /* (infoPtr->Style & LWS_IGNORERETURN) on creation */ } SYSLINK_INFO; static const WCHAR SL_LINKOPEN[] = { '<','a', 0 }; @@ -1451,13 +1452,13 @@ static LRESULT SYSLINK_LButtonUp (SYSLINK_INFO *infoPtr, const POINT *pt) */ static BOOL SYSLINK_OnEnter (const SYSLINK_INFO *infoPtr) { - if(infoPtr->HasFocus) + if(infoPtr->HasFocus && !infoPtr->IgnoreReturn) { PDOC_ITEM Focus; int id; Focus = SYSLINK_GetFocusLink(infoPtr, &id); - if(Focus != NULL) + if(Focus) { SYSLINK_SendParentNotify(infoPtr, NM_RETURN, Focus, id); return TRUE; @@ -1753,6 +1754,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->BackColor = infoPtr->Style & LWS_TRANSPARENT ? comctl32_color.clrWindow : comctl32_color.clrBtnFace; infoPtr->BreakChar = ' '; + infoPtr->IgnoreReturn = infoPtr->Style & LWS_IGNORERETURN; TRACE("SysLink Ctrl creation, hwnd=%p\n", hwnd); SYSLINK_SetText(infoPtr, ((LPCREATESTRUCTW)lParam)->lpszName); return 0; diff --git a/include/commctrl.h b/include/commctrl.h index ffda1f1..23a296b 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5054,6 +5054,7 @@ static const WCHAR WC_LINK[] = { 'S','y','s','L','i','n','k',0 }; /* SysLink styles */ #define LWS_TRANSPARENT 0x0001 +#define LWS_IGNORERETURN 0x0002 /* SysLink messages */ #define LM_HITTEST (WM_USER + 768)

1 0