Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60019: [AVIFIL32] * Move the resource files to the lang folder.
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 22:17:59 2013 New Revision: 60019 URL: http://svn.reactos.org/svn/reactos?rev=60019&view=rev Log: [AVIFIL32] * Move the resource files to the lang folder. Added: trunk/reactos/dll/win32/avifil32/lang/ (with props) trunk/reactos/dll/win32/avifil32/lang/avifile_Bg.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Bg.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Cs.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Cs.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Da.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Da.rc trunk/reactos/dll/win32/avifil32/lang/avifile_De.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_De.rc trunk/reactos/dll/win32/avifil32/lang/avifile_En.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_En.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Es.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Es.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Fr.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Fr.rc trunk/reactos/dll/win32/avifil32/lang/avifile_He.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_He.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Hu.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Hu.rc trunk/reactos/dll/win32/avifil32/lang/avifile_It.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_It.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Ja.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Ja.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Ko.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Lt.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Lt.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Nl.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Nl.rc trunk/reactos/dll/win32/avifil32/lang/avifile_No.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_No.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Pl.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Pl.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Pt.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Pt.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Ro.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Ro.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Ru.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Si.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Si.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Sv.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Sv.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Tr.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Uk.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Uk.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Zh.rc - copied unchanged from r60004, trunk/reactos/dll/win32/avifil32/avifile_Zh.rc Removed: trunk/reactos/dll/win32/avifil32/avifile_Bg.rc trunk/reactos/dll/win32/avifil32/avifile_Cs.rc trunk/reactos/dll/win32/avifil32/avifile_Da.rc trunk/reactos/dll/win32/avifil32/avifile_De.rc trunk/reactos/dll/win32/avifil32/avifile_En.rc trunk/reactos/dll/win32/avifil32/avifile_Es.rc trunk/reactos/dll/win32/avifil32/avifile_Fr.rc trunk/reactos/dll/win32/avifil32/avifile_He.rc trunk/reactos/dll/win32/avifil32/avifile_Hu.rc trunk/reactos/dll/win32/avifil32/avifile_It.rc trunk/reactos/dll/win32/avifil32/avifile_Ja.rc trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/avifile_Lt.rc trunk/reactos/dll/win32/avifil32/avifile_Nl.rc trunk/reactos/dll/win32/avifil32/avifile_No.rc trunk/reactos/dll/win32/avifil32/avifile_Pl.rc trunk/reactos/dll/win32/avifil32/avifile_Pt.rc trunk/reactos/dll/win32/avifil32/avifile_Ro.rc trunk/reactos/dll/win32/avifil32/avifile_Ru.rc trunk/reactos/dll/win32/avifil32/avifile_Si.rc trunk/reactos/dll/win32/avifil32/avifile_Sv.rc trunk/reactos/dll/win32/avifil32/avifile_Tr.rc trunk/reactos/dll/win32/avifil32/avifile_Uk.rc trunk/reactos/dll/win32/avifil32/avifile_Zh.rc Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc Removed: trunk/reactos/dll/win32/avifil32/avifile_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Bg.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "" - IDS_WAVEFILETYPE "" - IDS_ALLMULTIMEDIA "" - IDS_ALLFILES "ÐÑÐ¸ÑÐºÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ (*.*)" - IDS_VIDEO "" - IDS_AUDIO "" - IDS_AVIFILETYPE "" - IDS_UNCOMPRESSED "" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "",-1,129,43,36,9 - LTEXT "&ÐÐµÑÐ°Ñ",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð¸",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Cs.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "" - IDS_WAVEFILETYPE "" - IDS_ALLMULTIMEDIA "VÅ¡echny soubory multimÃ©diÃ" - IDS_ALLFILES "VÅ¡echny soubory (*.*)" - IDS_VIDEO "video" - IDS_AUDIO "audio" - IDS_AVIFILETYPE "Wine AVI-default-filehandler" - IDS_UNCOMPRESSED "nekomprimovanÃ½" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "NastavenÃ komprese" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Vyber datovÃ½ proud:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "V&olby...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "ProloÅ¾&it kaÅ¾dÃ½ch",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "rÃ¡mcÅ¯",-1,129,43,36,9 - LTEXT "SouÄasnÃ½ formÃ¡t:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Storno",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Da.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Lydkurve: %s" - IDS_WAVEFILETYPE "Lydkurve" - IDS_ALLMULTIMEDIA "Alle multimedia filer" - IDS_ALLFILES "Alle filer (*.*)" - IDS_VIDEO "video" - IDS_AUDIO "lyd" - IDS_AVIFILETYPE "Wine AVI-standard-filehandler" - IDS_UNCOMPRESSED "ukomprimeret" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Komprimerings indstillinger" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&VÃ¦lg stream:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Alternativer...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interleave hver",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "Billeder",-1,129,43,36,9 - LTEXT "NuvÃ¦rende format:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Annuller",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_De.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Kurvenform: %s" - IDS_WAVEFILETYPE "Kurvenform" - IDS_ALLMULTIMEDIA "Alle Multimedia-Dateien" - IDS_ALLFILES "Alle Dateien (*.*)" - IDS_VIDEO "Video" - IDS_AUDIO "Audio" - IDS_AVIFILETYPE "Wine AVI-Standard-Dateibehandlungsroutine" - IDS_UNCOMPRESSED "Unkomprimiert" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Komprimierungsoptionen" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&WÃ¤hlen Sie die Eingangsdaten aus:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Optionen...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interleave alle",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "Einzelbilder",-1,129,43,36,9 - LTEXT "Aktuelles Format:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Abbrechen",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_En.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Waveform: %s" - IDS_WAVEFILETYPE "Waveform" - IDS_ALLMULTIMEDIA "All multimedia files" - IDS_ALLFILES "All files (*.*)" - IDS_VIDEO "video" - IDS_AUDIO "audio" - IDS_AVIFILETYPE "Wine AVI-default-filehandler" - IDS_UNCOMPRESSED "uncompressed" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Compress options" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Choose a stream:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Options...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interleave every",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "frames",-1,129,43,36,9 - LTEXT "Current format:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Cancel",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Es.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Formato de ondas: %s" - IDS_WAVEFILETYPE "Formato de ondas" - IDS_ALLMULTIMEDIA "Todos los archivos multimedia" - IDS_ALLFILES "Todos los archivos (*.*)" - IDS_VIDEO "vÃdeo" - IDS_AUDIO "audio" - IDS_AVIFILETYPE "Manejador de archivo AVI por defecto de Wine" - IDS_UNCOMPRESSED "sin compresiÃ³n" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Opciones de compresiÃ³n" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Elija un stream:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Opciones...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interleave cada",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "cuadros",-1,129,43,36,9 - LTEXT "Formato actual:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "Aceptar",IDOK,170,42,50,14 - PUSHBUTTON "Cancelar",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Fr.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Forme d'ondeÂ : %s" - IDS_WAVEFILETYPE "Forme d'onde" - IDS_ALLMULTIMEDIA "Tous les fichiers multimÃ©dia" - IDS_ALLFILES "Tous les fichiers (*.*)" - IDS_VIDEO "vidÃ©o" - IDS_AUDIO "audio" - IDS_AVIFILETYPE "Gestionnaire de fichiers AVI par dÃ©faut de Wine" - IDS_UNCOMPRESSED "non compressÃ©" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Options de compression" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&SÃ©lectionnez un fluxÂ :",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Options...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Imbriquer toutes les",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "images",-1,129,43,36,9 - LTEXT "Format actuelÂ :",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Annuler",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_He.rc (removed) @@ -1,55 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Waveform: %s" - IDS_WAVEFILETYPE "Waveform" - IDS_ALLMULTIMEDIA "×× ×§××¦× ××××××××××" - IDS_ALLFILES "×× ××§××¦×× (*.*)" - IDS_VIDEO "×××××" - IDS_AUDIO "×©××¢" - IDS_AVIFILETYPE "Wine AVI-default-filehandler" - IDS_UNCOMPRESSED "×× ××××¡" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "××¤×©×¨××××ª ××××¡×" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Choose a stream:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "××¤×©×¨××××ª...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interleave every",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "×©×§××¤×××ª:",-1,129,43,36,9 - LTEXT "×¤××¨×× × ××××:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "×××©××¨",IDOK,170,42,50,14 - PUSHBUTTON "×××××",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Hu.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "HullÃ¡mforma: %s" - IDS_WAVEFILETYPE "HullÃ¡mforma" - IDS_ALLMULTIMEDIA "Minden multimÃ©dia fÃ¡jl" - IDS_ALLFILES "Minden fÃ¡jl (*.*)" - IDS_VIDEO "" - IDS_AUDIO "hang" - IDS_AVIFILETYPE "Wine AVI-alapÃ©rtelmezett-fÃ¡jlkezelÅ" - IDS_UNCOMPRESSED "tÃ¶mÃ¶rÃtetlen" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "TÃ¶mÃ¶rÃtÃ©si beÃ¡llÃtÃ¡sok" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&VÃ¡lassuon folyamot:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&OpciÃ³k...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&BeÃ©kel minden",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "kÃ©pkockÃ¡t",-1,129,43,36,9 - LTEXT "Jelenlegi formÃ¡tum:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "MÃ©gse",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_It.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Formato wave: %s" - IDS_WAVEFILETYPE "Formato wave" - IDS_ALLMULTIMEDIA "Tutti i file multimediali" - IDS_ALLFILES "Tutti i file (*.*)" - IDS_VIDEO "Video" - IDS_AUDIO "Audio" - IDS_AVIFILETYPE "Gestore predefinito di Wine dei file AVI" - IDS_UNCOMPRESSED "Non compresso" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Opzioni di compressione" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Scegliere un flusso:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Opzioni...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interfoliazione ogni",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "fotogrammi",-1,129,43,36,9 - LTEXT "Formato attuale:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "Ok",IDOK,170,42,50,14 - PUSHBUTTON "Annulla",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ja.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Waveãã¡ã¤ã«: %s" - IDS_WAVEFILETYPE "Waveãã¡ã¤ã«" - IDS_ALLMULTIMEDIA "å¨ã¦ã®ãã«ãã¡ãã£ã¢ãã¡ã¤ã«" - IDS_ALLFILES "ãã¹ã¦ã®ãã¡ã¤ã« (*.*)" - IDS_VIDEO "ãããª" - IDS_AUDIO "é³å£°" - IDS_AVIFILETYPE "Wine AVI-default-filehandler" - IDS_UNCOMPRESSED "æªå§ç¸®" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "å§ç¸®ãªãã·ã§ã³" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ã¹ããªã¼ã ãé¸æ(&C):",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "ãªãã·ã§ã³(&O)...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "ã¤ã³ã¿ã¼ãªã¼ã(&I)",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "ãã¬ã¼ã ",-1,129,43,36,9 - LTEXT "ç¾å¨ã®ãã©ã¼ããã:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ko.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "íí: %s" - IDS_WAVEFILETYPE "íí" - IDS_ALLMULTIMEDIA "ëª¨ë ë©í°ë¯¸ëì´ íì¼" - IDS_ALLFILES "ëª¨ë íì¼ (*.*)" - IDS_VIDEO "ë¹ëì¤" - IDS_AUDIO "ì¤ëì¤" - IDS_AVIFILETYPE "Wine AVI-ê¸°ë³¸-íì¼í¸ë¤ë¬" - IDS_UNCOMPRESSED "ìì¶ìë¨" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ìì¶ ìµì" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ì¤í¸ë¦¼ ì í(&C):",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "ìµì(&O)...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "íì ì¸í°ë¦¬ë¸ ì ì©(&I)",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "íë ì",-1,129,43,36,9 - LTEXT "íì¬ íì:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "íì¸",IDOK,170,42,50,14 - PUSHBUTTON "ì·¨ì",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Lt.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Bangos forma: %s" - IDS_WAVEFILETYPE "Bangos forma" - IDS_ALLMULTIMEDIA "Visi multimedijos failai" - IDS_ALLFILES "Visi failai (*.*)" - IDS_VIDEO "vaizdas" - IDS_AUDIO "garsas" - IDS_AVIFILETYPE "Wine numatyta-AVI-doroklÄ" - IDS_UNCOMPRESSED "neglaudintas" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Glaudinimo parametrai" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Pasirinkite srautÄ:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Parinktys...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Ä®tarpuoti kas",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "kadrÅ³",-1,129,43,36,9 - LTEXT "Dabartinis formatas:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "Gerai",IDOK,170,42,50,14 - PUSHBUTTON "Atsisakyti",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Nl.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Waveform: %s" - IDS_WAVEFILETYPE "Waveform" - IDS_ALLMULTIMEDIA "Alle multimediabestanden" - IDS_ALLFILES "Alle bestanden (*.*)" - IDS_VIDEO "video" - IDS_AUDIO "audio" - IDS_AVIFILETYPE "Wine AVI-standaard-bestandskoppeling" - IDS_UNCOMPRESSED "ongecomprimeerd" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Compressie-instellingen" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Kies een invoerbestand:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Opties...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interleave alle",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "frames",-1,129,43,36,9 - LTEXT "Huidig formaat:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Annuleren",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_No.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Lydformat: %s" - IDS_WAVEFILETYPE "Lydformat" - IDS_ALLMULTIMEDIA "Alle multimedia-filer" - IDS_ALLFILES "Alle filer (*.*)" - IDS_VIDEO "video" - IDS_AUDIO "lyd" - IDS_AVIFILETYPE "Wine standardfilhÃ¥ndterer for AVI" - IDS_UNCOMPRESSED "ukomprimert" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Komprimeringsinnstillinger" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Velg en strÃ¸m:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Alternativer...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "Sett &inn for hver",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "bilde",-1,129,43,36,9 - LTEXT "Gjeldende format:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Avbryt",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Pl.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "KsztaÅt fali: %s" - IDS_WAVEFILETYPE "KsztaÅt fali" - IDS_ALLMULTIMEDIA "Wszystkie pliki multimedialne" - IDS_ALLFILES "Wszystkie pliki (*.*)" - IDS_VIDEO "obraz" - IDS_AUDIO "dÅºwiÄk" - IDS_AVIFILETYPE "Wine AVI-domyÅlna-obsÅuga-pliku" - IDS_UNCOMPRESSED "nie skompresowany" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Opcje kompresji" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Wybierz strumieÅ:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Opcje...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Przeplot co",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "klatek",-1,129,43,36,9 - LTEXT "Wybrany format:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Anuluj",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Pt.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Formato wave: %s" - IDS_WAVEFILETYPE "Formato wave" - IDS_ALLMULTIMEDIA "Todos os ficheiros multimÃ©dia" - IDS_ALLFILES "Todos os ficheiros (*.*)" - IDS_VIDEO "vÃdeo" - IDS_AUDIO "Ã¡udio" - IDS_AVIFILETYPE "Manipulador AVI Wine predefinido" - IDS_UNCOMPRESSED "sem compressÃ£o" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "OpÃ§Ãµes de compressÃ£o" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Escolha a stream:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&OpÃ§Ãµes...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&InterlaÃ§ar a todos os",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "molduras",-1,129,43,36,9 - LTEXT "Formato actual:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Cancelar",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ro.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Forma de undÄ: %s" - IDS_WAVEFILETYPE "FormÄ de undÄ" - IDS_ALLMULTIMEDIA "Toate fiÈierele multimedia" - IDS_ALLFILES "Toate fiÈierele (*.*)" - IDS_VIDEO "video" - IDS_AUDIO "audio" - IDS_AVIFILETYPE "Tratare implicitÄ Wine pentru AVI" - IDS_UNCOMPRESSED "necomprimat" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "OpÈiuni de compresie" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&AlegeÈi un flux:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&OpÈiuni...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "È&ntreÈese fiecare",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "cadre",-1,129,43,36,9 - LTEXT "Formatul curent:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "RenunÈÄ",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ru.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "ÐÐ²ÑÐºÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾ÑÐ¾Ðº: %s" - IDS_WAVEFILETYPE "ÐÐ²ÑÐºÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾ÑÐ¾Ðº" - IDS_ALLMULTIMEDIA "ÐÑÐµ Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð° ÑÐ°Ð¹Ð»Ñ" - IDS_ALLFILES "ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*.*)" - IDS_VIDEO "Ð²Ð¸Ð´ÐµÐ¾" - IDS_AUDIO "Ð°ÑÐ´Ð¸Ð¾" - IDS_AVIFILETYPE "ÐÐ±ÑÐ°Ð±Ð¾ÑÑÐ¸Ðº Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ avi-ÑÐ°Ð¹Ð»Ð¾Ð² Ð² Wine" - IDS_UNCOMPRESSED "Ð±ÐµÐ· ÑÐ¶Ð°ÑÐ¸Ñ" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¶Ð°ÑÐ¸Ñ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¿Ð¾ÑÐ¾Ðº:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&ÐÑÐ¾ÑÐ»Ð°Ð¸Ð²Ð°ÑÑ ÐºÐ°Ð¶Ð´ÑÐµ",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "ÑÑÐµÐ¹Ð¼Ð°",-1,129,43,36,9 - LTEXT "Ð¢ÐµÐºÑÑÐ¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "ÐÐ",IDOK,170,42,50,14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Si.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "Valovna oblika: %s" - IDS_WAVEFILETYPE "Valovna oblika" - IDS_ALLMULTIMEDIA "Vse veÄpredstavnostne datoteke" - IDS_ALLFILES "Vse datoteke (*.*)" - IDS_VIDEO "video" - IDS_AUDIO "zvok" - IDS_AVIFILETYPE "Wine privzeti-upravljalnik-AVI-datotek" - IDS_UNCOMPRESSED "nestisnjeno" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "MoÅ¾nosti stiskanja" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Izbran tok:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "M&oÅ¾nosti ...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Prepletanje vsake",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "slike",-1,129,43,36,9 - LTEXT "Trenutna oblika zapisa:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "V redu",IDOK,170,42,50,14 - PUSHBUTTON "PrekliÄi",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Sv.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "VÃ¥gform: %s" - IDS_WAVEFILETYPE "VÃ¥gform" - IDS_ALLMULTIMEDIA "Alla multimediafiler" - IDS_ALLFILES "Alla filer (*.*)" - IDS_VIDEO "video" - IDS_AUDIO "ljud" - IDS_AVIFILETYPE "Wine AVI-standardfilhanterare" - IDS_UNCOMPRESSED "okomprimerad" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Komprimeringsalternativ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&VÃ¤lj en strÃ¶m:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Alternativ...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interfoliera varje",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "frames",-1,129,43,36,9 - LTEXT "Aktuellt format:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Avbryt",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Tr.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "" - IDS_WAVEFILETYPE "" - IDS_ALLMULTIMEDIA "TÃ¼m Ã§okluortam dosyalarÄ±" - IDS_ALLFILES "TÃ¼m dosyalar (*.*)" - IDS_VIDEO "vidyo" - IDS_AUDIO "ses" - IDS_AVIFILETYPE "Wine AVI-default-filehandler" - IDS_UNCOMPRESSED "sÄ±kÄ±ÅtÄ±rÄ±lmamÄ±Å" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "SÄ±kÄ±ÅtÄ±rma seÃ§enekleri" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Bir akÄ±Å se&Ã§in:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&SeÃ§enekler...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Interleave every",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "frames",-1,129,43,36,9 - LTEXT "GeÃ§erli biÃ§im:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "Tamam",IDOK,170,42,50,14 - PUSHBUTTON "Ä°ptal",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Uk.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "ÐÐ²ÑÐºÐ¾Ð²Ð¸Ð¹ Ð¿Ð¾ÑÑÐº: %s" - IDS_WAVEFILETYPE "ÐÐ²ÑÐºÐ¾Ð²Ð¸Ð¹ Ð¿Ð¾ÑÑÐº" - IDS_ALLMULTIMEDIA "Ð£ÑÑ Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ñ ÑÐ°Ð¹Ð»Ð¸" - IDS_ALLFILES "ÐÑÑ ÑÐ°Ð¹Ð»Ð¸ (*.*)" - IDS_VIDEO "Ð²ÑÐ´ÐµÐ¾" - IDS_AUDIO "Ð°ÑÐ´ÑÐ¾" - IDS_AVIFILETYPE "Wine Ð¾Ð±ÑÐ¾Ð±Ð½Ð¸Ðº AVI-ÑÐ°Ð¹Ð»ÑÐ² Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼" - IDS_UNCOMPRESSED "Ð±ÐµÐ· ÑÑÐ¸ÑÐ½ÐµÐ½Ð½Ñ" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ ÑÑÐ¸ÑÐ½ÐµÐ½Ð½Ñ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&ÐÐ±ÐµÑÑÑÑ Ð¿Ð¾ÑÑÐº:",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&ÐÐ½ÑÐµÑÐ²Ð°Ð» ÑÐµÑÐ³ÑÐ²Ð°Ð½Ð½Ñ",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "ÐºÐ°Ð´ÑÑÐ²",-1,129,43,36,9 - LTEXT "ÐÐ¾ÑÐ¾ÑÐ½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL,170,61,50,14 -END Removed: trunk/reactos/dll/win32/avifil32/avifile_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Zh.rc (removed) @@ -1,53 +0,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 "avifile_private.h" - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL - -STRINGTABLE -{ - IDS_WAVESTREAMFORMAT "æ³¢å½¢: %s" - IDS_WAVEFILETYPE "æ³¢å½¢" - IDS_ALLMULTIMEDIA "ææå¤åªé«æªæ¡" - IDS_ALLFILES "æææªæ¡ (*.*)" - IDS_VIDEO "è¦é »" - IDS_AUDIO "é³é »" - IDS_AVIFILETYPE "Wine AVI-é»èªèçå¨" - IDS_UNCOMPRESSED "æªå£ç¸®" -} - -IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "å£ç¸®é¸é " -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "é¸æä¾æº(&C):",-1,5,5,154,10 - COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "é¸é (&O)...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "äº¤ç¹: æ¯",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "å¹æ¸",-1,129,43,36,9 - LTEXT "ç¶åæ ¼å¼:",-1,5,56,73,9 - LTEXT "",IDC_FORMATTEXT,80,56,88,26 - DEFPUSHBUTTON "ç¢ºå®",IDOK,170,42,50,14 - PUSHBUTTON "åæ¶",IDCANCEL,170,61,50,14 -END Propchange: trunk/reactos/dll/win32/avifil32/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Sep 10 22:17:59 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/avifil32/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/avifil32/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/avifil32/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] Tue Sep 10 22:17:59 2013 @@ -47,74 +47,74 @@ * in one of the specific files. */ #ifdef LANGUAGE_CS_CZ - #include "avifile_Cs.rc" + #include "lang/avifile_Cs.rc" #endif #ifdef LANGUAGE_EN_US - #include "avifile_En.rc" + #include "lang/avifile_En.rc" #endif #ifdef LANGUAGE_ES_ES - #include "avifile_Es.rc" + #include "lang/avifile_Es.rc" #endif #ifdef LANGUAGE_HE_IL - #include "avifile_He.rc" + #include "lang/avifile_He.rc" #endif #ifdef LANGUAGE_HU_HU - #include "avifile_Hu.rc" + #include "lang/avifile_Hu.rc" #endif #ifdef LANGUAGE_IT_IT - #include "avifile_It.rc" + #include "lang/avifile_It.rc" #endif #ifdef LANGUAGE_NL_NL - #include "avifile_Nl.rc" + #include "lang/avifile_Nl.rc" #endif #ifdef LANGUAGE_NO_NO - #include "avifile_No.rc" + #include "lang/avifile_No.rc" #endif #ifdef LANGUAGE_PL_PL - #include "avifile_Pl.rc" + #include "lang/avifile_Pl.rc" #endif #ifdef LANGUAGE_SV_SE - #include "avifile_Sv.rc" + #include "lang/avifile_Sv.rc" #endif #ifdef LANGUAGE_TR_TR - #include "avifile_Tr.rc" + #include "lang/avifile_Tr.rc" #endif #ifdef LANGUAGE_DA_DK - #include "avifile_Da.rc" + #include "lang/avifile_Da.rc" #endif #ifdef LANGUAGE_DE_DE - #include "avifile_De.rc" + #include "lang/avifile_De.rc" #endif #ifdef LANGUAGE_FR_FR - #include "avifile_Fr.rc" + #include "lang/avifile_Fr.rc" #endif #ifdef LANGUAGE_JA_JP - #include "avifile_Ja.rc" + #include "lang/avifile_Ja.rc" #endif #ifdef LANGUAGE_KO_KR - #include "avifile_Ko.rc" + #include "lang/avifile_Ko.rc" #endif #ifdef LANGUAGE_LT_LT - #include "avifile_Lt.rc" + #include "lang/avifile_Lt.rc" #endif #ifdef LANGUAGE_PT_PT - #include "avifile_Pt.rc" + #include "lang/avifile_Pt.rc" #endif #ifdef LANGUAGE_RO_RO - #include "avifile_Ro.rc" + #include "lang/avifile_Ro.rc" #endif #ifdef LANGUAGE_RU_RU - #include "avifile_Ru.rc" + #include "lang/avifile_Ru.rc" #endif #ifdef LANGUAGE_SL_SI - #include "avifile_Si.rc" + #include "lang/avifile_Si.rc" #endif #ifdef LANGUAGE_UK_UA - #include "avifile_Uk.rc" + #include "lang/avifile_Uk.rc" #endif #ifdef LANGUAGE_ZH_CN - #include "avifile_Zh.rc" + #include "lang/avifile_Zh.rc" #endif #ifdef LANGUAGE_BG_BG - #include "avifile_Bg.rc" + #include "lang/avifile_Bg.rc" #endif

1 0

[khornicek] 60018: [CALC] Fix two more misaligned buttons in Czech resources.
by khornicek＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: khornicek Date: Tue Sep 10 22:10:14 2013 New Revision: 60018 URL: http://svn.reactos.org/svn/reactos?rev=60018&view=rev Log: [CALC] Fix two more misaligned buttons in Czech resources. Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Tue Sep 10 22:10:14 2013 @@ -49,7 +49,7 @@ BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,60,24,18,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "exp",IDC_BUTTON_EXP,64,83,24,18,BS_CENTER | BS_VCENTER | + PUSHBUTTON "exp",IDC_BUTTON_EXP,64,80,24,18,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,100,24,18,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -156,7 +156,7 @@ BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE",IDC_BUTTON_CE,222,38,43,18,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "ZpÄt",IDC_BUTTON_BACK,182,40,40,17,BS_CENTER | + PUSHBUTTON "ZpÄt",IDC_BUTTON_BACK,177,38,43,18,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP RTEXT "",IDC_TEXT_OUTPUT,5,1,305,14,SS_CENTERIMAGE, WS_EX_CLIENTEDGE

1 0

[hbelusca] 60017: [CSR]: Fix header information ;)
by hbelusca＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: hbelusca Date: Tue Sep 10 22:06:25 2013 New Revision: 60017 URL: http://svn.reactos.org/svn/reactos?rev=60017&view=rev Log: [CSR]: Fix header information ;) Modified: trunk/reactos/include/reactos/subsys/csr/csr.h trunk/reactos/include/reactos/subsys/csr/csrmsg.h trunk/reactos/include/reactos/subsys/csr/csrsrv.h Modified: trunk/reactos/include/reactos/subsys/csr/csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csr.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csr.h [iso-8859-1] Tue Sep 10 22:06:25 2013 @@ -3,7 +3,7 @@ * PROJECT: ReactOS Client/Server Runtime SubSystem * FILE: include/reactos/subsys/csr/csr.h * PURPOSE: Public definitions for CSR Clients - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: trunk/reactos/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Tue Sep 10 22:06:25 2013 @@ -4,7 +4,7 @@ * FILE: include/reactos/subsys/csr/csrmsg.h * PURPOSE: Public definitions for communication * between CSR Clients and Servers - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Tue Sep 10 22:06:25 2013 @@ -3,7 +3,7 @@ * PROJECT: ReactOS Client/Server Runtime SubSystem * FILE: include/reactos/subsys/csr/csrsrv.h * PURPOSE: Public definitions for CSR Servers - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */

1 0

[akhaldi] 60016: [NTOSKRNL] * Return the proper status when we attempt to illegally commit non-ARM3 section. We hit this assert with some kernel32 winetests (mainly loader and virtual). Brought to ...
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 21:57:52 2013 New Revision: 60016 URL: http://svn.reactos.org/svn/reactos?rev=60016&view=rev Log: [NTOSKRNL] * Return the proper status when we attempt to illegally commit non-ARM3 section. We hit this assert with some kernel32 winetests (mainly loader and virtual). Brought to you by Alex Ionescu. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Sep 10 21:57:52 2013 @@ -4095,7 +4095,12 @@ // Make sure this is an ARM3 section // MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)PAGE_ROUND_DOWN(PBaseAddress)); - ASSERT(MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3); + if (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3) + { + DPRINT1("Illegal commit of non-ARM3 section!\n"); + Status = STATUS_ALREADY_COMMITTED; + goto FailPath; + } // Is this a previously reserved section being committed? If so, enter the // special section path

1 0

[hbelusca] 60015: [ADVAPI32] Use a correct control pipe sharing policy.
by hbelusca＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: hbelusca Date: Tue Sep 10 21:38:15 2013 New Revision: 60015 URL: http://svn.reactos.org/svn/reactos?rev=60015&view=rev Log: [ADVAPI32] Use a correct control pipe sharing policy. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Tue Sep 10 21:38:15 2013 @@ -248,7 +248,7 @@ *hPipe = CreateFileW(NtControlPipeName, GENERIC_READ | GENERIC_WRITE, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,

1 0

[hbelusca] 60014: [USERENV][USER32] Use a correct return variable for RtlCreateUnicodeStringFromAsciiz. Advice: read the documentation before using functions...
by hbelusca＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: hbelusca Date: Tue Sep 10 21:26:37 2013 New Revision: 60014 URL: http://svn.reactos.org/svn/reactos?rev=60014&view=rev Log: [USERENV][USER32] Use a correct return variable for RtlCreateUnicodeStringFromAsciiz. Advice: read the documentation before using functions... Modified: trunk/reactos/dll/win32/userenv/desktop.c trunk/reactos/dll/win32/userenv/directory.c trunk/reactos/win32ss/user/user32/windows/menu.c trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/dll/win32/userenv/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/desktop.… ============================================================================== --- trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] Tue Sep 10 21:26:37 2013 @@ -164,45 +164,40 @@ UNICODE_STRING IconLocation; UNICODE_STRING WorkingDirectory; BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - Status = RtlCreateUnicodeStringFromAsciiz(&Arguments, - (LPSTR)lpArguments); - if (!NT_SUCCESS(Status)) + + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&Arguments, + (LPSTR)lpArguments)) { RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - Status = RtlCreateUnicodeStringFromAsciiz(&IconLocation, - (LPSTR)lpIconLocation); - if (!NT_SUCCESS(Status)) + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&IconLocation, + (LPSTR)lpIconLocation)) { RtlFreeUnicodeString(&Arguments); RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } if (lpWorkingDirectory != NULL) { - Status = RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, - (LPSTR)lpWorkingDirectory); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, + (LPSTR)lpWorkingDirectory)) { RtlFreeUnicodeString(&IconLocation); RtlFreeUnicodeString(&Arguments); RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } } @@ -389,13 +384,11 @@ { UNICODE_STRING ItemName; BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); + + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -437,13 +430,11 @@ { UNICODE_STRING GroupName; BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); + + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -495,13 +486,11 @@ { UNICODE_STRING GroupName; BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); + + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -564,54 +553,48 @@ UNICODE_STRING IconLocation; UNICODE_STRING WorkingDirectory; BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - Status = RtlCreateUnicodeStringFromAsciiz(&Arguments, - (LPSTR)lpArguments); - if (!NT_SUCCESS(Status)) + + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&Arguments, + (LPSTR)lpArguments)) { RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - Status = RtlCreateUnicodeStringFromAsciiz(&IconLocation, - (LPSTR)lpIconLocation); - if (!NT_SUCCESS(Status)) + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&IconLocation, + (LPSTR)lpIconLocation)) { RtlFreeUnicodeString(&Arguments); RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } if (lpGroupName != NULL) { - Status = RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) { RtlFreeUnicodeString(&IconLocation); RtlFreeUnicodeString(&Arguments); RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } } if (lpWorkingDirectory != NULL) { - Status = RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, - (LPSTR)lpWorkingDirectory); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, + (LPSTR)lpWorkingDirectory)) { if (lpGroupName != NULL) { @@ -620,7 +603,7 @@ RtlFreeUnicodeString(&IconLocation); RtlFreeUnicodeString(&Arguments); RtlFreeUnicodeString(&ItemName); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } } @@ -821,29 +804,26 @@ UNICODE_STRING GroupName; UNICODE_STRING ItemName; BOOL bResult; - NTSTATUS Status; if (lpGroupName != NULL) { - Status = RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) { - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } } - Status = RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) { if (lpGroupName != NULL) { RtlFreeUnicodeString(&GroupName); } - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } Modified: trunk/reactos/dll/win32/userenv/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/director… ============================================================================== --- trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] Tue Sep 10 21:26:37 2013 @@ -39,23 +39,20 @@ { UNICODE_STRING SrcPath; UNICODE_STRING DstPath; - NTSTATUS Status; BOOL bResult; - Status = RtlCreateUnicodeStringFromAsciiz(&SrcPath, - (LPSTR)lpSourcePath); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - Status = RtlCreateUnicodeStringFromAsciiz(&DstPath, - (LPSTR)lpDestinationPath); - if (!NT_SUCCESS(Status)) + if (!RtlCreateUnicodeStringFromAsciiz(&SrcPath, + (LPSTR)lpSourcePath)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&DstPath, + (LPSTR)lpDestinationPath)) { RtlFreeUnicodeString(&SrcPath); - SetLastError (RtlNtStatusToDosError (Status)); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Tue Sep 10 21:26:37 2013 @@ -5047,7 +5047,6 @@ { MENUITEMINFOW MenuItemInfoW; UNICODE_STRING UnicodeString; - NTSTATUS Status; ULONG Result = FALSE; RtlCopyMemory(&MenuItemInfoW, lpmii, min(lpmii->cbSize, sizeof(MENUITEMINFOW))); @@ -5069,12 +5068,11 @@ && MenuItemInfoW.dwTypeData != NULL) { /* cch is ignored when the content of a menu item is set by calling SetMenuItemInfo. */ - Status = RtlCreateUnicodeStringFromAsciiz(&UnicodeString, - (LPSTR)MenuItemInfoW.dwTypeData); - if (!NT_SUCCESS (Status)) - { - SetLastError (RtlNtStatusToDosError(Status)); - return FALSE; + if (!RtlCreateUnicodeStringFromAsciiz(&UnicodeString, + (LPSTR)MenuItemInfoW.dwTypeData)) + { + SetLastError (ERROR_NOT_ENOUGH_MEMORY); + return FALSE; } MenuItemInfoW.dwTypeData = UnicodeString.Buffer; MenuItemInfoW.cch = UnicodeString.Length / sizeof(WCHAR); Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Tue Sep 10 21:26:37 2013 @@ -2675,11 +2675,9 @@ RegisterWindowMessageA(LPCSTR lpString) { UNICODE_STRING String; - BOOLEAN Result; UINT Atom; - Result = RtlCreateUnicodeStringFromAsciiz(&String, (PCSZ)lpString); - if (!Result) + if (!RtlCreateUnicodeStringFromAsciiz(&String, (PCSZ)lpString)) { return(0); }

1 0

[ekohl] 60013: [LSASRV] - Allocate buffers for account and domain names in the well-known sid list instead of using pointers to strings. - Add a string load routine and convert all hard-coded SID n...
by ekohl＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: ekohl Date: Tue Sep 10 21:20:22 2013 New Revision: 60013 URL: http://svn.reactos.org/svn/reactos?rev=60013&view=rev Log: [LSASRV] - Allocate buffers for account and domain names in the well-known sid list instead of using pointers to strings. - Add a string load routine and convert all hard-coded SID names to resources. A german translation will follow soon. Added: trunk/reactos/dll/win32/lsasrv/lang/ (with props) trunk/reactos/dll/win32/lsasrv/lang/en-US.rc (with props) trunk/reactos/dll/win32/lsasrv/resources.h (with props) trunk/reactos/dll/win32/lsasrv/utils.c (with props) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/lookup.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/lsasrv.rc Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -18,6 +18,7 @@ privileges.c registry.c security.c + utils.c lsasrv.rc ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def Propchange: trunk/reactos/dll/win32/lsasrv/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Sep 10 21:20:22 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/lsasrv/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/lsasrv/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/lsasrv/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/lsasrv/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/lsasrv/lang/en-US.rc [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -0,0 +1,44 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_NT_AUTHORITY "NT AUTHORITY" + IDS_NULL_RID "NULL SID" + IDS_WORLD_RID "Everyone" + IDS_LOCAL_RID "LOCAL" + IDS_CREATOR_OWNER_RID "CREATOR OWNER" + IDS_CREATOR_GROUP_RID "CREATOR GROUP" + IDS_CREATOR_OWNER_SERVER_RID "CREATOR OWNER SERVER" + IDS_CREATOR_GROUP_SERVER_RID "CREATOR GROUP SERVER" + IDS_DIALUP_RID "DIALUP" + IDS_NETWORK_RID "NETWORK" + IDS_BATCH_RID "BATCH" + IDS_INTERACTIVE_RID "INTERACTIVE" + IDS_SERVICE_RID "SERVICE" + IDS_ANONYMOUS_LOGON_RID "ANONYMOUS LOGON" + IDS_PROXY_RID "PROXY" + IDS_ENTERPRISE_CONTROLLERS_RID "ENTERPRISE DOMAIN CONTROLLERS" + IDS_PRINCIPAL_SELF_RID "SELF" + IDS_AUTHENTICATED_USER_RID "Authenticated Users" + IDS_RESTRICTED_CODE_RID "RESTRICTED" + IDS_TERMINAL_SERVER_RID "TERMINAL SERVER USER" + IDS_REMOTE_LOGON_RID "REMOTE INTERACTIVE LOGON" + IDS_THIS_ORGANIZATION_RID "This Organization" + IDS_LOCAL_SYSTEM_RID "SYSTEM" + IDS_LOCAL_SERVICE_RID "LOCAL SERVICE" + IDS_NETWORK_SERVICE_RID "NETWORK SERVICE" + IDS_BUILTIN_DOMAIN_RID "BUILTIN" + IDS_ALIAS_RID_ADMINS "Administrators" + IDS_ALIAS_RID_USERS "Users" + IDS_ALIAS_RID_GUESTS "Guests" + IDS_ALIAS_RID_POWER_USERS "Power Users" + IDS_ALIAS_RID_ACCOUNT_OPS "Account Operators" + IDS_ALIAS_RID_SYSTEM_OPS "Server Operators" + IDS_ALIAS_RID_PRINT_OPS "Print Operators" + IDS_ALIAS_RID_BACKUP_OPS "Backup Operators" + IDS_ALIAS_RID_REPLICATOR "Replicators" + IDS_ALIAS_RID_RAS_SERVERS "RAS and IAS Servers" + IDS_ALIAS_RID_PREW2KCOMPACCESS "Pre-Windows 2000 Compatible Access" + IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Remote Desktop Users" + IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Network Configuration Operators" +END Propchange: trunk/reactos/dll/win32/lsasrv/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/lsasrv/lookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -235,11 +235,38 @@ *p = SubAuthorities[i]; } - RtlInitUnicodeString(&SidEntry->AccountName, - AccountName); - - RtlInitUnicodeString(&SidEntry->DomainName, - DomainName); +// RtlInitUnicodeString(&SidEntry->AccountName, +// AccountName); + SidEntry->AccountName.Length = wcslen(AccountName) * sizeof(WCHAR); + SidEntry->AccountName.MaximumLength = SidEntry->AccountName.Length + sizeof(WCHAR); + SidEntry->AccountName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, + SidEntry->AccountName.MaximumLength); + if (SidEntry->AccountName.Buffer == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry->Sid); + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry); + return FALSE; + } + + wcscpy(SidEntry->AccountName.Buffer, + AccountName); + +// RtlInitUnicodeString(&SidEntry->DomainName, +// DomainName); + SidEntry->DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + SidEntry->DomainName.MaximumLength = SidEntry->DomainName.Length + sizeof(WCHAR); + SidEntry->DomainName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, + SidEntry->DomainName.MaximumLength); + if (SidEntry->DomainName.Buffer == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry->AccountName.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry->Sid); + RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry); + return FALSE; + } + + wcscpy(SidEntry->DomainName.Buffer, + DomainName); SidEntry->Use = Use; @@ -253,223 +280,278 @@ NTSTATUS LsapInitSids(VOID) { + WCHAR szAccountName[80]; + WCHAR szDomainName[80]; ULONG SubAuthorities[8]; + HINSTANCE hInstance; InitializeListHead(&WellKnownSidListHead); + hInstance = GetModuleHandleW(L"lsasrv.dll"); + /* NT Authority */ + + LsapLoadString(hInstance, IDS_NT_AUTHORITY, szAccountName, 80); + LsapLoadString(hInstance, IDS_NT_AUTHORITY, szDomainName, 80); LsapCreateSid(&NtAuthority, 0, NULL, - L"NT AUTHORITY", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeDomain); /* Null Sid */ + LsapLoadString(hInstance, IDS_NULL_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_NULL_RID; LsapCreateSid(&NullSidAuthority, 1, SubAuthorities, - L"NULL SID", + szAccountName, L"", SidTypeWellKnownGroup); /* World Sid */ + LsapLoadString(hInstance, IDS_WORLD_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_WORLD_RID; LsapCreateSid(&WorldSidAuthority, 1, SubAuthorities, - L"Everyone", + szAccountName, L"", SidTypeWellKnownGroup); /* Local Sid */ + LsapLoadString(hInstance, IDS_LOCAL_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_LOCAL_RID; LsapCreateSid(&LocalSidAuthority, 1, SubAuthorities, - L"LOCAL", + szAccountName, L"", SidTypeWellKnownGroup); /* Creator Owner Sid */ + LsapLoadString(hInstance, IDS_CREATOR_OWNER_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_CREATOR_OWNER_RID; LsapCreateSid(&CreatorSidAuthority, 1, SubAuthorities, - L"CREATOR OWNER", + szAccountName, L"", SidTypeWellKnownGroup); /* Creator Group Sid */ + LsapLoadString(hInstance, IDS_CREATOR_GROUP_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_CREATOR_GROUP_RID; LsapCreateSid(&CreatorSidAuthority, 1, SubAuthorities, - L"CREATOR GROUP", + szAccountName, L"", SidTypeWellKnownGroup); /* Creator Owner Server Sid */ + LsapLoadString(hInstance, IDS_CREATOR_OWNER_SERVER_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_CREATOR_OWNER_SERVER_RID; LsapCreateSid(&CreatorSidAuthority, 1, SubAuthorities, - L"CREATOR OWNER SERVER", + szAccountName, L"", SidTypeWellKnownGroup); /* Creator Group Server Sid */ + LsapLoadString(hInstance, IDS_CREATOR_GROUP_SERVER_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_CREATOR_GROUP_SERVER_RID; LsapCreateSid(&CreatorSidAuthority, 1, SubAuthorities, - L"CREATOR GROUP SERVER", + szAccountName, L"", SidTypeWellKnownGroup); /* Dialup Sid */ + LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_NT_AUTHORITY, szDomainName, 80); + SubAuthorities[0] = SECURITY_DIALUP_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"DIALUP", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Network Sid */ + LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_NETWORK_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"NETWORK", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Batch Sid*/ + LsapLoadString(hInstance, IDS_BATCH_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_BATCH_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"BATCH", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Interactive Sid */ + LsapLoadString(hInstance, IDS_INTERACTIVE_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_INTERACTIVE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"INTERACTIVE", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Service Sid */ + LsapLoadString(hInstance, IDS_SERVICE_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_SERVICE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"SERVICE", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Anonymous Logon Sid */ + LsapLoadString(hInstance, IDS_ANONYMOUS_LOGON_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_ANONYMOUS_LOGON_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"ANONYMOUS LOGON", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Proxy Sid */ + LsapLoadString(hInstance, IDS_PROXY_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_PROXY_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"PROXY", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Enterprise Controllers Sid */ + LsapLoadString(hInstance, IDS_ENTERPRISE_CONTROLLERS_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_ENTERPRISE_CONTROLLERS_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"ENTERPRISE DOMAIN CONTROLLERS", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Principal Self Sid */ + LsapLoadString(hInstance, IDS_PRINCIPAL_SELF_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_PRINCIPAL_SELF_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"SELF", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Authenticated Users Sid */ + LsapLoadString(hInstance, IDS_AUTHENTICATED_USER_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_AUTHENTICATED_USER_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"Authenticated Users", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Restricted Code Sid */ + LsapLoadString(hInstance, IDS_RESTRICTED_CODE_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_RESTRICTED_CODE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"RESTRICTED", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Terminal Server Sid */ + LsapLoadString(hInstance, IDS_TERMINAL_SERVER_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_TERMINAL_SERVER_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"TERMINAL SERVER USER", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Remote Logon Sid */ + LsapLoadString(hInstance, IDS_REMOTE_LOGON_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_REMOTE_LOGON_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"REMOTE INTERACTIVE LOGON", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* This Organization Sid */ + LsapLoadString(hInstance, IDS_THIS_ORGANIZATION_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_THIS_ORGANIZATION_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"This Organization", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Local System Sid */ + LsapLoadString(hInstance, IDS_LOCAL_SYSTEM_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_LOCAL_SYSTEM_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"SYSTEM", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); /* Local Service Sid */ + LsapLoadString(hInstance, IDS_LOCAL_SERVICE_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_LOCAL_SERVICE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"LOCAL SERVICE", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); LsapCreateSid(&NtAuthority, @@ -480,12 +562,14 @@ SidTypeWellKnownGroup); /* Network Service Sid */ + LsapLoadString(hInstance, IDS_NETWORK_SERVICE_RID, szAccountName, 80); + SubAuthorities[0] = SECURITY_NETWORK_SERVICE_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"NETWORK SERVICE", - L"NT AUTHORITY", + szAccountName, + szDomainName, SidTypeWellKnownGroup); LsapCreateSid(&NtAuthority, @@ -496,144 +580,171 @@ SidTypeWellKnownGroup); /* Builtin Domain Sid */ + LsapLoadString(hInstance, IDS_BUILTIN_DOMAIN_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_BUILTIN_DOMAIN_RID, szDomainName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; LsapCreateSid(&NtAuthority, 1, SubAuthorities, - L"BUILTIN", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeDomain); /* Administrators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_ADMINS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_ADMINS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Administrators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Users Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_USERS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_USERS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Users", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Guests Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_GUESTS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_GUESTS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Guests", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Power User Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_POWER_USERS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_POWER_USERS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Power User", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Account Operators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_ACCOUNT_OPS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_ACCOUNT_OPS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Account Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* System Operators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_SYSTEM_OPS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_SYSTEM_OPS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Server Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Print Operators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_PRINT_OPS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_PRINT_OPS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Print Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Backup Operators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_BACKUP_OPS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_BACKUP_OPS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Backup Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Replicators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_REPLICATOR, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_REPLICATOR; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Replicators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); -#if 0 /* RAS Servers Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_RAS_SERVERS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_RAS_SERVERS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Backup Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); -#endif /* Pre-Windows 2000 Compatible Access Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_PREW2KCOMPACCESS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_PREW2KCOMPACCESS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Pre-Windows 2000 Compatible Access", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Remote Desktop Users Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_REMOTE_DESKTOP_USERS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Remote Desktop Users", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* Network Configuration Operators Alias Sid */ + LsapLoadString(hInstance, IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS, szAccountName, 80); + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS; LsapCreateSid(&NtAuthority, 2, SubAuthorities, - L"Network Configuration Operators", - L"BUILTIN", + szAccountName, + szDomainName, SidTypeAlias); /* FIXME: Add more well known sids */ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -14,6 +14,7 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> +#include <winuser.h> #define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/kefuncs.h> @@ -39,6 +40,7 @@ #include <wine/debug.h> +#include "resources.h" typedef enum _LSA_DB_OBJECT_TYPE { @@ -381,4 +383,11 @@ LsapCreateSecretSd(PSECURITY_DESCRIPTOR *SecretSd, PULONG SecretSdSize); +/* utils.c */ +INT +LsapLoadString(HINSTANCE hInstance, + UINT uId, + LPWSTR lpBuffer, + INT nBufferMax); + /* EOF */ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rc… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rc [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -1,5 +1,24 @@ +#include <windows.h> +#include "resources.h" + #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "LSA server DLL\0" #define REACTOS_STR_INTERNAL_NAME "lsasrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "lsasrv.dll\0" +#define REACTOS_FILEVERSION 5,1,2600,0 +#define REACTOS_STR_FILE_VERSION "5.1.2600\0" #include <reactos/version.rc> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. + */ + +/* UTF-8 */ +#pragma code_page(65001) +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Added: trunk/reactos/dll/win32/lsasrv/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/resources… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/resources.h (added) +++ trunk/reactos/dll/win32/lsasrv/resources.h [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -0,0 +1,52 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/lsasrv/resource.h + * PURPOSE: Resource IDs + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +#pragma once + +#define IDS_NT_AUTHORITY 100 + +#define IDS_NULL_RID 110 +#define IDS_WORLD_RID 111 +#define IDS_LOCAL_RID 112 +#define IDS_CREATOR_OWNER_RID 113 +#define IDS_CREATOR_GROUP_RID 114 +#define IDS_CREATOR_OWNER_SERVER_RID 115 +#define IDS_CREATOR_GROUP_SERVER_RID 116 +#define IDS_DIALUP_RID 117 +#define IDS_NETWORK_RID 118 +#define IDS_BATCH_RID 119 +#define IDS_INTERACTIVE_RID 120 +#define IDS_SERVICE_RID 121 +#define IDS_ANONYMOUS_LOGON_RID 122 +#define IDS_PROXY_RID 123 +#define IDS_ENTERPRISE_CONTROLLERS_RID 124 +#define IDS_PRINCIPAL_SELF_RID 125 +#define IDS_AUTHENTICATED_USER_RID 126 +#define IDS_RESTRICTED_CODE_RID 127 +#define IDS_TERMINAL_SERVER_RID 128 +#define IDS_REMOTE_LOGON_RID 129 +#define IDS_THIS_ORGANIZATION_RID 130 +#define IDS_LOCAL_SYSTEM_RID 131 +#define IDS_LOCAL_SERVICE_RID 132 +#define IDS_NETWORK_SERVICE_RID 133 +#define IDS_BUILTIN_DOMAIN_RID 134 +#define IDS_ALIAS_RID_ADMINS 135 +#define IDS_ALIAS_RID_USERS 136 +#define IDS_ALIAS_RID_GUESTS 137 +#define IDS_ALIAS_RID_POWER_USERS 138 +#define IDS_ALIAS_RID_ACCOUNT_OPS 139 +#define IDS_ALIAS_RID_SYSTEM_OPS 140 +#define IDS_ALIAS_RID_PRINT_OPS 141 +#define IDS_ALIAS_RID_BACKUP_OPS 142 +#define IDS_ALIAS_RID_REPLICATOR 143 +#define IDS_ALIAS_RID_RAS_SERVERS 144 +#define IDS_ALIAS_RID_PREW2KCOMPACCESS 145 +#define IDS_ALIAS_RID_REMOTE_DESKTOP_USERS 146 +#define IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS 147 + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/resources.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/lsasrv/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/utils.c?r… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/utils.c (added) +++ trunk/reactos/dll/win32/lsasrv/utils.c [iso-8859-1] Tue Sep 10 21:20:22 2013 @@ -0,0 +1,68 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Security Account Manager (SAM) Server + * FILE: reactos/dll/win32/lsasrv/utils.c + * PURPOSE: Utility functions + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "lsasrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + + +/* GLOBALS *****************************************************************/ + + +/* FUNCTIONS ***************************************************************/ + +INT +LsapLoadString(HINSTANCE hInstance, + UINT uId, + LPWSTR lpBuffer, + INT nBufferMax) +{ + HGLOBAL hmem; + HRSRC hrsrc; + WCHAR *p; + int string_num; + int i; + + /* Use loword (incremented by 1) as resourceid */ + hrsrc = FindResourceW(hInstance, + MAKEINTRESOURCEW((LOWORD(uId) >> 4) + 1), + (LPWSTR)RT_STRING); + if (!hrsrc) + return 0; + + hmem = LoadResource(hInstance, hrsrc); + if (!hmem) + return 0; + + p = LockResource(hmem); + string_num = uId & 0x000f; + for (i = 0; i < string_num; i++) + p += *p + 1; + + i = min(nBufferMax - 1, *p); + if (i > 0) + { + memcpy(lpBuffer, p + 1, i * sizeof(WCHAR)); + lpBuffer[i] = 0; + } + else + { + if (nBufferMax > 1) + { + lpBuffer[0] = 0; + return 0; + } + } + + return i; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/utils.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 60012: [BASESRV] - Fix header formatting plus windows headers inclusion. - RtlCreateUnicodeString returns booleans, not ntstatuses, so fix the code appropriately.
by hbelusca＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: hbelusca Date: Tue Sep 10 20:45:53 2013 New Revision: 60012 URL: http://svn.reactos.org/svn/reactos?rev=60012&view=rev Log: [BASESRV] - Fix header formatting plus windows headers inclusion. - RtlCreateUnicodeString returns booleans, not ntstatuses, so fix the code appropriately. Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h trunk/reactos/subsystems/win/basesrv/init.c Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] Tue Sep 10 20:45:53 2013 @@ -12,10 +12,18 @@ #pragma once /* PSDK/NDK Headers */ +#include <stdarg.h> #define WIN32_NO_STATUS -#include <windows.h> +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <winbase.h> +#include <winreg.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> + +/* PSEH for SEH Support */ +#include <pseh/pseh2.h> /* CSRSS Header */ #include <csr/csrsrv.h> @@ -31,25 +39,24 @@ } BASESRV_KERNEL_IMPORTS, *PBASESRV_KERNEL_IMPORTS; /* FIXME: BASENLS.H */ -typedef NTSTATUS(*WINAPI POPEN_DATA_FILE) (HANDLE hFile, - PWCHAR FileName - ); +typedef NTSTATUS(*WINAPI POPEN_DATA_FILE)(HANDLE hFile, + PWCHAR FileName); -typedef BOOL(*WINAPI PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, - LPWSTR FileName, - ULONG FileNameSize - ); +typedef BOOL(*WINAPI PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, + LPWSTR FileName, + ULONG FileNameSize); -typedef BOOL(*WINAPI PGET_NLS_SECTION_NAME)(UINT CodePage, - UINT Base, - ULONG Unknown, - LPWSTR BaseName, - LPWSTR Result, - ULONG ResultSize - ); +typedef BOOL(*WINAPI PGET_NLS_SECTION_NAME)(UINT CodePage, + UINT Base, + ULONG Unknown, + LPWSTR BaseName, + LPWSTR Result, + ULONG ResultSize); typedef BOOL(*WINAPI PVALIDATE_LOCALE)(IN ULONG LocaleId); -typedef NTSTATUS(*WINAPI PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, IN ULONG BufferSize, IN ULONG AceType); +typedef NTSTATUS(*WINAPI PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, + IN ULONG BufferSize, + IN ULONG AceType); /* Globals */ extern HANDLE BaseSrvHeap; Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Tue Sep 10 20:45:53 2013 @@ -280,6 +280,7 @@ BaseInitializeStaticServerData(IN PCSR_SERVER_DLL LoadedServerDll) { NTSTATUS Status; + BOOLEAN Success; WCHAR Buffer[MAX_PATH]; PWCHAR HeapBuffer; UNICODE_STRING SystemRootString; @@ -327,21 +328,21 @@ /* Create the base directory */ Buffer[SystemRootString.Length / sizeof(WCHAR)] = UNICODE_NULL; - Status = RtlCreateUnicodeString(&BaseSrvWindowsDirectory, - SystemRootString.Buffer); - ASSERT(NT_SUCCESS(Status)); + Success = RtlCreateUnicodeString(&BaseSrvWindowsDirectory, + SystemRootString.Buffer); + ASSERT(Success); /* Create the system directory */ wcscat(SystemRootString.Buffer, L"\\System32"); - Status = RtlCreateUnicodeString(&BaseSrvWindowsSystemDirectory, - SystemRootString.Buffer); - ASSERT(NT_SUCCESS(Status)); + Success = RtlCreateUnicodeString(&BaseSrvWindowsSystemDirectory, + SystemRootString.Buffer); + ASSERT(Success); /* Create the kernel32 path */ wcscat(SystemRootString.Buffer, L"\\kernel32.dll"); - Status = RtlCreateUnicodeString(&BaseSrvKernel32DllPath, - SystemRootString.Buffer); - ASSERT(NT_SUCCESS(Status)); + Success = RtlCreateUnicodeString(&BaseSrvKernel32DllPath, + SystemRootString.Buffer); + ASSERT(Success); /* FIXME: Check Session ID */ wcscpy(Buffer, L"\\BaseNamedObjects");

1 0

[aandrejevic] 60011: [SOFT386] Implement many instructions (including ADC, SUB, CDQ, CWDE, ...), and "stubplement" even more of them.
by aandrejevic＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: aandrejevic Date: Tue Sep 10 20:41:43 2013 New Revision: 60011 URL: http://svn.reactos.org/svn/reactos?rev=60011&view=rev Log: [SOFT386] Implement many instructions (including ADC, SUB, CDQ, CWDE, ...), and "stubplement" even more of them. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Tue Sep 10 20:41:43 2013 @@ -30,32 +30,32 @@ Soft386OpcodeAddModrm, Soft386OpcodeAddAl, Soft386OpcodeAddEax, - NULL, // TODO: OPCODE 0x06 NOT SUPPORTED - NULL, // TODO: OPCODE 0x07 NOT SUPPORTED + Soft386OpcodePushEs, + Soft386OpcodePopEs, Soft386OpcodeOrByteModrm, Soft386OpcodeOrModrm, Soft386OpcodeOrByteModrm, Soft386OpcodeOrModrm, Soft386OpcodeOrAl, Soft386OpcodeOrEax, - NULL, // TODO: OPCODE 0x0E NOT SUPPORTED + Soft386OpcodePushCs, NULL, // TODO: OPCODE 0x0F NOT SUPPORTED - NULL, // TODO: OPCODE 0x10 NOT SUPPORTED - NULL, // TODO: OPCODE 0x11 NOT SUPPORTED - NULL, // TODO: OPCODE 0x12 NOT SUPPORTED - NULL, // TODO: OPCODE 0x13 NOT SUPPORTED - NULL, // TODO: OPCODE 0x14 NOT SUPPORTED - NULL, // TODO: OPCODE 0x15 NOT SUPPORTED - NULL, // TODO: OPCODE 0x16 NOT SUPPORTED - NULL, // TODO: OPCODE 0x17 NOT SUPPORTED - NULL, // TODO: OPCODE 0x18 NOT SUPPORTED - NULL, // TODO: OPCODE 0x19 NOT SUPPORTED - NULL, // TODO: OPCODE 0x1A NOT SUPPORTED - NULL, // TODO: OPCODE 0x1B NOT SUPPORTED - NULL, // TODO: OPCODE 0x1C NOT SUPPORTED - NULL, // TODO: OPCODE 0x1D NOT SUPPORTED - NULL, // TODO: OPCODE 0x1E NOT SUPPORTED - NULL, // TODO: OPCODE 0x1F NOT SUPPORTED + Soft386OpcodeAdcByteModrm, + Soft386OpcodeAdcModrm, + Soft386OpcodeAdcByteModrm, + Soft386OpcodeAdcModrm, + Soft386OpcodeAdcAl, + Soft386OpcodeAdcEax, + Soft386OpcodePushSs, + Soft386OpcodePopSs, + Soft386OpcodeSbbByteModrm, + Soft386OpcodeSbbModrm, + Soft386OpcodeSbbByteModrm, + Soft386OpcodeSbbModrm, + Soft386OpcodeSbbAl, + Soft386OpcodeSbbEax, + Soft386OpcodePushDs, + Soft386OpcodePopDs, Soft386OpcodeAndByteModrm, Soft386OpcodeAndModrm, Soft386OpcodeAndByteModrm, @@ -63,15 +63,15 @@ Soft386OpcodeAndAl, Soft386OpcodeAndEax, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0x27 NOT SUPPORTED - NULL, // TODO: OPCODE 0x28 NOT SUPPORTED - NULL, // TODO: OPCODE 0x29 NOT SUPPORTED - NULL, // TODO: OPCODE 0x2A NOT SUPPORTED - NULL, // TODO: OPCODE 0x2B NOT SUPPORTED - NULL, // TODO: OPCODE 0x2C NOT SUPPORTED - NULL, // TODO: OPCODE 0x2D NOT SUPPORTED + Soft386OpcodeDaa, + Soft386OpcodeCmpSubByteModrm, + Soft386OpcodeCmpSubModrm, + Soft386OpcodeCmpSubByteModrm, + Soft386OpcodeCmpSubModrm, + Soft386OpcodeCmpSubAl, + Soft386OpcodeCmpSubEax, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0x2F NOT SUPPORTED + Soft386OpcodeDas, Soft386OpcodeXorByteModrm, Soft386OpcodeXorModrm, Soft386OpcodeXorByteModrm, @@ -79,15 +79,15 @@ Soft386OpcodeXorAl, Soft386OpcodeXorEax, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0x37 NOT SUPPORTED - NULL, // TODO: OPCODE 0x38 NOT SUPPORTED - NULL, // TODO: OPCODE 0x39 NOT SUPPORTED - NULL, // TODO: OPCODE 0x3A NOT SUPPORTED - NULL, // TODO: OPCODE 0x3B NOT SUPPORTED - NULL, // TODO: OPCODE 0x3C NOT SUPPORTED - NULL, // TODO: OPCODE 0x3D NOT SUPPORTED + Soft386OpcodeAaa, + Soft386OpcodeCmpSubByteModrm, + Soft386OpcodeCmpSubModrm, + Soft386OpcodeCmpSubByteModrm, + Soft386OpcodeCmpSubModrm, + Soft386OpcodeCmpSubAl, + Soft386OpcodeCmpSubEax, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0x3F NOT SUPPORTED + Soft386OpcodeAas, Soft386OpcodeIncrement, Soft386OpcodeIncrement, Soft386OpcodeIncrement, @@ -120,18 +120,18 @@ Soft386OpcodePopReg, Soft386OpcodePopReg, Soft386OpcodePopReg, - NULL, // TODO: OPCODE 0x60 NOT SUPPORTED - NULL, // TODO: OPCODE 0x61 NOT SUPPORTED - NULL, // TODO: OPCODE 0x62 NOT SUPPORTED - NULL, // TODO: OPCODE 0x63 NOT SUPPORTED + Soft386OpcodePushAll, + Soft386OpcodePopAll, + Soft386OpcodeBound, + Soft386OpcodeArpl, Soft386OpcodePrefix, Soft386OpcodePrefix, Soft386OpcodePrefix, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0x68 NOT SUPPORTED - NULL, // TODO: OPCODE 0x69 NOT SUPPORTED - NULL, // TODO: OPCODE 0x6A NOT SUPPORTED - NULL, // TODO: OPCODE 0x6B NOT SUPPORTED + Soft386OpcodePushImm, + Soft386OpcodeImulModrmImm, + Soft386OpcodePushByteImm, + Soft386OpcodeImulModrmByteImm, NULL, // TODO: OPCODE 0x6C NOT SUPPORTED NULL, // TODO: OPCODE 0x6D NOT SUPPORTED NULL, // TODO: OPCODE 0x6E NOT SUPPORTED @@ -160,13 +160,13 @@ Soft386OpcodeTestModrm, Soft386OpcodeXchgByteModrm, Soft386OpcodeXchgModrm, - NULL, // TODO: OPCODE 0x88 NOT SUPPORTED - NULL, // TODO: OPCODE 0x89 NOT SUPPORTED - NULL, // TODO: OPCODE 0x8A NOT SUPPORTED - NULL, // TODO: OPCODE 0x8B NOT SUPPORTED - NULL, // TODO: OPCODE 0x8C NOT SUPPORTED - NULL, // TODO: OPCODE 0x8D NOT SUPPORTED - NULL, // TODO: OPCODE 0x8E NOT SUPPORTED + Soft386OpcodeMovByteModrm, + Soft386OpcodeMovModrm, + Soft386OpcodeMovByteModrm, + Soft386OpcodeMovModrm, + Soft386OpcodeMovStoreSeg, + Soft386OpcodeLea, + Soft386OpcodeMovLoadSeg, NULL, // TODO: OPCODE 0x8F NOT SUPPORTED Soft386OpcodeNop, Soft386OpcodeExchangeEax, @@ -176,14 +176,14 @@ Soft386OpcodeExchangeEax, Soft386OpcodeExchangeEax, Soft386OpcodeExchangeEax, - NULL, // TODO: OPCODE 0x98 NOT SUPPORTED - NULL, // TODO: OPCODE 0x99 NOT SUPPORTED - NULL, // TODO: OPCODE 0x9A NOT SUPPORTED - NULL, // TODO: OPCODE 0x9B NOT SUPPORTED - NULL, // TODO: OPCODE 0x9C NOT SUPPORTED - NULL, // TODO: OPCODE 0x9D NOT SUPPORTED - NULL, // TODO: OPCODE 0x9E NOT SUPPORTED - NULL, // TODO: OPCODE 0x9F NOT SUPPORTED + Soft386OpcodeCwde, + Soft386OpcodeCdq, + Soft386OpcodeCallAbs, + Soft386OpcodeWait, + Soft386OpcodePushFlags, + Soft386OpcodePopFlags, + Soft386OpcodeSahf, + Soft386OpcodeLahf, NULL, // TODO: OPCODE 0xA0 NOT SUPPORTED NULL, // TODO: OPCODE 0xA1 NOT SUPPORTED NULL, // TODO: OPCODE 0xA2 NOT SUPPORTED @@ -192,8 +192,8 @@ NULL, // TODO: OPCODE 0xA5 NOT SUPPORTED NULL, // TODO: OPCODE 0xA6 NOT SUPPORTED NULL, // TODO: OPCODE 0xA7 NOT SUPPORTED - NULL, // TODO: OPCODE 0xA8 NOT SUPPORTED - NULL, // TODO: OPCODE 0xA9 NOT SUPPORTED + Soft386OpcodeTestAl, + Soft386OpcodeTestEax, NULL, // TODO: OPCODE 0xAA NOT SUPPORTED NULL, // TODO: OPCODE 0xAB NOT SUPPORTED NULL, // TODO: OPCODE 0xAC NOT SUPPORTED @@ -218,28 +218,28 @@ Soft386OpcodeMovRegImm, NULL, // TODO: OPCODE 0xC0 NOT SUPPORTED NULL, // TODO: OPCODE 0xC1 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC2 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC3 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC4 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC5 NOT SUPPORTED + Soft386OpcodeRetImm, + Soft386OpcodeRet, + Soft386OpcodeLes, + Soft386OpcodeLds, NULL, // TODO: OPCODE 0xC6 NOT SUPPORTED NULL, // TODO: OPCODE 0xC7 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC8 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC9 NOT SUPPORTED - NULL, // TODO: OPCODE 0xCA NOT SUPPORTED - NULL, // TODO: OPCODE 0xCB NOT SUPPORTED - NULL, // TODO: OPCODE 0xCC NOT SUPPORTED - NULL, // TODO: OPCODE 0xCD NOT SUPPORTED - NULL, // TODO: OPCODE 0xCE NOT SUPPORTED - NULL, // TODO: OPCODE 0xCF NOT SUPPORTED + Soft386OpcodeEnter, + Soft386OpcodeLeave, + Soft386OpcodeRetFarImm, + Soft386OpcodeRetFar, + Soft386OpcodeInt3, + Soft386OpcodeInt, + Soft386OpcodeIntOverflow, + Soft386OpcodeIret, NULL, // TODO: OPCODE 0xD0 NOT SUPPORTED NULL, // TODO: OPCODE 0xD1 NOT SUPPORTED NULL, // TODO: OPCODE 0xD2 NOT SUPPORTED NULL, // TODO: OPCODE 0xD3 NOT SUPPORTED - NULL, // TODO: OPCODE 0xD4 NOT SUPPORTED - NULL, // TODO: OPCODE 0xD5 NOT SUPPORTED + Soft386OpcodeAam, + Soft386OpcodeAad, NULL, // TODO: OPCODE 0xD6 NOT SUPPORTED - NULL, // TODO: OPCODE 0xD7 NOT SUPPORTED + Soft386OpcodeXlat, NULL, // TODO: OPCODE 0xD8 NOT SUPPORTED NULL, // TODO: OPCODE 0xD9 NOT SUPPORTED NULL, // TODO: OPCODE 0xDA NOT SUPPORTED @@ -248,17 +248,17 @@ NULL, // TODO: OPCODE 0xDD NOT SUPPORTED NULL, // TODO: OPCODE 0xDE NOT SUPPORTED NULL, // TODO: OPCODE 0xDF NOT SUPPORTED - NULL, // TODO: OPCODE 0xE0 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE1 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE2 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE3 NOT SUPPORTED + Soft386OpcodeLoopnz, + Soft386OpcodeLoopz, + Soft386OpcodeLoop, + Soft386OpcodeJecxz, Soft386OpcodeInByte, Soft386OpcodeIn, Soft386OpcodeOutByte, Soft386OpcodeOut, - NULL, // TODO: OPCODE 0xE8 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE9 NOT SUPPORTED - NULL, // TODO: OPCODE 0xEA NOT SUPPORTED + Soft386OpcodeCall, + Soft386OpcodeJmp, + Soft386OpcodeJmpAbs, Soft386OpcodeShortJump, Soft386OpcodeInByte, Soft386OpcodeIn, @@ -2610,3 +2610,1286 @@ /* The result is discarded */ return TRUE; } + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushEs) +{ + /* Call the internal API */ + return Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_ES].Selector); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePopEs) +{ + ULONG NewSelector; + + if (!Soft386StackPop(State, &NewSelector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386LoadSegment(State, SOFT386_REG_ES, LOWORD(NewSelector)); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushCs) +{ + /* Call the internal API */ + return Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_CS].Selector); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcByteModrm) +{ + UCHAR FirstValue, SecondValue, Result; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x10); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + else if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf + && ((FirstValue == 0xFF) || (SecondValue == 0xFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) == (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcModrm) +{ + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x11); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf + && ((FirstValue == 0xFFFFFFFF) || (SecondValue == 0xFFFFFFFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) == (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf + && ((FirstValue == 0xFFFF) || (SecondValue == 0xFFFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) == (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcAl) +{ + UCHAR FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + UCHAR SecondValue, Result; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x14); + + if (State->PrefixFlags) + { + /* This opcode doesn't take any prefixes */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (!Soft386FetchByte(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf && + ((FirstValue == 0xFF) || (SecondValue == 0xFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) == (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Result; + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcEax) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x15); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue, Result; + + if (!Soft386FetchDword(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf && + ((FirstValue == 0xFFFFFFFF) || (SecondValue == 0xFFFFFFFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) == (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result; + } + else + { + USHORT FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + USHORT SecondValue, Result; + + if (!Soft386FetchWord(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue + State->Flags.Cf; + + /* Special exception for CF */ + State->Flags.Cf = State->Flags.Cf && + ((FirstValue == 0xFFFF) || (SecondValue == 0xFFFF)); + + /* Update the flags */ + State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) == (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushSs) +{ + /* Call the internal API */ + return Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_SS].Selector); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePopSs) +{ + ULONG NewSelector; + + if (!Soft386StackPop(State, &NewSelector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386LoadSegment(State, SOFT386_REG_SS, LOWORD(NewSelector)); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbByteModrm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbModrm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbAl) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbEax) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushDs) +{ + /* Call the internal API */ + return Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_DS].Selector); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePopDs) +{ + ULONG NewSelector; + + if (!Soft386StackPop(State, &NewSelector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386LoadSegment(State, SOFT386_REG_DS, LOWORD(NewSelector)); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeDaa) +{ + UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + BOOLEAN Carry = State->Flags.Cf; + + /* Clear the carry flag */ + State->Flags.Cf = FALSE; + + /* Check if the first BCD digit is invalid or there was a carry from it */ + if (((Value & 0x0F) > 9) || State->Flags.Af) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte += 0x06; + if (State->GeneralRegs[SOFT386_REG_EAX].LowByte < 0x06) + { + /* A carry occurred */ + State->Flags.Cf = TRUE; + } + + /* Set the adjust flag */ + State->Flags.Af = TRUE; + } + + /* Check if the second BCD digit is invalid or there was a carry from it */ + if ((Value > 0x99) || Carry) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte += 0x60; + + /* There was a carry */ + State->Flags.Cf = TRUE; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubByteModrm) +{ + UCHAR FirstValue, SecondValue, Result; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xED) == 0x28); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + else if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is the instruction that writes to R/M */ + if (!(Opcode & SOFT386_OPCODE_WRITE_REG)) + { + /* Swap the order */ + FirstValue ^= SecondValue; + SecondValue ^= FirstValue; + FirstValue ^= SecondValue; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) != (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + /* Discard the result */ + return TRUE; + } +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubModrm) +{ + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xED) == 0x29); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is the instruction that writes to R/M */ + if (!(Opcode & SOFT386_OPCODE_WRITE_REG)) + { + /* Swap the order */ + FirstValue ^= SecondValue; + SecondValue ^= FirstValue; + FirstValue ^= SecondValue; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) != (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + /* Discard the result */ + return TRUE; + } + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is the instruction that writes to R/M */ + if (!(Opcode & SOFT386_OPCODE_WRITE_REG)) + { + /* Swap the order */ + FirstValue ^= SecondValue; + SecondValue ^= FirstValue; + FirstValue ^= SecondValue; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) != (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + /* Discard the result */ + return TRUE; + } + } + +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubAl) +{ + UCHAR FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + UCHAR SecondValue, Result; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xEF) == 0x2C); + + if (State->PrefixFlags) + { + /* This opcode doesn't take any prefixes */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (!Soft386FetchByte(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) != (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Result; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubEax) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xEF) == 0x2D); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue, Result; + + if (!Soft386FetchDword(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) != (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result; + } + } + else + { + USHORT FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + USHORT SecondValue, Result; + + if (!Soft386FetchWord(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) != (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeDas) +{ + UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + BOOLEAN Carry = State->Flags.Cf; + + /* Clear the carry flag */ + State->Flags.Cf = FALSE; + + /* Check if the first BCD digit is invalid or there was a borrow */ + if (((Value & 0x0F) > 9) || State->Flags.Af) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte -= 0x06; + if (State->GeneralRegs[SOFT386_REG_EAX].LowByte > 0xFB) + { + /* A borrow occurred */ + State->Flags.Cf = TRUE; + } + + /* Set the adjust flag */ + State->Flags.Af = TRUE; + } + + /* Check if the second BCD digit is invalid or there was a borrow */ + if ((Value > 0x99) || Carry) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte -= 0x60; + + /* There was a borrow */ + State->Flags.Cf = TRUE; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAaa) +{ + UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + + /* + * Check if the value in AL is not a valid BCD digit, + * or there was a carry from the lowest 4 bits of AL + */ + if (((Value & 0x0F) > 9) || State->Flags.Af) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte += 0x06; + State->GeneralRegs[SOFT386_REG_EAX].HighByte++; + + /* Set CF and AF */ + State->Flags.Cf = State->Flags.Af = TRUE; + } + else + { + /* Clear CF and AF */ + State->Flags.Cf = State->Flags.Af = FALSE; + } + + /* Keep only the lowest 4 bits of AL */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte &= 0x0F; + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAas) +{ + UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + + /* + * Check if the value in AL is not a valid BCD digit, + * or there was a borrow from the lowest 4 bits of AL + */ + if (((Value & 0x0F) > 9) || State->Flags.Af) + { + /* Correct it */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte -= 0x06; + State->GeneralRegs[SOFT386_REG_EAX].HighByte--; + + /* Set CF and AF */ + State->Flags.Cf = State->Flags.Af = TRUE; + } + else + { + /* Clear CF and AF */ + State->Flags.Cf = State->Flags.Af = FALSE; + } + + /* Keep only the lowest 4 bits of AL */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte &= 0x0F; + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushAll) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePopAll) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeBound) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeArpl) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushImm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmImm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushByteImm) +{ + UCHAR Data; + + if (!Soft386FetchByte(State, &Data)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386StackPush(State, Data); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmByteImm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovByteModrm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovModrm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovStoreSeg) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLea) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovLoadSeg) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCwde) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x98); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else if (State->PrefixFlags != 0) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + /* Sign extend AX to EAX */ + State->GeneralRegs[SOFT386_REG_EAX].Long = MAKELONG + ( + State->GeneralRegs[SOFT386_REG_EAX].LowWord, + (State->GeneralRegs[SOFT386_REG_EAX].LowWord & SIGN_FLAG_WORD) + ? 0xFFFF : 0x0000 + ); + } + else + { + /* Sign extend AL to AX */ + State->GeneralRegs[SOFT386_REG_EAX].HighByte = + (State->GeneralRegs[SOFT386_REG_EAX].LowByte & SIGN_FLAG_BYTE) + ? 0xFF : 0x00; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCdq) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x99); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else if (State->PrefixFlags != 0) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + /* Sign extend EAX to EDX:EAX */ + State->GeneralRegs[SOFT386_REG_EDX].Long = + (State->GeneralRegs[SOFT386_REG_EAX].Long & SIGN_FLAG_LONG) + ? 0xFFFFFFFF : 0x00000000; + } + else + { + /* Sign extend AX to DX:AX */ + State->GeneralRegs[SOFT386_REG_EDX].LowWord = + (State->GeneralRegs[SOFT386_REG_EAX].LowWord & SIGN_FLAG_WORD) + ? 0xFFFF : 0x0000; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCallAbs) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeWait) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePushFlags) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodePopFlags) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeSahf) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetImm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeRet) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLes) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLds) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeEnter) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLeave) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFar) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt3) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeIntOverflow) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeIret) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAam) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAad) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopnz) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopz) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoop) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeJecxz) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCall) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return FALSE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Tue Sep 10 20:41:43 2013 @@ -68,7 +68,75 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeXorEax); SOFT386_OPCODE_HANDLER(Soft386OpcodeTestByteModrm); SOFT386_OPCODE_HANDLER(Soft386OpcodeTestModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeTestAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeTestEax); SOFT386_OPCODE_HANDLER(Soft386OpcodeXchgByteModrm); SOFT386_OPCODE_HANDLER(Soft386OpcodeXchgModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushEs); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopEs); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushCs); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAdcEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushSs); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopSs); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushDs); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopDs); +SOFT386_OPCODE_HANDLER(Soft386OpcodeDaa); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodeDas); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAaa); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAas); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushAll); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopAll); +SOFT386_OPCODE_HANDLER(Soft386OpcodeBound); +SOFT386_OPCODE_HANDLER(Soft386OpcodeArpl); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushByteImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmByteImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovStoreSeg); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLea); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovLoadSeg); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCwde); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCdq); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCallAbs); +SOFT386_OPCODE_HANDLER(Soft386OpcodeWait); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushFlags); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopFlags); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSahf); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf); +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeRet); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLes); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLds); +SOFT386_OPCODE_HANDLER(Soft386OpcodeEnter); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLeave); +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFar); +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt3); +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt); +SOFT386_OPCODE_HANDLER(Soft386OpcodeIntOverflow); +SOFT386_OPCODE_HANDLER(Soft386OpcodeIret); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAam); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAad); +SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopnz); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopz); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoop); +SOFT386_OPCODE_HANDLER(Soft386OpcodeJecxz); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCall); +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp); +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs); #endif // _OPCODES_H_

1 0

[tfaber] 60010: [CMAKE] - Correctly escape error message. Spotted & tested by David Quintana
by tfaber＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: tfaber Date: Tue Sep 10 20:06:05 2013 New Revision: 60010 URL: http://svn.reactos.org/svn/reactos?rev=60010&view=rev Log: [CMAKE] - Correctly escape error message. Spotted & tested by David Quintana 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] Tue Sep 10 20:06:05 2013 @@ -189,7 +189,7 @@ set(${var} 16) elseif(${dir} STREQUAL reactos/system32/wbem) set(${var} 17) - else() + else() message(FATAL_ERROR "Wrong destination: ${dir}") endif() endmacro() @@ -207,7 +207,7 @@ endif() if(NOT _CD_FOR) - message(FATAL_ERROR "You must provide a cd name (or "all" for all of them) to install the file on!") + message(FATAL_ERROR "You must provide a cd name (or \"all\" for all of them) to install the file on!") endif() #get file if we need to

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