September 2008 - Wine-commits

Jacek Caban : jscript: Added lexer.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: b51a156ff1571d8c0af9e87b92d7949d82ecd0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51a156ff1571d8c0af9e87b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 3 00:25:46 2008 +0200 jscript: Added lexer. --- dlls/jscript/Makefile.in | 3 +- dlls/jscript/lex.c | 687 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/parser.y | 6 - 3 files changed, 689 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b51a156ff1571d8c0af9e…

1 0

Jacek Caban : jscript: Added parser memory managment.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 720e8c625225a91109c77ce11c34e4e2dc3977be URL: http://source.winehq.org/git/wine.git/?a=commit;h=720e8c625225a91109c77ce11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 3 00:26:10 2008 +0200 jscript: Added parser memory managment. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/engine.h | 7 ++- dlls/jscript/jscript.h | 19 ++++++++ dlls/jscript/jsutils.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/parser.y | 5 ++ 5 files changed, 142 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 3ccfae3..96d8c37 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ engine.c \ jscript.c \ jscript_main.c \ + jsutils.c \ lex.c IDL_TLB_SRCS = jsglobal.idl diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3e558bd..1fad3dd 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -29,6 +29,9 @@ typedef struct _parser_ctx_t { source_elements_t *source; BOOL nl; HRESULT hres; + + jsheap_t tmp_heap; + jsheap_t heap; } parser_ctx_t; HRESULT script_parse(script_ctx_t*,const WCHAR*,parser_ctx_t**); @@ -43,12 +46,12 @@ static inline void parser_addref(parser_ctx_t *ctx) static inline void *parser_alloc(parser_ctx_t *ctx, DWORD size) { - return heap_alloc(size); /* FIXME */ + return jsheap_alloc(&ctx->heap, size); } static inline void *parser_alloc_tmp(parser_ctx_t *ctx, DWORD size) { - return heap_alloc(size); /* FIXME */ + return jsheap_alloc(&ctx->tmp_heap, size); } typedef struct { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 6f43adc..ffb3f2b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -29,6 +29,7 @@ #include "activscp.h" #include "wine/unicode.h" +#include "wine/list.h" typedef struct _script_ctx_t script_ctx_t; @@ -62,6 +63,19 @@ static void inline script_addref(script_ctx_t *ctx) HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +typedef struct { + void **blocks; + DWORD block_cnt; + DWORD last_block; + DWORD offset; + struct list custom_blocks; +} jsheap_t; + +void jsheap_init(jsheap_t*); +void *jsheap_alloc(jsheap_t*,DWORD); +void jsheap_clear(jsheap_t*); +void jsheap_free(jsheap_t*); + extern LONG module_ref; static inline void lock_module(void) @@ -84,6 +98,11 @@ static inline void *heap_alloc_zero(size_t len) return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c new file mode 100644 index 0000000..4f84e88 --- /dev/null +++ b/dlls/jscript/jsutils.c @@ -0,0 +1,112 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +#define MIN_BLOCK_SIZE 128 + +static inline DWORD block_size(DWORD block) +{ + return MIN_BLOCK_SIZE << block; +} + +void jsheap_init(jsheap_t *heap) +{ + memset(heap, 0, sizeof(*heap)); + list_init(&heap->custom_blocks); +} + +void *jsheap_alloc(jsheap_t *heap, DWORD size) +{ + struct list *list; + void *tmp; + + if(!heap->block_cnt) { + if(!heap->blocks) { + heap->blocks = heap_alloc(sizeof(void*)); + if(!heap->blocks) + return NULL; + } + + tmp = heap_alloc(block_size(0)); + if(!tmp) + return NULL; + + heap->blocks[0] = tmp; + heap->block_cnt = 1; + } + + if(heap->offset + size < block_size(heap->last_block)) { + tmp = ((BYTE*)heap->blocks[heap->last_block])+heap->offset; + heap->offset += size; + return tmp; + } + + if(size < block_size(heap->last_block+1)) { + if(heap->last_block+1 == heap->block_cnt) { + tmp = heap_realloc(heap->blocks, (heap->block_cnt+1)*sizeof(void*)); + if(!tmp) + return NULL; + heap->blocks = tmp; + } + + tmp = heap_alloc(block_size(heap->block_cnt+1)); + if(!tmp) + return NULL; + + heap->blocks[heap->block_cnt++] = tmp; + + heap->last_block++; + heap->offset = size; + return heap->blocks[heap->last_block]; + } + + list = heap_alloc(size + sizeof(struct list)); + if(!list) + return NULL; + + list_add_head(&heap->custom_blocks, list); + return list+1; +} + +void jsheap_clear(jsheap_t *heap) +{ + struct list *tmp; + + while((tmp = list_next(&heap->custom_blocks, &heap->custom_blocks))) { + list_remove(tmp); + heap_free(tmp); + } +} + +void jsheap_free(jsheap_t *heap) +{ + DWORD i; + + jsheap_clear(heap); + + for(i=0; i < heap->block_cnt; i++) + heap_free(heap->blocks[i]); + heap_free(heap->blocks); + + jsheap_init(heap); +} diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index dc96647..15584ca 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1512,6 +1512,7 @@ void parser_release(parser_ctx_t *ctx) if(--ctx->ref) return; + jsheap_free(&ctx->heap); heap_free(ctx); } @@ -1533,7 +1534,11 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, parser_ctx_t **ret) script_addref(ctx); parser_ctx->script = ctx; + jsheap_init(&parser_ctx->tmp_heap); + jsheap_init(&parser_ctx->heap); + parser_parse(parser_ctx); + jsheap_free(&parser_ctx->tmp_heap); if(FAILED(parser_ctx->hres)) { hres = parser_ctx->hres; parser_release(parser_ctx);

1 0

Hongbo Ni : winspool: Add simplified and traditional Chinese resources.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 2656c02dd64dc7a7acbfef4bfa2c27669ba55c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2656c02dd64dc7a7acbfef4bf… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:25:25 2008 +1000 winspool: Add simplified and traditional Chinese resources. --- dlls/winspool.drv/Zh.rc | 64 +++++++++++++++++++++++++++++++++++++++++ dlls/winspool.drv/winspool.rc | 1 + 2 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/Zh.rc b/dlls/winspool.drv/Zh.rc new file mode 100644 index 0000000..5394448 --- /dev/null +++ b/dlls/winspool.drv/Zh.rc @@ -0,0 +1,64 @@ +/* + * winspool (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 + +FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "打印到文件" +FONT 9, "MS Song" +BEGIN + LTEXT "输出文件名(&O):", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "确定", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "取消", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_CAPTION "本地端口" + IDS_FILE_EXISTS "输出文件已存在, 按'确定'覆盖。" + IDS_CANNOT_OPEN "不能打开输出文件." +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "列印到檔案" +FONT 8, "PMingLiu" +BEGIN + LTEXT "輸出檔案名(&O):", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "確定", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "取消", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_CAPTION "本地端口" + IDS_FILE_EXISTS "輸出檔案已存在, 按'確定'覆蓋。" + IDS_CANNOT_OPEN "不能開啟輸出檔案." +} + +#pragma code_page(default) diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc index e9b168e..8fd7cb5 100644 --- a/dlls/winspool.drv/winspool.rc +++ b/dlls/winspool.drv/winspool.rc @@ -56,3 +56,4 @@ #include "Si.rc" #include "Sv.rc" #include "Tr.rc" +#include "Zh.rc"

1 0

Hongbo Ni : oleview: Add simplified and traditional Chinese resources.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 832c2ae1eb7f373eb4f90706e139914262f800a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=832c2ae1eb7f373eb4f90706e… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:25:39 2008 +1000 oleview: Add simplified and traditional Chinese resources. --- programs/oleview/Zh.rc | 410 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 + 2 files changed, 411 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=832c2ae1eb7f373eb4f90…

1 0

Hongbo Ni : wininet: Add simplified and traditional Chinese resources.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: ab08a0102f3e6ecaf3b4f9b40cbb33e1945761db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab08a0102f3e6ecaf3b4f9b40… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:25:16 2008 +1000 wininet: Add simplified and traditional Chinese resources. --- dlls/wininet/rsrc.rc | 1 + dlls/wininet/wininet_Zh.rc | 78 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/rsrc.rc b/dlls/wininet/rsrc.rc index d8869a5..29e72d6 100644 --- a/dlls/wininet/rsrc.rc +++ b/dlls/wininet/rsrc.rc @@ -62,3 +62,4 @@ #include "wininet_Si.rc" #include "wininet_Sv.rc" #include "wininet_Tr.rc" +#include "wininet_Zh.rc" diff --git a/dlls/wininet/wininet_Zh.rc b/dlls/wininet/wininet_Zh.rc new file mode 100644 index 0000000..e909b8e --- /dev/null +++ b/dlls/wininet/wininet_Zh.rc @@ -0,0 +1,78 @@ +/* + * wininet (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_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "输入网络密码" +FONT 9, "MS Song" +{ + LTEXT "请输入你的用户名和密码:", -1, 40, 6, 150, 15 + LTEXT "代理", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "用户", -1, 40, 66, 50, 10 + LTEXT "密码", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "保存密码(不安全)(&S)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "确定", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "取消", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "局域网连接" +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "輸入網路密碼" +FONT 8, "PMingLiu" +{ + LTEXT "請輸入你的用戶名和密碼:", -1, 40, 6, 150, 15 + LTEXT "代理", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "用戶", -1, 40, 66, 50, 10 + LTEXT "密碼", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "儲存密碼(不安全)(&S)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "確定", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "取消", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "局域網連接" +} + +#pragma code_page(default)

1 0

Hongbo Ni : shdoclc: Add simplified and traditional Chinese resources.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: e96792f8baa91e2c273fa217c587c5aa163f912f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96792f8baa91e2c273fa217c… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:24:35 2008 +1000 shdoclc: Add simplified and traditional Chinese resources. --- dlls/shdoclc/Zh.rc | 483 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/rsrc.rc | 1 + 2 files changed, 484 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e96792f8baa91e2c273fa…

1 0

Hongbo Ni : shlwapi: Add simplified and traditional Chinese resources.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 7d35b15539530979533da3abb92ac1b33251c74d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d35b15539530979533da3abb… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:24:55 2008 +1000 shlwapi: Add simplified and traditional Chinese resources. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Zh.rc | 72 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index 2b50214..2416649 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -45,3 +45,4 @@ #include "shlwapi_Si.rc" #include "shlwapi_Sv.rc" #include "shlwapi_Tr.rc" +#include "shlwapi_Zh.rc" diff --git a/dlls/shlwapi/shlwapi_Zh.rc b/dlls/shlwapi/shlwapi_Zh.rc new file mode 100644 index 0000000..b5f03a1 --- /dev/null +++ b/dlls/shlwapi/shlwapi_Zh.rc @@ -0,0 +1,72 @@ +/* + * shlwapi (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_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "错误!" +FONT 9, "MS Song" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "不要再显示这个讯息", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"确定(&O)" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"取消(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"是(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"否(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld 字节" + IDS_TIME_INTERVAL_HOURS " 小时" + IDS_TIME_INTERVAL_MINUTES " 分" + IDS_TIME_INTERVAL_SECONDS " 秒" +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "錯誤!" +FONT 8, "PMingLiu" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "不要再顯示這個訊息", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"確定(&O)" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"取消(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"是(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"否(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld 字節" + IDS_TIME_INTERVAL_HOURS " 小時" + IDS_TIME_INTERVAL_MINUTES " 分" + IDS_TIME_INTERVAL_SECONDS " 秒" +} + +#pragma code_page(default)

1 0

Hongbo Ni : wineps: Add simplified and traditional Chinese resources.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 29beb84b6b55ba56371b2ab9f15331833228ab05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29beb84b6b55ba56371b2ab9f… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:25:05 2008 +1000 wineps: Add simplified and traditional Chinese resources. --- dlls/wineps.drv/rsrc.rc | 1 + dlls/wineps.drv/wps_Zh.rc | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/rsrc.rc b/dlls/wineps.drv/rsrc.rc index d12b185..47df046 100644 --- a/dlls/wineps.drv/rsrc.rc +++ b/dlls/wineps.drv/rsrc.rc @@ -51,3 +51,4 @@ #include "wps_Sk.rc" #include "wps_Sv.rc" #include "wps_Tr.rc" +#include "wps_Zh.rc" diff --git a/dlls/wineps.drv/wps_Zh.rc b/dlls/wineps.drv/wps_Zh.rc new file mode 100644 index 0000000..d711bc0 --- /dev/null +++ b/dlls/wineps.drv/wps_Zh.rc @@ -0,0 +1,64 @@ +/* + * wineps (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 + +PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "纸张" +FONT 9, "MS Song" +{ + LTEXT "纸张大小(&Z):", -1, 10, 6, 100, 8 + LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | + WS_TABSTOP + GROUPBOX "方向", -1, 10, 80, 200, 50 + CONTROL "纵向(&P)", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + WS_TABSTOP, 20, 90, 60, 10 + CONTROL "横向(&L)", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + 20, 110, 60, 10 + LTEXT "双面:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + WS_TABSTOP +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "紙張" +FONT 8, "PMingLiu" +{ + LTEXT "紙張大小(&Z):", -1, 10, 6, 100, 8 + LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | + WS_TABSTOP + GROUPBOX "方向", -1, 10, 80, 200, 50 + CONTROL "縱向(&P)", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + WS_TABSTOP, 20, 90, 60, 10 + CONTROL "橫向(&L)", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + 20, 110, 60, 10 + LTEXT "雙面:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + WS_TABSTOP +} + +#pragma code_page(default)

1 0

Hongbo Ni : serialui: Add simplified and traditional Chinese resources.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 68aba12fb16d920bf39a2dccc5d690baca3d980b URL: http://source.winehq.org/git/wine.git/?a=commit;h=68aba12fb16d920bf39a2dccc… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:23:55 2008 +1000 serialui: Add simplified and traditional Chinese resources. --- dlls/serialui/Zh.rc | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/serialui/serialui_rc.rc | 1 + 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/Zh.rc b/dlls/serialui/Zh.rc new file mode 100644 index 0000000..3773683 --- /dev/null +++ b/dlls/serialui/Zh.rc @@ -0,0 +1,72 @@ +/* + * serialui (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_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "属性 - " +FONT 9, "MS Song" +BEGIN + LTEXT "速度", 0,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Parity", 0,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "流程控制", 0,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "数据位", 0,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "停止位", 0,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "确定", IDOK,30,138,50,14 + PUSHBUTTON "取消", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "屬性 - " +FONT 8, "PMingLiu" +BEGIN + LTEXT "速度", 0,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Parity", 0,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "流程控制", 0,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "數據位", 0,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "停止位", 0,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "確定", IDOK,30,138,50,14 + PUSHBUTTON "取消", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END + +#pragma code_page(default) diff --git a/dlls/serialui/serialui_rc.rc b/dlls/serialui/serialui_rc.rc index 72c8466..6cae0f7 100644 --- a/dlls/serialui/serialui_rc.rc +++ b/dlls/serialui/serialui_rc.rc @@ -40,3 +40,4 @@ #include "Ru.rc" #include "Sv.rc" #include "Tr.rc" +#include "Zh.rc"

1 0

Hongbo Ni : setupapi: Add simplified and traditional Chinese resources.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 4648b353e4cfcb0a128af35904ef3e54487a59cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4648b353e4cfcb0a128af3590… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Sep 3 22:24:18 2008 +1000 setupapi: Add simplified and traditional Chinese resources. --- dlls/setupapi/Zh.rc | 54 +++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.rc | 1 + 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Zh.rc b/dlls/setupapi/Zh.rc new file mode 100644 index 0000000..a2f6a8d --- /dev/null +++ b/dlls/setupapi/Zh.rc @@ -0,0 +1,54 @@ +/* + * SETUPAPI (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 + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "复制文件..." +FONT 9, "MS Song" +BEGIN + PUSHBUTTON "取消", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "源文件:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "目标文件:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "複製檔案..." +FONT 8, "PMingLiu" +BEGIN + PUSHBUTTON "取消", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "源檔案:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "目標檔案:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +#pragma code_page(default) diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index a7519dd..affbe5c 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -44,3 +44,4 @@ #include "Ru.rc" #include "Sv.rc" #include "Tr.rc" +#include "Zh.rc"

1 0