February 2017 - Wine-commits

Jeremy Newman : add loader for wysiwyg editor fields
by Jeremy Newman 03 Feb '17

03 Feb '17

Module: appdb Branch: master Commit: 5988d57b8b176303a9b3ac4a6f56d3a543717396 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5988d57b8b176303a9b3ac4a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:04:14 2017 -0600 add loader for wysiwyg editor fields * using redactor and codemirror * add dynamic css and js loader funcs * import sWebRoot from main website for paths --- js/utils.js | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 114 insertions(+), 14 deletions(-) diff --git a/js/utils.js b/js/utils.js index 204428e..d23e964 100644 --- a/js/utils.js +++ b/js/utils.js @@ -7,6 +7,110 @@ console.log('Welcome to the %cWineHQ%c AppDB', 'color: #490708; font-size: 48pt; font-style: italic; font-weight: bold;', 'color: #95493A; font-size: 48pt; font-style: italic; font-weight: bold;'); +/* + * jQuery old style toggle replacement + * this useful object was removed in jquery 1.9 + */ +$.fn.toggleClick = function(){ + var functions = arguments ; + return this.click(function(){ + var iteration = $(this).data('iteration') || 0; + functions[iteration].apply(this, arguments); + iteration = (iteration + 1) % functions.length ; + $(this).data('iteration', iteration); + }); +}; + +// load javascript file +// note: to force reload of js code, touch the dir +(function($){ + $.check_and_require=function(file,callback) + { + var full_path = sWebRoot + "js/" + file + '.js'; + var options = { + dataType: 'script', + cache: true, + async: false, + url: full_path, + success: callback + }; + $.ajax(options); + } +})(jQuery); + +// load css file once (use CDN if enabled) +var loadedCSS = []; +(function($){ + $.load_css_once=function(file) + { + if ($.inArray(file,loadedCSS) == -1) { + $('<link rel="stylesheet" type="text/css" href="' + sWebRoot + 'css/' + file + '.css" />').appendTo("head"); + loadedCSS.push(file); + } + } +})(jQuery); + +/* + * Load our preferred wysiwyg editor on a field + redactor II: http://imperavi.com/redactor/ + */ +(function($){ + $.fn.whq_wysiwyg = function () + { + // save this + var t = this; + + // calculate height + var iHeight = ($(t).attr("rows") ? ($(t).attr("rows") * 15) + 'px' : $(t).css('height')); + + // default redactor opts + var redactor_opts = { + minHeight: iHeight, + maxHeight: iHeight, + toolbarFixed: false, + focus: false, + overrideStyles: false, + pastePlainText: true, + dragImageUpload: false, + clipboardImageUpload: false, + multipleImageUpload: false, + imageResizable: true, + imagePosition: true, + imageCaption: true, + imageTag: 'figure', + script: false, + plugins: ['codemirror','alignment','table','fontcolor','fontfamily','fontsize','fullscreen','iconic'], + buttons: ['fullscreen', 'html', 'format', 'bold', 'italic', 'underline', 'deleted', + 'table', 'lists', 'alignment', 'horizontalrule','image', 'link'], + buttonsHideOnMobile: ['image','table'], + codemirror: { + lineNumbers: true, + lineWrapping: true, + mode: 'htmlmixed', + indentUnit: 4 + } + }; + + // load and execute codemirror + $.check_and_require('codemirror', function() + { + // load css + $.load_css_once('codemirror'); + $.load_css_once('redactor'); + + // load and execute redactor + $.check_and_require("redactor.min", function() + { + // load redactor on field + $(t).redactor(redactor_opts); + }); + }); + + // return calling object + return this; + } +})(jQuery); + // execute on when document ready $(document).ready(function() { @@ -79,6 +183,12 @@ $(document).ready(function() }); }); + // wysiwyg HTML editor + $("textarea.wysiwyg").each(function() + { + $(this).whq_wysiwyg(); + }); + // remove alert messages by clicking $("#whq-alert").click(function(){ $(this).fadeOut("slow"); }); @@ -92,20 +202,10 @@ $(document).ready(function() { $('div#dlogp').slideUp(); }); -}); -/* - * jQuery old style toggle replacement - * this useful object was removed in jquery 1.9 - */ -$.fn.toggleClick = function(){ - var functions = arguments ; - return this.click(function(){ - var iteration = $(this).data('iteration') || 0; - functions[iteration].apply(this, arguments); - iteration = (iteration + 1) % functions.length ; - $(this).data('iteration', iteration); - }); -}; + // HTML editor (redactor loader) + + +}); // done \ No newline at end of file

1 0

Jeremy Newman : remove xinha editor loader
by Jeremy Newman 03 Feb '17

03 Feb '17

Module: appdb Branch: master Commit: c364568a9e53ff09c45f327b6b556b12dc6c43e4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c364568a9e53ff09c45f327b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:05:58 2017 -0600 remove xinha editor loader --- include/util.php | 217 ------------------------------------------------------- 1 file changed, 217 deletions(-) diff --git a/include/util.php b/include/util.php index 367179d..6626027 100644 --- a/include/util.php +++ b/include/util.php @@ -603,223 +603,6 @@ function Simplify($dirs, $idx) } // End of snippet of code copied from php.net -// Use the directory of PHP_SELF and BASE and the relative path -// to get a simplified path to an appdb directory or file -// Used for the Xinha _editor_url because some plugins like SpellChecker -// won't work with relative paths like ../xinha -function GetSimplifiedPath($relative) -{ - return "/".SimplifyPath(dirname($_SERVER['PHP_SELF'])."/".BASE.$relative); -} - -function HtmlAreaLoaderScript($aTextareas) -{ - static $outputIndex = 0; - - /* Check if the user wants to display the HTML editor (always, for supported browsers or never) */ - switch($_SESSION['current']->getPref('htmleditor', 'for supported browsers')) - { - case 'never': - return; - case 'for supported browsers': - // Xinha 0.96.1 tested fine in Opera 11.6 & Konqueror 4.7.2 - break; - case 'always': - break; - } - - echo ' - <script type="text/javascript">'; - // You must set _editor_url to the URL (including trailing slash) where - // where xinha is installed, it's highly recommended to use an absolute URL - // eg: _editor_url = "/path/to/xinha/"; - // You may try a relative URL if you wish] - // eg: _editor_url = "../"; - // in this example we do a little regular expression to find the absolute path. - // NOTE: we use GetSimplifiedPath() because we cannot use a relative path and have - // all of the plugins work correctly. Specifically the SpellChecker plugin - // requires a absolute url path to the xinha directory - echo ' - _editor_url = "'.GetSimplifiedPath("xinha/").'", \'\'; - _editor_lang = "en"; // And the language we need to use in the editor. - </script>'; - - echo ' -  - <script type="text/javascript" src="'.BASE.'xinha/XinhaCore.js"></script> - - <script type="text/javascript"> - xinha_editors_'.$outputIndex.' = null; - xinha_init_'.$outputIndex.' = null;'; - - /* only need to nll out the first set of config and plugins */ - /* as we will reuse these for additional htmlareas */ - if($outputIndex == 0) - { - echo ' - xinha_config_'.$outputIndex.' = null; - xinha_plugins_'.$outputIndex.' = null;'; - } - - echo ' - // This contains the names of textareas we will make into Xinha editors - xinha_init_'.$outputIndex.' = xinha_init_'.$outputIndex.' ? xinha_init_'.$outputIndex.' : function() - {'; - - /** STEP 1 *************************************************************** - * First, what are the plugins you will be using in the editors on this - * page. List all the plugins you will need, even if not all the editors - * will use all the plugins. - ************************************************************************/ - if($outputIndex == 0) - { - echo ' - xinha_plugins_'.$outputIndex.' = xinha_plugins_'.$outputIndex.' ? xinha_plugins_'.$outputIndex.' : - [ - \'CharacterMap\', - \'CharCounter\', - \'ContextMenu\', - \'FullPage\', - \'ListType\', - \'SpellChecker\', - \'Stylist\', - \'SuperClean\', - \'TableOperations\', - \'DynamicCSS\', - \'FindReplace\' - ]; - - // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING :) - if(!HTMLArea.loadPlugins(xinha_plugins_'.$outputIndex.', xinha_init_'.$outputIndex.')) return;'; - } else - { - echo ' - // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING :) - if(!HTMLArea.loadPlugins(xinha_plugins_0, xinha_init_'.$outputIndex.')) return;'; - } - - /** STEP 2 *************************************************************** - * Now, what are the names of the textareas you will be turning into - * editors? - ************************************************************************/ - - // NOTE: we generate the editor names here so we can easily have any number of htmlarea editors - // and can reuse all of this code - echo ' - xinha_editors_'.$outputIndex.' = xinha_editors_'.$outputIndex.' ? xinha_editors_'.$outputIndex.' : - ['; - - $firstEntry = true; - foreach($aTextareas as $key=>$value) - { - if($firstEntry) - { - echo "'$value'"; - $firstEntry = false; - } else - { - echo ", '$value'"; - } - } - - echo ' - ];'; - - /** STEP 3 *************************************************************** - * We create a default configuration to be used by all the editors. - * If you wish to configure some of the editors differently this will be - * done in step 5. - * - * If you want to modify the default config you might do something like this. - * - * xinha_config = new HTMLArea.Config(); - * xinha_config.width = \'640px\'; - * xinha_config.height = \'420px\'; - * - *************************************************************************/ - /* We only need the configuration output for the first htmlarea on a given page */ - if($outputIndex == 0) - { - echo ' - xinha_config_'.$outputIndex.' = new HTMLArea.Config(); - - xinha_config_'.$outputIndex.'.toolbar = [ - ["popupeditor"], - ["separator","fontsize","bold","italic","underline","strikethrough"], - ["separator","forecolor","hilitecolor","textindicator"], - ["separator","subscript","superscript"], - ["linebreak","separator","justifyleft","justifycenter","justifyright","justifyfull"], - ["separator","insertorderedlist","insertunorderedlist","outdent","indent"], - ["separator","inserthorizontalrule","createlink","inserttable"], - ["separator","undo","redo","selectall"], (HTMLArea.is_gecko ? [] : ["cut","copy","paste","overwrite","saveas"]), - ["separator","killword","removeformat","toggleborders","lefttoright", "righttoleft","separator","htmlmode","about"] - ]; - - xinha_config_'.$outputIndex.'.pageStyle = "@import url('.BASE."application.css".');"; - '; - } - - /** STEP 4 *************************************************************** - * We first create editors for the textareas. - * - * You can do this in two ways, either - * - * xinha_editors = HTMLArea.makeEditors(xinha_editors, xinha_config, xinha_plugins); - * - * if you want all the editor objects to use the same set of plugins, OR; - * - * xinha_editors = HTMLArea.makeEditors(xinha_editors, xinha_config); - * xinha_editors['myTextArea'].registerPlugins(['Stylist','FullScreen']); - * xinha_editors['anotherOne'].registerPlugins(['CSS','SuperClean']); - * - * if you want to use a different set of plugins for one or more of the - * editors. - ************************************************************************/ - - echo ' - xinha_editors_'.$outputIndex.' = HTMLArea.makeEditors(xinha_editors_'.$outputIndex.', - xinha_config_0, xinha_plugins_0);'; - - /** STEP 5 *************************************************************** - * If you want to change the configuration variables of any of the - * editors, this is the place to do that, for example you might want to - * change the width and height of one of the editors, like this... - * - * xinha_editors.myTextArea.config.width = '640px'; - * xinha_editors.myTextArea.config.height = '480px'; - * - ************************************************************************/ - - - /** STEP 6 *************************************************************** - * Finally we "start" the editors, this turns the textareas into - * Xinha editors. - ************************************************************************/ - echo ' - HTMLArea.startEditors(xinha_editors_'.$outputIndex.'); - }'; - - if($outputIndex != 0) - { - echo ' - var old_on_load_'.$outputIndex.' = window.onload; - window.onload = function() { - if (typeof old_on_load_'.$outputIndex.' == "function") old_on_load_'.$outputIndex.'(); - xinha_init_'.$outputIndex.'(); - }'; - } else - { - echo ' - window.onload = xinha_init_'.$outputIndex.';'; - } - - echo ' - </SCRIPT> - '; - - $outputIndex++; /* increment the output index */ -} - /** * Cuts the link text to the specified number of chars if it's longer, * and adds an ellipsis

1 0

Jeremy Newman : remove xinha, add wysiwyg class to load editor
by Jeremy Newman 03 Feb '17

03 Feb '17

Module: appdb Branch: master Commit: 8f6be98e4e0fc51b60d6ff514404d404608f0d7e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8f6be98e4e0fc51b60d6ff51… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:06:11 2017 -0600 remove xinha, add wysiwyg class to load editor --- include/application.php | 4 +--- include/filter.php | 5 +---- include/note.php | 4 +--- include/testData.php | 8 +++----- include/version.php | 3 +-- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/include/application.php b/include/application.php index 376b459..75d13ee 100644 --- a/include/application.php +++ b/include/application.php @@ -565,8 +565,6 @@ class Application { /* output a html table and this applications values to the fields for editing */ public function outputEditor($sVendorName = "") { - HtmlAreaLoaderScript(array("app_editor")); - echo '<input type="hidden" name="iAppId" value="'.$this->iAppId.'">'; /* Used to distinguish between the first step of entering an application @@ -638,7 +636,7 @@ class Application { echo '<td><input size="75%" type="text" name="sAppKeywords" value="'.$this->sKeywords.'"></td></tr>',"\n"; echo '<tr valign=top><td class="color0"><b>Application description (In your own words)</b></td>',"\n"; - echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription">'; + echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription" class="wysiwyg">'; echo $this->sDescription.'</textarea></p></td></tr>',"\n"; diff --git a/include/filter.php b/include/filter.php index aa3fa6d..ec4c0b7 100644 --- a/include/filter.php +++ b/include/filter.php @@ -31,14 +31,11 @@ function filter_gpc() // Special cases for variables that don't fit our filtering scheme // don't filter the AppDB session cookie and MAX_FILE_SIZE - // and the DialogX values that xinha uses // NOTE: we must use === when comparing the return value of strpos // against a value, otherwise if strpos() returns false indicating that // the value wasn't found strpos(something) == 0 will still be true - if((strpos($aKeys[$i], "Dialog") === 0) || - (strpos($aKeys[$i], "XinhaColorPicker") === 0) || // Xinha variables - ($aKeys[$i] == "cx") || // google custom search variable + if(($aKeys[$i] == "cx") || // google custom search variable ($aKeys[$i] == "cof") || // google custom search variable ($aKeys[$i] == "q") || // google custom search variable ($aKeys[$i] == "g-recaptcha-response")) // google reCaptcha variable diff --git a/include/note.php b/include/note.php index 0e43cce..8a9dabd 100644 --- a/include/note.php +++ b/include/note.php @@ -382,8 +382,6 @@ class Note { $this->iAppId = $oVersion->iAppId; } - HtmlAreaLoaderScript(array("editor")); - echo html_frame_start("Edit Application Note", "90%","",0); echo html_table_begin("width='100%' border=0 align=left cellpadding=6 cellspacing=0 class='box-body'"); @@ -401,7 +399,7 @@ class Note { echo '</td></tr>'; echo '<tr><td class=color1>Description</td><td class=color0>', "\n"; echo '<p style="width:700px">', "\n"; - echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc">'.$this->shDescription.'</textarea>',"\n"; + echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc" class="wysiwyg">'.$this->shDescription.'</textarea>',"\n"; echo '</p>'; echo '</td></tr>'."\n"; diff --git a/include/testData.php b/include/testData.php index 18a04b4..8ba45c1 100644 --- a/include/testData.php +++ b/include/testData.php @@ -834,8 +834,6 @@ class testData{ if(!$this->sTestedDate) $this->sTestedDate = date('Y-m-d H:i:s'); - HtmlAreaLoaderScript(array("Test1", "Test2", "Test3")); - $sName = version::fullName($this->iVersionId); echo html_frame_start("Test Form - $sName", "90%", "", 0); @@ -843,15 +841,15 @@ class testData{ // What works echo '<tr valign=top><td class="color0"><b>What works</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks">'; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks" class="wysiwyg">'; echo $this->shWhatWorks.'</textarea></p></td></tr>',"\n"; // What Does not work echo '<tr valign=top><td class=color1><b>What does not work</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt">'; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt" class="wysiwyg">'; echo $this->shWhatDoesnt.'</textarea></p></td></tr>',"\n"; // What was not tested echo '<tr valign=top><td class=color0><b>What was not tested</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested">'; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested" class="wysiwyg">'; echo $this->shWhatNotTested.'</textarea></p></td></tr>',"\n"; // Date Tested echo '<tr valign=top><td class="color1"><b>Date tested </b></td>',"\n"; diff --git a/include/version.php b/include/version.php index 2e34d1a..b79954d 100644 --- a/include/version.php +++ b/include/version.php @@ -595,7 +595,6 @@ class version { /* otherwise, if $editParentAppliation is false, we leave them out */ public function outputEditor() { - HtmlAreaLoaderScript(array("version_editor")); echo html_frame_start("Version Form", "90%", "", 0); echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">'; @@ -669,7 +668,7 @@ class version { $oTableCell->SetClass("color0"); $oTableRow->AddCell($oTableCell); - $oTableRow->AddTextCell('<p><textarea cols="80" rows="20" id="version_editor" name="shVersionDescription">'. + $oTableRow->AddTextCell('<p><textarea cols="80" rows="20" id="version_editor" name="shVersionDescription" class="wysiwyg">'. $this->sDescription.'</textarea></p>'); $oTable->AddRow($oTableRow);

1 0

Jeremy Newman : change wording on super maintainer request
by Jeremy Newman 03 Feb '17

03 Feb '17

Module: appdb Branch: master Commit: 0c1548308ae757d006bd2822fd04cb5f7f832a4a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0c1548308ae757d006bd2822… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 09:51:42 2017 -0600 change wording on super maintainer request --- include/application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/application.php b/include/application.php index 2f7491e..376b459 100644 --- a/include/application.php +++ b/include/application.php @@ -653,7 +653,7 @@ class Application { "I would like to be a maintainer of the new version only<br>\n". "<input type=\"radio\" name=\"iMaintainerRequest\" ". "value=\"".SUPERMAINTAINER_REQUEST."\">". - "I would like to be a maintainer of the entire application<br>\n"; + "I would like to be a super maintainer for all versions of this application<br>\n"; $sMaintainerOptionsSelected = str_replace( "value=\"$this->iMaintainerRequest\"",

1 0

Zebediah Figura : compobj: Implement several IIDs.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: d150d08fb00b29065230f6b5a43005bedf296e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d150d08fb00b29065230f6b5a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 2 12:27:09 2017 -0600 compobj: Implement several IIDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.dll16.spec | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 03cf925..85dfc42 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -34,42 +34,42 @@ 34 pascal CoGetCurrentProcess() CoGetCurrentProcess16 35 stub SHRCREATE 36 stub COISOLE1CLASS -37 stub _GUID_NULL -38 stub _IID_IUNKNOWN -39 stub _IID_ICLASSFACTORY -40 stub _IID_IMALLOC -41 stub _IID_IMARSHAL -42 stub _IID_IRPCCHANNEL -43 stub _IID_IRPCSTUB -44 stub _IID_ISTUBMANAGER -45 stub _IID_IRPCPROXY -46 stub _IID_IPROXYMANAGER -47 stub _IID_IPSFACTORY -48 stub _IID_ILOCKBYTES -49 stub _IID_ISTORAGE -50 stub _IID_ISTREAM -51 stub _IID_IENUMSTATSTG -52 stub _IID_IBINDCTX -53 stub _IID_IMONIKER -54 stub _IID_IRUNNINGOBJECTTABLE -55 stub _IID_IINTERNALMONIKER -56 stub _IID_IROOTSTORAGE -57 stub _IID_IDFRESERVED1 -58 stub _IID_IDFRESERVED2 -59 stub _IID_IDFRESERVED3 -60 stub _IID_IMESSAGEFILTER +37 variable _GUID_NULL(0x00000000 0x00000000 0x00000000 0x00000000) +38 variable _IID_IUnknown(0x00000000 0x00000000 0x000000c0 0x46000000) +39 variable _IID_IClassFactory(0x00000001 0x00000000 0x000000c0 0x46000000) +40 variable _IID_IMalloc(0x00000002 0x00000000 0x000000c0 0x46000000) +41 variable _IID_IMarshal(0x00000003 0x00000000 0x000000c0 0x46000000) +42 variable _IID_IRpcChannel(0x00000004 0x00000000 0x000000c0 0x46000000) +43 variable _IID_IRpcStub(0x00000005 0x00000000 0x000000c0 0x46000000) +44 variable _IID_IStubManager(0x00000006 0x00000000 0x000000c0 0x46000000) +45 variable _IID_IRpcProxy(0x00000007 0x00000000 0x000000c0 0x46000000) +46 variable _IID_IProxyManager(0x00000008 0x00000000 0x000000c0 0x46000000) +47 variable _IID_IPSFactory(0x00000009 0x00000000 0x000000c0 0x46000000) +48 variable _IID_ILockBytes(0x0000000a 0x00000000 0x000000c0 0x46000000) +49 variable _IID_IStorage(0x0000000b 0x00000000 0x000000c0 0x46000000) +50 variable _IID_IStream(0x0000000c 0x00000000 0x000000c0 0x46000000) +51 variable _IID_IEnumSTATSTG(0x0000000d 0x00000000 0x000000c0 0x46000000) +52 variable _IID_IBindCtx(0x0000000e 0x00000000 0x000000c0 0x46000000) +53 variable _IID_IMoniker(0x0000000f 0x00000000 0x000000c0 0x46000000) +54 variable _IID_IRunningObjectTable(0x00000010 0x00000000 0x000000c0 0x46000000) +55 variable _IID_IInternalMoniker(0x00000011 0x00000000 0x000000c0 0x46000000) +56 variable _IID_IRootStorage(0x00000012 0x00000000 0x000000c0 0x46000000) +57 variable _IID_IDfReserved1(0x00000013 0x00000000 0x000000c0 0x46000000) +58 variable _IID_IDfReserved2(0x00000014 0x00000000 0x000000c0 0x46000000) +59 variable _IID_IDfReserved3(0x00000015 0x00000000 0x000000c0 0x46000000) +60 variable _IID_IMessageFilter(0x00000016 0x00000000 0x000000c0 0x46000000) 61 pascal CLSIDFromProgID(str ptr) CLSIDFromProgID16 62 pascal ProgIDFromCLSID(ptr ptr) ProgIDFromCLSID16 63 pascal CoLockObjectExternal(segptr word word) CoLockObjectExternal16 -64 stub _CLSID_STDMARSHAL +64 variable _CLSID_StdMarshal(0x00000017 0x00000000 0x000000c0 0x46000000) 65 stub COGETTREATASCLASS 66 stub COTREATASCLASS 67 stub COGETSTANDARDMARSHAL 68 stub PROPAGATERESULT 69 stub IIDFROMSTRING -70 stub _IID_ISTDMARSHALINFO +70 variable _IID_IStdMarshalInfo(0x00000018 0x00000000 0x000000c0 0x46000000) 71 pascal CoCreateStandardMalloc(long ptr) CoCreateStandardMalloc16 -72 stub _IID_IEXTERNALCONNECTION +72 variable _IID_IExternalConnection(0x00000019 0x00000000 0x000000c0 0x46000000) 73 pascal CoCreateGuid(ptr) CoCreateGuid16 75 stub FNASSERT 76 pascal -ret16 StringFromGUID2(ptr ptr word) StringFromGUID216

1 0

Zebediah Figura : ole2: Implement several IIDs.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 72df9e3c0ff1a7193258a1855c2701e146219a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72df9e3c0ff1a7193258a1855… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 2 12:27:10 2017 -0600 ole2: Implement several IIDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2.dll16/ole2.dll16.spec | 84 ++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index ed5e917..108c3ee 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -102,48 +102,48 @@ 113 stub VALIDATEALLOBJECTS 114 stub DBGDUMPCLASSNAME 115 stub DBGDUMPEXTERNALOBJECT -120 stub _IID_IENUMUNKNOWN -121 stub _IID_IENUMSTRING -122 stub _IID_IENUMMONIKER -123 stub _IID_IENUMFORMATETC -124 stub _IID_IENUMOLEVERB -125 stub _IID_IENUMSTATDATA -126 stub _IID_IENUMGENERIC -127 stub _IID_IENUMHOLDER -128 stub _IID_IENUMCALLBACK -129 stub _IID_IPERSISTSTREAM -130 stub _IID_IPERSISTSTORAGE -131 stub _IID_IPERSISTFILE -132 stub _IID_IPERSIST -133 stub _IID_IVIEWOBJECT -134 stub _IID_IDATAOBJECT -135 stub _IID_IADVISESINK -136 stub _IID_IDATAADVISEHOLDER -137 stub _IID_IOLEADVISEHOLDER -138 stub _IID_IOLEOBJECT -139 stub _IID_IOLEINPLACEOBJECT -140 stub _IID_IOLEWINDOW -141 stub _IID_IOLEINPLACEUIWINDOW -142 stub _IID_IOLEINPLACEFRAME -143 stub _IID_IOLEINPLACEACTIVEOBJECT -144 stub _IID_IOLECLIENTSITE -145 stub _IID_IOLEINPLACESITE -146 stub _IID_IPARSEDISPLAYNAME -147 stub _IID_IOLECONTAINER -148 stub _IID_IOLEITEMCONTAINER -149 stub _IID_IOLELINK -150 stub _IID_IOLECACHE -151 stub _IID_IOLEMANAGER -152 stub _IID_IOLEPRESOBJ -153 stub _IID_IDROPSOURCE -154 stub _IID_IDROPTARGET -155 stub _IID_IDEBUG -156 stub _IID_IDEBUGSTREAM -157 stub _IID_IADVISESINK2 -158 stub _IID_IVIEWOBJECT2 -159 stub _IID_IOLECACHE2 -160 stub _IID_IOLECACHECONTROL -161 stub _IID_IRUNNABLEOBJECT +120 variable _IID_IEnumUnknown(0x00000100 0x00000000 0x000000c0 0x46000000) +121 variable _IID_IEnumString(0x00000101 0x00000000 0x000000c0 0x46000000) +122 variable _IID_IEnumMoniker(0x00000102 0x00000000 0x000000c0 0x46000000) +123 variable _IID_IEnumFORMATETC(0x00000103 0x00000000 0x000000c0 0x46000000) +124 variable _IID_IEnumOLEVERB(0x00000104 0x00000000 0x000000c0 0x46000000) +125 variable _IID_IEnumSTATDATA(0x00000105 0x00000000 0x000000c0 0x46000000) +126 variable _IID_IEnumGeneric(0x00000106 0x00000000 0x000000c0 0x46000000) +127 variable _IID_IEnumHolder(0x00000107 0x00000000 0x000000c0 0x46000000) +128 variable _IID_IEnumCallback(0x00000108 0x00000000 0x000000c0 0x46000000) +129 variable _IID_IPersistStream(0x00000109 0x00000000 0x000000c0 0x46000000) +130 variable _IID_IPersistStorage(0x0000010a 0x00000000 0x000000c0 0x46000000) +131 variable _IID_IPersistFile(0x0000010b 0x00000000 0x000000c0 0x46000000) +132 variable _IID_IPersist(0x0000010c 0x00000000 0x000000c0 0x46000000) +133 variable _IID_IViewObject(0x0000010d 0x00000000 0x000000c0 0x46000000) +134 variable _IID_IDataObject(0x0000010e 0x00000000 0x000000c0 0x46000000) +135 variable _IID_IAdviseSink(0x0000010f 0x00000000 0x000000c0 0x46000000) +136 variable _IID_IDataAdviseHolder(0x00000110 0x00000000 0x000000c0 0x46000000) +137 variable _IID_IOleAdviseHolder(0x00000111 0x00000000 0x000000c0 0x46000000) +138 variable _IID_IOleObject(0x00000112 0x00000000 0x000000c0 0x46000000) +139 variable _IID_IOleInPlaceObject(0x00000113 0x00000000 0x000000c0 0x46000000) +140 variable _IID_IOleWindow(0x00000114 0x00000000 0x000000c0 0x46000000) +141 variable _IID_IOleInPlaceUIWindow(0x00000115 0x00000000 0x000000c0 0x46000000) +142 variable _IID_IOleInPlaceFrame(0x00000116 0x00000000 0x000000c0 0x46000000) +143 variable _IID_IOleInPlaceActiveObject(0x00000117 0x00000000 0x000000c0 0x46000000) +144 variable _IID_IOleClientSite(0x00000118 0x00000000 0x000000c0 0x46000000) +145 variable _IID_IOleInPlaceSite(0x00000119 0x00000000 0x000000c0 0x46000000) +146 variable _IID_IParseDisplayName(0x0000011a 0x00000000 0x000000c0 0x46000000) +147 variable _IID_IOleContainer(0x0000011b 0x00000000 0x000000c0 0x46000000) +148 variable _IID_IOleItemContainer(0x0000011c 0x00000000 0x000000c0 0x46000000) +149 variable _IID_IOleLink(0x0000011d 0x00000000 0x000000c0 0x46000000) +150 variable _IID_IOleCache(0x0000011e 0x00000000 0x000000c0 0x46000000) +151 variable _IID_IOleManager(0x0000011f 0x00000000 0x000000c0 0x46000000) +152 variable _IID_IOlePresObj(0x00000120 0x00000000 0x000000c0 0x46000000) +153 variable _IID_IDropSource(0x00000121 0x00000000 0x000000c0 0x46000000) +154 variable _IID_IDropTarget(0x00000122 0x00000000 0x000000c0 0x46000000) +155 variable _IID_IDebug(0x00000123 0x00000000 0x000000c0 0x46000000) +156 variable _IID_IDebugStream(0x00000124 0x00000000 0x000000c0 0x46000000) +157 variable _IID_IAdviseSink2(0x00000125 0x00000000 0x000000c0 0x46000000) +158 variable _IID_IViewObject2(0x00000127 0x00000000 0x000000c0 0x46000000) +159 variable _IID_IOleCache2(0x00000128 0x00000000 0x000000c0 0x46000000) +160 variable _IID_IOleCacheControl(0x00000129 0x00000000 0x000000c0 0x46000000) +161 variable _IID_IRunnableObject(0x00000126 0x00000000 0x000000c0 0x46000000) # WINE MemLockBytes implementation. 500 cdecl HGLOBALLockBytesImpl16_QueryInterface(segptr ptr ptr) HGLOBALLockBytesImpl16_QueryInterface

1 0

Zebediah Figura : avifile: Implement several IIDs.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: e29b1682c2e1c7e97ca0a401e9098ea882b94e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29b1682c2e1c7e97ca0a401e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 2 12:27:11 2017 -0600 avifile: Implement several IIDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifile.dll16/avifile.dll16.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/avifile.dll16/avifile.dll16.spec b/dlls/avifile.dll16/avifile.dll16.spec index 71a6c74..239d3a4 100644 --- a/dlls/avifile.dll16/avifile.dll16.spec +++ b/dlls/avifile.dll16/avifile.dll16.spec @@ -7,11 +7,11 @@ 2 stub DLLGETCLASSOBJECT 3 stub DLLCANUNLOADNOW 4 stub ___EXPORTEDSTUB -10 stub _IID_IAVISTREAM -11 stub _IID_IAVIFILE -12 stub _IID_IAVIEDITSTREAM -13 stub _IID_IGETFRAME -14 stub _CLSID_AVISIMPLEUNMARSHAL +10 variable _IID_IAVIStream(0x00020021 0x00000000 0x000000c0 0x46000000) +11 variable _IID_IAVIFile(0x00020020 0x00000000 0x000000c0 0x46000000) +12 variable _IID_IAVIEditStream(0x00020024 0x00000000 0x000000c0 0x46000000) +13 variable _IID_IGetFrame(0x00020023 0x00000000 0x000000c0 0x46000000) +14 variable _CLSID_AVISimpleUnMarshal(0x00020009 0x00000000 0x000000c0 0x46000000) 100 pascal AVIFileInit() AVIFileInit 101 pascal AVIFileExit() AVIFileExit 102 pascal AVIFileOpen(ptr str word ptr) AVIFileOpenA

1 0

Zebediah Figura : ole2disp: Implement several IIDs.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 77d99bbff3c26960aaa18a93f0e1156615a98648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d99bbff3c26960aaa18a93f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 2 12:27:12 2017 -0600 ole2disp: Implement several IIDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.dll16.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 4ee52e1..4b8af41 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -30,8 +30,8 @@ 30 stub DISPINVOKE 31 pascal CreateDispTypeInfo(ptr long ptr) CreateDispTypeInfo16 32 pascal CreateStdDispatch(ptr ptr ptr ptr) CreateStdDispatch16 -33 stub _IID_IDISPATCH -34 stub _IID_IENUMVARIANT +33 variable _IID_IDispatch(0x00020400 0x00000000 0x000000c0 0x46000000) +34 variable _IID_IEnumVARIANT(0x00020404 0x00000000 0x000000c0 0x46000000) 35 pascal RegisterActiveObject(ptr ptr long ptr) RegisterActiveObject16 36 stub REVOKEACTIVEOBJECT 37 stub GETACTIVEOBJECT @@ -110,9 +110,9 @@ 110 pascal SetErrorInfo(long ptr) SetErrorInfo16 111 stub GETERRORINFO 112 stub CREATEERRORINFO -113 stub _IID_IERRORINFO -114 stub _IID_ICREATEERRORINFO -115 stub _IID_ISUPPORTERRORINFO +113 variable _IID_IErrorInfo(0x1cf2b120 0x101b547d 0x0008658e 0x19d12b2b) +114 variable _IID_ICreateErrorInfo(0x22f03340 0x101b547d 0x0008658e 0x19d12b2b) +115 variable _IID_ISupportErrorInfo(0xdf0b3d60 0x101b548f 0x0008658e 0x19d12b2b) 116 stub VARUI1FROMI2 117 stub VARUI1FROMI4 118 stub VARUI1FROMR4

1 0

Zebediah Figura : typelib: Implement several IIDs.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 39ed0c0ca14a117325642f11a9d6427eff6bbc03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ed0c0ca14a117325642f11a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 2 12:27:13 2017 -0600 typelib: Implement several IIDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/typelib.dll16/typelib.dll16.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/typelib.dll16/typelib.dll16.spec b/dlls/typelib.dll16/typelib.dll16.spec index 10f5d4c..66fd0aa 100644 --- a/dlls/typelib.dll16/typelib.dll16.spec +++ b/dlls/typelib.dll16/typelib.dll16.spec @@ -1,11 +1,11 @@ 2 stub CREATETYPELIB 3 pascal LoadTypeLib(ptr ptr) LoadTypeLib16 4 pascal LHashValOfNameSys(word long str) LHashValOfNameSys16 -5 stub _IID_ICREATETYPEINFO -6 stub _IID_ICREATETYPELIB -7 stub _IID_ITYPECOMP -8 stub _IID_ITYPEINFO -9 stub _IID_ITYPELIB +5 variable _IID_ICreateTypeInfo(0x00020405 0x00000000 0x000000c0 0x46000000) +6 variable _IID_ICreateTypeLib(0x00020406 0x00000000 0x000000c0 0x46000000) +7 variable _IID_ITypeComp(0x00020403 0x00000000 0x000000c0 0x46000000) +8 variable _IID_ITypeInfo(0x00020401 0x00000000 0x000000c0 0x46000000) +9 variable _IID_ITypeLib(0x00020402 0x00000000 0x000000c0 0x46000000) 10 stub REGISTERTYPELIB 11 stub LOADREGTYPELIB 14 pascal QueryPathOfRegTypeLib(ptr word word word ptr) QueryPathOfRegTypeLib16

1 0

Józef Kucia : d3d11/tests: Add tests showing that views do not keep resource reference.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 0ce7d71c4657d7537b9e571d89eb1122d953448d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce7d71c4657d7537b9e571d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:35 2017 +0100 d3d11/tests: Add tests showing that views do not keep resource reference. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 758075a..f83e764 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2751,8 +2751,11 @@ static void test_create_depthstencil_view(void) get_dsv_desc(current_desc, &tests[i].dsv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, current_desc, &dsview); ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3112,8 +3115,11 @@ static void test_create_rendertarget_view(void) get_rtv_desc(current_desc, &tests[i].rtv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateRenderTargetView(device, texture, current_desc, &rtview); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3468,8 +3474,11 @@ static void test_create_shader_resource_view(void) get_srv_desc(current_desc, &tests[i].srv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateShaderResourceView(device, texture, current_desc, &srview); ok(SUCCEEDED(hr), "Test %u: Failed to create a shader resource view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -8143,6 +8152,7 @@ static void test_swapchain_views(void) ID3D11DeviceContext *context; ID3D11RenderTargetView *rtv; ID3D11Device *device; + ULONG refcount; HRESULT hr; static const struct vec4 color = {0.2f, 0.3f, 0.5f, 1.0f}; @@ -8153,6 +8163,9 @@ static void test_swapchain_views(void) device = test_context.device; context = test_context.immediate_context; + refcount = get_refcount((IUnknown *)test_context.backbuffer); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + draw_color_quad(&test_context, &color); check_texture_color(test_context.backbuffer, 0xff7f4c33, 1); @@ -8163,6 +8176,9 @@ static void test_swapchain_views(void) ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + refcount = get_refcount((IUnknown *)test_context.backbuffer); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + draw_color_quad(&test_context, &color); todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); @@ -10376,8 +10392,11 @@ static void test_create_unordered_access_view(void) get_uav_desc(current_desc, &tests[i].uav_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateUnorderedAccessView(device, texture, current_desc, &uav); ok(SUCCEEDED(hr), "Test %u: Failed to create unordered access view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); memset(&uav_desc, 0, sizeof(uav_desc)); ID3D11UnorderedAccessView_GetDesc(uav, &uav_desc);

1 0