wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Igor Paliychuk : comdlg32: Ukrainian translation update.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: 4ab5328934e95a70eda14a9424a694ee32acf211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab5328934e95a70eda14a942… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Thu Jul 1 10:42:51 2010 +0300 comdlg32: Ukrainian translation update. --- dlls/comdlg32/cdlg_Uk.rc | 92 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 71 insertions(+), 21 deletions(-) diff --git a/dlls/comdlg32/cdlg_Uk.rc b/dlls/comdlg32/cdlg_Uk.rc index 730d610..14a8f1d 100644 --- a/dlls/comdlg32/cdlg_Uk.rc +++ b/dlls/comdlg32/cdlg_Uk.rc @@ -1,6 +1,8 @@ /* * Copyright 2004 Ilya Korniyko * + * Copyright 2010 Igor Paliychuk + * * 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 @@ -41,7 +43,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&��:", 1091, 110, 104, 92, 9 COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "³��", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "&�� ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP } @@ -63,7 +65,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&��:", 1091, 110, 104, 92, 9 COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "�� ", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "&�� ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP } @@ -81,7 +83,7 @@ FONT 8, "MS Shell Dlg" RADIOBUTTON "�&�� ", 1057, 16, 60, 60, 12 RADIOBUTTON "&��", 1058, 16, 75, 60, 12 DEFPUSHBUTTON "��", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "��", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&�:", 1090, 60, 80, 30, 9 LTEXT "&��:", 1091, 120, 80, 30, 9 @@ -103,7 +105,7 @@ FONT 8, "MS Shell Dlg" RADIOBUTTON "&�� ", 1057, 16, 50, 80, 12 COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "��", 1073, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "&��", 1058, 50, 100, 40, 12 @@ -133,7 +135,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "³��",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "��",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&��" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "��",1072,6,72,84,34,WS_GROUP @@ -176,7 +178,7 @@ FONT 8, "MS Shell Dlg" CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "��", 1038,100,166, 44, 14 PUSHBUTTON "&�� ", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&�� >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP @@ -198,7 +200,7 @@ FONT 8, "MS Shell Dlg" CONTROL "�&��", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12 DEFPUSHBUTTON "�&�� ", IDOK, 190, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "³��", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", pshHelp , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -218,7 +220,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "�&�� ", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&��", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "�� &��", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } @@ -229,7 +231,7 @@ CAPTION " FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "³��", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "��", IDCANCEL, 232,164, 48,14, WS_GROUP PUSHBUTTON "&��", pshHelp, 50, 161, 48,14, WS_GROUP GROUPBOX "��", grp4, 8, 4, 272,84, WS_GROUP @@ -269,7 +271,7 @@ CAPTION " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "³��",IDCANCEL,232,156,48,14 + PUSHBUTTON "��",IDCANCEL,232,156,48,14 /* PUSHBUTTON "ѳ��...", psh5, 284,156,48,14 */ GROUPBOX "��", grp4, 8, 4, 272,84, WS_GROUP @@ -297,6 +299,36 @@ BEGIN CONTROL "�&��", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 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" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "��", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&��:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "��&��:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "��", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "�&��", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "��&��", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "��", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "�&��:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "�&��:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "�&��:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "�&��:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "��", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "�&��...", psh3, 184, 220, 48, 14 +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 "³��" @@ -317,7 +349,7 @@ FONT 8, "MS Shell Dlg" CONTROL "�� &��",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 DEFPUSHBUTTON "&³��", IDOK,222,110,50,14 - PUSHBUTTON "³��", IDCANCEL,222,128,50,14 + PUSHBUTTON "��", IDCANCEL,222,128,50,14 PUSHBUTTON "&��", pshHelp,222,145,50,14 } @@ -376,9 +408,9 @@ STRINGTABLE DISCARDABLE PD32_OUT_OF_MEMORY "�� '��" PD32_GENERIC_ERROR "��(�) ��(�)" PD32_DRIVER_UNKNOWN "�� " - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "�� \ +�� . \ +�� ." PD32_DEFAULT_PRINTER "�� ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d �� " @@ -414,22 +446,40 @@ Please install one and retry." PD32_PRINTER_STATUS_POWER_SAVE "�� ; " } +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "��" + IDS_FONT_BOLD "��" + IDS_FONT_ITALIC "��" + IDS_FONT_BOLD_ITALIC "�� " +} + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "��" - IDS_COLOR_MAROON "��" + IDS_COLOR_MAROON "��" IDS_COLOR_GREEN "��" IDS_COLOR_OLIVE "��" IDS_COLOR_NAVY "��" - IDS_COLOR_PURPLE "��" - IDS_COLOR_TEAL "��-��" + IDS_COLOR_PURPLE "��" + IDS_COLOR_TEAL "��-��" IDS_COLOR_GRAY "ѳ��" - IDS_COLOR_SILVER "��" + IDS_COLOR_SILVER "��" IDS_COLOR_RED "��" IDS_COLOR_LIME "��" IDS_COLOR_YELLOW "��" - IDS_COLOR_BLUE "��" - IDS_COLOR_FUCHSIA "Գ��" - IDS_COLOR_AQUA "��" + IDS_COLOR_BLUE "��" + IDS_COLOR_FUCHSIA "��" + IDS_COLOR_AQUA "��" IDS_COLOR_WHITE "��" } + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "�� %d - %d ��." + IDS_SAVE_BUTTON "&��" + IDS_SAVE_IN "�� &�:" + IDS_SAVE "��" + IDS_SAVE_AS "�� " + IDS_OPEN_FILE "³�� " +}

1 0

Piotr Caban : wininet: Remove get_avail_data check from HTTPREQ_ReadFileExA .
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: 898531de80511662ffa61bd93189870bf09ac905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=898531de80511662ffa61bd93… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 1 13:10:46 2010 +0200 wininet: Remove get_avail_data check from HTTPREQ_ReadFileExA. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4b4bc5b..54895bb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2160,7 +2160,7 @@ static DWORD HTTPREQ_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffer INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - if ((hdr->dwFlags & INTERNET_FLAG_ASYNC) && !get_avail_data(req)) + if (hdr->dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest;

1 0

Paul Chitescu : mshtml: Pass the data read from resource to FindMimeFromData.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: 0825f4b3ff3718752b5f6addd95bc30c10f75d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0825f4b3ff3718752b5f6addd… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Thu Jul 1 13:17:42 2010 +0300 mshtml: Pass the data read from resource to FindMimeFromData. --- dlls/mshtml/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 193004d..1485881 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -670,7 +670,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, FreeLibrary(hdll); - hres = FindMimeFromData(NULL, url_file, NULL, 0, NULL, 0, &mime, 0); + hres = FindMimeFromData(NULL, url_file, This->data, This->data_len, NULL, 0, &mime, 0); heap_free(url); if(SUCCEEDED(hres)) { IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, mime);

1 0

Paul Chitescu : mshtml: Do not try to use IDocHostUIHandler for context menu if hostui is NULL.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: fa49b9f22604691627d2273a5fa603d8a0066df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa49b9f22604691627d2273a5… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jun 30 18:52:17 2010 +0300 mshtml: Do not try to use IDocHostUIHandler for context menu if hostui is NULL. --- dlls/mshtml/olecmd.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 4d5967a..851189b 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -898,11 +898,9 @@ void show_context_menu(HTMLDocumentObj *This, DWORD dwID, POINT *ppt, IDispatch { HMENU menu_res, menu; DWORD cmdid; - HRESULT hres; - hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt, - (IUnknown*)CMDTARGET(&This->basedoc), elem); - if(hres == S_OK) + if(This->hostui && S_OK == IDocHostUIHandler_ShowContextMenu(This->hostui, + dwID, ppt, (IUnknown*)CMDTARGET(&This->basedoc), elem)) return; menu_res = LoadMenuW(get_shdoclc(), MAKEINTRESOURCEW(IDR_BROWSE_CONTEXT_MENU));

1 0

Alexandre Julliard : msi/tests: Reset the enumeration index for MsiEnumProducts before testing it.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: bcb869a342a02f8ffe256ba8cf811630b0e0c0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb869a342a02f8ffe256ba8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 13:21:34 2010 +0200 msi/tests: Reset the enumeration index for MsiEnumProducts before testing it. --- dlls/msi/tests/msi.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 90a357b..b377320 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11298,6 +11298,9 @@ static void test_MsiEnumProducts(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); index = 0; + r = MsiEnumProductsA(index, guid); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + r = MsiEnumProductsA(index, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r);

1 0

Alexandre Julliard : gdiplus/tests: Don' t fail if we do find Microsoft Sans Serif on Wine.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: 415bb3c5a0a16c9794b7b206302632629f72adfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=415bb3c5a0a16c9794b7b2063… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 12:06:35 2010 +0200 gdiplus/tests: Don't fail if we do find Microsoft Sans Serif on Wine. --- dlls/gdiplus/tests/font.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 80f11bc..c2ed3c7 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -33,6 +33,7 @@ static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r', static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; +static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; static void test_createfont(void) { @@ -295,9 +296,12 @@ static void test_getgenerics (void) expect (Ok, stat); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); expect (Ok, stat); - todo_wine ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), - "Expected Microsoft Sans Serif, got %s\n", - wine_dbgstr_w(familyName)); + if (!lstrcmpiW(familyName, Tahoma)) + todo_wine ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), + "Expected Microsoft Sans Serif, got Tahoma\n"); + else + ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), + "Expected Microsoft Sans Serif, got %s\n", wine_dbgstr_w(familyName)); stat = GdipDeleteFontFamily (family); expect (Ok, stat);

1 0

Alexandre Julliard : gdiplus/tests: Use Tahoma instead of Courier New for testing font metrics.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: 5d71136611d49adda0c83895bfae067fcaaf951d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d71136611d49adda0c83895b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 11:38:46 2010 +0200 gdiplus/tests: Use Tahoma instead of Courier New for testing font metrics. --- dlls/gdiplus/tests/graphics.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 57ce638..aaf661d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2411,9 +2411,8 @@ static void test_string_functions(void) GpBrush *brush; ARGB color = 0xff000000; HDC hdc = GetDC( hwnd ); - const WCHAR fontname[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; - const WCHAR fontname2[] = {'C','o','u','r','i','e','r',0}; - const WCHAR teststring[] = {'o','o',' ','o','\n','o',0}; + const WCHAR fontname[] = {'T','a','h','o','m','a',0}; + const WCHAR teststring[] = {'M','M',' ','M','\n','M',0}; REAL char_width, char_height; INT codepointsfitted, linesfilled; GpStringFormat *format; @@ -2428,14 +2427,6 @@ static void test_string_functions(void) ok(graphics != NULL, "Expected graphics to be initialized\n"); status = GdipCreateFontFamilyFromName(fontname, NULL, &family); - - if (status != Ok) - { - /* Wine doesn't have Courier New? */ - todo_wine expect(Ok, status); - status = GdipCreateFontFamilyFromName(fontname2, NULL, &family); - } - expect(Ok, status); status = GdipCreateFont(family, 10.0, FontStyleRegular, UnitPixel, &font); @@ -2514,14 +2505,15 @@ static void test_string_functions(void) expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf_(char_bounds.Width + char_width * 3, bounds.Width, 0.01); + ok(bounds.Width > char_bounds.Width + char_width * 2, "got %0.2f, expected at least %0.2f\n", + bounds.Width, char_bounds.Width + char_width * 2); ok(bounds.Height > char_bounds.Height, "got %0.2f, expected at least %0.2f\n", bounds.Height, char_bounds.Height); expect(6, codepointsfitted); expect(2, linesfilled); char_height = bounds.Height - char_bounds.Height; /* Cut off everything after the first space. */ - rc.Width = char_bounds.Width + char_width * 2.5; + rc.Width = char_bounds.Width + char_width * 2.1; status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); expect(Ok, status); @@ -2607,7 +2599,7 @@ static void test_string_functions(void) ok(!region_isempty[3], "region shouldn't be empty\n"); /* Cut off everything after the first space, and the second line. */ - rc.Width = char_bounds.Width + char_width * 2.5; + rc.Width = char_bounds.Width + char_width * 2.1; rc.Height = char_bounds.Height + char_height * 0.5; status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 3, regions);

1 0

Gustavo Henrique Milaré : regedit: Update Portuguese (Brazilian) translation.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: b6cd1c4d1823a7a09df151eef2367629e78c1dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cd1c4d1823a7a09df151eef… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 30 17:21:21 2010 -0300 regedit: Update Portuguese (Brazilian) translation. --- programs/regedit/Pt.rc | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/programs/regedit/Pt.rc b/programs/regedit/Pt.rc index b482148..fd8219e 100644 --- a/programs/regedit/Pt.rc +++ b/programs/regedit/Pt.rc @@ -4,6 +4,7 @@ * Copyright 2003 Marcelo Duarte * Copyright 2004 Américo José Melo * Copyright 2009 Ricardo Filipe + * Copyright 2010 Gustavo Henrique Milaré * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -81,7 +82,7 @@ BEGIN END POPUP "Aj&uda" BEGIN - MENUITEM "&Topics da Ajuda", ID_HELP_HELPTOPICS + MENUITEM "&Tópicos da Ajuda", ID_HELP_HELPTOPICS MENUITEM SEPARATOR MENUITEM "&Sobre o Editor do Registro", ID_HELP_ABOUT END @@ -140,7 +141,7 @@ BEGIN END POPUP "Aj&uda" BEGIN - MENUITEM "&Topicos da Ajuda", ID_HELP_HELPTOPICS + MENUITEM "&Tópicos da Ajuda", ID_HELP_HELPTOPICS MENUITEM SEPARATOR MENUITEM "&Acerca do Editor de Registo", ID_HELP_ABOUT END @@ -186,7 +187,20 @@ END * Dialog */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_EXPORT_TEMPLATE DIALOG DISCARDABLE 50, 50, 278, 54 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Exportar registro", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP + AUTORADIOBUTTON "&Todos", IDC_EXPORT_ALL, 12, 15, 244, 12 + AUTORADIOBUTTON "&Ramo selecionado:", IDC_EXPORT_SELECTED, 12, 30, 70, 12 + EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_EXPORT_TEMPLATE DIALOG DISCARDABLE 50, 50, 278, 54 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | @@ -199,6 +213,8 @@ BEGIN EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 END +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + IDD_FIND DIALOG DISCARDABLE 22, 17, 220, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar" @@ -353,6 +369,7 @@ BEGIN ID_EDIT_NEW_STRINGVALUE "Adiciona um novo valor texto." ID_EDIT_NEW_BINARYVALUE "Adiciona um novo valor binário." ID_EDIT_NEW_DWORDVALUE "Adiciona um novo valor DWORD." + ID_EDIT_NEW_MULTI_STRINGVALUE "Adiciona um novo valor de múltiplas strings" ID_REGISTRY_IMPORTREGISTRYFILE "Importa um arquivo texto para o registro." ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo ou parte do registro para um arquivo texto." @@ -403,6 +420,7 @@ BEGIN ID_EDIT_COPYKEYNAME "Copia o nome da chave selecionada para a Área de transferência." ID_EDIT_FIND "Localiza um texto em uma chave, valor ou dado." ID_EDIT_FINDNEXT "Localiza a próxima ocorrência do texto especificado na pesquisa anterior." + ID_EDIT_EXPORT "Exporta o ramo do registro selecionado para um arquivo de texto" END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -435,7 +453,7 @@ BEGIN IDS_TOO_BIG_VALUE "Valor é muito grande (%u)" IDS_DELETE_BOX_TITLE "Confirmar exclusão de valor" IDS_DELETE_BOX_TEXT "Tem certeza que deseja excluir o valor '%s'?" - IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Tem a certeza que deseja excluir estes valores?" IDS_NEWKEY "Nova chave #%d" IDS_NEWVALUE "Novo valor #%d" IDS_NOTFOUND "Chave de busca '%s' não encontrada" @@ -458,6 +476,18 @@ BEGIN IDS_NOTFOUND "Chave de pesquisa '%s' não encontrada" END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FILEDIALOG_IMPORT_TITLE "Importar Arquivo de Registro" + IDS_FILEDIALOG_EXPORT_TITLE "Exportar Arquivo de Registro" + IDS_FILEDIALOG_FILTER "Arquivos de Registro\0*.reg\0Arquivos de Registro Win9x/NT4 (REGEDIT4)\0*.reg\0Todos os Arquivos (*.*)\0*.*\0\0" +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + STRINGTABLE DISCARDABLE BEGIN IDS_FILEDIALOG_IMPORT_TITLE "Importar Ficheiro de Registo" @@ -465,6 +495,8 @@ BEGIN IDS_FILEDIALOG_FILTER "Ficheiros de Registo\0*.reg\0Ficheiros de Registo Win9x/NT4 (REGEDIT4)\0*.reg\0Todos os Ficheiros (*.*)\0*.*\0\0" END +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + STRINGTABLE DISCARDABLE BEGIN IDS_REGISTRY_ROOT_NAME "Meu Computador"

1 0

Gustavo Henrique Milaré : mshtml: Fix Portuguese (Brazilian) translation.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: b48f8b53a35ca2d82cb9131837fb0029b8347f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48f8b53a35ca2d82cb913183… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 30 23:03:40 2010 -0300 mshtml: Fix Portuguese (Brazilian) translation. --- dlls/mshtml/Pt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index be98a59..e6b6588 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -50,7 +50,7 @@ CAPTION "Instalador Wine Gecko" FONT 8, "MS Shell Dlg" { LTEXT "O Wine não pôde encontrar o pacote Gecko que é necessário para aplicações com HTML embutido" \ - "funcionarem corretamente. O Wine pode automaticamente efetuar o download instalá-lo para você.\n\n" \ + "funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalá-lo para você.\n\n" \ "Nota: é recomendável usar os pacotes da sua distribuição ao invés disso. \n\ Veja http://wiki.winehq.org/Gecko para mais detalhes.", ID_DWL_STATUS, 10, 10, 240, 60, SS_LEFT

1 0

Gustavo Henrique Milaré : xcopy: Update Portuguese (Brazilian) translation.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: d58782fce1bf705e3460f1d4302a6b96754be1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58782fce1bf705e3460f1d43… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 30 20:55:44 2010 -0300 xcopy: Update Portuguese (Brazilian) translation. --- programs/xcopy/Pt.rc | 111 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 86 insertions(+), 25 deletions(-) diff --git a/programs/xcopy/Pt.rc b/programs/xcopy/Pt.rc index d8254d5..f8f70c3 100644 --- a/programs/xcopy/Pt.rc +++ b/programs/xcopy/Pt.rc @@ -3,6 +3,7 @@ * Portuguese language support * * Copyright (C) 2008 Ricardo Filipe + * Copyright 2010 Gustavo Henrique Milaré * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,21 +22,81 @@ #include "xcopy.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + STRING_INVPARMS, "Número de parâmetros inválido - Use xcopy /? para ajuda\n" + STRING_INVPARM, "Parâmetro inválido '%s' - Use xcopy /? para ajuda\n" + STRING_PAUSE, "Pressione <Enter> para iniciar a cópia\n" + STRING_SIMCOPY, "%d arquivo(s) seriam copiado(s)\n" + STRING_COPY, "%d arquivo(s) copiado(s)\n" + STRING_QISDIR, "'%s' é um arquivo ou diretório\n" \ + "no alvo?\n" \ + "(A - Arquivo, D - Directório)\n" + STRING_SRCPROMPT,"%s? (Sim|Não)\n" + STRING_OVERWRITE,"Reescrever %s? (Sim|Não|Tudo)\n" + STRING_COPYFAIL, "Falha ao copiar '%s' para '%s' com r/c %d\n" + STRING_OPENFAIL, "Falha ao abrir '%s'\n" + STRING_READFAIL, "Falha a ler '%s'\n" + STRING_YES_CHAR, "S" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"A" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Copia arquivos ou diretórios para um destino\n\ +\n\ +Sintaxe:\n\ +XCOPY fonte [destino] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Onde:\n\ +\n\ +[/I] Assume diretório se o destino não existe e está copiando 2 ou\n\ +\tmais arquivos\n\ +[/S] Copiar diretórios e subdiretórios\n\ +[/E] Copiar diretórios e subdiretórios, incluindo os vazios\n\ +[/Q] Não mostrar nomes durante a cópia, ie modo silencioso.\n\ +[/F] Mostrar por completo os nomes de fonte e destino durante a cópia\n\ +[/L] Simular a operação, mostrando os nomes que seriam copiados\n\ +[/W] Alerta antes de iniciar a operação de cópia\n\ +[/T] Cria a estrutura de diretórios mas não copia arquivos\n\ +[/Y] Omitir alertas ao sobrescrever arquivos\n\ +[/-Y] Alertar ao sobrescrever arquivos\n\ +[/P] Alertar antes de cada arquivo ser copiado\n\ +[/N] Copiar usando nomes pequenos\n\ +[/U] Copiar apenas arquivos que já existem no destino\n\ +[/R] Reescrever quaisquer arquivos de somente leitura\n\ +[/H] Incluir arquivos ocultos e de sistema na cópia\n\ +[/C] Continuar mesmo que ocorra um erro durante a cópia\n\ +[/A] Copiar apenas arquivos com atributo de arquivo\n\ +[/M] Copiar apenas arquivos com atributo de arquivo, removendo\n\ +\to atributo de arquivo\n\ +[/D | /D:m-d-y] Copiar novos arquivos ou os alterados após a data fornecida\n\ +\t\tSe nenhuma data for fornecida, apenas copiar se o destino\n\ +\t\tfor mais antigo que a fonte\n\n" + +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE { - STRING_INVPARMS, "N�mero de par�metros inv�lido - Use xcopy /? para ajuda\n" - STRING_INVPARM, "Par�metro inv�lido '%s' - Use xcopy /? para ajuda\n" - STRING_PAUSE, "Carregue <Enter> para iniciar c�pia\n" - STRING_SIMCOPY, "%d ficheiro(s) seriam copiados\n" - STRING_COPY, "%d ficheiro(s) copiados\n" - STRING_QISDIR, "'%s' � um ficheiro ou direct�rio\n" \ + STRING_INVPARMS, "Número de parâmetros inválido - Use xcopy /? para ajuda\n" + STRING_INVPARM, "Parâmetro inválido '%s' - Use xcopy /? para ajuda\n" + STRING_PAUSE, "Carregue <Enter> para iniciar cópia\n" + STRING_SIMCOPY, "%d ficheiro(s) seriam copiado(s)\n" + STRING_COPY, "%d ficheiro(s) copiado(s)\n" + STRING_QISDIR, "'%s' é um ficheiro ou directório\n" \ "no alvo?\n" \ - "(F - Ficheiro, D - Direct�rio)\n" + "(F - Ficheiro, D - Directório)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"Reescrever %s? (Yes|No|All)\n" - STRING_COPYFAIL, "C�pia de '%s' para '%s' falhou com r/c %d\n" + STRING_COPYFAIL, "Cópia de '%s' para '%s' falhou com r/c %d\n" STRING_OPENFAIL, "Falhou ao abrir '%s'\n" STRING_READFAIL, "Falhou a ler '%s'\n" STRING_YES_CHAR, "Y" @@ -45,7 +106,7 @@ STRINGTABLE STRING_DIR_CHAR, "D" STRING_HELP, -"XCOPY - Copia ficheiros ou direct�rios para um destino\n\ +"XCOPY - Copia ficheiros ou directórios para um destino\n\ \n\ Sintaxe:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ @@ -53,28 +114,28 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \n\ Onde:\n\ \n\ -[/I] Assume direct�rio se o destino n�o existe e est� a copiar 2 ou\n\ +[/I] Assume directório se o destino não existe e está a copiar 2 ou\n\ \tmais ficheiros\n\ -[/S] Copiar direct�rios e subdirect�rios\n\ -[/E] Copiar direct�rios e subdirect�rios, incluindo os vazios\n\ -[/Q] N�o mostrar nomes durante a c�pia, ie quiet.\n\ -[/F] Mostrar por completo os nomes de fonte e destino durante a c�pia\n\ -[/L] Simular a opera��o, mostrando os nomes que seriam copiados\n\ -[/W] Alerta antes de iniciar a opera��o de c�pia\n\ -[/T] Cria a estrutura de direct�rios mas n�o copia ficheiros\n\ +[/S] Copiar directórios e subdirectórios\n\ +[/E] Copiar directórios e subdirectórios, incluindo os vazios\n\ +[/Q] Não mostrar nomes durante a cópia, ie quiet.\n\ +[/F] Mostrar por completo os nomes de fonte e destino durante a cópia\n\ +[/L] Simular a operação, mostrando os nomes que seriam copiados\n\ +[/W] Alerta antes de iniciar a operação de cópia\n\ +[/T] Cria a estrutura de directórios mas não copia ficheiros\n\ [/Y] Suprimir alertas quando reescreve ficheiros\n\ [/-Y] Alertar quando reescreve ficheiros\n\ -[/P] Alertar antes de cada ficheiros ser copiado\n\ +[/P] Alertar antes de cada ficheiro ser copiado\n\ [/N] Copiar usando nomes pequenos\n\ -[/U] Copiar apenas ficheiros que j� existem no destino\n\ +[/U] Copiar apenas ficheiros que já existem no destino\n\ [/R] Reescrever quaisquer ficheiros apenas de leitura\n\ -[/H] Incluir ficheiros ocultos e de sistema na c�pia\n\ -[/C] Continuar mesmo que ocorra um erro durante a c�pia\n\ +[/H] Incluir ficheiros ocultos e de sistema na cópia\n\ +[/C] Continuar mesmo que ocorra um erro durante a cópia\n\ [/A] Copiar apenas ficheiros com atributo de arquivo\n\ [/M] Copiar apenas ficheiros com atributo de arquivo, removendo\n\ \to atributo de arquivo\n\ -[/D | /D:m-d-y] Copiar novos ficheiros ou os alterados ap�s a data fornecida\n\ -\t\tSe nenhuma data for fornecida, apenas copiar se o destino for mais antigo\n\ -\t\tque a fonte\n\n" +[/D | /D:m-d-y] Copiar novos ficheiros ou os alterados após a data fornecida\n\ +\t\tSe nenhuma data for fornecida, apenas copiar se o destino\n\ +\t\tfor mais antigo que a fonte\n\n" }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2010