wine-commits May 2007

wine-commits@winehq.org

3 participants
715 discussions

Mikołaj Zalewski : localui: Add Polish translation.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 918ee77d1ca618c40aa6972992ffdfb9038bd579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918ee77d1ca618c40aa697299… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue May 8 22:08:37 2007 +0200 localui: Add Polish translation. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Pl.rc | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 4841708..2486342 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -40,3 +40,4 @@ #include "ui_De.rc" #include "ui_En.rc" +#include "ui_Pl.rc" diff --git a/dlls/localui/ui_Pl.rc b/dlls/localui/ui_Pl.rc new file mode 100644 index 0000000..74a5015 --- /dev/null +++ b/dlls/localui/ui_Pl.rc @@ -0,0 +1,55 @@ +/* + * Polish resources for localui + * + * Copyright 2007 Detlef Riekenberg + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Dodaj port lokalny" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa nowego portu:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "&Anuluj", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Konfiguracja portu LPT" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Czasy oczekiwania (sekundy)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Ponowienie transmisji:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "&OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "&Anuluj", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Port lokalny" + IDS_INVALIDNAME "'%s' nie jest poprawn� nazw� portu" + IDS_PORTEXISTS "Port %s ju� istnieje" + IDS_NOTHINGTOCONFIG "Ten port nie ma opcji do skonfigurowania" +}

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

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

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

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: Added IPersistStreamInit::Load test.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 66067781d6e5df7499abe419216172e630383056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66067781d6e5df7499abe4192… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 13:18:20 2007 +0200 mshtml: Added IPersistStreamInit::Load test. --- dlls/mshtml/tests/htmldoc.c | 102 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 91 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 730833c..37e7f5a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -120,10 +120,11 @@ DEFINE_EXPECT(Protocol_Read); DEFINE_EXPECT(LockRequest); DEFINE_EXPECT(UnlockRequest); +static IUnknown *doc_unk; static BOOL expect_LockContainer_fLock; static BOOL expect_SetActiveObject_active; static BOOL set_clientsite = FALSE, container_locked = FALSE; -static BOOL readystate_set_loading = FALSE; +static BOOL readystate_set_loading = FALSE, load_from_stream; static BOOL editmode = FALSE; static int stream_read, protocol_read; static enum load_state_t { @@ -2054,8 +2055,6 @@ static void test_readyState(IUnknown *unk) BSTR state; HRESULT hres; - static IUnknown *_unk; - static const WCHAR wszUninitialized[] = {'u','n','i','n','i','t','i','a','l','i','z','e','d',0}; static const WCHAR wszLoading[] = {'l','o','a','d','i','n','g',0}; static const WCHAR wszInteractive[] = {'i','n','t','e','r','a','c','t','i','v','e',0}; @@ -2069,8 +2068,8 @@ static void test_readyState(IUnknown *unk) wszUninitialized }; - if(!unk) unk = _unk; - else _unk = unk; + if(!unk) + unk = doc_unk; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&htmldoc); ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08x\n", hres); @@ -2239,7 +2238,8 @@ static void test_download(BOOL verb_done, BOOL css_dwl) if(verb_done) { SET_EXPECT(Exec_SETPROGRESSMAX); - SET_EXPECT(GetHostInfo); + if(!load_from_stream) + SET_EXPECT(GetHostInfo); } SET_EXPECT(SetStatusText); SET_EXPECT(Exec_SETDOWNLOADSTATE_1); @@ -2268,7 +2268,8 @@ static void test_download(BOOL verb_done, BOOL css_dwl) if(verb_done) { CHECK_CALLED(Exec_SETPROGRESSMAX); - CHECK_CALLED(GetHostInfo); + if(!load_from_stream) + CHECK_CALLED(GetHostInfo); } CHECK_CALLED(SetStatusText); CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); @@ -2408,10 +2409,8 @@ static void test_QueryStatus(IUnknown *unk, REFIID cgid, ULONG cmdid, DWORD cmdf static void test_MSHTML_QueryStatus(IUnknown *unk, DWORD cmdf) { - static IUnknown *_unk; - - if(unk) _unk = unk; - else unk = _unk; + if(!unk) + unk = doc_unk; test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTNAME, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTSIZE, cmdf); @@ -2987,6 +2986,35 @@ static void test_Navigate(IUnknown *unk) IHlinkTarget_Release(hlink); } +static void test_StreamLoad(IUnknown *unk) +{ + IPersistStreamInit *init; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(Exec_ShellDocView_37); + SET_EXPECT(OnChanged_READYSTATE); + SET_EXPECT(Read); + readystate_set_loading = TRUE; + + hres = IPersistStreamInit_Load(init, &Stream); + ok(hres == S_OK, "Load failed: %08x\n", hres); + + CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(Exec_ShellDocView_37); + CHECK_CALLED(OnChanged_READYSTATE); + CHECK_CALLED(Read); + + IPersistStreamInit_Release(init); +} + static void test_QueryInterface(IUnknown *unk) { IRunnableObject *runnable = (IRunnableObject*)0xdeadbeef; @@ -2998,8 +3026,10 @@ static void test_QueryInterface(IUnknown *unk) } static void init_test(enum load_state_t ls) { + doc_unk = NULL; hwnd = last_hwnd = NULL; set_clientsite = FALSE; + load_from_stream = FALSE; call_UIActivate = FALSE; load_state = ls; editmode = FALSE; @@ -3020,6 +3050,7 @@ static void test_HTMLDocument(enum load_state_t ls) hres = create_document(&unk); if(FAILED(hres)) return; + doc_unk = unk; test_QueryInterface(unk); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); @@ -3100,6 +3131,7 @@ static void test_HTMLDocument_hlink(void) hres = create_document(&unk); if(FAILED(hres)) return; + doc_unk = unk; test_ConnectionPointContainer(unk); test_Persist(unk); @@ -3121,6 +3153,52 @@ static void test_HTMLDocument_hlink(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } +static void test_HTMLDocument_StreamLoad(void) +{ + IOleObject *oleobj; + IUnknown *unk; + HRESULT hres; + ULONG ref; + + trace("Testing HTMLDocument (IPersistStreamInit)...\n"); + + init_test(LD_DOLOAD); + load_from_stream = TRUE; + + hres = create_document(&unk); + if(FAILED(hres)) + return; + doc_unk = unk; + + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); + + test_readyState(unk); + test_ConnectionPointContainer(unk); + test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); + test_DoVerb(oleobj); + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + + IOleObject_Release(oleobj); + + test_StreamLoad(unk); + test_download(TRUE, FALSE); + + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_UIDeactivate(); + test_InPlaceDeactivate(unk, TRUE); + test_Close(unk, FALSE); + + if(view) { + IOleDocumentView_Release(view); + view = NULL; + } + + + ref = IUnknown_Release(unk); + ok(ref == 0, "ref=%d, expected 0\n", ref); +} + static void test_editing_mode(void) { IUnknown *unk; @@ -3135,6 +3213,7 @@ static void test_editing_mode(void) hres = create_document(&unk); if(FAILED(hres)) return; + doc_unk = unk; hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); @@ -3223,6 +3302,7 @@ START_TEST(htmldoc) test_HTMLDocument(LD_NO); test_HTMLDocument(LD_DOLOAD); test_HTMLDocument_hlink(); + test_HTMLDocument_StreamLoad(); test_editing_mode(); DestroyWindow(container_hwnd);

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
72
Older →

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 May 2007