October 2009 - Wine-Commits

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

Oct. 26, 2009

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

Jacek Caban : mshtml: Fail to create HTMLDocument if Gecko is not available .
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 8a860e4c0f06f96ef71526c77ebf8db3c0d5fccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a860e4c0f06f96ef71526c77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 25 21:05:07 2009 +0100 mshtml: Fail to create HTMLDocument if Gecko is not available. --- dlls/mshtml/htmldoc.c | 26 +++++++++++++++----------- dlls/mshtml/tests/dom.c | 2 ++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 49b0537..134b108 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1957,6 +1957,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) { HTMLDocumentObj *doc; nsIDOMWindow *nswindow = NULL; + nsresult nsres; HRESULT hres; TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppvObject); @@ -1972,23 +1973,26 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) doc->ref = 1; doc->basedoc.doc_obj = doc; + list_init(&doc->bindings); + doc->usermode = UNKNOWN_USERMODE; + doc->readystate = READYSTATE_UNINITIALIZED; + + doc->nscontainer = NSContainer_Create(doc, NULL); + if(!doc->nscontainer) { + ERR("Failed to init Gecko, returning CLASS_E_CLASSNOTAVAILABLE\n"); + htmldoc_release(&doc->basedoc); + return CLASS_E_CLASSNOTAVAILABLE; + } + hres = htmldoc_query_interface(&doc->basedoc, riid, ppvObject); htmldoc_release(&doc->basedoc); if(FAILED(hres)) return hres; - doc->nscontainer = NSContainer_Create(doc, NULL); - list_init(&doc->bindings); - doc->usermode = UNKNOWN_USERMODE; - doc->readystate = READYSTATE_UNINITIALIZED; - - if(doc->nscontainer) { - nsresult nsres; - nsres = nsIWebBrowser_GetContentDOMWindow(doc->nscontainer->webbrowser, &nswindow); - if(NS_FAILED(nsres)) - ERR("GetContentDOMWindow failed: %08x\n", nsres); - } + nsres = nsIWebBrowser_GetContentDOMWindow(doc->nscontainer->webbrowser, &nswindow); + if(NS_FAILED(nsres)) + ERR("GetContentDOMWindow failed: %08x\n", nsres); hres = HTMLWindow_Create(doc, nswindow, NULL /* FIXME */, &doc->basedoc.window); if(nswindow) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ba85130..d9642e1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -438,6 +438,8 @@ static IHTMLDocument2 *create_document(void) hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if(FAILED(hres)) + return NULL; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); if(FAILED(hres)) {

1 0

Jerome Leclanche : msvcirt: Implement MSVCIRT_operator_sl_callback.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 370873f97441b604aa450efd9dce511cfb20516f URL: http://source.winehq.org/git/wine.git/?a=commit;h=370873f97441b604aa450efd9… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Sun Oct 25 23:15:28 2009 +0200 msvcirt: Implement MSVCIRT_operator_sl_callback. --- dlls/msvcirt/msvcirt.c | 11 +++++++++++ dlls/msvcirt/msvcirt.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 569452c..a498662 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -73,6 +73,17 @@ void * __stdcall MSVCIRT_operator_sl_pchar(class_ostream * _this, const char * s } /****************************************************************** + * ??6ostream@@QAEAAV0(a)P6AAAV0@AAV0@@Z(a)Z (MSVCRTI.@) + * class ostream & __thiscall ostream::operator<<(class ostream & (__cdecl*)(class ostream &)) + */ +DEFINE_THISCALL_WRAPPER(MSVCIRT_operator_sl_callback,8) +void * __stdcall MSVCIRT_operator_sl_callback(class_ostream * _this, class_ostream * (__cdecl*func)(class_ostream*)) +{ + TRACE("%p, %p\n", _this, func); + return func(_this); +} + +/****************************************************************** * ?endl@@YAAAVostream@@AAV1@@Z (MSVCRTI.@) * class ostream & __cdecl endl(class ostream &) */ diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index a91cec7..0efae20 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -141,7 +141,7 @@ @ stub ??6ostream@@QAEAAV0(a)M@Z # class ostream & __thiscall ostream::operator<<(float) @ stub ??6ostream@@QAEAAV0(a)N@Z # class ostream & __thiscall ostream::operator<<(double) @ stub ??6ostream@@QAEAAV0(a)O@Z # class ostream & __thiscall ostream::operator<<(long double) -@ stub ??6ostream@@QAEAAV0(a)P6AAAV0@AAV0@@Z(a)Z # class ostream & __thiscall ostream::operator<<(class ostream & (__cdecl*)(class ostream &)) +@ cdecl -i386 -norelay ??6ostream@@QAEAAV0(a)P6AAAV0@AAV0@@Z(a)Z(ptr ptr) __thiscall_MSVCIRT_operator_sl_callback # class ostream & __thiscall ostream::operator<<(class ostream & (__cdecl*)(class ostream &)) @ stub ??6ostream@@QAEAAV0(a)P6AAAVios@@AAV1@@Z(a)Z # class ostream & __thiscall ostream::operator<<(class ios & (__cdecl*)(class ios &)) @ stub ??6ostream@@QAEAAV0(a)PAVstreambuf@@@Z # class ostream & __thiscall ostream::operator<<(class streambuf *) @ stub ??6ostream@@QAEAAV0(a)PBC@Z # class ostream & __thiscall ostream::operator<<(signed char const *)

1 0

Francois Gouget : winapi_check: Add support for the new architectures in the spec files.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 8ab66c7896f1f8c8c95e9910af073b31ff5eb31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab66c7896f1f8c8c95e9910a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 26 09:27:43 2009 +0100 winapi_check: Add support for the new architectures in the spec files. --- tools/winapi/winapi.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 491063e..db0b06a 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -279,9 +279,9 @@ sub parse_spec_file($$) { } my $ordinal; - my $ARCHES="alpha|i386|powerpc|sparc|x86_64"; + my $ARCHES="alpha|i386|powerpc|sparc|win32|win64|x86_64"; if(/^(\d+|@)\s+ - (pascal|stdcall|cdecl|varargs)\s+ + (cdecl|pascal|stdcall|varargs)\s+ ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) { my $calling_convention = $2; @@ -440,7 +440,7 @@ sub parse_spec_file($$) { } else { # if($$function_external_module{$external_name} !~ /$module/) { $$function_external_module{$external_name} .= " & $module"; } - } elsif(/^(\d+|@)\s+extern(?:\s+(?:-norelay|-i386|-ret16|-ret64))?\s+(\S+)\s*(\S*)$/) { + } elsif(/^(\d+|@)\s+extern(?:\s+(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-norelay|-i386|-ret16|-ret64))?\s+(\S+)\s*(\S*)$/) { $ordinal = $1; my $external_name = $2;

1 0

Francois Gouget : mmsystem.dll16: Make MMSYSTEM_MMTIME16to32() static.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 621230fdc211ea3856440af50a9cb4e9a6a4e658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621230fdc211ea3856440af50… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 26 09:28:52 2009 +0100 mmsystem.dll16: Make MMSYSTEM_MMTIME16to32() static. --- dlls/mmsystem.dll16/mmsystem.c | 2 +- dlls/mmsystem.dll16/winemm16.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index b07629b..94bb85f 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -108,7 +108,7 @@ void MMSYSTEM_MMTIME32to16(LPMMTIME16 mmt16, const MMTIME* mmt32) * * */ -void MMSYSTEM_MMTIME16to32(LPMMTIME mmt32, const MMTIME16* mmt16) +static void MMSYSTEM_MMTIME16to32(LPMMTIME mmt32, const MMTIME16* mmt16) { mmt32->wType = mmt16->wType; /* layout of rest is the same for 32/16, diff --git a/dlls/mmsystem.dll16/winemm16.h b/dlls/mmsystem.dll16/winemm16.h index 2435e90..e8cad53 100644 --- a/dlls/mmsystem.dll16/winemm16.h +++ b/dlls/mmsystem.dll16/winemm16.h @@ -24,7 +24,6 @@ /* mmsystem (16 bit files) only functions */ void MMDRV_Init16(void); -void MMSYSTEM_MMTIME16to32(LPMMTIME mmt32, const MMTIME16* mmt16); void MMSYSTEM_MMTIME32to16(LPMMTIME16 mmt16, const MMTIME* mmt32); typedef LONG (*MCIPROC16)(DWORD, HDRVR16, WORD, DWORD, DWORD);

1 0

Hans Leidekker : wininet: Avoid accessing uninitialized memory.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 4a8f4f28670343f59e808ca2c9823ba52de0628b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8f4f28670343f59e808ca2c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 26 09:56:04 2009 +0100 wininet: Avoid accessing uninitialized memory. Found by valgrind. --- dlls/wininet/cookie.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 30e0b99..75cf049 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -163,7 +163,6 @@ static cookie_domain *COOKIE_addDomain(LPCWSTR domain, LPCWSTR path) static BOOL COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostNameLen, LPWSTR path, int pathLen) { URL_COMPONENTSW UrlComponents; - BOOL rc; UrlComponents.lpszExtraInfo = NULL; UrlComponents.lpszPassword = NULL; @@ -178,22 +177,28 @@ static BOOL COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostName UrlComponents.dwHostNameLength = hostNameLen; UrlComponents.dwUrlPathLength = pathLen; - rc = InternetCrackUrlW(lpszUrl, 0, 0, &UrlComponents); + if (!InternetCrackUrlW(lpszUrl, 0, 0, &UrlComponents)) return FALSE; /* discard the webpage off the end of the path */ - if (pathLen > 0 && path[pathLen-1] != '/') + if (UrlComponents.dwUrlPathLength) { - LPWSTR ptr; - ptr = strrchrW(path,'/'); - if (ptr) - *(++ptr) = 0; - else + if (path[UrlComponents.dwUrlPathLength - 1] != '/') { - path[0] = '/'; - path[1] = 0; + WCHAR *ptr; + if ((ptr = strrchrW(path, '/'))) *(++ptr) = 0; + else + { + path[0] = '/'; + path[1] = 0; + } } } - return rc; + else if (pathLen >= 2) + { + path[0] = '/'; + path[1] = 0; + } + return TRUE; } /* match a domain. domain must match if the domain is not NULL. path must match if the path is not NULL */ @@ -569,7 +574,7 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return FALSE; } - hostName[0] = path[0] = 0; + hostName[0] = 0; ret = COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0])); if (!ret || !hostName[0]) return FALSE;

1 0

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

Oct. 26, 2009

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

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

Oct. 26, 2009

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

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

Oct. 26, 2009

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

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

Oct. 26, 2009

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