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

Mikołaj Zalewski : msxml3: Implement IXMLDOMDocument2: :setProperty("SelectionLanguage", ...).
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: bf3849ad6f4205c9e11e3ef26a67ef192a99fbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3849ad6f4205c9e11e3ef26… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed May 9 20:09:11 2007 +0200 msxml3: Implement IXMLDOMDocument2::setProperty("SelectionLanguage", ...). --- dlls/msxml3/domdoc.c | 58 ++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8b3f561..a0264ca 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -43,6 +43,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +static const WCHAR SZ_PROPERTY_SELECTION_LANGUAGE[] = {'S','e','l','e','c','t','i','o','n','L','a','n','g','u','a','g','e',0}; +static const WCHAR SZ_VALUE_XPATH[] = {'X','P','a','t','h',0}; +static const WCHAR SZ_VALUE_XSLPATTERN[] = {'X','S','L','P','a','t','t','e','r','n',0}; + typedef struct { const struct IBindStatusCallbackVtbl *lpVtbl; } bsc; @@ -169,6 +173,7 @@ typedef struct _domdoc VARIANT_BOOL validating; VARIANT_BOOL resolving; VARIANT_BOOL preserving; + BOOL bUseXPath; IUnknown *node_unk; IXMLDOMNode *node; IXMLDOMSchemaCollection *schema; @@ -1374,8 +1379,38 @@ static HRESULT WINAPI domdoc_setProperty( BSTR p, VARIANT var) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + + if (lstrcmpiW(p, SZ_PROPERTY_SELECTION_LANGUAGE) == 0) + { + VARIANT varStr; + HRESULT hr; + BSTR bstr; + + V_VT(&varStr) = VT_EMPTY; + if (V_VT(&var) != VT_BSTR) + { + if (FAILED(hr = VariantChangeType(&varStr, &var, 0, VT_BSTR))) + return hr; + bstr = V_BSTR(&varStr); + } + else + bstr = V_BSTR(&var); + + hr = S_OK; + if (lstrcmpiW(bstr, SZ_VALUE_XPATH) == 0) + This->bUseXPath = TRUE; + else if (lstrcmpiW(bstr, SZ_VALUE_XSLPATTERN) == 0) + This->bUseXPath = FALSE; + else + hr = E_FAIL; + + VariantClear(&varStr); + return hr; + } + + FIXME("Unknown property %s\n", wine_dbgstr_w(p)); + return E_FAIL; } static HRESULT WINAPI domdoc_getProperty( @@ -1383,8 +1418,22 @@ static HRESULT WINAPI domdoc_getProperty( BSTR p, VARIANT* var) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + + if (var == NULL) + return E_INVALIDARG; + if (lstrcmpiW(p, SZ_PROPERTY_SELECTION_LANGUAGE) == 0) + { + V_VT(var) = VT_BSTR; + if (This->bUseXPath) + V_BSTR(var) = SysAllocString(SZ_VALUE_XPATH); + else + V_BSTR(var) = SysAllocString(SZ_VALUE_XSLPATTERN); + return S_OK; + } + + FIXME("Unknown property %s\n", wine_dbgstr_w(p)); + return E_FAIL; } static const struct IXMLDOMDocument2Vtbl domdoc_vtbl = @@ -1491,6 +1540,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->validating = 0; doc->resolving = 0; doc->preserving = 0; + doc->bUseXPath = FALSE; doc->error = S_OK; doc->schema = NULL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cdf3fac..02e8bf9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -26,6 +26,7 @@ #include "xmldom.h" #include "msxml2.h" #include <stdio.h> +#include <assert.h> #include "wine/test.h" @@ -101,6 +102,59 @@ static const WCHAR szstr2[] = { 's','t','r','2',0 }; static const WCHAR szstar[] = { '*',0 }; static const WCHAR szfn1_txt[] = {'f','n','1','.','t','x','t',0}; +#define expect_bstr_eq_and_free(bstr, expect) { \ + BSTR bstrExp = alloc_str_from_narrow(expect); \ + ok(lstrcmpW(bstr, bstrExp) == 0, "String differs\n"); \ + SysFreeString(bstr); \ + SysFreeString(bstrExp); \ +} + +#define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } + +#define ole_check(expr) { \ + HRESULT r = expr; \ + ok(r == S_OK, #expr " returned %x\n", r); \ +} + +#define ole_expect(expr, expect) { \ + HRESULT r = expr; \ + ok(r == (expect), #expr " returned %x, expected %x\n", r, expect); \ +} + +static BSTR alloc_str_from_narrow(const char *str) +{ + int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + BSTR ret = SysAllocStringLen(NULL, len - 1); /* NUL character added automatically */ + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +BSTR alloced_bstrs[256]; +int alloced_bstrs_count = 0; + +static BSTR _bstr_(const char *str) +{ + assert(alloced_bstrs_count < sizeof(alloced_bstrs)/sizeof(alloced_bstrs[0])); + alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); + return alloced_bstrs[alloced_bstrs_count++]; +} + +static void free_bstrs() +{ + int i; + for (i = 0; i < alloced_bstrs_count; i++) + SysFreeString(alloced_bstrs[i]); + alloced_bstrs_count = 0; +} + +static VARIANT _variantbstr_(const char *str) +{ + VARIANT v; + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_(str); + return v; +} + static void test_domdoc( void ) { HRESULT r; @@ -1162,6 +1216,8 @@ static void test_IXMLDOMDocument2(void) BSTR str; IXMLDOMDocument *doc; IXMLDOMDocument2 *doc2; + VARIANT var; + int ref; r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); @@ -1177,8 +1233,43 @@ static void test_IXMLDOMDocument2(void) r = IXMLDOMDocument_QueryInterface( doc, &IID_IXMLDOMDocument2, (void**)&doc2 ); ok( r == S_OK, "ret %08x\n", r ); ok( doc == (IXMLDOMDocument*)doc2, "interfaces differ\n"); + + /* we will check if the variant got cleared */ + ref = IXMLDOMDocument2_AddRef(doc2); + expect_eq(ref, 3, int, "%d"); /* doc, doc2, AddRef*/ + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown *)doc2; + + /* invalid calls */ + ole_expect(IXMLDOMDocument2_getProperty(doc2, _bstr_("askldhfaklsdf"), &var), E_FAIL); + expect_eq(V_VT(&var), VT_UNKNOWN, int, "%x"); + ole_expect(IXMLDOMDocument2_getProperty(doc2, _bstr_("SelectionLanguage"), NULL), E_INVALIDARG); + + /* valid call */ + ole_check(IXMLDOMDocument2_getProperty(doc2, _bstr_("SelectionLanguage"), &var)); + expect_eq(V_VT(&var), VT_BSTR, int, "%x"); + expect_bstr_eq_and_free(V_BSTR(&var), "XSLPattern"); + V_VT(&var) = VT_R4; + + /* the variant didn't get cleared*/ + expect_eq(IXMLDOMDocument2_Release(doc2), 2, int, "%d"); + + /* setProperty tests */ + ole_expect(IXMLDOMDocument2_setProperty(doc2, _bstr_("askldhfaklsdf"), var), E_FAIL); + ole_expect(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), var), E_FAIL); + ole_expect(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("alskjdh faklsjd hfk")), E_FAIL); + ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern"))); + ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); + ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern"))); + + /* contrary to what MSDN calims you can switch back from XPath to XSLPattern */ + ole_check(IXMLDOMDocument2_getProperty(doc2, _bstr_("SelectionLanguage"), &var)); + expect_eq(V_VT(&var), VT_BSTR, int, "%x"); + expect_bstr_eq_and_free(V_BSTR(&var), "XSLPattern"); + IXMLDOMDocument2_Release( doc2 ); IXMLDOMDocument_Release( doc ); + free_bstrs(); } START_TEST(domdoc)

1 0

appdb/include maintainer.php
by WineHQ 13 May '07

13 May '07

ChangeSet ID: 31129 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/13 11:54:33 Modified files: include : maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Don't display supermaintainers twice on maintainer processing screen. When printing the list of non-super maintainers, only print the entry if the user is not a super maintainer Patch: http://cvs.winehq.org/patch.py?id=31129 Old revision New revision Changes Path 1.41 1.42 +6 -1 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.41 appdb/include/maintainer.php:1.42 --- appdb/include/maintainer.php:1.41 13 May 2007 16:54:33 -0000 +++ appdb/include/maintainer.php 13 May 2007 16:54:33 -0000 @@ -537,7 +537,12 @@ class maintainer while(list($index, $iUserId) = each($aOtherMaintainers)) { $oUser = new User($iUserId); - echo "$oUser->sRealname \n"; + + // because Version::getMaintainersUserIds() includes super maintainers + // we need to exclude these from the list of maintainers that we are + // building + if(!maintainer::isUserSuperMaintainer($oUser, $oVersion->iAppId)) + echo "$oUser->sRealname \n"; } }

1 0

appdb/include vendor.php
by WineHQ 12 May '07

12 May '07

ChangeSet ID: 31128 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/12 11:54:58 Modified files: include : vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Don't create duplicate vendors. If there is a vendor with the same name as the one being created retrieve the duplicate vendors information for the current object and return TRUE, even though we didn't really create new vendor we can handle this error situation more gracefully than returning false. Patch: http://cvs.winehq.org/patch.py?id=31128 Old revision New revision Changes Path 1.27 1.28 +20 -0 appdb/include/vendor.php Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.27 appdb/include/vendor.php:1.28 --- appdb/include/vendor.php:1.27 12 May 2007 16:54:58 -0000 +++ appdb/include/vendor.php 12 May 2007 16:54:58 -0000 @@ -60,9 +60,29 @@ class Vendor { /** * Creates a new vendor. + * + * NOTE: If creating a vendor with the same name as an existing vendor + * we retrieve the existing vendors information and return true, + * even though we didn't create the vendor, this makes it easier + * for the user of the vendor class. */ function create() { + /* Check for duplicates */ + $hResult = query_parameters("SELECT * FROM vendor WHERE vendorName = '?'", + $this->sName); + if($hResult && $oRow = mysql_fetch_object($hResult)) + { + if(mysql_num_rows($hResult)) + { + $this->vendor($oRow->vendorId); + + /* Even though we did not create a new vendor, the caller is provided + with an id and can proceed as normal, so we return TRUE */ + return TRUE; + } + } + $hResult = query_parameters("INSERT INTO vendor (vendorName, vendorURL, queued) ". "VALUES ('?', '?', '?')", $this->sName, $this->sWebpage,

1 0

appdb/include vendor.php
by WineHQ 12 May '07

12 May '07

ChangeSet ID: 31127 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/12 11:34:28 Modified files: include : vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Implement vendor::objectMoveChildren() Patch: http://cvs.winehq.org/patch.py?id=31127 Old revision New revision Changes Path 1.26 1.27 +23 -0 appdb/include/vendor.php Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.26 appdb/include/vendor.php:1.27 --- appdb/include/vendor.php:1.26 12 May 2007 16:34:28 -0000 +++ appdb/include/vendor.php 12 May 2007 16:34:28 -0000 @@ -317,6 +317,29 @@ class Vendor { { return FALSE; } + + function objectMoveChildren($iNewId) + { + /* Keep track of how many children we have modified */ + $iCount = 0; + + foreach($this->aApplicationsIds as $iAppId) + { + $oApp = new application($iAppId); + $oApp->iVendorId = $iNewId; + if($oApp->update(TRUE)) + $iCount++; + else + return FALSE; + } + + return $iCount; + } + + function objectGetId() + { + return $this->iVendorId; + } } ?>

1 0

appdb/include config.php.sample mail.php
by WineHQ 12 May '07

12 May '07

ChangeSet ID: 31126 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/12 11:30:32 Modified files: include : config.php.sample mail.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use separate setting for the email sender address. This allows the appdb emails to be sent from a different address than the default one. Use the sender address to point email responses to the new noreply address. Patch: http://cvs.winehq.org/patch.py?id=31126 Old revision New revision Changes Path 1.14 1.15 +1 -0 appdb/include/config.php.sample 1.8 1.9 +3 -3 appdb/include/mail.php Index: appdb/include/config.php.sample diff -u -p appdb/include/config.php.sample:1.14 appdb/include/config.php.sample:1.15 --- appdb/include/config.php.sample:1.14 12 May 2007 16:30:32 -0000 +++ appdb/include/config.php.sample 12 May 2007 16:30:32 -0000 @@ -17,6 +17,7 @@ define("APPDB_ROOT", "http://appdb.wineh define("APPDB_OWNER","WineHQ"); // with what product/company is this AppDB related ? define("APPDB_OWNER_URL","http://www.winehq.org/"); // website of this product/company define("APPDB_OWNER_EMAIL","appdb(a)winehq.org"); // e-mail of this product/company +define("APPDB_SENDER_EMAIL","appdb-noreply(a)winehq.org"); // The e-mail address which appears as the sender in mails sent by the AppDB define("BUGZILLA_ROOT","http://bugs.winehq.org/"); // path to bugzilla // AppDB developers: Use this define to disable email from being sent from the appdb during testing Index: appdb/include/mail.php diff -u -p appdb/include/mail.php:1.8 appdb/include/mail.php:1.9 --- appdb/include/mail.php:1.8 12 May 2007 16:30:32 -0000 +++ appdb/include/mail.php 12 May 2007 16:30:32 -0000 @@ -9,8 +9,8 @@ function mail_appdb($sEmailList,$sSubjec return; $sHeaders = "MIME-Version: 1.0\r\n"; - $sHeaders .= "From: AppDB <".APPDB_OWNER_EMAIL.">\r\n"; - $sHeaders .= "Reply-to: AppDB <".APPDB_OWNER_EMAIL.">\r\n"; + $sHeaders .= "From: AppDB <".APPDB_SENDER_EMAIL.">\r\n"; + $sHeaders .= "Reply-to: AppDB <".APPDB_SENDER_EMAIL.">\r\n"; $sHeaders .= "X-Priority: 3\r\n"; $sHeaders .= "X-Mailer: ".APPDB_OWNER." mailer\r\n"; $sMsg = trim(ereg_replace("\r\n","\n",$sMsg)); @@ -32,7 +32,7 @@ function mail_appdb($sEmailList,$sSubjec return; } - $bResult = mail(str_replace(" ",",",$sEmailList), "[AppDB] ".$sSubject, $sMsg, $sHeaders, "-f".APPDB_OWNER_EMAIL); + $bResult = mail(str_replace(" ",",",$sEmailList), "[AppDB] ".$sSubject, $sMsg, $sHeaders, "-f".APPDB_SENDER_EMAIL); if($bResult) addmsg("Message sent to: ".$sEmailList, "green"); else

1 0

lostwages/ include/winehq.conf news/2007051101.xml
by Alexandre Julliard 11 May '07

11 May '07

ChangeSet ID: 31125 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/05/11 12:54:37 Modified files: include : winehq.conf Added files: news : 2007051101.xml Log message: Release 0.9.37 Patch: http://cvs.winehq.org/patch.py?id=31125 Old revision New revision Changes Path 1.59 1.60 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007051101.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.59 lostwages/include/winehq.conf:1.60 --- lostwages/include/winehq.conf:1.59 11 May 2007 17:54:37 -0000 +++ lostwages/include/winehq.conf 11 May 2007 17:54:37 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.36 +snapshot_date: 0.9.37 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007051101.xml diff -u -p /dev/null lostwages/news/2007051101.xml:1.1 --- /dev/null 11 May 2007 17:54:37 -0000 +++ lostwages/news/2007051101.xml 11 May 2007 17:54:37 -0000 @@ -0,0 +1,25 @@ +<news> +<date>May 11, 2007</date> +<title>Wine 0.9.37 Released</title> +<body> +Wine 0.9.37 was released today, with the following main changes: + +<ul> +<li>MSI automation with JScript/VBScript support.</li> +<li>Various MSHTML improvements.</li> +<li>The usual assortment of Direct3D fixes.</li> +<li>Support for a few more exe protection schemes.</li> +<li>Lots of bug fixes.</li> +</ul> + + +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-0.9.37.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.37">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. + +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.37.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: cbc241c9912fdc3dc1311302f34598e739ac8eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc241c9912fdc3dc1311302f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 19:35:02 2007 +0200 Release 0.9.37. --- ANNOUNCE | 752 +++++++++++++++++---------------- ChangeLog | 1415 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1813 insertions(+), 374 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbc241c9912fdc3dc1311…

1 0

Tag wine-0.9.37 : Alexandre Julliard : Release 0.9.37
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: refs/tags/wine-0.9.37 Tag: 364b7316778530c53a468642c0ed0ccab2f5e914 URL: http://source.winehq.org/git/wine.git/?a=tag;h=364b7316778530c53a468642c0ed… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 19:35:03 2007 +0200 Release 0.9.37

1 0

Paul Vriens : d3drm/tests: d3drm is removed from Windows Vista.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 59eb87145909650727de1f215ab336c0368f7a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59eb87145909650727de1f215… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri May 11 13:22:57 2007 +0200 d3drm/tests: d3drm is removed from Windows Vista. --- dlls/d3drm/tests/Makefile.in | 2 +- dlls/d3drm/tests/vector.c | 85 ++++++++++++++++++++++++++++++++++------- 2 files changed, 71 insertions(+), 16 deletions(-) diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index 1e682e7..cb96a6a 100644 --- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = d3drm.dll -IMPORTS = d3drm kernel32 +IMPORTS = kernel32 EXTRALIBS = -ldxguid CTESTS = vector.c diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index e4c65ce..0b8fa33 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -65,6 +65,56 @@ "Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", \ U1(expectedvec).x,U2(expectedvec).y,U3(expectedvec).z, U1(gotvec).x, U2(gotvec).y, U3(gotvec).z); +static HMODULE d3drm_handle = 0; + +static void (WINAPI * pD3DRMMatrixFromQuaternion)(D3DRMMATRIX4D, LPD3DRMQUATERNION); +static LPD3DVECTOR (WINAPI* pD3DRMVectorAdd)(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +static LPD3DVECTOR (WINAPI* pD3DRMVectorCrossProduct)(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +static D3DVALUE (WINAPI* pD3DRMVectorDotProduct)(LPD3DVECTOR, LPD3DVECTOR); +static D3DVALUE (WINAPI* pD3DRMVectorModulus)(LPD3DVECTOR); +static LPD3DVECTOR (WINAPI * pD3DRMVectorNormalize)(LPD3DVECTOR); +static LPD3DVECTOR (WINAPI * pD3DRMVectorReflect)(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +static LPD3DVECTOR (WINAPI * pD3DRMVectorRotate)(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR, D3DVALUE); +static LPD3DVECTOR (WINAPI * pD3DRMVectorScale)(LPD3DVECTOR, LPD3DVECTOR, D3DVALUE); +static LPD3DVECTOR (WINAPI * pD3DRMVectorSubtract)(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +static LPD3DRMQUATERNION (WINAPI * pD3DRMQuaternionFromRotation)(LPD3DRMQUATERNION, LPD3DVECTOR, D3DVALUE); +static LPD3DRMQUATERNION (WINAPI * pD3DRMQuaternionSlerp)(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION, D3DVALUE); + +#define D3DRM_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(d3drm_handle, #func); \ + if(!p ## func) { \ + trace("GetProcAddress(%s) failed\n", #func); \ + FreeLibrary(d3drm_handle); \ + return FALSE; \ + } + +static BOOL InitFunctionPtrs(void) +{ + d3drm_handle = LoadLibraryA("d3drm.dll"); + + if(!d3drm_handle) + { + skip("Could not load d3drm.dll\n"); + return FALSE; + } + + D3DRM_GET_PROC(D3DRMMatrixFromQuaternion) + D3DRM_GET_PROC(D3DRMVectorAdd) + D3DRM_GET_PROC(D3DRMVectorCrossProduct) + D3DRM_GET_PROC(D3DRMVectorDotProduct) + D3DRM_GET_PROC(D3DRMVectorModulus) + D3DRM_GET_PROC(D3DRMVectorNormalize) + D3DRM_GET_PROC(D3DRMVectorReflect) + D3DRM_GET_PROC(D3DRMVectorRotate) + D3DRM_GET_PROC(D3DRMVectorScale) + D3DRM_GET_PROC(D3DRMVectorSubtract) + D3DRM_GET_PROC(D3DRMQuaternionFromRotation) + D3DRM_GET_PROC(D3DRMQuaternionSlerp) + + return TRUE; +} + + static void VectorTest(void) { D3DVALUE mod,par,theta; @@ -74,37 +124,37 @@ static void VectorTest(void) U1(v).x=4.0;U2(v).y=4.0;U3(v).z=0.0; /*______________________VectorAdd_________________________________*/ - D3DRMVectorAdd(&r,&u,&v); + pD3DRMVectorAdd(&r,&u,&v); U1(e).x=6.0;U2(e).y=6.0;U3(e).z=1.0; expect_vec(e,r); /*_______________________VectorSubtract__________________________*/ - D3DRMVectorSubtract(&r,&u,&v); + pD3DRMVectorSubtract(&r,&u,&v); U1(e).x=-2.0;U2(e).y=-2.0;U3(e).z=1.0; expect_vec(e,r); /*_______________________VectorCrossProduct_______________________*/ - D3DRMVectorCrossProduct(&r,&u,&v); + pD3DRMVectorCrossProduct(&r,&u,&v); U1(e).x=-4.0;U2(e).y=4.0;U3(e).z=0.0; expect_vec(e,r); /*_______________________VectorDotProduct__________________________*/ - mod=D3DRMVectorDotProduct(&u,&v); + mod=pD3DRMVectorDotProduct(&u,&v); ok((mod == 16.0), "Expected 16.0, Got %f\n",mod); /*_______________________VectorModulus_____________________________*/ - mod=D3DRMVectorModulus(&u); + mod=pD3DRMVectorModulus(&u); ok((mod == 3.0), "Expected 3.0, Got %f\n",mod); /*_______________________VectorNormalize___________________________*/ - D3DRMVectorNormalize(&u); + pD3DRMVectorNormalize(&u); U1(e).x=2.0/3.0;U2(e).y=2.0/3.0;U3(e).z=1.0/3.0; expect_vec(e,u); /* If u is the NULL vector, MSDN says that the return vector is NULL. In fact, the returned vector is (1,0,0). The following test case prove it. */ U1(casnul).x=0.0; U2(casnul).y=0.0; U3(casnul).z=0.0; - D3DRMVectorNormalize(&casnul); + pD3DRMVectorNormalize(&casnul); U1(e).x=1.0; U2(e).y=0.0; U3(e).z=0.0; expect_vec(e,casnul); @@ -112,26 +162,26 @@ static void VectorTest(void) U1(ray).x=3.0; U2(ray).y=-4.0; U3(ray).z=5.0; U1(norm).x=1.0; U2(norm).y=-2.0; U3(norm).z=6.0; U1(e).x=79.0; U2(e).y=-160.0; U3(e).z=487.0; - D3DRMVectorReflect(&r,&ray,&norm); + pD3DRMVectorReflect(&r,&ray,&norm); expect_vec(e,r); /*_______________________VectorRotate_______________________________*/ U1(w).x=3.0; U2(w).y=4.0; U3(w).z=0.0; U1(axis).x=0.0; U2(axis).y=0.0; U3(axis).z=1.0; theta=2.0*PI/3.0; - D3DRMVectorRotate(&r,&w,&axis,theta); + pD3DRMVectorRotate(&r,&w,&axis,theta); U1(e).x=-0.3-0.4*sqrt(3.0); U2(e).y=0.3*sqrt(3.0)-0.4; U3(e).z=0.0; expect_vec(e,r); /* The same formula gives D3DRMVectorRotate, for theta in [-PI/2;+PI/2] or not. The following test proves this fact.*/ theta=-PI/4.0; - D3DRMVectorRotate(&r,&w,&axis,-PI/4); + pD3DRMVectorRotate(&r,&w,&axis,-PI/4); U1(e).x=1.4/sqrt(2.0); U2(e).y=0.2/sqrt(2.0); U3(e).z=0.0; expect_vec(e,r); /*_______________________VectorScale__________________________*/ par=2.5; - D3DRMVectorScale(&r,&v,par); + pD3DRMVectorScale(&r,&v,par); U1(e).x=10.0; U2(e).y=10.0; U3(e).z=0.0; expect_vec(e,r); } @@ -147,7 +197,7 @@ static void MatrixTest(void) exp[3][0]=0.0; exp[3][1]=0.0; exp[3][2]=0.0; exp[3][3]=1.0; q.s=1.0; U1(q.v).x=2.0; U2(q.v).y=3.0; U3(q.v).z=4.0; - D3DRMMatrixFromQuaternion(mat,&q); + pD3DRMMatrixFromQuaternion(mat,&q); expect_mat(exp,mat); } @@ -160,7 +210,7 @@ static void QuaternionTest(void) /*_________________QuaternionFromRotation___________________*/ U1(axis).x=1.0; U2(axis).y=1.0; U3(axis).z=1.0; theta=2.0*PI/3.0; - D3DRMQuaternionFromRotation(&r,&axis,theta); + pD3DRMQuaternionFromRotation(&r,&axis,theta); q.s=0.5; U1(q.v).x=0.5; U2(q.v).y=0.5; U3(q.v).z=0.5; expect_quat(q,r); @@ -180,7 +230,7 @@ static void QuaternionTest(void) U1(q.v).x=g*U1(q1.v).x+h*U1(q2.v).x; U2(q.v).y=g*U2(q1.v).y+h*U2(q2.v).y; U3(q.v).z=g*U3(q1.v).z+h*U3(q2.v).z; - D3DRMQuaternionSlerp(&r,&q1,&q2,par); + pD3DRMQuaternionSlerp(&r,&q1,&q2,par); expect_quat(q,r); q1.s=1.0; U1(q1.v).x=2.0; U2(q1.v).y=3.0; U3(q1.v).z=50.0; @@ -192,13 +242,18 @@ static void QuaternionTest(void) U1(q.v).x=g*U1(q1.v).x+h*U1(q2.v).x; U2(q.v).y=g*U2(q1.v).y+h*U2(q2.v).y; U3(q.v).z=g*U3(q1.v).z+h*U3(q2.v).z; - D3DRMQuaternionSlerp(&r,&q1,&q2,par); + pD3DRMQuaternionSlerp(&r,&q1,&q2,par); expect_quat(q,r); } START_TEST(vector) { + if(!InitFunctionPtrs()) + return; + VectorTest(); MatrixTest(); QuaternionTest(); + + FreeLibrary(d3drm_handle); }

1 0

Jacek Caban : mshtml: Don't crash in OnStopBinding if This->binding is null .
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 94a264d0beef21f51655e3cacebc699e74ee4d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a264d0beef21f51655e3cac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 13:14:14 2007 +0200 mshtml: Don't crash in OnStopBinding if This->binding is null. --- dlls/mshtml/navigate.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 6ab6bc4..4ee33aa 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -380,8 +380,10 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); - IBinding_Release(This->binding); - This->binding = NULL; + if(This->binding) { + IBinding_Release(This->binding); + This->binding = NULL; + } if(This->nslistener) { nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel),

1 0