April 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d9: Store wined3d vertex declarations in the fvf lookup table.
by Alexandre Julliard April 12, 2012

April 12, 2012

Module: wine Branch: master Commit: 5fc17b84d01c1a38607f3d2501fe28b8fe1fc9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc17b84d01c1a38607f3d250… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 11 22:52:03 2012 +0200 d3d9: Store wined3d vertex declarations in the fvf lookup table. This also implicitly gets rid of the convFVF hack in IDirect3DVertexDeclaration9Impl_Release(). --- dlls/d3d9/d3d9_private.h | 11 ++- dlls/d3d9/device.c | 159 ++++++++++++++++++++++------------------- dlls/d3d9/vertexdeclaration.c | 35 +++------- 3 files changed, 103 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fc17b84d01c1a38607f3…

1 0

André Hentschel : winedbg: Add partial ARM disassembler.
by Alexandre Julliard April 12, 2012

April 12, 2012

Module: wine Branch: master Commit: 0fccc41c3fdcdfcdc8593ea451c3a99c83a6c826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fccc41c3fdcdfcdc8593ea45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 11 20:28:30 2012 +0200 winedbg: Add partial ARM disassembler. --- programs/winedbg/be_arm.c | 309 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 304 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fccc41c3fdcdfcdc8593…

1 0

Huw Davies : wineps: Switch to using a Unicode devmode.
by Alexandre Julliard April 12, 2012

April 12, 2012

Module: wine Branch: master Commit: 210f3e333828917335ec219bacd2fca712a7e339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=210f3e333828917335ec219ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 12 13:03:10 2012 +0100 wineps: Switch to using a Unicode devmode. --- dlls/wineps.drv/driver.c | 69 ++++++++++++++++++++++++++++----- dlls/wineps.drv/init.c | 96 ++++++++++++--------------------------------- dlls/wineps.drv/psdrv.h | 10 ++-- 3 files changed, 90 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=210f3e333828917335ec2…

1 0

Henri Verbeet : d3d9: Introduce a separate function for vertex declaration creation.
by Alexandre Julliard April 12, 2012

April 12, 2012

Module: wine Branch: master Commit: ba67df7a6034278dcfb5dd9e9da8449d20ba6099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba67df7a6034278dcfb5dd9e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 11 22:52:02 2012 +0200 d3d9: Introduce a separate function for vertex declaration creation. --- dlls/d3d9/d3d9_private.h | 4 ++-- dlls/d3d9/device.c | 23 ++++------------------- dlls/d3d9/vertexdeclaration.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 265ecfb..6ad6eed 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -395,8 +395,8 @@ typedef struct IDirect3DVertexDeclaration9Impl { } IDirect3DVertexDeclaration9Impl; void IDirect3DVertexDeclaration9Impl_Destroy(LPDIRECT3DVERTEXDECLARATION9 iface) DECLSPEC_HIDDEN; -HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, - IDirect3DDevice9Impl *device, const D3DVERTEXELEMENT9 *elements) DECLSPEC_HIDDEN; +HRESULT d3d9_vertex_declaration_create(IDirect3DDevice9Impl *device, + const D3DVERTEXELEMENT9 *elements, IDirect3DVertexDeclaration9Impl **declaration) DECLSPEC_HIDDEN; /* ---------------------- */ /* IDirect3DVertexShader9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a9ca1d3..3aeb437 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2073,7 +2073,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(IDirect3DDevice9Ex *i static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(IDirect3DDevice9Ex *iface, const D3DVERTEXELEMENT9 *elements, IDirect3DVertexDeclaration9 **declaration) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); IDirect3DVertexDeclaration9Impl *object; HRESULT hr; @@ -2085,25 +2085,10 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(IDirect3DDevi return D3DERR_INVALIDCALL; } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - ERR("Failed to allocate vertex declaration memory.\n"); - return E_OUTOFMEMORY; - } - - hr = vertexdeclaration_init(object, This, elements); - if (FAILED(hr)) - { - WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - TRACE("Created vertex declaration %p.\n", object); - *declaration = (IDirect3DVertexDeclaration9 *)object; + if (SUCCEEDED(hr = d3d9_vertex_declaration_create(device, elements, &object))) + *declaration = (IDirect3DVertexDeclaration9 *)object; - return D3D_OK; + return hr; } static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(IDirect3DDevice9Ex *iface, diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 3ed9eb7..a003d88 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -367,7 +367,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem return D3D_OK; } -HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, +static HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, IDirect3DDevice9Impl *device, const D3DVERTEXELEMENT9 *elements) { struct wined3d_vertex_element *wined3d_elements; @@ -413,3 +413,30 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, return D3D_OK; } + +HRESULT d3d9_vertex_declaration_create(IDirect3DDevice9Impl *device, + const D3DVERTEXELEMENT9 *elements, IDirect3DVertexDeclaration9Impl **declaration) +{ + IDirect3DVertexDeclaration9Impl *object; + HRESULT hr; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate vertex declaration memory.\n"); + return E_OUTOFMEMORY; + } + + hr = vertexdeclaration_init(object, device, elements); + if (FAILED(hr)) + { + WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created vertex declaration %p.\n", object); + *declaration = object; + + return D3D_OK; +}

1 0

Jeremy Newman : fix depreciated code
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: 6b0603be401b695c71f9d03d8f9df21cb5f3491e URL: http://source.winehq.org/git/website.git/?a=commit;h=6b0603be401b695c71f9d0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 15:07:31 2012 -0500 fix depreciated code --- include/html.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/html.php b/include/html.php index a90daf0..9b2e83c 100644 --- a/include/html.php +++ b/include/html.php @@ -332,7 +332,8 @@ class html else if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { // load from web browser environment - $avail = preg_split('/,/', array_shift(preg_split('/;/', $_SERVER["HTTP_ACCEPT_LANGUAGE"]))); + $hal = preg_split("/\;/", $_SERVER["HTTP_ACCEPT_LANGUAGE"]); + $avail = preg_split('/\,/', array_shift($hal)); if (isset($avail[0])) { // if first language is a variation, use the parent language @@ -345,7 +346,7 @@ class html $lang = $avail[0]; } } - unset($avail); + unset($hal, $avail); } // return language

1 0

Jeremy Newman : fix depreciated code
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: 60ee8a13cac1a942c6df1376ef0b451e522222fb URL: http://source.winehq.org/git/website.git/?a=commit;h=60ee8a13cac1a942c6df13… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 15:00:22 2012 -0500 fix depreciated code --- include/config.php | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/config.php b/include/config.php index aa80daa..80f3311 100644 --- a/include/config.php +++ b/include/config.php @@ -6,9 +6,10 @@ by Jeremy Newman <jnewman(a)codeweavers.com> */ -class config -{ - function config () +class config +{ + // constructor + public function __construct () { // get files passed $files = func_get_args(); @@ -19,31 +20,30 @@ class config // read global config file $this->readConfig($path); } - // end of config() } - + // reads config from text file - function readConfig ($file) + private function readConfig ($file) { if (file_exists($file)) { $fd = fopen ($file, "r"); while (!feof ($fd)) { $buffer = trim(fgets($fd, 4096)); - if (ereg('^\#', $buffer)) continue; + if (preg_match('/^\#/', $buffer)) continue; if ($buffer == "") continue; $arr = preg_split('/:\s+/',$buffer,2); $arr[1] = preg_replace("/<br>/","\n",$arr[1]); - if (ereg('^\@', $arr[0])) + if (preg_match('/^\@/', $arr[0])) { // array - $arr[0] = ereg_replace('\@', '', $arr[0]); + $arr[0] = preg_replace('/\@/', '', $arr[0]); $this->$arr[0] = preg_split('/,\s+/', $arr[1]); } - else if (ereg('^\%', $arr[0])) + else if (preg_match('/^\%/', $arr[0])) { // assoc array - $arr[0] = ereg_replace('\%', '', $arr[0]); + $arr[0] = preg_replace('/\%/', '', $arr[0]); $this->$arr[0] = array(); $params = preg_split('/,\s+/', $arr[1]); while (list($n, $m) = each($params)) @@ -59,7 +59,7 @@ class config { // load other vars into existing var $arr[1] = preg_replace('/(.*)\{\$([a-z0-9_]+)\}(.*)/', "\\1,\\2,\\3", $arr[1]); - list($a,$b,$c) = split(",", $arr[1], 3); + list($a,$b,$c) = preg_split("/\,/", $arr[1], 3); if ($b and isset($this->$b)) $arr[1] = $a.$this->$b.$c; else @@ -72,7 +72,8 @@ class config } else { - trigger_error("Unable to read config: ".$file); + trigger_error("ERROR: Unable to read config!", E_USER_ERROR); + exit(); } // end of readConfig }

1 0

Jeremy Newman : fix some depreciated functions
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: b1fc778e554739273849bf4016d4d0570a4b01d6 URL: http://source.winehq.org/git/website.git/?a=commit;h=b1fc778e554739273849bf… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:24:03 2012 -0500 fix some depreciated functions --- include/utils.php | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/include/utils.php b/include/utils.php index 4cb98f3..e51b0c1 100644 --- a/include/utils.php +++ b/include/utils.php @@ -101,16 +101,28 @@ function get_files ($dir, $filter = null) { // read dir $files = array(); - $d = opendir($dir); while($entry = readdir($d)) { - if ($filter) - { - if(!eregi("(.+)\\.".$filter, $entry)) - continue; - } - array_push($files, $entry); + if (is_dir($dir.$entry)) + continue; + if (is_array($filter)) + { + $in = 0; + foreach ($filter as $f) + { + if (preg_match('/(.+)\\.'.$f.'/', $entry)) + $in = 1; + } + if (!$in) + continue; + } + else if ($filter) + { + if (!preg_match('/(.+)\\.'.$filter.'/', $entry)) + continue; + } + array_push($files, $entry); } closedir($d); @@ -127,11 +139,11 @@ function get_xml_tags ($file, $tags = null) { $content = array(); $fp = @fopen($file, "r"); - $data = fread($fp, filesize($file)); - @fclose($fp); + $data = fread($fp, filesize($file)); + @fclose($fp); foreach ($tags as $tag) { - if (eregi("<" . $tag . ">(.*)</" . $tag . ">", $data, $out)) + if (preg_match("/\<{$tag}\>(.*)\<\/{$tag}\>/Us", $data, $out)) { $content[$tag] = $out[1]; }

1 0

Jeremy Newman : adding google analytics plugin call
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: abf8891e52a7c6a5c33774e5b9d5eac42f6b1cd6 URL: http://source.winehq.org/git/website.git/?a=commit;h=abf8891e52a7c6a5c33774… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:43:53 2012 -0500 adding google analytics plugin call --- templates/de/global/themes/winehq/content.template | 2 ++ .../de/global/themes/winehq/content_nobox.template | 2 ++ templates/en/global/themes/winehq/content.template | 2 ++ .../en/global/themes/winehq/content_nobox.template | 2 ++ templates/fr/global/themes/winehq/content.template | 2 ++ .../fr/global/themes/winehq/content_nobox.template | 2 ++ templates/he/global/themes/winehq/content.template | 2 ++ .../he/global/themes/winehq/content_nobox.template | 2 ++ templates/tr/global/themes/winehq/content.template | 2 ++ .../tr/global/themes/winehq/content_nobox.template | 2 ++ 10 files changed, 20 insertions(+), 0 deletions(-) diff --git a/templates/de/global/themes/winehq/content.template b/templates/de/global/themes/winehq/content.template index f529f8a..17579c6 100644 --- a/templates/de/global/themes/winehq/content.template +++ b/templates/de/global/themes/winehq/content.template @@ -14,6 +14,8 @@ {$js_links} + + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> {$rss_link} diff --git a/templates/de/global/themes/winehq/content_nobox.template b/templates/de/global/themes/winehq/content_nobox.template index f828c0c..8c129c5 100644 --- a/templates/de/global/themes/winehq/content_nobox.template +++ b/templates/de/global/themes/winehq/content_nobox.template @@ -14,6 +14,8 @@ {$js_links} + + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> {$rss_link} diff --git a/templates/en/global/themes/winehq/content.template b/templates/en/global/themes/winehq/content.template index d1c6e27..9467a67 100644 --- a/templates/en/global/themes/winehq/content.template +++ b/templates/en/global/themes/winehq/content.template @@ -13,6 +13,8 @@ {$js_links} + + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> {$rss_link} diff --git a/templates/en/global/themes/winehq/content_nobox.template b/templates/en/global/themes/winehq/content_nobox.template index 7303d08..899d026 100644 --- a/templates/en/global/themes/winehq/content_nobox.template +++ b/templates/en/global/themes/winehq/content_nobox.template @@ -13,6 +13,8 @@ {$js_links} + + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> {$rss_link} diff --git a/templates/fr/global/themes/winehq/content.template b/templates/fr/global/themes/winehq/content.template index ae3f4a7..93d92fa 100644 --- a/templates/fr/global/themes/winehq/content.template +++ b/templates/fr/global/themes/winehq/content.template @@ -13,6 +13,8 @@ {$js_links} + + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> {$rss_link} diff --git a/templates/fr/global/themes/winehq/content_nobox.template b/templates/fr/global/themes/winehq/content_nobox.template index 5204032..1474567 100644 --- a/templates/fr/global/themes/winehq/content_nobox.template +++ b/templates/fr/global/themes/winehq/content_nobox.template @@ -13,6 +13,8 @@ {$js_links} + + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> {$rss_link} diff --git a/templates/he/global/themes/winehq/content.template b/templates/he/global/themes/winehq/content.template index 7314319..fb7f647 100644 --- a/templates/he/global/themes/winehq/content.template +++ b/templates/he/global/themes/winehq/content.template @@ -14,6 +14,8 @@ {$js_links} + + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> {$rss_link} diff --git a/templates/he/global/themes/winehq/content_nobox.template b/templates/he/global/themes/winehq/content_nobox.template index 3dd4937..e1beb4e 100644 --- a/templates/he/global/themes/winehq/content_nobox.template +++ b/templates/he/global/themes/winehq/content_nobox.template @@ -14,6 +14,8 @@ {$js_links} + + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> {$rss_link} diff --git a/templates/tr/global/themes/winehq/content.template b/templates/tr/global/themes/winehq/content.template index 4f93d88..40e7e76 100644 --- a/templates/tr/global/themes/winehq/content.template +++ b/templates/tr/global/themes/winehq/content.template @@ -13,6 +13,8 @@ {$js_links} + + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> {$rss_link} diff --git a/templates/tr/global/themes/winehq/content_nobox.template b/templates/tr/global/themes/winehq/content_nobox.template index e839167..f158c6c 100644 --- a/templates/tr/global/themes/winehq/content_nobox.template +++ b/templates/tr/global/themes/winehq/content_nobox.template @@ -13,6 +13,8 @@ {$js_links} + + <link rel="icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> {$rss_link}

1 0

Jeremy Newman : update object
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: 8039e5584a32f022f0d58c9eb50257999bd2978f URL: http://source.winehq.org/git/website.git/?a=commit;h=8039e5584a32f022f0d58c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:25:54 2012 -0500 update object --- include/data.php | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/data.php b/include/data.php index 0c4dea8..15b3796 100644 --- a/include/data.php +++ b/include/data.php @@ -12,9 +12,13 @@ class data { - // create shopping cart object - function data () - { + // defines + public $stop_page; + public $languages; + + // constuctor + public function __construct () + { // plugin stop pages // add the template path here to make anything after the path in the URL // be stored in the static PAGE_PARAMS @@ -61,8 +65,6 @@ class data 'change' => 'Lisan Değiştir' ) ); - - return; } } ?>

1 0

Jeremy Newman : add error handling function, fix depreciated functions
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: 58eafdd1421c26da6d50fdd2ddd965efcc264bd2 URL: http://source.winehq.org/git/website.git/?a=commit;h=58eafdd1421c26da6d50fd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:25:18 2012 -0500 add error handling function, fix depreciated functions --- include/html.php | 113 +++++++++++++++++++++++++++++------------------------ 1 files changed, 62 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=58eafdd1421c26da6d…

1 0