wine-commits May 2008

wine-commits@winehq.org

4 participants
722 discussions

Francois Gouget : ddraw: Remove trailing spaces in Wine traces.
by Alexandre Julliard 30 May '08

30 May '08

Module: wine Branch: master Commit: 476cb96b7589d20efe8c5df6ae8f326ef6bcc454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=476cb96b7589d20efe8c5df6a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 29 18:23:47 2008 +0200 ddraw: Remove trailing spaces in Wine traces. --- dlls/ddraw/texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index 0f0c278..c3be680 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -303,7 +303,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, HRESULT ret_value = D3D_OK; if(src_ptr == This) { - TRACE(" copying surface %p to surface %p, why? \n", src_ptr, This); + TRACE("copying surface %p to surface %p, why?\n", src_ptr, This); return ret_value; }

1 0

Francois Gouget : shell32: s/library/Wine/ for consistency in the license message.
by Alexandre Julliard 30 May '08

30 May '08

Module: wine Branch: master Commit: 5f34a493685e6a163c28678229e820d6e1b03e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f34a493685e6a163c2867822… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 29 18:22:56 2008 +0200 shell32: s/library/Wine/ for consistency in the license message. --- dlls/shell32/shell32_En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 68263ce..e2f476a 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -264,6 +264,6 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of \ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ Lesser General Public License for more details.\n\n\ You should have received a copy of the GNU Lesser General Public \ -License along with this library; if not, write to the Free Software \ +License along with Wine; if not, write to the Free Software \ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." }

1 0

Michael Karcher : advpack: Fix buffer sizes for possibly quoted strings.
by Alexandre Julliard 30 May '08

30 May '08

Module: wine Branch: master Commit: 98778f486a43b72e1d4fe1f7cfc8d7ecfc78dad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98778f486a43b72e1d4fe1f7c… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Thu May 29 17:35:03 2008 +0200 advpack: Fix buffer sizes for possibly quoted strings. --- dlls/advpack/advpack.c | 10 +++--- dlls/advpack/tests/advpack.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 8ef1c9a..6c26e51 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -68,8 +68,8 @@ static void strip_quotes(WCHAR *buffer, DWORD *size) static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dwSize) { INFCONTEXT context; - WCHAR key[MAX_PATH], value[MAX_PATH]; - WCHAR prefix[PREFIX_LEN]; + WCHAR key[MAX_PATH + 2], value[MAX_PATH + 2]; + WCHAR prefix[PREFIX_LEN + 2]; HKEY root, subkey; DWORD size; @@ -78,11 +78,11 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw /* load the destination parameters */ SetupFindFirstLineW(hInf, pszSection, NULL, &context); - SetupGetStringFieldW(&context, 1, prefix, PREFIX_LEN, &size); + SetupGetStringFieldW(&context, 1, prefix, PREFIX_LEN + 2, &size); strip_quotes(prefix, &size); - SetupGetStringFieldW(&context, 2, key, MAX_PATH, &size); + SetupGetStringFieldW(&context, 2, key, MAX_PATH + 2, &size); strip_quotes(key, &size); - SetupGetStringFieldW(&context, 3, value, MAX_PATH, &size); + SetupGetStringFieldW(&context, 3, value, MAX_PATH + 2, &size); strip_quotes(value, &size); if (!lstrcmpW(prefix, hklm)) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index b90df2d..e761577 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -465,6 +465,63 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); DeleteFileA(inf_file); + + /* Create another .inf file which is just here to trigger a wine bug */ + { + char data[1024]; + char *ptr = data; + DWORD dwNumberOfBytesWritten; + HANDLE hf = CreateFile(inf_file, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + append_str(&ptr, "[Version]\n"); + append_str(&ptr, "Signature=\"$Chicago$\"\n"); + append_str(&ptr, "[section]\n"); + append_str(&ptr, "NotACustomDestination=Version\n"); + append_str(&ptr, "CustomDestination=CustInstDestSection\n"); + append_str(&ptr, "[CustInstDestSection]\n"); + append_str(&ptr, "49010=DestA,1\n"); + append_str(&ptr, "49020=DestB\n"); + append_str(&ptr, "49030=DestC\n"); + append_str(&ptr, "49040=DestD\n"); + append_str(&ptr, "[Options.NTx86]\n"); + append_str(&ptr, "Result2=%%49030%%\n"); + append_str(&ptr, "[DestA]\n"); + append_str(&ptr, "HKLM,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%24%%'\n"); + /* The point of this test is to have HKCU just before the quoted HKLM */ + append_str(&ptr, "[DestB]\n"); + append_str(&ptr, "HKCU,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%24%%'\n"); + append_str(&ptr, "[DestC]\n"); + append_str(&ptr, "'HKLM','Software\\Microsoft\\Windows\\CurrentVersion',"); + append_str(&ptr, "'ProgramFilesDir',,\"%%24%%\"\n"); + append_str(&ptr, "[DestD]\n"); + append_str(&ptr, "HKLM,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%24%%'\n"); + + WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + CloseHandle(hf); + } + + /* open the inf with the install section */ + hr = pOpenINFEngine(inf_file, "section", 0, &hinf, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* Single quote test (Note size includes null on return from call) */ + memset(buffer, 'a', APP_PATH_LEN); + buffer[APP_PATH_LEN - 1] = '\0'; + size = MAX_PATH; + hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result2", + buffer, size, &size, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); + ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + lstrlenA(PROG_FILES_ROOT)+1, size); + + /* close the INF again */ + hr = pCloseINFEngine(hinf); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + DeleteFileA(inf_file); } static BOOL check_reg_str(HKEY hkey, LPCSTR name, LPCSTR value)

1 0

James Hawkins : user32: win2k3' s GetWindowModuleFileName does return ERROR_INSUFFICIENT_BUFFER.
by Alexandre Julliard 30 May '08

30 May '08

Module: wine Branch: master Commit: 2b19e357072d1ac0edfa451e6d07a1e30b33111e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b19e357072d1ac0edfa451e6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu May 29 09:45:22 2008 -0500 user32: win2k3's GetWindowModuleFileName does return ERROR_INSUFFICIENT_BUFFER. --- dlls/user32/tests/win.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e60ab13..60b7d88 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4695,22 +4695,30 @@ static void test_GetWindowModuleFileName(void) SetLastError(0xdeadbeef); ret2 = GetModuleFileName(hinst, buf2, ret1 - 2); ok(ret2 == ret1 - 2, "expected %u, got %u\n", ret1 - 2, ret2); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3 */ + "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); ret2 = GetModuleFileName(hinst, buf2, 0); ok(!ret2, "GetModuleFileName should return 0\n"); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3 */ + "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); ret2 = pGetWindowModuleFileNameA(hwnd, buf2, ret1 - 2); ok(ret2 == ret1 - 2, "expected %u, got %u\n", ret1 - 2, ret2); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3 */ + "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); ret2 = pGetWindowModuleFileNameA(hwnd, buf2, 0); ok(!ret2, "expected 0, got %u\n", ret2); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3 */ + "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); DestroyWindow(hwnd);

1 0

Jeremy Newman : fix issue of detection overwriting incorrect var
by Jeremy Newman 29 May '08

29 May '08

Module: website Branch: master Commit: c14654e092dc4a49e45f682b69f461867b54d7b4 URL: http://source.winehq.org/git/website.git/?a=commit;h=c14654e092dc4a49e45f68… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu May 29 16:57:27 2008 -0500 fix issue of detection overwriting incorrect var --- include/html.php | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/html.php b/include/html.php index adf793f..f5833ee 100644 --- a/include/html.php +++ b/include/html.php @@ -57,16 +57,17 @@ class html else if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { // load from web browser environment - $lang = split(',', array_shift(split(";", $_SERVER["HTTP_ACCEPT_LANGUAGE"]))); - if (isset($lang[0])) + $avail = split(',', array_shift(split(";", $_SERVER["HTTP_ACCEPT_LANGUAGE"]))); + if (isset($avail[0])) { // if first language is a variation, use the parent language - if (strlen($lang[0]) > 2) - $lang[0] = substr($lang[0], 0, 2); + if (strlen($avail[0]) > 2) + $avail[0] = substr($avail[0], 0, 2); // check to make sure lang is defined in our config - if (in_array($lang[0], $GLOBALS['config']->languages)) - $lang = $lang[0]; + if (in_array($avail[0], $GLOBALS['config']->languages)) + $lang = $avail[0]; } + unset($avail); } // return language return $lang;

1 0

Jeremy Newman : fix XML source link
by Jeremy Newman 29 May '08

29 May '08

Module: website Branch: master Commit: de92f6c59bc193ae919614c564c1425c793b3e93 URL: http://source.winehq.org/git/website.git/?a=commit;h=de92f6c59bc193ae919614… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu May 29 16:45:12 2008 -0500 fix XML source link --- include/wwn.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wwn.php b/include/wwn.php index 7928b43..7901048 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -235,7 +235,7 @@ class wwn 'issue' => $cur, 'date' => $this->issue, 'summary' => $summary_box, - 'xml' => $wwn{$cur}, + 'xml' => (file_exists($config->wwn_xml_path."/".$html->lang."/".$wwn{$cur}) ? $html->lang."/".$wwn{$cur} : $config->lang."/".$wwn{$cur}), 'author' => $this->author, 'contact' => $this->contact, 'body' => $this->body,

1 0

Jeremy Newman : comment
by Jeremy Newman 29 May '08

29 May '08

Module: website Branch: master Commit: 86d0c0cda1f3ed67c03d21bf0d48863433820193 URL: http://source.winehq.org/git/website.git/?a=commit;h=86d0c0cda1f3ed67c03d21… Author: Jeremy Newman <jnewman(a)jnewman.codeweavers.com> Date: Thu May 29 16:26:16 2008 -0500 comment --- include/html.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/html.php b/include/html.php index af93eba..adf793f 100644 --- a/include/html.php +++ b/include/html.php @@ -29,6 +29,7 @@ class html // start body object $this->page = ""; + // get the language to be displayed in templates $this->lang = $this->get_lang(); }

1 0

Jeremy Newman : use available languages from site config file, not hard coded into config lib
by Jeremy Newman 29 May '08

29 May '08

Module: website Branch: master Commit: 044886f0994aaff064bedbb418d5cd3a1ef3fbaf URL: http://source.winehq.org/git/website.git/?a=commit;h=044886f0994aaff064bedb… Author: Jeremy Newman <jnewman(a)jnewman.codeweavers.com> Date: Thu May 29 16:14:39 2008 -0500 use available languages from site config file, not hard coded into config lib --- include/config.php | 3 --- include/html.php | 7 +++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/config.php b/include/config.php index 7ec30fc..a5f1fe2 100644 --- a/include/config.php +++ b/include/config.php @@ -30,9 +30,6 @@ class config $this->readConfig($path); } - // define avialable languages - $this->langs_avail = array('en', 'es'); - // navigation $this->nav = array( 'WineHQ Menu' => array( diff --git a/include/html.php b/include/html.php index 8f78427..af93eba 100644 --- a/include/html.php +++ b/include/html.php @@ -40,12 +40,12 @@ class html if (isset($_GET['lang']) or isset($_COOKIE['lang'])) { // load language from URL or cookie - if (isset($_GET['lang']) and in_array($_GET['lang'], $GLOBALS['config']->langs_avail)) + if (isset($_GET['lang']) and in_array($_GET['lang'], $GLOBALS['config']->languages)) { // load from URL $lang = $_GET['lang']; } - else if (isset($_COOKIE['lang']) and in_array($_COOKIE['lang'], $GLOBALS['config']->langs_avail)) + else if (isset($_COOKIE['lang']) and in_array($_COOKIE['lang'], $GLOBALS['config']->languages)) { // load from COOKIE $lang = $_COOKIE['lang']; @@ -56,7 +56,6 @@ class html else if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { // load from web browser environment - $avail = get_files($this->_file_root."/templates", "DIR"); $lang = split(',', array_shift(split(";", $_SERVER["HTTP_ACCEPT_LANGUAGE"]))); if (isset($lang[0])) { @@ -64,7 +63,7 @@ class html if (strlen($lang[0]) > 2) $lang[0] = substr($lang[0], 0, 2); // check to make sure lang is defined in our config - if (in_array($lang[0], $GLOBALS['config']->langs_avail)) + if (in_array($lang[0], $GLOBALS['config']->languages)) $lang = $lang[0]; } }

1 0

Jeremy Newman : support loading templates from multiple language dirs
by Jeremy Newman 29 May '08

29 May '08

Module: website Branch: master Commit: 80dd349a6b0a05ed00b239b632488e5752c00cdc URL: http://source.winehq.org/git/website.git/?a=commit;h=80dd349a6b0a05ed00b239… Author: Jeremy Newman <jnewman(a)jnewman.codeweavers.com> Date: Thu May 29 16:08:31 2008 -0500 support loading templates from multiple language dirs --- include/config.php | 9 ++++-- include/html.php | 70 ++++++++++++++++++++++++++++++++++++++++++++++----- include/wwn.php | 59 ++++++++++++++++++++++--------------------- site | 21 +++++++++------ 4 files changed, 112 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=80dd349a6b0a05ed00…

1 0

Jeremy Newman : adding 404 not found template for "es" spanish
by Jeremy Newman 29 May '08

29 May '08

Module: website Branch: master Commit: 7e1b161e48df299875f663ec28d2850aba07f4a8 URL: http://source.winehq.org/git/website.git/?a=commit;h=7e1b161e48df299875f663… Author: Jeremy Newman <jnewman(a)jnewman.codeweavers.com> Date: Thu May 29 16:05:40 2008 -0500 adding 404 not found template for "es" spanish --- templates/es/404.template | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/templates/es/404.template b/templates/es/404.template new file mode 100644 index 0000000..278271b --- /dev/null +++ b/templates/es/404.template @@ -0,0 +1,21 @@ + + + + 404 no encontrados + + + + Apesadumbrado, ese documento no fue encontrado. Compruebe por favor su URL e intente otra vez. + + +<img src="{$root}/images/grey_pixel.gif" width="100%" height="1" alt=""> + + + Si usted siguió un acoplamiento de una página de WineHQ.org y alcanzó esta página en error, divulgúelo por favor a WineHQ.org <a href="http://bugs.winehq.org/enter_bug.cgi?product=WineHQ.com">Bugzilla</a>. + + +  +  +  +  +

1 0

← Newer
1
2
3
4
5
6
7
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2008