wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Gustavo Henrique Milaré : notepad: Fix Portuguese translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

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

Gustavo Henrique Milaré : appwiz.cpl: Update Portuguese translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 7b7672056f28a3eb25f5a941d6f173f06282b19c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7672056f28a3eb25f5a941d… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 23 10:43:15 2010 -0300 appwiz.cpl: Update Portuguese translation. --- dlls/appwiz.cpl/Pt.rc | 75 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/Pt.rc b/dlls/appwiz.cpl/Pt.rc index cf013cf..87d50a4 100644 --- a/dlls/appwiz.cpl/Pt.rc +++ b/dlls/appwiz.cpl/Pt.rc @@ -2,6 +2,7 @@ * Add/Remove Programs Portuguese resources * * Copyright 2001-2002, 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 @@ -23,6 +24,26 @@ #pragma code_page(65001) +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_CPL_TITLE, "Adicionar/Remover Programas" + IDS_CPL_DESC, "Permite a instalação de novo software, ou a remoção de software existente no seu computador." + IDS_TAB1_TITLE, "Aplicativos" + + IDS_UNINSTALL_FAILED, "Não foi possível executar o desinstalador, '%s'. Deseja remover do registo a entrada de desinstalação para este programa?" + IDS_NOT_SPECIFIED, "Não especificado" + + IDS_COLUMN_NAME, "Nome" + IDS_COLUMN_PUBLISHER, "Editor" + IDS_COLUMN_VERSION, "Versão" + IDS_INSTALL_FILTER, "Programas de Instalação\0*instal*.exe;*setup*.exe;*.msi\0Programas (*.exe)\0*.exe\0Todos os arquivos (*.*)\0*.*\0\0" + + IDS_REMOVE, "&Remover..." + IDS_MODIFY_REMOVE, "&Modificar/Remover..." +} + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE @@ -43,6 +64,28 @@ STRINGTABLE IDS_MODIFY_REMOVE, "&Modificar/Remover..." } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalar/Desinstalar" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Para instalar um programa novo a partir de uma disquete, CD-ROM ou do seu disco rígido, clique em Instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Instalar...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "O software seguinte pode ser automaticamente removido. Para remover um programa ou modificar os seus componentes instalados selecione-o na lista e clique em Adicionar/Remover.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Informação de Suporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 198, 94, 14 + CONTROL "&Modificar...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Remover...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalar/Desinstalar" @@ -54,12 +97,42 @@ FONT 8, "MS Shell Dlg" CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 CONTROL "O software seguinte pode ser automaticamente removido. Para remover um programa ou modificar os seus componentes instalados seleccione-o da lista e clique em Adicionar/Remover.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "&Informação de Suporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Informação de Suporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 198, 94, 14 CONTROL "&Modificar...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "&Remover...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Informação de Suporte" +FONT 8, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "A informação seguinte pode ser usada para obter suporte técnico para %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Editor:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versão:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contato:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Informação de Suporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Telefone de Suporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Leia-me:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Atualizações de Produto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Comentários:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Informação de Suporte"

1 0

Jörg Höhle : mmsystem: Handle WAVE_FORMAT_QUERY case.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 64742c99fc7b2e250f6c97106ed23344ca308508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64742c99fc7b2e250f6c97106… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jun 23 06:57:57 2010 +0200 mmsystem: Handle WAVE_FORMAT_QUERY case. --- dlls/mmsystem.dll16/mmsystem.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index e9f2b3a..1109ef4 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -1257,11 +1257,10 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID, ret = waveOutOpen(&hWaveOut, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID, lpFormat, (DWORD)thunk, dwInstance, dwFlags); - if (ret == MMSYSERR_NOERROR) - { - if (lphWaveOut != NULL) *lphWaveOut = HWAVEOUT_16(hWaveOut); - MMSYSTDRV_SetHandle(thunk, (void*)hWaveOut); - } + if (lphWaveOut != NULL && ret == MMSYSERR_NOERROR) + *lphWaveOut = HWAVEOUT_16(hWaveOut); + if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) + MMSYSTDRV_SetHandle(thunk, (void*)hWaveOut); else MMSYSTDRV_DeleteThunk(thunk); return ret; } @@ -1550,11 +1549,10 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID, ret = waveInOpen(&hWaveIn, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID, lpFormat, (DWORD)thunk, dwInstance, dwFlags); - if (ret == MMSYSERR_NOERROR) - { - if (lphWaveIn != NULL) *lphWaveIn = HWAVEIN_16(hWaveIn); - MMSYSTDRV_SetHandle(thunk, (void*)hWaveIn); - } + if (lphWaveIn != NULL && ret == MMSYSERR_NOERROR) + *lphWaveIn = HWAVEIN_16(hWaveIn); + if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) + MMSYSTDRV_SetHandle(thunk, (void*)hWaveIn); else MMSYSTDRV_DeleteThunk(thunk); return ret; }

1 0

Jörg Höhle : winealsa: Only linear PCM is supported.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 3d94ea821500da21c711446ddc906dd8a284edc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d94ea821500da21c711446dd… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jun 22 06:51:18 2010 +0200 winealsa: Only linear PCM is supported. --- dlls/winealsa.drv/alsa.c | 15 --------------- dlls/winealsa.drv/waveout.c | 12 ------------ 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 5ebb8b7..b242cfa 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -358,10 +358,6 @@ void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) iLength = sizeof(WAVEFORMATPCMEX); else iLength = sizeof(WAVEFORMATEX) + wf1->cbSize; - if (iLength > sizeof(WAVEFORMATPCMEX)) { - ERR("calculated %u bytes, capping\n", iLength); - iLength = sizeof(WAVEFORMATPCMEX); - } memcpy(wf2, wf1, iLength); } @@ -395,17 +391,6 @@ BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf) } else WARN("only KSDATAFORMAT_SUBTYPE_PCM and KSDATAFORMAT_SUBTYPE_IEEE_FLOAT " "supported\n"); - } else if (wf->wFormatTag == WAVE_FORMAT_MULAW || wf->wFormatTag == WAVE_FORMAT_ALAW) { - if (wf->wBitsPerSample==8) - return TRUE; - else - ERR("WAVE_FORMAT_MULAW and WAVE_FORMAT_ALAW wBitsPerSample must = 8\n"); - - } else if (wf->wFormatTag == WAVE_FORMAT_ADPCM) { - if (wf->wBitsPerSample==4) - return TRUE; - else - ERR("WAVE_FORMAT_ADPCM wBitsPerSample must = 4\n"); } else WARN("only WAVE_FORMAT_PCM and WAVE_FORMAT_EXTENSIBLE supported\n"); diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 18693c1..6ab1515 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -716,18 +716,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } else if ((wwo->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) && IsEqualGUID(&wwo->format.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)){ format = (wwo->format.Format.wBitsPerSample == 32) ? SND_PCM_FORMAT_FLOAT_LE : -1; - } else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_MULAW) { - FIXME("unimplemented format: WAVE_FORMAT_MULAW\n"); - retcode = WAVERR_BADFORMAT; - goto errexit; - } else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_ALAW) { - FIXME("unimplemented format: WAVE_FORMAT_ALAW\n"); - retcode = WAVERR_BADFORMAT; - goto errexit; - } else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_ADPCM) { - FIXME("unimplemented format: WAVE_FORMAT_ADPCM\n"); - retcode = WAVERR_BADFORMAT; - goto errexit; } else { ERR("invalid format: %0x04x\n", wwo->format.Format.wFormatTag); retcode = WAVERR_BADFORMAT;

1 0

André Hentschel : winetest: Implement aborting.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: bee78503449c4175e4e2731dc70cecbfd3d6ea15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee78503449c4175e4e2731dc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 19:36:08 2010 +0200 winetest: Implement aborting. --- programs/winetest/gui.c | 3 ++- programs/winetest/main.c | 11 +++++++++++ programs/winetest/winetest.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index 45b3232..a9f3465 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -456,7 +456,8 @@ DlgProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) MAKEINTRESOURCE (IDD_ABOUT), hwnd, AboutProc); return TRUE; case IDABORT: - report (R_WARNING, "Not implemented"); + report (R_STATUS, "Aborting, please wait..."); + aborting = TRUE; return TRUE; } } diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 01217d2..f5bf8d4 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -49,6 +49,7 @@ struct wine_test char *tag = NULL; char *email = NULL; +BOOL aborting = FALSE; static struct wine_test *wine_tests; static int nr_of_files, nr_of_tests; static int nr_native_dlls; @@ -677,6 +678,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, HMODULE dll; DWORD err; + if (aborting) return TRUE; if (test_filtered_out( lpszName, NULL )) return TRUE; /* Check if the main dll is present on this system */ @@ -840,6 +842,8 @@ run_tests (char *logname, char *outdir) FreeLibrary(hmscoree); + if (aborting) return logname; + xprintf ("Test output:\n" ); report (R_DELTA, 0, "Extracting: Done"); @@ -853,12 +857,15 @@ run_tests (char *logname, char *outdir) struct wine_test *test = wine_tests + i; int j; + if (aborting) break; + if (test->maindllpath) { /* We need to add the path (to the main dll) to PATH */ append_path(test->maindllpath); } for (j = 0; j < test->subtest_count; j++) { + if (aborting) break; report (R_STEP, "Running: %s:%s", test->name, test->subtests[j]); run_test (test, test->subtests[j], logfile, tempdir); @@ -1105,6 +1112,10 @@ int main( int argc, char *argv[] ) if (!logname) { logname = run_tests (NULL, outdir); + if (aborting) { + DeleteFileA(logname); + exit (0); + } if (build_id[0] && !nb_filters && !nr_native_dlls && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) if (!send_file (logname) && !DeleteFileA(logname)) diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index a0d2fbd..2b9046c 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -69,6 +69,7 @@ enum report_type { #define MAXTAGLEN 20 extern char *tag; extern char *email; +extern BOOL aborting; int guiAskTag (void); int guiAskEmail (void); int report (enum report_type t, ...);

1 0

Misha Koshelev : include: Include d3dx9shape.h in d3dx9.h.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 6882287b97cf9401e5a5eee032bb4bf26e904ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6882287b97cf9401e5a5eee03… Author: Misha Koshelev <misha680(a)gmail.com> Date: Tue Jun 22 22:56:23 2010 -0500 include: Include d3dx9shape.h in d3dx9.h. --- include/d3dx9.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/d3dx9.h b/include/d3dx9.h index ccf731e..09ae553 100644 --- a/include/d3dx9.h +++ b/include/d3dx9.h @@ -33,6 +33,7 @@ #include "d3dx9mesh.h" #include "d3dx9shader.h" #include "d3dx9effect.h" +#include "d3dx9shape.h" #include "d3dx9tex.h" #define _FACDD 0x876

1 0

Gustavo Henrique Milaré : browseui: Update Portuguese (Brazilian) translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: a7297802b830ebad34339d690d052e143a6e4f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7297802b830ebad34339d690… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 23 10:18:10 2010 -0300 browseui: Update Portuguese (Brazilian) translation. --- dlls/browseui/rsrc_Pt.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/rsrc_Pt.rc b/dlls/browseui/rsrc_Pt.rc index fe07405..5320424 100644 --- a/dlls/browseui/rsrc_Pt.rc +++ b/dlls/browseui/rsrc_Pt.rc @@ -1,5 +1,6 @@ /* * Copyright 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 @@ -18,13 +19,23 @@ #include "resids.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_CANCELLING "Cancelando..." +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE { IDS_CANCELLING "A cancelar..." } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU CAPTION ""

1 0

Gustavo Henrique Milaré : wordpad: Update Portuguese translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 3fbe5d1e044e95c4fa6b793170c430f0b02e47f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbe5d1e044e95c4fa6b79317… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Jun 23 10:08:27 2010 -0300 wordpad: Update Portuguese translation. --- programs/wordpad/Pt.rc | 164 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 149 insertions(+), 15 deletions(-) diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index 3f14049..b7f9c52 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -2,6 +2,7 @@ * Portuguese Language File * * Copyright 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 @@ -22,6 +23,81 @@ #pragma code_page(65001) +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Arquivo" + BEGIN + MENUITEM "&Novo...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Abrir...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Salvar\tCtrl+S", ID_FILE_SAVE + MENUITEM "Salvar &como...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Imprimir...\tCtrl+P", ID_PRINT + MENUITEM "&Pré visualizar...", ID_PREVIEW + MENUITEM "C&onfigurar página...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Sair", ID_FILE_EXIT + END + POPUP "&Editar" + BEGIN + MENUITEM "&Desfazer\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Refazer\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "Cor&tar\tCtrl+X", ID_EDIT_CUT + MENUITEM "C&opiar\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Colar\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Limpar\tDEL", ID_EDIT_CLEAR + MENUITEM "&Selecionar tudo\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "Locali&zar...\tCtrl+F", ID_FIND + MENUITEM "&Localizar próxima\tF3", ID_FIND_NEXT + MENUITEM "Substitui&r...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "Some&nte leitura", ID_EDIT_READONLY + MENUITEM "&Modificado", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "E&xtras" + BEGIN + MENUITEM "&Informação da selecção", ID_EDIT_SELECTIONINFO + MENUITEM "&Formato dos caracteres", ID_EDIT_CHARFORMAT + MENUITEM "&Definir formato dos caracteres", ID_EDIT_DEFCHARFORMAT + MENUITEM "F&ormato dos parágrafos", ID_EDIT_PARAFORMAT + MENUITEM "&Buscar texto", ID_EDIT_GETTEXT + END + END + POPUP "E&xibir" + BEGIN + MENUITEM "&Barra de Ferramentas", ID_TOGGLE_TOOLBAR + MENUITEM "Barra de &Formatação", ID_TOGGLE_FORMATBAR + MENUITEM "&Régua", ID_TOGGLE_RULER + MENUITEM "Barra de &Estado", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Opções...", ID_VIEWPROPERTIES + END + POPUP "&Inserir" + BEGIN + MENUITEM "&Data e hora...", ID_DATETIME + END + POPUP "F&ormatar" + BEGIN + MENUITEM "&Fonte...", ID_FONTSETTINGS + MENUITEM "&Marcadores" ID_BULLET + MENUITEM "&Parágrafo..." ID_PARAFORMAT + MENUITEM "T&abulação..." ID_TABSTOPS + POPUP "&Fundo" + BEGIN + MENUITEM "&Sistema\tCtrl+1", ID_BACK_1 + MENUITEM "&PostThat amarelo\tCtrl+2", ID_BACK_2 + END + END + POPUP "&Ajuda" + BEGIN + MENUITEM "&Sobre Wine Wordpad" ID_ABOUT + END +END + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDM_MAINMENU MENU DISCARDABLE @@ -97,6 +173,24 @@ BEGIN END END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Cortar", ID_EDIT_CUT + MENUITEM "C&opiar", ID_EDIT_COPY + MENUITEM "Co&lar", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Marcadores" ID_BULLET + MENUITEM "&Parágrafo..." ID_PARAFORMAT + END +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + IDM_POPUP MENU DISCARDABLE BEGIN POPUP "" @@ -110,6 +204,9 @@ BEGIN END END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + IDM_COLOR_POPUP MENU DISCARDABLE BEGIN POPUP "" @@ -130,7 +227,7 @@ BEGIN MENUITEM "Fúcsia" ID_COLOR_FUCHSIA MENUITEM "Azul-piscina" ID_COLOR_AQUA MENUITEM "Branco" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Automático" ID_COLOR_AUTOMATIC END END @@ -156,22 +253,22 @@ BEGIN PUSHBUTTON "&Cancelar",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 220, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Parágrafo" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Identação", -1, 10, 10, 120, 68 - LTEXT "Esquerda", -1, 15, 22, 40, 13 - EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Direita", -1, 15, 40, 40, 13 - EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Primeira Linha", -1, 15, 58, 40, 13 - EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alinhamento", -1, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancelar", IDCANCEL, 137, 33, 50, 15 + GROUPBOX "Identação", -1, 10, 10, 140, 68 + LTEXT "Esquerda", -1, 15, 22, 60, 13 + EDITTEXT IDC_PARA_LEFT, 75, 20, 60, 13 + LTEXT "Direita", -1, 15, 40, 60, 13 + EDITTEXT IDC_PARA_RIGHT, 75, 38, 60, 13 + LTEXT "Primeira Linha", -1, 15, 58, 60, 13 + EDITTEXT IDC_PARA_FIRST, 75, 56, 60, 13 + LTEXT "Alinhamento", -1, 15, 87, 50, 13 + COMBOBOX IDC_PARA_ALIGN, 65, 85, 70, 60, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 157, 15, 50, 15 + PUSHBUTTON "&Cancelar", IDCANCEL, 157, 33, 50, 15 END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 @@ -207,7 +304,7 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" + STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)" STRING_ALL_FILES, "Todos os documentos (*.*)" @@ -222,16 +319,29 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_NEWFILE_RICHTEXT, "Rich text document" + STRING_NEWFILE_RICHTEXT, "Documento rich text" STRING_NEWFILE_TXT, "Documento de texto" STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Arquivos de impressora (*.PRN)" +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + STRINGTABLE DISCARDABLE BEGIN STRING_PRINTER_FILES_PRN, "Ficheiros de impressora (*.PRN)" END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + STRINGTABLE DISCARDABLE BEGIN STRING_VIEWPROPS_TITLE, "Opções" @@ -257,6 +367,30 @@ BEGIN STRING_UNITS_PT, "pt" END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "Documento" + STRING_PROMPT_SAVE_CHANGES, "Salvar as alterações de '%s'?" + STRING_SEARCH_FINISHED, "Acabou a pesquisa do documento." + STRING_LOAD_RICHED_FAILED, "Falha ao carregar a biblioteca RichEdit." + STRING_SAVE_LOSEFORMATTING, "Foi escolhido salvar em formato de texto simples, " \ + "o que vai anular todas as formatações. " \ + "Tem a certeza que deseja fazer isto?" + STRING_INVALID_NUMBER, "Formato de número inválido" + STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE não são suportados" + STRING_WRITE_FAILED, "Não foi possível salvar o arquivo." + STRING_WRITE_ACCESS_DENIED, "Não tem permissões para salvar o arquivo." + STRING_OPEN_FAILED, "Não foi possível abrir o arquivo." + STRING_OPEN_ACCESS_DENIED, "Não tem permissões para abrir o arquivo." + STRING_PRINTING_NOT_IMPLEMENTED, "Impressão não implementada" + STRING_MAX_TAB_STOPS, "Não é possível adicionar mais de 32 tabulações." +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Documento"

1 0

Alessandro Pignotti : winedevice: Use 64-bit wide delta when relocating.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 58f36e863e9d4efe08b620557d2ea93109380cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f36e863e9d4efe08b620557… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Wed Jun 23 13:51:46 2010 +0200 winedevice: Use 64-bit wide delta when relocating. --- programs/winedevice/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index e0cd07b..2ce8c15 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -67,7 +67,8 @@ static HMODULE load_driver_module( const WCHAR *name ) IMAGE_NT_HEADERS *nt; const IMAGE_IMPORT_DESCRIPTOR *imports; size_t page_size = getpagesize(); - int i, delta; + int i; + INT_PTR delta; ULONG size; HMODULE module = LoadLibraryW( name );

1 0

Jose Rostagno : regedit: Fix Spanish translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: f3a1e2cf00b4a8544a196525607eec458a3793bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a1e2cf00b4a8544a1965256… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 22 22:21:10 2010 -0300 regedit: Fix Spanish translation. --- programs/regedit/Es.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/Es.rc b/programs/regedit/Es.rc index c6d3f95..3799d37 100644 --- a/programs/regedit/Es.rc +++ b/programs/regedit/Es.rc @@ -298,7 +298,7 @@ BEGIN IDS_TOO_BIG_VALUE "El valor es demasiado grande (%u)" IDS_DELETE_BOX_TITLE "Confirmar eliminaci�n de valor" IDS_DELETE_BOX_TEXT "�Seguro que desea eliminar el valor '%s'?" - IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" + IDS_DELETE_BOX_TEXT_MULTIPLE "�Est� seguro que desea eliminar estos valores?" IDS_NEWKEY "Nueva clave #%d" IDS_NEWVALUE "Nuevo valor #%d" IDS_NOTFOUND "Cadena de b�squeda '%s' no encontrada" @@ -307,7 +307,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_FILEDIALOG_IMPORT_TITLE "Importar archivo de registro" - IDS_FILEDIALOG_EXPORT_TITLE "Exportar arvhivo de registro" + IDS_FILEDIALOG_EXPORT_TITLE "Exportar archivo de registro" IDS_FILEDIALOG_FILTER "Archivos de registro\0*.reg\0Archivos de registro de Win9x/NT4 (REGEDIT4)\0*.reg\0Todos los archivos (*.*)\0*.*\0\0" END

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
67
Older →

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 June 2010