October 2009 - Wine-Commits

Nikolay Sivov : comctl32/listview: Don't query header if it isn't created.
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: aaec03347d3ab19d8322742095f66e257647f4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaec03347d3ab19d832274209… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 22 00:29:00 2009 +0400 comctl32/listview: Don't query header if it isn't created. --- dlls/comctl32/listview.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3744e10..4ec8628 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10326,19 +10326,23 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) } else if (infoPtr->uView == LV_VIEW_DETAILS) { - HDLAYOUT hl; - WINDOWPOS wp; - - hl.prc = &infoPtr->rcList; - hl.pwpos = &wp; - SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); - TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); - SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, - wp.flags | ((infoPtr->dwStyle & LVS_NOCOLUMNHEADER) - ? SWP_HIDEWINDOW : SWP_SHOWWINDOW)); - TRACE(" after SWP wp=%d,%d (%dx%d)\n", wp.x, wp.y, wp.cx, wp.cy); - - infoPtr->rcList.top = max(wp.cy, 0); + /* if control created invisible header isn't created */ + if (infoPtr->hwndHeader) + { + HDLAYOUT hl; + WINDOWPOS wp; + + hl.prc = &infoPtr->rcList; + hl.pwpos = &wp; + SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); + TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); + SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, + wp.flags | ((infoPtr->dwStyle & LVS_NOCOLUMNHEADER) + ? SWP_HIDEWINDOW : SWP_SHOWWINDOW)); + TRACE(" after SWP wp=%d,%d (%dx%d)\n", wp.x, wp.y, wp.cx, wp.cy); + + infoPtr->rcList.top = max(wp.cy, 0); + } infoPtr->rcList.top += (infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) ? 2 : 0; }

1 0

Julius Schwartzenberg : user32/tests: Test extra value of standard dialog and edit classes.
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: 9f548bd9b85995a6edd5c1ba392abdeb7934d12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f548bd9b85995a6edd5c1ba3… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun Oct 11 15:32:15 2009 +0200 user32/tests: Test extra value of standard dialog and edit classes. --- dlls/user32/tests/class.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 0e7b0e4..7b42ce3 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -831,10 +831,42 @@ static void CreateDialogParamTest(HINSTANCE hInstance) } } +static const struct +{ + const char name[9]; + int value; + int badvalue; +} extra_values[] = +{ + {"#32770",30,30}, /* Dialog */ +#ifdef _WIN64 + {"Edit",8,8}, +#else + {"Edit",6,8}, /* Windows XP 64-bit returns 8 also to 32-bit applications */ +#endif +}; + +static void test_extra_values(void) +{ + int i; + for(i=0; i< sizeof(extra_values)/sizeof(extra_values[0]); i++) + { + WNDCLASSEX wcx; + BOOL ret = GetClassInfoEx(NULL,extra_values[i].name,&wcx); + + ok( ret, "GetClassInfo (0) failed for global class %s\n", extra_values[i].name); + if (!ret) continue; + ok(extra_values[i].value == wcx.cbWndExtra || broken(extra_values[i].badvalue == wcx.cbWndExtra), + "expected %d, got %d\n", extra_values[i].value, wcx.cbWndExtra); + } +} + START_TEST(class) { HANDLE hInstance = GetModuleHandleA( NULL ); + test_extra_values(); + if (!GetModuleHandleW(0)) { trace("Class test is incompatible with Win9x implementation, skipping\n");

1 0

Alexandre Julliard : advapi32: Fix lookup of the current user SID in SetEntriesInAclW.
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: 104a0f5439c941c5a052de28c40fd6613cdf99c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=104a0f5439c941c5a052de28c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 13:19:31 2009 +0200 advapi32: Fix lookup of the current user SID in SetEntriesInAclW. --- dlls/advapi32/security.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f89c12f..ba90ad0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3507,8 +3507,15 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, DWORD sid_size = FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]); DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1; SID_NAME_USE use; - if ( strcmpW( pEntries[i].Trustee.ptstrName, CURRENT_USER ) && - !LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) + if (!strcmpW( pEntries[i].Trustee.ptstrName, CURRENT_USER )) + { + if (!lookup_user_account_name( ppsid[i], &sid_size, NULL, &domain_size, &use )) + { + ret = GetLastError(); + goto exit; + } + } + else if (!LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) { WARN("bad user name %s for trustee %d\n", debugstr_w(pEntries[i].Trustee.ptstrName), i); ret = ERROR_INVALID_PARAMETER;

1 0

Nikolay Sivov : comctl32/listview: Free ID array when removing all items.
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: cd7cfd7451ba12da1b51a57caa8342ed589904c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7cfd7451ba12da1b51a57ca… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 22 02:25:04 2009 +0400 comctl32/listview: Free ID array when removing all items. --- dlls/comctl32/listview.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ea79b38..a97fc46 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5004,6 +5004,8 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) HDPA hdpaSubItems = NULL; BOOL bSuppress; ITEMHDR *hdrItem; + ITEM_INFO *lpItem; + ITEM_ID *lpID; INT i, j; TRACE("()\n"); @@ -5025,13 +5027,20 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) { if (!(infoPtr->dwStyle & LVS_OWNERDATA)) { - /* send LVN_DELETEITEM notification, if not suppressed - and if it is not a virtual listview */ - if (!bSuppress) notify_deleteitem(infoPtr, i); - hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, i); + /* send LVN_DELETEITEM notification, if not suppressed + and if it is not a virtual listview */ + if (!bSuppress) notify_deleteitem(infoPtr, i); + hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, i); + lpItem = DPA_GetPtr(hdpaSubItems, 0); + /* free id struct */ + j = DPA_GetPtrIndex(infoPtr->hdpaItemIds, lpItem->id); + lpID = DPA_GetPtr(infoPtr->hdpaItemIds, j); + DPA_DeletePtr(infoPtr->hdpaItemIds, j); + Free(lpID); + /* both item and subitem start with ITEMHDR header */ for (j = 0; j < DPA_GetPtrCount(hdpaSubItems); j++) { - hdrItem = DPA_GetPtr(hdpaSubItems, j); + hdrItem = DPA_GetPtr(hdpaSubItems, j); if (is_textW(hdrItem->pszText)) Free(hdrItem->pszText); Free(hdrItem); }

1 0

Nikolay Sivov : comctl32/listview: Free column data on control destruction.
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: 7301ec8aa87ba08787045ca227325dfebfe1dfb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7301ec8aa87ba08787045ca22… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 22 01:12:05 2009 +0400 comctl32/listview: Free column data on control destruction. --- dlls/comctl32/listview.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4ec8628..ea79b38 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9634,6 +9634,8 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT */ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) { + INT i; + TRACE("()\n"); /* delete all items */ @@ -9644,6 +9646,9 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) DPA_Destroy(infoPtr->hdpaItemIds); DPA_Destroy(infoPtr->hdpaPosX); DPA_Destroy(infoPtr->hdpaPosY); + /* columns */ + for (i = 0; i < DPA_GetPtrCount(infoPtr->hdpaColumns); i++) + Free(DPA_GetPtr(infoPtr->hdpaColumns, i)); DPA_Destroy(infoPtr->hdpaColumns); ranges_destroy(infoPtr->selectionRanges);

1 0

Nikolay Sivov : comctl32: Fix imagelist leak when switching LVS_EX_CHECKBOXES style.
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: a061d3a0d4e5e81af6236225486e12b1779c1f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a061d3a0d4e5e81af62362254… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 22 04:56:47 2009 +0400 comctl32: Fix imagelist leak when switching LVS_EX_CHECKBOXES style. --- dlls/comctl32/listview.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a97fc46..952c589 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7932,10 +7932,18 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM LISTVIEW_SetItemState(infoPtr, -1, &item); himl = LISTVIEW_CreateCheckBoxIL(infoPtr); + if(!(infoPtr->dwStyle & LVS_SHAREIMAGELISTS)) + ImageList_Destroy(infoPtr->himlState); } - LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl); + himl = LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl); + /* checkbox list replaces prevous custom list or... */ + if(((infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) && + !(infoPtr->dwStyle & LVS_SHAREIMAGELISTS)) || + /* ...previous was checkbox list */ + (dwOldExStyle & LVS_EX_CHECKBOXES)) + ImageList_Destroy(himl); } - + if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_HEADERDRAGDROP) { DWORD dwStyle; @@ -9664,12 +9672,9 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) /* destroy image lists */ if (!(infoPtr->dwStyle & LVS_SHAREIMAGELISTS)) { - if (infoPtr->himlNormal) - ImageList_Destroy(infoPtr->himlNormal); - if (infoPtr->himlSmall) - ImageList_Destroy(infoPtr->himlSmall); - if (infoPtr->himlState) - ImageList_Destroy(infoPtr->himlState); + ImageList_Destroy(infoPtr->himlNormal); + ImageList_Destroy(infoPtr->himlSmall); + ImageList_Destroy(infoPtr->himlState); } /* destroy font, bkgnd brush */

1 0

Julius Schwartzenberg : user32: Change extra value for standard edit class to 6.
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: 8e899e0076bb88c6b1f3439a8daf90f05fa728cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e899e0076bb88c6b1f3439a8… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun Oct 11 15:27:44 2009 +0200 user32: Change extra value for standard edit class to 6. Civilization II crashes when trying to display an edit box when this value is anything other than six. It crashes in exactly the same way on Windows XP 64-bit. --- dlls/user32/edit.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 38622cc..190e9c6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5425,7 +5425,11 @@ const struct builtin_class_descr EDIT_builtin_class = CS_DBLCLKS | CS_PARENTDC, /* style */ EditWndProcA, /* procA */ EditWndProcW, /* procW */ +#ifdef _WIN64 sizeof(EDITSTATE *), /* extra */ +#else + sizeof(EDITSTATE *) + sizeof(HANDLE16), /* extra */ +#endif IDC_IBEAM, /* cursor */ 0 /* brush */ };

1 0

Juan Lang : rsaenh: Revert part of d3c482250a8232e9657ecefb3e61fff0194e3fbe .
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: 9d9ae93a5848da95ff5932d6f75701194ea3b4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9ae93a5848da95ff5932d6f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 21 13:47:27 2009 -0700 rsaenh: Revert part of d3c482250a8232e9657ecefb3e61fff0194e3fbe. --- dlls/advapi32/tests/crypt.c | 1 - dlls/rsaenh/rsaenh.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 35ce974..0b3f90f 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -988,7 +988,6 @@ static void test_rc2_keylen(void) ret = pCryptImportKey(provider, (BYTE*)&key_blob, sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, 0, &hkey); - todo_wine ok(!ret && GetLastError() == NTE_BAD_DATA, "expected NTE_BAD_DATA, got %08x\n", GetLastError()); /* but importing an 8-bit (7-byte) key does.. */ diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index a6c852a..4f13c17 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -159,7 +159,7 @@ typedef struct tagKEYCONTAINER static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = { { - {CALG_RC2, 40, 5, 128,0, 4,"RC2", 24,"RSA Data Security's RC2"}, + {CALG_RC2, 40, 40, 56,0, 4,"RC2", 24,"RSA Data Security's RC2"}, {CALG_RC4, 40, 40, 56,0, 4,"RC4", 24,"RSA Data Security's RC4"}, {CALG_DES, 56, 56, 56,0, 4,"DES", 31,"Data Encryption Standard (DES)"}, {CALG_SHA, 160,160, 160,CRYPT_FLAG_SIGNING, 6,"SHA-1", 30,"Secure Hash Algorithm (SHA-1)"}, @@ -826,7 +826,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK { TRACE("key len %d out of bounds (%d, %d)\n", dwKeyLen, peaAlgidInfo->dwMinLen, peaAlgidInfo->dwMaxLen); - SetLastError(NTE_BAD_FLAGS); + SetLastError(NTE_BAD_DATA); return (HCRYPTKEY)INVALID_HANDLE_VALUE; } }

1 0

Juan Lang : rsaenh: Add more tests of the RC2 key length.
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: a1502846af3d93564d460aab4ec9afe048359b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1502846af3d93564d460aab4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 21 13:33:18 2009 -0700 rsaenh: Add more tests of the RC2 key length. --- dlls/advapi32/tests/crypt.c | 84 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index e4b5934..022d3e6 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -939,13 +939,13 @@ static const unsigned char key[key_length] = { 0xbf, 0xf6, 0x83, 0x4b, 0x3e, 0xa3, 0x23, 0xdd, 0x96, 0x78, 0x70, 0x8e, 0xa1, 0x9d, 0x3b, 0x40 }; -static void hashtest(void) +static void test_rc2_keylen(void) { struct KeyBlob { BLOBHEADER header; DWORD key_size; - BYTE key_data[key_length]; + BYTE key_data[2048]; } key_blob; HCRYPTPROV provider; @@ -961,20 +961,92 @@ static void hashtest(void) key_blob.header.bVersion = CUR_BLOB_VERSION; key_blob.header.reserved = 0; key_blob.header.aiKeyAlg = CALG_RC2; - key_blob.key_size = key_length; + key_blob.key_size = sizeof(key); memcpy(key_blob.key_data, key, key_length); + /* Importing a 16-byte key works with the default provider. */ SetLastError(0xdeadbeef); ret = pCryptImportKey(provider, (BYTE*)&key_blob, - sizeof(BLOBHEADER)+sizeof(DWORD)+key_length, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), - "CryptImportKey error %u\n", GetLastError()); + "CryptImportKey error %08x\n", GetLastError()); pCryptDestroyKey(hkey); pCryptReleaseContext(provider, 0); + + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextA(&provider, NULL, MS_DEF_PROV, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContext error %08x\n", GetLastError()); + + /* Importing a 16-byte key doesn't work with the base provider.. */ + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, 0, &hkey); + todo_wine + ok(!ret && GetLastError() == NTE_BAD_DATA, + "expected NTE_BAD_DATA, got %08x\n", GetLastError()); + /* but importing an 8-bit (7-byte) key does.. */ + key_blob.key_size = 7; + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, 0, &hkey); + ok(ret, "CryptAcquireContext error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + /* as does importing a 16-byte key with the base provider when + * CRYPT_IPSEC_HMAC_KEY is specified. + */ + key_blob.key_size = sizeof(key); + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + + pCryptReleaseContext(provider, 0); + + key_blob.key_size = sizeof(key); + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextA(&provider, NULL, NULL, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContext error %08x\n", GetLastError()); + + /* Importing a 16-byte key also works with the default provider when + * CRYPT_IPSEC_HMAC_KEY is specified. + */ + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + + /* There is no apparent limit to the size of the input key when + * CRYPT_IPSEC_HMAC_KEY is specified. + */ + key_blob.key_size = sizeof(key_blob.key_data); + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + todo_wine + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + + pCryptReleaseContext(provider, 0); } START_TEST(crypt) @@ -982,7 +1054,7 @@ START_TEST(crypt) init_function_pointers(); if (pCryptAcquireContextA && pCryptReleaseContext) { - hashtest(); + test_rc2_keylen(); init_environment(); test_acquire_context(); test_incorrect_api_usage();

1 0

Henri Verbeet : d3d9: Free "elements" in a vertexdeclaration_init() error path (Valgrind).
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: 66961840a5447af4e584acaa5b26a02bcf58f928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66961840a5447af4e584acaa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:57 2009 +0200 d3d9: Free "elements" in a vertexdeclaration_init() error path (Valgrind). --- dlls/d3d9/vertexdeclaration.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 9cb0528..cd0829f 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -405,6 +405,7 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, HeapFree(GetProcessHeap(), 0, wined3d_elements); if (FAILED(hr)) { + HeapFree(GetProcessHeap(), 0, declaration->elements); WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); return hr; }

1 0