wine-commits August 2009

wine-commits@winehq.org

4 participants
1042 discussions

Alexandre Julliard : wrc: Print a warning when encountering utf8 strings in non-utf8 codepage.
by Alexandre Julliard 20 Aug '09

20 Aug '09

Module: wine Branch: master Commit: be7558fc30f301f891ee8dfc6fba3bf569c44913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7558fc30f301f891ee8dfc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 15:33:03 2009 +0200 wrc: Print a warning when encountering utf8 strings in non-utf8 codepage. --- tools/wrc/genres.c | 3 +++ tools/wrc/parser.l | 3 +++ tools/wrc/utils.c | 23 +++++++++++++++++++++++ tools/wrc/utils.h | 1 + tools/wrc/wrc.c | 3 +++ tools/wrc/wrc.h | 1 + 6 files changed, 34 insertions(+), 0 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index e4317d5..131f6f7 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -314,6 +314,9 @@ static void put_string(res_t *res, const string_t *str, enum str_e type, int ist if (!check_unicode_conversion( str, newstr, codepage )) error( "String %s does not convert identically to Unicode and back in codepage %d. " "Try using a Unicode string instead\n", str->str.cstr, codepage ); + if (check_valid_utf8( str, codepage )) + warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use.\n", + str->str.cstr, codepage ); } if (!isterm) put_word(res, newstr->size); for(cnt = 0; cnt < newstr->size; cnt++) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index cafa35a..8ed0445 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -637,6 +637,9 @@ static string_t *get_buffered_cstring(void) if (!check_unicode_conversion( str, str_w, current_codepage )) parser_error("String %s does not convert identically to Unicode and back in codepage %d. " "Try using a Unicode string instead", str->str.cstr, current_codepage ); + if (check_valid_utf8( str, current_codepage )) + parser_warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use.", + str->str.cstr, current_codepage ); free_string( str ); return str_w; } diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index b6688af..d3b8cf7 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -311,6 +311,29 @@ void free_string(string_t *str) free( str ); } +/* check if the string is valid utf8 despite a different codepage being in use */ +int check_valid_utf8( const string_t *str, int codepage ) +{ + unsigned int i; + + if (!check_utf8) return 0; + if (!codepage) return 0; + if (!wine_cp_get_table( codepage )) return 0; + + for (i = 0; i < str->size; i++) + { + if ((unsigned char)str->str.cstr[i] >= 0xf5) goto done; + if ((unsigned char)str->str.cstr[i] >= 0xc2) break; + if ((unsigned char)str->str.cstr[i] >= 0x80) goto done; + } + if (i == str->size) return 0; /* no 8-bit chars at all */ + + if (wine_utf8_mbstowcs( MB_ERR_INVALID_CHARS, str->str.cstr, str->size, NULL, 0 ) >= 0) return 1; + +done: + check_utf8 = 0; /* at least one 8-bit non-utf8 string found, stop checking */ + return 0; +} int check_unicode_conversion( const string_t *str_a, const string_t *str_w, int codepage ) { diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h index 09144e7..ced55ab 100644 --- a/tools/wrc/utils.h +++ b/tools/wrc/utils.h @@ -45,6 +45,7 @@ char *dup_basename(const char *name, const char *ext); int compare_name_id(const name_id_t *n1, const name_id_t *n2); string_t *convert_string(const string_t *str, enum str_e type, int codepage); void free_string( string_t *str ); +int check_valid_utf8( const string_t *str, int codepage ); int check_unicode_conversion( const string_t *str_a, const string_t *str_w, int codepage ); int get_language_codepage( unsigned short lang, unsigned short sublang ); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 5879d92..7dd91fb 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -155,6 +155,8 @@ int preprocess_only = 0; */ int no_preprocess = 0; +int check_utf8 = 1; /* whether to check for valid utf8 */ + static int verify_translations_mode; char *output_name = NULL; /* The name given by the -o option */ @@ -292,6 +294,7 @@ static int load_file( const char *input_name, const char *output_name ) /* Reset the language */ currentlanguage = dup_language( defaultlanguage ); + check_utf8 = 1; /* Go from .rc to .res */ chat("Starting parse\n"); diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index de8929a..0283546 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -43,6 +43,7 @@ extern int pedantic; extern int byteorder; extern int preprocess_only; extern int no_preprocess; +extern int check_utf8; extern char *output_name; extern char *input_name;

1 0

Michael Stefaniuc : oleacc: Add the Romanian translation.
by Alexandre Julliard 20 Aug '09

20 Aug '09

Module: wine Branch: master Commit: 385594aa11557161a2ef95c4460504d4d2dd5cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=385594aa11557161a2ef95c44… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 20 10:47:58 2009 +0200 oleacc: Add the Romanian translation. --- dlls/oleacc/Makefile.in | 3 +- dlls/oleacc/oleacc_Ro.rc | 93 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 1f961fa..4fc8d51 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -17,7 +17,8 @@ RC_SRCS = \ oleacc_Lt.rc \ oleacc_Nl.rc \ oleacc_Pl.rc \ - oleacc_Pt.rc + oleacc_Pt.rc \ + oleacc_Ro.rc @MAKE_DLL_RULES@ diff --git a/dlls/oleacc/oleacc_Ro.rc b/dlls/oleacc/oleacc_Ro.rc new file mode 100644 index 0000000..52fc47b --- /dev/null +++ b/dlls/oleacc/oleacc_Ro.rc @@ -0,0 +1,93 @@ +/* + * Copyright 2008 Nikolay Sivov + * Copyright 2009 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 "oleacc.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE +{ + 0 "obiect necunoscut" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "bară de titlu" + ROLE_SYSTEM_MENUBAR "bară de meniu" + ROLE_SYSTEM_SCROLLBAR "bară de defilare" + ROLE_SYSTEM_GRIP "ghidaj" + ROLE_SYSTEM_SOUND "sunet" + ROLE_SYSTEM_CURSOR "cursor" + ROLE_SYSTEM_CARET "circumflex" + ROLE_SYSTEM_ALERT "atenționare" + ROLE_SYSTEM_WINDOW "fereastră" + ROLE_SYSTEM_CLIENT "client" + ROLE_SYSTEM_MENUPOPUP "meniu contextual" + ROLE_SYSTEM_MENUITEM "element de meniu" + ROLE_SYSTEM_TOOLTIP "indiciu" + ROLE_SYSTEM_APPLICATION "aplicație" + ROLE_SYSTEM_DOCUMENT "document" + ROLE_SYSTEM_PANE "panou" + ROLE_SYSTEM_CHART "diagramă" + ROLE_SYSTEM_DIALOG "dialog" + ROLE_SYSTEM_BORDER "margine" + ROLE_SYSTEM_GROUPING "grupare" + ROLE_SYSTEM_SEPARATOR "separator" + ROLE_SYSTEM_TOOLBAR "bară de unelte" + ROLE_SYSTEM_STATUSBAR "bară de stare" + ROLE_SYSTEM_TABLE "tabel" + ROLE_SYSTEM_COLUMNHEADER "antet de coloană" + ROLE_SYSTEM_ROWHEADER "antet de rând" + ROLE_SYSTEM_COLUMN "coloană" + ROLE_SYSTEM_ROW "rând" + ROLE_SYSTEM_CELL "celulă" + ROLE_SYSTEM_LINK "legătură" + ROLE_SYSTEM_HELPBALLOON "balon de ajutor" + ROLE_SYSTEM_CHARACTER "caracter" + ROLE_SYSTEM_LIST "listă" + ROLE_SYSTEM_LISTITEM "element din listă" + ROLE_SYSTEM_OUTLINE "contur" + ROLE_SYSTEM_OUTLINEITEM "conturare element" + ROLE_SYSTEM_PAGETAB "filă" + ROLE_SYSTEM_PROPERTYPAGE "pagină de proprietăți" + ROLE_SYSTEM_INDICATOR "indicator" + ROLE_SYSTEM_GRAPHIC "grafică" + ROLE_SYSTEM_STATICTEXT "text static" + ROLE_SYSTEM_TEXT "text" + ROLE_SYSTEM_PUSHBUTTON "buton de comandă" + ROLE_SYSTEM_CHECKBUTTON "buton de bifare" + ROLE_SYSTEM_RADIOBUTTON "buton radio" + ROLE_SYSTEM_COMBOBOX "căsuță combinată" + ROLE_SYSTEM_DROPLIST "listă verticală" + ROLE_SYSTEM_PROGRESSBAR "bară de progres" + ROLE_SYSTEM_DIAL "apelator" + ROLE_SYSTEM_HOTKEYFIELD "câmp de tastă rapidă" + ROLE_SYSTEM_SLIDER "glisor" + ROLE_SYSTEM_SPINBUTTON "căsuță incrementală" + ROLE_SYSTEM_DIAGRAM "diagramă" + ROLE_SYSTEM_ANIMATION "animație" + ROLE_SYSTEM_EQUATION "ecuație" + ROLE_SYSTEM_BUTTONDROPDOWN "buton listă verticală" + ROLE_SYSTEM_BUTTONMENU "buton meniu" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "buton listă verticală de grilă" + ROLE_SYSTEM_WHITESPACE "spațiu gol" + ROLE_SYSTEM_PAGETABLIST "listă de file" + ROLE_SYSTEM_CLOCK "ceas" + ROLE_SYSTEM_SPLITBUTTON "buton separare" + ROLE_SYSTEM_IPADDRESS "adresă IP" + ROLE_SYSTEM_OUTLINEBUTTON "buton contur" +}

1 0

Luca Bennati : wininet: Update Italian translation.
by Alexandre Julliard 20 Aug '09

20 Aug '09

Module: wine Branch: master Commit: 18af49ab239ff47b62a7f89f5ce5bf3566add5f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18af49ab239ff47b62a7f89f5… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Aug 19 22:58:04 2009 +0200 wininet: Update Italian translation. --- dlls/wininet/wininet_It.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_It.rc b/dlls/wininet/wininet_It.rc index 911b8a9..04f71c5 100644 --- a/dlls/wininet/wininet_It.rc +++ b/dlls/wininet/wininet_It.rc @@ -42,6 +42,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annulla", 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 "Autenticazione richiesta" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Inserire il nome utente e la password:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "Utente", -1, 40, 66, 50, 10 + LTEXT "Password", -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 "&Memorizza la password (RISCHIOSO)", 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 "Annulla", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Connessione LAN"

1 0

Luca Bennati : notepad: Update Italian translation.
by Alexandre Julliard 20 Aug '09

20 Aug '09

Module: wine Branch: master Commit: 65b15b892b26e056579eac08d57eadb257bebe58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b15b892b26e056579eac08d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Aug 19 22:56:38 2009 +0200 notepad: Update Italian translation. --- programs/notepad/It.rc | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/programs/notepad/It.rc b/programs/notepad/It.rc index b8fb42a..e7cb5f0 100644 --- a/programs/notepad/It.rc +++ b/programs/notepad/It.rc @@ -7,6 +7,7 @@ * Copyright 2003 Marcelo Duarte * Copyright 2003-2004 Ivan Leo Puoti * Copyright 2006 Antonio Codazzi + * Copyright 2009 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +26,8 @@ #include "notepad_res.h" +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MAIN_MENU MENU @@ -58,6 +61,7 @@ POPUP "&Modifica" { POPUP "&Trova" { MENUITEM "&Trova...\tCtrl+F", CMD_SEARCH MENUITEM "&Trova successivo\tF3", CMD_SEARCH_NEXT + MENUITEM "&Sostituisci...\tCtrl+H", CMD_REPLACE } POPUP "&Aiuto" { MENUITEM "&Contenuti", CMD_HELP_CONTENTS @@ -77,7 +81,7 @@ CAPTION "Imposta pagina" { LTEXT "&Note a inizio pagina:", 0x140, 10, 04, 40, 18 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Note a pi� di pagina:", 0x142, 10, 23, 40, 18 +LTEXT "&Note a piè di pagina:", 0x142, 10, 23, 40, 18 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP GROUPBOX "&Margini:", 0x144, 10, 43,160, 45 @@ -95,6 +99,14 @@ PUSHBUTTON "Cancella", IDCANCEL, 180, 21, 40, 15, WS_TABSTO PUSHBUTTON "&Aiuto", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Codifica:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -110,16 +122,26 @@ STRING_UNTITLED, "(senza nome)" STRING_ALL_FILES, "Tutti i file (*.*)" STRING_TEXT_FILES_TXT, "File di testo (*.txt)" -STRING_TOOLARGE, "Il file '%s' � troppo grande per il blocco note.\n \ +STRING_TOOLARGE, "Il file '%s' è troppo grande per il blocco note.\n \ Per favore usare un altro editor." -STRING_NOTEXT, "Non � stato inserito alcun testo. \ +STRING_NOTEXT, "Non è stato inserito alcun testo. \ \nPer favore digitare qualcosa e riprovare" STRING_DOESNOTEXIST, "Il file '%s'\nnon esiste\n\n \ Creare un nuovo file ?" -STRING_NOTSAVED, "Il file '%s'\ne' stato modificato\n\n \ +STRING_NOTSAVED, "Il file '%s'\nè stato modificato\n\n \ Salvare le modifiche ?" -STRING_NOTFOUND, "'%s' non � stato trovato." +STRING_NOTFOUND, "'%s' non è stato trovato." STRING_OUT_OF_MEMORY, "Memoria insufficiente per completare questa operazione \ -\nChiudere una o pi� applicazioni per aumentare la quantita'\n di memoria libera." +\nChiudere una o più applicazioni per aumentare la quantità\n di memoria libera." + + +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Questo file contiene caratteri Unicode che verranno persi se\n\ +salvi questo file nella codifica %s.\n\ +Per mantenere questi caratteri, clicca Annulla e scegli\n\ +una delle opzioni Unicode nel menu a tendina Codifica.\n\ +Continuare?" }

1 0

Luca Bennati : winecfg: Update Italian translation.
by Alexandre Julliard 20 Aug '09

20 Aug '09

Module: wine Branch: master Commit: a76bc4d45eeeb7cd233be53e3d7b76bfde4cd35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76bc4d45eeeb7cd233be53e3… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Aug 19 22:54:25 2009 +0200 winecfg: Update Italian translation. --- programs/winecfg/It.rc | 304 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 229 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a76bc4d45eeeb7cd233be…

1 0

Luca Bennati : appwiz.cpl: Add Italian translation.
by Alexandre Julliard 20 Aug '09

20 Aug '09

Module: wine Branch: master Commit: c2576bd323756f0821cae28e36564df57245ff6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2576bd323756f0821cae28e3… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Aug 19 22:49:40 2009 +0200 appwiz.cpl: Add Italian translation. --- dlls/appwiz.cpl/It.rc | 87 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Makefile.in | 1 + 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/It.rc b/dlls/appwiz.cpl/It.rc new file mode 100644 index 0000000..7939f61 --- /dev/null +++ b/dlls/appwiz.cpl/It.rc @@ -0,0 +1,87 @@ +/* +* Add/Remove Programs English resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2009 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 "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CPL_TITLE, "Agiungi/Rimuovi Programmi" + IDS_CPL_DESC, "Ti permette di installare nuovi software o di rimuovere quelli presenti dal tuo computer." + IDS_TAB1_TITLE, "Applicazioni" + + IDS_UNINSTALL_FAILED, "Impossibile eseguire il disinstallatore, '%s'. Vuoi rimuovere la voce di disinstallazione di questo programma dal registro?" + IDS_NOT_SPECIFIED, "Non specificato" + + IDS_COLUMN_NAME, "Nome" + IDS_COLUMN_PUBLISHER, "Editore" + IDS_COLUMN_VERSION, "Versione" + IDS_INSTALL_FILTER, "Programmi d'installazione\0*instal*.exe;*setup*.exe;*.msi\0Programmi (*.exe)\0*.exe\0Tutti i file (*.*)\0*.*\0\0" + + IDS_REMOVE, "&Rimuovi..." + IDS_MODIFY_REMOVE, "&Modifica/Rimuovi..." +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installa/Disinstalla" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Per installare un nuovo programma dal floppy disk, CD-ROM o dal tuo hard disk, clicca Installa.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Installa...", 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 "Il seguente software può essere automaticamente rimosso. Per rimuovere un programma o per modificare i suoi componenti installati, selezionalo dalla lista e clicca Cambia/Rimuovi.", 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 "Informazioni di &supporto...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Modifica...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Rimuovi...", 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 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Informazioni di supporto" +FONT 8, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Le seguenti informazioni possono essere usate per ottenere supporto tecnico per %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Editore:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versione:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contatti:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Informazioni di supporto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Telefono di supporto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Leggimi:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Aggiornamenti del prodotto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Commenti:", -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 +} diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index b7ae32e..50c9099 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -12,6 +12,7 @@ RC_SRCS = \ De.rc \ En.rc \ Fr.rc \ + It.rc \ Ja.rc \ Ko.rc \ Lt.rc \

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put borderLeftWidth.
by Alexandre Julliard 20 Aug '09

20 Aug '09

Module: wine Branch: master Commit: d343124344373bcff921393c620a0a723e3295c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d343124344373bcff921393c6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 20:44:38 2009 +1100 mshtml: Implement IHTMLStyle get/put borderLeftWidth. --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f036077..f938005 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -59,6 +59,8 @@ static const WCHAR attrBorderLeft[] = {'b','o','r','d','e','r','-','l','e','f','t',0}; static const WCHAR attrBorderLeftStyle[] = {'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0}; +static const WCHAR attrBorderLeftWidth[] = + {'b','o','r','d','e','r','-','l','e','f','t','-','w','i','d','t','h',0}; static const WCHAR attrBorderRightStyle[] = {'b','o','r','d','e','r','-','r','i','g','h','t','-','s','t','y','l','e',0}; static const WCHAR attrBorderRightWidth[] = @@ -140,6 +142,7 @@ static const struct{ {attrBorderColor, DISPID_IHTMLSTYLE_BORDERCOLOR}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, + {attrBorderLeftWidth, DISPID_IHTMLSTYLE_BORDERLEFTWIDTH}, {attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE}, {attrBorderRightWidth, DISPID_IHTMLSTYLE_BORDERRIGHTWIDTH}, {attrBorderStyle, DISPID_IHTMLSTYLE_BORDERSTYLE}, @@ -1574,15 +1577,15 @@ static HRESULT WINAPI HTMLStyle_get_borderBottomWidth(IHTMLStyle *iface, VARIANT static HRESULT WINAPI HTMLStyle_put_borderLeftWidth(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_LEFT_WIDTH, &v, 0); } static HRESULT WINAPI HTMLStyle_get_borderLeftWidth(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_LEFT_WIDTH, p, 0); } static HRESULT WINAPI HTMLStyle_put_borderStyle(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 307824e..beab44e 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -47,6 +47,7 @@ typedef enum { STYLEID_BORDER_COLOR, STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT_STYLE, + STYLEID_BORDER_LEFT_WIDTH, STYLEID_BORDER_RIGHT_STYLE, STYLEID_BORDER_RIGHT_WIDTH, STYLEID_BORDER_STYLE, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 50222ec..798dcd2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3557,8 +3557,8 @@ static void test_default_style(IHTMLStyle *style) V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderLeftWidth(style, &v); - todo_wine ok(hres == S_OK, "get_borderLeftWidth failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(V_BSTR(&v), "thick"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(hres == S_OK, "get_borderLeftWidth failed: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "thick"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_get_borderLeftStyle(style, &str); @@ -3665,6 +3665,25 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_borderBottomWidth: %08x\n", hres); VariantClear(&vDefault); + /* borderLeftWidth */ + hres = IHTMLStyle_get_borderLeftWidth(style, &vDefault); + ok(hres == S_OK, "get_borderLeftWidth: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10"); + hres = IHTMLStyle_put_borderLeftWidth(style, v); + ok(hres == S_OK, "put_borderLeftWidth: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderLeftWidth(style, &v); + ok(hres == S_OK, "get_borderLeftWidth: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expected 10px = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderLeftWidth(style, vDefault); + ok(hres == S_OK, "put_borderLeftWidth: %08x\n", hres); + VariantClear(&vDefault); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Juan Lang : ole32: Correct byte count.
by Alexandre Julliard 20 Aug '09

20 Aug '09

Module: wine Branch: master Commit: b308157bf275bacadf1d0547b21f0bb5b2a72e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b308157bf275bacadf1d0547b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 19 19:21:18 2009 -0700 ole32: Correct byte count. --- dlls/ole32/stg_prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 93653bb..9bf9481 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1531,7 +1531,7 @@ static BOOL PropertyStorage_DictionaryWriter(const void *key, &count); if (FAILED(c->hr)) goto end; - c->bytesWritten += keyLen; + c->bytesWritten += keyLen * sizeof(WCHAR); if (keyLen % sizeof(DWORD)) { c->hr = IStream_Write(This->stm, &pad,

1 0

Juan Lang : ole32: On big endian machines, copy strings to little endian order without mucking with the map they' re stored in.
by Alexandre Julliard 20 Aug '09

20 Aug '09

Module: wine Branch: master Commit: c664e9f4942a9fa5d31366aabfeb056861519aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c664e9f4942a9fa5d31366aab… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 19 19:18:26 2009 -0700 ole32: On big endian machines, copy strings to little endian order without mucking with the map they're stored in. --- dlls/ole32/stg_prop.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 381e079..93653bb 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1477,6 +1477,25 @@ static void PropertyStorage_MakePropertyIdOffset(DWORD propid, DWORD dwOffset, offsetof(PROPERTYIDOFFSET, dwOffset), dwOffset); } +static inline HRESULT PropertStorage_WriteWStringToStream(IStream *stm, + LPCWSTR str, DWORD len, DWORD *written) +{ +#ifdef WORDS_BIGENDIAN + WCHAR *leStr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + HRESULT hr; + + if (!leStr) + return E_OUTOFMEMORY; + memcpy(leStr, str, len * sizeof(WCHAR)); + PropertyStorage_ByteSwapString(leStr, len); + hr = IStream_Write(stm, leStr, len, written); + HeapFree(GetProcessHeap(), 0, leStr); + return hr; +#else + return IStream_Write(stm, str, len, written); +#endif +} + struct DictionaryClosure { HRESULT hr; @@ -1508,12 +1527,8 @@ static BOOL PropertyStorage_DictionaryWriter(const void *key, if (FAILED(c->hr)) goto end; c->bytesWritten += sizeof(DWORD); - /* Rather than allocate a copy, I'll swap the string to little-endian - * in-place, write it, then swap it back. - */ - PropertyStorage_ByteSwapString(key, keyLen); - c->hr = IStream_Write(This->stm, key, keyLen, &count); - PropertyStorage_ByteSwapString(key, keyLen); + c->hr = PropertStorage_WriteWStringToStream(This->stm, key, keyLen, + &count); if (FAILED(c->hr)) goto end; c->bytesWritten += keyLen;

1 0

Juan Lang : rpcrt4: Allow Annotation to be NULL.
by Alexandre Julliard 20 Aug '09

20 Aug '09

Module: wine Branch: master Commit: d82cbcf049fb5b85ab69549135bf28229dc769d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82cbcf049fb5b85ab6954913… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 19 14:27:20 2009 -0700 rpcrt4: Allow Annotation to be NULL. Fixes bug 19760. --Juan >From afb4d6b943345e19952fe34bd1d8ab4c411563ae Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang(a)gmail.com> Date: Wed, 19 Aug 2009 14:27:20 -0700 Subject: [PATCH 3/3] Allow Annotation to be NULL --- dlls/rpcrt4/rpc_epmap.c | 5 +++-- dlls/rpcrt4/tests/rpc_protseq.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 2a03484..60c4255 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -225,7 +225,6 @@ RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bind RpcBinding* bind = BindingVector->BindingH[i]; for (j = 0; j < (UuidVector ? UuidVector->Count : 1); j++) { - int len = strlen((char *)Annotation); status = TowerConstruct(&If->InterfaceId, &If->TransferSyntax, bind->Protseq, bind->Endpoint, bind->NetworkAddr, @@ -236,7 +235,9 @@ RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bind memcpy(&entries[i * UuidVector->Count].object, &UuidVector->Uuid[j], sizeof(GUID)); else memset(&entries[i].object, 0, sizeof(entries[i].object)); - memcpy(entries[i].annotation, Annotation, min(len + 1, ept_max_annotation_size)); + if (Annotation) + memcpy(entries[i].annotation, Annotation, + min(strlen((char *)Annotation) + 1, ept_max_annotation_size)); } } diff --git a/dlls/rpcrt4/tests/rpc_protseq.c b/dlls/rpcrt4/tests/rpc_protseq.c index 4837f6a..3acc38b 100644 --- a/dlls/rpcrt4/tests/rpc_protseq.c +++ b/dlls/rpcrt4/tests/rpc_protseq.c @@ -157,6 +157,9 @@ static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address) /* register endpoints created in test_RpcServerUseProtseq */ status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, annotation); ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); + /* reregister the same endpoint with no annotation */ + status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, NULL); + ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); status = RpcStringBindingCompose(NULL, protseq, address, NULL, NULL, &binding);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2009