July 2012 - Wine-Commits - list.winehq.org

Jacek Caban : widl: Add IDL installation directory to include path.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 80d3055869d5135b18308380b09c424baa514cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d3055869d5135b18308380b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 11:38:23 2012 +0200 widl: Add IDL installation directory to include path. --- tools/widl/Makefile.in | 1 + tools/widl/widl.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index f2bd3f3..88558bb 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -21,6 +21,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y +EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"$(includedir)/windows/\" INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) all: $(PROGRAMS) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 85d66d7..fc3d0d9 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -643,6 +643,10 @@ int main(int argc,char *argv[]) } } +#ifdef DEFAULT_INCLUDE_DIR + wpp_add_include_path(DEFAULT_INCLUDE_DIR); +#endif + if(do_everything) { set_everything(TRUE); }

1 0

Michael Stefaniuc : winedump: Simplify the "pointer to start of array" idiom.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 19c9d083047f1af8517662a1687df353581d3e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c9d083047f1af8517662a16… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 23 10:37:06 2012 +0200 winedump: Simplify the "pointer to start of array" idiom. --- tools/winedump/debug.c | 2 +- tools/winedump/minidump.c | 8 ++++---- tools/winedump/pdb.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index c59efa6..961cf42 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -500,7 +500,7 @@ static const char *get_coff_name( const IMAGE_SYMBOL *coff_sym, const char *coff { memcpy(namebuff, coff_sym->N.ShortName, 8); namebuff[8] = '\0'; - nampnt = &namebuff[0]; + nampnt = namebuff; } else { diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index ddd0ed6..aaa9dff 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -102,7 +102,7 @@ void mdmp_dump(void) case ThreadListStream: { const MINIDUMP_THREAD_LIST* mtl = (const MINIDUMP_THREAD_LIST*)stream; - const MINIDUMP_THREAD* mt = &mtl->Threads[0]; + const MINIDUMP_THREAD* mt = mtl->Threads; unsigned int i; printf("Threads: %u\n", mtl->NumberOfThreads); @@ -129,7 +129,7 @@ void mdmp_dump(void) case 0xFFF0: { const MINIDUMP_MODULE_LIST* mml = (const MINIDUMP_MODULE_LIST*)stream; - const MINIDUMP_MODULE* mm = &mml->Modules[0]; + const MINIDUMP_MODULE* mm = mml->Modules; unsigned int i; const char* p1; const char* p2; @@ -224,7 +224,7 @@ void mdmp_dump(void) case MemoryListStream: { const MINIDUMP_MEMORY_LIST* mml = (const MINIDUMP_MEMORY_LIST*)stream; - const MINIDUMP_MEMORY_DESCRIPTOR* mmd = &mml->MemoryRanges[0]; + const MINIDUMP_MEMORY_DESCRIPTOR* mmd = mml->MemoryRanges; unsigned int i; printf("Memory Ranges: %u\n", mml->NumberOfMemoryRanges); @@ -333,7 +333,7 @@ void mdmp_dump(void) if (msi->ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { printf(" x86.VendorId: %.12s\n", - (const char*)&msi->Cpu.X86CpuInfo.VendorId[0]); + (const char*)msi->Cpu.X86CpuInfo.VendorId); printf(" x86.VersionInformation: %x\n", msi->Cpu.X86CpuInfo.VersionInformation); printf(" x86.FeatureInformation: %x\n", diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 7a0bd61..3513452 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -174,12 +174,12 @@ static unsigned get_stream_by_name(struct pdb_reader* reader, const char* name) if (reader->read_file == pdb_jg_read_file) { - str = &reader->u.jg.root->names[0]; + str = reader->u.jg.root->names; cbstr = reader->u.jg.root->cbNames; } else { - str = &reader->u.ds.root->names[0]; + str = reader->u.ds.root->names; cbstr = reader->u.ds.root->cbNames; } @@ -740,7 +740,7 @@ static void pdb_jg_dump(void) reader.u.jg.root->Age, (unsigned)reader.u.jg.root->cbNames); - pdw = (DWORD*)(&reader.u.jg.root->names[0] + reader.u.jg.root->cbNames); + pdw = (DWORD*)(reader.u.jg.root->names + reader.u.jg.root->cbNames); numok = *pdw++; count = *pdw++; printf("\tStreams directory:\n" @@ -895,7 +895,7 @@ static void pdb_ds_dump(void) reader.u.ds.root->Age, get_guid_str(&reader.u.ds.root->guid), reader.u.ds.root->cbNames); - pdw = (DWORD*)(&reader.u.ds.root->names[0] + reader.u.ds.root->cbNames); + pdw = (DWORD*)(reader.u.ds.root->names + reader.u.ds.root->cbNames); numok = *pdw++; count = *pdw++; printf("\tStreams directory:\n"

1 0

Nikolay Sivov : advapi32/tests: Add some more well known SIDs to tests.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: a56f3c665e436f5faf819a7146da419efe309858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56f3c665e436f5faf819a714… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 20:13:14 2012 +0400 advapi32/tests: Add some more well known SIDs to tests. --- dlls/advapi32/tests/security.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3fc9930..28e43ec 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1655,7 +1655,8 @@ static const struct well_known_sid_value /* 66 */ {TRUE, "S-1-16-4096"}, {TRUE, "S-1-16-8192"}, {TRUE, "S-1-16-12288"}, /* 69 */ {TRUE, "S-1-16-16384"}, {TRUE, "S-1-5-33"}, {TRUE, "S-1-3-4"}, /* 72 */ {FALSE, "S-1-5-21-12-23-34-45-56-571"}, {FALSE, "S-1-5-21-12-23-34-45-56-572"}, -/* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"} +/* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"}, +/* 77 */ {FALSE, "S-1-5-21-12-23-34-45-56-498"}, {TRUE, "S-1-5-32-574"}, {TRUE, "S-1-16-8448"} }; static void test_CreateWellKnownSid(void) @@ -1720,7 +1721,7 @@ static void test_CreateWellKnownSid(void) expect_eq(GetSidLengthRequired(*GetSidSubAuthorityCount(sid_buffer)), cb, DWORD, "%d"); ok(IsValidSid(sid_buffer), "The sid is not valid\n"); ok(pConvertSidToStringSidA(sid_buffer, &str), "Couldn't convert SID to string\n"); - ok(strcmp(str, value->sid_string) == 0, "SID mismatch - expected %s, got %s\n", + ok(strcmp(str, value->sid_string) == 0, "%d: SID mismatch - expected %s, got %s\n", i, value->sid_string, str); LocalFree(str);

1 0

Nikolay Sivov : kernel32: Added GetSystemDefaultLocaleName().
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: b586be515ccb404e481393066d83839d5ecc34b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b586be515ccb404e481393066… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 11:41:20 2012 +0400 kernel32: Added GetSystemDefaultLocaleName(). --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c5518ce..5906ca3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -634,6 +634,7 @@ @ stdcall GetStringTypeW(long wstr long ptr) @ stdcall GetSystemDefaultLCID() @ stdcall GetSystemDefaultLangID() +@ stdcall GetSystemDefaultLocaleName(ptr long) @ stdcall GetSystemDefaultUILanguage() @ stdcall GetSystemDEPPolicy() @ stdcall GetSystemDirectoryA(ptr long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d627bdb..ac708c3 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -931,6 +931,14 @@ LCID WINAPI GetSystemDefaultLCID(void) return lcid; } +/*********************************************************************** + * GetSystemDefaultLocaleName (KERNEL32.@) + */ +INT WINAPI GetSystemDefaultLocaleName(LPWSTR localename, INT len) +{ + LCID lcid = GetSystemDefaultLCID(); + return LCIDToLocaleName(lcid, localename, len, 0); +} /*********************************************************************** * GetUserDefaultUILanguage (KERNEL32.@)

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone27 palette.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 6a7f97f98f394ef3f42f971266bd4840a5822e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7f97f98f394ef3f42f97126… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:43:45 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone27 palette. --- dlls/windowscodecs/palette.c | 27 +++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 21 +++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 4541c7c..74438f6 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -160,6 +160,28 @@ static WICColor *generate_halftone8_palette(UINT *count) return entries; } +static WICColor *generate_halftone27_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 28; + entries = HeapAlloc(GetProcessHeap(), 0, 28 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 27; i++) + { + static const BYTE halftone_values[4] = { 0x00,0x80,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%3]; + entries[i] |= halftone_values[(i/3)%3] << 8; + entries[i] |= halftone_values[(i/9)%3] << 16; + } + + entries[i] = 0xffc0c0c0; + return entries; +} + static WICColor *generate_halftone64_palette(UINT *count) { WICColor *entries; @@ -253,6 +275,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone27: + colors = generate_halftone27_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + case WICBitmapPaletteTypeFixedHalftone64: colors = generate_halftone64_palette(&count); if (!colors) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 8e320c5..7c4c3d4 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -199,6 +199,24 @@ static void generate_halftone8_palette(DWORD *entries, UINT count) } } +static void generate_halftone27_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values[4] = { 0x00,0x80,0xff }; + UINT i; + + assert(count == 28); + + for (i = 0; i < 27; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%3]; + entries[i] |= halftone_values[(i/3)%3] << 8; + entries[i] |= halftone_values[(i/9)%3] << 16; + } + + entries[i] = 0xffc0c0c0; +} + static void generate_halftone64_palette(DWORD *entries, UINT count) { static const BYTE halftone_values[4] = { 0x00,0x55,0xaa,0xff }; @@ -256,6 +274,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone27, 0, 0, 28, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; @@ -314,6 +333,8 @@ static void test_predefined_palette(void) generate_gray256_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone8) generate_halftone8_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone27) + generate_halftone27_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) generate_halftone64_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256)

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: feea8e3b2ec1ca3a1850145949dc0b8ccb49b3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feea8e3b2ec1ca3a185014594… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 01:29:21 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 140 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 84 insertions(+), 56 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 29084ac..48140e5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -13235,7 +13235,7 @@ msgstr "版本資訊" #: winefile.rc:194 msgctxt "accelerator Fullscreen" msgid "S" -msgstr "" +msgstr "S" #: winefile.rc:87 msgid "Applying font settings" @@ -13243,7 +13243,7 @@ msgstr "字型設定套用中" #: winefile.rc:88 msgid "Error while selecting new font." -msgstr "" +msgstr "選取新字型時發生錯誤。" #: winefile.rc:93 msgid "Wine File Manager" @@ -13251,15 +13251,15 @@ msgstr "Wine 檔案管理員" #: winefile.rc:95 msgid "root fs" -msgstr "" +msgstr "根檔案系統" #: winefile.rc:96 msgid "unixfs" -msgstr "" +msgstr "unixfs" #: winefile.rc:98 msgid "Shell" -msgstr "" +msgstr "命令殼" #: winefile.rc:99 winhlp32.rc:107 winhlp32.rc:82 msgid "Not yet implemented" @@ -13267,38 +13267,38 @@ msgstr "尚未實作" #: winefile.rc:106 msgid "CDate" -msgstr "" +msgstr "CDate" #: winefile.rc:107 msgid "ADate" -msgstr "" +msgstr "ADate" #: winefile.rc:108 msgid "MDate" -msgstr "" +msgstr "MDate" #: winefile.rc:109 msgid "Index/Inode" -msgstr "" +msgstr "索引/Inode" #: winefile.rc:114 msgid "%1 of %2 free" -msgstr "" +msgstr "%2 中剩下 %1" #: winefile.rc:115 msgctxt "unit kilobyte" msgid "kB" -msgstr "" +msgstr "kB" #: winefile.rc:116 msgctxt "unit megabyte" msgid "MB" -msgstr "" +msgstr "MB" #: winefile.rc:117 msgctxt "unit gigabyte" msgid "GB" -msgstr "" +msgstr "GB" #: winemine.rc:34 msgid "&Game" @@ -13310,7 +13310,7 @@ msgstr "新遊戲(&N)\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "問號(&M)" #: winemine.rc:39 msgid "&Beginner" @@ -13326,7 +13326,7 @@ msgstr "專家(&E)" #: winemine.rc:42 msgid "&Custom..." -msgstr "自訂(&C)..." +msgstr "自訂(&C)…" #: winemine.rc:44 msgid "&Fastest Times" @@ -13478,33 +13478,27 @@ msgstr "無法開啟檔案「%s」。您想要自己搜尋這個檔案嗎？" #: winhlp32.rc:90 msgid "Cannot find a richedit implementation... Aborting" -msgstr "找不到 richedit... 終止" +msgstr "找不到 richedit… 終止" #: winhlp32.rc:91 msgid "Help topics: " msgstr "說明主題：" #: wmic.rc:25 -#, fuzzy -#| msgid "Extended attributes not supported.\n" msgid "Error: Command line not supported\n" -msgstr "不支援延伸屬性。\n" +msgstr "錯誤：不支援命令列\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Sector not found.\n" msgid "Error: Alias not found\n" -msgstr "找不到磁區。\n" +msgstr "錯誤：找不到別名\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Invalid key.\n" msgid "Error: Invalid query\n" -msgstr "無效的機碼。\n" +msgstr "錯誤：無效的查詢\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N" -msgstr "新增(&N)...\tCtrl+N" +msgstr "新增(&N)…\tCtrl+N" #: wordpad.rc:42 msgid "R&edo\tCtrl+Y" @@ -13568,7 +13562,7 @@ msgstr "插入(&I)" #: wordpad.rc:77 msgid "&Date and time..." -msgstr "日期時間(&D)..." +msgstr "日期時間(&D)…" #: wordpad.rc:79 msgid "F&ormat" @@ -13580,11 +13574,11 @@ msgstr "子彈點(&B)" #: wordpad.rc:83 wordpad.rc:106 msgid "&Paragraph..." -msgstr "段落(&P)..." +msgstr "段落(&P)…" #: wordpad.rc:84 msgid "&Tabs..." -msgstr "標籤(&T)..." +msgstr "標籤(&T)…" #: wordpad.rc:85 msgid "Backgroun&d" @@ -13636,7 +13630,7 @@ msgstr "右" #: wordpad.rc:229 msgid "First line" -msgstr "第一行" +msgstr "第一列" #: wordpad.rc:231 msgid "Alignment" @@ -13656,11 +13650,11 @@ msgstr "全部刪除(&L)" #: wordpad.rc:256 msgid "Line wrapping" -msgstr "自動換行" +msgstr "自動換列" #: wordpad.rc:257 msgid "&No line wrapping" -msgstr "關閉自動換行(&N)" +msgstr "關閉自動換列(&N)" #: wordpad.rc:258 msgid "Wrap text by the &window border" @@ -13677,37 +13671,37 @@ msgstr "工具列" #: wordpad.rc:273 msgctxt "accelerator Align Left" msgid "L" -msgstr "" +msgstr "L" #: wordpad.rc:274 msgctxt "accelerator Align Center" msgid "E" -msgstr "" +msgstr "E" #: wordpad.rc:275 msgctxt "accelerator Align Right" msgid "R" -msgstr "" +msgstr "R" #: wordpad.rc:282 msgctxt "accelerator Redo" msgid "Y" -msgstr "" +msgstr "Y" #: wordpad.rc:283 msgctxt "accelerator Bold" msgid "B" -msgstr "" +msgstr "B" #: wordpad.rc:284 msgctxt "accelerator Italic" msgid "I" -msgstr "" +msgstr "I" #: wordpad.rc:285 msgctxt "accelerator Underline" msgid "U" -msgstr "" +msgstr "U" #: wordpad.rc:136 msgid "All documents (*.*)" @@ -13719,15 +13713,15 @@ msgstr "純文字文件 (*.txt)" #: wordpad.rc:138 msgid "Unicode text document (*.txt)" -msgstr "統一碼文字文件 (*.txt)" +msgstr "萬國碼文字文件 (*.txt)" #: wordpad.rc:139 msgid "Rich text format (*.rtf)" -msgstr "RTF豐富格式 (*.rtf)" +msgstr "豐富文字格式 (*.rtf)" #: wordpad.rc:140 msgid "Rich text document" -msgstr "RTF豐富格式檔案" +msgstr "豐富文字格式檔案" #: wordpad.rc:141 msgid "Text document" @@ -13735,7 +13729,7 @@ msgstr "純文字文件" #: wordpad.rc:142 msgid "Unicode text document" -msgstr "統一碼文字文件" +msgstr "萬國碼文字文件" #: wordpad.rc:143 msgid "Printer files (*.prn)" @@ -13828,11 +13822,11 @@ msgstr "您已經選擇儲存為純文字格式, 這可能導致格式遺失。 #: wordpad.rc:187 msgid "Invalid number format." -msgstr "" +msgstr "無效的數字格式。" #: wordpad.rc:188 msgid "OLE storage documents are not supported." -msgstr "" +msgstr "OLE 儲存體文件未被支援。" #: wordpad.rc:189 msgid "Could not save the file." @@ -13856,19 +13850,19 @@ msgstr "列印功能尚未實作。" #: wordpad.rc:194 msgid "Cannot add more than 32 tab stops." -msgstr "" +msgstr "無法加入超過 32 個定位停駐點。" #: write.rc:27 msgid "Starting Wordpad failed" -msgstr "" +msgstr "啟動 Wordpad 時失敗" #: xcopy.rc:27 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "" +msgstr "無效的參數數量 - 使用 xcopy /? 以獲得說明\n" #: xcopy.rc:28 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "" +msgstr "無效的參數『%1』- 使用 xcopy /? 以獲得說明\n" #: xcopy.rc:29 msgid "Press <Enter> to begin copying\n" @@ -13876,7 +13870,7 @@ msgstr "請按 <Enter> 鍵開始複製\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n" -msgstr "" +msgstr "%1!d! 個檔案將被複製\n" #: xcopy.rc:31 msgid "%1!d! file(s) copied\n" @@ -13888,32 +13882,35 @@ msgid "" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" +"『%1』是一個在目標上的\n" +"檔名或目錄？\n" +"(F - 檔案，D - 目錄)\n" #: xcopy.rc:35 msgid "%1? (Yes|No)\n" -msgstr "%1？ (是｜否)\n" +msgstr "%1？ (Yes|No)\n" #: xcopy.rc:36 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "是否覆蓋 %1？ (是｜否｜全部皆是)\n" +msgstr "是否覆蓋 %1？ (Yes|No|All)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "" +msgstr "將『%1』複製到『%2』時失敗並獲得 r/c %3!d!\n" #: xcopy.rc:39 msgid "Failed during reading of '%1'\n" -msgstr "" +msgstr "在讀取『%1』的期間發生了失敗\n" #: xcopy.rc:43 msgctxt "File key" msgid "F" -msgstr "" +msgstr "F" #: xcopy.rc:44 msgctxt "Directory key" msgid "D" -msgstr "" +msgstr "D" #: xcopy.rc:77 msgid "" @@ -13950,3 +13947,34 @@ msgid "" "\t\tthan source.\n" "\n" msgstr "" +"XCOPY - 將來源檔案或樹狀目錄複製到目的。\n" +"\n" +"語法：\n" +"XCOPY 來源 [目的] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" +"\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" +"\n" +"位置：\n" +"\n" +"[/I] 如果目的不存在且複製兩個或更多檔案時，\n" +"\t將目的假設為目錄。\n" +"[/S] 複製目錄和子目錄。\n" +"[/E] 複製目錄和子目錄，包含任何空目錄。\n" +"[/Q] 在複製期間不列出名稱，亦即安靜模式。\n" +"[/F] 在複製期間顯示完整的來源和目的名稱。\n" +"[/L] 模擬操作，顯示會被複製的名稱。\n" +"[/W] 在開始複製操作之前進行提示。\n" +"[/T] 建立空的目錄結構但是不複製檔案。\n" +"[/Y] 覆寫檔案時抑制提示。\n" +"[/-Y] 覆寫檔案時啟用提示。\n" +"[/P] 於複製每個來源檔案之前提示。\n" +"[/N] 使用簡稱複製。\n" +"[/U] 只複製已經存在目的中的檔案。\n" +"[/R] 覆寫任何唯讀檔案。\n" +"[/H] 複製時包括隱藏和系統檔案。\n" +"[/C] 即使在複製期間發生錯誤仍然繼續。\n" +"[/A] 只複製具有封存屬性的檔案。\n" +"[/M] 只複製具有封存屬性的檔案，\n" +"\t但會移除封存屬性。\n" +"[/D | /D:m-d-y] 複製新檔案或是於給定日期之後修改的檔案。\n" +"\t\t如果沒有給定日期，只有當目的比來源舊時才複製。\n" +"\n"

1 0

Henri Verbeet : d3d10: Add support for parsing depth/stencil states.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: ea05d7b92d4cdaa7d0cdf8b65e546b24932114b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea05d7b92d4cdaa7d0cdf8b65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:55 2012 +0200 d3d10: Add support for parsing depth/stencil states. --- dlls/d3d10/effect.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cba50e2..dabe02c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -138,6 +138,20 @@ static const struct d3d10_effect_state_property_info property_info[] = {0x13, "RasterizerState.ScissorEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_RASTERIZER, FIELD_OFFSET(D3D10_RASTERIZER_DESC, ScissorEnable) }, {0x14, "RasterizerState.MultisampleEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_RASTERIZER, FIELD_OFFSET(D3D10_RASTERIZER_DESC, MultisampleEnable) }, {0x15, "RasterizerState.AntialiasedLineEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_RASTERIZER, FIELD_OFFSET(D3D10_RASTERIZER_DESC, AntialiasedLineEnable) }, + {0x16, "DepthStencilState.DepthEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, DepthEnable) }, + {0x17, "DepthStencilState.DepthWriteMask", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, DepthWriteMask) }, + {0x18, "DepthStencilState.DepthFunc", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, DepthFunc) }, + {0x19, "DepthStencilState.StencilEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, StencilEnable) }, + {0x1a, "DepthStencilState.StencilReadMask", D3D10_SVT_UINT8, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, StencilReadMask) }, + {0x1b, "DepthStencilState.StencilWriteMask", D3D10_SVT_UINT8, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, StencilWriteMask) }, + {0x1c, "DepthStencilState.FrontFaceStencilFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilFailOp) }, + {0x1d, "DepthStencilState.FrontFaceStencilDepthFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilDepthFailOp)}, + {0x1e, "DepthStencilState.FrontFaceStencilPass", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilPassOp) }, + {0x1f, "DepthStencilState.FrontFaceStencilFunc", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilFunc) }, + {0x20, "DepthStencilState.BackFaceStencilFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilFailOp) }, + {0x21, "DepthStencilState.BackFaceStencilDepthFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilDepthFailOp) }, + {0x22, "DepthStencilState.BackFaceStencilPass", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilPassOp) }, + {0x23, "DepthStencilState.BackFaceStencilFunc", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilFunc) }, }; static const D3D10_RASTERIZER_DESC default_rasterizer_desc = @@ -154,6 +168,18 @@ static const D3D10_RASTERIZER_DESC default_rasterizer_desc = FALSE, }; +static const D3D10_DEPTH_STENCIL_DESC default_depth_stencil_desc = +{ + TRUE, + D3D10_DEPTH_WRITE_MASK_ALL, + D3D10_COMPARISON_LESS, + FALSE, + D3D10_DEFAULT_STENCIL_READ_MASK, + D3D10_DEFAULT_STENCIL_WRITE_MASK, + {D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_COMPARISON_ALWAYS}, + {D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_COMPARISON_ALWAYS}, +}; + struct d3d10_effect_state_storage_info { D3D_SHADER_VARIABLE_TYPE id; @@ -164,6 +190,7 @@ struct d3d10_effect_state_storage_info static const struct d3d10_effect_state_storage_info d3d10_effect_state_storage_info[] = { {D3D10_SVT_RASTERIZER, sizeof(default_rasterizer_desc), &default_rasterizer_desc }, + {D3D10_SVT_DEPTHSTENCIL, sizeof(default_depth_stencil_desc), &default_depth_stencil_desc}, }; static BOOL copy_name(const char *ptr, char **name) @@ -1013,6 +1040,20 @@ static BOOL read_int32_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT } } +static BOOL read_int8_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT8 *out_data, UINT idx) +{ + switch (in_type) + { + case D3D10_SVT_INT: + out_data[idx] = value; + return TRUE; + + default: + FIXME("Unhandled in_type %#x.\n", in_type); + return FALSE; + } +} + static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, UINT out_base, UINT out_size, void *out_data) { @@ -1049,6 +1090,11 @@ static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, return FALSE; break; + case D3D10_SVT_UINT8: + if (!read_int8_value(value, in_type, out_data, out_idx)) + return FALSE; + break; + default: FIXME("Unhandled out_type %#x.\n", out_type); return FALSE; @@ -1502,7 +1548,6 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const } break; - case D3D10_SVT_DEPTHSTENCIL: case D3D10_SVT_BLEND: case D3D10_SVT_SAMPLER: TRACE("SVT is a state.\n"); @@ -1521,6 +1566,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const } break; + case D3D10_SVT_DEPTHSTENCIL: case D3D10_SVT_RASTERIZER: { const struct d3d10_effect_state_storage_info *storage_info;

1 0

Henri Verbeet : wined3d: Get rid of APPLE_flush_render, it doesn't exist.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 526901e307fddc5994e3a3aa22f8a92946f50a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526901e307fddc5994e3a3aa2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:52 2012 +0200 wined3d: Get rid of APPLE_flush_render, it doesn't exist. --- dlls/wined3d/directx.c | 2 -- dlls/wined3d/wined3d_gl.h | 10 ---------- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2a6b83b..6b60966 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -91,7 +91,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_APPLE_fence", APPLE_FENCE, 0 }, {"GL_APPLE_float_pixels", APPLE_FLOAT_PIXELS, 0 }, {"GL_APPLE_flush_buffer_range", APPLE_FLUSH_BUFFER_RANGE, 0 }, - {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER, 0 }, {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422, 0 }, /* ARB */ @@ -1413,7 +1412,6 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in * DirectDraw, not OpenGL. */ if (gl_info->supported[APPLE_FENCE] && gl_info->supported[APPLE_CLIENT_STORAGE] - && gl_info->supported[APPLE_FLUSH_RENDER] && gl_info->supported[APPLE_YCBCR_422]) return GL_VENDOR_APPLE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 5bc3c63..f01cdb3 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1720,7 +1720,6 @@ enum wined3d_gl_extension APPLE_FENCE, APPLE_FLOAT_PIXELS, APPLE_FLUSH_BUFFER_RANGE, - APPLE_FLUSH_RENDER, APPLE_YCBCR_422, /* ARB */ ARB_COLOR_BUFFER_FLOAT, @@ -1887,10 +1886,6 @@ typedef void (WINE_GLAPI *PGLFNFINISHOBJECTAPPLEPROC)(GLenum, GLuint); typedef void (WINE_GLAPI *PGLFNBUFFERPARAMETERIAPPLE)(GLenum target, GLenum pname, GLint param); typedef void (WINE_GLAPI *PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); -/* GL_APPLE_flush_render */ -typedef void (WINE_GLAPI *PGLFNFLUSHRENDERAPPLEPROC)(void); -typedef void (WINE_GLAPI *PGLFNFINISHRENDERAPPLEPROC)(void); - /* GL_APPLE_ycbcr_422 */ #ifndef GL_APPLE_ycbcr_422 #define GL_APPLE_ycbcr_422 1 @@ -3712,11 +3707,6 @@ typedef BOOL (WINAPI *PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat); glBufferParameteriAPPLE, APPLE_FLUSH_BUFFER_RANGE, NULL) \ USE_GL_FUNC(PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE, \ glFlushMappedBufferRangeAPPLE, APPLE_FLUSH_BUFFER_RANGE, NULL) \ - /* GL_APPLE_flush_render */ \ - USE_GL_FUNC(PGLFNFLUSHRENDERAPPLEPROC, \ - glFlushRenderAPPLE, APPLE_FLUSH_RENDER, NULL) \ - USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, \ - glFinishRenderAPPLE, APPLE_FLUSH_RENDER, NULL) \ /* GL_ARB_color_buffer_float */ \ USE_GL_FUNC(PGLFNCLAMPCOLORARBPROC, \ glClampColorARB, ARB_COLOR_BUFFER_FLOAT, NULL) \

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_depth_stencil_variable_GetBackingStore().
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 6feffa6ee2d8bdf043f9a35471a5b4a66abba90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6feffa6ee2d8bdf043f9a3547… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:56 2012 +0200 d3d10: Implement d3d10_effect_depth_stencil_variable_GetBackingStore(). --- dlls/d3d10/effect.c | 14 ++++++++++- dlls/d3d10/tests/effect.c | 52 +++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index dabe02c..eb82512 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6091,9 +6091,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetDepthSte static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingStore(ID3D10EffectDepthStencilVariable *iface, UINT index, D3D10_DEPTH_STENCIL_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (index >= max(v->type->element_count, 1)) + { + WARN("Invalid index %u.\n", index); + return E_FAIL; + } + + *desc = ((D3D10_DEPTH_STENCIL_DESC *)v->data)[index]; + + return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 089ded6..b1b3816 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3866,30 +3866,29 @@ static void test_effect_state_groups(ID3D10Device *device) v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v); - memset(&ds_desc, 0, sizeof(ds_desc)); d->lpVtbl->GetBackingStore(d, 0, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_EQUAL, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); - todo_wine ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); - todo_wine ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); - todo_wine ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); - todo_wine ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_INVERT, "Got unexpected FrontFaceStencilFail %#x.\n", + ok(ds_desc.DepthFunc == D3D10_COMPARISON_EQUAL, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); + ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); + ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); + ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_INVERT, "Got unexpected FrontFaceStencilFail %#x.\n", ds_desc.FrontFace.StencilFailOp); - todo_wine ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR, + ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR, "Got unexpected FrontFaceStencilDepthFail %#x.\n", ds_desc.FrontFace.StencilDepthFailOp); - todo_wine ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_DECR, "Got unexpected FrontFaceStencilPass %#x.\n", + ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_DECR, "Got unexpected FrontFaceStencilPass %#x.\n", ds_desc.FrontFace.StencilPassOp); - todo_wine ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_LESS_EQUAL, "Got unexpected FrontFaceStencilFunc %#x.\n", + ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_LESS_EQUAL, "Got unexpected FrontFaceStencilFunc %#x.\n", ds_desc.FrontFace.StencilFunc); - todo_wine ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_REPLACE, "Got unexpected BackFaceStencilFail %#x.\n", + ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_REPLACE, "Got unexpected BackFaceStencilFail %#x.\n", ds_desc.BackFace.StencilFailOp); - todo_wine ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR_SAT, + ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR_SAT, "Got unexpected BackFaceStencilDepthFail %#x.\n", ds_desc.BackFace.StencilDepthFailOp); - todo_wine ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_DECR_SAT, "Got unexpected BackFaceStencilPass %#x.\n", + ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_DECR_SAT, "Got unexpected BackFaceStencilPass %#x.\n", ds_desc.BackFace.StencilPassOp); - todo_wine ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", + ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); @@ -4116,30 +4115,29 @@ static void test_effect_state_group_defaults(ID3D10Device *device) v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v); - memset(&ds_desc, 0, sizeof(ds_desc)); d->lpVtbl->GetBackingStore(d, 0, &ds_desc); - todo_wine ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); - todo_wine ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ALL, "Got unexpected DepthWriteMask %#x.\n", + ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ALL, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_LESS, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + ok(ds_desc.DepthFunc == D3D10_COMPARISON_LESS, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); ok(!ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); - todo_wine ok(ds_desc.StencilReadMask == 0xff, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); - todo_wine ok(ds_desc.StencilWriteMask == 0xff, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); - todo_wine ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilFail %#x.\n", + ok(ds_desc.StencilReadMask == 0xff, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); + ok(ds_desc.StencilWriteMask == 0xff, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); + ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilFail %#x.\n", ds_desc.FrontFace.StencilFailOp); - todo_wine ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, + ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilDepthFail %#x.\n", ds_desc.FrontFace.StencilDepthFailOp); - todo_wine ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilPass %#x.\n", + ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilPass %#x.\n", ds_desc.FrontFace.StencilPassOp); - todo_wine ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected FrontFaceStencilFunc %#x.\n", + ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected FrontFaceStencilFunc %#x.\n", ds_desc.FrontFace.StencilFunc); - todo_wine ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilFail %#x.\n", + ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilFail %#x.\n", ds_desc.BackFace.StencilFailOp); - todo_wine ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, + ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilDepthFail %#x.\n", ds_desc.BackFace.StencilDepthFailOp); - todo_wine ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilPass %#x.\n", + ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilPass %#x.\n", ds_desc.BackFace.StencilPassOp); - todo_wine ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected BackFaceStencilFunc %#x.\n", + ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); v = effect->lpVtbl->GetVariableByName(effect, "rast_state");

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 33e87241896775d793687f8f2d7f767100cb11cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e87241896775d793687f8f2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 23 07:35:19 2012 +0200 po: Update French translation. --- po/fr.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 72723d2..86107a6 100644 --- a/po/fr.po +++ b/po/fr.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: 2012-06-22 07:46+0100\n" +"PO-Revision-Date: 2012-07-23 07:34+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3479,16 +3479,16 @@ msgid "Test Force Feedback" msgstr "Tester le retour de force" #: joy.rc:63 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Formats disponibles" +msgstr "Effets disponibles" #: joy.rc:65 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"Appuyez sur un bouton du contrôleur pour activer l'effet choisi. La " +"direction de l'effet peut être modifiée en utilisant l'axe du contrôleur." #: joy.rc:28 msgid "Game Controllers"

1 0