August 2008 - Wine-commits - list.winehq.org

James Hawkins : advapi32: Fix another set of failures on some Vista systems .
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 3814d38aa9f5613b27b457ab0916b3199e1aa553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3814d38aa9f5613b27b457ab0… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:07:12 2008 -0500 advapi32: Fix another set of failures on some Vista systems. --- dlls/advapi32/tests/cred.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index e96d589..1bb2545 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -222,6 +222,12 @@ static void test_domain_password(DWORD cred_type) new_cred.TargetAlias = NULL; new_cred.UserName = (char *)"test\\winetest"; ret = pCredWriteA(&new_cred, 0); + if (!ret && GetLastError() == ERROR_NO_SUCH_LOGON_SESSION) + { + skip("CRED_TYPE_DOMAIN_PASSWORD credentials are not supported " + "or are disabled. Skipping\n"); + return; + } ok(ret, "CredWriteA failed with error %d\n", GetLastError()); ret = pCredEnumerateA(NULL, 0, &count, &creds);

1 0

Christian Costa : d3dxof: Fix guid syntax.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: ce313a5b0ee30c02da36d39d8adb38bf095b9e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce313a5b0ee30c02da36d39d8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Aug 29 11:11:54 2008 +0200 d3dxof: Fix guid syntax. --- dlls/d3dxof/d3dxof.c | 4 ++-- dlls/d3dxof/tests/d3dxof.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 1281346..30c8bdb 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -77,7 +77,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); #define TOKEN_CSTRING 51 #define TOKEN_ARRAY 52 -#define CLSIDFMT "<%08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X>" +#define CLSIDFMT "<%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X>" typedef struct { /* Buffer to parse */ @@ -383,7 +383,7 @@ static BOOL is_guid(parse_buffer* buf) } tmp[pos++] = '>'; tmp[pos] = 0; - if (pos != 37 /* <+35+> */) + if (pos != 38 /* <+36+> */) { TRACE("Wrong guid %s (%d) \n", tmp, pos); return FALSE; diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index b38fa5d..bdc1431 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -30,10 +30,10 @@ char template[] = "xof 0302txt 0064\n" "template Header\n" "{\n" -"<3D82AB43-62DA-11CF-AB390020AF71E433>\n" -"WORD major ;\n" -"WORD minor ;\n" -"DWORD flags ;\n" +"<3D82AB43-62DA-11CF-AB39-0020AF71E433>\n" +"WORD major;\n" +"WORD minor;\n" +"DWORD flags;\n" "}\n"; static void init_function_pointers(void) @@ -79,7 +79,6 @@ static void test_d3dxof(void) ref = IDirectXFile_Release(lpDirectXFile); ok(ref == 1, "Got refcount %ld, expected 1\n", ref); - /* RegisterTemplates does not support txt format yet */ hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, strlen(template)); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr);

1 0

James Hawkins : advapi32: Fix a few failing tests in Vista.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 7b8e8004c800fbb0470b59b47eb27d67acd9f86d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8e8004c800fbb0470b59b47… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:06:29 2008 -0500 advapi32: Fix a few failing tests in Vista. --- dlls/advapi32/tests/cred.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 6d7b758..e96d589 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -97,8 +97,12 @@ static void test_CredWriteA(void) SetLastError(0xdeadbeef); ret = pCredWriteA(&new_cred, 0); - ok(!ret && ( GetLastError() == ERROR_BAD_USERNAME || GetLastError() == ERROR_NO_SUCH_LOGON_SESSION /* Vista */ ), - "CredWrite with username without domain should return ERROR_BAD_USERNAME or ERROR_NO_SUCH_LOGON_SESSION not %d\n", GetLastError()); + ok(!ret, "CredWrite with username without domain should have failed\n"); + ok(GetLastError() == ERROR_BAD_USERNAME || + GetLastError() == ERROR_NO_SUCH_LOGON_SESSION || /* Vista */ + broken(GetLastError() == ERROR_IO_PENDING), + "CredWrite with username without domain should return ERROR_BAD_USERNAME" + "or ERROR_NO_SUCH_LOGON_SESSION not %d\n", GetLastError()); new_cred.UserName = NULL; SetLastError(0xdeadbeef); @@ -175,10 +179,12 @@ static void test_generic(void) { if (!strcmp(creds[i]->TargetName, TEST_TARGET_NAME)) { - ok(creds[i]->Type == CRED_TYPE_GENERIC, "expected creds[%d]->Type CRED_TYPE_GENERIC but got %d\n", i, creds[i]->Type); + ok(creds[i]->Type == CRED_TYPE_GENERIC || + creds[i]->Type == CRED_TYPE_DOMAIN_PASSWORD, /* Vista */ + "expected creds[%d]->Type CRED_TYPE_GENERIC or CRED_TYPE_DOMAIN_PASSWORD but got %d\n", i, creds[i]->Type); ok(!creds[i]->Flags, "expected creds[%d]->Flags 0 but got 0x%x\n", i, creds[i]->Flags); ok(!strcmp(creds[i]->Comment, "Comment"), "expected creds[%d]->Comment \"Comment\" but got \"%s\"\n", i, creds[i]->Comment); - check_blob(__LINE__, CRED_TYPE_GENERIC, creds[i]); + check_blob(__LINE__, creds[i]->Type, creds[i]); ok(creds[i]->Persist, "expected creds[%d]->Persist CRED_PERSIST_ENTERPRISE but got %d\n", i, creds[i]->Persist); ok(!strcmp(creds[i]->UserName, "winetest"), "expected creds[%d]->UserName \"winetest\" but got \"%s\"\n", i, creds[i]->UserName); found = TRUE;

1 0

Nikolay Sivov : gdiplus: Implemented GdipIsEmptyClip with tests.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 813d6dc5372475494a5df6ee3f5a2da905f59331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=813d6dc5372475494a5df6ee3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Aug 28 17:49:41 2008 +0400 gdiplus: Implemented GdipIsEmptyClip with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 8 ++++++++ dlls/gdiplus/tests/graphics.c | 35 +++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 87dc747..94123fa 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -414,7 +414,7 @@ @ stub GdipImageSetAbort @ stub GdipInitializePalette @ stdcall GdipInvertMatrix(ptr) -@ stub GdipIsClipEmpty +@ stdcall GdipIsClipEmpty(ptr ptr) @ stdcall GdipIsEmptyRegion(ptr ptr ptr) @ stdcall GdipIsEqualRegion(ptr ptr ptr ptr) @ stdcall GdipIsInfiniteRegion(ptr ptr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bcfe70f..d91d825 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2392,6 +2392,14 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics *graphics, GpMatrix *matrix return Ok; } +GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics *graphics, BOOL *res) +{ + if(!graphics || !res) + return InvalidParameter; + + return GdipIsEmptyRegion(graphics->clip, graphics, res); +} + GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFont* font, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 8bd76d1..b0858e1 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -844,6 +844,40 @@ static void test_get_set_clip(void) ReleaseDC(0, hdc); } +static void test_isempty(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + HDC hdc = GetDC(0); + GpRegion *clip; + BOOL res; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateRegion(&clip); + expect(Ok, status); + + /* NULL */ + status = GdipIsClipEmpty(NULL, NULL); + expect(InvalidParameter, status); + status = GdipIsClipEmpty(graphics, NULL); + expect(InvalidParameter, status); + status = GdipIsClipEmpty(NULL, &res); + expect(InvalidParameter, status); + + /* default is infinite */ + res = TRUE; + status = GdipIsClipEmpty(graphics, &res); + expect(Ok, status); + expect(FALSE, res); + + GdipDeleteRegion(clip); + + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -866,6 +900,7 @@ START_TEST(graphics) test_Get_Release_DC(); test_transformpoints(); test_get_set_clip(); + test_isempty(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index d9b70b2..0b4a67f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -158,6 +158,7 @@ GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*); GpStatus WINGDIPAPI GdipGetClip(GpGraphics*,GpRegion*); GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics*,GpRegion*,CombineMode); GpStatus WINGDIPAPI GdipResetClip(GpGraphics*); +GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics*, BOOL*); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetDC(GpGraphics*,HDC*); GpStatus WINGDIPAPI GdipGetImageDimension(GpImage*,REAL*,REAL*);

1 0

Nikolay Sivov : gdiplus: Add TRACE(..) to graphicspath.c.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 7d71805afc57567f0e0d37f2cd101c43f1b48e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d71805afc57567f0e0d37f2c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Aug 28 18:27:55 2008 +0400 gdiplus: Add TRACE(..) to graphicspath.c. --- dlls/gdiplus/graphicspath.c | 118 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 116 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d71805afc57567f0e0d3…

1 0

Nikolay Sivov : gdiplus: Implemented GdipResetClip with tests.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: ff88d4e18e806c6c5256ef00f8a8f612c1469ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff88d4e18e806c6c5256ef00f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Aug 28 17:34:22 2008 +0400 gdiplus: Implemented GdipResetClip with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 11 +++++++++++ dlls/gdiplus/tests/graphics.c | 33 +++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 95add0d..87dc747 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -474,7 +474,7 @@ @ stub GdipRecordMetafileStreamI @ stdcall GdipReleaseDC(ptr ptr) @ stdcall GdipRemovePropertyItem(ptr long) -@ stub GdipResetClip +@ stdcall GdipResetClip(ptr) @ stub GdipResetImageAttributes @ stub GdipResetLineTransform @ stub GdipResetPageTransform diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a2ff33f..bcfe70f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2514,6 +2514,17 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipResetClip(GpGraphics *graphics) +{ + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return GdipSetInfinite(graphics->clip); +} + GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics *graphics) { if(!graphics) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e316ab9..8bd76d1 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -674,6 +674,8 @@ static void test_Get_Release_DC(void) expect(ObjectBusy, status); status = Ok; /* GdipMeasureCharacterRanges */ /* GdipMeasureString */ + status = GdipResetClip(graphics); + expect(ObjectBusy, status); status = Ok; status = GdipResetWorldTransform(graphics); expect(ObjectBusy, status); status = Ok; /* GdipRestoreGraphics */ @@ -805,6 +807,37 @@ static void test_get_set_clip(void) expect(Ok, status); expect(TRUE, res); + /* remains infinite after reset */ + res = FALSE; + status = GdipResetClip(graphics); + expect(Ok, status); + status = GdipGetClip(graphics, clip); + expect(Ok, status); + status = GdipIsInfiniteRegion(clip, graphics, &res); + expect(Ok, status); + expect(TRUE, res); + + /* set to empty and then reset to infinite */ + status = GdipSetEmpty(clip); + expect(Ok, status); + status = GdipSetClipRegion(graphics, clip, CombineModeReplace); + expect(Ok, status); + + status = GdipGetClip(graphics, clip); + expect(Ok, status); + res = FALSE; + status = GdipIsEmptyRegion(clip, graphics, &res); + expect(Ok, status); + expect(TRUE, res); + status = GdipResetClip(graphics); + expect(Ok, status); + status = GdipGetClip(graphics, clip); + expect(Ok, status); + res = FALSE; + status = GdipIsInfiniteRegion(clip, graphics, &res); + expect(Ok, status); + expect(TRUE, res); + GdipDeleteRegion(clip); GdipDeleteGraphics(graphics); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8a1e8f7..d9b70b2 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -157,6 +157,7 @@ GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics*,GpBrush*,GDIPCONST GpRect*,I GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*); GpStatus WINGDIPAPI GdipGetClip(GpGraphics*,GpRegion*); GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics*,GpRegion*,CombineMode); +GpStatus WINGDIPAPI GdipResetClip(GpGraphics*); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetDC(GpGraphics*,HDC*); GpStatus WINGDIPAPI GdipGetImageDimension(GpImage*,REAL*,REAL*);

1 0

Hongbo Ni : comdlg32: Update simplified Chinese resource.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 698e8727513012d23e50ad242d93722042d45700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=698e8727513012d23e50ad242… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 29 13:15:30 2008 +1000 comdlg32: Update simplified Chinese resource. --- dlls/comdlg32/cdlg_Cn.rc | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/comdlg32/cdlg_Cn.rc b/dlls/comdlg32/cdlg_Cn.rc index a14eaf0..f79b0b5 100644 --- a/dlls/comdlg32/cdlg_Cn.rc +++ b/dlls/comdlg32/cdlg_Cn.rc @@ -28,7 +28,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "打开" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { LTEXT "文件名(&N):", 1090, 6, 6, 76, 9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP @@ -50,7 +50,7 @@ FONT 8, "MS Shell Dlg" SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "另存为..." -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { LTEXT "文件名(&N):", 1090, 6, 6, 76, 9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP @@ -72,7 +72,7 @@ FONT 8, "MS Shell Dlg" PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "打印" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { LTEXT "打印机:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "打印设置" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { GROUPBOX "打印机", grp1, 6, 10, 180, 65, BS_GROUPBOX RADIOBUTTON "默认打印机(&D)", rad1, 16, 20, 80, 12 @@ -121,7 +121,7 @@ FONT 8, "MS Shell Dlg" CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "字体" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { LTEXT "字体(&F):",1088 ,6,3,40,9 COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | @@ -153,7 +153,7 @@ FONT 8, "MS Shell Dlg" CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "颜色" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { LTEXT "基本颜色(&B):", 1088, 4, 4, 140, 10 LTEXT "自定制颜色(&C):", 1089, 4, 106, 140, 10 @@ -187,17 +187,17 @@ FONT 8, "MS Shell Dlg" FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "查找" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { LTEXT "查找(&n):", -1, 4, 8, 42, 8 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "全字匹配(&W)", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "区分大小写(&C)", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "方向", grp1, 107, 26, 68, 28 - CONTROL "向上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "向下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + CONTROL "上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 + CONTROL "下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "查找下一个(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "找下一个(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "帮助(&H)", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -206,16 +206,16 @@ FONT 8, "MS Shell Dlg" REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "替换" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { - LTEXT "查找内容(&n):", -1, 4, 9, 48, 8 + LTEXT "查找(&n):", -1, 4, 9, 48, 8 EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "替换为(&p):", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "全字匹配(&W)", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "区分大小写(&C)", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "查找下一个(&F)", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "找下一个(&F)", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "替换(&R)", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "全部替换(&A)", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP @@ -227,7 +227,7 @@ PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "打印" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { DEFPUSHBUTTON "确定", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL, 232,164, 48,14, WS_GROUP @@ -267,7 +267,7 @@ PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "打印设置" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" BEGIN DEFPUSHBUTTON "确定",IDOK,180,156,48,14,WS_GROUP PUSHBUTTON "取消",IDCANCEL,232,156,48,14 @@ -301,7 +301,7 @@ END PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "页面设置" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 @@ -331,7 +331,7 @@ END NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN CAPTION "打开" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { LTEXT "搜寻(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

1 0

Hongbo Ni : comdlg32: Update traditional Chinese resource.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: b76433452ca239ef1cab06177b00586381af550c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76433452ca239ef1cab06177… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 29 12:53:42 2008 +1000 comdlg32: Update traditional Chinese resource. --- dlls/comdlg32/cdlg_Zh.rc | 102 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/comdlg32/cdlg_Zh.rc b/dlls/comdlg32/cdlg_Zh.rc index a89d4e4..5d862de 100644 --- a/dlls/comdlg32/cdlg_Zh.rc +++ b/dlls/comdlg32/cdlg_Zh.rc @@ -1,5 +1,8 @@ /* + * comdlg32 (Traditional Chinese Resource) + * * Copyright 2000 Aric Stewart + * 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 @@ -28,7 +31,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "開啟" -FONT 8, "MS Shell Dlg" +FONT 8, "PMingLiu" { LTEXT "檔案名稱(&N):", 1090, 6, 6, 100, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP @@ -50,7 +53,7 @@ FONT 8, "MS Shell Dlg" SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "另存新檔..." -FONT 8, "MS Shell Dlg" +FONT 8, "PMingLiu" { LTEXT "檔案名稱(&N):", 1090, 6, 6, 76, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP @@ -71,7 +74,7 @@ FONT 8, "MS Shell Dlg" CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 294, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "字型" -FONT 8, "MS Shell Dlg" +FONT 8, "PMingLiu" { LTEXT "字型(&F):",1088 ,6,3,40,9 COMBOBOX 1136 ,6,13,124,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | @@ -94,7 +97,7 @@ FONT 8, "MS Shell Dlg" CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "範例",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + LTEXT "语言:",stc7 ,98,114,80,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -103,7 +106,7 @@ FONT 8, "MS Shell Dlg" CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "色彩" -FONT 8, "MS Shell Dlg" +FONT 8, "PMingLiu" { LTEXT "基本色彩(&B):", 1088, 4, 4, 140, 10 LTEXT "自定色彩(&C):", 1089, 4, 106, 140, 10 @@ -137,7 +140,7 @@ FONT 8, "MS Shell Dlg" FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 263, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "搜尋" -FONT 8, "MS Shell Dlg" +FONT 8, "PMingLiu" { LTEXT "搜尋目標(&N):", -1, 4, 8, 50, 8 EDITTEXT 1152, 61, 7, 130, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP @@ -156,14 +159,14 @@ FONT 8, "MS Shell Dlg" REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 263, 94 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "取代" -FONT 8, "MS Shell Dlg" +FONT 8, "PMingLiu" { LTEXT "尋找目標(&N):", -1, 4, 9, 50, 8 EDITTEXT 1152, 61, 7, 130, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "取代為(&P):", -1, 4, 26, 50, 8 EDITTEXT 1153, 61, 24, 130, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "全字拼寫須符合(&W)", 1040, 5, 46, 89, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "大小寫視為想異(&C)", 1041, 5, 62, 89, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "大小寫視為相異(&C)", 1041, 5, 62, 89, 12, BS_AUTOCHECKBOX | WS_TABSTOP DEFPUSHBUTTON "找下一個(&F)", IDOK, 199, 4, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "取代(&R)", psh1 , 199, 21, 60, 14, WS_GROUP | WS_TABSTOP @@ -175,7 +178,7 @@ FONT 8, "MS Shell Dlg" NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN CAPTION "開啟舊檔" -FONT 8, "MS Shell Dlg" +FONT 8, "PMingLiu" { LTEXT "搜尋位置(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY COMBOBOX IDC_LOOKIN,52,3,130,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP @@ -198,9 +201,9 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { - IDS_ABOUTBOX "&About FolderPicker Test" - IDS_DOCUMENTFOLDERS "文件夾" - IDS_PERSONAL "我的文件" + IDS_ABOUTBOX "关于資料夹选择器(&A)" + IDS_DOCUMENTFOLDERS "資料夾" + IDS_PERSONAL "我的檔案" IDS_FAVORITES "我的最愛" IDS_PATH "系統路徑" IDS_DESKTOP "桌面" @@ -210,16 +213,16 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { - IDS_SYSTEMFOLDERS "System Folders" - IDS_LOCALHARDRIVES "Local Hard Drives" - IDS_FILENOTFOUND "File not found" - IDS_VERIFYFILE "Please verify if the correct file name was given" - IDS_CREATEFILE "File does not exist\nDo you want to create file" - IDS_OVERWRITEFILE "File does already exist.\nDo you want to replace it?" - IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path" - IDS_INVALID_FILENAME "A filename cannot contain any of the following characters:\n / : < > |" - IDS_PATHNOTEXISTING "Path does not exist" - IDS_FILENOTEXISTING "File does not exist" + IDS_SYSTEMFOLDERS "系統資料夾" + IDS_LOCALHARDRIVES "本地硬盤驅動器" + IDS_FILENOTFOUND "找不到檔案" + IDS_VERIFYFILE "請檢驗是否給予正確的檔案名稱。" + IDS_CREATEFILE "找不到檔案\n是否創建新檔案?" + IDS_OVERWRITEFILE "檔案已經存在。\n要替換嗎?" + IDS_INVALID_FILENAME_TITLE "檔案名中存在無效的字符" + IDS_INVALID_FILENAME "檔案名中不能包含任何一下字符::\n / : < > |" + IDS_PATHNOTEXISTING "資料夾不存在" + IDS_FILENOTEXISTING "檔案不存在" } STRINGTABLE DISCARDABLE @@ -231,4 +234,59 @@ STRINGTABLE DISCARDABLE IDS_TODESKTOP "顯示桌面" } +STRINGTABLE DISCARDABLE +{ + PD32_PRINT_TITLE "列印" + + PD32_VALUE_UREADABLE "數值不可讀" + PD32_INVALID_PAGE_RANGE "這個值不在頁數範圍。\n \ +請輸入一個 %d 和 %d 之間的數。" + PD32_FROM_NOT_ABOVE_TO "'從'項的值不能大於'到'項的值。" + PD32_MARGINS_OVERLAP "邊緣空白重迭或落於紙外,\n請重新輸入邊緣空白。" + PD32_NR_OF_COPIES_EMPTY "'份數' 項不能空." + PD32_TOO_LARGE_COPIES "你的印表機不支持這麼大的份數。\n \ +請輸入一個 1 和 %d 之間的數。" + PD32_PRINT_ERROR "印表機錯誤。" + PD32_NO_DEFAULT_PRINTER "沒有默認印表機。" + PD32_CANT_FIND_PRINTER "找不到印表機。" + PD32_OUT_OF_MEMORY "內存不夠。" + PD32_GENERIC_ERROR "出現一些錯誤。" + PD32_DRIVER_UNKNOWN "找不到印表機驅動器。" + PD32_NO_DEVICES "在使用與印表機有關功能(版面設定, 列印檔案)之前, \ +你必須先裝印表機。請裝一個印表機再試。" + + PD32_DEFAULT_PRINTER "默認印表機; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "有 %d 個文檔正在等待列印" + PD32_MARGINS_IN_INCHES "邊緣空白 [英寸]" + PD32_MARGINS_IN_MILIMETERS "邊緣空白 [毫米]" + PD32_MILIMETERS "毫米" + + PD32_PRINTER_STATUS_READY "待命" + PD32_PRINTER_STATUS_PAUSED "暫停; " + PD32_PRINTER_STATUS_ERROR "錯誤; " + PD32_PRINTER_STATUS_PENDING_DELETION "等待刪除; " + PD32_PRINTER_STATUS_PAPER_JAM "卡紙; " + PD32_PRINTER_STATUS_PAPER_OUT "無紙; " + PD32_PRINTER_STATUS_MANUAL_FEED "手動進紙; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "紙的問題; " + PD32_PRINTER_STATUS_OFFLINE "印表機離線; " + PD32_PRINTER_STATUS_IO_ACTIVE "I/O 活動; " + PD32_PRINTER_STATUS_BUSY "繁忙; " + PD32_PRINTER_STATUS_PRINTING "正在列印; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "出紙托盤已滿; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "不可用; " + PD32_PRINTER_STATUS_WAITING "等待; " + PD32_PRINTER_STATUS_PROCESSING "正在處理; " + PD32_PRINTER_STATUS_INITIALIZING "正在啓動; " + PD32_PRINTER_STATUS_WARMING_UP "預熱; " + PD32_PRINTER_STATUS_TONER_LOW "墨低; " + PD32_PRINTER_STATUS_NO_TONER "沒墨; " + PD32_PRINTER_STATUS_PAGE_PUNT "頁處理內存超支; " + PD32_PRINTER_STATUS_USER_INTERVENTION "用戶干預; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "內存不夠; " + PD32_PRINTER_STATUS_DOOR_OPEN "印表機蓋是打開的; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "找不到列印服務器; " + PD32_PRINTER_STATUS_POWER_SAVE "省電狀態; " +} + #pragma code_page(default)

1 0

Hongbo Ni : shell32: Update simplified Chinese resource.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: daca24631c549e76bff9f6230a6bfcaf94c31e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daca24631c549e76bff9f6230… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 29 13:13:34 2008 +1000 shell32: Update simplified Chinese resource. --- dlls/shell32/shell32_Cn.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Cn.rc b/dlls/shell32/shell32_Cn.rc index bb36d3a..31ee724 100644 --- a/dlls/shell32/shell32_Cn.rc +++ b/dlls/shell32/shell32_Cn.rc @@ -68,7 +68,7 @@ END SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "关于 %s" -FONT 10, "MS Shell Dlg" +FONT 9, "MS Song" { DEFPUSHBUTTON "确定", IDOK, 153, 133, 60, 12, WS_TABSTOP PUSHBUTTON "使用许可(&l)...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP @@ -83,7 +83,7 @@ FONT 10, "MS Shell Dlg" SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Song" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE LTEXT "输入程序，目录，文件或者Internet资源名，Wine将为您打开它。", 12289, 36, 11, 182, 18

1 0

Hongbo Ni : shell32: Update traditional Chinese resource.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 0fc9ad37d85b619ae5a2efb0c0bb0ad3418a65d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc9ad37d85b619ae5a2efb0c… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 29 12:53:16 2008 +1000 shell32: Update traditional Chinese resource. --- dlls/shell32/shell32_Zh.rc | 69 +++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/shell32_Zh.rc b/dlls/shell32/shell32_Zh.rc index 0b98d47..b6218fb 100644 --- a/dlls/shell32/shell32_Zh.rc +++ b/dlls/shell32/shell32_Zh.rc @@ -1,5 +1,8 @@ /* + * shell32 (Traditional Chinese Resource) + * * Copyright 1998 Juergen Schmied + * 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 @@ -28,70 +31,70 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN - MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE - MENUITEM "&Open", FCIDM_SHVIEW_OPEN + MENUITEM "選擇(&S)" FCIDM_SHVIEW_OPEN + MENUITEM "檔案管理器(&x)", FCIDM_SHVIEW_EXPLORE + MENUITEM "開啟(&O)", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR - MENUITEM "C&ut", FCIDM_SHVIEW_CUT - MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM "剪下(&u)", FCIDM_SHVIEW_CUT + MENUITEM "複製(&C)", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Delete", FCIDM_SHVIEW_DELETE - MENUITEM "&Rename", FCIDM_SHVIEW_RENAME + MENUITEM "生成連接(&L)", FCIDM_SHVIEW_CREATELINK + MENUITEM "刪除(&D)", FCIDM_SHVIEW_DELETE + MENUITEM "改名(&R)", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR - MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES + MENUITEM "屬性(&P)", FCIDM_SHVIEW_PROPERTIES END END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "檔案(&F)" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "結束(&x)", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "檢視(&V)" BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "大圖標(&g)", FCIDM_SHVIEW_BIGICON + MENUITEM "小圖標(&m)", FCIDM_SHVIEW_SMALLICON + MENUITEM "列表(&L)", FCIDM_SHVIEW_LISTVIEW + MENUITEM "詳情(&D)", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "幫助(&H)" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "關於控制面板(&A)...", IDM_CPANEL_ABOUT END END SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "關於 %s" -FONT 8, "MS Shell Dlg" +FONT 8, "PMingLiu" { DEFPUSHBUTTON "確定", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "Wine &license...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "使用許可(&l)...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 - LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 - LTEXT "Wine was brought to you by:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "運行於 %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine 開發人員 :", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" -FONT 8, "MS Shell Dlg" +FONT 8, "PMingLiu" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "輸入程式，目錄，檔案或者Internet資源名，Wine將為您開啟它。", 12289, 36, 11, 182, 18 + LTEXT "打開(&O):", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 - DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "確定", IDOK, 62, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "取消", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "瀏覽(&B)...", 12288, 170, 63, 50, 14, WS_TABSTOP } /* columns in the shellview */ @@ -104,12 +107,12 @@ BEGIN IDS_SHV_COLUMN5 "屬性" IDS_SHV_COLUMN6 "使用空間" IDS_SHV_COLUMN7 "剩餘空間" - IDS_SHV_COLUMN8 "Name" /*FIXME*/ - IDS_SHV_COLUMN9 "Comments" /*FIXME*/ + IDS_SHV_COLUMN8 "名稱" + IDS_SHV_COLUMN9 "備註" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Wine 控制面板" + IDS_CPANEL_NAME "名稱" + IDS_CPANEL_DESCRIPTION "描述" END #pragma code_page(default)

1 0