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

appdb/include objectManager.php
by WineHQ June 11, 2007

June 11, 2007

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 June 11, 2007

June 11, 2007

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 June 11, 2007

June 11, 2007

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 June 11, 2007

June 11, 2007

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 IsDirty tests.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 431cf8038e19c2c2270cb44dacd99f1e1cf6aab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=431cf8038e19c2c2270cb44da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:21:58 2007 +0200 mshtml: Added IsDirty tests. --- dlls/mshtml/tests/htmldoc.c | 44 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 52053ae..6196610 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2436,12 +2436,12 @@ static void test_QueryStatus(IUnknown *unk, REFIID cgid, ULONG cmdid, DWORD cmdf return; hres = IOleCommandTarget_QueryStatus(cmdtrg, cgid, 1, &olecmd, NULL); - ok(hres == S_OK, "QueryStatus failed: %08x\n", hres); + ok(hres == S_OK, "QueryStatus(%u) failed: %08x\n", cmdid, hres); IOleCommandTarget_Release(cmdtrg); ok(olecmd.cmdID == cmdid, "cmdID changed\n"); - ok(olecmd.cmdf == cmdf, "cmdf=%08x, expected %08x\n", olecmd.cmdf, cmdf); + ok(olecmd.cmdf == cmdf, "(%u) cmdf=%08x, expected %08x\n", cmdid, olecmd.cmdf, cmdf); } static void test_MSHTML_QueryStatus(IUnknown *unk, DWORD cmdf) @@ -2510,7 +2510,7 @@ static void test_OleCommandTarget_fail(IUnknown *unk) }; hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "QueryInterface(IIDIOleM=CommandTarget failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IIDIOleCommandTarget failed: %08x\n", hres); if(FAILED(hres)) return; @@ -2673,6 +2673,38 @@ static void test_exec_noargs(IUnknown *unk, DWORD cmdid) IOleCommandTarget_Release(cmdtrg); } +static void test_IsDirty(IUnknown *unk, HRESULT exhres) +{ + IPersistStreamInit *perinit; + IPersistMoniker *permon; + IPersistFile *perfile; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IPersistStreamInit, (void**)&perinit); + ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit failed: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IPersistStreamInit_IsDirty(perinit); + ok(hres == exhres, "IsDirty() = %08x, expected %08x\n", hres, exhres); + IPersistStreamInit_Release(perinit); + } + + hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&permon); + ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker failed: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IPersistMoniker_IsDirty(permon); + ok(hres == exhres, "IsDirty() = %08x, expected %08x\n", hres, exhres); + IPersistMoniker_Release(permon); + } + + hres = IUnknown_QueryInterface(unk, &IID_IPersistFile, (void**)&perfile); + ok(hres == S_OK, "QueryInterface(IID_IPersistFile failed: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IPersistFile_IsDirty(perfile); + ok(hres == exhres, "IsDirty() = %08x, expected %08x\n", hres, exhres); + IPersistFile_Release(perfile); + } +} + static HWND create_container_window(void) { static const WCHAR wszHTMLDocumentTest[] = @@ -3155,6 +3187,7 @@ static void test_HTMLDocument(enum load_state_t ls) doc_unk = unk; test_QueryInterface(unk); + test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_ConnectionPointContainer(unk); test_Persist(unk); @@ -3175,6 +3208,7 @@ static void test_HTMLDocument(enum load_state_t ls) test_OleCommandTarget(unk); test_OnAmbientPropertyChange(unk); test_Window(unk, TRUE); + test_UIDeactivate(); test_OleCommandTarget(unk); test_Window(unk, TRUE); @@ -3241,11 +3275,13 @@ static void test_HTMLDocument_hlink(void) test_download(FALSE, TRUE); + test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_exec_onunload(unk); test_Window(unk, TRUE); test_InPlaceDeactivate(unk, TRUE); test_Close(unk, FALSE); + test_IsDirty(unk, S_FALSE); if(view) IOleDocumentView_Release(view); @@ -3276,6 +3312,7 @@ static void test_HTMLDocument_StreamLoad(void) ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); test_readyState(unk); + test_IsDirty(unk, S_FALSE); test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); @@ -3290,6 +3327,7 @@ static void test_HTMLDocument_StreamLoad(void) test_UIDeactivate(); test_InPlaceDeactivate(unk, TRUE); test_Close(unk, FALSE); + test_IsDirty(unk, S_FALSE); if(view) { IOleDocumentView_Release(view);

1 0

Jacek Caban : mshtml: Added IHTMLStyle::get_fontFamily implementation.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 1d428f48379b2efb694b5b443a26f5d4b7cf813d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d428f48379b2efb694b5b443… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:55:25 2007 +0200 mshtml: Added IHTMLStyle::get_fontFamily implementation. --- dlls/mshtml/htmlstyle.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ea84ea6..3657033 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -77,6 +77,30 @@ static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value) return S_OK; } +static HRESULT get_style_attr(HTMLStyle *This, LPCWSTR name, BSTR *p) +{ + nsAString str_name, str_value; + const PRUnichar *value; + nsresult nsres; + + nsAString_Init(&str_name, name); + nsAString_Init(&str_value, NULL); + + nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(This->nsstyle, &str_name, &str_value); + if(NS_FAILED(nsres)) + ERR("SetProperty failed: %08x\n", nsres); + + nsAString_GetData(&str_value, &value, NULL); + *p = SysAllocString(value); + + nsAString_Finish(&str_name); + nsAString_Finish(&str_value); + + TRACE("%s -> %s\n", debugstr_w(name), debugstr_w(*p)); + + return S_OK; +} + #define HTMLSTYLE_THIS(iface) DEFINE_THIS(HTMLStyle, HTMLStyle, iface) static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, void **ppv) @@ -175,8 +199,10 @@ static HRESULT WINAPI HTMLStyle_put_fontFamily(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_fontFamily(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, attrFontFamily, p); } static HRESULT WINAPI HTMLStyle_put_fontStyle(IHTMLStyle *iface, BSTR v)

1 0

Jacek Caban : mshtml: Added IDM_COMPOSESETTINGS implementation.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: b0fc3115c96b051420247cc706db0f44f06b7257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fc3115c96b051420247cc70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:20:30 2007 +0200 mshtml: Added IDM_COMPOSESETTINGS implementation. --- dlls/mshtml/editor.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 12a43e1..6edf951 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -864,14 +864,72 @@ static HRESULT exec_outdent(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, V static HRESULT exec_composesettings(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { + WCHAR *ptr; + if(out || !in || V_VT(in) != VT_BSTR) { WARN("invalid arg\n"); return E_INVALIDARG; } - FIXME("%s\n", debugstr_w(V_BSTR(in))); + TRACE("(%p)->(%x %s)\n", This, cmdexecopt, debugstr_w(V_BSTR(in))); update_doc(This, UPDATE_UI); + + ptr = V_BSTR(in); + if(*ptr == '1') + exec_bold(This, cmdexecopt, NULL, NULL); + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + if(*++ptr == '1') + exec_italic(This, cmdexecopt, NULL, NULL); + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + if(*++ptr == '1') + exec_underline(This, cmdexecopt, NULL, NULL); + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + if(isdigitW(*++ptr)) { + VARIANT v; + + V_VT(&v) = VT_I4; + V_I4(&v) = *ptr-'0'; + + exec_fontsize(This, cmdexecopt, &v, NULL); + } + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + if(*++ptr != ',') + FIXME("set font color\n"); + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + if(*++ptr != ',') + FIXME("set background color\n"); + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + ptr++; + if(*ptr) { + VARIANT v; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(ptr); + + exec_fontname(This, cmdexecopt, &v, NULL); + + SysFreeString(V_BSTR(&v)); + } + return S_OK; }

1 0

Jacek Caban : mshtml: Added semi stub IsDirty implementation.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: a8db34243040061eb0608b5aa192b6e097f2721c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8db34243040061eb0608b5aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:21:14 2007 +0200 mshtml: Added semi stub IsDirty implementation. --- dlls/mshtml/persist.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index cb1025b..13c07d4 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -565,8 +565,13 @@ static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CL static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) { HTMLDocument *This = PERSTRINIT_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if(This->usermode == EDITMODE) + FIXME("Unimplemented in edit mode\n"); + + return S_FALSE; } static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM pStm)

1 0

Jacek Caban : mshtml: Added IDM_RESPECTVISIBILITY_INDESIGN command stub implementation.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 2aa419e809314ac40b7a994aff3bdbff69e2829f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa419e809314ac40b7a994af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:53:29 2007 +0200 mshtml: Added IDM_RESPECTVISIBILITY_INDESIGN command stub implementation. --- dlls/mshtml/olecmd.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8a0aa61..8f8837d 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.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 @@ -576,6 +576,13 @@ static HRESULT exec_baselinefont3(HTMLDocument *This, DWORD cmdexecopt, VARIANT return S_OK; } +static HRESULT exec_respectvisibility_indesign(HTMLDocument *This, DWORD cmdexecopt, + VARIANT *in, VARIANT *out) +{ + FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + return E_NOTIMPL; +} + static HRESULT query_enabled_stub(HTMLDocument *This, OLECMD *cmd) { switch(cmd->cmdID) { @@ -653,6 +660,7 @@ static const cmdtable_t base_cmds[] = { {IDM_BASELINEFONT3, NULL, exec_baselinefont3}, {IDM_BLOCKDIRLTR, query_enabled_stub, NULL}, {IDM_BLOCKDIRRTL, query_enabled_stub, NULL}, + {IDM_RESPECTVISIBILITY_INDESIGN, NULL, exec_respectvisibility_indesign}, {0,NULL,NULL} };

1 0

Jacek Caban : mshtml: Set default scrollbar preferences.
by Alexandre Julliard June 11, 2007

June 11, 2007

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