September 2008 - Wine-Commits

Hongbo Ni : htctrl: Add simplified and traditional Chinese resources.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: ee288272a501e3a01a6ad331240a74d2c447df83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee288272a501e3a01a6ad3312… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:20:04 2008 +1000 htctrl: Add simplified and traditional Chinese resources. --- dlls/hhctrl.ocx/Zh.rc | 100 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.rc | 1 + 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/Zh.rc b/dlls/hhctrl.ocx/Zh.rc new file mode 100644 index 0000000..a7ccab0 --- /dev/null +++ b/dlls/hhctrl.ocx/Zh.rc @@ -0,0 +1,100 @@ +/* + * HTML Help (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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 + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_CONTENTS "内容(&C)" + IDS_INDEX "目录(&N)" + IDS_SEARCH "搜寻(&S)" + IDS_FAVORITES "最爱(&I)" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "显示" + IDTB_CONTRACT "隐藏" + IDTB_STOP "停止" + IDTB_REFRESH "刷新" + IDTB_BACK "向后" + IDTB_HOME "首页" + IDTB_SYNC "同步" + IDTB_PRINT "打印" + IDTB_OPTIONS "选项" + IDTB_FORWARD "向前" + IDTB_NOTES "说明" + IDTB_BROWSE_FWD "向前" + IDTB_BROWSE_BACK "向后" + IDTB_CONTENTS "内容" + IDTB_INDEX "目录" + IDTB_SEARCH "搜寻" + IDTB_HISTORY "历史" + IDTB_FAVORITES "最爱" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "个性化" + IDTB_ZOOM "放大" + IDTB_TOC_NEXT "后一项" + IDTB_TOC_PREV "前一项" +END + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "內容(&C)" + IDS_INDEX "目錄(&N)" + IDS_SEARCH "搜尋(&S)" + IDS_FAVORITES "最愛(&I)" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "顯示" + IDTB_CONTRACT "隱藏" + IDTB_STOP "停止" + IDTB_REFRESH "刷新" + IDTB_BACK "向後" + IDTB_HOME "首頁" + IDTB_SYNC "同步" + IDTB_PRINT "列印" + IDTB_OPTIONS "選項" + IDTB_FORWARD "向前" + IDTB_NOTES "說明" + IDTB_BROWSE_FWD "向前" + IDTB_BROWSE_BACK "向後" + IDTB_CONTENTS "內容" + IDTB_INDEX "目錄" + IDTB_SEARCH "搜尋" + IDTB_HISTORY "歷史" + IDTB_FAVORITES "最愛" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "個性化" + IDTB_ZOOM "放大" + IDTB_TOC_NEXT "後一項" + IDTB_TOC_PREV "前一項" +END + +#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 08d9648..1a5950c 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -45,3 +45,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Si.rc" #include "Sv.rc" #include "Tr.rc" +#include "Zh.rc"

1 0

Hongbo Ni : credui: Add simplified and traditional Chinese resources.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: baf3460459c132acd7ceb4b77024bd2902f69db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf3460459c132acd7ceb4b77… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:19:33 2008 +1000 credui: Add simplified and traditional Chinese resources. --- dlls/credui/credui.rc | 1 + dlls/credui/credui_Zh.rc | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index 1de419f..17cdc19 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -39,3 +39,4 @@ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp #include "credui_Ru.rc" #include "credui_Si.rc" #include "credui_Sv.rc" +#include "credui_Zh.rc" diff --git a/dlls/credui/credui_Zh.rc b/dlls/credui/credui_Zh.rc new file mode 100644 index 0000000..45c3249 --- /dev/null +++ b/dlls/credui/credui_Zh.rc @@ -0,0 +1,86 @@ +/* + * Credentials UI (Simplified and Traditional Chinese Resource) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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 + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 9, "MS Song" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "用户名(&U):",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "密码(&P):",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "记住我的密码(&R)",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "确定",IDOK,97,128,50,14 + PUSHBUTTON "取消",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "连接到 %s" + IDS_MESSAGEFORMAT "正在连接到 %s" + IDS_INCORRECTPASSWORDTITLE "登录失败" + IDS_INCORRECTPASSWORD "请确认你输入的用户名和密码\n是否正确." + IDS_CAPSLOCKONTITLE "大写锁定开着" + IDS_CAPSLOCKON "开着大写锁定可能导致你输入错误的密码." +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "PMingLiu" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "用戶名(&U):",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "密碼(&P):",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "記住我的密碼(&R)",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "確定",IDOK,97,128,50,14 + PUSHBUTTON "取消",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "連接到 %s" + IDS_MESSAGEFORMAT "正在連接到 %s" + IDS_INCORRECTPASSWORDTITLE "登錄失敗" + IDS_INCORRECTPASSWORD "請確認你輸入的用戶名和密碼\n是否正確." + IDS_CAPSLOCKONTITLE "大寫鎖定開著" + IDS_CAPSLOCKON "開著大寫鎖定可能導致你輸入錯誤的密碼." +} + +#pragma code_page(default)

1 0

Hongbo Ni : gphoto2: Add simplified and traditional Chinese resources.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 092f298aa1507babdb3021335d5eaad05d29bd3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=092f298aa1507babdb3021335… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:19:49 2008 +1000 gphoto2: Add simplified and traditional Chinese resources. --- dlls/gphoto2.ds/gphoto2_Zh.rc | 96 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Zh.rc b/dlls/gphoto2.ds/gphoto2_Zh.rc new file mode 100644 index 0000000..b734368 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Zh.rc @@ -0,0 +1,96 @@ +/* + * Twain (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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 + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "照相机中的文件" +MENU 20545 +FONT 9, "MS Song" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "导入选定文件",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "预览",IDC_FETCH,7,252,64,14 + PUSHBUTTON "导入全部",IDC_IMPORTALL,80,252,64,14 + CONTROL "跳过本对话框",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "退出",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "正在传输" +FONT 9, "MS Song" +BEGIN + LTEXT "正在传输... 请稍候",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "连接照相机" +FONT 9, "MS Song" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "正在连接照相机... 请稍候",IDC_STATIC,128,58, + 116,8 +END + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "照相機中的檔案" +MENU 20545 +FONT 8, "PMingLiu" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "導入選定檔案",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "預覽",IDC_FETCH,7,252,64,14 + PUSHBUTTON "導入全部",IDC_IMPORTALL,80,252,64,14 + CONTROL "跳過本對話框",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "結束",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "正在傳輸" +FONT 8, "PMingLiu" +BEGIN + LTEXT "正在傳輸... 請稍候",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "連接照相機" +FONT 8, "PMingLiu" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "正在連接照相機... 請稍候",IDC_STATIC,128,58, + 116,8 +END + +#pragma code_page(default) diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index 680b401..2309565 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -38,3 +38,4 @@ #include "gphoto2_Ru.rc" #include "gphoto2_Si.rc" #include "gphoto2_Sv.rc" +#include "gphoto2_Zh.rc"

1 0

Hongbo Ni : avifil32: Add simplified and traditional Chinese resources.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 030e678c9ed01928978ecda7bdfed6c2fc9bdad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=030e678c9ed01928978ecda7b… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:18:26 2008 +1000 avifil32: Add simplified and traditional Chinese resources. --- dlls/avifil32/avifile_Zh.rc | 90 +++++++++++++++++++++++++++++++++++++++++++ dlls/avifil32/rsrc.rc | 1 + 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/avifile_Zh.rc b/dlls/avifil32/avifile_Zh.rc new file mode 100644 index 0000000..eacc35e --- /dev/null +++ b/dlls/avifil32/avifile_Zh.rc @@ -0,0 +1,90 @@ +/* + * avifile (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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 + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "压缩选项" +FONT 9, "MS Song" +BEGIN + LTEXT "选择来源(&C):",-1,2,5,154,10 + COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "选项(&O)...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "交织: 每",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "帧数",-1,129,43,36,9 + LTEXT "当前格式:",-1,3,56,73,9 + LTEXT "(?)",IDC_FORMATTEXT,75,56,90,26 + DEFPUSHBUTTON "确定",IDOK,170,42,50,14 + PUSHBUTTON "取消",IDCANCEL,170,61,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "波形: %s" + IDS_WAVEFILETYPE "波形" + IDS_ALLMULTIMEDIA "所有多媒体文件" + IDS_ALLFILES "所有文件 (*.*)(a)*.*" + IDS_VIDEO "视频" + IDS_AUDIO "音频" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine AVI-默认处理器" + IDS_UNCOMPRESSED "未压缩" +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "壓縮選項" +FONT 8, "PMingLiu" +BEGIN + LTEXT "選擇來源(&C):",-1,2,5,154,10 + COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "選項(&O)...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "交織: 每",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "幀數",-1,129,43,36,9 + LTEXT "當前格式:",-1,3,56,73,9 + LTEXT "(?)",IDC_FORMATTEXT,75,56,90,26 + DEFPUSHBUTTON "確定",IDOK,170,42,50,14 + PUSHBUTTON "取消",IDCANCEL,170,61,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "波形: %s" + IDS_WAVEFILETYPE "波形" + IDS_ALLMULTIMEDIA "所有多媒體檔案" + IDS_ALLFILES "所有檔案 (*.*)(a)*.*" + IDS_VIDEO "視頻" + IDS_AUDIO "音頻" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine AVI-默認處理器" + IDS_UNCOMPRESSED "未壓縮" +} + +#pragma code_page(default) diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc index bd56594..1872deb 100644 --- a/dlls/avifil32/rsrc.rc +++ b/dlls/avifil32/rsrc.rc @@ -56,3 +56,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "avifile_Si.rc" #include "avifile_Sv.rc" #include "avifile_Tr.rc" +#include "avifile_Zh.rc"

1 0

Hongbo Ni : browseui: Add simplified and traditional Chinese resou.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: e36ef9a5c93ad46747367370613e7462636ac742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36ef9a5c93ad467473673706… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:19:22 2008 +1000 browseui: Add simplified and traditional Chinese resou. --- dlls/browseui/rsrc.rc | 1 + dlls/browseui/rsrc_Zh.rc | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc index 4fae12a..dd6dd0d 100644 --- a/dlls/browseui/rsrc.rc +++ b/dlls/browseui/rsrc.rc @@ -35,3 +35,4 @@ #include "rsrc_Ro.rc" #include "rsrc_Ru.rc" #include "rsrc_Si.rc" +#include "rsrc_Zh.rc" diff --git a/dlls/browseui/rsrc_Zh.rc b/dlls/browseui/rsrc_Zh.rc new file mode 100644 index 0000000..386ee75 --- /dev/null +++ b/dlls/browseui/rsrc_Zh.rc @@ -0,0 +1,65 @@ +/* + * browseui (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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 + */ + + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +{ + IDS_CANCELLING "正在取消..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 9, "MS Song" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "取消(&C)", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE +{ + IDS_CANCELLING "正在取消..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "PMingLiu" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "取消(&C)", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +} + +#pragma code_page(default)

1 0

Louis Lenders : wine.inf: Add default Directx registry key for InstalledVersion.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 9c2ca354c29be96d0653123bff505304005f4f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2ca354c29be96d0653123bf… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Sep 3 18:19:47 2008 +0000 wine.inf: Add default Directx registry key for InstalledVersion. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 4d10778..cc5916d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -241,6 +241,7 @@ HKCU,%Metrics%,"Shell Icon Size",2,"32" [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" +HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00 HKLM,Software\Microsoft\DirectMusic,GMFilePath,,"%12%\gm.dls" HKLM,Software\Microsoft\DirectMusic\Defaults,DefaultOutputPort,,"{58C2B4D0-46E7-11D1-89AC-00A0C9054129}" HKLM,Software\Microsoft\DirectMusic\SoftwareSynths\{58C2B4D0-46E7-11D1-89AC-00A0C9054129},Description,,"Microsoft Software Synthesizer"

1 0

Henri Verbeet : wined3d: IWineD3DSurface_PreLoad() doesn' t do an implicit glBindTexture() anymore.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 615f75faecb76f7a22b4cb8ab67b0ea0ed77d4d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615f75faecb76f7a22b4cb8ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 16:29:34 2008 +0200 wined3d: IWineD3DSurface_PreLoad() doesn't do an implicit glBindTexture() anymore. This was exposed by moving texture id generation from Preload() to BindTexture(). --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d12aebd..74688dd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6160,6 +6160,7 @@ void attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWine IWineD3DSurface_PreLoad(depth_stencil); + glBindTexture(target, depth_stencil_impl->glDescription.textureName); glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); @@ -6202,6 +6203,7 @@ void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface_PreLoad(surface); + glBindTexture(target, surface_impl->glDescription.textureName); glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glBindTexture(target, old_binding);

1 0

Henri Verbeet : wined3d: Fix a variable name inside a VTRACE.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 4b354e8e6215e784c3a9f223080d6292ecab5964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b354e8e6215e784c3a9f2230… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 16:26:38 2008 +0200 wined3d: Fix a variable name inside a VTRACE. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 24c7d1a..126eb3a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -680,7 +680,7 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedDa } /* Start drawing in GL */ - VTRACE(("glBegin(%x)\n", glPrimType)); + VTRACE(("glBegin(%x)\n", glPrimitiveType)); glBegin(glPrimitiveType); for (vx_index = 0; vx_index < numberOfVertices; ++vx_index) {

1 0

Henri Verbeet : wined3d: Correct a TRACE and remove an incorrect comment.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 632102cd14d37f9905cb940eed91cb16ac9adb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=632102cd14d37f9905cb940ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 16:29:09 2008 +0200 wined3d: Correct a TRACE and remove an incorrect comment. --- dlls/wined3d/drawprim.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 126eb3a..60eb721 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -268,12 +268,9 @@ static void drawStridedFast(IWineD3DDevice *iface,UINT numberOfVertices, GLenum #endif } else { - - /* Note first is now zero as we shuffled along earlier */ - TRACE("(%p) : glDrawArrays(%x, 0, %d)\n", This, glPrimitiveType, numberOfVertices); + TRACE("(%p) : glDrawArrays(%#x, %d, %d)\n", This, glPrimitiveType, startVertex, numberOfVertices); glDrawArrays(glPrimitiveType, startVertex, numberOfVertices); checkGLcall("glDrawArrays"); - } return;

1 0

Shunichi Fuji : gdi32: Adjust FT_MulFix function to Freetype cvs head.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: de251e1c62651d8160b340a4fb9d0f9834a8e538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de251e1c62651d8160b340a4f… Author: Shunichi Fuji <palglowr(a)gmail.com> Date: Wed Sep 3 20:14:17 2008 +0900 gdi32: Adjust FT_MulFix function to Freetype cvs head. --- dlls/gdi32/freetype.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cb351db..74e70ea 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -163,7 +163,11 @@ MAKE_FUNCPTR(FT_Get_Sfnt_Table); MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Load_Glyph); MAKE_FUNCPTR(FT_Matrix_Multiply); +#ifdef FT_MULFIX_INLINED +#define pFT_MulFix FT_MULFIX_INLINED +#else MAKE_FUNCPTR(FT_MulFix); +#endif MAKE_FUNCPTR(FT_New_Face); MAKE_FUNCPTR(FT_New_Memory_Face); MAKE_FUNCPTR(FT_Outline_Get_Bitmap); @@ -2434,7 +2438,9 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Init_FreeType) LOAD_FUNCPTR(FT_Load_Glyph) LOAD_FUNCPTR(FT_Matrix_Multiply) +#ifndef FT_MULFIX_INLINED LOAD_FUNCPTR(FT_MulFix) +#endif LOAD_FUNCPTR(FT_New_Face) LOAD_FUNCPTR(FT_New_Memory_Face) LOAD_FUNCPTR(FT_Outline_Get_Bitmap)

1 0