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

Alexander Scott-Johns : include/msvcrt: Define _TRUNCATE; use it in the tests.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 4e8e2f39c5c028d6812578119885b3edef76d0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8e2f39c5c028d6812578119… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Sun Jun 6 16:24:09 2010 +0100 include/msvcrt: Define _TRUNCATE; use it in the tests. --- dlls/msvcrt/tests/string.c | 8 ++++---- include/msvcrt/stdlib.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f6c0e2c..1a362a1 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1215,22 +1215,22 @@ static void test_mbstowcs(void) return; } - err = pmbstowcs_s(&ret, wOut, 6, mSimple, -1/*_TRUNCATE*/); + err = pmbstowcs_s(&ret, wOut, 6, mSimple, _TRUNCATE); ok(err == 0, "err = %d\n", err); ok(ret == 5, "ret = %d\n", (int)ret); ok(!memcmp(wOut, wSimple, sizeof(wSimple)), "wOut = %s\n", wine_dbgstr_w(wOut)); - err = pmbstowcs_s(&ret, wOut, 6, mHiragana, -1/*_TRUNCATE*/); + err = pmbstowcs_s(&ret, wOut, 6, mHiragana, _TRUNCATE); ok(err == 0, "err = %d\n", err); ok(ret == 3, "ret = %d\n", (int)ret); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); - err = pwcstombs_s(&ret, mOut, 6, wSimple, -1/*_TRUNCATE*/); + err = pwcstombs_s(&ret, mOut, 6, wSimple, _TRUNCATE); ok(err == 0, "err = %d\n", err); ok(ret == 5, "ret = %d\n", (int)ret); ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); - err = pwcstombs_s(&ret, mOut, 6, wHiragana, -1/*_TRUNCATE*/); + err = pwcstombs_s(&ret, mOut, 6, wHiragana, _TRUNCATE); ok(err == 0, "err = %d\n", err); ok(ret == 5, "ret = %d\n", (int)ret); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 6633ee9..35a9782 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -47,6 +47,8 @@ typedef struct #define _MAX_PATH 260 #endif +/* Make the secure string functions (names end in "_s") truncate their output */ +#define _TRUNCATE ((size_t)-1) typedef struct _div_t { int quot;

1 0

Alexander Scott-Johns : msvcrt: The sizeOfBuffer argument of _vsnwprintf_s is measured in wide characters, not bytes.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: d56113cd4fba1822984dc5204cb22875ba2eb2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56113cd4fba1822984dc5204… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Mon Jun 7 02:54:14 2010 +0100 msvcrt: The sizeOfBuffer argument of _vsnwprintf_s is measured in wide characters, not bytes. --- dlls/msvcrt/wcs.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 90bc3b8..78e42b2 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1147,17 +1147,17 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer { int len, ret; - len = sizeOfBuffer/sizeof(MSVCRT_wchar_t); + len = sizeOfBuffer; if(count!=-1 && len>count+1) len = count+1; ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist); if(ret<0 || ret==len) { - if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) { + if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); *MSVCRT__errno() = MSVCRT_ERANGE; - memset(str, 0, sizeOfBuffer); + memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); } else str[len-1] = '\0'; @@ -1242,8 +1242,7 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, int r; __ms_va_start(ap, format); - r = MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), - INT_MAX, format, ap); + r = MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, ap); __ms_va_end(ap); return r; @@ -1271,8 +1270,7 @@ int CDECL _vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args ) int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, const MSVCRT_wchar_t* format, __ms_va_list args) { - return MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), - INT_MAX, format, args); + return MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, args ); } /********************************************************************* @@ -1281,8 +1279,8 @@ int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list args) { - return MSVCRT_vsnwprintf_s_l(str, numberOfElements*sizeof(MSVCRT_wchar_t), - INT_MAX, format, locale, args ); + return MSVCRT_vsnwprintf_s_l(str, numberOfElements, INT_MAX, + format, locale, args ); } /*********************************************************************

1 0

Sven Baars : comdlg32: Fix Dutch translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 3d6ce9cf945877fbd16bfcd9c285672d8f7900de URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ce9cf945877fbd16bfcd9c… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Jun 6 21:43:44 2010 +0200 comdlg32: Fix Dutch translation. --- dlls/comdlg32/cdlg_Nl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index 8f29a59..d17ca92 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Openen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Alleen &Lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Alleen-&lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Opslaan als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Alleen &Lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Alleen-&lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -108,7 +108,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "Afdrukstand", 1073, 6, 85, 100, 50, BS_GROUPBOX + GROUPBOX "Oriëntatie", 1073, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "S&taand", 1058, 50, 100, 40, 12 RADIOBUTTON "&Liggend", 1059, 50, 115, 40, 12 ICON "LANDSCAP", 1097, 10, 95, 32, 32 @@ -336,7 +336,7 @@ BEGIN COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL LTEXT "La&de:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "Orientatie", grp1, 8, 156, 64, 56, BS_GROUPBOX + GROUPBOX "Oriëntatie", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Staand", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Liggend", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Randen", grp4, 80, 156, 152, 56, BS_GROUPBOX

1 0

Luca Bennati : regedit: Update Italian translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 707ccc4fd6a0b7c6f7a5cefd28f19d2746b3984f URL: http://source.winehq.org/git/wine.git/?a=commit;h=707ccc4fd6a0b7c6f7a5cefd2… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Jun 3 19:06:45 2010 +0200 regedit: Update Italian translation. --- programs/regedit/It.rc | 56 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 51 insertions(+), 5 deletions(-) diff --git a/programs/regedit/It.rc b/programs/regedit/It.rc index dc57e8f..96c562b 100644 --- a/programs/regedit/It.rc +++ b/programs/regedit/It.rc @@ -4,6 +4,7 @@ * Copyright 2002 Robert Dickenson * Copyright 2003-2004 Ivan Leo Puoti * Copyright 2006 Antonio Codazzi + * Copyright 2010 Luca Bennati * * 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,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* @@ -53,7 +57,7 @@ BEGIN MENUITEM "Valore &stringa", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE + MENUITEM "Valore &multistringa", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Elimina\tDel", ID_EDIT_DELETE @@ -104,13 +108,13 @@ BEGIN MENUITEM "Valore &stringa", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE + MENUITEM "Valore &multistringa", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Elimina\tDel", ID_EDIT_DELETE MENUITEM "&Rinomina\tF2" ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "&Export...", ID_EDIT_EXPORT + MENUITEM "&Esporta...", ID_EDIT_EXPORT MENUITEM "&Copia nome chiave", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Trova\tCtrl+F", ID_EDIT_FIND, GRAYED @@ -121,6 +125,17 @@ END * Dialog */ +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 "Esporta registro", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP + AUTORADIOBUTTON "&Tutti", IDC_EXPORT_ALL, 12, 15, 244, 12 + AUTORADIOBUTTON "Ramo s&elezionato:", IDC_EXPORT_SELECTED, 12, 30, 70, 12 + EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 +END + IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Trova" @@ -201,6 +216,19 @@ BEGIN PUSHBUTTON "Annulla",IDCANCEL,175,80,30,11,WS_GROUP END +IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Modifica Multistringa" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Nome del valore:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "Dati del valore:",IDC_STATIC,5,30,119,8 + EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + DEFPUSHBUTTON "OK",IDOK,120,156,40,15,WS_GROUP + PUSHBUTTON "Annulla",IDCANCEL,165,156,40,15,WS_GROUP +END + /* * String Table */ @@ -220,7 +248,7 @@ END STRINGTABLE DISCARDABLE BEGIN ID_REGISTRY_MENU "Contiene i comandi per lavorare su tutto il Registro" - ID_EDIT_MENU "Contiene i comandi per editare valori o chiavi" + ID_EDIT_MENU "Contiene i comandi per modificare valori o chiavi" ID_VIEW_MENU "Contiene i comandi per personalizzare la finestra del Registro" ID_FAVORITES_MENU "Contiene i comandi per accedere alle chiavi usate frequentemente" ID_HELP_MENU "Contiene i comandi per visualizzare la Guida e informazioni sull'editor del Registro" @@ -234,6 +262,7 @@ BEGIN ID_EDIT_NEW_STRINGVALUE "Aggiunge un nuovo valore stringa" ID_EDIT_NEW_BINARYVALUE "Aggiunge un nuovo valore binario" ID_EDIT_NEW_DWORDVALUE "Aggiunge un nuovo valore a doppia parola" + ID_EDIT_NEW_MULTI_STRINGVALUE "Aggiunge un nuovo valore multistringa" ID_REGISTRY_IMPORTREGISTRYFILE "Importa un file di testo nel Registro" ID_REGISTRY_EXPORTREGISTRYFILE "Esporta tutto o parte del Registro in un file di testo" @@ -250,7 +279,7 @@ STRINGTABLE DISCARDABLE BEGIN ID_REGISTRY_EXIT "Esce dall'editor del Registro" ID_FAVORITES_ADDTOFAVORITES "Aggiunge una chiave alla lista dei Preferiti" - ID_FAVORITES_REMOVEFAVORITE "Rimuove una o pi� chiavi dalla lista dei preferiti" + ID_FAVORITES_REMOVEFAVORITE "Rimuove una o più chiavi dalla lista dei preferiti" ID_VIEW_STATUSBAR "Mostra o nasconde la barra di stato" ID_VIEW_SPLIT "Cambia la posizione del separatore tra due pannelli" ID_VIEW_REFRESH "Aggiorna la finestra" @@ -259,6 +288,7 @@ BEGIN ID_EDIT_COPYKEYNAME "Copia il nome della chiave selezionata negli appunti" ID_EDIT_FIND "Trova una stringa di testo in una chiave, un valore o in dei dati" ID_EDIT_FINDNEXT "Trova la volta successiva il testo specificato nella ricerca precedente" + ID_EDIT_EXPORT "Esporta il ramo selezionato del registro in un file di testo" END STRINGTABLE DISCARDABLE @@ -276,6 +306,22 @@ BEGIN IDS_NOTFOUND "Stringa di ricerca '%s' non trovata" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_FILEDIALOG_IMPORT_TITLE "Importa file di registro" + IDS_FILEDIALOG_EXPORT_TITLE "Esporta file di registro" + IDS_FILEDIALOG_FILTER "File di registro\0*.reg\0File di registro Win9x/NT4 (REGEDIT4)\0*.reg\0Tutti i file (*.*)\0*.*\0\0" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_REGISTRY_ROOT_NAME "Il mio computer" + IDS_REGISTRY_DEFAULT_VALUE "(Default)" + IDS_REGISTRY_VALUE_NOT_SET "(valore non immesso)" + IDS_REGISTRY_VALUE_CANT_DISPLAY "(impossibile visualizzare valore)" + IDS_REGISTRY_UNKNOWN_TYPE "(%d sconosciuto)" +END + /*****************************************************************/ /*

1 0

Luca Bennati : shell32: Fix Italian translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: cabff4e2213ee777645539edabdb1611d9d0a3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabff4e2213ee777645539eda… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Jun 3 19:13:02 2010 +0200 shell32: Fix Italian translation. --- dlls/shell32/shell32_It.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc index 8efa8c6..a797fda 100644 --- a/dlls/shell32/shell32_It.rc +++ b/dlls/shell32/shell32_It.rc @@ -254,6 +254,12 @@ STRINGTABLE IDS_SHUTDOWN_TITLE "Termina sessione" IDS_SHUTDOWN_PROMPT "Vuoi terminare la sessione di Wine?" + /* Run File dialog */ + IDS_RUNDLG_ERROR "Impossibile mostrare la finestra Esegui File (errore interno)" + IDS_RUNDLG_BROWSE_ERROR "Impossibile mostrare la finestra Sfoglia (errore interno)" + IDS_RUNDLG_BROWSE_CAPTION "Sfoglia" + IDS_RUNDLG_BROWSE_FILTER "File eseguibili\0*.exe\0Tutti i files\0*.*\0\0" + /* shell folder path default values */ IDS_STARTMENU "Start Menu" IDS_PROGRAMS "Start Menu\\Programmi"

1 0

Luca Bennati : shdoclc: Add Italian translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: ec6c34eeeafc9da56f67b76a93bf0014321db3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6c34eeeafc9da56f67b76a9… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Jun 6 16:41:53 2010 +0200 shdoclc: Add Italian translation. --- dlls/shdoclc/It.rc | 253 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Makefile.in | 1 + 2 files changed, 254 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec6c34eeeafc9da56f67b…

1 0

Luca Bennati : wldap32: Add Italian translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: d4b8ca12f21d7befc7ef30da9e41db1a105bb811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b8ca12f21d7befc7ef30da9… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Jun 6 16:44:30 2010 +0200 wldap32: Add Italian translation. --- dlls/wldap32/Makefile.in | 1 + dlls/wldap32/wldap32_It.rc | 128 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index 5942be1..625dd4b 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -35,6 +35,7 @@ RC_SRCS = \ wldap32_En.rc \ wldap32_Es.rc \ wldap32_Fr.rc \ + wldap32_It.rc \ wldap32_Ko.rc \ wldap32_Lt.rc \ wldap32_Nl.rc \ diff --git a/dlls/wldap32/wldap32_It.rc b/dlls/wldap32/wldap32_It.rc new file mode 100644 index 0000000..a7c9b6b --- /dev/null +++ b/dlls/wldap32/wldap32_It.rc @@ -0,0 +1,128 @@ +/* + * Italian resources for WLDAP32 + * + * Copyright 2010 Luca Bennati + * + * 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 "windef.h" + +/*UTF-8*/ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "Successo" + 1 "Errore nelle operazioni" + 2 "Errore nel protocollo" + 3 "Superato il tempo limite" + 4 "Superata la dimensione massima" + 5 "Compara falso" + 6 "Compara vero" + 7 "Metodo di autenticazione non supportato" + 8 "Autenticazione forte richiesta" + 9 "Referral (v2)" + 10 "Referral" + 11 "Superato il limite di amministrazione" + 12 "Estensione critica non disponibile" + 13 "Richiesta confidenzialità" + 14 "" + 15 "" + 16 "Attributo inesistente" + 17 "Tipo non definito" + 18 "Matching inappropriato" + 19 "Violazione del vincolo" + 20 "Attributo o valore esistente" + 21 "Sintassi non valida" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "Oggetto inesistente" + 33 "Problema di alias" + 34 "Sintassi DN non valida" + 35 "È foglia" + 36 "Problema di dereferenziazione di alias" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Autenticazione non appropriata" + 49 "Credenziali non valide" + 50 "Diritti insufficenti" + 51 "Occupato" + 52 "Non disponibile" + 53 "Non intenzionato ad agire" + 54 "Trovato Loop" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Controllo dell'ordine mancante" + 61 "Errore di range dell'indice" + 62 "" + 63 "" + 64 "Violazione di nominazione" + 65 "Violazione di classe dell'oggetto" + 66 "Non permesso su non-foglie" + 67 "Non permesso su RDN" + 68 "Esiste già" + 69 "Nessuna mod di classi di oggetto" + 70 "Risultati troppo grandi" + 71 "Ha effetto su molti DSA" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Altro" + 81 "Server irraggiungibile" + 82 "Errore locale" + 83 "Errore di codifica" + 84 "Errore di decodifica" + 85 "Timeout" + 86 "Autenticazione sconosciuta" + 87 "Errore del filtro" + 88 "Utente eliminato" + 89 "Errore del parametro" + 90 "Memoria non disponibile" + 91 "Impossibile connettersi al server LDAP" + 92 "Operazione non supportata da questa versione del protocollo LDAP" + 93 "Il controllo specificato non è stato trovato nel messaggio" + 94 "Nessun rislutato presente nel messaggio" + 95 "Più risultati ricevuti" + 96 "Loop nel gestire i referral" + 97 "Ecceduto il limite di salti di referral" +}

1 0

Luca Bennati : oleview: Add Italian translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 522fe9abebbc3fd319254de0bebadbe7200152c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=522fe9abebbc3fd319254de0b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Jun 6 16:43:03 2010 +0200 oleview: Add Italian translation. --- programs/oleview/It.rc | 218 ++++++++++++++++++++++++++++++++++++++++++ programs/oleview/Makefile.in | 1 + 2 files changed, 219 insertions(+), 0 deletions(-) diff --git a/programs/oleview/It.rc b/programs/oleview/It.rc new file mode 100644 index 0000000..0865306 --- /dev/null +++ b/programs/oleview/It.rc @@ -0,0 +1,218 @@ +/* + * OleView (It.rc) + * Italian Language Support + * + * Copyright 2010 Luca Bennati + * + * 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" + +/*UTF-8*/ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDM_MENU MENU +{ + POPUP "&File" + { + MENUITEM "Fi&ssa su file...", IDM_BIND + MENUITEM "&Mostra TypeLib...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "Configurazione di &sistema...", IDM_SYSCONF + MENUITEM "Esegui l'editor di &registro", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "&Esci", IDM_EXIT + } + POPUP "&Elemento" + { + POPUP "Flag &CoCreateInstance" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "Mostra informazioni sul &tipo", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Crea &instanza", IDM_CREATEINST, GRAYED + MENUITEM "Crea instanza &su...", IDM_CREATEINSTON, GRAYED + MENUITEM "&Rilascia instanza", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "Copia C&LSID negli appunti", IDM_COPYCLSID, GRAYED + MENUITEM "Copia categoria oggetto &HTML negli appunti", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Mostra...", IDM_VIEW, GRAYED + } + POPUP "&Visualizza" + { + MENUITEM "Modalità &esperto", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "Categorie di componenti &nascoste", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Barra degli s&trumenti", IDM_TOOLBAR,CHECKED + MENUITEM "Barra dello &stato", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Aggiorna\tF5", IDM_REFRESH + } + POPUP "&Aiuto" + { + MENUITEM "&Su OleView", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&File" + { + MENUITEM "&Salva come...", IDM_SAVEAS + MENUITEM "&Chiudi", IDM_CLOSE + } + POPUP "&Vista" + { + MENUITEM "&Raggruppa per tipo", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "&Barra degli Strumenti", IDM_TOOLBAR + MENUITEM "Barra di &Stato", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "Pronto" + IDS_ABOUT "OleView - Visualizzatore di oggetti OLE/COM" + IDS_ABOUTVER "versione 1.0" + IDS_TYPELIBTITLE "Visore ITypeLib" + IDS_OPEN "Apri" + IDS_OPEN_TYPELIB_FILTER "File TypeLib (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0Tutti i file (*.*)\0*.*\0\0" + + IDM_BIND, "Fissa su un file con un File Moniker" + IDM_TYPELIB, "Apri un file TypeLib e visualizza i contenuti" + IDM_SYSCONF, "Cambia le impostazioni per COM Distribuite per l'intera macchina" + IDM_REGEDIT, "Esegui l'editor di registro di Wine" + IDM_EXIT, "Chiudi l'applicazione. Chiede se salvare i cambiamenti" + IDM_CREATEINST, "Crea un'instanza dell'elemento selezionato" + IDM_CREATEINSTON, "Crea un'instanza dell'elemento selezionato su una macchina specifica" + IDM_RELEASEINST, "Rilascia l'istanza dell'elemento correntemente selezionato" + IDM_COPYCLSID, "Copia il GUID dell'elemento correntemente selezionato negli appunti" + IDM_VIEW, "Mostra il visualizzatore per l'elemento selezionato" + IDM_FLAG_INSERV, "Usa CLSCTX_INPROC_SERVER nel chiamare CoGetClassObject" + IDM_FLAG_INHANDL, "Usa CLSCTX_INPROC_HANDLER nel chiamare CoGetClassObject" + IDM_FLAG_LOCSERV, "Usa CLSCTX_LOCAL_SERVER nel chiamare CoGetClassObject" + IDM_FLAG_REMSERV, "Usa CLSCTX_REMOTE_SERVER nel chiamare CoGetClassObject" + IDM_EXPERT, "Cambia tra modalità visualizzazione esperto e novizio" + IDM_HIDDEN, "Cambia display delle categorie di componenti che non devono essere visibili" + IDM_TOOLBAR, "Mostra o nascondi la barra degli strumenti" + IDM_STATUSBAR, "Mostra o nascondi la barra di stato" + IDM_REFRESH, "Aggiorna tutte le liste" + IDM_ABOUT, "Mostra informazioni, numero di versione e copyright del programma" + + IDM_SAVEAS, "Salva come file .IDL o .H" + IDM_CLOSE, "Chiudi finestra" + IDM_GROUP, "Raggruppa TypeInfo per tipologia" + + IDS_TREE_OC, "Classi dell'oggetto" + IDS_TREE_GBCC, "Raggruppati per categoria di componente" + IDS_TREE_O1O, "Oggetti OLE 1.0" + IDS_TREE_CLO, "Oggetti di librerie COM" + IDS_TREE_AO, "Tutti gli oggetti" + IDS_TREE_AID, "ID Applicazione" + IDS_TREE_TL, "TypeLibrary" + IDS_TL_VER, "ver." + IDS_TREE_I, "Interfacce" + + IDS_TAB_REG, "Registro" + IDS_TAB_IMPL, "Implementazione" + IDS_TAB_ACTIV, "Attivazione" + + IDS_CGCOFAIL, "CoGetClassObject fallito." + IDS_ERROR_UNKN, "Errore sconosciuto" + IDS_TRUE, "Vero" + IDS_FALSE, "Falso" + IDS_BYTES, "bytes" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) fallito ($%x)" + IDS_INHERITINTERFACES, "Interfacce Ereditate" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Connetti ad un'altra macchina" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Nome della macchina:", -1, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&Annulla", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Configurazione di sistema" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Impostazioni di sistema", -1, 5, 6, 160, 8 + CHECKBOX "&Abilita i COM Distribuiti", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "Abilita Connessioni &Remote (solo Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "Queste impostazioni cambiano solo i valori del registro.\nNon hanno effetto sulle prestazioni di Wine.", -1, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&Annulla", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Visualizzatore di interfacce predefinito" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Interfaccia", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Chiudi", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&Vedi informazioni sul tipo", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Visualizzatore di interfaccia IPersist" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Nome della classe:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Chiudi", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Visualizzatore di interfaccia IPersistStream" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Nome della classe:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Chiudi", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&Sporco", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&MassimaDimensione", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 3b9ec12..556fa08 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -20,6 +20,7 @@ RC_SRCS = \ De.rc \ En.rc \ Fr.rc \ + It.rc \ Ja.rc \ Ko.rc \ Lt.rc \

1 0

Andrew Eikum : msi/tests: Fix install tests for Win9x.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: c99c5a41e976a4b2ea4493392e6f6d43e2d54742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99c5a41e976a4b2ea4493392… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 4 09:56:58 2010 -0500 msi/tests: Fix install tests for Win9x. --- dlls/msi/tests/install.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 22309c2..b78918c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3218,12 +3218,21 @@ static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) static BOOL get_user_dirs(void) { - HRESULT hres; + HKEY hkey; + DWORD type, size; - hres = SHGetFolderPathA(NULL, CSIDL_APPDATA, NULL, 0, APP_DATA_DIR); - if(FAILED(hres)) + if(RegOpenKey(HKEY_CURRENT_USER, + "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", + &hkey)) return FALSE; + size = MAX_PATH; + if(RegQueryValueExA(hkey, "AppData", 0, &type, (LPBYTE)APP_DATA_DIR, &size)){ + RegCloseKey(hkey); + return FALSE; + } + + RegCloseKey(hkey); return TRUE; } @@ -9426,7 +9435,7 @@ static void test_icon_table(void) MSIHANDLE hdb = 0, record; LPCSTR query; UINT res; - CHAR path[MAX_PATH]; + CHAR path[MAX_PATH], win9xpath[MAX_PATH]; static const char prodcode[] = "{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}"; create_database(msifile, icon_base_tables, sizeof(icon_base_tables) / sizeof(msi_table)); @@ -9473,12 +9482,20 @@ static void test_icon_table(void) res = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1 ALLUSERS=1"); ok(res == ERROR_SUCCESS, "Failed to system-wide install: %d\n", res); + /* win9x with MSI 2.0 installs the icon to a different folder, same as above */ + lstrcpyA(win9xpath, APP_DATA_DIR); + lstrcatA(path, "\\"); + lstrcatA(path, "Microsoft\\Installer\\"); + lstrcatA(path, prodcode); + lstrcatA(path, "\\testicon"); + lstrcpyA(path, WINDOWS_DIR); lstrcatA(path, "\\"); lstrcatA(path, "Installer\\"); lstrcatA(path, prodcode); lstrcatA(path, "\\testicon"); - ok(file_exists(path), "System-wide icon file isn't where it's expected (%s)\n", path); + ok(file_exists(path) || file_exists(win9xpath), + "System-wide icon file isn't where it's expected (%s)\n", path); res = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(res == ERROR_SUCCESS, "Failed to uninstall system-wide\n");

1 0

Akihiro Sagawa : wininet: Update Japanese translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 089de46366ea7b5b76110ba8ba52e7cc9a3fa482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=089de46366ea7b5b76110ba8b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 5 00:09:51 2010 +0900 wininet: Update Japanese translation. --- dlls/wininet/wininet_Ja.rc | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/wininet_Ja.rc b/dlls/wininet/wininet_Ja.rc index e179b84..2d12563 100644 --- a/dlls/wininet/wininet_Ja.rc +++ b/dlls/wininet/wininet_Ja.rc @@ -30,7 +30,7 @@ FONT 9, "MS Shell Dlg" { LTEXT "ユーザ名とパスワードを入力して下さい:", -1, 40, 6, 150, 15 LTEXT "プロキシ", -1, 40, 26, 50, 10 - LTEXT "地域", -1, 40, 46, 50, 10 + LTEXT "領域", -1, 40, 46, 50, 10 LTEXT "ユーザ名", -1, 40, 66, 50, 10 LTEXT "パスワード", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 @@ -43,6 +43,26 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "キャンセル", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "認証が必要です" +FONT 8, "MS Shell Dlg" +{ + LTEXT "ユーザ名とパスワードを入力して下さい:", -1, 40, 6, 150, 15 + LTEXT "サーバ", -1, 40, 26, 50, 10 + LTEXT "領域", -1, 40, 46, 50, 10 + LTEXT "ユーザ名", -1, 40, 66, 50, 10 + LTEXT "パスワード", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "パスワードを保存する(&S)(セキュアではありません)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "キャンセル", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "LAN 接続"

1 0