August 2011 - Wine-commits - list.winehq.org

Francois Gouget : msrle32: Mark 'WINE-MS-RLE' as not needing translation.
by Alexandre Julliard 25 Aug '11

25 Aug '11

1 0

Alexandre Julliard : msxml6: Add a WinSxS manifest resource.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 63dadcb66f4fb17bf4a1d5d9eefe28efd901c8f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63dadcb66f4fb17bf4a1d5d9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 25 17:20:55 2011 +0200 msxml6: Add a WinSxS manifest resource. --- dlls/msxml6/msxml6.manifest | 5 +++++ dlls/msxml6/rsrc.rc | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml6/msxml6.manifest b/dlls/msxml6/msxml6.manifest new file mode 100644 index 0000000..8179006 --- /dev/null +++ b/dlls/msxml6/msxml6.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft-Windows-MSXML60" version="6.0.6000.16386" processorArchitecture="" publicKeyToken="31bf3856ad364e35"/> + <file name="msxml6.dll"/> +</assembly> diff --git a/dlls/msxml6/rsrc.rc b/dlls/msxml6/rsrc.rc index 6b413c3..9c6e55c 100644 --- a/dlls/msxml6/rsrc.rc +++ b/dlls/msxml6/rsrc.rc @@ -25,3 +25,6 @@ #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" + +/* @makedep: msxml6.manifest */ +WINE_MANIFEST 24 msxml6.manifest

1 0

Alexandre Julliard : gdiplus: Add a WinSxS manifest resource.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 835e74a5f060f81d8983a5555e9c14fd9c93d5cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=835e74a5f060f81d8983a5555… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 25 17:21:05 2011 +0200 gdiplus: Add a WinSxS manifest resource. --- dlls/gdiplus/Makefile.in | 2 ++ dlls/gdiplus/gdiplus.manifest | 5 +++++ dlls/gdiplus/gdiplus.rc | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index b057eaf..0702cc8 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -19,4 +19,6 @@ C_SRCS = \ region.c \ stringformat.c +RC_SRCS = gdiplus.rc + @MAKE_DLL_RULES@ diff --git a/dlls/gdiplus/gdiplus.manifest b/dlls/gdiplus/gdiplus.manifest new file mode 100644 index 0000000..86c32a0 --- /dev/null +++ b/dlls/gdiplus/gdiplus.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.6000.16386" processorArchitecture="" publicKeyToken="6595b64144ccf1df"/> + <file name="gdiplus.dll"/> +</assembly> diff --git a/dlls/gdiplus/gdiplus.rc b/dlls/gdiplus/gdiplus.rc new file mode 100644 index 0000000..56f6c22 --- /dev/null +++ b/dlls/gdiplus/gdiplus.rc @@ -0,0 +1,22 @@ +/* + * Resource file for gdiplus + * + * Copyright 2011 Alexandre Julliard + * + * This library 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. + * + * This library 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. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: gdiplus.manifest */ +WINE_MANIFEST 24 gdiplus.manifest

1 0

Yaron Shahrabani : po: Hebrew translation update.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: d4dbc8f2b32bdcda66d270b8681407ef88f0d0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4dbc8f2b32bdcda66d270b86… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Aug 25 11:14:07 2011 +0300 po: Hebrew translation update. --- po/he.po | 1057 +++++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 702 insertions(+), 355 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4dbc8f2b32bdcda66d27…

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 36c6d890fe4cb86969b338ed1e51a3d5ce49ccc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c6d890fe4cb86969b338ed1… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Aug 24 11:45:34 2011 +0900 po: Updated Korean translation. --- po/ko.po | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/po/ko.po b/po/ko.po index 9d21a13..1254565 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8715,7 +8715,6 @@ msgstr "" " 다른 편집기를 사용하십시오." #: notepad.rc:81 -#, fuzzy msgid "" "You did not enter any text.\n" "Please type something and try again." @@ -8810,21 +8809,19 @@ msgstr "&CoCreateInstance 플래그" #: oleview.rc:41 msgid "&In-process server" -msgstr "" +msgstr "인-프로세스 서버(&I)" #: oleview.rc:42 msgid "In-process &handler" -msgstr "" +msgstr "인-프로세스 핸들러(&H)" #: oleview.rc:43 -#, fuzzy msgid "&Local server" -msgstr "로컬 오류" +msgstr "지역 서버(&L)" #: oleview.rc:44 -#, fuzzy msgid "&Remote server" -msgstr "제거(&R)" +msgstr "서버 제거(&R)" #: oleview.rc:47 msgid "View &Type information" @@ -8969,21 +8966,19 @@ msgstr "프로그램 정보, 버젼, 저작권 보여주기" #: oleview.rc:113 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "" +msgstr "CoGetClassObject을 호출 할때 인-프로세스 서버에 묻기" #: oleview.rc:114 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "" +msgstr "CoGetClassObject을 호출 할때 인-프로세스 핸들러에 묻기" #: oleview.rc:115 -#, fuzzy msgid "Ask for a local server when calling CoGetClassObject" -msgstr "CoGetClassObject이 호출될 때 CLSCTX_LOCAL_SERVER 사용" +msgstr "CoGetClassObject을 호출할 때 지역 서버에 묻기" #: oleview.rc:116 -#, fuzzy msgid "Ask for a remote server when calling CoGetClassObject" -msgstr "CoGetClassObject이 호출될 때 CLSCTX_LOCAL_SERVER 사용" +msgstr "CoGetClassObject을 호출할 때 원격 서버에 묻기" #: oleview.rc:128 msgid "ObjectClasses"

1 0

Aric Stewart : usp10/test: Test ScriptXtoX on an RTL set with differing cChars and cGlyphs.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 515dd2543e74597cc50b14e85274f93458e8a69f URL: http://source.winehq.org/git/wine.git/?a=commit;h=515dd2543e74597cc50b14e85… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 25 08:13:43 2011 -0500 usp10/test: Test ScriptXtoX on an RTL set with differing cChars and cGlyphs. --- dlls/usp10/tests/usp10.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e2110fe..5eb48e1 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1876,7 +1876,7 @@ static void _test_item_ScriptXtoX(SCRIPT_ANALYSIS *psa, int cChars, int cGlyphs, hr = ScriptCPtoX(iCP, fTrailing, icChars, icGlyphs, pwLogClust, psva, piAdvance, psa, &piX); winetest_ok(hr == S_OK, "ScriptCPtoX trailing: should return S_OK not %08x\n", hr); winetest_ok(piX == offsets[iCP+1], - "ScriptCPtoX trailing: iCP=%d should return piX=%d not %d\n", iCP, offsets[iCP+direction], piX); + "ScriptCPtoX trailing: iCP=%d should return piX=%d not %d\n", iCP, offsets[iCP+1], piX); } } @@ -1887,9 +1887,12 @@ static void test_ScriptXtoX(void) { WORD pwLogClust[10] = {0, 0, 0, 1, 1, 2, 2, 3, 3, 3}; WORD pwLogClust_RTL[10] = {3, 3, 3, 2, 2, 1, 1, 0, 0, 0}; + WORD pwLogClust_2[7] = {4, 3, 3, 2, 1, 0 ,0}; int piAdvance[10] = {201, 190, 210, 180, 170, 204, 189, 195, 212, 203}; + int piAdvance_2[5] = {39, 26, 19, 17, 11}; static const int offsets[13] = {0, 67, 134, 201, 296, 391, 496, 601, 1052, 1503, 1954, 1954, 1954}; static const int offsets_RTL[13] = {781, 721, 661, 601, 496, 391, 296, 201, 134, 67, 0, 0, 0}; + static const int offsets_2[10] = {112, 101, 92, 84, 65, 39, 19, 0, 0, 0}; SCRIPT_VISATTR psva[10]; SCRIPT_ANALYSIS sa; int iX; @@ -1925,6 +1928,7 @@ static void test_ScriptXtoX(void) test_item_ScriptXtoX(&sa, 10, 10, offsets, pwLogClust, piAdvance); sa.fRTL = TRUE; test_item_ScriptXtoX(&sa, 10, 10, offsets_RTL, pwLogClust_RTL, piAdvance); + test_item_ScriptXtoX(&sa, 7, 5, offsets_2, pwLogClust_2, piAdvance_2); } static void test_ScriptString(HDC hdc)

1 0

Frédéric Delanoy : cmd/tests: Add tests for variables substrings.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 82cdeb6d4dd49208a70e0e58c64e1a0e4790d3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82cdeb6d4dd49208a70e0e58c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 14:22:29 2011 +0200 cmd/tests: Add tests for variables substrings. --- programs/cmd/tests/test_builtins.cmd | 13 +++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 10 ++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1c53cd2..668bea4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -214,6 +214,19 @@ echo P%ERRORLEVEL% echo %ERRORLEVEL%S echo P%ERRORLEVEL%S +echo ------------ Testing variable substrings -------------- +set VAR=qwerty +echo %VAR:~0,1% +echo %VAR:~0,3% +echo %VAR:~2,2% +echo '%VAR:~-2,3%' +echo '%VAR:~-2,1%' +echo %VAR:~2,-1% +echo %VAR:~2,-3% +echo '%VAR:~-2,-4%' +echo %VAR:~-3,-2% +set VAR= + echo ------------ Testing variable delayed expansion -------------- rem NT4 doesn't support this echo ...default mode (load-time expansion) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c9c6521..08a66eb 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -203,6 +203,16 @@ ERRORLEVEL P0 0S P0S +------------ Testing variable substrings -------------- +q +qwe +er +(a)todo_wine@'ty'@or_broken@'' +'t'@or_broken@'' +ert(a)or_broken@qwerty +e(a)or_broken@qwerty +''@or_broken@'qwerty' +r(a)or_broken@qwerty ------------ Testing variable delayed expansion -------------- ...default mode (load-time expansion) foo

1 0

Alexandre Julliard : msxml3: Add a WinSxS manifest resource.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 64651a369b6d7c08f5f039571d0cf4ebe29cca61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64651a369b6d7c08f5f039571… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 25 17:20:37 2011 +0200 msxml3: Add a WinSxS manifest resource. --- dlls/msxml3/msxml3.manifest | 5 +++++ dlls/msxml3/version.rc | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/msxml3.manifest b/dlls/msxml3/msxml3.manifest new file mode 100644 index 0000000..02793c1 --- /dev/null +++ b/dlls/msxml3/msxml3.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft-Windows-MSXML30" version="6.0.6000.16386" processorArchitecture="" publicKeyToken="31bf3856ad364e35"/> + <file name="msxml3.dll"/> +</assembly> diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc index 21acf1b..127ecee 100644 --- a/dlls/msxml3/version.rc +++ b/dlls/msxml3/version.rc @@ -23,3 +23,6 @@ #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" + +/* @makedep: msxml3.manifest */ +WINE_MANIFEST 24 msxml3.manifest

1 0

Alexandre Julliard : msxml4: Add a WinSxS manifest resource.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: d64c210cc6938681b2c3c26701c717e98d9df1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64c210cc6938681b2c3c2670… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 25 17:20:46 2011 +0200 msxml4: Add a WinSxS manifest resource. --- dlls/msxml4/msxml4.manifest | 5 +++++ dlls/msxml4/rsrc.rc | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml4/msxml4.manifest b/dlls/msxml4/msxml4.manifest new file mode 100644 index 0000000..4851600 --- /dev/null +++ b/dlls/msxml4/msxml4.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.MSXML2" version="4.1.0.0" processorArchitecture="" publicKeyToken="6bd6b9abf345378f"/> + <file name="msxml4.dll"/> +</assembly> diff --git a/dlls/msxml4/rsrc.rc b/dlls/msxml4/rsrc.rc index 82c0efe..3e36867 100644 --- a/dlls/msxml4/rsrc.rc +++ b/dlls/msxml4/rsrc.rc @@ -26,3 +26,6 @@ #define WINE_PRODUCTVERSION_STR "4.20.9818.0" #include "wine/wine_common_ver.rc" + +/* @makedep: msxml4.manifest */ +WINE_MANIFEST 24 msxml4.manifest

1 0

Frédéric Delanoy : cmd: Misc tab fixes.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 09655aca95d1942aee4005afda472c31d7709c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=09655aca95d1942aee4005afd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 00:48:23 2011 +0200 cmd: Misc tab fixes. --- programs/cmd/builtins.c | 7 ++++--- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5e405d5..7b8f76d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2098,7 +2098,8 @@ void WCMD_setshow_default (const WCHAR *command) { NORM_IGNORECASE | SORT_STRINGSORT, command, 2, parmD, -1) == CSTR_EQUAL) { command += 2; - while (*command && *command==' ') command++; + while (*command && (*command==' ' || *command=='\t')) + command++; } GetCurrentDirectoryW(sizeof(cwd)/sizeof(WCHAR), cwd); @@ -2309,7 +2310,7 @@ void WCMD_setshow_env (WCHAR *s) { DWORD count; s += 2; - while (*s && *s==' ') s++; + while (*s && (*s==' ' || *s=='\t')) s++; if (*s=='\"') WCMD_opt_s_strip_quotes(s); @@ -2406,7 +2407,7 @@ void WCMD_setshow_prompt (void) { } else { s = param1; - while ((*s == '=') || (*s == ' ')) s++; + while ((*s == '=') || (*s == ' ') || (*s == '\t')) s++; if (strlenW(s) == 0) { SetEnvironmentVariableW(promptW, NULL); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index cc083d2..6cd8a48 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -325,6 +325,11 @@ cd cd ..\.. cd rd /Q/s foobar +mkdir foobar +cd /d(a)tab@foobar +cd +cd .. +rd /q/s foobar echo ------------ Testing type ------------ echo bar> foobaz @@ -465,6 +470,7 @@ rd /s/Q foobar echo ...for /L rem Some cases loop forever writing 0s, like e.g. (1,0,1), (1,a,3) or (a,b,c); those can't be tested here for /L %%i in (1,2,0) do echo %%i +for(a)tab@/L %%i in (1,2,0) do echo %%i for /L %%i in (1,2,6) do echo %%i for /l %%i in (1 ,2,6) do echo %%i for /L %%i in (a,2,3) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 535ef44..e6bf421 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -247,6 +247,7 @@ Current dir: @pwd@\foobar(a)or_broken@Current dir:@space@ @pwd@\foobar\bar bak @pwd@\foobar\bar bak @pwd@ +(a)pwd@\foobar ------------ Testing type ------------ @pwd@>type foobaz(a)space@

1 0