December 2008 - Wine-Commits

Alexandre Julliard : server: Add a mem_size_t type to represent memory sizes and offsets.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 992d3cea936e52cac0540f1db1a2b2253a8c9105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992d3cea936e52cac0540f1db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 19:24:33 2008 +0100 server: Add a mem_size_t type to represent memory sizes and offsets. --- include/wine/server_protocol.h | 35 ++++++++++++++++++----------------- server/protocol.def | 35 ++++++++++++++++++----------------- 2 files changed, 36 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=992d3cea936e52cac0540…

1 0

Alexandre Julliard : server: Make mem_size_t always 64-bit.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 401f4b717a1ae46313f7d033952efd2395099941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=401f4b717a1ae46313f7d0339… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 19:25:09 2008 +0100 server: Make mem_size_t always 64-bit. --- dlls/ntdll/sync.c | 128 +++++++++++++++++++++++++-------------- dlls/ntdll/virtual.c | 2 + include/wine/server_protocol.h | 4 +- server/protocol.def | 2 +- server/trace.c | 130 +++++++++++++++++++++------------------ tools/make_requests | 8 +- 6 files changed, 162 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=401f4b717a1ae46313f7d…

1 0

Jeremy Newman : adding news post about sourceforge.net award
by Jeremy Newman Dec. 17, 2008

Dec. 17, 2008

Module: website Branch: master Commit: 67944162b1ee717665c7c27e599549686bc5c491 URL: http://source.winehq.org/git/website.git/?a=commit;h=67944162b1ee717665c7c2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 17 11:25:28 2008 -0600 adding news post about sourceforge.net award --- images/misc/WineAward_2008.png | Bin 0 -> 336388 bytes images/misc/WineAward_2008_sm.png | Bin 0 -> 19124 bytes news/en/2008121701.xml | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/images/misc/WineAward_2008.png b/images/misc/WineAward_2008.png new file mode 100644 index 0000000..69921a5 Binary files /dev/null and b/images/misc/WineAward_2008.png differ diff --git a/images/misc/WineAward_2008_sm.png b/images/misc/WineAward_2008_sm.png new file mode 100644 index 0000000..2748c76 Binary files /dev/null and b/images/misc/WineAward_2008_sm.png differ diff --git a/news/en/2008121701.xml b/news/en/2008121701.xml new file mode 100644 index 0000000..de538bf --- /dev/null +++ b/news/en/2008121701.xml @@ -0,0 +1,20 @@ +<news> + <date>December 17, 2008</date> + <title>SourceForge 2008 Community Choice Awards</title> + <body> + <a href="{$root}/images/misc/WineAward_2008.png"><img src="{$root}/images/misc/WineAward_2008_sm.png" + style="float: left; margin: 0 20px 20px 0;"></a> + + The Wine project has won an award from the + <a href="http://sourceforge.net/community/cca08/">SourceForge 2008 Community Choice Awards</a>. + + + We won the category: + "Most Likely to Be Ambiguously and Baselessly Accused of Patent Violation". + + + We would like to thank to the voters of SourceForge community for this fantastic award. + + <div style="clear: both;"></div> + </body> +</news>

1 0

Alexandre Julliard : include: Use __p__iob on i386 to avoid problems with Mingw libraries.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 5646fec9b14b2d039994cdeeef141eca889e649f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5646fec9b14b2d039994cdeee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 17:38:02 2008 +0100 include: Use __p__iob on i386 to avoid problems with Mingw libraries. --- include/msvcrt/stdio.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 0f91947..98cc950 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -81,8 +81,13 @@ extern "C" { #endif #ifndef _STDIO_DEFINED +# ifdef __i386__ +FILE* __cdecl __p__iob(void); +# define _iob (__p__iob()) +# else FILE* __cdecl __iob_func(void); -# define _iob (__iob_func()) +# define _iob (__iob_func()) +# endif #endif /* _STDIO_DEFINED */ #define stdin (_iob+STDIN_FILENO)

1 0

Jeremy Newman : adding french translation
by Jeremy Newman Dec. 17, 2008

Dec. 17, 2008

Module: website Branch: master Commit: d79d2bfcbd48e037ab91c0315960ba8bc6dfe4a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=d79d2bfcbd48e037ab91c0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 17 10:19:26 2008 -0600 adding french translation --- include/data.php | 4 ++++ include/winehq.conf.sample | 2 +- templates/en/lang.template | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/data.php b/include/data.php index a4cfbdc..6c5a90a 100644 --- a/include/data.php +++ b/include/data.php @@ -56,6 +56,10 @@ class data 'es' => array( 'name' => 'Español', 'change' => 'Cambiar la Lengua' + ), + 'fr' => array( + 'name' => 'Français', + 'change' => 'Changez la langue' ) ); diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 06b9c3e..2ec82ab 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -16,7 +16,7 @@ theme: winehq lang: en # available languages -(a)languages: en, de, es +(a)languages: en, de, es, fr # default base URLS (if you run the site, in a subdir, set base_root) base_root: diff --git a/templates/en/lang.template b/templates/en/lang.template index c513cc1..cdd3052 100644 --- a/templates/en/lang.template +++ b/templates/en/lang.template @@ -20,6 +20,10 @@ <li style="background-image: url('{$root}/images/lang/es.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> <a href="{$root}/lang/es" title="Español">Español</a> (Spanish) </li> - + + <li style="background-image: url('{$root}/images/lang/fr.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/fr" title="Español">Français</a> (French) + </li> + </ul>

1 0

Jeremy Newman : match more on title and blurb
by Jeremy Newman Dec. 17, 2008

Dec. 17, 2008

Module: website Branch: master Commit: 91ec4e85ac585335db8a812c50fe9802723b9cfb URL: http://source.winehq.org/git/website.git/?a=commit;h=91ec4e85ac585335db8a81… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 17 10:18:38 2008 -0600 match more on title and blurb --- include/html.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/html.php b/include/html.php index 27c2162..650cee9 100644 --- a/include/html.php +++ b/include/html.php @@ -1260,10 +1260,10 @@ class html $in = preg_replace('/\{\$[a-z0-9_\-]+\}/', '', $in); // get page name from template - if (preg_match('//', $orig, $arr)) + if (preg_match('//', $orig, $arr)) { debug("global", "adding to title: {$arr[1]}"); - $in = preg_replace('/\n/', '', $in); + $in = preg_replace('/\n/', '', $in); $this->page_title .= " - {$arr[1]}"; unset($arr); } @@ -1287,10 +1287,10 @@ class html } // get page blurb template - if (preg_match('//', $orig, $arr)) + if (preg_match('//', $orig, $arr)) { debug("global", "setting page blurb: {$arr[1]}"); - $in = preg_replace('/\n/', '', $in); + $in = preg_replace('/\n/', '', $in); $this->page_blurb = $arr[1]; unset($arr); }

1 0

Jonathan Ernst : French l10n
by Jeremy Newman Dec. 17, 2008

Dec. 17, 2008

Module: website Branch: master Commit: a73c251b8f566cd6d58f3ed9f830e1c10537a09b URL: http://source.winehq.org/git/website.git/?a=commit;h=a73c251b8f566cd6d58f3e… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Dec 16 20:11:02 2008 +0100 French l10n >From d00ac529c90c09d41d6cf94c674095ce0d2c8d87 Mon Sep 17 00:00:00 2001 From: Jonathan Ernst <jernst(a)jernst-desktop.(none)> Date: Tue, 16 Dec 2008 20:02:11 +0100 Subject: First attempt at a French l10n of the website. --- templates/fr/about.template | 49 +++++++++++ templates/fr/announce.template | 7 ++ templates/fr/home.template | 90 ++++++++++++++++++++ templates/fr/interview.template | 8 ++ templates/fr/irc.template | 19 ++++ templates/fr/news.template | 11 +++ templates/fr/why.template | 174 +++++++++++++++++++++++++++++++++++++++ templates/fr/wwn.template | 9 ++ 8 files changed, 367 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=a73c251b8f566cd6d5…

1 0

Konstantin Kondratyuk : mshtml: Correct UIDs of interfaces.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: ba8a0b7b9d0d0798fc0bb180b1d6e064db2df39c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba8a0b7b9d0d0798fc0bb180b… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Dec 12 15:15:12 2008 +0300 mshtml: Correct UIDs of interfaces. --- include/mshtml.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 8bf3efa..eabf867 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -20188,7 +20188,7 @@ interface IMarkupPointer : IUnknown [ object, pointer_default(unique), - uuid(83f65030-b598-cf11-bb82-00aa00bdce0b) + uuid(3050f683-98b5-11cf-bb82-00aa00bdce0b) ] interface ISegment : IUnknown { @@ -20220,7 +20220,7 @@ interface IElementSegment : ISegment [ object, pointer_default(unique), - uuid(99f65030-b598-cf11-bb82-00aa00bdce0b) + uuid(3050f699-98b5-11cf-bb82-00aa00bdce0b) ] interface ISelectionServicesListener : IUnknown {

1 0

Jacek Caban : jscript: Correctly handle SCRIPTITEM_GLOBALMEMBERS flag in identifier_eval.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 775a6b21e9be24e9b9f70670b7363789eafda0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=775a6b21e9be24e9b9f70670b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 17 12:56:12 2008 +0100 jscript: Correctly handle SCRIPTITEM_GLOBALMEMBERS flag in identifier_eval. --- dlls/jscript/engine.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5a14c5f..423df46 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -489,9 +489,11 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex } for(item = ctx->parser->script->named_items; item; item = item->next) { - hres = disp_get_id(item->disp, identifier, 0, &id); - if(SUCCEEDED(hres)) - break; + if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { + hres = disp_get_id(item->disp, identifier, 0, &id); + if(SUCCEEDED(hres)) + break; + } } if(item) {

1 0

Paul Vriens : shlwapi/tests: Fix some test failures on Vista.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 05988f4fbc4812e734a9d1e9435ca3f8e05ab64d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05988f4fbc4812e734a9d1e94… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 17 10:46:49 2008 +0100 shlwapi/tests: Fix some test failures on Vista. --- dlls/shlwapi/tests/shreg.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index 77a47e2..f088c2e 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -31,7 +31,7 @@ /* Keys used for testing */ #define REG_TEST_KEY "Software\\Wine\\Test" -#define REG_CURRENT_VERSION "Software\\Microsoft\\Windows\\CurrentVersion" +#define REG_CURRENT_VERSION "Software\\Microsoft\\Windows\\CurrentVersion\\explorer" static HMODULE hshlwapi; typedef DWORD (WINAPI *SHCopyKeyA_func)(HKEY,LPCSTR,HKEY,DWORD); @@ -284,6 +284,12 @@ static void test_SHCopyKey(void) HKEY hKeySrc, hKeyDst; DWORD dwRet; + if (!pSHCopyKeyA) + { + win_skip("SHCopyKeyA is not available\n"); + return; + } + /* Delete existing destination sub keys */ hKeyDst = NULL; if (!RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination", &hKeyDst) && hKeyDst) @@ -305,22 +311,19 @@ static void test_SHCopyKey(void) if (dwRet || !hKeySrc) { ok( 0, "Source couldn't be opened, RegOpenKeyA returned (%u)\n", dwRet); + RegCloseKey(hKeyDst); return; } - - if (pSHCopyKeyA) - { - dwRet = (*pSHCopyKeyA)(hKeySrc, NULL, hKeyDst, 0); - ok ( ERROR_SUCCESS == dwRet, "Copy failed, ret=(%u)\n", dwRet); - } + dwRet = (*pSHCopyKeyA)(hKeySrc, NULL, hKeyDst, 0); + ok ( ERROR_SUCCESS == dwRet, "Copy failed, ret=(%u)\n", dwRet); RegCloseKey(hKeySrc); RegCloseKey(hKeyDst); /* Check we copied the sub keys, i.e. something that's on every windows system (including Wine) */ hKeyDst = NULL; - dwRet = RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination\\Setup", &hKeyDst); + dwRet = RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination\\Shell Folders", &hKeyDst); if (dwRet || !hKeyDst) { ok ( 0, "Copy couldn't be opened, RegOpenKeyA returned (%u)\n", dwRet); @@ -328,7 +331,7 @@ static void test_SHCopyKey(void) } /* And the we copied the values too */ - ok(!SHQueryValueExA(hKeyDst, "BootDir", NULL, NULL, NULL, NULL), "SHQueryValueExA failed\n"); + ok(!SHQueryValueExA(hKeyDst, "Common AppData", NULL, NULL, NULL, NULL), "SHQueryValueExA failed\n"); RegCloseKey(hKeyDst); }

1 0