December 2011 - Wine-commits

Alexandre Julliard : comctl32/tests: Fix a test failure on older Windows.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 9c9e8dd141fb90d2a448dda15c803d5e3907157b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9e8dd141fb90d2a448dda15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 19:47:27 2011 +0100 comctl32/tests: Fix a test failure on older Windows. --- dlls/comctl32/tests/imagelist.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 85eb13e..588a5b3 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -771,7 +771,8 @@ static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT ok(ilh->cx == cx, "wrong cx %d (expected %d)\n", ilh->cx, cx); ok(ilh->cy == cy, "wrong cy %d (expected %d)\n", ilh->cy, cy); ok(ilh->bkcolor == CLR_NONE, "wrong bkcolor %x\n", ilh->bkcolor); - ok(ilh->flags == flags, "wrong flags %04x\n", ilh->flags); + ok(ilh->flags == flags || broken(!(ilh->flags & 0xfe) && (flags & 0xfe) == ILC_COLOR4), /* <= w2k */ + "wrong flags %04x\n", ilh->flags); ok(ilh->ovls[0] == -1, "wrong ovls[0] %04x\n", ilh->ovls[0]); ok(ilh->ovls[1] == -1, "wrong ovls[1] %04x\n", ilh->ovls[1]); ok(ilh->ovls[2] == -1, "wrong ovls[2] %04x\n", ilh->ovls[2]);

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 3463c1cdffa729d929a46d860898328113422b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3463c1cdffa729d929a46d860… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Dec 16 00:46:51 2011 +0100 po: Update Italian translation. --- po/it.po | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/po/it.po b/po/it.po index 76adce9..7199fd6 100644 --- a/po/it.po +++ b/po/it.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-12-13 08:20+0100\n" +"PO-Revision-Date: 2011-12-17 08:45+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -3557,9 +3557,8 @@ msgid "Boolean object expected" msgstr "Previsto un oggetto Booleano" #: jscript.rc:46 -#, fuzzy msgid "Cannot delete '|'" -msgstr "Impossibile completare\n" +msgstr "Impossibile eliminare '|'" #: jscript.rc:47 msgid "VBArray object expected" @@ -6807,9 +6806,8 @@ msgid "&Data Rate" msgstr "&Rate di dati" #: msvfw32.rc:52 -#, fuzzy msgid "kB/s" -msgstr "kB/sec" +msgstr "kB/s" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -10042,13 +10040,11 @@ msgid "Parameter error\n" msgstr "Errore nel parametro\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Il volume nell'unità %1!c! è %2\n" -"Il numero seriale del volume è %3!04x!-%4!04x!\n" +"Il numero seriale del volume è %1!04x!-%2!04x!\n" "\n" #: cmd.rc:319 @@ -10081,11 +10077,11 @@ msgstr "La linea di input è troppo lunga.\n" #: cmd.rc:326 msgid "Volume in drive %1!c! is %2\n" -msgstr "" +msgstr "Il volume nell'unità %1!c! è %2\n" #: cmd.rc:327 msgid "Volume in drive %1!c! has no label.\n" -msgstr "" +msgstr "Il volume nell'unità %1!c! non ha etichetta.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 22283c96cce8606108be683180138e206c4c4b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22283c96cce8606108be68318… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Dec 2 19:06:48 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index 5d716f8..7c697d1 100644 --- a/po/lt.po +++ b/po/lt.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-12-12 21:39+0300\n" +"PO-Revision-Date: 2011-12-16 20:12+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3550,9 +3550,8 @@ msgid "Boolean object expected" msgstr "Tikėtasi loginio objekto" #: jscript.rc:46 -#, fuzzy msgid "Cannot delete '|'" -msgstr "Nepavyko užbaigti\n" +msgstr "Negalima pašalinti „|“" #: jscript.rc:47 msgid "VBArray object expected" @@ -6799,7 +6798,6 @@ msgid "&Data Rate" msgstr "&Duomenų sparta" #: msvfw32.rc:52 -#, fuzzy msgid "kB/s" msgstr "kB/s" @@ -9997,13 +9995,11 @@ msgid "Parameter error\n" msgstr "Parametro klaida\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Tomas diske %1!c! yra %2\n" -"Tomo serijos numeris yra %3!04x!-%4!04x!\n" +"Tomo serijos numeris yra %1!04x!-%2!04x!\n" "\n" #: cmd.rc:319 @@ -10036,11 +10032,11 @@ msgstr "Įvedimo eilutė per ilga.\n" #: cmd.rc:326 msgid "Volume in drive %1!c! is %2\n" -msgstr "" +msgstr "Tomas diske %1!c! yra %2\n" #: cmd.rc:327 msgid "Volume in drive %1!c! has no label.\n" -msgstr "" +msgstr "Tomas diske %1!c! neturi vardo.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Frédéric Delanoy : Release 1.3.35.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: c0b31dcdfbcdcdb28d3ca3934d5f12c0fa82f8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b31dcdfbcdcdb28d3ca3934… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 15 21:35:06 2011 +0100 Release 1.3.35. --- ANNOUNCE | 1019 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 538 insertions(+), 501 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0b31dcdfbcdcdb28d3ca…

1 0

Tag wine-1.3.35 : Alexandre Julliard : Release 1.3.35
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: refs/tags/wine-1.3.35 Tag: e39101495e70bc7c70a44ca1602c3a7750d434c6 URL: http://source.winehq.org/git/wine.git/?a=tag;h=e39101495e70bc7c70a44ca1602c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 20:15:33 2011 +0100 Release 1.3.35

1 0

Francois Gouget : riched20: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 8dd66bc927ba0ac3f4ce9745b90da372fce46185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd66bc927ba0ac3f4ce9745b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:45 2011 +0100 riched20: Avoid hardcoding the Unicode string literal lengths. --- dlls/riched20/writer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 45047bd..a5e5d50 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -927,7 +927,7 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, if (!editor->bEmulateVersion10 && cursor.pRun->member.run.nFlags & MERF_ENDPARA) { - static const WCHAR szEOL[2] = { '\r', '\n' }; + static const WCHAR szEOL[] = { '\r', '\n' }; /* richedit 2.0 - all line breaks are \r\n */ if (dwFormat & SF_UNICODE)

1 0

Francois Gouget : quartz: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: e8f42fb29efc5e3b4e871c3a18651f0e1dbd7253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f42fb29efc5e3b4e871c3a1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:07:04 2011 +0100 quartz: Avoid hardcoding the Unicode string literal lengths. --- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/regsvr.c | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index ab72f4f..6d3e554 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -60,9 +60,9 @@ static inline AsyncReader *impl_from_IFileSourceFilter( IFileSourceFilter *iface return (AsyncReader *)((char*)iface - FIELD_OFFSET(AsyncReader, lpVtblFSF)); } -static WCHAR const mediatype_name[11] = { +static WCHAR const mediatype_name[] = { 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; -static WCHAR const subtype_name[8] = { +static WCHAR const subtype_name[] = { 'S', 'u', 'b', 't', 'y', 'p', 'e', 0 }; static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index d41e2f5..db5428e 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -124,43 +124,43 @@ static HRESULT unregister_filters(struct regsvr_filter const *list); /*********************************************************************** * static string constants */ -static WCHAR const interface_keyname[10] = { +static WCHAR const interface_keyname[] = { 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; -static WCHAR const base_ifa_keyname[14] = { +static WCHAR const base_ifa_keyname[] = { 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; -static WCHAR const num_methods_keyname[11] = { +static WCHAR const num_methods_keyname[] = { 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; -static WCHAR const ps_clsid_keyname[15] = { +static WCHAR const ps_clsid_keyname[] = { 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', 'i', 'd', 0 }; -static WCHAR const ps_clsid32_keyname[17] = { +static WCHAR const ps_clsid32_keyname[] = { 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', 'i', 'd', '3', '2', 0 }; -static WCHAR const clsid_keyname[6] = { +static WCHAR const clsid_keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; -static WCHAR const curver_keyname[7] = { +static WCHAR const curver_keyname[] = { 'C', 'u', 'r', 'V', 'e', 'r', 0 }; -static WCHAR const ips_keyname[13] = { +static WCHAR const ips_keyname[] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', 0 }; -static WCHAR const ips32_keyname[15] = { +static WCHAR const ips32_keyname[] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', '3', '2', 0 }; -static WCHAR const progid_keyname[7] = { +static WCHAR const progid_keyname[] = { 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static WCHAR const viprogid_keyname[25] = { +static WCHAR const viprogid_keyname[] = { 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', 0 }; static char const tmodel_valuename[] = "ThreadingModel"; -static WCHAR const mediatype_name[11] = { +static WCHAR const mediatype_name[] = { 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; -static WCHAR const subtype_valuename[8] = { +static WCHAR const subtype_valuename[] = { 'S', 'u', 'b', 't', 'y', 'p', 'e', 0 }; -static WCHAR const sourcefilter_valuename[14] = { +static WCHAR const sourcefilter_valuename[] = { 'S', 'o', 'u', 'r', 'c', 'e', ' ', 'F', 'i', 'l', 't', 'e', 'r', 0 }; -static WCHAR const extensions_keyname[11] = { +static WCHAR const extensions_keyname[] = { 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', 0 }; /*********************************************************************** @@ -209,7 +209,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) } if (0 <= list->num_methods) { - static WCHAR const fmt[3] = { '%', 'd', 0 }; + static WCHAR const fmt[] = { '%', 'd', 0 }; HKEY key; res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0,

1 0

Francois Gouget : ntdll: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 1c59b91d64228221ffd75c628fc9ec360cd0beae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c59b91d64228221ffd75c628… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:07:20 2011 +0100 ntdll: Avoid hardcoding the Unicode string literal lengths. --- dlls/ntdll/path.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 23f2bbd..d22434c 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -269,12 +269,12 @@ DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U( PCWSTR path ) ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) { static const WCHAR consoleW[] = {'\\','\\','.','\\','C','O','N',0}; - static const WCHAR auxW[3] = {'A','U','X'}; - static const WCHAR comW[3] = {'C','O','M'}; - static const WCHAR conW[3] = {'C','O','N'}; - static const WCHAR lptW[3] = {'L','P','T'}; - static const WCHAR nulW[3] = {'N','U','L'}; - static const WCHAR prnW[3] = {'P','R','N'}; + static const WCHAR auxW[] = {'A','U','X'}; + static const WCHAR comW[] = {'C','O','M'}; + static const WCHAR conW[] = {'C','O','N'}; + static const WCHAR lptW[] = {'L','P','T'}; + static const WCHAR nulW[] = {'N','U','L'}; + static const WCHAR prnW[] = {'P','R','N'}; const WCHAR *start, *end, *p; @@ -343,7 +343,7 @@ BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, PWSTR* file_part, CURDIR* cd) { - static const WCHAR LongFileNamePfxW[4] = {'\\','\\','?','\\'}; + static const WCHAR LongFileNamePfxW[] = {'\\','\\','?','\\'}; ULONG sz, offset; WCHAR local[MAX_PATH]; LPWSTR ptr;

1 0

Francois Gouget : krnl386.exe16: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 95577f33681b3c880fbf83a7e75bfbc00e13beb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95577f33681b3c880fbf83a7e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:07:35 2011 +0100 krnl386.exe16: Avoid hardcoding the Unicode string literal lengths. --- dlls/krnl386.exe16/int21.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index f8e235a..241ecc1 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -599,7 +599,7 @@ static WORD INT21_GetHeapSelector( CONTEXT *context ) */ static BOOL INT21_FillDrivePB( BYTE drive ) { - WCHAR drivespec[3] = {'A', ':', 0}; + WCHAR drivespec[] = {'A', ':', 0}; INT21_HEAP *heap = INT21_GetHeapPointer(); INT21_DPB *dpb; UINT drivetype;

1 0

Francois Gouget : kernel32: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 632ac0b227ec9631543b36da8c990c8498a56c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=632ac0b227ec9631543b36da8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:08:23 2011 +0100 kernel32: Avoid hardcoding the Unicode string literal lengths. --- dlls/kernel32/console.c | 3 +-- dlls/kernel32/tests/atom.c | 8 ++++---- dlls/kernel32/tests/codepage.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e66e9b8..2ca74c9 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2430,8 +2430,7 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber break; case '\t': { - WCHAR tmp[8] = {' ',' ',' ',' ',' ',' ',' ',' '}; - + static const WCHAR tmp[] = {' ',' ',' ',' ',' ',' ',' ',' '}; if (!write_block(hConsoleOutput, &csbi, mode, tmp, ((csbi.dwCursorPosition.X + 8) & ~7) - csbi.dwCursorPosition.X)) goto the_end; diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index 15ef04c..a0f99d1 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -168,11 +168,11 @@ static void test_get_atom_name(void) if (unicode_OS) { - static const WCHAR sampleW[10] = {'.','.','.','.','.','.','.','.','.','.'}; + static const WCHAR sampleW[] = {'.','.','.','.','.','.','.','.','.','.'}; for (i = 0; i < 10; i++) bufW[i] = '.'; ok( !GlobalGetAtomNameW( atom, bufW, 0 ), "succeeded\n" ); - ok( !memcmp( bufW, sampleW, 10 * sizeof(WCHAR) ), "should not touch buffer\n" ); + ok( !memcmp( bufW, sampleW, sizeof(sampleW) ), "should not touch buffer\n" ); } /* Test integer atoms */ @@ -442,11 +442,11 @@ static void test_local_get_atom_name(void) if (unicode_OS) { - static const WCHAR sampleW[10] = {'.','.','.','.','.','.','.','.','.','.'}; + static const WCHAR sampleW[] = {'.','.','.','.','.','.','.','.','.','.'}; for (i = 0; i < 10; i++) bufW[i] = '.'; ok( !GetAtomNameW( atom, bufW, 0 ), "succeeded\n" ); - ok( !memcmp( bufW, sampleW, 10 * sizeof(WCHAR) ), "should not touch buffer\n" ); + ok( !memcmp( bufW, sampleW, sizeof(sampleW) ), "should not touch buffer\n" ); } /* Test integer atoms */ diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8f9c4e1..61bcf54 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -211,8 +211,8 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) int ret; WCHAR wc1 = 228; /* Western Windows-1252 character */ WCHAR wc2 = 1088; /* Russian Windows-1251 character not displayable for Windows-1252 */ - WCHAR wcs[5] = {'T', 'h', 1088, 'i', 0}; /* String with ASCII characters and a Russian character */ - WCHAR dbwcs[3] = {28953, 25152, 0}; /* String with Chinese (codepage 950) characters */ + static const WCHAR wcs[] = {'T', 'h', 1088, 'i', 0}; /* String with ASCII characters and a Russian character */ + static const WCHAR dbwcs[] = {28953, 25152, 0}; /* String with Chinese (codepage 950) characters */ SetLastError(0xdeadbeef); ret = WideCharToMultiByte(1252, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar);

1 0