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

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

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

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

Michael Stefaniuc : hhctrl.ocx: Add the Romanian translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: fb5ef1c6c648ad443b3fdc4015f7cd5bd0cff548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5ef1c6c648ad443b3fdc401… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 23 01:14:28 2010 +0200 hhctrl.ocx: Add the Romanian translation. Translation by Claudia Cotună. --- dlls/hhctrl.ocx/Makefile.in | 1 + dlls/hhctrl.ocx/Ro.rc | 63 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 5561f42..1dd511b 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -34,6 +34,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc \ Sv.rc \ diff --git a/dlls/hhctrl.ocx/Ro.rc b/dlls/hhctrl.ocx/Ro.rc new file mode 100644 index 0000000..28f7569 --- /dev/null +++ b/dlls/hhctrl.ocx/Ro.rc @@ -0,0 +1,63 @@ +/* + * HTML Help resources + * + * Copyright 2005 James Hawkins + * 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) + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Cuprins" + IDS_INDEX "I&ndex" + IDS_SEARCH "C&aută" + IDS_FAVORITES "Favor&ite" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Afișează" + IDTB_CONTRACT "Ascunde" + IDTB_STOP "Oprește" + IDTB_REFRESH "Actualizează" + IDTB_BACK "Înapoi" + IDTB_HOME "Acasă" + IDTB_SYNC "Sincronizează" + IDTB_PRINT "Imprimă" + IDTB_OPTIONS "Opțiuni" + IDTB_FORWARD "Înainte" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Salt1" + IDTB_JUMP2 "Salt2" + IDTB_CUSTOMIZE "Personalizare" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END

1 0

Michael Stefaniuc : gphoto.ds: Add the Romanian translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 65cebf3ae23b89b67d3861231d317f2017fef068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65cebf3ae23b89b67d3861231… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 23 01:14:48 2010 +0200 gphoto.ds: Add the Romanian translation. Translation by Claudia Cotună. --- dlls/gphoto2.ds/Makefile.in | 1 + dlls/gphoto2.ds/gphoto2_Ro.rc | 57 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index 63d1b68..5cbde22 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ gphoto2_No.rc \ gphoto2_Pl.rc \ gphoto2_Pt.rc \ + gphoto2_Ro.rc \ gphoto2_Ru.rc \ gphoto2_Si.rc \ gphoto2_Sv.rc \ diff --git a/dlls/gphoto2.ds/gphoto2_Ro.rc b/dlls/gphoto2.ds/gphoto2_Ro.rc new file mode 100644 index 0000000..9cfe1b2 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Ro.rc @@ -0,0 +1,57 @@ +/* + * Copyright 2006 CodeWeavers, Aric Stewart + * 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) + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Fișiere în aparatul foto" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Lista1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Importă selecția",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Previzualizare",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Importă tot",IDC_IMPORTALL,80,252,64,14 + CONTROL "Omite acest dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "Ieșire",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Transferare" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Se transferă... Așteptați",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Conectare la cameră" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Se conectează la cameră... Așteptați",IDC_STATIC,128,58,116,8 +END

1 0

Luca Bennati : cmd: Update Italian translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 0e63d955d6fe7f4cf61cd1d0dd4865a25f14ddd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e63d955d6fe7f4cf61cd1d0d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Jun 22 23:38:53 2010 +0200 cmd: Update Italian translation. --- programs/cmd/It.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/It.rc b/programs/cmd/It.rc index ecccebe..c503cd1 100644 --- a/programs/cmd/It.rc +++ b/programs/cmd/It.rc @@ -113,8 +113,8 @@ MOVE fallisce se la nuova e la vecchia locazione sono su lettere di unità DOS d WCMD_PATH, "PATH mostra o cambia il percorso di ricerca di cmd.\n\ \n\ -Usando PATH, verrà mostrato la configurazione corrente di PATH (inizialmente questa è\n\ -il valore nel tuo file wine.conf). Per cambiarla, fai seguire al\n\ +Usando PATH, verrà mostrato l'impostazione corrente di PATH (il cui valore è preso\n\ +inizialmente dal registro). Per cambiarla, fai seguire al\n\ comando PATH il nuovo valore.\n\ \n\ È anche possibile modificare il PATH usando la variabile d'ambiente\n\

1 0

Aric Stewart : shlwapi: URL_FILE_USE_PATHURL flag only unescapes file urls in UrlCanonicalize.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: ea029bd2fb3754ea1c30e41e1a4c6cb770f4c9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea029bd2fb3754ea1c30e41e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 23 15:47:35 2010 +0900 shlwapi: URL_FILE_USE_PATHURL flag only unescapes file urls in UrlCanonicalize. --- dlls/shlwapi/tests/url.c | 4 +++- dlls/shlwapi/url.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index c828ea9..8a8f68a 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -160,7 +160,9 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"A", 0, S_OK, "A", FALSE}, {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", FALSE} /*LimeWire online installer calls this*/, {"http:www.winehq.org/dir/../index.html", 0, S_OK, "http:www.winehq.org/index.html"}, - {"http://localhost/test.html", URL_FILE_USE_PATHURL, S_OK, "http://localhost/test.html"} + {"http://localhost/test.html", URL_FILE_USE_PATHURL, S_OK, "http://localhost/test.html"}, + {"http://localhost/te%20st.html", URL_FILE_USE_PATHURL, S_OK, "http://localhost/te%20st.html"}, + {"http://www.winehq.org/%E6%A1%9C.html", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/%E6%A1%9C.html"} }; /* ################ */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index ad7d989..d7a36db 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -486,7 +486,9 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, while ((nLen > 0) && ((lpszUrlCpy[nLen-1] <= ' '))) lpszUrlCpy[--nLen]=0; - if(dwFlags & (URL_UNESCAPE | URL_FILE_USE_PATHURL)) + if((dwFlags & URL_UNESCAPE) || + ((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) + && !memcmp(wszFile, pszUrl, sizeof(wszFile)))) UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE); if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE |

1 0

Alexandre Julliard : user32/tests: Add more systematic tests to validate the DDE client-side A<-> W conversions.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: f5f93d459e5b56539bf545a6a368fd96f14b0e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f93d459e5b56539bf545a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 23 14:19:51 2010 +0200 user32/tests: Add more systematic tests to validate the DDE client-side A<->W conversions. --- dlls/user32/tests/dde.c | 439 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 363 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5f93d459e5b56539bf54…

1 0

Alexandre Julliard : user32/tests: Fix some DDE test failures on Win9x.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: fe161ec2f906c62c4e718770cc479b4af1744887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe161ec2f906c62c4e718770c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 23 15:22:29 2010 +0200 user32/tests: Fix some DDE test failures on Win9x. --- dlls/user32/tests/dde.c | 60 ++++++++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 040c11a..8ead6d2 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -162,7 +162,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA lstrcpyA((LPSTR)data->Value, str); GlobalUnlock(hglobal); - lparam = PackDDElParam(WM_DDE_ACK, (UINT_PTR)hglobal, HIWORD(lparam)); + lparam = PackDDElParam(WM_DDE_DATA, (UINT_PTR)hglobal, HIWORD(lparam)); PostMessageA(client, WM_DDE_DATA, (WPARAM)hwnd, lparam); break; @@ -188,7 +188,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA if (msg_index == 5) { size = GlobalSize((HGLOBAL)lo); - ok(size == 4, "got %d\n", size); + ok(size == 4 || broken(size == 32), /* sizes are rounded up on win9x */ "got %d\n", size); } else ok(!lstrcmpA((LPSTR)poke->Value, "poke data\r\n"), @@ -230,6 +230,11 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA break; } + case WM_DDE_ACK: /* happens on win9x when fAckReq is TRUE, ignore it */ + ok(msg_index == 4, "Expected 4, got %d\n", msg_index); + msg_index--; + break; + default: ok(FALSE, "Unhandled msg: %08x\n", msg); } @@ -300,14 +305,15 @@ static void test_ddeml_client(void) hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %08x\n", res); - if (hdata == NULL) - ok(FALSE, "hdata is NULL\n"); - else + ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */ + "Expected DDE_FNOTPROCESSED, got %08x\n", res); + ok( hdata != NULL, "hdata is NULL\n" ); + if (hdata) { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); + ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -318,16 +324,18 @@ static void test_ddeml_client(void) DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); + ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */ + "Expected DDE_FNOTPROCESSED, got %x\n", res); todo_wine - ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); - if (hdata == NULL) - ok(FALSE, "hdata is NULL\n"); - else + ok(ret == DMLERR_MEMORY_ERROR || broken(ret == 0), /* win9x */ + "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); + ok( hdata != NULL, "hdata is NULL\n" ); + if (hdata) { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); + ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -339,14 +347,16 @@ todo_wine hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); + ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */ + "Expected DDE_FNOTPROCESSED, got %x\n", res); if (hdata == NULL) ok(FALSE, "hdata is NULL\n"); else { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19, "Expected 19, got %d\n", size); + ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ + "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -394,7 +404,7 @@ todo_wine op = DdeClientTransaction((LPBYTE)hdata, 0, conversation, item, CF_TEXT, XTYP_POKE, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op); - ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res); + ok(res == DDE_FACK || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); /* XTYP_POKE, correct params */ @@ -403,7 +413,8 @@ todo_wine op = DdeClientTransaction((LPBYTE)hdata, -1, conversation, item, CF_TEXT, XTYP_POKE, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op); - ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res); + ok(res == DDE_FACK || broken(res == (0xdead0000 | DDE_FACK)), /* win9x */ + "Expected DDE_FACK, got %x\n", res); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); DdeFreeDataHandle(hdata); @@ -420,7 +431,7 @@ todo_wine ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op); - ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res); + ok(res == DDE_FACK || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res); /* XTYP_EXECUTE, no data */ res = 0xdeadbeef; @@ -585,9 +596,16 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon ok(size == 13, "Expected 13, got %d\n", size); size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI); - ok(!strncmp(str, "TestDDEServer(", 14), "Expected TestDDEServer(, got %s\n", str); - ok(str[size - 1] == ')', "Expected ')', got %c\n", str[size - 1]); - ok(size == 17 + 2*sizeof(ULONG_PTR), "Got size %d for %s\n", size, str); + if (!strncmp( str, "TestDDEServer:(", 15 )) /* win9x style */ + { + ok(size == 16 + 2*sizeof(WORD), "Got size %d for %s\n", size, str); + } + else + { + ok(!strncmp(str, "TestDDEServer(", 14), "Expected TestDDEServer(, got %s\n", str); + ok(size == 17 + 2*sizeof(ULONG_PTR), "Got size %d for %s\n", size, str); + } + ok(str[size - 1] == ')', "Expected ')', got %c\n", str[size - 1]); return (HDDEDATA)TRUE; }

1 0

Michael Stefaniuc : net: Add the Romanian translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: dbf5ec01aea564bf230da144fc4b714962a12915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf5ec01aea564bf230da144f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 23 10:34:21 2010 +0200 net: Add the Romanian translation. Translation by Claudia Cotună. --- programs/net/Makefile.in | 1 + programs/net/Ro.rc | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index 5c06bb8..5efbef0 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc diff --git a/programs/net/Ro.rc b/programs/net/Ro.rc new file mode 100644 index 0000000..9dc52f7 --- /dev/null +++ b/programs/net/Ro.rc @@ -0,0 +1,48 @@ +/* + * NET.EXE - Wine-compatible net program + * + * Copyright (C) 2007 Tim Schwartz + * Copyright (C) 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 "resources.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + STRING_USAGE, "Sintaxa acestei comenzi este:\n\nNET [ HELP | START | STOP | USE ]\n" + STRING_START_USAGE, "Specificați numele serviciului de pornit.\n" + STRING_STOP_USAGE, "Specificați numele serviciului de oprit.\n" + STRING_STOP_DEP, "Se oprește serviciul dependent: %s\n" + STRING_CANT_STOP, "Serviciul %s nu a putut fi oprit\n" + STRING_NO_SCM, "Nu a putut fi accesat managerul de control al serviciului.\n" + STRING_NO_SVCHANDLE, "Serviciul nu a putut fi accesat.\n" + STRING_START_SVC, "Serviciul %s pornește.\n" + STRING_START_SVC_SUCCESS, "Serviciul %s a fost pornit cu succes.\n" + STRING_START_SVC_FAIL, "Pornirea serviciului %s a eșuat.\n" + STRING_STOP_SVC, "Serviciul %s se oprește.\n" + STRING_STOP_SVC_SUCCESS, "Serviciul %s a fost oprit cu succes.\n" + STRING_STOP_SVC_FAIL, "Oprirea serviciului %s a eșuat.\n" + STRING_HELP_USAGE, "Sintaxa acestei comenzi este:\n\ncomandă NET HELP\n -sau-\ncomandă NET /HELP\n\n Comenzile disponibile sunt:\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "Nu există nici un element în listă.\n" + STRING_USE_HEADER, "\nStare Local Distant\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S Resurse deschise: %lu\n" +}

1 0