wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Nikolay Sivov : comctl32/tests: Release Imagelist handles when no needed anymore.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: eaa939e9425e5903f26535a0e7015d4b6bc1f232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa939e9425e5903f26535a0e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 24 19:33:36 2009 +0400 comctl32/tests: Release Imagelist handles when no needed anymore. --- dlls/comctl32/tests/toolbar.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 3b3708b..41f4f2d 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -373,6 +373,8 @@ static void test_add_bitmap(void) addbmp.hInst = HINST_COMMCTRL; addbmp.nID = IDB_STD_SMALL_COLOR; rebuild_toolbar(&hToolbar); + ImageList_Destroy(himl); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(15, 16, 16); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(23, 22), "%x"); @@ -980,6 +982,7 @@ static void test_sizes(void) rebuild_toolbar(&hToolbar); ImageList_Destroy(himl); + ImageList_Destroy(himl2); SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 39), "Unexpected button size\n");

1 0

Nikolay Sivov : comctl32/toolbar: Don't leak button strings.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 31ae6a902ea8ba0dff214e207801216dd8bb1b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ae6a902ea8ba0dff214e207… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 24 18:18:19 2009 +0400 comctl32/toolbar: Don't leak button strings. --- dlls/comctl32/toolbar.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d05a40d..b485f04 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -315,6 +315,11 @@ TOOLBAR_DumpToolbar(const TOOLBAR_INFO *iP, INT line) } } +static inline BOOL +TOOLBAR_ButtonHasString(const TBUTTON_INFO *btnPtr) +{ + return HIWORD(btnPtr->iString) && btnPtr->iString != -1; +} /*********************************************************************** * TOOLBAR_CheckStyle @@ -3203,6 +3208,8 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) if (infoPtr->nNumButtons == 1) { TRACE(" simple delete!\n"); + if (TOOLBAR_ButtonHasString(infoPtr->buttons)) + Free((LPWSTR)infoPtr->buttons[0].iString); Free (infoPtr->buttons); infoPtr->buttons = NULL; infoPtr->nNumButtons = 0; @@ -3223,6 +3230,8 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) (infoPtr->nNumButtons - nIndex) * sizeof(TBUTTON_INFO)); } + if (TOOLBAR_ButtonHasString(oldButtons)) + Free((LPWSTR)oldButtons->iString); Free (oldButtons); } @@ -4331,11 +4340,10 @@ TOOLBAR_SetButtonInfoA (TOOLBAR_INFO *infoPtr, INT Id, const TBBUTTONINFOA *lptb btnPtr->fsStyle = lptbbi->fsStyle; if ((lptbbi->dwMask & TBIF_TEXT) && ((INT_PTR)lptbbi->pszText != -1)) { - if ((HIWORD(btnPtr->iString) == 0) || (btnPtr->iString == -1)) - /* iString is index, zero it to make Str_SetPtr succeed */ - btnPtr->iString=0; + /* iString is index, zero it to make Str_SetPtr succeed */ + if (!TOOLBAR_ButtonHasString(btnPtr)) btnPtr->iString = 0; - Str_SetPtrAtoW ((LPWSTR *)&btnPtr->iString, lptbbi->pszText); + Str_SetPtrAtoW ((LPWSTR *)&btnPtr->iString, lptbbi->pszText); } /* save the button rect to see if we need to redraw the whole toolbar */ @@ -4382,9 +4390,9 @@ TOOLBAR_SetButtonInfoW (TOOLBAR_INFO *infoPtr, INT Id, const TBBUTTONINFOW *lptb btnPtr->fsStyle = lptbbi->fsStyle; if ((lptbbi->dwMask & TBIF_TEXT) && ((INT_PTR)lptbbi->pszText != -1)) { - if ((HIWORD(btnPtr->iString) == 0) || (btnPtr->iString == -1)) - /* iString is index, zero it to make Str_SetPtr succeed */ - btnPtr->iString=0; + /* iString is index, zero it to make Str_SetPtr succeed */ + if (!TOOLBAR_ButtonHasString(btnPtr)) btnPtr->iString = 0; + Str_SetPtrW ((LPWSTR *)&btnPtr->iString, lptbbi->pszText); } @@ -5222,6 +5230,8 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) static LRESULT TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) { + INT i; + /* delete tooltip control */ if (infoPtr->hwndToolTip) DestroyWindow (infoPtr->hwndToolTip); @@ -5231,11 +5241,13 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) Free (infoPtr->bitmaps); /* bitmaps list */ /* delete button data */ + for (i = 0; i < infoPtr->nNumButtons; i++) + if (TOOLBAR_ButtonHasString(&infoPtr->buttons[i])) + Free ((LPWSTR)infoPtr->buttons[i].iString); Free (infoPtr->buttons); /* delete strings */ if (infoPtr->strings) { - INT i; for (i = 0; i < infoPtr->nNumStrings; i++) Free (infoPtr->strings[i]);

1 0

Jeremy White : oleaut32: Implement the ability to marshall VT_CARRAY' s of user defined types.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: b8d7088e88d7c077c0c4ad1b2c4d7f3503e2806a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d7088e88d7c077c0c4ad1b2… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Sat Oct 24 17:29:02 2009 -0500 oleaut32: Implement the ability to marshall VT_CARRAY's of user defined types. --- dlls/oleaut32/tests/tmarshal.c | 2 -- dlls/oleaut32/tmarshal.c | 5 +++-- dlls/oleaut32/typelib.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 9b14613..c9ea77d 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1078,9 +1078,7 @@ static void test_typelibmarshal(void) mystruct = MYSTRUCT_BYPTR; memcpy(mystructArray, MYSTRUCT_ARRAY, sizeof(mystructArray)); hr = IWidget_StructArgs(pWidget, MYSTRUCT_BYVAL, &mystruct, mystructArray); - todo_wine { ok_ole_success(hr, IWidget_StructArgs); - } /* call Clone */ dispparams.cNamedArgs = 0; diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index e7d7b89..b3d1734 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -888,7 +888,7 @@ serialize_param( if (debugout) TRACE_(olerelay)("(vt %s)",debugstr_vt(adesc->tdescElem.vt)); if (debugout) TRACE_(olerelay)("["); for (i=0;i<arrsize;i++) { - hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)arg+i*_xsize(&adesc->tdescElem, tinfo)), buf); + hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)(*arg)+i*_xsize(&adesc->tdescElem, tinfo)), buf); if (hres) return hres; if (debugout && (i<arrsize-1)) TRACE_(olerelay)(","); @@ -1247,6 +1247,7 @@ deserialize_param( if (adesc->cDims > 1) FIXME("cDims > 1 in VT_CARRAY. Does it work?\n"); for (i=0;i<adesc->cDims;i++) arrsize *= adesc->rgbounds[i].cElements; + *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo) * arrsize); for (i=0;i<arrsize;i++) deserialize_param( tinfo, @@ -1254,7 +1255,7 @@ deserialize_param( debugout, alloc, &adesc->tdescElem, - (DWORD*)((LPBYTE)(arg)+i*_xsize(&adesc->tdescElem, tinfo)), + (DWORD*)((LPBYTE)(*arg)+i*_xsize(&adesc->tdescElem, tinfo)), buf ); return S_OK; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0bd9b19..9e25e77 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2947,7 +2947,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) if(td[1]<0) pTypeLibImpl->pTypeDesc[i].u.lpadesc->tdescElem.vt = td[0] & VT_TYPEMASK; else - pTypeLibImpl->pTypeDesc[i].u.lpadesc->tdescElem = stndTypeDesc[td[0]/8]; + pTypeLibImpl->pTypeDesc[i].u.lpadesc->tdescElem = cx.pLibInfo->pTypeDesc[td[0]/(2*sizeof(INT))]; pTypeLibImpl->pTypeDesc[i].u.lpadesc->cDims = td[2];

1 0

Jeremy White : oleaut32: StructArg tests cannot rely on an unpacked structure memcmp.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 1e0b8367124c8a10648f665ff6edb9d8d3c92788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0b8367124c8a10648f665ff… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Sat Oct 24 17:13:17 2009 -0500 oleaut32: StructArg tests cannot rely on an unpacked structure memcmp. --- dlls/oleaut32/tests/tmarshal.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index b73a0da..9b14613 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -521,9 +521,18 @@ static HRESULT WINAPI Widget_StructArgs( MYSTRUCT *byptr, MYSTRUCT arr[5]) { - ok(memcmp(&byval, &MYSTRUCT_BYVAL, sizeof(MYSTRUCT))==0, "Struct parameter passed by value corrupted\n"); - ok(memcmp(byptr, &MYSTRUCT_BYPTR, sizeof(MYSTRUCT))==0, "Struct parameter passed by pointer corrupted\n"); - ok(memcmp(arr, MYSTRUCT_ARRAY, sizeof(MYSTRUCT_ARRAY))==0, "Array of structs corrupted\n"); + int i, diff = 0; + ok(byval.field1 == MYSTRUCT_BYVAL.field1 && + byval.field2 == MYSTRUCT_BYVAL.field2, + "Struct parameter passed by value corrupted\n"); + ok(byptr->field1 == MYSTRUCT_BYPTR.field1 && + byptr->field2 == MYSTRUCT_BYPTR.field2, + "Struct parameter passed by pointer corrupted\n"); + for (i = 0; i < 5; i++) + if (arr[i].field1 != MYSTRUCT_ARRAY[i].field1 || + arr[i].field2 != MYSTRUCT_ARRAY[i].field2) + diff++; + ok(diff == 0, "Array of structs corrupted\n"); return S_OK; }

1 0

Vincent Povirk : ole32: Don' t use IEnumSTATSTG to search for elements of storages.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: ee6856d874d687c4504914e61bcde3e6b8823bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6856d874d687c4504914e61… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Oct 23 13:57:42 2009 -0500 ole32: Don't use IEnumSTATSTG to search for elements of storages. We use it to do a linear search of a binary tree, which is overkill. Replace it with a simple binary search. --- dlls/ole32/storage32.c | 181 ++++++++++++++++++------------------------------ 1 files changed, 68 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee6856d874d687c450491…

1 0

Vincent Povirk : ole32: Rename previous/nextProperty to left/rightChild.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: dce1ec06c8f034480abc775b13ef520af2555e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce1ec06c8f034480abc775b1… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Oct 23 13:36:59 2009 -0500 ole32: Rename previous/nextProperty to left/rightChild. These fields are used to build a binary tree of elements in a storage. This should make the usage clearer. --- dlls/ole32/storage32.c | 116 ++++++++++++++++++++++++------------------------ dlls/ole32/storage32.h | 8 ++-- 2 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dce1ec06c8f034480abc7…

1 0

Vincent Povirk : ole32: Clarify the timestamp fields in StgProperty.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 224ddb50f325d558d3e4a2f419484f1f30ba1b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=224ddb50f325d558d3e4a2f41… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Oct 23 13:29:56 2009 -0500 ole32: Clarify the timestamp fields in StgProperty. According to the MS spec, these are FILETIME structures containing creation and modification times. --- dlls/ole32/storage32.c | 50 +++++++++++++++++++++-------------------------- dlls/ole32/storage32.h | 14 +++++------- 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b9c2f29..32ff8b6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -773,10 +773,8 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( renamedProperty.dirProperty = currentProperty.dirProperty; /* call CoFileTime to get the current time - renamedProperty.timeStampS1 - renamedProperty.timeStampD1 - renamedProperty.timeStampS2 - renamedProperty.timeStampD2 + renamedProperty.ctime + renamedProperty.mtime renamedProperty.propertyUniqueID */ @@ -967,10 +965,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( newStreamProperty.dirProperty = PROPERTY_NULL; /* call CoFileTime to get the current time - newStreamProperty.timeStampS1 - newStreamProperty.timeStampD1 - newStreamProperty.timeStampS2 - newStreamProperty.timeStampD2 + newStreamProperty.ctime + newStreamProperty.mtime */ /* newStreamProperty.propertyUniqueID */ @@ -1167,10 +1163,8 @@ static HRESULT WINAPI StorageImpl_CreateStorage( newProperty.dirProperty = PROPERTY_NULL; /* call CoFileTime to get the current time - newProperty.timeStampS1 - newProperty.timeStampD1 - newProperty.timeStampS2 - newProperty.timeStampD2 + newProperty.ctime + newProperty.mtime */ /* newStorageProperty.propertyUniqueID */ @@ -3234,23 +3228,23 @@ BOOL StorageImpl_ReadProperty( StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSS1, - &buffer->timeStampS1); + OFFSET_PS_CTIMELOW, + &buffer->ctime.dwLowDateTime); StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSD1, - &buffer->timeStampD1); + OFFSET_PS_CTIMEHIGH, + &buffer->ctime.dwHighDateTime); StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSS2, - &buffer->timeStampS2); + OFFSET_PS_MTIMELOW, + &buffer->mtime.dwLowDateTime); StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSD2, - &buffer->timeStampD2); + OFFSET_PS_MTIMEHIGH, + &buffer->mtime.dwHighDateTime); StorageUtl_ReadDWord( currentProperty, @@ -3320,23 +3314,23 @@ BOOL StorageImpl_WriteProperty( StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSS1, - buffer->timeStampS1); + OFFSET_PS_CTIMELOW, + buffer->ctime.dwLowDateTime); StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSD1, - buffer->timeStampD1); + OFFSET_PS_CTIMEHIGH, + buffer->ctime.dwHighDateTime); StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSS2, - buffer->timeStampS2); + OFFSET_PS_MTIMELOW, + buffer->mtime.dwLowDateTime); StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSD2, - buffer->timeStampD2); + OFFSET_PS_MTIMEHIGH, + buffer->ctime.dwHighDateTime); StorageUtl_WriteDWord( currentProperty, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index fc4af32..a1b7ac5 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -58,10 +58,10 @@ static const ULONG OFFSET_PS_PREVIOUSPROP = 0x00000044; static const ULONG OFFSET_PS_NEXTPROP = 0x00000048; static const ULONG OFFSET_PS_DIRPROP = 0x0000004C; static const ULONG OFFSET_PS_GUID = 0x00000050; -static const ULONG OFFSET_PS_TSS1 = 0x00000064; -static const ULONG OFFSET_PS_TSD1 = 0x00000068; -static const ULONG OFFSET_PS_TSS2 = 0x0000006C; -static const ULONG OFFSET_PS_TSD2 = 0x00000070; +static const ULONG OFFSET_PS_CTIMELOW = 0x00000064; +static const ULONG OFFSET_PS_CTIMEHIGH = 0x00000068; +static const ULONG OFFSET_PS_MTIMELOW = 0x0000006C; +static const ULONG OFFSET_PS_MTIMEHIGH = 0x00000070; static const ULONG OFFSET_PS_STARTBLOCK = 0x00000074; static const ULONG OFFSET_PS_SIZE = 0x00000078; static const WORD DEF_BIG_BLOCK_SIZE_BITS = 0x0009; @@ -136,10 +136,8 @@ struct StgProperty ULONG nextProperty; ULONG dirProperty; GUID propertyUniqueID; - ULONG timeStampS1; - ULONG timeStampD1; - ULONG timeStampS2; - ULONG timeStampD2; + FILETIME ctime; + FILETIME mtime; ULONG startingBlock; ULARGE_INTEGER size; };

1 0

Eric Pouech : msvfw32: Remove 16bit driver references ( now that they no longer exist in winmm).
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 70d43eb0477d18a78deecbc53fab661e609c0186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d43eb0477d18a78deecbc53… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 23 20:59:32 2009 +0200 msvfw32: Remove 16bit driver references (now that they no longer exist in winmm). --- dlls/msvfw32/msvideo_main.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 5217c58..ae8d6d2 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -394,7 +394,6 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) ICOPEN icopen; HDRVR hdrv; WINE_HIC* whic; - BOOL bIs16; static const WCHAR drv32W[] = {'d','r','i','v','e','r','s','3','2','\0'}; reg_driver* driver; @@ -442,14 +441,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) if (!hdrv) return 0; } - bIs16 = GetDriverFlags(hdrv) & 0x10000000; /* undocumented flag: WINE_GDF_16BIT */ - if (bIs16) - { - FIXME("Got a 16 bit driver, but no 16 bit support in msvfw\n"); - CloseDriver(hdrv, 0, 0); - return 0; - } whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC)); if (!whic) {

1 0

Juan Lang : crypt32: Fix a test failure on systems with no c: drive.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 89c009a063a69b1868f200455fbe4f822eace02e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c009a063a69b1868f200455… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 22 15:02:29 2009 -0700 crypt32: Fix a test failure on systems with no c: drive. --- dlls/crypt32/tests/sip.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 372d7ce..8d9af75 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -181,8 +181,10 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(deadbeef, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); - ok (GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d.\n", GetLastError()); + ok (GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_PATH_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND or ERROR_PATH_NOT_FOUND, got %d.\n", + GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), "Expected a NULL GUID for c:\\deadbeef.dbf, not %s\n", show_guid(&subject, guid1));

1 0

Juan Lang : crypt32: Move tracing of key usage extension to common extension tracing location.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: cf9491a5a342796f453c483289f69547259433b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9491a5a342796f453c48328… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 09:57:04 2009 -0700 crypt32: Move tracing of key usage extension to common extension tracing location. --- dlls/crypt32/chain.c | 51 ++++++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 0490723..ccb3dc7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -755,12 +755,41 @@ static void dump_basic_constraints2(const CERT_EXTENSION *ext) } } +static void dump_key_usage(const CERT_EXTENSION *ext) +{ + CRYPT_BIT_BLOB usage; + DWORD size = sizeof(usage); + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_BITS, ext->Value.pbData, + ext->Value.cbData, CRYPT_DECODE_NOCOPY_FLAG, NULL, &usage, &size)) + { +#define trace_usage_bit(bits, bit) \ + if ((bits) & (bit)) TRACE_(chain)("%s\n", #bit) + if (usage.cbData) + { + trace_usage_bit(usage.pbData[0], CERT_DIGITAL_SIGNATURE_KEY_USAGE); + trace_usage_bit(usage.pbData[0], CERT_NON_REPUDIATION_KEY_USAGE); + trace_usage_bit(usage.pbData[0], CERT_KEY_ENCIPHERMENT_KEY_USAGE); + trace_usage_bit(usage.pbData[0], CERT_DATA_ENCIPHERMENT_KEY_USAGE); + trace_usage_bit(usage.pbData[0], CERT_KEY_AGREEMENT_KEY_USAGE); + trace_usage_bit(usage.pbData[0], CERT_KEY_CERT_SIGN_KEY_USAGE); + trace_usage_bit(usage.pbData[0], CERT_CRL_SIGN_KEY_USAGE); + trace_usage_bit(usage.pbData[0], CERT_ENCIPHER_ONLY_KEY_USAGE); + } +#undef trace_usage_bit + if (usage.cbData > 1 && usage.pbData[1] & CERT_DECIPHER_ONLY_KEY_USAGE) + TRACE_(chain)("CERT_DECIPHER_ONLY_KEY_USAGE\n"); + } +} + static void dump_extension(const CERT_EXTENSION *ext) { TRACE_(chain)("%s (%scritical)\n", debugstr_a(ext->pszObjId), ext->fCritical ? "" : "not "); if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS)) dump_basic_constraints(ext); + else if (!strcmp(ext->pszObjId, szOID_KEY_USAGE)) + dump_key_usage(ext); else if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS2)) dump_basic_constraints2(ext); } @@ -815,26 +844,6 @@ static void dump_element(PCCERT_CONTEXT cert) dump_extension(&cert->pCertInfo->rgExtension[i]); } -static void trace_usage(const CRYPT_BIT_BLOB *usage) -{ -#define trace_usage_bit(bits, bit) \ - if ((bits) & (bit)) TRACE_(chain)("%s\n", #bit) - if (usage->cbData) - { - trace_usage_bit(usage->pbData[0], CERT_DIGITAL_SIGNATURE_KEY_USAGE); - trace_usage_bit(usage->pbData[0], CERT_NON_REPUDIATION_KEY_USAGE); - trace_usage_bit(usage->pbData[0], CERT_KEY_ENCIPHERMENT_KEY_USAGE); - trace_usage_bit(usage->pbData[0], CERT_DATA_ENCIPHERMENT_KEY_USAGE); - trace_usage_bit(usage->pbData[0], CERT_KEY_AGREEMENT_KEY_USAGE); - trace_usage_bit(usage->pbData[0], CERT_KEY_CERT_SIGN_KEY_USAGE); - trace_usage_bit(usage->pbData[0], CERT_CRL_SIGN_KEY_USAGE); - trace_usage_bit(usage->pbData[0], CERT_ENCIPHER_ONLY_KEY_USAGE); - } -#undef trace_usage_bit - if (usage->cbData > 1 && usage->pbData[1] & CERT_DECIPHER_ONLY_KEY_USAGE) - TRACE_(chain)("CERT_DECIPHER_ONLY_KEY_USAGE\n"); -} - static BOOL CRYPT_KeyUsageValid(PCCERT_CONTEXT cert, BOOL isRoot, BOOL isCA, DWORD index) { @@ -868,8 +877,6 @@ static BOOL CRYPT_KeyUsageValid(PCCERT_CONTEXT cert, BOOL isRoot, BOOL isCA, * key usage bits. */ usageBits = usage.pbData[usage.cbData - 1]; - if (TRACE_ON(chain)) - trace_usage(&usage); } } if (isCA)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009