June 2010 - Wine-Commits - list.winehq.org

Akihiro Sagawa : shdoclc: Fix Japanese translation.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 13f82064807670219f245ca516e61ea21af0ad0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f82064807670219f245ca51… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jun 23 23:19:55 2010 +0900 shdoclc: Fix Japanese translation. --- dlls/shdoclc/Ja.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdoclc/Ja.rc b/dlls/shdoclc/Ja.rc index 92410d9..f423977 100644 --- a/dlls/shdoclc/Ja.rc +++ b/dlls/shdoclc/Ja.rc @@ -194,8 +194,8 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "お気に入りに追加(&F)...", IDM_ADDFAVORITES MENUITEM SEPARATOR - MENUITEM "再生", IDM_DYNSRCPLAY - MENUITEM "停止", IDM_DYNSRCSTOP + MENUITEM "再生", IDM_IMGARTPLAY + MENUITEM "停止", IDM_IMGARTSTOP MENUITEM "巻き戻し", IDM_IMGARTREWIND MENUITEM SEPARATOR MENUITEM SEPARATOR

1 0

Dylan Smith : wordpad: Remove untranslated resources from the Chinese translation.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 63b04e4abfcc441edd7dc31e01f6b10c5621f049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b04e4abfcc441edd7dc31e0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 23 19:19:50 2010 -0400 wordpad: Remove untranslated resources from the Chinese translation. --- programs/wordpad/Zh.rc | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 135f00c..bae40a7 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -111,30 +111,6 @@ BEGIN END END -IDM_COLOR_POPUP MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Black", ID_COLOR_BLACK - MENUITEM "Maroon", ID_COLOR_MAROON - MENUITEM "Green", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Purple" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gray" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "Red" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Yellow" ID_COLOR_YELLOW - MENUITEM "Blue" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "White" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC - END -END - IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "日期和时间"

1 0

Michael Stefaniuc : oledlg: Add the Romanian translation.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 756df72a04e45d392adb75ae157727e4cf645844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756df72a04e45d392adb75ae1… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Thu Jun 24 00:01:00 2010 +0200 oledlg: Add the Romanian translation. Translation by Claudia Cotună, reviewed by Alexandru Băluț. --- dlls/oledlg/Makefile.in | 1 + dlls/oledlg/oledlg_Ro.rc | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 6f9a3bf..70648f3 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ oledlg_No.rc \ oledlg_Pl.rc \ oledlg_Pt.rc \ + oledlg_Ro.rc \ oledlg_Ru.rc \ oledlg_Si.rc \ oledlg_Sv.rc \ diff --git a/dlls/oledlg/oledlg_Ro.rc b/dlls/oledlg/oledlg_Ro.rc new file mode 100644 index 0000000..8ffa714 --- /dev/null +++ b/dlls/oledlg/oledlg_Ro.rc @@ -0,0 +1,101 @@ +/* + * Copyright 2003 Ulrich Czekalla for CodeWeavers + * Copyright 2010 Claudia Cotună + * Michael Stefaniuc + * + * 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 "resource.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 314, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Inserare obiect" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Tipul obiectului:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Renunță",IDCANCEL,221,24,66,14 + GROUPBOX "Rezultat",IDC_RESULT,7,103,208,41 + CONTROL "Creează nou",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,67,10 + CONTROL "Creează un control",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,74,10 + CONTROL "Creează din fișier",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Adăugă un control...",IDC_ADDCONTROL,82,88,72,14,NOT WS_VISIBLE + CONTROL "Afișează ca pictogramă",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,86,10 + PUSHBUTTON "Navigare...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Fișier:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Inserați un nou obiect %s în document" + IDS_RESULTFILEOBJDESC "Inserați conținutul fișierului ca pe un obiect în document, astfel încât să îl puteți activa utilizând programul care l-a creat." + IDS_BROWSE "Navigare" + IDS_NOTOLEMOD "Fișierul nu pare a fi un modul OLE valid. Nu se poate înregistra controlul OLE." + IDS_NOTOLEMODCAPTION "Adaugă un control" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 324, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Inserare specială" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sursă:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "I&nserează", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Inserează &legătura", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 74, 10 + LTEXT "C&a:", -1, 81, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 81, 36, 148, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 81, 36, 148, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 81, 36, 148, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 235, 6, 86, 14 + CONTROL "Renunță", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 235, 23, 86, 14 + CONTROL "A&jutor", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 235, 42, 86, 14 + CONTROL "A&fișează ca pictogramă", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 235, 59, 86, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 235, 75, 66, 44 + CONTROL "Schimbare p&ictogramă...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 235, 123, 82, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< textul rezultat apare aici >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 65, 100, 159, 35 + CONTROL "Rezultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 223, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Inserează conținutul din clipboard în document ca %s." + IDS_PS_PASTE_OBJECT "Inserează conținutul din clipboard în document astfel încât să îl puteți activa utilizând %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Inserează conținutul din clipboard în document astfel încât să îl puteți activa utilizând %s. Va fi afișat ca o pictogramă." + IDS_PS_PASTE_LINK_DATA "Inserează conținutul din clipboard în document ca %s. Datele sunt legate de fișierul sursă, astfel încât modificările aduse fișierului vor fi reflectate în document." + IDS_PS_PASTE_LINK_OBJECT "Inserează o imagine a conținutului din clipboard în document. Imaginea este legată de fișierul sursă, astfel încât modificările aduse fișierului vor fi reflectate în document." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Inserează o scurtătură care conduce la locația conținutului din clipboard. Scurtătura este legată de fișierul sursă, astfel încât modificările aduse fișierului vor fi reflectate în document." + IDS_PS_NON_OLE "Inserează conținutul din clipboard în document." + IDS_PS_UNKNOWN_TYPE "Tip necunoscut" + IDS_PS_UNKNOWN_SRC "Sursă necunoscută" + IDS_PS_UNKNOWN_APP "programul care l-a creat" +}

1 0

Francois Gouget : wined3d: Remove spaces after '\n's.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 620087c545c9f8e62abffe3b8ae38c7591d3c6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620087c545c9f8e62abffe3b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 10:03:13 2010 +0200 wined3d: Remove spaces after '\n's. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9781a4b..89bc6ac 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1832,7 +1832,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context case WINED3DSTT_CUBE: if (shadow) { - FIXME("Unsupported Cube shadow function.\n "); + FIXME("Unsupported Cube shadow function.\n"); sample_function->name = "unsupportedCubeShadow"; sample_function->coord_mask = 0; } @@ -1865,7 +1865,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context case WINED3DSTT_VOLUME: if (shadow) { - FIXME("Unsupported 3D shadow function.\n "); + FIXME("Unsupported 3D shadow function.\n"); sample_function->name = "unsupported3DShadow"; sample_function->coord_mask = 0; }

1 0

Jose Rostagno : winhlp32: Fix Spanish translation.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: d36ef881c13b462ea9b9e54ab39fe12065540c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36ef881c13b462ea9b9e54ab… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Wed Jun 23 23:14:32 2010 -0300 winhlp32: Fix Spanish translation. --- programs/winhlp32/Es.rc | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/programs/winhlp32/Es.rc b/programs/winhlp32/Es.rc index e752950..745cac6 100644 --- a/programs/winhlp32/Es.rc +++ b/programs/winhlp32/Es.rc @@ -42,21 +42,21 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL POPUP "&Marcador" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Opciones" { + POPUP "Ayuda siempre visible" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Por defecto", MNID_OPTS_HELP_DEFAULT MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "No visible", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historial", MNID_OPTS_HISTORY + POPUP "Fuentes" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Peque�a", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Grande", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Usar colores del sistema", MNID_OPTS_SYSTEM_COLORS } POPUP "A&yuda" { MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON @@ -69,6 +69,22 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "�ndice" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Buscar" +{ + LTEXT "A�n no implementado", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL { @@ -79,11 +95,11 @@ STID_INFO, "Informaci STID_NOT_IMPLEMENTED, "A�n no implementado" STID_HLPFILE_ERROR_s, "Error al leer el archivo de ayuda `%s'" STID_INDEX, "&�ndice" -STID_CONTENTS, "Summary" +STID_CONTENTS, "Resumen" STID_BACK, "&Anterior" STID_ALL_FILES, "Todos los archivos (*.*)" STID_HELP_FILES_HLP, "Archivos de ayuda (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_FILE_NOT_FOUND_s "No se pudo encontrar '%s'. �Desea buscar este archivo usted mismo?" +STID_NO_RICHEDIT "No se pudo encontrar una implementaci�n de richedit... Abortando" +STID_PSH_INDEX, "Temas de ayuda: " }

1 0

Francois Gouget : mmdevapi/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 5fe33dcb530c7c411fbfe018929d6add08544076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe33dcb530c7c411fbfe0189… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 24 09:56:16 2010 +0200 mmdevapi/tests: Add a trailing '\n' to an ok() call. --- dlls/mmdevapi/tests/dependency.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c index 23c3614..62bc4e6 100644 --- a/dlls/mmdevapi/tests/dependency.c +++ b/dlls/mmdevapi/tests/dependency.c @@ -94,7 +94,7 @@ START_TEST(dependency) hr = IBaseFilter_GetClassID(bf, &clsid); ok(hr == S_OK, "GetClassId failed with 0x%08x\n", hr); if (hr == S_OK) - ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s", dump_guid(&clsid)); + ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s\n", dump_guid(&clsid)); } }

1 0

Nikolay Sivov : msxml3/tests: A test to show difference in XPath and XSLPattern for node position.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: 89a00ec3ac6e78bb2a5d55a421c71745741eddd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a00ec3ac6e78bb2a5d55a42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 24 00:33:37 2010 +0400 msxml3/tests: A test to show difference in XPath and XSLPattern for node position. --- dlls/msxml3/tests/domdoc.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d85e9fb..9c1440c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2969,6 +2969,8 @@ static void test_XPath(void) expect_list_and_release(list, ""); ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("//elem[4]"), &list)); expect_list_and_release(list, ""); + ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root//elem[0]"), &list)); + expect_list_and_release(list, ""); /* foo undeclared in document node */ ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); @@ -5524,6 +5526,38 @@ static void test_document_IObjectSafety(void) IXMLDOMDocument_Release(doc); } +static void test_XSLPattern(void) +{ + IXMLDOMDocument2 *doc; + IXMLDOMNodeList *list; + VARIANT_BOOL b; + HRESULT r; + LONG len; + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void**)&doc ); + ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r ); + if( r != S_OK ) + return; + + ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + /* switch to XPath */ + ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern"))); + + /* for XSLPattern start index is 0, for XPath it's 1 */ + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//elem[0]"), &list)); + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "E1.E2.D1"); + + IXMLDOMDocument2_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -5552,6 +5586,7 @@ START_TEST(domdoc) test_removeNamedItem(); test_IXMLDOMDocument2(); test_XPath(); + test_XSLPattern(); test_cloneNode(); test_xmlTypes(); test_nodeTypeTests();

1 0

Eric Pouech : mmsystem.drv: Always create a thunk for MMIO objects.
by Alexandre Julliard June 24, 2010

June 24, 2010

Module: wine Branch: master Commit: dfcaf61de87007eeaa9eba8476f26642824df8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfcaf61de87007eeaa9eba847… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Jun 23 22:11:51 2010 +0200 mmsystem.drv: Always create a thunk for MMIO objects. --- dlls/mmsystem.dll16/mmio16.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c index cc13583..ff55ce9 100644 --- a/dlls/mmsystem.dll16/mmio16.c +++ b/dlls/mmsystem.dll16/mmio16.c @@ -248,7 +248,7 @@ HMMIO16 WINAPI mmioOpen16(LPSTR szFileName, MMIOINFO16* lpmmioinfo16, memset(&mmioinfo, 0, sizeof(mmioinfo)); EnterCriticalSection(&mmio_cs); - if (lpmmioinfo16->pIOProc && !(thunk = MMIO_AddThunk(lpmmioinfo16->pIOProc, lpmmioinfo16->pchBuffer))) + if (!(thunk = MMIO_AddThunk(lpmmioinfo16->pIOProc, lpmmioinfo16->pchBuffer))) { LeaveCriticalSection(&mmio_cs); return 0; @@ -256,7 +256,7 @@ HMMIO16 WINAPI mmioOpen16(LPSTR szFileName, MMIOINFO16* lpmmioinfo16, mmioinfo.dwFlags = lpmmioinfo16->dwFlags; mmioinfo.fccIOProc = lpmmioinfo16->fccIOProc; - mmioinfo.pIOProc = (LPMMIOPROC)thunk; + mmioinfo.pIOProc = lpmmioinfo16->pIOProc ? (LPMMIOPROC)thunk : 0; mmioinfo.cchBuffer = lpmmioinfo16->cchBuffer; mmioinfo.pchBuffer = MapSL((DWORD)lpmmioinfo16->pchBuffer); mmioinfo.adwInfo[0] = lpmmioinfo16->adwInfo[0]; @@ -267,14 +267,19 @@ HMMIO16 WINAPI mmioOpen16(LPSTR szFileName, MMIOINFO16* lpmmioinfo16, mmioinfo.adwInfo[2] = lpmmioinfo16->adwInfo[2]; ret = mmioOpenA(szFileName, &mmioinfo, dwOpenFlags); - if (thunk) + if (!ret || (dwOpenFlags & (MMIO_PARSE|MMIO_EXIST))) { - if (!ret || (dwOpenFlags & (MMIO_PARSE|MMIO_EXIST))) - { - thunk->pfn16 = NULL; - thunk->hMmio = NULL; - } - else thunk->hMmio = ret; + thunk->pfn16 = NULL; + thunk->hMmio = NULL; + } + else thunk->hMmio = ret; + if (ret && (dwOpenFlags & MMIO_ALLOCBUF)) + { + MMIOINFO m; + if (lpmmioinfo16->pchBuffer) FIXME("ooch\n"); + /* FIXME: check whether mmioOpen should set pchBuffer */ + mmioGetInfo(ret, &m, 0); + thunk->segbuffer = MapLS(m.pchBuffer); } LeaveCriticalSection(&mmio_cs);

1 0

Gustavo Henrique Milaré : avifil32: Update Portuguese (Brazilian) translation.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 410f8e9128763b36e40a08a7379f1b70c5a8d7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=410f8e9128763b36e40a08a73… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 23 11:57:25 2010 -0300 avifil32: Update Portuguese (Brazilian) translation. --- dlls/avifil32/avifile_Pt.rc | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/avifil32/avifile_Pt.rc b/dlls/avifil32/avifile_Pt.rc index ce3d032..9ef3abf 100644 --- a/dlls/avifil32/avifile_Pt.rc +++ b/dlls/avifil32/avifile_Pt.rc @@ -1,6 +1,7 @@ /* * Copyright 2003 Marcelo Duarte - * Copyright 2006 Am�rico Jos� Melo + * Copyright 2006 Américo José Melo + * 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 @@ -19,20 +20,22 @@ #include "avifile_private.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Op��es de compress�o" +CAPTION "Opções de compressão" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Escolha a stream:",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Op��es...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interleave every",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + PUSHBUTTON "&Opções...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "&Entrelaçar todos",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "frames",-1,129,43,36,9 + LTEXT "quadros",-1,129,43,36,9 LTEXT "Formato atual:",-1,3,56,73,9 LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 @@ -43,14 +46,14 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Op��es de compress�o" +CAPTION "Opções de compressão" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Escolha a stream:",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Op��es...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interla�ar a todos os",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + PUSHBUTTON "&Opções...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "&Interlaçar a todos os",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL LTEXT "molduras",-1,129,43,36,9 LTEXT "Formato actual:",-1,3,56,73,9 @@ -66,13 +69,13 @@ STRINGTABLE DISCARDABLE { IDS_WAVESTREAMFORMAT "Formato wave: %s" IDS_WAVEFILETYPE "Formato wave" - IDS_ALLMULTIMEDIA "Todos arquivos multim�dia" + IDS_ALLMULTIMEDIA "Todos arquivos multimídia" IDS_ALLFILES "Todos os arquivos (*.*)(a)*.*" - IDS_VIDEO "v�deo" - IDS_AUDIO "�udio" + IDS_VIDEO "vídeo" + IDS_AUDIO "áudio" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Wine AVI-manipulador padr�o de arquivo" - IDS_UNCOMPRESSED "sem compress�o" + IDS_AVIFILETYPE "Manipulador de AVI padrão do Wine" + IDS_UNCOMPRESSED "sem compressão" } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -81,11 +84,11 @@ STRINGTABLE DISCARDABLE { IDS_WAVESTREAMFORMAT "Formato wave: %s" IDS_WAVEFILETYPE "Formato wave" - IDS_ALLMULTIMEDIA "Todos os ficheiros multim�dia" + IDS_ALLMULTIMEDIA "Todos os ficheiros multimédia" IDS_ALLFILES "Todos os ficheiros (*.*)(a)*.*" - IDS_VIDEO "v�deo" - IDS_AUDIO "�udio" + IDS_VIDEO "vídeo" + IDS_AUDIO "áudio" IDS_AVISTREAMFORMAT "%s %s #%d" IDS_AVIFILETYPE "Manipulador AVI Wine predefinido" - IDS_UNCOMPRESSED "sem compress�o" + IDS_UNCOMPRESSED "sem compressão" }

1 0

Gustavo Henrique Milaré : notepad: Fix Portuguese translation.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 7fe7bd550873a712985487cac2c22d7044d792ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe7bd550873a712985487cac… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 23 11:23:32 2010 -0300 notepad: Fix Portuguese translation. --- programs/notepad/Pt.rc | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index a9f244a..959ff51 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -6,6 +6,7 @@ * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2003 Marcelo Duarte * Copyright 2004 Américo José Melo + * 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 @@ -124,16 +125,16 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Configurar página" { -LTEXT "&Cabeçalho (mm):", 0x140, 10, 07, 40, 15 +LTEXT "&Cabeçalho:", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP LTEXT "&Rodapé:", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "&Margens:", 0x144, 10, 43,160, 45 -LTEXT "&Esquerda:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Superior:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +GROUPBOX "&Margens (milímetros):", 0x144, 10, 43,160, 45 +LTEXT "&Esquerda:", 0x145, 20, 55, 35, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_LEFTVALUE, 55, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Superior:", 0x148, 20, 73, 35, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_TOPVALUE, 55, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Direita:", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Inferior:", 0x14E,100, 73, 30, 10, WS_CHILD @@ -176,10 +177,10 @@ STRING_NOTEXT, "Você não digitou nenhum texto. \ STRING_DOESNOTEXIST, "Arquivo '%s'\nnão existe\n\n \ Você deseja criar um novo arquivo?" STRING_NOTSAVED, "Arquivo '%s'\nfoi modificado\n\n \ -Gostaria de salvar as alteraçÕes?" +Gostaria de salvar as alterações?" STRING_NOTFOUND, "'%s' não pode ser encontrado." STRING_OUT_OF_MEMORY, "Não há memória suficiente para completar essa \ -tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória livre." +tarefa.\nFeche um ou mais aplicativos para aumentar a quantidade de memória livre." } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -206,7 +207,7 @@ STRINGTABLE DISCARDABLE STRING_DOESNOTEXIST, "Ficheiro '%s'\nnão existe\n\n \ Deseja criar um novo ficheiro?" STRING_NOTSAVED, "Ficheiro '%s'\nfoi modificado\n\n \ -Gostaria de gravar as alteraçÕes?" +Gostaria de gravar as alterações?" STRING_NOTFOUND, "'%s' não pode ser encontrado." STRING_OUT_OF_MEMORY, "Não há memória suficiente para completar esta \ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória livre."

1 0