May 2008 - Wine-commits - list.winehq.org

Michael Karcher : crypt32: Pass on aiKeyAlg on RSA key import.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 8fa3b6871fa477e762ff614a50486df671853f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa3b6871fa477e762ff614a5… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun May 25 20:16:14 2008 +0200 crypt32: Pass on aiKeyAlg on RSA key import. --- dlls/crypt32/encode.c | 4 ++++ dlls/crypt32/tests/encode.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 80f30ae..ee42a3d 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3918,8 +3918,12 @@ static BOOL WINAPI CRYPT_ImportRsaPublicKeyInfoEx(HCRYPTPROV hCryptProv, pInfo->PublicKey.pbData, pInfo->PublicKey.cbData, 0, pubKey, &pubKeySize); if (ret) + { + if(aiKeyAlg) + ((BLOBHEADER*)pubKey)->aiKeyAlg = aiKeyAlg; ret = CryptImportKey(hCryptProv, pubKey, pubKeySize, 0, 0, phKey); + } CryptMemFree(pubKey); } else diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 8e75689..49e4955 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5802,6 +5802,8 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) BOOL ret; HCRYPTKEY key; PCCERT_CONTEXT context; + DWORD dwSize; + ALG_ID ai; /* These crash ret = CryptImportPublicKeyInfoEx(0, 0, NULL, 0, 0, NULL, NULL); @@ -5820,9 +5822,37 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) &key); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + + /* Export key with standard algorithm (CALG_RSA_KEYX) */ ret = CryptImportPublicKeyInfoEx(csp, X509_ASN_ENCODING, info, 0, 0, NULL, &key); ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); + + dwSize = sizeof(ai); + CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); + ok(ret, "CryptGetKeyParam failed: %08x\n", GetLastError()); + if(ret) + { + ok(dwSize == sizeof(ai), "CryptGetKeyParam returned size %d\n",dwSize); + ok(ai == CALG_RSA_KEYX, "Default ALG_ID is %04x (expected CALG_RSA_KEYX)\n", ai); + } + + CryptDestroyKey(key); + + /* Repeat with forced algorithm */ + ret = CryptImportPublicKeyInfoEx(csp, X509_ASN_ENCODING, info, CALG_RSA_SIGN, 0, NULL, + &key); + ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); + + dwSize = sizeof(ai); + CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); + ok(ret, "CryptGetKeyParam failed: %08x\n", GetLastError()); + if(ret) + { + ok(dwSize == sizeof(ai), "CryptGetKeyParam returned size %d\n",dwSize); + ok(ai == CALG_RSA_SIGN, "ALG_ID is %04x (expected CALG_RSA_SIGN)\n", ai); + } + CryptDestroyKey(key); /* Test importing a public key from a certificate context */

1 0

Jacek Caban : mshtml: Fixed some tests on IE 7.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 28888b45798838bab0167baf28de99c326de0514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28888b45798838bab0167baf2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 25 12:41:08 2008 +0200 mshtml: Fixed some tests on IE 7. --- dlls/mshtml/tests/htmldoc.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 6c1640b..cde888a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -103,6 +103,7 @@ DEFINE_EXPECT(Exec_UPDATECOMMANDS); DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(Exec_HTTPEQUIV); DEFINE_EXPECT(Exec_MSHTML_PARSECOMPLETE); +DEFINE_EXPECT(Exec_Explorer_69); DEFINE_EXPECT(Invoke_AMBIENT_USERMODE); DEFINE_EXPECT(Invoke_AMBIENT_DLCONTROL); DEFINE_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -2069,7 +2070,8 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - test_readyState(NULL); + if(!pguidCmdGroup || !IsEqualGUID(pguidCmdGroup, &CGID_Explorer)) + test_readyState(NULL); if(!pguidCmdGroup) { switch(nCmdID) { @@ -2198,7 +2200,17 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_FAIL; /* TODO */ if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) { - ok(0, "unexpected cmd %d of CGID_Explorer\n", nCmdID); + ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); + + switch(nCmdID) { + case 69: + CHECK_EXPECT2(Exec_Explorer_69); + ok(pvaIn == NULL, "pvaIn != NULL\n"); + ok(pvaOut != NULL, "pvaOut == NULL\n"); + return E_NOTIMPL; + default: + ok(0, "unexpected cmd %d of CGID_Explorer\n", nCmdID); + } return E_NOTIMPL; } @@ -2688,6 +2700,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) SET_EXPECT(Protocol_Read); SET_EXPECT(UnlockRequest); } + SET_EXPECT(Exec_Explorer_69); SET_EXPECT(OnChanged_1005); SET_EXPECT(OnChanged_READYSTATE); SET_EXPECT(Exec_SETPROGRESSPOS); @@ -2733,6 +2746,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) nogecko = TRUE; } } + SET_CALLED(Exec_Explorer_69); CHECK_CALLED(OnChanged_1005); CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(Exec_SETPROGRESSPOS);

1 0

Jacek Caban : mshtml: Make Wine behave like IE 7.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 9b2e7710bc3e0e793b0673725687292d6cf8f2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2e7710bc3e0e793b0673725… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 25 12:41:24 2008 +0200 mshtml: Make Wine behave like IE 7. --- dlls/mshtml/task.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 99e2573..5dbc2fd 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "ole2.h" #include "mshtmcid.h" +#include "shlguid.h" #include "wine/debug.h" @@ -196,6 +197,27 @@ static void set_downloading(HTMLDocument *doc) } } +/* Calls undocumented 69 cmd of CGID_Explorer */ +static void call_explorer_69(HTMLDocument *doc) +{ + IOleCommandTarget *olecmd; + VARIANT var; + HRESULT hres; + + if(!doc->client) + return; + + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(FAILED(hres)) + return; + + VariantInit(&var); + hres = IOleCommandTarget_Exec(olecmd, &CGID_Explorer, 69, 0, NULL, &var); + IOleCommandTarget_Release(olecmd); + if(SUCCEEDED(hres) && V_VT(&var) != VT_NULL) + FIXME("handle result\n"); +} + static void set_parsecomplete(HTMLDocument *doc) { IOleCommandTarget *olecmd = NULL; @@ -205,7 +227,9 @@ static void set_parsecomplete(HTMLDocument *doc) if(doc->usermode == EDITMODE) init_editor(doc); + call_explorer_69(doc); call_property_onchanged(&doc->cp_propnotif, 1005); + call_explorer_69(doc); doc->readystate = READYSTATE_INTERACTIVE; call_property_onchanged(&doc->cp_propnotif, DISPID_READYSTATE);

1 0

Jacek Caban : mshtml: Fixed more tests on IE 7.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 98e24241837a8cbd88327cd6c961e8117502e512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e24241837a8cbd88327cd6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 25 20:10:01 2008 +0200 mshtml: Fixed more tests on IE 7. --- dlls/mshtml/task.c | 1 + dlls/mshtml/tests/htmldoc.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 5dbc2fd..55ca882 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -250,6 +250,7 @@ static void set_parsecomplete(HTMLDocument *doc) IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, OLECMDEXECOPT_DONTPROMPTUSER, &state, NULL); + IOleCommandTarget_Exec(olecmd, &CGID_ShellDocView, 103, 0, NULL, NULL); IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index cde888a..11ec3fe 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -99,6 +99,7 @@ DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_0); DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_1); DEFINE_EXPECT(Exec_ShellDocView_37); DEFINE_EXPECT(Exec_ShellDocView_84); +DEFINE_EXPECT(Exec_ShellDocView_103); DEFINE_EXPECT(Exec_UPDATECOMMANDS); DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(Exec_HTTPEQUIV); @@ -2170,12 +2171,21 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 84: CHECK_EXPECT2(Exec_ShellDocView_84); - ok(pvaIn == NULL, "pvaIn == NULL\n"); - ok(pvaOut != NULL, "pvaOut=%p, expected NULL\n", pvaOut); + ok(pvaIn == NULL, "pvaIn != NULL\n"); + ok(pvaOut != NULL, "pvaOut == NULL\n"); if(pvaIn) ok(V_VT(pvaOut) == VT_EMPTY, "V_VT(pvaOut)=%d\n", V_VT(pvaOut)); return E_NOTIMPL; + + case 103: + CHECK_EXPECT2(Exec_ShellDocView_103); + + ok(pvaIn == NULL, "pvaIn != NULL\n"); + ok(pvaOut == NULL, "pvaOut != NULL\n"); + + return E_NOTIMPL; + default: ok(0, "unexpected command %d\n", nCmdID); return E_FAIL; @@ -2705,6 +2715,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) SET_EXPECT(OnChanged_READYSTATE); SET_EXPECT(Exec_SETPROGRESSPOS); SET_EXPECT(Exec_SETDOWNLOADSTATE_0); + SET_EXPECT(Exec_ShellDocView_103); SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); SET_EXPECT(Exec_HTTPEQUIV_DONE); expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ @@ -2751,6 +2762,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(Exec_SETPROGRESSPOS); CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); + SET_CALLED(Exec_ShellDocView_103); CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE);

1 0

Michael Karcher : crypt32: Fix integer overflow.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: a6087662ba7b8af37488b5465695a59c5fb17d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6087662ba7b8af37488b5465… Author: Michael Karcher <karcher(a)physik.fu-berlin.de> Date: Sun May 25 14:32:22 2008 +0200 crypt32: Fix integer overflow. --- dlls/crypt32/encode.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 9071e5c..a274f44 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2540,8 +2540,8 @@ static BOOL WINAPI CRYPT_AsnEncodeInteger(DWORD dwCertEncodingType, __TRY { - DWORD significantBytes, lenBytes; - BYTE padByte = 0, bytesNeeded; + DWORD significantBytes, lenBytes, bytesNeeded; + BYTE padByte = 0; BOOL pad = FALSE; const CRYPT_INTEGER_BLOB *blob = (const CRYPT_INTEGER_BLOB *)pvStructInfo; @@ -2629,8 +2629,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUnsignedInteger(DWORD dwCertEncodingType, __TRY { - DWORD significantBytes, lenBytes; - BYTE bytesNeeded; + DWORD significantBytes, lenBytes, bytesNeeded; BOOL pad = FALSE; const CRYPT_INTEGER_BLOB *blob = (const CRYPT_INTEGER_BLOB *)pvStructInfo;

1 0

Michael Karcher : crypt32: Fix order-of-evaluation dependence.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: a3223df86577704c23d059deb51fdc74d6f82119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3223df86577704c23d059deb… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun May 25 17:38:54 2008 +0200 crypt32: Fix order-of-evaluation dependence. --- dlls/crypt32/encode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index a274f44..80f30ae 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -346,8 +346,8 @@ static BOOL WINAPI CRYPT_AsnEncodeValidity(DWORD dwCertEncodingType, /* This has two filetimes in a row, a NotBefore and a NotAfter */ const FILETIME *timePtr = (const FILETIME *)pvStructInfo; struct AsnEncodeSequenceItem items[] = { - { timePtr++, CRYPT_AsnEncodeChoiceOfTime, 0 }, - { timePtr, CRYPT_AsnEncodeChoiceOfTime, 0 }, + { timePtr, CRYPT_AsnEncodeChoiceOfTime, 0 }, + { timePtr + 1, CRYPT_AsnEncodeChoiceOfTime, 0 }, }; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items,

1 0

Alistair Leslie-Hughes : msxml3: Stopped tests from crashing and a Win98 fix.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 6a90c5890c10c10e3a1bc879657f193477fd2264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a90c5890c10c10e3a1bc8796… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 24 22:30:41 2008 +1000 msxml3: Stopped tests from crashing and a Win98 fix. --- dlls/msxml3/tests/domdoc.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bd45a77..cd50215 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -477,10 +477,6 @@ static void test_domdoc( void ) ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); - /* try with a null out pointer */ - r = IXMLDOMDocument_get_documentElement( doc, NULL ); - ok( r == E_INVALIDARG, "should be no document element\n"); - /* check if nodename is correct */ r = IXMLDOMDocument_get_nodeName( doc, NULL ); ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); @@ -937,7 +933,7 @@ static void test_domnode( void ) V_I4(&var) = 0x1234; r = IXMLDOMElement_getAttribute( element, str, &var ); ok( r == E_FAIL, "getAttribute ret %08x\n", r ); - ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); SysFreeString( str );

1 0

Jeff Zaroyko : Ask people to fill out the description in their own words. Often the copy-pasted description makes no sense even if it is from the applications website .
by Chris Morgan 26 May '08

26 May '08

Module: appdb Branch: master Commit: f3daa9a47d2dc0fe30b1f1a071f6570f946fe3cf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f3daa9a47d2dc0fe30b1f1a0… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Sun May 25 07:30:49 2008 +1000 Ask people to fill out the description in their own words. Often the copy-pasted description makes no sense even if it is from the applications website. --- include/application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index 7bd571e..2c36f24 100644 --- a/include/application.php +++ b/include/application.php @@ -603,7 +603,7 @@ class Application { echo '<tr valign=top><td class="color0"><b>Keywords</b></td>',"\n"; echo '<td><input size="75%" type="text" name="sAppKeywords" value="'.$this->sKeywords.'"></td></tr>',"\n"; - echo '<tr valign=top><td class="color0"><b>Application description</b></td>',"\n"; + echo '<tr valign=top><td class="color0"><b>Application description (In your own words)</b></td>',"\n"; echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription">'; echo $this->sDescription.'</textarea></p></td></tr>',"\n";

1 0

Alexandre Julliard : wine_release: Disable mandatory packages in configure.
by Alexandre Julliard 23 May '08

23 May '08

Module: tools Branch: master Commit: 78daac2f7725a1ebd9663b4cd396175c4f44ef75 URL: http://source.winehq.org/git/tools.git/?a=commit;h=78daac2f7725a1ebd9663b4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 23 17:37:08 2008 +0200 wine_release: Disable mandatory packages in configure. --- wine_release | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wine_release b/wine_release index e4afefe..a9d230f 100755 --- a/wine_release +++ b/wine_release @@ -57,7 +57,7 @@ cd ../.. # update man page and documentation echo "==== UPDATING DOCUMENTATION ====" cd wine-$version -./configure --quiet +./configure --quiet --without-x --without-freetype manpages="\ loader/wine.man \

1 0

Alexandre Julliard : Wine release 1.0-rc2
by Alexandre Julliard 23 May '08

23 May '08

Module: website Branch: master Commit: 044330641f90a4d10981b67a71f6d9f5d945d3e7 URL: http://source.winehq.org/git/website.git/?a=commit;h=044330641f90a4d10981b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 23 17:21:24 2008 +0200 Wine release 1.0-rc2 --- news/2008052301.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/news/2008052301.xml b/news/2008052301.xml new file mode 100644 index 0000000..28fdd33 --- /dev/null +++ b/news/2008052301.xml @@ -0,0 +1,21 @@ +<news> +<date>May 23, 2008</date> +<title>Wine 1.0-rc2 Released</title> +<body> +<p>Wine 1.0-rc2 was released today, with the following main changes:</p> + +<ul> +<li>Bug fixes only, we are in code freeze.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-1.0-rc2.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=1.0-rc2">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0