Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60249: [LOCALUI] * Move resource files to the lang folder. CORE-7470
by akhaldi＠svn.reactos.org 20 Sep '13

20 Sep '13

Author: akhaldi Date: Fri Sep 20 19:12:38 2013 New Revision: 60249 URL: http://svn.reactos.org/svn/reactos?rev=60249&view=rev Log: [LOCALUI] * Move resource files to the lang folder. CORE-7470 Added: trunk/reactos/dll/win32/localui/lang/ (with props) trunk/reactos/dll/win32/localui/lang/ui_Da.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Da.rc trunk/reactos/dll/win32/localui/lang/ui_De.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_De.rc trunk/reactos/dll/win32/localui/lang/ui_En.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_En.rc trunk/reactos/dll/win32/localui/lang/ui_Es.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Es.rc trunk/reactos/dll/win32/localui/lang/ui_Fr.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Fr.rc trunk/reactos/dll/win32/localui/lang/ui_He.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_He.rc trunk/reactos/dll/win32/localui/lang/ui_Hu.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Hu.rc trunk/reactos/dll/win32/localui/lang/ui_It.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_It.rc trunk/reactos/dll/win32/localui/lang/ui_Ja.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Ja.rc trunk/reactos/dll/win32/localui/lang/ui_Ko.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Ko.rc trunk/reactos/dll/win32/localui/lang/ui_Lt.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Lt.rc trunk/reactos/dll/win32/localui/lang/ui_Nl.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Nl.rc trunk/reactos/dll/win32/localui/lang/ui_No.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_No.rc trunk/reactos/dll/win32/localui/lang/ui_Pl.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Pl.rc trunk/reactos/dll/win32/localui/lang/ui_Pt.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Pt.rc trunk/reactos/dll/win32/localui/lang/ui_Ro.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Ro.rc trunk/reactos/dll/win32/localui/lang/ui_Ru.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Ru.rc trunk/reactos/dll/win32/localui/lang/ui_Si.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Si.rc trunk/reactos/dll/win32/localui/lang/ui_Sv.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Sv.rc trunk/reactos/dll/win32/localui/lang/ui_Uk.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Uk.rc trunk/reactos/dll/win32/localui/lang/ui_Zh.rc - copied unchanged from r60247, trunk/reactos/dll/win32/localui/ui_Zh.rc Removed: trunk/reactos/dll/win32/localui/ui_Da.rc trunk/reactos/dll/win32/localui/ui_De.rc trunk/reactos/dll/win32/localui/ui_En.rc trunk/reactos/dll/win32/localui/ui_Es.rc trunk/reactos/dll/win32/localui/ui_Fr.rc trunk/reactos/dll/win32/localui/ui_He.rc trunk/reactos/dll/win32/localui/ui_Hu.rc trunk/reactos/dll/win32/localui/ui_It.rc trunk/reactos/dll/win32/localui/ui_Ja.rc trunk/reactos/dll/win32/localui/ui_Ko.rc trunk/reactos/dll/win32/localui/ui_Lt.rc trunk/reactos/dll/win32/localui/ui_Nl.rc trunk/reactos/dll/win32/localui/ui_No.rc trunk/reactos/dll/win32/localui/ui_Pl.rc trunk/reactos/dll/win32/localui/ui_Pt.rc trunk/reactos/dll/win32/localui/ui_Ro.rc trunk/reactos/dll/win32/localui/ui_Ru.rc trunk/reactos/dll/win32/localui/ui_Si.rc trunk/reactos/dll/win32/localui/ui_Sv.rc trunk/reactos/dll/win32/localui/ui_Uk.rc trunk/reactos/dll/win32/localui/ui_Zh.rc Modified: trunk/reactos/dll/win32/localui/localui.rc Propchange: trunk/reactos/dll/win32/localui/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 20 19:12:38 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/localui/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/localui/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/localui/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Modified: trunk/reactos/dll/win32/localui/localui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/localui.rc [iso-8859-1] Fri Sep 20 19:12:38 2013 @@ -38,67 +38,67 @@ #include "wine/wine_common_ver.rc" #ifdef LANGUAGE_DA_DK - #include "ui_Da.rc" + #include "lang/ui_Da.rc" #endif #ifdef LANGUAGE_EN_US - #include "ui_En.rc" + #include "lang/ui_En.rc" #endif #ifdef LANGUAGE_KO_KR - #include "ui_Ko.rc" + #include "lang/ui_Ko.rc" #endif #ifdef LANGUAGE_NL_NL - #include "ui_Nl.rc" + #include "lang/ui_Nl.rc" #endif #ifdef LANGUAGE_NO_NO - #include "ui_No.rc" + #include "lang/ui_No.rc" #endif #ifdef LANGUAGE_PL_PL - #include "ui_Pl.rc" + #include "lang/ui_Pl.rc" #endif #ifdef LANGUAGE_PT_PT - #include "ui_Pt.rc" + #include "lang/ui_Pt.rc" #endif #ifdef LANGUAGE_SV_SE - #include "ui_Sv.rc" + #include "lang/ui_Sv.rc" #endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE - #include "ui_De.rc" + #include "lang/ui_De.rc" #endif #ifdef LANGUAGE_ES_ES - #include "ui_Es.rc" + #include "lang/ui_Es.rc" #endif #ifdef LANGUAGE_FR_FR - #include "ui_Fr.rc" + #include "lang/ui_Fr.rc" #endif #ifdef LANGUAGE_HE_IL - #include "ui_He.rc" + #include "lang/ui_He.rc" #endif #ifdef LANGUAGE_HU_HU - #include "ui_Hu.rc" + #include "lang/ui_Hu.rc" #endif #ifdef LANGUAGE_IT_IT - #include "ui_It.rc" + #include "lang/ui_It.rc" #endif #ifdef LANGUAGE_JA_JP - #include "ui_Ja.rc" + #include "lang/ui_Ja.rc" #endif #ifdef LANGUAGE_LT_LT - #include "ui_Lt.rc" + #include "lang/ui_Lt.rc" #endif #ifdef LANGUAGE_RO_RO - #include "ui_Ro.rc" + #include "lang/ui_Ro.rc" #endif #ifdef LANGUAGE_RU_RU - #include "ui_Ru.rc" + #include "lang/ui_Ru.rc" #endif #ifdef LANGUAGE_SL_SI - #include "ui_Si.rc" + #include "lang/ui_Si.rc" #endif #ifdef LANGUAGE_UK_UA - #include "ui_Uk.rc" + #include "lang/ui_Uk.rc" #endif #ifdef LANGUAGE_ZH_CN - #include "ui_Zh.rc" + #include "lang/ui_Zh.rc" #endif Removed: trunk/reactos/dll/win32/localui/ui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Da.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Da.rc (removed) @@ -1,56 +0,0 @@ -/* - * Danish resources for localui - * - * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> - * - * 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 "localui.h" - -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Opret en lokal port" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Skriv navnet på den nye port:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Annuller", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Opsæt LPT port" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Timeout (sekunder)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Transmission retry:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Annuller", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokal port" - IDS_INVALIDNAME "'%s' er ikke et gyldigt port navn" - IDS_PORTEXISTS "Porten %s findes allerede" - IDS_NOTHINGTOCONFIG "Denne port har ingen indstillinger" -} Removed: trunk/reactos/dll/win32/localui/ui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_De.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_De.rc (removed) @@ -1,58 +0,0 @@ -/* - * German resources for localui - * - * Copyright 2007 Detlef Riekenberg - * - * 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 "localui.h" - -#pragma code_page(65001) - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Lokalen Anschluss hinzufÃ¼gen" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Lokaler Anschuss, der hinzugefÃ¼gt werden soll:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Abbrechen", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "LPT-Anschluss konfigurieren" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "ZeitÃ¼berschreitung (Sekunden)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "Ã&bertragung wiederholen:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Abbrechen", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokaler Anschluss" - IDS_INVALIDNAME "'%s' ist kein gÃ¼ltiger Anschlussname" - IDS_PORTEXISTS "Der Anschluss %s existiert bereits" - IDS_NOTHINGTOCONFIG "Dieser Anschluss hat keine Optionen zum Konfigurieren" -} Removed: trunk/reactos/dll/win32/localui/ui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_En.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_En.rc (removed) @@ -1,56 +0,0 @@ -/* - * English resources for localui - * - * Copyright 2007 Detlef Riekenberg - * - * 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 "localui.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Add a Local Port" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Enter the port name to add:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Cancel", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Configure LPT Port" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Timeout (seconds)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Transmission Retry:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Cancel", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Local Port" - IDS_INVALIDNAME "'%s' is not a valid port name" - IDS_PORTEXISTS "Port %s already exists" - IDS_NOTHINGTOCONFIG "This port has no options to configure" -} Removed: trunk/reactos/dll/win32/localui/ui_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Es.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Es.rc (removed) @@ -1,58 +0,0 @@ -/* - * Spanish resources for localui - * - * Copyright 2010 JosÃ© Rostagno - * - * 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 "localui.h" - -#pragma code_page(65001) - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Agregar un puerto local" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Ingrese el nombre del puerto a agregar:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Aceptar", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Configurar puerto LPT" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Tiempo de espera (segundos)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Reintentar transmisiÃ³n:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "Aceptar", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Cancelar", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Puerto local" - IDS_INVALIDNAME "'%s' no es un nombre de puerto vÃ¡lido" - IDS_PORTEXISTS "El puerto %s ya existe" - IDS_NOTHINGTOCONFIG "Este puerto no tiene opciones para configurar" -} Removed: trunk/reactos/dll/win32/localui/ui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Fr.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Fr.rc (removed) @@ -1,58 +0,0 @@ -/* - * French resources for localui - * - * Copyright 2007 JonathanÂ Ernst - * - * 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 "localui.h" - -#pragma code_page(65001) - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ajouter un port local" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Saisisser le nom du port Ã ajouterÂ :", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Annuler", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Configurer un port LPT" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "DÃ©lai (en secondes)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Essais de retransmissionÂ :", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Annuler", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Port local" - IDS_INVALIDNAME "Â«Â %sÂ Â» n'est pas un nom de port valide" - IDS_PORTEXISTS "Le port %s existe dÃ©jÃ " - IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration" -} Removed: trunk/reactos/dll/win32/localui/ui_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_He.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_He.rc (removed) @@ -1,58 +0,0 @@ -/* - * Hebrew resources for localui - * - * Copyright 2007 Detlef Riekenberg - * - * Translated by Baruch Rutman - * - * 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 "localui.h" - -LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "×××¡×£ ××¦××× ××§××××ª" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "××× ××ª ×©× ×××¦××× ××× ××××¡××¤×:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "×××©××¨", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "×××××", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "××××¨×ª ××¦×××ª LPT" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "×¤×¡×§ ××× (×©× ×××ª)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "× ××¡××× ×©××××¨ ××××¨:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "×××©××¨", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "×××××", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "××¦××× ××§××××ª" - IDS_INVALIDNAME "'%s' ××× × ×©× ××¦××× ×××§×" - IDS_PORTEXISTS "××¦××× %s ×××¨ ×§××××ª" - IDS_NOTHINGTOCONFIG "×××¦××× ××× ××× ××¤×©×¨××××ª ××××××¨" -} Removed: trunk/reactos/dll/win32/localui/ui_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Hu.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Hu.rc (removed) @@ -1,59 +0,0 @@ -/* - * Hungarian resources for localui - * - * Copyright 2010 Andras Kovacs - * - * 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 "localui.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Helyi port hozzÃ¡adÃ¡sa" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Adja meg a &hozzÃ¡adni kÃvÃ¡nt port nevÃ©t:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "MÃ©gse", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "LPT port beÃ¡llÃtÃ¡sa" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "IdÅtÃºllÃ©pÃ©s (mÃ¡sodperc)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "Ã&tviteli ÃºjraprÃ³bÃ¡lkozÃ¡s:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "MÃ©gse", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Helyi port" - IDS_INVALIDNAME "A(z) '%s' nem egy Ã©rvÃ©nyes portnÃ©v" - IDS_PORTEXISTS "A port: %s mÃ¡r lÃ©tezik" - IDS_NOTHINGTOCONFIG "Ennek a portnak nincsenek beÃ¡llÃthatÃ³ tulajdonsÃ¡gai" -} Removed: trunk/reactos/dll/win32/localui/ui_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_It.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_It.rc (removed) @@ -1,60 +0,0 @@ -/* - * Italian resources for localui - * - * Copyright 2007 Detlef Riekenberg - * 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 "localui.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Aggiungi una porta locale" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Inserisci il nome della porta da aggiungere:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Annulla", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Configura la porta LPT" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Timeout (secondi)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Tentativi di trasmissione:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Annulla", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Porta locale" - IDS_INVALIDNAME "'%s' non Ã¨ un nome di porta valido" - IDS_PORTEXISTS "La porta %s giÃ esiste" - IDS_NOTHINGTOCONFIG "Questa porta non ha opzioni da configurare" -} Removed: trunk/reactos/dll/win32/localui/ui_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ja.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ja.rc (removed) @@ -1,59 +0,0 @@ -/* - * Japanese resources for localui - * - * Copyright 2007 Detlef Riekenberg - * - * 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 "localui.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ãã¼ã«ã« ãã¼ãã®è¿½å " -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "è¿½å ãããã¼ãã®åå(&E):", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ããªã³ã¿ ãã¼ãã®è¨å®" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "ã¿ã¤ã ã¢ã¦ã (ç§)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "åéåæ°(&T):", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "ãã¼ã«ã« ãã¼ã" - IDS_INVALIDNAME "'%s' ã¯ãã¼ãåã¨ãã¦æ£ããããã¾ãã" - IDS_PORTEXISTS "ãã¼ã %s ã¯ãã§ã«åå¨ãã¾ã" - IDS_NOTHINGTOCONFIG "ãã®ãã¼ãã«ã¯è¨å®é ç®ãããã¾ãã" -} Removed: trunk/reactos/dll/win32/localui/ui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ko.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ko.rc (removed) @@ -1,57 +0,0 @@ -/* - * Korean resources for localui - * - * Copyright 2007 Detlef Riekenberg - * Copyright 2007 YunSong Hwang(È²À±¼º)(hys545(a)dreamwiz.com) - * - * 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 "localui.h" - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Áö¿ª Æ÷Æ® ´õÇÏ±â" -FONT 9, "MS Shell Dlg" -BEGIN - LTEXT "´õÇÒ Æ÷Æ® ÀÌ¸§ ÀÔ·Â(&E):", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "È®ÀÎ", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Ãë¼Ò", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "LPT Æ÷Æ® ¼³Á¤" -FONT 9, "MS Shell Dlg" -BEGIN - GROUPBOX "½Ã°£ÃÊ°ú(ÃÊ)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "Àç Àü¼Û È½¼ö(&T):", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "È®ÀÎ", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Ãë¼Ò", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Áö¿ª Æ÷Æ®" - IDS_INVALIDNAME "'%s'´Â ¿Ã¹Ù¸¥ Æ÷Æ® ÀÌ¸§ÀÌ ¾Æ´Õ´Ï´Ù" - IDS_PORTEXISTS "Æ÷Æ® %s´Â ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù" - IDS_NOTHINGTOCONFIG "ÀÌ Æ÷Æ®´Â ¼³Á¤ÇÒ ¿É¼ÇÀÌ ¾ø½À´Ï´Ù" -} Removed: trunk/reactos/dll/win32/localui/ui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Lt.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Lt.rc (removed) @@ -1,59 +0,0 @@ -/* - * Lithuanian resources for localui - * - * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> - * - * 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 "localui.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "PridÄti vietinÄ¯ prievadÄ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Ä®veskite pridedamo prievado vardÄ:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Gerai", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Atsisakyti", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "KonfigÅ«ruoti LPT prievadÄ" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Laukimo laikas (sekundÄmis)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Perdavimo pakartojimas:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "Gerai", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Atsisakyti", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Vietinis prievadas" - IDS_INVALIDNAME "â%sâ yra netinkamas prievado vardas" - IDS_PORTEXISTS "Prievadas %s jau egzistuoja" - IDS_NOTHINGTOCONFIG "Å is prievadas neturi parinkÄiÅ³ konfigÅ«ravimui" -} Removed: trunk/reactos/dll/win32/localui/ui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Nl.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Nl.rc (removed) @@ -1,56 +0,0 @@ -/* - * Dutch resources for localui - * - * Copyright 2008 Frans Kool - * - * 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 "localui.h" - -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Voeg een Lokale Poort toe" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Voer de toe te voegen poort naam in:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Annuleren", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Configureer LPT Poort" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Timeout (seconden)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Transmissie Herstart:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Annuleren", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokale Poort" - IDS_INVALIDNAME "'%s' is geen valide poort naam" - IDS_PORTEXISTS "Poort %s bestaat reeds" - IDS_NOTHINGTOCONFIG "Deze poort heeft geen opties om in te stellen" -} Removed: trunk/reactos/dll/win32/localui/ui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_No.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_No.rc (removed) @@ -1,56 +0,0 @@ -/* - * Norwegian Bokmål resources for localui - * - * Copyright 2007 Alexander N. Sørnes <alex(a)thehandofagony.com> - * - * 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 "localui.h" - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Legg til en lokal port" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Skriv inn navn&et på den nye porten:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Avbryt", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Oppsett av LPT-port" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Tidsavbrudd (sekunder)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "Prøv å sende på nyt&t:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Avbryt", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokal port" - IDS_INVALIDNAME "«%s» er ikke et gyldig portnavn" - IDS_PORTEXISTS "Porten %s finnes allerede" - IDS_NOTHINGTOCONFIG "Denne porten har ingen innstillinger" -} Removed: trunk/reactos/dll/win32/localui/ui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pl.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Pl.rc (removed) @@ -1,57 +0,0 @@ -/* - * Polish resources for localui - * - * Copyright 2007 Detlef Riekenberg - * Copyright 2007 Mikolaj Zalewski - * - * 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 "localui.h" - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Dodaj port lokalny" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Nazwa nowego portu:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "&OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "&Anuluj", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Konfiguracja portu LPT" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Czasy oczekiwania (sekundy)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Ponowienie transmisji:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "&OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "&Anuluj", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Port lokalny" - IDS_INVALIDNAME "'%s' nie jest poprawn¹ nazw¹ portu" - IDS_PORTEXISTS "Port %s ju¿ istnieje" - IDS_NOTHINGTOCONFIG "Ten port nie ma opcji do skonfigurowania" -} Removed: trunk/reactos/dll/win32/localui/ui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pt.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Pt.rc (removed) @@ -1,56 +0,0 @@ -/* - * Portuguese resources for localui - * - * Copyright 2008 Ricardo Filipe - * - * 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 "localui.h" - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Adicionar uma porta local" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Introduza o nome da porta a adicionar:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Configurar porta LPT" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Tempo expirado (segundos)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Recomeço da transmissão:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Cancelar", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Porta Local" - IDS_INVALIDNAME "'%s' não é um nome de porta válido" - IDS_PORTEXISTS "Porta %s já existe" - IDS_NOTHINGTOCONFIG "Esta porta não possui opções de configuração" -} Removed: trunk/reactos/dll/win32/localui/ui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ro.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ro.rc (removed) @@ -1,57 +0,0 @@ -/* - * Copyright 2007 Detlef Riekenberg - * Copyright 2008 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 "localui.h" - -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "AdaugÄ un port local" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Nume port de adÄugat:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "RenunÈÄ", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Configurare port LPT" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Temporizare (secunde)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "ReÃ®ncearcÄ &transmisia:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "RenunÈÄ", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Port local" - IDS_INVALIDNAME "'%s' nu este un nume valid de port" - IDS_PORTEXISTS "Portul %s existsÄ deja" - IDS_NOTHINGTOCONFIG "Acest port nu are opÈiuni de configurat" -} Removed: trunk/reactos/dll/win32/localui/ui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ru.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ru.rc (removed) @@ -1,59 +0,0 @@ -/* - * Russian resources for localui - * - * Copyright 2008 Vitaliy Margolen - * - * 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 "localui.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ Ð¿Ð¾ÑÑ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ &Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð¿Ð¾ÑÑÐ°:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð¸ÑÑ", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð¿Ð°ÑÐ°Ð»Ð»ÐµÐ»ÑÐ½Ð¾Ð³Ð¾ Ð¿Ð¾ÑÑÐ°" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Ð¢Ð°Ð¹Ð¼-Ð°ÑÑ (ÑÐµÐºÑÐ½Ð´)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&ÐÐ¾Ð¿ÑÑÐ¾Ðº Ð¿ÐµÑÐµÑÑÐ»ÐºÐ¸:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "ÐÐ¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ Ð¿Ð¾ÑÑ" - IDS_INVALIDNAME "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð¾ÑÑÐ° '%s'" - IDS_PORTEXISTS "ÐÐ¾ÑÑ '%s' ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" - IDS_NOTHINGTOCONFIG "ÐÑÐ¾Ñ Ð¿Ð¾ÑÑ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð½Ð°ÑÑÑÐ¾ÐµÐº" -} Removed: trunk/reactos/dll/win32/localui/ui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Si.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Si.rc (removed) @@ -1,58 +0,0 @@ -/* - * Slovenian resources for localui - * - * Copyright 2008 Rok Mandeljc - * - * 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 "localui.h" - -#pragma code_page(65001) - -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Dodaj lokalna vrata" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Ime vrat:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "V redu", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "PrekliÄi", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Nastavitev LPT vrat" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Äasovna omejitev (seconds)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Ponoven poskus prenosa:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "V redu", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "PrekliÄi", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokalna vrata" - IDS_INVALIDNAME "'%s' ni veljavno ime vrat" - IDS_PORTEXISTS "Vrata z imenom %s Å¾e obstajajo" - IDS_NOTHINGTOCONFIG "Ta vrata nimajo moÅ¾nosti nastavitve" -} Removed: trunk/reactos/dll/win32/localui/ui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Sv.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Sv.rc (removed) @@ -1,56 +0,0 @@ -/* - * Swedish resources for localui - * - * Copyright 2007 Daniel Nylander - * - * 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 "localui.h" - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Lägg till en lokal port" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Ange portnamnet att lägga till:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Avbryt", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Konfigurera LPT-port" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Tidsgräns (sekunder)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "Öve&rföringsförsök:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Avbryt", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokal port" - IDS_INVALIDNAME "'%s' är inte ett giltigt portnamn" - IDS_PORTEXISTS "Porten %s finns redan" - IDS_NOTHINGTOCONFIG "Denna port har inga alternativ att konfigurera" -} Removed: trunk/reactos/dll/win32/localui/ui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Uk.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Uk.rc (removed) @@ -1,59 +0,0 @@ -/* - * Ukrainian resources for localui - * - * Copyright 2010 Igor Paliychuk - * - * 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 "localui.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ÐÐ¾Ð´Ð°ÑÐ¸ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¸Ð¹ Ð¿Ð¾ÑÑ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ÐÐ²ÐµÐ´ÑÑÑ &Ð½Ð°Ð·Ð²Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð¿Ð¾ÑÑÐ°:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ LPT Ð¿Ð¾ÑÑÐ°" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Ð¢Ð°Ð¹Ð¼-Ð°ÑÑ (ÑÐµÐºÑÐ½Ð´)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&Ð¡Ð¿ÑÐ¾Ð± Ð¿ÐµÑÐµÑÐ¸Ð»Ð°Ð½Ð½Ñ:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð¸Ð¹ Ð¿Ð¾ÑÑ" - IDS_INVALIDNAME "'%s' Ð½Ðµ Ð´ÑÐ¹ÑÐ½Ð° Ð½Ð°Ð·Ð²Ð° Ð¿Ð¾ÑÑÑ" - IDS_PORTEXISTS "ÐÐ¾ÑÑ '%s' Ð²Ð¶Ðµ ÑÑÐ½ÑÑ" - IDS_NOTHINGTOCONFIG "Ð¦ÐµÐ¹ Ð¿Ð¾ÑÑ Ð½Ðµ Ð¼Ð°Ñ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ñ" -} Removed: trunk/reactos/dll/win32/localui/ui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Zh.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Zh.rc (removed) @@ -1,94 +0,0 @@ -/* - * localui (Simplified and Traditional Chinese Resources) - * - * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> - * - * 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 "localui.h" - -/* Chinese text is encoded in UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "æ·»å æ¬å°ç«¯å£" -FONT 9, "MS Shell Dlg" -BEGIN - LTEXT "æ·»å æ¬å°ç«¯å£åç§°(&E):", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "ç¡®å®", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "åæ¶", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "è®¾ç½®æå°ç«¯å£" -FONT 9, "MS Shell Dlg" -BEGIN - GROUPBOX "è¶æ¶(ç§)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "éè¯éè®¯(&T):", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "ç¡®å®", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "åæ¶", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "æ¬å°ç«¯å£" - IDS_INVALIDNAME "'%s' ä¸æ¯ææçç«¯å£åç§°" - IDS_PORTEXISTS "ç«¯å£ %s å·²ç»åå¨" - IDS_NOTHINGTOCONFIG "è¿ä¸ªç«¯å£æ²¡æå¯è®¾ç½®éé¡¹" -} - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL - -ADDPORT_DIALOG DIALOG 6, 18, 245, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "æ·»å æ¬å°ç«¯å£" -FONT 9, "MS Shell Dlg" -BEGIN - LTEXT "æ·»å æ¬å°ç«¯å£åç¨±(&E):", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "ç¢ºå®", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "åæ¶", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE -END - - -LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "è¨å®åå°ç«¯å£" -FONT 9, "MS Shell Dlg" -BEGIN - GROUPBOX "è¶æ(ç§)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "éè©¦éè¨(&T):", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "ç¢ºå®", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "åæ¶", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE -END - - -STRINGTABLE -{ - IDS_LOCALPORT "æ¬å°ç«¯å£" - IDS_INVALIDNAME "'%s' ä¸æ¯ææçç«¯å£åç¨±" - IDS_PORTEXISTS "ç«¯å£ %s å·²ç¶åå¨" - IDS_NOTHINGTOCONFIG "éåç«¯å£æ²æå¯è¨å®é¸é " -}

1 0

[akhaldi] 60248: [LOADPERF] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 20 Sep '13

20 Sep '13

Author: akhaldi Date: Fri Sep 20 13:28:20 2013 New Revision: 60248 URL: http://svn.reactos.org/svn/reactos?rev=60248&view=rev Log: [LOADPERF] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/loadperf/CMakeLists.txt trunk/reactos/dll/win32/loadperf/loadperf_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] Fri Sep 20 13:28:20 2013 @@ -1,16 +1,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(loadperf.dll loadperf.spec ADD_IMPORTLIB) -add_library(loadperf SHARED - loadperf_main.c - stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def) +list(APPEND SOURCE + loadperf_main.c + stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def) +add_library(loadperf SHARED ${SOURCE}) set_module_type(loadperf win32dll) target_link_libraries(loadperf wine) add_importlibs(loadperf msvcrt kernel32 ntdll) add_cd_file(TARGET loadperf DESTINATION reactos/system32 FOR all) - Modified: trunk/reactos/dll/win32/loadperf/loadperf_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadper… ============================================================================== --- trunk/reactos/dll/win32/loadperf/loadperf_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/loadperf/loadperf_main.c [iso-8859-1] Fri Sep 20 13:28:20 2013 @@ -44,8 +44,6 @@ return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: break; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 20 13:28:20 2013 @@ -92,7 +92,7 @@ reactos/dll/win32/itircl # Synced to Wine-1.7.1 reactos/dll/win32/itss # Synced to Wine-1.7.1 reactos/dll/win32/jscript # Synced to Wine-1.7.1 -reactos/dll/win32/loadperf # Synced to Wine-1.5.19 +reactos/dll/win32/loadperf # Synced to Wine-1.7.1 reactos/dll/win32/localspl # Synced to Wine-1.5.26 reactos/dll/win32/localui # Synced to Wine-1.5.19 reactos/dll/win32/lz32 # Synced to Wine-1.5.19

1 0

[akhaldi] 60247: [JSCRIPT_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 20 Sep '13

20 Sep '13

Author: akhaldi Date: Fri Sep 20 12:16:03 2013 New Revision: 60247 URL: http://svn.reactos.org/svn/reactos?rev=60247&view=rev Log: [JSCRIPT_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Added: trunk/rostests/winetests/jscript/sunspider-regexp-dna.js (with props) trunk/rostests/winetests/jscript/sunspider-string-base64.js (with props) trunk/rostests/winetests/jscript/sunspider-string-validate-input.js (with props) Modified: trunk/rostests/winetests/jscript/CMakeLists.txt trunk/rostests/winetests/jscript/regexp.js trunk/rostests/winetests/jscript/rsrc.rc trunk/rostests/winetests/jscript/run.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/CMakeLi… Modified: trunk/rostests/winetests/jscript/regexp.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/regexp.… Modified: trunk/rostests/winetests/jscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/rsrc.rc… Modified: trunk/rostests/winetests/jscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/run.c?r… Added: trunk/rostests/winetests/jscript/sunspider-regexp-dna.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/sunspid… Added: trunk/rostests/winetests/jscript/sunspider-string-base64.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/sunspid… Added: trunk/rostests/winetests/jscript/sunspider-string-validate-input.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/sunspid…

1 0

[akhaldi] 60246: [JSCRIPT] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 20 Sep '13

20 Sep '13

Author: akhaldi Date: Fri Sep 20 12:14:54 2013 New Revision: 60246 URL: http://svn.reactos.org/svn/reactos?rev=60246&view=rev Log: [JSCRIPT] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt trunk/reactos/dll/win32/jscript/activex.c trunk/reactos/dll/win32/jscript/array.c trunk/reactos/dll/win32/jscript/compile.c trunk/reactos/dll/win32/jscript/date.c trunk/reactos/dll/win32/jscript/dispex.c trunk/reactos/dll/win32/jscript/engine.c trunk/reactos/dll/win32/jscript/error.c trunk/reactos/dll/win32/jscript/function.c trunk/reactos/dll/win32/jscript/global.c trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/jscript/jscript_main.c trunk/reactos/dll/win32/jscript/jsregexp.c trunk/reactos/dll/win32/jscript/jsstr.c trunk/reactos/dll/win32/jscript/jsstr.h trunk/reactos/dll/win32/jscript/jsutils.c trunk/reactos/dll/win32/jscript/number.c trunk/reactos/dll/win32/jscript/object.c trunk/reactos/dll/win32/jscript/parser.tab.c trunk/reactos/dll/win32/jscript/parser.tab.h trunk/reactos/dll/win32/jscript/parser.y trunk/reactos/dll/win32/jscript/string.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/CMakeLis… Modified: trunk/reactos/dll/win32/jscript/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/activex.… Modified: trunk/reactos/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/array.c?… Modified: trunk/reactos/dll/win32/jscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/compile.… Modified: trunk/reactos/dll/win32/jscript/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/date.c?r… Modified: trunk/reactos/dll/win32/jscript/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/dispex.c… Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c… Modified: trunk/reactos/dll/win32/jscript/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/error.c?… Modified: trunk/reactos/dll/win32/jscript/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/function… Modified: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c… Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… Modified: trunk/reactos/dll/win32/jscript/jscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Modified: trunk/reactos/dll/win32/jscript/jsregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsregexp… Modified: trunk/reactos/dll/win32/jscript/jsstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsstr.c?… Modified: trunk/reactos/dll/win32/jscript/jsstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsstr.h?… Modified: trunk/reactos/dll/win32/jscript/jsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsutils.… Modified: trunk/reactos/dll/win32/jscript/number.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/number.c… Modified: trunk/reactos/dll/win32/jscript/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/object.c… Modified: trunk/reactos/dll/win32/jscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… Modified: trunk/reactos/dll/win32/jscript/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… Modified: trunk/reactos/dll/win32/jscript/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.y… Modified: trunk/reactos/dll/win32/jscript/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/string.c… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 60245: [ITSS_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 20 Sep '13

20 Sep '13

Author: akhaldi Date: Fri Sep 20 10:54:23 2013 New Revision: 60245 URL: http://svn.reactos.org/svn/reactos?rev=60245&view=rev Log: [ITSS_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/itss/CMakeLists.txt trunk/rostests/winetests/itss/protocol.c trunk/rostests/winetests/itss/testlist.c Modified: trunk/rostests/winetests/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/CMakeLists… ============================================================================== --- trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] Fri Sep 20 10:54:23 2013 @@ -1,7 +1,5 @@ -add_definitions(-D__ROS_LONG64__) add_executable(itss_winetest protocol.c testlist.c rsrc.rc) -target_link_libraries(itss_winetest wine) set_module_type(itss_winetest win32cui) -add_importlibs(itss_winetest ole32 msvcrt kernel32 ntdll) +add_importlibs(itss_winetest ole32 msvcrt kernel32) add_cd_file(TARGET itss_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/itss/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/protocol.c… ============================================================================== --- trunk/rostests/winetests/itss/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/itss/protocol.c [iso-8859-1] Fri Sep 20 10:54:23 2013 @@ -87,6 +87,8 @@ 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; static const WCHAR blank_url8[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; +static const WCHAR blank_url9[] = {'i','t','s',':', + 't','e','s','t','.','c','h','m',':',':','/','d','i','r','/','.','.','/','b','l','a','n','k','.','h','t','m','l',0}; static enum { ITS_PROTOCOL, @@ -100,6 +102,24 @@ static const WCHAR cache_file3[] = {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; static const WCHAR *cache_file = cache_file1; + +static const WCHAR *a2w(const char *str) +{ + static WCHAR bufs[8][128]; + static int i; + + if(!str) + return NULL; + + i = (i+1) % 8; + MultiByteToWideChar(CP_ACP, 0, str, -1, bufs[i], 128); + return bufs[i]; +} + +static int strcmp_wa(const WCHAR *str1, const char *str2) +{ + return lstrcmpW(str1, a2w(str2)); +} static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { @@ -440,65 +460,35 @@ read_protocol = NULL; } -static const WCHAR rel_url1[] = - {'t','e','s','t','.','h','t','m','l',0}; -static const WCHAR rel_url2[] = - {'t','e','s','t','.','c','h','m',':',':','/','t','e','s','t','.','h','t','m','l',0}; -static const WCHAR rel_url3[] = - {'/','t','e','s','t','.','h','t','m','l',0}; -static const WCHAR rel_url4[] = - {'t','e',':','t','.','h','t','m','l',0}; -static const WCHAR rel_url5[] = - {'d','i','r','/','t','e','s','t','.','h','t','m','l',0}; - -static const WCHAR base_url1[] = {'i','t','s',':', - 't','e','s','t',':','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR base_url2[] = {'i','t','s',':','t','e','s','t','.','c','h','m', - ':',':','/','d','i','r','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR base_url3[] = {'m','s','-','i','t','s',':','t','e','s','t','.','c','h','m', - ':',':','/','d','i','r','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR base_url4[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','/','d','i','r','/', - 'b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR base_url5[] = {'x','x','x',':','t','e','s','t','.','c','h','m', - ':',':','/','d','i','r','/','b','l','a','n','k','.','h','t','m','l',0}; - -static const WCHAR combined_url1[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','t','e','s','t','.','h','t','m','l',0}; -static const WCHAR combined_url2[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','d','i','r','/','t','e','s','t','.','h','t','m','l',0}; -static const WCHAR combined_url3[] = {'i','t','s',':', - 't','e','s','t',':','.','c','h','m',':',':','/','t','e','s','t','.','h','t','m','l',0}; -static const WCHAR combined_url4[] = {'i','t','s',':','t','e','s','t','.','c','h','m', - ':',':','b','l','a','n','k','.','h','t','m','l','t','e','s','t','.','h','t','m','l',0}; -static const WCHAR combined_url5[] = {'m','s','-','i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','d','i','r','/','t','e','s','t','.','h','t','m','l',0}; -static const WCHAR combined_url6[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','/','d','i','r','/','t','e','s','t','.','h','t','m','l',0}; - static const struct { - LPCWSTR base_url; - LPCWSTR rel_url; + const char *base_url; + const char *rel_url; DWORD flags; HRESULT hres; - LPCWSTR combined_url; + const char *combined_url; } combine_tests[] = { - {blank_url1, blank_url1, 0, STG_E_INVALIDNAME, NULL}, - {blank_url2, blank_url2, 0, STG_E_INVALIDNAME, NULL}, - {blank_url1, rel_url1, 0, S_OK, combined_url1}, - {blank_url1, rel_url2, 0, STG_E_INVALIDNAME, NULL}, - {blank_url1, rel_url3, 0, S_OK, combined_url1}, - {blank_url1, rel_url4, 0, STG_E_INVALIDNAME, NULL}, - {blank_url1, rel_url3, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, S_OK, combined_url1}, - {blank_url1, rel_url5, 0, S_OK, combined_url2}, - {rel_url1, rel_url2, 0, 0x80041001, NULL}, - {base_url1, rel_url1, 0, S_OK, combined_url3}, - {base_url2, rel_url1, 0, S_OK, combined_url2}, - {blank_url4, rel_url1, 0, S_OK, combined_url4}, - {base_url3, rel_url1, 0, S_OK, combined_url5}, - {base_url4, rel_url1, 0, S_OK, combined_url6}, - {base_url5, rel_url1, 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, - {base_url2, rel_url3, 0, S_OK, combined_url1}, + {"its:test.chm::/blank.html", "its:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, + {"mS-iTs:test.chm::/blank.html", "mS-iTs:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, + {"its:test.chm::/blank.html", "test.html", 0, S_OK, "its:test.chm::/test.html"}, + {"its:test.chm::/blank.html", "test.chm::/test.html", 0, STG_E_INVALIDNAME, NULL}, + {"its:test.chm::/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, + {"its:test.chm::/blank.html", "te:t.html", 0, STG_E_INVALIDNAME, NULL}, + {"its:test.chm::/blank.html", "/test.html", URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, S_OK, "its:test.chm::/test.html"}, + {"its:test.chm::/blank.html", "dir/test.html", 0, S_OK, "its:test.chm::/dir/test.html"}, + {"test.html", "test.chm::/test.html", 0, 0x80041001, NULL}, + {"its:test:.chm::/blank.html", "test.html", 0, S_OK, "its:test:.chm::/test.html"}, + {"its:test.chm::/dir/blank.html", "test.html", 0, S_OK, "its:test.chm::/dir/test.html"}, + {"its:test.chm::blank.html", "test.html", 0, S_OK, "its:test.chm::blank.htmltest.html"}, + {"ms-its:test.chm::/dir/blank.html", "test.html", 0, S_OK, "ms-its:test.chm::/dir/test.html"}, + {"mk:@MSITStore:test.chm::/dir/blank.html", "test.html", 0, S_OK, "mk:@MSITStore:test.chm::/dir/test.html"}, + {"xxx:test.chm::/dir/blank.html", "test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, + {"its:test.chm::/dir/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, + {"its:test.chm::/blank.html", "#frag", 0, S_OK, "its:test.chm::/blank.html#frag"}, + {"its:test.chm::/blank.html#hash", "#frag", 0, S_OK, "its:test.chm::/blank.html#hash#frag"}, + {"its:test.chm::/blank.html", "test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, + {"its:test.chm::/blank.html", "/test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, + {"its:test.chm::/blank.html", "?query", 0, S_OK, "its:test.chm::/?query"}, + {"its:test.chm::/blank.html#frag/blank", "test.html", 0, S_OK, "its:test.chm::/blank.html#frag/test.html"}, }; static void test_its_protocol_info(IInternetProtocol *protocol) @@ -525,25 +515,25 @@ for(i=0; i < sizeof(combine_tests)/sizeof(combine_tests[0]); i++) { size = 0xdeadbeef; memset(buf, 0xfe, sizeof(buf)); - hres = IInternetProtocolInfo_CombineUrl(info, combine_tests[i].base_url, - combine_tests[i].rel_url, combine_tests[i].flags, buf, + hres = IInternetProtocolInfo_CombineUrl(info, a2w(combine_tests[i].base_url), + a2w(combine_tests[i].rel_url), combine_tests[i].flags, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); ok(hres == combine_tests[i].hres, "[%d] CombineUrl returned %08x, expected %08x\n", i, hres, combine_tests[i].hres); - ok(size == (combine_tests[i].combined_url ? lstrlenW(combine_tests[i].combined_url)+1 + ok(size == (combine_tests[i].combined_url ? strlen(combine_tests[i].combined_url)+1 : 0xdeadbeef), "[%d] unexpected size=%d\n", i, size); if(combine_tests[i].combined_url) - ok(!lstrcmpW(combine_tests[i].combined_url, buf), "[%d] unexpected result\n", i); + ok(!strcmp_wa(buf, combine_tests[i].combined_url), "[%d] unexpected result: %s\n", i, wine_dbgstr_w(buf)); else ok(buf[0] == 0xfefe, "buf changed\n"); } size = 0xdeadbeef; memset(buf, 0xfe, sizeof(buf)); - hres = IInternetProtocolInfo_CombineUrl(info, blank_url1, rel_url1, 0, buf, + hres = IInternetProtocolInfo_CombineUrl(info, a2w("its:test.chm::/blank.html"), a2w("test.html"), 0, buf, 1, &size, 0); ok(hres == E_OUTOFMEMORY, "CombineUrl failed: %08x\n", hres); - ok(size == sizeof(combined_url1)/sizeof(WCHAR), "size=%d\n", size); + ok(size == 25, "size=%d\n", size); ok(buf[0] == 0xfefe, "buf changed\n"); IInternetProtocolInfo_Release(info); @@ -612,6 +602,7 @@ test_protocol_url(factory, blank_url5, TRUE); test_protocol_url(factory, blank_url6, TRUE); test_protocol_url(factory, blank_url8, TRUE); + test_protocol_url(factory, blank_url9, TRUE); bindf = BINDF_FROMURLMON | BINDF_NEEDFILE; test_protocol_url(factory, blank_url1, TRUE); } Modified: trunk/rostests/winetests/itss/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/testlist.c… ============================================================================== --- trunk/rostests/winetests/itss/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/itss/testlist.c [iso-8859-1] Fri Sep 20 10:54:23 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_protocol(void);

1 0

[akhaldi] 60244: [ITSS] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 20 Sep '13

20 Sep '13

Author: akhaldi Date: Fri Sep 20 10:53:58 2013 New Revision: 60244 URL: http://svn.reactos.org/svn/reactos?rev=60244&view=rev Log: [ITSS] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt trunk/reactos/dll/win32/itss/chm_lib.c trunk/reactos/dll/win32/itss/itss.c trunk/reactos/dll/win32/itss/moniker.c trunk/reactos/dll/win32/itss/protocol.c trunk/reactos/dll/win32/itss/storage.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] Fri Sep 20 10:53:58 2013 @@ -11,30 +11,11 @@ moniker.c protocol.c storage.c - #${REACTOS_BINARY_DIR}/include/reactos/wine/itss_i.c ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/itss.def) -add_library(itss SHARED - ${SOURCE} - rsrc.rc) - +add_library(itss SHARED ${SOURCE} rsrc.rc) set_module_type(itss win32dll) target_link_libraries(itss uuid wine) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(itss) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - -add_importlibs(itss - urlmon - shlwapi - ole32 - msvcrt - kernel32 - ntdll) - -add_dependencies(itss wineheaders) +add_importlibs(itss urlmon shlwapi ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET itss DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/itss/chm_lib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/chm_lib.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/chm_lib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/chm_lib.c [iso-8859-1] Fri Sep 20 10:53:58 2013 @@ -835,7 +835,7 @@ struct chmFile *newHandle=NULL; newHandle = HeapAlloc(GetProcessHeap(), 0, sizeof(struct chmFile)); - memcpy(newHandle, oldHandle, sizeof(struct chmFile)); + *newHandle = *oldHandle; /* duplicate fd handle */ DuplicateHandle(GetCurrentProcess(), oldHandle->fd, Modified: trunk/reactos/dll/win32/itss/itss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/itss.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/itss/itss.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/itss.c [iso-8859-1] Fri Sep 20 10:53:58 2013 @@ -62,8 +62,6 @@ DisableThreadLibraryCalls(hInstDLL); hInst = hInstDLL; break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } @@ -200,8 +198,8 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IITStorage)) { - IClassFactory_AddRef(iface); - *ppvObject = This; + IITStorage_AddRef(iface); + *ppvObject = iface; return S_OK; } Modified: trunk/reactos/dll/win32/itss/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/moniker.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/moniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/moniker.c [iso-8859-1] Fri Sep 20 10:53:58 2013 @@ -69,8 +69,8 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - IClassFactory_AddRef(iface); - *ppvObject = This; + IMoniker_AddRef(iface); + *ppvObject = iface; return S_OK; } @@ -358,7 +358,7 @@ DWORD sz; /* szFile[1] has space for one character already */ - sz = sizeof(ITS_IMonikerImpl) + strlenW( name )*sizeof(WCHAR); + sz = FIELD_OFFSET( ITS_IMonikerImpl, szFile[strlenW( name ) + 1] ); itsmon = HeapAlloc( GetProcessHeap(), 0, sz ); itsmon->IMoniker_iface.lpVtbl = &ITS_IMonikerImpl_Vtbl; @@ -399,8 +399,8 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - IClassFactory_AddRef(iface); - *ppvObject = This; + IParseDisplayName_AddRef(iface); + *ppvObject = iface; return S_OK; } Modified: trunk/reactos/dll/win32/itss/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/protocol.c?… ============================================================================== --- trunk/reactos/dll/win32/itss/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/protocol.c [iso-8859-1] Fri Sep 20 10:53:58 2013 @@ -138,6 +138,55 @@ return NULL; } +/* Adopted from urlmon */ +static void remove_dot_segments(WCHAR *path) { + const WCHAR *in = path; + WCHAR *out = path; + + while(1) { + /* Move the first path segment in the input buffer to the end of + * the output buffer, and any subsequent characters up to, including + * the next "/" character (if any) or the end of the input buffer. + */ + while(*in != '/') { + if(!(*out++ = *in++)) + return; + } + + *out++ = *in++; + + while(*in) { + if(*in != '.') + break; + + /* Handle ending "/." */ + if(!in[1]) { + ++in; + break; + } + + /* Handle "/./" */ + if(in[1] == '/') { + in += 2; + continue; + } + + /* If we don't have "/../" or ending "/.." */ + if(in[1] != '.' || (in[2] && in[2] != '/')) + break; + + in += *in ? 3 : 2; + + /* Find the slash preceding out pointer and move out pointer to it */ + if(out > path+1 && *--out == '/') + --out; + while(out > path && *(--out) != '/'); + if(*out == '/') + ++out; + } + } +} + static HRESULT report_result(IInternetProtocolSink *sink, HRESULT hres) { IInternetProtocolSink_ReportResult(sink, hres, 0, NULL); @@ -218,6 +267,8 @@ if(*p == '\\') *p = '/'; } + + remove_dot_segments(object_name); TRACE("Resolving %s\n", debugstr_w(object_name)); @@ -422,7 +473,9 @@ if(strchrW(pwzRelativeUrl, ':')) return STG_E_INVALIDNAME; - if(pwzRelativeUrl[0] != '/') { + if(pwzRelativeUrl[0] == '#') { + base_end += strlenW(base_end); + }else if(pwzRelativeUrl[0] != '/') { ptr = strrchrW(base_end, '/'); if(ptr) base_end = ptr+1; Modified: trunk/reactos/dll/win32/itss/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/storage.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] Fri Sep 20 10:53:58 2013 @@ -620,13 +620,11 @@ struct chmFile *chmfile, const WCHAR *dir, IStorage** ppstgOpen ) { ITSS_IStorageImpl *stg; - DWORD len; TRACE("%p %s\n", chmfile, debugstr_w( dir ) ); - len = strlenW( dir ) + 1; - stg = HeapAlloc( GetProcessHeap(), 0, - sizeof (ITSS_IStorageImpl) + len*sizeof(WCHAR) ); + stg = HeapAlloc( GetProcessHeap(), 0, + FIELD_OFFSET( ITSS_IStorageImpl, dir[strlenW( dir ) + 1] )); stg->IStorage_iface.lpVtbl = &ITSS_IStorageImpl_Vtbl; stg->ref = 1; stg->chmfile = chmfile; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 20 10:53:58 2013 @@ -90,7 +90,7 @@ reactos/dll/win32/inseng # Synced to Wine-1.7.1 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to Wine-1.7.1 -reactos/dll/win32/itss # Synced to Wine-1.5.4 +reactos/dll/win32/itss # Synced to Wine-1.7.1 reactos/dll/win32/jscript # Synced to Wine-1.5.26 reactos/dll/win32/loadperf # Synced to Wine-1.5.19 reactos/dll/win32/localspl # Synced to Wine-1.5.26

1 0

[akhaldi] 60243: [ITIRCL] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 20 Sep '13

20 Sep '13

Author: akhaldi Date: Fri Sep 20 10:30:50 2013 New Revision: 60243 URL: http://svn.reactos.org/svn/reactos?rev=60243&view=rev Log: [ITIRCL] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/itircl/CMakeLists.txt trunk/reactos/dll/win32/itircl/itircl_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/itircl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itircl/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/itircl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itircl/CMakeLists.txt [iso-8859-1] Fri Sep 20 10:30:50 2013 @@ -10,11 +10,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/itircl.def) add_library(itircl SHARED ${SOURCE}) - set_module_type(itircl win32dll) - target_link_libraries(itircl wine) - add_importlibs(itircl msvcrt kernel32 ntdll) -add_dependencies(itircl psdk) add_cd_file(TARGET itircl DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/itircl/itircl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itircl/itircl_ma… ============================================================================== --- trunk/reactos/dll/win32/itircl/itircl_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itircl/itircl_main.c [iso-8859-1] Fri Sep 20 10:30:50 2013 @@ -41,10 +41,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; - default: - break; } return TRUE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 20 10:30:50 2013 @@ -89,7 +89,7 @@ reactos/dll/win32/initpki # Synced to Wine-1.7.1 reactos/dll/win32/inseng # Synced to Wine-1.7.1 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to Wine-1.5.19 +reactos/dll/win32/itircl # Synced to Wine-1.7.1 reactos/dll/win32/itss # Synced to Wine-1.5.4 reactos/dll/win32/jscript # Synced to Wine-1.5.26 reactos/dll/win32/loadperf # Synced to Wine-1.5.19

1 0

[akhaldi] 60242: [CMAKE] * Simplify the last occurrence of the transitional check (we have RosBE 2.1 now).
by akhaldi＠svn.reactos.org 20 Sep '13

20 Sep '13

Author: akhaldi Date: Fri Sep 20 10:29:40 2013 New Revision: 60242 URL: http://svn.reactos.org/svn/reactos?rev=60242&view=rev Log: [CMAKE] * Simplify the last occurrence of the transitional check (we have RosBE 2.1 now). Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Sep 20 10:29:40 2013 @@ -553,7 +553,7 @@ set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) endfunction() -if(NOT MSVC AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) +if(NOT MSVC) function(add_object_library _target) add_library(${_target} OBJECT ${ARGN}) endfunction()

1 0

[akhaldi] 60241: [HAL] * Simplify these checks now that we have RosBE 2.1.
by akhaldi＠svn.reactos.org 20 Sep '13

20 Sep '13

Author: akhaldi Date: Fri Sep 20 10:26:05 2013 New Revision: 60241 URL: http://svn.reactos.org/svn/reactos?rev=60241&view=rev Log: [HAL] * Simplify these checks now that we have RosBE 2.1. Modified: trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/hal/halx86/acpi.cmake trunk/reactos/hal/halx86/legacy.cmake Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Fri Sep 20 10:26:05 2013 @@ -14,7 +14,7 @@ spec2def(${_halname}.dll ../hal.spec ADD_IMPORTLIB) # Create the actual target - if(NOT MSVC AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) + if(NOT MSVC) foreach(_component ${_haldata_COMPONENTS}) list(APPEND _haldata_SOURCES "$<TARGET_OBJECTS:lib_hal_${_component}>") endforeach() Modified: trunk/reactos/hal/halx86/acpi.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi.cmake?rev=… ============================================================================== --- trunk/reactos/hal/halx86/acpi.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi.cmake [iso-8859-1] Fri Sep 20 10:26:05 2013 @@ -9,6 +9,6 @@ add_dependencies(lib_hal_acpi bugcodes) #add_pch(lib_hal_acpi include/hal.h) -if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7)) +if(MSVC) target_link_libraries(lib_hal_acpi lib_hal_generic) endif() Modified: trunk/reactos/hal/halx86/legacy.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy.cmake?re… ============================================================================== --- trunk/reactos/hal/halx86/legacy.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy.cmake [iso-8859-1] Fri Sep 20 10:26:05 2013 @@ -15,6 +15,6 @@ add_dependencies(lib_hal_legacy bugcodes) #add_pch(lib_hal_legacy include/hal.h) -if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7)) +if(MSVC) target_link_libraries(lib_hal_legacy lib_hal_generic) endif()

1 0

[akhaldi] 60240: [FRELDR/SETUPLDR] * Simplify these checks now that we have RosBE 2.1.
by akhaldi＠svn.reactos.org 20 Sep '13

20 Sep '13

Author: akhaldi Date: Fri Sep 20 10:22:11 2013 New Revision: 60240 URL: http://svn.reactos.org/svn/reactos?rev=60240&view=rev Log: [FRELDR/SETUPLDR] * Simplify these checks now that we have RosBE 2.1. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Sep 20 10:22:11 2013 @@ -151,7 +151,7 @@ #TBD endif() -if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) +if(NOT MSVC) add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE} ${FREELDR_COMMON_ASM_SOURCE}) else() add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}) @@ -172,7 +172,7 @@ list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def) endif() -if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) +if(NOT MSVC) add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) if(SEPARATE_DBG) @@ -205,7 +205,7 @@ target_link_libraries(freeldr_pe_dbg mini_hal) endif() -if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7)) +if(MSVC) target_link_libraries(freeldr_pe freeldr_common) target_link_libraries(freeldr_pe_dbg freeldr_common) endif() @@ -236,7 +236,7 @@ list(APPEND SETUPLDR_SOURCE windows/setupldr.c) endif() -if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) +if(NOT MSVC) add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) if(SEPARATE_DBG) @@ -272,7 +272,7 @@ target_link_libraries(setupldr_pe_dbg mini_hal) endif() -if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7)) +if(MSVC) target_link_libraries(setupldr_pe freeldr_common) target_link_libraries(setupldr_pe_dbg freeldr_common) endif()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs