December 2010 - Wine-Commits

André Hentschel : advapi32/tests: More tests for the merged view of HKEY_CLASSES_ROOT.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 9c7366c05e2f54916516ec707e2235f7c2ebb8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7366c05e2f54916516ec707… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 2 21:59:14 2010 +0100 advapi32/tests: More tests for the merged view of HKEY_CLASSES_ROOT. --- dlls/advapi32/tests/registry.c | 85 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 505d5ad..d4beb17 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1914,7 +1914,7 @@ static void test_redirection(void) static void test_classesroot(void) { - HKEY hkey, hkcr; + HKEY hkey, hklm, hkcr; DWORD size = 8; DWORD type = REG_SZ; static CHAR buffer[8]; @@ -1963,8 +1963,91 @@ static void test_classesroot(void) /* cleanup */ delete_key( hkey ); + delete_key( hkcr ); RegCloseKey( hkey ); RegCloseKey( hkcr ); + + /* create a key in the hklm classes */ + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", &hklm )) + { + delete_key( hklm ); + RegCloseKey( hklm ); + } + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &hklm, NULL ); + if (res == ERROR_ACCESS_DENIED) + { + skip("not enough privileges to add a system class\n"); + return; + } + + /* try to open that key in hkcr */ + res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); + ok(res == ERROR_SUCCESS, + "test key not found in hkcr: %d\n", res); + if (res) + { + delete_key( hklm ); + RegCloseKey( hklm ); + return; + } + + /* set a value in hklm classes */ + res = RegSetValueExA(hklm, "val2", 0, REG_SZ, (const BYTE *)"hklm", sizeof("user")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* try to find the value in hkcr */ + res = RegQueryValueExA(hkcr, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "hklm" ), "value set to '%s'\n", buffer ); + + /* modify the value in hkcr */ + res = RegSetValueExA(hkcr, "val2", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + + /* check that the value is not modified in hklm classes */ + res = RegQueryValueExA(hklm, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); + ok(!strcmp( buffer, "hklm" ), "value set to '%s'\n", buffer ); + + if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return; + + /* try to open that key in hkcr */ + res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); + ok(res == ERROR_SUCCESS, + "test key not found in hkcr: %d\n", res); + + /* set a value in user's classes */ + res = RegSetValueExA(hkey, "val2", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* try to find the value in hkcr */ + res = RegQueryValueExA(hkcr, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + + /* modify the value in hklm */ + res = RegSetValueExA(hklm, "val2", 0, REG_SZ, (const BYTE *)"hklm", sizeof("user")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* check that the value is not overwritten in hkcr or user's classes */ + res = RegQueryValueExA(hkcr, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + res = RegQueryValueExA(hkey, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + + /* cleanup */ + delete_key( hkey ); + delete_key( hklm ); + delete_key( hkcr ); + RegCloseKey( hkey ); + RegCloseKey( hklm ); + RegCloseKey( hkcr ); } static void test_deleted_key(void)

1 0

Henri Verbeet : wined3d: Explicitly pass shader_data and reg_maps to need_rel_addr_const().
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 8c1e326e3cf0c7c8faaceea6c01905c486f1c21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1e326e3cf0c7c8faaceea6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:47 2010 +0100 wined3d: Explicitly pass shader_data and reg_maps to need_rel_addr_const(). --- dlls/wined3d/arb_program_shader.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2e5424e..d16ea28 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -316,11 +316,11 @@ struct shader_arb_priv }; /* GL locking for state handlers is done by the caller. */ -static BOOL need_rel_addr_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static BOOL need_rel_addr_const(const struct arb_vshader_private *shader_data, + const struct shader_reg_maps *reg_maps, const struct wined3d_gl_info *gl_info) { - const struct arb_vshader_private *shader_data = shader->baseShader.backend_data; if (shader_data->rel_offset) return TRUE; - if (!shader->baseShader.reg_maps.usesmova) return FALSE; + if (!reg_maps->usesmova) return FALSE; return !gl_info->supported[NV_VERTEX_PROGRAM2_OPTION]; } @@ -333,7 +333,8 @@ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) static BOOL need_helper_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) { - if (need_rel_addr_const(shader, gl_info)) return TRUE; + if (need_rel_addr_const(shader->baseShader.backend_data, + &shader->baseShader.reg_maps, gl_info)) return TRUE; if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ if (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) return TRUE; /* Load the immval offset. */ if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ @@ -349,7 +350,8 @@ static unsigned int reserved_vs_const(IWineD3DVertexShaderImpl *shader, const st /* We use one PARAM for the pos fixup, and in some cases one to load * some immediate values into the shader. */ if (need_helper_const(shader, gl_info)) ++ret; - if (need_rel_addr_const(shader, gl_info)) ++ret; + if (need_rel_addr_const(shader->baseShader.backend_data, + &shader->baseShader.reg_maps, gl_info)) ++ret; return ret; } @@ -4106,7 +4108,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct { shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps); } - if (need_rel_addr_const(This, gl_info)) + if (need_rel_addr_const(shader_data, reg_maps, gl_info)) { shader_addline(buffer, "PARAM rel_addr_const = { 0.5, %d.0, 0.0, 0.0 };\n", shader_data->rel_offset); shader_addline(buffer, "TEMP A0_SHADOW;\n");

1 0

Henri Verbeet : wined3d: Properly initialize min_rel_offset.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: b72b0371288b42a3866ca939ee90bfb56689dcc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72b0371288b42a3866ca939e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:44 2010 +0100 wined3d: Properly initialize min_rel_offset. This somehow got lost in 14da44aa364539d2c2d392c042921cc430b21c47. --- dlls/wined3d/shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8220d65..320b2f4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -459,6 +459,7 @@ static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct const DWORD *ptr = byte_code; memset(reg_maps, 0, sizeof(*reg_maps)); + reg_maps->min_rel_offset = ~0U; /* get_registers_used() is called on every compile on some 1.x shaders, * which can result in stacking up a collection of local constants.

1 0

Juan Lang : ws2_32: Set length on successful return from WSAStringToAddress .
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 7f5583aee9f8ac782376f73c05049febec6f8049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5583aee9f8ac782376f73c0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 2 15:28:23 2010 -0800 ws2_32: Set length on successful return from WSAStringToAddress. --- dlls/ws2_32/socket.c | 2 ++ dlls/ws2_32/tests/sock.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0bc773e..51139c9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5953,6 +5953,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEFAULT; break; } + *lpAddressLength = sizeof(SOCKADDR_IN); memset(lpAddress, 0, sizeof(SOCKADDR_IN)); ((LPSOCKADDR_IN)lpAddress)->sin_family = AF_INET; @@ -5990,6 +5991,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, break; } #ifdef HAVE_INET_PTON + *lpAddressLength = sizeof(SOCKADDR_IN6); memset(lpAddress, 0, sizeof(SOCKADDR_IN6)); ((LPSOCKADDR_IN6)lpAddress)->sin6_family = WS_AF_INET6; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6843846..9e0b4cb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1801,8 +1801,9 @@ static void test_WSAStringToAddressA(void) static void test_WSAStringToAddressW(void) { INT ret, len; - SOCKADDR_IN sockaddr; + SOCKADDR_IN sockaddr, *sin; SOCKADDR_IN6 sockaddr6; + SOCKADDR_STORAGE sockaddr_storage; int GLE; WCHAR address1[] = { '0','.','0','.','0','.','0', 0 }; @@ -1866,6 +1867,20 @@ static void test_WSAStringToAddressW(void) (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); + /* Test with a larger buffer than necessary */ + len = sizeof(sockaddr_storage); + sin = (SOCKADDR_IN *)&sockaddr_storage; + sin->sin_port = 0; + sin->sin_addr.s_addr = 0; + + ret = WSAStringToAddressW( address5, AF_INET, NULL, (SOCKADDR*)sin, &len ); + ok( (ret == 0 && sin->sin_addr.s_addr == 0xffffffff && sin->sin_port == 0xffff) || + (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), + "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); + ok( len == sizeof(SOCKADDR_IN) || + broken(len == sizeof(SOCKADDR_STORAGE)) /* NT4/2k */, + "unexpected length %d\n", len ); + len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); sockaddr6.sin6_family = AF_INET6;

1 0

Henri Verbeet : wined3d: Move the rel_offset vertex shader field to the ARB shader backend.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: fe47ba8fa296b17d28afcb53eed21c392c511732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe47ba8fa296b17d28afcb53e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:45 2010 +0100 wined3d: Move the rel_offset vertex shader field to the ARB shader backend. --- dlls/wined3d/arb_program_shader.c | 122 ++++++++++++++++++++++--------------- dlls/wined3d/shader.c | 25 -------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 72 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe47ba8fa296b17d28afc…

1 0

Luca Bennati : xcopy: Fix Italian translation.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 915162d2de393dd7a47d9e5517fe066cd0a3386d URL: http://source.winehq.org/git/wine.git/?a=commit;h=915162d2de393dd7a47d9e551… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Nov 20 21:26:58 2010 +0100 xcopy: Fix Italian translation. (cherry picked from commit 1c24b643fff703ca6b4ae8d1f2efef0ff0a802ac) --- programs/xcopy/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/It.rc b/programs/xcopy/It.rc index 2978c0d..2a1cae9 100644 --- a/programs/xcopy/It.rc +++ b/programs/xcopy/It.rc @@ -34,7 +34,7 @@ STRINGTABLE STRING_SIMCOPY, "%d file saranno copiati\n" STRING_COPY, "%d file copiato/i\n" STRING_QISDIR, "'%s' è il nome di un file o una cartella\n\ - nell'obiettivo?\n\ + nella destinazione?\n\ (F - File, C - Cartella)\n" STRING_SRCPROMPT,"%s? (Sì|No)\n" STRING_OVERWRITE,"Sovrascrivere %s? (Sì|No|Tutti)\n"

1 0

Luca Bennati : cmd: Fix Italian translation.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 874314c972c40f12febee833261f35f96b137ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=874314c972c40f12febee8332… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Nov 21 16:50:08 2010 +0100 cmd: Fix Italian translation. (cherry picked from commit 12099f3d9ecf964022d4022eed11d816eef767f4) --- programs/cmd/It.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/It.rc b/programs/cmd/It.rc index 7648f24..2254350 100644 --- a/programs/cmd/It.rc +++ b/programs/cmd/It.rc @@ -74,9 +74,9 @@ esiste nel cmd di wine.\n" "Il comando GOTO trasferisce l'esecuzione ad un'altra istruzione dentro un\n\ file batch.\n\ \n\ -L'etichetta che è l'obiettivo di un GOTO può essere lunga fino a 255 caratteri\n\ +L'etichetta di destinazione di un GOTO può essere lunga fino a 255 caratteri\n\ ma non può includere spazi (questo è differente da altri sistemi\n\ -operativi). Se esistono due o più etichette identiche esistono in un file batch, la\n\ +operativi). Se esistono due o più etichette identiche in un file batch, la\n\ prima sarà sempre eseguita. Tentare un GOTO verso un'etichetta\n\ inesistente termina l'esecuzione del file batch.\n\ \n\ @@ -257,7 +257,7 @@ Inserisci HELP <comando> per maggiori informazioni su ciascuno dei comandi sopra WCMD_SYNTAXERR, "Errore di sintassi\n" WCMD_FILENOTFOUND, "%s : File non trovato\n" WCMD_NOCMDHELP, "Nessun aiuto disponibile per %s\n" - WCMD_NOTARGET, "Obiettivo del GOTO non trovato\n" + WCMD_NOTARGET, "Destinazione del GOTO non trovata\n" WCMD_CURRENTDATE, "La data attuale è %s\n" WCMD_CURRENTTIME, "L'ora attuale è %s\n" WCMD_NEWDATE, "Inserisci una nuova data: "

1 0

Cheer Xiao : wordpad: Update Simplified Chinese translation.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: ec27e91e699d441109925fd8f1072cbae94f05a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec27e91e699d441109925fd8f… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:21:58 2010 +0800 wordpad: Update Simplified Chinese translation. (cherry picked from commit 5ee61dd51da2a9028716d9dd11cd5c60ea0cca2e) --- programs/wordpad/Zh.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 663cc1d..3b7b4f3 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -61,7 +61,7 @@ BEGIN 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 @@ -118,7 +118,7 @@ BEGIN BEGIN MENUITEM "黑色", ID_COLOR_BLACK /* 未找到“标准译名表” */ MENUITEM "栗色", ID_COLOR_MAROON - MENUITEM "调和绿", ID_COLOR_GREEN + MENUITEM "绿色", ID_COLOR_GREEN MENUITEM "橄榄色" ID_COLOR_OLIVE MENUITEM "藏青" ID_COLOR_NAVY MENUITEM "紫色" ID_COLOR_PURPLE @@ -126,7 +126,7 @@ BEGIN MENUITEM "灰色" ID_COLOR_GRAY MENUITEM "银色" ID_COLOR_SILVER MENUITEM "红色" ID_COLOR_RED - MENUITEM "绿色" ID_COLOR_LIME + MENUITEM "青柠色" ID_COLOR_LIME MENUITEM "黄色" ID_COLOR_YELLOW MENUITEM "蓝色" ID_COLOR_BLUE MENUITEM "洋红" ID_COLOR_FUCHSIA /* =magenta? */

1 0

Cheer Xiao : notepad: Update Simplified Chinese translation.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 6961063aaacb75587d12fa3a334352e91e6e220f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6961063aaacb75587d12fa3a3… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:46:45 2010 +0800 notepad: Update Simplified Chinese translation. (cherry picked from commit ecbcf8b137a49da3aaf2761bfa80f400c6a82468) --- programs/notepad/Zh.rc | 52 +++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 20 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index dbc4430..94ac3f4 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -3,6 +3,7 @@ * * Copyright 2002 liuspider <liuspider(a)yahoo.com> * 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 @@ -74,19 +75,19 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" CAPTION "页面设置" { -LTEXT "页眉(&H):", 0x140, 10, 07, 40, 15 +LTEXT "页眉(&H)：", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "脚注(&F):", 0x142, 10, 24, 40, 15 +LTEXT "页脚(&F)：", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "边缘空白(&M):", 0x144, 10, 43,160, 45 -LTEXT "左(&L):", 0x145, 20, 55, 30, 10, WS_CHILD +GROUPBOX "边距（毫米）(&M)：", 0x144, 10, 43,160, 45 +LTEXT "左(&L)：", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "上(&T):", 0x148, 20, 73, 30, 10, WS_CHILD +LTEXT "上(&T)：", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "右(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "右(&R)：", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "下(&B):", 0x14E,100, 73, 30, 10, WS_CHILD +LTEXT "下(&B)：", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "确定", IDOK, 180, 3, 40, 15, WS_TABSTOP @@ -94,33 +95,44 @@ PUSHBUTTON "取消", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "帮助(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG 50,50,300,15 +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "编码：", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "&p 页" +STRING_PAGESETUP_FOOTERVALUE, "第 &p 页" STRING_NOTEPAD, "记事本" STRING_ERROR, "错误" STRING_WARNING, "警告" STRING_INFO, "信息" -STRING_UNTITLED, "(未命名)" +STRING_UNTITLED, "（未命名）" STRING_ALL_FILES, "所有文件 (*.*)" STRING_TEXT_FILES_TXT, "文本文件 (*.txt)" -STRING_TOOLARGE, "记事本不能打开 '%s' 这么大的文件。\n \ -请使用别的编辑器。" -STRING_NOTEXT, "您没有输入任何文本。 \ -\n请输入一些再试" -STRING_DOESNOTEXIST, "文件 '%s'\n不存在\n\n \ -您想新建一个文件吗？" -STRING_NOTSAVED, "文件 '%s'\n正文已更改\n\n \ -是否保存更改？" -STRING_NOTFOUND, "找不到: '%s'" -STRING_OUT_OF_MEMORY, "没有足够的内存可以用来完成此项任务。 \ -\n请关闭一些程序后再试。" +STRING_TOOLARGE, "记事本不能打开“%s“这么大的文件。\n请使用别的编辑器。" +STRING_NOTEXT, "您没有输入任何文本。\n请输入一些再试。" +STRING_DOESNOTEXIST, "文件“%s”不存在。\n\n您想新建一个文件吗？" +STRING_NOTSAVED, "文件“%s”已更改。\n\n是否保存更改？" +STRING_NOTFOUND, "找不到“%s”。" +STRING_OUT_OF_MEMORY, "没有足够的内存可以用来完成此项任务。请关闭一些程序后再试。" + +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 大尾)" +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +此文件包含 Unicode 字符。如果用 %s 编码保存，这些字符将会丢失。\n\ +要保留这些字符，请点“取消”，然后选择一种 Unicode 编码。\n\ +要继续吗？" } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

1 0

Cheer Xiao : winhlp32: Update Simplified Chinese translation.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 6e6c66b2398d4250c9a2f4cab8268d43a7bb583f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6c66b2398d4250c9a2f4cab… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:21:02 2010 +0800 winhlp32: Update Simplified Chinese translation. (cherry picked from commit 2d728e4c04e23b8835ba01d2a678ea76c0976cdd) --- programs/winhlp32/Zh.rc | 56 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 48 insertions(+), 8 deletions(-) diff --git a/programs/winhlp32/Zh.rc b/programs/winhlp32/Zh.rc index 089323a..cacdf51 100644 --- a/programs/winhlp32/Zh.rc +++ b/programs/winhlp32/Zh.rc @@ -4,6 +4,7 @@ * * Copyright 2002 liuspider <liuspider(a)yahoo.com> * 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 @@ -37,7 +38,7 @@ MAIN_MENU MENU MENUITEM "打印(&P)", MNID_FILE_PRINT MENUITEM "打印机设置(&S)...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "退出(&E)", MNID_FILE_EXIT + MENUITEM "退出(&X)", MNID_FILE_EXIT } POPUP "编辑(&E)" { MENUITEM "复制(&C)...", MNID_EDIT_COPYDLG @@ -48,7 +49,7 @@ MAIN_MENU MENU MENUITEM "定义(&D)...", MNID_BKMK_DEFINE } POPUP "选项(&O)" { - POPUP "显示帮助" + POPUP "总是显示帮助" BEGIN MENUITEM "默认", MNID_OPTS_HELP_DEFAULT MENUITEM "显示", MNID_OPTS_HELP_VISIBLE @@ -67,10 +68,26 @@ MAIN_MENU MENU MENUITEM "如何使用帮助(&O)", MNID_HELP_HELPON MENUITEM "总是在最前面(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "资料信息(&I)...", MNID_HELP_ABOUT + MENUITEM "关于 Wine 帮助(&I)...", MNID_HELP_ABOUT } } +IDD_INDEX DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "索引" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "搜索" +{ + LTEXT "尚未实现", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE { @@ -79,17 +96,40 @@ STID_WHERROR, "错误" STID_WARNING, "警告" STID_INFO, "信息" STID_NOT_IMPLEMENTED, "未实现" -STID_HLPFILE_ERROR_s, "读入帮助文件 ‘%s’ 时发生错误" -STID_INDEX, "内容(&C)" +STID_HLPFILE_ERROR_s, "读入帮助文件“%s”时发生错误" +STID_INDEX, "索引(&I)" STID_CONTENTS, "概要" STID_BACK, "返回(&B)" STID_ALL_FILES, "所有文件 (*.*)" STID_HELP_FILES_HLP, "帮助文件 (*.hlp)" -STID_FILE_NOT_FOUND_s "不能打开文件 '%s'. 你想要自己找这个文件吗?" -STID_NO_RICHEDIT "找不到 richedit... 终止" -STID_PSH_INDEX, "帮助内容: " +STID_FILE_NOT_FOUND_s "找不到文件“%s”。你想要自己找这个文件吗？" +STID_NO_RICHEDIT "找不到 richedit 的实现……终止" +STID_PSH_INDEX, "帮助主题：" } +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "注释...", MNID_CTXT_ANNOTATE + MENUITEM "复制", MNID_CTXT_COPY + MENUITEM "打印...", MNID_CTXT_PRINT + POPUP "字体" + BEGIN + MENUITEM "小号", MNID_CTXT_FONTS_SMALL + MENUITEM "中号", MNID_CTXT_FONTS_NORMAL + MENUITEM "大号", MNID_CTXT_FONTS_LARGE + END + POPUP "总是显示帮助" + BEGIN + MENUITEM "默认", MNID_CTXT_HELP_DEFAULT + MENUITEM "显示", MNID_CTXT_HELP_VISIBLE + MENUITEM "不显示", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "使用系统颜色", MNID_CTXT_SYSTEM_COLORS + END +END + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL /* Menu */

1 0