September 2010 - Wine-commits

Anders Jonsson : inetcpl.cpl: Update Swedish translation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 6457d14b711772a11e66419f48ec8c0f167e363b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6457d14b711772a11e66419f4… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Sep 29 00:19:40 2010 +0200 inetcpl.cpl: Update Swedish translation. --- dlls/inetcpl.cpl/cpl_Sv.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Sv.rc b/dlls/inetcpl.cpl/cpl_Sv.rc index b004250..d825097 100644 --- a/dlls/inetcpl.cpl/cpl_Sv.rc +++ b/dlls/inetcpl.cpl/cpl_Sv.rc @@ -30,3 +30,18 @@ BEGIN IDS_CPL_NAME "Internetinställningar" IDS_CPL_INFO "Konfigurera Wines webbläsare och tillhörande inställningar" END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Content" +BEGIN + + GROUPBOX " Certifikat ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Certifikat används för din personliga identifikation samt för att identifiera certifikats-auktoriteter och -utgivare.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Certifikat...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Utgivare... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Alexandre Julliard : kernel32/tests: Use a real console handle in the VerifyConsoleIoHandle test.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 5db7d5957ad9898f120772bbfd15ea0b6d1a444c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db7d5957ad9898f120772bbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 11:57:42 2010 +0200 kernel32/tests: Use a real console handle in the VerifyConsoleIoHandle test. --- dlls/kernel32/tests/console.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 072bd01..2f8cf84 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1085,11 +1085,10 @@ static void test_OpenConsoleW(void) CloseHandle(ret); } -static void test_VerifyConsoleIoHandle(void) +static void test_VerifyConsoleIoHandle( HANDLE handle ) { BOOL ret; DWORD error; - HANDLE handle; if (!pVerifyConsoleIoHandle) { @@ -1125,7 +1124,6 @@ static void test_VerifyConsoleIoHandle(void) ok(!ret, "expected VerifyConsoleIoHandle to fail\n"); ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); - handle = GetStdHandle(STD_INPUT_HANDLE); /* valid handle */ SetLastError(0xdeadbeef); ret = pVerifyConsoleIoHandle(handle); @@ -1221,6 +1219,6 @@ START_TEST(console) test_GetConsoleProcessList(); test_OpenConsoleW(); - test_VerifyConsoleIoHandle(); + test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle(); }

1 0

Alexandre Julliard : winmm/tests: Skip tests if MIDI cannot be opened.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: c2224ea8bb1532667c84f68a2f5dd23c94c5b25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2224ea8bb1532667c84f68a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 29 12:19:34 2010 +0200 winmm/tests: Skip tests if MIDI cannot be opened. --- dlls/winmm/tests/midi.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 891bf70..e1f5104 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -227,6 +227,11 @@ static void test_midiOut_device(UINT udev, HWND hwnd) rc = midiOutOpen(&hm, udev, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiOutOpen(&hm, udev, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); + if (rc == MMSYSERR_NOTSUPPORTED) + { + skip( "MIDI out not supported\n" ); + return; + } ok(!rc, "midiOutOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); if (rc) return; @@ -382,6 +387,11 @@ static void test_midiStream(UINT udev, HWND hwnd) rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); + if (rc == MMSYSERR_NOTSUPPORTED) + { + skip( "MIDI stream not supported\n" ); + return; + } ok(!rc, "midiStreamOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); if (rc) return;

1 0

Cheer Xiao : regedit: Update simplified Chinese translation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 316981e5ffd54d150ef5af8e564ede1fcc140606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=316981e5ffd54d150ef5af8e5… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Sep 29 14:21:26 2010 +0800 regedit: Update simplified Chinese translation. --- programs/regedit/Zh.rc | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/regedit/Zh.rc b/programs/regedit/Zh.rc index 8d9f759..1b08127 100644 --- a/programs/regedit/Zh.rc +++ b/programs/regedit/Zh.rc @@ -127,7 +127,7 @@ FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "导出注册表", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP AUTORADIOBUTTON "全部(&A)", IDC_EXPORT_ALL, 12, 15, 244, 12 - AUTORADIOBUTTON "指定分支(&E):", IDC_EXPORT_SELECTED, 12, 30, 70, 12 + AUTORADIOBUTTON "指定分支(&E)：", IDC_EXPORT_SELECTED, 12, 30, 70, 12 EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 END @@ -136,9 +136,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "查找" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "查找:",IDC_STATIC,5,7,119,8 + LTEXT "查找：",IDC_STATIC,5,7,119,8 EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "在这找:",IDC_STATIC,5, 22, 119, 8 + LTEXT "在这找：",IDC_STATIC,5, 22, 119, 8 CHECKBOX "键", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX CHECKBOX "值名称", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "值内容", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX @@ -152,7 +152,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "添加收藏" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "名称:",IDC_STATIC,5,5,119,8 + LTEXT "名称：",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL DEFPUSHBUTTON "确定",IDOK,120,36,40,15,WS_GROUP PUSHBUTTON "取消",IDCANCEL,165,36,40,15,WS_GROUP @@ -163,7 +163,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "删除收藏" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "名称:",IDC_STATIC,5,5,119,8 + LTEXT "名称：",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL DEFPUSHBUTTON "确定",IDOK,120,72,40,15,WS_GROUP PUSHBUTTON "取消",IDCANCEL,165,72,40,15,WS_GROUP @@ -174,9 +174,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "编辑字符串" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "值名称:",IDC_STATIC,5,5,119,8 + LTEXT "值名称：",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED - LTEXT "值数据:",IDC_STATIC,5,30,119,8 + LTEXT "值数据：",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL DEFPUSHBUTTON "确定",IDOK,120,56,40,15,WS_GROUP PUSHBUTTON "取消",IDCANCEL,165,56,40,15,WS_GROUP @@ -187,9 +187,9 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "编辑整数" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "值名称:",IDC_STATIC,5,5,119,8 + LTEXT "值名称：",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED - LTEXT "值数据:",IDC_STATIC,5,30,90,8 + LTEXT "值数据：",IDC_STATIC,5,30,90,8 EDITTEXT IDC_VALUE_DATA,5,40,90,12, WS_BORDER | WS_TABSTOP GROUPBOX "进制", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX AUTORADIOBUTTON "十六进制", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP @@ -203,9 +203,9 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "编辑二进制" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "值名称:",IDC_STATIC,5,5,119,8 + LTEXT "值名称：",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED - LTEXT "值数据:",IDC_STATIC,5,30,90,8 + LTEXT "值数据：",IDC_STATIC,5,30,90,8 CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,160,40 DEFPUSHBUTTON "确定",IDOK,80,83,40,15,WS_GROUP PUSHBUTTON "取消",IDCANCEL,125,83,40,15,WS_GROUP @@ -216,9 +216,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "编辑多个字符串" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "值名称:",IDC_STATIC,5,5,119,8 + LTEXT "值名称：",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED - LTEXT "值数据:",IDC_STATIC,5,30,119,8 + LTEXT "值数据：",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN DEFPUSHBUTTON "确定",IDOK,120,156,40,15,WS_GROUP PUSHBUTTON "取消",IDCANCEL,165,156,40,15,WS_GROUP

1 0

Cheer Xiao : uninstaller: Update simplified Chinese translation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: d6a306b9814737b46438fb030915351e0eb33313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a306b9814737b46438fb030… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Sep 29 14:22:39 2010 +0800 uninstaller: Update simplified Chinese translation. --- programs/uninstaller/Zh.rc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/Zh.rc b/programs/uninstaller/Zh.rc index 358af10..4b7dd09 100644 --- a/programs/uninstaller/Zh.rc +++ b/programs/uninstaller/Zh.rc @@ -2,6 +2,7 @@ * Uninstaller (Simplified and Traditional Chinese Resource) * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,8 +27,8 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE { - IDS_APPNAME, "Wine 应有程序卸载管理器" - IDS_UNINSTALLFAILED, "卸载命令运行失败 '%s', 可能是找不到可运行程序.\r\n你想把这项卸载命令从注册表中删除吗?" + IDS_APPNAME, "Wine 应用程序卸载管理器" + IDS_UNINSTALLFAILED, "卸载命令 '%s' 运行失败，可能是找不到可执行程序。\r\n你想把这项卸载命令从注册表中删除吗？" } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

1 0

Cheer Xiao : view: Update simplified Chinese translation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: d7f84d0e4d20aa5b425f369e43af726f4d528fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f84d0e4d20aa5b425f369e4… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Sep 29 14:23:15 2010 +0800 view: Update simplified Chinese translation. --- programs/view/Zh.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/view/Zh.rc b/programs/view/Zh.rc index 14b1af6..55a2c92 100644 --- a/programs/view/Zh.rc +++ b/programs/view/Zh.rc @@ -2,6 +2,7 @@ * View (Simplified and Traditional Chinese Resource) * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,7 +41,7 @@ BEGIN END POPUP "平移(&P)" BEGIN - MENUITEM "放大至视窗(&S)", IDM_SET_EXT_TO_WIN + MENUITEM "缩放至窗口(&S)", IDM_SET_EXT_TO_WIN MENUITEM SEPARATOR MENUITEM "左(&L)", IDM_LEFT MENUITEM "右(&R)", IDM_RIGHT

1 0

Cheer Xiao : wineboot: Update simplified Chinese translation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 3c99df74f02c6ad1dcc27312d7afa9df90c5679a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c99df74f02c6ad1dcc27312d… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Sep 29 14:23:51 2010 +0800 wineboot: Update simplified Chinese translation. --- programs/wineboot/wineboot_Zh.rc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/wineboot/wineboot_Zh.rc b/programs/wineboot/wineboot_Zh.rc index 6ecd276..8bb69d1 100644 --- a/programs/wineboot/wineboot_Zh.rc +++ b/programs/wineboot/wineboot_Zh.rc @@ -2,6 +2,7 @@ * wineboot (Simplified and Traditional Chinese Resource) * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,9 +34,9 @@ FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "取消",IDCANCEL,129,49,50,15 PUSHBUTTON "中断进程",IDOK,51,49,71,15 - LTEXT "正在模拟关机, 但是这个程序没有反应.", + LTEXT "正在模拟关机，但是这个程序没有响应。", IDC_STATIC,7,7,172,19 - LTEXT "如果你中断进程，有可能丢失没有保存的数据.", + LTEXT "如果你中断进程，有可能丢失没有保存的数据。", IDC_STATIC,7,28,172,15 END @@ -45,7 +46,7 @@ CAPTION "Wine" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_WAITICON, 3, 3, 10, 10 - LTEXT "正在更新位于 %s 的 Wine 配置, 请稍候...", + LTEXT "正在更新位于 %s 的 Wine 配置，请稍候……", IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END

1 0

Cheer Xiao : winemine: Update simplified Chinese translation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 91b4a24a6653f72585151599d9b25ee851e62ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b4a24a6653f72585151599d… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Sep 29 14:24:24 2010 +0800 winemine: Update simplified Chinese translation. --- programs/winemine/Zh.rc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winemine/Zh.rc b/programs/winemine/Zh.rc index a088a0b..604f582 100644 --- a/programs/winemine/Zh.rc +++ b/programs/winemine/Zh.rc @@ -2,6 +2,7 @@ * WineMine (Simplified and Traditional Chinese Resource) * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,7 +37,7 @@ MENU_WINEMINE MENU POPUP "选项(&O)" { MENUITEM "新游戏(&N)\tF2", IDM_NEW MENUITEM SEPARATOR - MENUITEM "标出问题(&M)", IDM_MARKQ + MENUITEM "允许问号标记(&M)", IDM_MARKQ MENUITEM SEPARATOR MENUITEM "初学者(&B)", IDM_BEGINNER MENUITEM "高级(&A)", IDM_ADVANCED @@ -72,7 +73,7 @@ CAPTION "最快时间" DLG_CONGRATS DIALOG 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "祝贺!" +CAPTION "祝贺！" { LTEXT "请输入你的名字", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12

1 0

Cheer Xiao : wordpad: Update simplified Chinese translation.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: cdfdb7a633a67e6a8d2ecb536d9423e7acaf149d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdfdb7a633a67e6a8d2ecb536… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Sep 29 14:24:54 2010 +0800 wordpad: Update simplified Chinese translation. --- programs/wordpad/Zh.rc | 58 +++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 30 deletions(-) diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 63bfc57..cd13c71 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -56,12 +56,12 @@ BEGIN MENUITEM "找下一个(&N)\tF3", ID_FIND_NEXT MENUITEM "替换(&R)...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR - MENUITEM "只读(&0))", ID_EDIT_READONLY - MENUITEM "已改动(M)", ID_EDIT_MODIFIED + MENUITEM "只读(&O)", ID_EDIT_READONLY + MENUITEM "已改动(&M)", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "其他(&X)" BEGIN - MENUITEM "选择信息(&I)", ID_EDIT_SELECTIONINFO + MENUITEM "选中信息(&I)", ID_EDIT_SELECTIONINFO MENUITEM "文字格式(&F)", ID_EDIT_CHARFORMAT MENUITEM "默认格式(&D)", ID_EDIT_DEFCHARFORMAT MENUITEM "段落格式(&H)", ID_EDIT_PARAFORMAT @@ -116,22 +116,22 @@ IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN - MENUITEM "黑", ID_COLOR_BLACK - MENUITEM "Maroon", ID_COLOR_MAROON - MENUITEM "绿", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "紫" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "灰" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "红" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "黄" ID_COLOR_YELLOW - MENUITEM "蓝" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "白" ID_COLOR_WHITE + MENUITEM "黑色", ID_COLOR_BLACK /* 未找到“标准译名表” */ + MENUITEM "栗色", ID_COLOR_MAROON + MENUITEM "调和绿", ID_COLOR_GREEN + MENUITEM "橄榄色" ID_COLOR_OLIVE + MENUITEM "藏青" ID_COLOR_NAVY + MENUITEM "紫色" ID_COLOR_PURPLE + MENUITEM "鸭翅绿" ID_COLOR_TEAL + MENUITEM "灰色" ID_COLOR_GRAY + MENUITEM "银色" ID_COLOR_SILVER + MENUITEM "红色" ID_COLOR_RED + MENUITEM "绿色" ID_COLOR_LIME + MENUITEM "黄色" ID_COLOR_YELLOW + MENUITEM "蓝色" ID_COLOR_BLUE + MENUITEM "洋红" ID_COLOR_FUCHSIA /* =magenta? */ + MENUITEM "水绿" ID_COLOR_AQUA + MENUITEM "白色" ID_COLOR_WHITE MENUITEM "自动" ID_COLOR_AUTOMATIC END END @@ -262,20 +262,18 @@ END STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "文档" - STRING_PROMPT_SAVE_CHANGES, "要保存 '%s' 吗?" - STRING_SEARCH_FINISHED, "文件查找结束." - STRING_LOAD_RICHED_FAILED, "RichEdit 装载失败." - STRING_SAVE_LOSEFORMATTING, "你已经选择保存为文本文件, " \ - "这可能导致格式丢失. " \ - "你确定要这么做吗?" + STRING_PROMPT_SAVE_CHANGES, "要保存“%s”吗？" + STRING_SEARCH_FINISHED, "文件查找结束。" + STRING_LOAD_RICHED_FAILED, "RichEdit 装载失败。" + STRING_SAVE_LOSEFORMATTING, "你已经选择保存为文本文件，而这可能导致格式丢失。你确定要这么做吗？" STRING_INVALID_NUMBER, "数字格式无效" STRING_OLE_STORAGE_NOT_SUPPORTED, "不支持 OLE 储存文件" - STRING_WRITE_FAILED, "不能保存文件." - STRING_WRITE_ACCESS_DENIED, "你没有保存文件的权限." - STRING_OPEN_FAILED, "不能打开文件." - STRING_OPEN_ACCESS_DENIED, "你没有打开文件的权限." + STRING_WRITE_FAILED, "不能保存文件。" + STRING_WRITE_ACCESS_DENIED, "你没有保存文件的权限。" + STRING_OPEN_FAILED, "不能打开文件。" + STRING_OPEN_ACCESS_DENIED, "你没有打开文件的权限。" STRING_PRINTING_NOT_IMPLEMENTED, "打印功能尚未实现" - STRING_MAX_TAB_STOPS, "最多只能添加 32 个制表位宽度." + STRING_MAX_TAB_STOPS, "最多只能添加 32 个制表位宽度。" END LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

1 0

Nikolay Sivov : msxml3/httprequest: Implement IXMLHttpRequest:: setRequestHeader().
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 1ac256a5885fcb7a26e5d617f1599b2761f765e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac256a5885fcb7a26e5d617f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 02:50:37 2010 +0400 msxml3/httprequest: Implement IXMLHttpRequest::setRequestHeader(). --- dlls/msxml3/httprequest.c | 80 ++++++++++++++++++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 36 ++++++++++++++++++++ 2 files changed, 110 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 21bd80c..e0f7701 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -31,6 +31,7 @@ #include "msxml_private.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -40,14 +41,34 @@ static const WCHAR MethodGetW[] = {'G','E','T',0}; static const WCHAR MethodPutW[] = {'P','U','T',0}; static const WCHAR MethodPostW[] = {'P','O','S','T',0}; +struct reqheader +{ + struct list entry; + BSTR header; + BSTR value; +}; + +enum READYSTATE +{ + STATE_UNINITIALIZED = 0, + STATE_LOADING = 1, + STATE_LOADED = 2, + STATE_INTERACTIVE = 3, + STATE_COMPLETED = 4 +}; + typedef struct _httprequest { const struct IXMLHTTPRequestVtbl *lpVtbl; LONG ref; + READYSTATE state; + + /* request */ BINDVERB verb; BSTR url; BOOL async; + struct list reqheaders; /* credentials */ BSTR user; @@ -59,6 +80,12 @@ static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) return (httprequest *)((char*)iface - FIELD_OFFSET(httprequest, lpVtbl)); } +/* TODO: process OnChange callback */ +static void httprequest_setreadystate(httprequest *This, READYSTATE state) +{ + This->state = state; +} + static HRESULT WINAPI httprequest_QueryInterface(IXMLHTTPRequest *iface, REFIID riid, void **ppvObject) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); @@ -95,9 +122,20 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { + struct reqheader *header, *header2; + SysFreeString(This->url); SysFreeString(This->user); SysFreeString(This->password); + + /* request headers */ + LIST_FOR_EACH_ENTRY_SAFE(header, header2, &This->reqheaders, struct reqheader, entry) + { + list_remove(&header->entry); + SysFreeString(header->header); + SysFreeString(header->value); + } + heap_free( This ); } @@ -223,16 +261,41 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR if (hr == S_OK) This->password = V_BSTR(&str); + httprequest_setreadystate(This, STATE_LOADING); + return S_OK; } -static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR bstrHeader, BSTR bstrValue) +static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR header, BSTR value) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + struct reqheader *entry; - FIXME("stub (%p) %s %s\n", This, debugstr_w(bstrHeader), debugstr_w(bstrValue)); + TRACE("(%p)->(%s %s)\n", This, debugstr_w(header), debugstr_w(value)); - return E_NOTIMPL; + if (!header || !*header) return E_INVALIDARG; + if (This->state != STATE_LOADING) return E_FAIL; + if (!value) return E_INVALIDARG; + + /* replace existing header value if already added */ + LIST_FOR_EACH_ENTRY(entry, &This->reqheaders, struct reqheader, entry) + { + if (lstrcmpW(entry->header, header) == 0) + { + return SysReAllocString(&entry->value, value) ? S_OK : E_OUTOFMEMORY; + } + } + + entry = heap_alloc(sizeof(*entry)); + if (!entry) return E_OUTOFMEMORY; + + /* new header */ + entry->header = SysAllocString(header); + entry->value = SysAllocString(value); + + list_add_head(&This->reqheaders, &entry->entry); + + return S_OK; } static HRESULT WINAPI httprequest_getResponseHeader(IXMLHTTPRequest *iface, BSTR bstrHeader, BSTR *pbstrValue) @@ -325,13 +388,16 @@ static HRESULT WINAPI httprequest_get_responseStream(IXMLHTTPRequest *iface, VAR return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, LONG *plState) +static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, LONG *state) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - FIXME("stub %p %p\n", This, plState); + TRACE("(%p)->(%p)\n", This, state); - return E_NOTIMPL; + if (!state) return E_INVALIDARG; + + *state = This->state; + return S_OK; } static HRESULT WINAPI httprequest_put_onreadystatechange(IXMLHTTPRequest *iface, IDispatch *pReadyStateSink) @@ -385,6 +451,8 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, LPVOID *ppObj) req->async = FALSE; req->verb = -1; req->url = req->user = req->password = NULL; + req->state = STATE_UNINITIALIZED; + list_init(&req->reqheaders); *ppObj = &req->lpVtbl; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 008c6b7..d9587a0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2887,6 +2887,7 @@ static void test_XMLHTTP(void) VARIANT dummy; VARIANT async; VARIANT varbody; + LONG state; HRESULT hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest, (void **)&pXMLHttpRequest); @@ -2918,9 +2919,43 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_open(pXMLHttpRequest, NULL, url, async, dummy, dummy); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_("header1"), NULL); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, NULL, _bstr_("value1")); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_("header1"), _bstr_("value1")); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + state = -1; + hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == 0, "got %d, expected 0\n", state); + hr = IXMLHttpRequest_open(pXMLHttpRequest, method, url, async, dummy, dummy); ok(hr == S_OK, "got 0x%08x\n", hr); + state = -1; + hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == 1, "got %d, expected 1\n", state); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_("header1"), _bstr_("value1")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, NULL, _bstr_("value1")); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_(""), _bstr_("value1")); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + SysFreeString(method); SysFreeString(url); @@ -2945,6 +2980,7 @@ static void test_XMLHTTP(void) } IXMLHttpRequest_Release(pXMLHttpRequest); + free_bstrs(); } static void test_IXMLDOMDocument2(void)

1 0