wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Francois Gouget : po: Remove English strings from the Walloon translation.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: cf518dc6d150284860b93db778da2bb7eb67bff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf518dc6d150284860b93db77… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 00:20:08 2011 +0200 po: Remove English strings from the Walloon translation. --- po/wa.po | 191 ++++++++++++++++++++----------------------------------------- 1 files changed, 63 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf518dc6d150284860b93…

1 0

Francois Gouget : po: Remove English strings from the Chinese (PRC) translation.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 66941383e7bf1b734e1479be9c4d33a1d560a739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66941383e7bf1b734e1479be9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 00:17:55 2011 +0200 po: Remove English strings from the Chinese (PRC) translation. --- po/zh_CN.po | 48 ++---------------------------------------------- 1 files changed, 2 insertions(+), 46 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 7a17d0a..977a290 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5600,7 +5600,6 @@ msgid "insert disk %s" msgstr "插入软盘 %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5632,35 +5631,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -6957,19 +6927,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine is free software; you can redistribute it and/or modify it under the " -"terms of the GNU Lesser General Public License as published by the Free " -"Software Foundation; either version 2.1 of the License, or (at your option) " -"any later version.\n" -"\n" -"Wine is distributed in the hope that it will be useful, 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 Wine; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:265 msgid "Wine License" @@ -6977,7 +6934,7 @@ msgstr "Wine 使用许可" #: shell32.rc:155 msgid "Trash" -msgstr "Trash" +msgstr "" #: shlwapi.rc:27 msgid "%ld bytes" @@ -7767,9 +7724,8 @@ msgid "Timeout" msgstr "" #: wldap32.rc:113 -#, fuzzy msgid "Auth Unknown" -msgstr "Context Unknown" +msgstr "" #: wldap32.rc:114 msgid "Filter Error"

1 0

Francois Gouget : po: Remove English strings from the Ukrainian translation .
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 5d9c30464fd940deb78f78de0dab85dc3716ea7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9c30464fd940deb78f78de0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 8 00:13:35 2011 +0200 po: Remove English strings from the Ukrainian translation. --- po/uk.po | 796 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 397 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d9c30464fd940deb78f7…

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 1c404ef443cf8e61a385a481abf97bb78045f061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c404ef443cf8e61a385a481a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 23:46:08 2011 +0200 po: Update German translation. --- po/de.po | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/po/de.po b/po/de.po index 12bd5a7..a691c8a 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-09-06 08:07+0200\n" +"PO-Revision-Date: 2011-09-07 23:43+0200\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2017,14 +2017,12 @@ msgid "Default MidiOut Device" msgstr "Standard MidiOut - Gerät" #: dinput.rc:34 -#, fuzzy msgid "Action" -msgstr "Aktivierung" +msgstr "Aktion" #: dinput.rc:35 -#, fuzzy msgid "Object" -msgstr "&Objekt" +msgstr "Objekt" #: dxdiagn.rc:25 msgid "Regional Setting" @@ -10552,7 +10550,6 @@ msgstr "" "Laufwerk C neu zu erstellen!" #: winecfg.rc:80 -#, fuzzy msgctxt "Drive letter" msgid "Letter" msgstr "Buchst." @@ -10795,7 +10792,6 @@ msgstr "" "Optionen:\n" #: wineconsole.rc:49 -#, fuzzy msgid "" " --backend={user|curses} Choosing user will spawn a new window, curses " "will\n" @@ -10805,16 +10801,14 @@ msgstr "" " --backend={user|curses} Auswahl von ‚user‘ erstellt ein neues Fenster,\n" " ‚curses‘ versucht das aktuelle Terminal als " "Wine-\n" -" Konsole einzurichten\n" +" Konsole einzurichten.\n" #: wineconsole.rc:51 -#, fuzzy msgid " <command> The Wine program to launch in the console.\n" msgstr "" -" <Befehl> Das in der Konsole zu startende Wine-Programm\n" +" <Befehl> Das in der Konsole zu startende Wine-Programm.\n" #: wineconsole.rc:52 -#, fuzzy msgid "" "\n" "Example:\n" @@ -10825,7 +10819,7 @@ msgstr "" "\n" "Bespiel:\n" " wineconsole cmd\n" -"Startet die Wine-Befehlszeile in einer Wine-Konsole\n" +"Startet die Wine-Befehlszeile in einer Wine-Konsole.\n" "\n" #: winedbg.rc:35

1 0

Gerald Pfeifer : comctl32: Remove dead code from MONTHCAL_HitTest.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: a17463b1e4b3498fb8ba9dc7a69a61b35776d152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17463b1e4b3498fb8ba9dc7a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Sep 8 00:23:15 2011 +0200 comctl32: Remove dead code from MONTHCAL_HitTest. --- dlls/comctl32/monthcal.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index c0c8810..ae9bdcd 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1665,13 +1665,9 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) MCHITTESTINFO htinfo; SYSTEMTIME ht_month; INT day, calIdx; - UINT x, y; if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1; - x = lpht->pt.x; - y = lpht->pt.y; - htinfo.st = st_null; /* we should preserve passed fields if hit area doesn't need them */

1 0

André Hentschel : ntdll: Fix a comment.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 322c2f45f87f20f6ab84f933841c9f00de73f11a URL: http://source.winehq.org/git/wine.git/?a=commit;h=322c2f45f87f20f6ab84f9338… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 22:31:39 2011 +0200 ntdll: Fix a comment. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index dda1f37..6699de1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1460,7 +1460,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** - * virtual_create_system_view + * virtual_create_builtin_view */ NTSTATUS virtual_create_builtin_view( void *module ) {

1 0

André Hentschel : ntdll/tests: Tests for _wcslwr and _wcsupr.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: ca8d7652f68d564c5e2404048090c345568a8329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8d7652f68d564c5e2404048… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 18:03:17 2011 +0200 ntdll/tests: Tests for _wcslwr and _wcsupr. --- dlls/ntdll/tests/string.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 14464d9..9422d41 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -51,8 +51,8 @@ static LPWSTR (WINAPIV *p_ultow)(ULONG, LPWSTR, INT); static LPWSTR (WINAPIV *p_i64tow)(LONGLONG, LPWSTR, INT); static LPWSTR (WINAPIV *p_ui64tow)(ULONGLONG, LPWSTR, INT); -static long (WINAPIV *pwcstol)(LPCWSTR, LPWSTR *, INT); -static ULONG (WINAPIV *pwcstoul)(LPCWSTR, LPWSTR *, INT); +static LPWSTR (__cdecl *p_wcslwr)(LPWSTR); +static LPWSTR (__cdecl *p_wcsupr)(LPWSTR); static LPWSTR (WINAPIV *p_wcschr)(LPCWSTR, WCHAR); static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); @@ -89,8 +89,8 @@ static void InitFunctionPtrs(void) p_i64tow = (void *)GetProcAddress(hntdll, "_i64tow"); p_ui64tow = (void *)GetProcAddress(hntdll, "_ui64tow"); - pwcstol = (void *)GetProcAddress(hntdll, "wcstol"); - pwcstoul = (void *)GetProcAddress(hntdll, "wcstoul"); + p_wcslwr = (void *)GetProcAddress(hntdll, "_wcslwr"); + p_wcsupr = (void *)GetProcAddress(hntdll, "_wcsupr"); p_wcschr= (void *)GetProcAddress(hntdll, "wcschr"); p_wcsrchr= (void *)GetProcAddress(hntdll, "wcsrchr"); @@ -1143,6 +1143,28 @@ static void test_wcsrchr(void) "wcsrchr should have returned NULL\n"); } +static void test_wcslwrupr(void) +{ + static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; + static WCHAR emptyW[1] = {0}; + static const WCHAR constemptyW[1] = {0}; + + if (0) /* crashes on native */ + { + static const WCHAR conststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; + ok(p_wcslwr((LPWSTR)conststringW) == conststringW, "p_wcslwr returned different string\n"); + ok(p_wcsupr((LPWSTR)conststringW) == conststringW, "p_wcsupr returned different string\n"); + ok(p_wcslwr(NULL) == NULL, "p_wcslwr didn't returned NULL\n"); + ok(p_wcsupr(NULL) == NULL, "p_wcsupr didn't returned NULL\n"); + } + ok(p_wcslwr(teststringW) == teststringW, "p_wcslwr returned different string\n"); + ok(p_wcsupr(teststringW) == teststringW, "p_wcsupr returned different string\n"); + ok(p_wcslwr(emptyW) == emptyW, "p_wcslwr returned different string\n"); + ok(p_wcsupr(emptyW) == emptyW, "p_wcsupr returned different string\n"); + ok(p_wcslwr((LPWSTR)constemptyW) == constemptyW, "p_wcslwr returned different string\n"); + ok(p_wcsupr((LPWSTR)constemptyW) == constemptyW, "p_wcsupr returned different string\n"); +} + static __cdecl int intcomparefunc(const void *a, const void *b) { const int *p = a, *q = b; @@ -1272,6 +1294,8 @@ START_TEST(string) test_wcschr(); if (p_wcsrchr) test_wcsrchr(); + if (p_wcslwr && p_wcsupr) + test_wcslwrupr(); if (patoi) test_atoi(); if (patol)

1 0

Alexandre Julliard : libwine: Avoid converting the final null in strlwrW and struprW.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: f7c98b036c5b7b177d56652ae3f9a153a3783328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c98b036c5b7b177d56652ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 11:16:51 2011 +0200 libwine: Avoid converting the final null in strlwrW and struprW. --- include/wine/unicode.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index b685e43..35c6166 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -265,15 +265,15 @@ WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ) WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) { - WCHAR *ret = str; - while ((*str = tolowerW(*str))) str++; + WCHAR *ret; + for (ret = str; *str; str++) *str = tolowerW(*str); return ret; } WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ) { - WCHAR *ret = str; - while ((*str = toupperW(*str))) str++; + WCHAR *ret; + for (ret = str; *str; str++) *str = toupperW(*str); return ret; }

1 0

André Hentschel : ntdll/tests: Run the execution test only on x86 platforms.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 94a9db6383f5915826267b2641ced193a661b2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a9db6383f5915826267b264… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 18:54:45 2011 +0200 ntdll/tests: Run the execution test only on x86 platforms. --- dlls/ntdll/tests/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2d5c94f..ec1ce3d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1194,10 +1194,12 @@ static void test_mapprotection(void) addr = NULL; status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); +#if defined(__x86_64__) || defined(__i386__) memset (addr, 0xc3, 1); /* lret ... in both i386 and x86_64 */ trace("trying to execute code in the readwrite only mapped anon file...\n"); f = addr;f(); trace("...done.\n"); +#endif status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_scissor_rect() const.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 20e9b3f13f0632503dcd415ac83a5e8d05f50361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e9b3f13f0632503dcd415ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 7 20:22:01 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_scissor_rect() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b722f5..ac609fd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2595,7 +2595,7 @@ HRESULT CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, con return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_scissor_rect(struct wined3d_device *device, RECT *rect) +HRESULT CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) { TRACE("device %p, rect %p.\n", device, rect); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ddf6561..b05acae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2245,7 +2245,7 @@ HRESULT __cdecl wined3d_device_get_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target); HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, WINED3DSAMPLERSTATETYPE state, DWORD *value); -HRESULT __cdecl wined3d_device_get_scissor_rect(struct wined3d_device *device, RECT *rect); +HRESULT __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride);

1 0

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 September 2011