January 2016 - Wine-commits

Jeremy Newman : fix debug log
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: c149a4c30cdf610d6b95392afc9b4d0d2016bf43 URL: http://source.winehq.org/git/website.git/?a=commit;h=c149a4c30cdf610d6b9539… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:23:04 2016 -0600 fix debug log --- templates/en/global/layout/debug_log.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/en/global/layout/debug_log.template b/templates/en/global/layout/debug_log.template index a90b004..56d23b3 100644 --- a/templates/en/global/layout/debug_log.template +++ b/templates/en/global/layout/debug_log.template @@ -1,4 +1,4 @@ -<div id="debug_log"> +<div id="whq-debug-log"> <pre>{$debug_log}</pre> </div>

1 0

Jeremy Newman : add XML parsing to array class
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: f5cf99650775aa1a07673050fc9b41599a2bf6fe URL: http://source.winehq.org/git/website.git/?a=commit;h=f5cf99650775aa1a076730… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:24:00 2016 -0600 add XML parsing to array class --- include/XMLToArray.php | 189 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/include/XMLToArray.php b/include/XMLToArray.php new file mode 100644 index 0000000..7996c5e --- /dev/null +++ b/include/XMLToArray.php @@ -0,0 +1,189 @@ +<?php +/* + loads an XML file into an array + Use transverse_array() after parsing to get a nice dump + by Jeremy Newman <jnewman(a)codeweavers.com> +*/ + +class XMLToArray +{ + var $data; + var $filename; + var $traverse_array = array(); + var $error; + + /** PUBLIC + * Constructor: init the object. Define the parsing mode. + */ + public function __construct () + { + return true; + } + + /** PUBLIC + * Parse a text string containing valid XML into a multidimensional array + */ + public function parse () + { + if (!$this->data and isset($this->filename)) + { + if (file_exists($this->filename)) + { + $this->data = join("", @file($this->filename)); + } + else + { + $message = "XML ERROR: {$this->filebname} NOT FOUND!"; + $this->error = $message; + error_log("$message\n"); + return 0; + } + } + + if (!$this->data) + { + $message = "XML ERROR: no data to be parsed!"; + error_log("$message\n"); + $this->error = $message; + return 0; + } + + $this->data = trim($this->data); + $vals = $index = $array = array(); + $parser = xml_parser_create(""); + xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); + xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0); + xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); + if (!xml_parse_into_struct($parser, $this->data, $vals, $index)) + { + $message = "XML ERROR: ".xml_error_string(xml_get_error_code($parser))." at line ".xml_get_current_line_number($parser); + $this->error = $message; + error_log("$message\n"); + return 0; + } + xml_parser_free($parser); + + $i = 0; + + $tagname = $vals[$i]['tag']; + if (isset($vals[$i]['attributes'])) + { + $array[$tagname]['@'] = $vals[$i]['attributes']; + } + else + { + $array[$tagname]['@'] = array(); + } + + $array[$tagname]["#"] = $this->depth($vals, $i); + + return $array; + } + + /** PRIVATE + * this goes through the tags in the mode 2 parsing. called from parse_mode2 + */ + private function depth ($vals, &$i) + { + $children = array(); + + if (isset($vals[$i]['value'])) + { + array_push($children, $vals[$i]['value']); + } + + while (++$i < count($vals)) + { + switch ($vals[$i]['type']) + { + case 'open': + + if (isset($vals[$i]['tag'])) + { + $tagname = $vals[$i]['tag']; + } + else + { + $tagname = ''; + } + + if (isset($children[$tagname])) + { + $size = sizeof($children[$tagname]); + } + else + { + $size = 0; + } + + if (isset($vals[$i]['attributes'])) + { + $children[$tagname][$size]['@'] = $vals[$i]["attributes"]; + } + + $children[$tagname][$size]['#'] = $this->depth($vals, $i); + + break; + + case 'cdata': + array_push($children, $vals[$i]['value']); + break; + + case 'complete': + $tagname = $vals[$i]['tag']; + + if (isset($children[$tagname])) + { + $size = sizeof($children[$tagname]); + } + else + { + $size = 0; + } + + if (isset($vals[$i]['value'])) + { + $children[$tagname][$size]["#"] = $vals[$i]['value']; + } + else + { + $children[$tagname][$size]["#"] = ''; + } + + if (isset($vals[$i]['attributes'])) + { + $children[$tagname][$size]['@'] = $vals[$i]['attributes']; + } + break; + + case 'close': + return $children; + break; + } + + } + return $children; + } + + /** PUBLIC + * dump an array to the PHP full var path (useful for debugging) + */ + public function traverse ($array, $arrName = "array", $level = 0) + { + foreach ($array as $key => $val) + { + if (is_array($val)) + { + $this->traverse($val, $arrName . "[" . $key . "]", $level + 1); + } + else + { + $this->traverse_array[] = '$' . $arrName . '[' . $key . '] = "' . $val . "\""; + } + } + return 1; + } + +} + +?>

1 0

Jeremy Newman : move language strings to translation table
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 3ba6819debd39bc5668554a7caaad69c39e6162d URL: http://source.winehq.org/git/website.git/?a=commit;h=3ba6819debd39bc5668554… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:24:12 2016 -0600 move language strings to translation table --- include/plugins/language.php | 4 ++- include/whq_data.php | 62 ---------------------------------- site.php | 9 ++--- templates/en/global/xml/trans/lang.xml | 38 +++++++++++++++++++++ 4 files changed, 44 insertions(+), 69 deletions(-) diff --git a/include/plugins/language.php b/include/plugins/language.php index 8ea917e..45b2ccc 100644 --- a/include/plugins/language.php +++ b/include/plugins/language.php @@ -12,8 +12,10 @@ switch ($_PLUGIN['cmd']) case "list": foreach ($config->languages as $lang) { + $name = $html->trans_val("lang", "lang", $lang); + $change = $html->trans_val("lang", "change", $lang); echo "<li style=\"background-image: url('{$html->base_url()}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;\">\n". - " <a href=\"{$html->base_url()}/lang/{$lang}\">{$whq_data->languages[$lang]['name']}</a> · {$whq_data->languages[$lang]['change']}\n". + " <a href=\"{$html->base_url()}/lang/{$lang}\">{$name}</a> · {$change}\n". "</li>\n"; } break; diff --git a/include/whq_data.php b/include/whq_data.php deleted file mode 100644 index b580b81..0000000 --- a/include/whq_data.php +++ /dev/null @@ -1,62 +0,0 @@ -<?php - -/* - WineHQ - misc data class - by Jeremy Newman <jnewman(a)codeweavers.com> -*/ - -class whq_data -{ - // defines - public $languages; - - // constuctor - public function __construct () - { - // available languages - $this->languages = array( - 'en' => array( - 'name' => 'English', - 'change' => 'Change Language' - ), - 'de' => array( - 'name' => 'Deutsch', - 'change' => 'Sprache ändern' - ), - 'es' => array( - 'name' => 'Español', - 'change' => 'Cambiar Idioma' - ), - 'fr' => array( - 'name' => 'Français', - 'change' => 'Changez la langue' - ), - 'he' => array( - 'name' => 'עברית', - 'change' => 'החלפת השפה' - ), - 'pl' => array( - 'name' => 'Polski', - 'change' => 'Zmień język' - ), - 'pt' => array( - 'name' => 'Português', - 'change' => 'Mudar a língua' - ), - 'tr' => array( - 'name' => 'Türkçe', - 'change' => 'Lisan Değiştir' - ), - 'uk' => array( - 'name' => 'Українська', - 'change' => 'Змінити мову' - ), - 'zh-cn' => array( - 'name' => '简体中文', - 'change' => '选择语言' - ) - ); - } -} -?> diff --git a/site.php b/site.php index d03f0fc..77b2a56 100644 --- a/site.php +++ b/site.php @@ -9,9 +9,6 @@ $file_root = realpath(dirname(__FILE__)); require("{$file_root}/include/incl.php"); -// init data class -$whq_data = new whq_data(); - // default page body $PAGE_body = ""; @@ -244,11 +241,11 @@ $PAGE_vars = array( 'js_postload' => $html->get_header_links('js_post'), 'rss_link' => &$PAGE_rss, 'page_body' => &$PAGE_body, - 'page_body_class' => &$PAGE_body_class, + 'page_body_class' => $PAGE_body_class, 'copyright_year' => date("Y", time()), 'debug_log' => &$PAGE_debug, - 'langCur' => &$whq_data->languages[$html->lang]['name'], - 'langChange' => &$whq_data->languages[$html->lang]['change'] + 'langCur' => $html->trans_val("lang", "lang", $html->lang), + 'langChange' => $html->trans_val("lang", "change", $html->lang) ); // HTTP status headers diff --git a/templates/en/global/xml/trans/lang.xml b/templates/en/global/xml/trans/lang.xml new file mode 100644 index 0000000..8b22df7 --- /dev/null +++ b/templates/en/global/xml/trans/lang.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" ?> +<trans lang="en" table="lang"> + +  + +  + <str name="lang"> + <str name="en">English</str> + <str name="de">Deutsch</str> + <str name="es">Español</str> + <str name="fr">Français</str> + <str name="he">עברית</str> + <str name="pl">Polski</str> + <str name="pt">Português</str> + <str name="tr">Türkçe</str> + <str name="uk">Українська</str> + <str name="zh-cn">简体中文</str> + </str> + +  + <str name="change"> + <str name="en">Change Language</str> + <str name="de">Sprache ändern</str> + <str name="es">Cambiar Idioma</str> + <str name="fr">Changez la langue</str> + <str name="he">החלפת השפה</str> + <str name="pl">Zmień język</str> + <str name="pt">Mudar a língua</str> + <str name="tr">Lisan Değiştir</str> + <str name="uk">Змінити мову</str> + <str name="zh-cn">选择语言</str> + </str> + +</trans>

1 0

Jeremy Newman : move translatable strings from global theme into global trans table
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 415095689f4eee6f309705960b5819e30fb6ffe0 URL: http://source.winehq.org/git/website.git/?a=commit;h=415095689f4eee6f309705… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:33:32 2016 -0600 move translatable strings from global theme into global trans table --- include/incl.php | 3 +++ site.php | 3 +-- templates/en/global/layout/content.template | 14 +++++++------- templates/en/global/xml/trans/global.xml | 15 +++++++++++++++ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/include/incl.php b/include/incl.php index 302d9c1..4a52861 100644 --- a/include/incl.php +++ b/include/incl.php @@ -114,4 +114,7 @@ else unset($lang); } +// load global translation table +$html->load_trans("global"); + ?> diff --git a/site.php b/site.php index 77b2a56..29c5159 100644 --- a/site.php +++ b/site.php @@ -132,13 +132,12 @@ if (defined("PAGE") and PAGE == "home") } // online mode switch -if ($config->offline) +if (!empty($config->offline)) { /* OFFLINE */ $html->_error_mode = 1; - $PAGE_template = "content_nonav"; $PAGE_body = $html->template("local", 'global/website_offline'); } else diff --git a/templates/en/global/layout/content.template b/templates/en/global/layout/content.template index 05677a2..82d4942 100644 --- a/templates/en/global/layout/content.template +++ b/templates/en/global/layout/content.template @@ -38,11 +38,11 @@ <div id="whq-tabs"> <div class="whq-tabs-menu">☰</div> <ul> - <li class="s"><a href="{$base_url}">WineHQ</a></li> - <li><a href="http://wiki.winehq.org/">Wiki</a></li> - <li><a href="//appdb.winehq.org/">AppDB</a></li> - <li><a href="//bugs.winehq.org/">Bugzilla</a></li> - <li><a href="//forums.winehq.org/">Forums</a></li> + <li class="s"><a href="{$base_url}">{trans($tab_winehq)}</a></li> + <li><a href="http://wiki.winehq.org/">{trans($tab_wiki)}</a></li> + <li><a href="//appdb.winehq.org/">{trans($tab_appdb)}</a></li> + <li><a href="//bugs.winehq.org/">{trans($tab_bugs)}</a></li> + <li><a href="//forums.winehq.org/">{trans($tab_forums)}</a></li> </ul> </div> <div class="clear"></div> @@ -70,9 +70,9 @@ <span class="glyphicon glyphicon-globe large"></span> {$langCur} (<a href="{$root}/lang">{$langChange}</a>) </div> <div class="col-xs-6 text-right"> - Hosted By + {trans($hosted_by)} <a href="https://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" - title="CodeWeavers - Run Windows applications and games on Mac and Linux"></a> + title="{trans($hosted_by_alt)}"></a> </div> </div> </div> diff --git a/templates/en/global/xml/trans/global.xml b/templates/en/global/xml/trans/global.xml new file mode 100644 index 0000000..42c0496 --- /dev/null +++ b/templates/en/global/xml/trans/global.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" ?> +<trans lang="en" table="global"> + +  + <str name="tab_winehq">WineHQ</str> + <str name="tab_wiki">Wiki</str> + <str name="tab_appdb">AppDB</str> + <str name="tab_bugs">Bugzilla</str> + <str name="tab_forums">Forums</str> + +  + <str name="hosted_by">Hosted By</str> + <str name="hosted_by_alt">CodeWeavers - Run Windows applications and games on Mac and Linux</str> + +</trans>

1 0

Jeremy Newman : update README for new translation instructions and requirements
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 095c1f0055ea48b604b16758e6a53991f50aa1b7 URL: http://source.winehq.org/git/website.git/?a=commit;h=095c1f0055ea48b604b167… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:40:48 2016 -0600 update README for new translation instructions and requirements --- README | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README b/README index 6cb89bb..6e8761f 100644 --- a/README +++ b/README @@ -1,12 +1,12 @@ WineHQ (lostwages) Website Template Engine -ver 3.0 +ver 4.0 by Jeremy Newman <jnewman(a)codeweavers.com> ----------------------------------------------------------------------- Installation Requirements: * Apache 2.0 or higher * mod_rewrite enabled in Apache config - * PHP 5.3 or higher + * PHP 5.4 or higher Setting Up: ----------------------------------------------------------------------- @@ -38,6 +38,16 @@ The following varables can be used in templates. You can also add global vars to include/globals.conf and they will be availbe as {$config_[key]} where [key] is the name you defined in globals.conf +Translating: +----------------------------------------------------------------------- +1. Edit include/winehq.conf and add your language code to @languages. +2. Create language subdir in templates. +4. Add your language strings to templates/en/global/xml/trans/lang.xml +5. Copy and edit path templates/en/global/xml/trans/global.xml to your + langs subdir. +6. Copy individual templates/en/*.template to your langs subdir as you + translate them. Only copy the files you plan on translating. +7. News item translations are in news/<lang>. Notes: -----------------------------------------------------------------------

1 0

Jeremy Newman : remove requirement for base_path config var
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 1fb8c25327696aa95a66618852768725534205ff URL: http://source.winehq.org/git/website.git/?a=commit;h=1fb8c25327696aa95a6661… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:49:42 2016 -0600 remove requirement for base_path config var --- include/utils.php | 4 ++-- include/winehq.conf.sample | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/utils.php b/include/utils.php index f9cc2c6..21d5253 100644 --- a/include/utils.php +++ b/include/utils.php @@ -63,7 +63,7 @@ function include_plugin ($__module, $_PLUGIN = array()) $__module = preg_replace('%(^\/|^\\\|^\.|\.\.*)%', '', $__module); // load module if file exists - if ($__module and file_exists("{$GLOBALS['config']->base_path}include/plugins/{$__module}.php")) + if ($__module and file_exists("{$GLOBALS['file_root']}/include/plugins/{$__module}.php")) { debug("plugin", "loading plugin: [{$__module}]"); $out = ""; @@ -74,7 +74,7 @@ function include_plugin ($__module, $_PLUGIN = array()) extract($GLOBALS, EXTR_REFS); // execute the plugin - include("{$config->base_path}include/plugins/{$__module}.php"); + include("{$GLOBALS['file_root']}/include/plugins/{$__module}.php"); $out = ob_get_contents(); } catch (_pluginError $e) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 8967c53..82db033 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -29,14 +29,11 @@ lang: en base_root: base_url: https://www.winehq.org{$base_root}/ -# base path on filesystem to website -base_path: /home/wineowner/opt/www/ - # Path to WWN XML files -news_xml_path: {$base_path}news +news_xml_path: ./news # Path to WWN XML files -wwn_xml_path: {$base_path}wwn +wwn_xml_path: ./wwn # URL for bugs bug_system: http://bugs.winehq.org/show_bug.cgi?id=

1 0

Jeremy Newman : Rename site index to site.php
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: fc754d85752ceb6509021147ba1997914be821fc URL: http://source.winehq.org/git/website.git/?a=commit;h=fc754d85752ceb65090211… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 5 14:21:11 2016 -0600 Rename site index to site.php This will make things easier on Non-Apache based Web Servers Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/htaccess.sample | 6 +++--- site => site.php | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index 4d04076..775e8ad 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -2,7 +2,7 @@ allow from all # Set Our Default Directory Index -DirectoryIndex site index.html index.shtml index.cgi index.php +DirectoryIndex site.php index.html index.shtml index.cgi index.php # Website Offline #RewriteEngine on @@ -21,7 +21,7 @@ php_value arg_separator.output ";" php_value arg_separator.input ";&" # force the php to accept PATH_INFO -<Files ~ (site)$> +<Files ~ (site.php)$> AcceptPathInfo On ForceType application/x-httpd-php </Files> @@ -105,5 +105,5 @@ RedirectPermanent /diff https://source.winehq.org/search RewriteEngine on Rewritebase / RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule ^(.+) site/$1 [L] +RewriteRule ^(.+) site.php/$1 [L] diff --git a/site b/site.php similarity index 100% rename from site rename to site.php

1 0

Andrew Eikum : xaudio2_8: Don' t use IXAudio27 interface to call Initialize.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: fb954b7b9f2ddc477464a22e39426a0c27ab397c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb954b7b9f2ddc477464a22e3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 18 13:15:54 2016 -0600 xaudio2_8: Don't use IXAudio27 interface to call Initialize. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 6 +++--- dlls/xaudio2_7/xaudio_dll.c | 21 ++++++++++----------- dlls/xaudio2_7/xaudio_private.h | 1 + 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index ffe6531..88dd850 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -468,7 +468,7 @@ static HRESULT WINAPI XA27_Initialize(IXAudio27 *iface, UINT32 flags, { IXAudio2Impl *This = impl_from_IXAudio27(iface); TRACE("(%p)->(0x%x, 0x%x)\n", This, flags, processor); - return S_OK; + return xaudio2_initialize(This, flags, processor); } static HRESULT WINAPI XA27_RegisterForCallbacks(IXAudio27 *iface, @@ -1305,7 +1305,7 @@ static HRESULT WINAPI XA22_Initialize(IXAudio22 *iface, UINT32 flags, { IXAudio2Impl *This = impl_from_IXAudio22(iface); TRACE("(%p)->(0x%x, 0x%x)\n", This, flags, processor); - return S_OK; + return xaudio2_initialize(This, flags, processor); } static HRESULT WINAPI XA22_RegisterForCallbacks(IXAudio22 *iface, @@ -2163,7 +2163,7 @@ static HRESULT WINAPI XA20_Initialize(IXAudio20 *iface, UINT32 flags, { IXAudio2Impl *This = impl_from_IXAudio20(iface); TRACE("(%p)->(0x%x, 0x%x)\n", This, flags, processor); - return S_OK; + return xaudio2_initialize(This, flags, processor); } static HRESULT WINAPI XA20_RegisterForCallbacks(IXAudio20 *iface, diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index efa6279..86c8cbf 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2046,14 +2046,22 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return IClassFactory_QueryInterface(factory, riid, ppv); } +HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) +{ + if(flags) + FIXME("Unimplemented flags: 0x%x\n", flags); + return S_OK; +} + #if XAUDIO2_VER >= 8 HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR proc) { HRESULT hr; IXAudio2 *xa2; - IXAudio27 *xa27; IClassFactory *cf; + TRACE("%p 0x%x 0x%x\n", ppxa2, flags, proc); + cf = make_xaudio2_factory(); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IXAudio2, (void**)&xa2); @@ -2061,21 +2069,12 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p if(FAILED(hr)) return hr; - hr = IXAudio2_QueryInterface(xa2, &IID_IXAudio27, (void**)&xa27); + hr = xaudio2_initialize(impl_from_IXAudio2(xa2), flags, proc); if(FAILED(hr)){ IXAudio2_Release(xa2); return hr; } - hr = IXAudio27_Initialize(xa27, flags, proc); - if(FAILED(hr)){ - IXAudio27_Release(xa27); - IXAudio2_Release(xa2); - return hr; - } - - IXAudio27_Release(xa27); - *ppxa2 = xa2; return S_OK; diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index a75f721..39ed2c8 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -150,3 +150,4 @@ extern const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio20MasteringVoiceVtbl XAudio20MasteringVoice_Vtbl DECLSPEC_HIDDEN; extern IClassFactory *make_xapo_factory(REFCLSID clsid) DECLSPEC_HIDDEN; +extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : xaudio2: Don't build interfaces for other versions.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: d9e6a31c6e4207c36f56d2bccae6cc839058d085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e6a31c6e4207c36f56d2bcc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 18 13:15:57 2016 -0600 xaudio2: Don't build interfaces for other versions. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 2461 ++++++++++++++++++++------------------- dlls/xaudio2_7/tests/xaudio2.c | 3 + dlls/xaudio2_7/xaudio_dll.c | 32 +- dlls/xaudio2_7/xaudio_private.h | 48 +- 4 files changed, 1311 insertions(+), 1233 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9e6a31c6e4207c36f56d…

1 0

Alexandre Julliard : server: Add a helper function to skip the object attributes structure.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: c4843d4a45c5af5e536fdf51c4456f935c16c075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4843d4a45c5af5e536fdf51c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 19 15:00:21 2016 +0900 server: Add a helper function to skip the object attributes structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 3 +-- server/request.c | 9 +++++++++ server/request.h | 1 + server/symlink.c | 5 ++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/server/file.c b/server/file.c index 9fd3a9e..39f6ff0 100644 --- a/server/file.c +++ b/server/file.c @@ -711,8 +711,7 @@ DECL_HANDLER(create_file) if (!root_fd) return; } - name = (const char *)get_req_data() + sizeof(*objattr) + objattr->sd_len; - name_len = get_req_data_size() - sizeof(*objattr) - objattr->sd_len; + name = get_req_data_after_objattr( objattr, &name_len ); reply->handle = 0; if ((file = create_file( root_fd, name, name_len, req->access, req->sharing, diff --git a/server/request.c b/server/request.c index 2debf6d..942bc42 100644 --- a/server/request.c +++ b/server/request.c @@ -198,6 +198,15 @@ const struct object_attributes *get_req_object_attributes( const struct security return attr; } +/* return a pointer to the request data following an object attributes structure */ +const void *get_req_data_after_objattr( const struct object_attributes *attr, data_size_t *len ) +{ + const void *ptr = (const WCHAR *)((const struct object_attributes *)get_req_data() + 1) + + attr->sd_len / sizeof(WCHAR) + attr->name_len / sizeof(WCHAR); + *len = get_req_data_size() - ((const char *)ptr - (const char *)get_req_data()); + return ptr; +} + /* write the remaining part of the reply */ void write_reply( struct thread *thread ) { diff --git a/server/request.h b/server/request.h index 2c99c79..caaa30e 100644 --- a/server/request.h +++ b/server/request.h @@ -48,6 +48,7 @@ extern const char *get_config_dir(void); extern void *set_reply_data_size( data_size_t size ); extern const struct object_attributes *get_req_object_attributes( const struct security_descriptor **sd, struct unicode_str *name ); +extern const void *get_req_data_after_objattr( const struct object_attributes *attr, data_size_t *len ); extern int receive_fd( struct process *process ); extern int send_client_fd( struct process *process, int fd, obj_handle_t handle ); extern void read_request( struct thread *thread ); diff --git a/server/symlink.c b/server/symlink.c index 28d51ab..abc34f2 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -174,9 +174,8 @@ DECL_HANDLER(create_symlink) if (!objattr) return; - target.str = (const WCHAR *)get_req_data() + sizeof(*objattr) / sizeof(WCHAR) + - objattr->sd_len / sizeof(WCHAR) + name.len / sizeof(WCHAR); - target.len = get_req_data_size() - ((const char *)target.str - (const char *)get_req_data()); + target.str = get_req_data_after_objattr( objattr, &target.len ); + target.len = (target.len / sizeof(WCHAR)) * sizeof(WCHAR); if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return;

1 0