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

appdb/include objectManager.php
by WineHQ 12 Jun '07

12 Jun '07

ChangeSet ID: 31188 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/11 19:36:29 Modified files: include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Pass a valid $iPageRange into display_page_range(), otherwise display_page_range() behaves improperly Patch: http://cvs.winehq.org/patch.py?id=31188 Old revision New revision Changes Path 1.24 1.25 +1 -0 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.24 appdb/include/objectManager.php:1.25 --- appdb/include/objectManager.php:1.24 12 Jun 2007 0:36:29 -0000 +++ appdb/include/objectManager.php 12 Jun 2007 0:36:29 -0000 @@ -580,6 +580,7 @@ class ObjectManager echo "<b>Page $iPage of $iNumPages</b><br />"; /* Page controls */ + $iPageRange = 7; // the number of page links we want to display display_page_range($iPage, $iPageRange, $iNumPages, $this->makeUrl()."&iItemsPerPage=". "$iItemsPerPage");

1 0

appdb/include objectManager.php testData.php t ...
by WineHQ 12 Jun '07

12 Jun '07

ChangeSet ID: 31187 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/11 19:02:41 Modified files: include : objectManager.php testData.php testData_queue.php vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add multi-page control to list of un-queued testData Patch: http://cvs.winehq.org/patch.py?id=31187 Old revision New revision Changes Path 1.23 1.24 +2 -2 appdb/include/objectManager.php 1.59 1.60 +41 -7 appdb/include/testData.php 1.9 1.10 +12 -2 appdb/include/testData_queue.php 1.30 1.31 +1 -1 appdb/include/vendor.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.23 appdb/include/objectManager.php:1.24 --- appdb/include/objectManager.php:1.23 12 Jun 2007 0: 2:41 -0000 +++ appdb/include/objectManager.php 12 Jun 2007 0: 2:41 -0000 @@ -532,14 +532,14 @@ class ObjectManager $oObject = new $this->sClass(); if(!method_exists($oObject, "objectGetItemsPerPage") || - $oObject->objectGetItemsPerPage() === FALSE) + $oObject->objectGetItemsPerPage($this->bIsQueue) === FALSE) { /* Do not enable the MultiPage controls */ $this->oMultiPage->MultiPage(FALSE); return; } - $aReturn = $oObject->objectGetItemsPerPage(); + $aReturn = $oObject->objectGetItemsPerPage($this->bIsQueue); $aItemsPerPage = $aReturn[0]; $iDefaultPerPage = $aReturn[1]; Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.59 appdb/include/testData.php:1.60 --- appdb/include/testData.php:1.59 12 Jun 2007 0: 2:41 -0000 +++ appdb/include/testData.php 12 Jun 2007 0: 2:41 -0000 @@ -841,10 +841,24 @@ class testData{ return $oRow->count; } - function objectGetEntries($bQueued, $bRejected, $sOrderBy = "testingId") + function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sOrderBy = "testingId") { $oTest = new testData(); $sQueued = objectManager::getQueueString($bQueued, $bRejected); + + $sLimit = ""; + + /* Should we add a limit clause to the query? */ + if($iRows || $iStart) + { + $sLimit = " LIMIT ?,?"; + + /* Selecting 0 rows makes no sense, so we assume the user wants to select all of them + after an offset given by iStart */ + if(!$iRows) + $iRows = testData::objectGetEntriesCount($bQueued, $bRejected); + } + if($bQueued && !$oTest->canEdit()) { if($bRejected) @@ -856,7 +870,7 @@ class testData{ AND testResults.submitterId = '?' AND - testResults.queued = '?' ORDER BY '?'"; + testResults.queued = '?' ORDER BY '?'$sLimit"; } else { $sQuery = "SELECT testResults.* FROM testResults, appVersion, @@ -881,10 +895,17 @@ class testData{ ) ) AND - testResults.queued = '?' ORDER BY '?'"; + testResults.queued = '?' ORDER BY '?'$sLimit"; + } + if($sLimit) + { + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sQueued, $sOrderBy, $iStart, $iRows); + } else + { + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sQueued, $sOrderBy); } - $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, - $sQueued, $sOrderBy); } else { $sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE @@ -892,8 +913,11 @@ class testData{ AND appVersion.queued = 'false' AND - testResults.queued = '?' ORDER by '?'"; - $hResult = query_parameters($sQuery, $sQueued, $sOrderBy); + testResults.queued = '?' ORDER by '?'$sLimit"; + if($sLimit) + $hResult = query_parameters($sQuery, $sQueued, $sOrderBy, $iStart, $iRows); + else + $hResult = query_parameters($sQuery, $sQueued, $sOrderBy); } if(!$hResult) @@ -1037,6 +1061,16 @@ class testData{ { return FALSE; } + + function objectGetItemsPerPage($bQueued = false) + { + if($bQueued) + return FALSE; + + $aItemsPerPage = array(25, 50, 100, 200); + $iDefaultPerPage = 25; + return array($aItemsPerPage, $iDefaultPerPage); + } } ?> Index: appdb/include/testData_queue.php diff -u -p appdb/include/testData_queue.php:1.9 appdb/include/testData_queue.php:1.10 --- appdb/include/testData_queue.php:1.9 12 Jun 2007 0: 2:41 -0000 +++ appdb/include/testData_queue.php 12 Jun 2007 0: 2:41 -0000 @@ -122,9 +122,14 @@ class testData_queue $this->oTestData->objectDisplayAddItemHelp(); } - function objectGetEntries($bQueued, $bRejected) + function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sOrderBy = "testingId") { - return $this->oTestData->objectGetEntries($bQueued, $bRejected); + return $this->oTestData->objectGetEntries($bQueued, $bRejected, $iRows, $iStart, $sOrderBy); + } + + function objectGetEntriesCount($bQueued, $bRejected) + { + return testData::objectGetEntriesCount($bQueued, $bRejected); } function objectGetHeader() @@ -168,6 +173,11 @@ class testData_queue { return testData::allowAnonymousSubmissions(); } + + function objectGetItemsPerPage($bQueued = false) + { + return testData::objectGetItemsPerPage($bQueued); + } } ?> Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.30 appdb/include/vendor.php:1.31 --- appdb/include/vendor.php:1.30 12 Jun 2007 0: 2:41 -0000 +++ appdb/include/vendor.php 12 Jun 2007 0: 2:41 -0000 @@ -356,7 +356,7 @@ class Vendor { return $this->iVendorId; } - function objectGetItemsPerPage() + function objectGetItemsPerPage($bQueued = false) { $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25;

1 0

appdb/include sidebar_admin.php testData.php
by WineHQ 12 Jun '07

12 Jun '07

ChangeSet ID: 31186 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/11 18:51:29 Modified files: include : sidebar_admin.php testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add 'View Test Results' entry to admin sidebar. Enable testData deletion so we can either edit or delete a given test entry. Patch: http://cvs.winehq.org/patch.py?id=31186 Old revision New revision Changes Path 1.43 1.44 +3 -0 appdb/include/sidebar_admin.php 1.58 1.59 +6 -1 appdb/include/testData.php Index: appdb/include/sidebar_admin.php diff -u -p appdb/include/sidebar_admin.php:1.43 appdb/include/sidebar_admin.php:1.44 --- appdb/include/sidebar_admin.php:1.43 11 Jun 2007 23:51:29 -0000 +++ appdb/include/sidebar_admin.php 11 Jun 2007 23:51:29 -0000 @@ -32,6 +32,9 @@ function global_admin_menu() { BASE."admin/adminMaintainers.php"); $g->add("View Bug Links (".getNumberOfQueuedBugLinks()."/".getNumberOfBugLinks().")", BASE."admin/adminBugs.php"); + $g->add("View Test Results (".testData::objectGetEntriesCount(false, false).")", + BASE."objectManager.php?sClass=testData&bIsQueue=false&sTitle=". + "View%20Test%20Results"); $g->add("Users Management", BASE."admin/adminUsers.php"); $g->add("Comments Management", BASE."admin/adminCommentView.php"); $g->add("Screenshots Management", BASE."admin/adminScreenshots.php"); Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.58 appdb/include/testData.php:1.59 --- appdb/include/testData.php:1.58 11 Jun 2007 23:51:29 -0000 +++ appdb/include/testData.php 11 Jun 2007 23:51:29 -0000 @@ -936,8 +936,13 @@ class testData{ if($this->canEdit() or $this->sQueued == "rejected") { + $shDeleteLink = "[ <a href=\"".$oObject->makeUrl("delete", + $this->iTestingId). + "\"> delete</a> ]"; + $aCells[] = "[ <a href=\"".$oObject->makeUrl("edit", - $this->iTestingId)."\">$sEditLinkLabel</a> ]"; + $this->iTestingId)."\">$sEditLinkLabel</a> ]". + $shDeleteLink; } echo html_tr($aCells, $this->sTestedRating);

1 0

appdb/include appData.php
by WineHQ 12 Jun '07

12 Jun '07

ChangeSet ID: 31185 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/11 18:20:55 Modified files: include : appData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix type in appData::objectGetEntries() Patch: http://cvs.winehq.org/patch.py?id=31185 Old revision New revision Changes Path 1.25 1.26 +1 -1 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.25 appdb/include/appData.php:1.26 --- appdb/include/appData.php:1.25 11 Jun 2007 23:20:55 -0000 +++ appdb/include/appData.php 11 Jun 2007 23:20:55 -0000 @@ -366,7 +366,7 @@ class appData appData.queued = '?' AND appData.type = '?'"; - if(!$iRows && !$iStarts) + if(!$iRows && !$iStart) { $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $bQueued ? "true" : "false", $sType);

1 0

Jacek Caban : mshtml: Added edit mode IDM_CUT implementation.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 371b0edb8ed21065da56bd76dfe12afbd2157026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371b0edb8ed21065da56bd76d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:30:30 2007 +0200 mshtml: Added edit mode IDM_CUT implementation. --- dlls/mshtml/editor.c | 12 ++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/olecmd.c | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 4630cfb..d257c5f 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_CHARNEXT "cmd_charNext" #define NSCMD_CHARPREVIOUS "cmd_charPrevious" #define NSCMD_COPY "cmd_copy" +#define NSCMD_CUT "cmd_cut" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_FONTFACE "cmd_fontFace" #define NSCMD_INDENT "cmd_indent" @@ -946,6 +947,17 @@ HRESULT editor_exec_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARI return S_OK; } +HRESULT editor_exec_cut(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + update_doc(This, UPDATE_UI); + + if(!This->nscontainer) + return E_FAIL; + + do_ns_editor_command(This->nscontainer, NSCMD_CUT); + return S_OK; +} + HRESULT editor_exec_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { update_doc(This, UPDATE_UI); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4c4ee4a..74ee748 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -399,6 +399,7 @@ void init_editor(HTMLDocument*); void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); +HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index e2b749c..288a12b 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -487,7 +487,12 @@ static HRESULT query_mshtml_cut(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_cut(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + + if(This->usermode == EDITMODE) + return editor_exec_cut(This, cmdexecopt, in, out); + + FIXME("Unimplemented in browse mode\n"); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added edit mode IDM_PASTE implementation.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 775425b24bad6a3bea8353aaca0c206cd1476740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=775425b24bad6a3bea8353aac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:29:53 2007 +0200 mshtml: Added edit mode IDM_PASTE implementation. --- dlls/mshtml/editor.c | 12 ++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/olecmd.c | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 432f48c..4630cfb 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -53,6 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_MOVEPAGEUP "cmd_movePageUp" #define NSCMD_OL "cmd_ol" #define NSCMD_OUTDENT "cmd_outdent" +#define NSCMD_PASTE "cmd_paste" #define NSCMD_SELECTCHARNEXT "cmd_selectCharNext" #define NSCMD_SELECTCHARPREVIOUS "cmd_selectCharPrevious" #define NSCMD_SELECTLINENEXT "cmd_selectLineNext" @@ -945,6 +946,17 @@ HRESULT editor_exec_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARI return S_OK; } +HRESULT editor_exec_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + update_doc(This, UPDATE_UI); + + if(!This->nscontainer) + return E_FAIL; + + do_ns_editor_command(This->nscontainer, NSCMD_PASTE); + return S_OK; +} + static HRESULT query_edit_status(HTMLDocument *This, OLECMD *cmd) { switch(cmd->cmdID) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 33806f6..4c4ee4a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -399,6 +399,7 @@ void init_editor(HTMLDocument*); void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); +HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 61deb68..e2b749c 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -500,7 +500,12 @@ static HRESULT query_mshtml_paste(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + + if(This->usermode == EDITMODE) + return editor_exec_paste(This, cmdexecopt, in, out); + + FIXME("Unimplemented in browse mode\n"); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added edit mode IDM_COPY implementation.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 4231c9e2ee4bac80396db7ed47944b9c194d7597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4231c9e2ee4bac80396db7ed4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:28:48 2007 +0200 mshtml: Added edit mode IDM_COPY implementation. --- dlls/mshtml/editor.c | 12 ++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/olecmd.c | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 6edf951..432f48c 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_BOLD "cmd_bold" #define NSCMD_CHARNEXT "cmd_charNext" #define NSCMD_CHARPREVIOUS "cmd_charPrevious" +#define NSCMD_COPY "cmd_copy" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_FONTFACE "cmd_fontFace" #define NSCMD_INDENT "cmd_indent" @@ -933,6 +934,17 @@ static HRESULT exec_composesettings(HTMLDocument *This, DWORD cmdexecopt, VARIAN return S_OK; } +HRESULT editor_exec_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + update_doc(This, UPDATE_UI); + + if(!This->nscontainer) + return E_FAIL; + + do_ns_editor_command(This->nscontainer, NSCMD_COPY); + return S_OK; +} + static HRESULT query_edit_status(HTMLDocument *This, OLECMD *cmd) { switch(cmd->cmdID) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 44d6645..33806f6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -398,6 +398,7 @@ void update_title(HTMLDocument*); void init_editor(HTMLDocument*); void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); +HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8f8837d..61deb68 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -469,7 +469,12 @@ static HRESULT query_mshtml_copy(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + + if(This->usermode == EDITMODE) + return editor_exec_copy(This, cmdexecopt, in, out); + + FIXME("Unimplemented in browse mode\n"); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added COMMENT_NODE implementation in nsnode_to_nsstring_rec.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 9e3021746cbd5b4a71a3da3ccac74e2d58385bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3021746cbd5b4a71a3da3cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:54:51 2007 +0200 mshtml: Added COMMENT_NODE implementation in nsnode_to_nsstring_rec. --- dlls/mshtml/nsembed.c | 6 ++++++ dlls/mshtml/nsiface.idl | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 4282789..40225d5 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -513,6 +513,12 @@ static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode nsIDOMText_Release(nstext); break; } + case COMMENT_NODE: { + nsIDOMComment *nscomment; + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMComment, (void**)&nscomment); + nsres = nsIContentSerializer_AppendComment(serializer, nscomment, 0, -1, str); + break; + } case DOCUMENT_NODE: { nsIDOMDocument *nsdoc; nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMDocument, (void**)&nsdoc); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 347fd49..cc7ae35 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -99,7 +99,6 @@ typedef nsISupports nsIDOMNamedNodeMap; typedef nsISupports nsIDOMAttr; typedef nsISupports nsIDOMDocumentType; typedef nsISupports nsIDOMDOMImplementation; -typedef nsISupports nsIDOMComment; typedef nsISupports nsIDOMCDATASection; typedef nsISupports nsIDOMProcessingInstruction; typedef nsISupports nsIDOMEntityReference; @@ -594,6 +593,15 @@ interface nsIDOMText : nsIDOMCharacterData [ object, + uuid(a6cf9073-15b3-11d2-932e-00805f8add32) + /* FROZEN */ +] +interface nsIDOMComment : nsIDOMCharacterData +{ +} + +[ + object, uuid(a6cf9076-15b3-11d2-932e-00805f8add32) /* FROZEN */ ] @@ -1152,6 +1160,7 @@ interface nsIWebBrowserPrint : nsISupports [ object, uuid(919e792a-6490-40b8-bba5-f9e9ad5640c8) + /* NOT_FROZEN */ ] interface nsIScrollable : nsISupports {

1 0

Jacek Caban : mshtml: Silence invalid FIXME for ELEMENT_DOCUMENT_FRAGMENT_NODE in nsnode_to_nsstring_rec .
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 21d61dae88e0f0eba2e78bf093301238dd8261c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d61dae88e0f0eba2e78bf09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:54:11 2007 +0200 mshtml: Silence invalid FIXME for ELEMENT_DOCUMENT_FRAGMENT_NODE in nsnode_to_nsstring_rec. --- dlls/mshtml/nsembed.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index df6bcf3..4282789 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -520,6 +520,8 @@ static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode nsIDOMDocument_Release(nsdoc); break; } + case DOCUMENT_FRAGMENT_NODE: + break; default: FIXME("Unhandled type %u\n", type); }

1 0

Jacek Caban : mshtml: Set default scrollbar preferences.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: bd5d6f753c355311670f41be5a53259e6c5b645c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5d6f753c355311670f41be5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:52:53 2007 +0200 mshtml: Set default scrollbar preferences. --- dlls/mshtml/nsembed.c | 20 +++++++++++++++++++- dlls/mshtml/nsiface.idl | 31 ++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f8944e9..df6bcf3 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 Jacek Caban for CodeWeavers + * Copyright 2005-2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1526,6 +1526,7 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) { nsIDOMWindow *dom_window; nsIWebBrowserSetup *wbsetup; + nsIScrollable *scrollable; NSContainer *ret; nsresult nsres; @@ -1642,6 +1643,23 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) ERR("GetContentDOMWindow failed: %08x\n", nsres); } + nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIScrollable, (void**)&scrollable); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIScrollable_SetDefaultScrollbarPreferences(scrollable, + ScrollOrientation_Y, Scrollbar_Always); + if(NS_FAILED(nsres)) + ERR("Could not set default Y scrollbar prefs: %08x\n", nsres); + + nsres = nsIScrollable_SetDefaultScrollbarPreferences(scrollable, + ScrollOrientation_X, Scrollbar_Auto); + if(NS_FAILED(nsres)) + ERR("Could not set default X scrollbar prefs: %08x\n", nsres); + + nsIScrollable_Release(scrollable); + }else { + ERR("Could not get nsIScrollable: %08x\n", nsres); + } + return ret; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 9643e61..347fd49 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 Jacek Caban for CodeWeavers + * Copyright 2005-2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1151,6 +1151,35 @@ interface nsIWebBrowserPrint : nsISupports [ object, + uuid(919e792a-6490-40b8-bba5-f9e9ad5640c8) +] +interface nsIScrollable : nsISupports +{ + enum { + ScrollOrientation_X = 1, + ScrollOrientation_Y = 2 + }; + + enum { + Scrollbar_Auto = 1, + Scrollbar_Never = 2, + Scrollbar_Always = 3 + }; + + nsresult GetCurScrollPos(PRInt32 scrollOrientation, PRInt32 *curPos); + nsresult SetCurScrollPos(PRInt32 scrollOrientation, PRInt32 curPos); + nsresult SetCurScrollPosEx(PRInt32 curHorizontalPos, PRInt32 curVerticalPos); + nsresult GetScrollRange(PRInt32 scrollOrientation, PRInt32 *minPos, PRInt32 *maxPos); + nsresult SetScrollRange(PRInt32 scrollOrientation, PRInt32 minPos, PRInt32 maxPos); + nsresult SetScrollRangeEx(PRInt32 minHorizontalPos, PRInt32 maxHorizontalPos, + PRInt32 minVerticalPos, PRInt32 maxVerticalPos); + nsresult GetDefaultScrollbarPreferences(PRInt32 scrollOrientation, PRInt32 *scrollbarPref); + nsresult SetDefaultScrollbarPreferences(PRInt32 scrollOrientation, PRInt32 scrollbarPref); + nsresult GetScrollbarVisibility(PRBool *verticalVisible, PRBool *horizontalVisible); +} + +[ + object, uuid(c8c0a080-0868-11d3-915f-d9d889d48e3c) /* FROZEN */ ]

1 0