Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[royce] 14095: have buildno invocation conform to VERBOSE setting

by royce＠svn.reactos.com

have buildno invocation conform to VERBOSE setting Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-15 11:38:15 UTC (rev 14094) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-15 14:02:22 UTC (rev 14095) @@ -32,17 +32,21 @@ ifeq ($(VERBOSE),no) Q = @ HALFVERBOSEECHO = no + BUILDNO_QUIET = -q else ifeq ($(VERBOSE),yes) Q = HALFVERBOSEECHO = no + BUILDNO_QUIET = else Q = @ HALFVERBOSEECHO = yes + BUILDNO_QUIET = -q endif endif ifeq ($(HALFVERBOSEECHO),yes) ECHO_MKDIR =@echo [MKDIR] $@ + ECHO_BUILDNO=@echo [BUILDNO] $@ ECHO_INVOKE =@echo [INVOKE] $< ECHO_PCH =@echo [PCH] $@ ECHO_CC =@echo [CC] $< @@ -63,6 +67,7 @@ ECHO_TEST =@echo [TEST] $@ else ECHO_MKDIR = + ECHO_BUILDNO= ECHO_INVOKE = ECHO_PCH = ECHO_CC = @@ -143,7 +148,7 @@ INTERMEDIATE_EXISTS = $(INTERMEDIATE)$(EXISTS) $(INTERMEDIATE_EXISTS): - ${nmkdir} $(INTERMEDIATE_NO_SLASH) + -${nmkdir} $(INTERMEDIATE_NO_SLASH) 2>$(NUL) >$(NUL) @echo . > $@ NTOSKRNL_MC = ntoskrnl$(SEP)ntoskrnl.mc _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak --- branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-15 11:38:15 UTC (rev 14094) +++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-15 14:02:22 UTC (rev 14095) @@ -50,4 +50,5 @@ clean: buildno_clean $(BUILDNO_H): $(BUILDNO_TARGET) - $(BUILDNO_TARGET) $(BUILDNO_H) + $(ECHO_BUILDNO) + $(Q)$(BUILDNO_TARGET) $(BUILDNO_QUIET) $(BUILDNO_H)

19 years, 6 months

[gvg] 14094: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: Americo Jose Melo <mmodem00(a)netvisao.pt> Francois Gouget <fgouget(a)codeweavers.com> - Translate the Wine resources to Portuguese. Alex Villacfs Lasso <a_villacis(a)palosanto.com> - Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all resources, so that Spanish locales other than Spain also use Spanish resources. Juan Lang <juan_lang(a)yahoo.com> - Implement SetupDiGetClassDevsA/W, SetupDiEnumDeviceInterfaces, SetupDiDestroyDeviceInfoList, and SetupDiGetDeviceInterfaceDetailA for serial ports. Hans Leidekker <hans(a)it.vu.nl> - Don't use utf8 in rc files. Ge van Geldorp <gvg(a)reactos.com> - eol-style fixes Modified: trunk/reactos/lib/setupapi/Cs.rc Modified: trunk/reactos/lib/setupapi/De.rc Modified: trunk/reactos/lib/setupapi/En.rc Modified: trunk/reactos/lib/setupapi/Es.rc Modified: trunk/reactos/lib/setupapi/Fr.rc Modified: trunk/reactos/lib/setupapi/It.rc Modified: trunk/reactos/lib/setupapi/Ja.rc Modified: trunk/reactos/lib/setupapi/Makefile.in Modified: trunk/reactos/lib/setupapi/Nl.rc Modified: trunk/reactos/lib/setupapi/Pt.rc Modified: trunk/reactos/lib/setupapi/Ru.rc Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/devinst16.c Modified: trunk/reactos/lib/setupapi/dirid.c Modified: trunk/reactos/lib/setupapi/diskspace.c Modified: trunk/reactos/lib/setupapi/infparse.c Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/parser.c Modified: trunk/reactos/lib/setupapi/queue.c Modified: trunk/reactos/lib/setupapi/setupapi.rc Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/setupapi_private.h Modified: trunk/reactos/lib/setupapi/setupcab.c Modified: trunk/reactos/lib/setupapi/setupx.spec Modified: trunk/reactos/lib/setupapi/setupx16.h Modified: trunk/reactos/lib/setupapi/setupx_main.c Modified: trunk/reactos/lib/setupapi/stubs.c Modified: trunk/reactos/lib/setupapi/virtcopy.c Modified: trunk/reactos/w32api/include/winioctl.h _____ Modified: trunk/reactos/lib/setupapi/Cs.rc --- trunk/reactos/lib/setupapi/Cs.rc 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/Cs.rc 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,35 +1,35 @@ -/* - * Czech resources for SETUPAPI - * - * Copyright 2001 Andreas Mohr - * Copyright 2004 David Kredba - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "KopÝruji soubory..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Storno", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Zdroj:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "CÝl:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Czech resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * Copyright 2004 David Kredba + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "KopÝruji soubory..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Storno", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Zdroj:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "CÝl:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/De.rc --- trunk/reactos/lib/setupapi/De.rc 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/De.rc 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,34 +1,34 @@ -/* - * German resources for SETUPAPI - * - * Copyright 2004 Henning Gerhardt - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Dateien kopieren..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Abbrechen", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Quelle:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Ziel:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * German resources for SETUPAPI + * + * Copyright 2004 Henning Gerhardt + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Dateien kopieren..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Abbrechen", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Quelle:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ziel:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/En.rc --- trunk/reactos/lib/setupapi/En.rc 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/En.rc 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,34 +1,34 @@ -/* - * English resources for SETUPAPI - * - * Copyright 2001 Andreas Mohr - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copying Files..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * English resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copying Files..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/Es.rc --- trunk/reactos/lib/setupapi/Es.rc 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/Es.rc 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,34 +1,34 @@ -/* - * Spanish resources for SETUPAPI - * - * Copyright 2003 JosÚ Manuel Ferrer Ortiz - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copiando archivos..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Origen:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Spanish resources for SETUPAPI + * + * Copyright 2003 JosÚ Manuel Ferrer Ortiz + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copiando archivos..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Origen:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/Fr.rc --- trunk/reactos/lib/setupapi/Fr.rc 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/Fr.rc 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,35 +1,35 @@ -/* - * French resources for SETUPAPI - * - * Copyright 2001 Andreas Mohr - * Copyright 2003 Vincent BÚron - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copie de fichiers..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * French resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * Copyright 2003 Vincent BÚron + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copie de fichiers..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/It.rc --- trunk/reactos/lib/setupapi/It.rc 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/It.rc 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,35 +1,35 @@ -/* - * Italian resources for SETUPAPI - * - * Copyright 2001 Andreas Mohr - * Copyright 2003 Ivan Leo Puoti - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copia dei file in corso..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Anulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Origine:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destinazione:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Italian resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * Copyright 2003 Ivan Leo Puoti + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copia dei file in corso..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Anulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Origine:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destinazione:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/Ja.rc --- trunk/reactos/lib/setupapi/Ja.rc 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/Ja.rc 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,34 +1,34 @@ -/* - * Japanese resources for SETUPAPI - * - * Copyright 2004 Hajime Segawa - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "âtâ@âCâïéâRâsü[éÁé?éóé?éÀ..." -FONT 9, "MS UI Gothic" -BEGIN - PUSHBUTTON "âLâââôâZâï", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "âRâsü[î?:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "âRâsü[Éµ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Japanese resources for SETUPAPI + * + * Copyright 2004 Hajime Segawa + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "âtâ@âCâïéâRâsü[éÁé?éóé?éÀ..." +FONT 9, "MS UI Gothic" +BEGIN + PUSHBUTTON "âLâââôâZâï", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "âRâsü[î?:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "âRâsü[Éµ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/Makefile.in --- trunk/reactos/lib/setupapi/Makefile.in 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/Makefile.in 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,35 +1,35 @@ -EXTRADEFS = -D_SETUPAPI_ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = setupapi.dll -IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll -DELAYIMPORTS = shell32 -EXTRALIBS = $(LIBUNICODE) - -C_SRCS = \ - cfgmgr.c \ - devinst.c \ - dirid.c \ - diskspace.c \ - install.c \ - misc.c \ - parser.c \ - queue.c \ - setupcab.c \ - stubs.c - -C_SRCS16 = \ - devinst16.c \ - infparse.c \ - setupx_main.c \ - virtcopy.c - -SPEC_SRCS16 = setupx.spec - -RC_SRCS= setupapi.rc - -@MAKE_DLL_RULES@ - -### Dependencies: +EXTRADEFS = -D_SETUPAPI_ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = setupapi.dll +IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll +DELAYIMPORTS = shell32 +EXTRALIBS = $(LIBUNICODE) + +C_SRCS = \ + cfgmgr.c \ + devinst.c \ + dirid.c \ + diskspace.c \ + install.c \ + misc.c \ + parser.c \ + queue.c \ + setupcab.c \ + stubs.c + +C_SRCS16 = \ + devinst16.c \ + infparse.c \ + setupx_main.c \ + virtcopy.c + +SPEC_SRCS16 = setupx.spec + +RC_SRCS= setupapi.rc + +@MAKE_DLL_RULES@ + +### Dependencies: _____ Modified: trunk/reactos/lib/setupapi/Nl.rc --- trunk/reactos/lib/setupapi/Nl.rc 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/Nl.rc 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,34 +1,34 @@ -/* - * setupapi (Dutch resources) - * - * Copyright 2003 Hans Leidekker - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Bestanden worden gekopi?½erd..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Annuleren", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Bron:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Bestemming:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * setupapi (Dutch resources) + * + * Copyright 2003 Hans Leidekker + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Bestanden worden gekopiÙerd..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Annuleren", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Bron:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Bestemming:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/Pt.rc --- trunk/reactos/lib/setupapi/Pt.rc 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/Pt.rc 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,34 +1,50 @@ -/* - * Portuguese resources for SETUPAPI - * - * Copyright 2003 Marcelo Duarte - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copiando arquivos..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Origem:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Portuguese resources for SETUPAPI + * + * Copyright 2003 Marcelo Duarte + * Copyright 2004 AmÚrico JosÚ Melo + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copiando arquivos..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Origem:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "A copiar ficheiros..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Origem:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destino:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/Ru.rc --- trunk/reactos/lib/setupapi/Ru.rc 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/Ru.rc 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,34 +1,34 @@ -/* - * SETUPAPI (Russian resources) - * - * Copyright 2003 Igor Stepin - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "?¯´Þ¯ÔÓÝÞÕ ¶ÓÚÙ¯Ô..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "??Û¾õÓ:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "?¾õÓ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * SETUPAPI (Russian resources) + * + * Copyright 2003 Igor Stepin + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "?¯´Þ¯ÔÓÝÞÕ ¶ÓÚÙ¯Ô..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "??Û¾õÓ:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "?¾õÓ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-03-15 11:38:15 UTC (rev 14094) @@ -29,6 +29,7 @@ #include "winreg.h" #include "setupapi.h" #include "cfgmgr32.h" +#include "setupapi_private.h" #include "wine/debug.h" _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-03-15 09:22:34 UTC (rev 14093) +++ trunk/reactos/lib/setupapi/devinst.c 2005-03-15 11:38:15 UTC (rev 14094) @@ -1,1282 +1,1521 @@ -/* - * SetupAPI device installer - * - * Copyright 2000 Andreas Mohr for CodeWeavers - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winreg.h" -#include "winternl.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "setupapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -#include "rpc.h" -#include "rpcdce.h" - -#include "setupapi_private.h" - - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); - -/* Unicode constants */ -static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; -static const WCHAR Class[] = {'C','l','a','s','s',0}; -static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; -static const WCHAR NoDisplayClass[] = {'N','o','D','i','s','p','l','a','y','C','l','a','s','s',0}; -static const WCHAR NoInstallClass[] = {'N','o','I','s','t','a','l','l','C','l','a','s','s',0}; -static const WCHAR NoUseClass[] = {'N','o','U','s','e','C','l','a','s','s',0}; -static const WCHAR NtExtension[] = {'.','N','T',0}; -static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; -static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; -static const WCHAR WinExtension[] = {'.','W','i','n',0}; - -/* Registry key and value names */ -static const WCHAR ControlClass[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , - 'C','o','n','t','r','o','l','\\', - 'C','l','a','s','s',0}; - -static const WCHAR DeviceClasses[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , - 'C','o','n','t','r','o','l','\\', - 'D','e','v','i','c','e','C','l','a','s','s','e','s',0}; - -/********************************************************************** * - * SetupDiBuildClassInfoList (SETUPAPI.@) - */ -BOOL WINAPI SetupDiBuildClassInfoList( - DWORD Flags, - LPGUID ClassGuidList, - DWORD ClassGuidListSize, - PDWORD RequiredSize) -{ - TRACE("\n"); - return SetupDiBuildClassInfoListExW(Flags, ClassGuidList, - ClassGuidListSize, RequiredSize, - NULL, NULL); -} - -/********************************************************************** * - * SetupDiBuildClassInfoListExA (SETUPAPI.@) - */ -BOOL WINAPI SetupDiBuildClassInfoListExA( - DWORD Flags, - LPGUID ClassGuidList, - DWORD ClassGuidListSize, - PDWORD RequiredSize, - LPCSTR MachineName, - PVOID Reserved) -{ - LPWSTR MachineNameW = NULL; - BOOL bResult; - - TRACE("\n"); - - if (MachineName) - { - MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); - if (MachineNameW == NULL) - return FALSE; - } - - bResult = SetupDiBuildClassInfoListExW(Flags, ClassGuidList, - ClassGuidListSize, RequiredSize, - MachineNameW, Reserved); - - if (MachineNameW) - MyFree(MachineNameW); - - return bResult; -} - -/********************************************************************** * - * SetupDiBuildClassInfoListExW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiBuildClassInfoListExW( - DWORD Flags, - LPGUID ClassGuidList, - DWORD ClassGuidListSize, - PDWORD RequiredSize, - LPCWSTR MachineName, - PVOID Reserved) -{ - WCHAR szKeyName[40]; - HKEY hClassesKey; - HKEY hClassKey; - DWORD dwLength; - DWORD dwIndex; - LONG lError; - DWORD dwGuidListIndex = 0; - - TRACE("\n"); - - if (RequiredSize != NULL) - *RequiredSize = 0; - - hClassesKey = SetupDiOpenClassRegKeyExW(NULL, - KEY_ALL_ACCESS, - DIOCR_INSTALLER, - MachineName, - Reserved); - if (hClassesKey == INVALID_HANDLE_VALUE) - { - return FALSE; - } - - for (dwIndex = 0; ; dwIndex++) - { - dwLength = 40; - lError = RegEnumKeyExW(hClassesKey, - dwIndex, - szKeyName, [truncated at 1000 lines; 21345 more skipped]

19 years, 6 months

[gvg] 14093: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: Alexandre Julliard <julliard(a)winehq.org> - Avoid spaces before preprocessor directives, that's not portable. Robert Shearman <rob(a)codeweavers.com> - Add a stub implementation of RpcImpersonateClient. - More tracing, particularly on error paths. - ERROR_IO_PENDING is expected, so don't return an error. Mike Hearn <mh(a)codeweavers.com> - Suppress some useless warnings in the RPC runtime, and make a few TRACEs that were reporting problems into WARNs. Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c Modified: trunk/reactos/lib/rpcrt4/rpc_message.c Modified: trunk/reactos/lib/rpcrt4/rpc_server.c Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec _____ Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c --- trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-03-15 09:08:16 UTC (rev 14092) +++ trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-03-15 09:22:34 UTC (rev 14093) @@ -45,21 +45,21 @@ #define BUFFER_PARANOIA 20 #if defined(__i386__) - #define LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32) \ +# define LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32) \ (*((UINT32 *)(pchar)) = (uint32)) - #define LITTLE_ENDIAN_UINT32_READ(pchar) \ +# define LITTLE_ENDIAN_UINT32_READ(pchar) \ (*((UINT32 *)(pchar))) #else /* these would work for i386 too, but less efficient */ - #define LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32) \ +# define LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32) \ (*(pchar) = LOBYTE(LOWORD(uint32)), \ *((pchar)+1) = HIBYTE(LOWORD(uint32)), \ *((pchar)+2) = LOBYTE(HIWORD(uint32)), \ *((pchar)+3) = HIBYTE(HIWORD(uint32)), \ (uint32)) /* allow as r-value */ - #define LITTLE_ENDIAN_UINT32_READ(pchar) \ +# define LITTLE_ENDIAN_UINT32_READ(pchar) \ (MAKELONG( \ MAKEWORD(*(pchar), *((pchar)+1)), \ MAKEWORD(*((pchar)+2), *((pchar)+3)))) @@ -78,14 +78,14 @@ MAKEWORD(*((pchar)+1), *(pchar)))) #ifdef NDR_LOCAL_IS_BIG_ENDIAN - #define NDR_LOCAL_UINT32_WRITE(pchar, uint32) \ +# define NDR_LOCAL_UINT32_WRITE(pchar, uint32) \ BIG_ENDIAN_UINT32_WRITE(pchar, uint32) - #define NDR_LOCAL_UINT32_READ(pchar) \ +# define NDR_LOCAL_UINT32_READ(pchar) \ BIG_ENDIAN_UINT32_READ(pchar) #else - #define NDR_LOCAL_UINT32_WRITE(pchar, uint32) \ +# define NDR_LOCAL_UINT32_WRITE(pchar, uint32) \ LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32) - #define NDR_LOCAL_UINT32_READ(pchar) \ +# define NDR_LOCAL_UINT32_READ(pchar) \ LITTLE_ENDIAN_UINT32_READ(pchar) #endif _____ Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c --- trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-03-15 09:08:16 UTC (rev 14092) +++ trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-03-15 09:22:34 UTC (rev 14093) @@ -173,11 +173,13 @@ memset(&Connection->ovl, 0, sizeof(Connection->ovl)); Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) { - WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); if (GetLastError() == ERROR_PIPE_CONNECTED) { SetEvent(Connection->ovl.hEvent); return RPC_S_OK; + } else if (GetLastError() == ERROR_IO_PENDING) { + return RPC_S_OK; } + WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } } @@ -211,7 +213,7 @@ return RPC_S_SERVER_TOO_BUSY; } else { err = GetLastError(); - TRACE("connection failed, error=%lx\n", err); + WARN("connection failed, error=%lx\n", err); HeapFree(GetProcessHeap(), 0, pname); return RPC_S_SERVER_UNAVAILABLE; } @@ -243,7 +245,7 @@ err = GetLastError(); /* we don't need to handle ERROR_PIPE_BUSY here, * the doc says that it is returned to the app */ - TRACE("connection failed, error=%lx\n", err); + WARN("connection failed, error=%lx\n", err); HeapFree(GetProcessHeap(), 0, pname); if (err == ERROR_PIPE_BUSY) return RPC_S_SERVER_TOO_BUSY; @@ -397,7 +399,7 @@ RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection) { RpcBinding* NewBinding; - TRACE("(*RpcBinding == ^%p, Connection == ^%p)\n", *Binding, Connection); + TRACE("(RpcBinding == ^%p, Connection == ^%p)\n", Binding, Connection); RPCRT4_AllocBinding(&NewBinding, Connection->server); NewBinding->Protseq = RPCRT4_strdupA(Connection->Protseq); @@ -1094,3 +1096,22 @@ FIXME("Unknown protseq %s - we probably need to implement it one day\n", debugstr_w(protseq)); return RPC_S_PROTSEQ_NOT_SUPPORTED; } + +/********************************************************************** * + * RpcImpersonateClient (RPCRT4.@) + * + * Impersonates the client connected via a binding handle so that security + * checks are done in the context of the client. + * + * PARAMS + * BindingHandle [I] Handle to the binding to the client. + * + * RETURNS + * Success: RPS_S_OK. + * Failure: RPC_STATUS value. + */ +RPC_STATUS WINAPI RpcImpersonateClient(RPC_BINDING_HANDLE BindingHandle) +{ + FIXME("(%p): stub\n", BindingHandle); + return RPC_S_NO_CONTEXT_AVAILABLE; +} _____ Modified: trunk/reactos/lib/rpcrt4/rpc_message.c --- trunk/reactos/lib/rpcrt4/rpc_message.c 2005-03-15 09:08:16 UTC (rev 14092) +++ trunk/reactos/lib/rpcrt4/rpc_message.c 2005-03-15 09:22:34 UTC (rev 14093) @@ -330,6 +330,7 @@ } } if (dwRead != sizeof(common_hdr)) { + WARN("Short read of header, %ld/%d bytes\n", dwRead, sizeof(common_hdr)); status = RPC_S_PROTOCOL_ERROR; goto fail; } @@ -344,6 +345,7 @@ hdr_length = RPCRT4_GetHeaderSize((RpcPktHdr*)&common_hdr); if (hdr_length == 0) { + WARN("header length == 0\n"); status = RPC_S_PROTOCOL_ERROR; goto fail; } @@ -366,6 +368,7 @@ } } if (dwRead != hdr_length - sizeof(common_hdr)) { + WARN("bad header length, %ld/%ld bytes\n", dwRead, hdr_length - sizeof(common_hdr)); status = RPC_S_PROTOCOL_ERROR; goto fail; } @@ -382,6 +385,9 @@ default: pMsg->BufferLength = common_hdr.frag_len - hdr_length; } + + TRACE("buffer length = %u\n", pMsg->BufferLength); + status = I_RpcGetBuffer(pMsg); if (status != RPC_S_OK) goto fail; @@ -413,12 +419,15 @@ } } if (dwRead != data_length) { + WARN("bad data length, %ld/%ld\n", dwRead, data_length); status = RPC_S_PROTOCOL_ERROR; goto fail; } + /* when there is no more data left, it should be the last packet */ if (buffer_length == pMsg->BufferLength && ((*Header)->common.flags & RPC_FLG_LAST) == 0) { + WARN("no more data left, but not last packet\n"); status = RPC_S_PROTOCOL_ERROR; goto fail; } @@ -610,6 +619,7 @@ status = RPC_S_CALL_FAILED; /* ? */ goto fail; default: + WARN("bad packet type %d\n", hdr->common.ptype); goto fail; } _____ Modified: trunk/reactos/lib/rpcrt4/rpc_server.c --- trunk/reactos/lib/rpcrt4/rpc_server.c 2005-03-15 09:08:16 UTC (rev 14092) +++ trunk/reactos/lib/rpcrt4/rpc_server.c 2005-03-15 09:22:34 UTC (rev 14093) @@ -93,7 +93,14 @@ static BOOL std_listen; static LONG listen_count = -1; -static HANDLE mgr_event, server_thread; +/* set on change of configuration (e.g. listening on new protseq) */ +static HANDLE mgr_event; +/* mutex for ensuring only one thread can change state at a time */ +static HANDLE mgr_mutex; +/* set when server thread has finished opening connections */ +static HANDLE server_ready_event; +/* thread that waits for connections */ +static HANDLE server_thread; static CRITICAL_SECTION spacket_cs; static CRITICAL_SECTION_DEBUG spacket_cs_debug = @@ -463,6 +470,7 @@ RpcServerProtseq* cps; RpcConnection* conn; RpcConnection* cconn; + BOOL set_ready_event = FALSE; TRACE("(the_arg == ^%p)\n", the_arg); @@ -499,11 +507,22 @@ } LeaveCriticalSection(&server_cs); + if (set_ready_event) + { + /* signal to function that changed state that we are now sync'ed */ + SetEvent(server_ready_event); + set_ready_event = FALSE; + } + /* start waiting */ res = WaitForMultipleObjects(count, objs, FALSE, INFINITE); if (res == WAIT_OBJECT_0) { - ResetEvent(m_event); - if (!std_listen) break; + if (!std_listen) + { + SetEvent(server_ready_event); + break; + } + set_ready_event = TRUE; } else if (res == WAIT_FAILED) { ERR("wait failed\n"); @@ -548,13 +567,31 @@ return 0; } +/* tells the server thread that the state has changed and waits for it to + * make the changes */ +static void RPCRT4_sync_with_server_thread(void) +{ + /* make sure we are the only thread sync'ing the server state, otherwise + * there is a race with the server thread setting an older state and setting + * the server_ready_event when the new state hasn't yet been applied */ + WaitForSingleObject(mgr_mutex, INFINITE); + + SetEvent(mgr_event); + /* wait for server thread to make the requested changes before returning */ + WaitForSingleObject(server_ready_event, INFINITE); + + ReleaseMutex(mgr_mutex); +} + static void RPCRT4_start_listen(void) { TRACE("\n"); EnterCriticalSection(&listen_cs); if (! ++listen_count) { - if (!mgr_event) mgr_event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!mgr_mutex) mgr_mutex = CreateMutexW(NULL, FALSE, NULL); + if (!mgr_event) mgr_event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!server_ready_event) server_ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); if (!server_sem) server_sem = CreateSemaphoreW(NULL, 0, MAX_THREADS, NULL); if (!worker_tls) worker_tls = TlsAlloc(); std_listen = TRUE; @@ -562,7 +599,7 @@ LeaveCriticalSection(&listen_cs); } else { LeaveCriticalSection(&listen_cs); - SetEvent(mgr_event); + RPCRT4_sync_with_server_thread(); } } @@ -574,7 +611,7 @@ else if (--listen_count == -1) { std_listen = FALSE; LeaveCriticalSection(&listen_cs); - SetEvent(mgr_event); + RPCRT4_sync_with_server_thread(); } else LeaveCriticalSection(&listen_cs); assert(listen_count > -2); @@ -589,7 +626,7 @@ protseqs = ps; LeaveCriticalSection(&server_cs); - if (std_listen) SetEvent(mgr_event); + if (std_listen) RPCRT4_sync_with_server_thread(); return RPC_S_OK; } _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec --- trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-03-15 09:08:16 UTC (rev 14092) +++ trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-03-15 09:22:34 UTC (rev 14093) @@ -72,7 +72,7 @@ @ stub RpcGetAsyncCallStatus @ stub RpcIfIdVectorFree @ stub RpcIfInqId -@ stub RpcImpersonateClient +@ stdcall RpcImpersonateClient(ptr) @ stub RpcInitializeAsyncHandle @ stub RpcMgmtBindingInqParameter # win9x @ stub RpcMgmtBindingSetParameter # win9x

19 years, 6 months

[gvg] 14092: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: Mike McCormack <mike(a)codeweavers.com> - Forward the RichEdit 1.0 control to the RichEdit 2.0 control. - Don't clear ES_AUTO[HV]SCROLL in the edit control created by richedit. - Remove unused declaration. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Jason Edmeades <us(a)the-edmeades.demon.co.uk> - Make the edit field created from a richedit control which was created with ES_DISABLENOSCROLL, not have the ES_NUMBER style and hence accept alphanumeric input. Modified: trunk/reactos/lib/richedit/Makefile.in Modified: trunk/reactos/lib/richedit/richedit.c _____ Modified: trunk/reactos/lib/richedit/Makefile.in --- trunk/reactos/lib/richedit/Makefile.in 2005-03-15 09:04:29 UTC (rev 14091) +++ trunk/reactos/lib/richedit/Makefile.in 2005-03-15 09:08:16 UTC (rev 14092) @@ -3,11 +3,9 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = riched32.dll -IMPORTS = user32 kernel32 +IMPORTS = riched20 user32 kernel32 C_SRCS = \ - reader.c \ - text-writer.c \ richedit.c @MAKE_DLL_RULES@ _____ Modified: trunk/reactos/lib/richedit/richedit.c --- trunk/reactos/lib/richedit/richedit.c 2005-03-15 09:04:29 UTC (rev 14091) +++ trunk/reactos/lib/richedit/richedit.c 2005-03-15 09:08:16 UTC (rev 14092) @@ -1,11 +1,10 @@ /* * RichEdit32 functions * - * This module is a simple wrapper for the edit controls. - * At the point, it is good only for application who use the RICHEDIT - * control to display RTF text. + * This module is a simple wrapper for the RichEdit 2.0 control * * Copyright 2000 by Jean-Claude Batista + * Copyright 2005 Mike McCormack * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,728 +28,29 @@ #include "wingdi.h" #include "winreg.h" #include "winerror.h" -#include "riched32.h" +#include "winuser.h" #include "richedit.h" -#define NO_SHLWAPI_STREAM #include "shlwapi.h" -#include "rtf.h" -#include "rtf2text.h" #include "wine/debug.h" -#define ID_EDIT 1 - WINE_DEFAULT_DEBUG_CHANNEL(richedit); -HANDLE RICHED32_hHeap = NULL; -/* LPSTR RICHED32_aSubclass = NULL; */ -static WNDPROC lpfnEditWndProc = NULL; -static INT RTFInfoOffset = 0; +/* Window procedure of the RichEdit 1.0 control in riched20.dll */ +extern LRESULT WINAPI RichEdit10ANSIWndProc(HWND, UINT, WPARAM, LPARAM); -#define TRACE_EDIT_MSG32(str) \ - TRACE(\ - "32 bit : " str ": hwnd=%p, wParam=%08x, lParam=%08x\n"\ - , \ - hwnd, (UINT)wParam, (UINT)lParam) -LPVOID* WINAPI CreateIRichEditOle(); -VOID RICHEDIT_InitEditControlInfo(void); - /*********************************************************************** - * DllMain [Internal] Initializes the internal 'RICHED32.DLL'. - * - * PARAMS - * hinstDLL [I] handle to the DLL's instance - * fdwReason [I] - * lpvReserved [I] reserved, must be NULL - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("\n"); - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - /* create private heap */ - RICHED32_hHeap = HeapCreate (0, 0x10000, 0); - /* Retrieve edit control class info */ - RICHEDIT_InitEditControlInfo(); - /* register the Rich Edit class */ - RICHED32_Register (); - break; - - case DLL_PROCESS_DETACH: - /* unregister all common control classes */ - RICHED32_Unregister (); - HeapDestroy (RICHED32_hHeap); - RICHED32_hHeap = NULL; - break; - } - return TRUE; -} - -/* Support routines for window procedure */ - INT RICHEDIT_GetTextRange(HWND hwnd,TEXTRANGEA *tr); - INT RICHEDIT_GetSelText(HWND hwnd,LPSTR lpstrBuffer); - -typedef struct _RTFControl_info -{ - HWND hwndParent; - char* rtfBuffer; - RTF_Info *parser; -} RTFControl_Info; - -/* - * - * DESCRIPTION: - * Window procedure of the RichEdit control. - * - */ -static LRESULT WINAPI RICHED32_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, - LPARAM lParam) -{ - LONG newstyle = 0; - LONG style = 0; - RTFControl_Info *info; - CHARRANGE *cr; - - info = (RTFControl_Info *) GetWindowLongW( hwnd, RTFInfoOffset ); - - TRACE("uMsg: 0x%x hwnd: %p\n",uMsg,hwnd); - - switch (uMsg) - { - - case WM_CREATE: - TRACE_EDIT_MSG32("WM_CREATE Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - - case WM_NCCREATE : - TRACE_EDIT_MSG32("WM_NCCREATE"); - - info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof (RTFControl_Info)); - info->parser = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof (RTF_Info)); - SetWindowLongW( hwnd, RTFInfoOffset, (LONG)info ); - - /* remove SCROLLBARS from the current window style */ - info->hwndParent = ((LPCREATESTRUCTA) lParam)->hwndParent; - - newstyle = style = ((LPCREATESTRUCTA) lParam)->style; - newstyle &= ~WS_HSCROLL; - newstyle &= ~WS_VSCROLL; - newstyle &= ~ES_AUTOHSCROLL; - newstyle &= ~ES_AUTOVSCROLL; - SetWindowLongA(hwnd,GWL_STYLE, newstyle); - - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - - case WM_SETFOCUS : - TRACE_EDIT_MSG32("WM_SETFOCUS"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - - case WM_SIZE : - TRACE_EDIT_MSG32("WM_SIZE"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - - case WM_COMMAND : - TRACE_EDIT_MSG32("WM_COMMAND"); - switch(HIWORD(wParam)) { - case EN_CHANGE: - case EN_HSCROLL: - case EN_KILLFOCUS: - case EN_SETFOCUS: - case EN_UPDATE: - case EN_VSCROLL: - return SendMessageA(info->hwndParent, WM_COMMAND, - wParam, (LPARAM)(hwnd)); - - case EN_ERRSPACE: - case EN_MAXTEXT: - MessageBoxA (hwnd, "RichEdit control out of space.", - "ERROR", MB_OK | MB_ICONSTOP) ; - return 0 ; - } - - case EM_STREAMIN: - TRACE_EDIT_MSG32("EM_STREAMIN"); - - /* setup the RTF parser */ - RTFSetEditStream(info->parser,( EDITSTREAM*)lParam); - info->parser->rtfFormat = wParam&(SF_TEXT|SF_RTF); - info->parser->hwndEdit = hwnd; - WriterInit(info->parser); - RTFInit (info->parser); - BeginFile(info->parser); - - /* do the parsing */ - RTFRead (info->parser); - RTFFlushOutputBuffer( info->parser ); - - /* put the cursor at the top */ - SendMessageA( hwnd, EM_SETSEL, 0, 0 ); - - return 0; - -/* Messages specific to Richedit controls */ - - case EM_AUTOURLDETECT: - TRACE_EDIT_MSG32("EM_AUTOURLDETECT Ignored"); - return 0; - - case EM_CANPASTE: - TRACE_EDIT_MSG32("EM_CANPASTE Ignored"); - return 0; - - case EM_CANREDO: - TRACE_EDIT_MSG32("EM_CANREDO Ignored"); - return 0; - - case EM_DISPLAYBAND: - TRACE_EDIT_MSG32("EM_DISPLAYBAND Ignored"); - return 0; - - case EM_EXGETSEL: - TRACE_EDIT_MSG32("EM_EXGETSEL -> EM_GETSEL"); - cr = (VOID *) lParam; - CallWindowProcA(lpfnEditWndProc, hwnd, EM_GETSEL, (INT)&cr->cpMin, (INT)&cr->cpMax); - TRACE("cpMin: 0x%x cpMax: 0x%x\n",(INT)cr->cpMin,(INT)cr->cpMax); - return 0; - - case EM_EXLIMITTEXT: - { - DWORD limit = lParam; - TRACE_EDIT_MSG32("EM_EXLIMITTEXT"); - if (limit > 65534) - { - limit = 0xFFFFFFFF; - } - return CallWindowProcA(lpfnEditWndProc, hwnd, EM_SETLIMITTEXT, limit, 0); - } - - case EM_EXLINEFROMCHAR: - TRACE_EDIT_MSG32("EM_EXLINEFROMCHAR -> LINEFROMCHAR"); - return CallWindowProcA(lpfnEditWndProc, hwnd, EM_LINEFROMCHAR, lParam, wParam); - - case EM_EXSETSEL: - TRACE_EDIT_MSG32("EM_EXSETSEL -> EM_SETSEL"); - cr = (VOID *) lParam; - return CallWindowProcA(lpfnEditWndProc, hwnd, EM_SETSEL, cr->cpMin, cr->cpMax); - - case EM_FINDTEXT: - TRACE_EDIT_MSG32("EM_FINDTEXT Ignored"); - return 0; - - case EM_FINDTEXTEX: - TRACE_EDIT_MSG32("EM_FINDTEXTEX Ignored"); - return 0; - - case EM_FINDTEXTEXW: - TRACE_EDIT_MSG32("EM_FINDTEXTEXW Ignored"); - return 0; - - case EM_FINDTEXTW: - TRACE_EDIT_MSG32("EM_FINDTEXTW Ignored"); - return 0; - - case EM_FINDWORDBREAK: - TRACE_EDIT_MSG32("EM_FINDWORDBREAK Ignored"); - return 0; - - case EM_FORMATRANGE: - TRACE_EDIT_MSG32("EM_FORMATRANGE Ignored"); - return 0; - - case EM_GETAUTOURLDETECT: - TRACE_EDIT_MSG32("EM_GETAUTOURLDETECT Ignored"); - return 0; - - case EM_GETBIDIOPTIONS: - TRACE_EDIT_MSG32("EM_GETBIDIOPTIONS Ignored"); - return 0; - - case EM_GETCHARFORMAT: - TRACE_EDIT_MSG32("EM_GETCHARFORMAT Ignored"); - return 0; - - case EM_GETEDITSTYLE: - TRACE_EDIT_MSG32("EM_GETEDITSTYLE Ignored"); - return 0; - - case EM_GETEVENTMASK: - TRACE_EDIT_MSG32("EM_GETEVENTMASK Ignored"); - return 0; - - case EM_GETIMECOLOR: - TRACE_EDIT_MSG32("EM_GETIMECOLOR Ignored"); - return 0; - - case EM_GETIMECOMPMODE: - TRACE_EDIT_MSG32("EM_GETIMECOMPMODE Ignored"); - return 0; - - case EM_GETIMEOPTIONS: - TRACE_EDIT_MSG32("EM_GETIMEOPTIONS Ignored"); - return 0; - - case EM_GETLANGOPTIONS: - TRACE_EDIT_MSG32("STUB: EM_GETLANGOPTIONS"); - return 0; - - case EM_GETOLEINTERFACE: - TRACE_EDIT_MSG32("EM_GETOLEINTERFACE Ignored"); - return 0; - - case EM_GETOPTIONS: - TRACE_EDIT_MSG32("EM_GETOPTIONS Ignored"); - return 0; - - case EM_GETPARAFORMAT: - TRACE_EDIT_MSG32("EM_GETPARAFORMAT Ignored"); - return 0; - - case EM_GETPUNCTUATION: - TRACE_EDIT_MSG32("EM_GETPUNCTUATION Ignored"); - return 0; - - case EM_GETREDONAME: - TRACE_EDIT_MSG32("EM_GETREDONAME Ignored"); - return 0; - - case EM_GETSCROLLPOS: - TRACE_EDIT_MSG32("EM_GETSCROLLPOS Ignored"); - return 0; - - case EM_GETSELTEXT: - TRACE_EDIT_MSG32("EM_GETSELTEXT"); - return RICHEDIT_GetSelText(hwnd,(void *)lParam); - - case EM_GETTEXTEX: - TRACE_EDIT_MSG32("EM_GETTEXTEX Ignored"); - return 0; - - case EM_GETTEXTLENGTHEX: - TRACE_EDIT_MSG32("EM_GETTEXTLENGTHEX Ignored"); - return 0; - - case EM_GETTEXTMODE: - TRACE_EDIT_MSG32("EM_GETTEXTMODE Ignored"); - return 0; - - case EM_GETTEXTRANGE: - TRACE_EDIT_MSG32("EM_GETTEXTRANGE"); - return RICHEDIT_GetTextRange(hwnd,(TEXTRANGEA *)lParam); - - case EM_GETTYPOGRAPHYOPTIONS: - TRACE_EDIT_MSG32("EM_GETTYPOGRAPHYOPTIONS Ignored"); - return 0; - - case EM_GETUNDONAME: - TRACE_EDIT_MSG32("EM_GETUNDONAME Ignored"); - return 0; - - case EM_GETWORDBREAKPROCEX: - TRACE_EDIT_MSG32("EM_GETWORDBREAKPROCEX Ignored"); - return 0; - - case EM_GETWORDWRAPMODE: - TRACE_EDIT_MSG32("EM_GETWORDWRAPMODE Ignored"); - return 0; - - case EM_GETZOOM: - TRACE_EDIT_MSG32("EM_GETZOOM Ignored"); - return 0; - - case EM_HIDESELECTION: - TRACE_EDIT_MSG32("EM_HIDESELECTION Ignored"); - return 0; - - case EM_PASTESPECIAL: - TRACE_EDIT_MSG32("EM_PASTESPECIAL Ignored"); - return 0; - - case EM_RECONVERSION: - TRACE_EDIT_MSG32("EM_RECONVERSION Ignored"); - return 0; - - case EM_REDO: - TRACE_EDIT_MSG32("EM_REDO Ignored"); - return 0; - - case EM_REQUESTRESIZE: - TRACE_EDIT_MSG32("EM_REQUESTRESIZE Ignored"); - return 0; - - case EM_SELECTIONTYPE: - TRACE_EDIT_MSG32("EM_SELECTIONTYPE Ignored"); - return 0; - - case EM_SETBIDIOPTIONS: - TRACE_EDIT_MSG32("EM_SETBIDIOPTIONS Ignored"); - return 0; - - case EM_SETBKGNDCOLOR: - TRACE_EDIT_MSG32("EM_SETBKGNDCOLOR Ignored"); - return 0; - - case EM_SETCHARFORMAT: - TRACE_EDIT_MSG32("EM_SETCHARFORMAT Ignored"); - return 0; - - case EM_SETEDITSTYLE: - TRACE_EDIT_MSG32("EM_SETEDITSTYLE Ignored"); - return 0; - - case EM_SETEVENTMASK: - TRACE_EDIT_MSG32("EM_SETEVENTMASK Ignored"); - return 0; - - case EM_SETFONTSIZE: - TRACE_EDIT_MSG32("EM_SETFONTSIZE Ignored"); - return 0; - - case EM_SETIMECOLOR: - TRACE_EDIT_MSG32("EM_SETIMECOLO Ignored"); - return 0; - - case EM_SETIMEOPTIONS: - TRACE_EDIT_MSG32("EM_SETIMEOPTIONS Ignored"); - return 0; - - case EM_SETLANGOPTIONS: - TRACE_EDIT_MSG32("EM_SETLANGOPTIONS Ignored"); - return 0; - - case EM_SETOLECALLBACK: - TRACE_EDIT_MSG32("EM_SETOLECALLBACK Ignored"); - return 0; - - case EM_SETOPTIONS: - TRACE_EDIT_MSG32("EM_SETOPTIONS Ignored"); - return 0; - - case EM_SETPALETTE: - TRACE_EDIT_MSG32("EM_SETPALETTE Ignored"); - return 0; - - case EM_SETPARAFORMAT: - TRACE_EDIT_MSG32("EM_SETPARAFORMAT Ignored"); - return 0; - - case EM_SETPUNCTUATION: - TRACE_EDIT_MSG32("EM_SETPUNCTUATION Ignored"); - return 0; - - case EM_SETSCROLLPOS: - TRACE_EDIT_MSG32("EM_SETSCROLLPOS Ignored"); - return 0; - - case EM_SETTARGETDEVICE: - TRACE_EDIT_MSG32("EM_SETTARGETDEVICE Ignored"); - return 0; - - case EM_SETTEXTEX: - TRACE_EDIT_MSG32("EM_SETTEXTEX Ignored"); - return 0; - - case EM_SETTEXTMODE: - TRACE_EDIT_MSG32("EM_SETTEXTMODE Ignored"); - return 0; - - case EM_SETTYPOGRAPHYOPTIONS: - TRACE_EDIT_MSG32("EM_SETTYPOGRAPHYOPTIONS Ignored"); - return 0; - - case EM_SETUNDOLIMIT: - TRACE_EDIT_MSG32("EM_SETUNDOLIMIT Ignored"); - return 0; - - case EM_SETWORDBREAKPROCEX: - TRACE_EDIT_MSG32("EM_SETWORDBREAKPROCEX Ignored"); - return 0; - - case EM_SETWORDWRAPMODE: - TRACE_EDIT_MSG32("EM_SETWORDWRAPMODE Ignored"); - return 0; - - case EM_SETZOOM: - TRACE_EDIT_MSG32("EM_SETZOOM Ignored"); - return 0; - - case EM_SHOWSCROLLBAR: - TRACE_EDIT_MSG32("EM_SHOWSCROLLBAR Ignored"); - return 0; - - case EM_STOPGROUPTYPING: - TRACE_EDIT_MSG32("EM_STOPGROUPTYPING Ignored"); - return 0; - - case EM_STREAMOUT: - TRACE_EDIT_MSG32("EM_STREAMOUT Ignored"); - return 0; - -/* Messages dispatched to the edit control */ - case EM_CANUNDO: - TRACE_EDIT_MSG32("EM_CANUNDO Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_CHARFROMPOS: - TRACE_EDIT_MSG32("EM_CHARFROMPOS Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_EMPTYUNDOBUFFER: - TRACE_EDIT_MSG32("EM_EMPTYUNDOBUFFER Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_FMTLINES: - TRACE_EDIT_MSG32("EM_FMTLINES Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETFIRSTVISIBLELINE: - TRACE_EDIT_MSG32("EM_GETFIRSTVISIBLELINE Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETHANDLE: - TRACE_EDIT_MSG32("EM_GETHANDLE Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - /* case EM_GETIMESTATUS:*/ - case EM_GETLIMITTEXT: - TRACE_EDIT_MSG32("EM_GETLIMITTEXT Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETLINE: - TRACE_EDIT_MSG32("EM_GETLINE Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETLINECOUNT: - TRACE_EDIT_MSG32("EM_GETLINECOUNT Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETMARGINS: - TRACE_EDIT_MSG32("EM_GETMARGINS Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETMODIFY: - TRACE_EDIT_MSG32("EM_GETMODIFY Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETPASSWORDCHAR: - TRACE_EDIT_MSG32("EM_GETPASSWORDCHAR Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETRECT: - TRACE_EDIT_MSG32("EM_GETRECT Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETSEL: - TRACE_EDIT_MSG32("EM_GETSEL Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETTHUMB: - TRACE_EDIT_MSG32("EM_GETTHUMB Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_GETWORDBREAKPROC: - TRACE_EDIT_MSG32("EM_GETWORDBREAKPROC Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_LINEFROMCHAR: - TRACE_EDIT_MSG32("EM_LINEFROMCHAR Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_LINEINDEX: - TRACE_EDIT_MSG32("EM_LINEINDEX Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_LINELENGTH: - TRACE_EDIT_MSG32("EM_LINELENGTH Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_LINESCROLL: - TRACE_EDIT_MSG32("EM_LINESCROLL Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_POSFROMCHAR: - TRACE_EDIT_MSG32("EM_POSFROMCHAR Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_REPLACESEL: - TRACE_EDIT_MSG32("case EM_REPLACESEL Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SCROLL: - TRACE_EDIT_MSG32("case EM_SCROLL Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SCROLLCARET: - case WM_USER+49: /* EM_SCROLLCARET too */ - TRACE_EDIT_MSG32("EM_SCROLLCARET Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, EM_SCROLLCARET, wParam, lParam); - case EM_SETHANDLE: - TRACE_EDIT_MSG32("EM_SETHANDLE Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - /* case EM_SETIMESTATUS:*/ - case EM_SETLIMITTEXT: - TRACE_EDIT_MSG32("EM_SETLIMITTEXT Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SETMARGINS: - TRACE_EDIT_MSG32("case EM_SETMARGINS Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SETMODIFY: - TRACE_EDIT_MSG32("EM_SETMODIFY Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SETPASSWORDCHAR: - TRACE_EDIT_MSG32("EM_SETPASSWORDCHAR Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SETREADONLY: - TRACE_EDIT_MSG32("EM_SETREADONLY Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SETRECT: - TRACE_EDIT_MSG32("EM_SETRECT Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SETRECTNP: - TRACE_EDIT_MSG32("EM_SETRECTNP Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SETSEL: - TRACE_EDIT_MSG32("EM_SETSEL Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SETTABSTOPS: - TRACE_EDIT_MSG32("EM_SETTABSTOPS Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_SETWORDBREAKPROC: - TRACE_EDIT_MSG32("EM_SETWORDBREAKPROC Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case EM_UNDO: - TRACE_EDIT_MSG32("EM_UNDO Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - - case WM_STYLECHANGING: - TRACE_EDIT_MSG32("WM_STYLECHANGING Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_STYLECHANGED: - TRACE_EDIT_MSG32("WM_STYLECHANGED Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_GETTEXT: - TRACE_EDIT_MSG32("WM_GETTEXT Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_GETTEXTLENGTH: - TRACE_EDIT_MSG32("WM_GETTEXTLENGTH Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_SETTEXT: - TRACE_EDIT_MSG32("WM_SETTEXT Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_CUT: - TRACE_EDIT_MSG32("WM_CUT Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_COPY: - TRACE_EDIT_MSG32("WM_COPY Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_PASTE: - TRACE_EDIT_MSG32("WM_PASTE Passed to edit control"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - - /* Messages passed to default handler. */ - case WM_NCCALCSIZE: - TRACE_EDIT_MSG32("WM_NCCALCSIZE Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_NCPAINT: - TRACE_EDIT_MSG32("WM_NCPAINT Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_PAINT: - TRACE_EDIT_MSG32("WM_PAINT Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_ERASEBKGND: - TRACE_EDIT_MSG32("WM_ERASEBKGND Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_KILLFOCUS: - TRACE_EDIT_MSG32("WM_KILLFOCUS Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_DESTROY: - TRACE_EDIT_MSG32("WM_DESTROY Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_CHILDACTIVATE: - TRACE_EDIT_MSG32("WM_CHILDACTIVATE Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - - case WM_WINDOWPOSCHANGING: - TRACE_EDIT_MSG32("WM_WINDOWPOSCHANGING Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_WINDOWPOSCHANGED: - TRACE_EDIT_MSG32("WM_WINDOWPOSCHANGED Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); -/* case WM_INITIALUPDATE: - TRACE_EDIT_MSG32("WM_INITIALUPDATE Passed to default"); - return DefWindowProcA( hwnd,uMsg,wParam,lParam); */ - case WM_CTLCOLOREDIT: - TRACE_EDIT_MSG32("WM_CTLCOLOREDIT Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_SETCURSOR: - TRACE_EDIT_MSG32("WM_SETCURSOR Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_MOVE: - TRACE_EDIT_MSG32("WM_MOVE Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_SHOWWINDOW: - TRACE_EDIT_MSG32("WM_SHOWWINDOW Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_PARENTNOTIFY: - TRACE_EDIT_MSG32("WM_PARENTNOTIFY Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_SETREDRAW: - TRACE_EDIT_MSG32("WM_SETREDRAW Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_NCDESTROY: - { - TRACE_EDIT_MSG32("WM_NCDESTROY Passed to default"); - HeapFree( GetProcessHeap(), 0, info->parser ); - HeapFree( GetProcessHeap(), 0, info ); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - } - - case WM_NCHITTEST: - TRACE_EDIT_MSG32("WM_NCHITTEST Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_CTLCOLORSTATIC: - TRACE_EDIT_MSG32("WM_CTLCOLORSTATIC Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_NCMOUSEMOVE: - TRACE_EDIT_MSG32("WM_NCMOUSEMOVE Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_CLEAR: - TRACE_EDIT_MSG32("WM_CLEAR Passed to default"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - /* - * used by IE in the EULA box - */ - case WM_ALTTABACTIVE: - TRACE_EDIT_MSG32("WM_ALTTABACTIVE"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_GETDLGCODE: - TRACE_EDIT_MSG32("WM_GETDLGCODE"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - case WM_SETFONT: - TRACE_EDIT_MSG32("WM_SETFONT"); - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); - - } - - if ((uMsg >= WM_USER) && (uMsg < WM_APP)) { - FIXME("Unknown message 0x%x Passed to default hwnd=%p, wParam=%08x, lParam=%08x\n", - uMsg, hwnd, (UINT)wParam, (UINT)lParam); - } - - return CallWindowProcA(lpfnEditWndProc, hwnd, uMsg, wParam, lParam); -} - -/********************************************************************** * * DllGetVersion [RICHED32.2] * - * Retrieves version information of the 'RICHED32.DLL' - * - * PARAMS - * pdvi [O] pointer to version information structure. - * - * RETURNS - * Success: S_OK - * Failure: E_INVALIDARG - * - * NOTES - * Returns version of a comctl32.dll from IE4.01 SP1. + * Retrieves version information */ - -HRESULT WINAPI -RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi) +HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi) { TRACE("\n"); - if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) { - + if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) return E_INVALIDARG; - } pdvi->dwMajorVersion = 4; pdvi->dwMinorVersion = 0; @@ -760,99 +60,47 @@ return S_OK; } -/*** - * DESCRIPTION: - * Registers the window class. - * - * PARAMETER(S): - * None - * - * RETURN: - * None - */ -VOID RICHED32_Register(void) +/* Unregisters the window class. */ +static BOOL RICHED32_Unregister(void) { - WNDCLASSA wndClass; - TRACE("\n"); + UnregisterClassA(RICHEDIT_CLASS10A, NULL); + return TRUE; +} + + +/* Registers the window class. */ +static BOOL RICHED32_Register(void) +{ + WNDCLASSA wndClass; + ZeroMemory(&wndClass, sizeof(WNDCLASSA)); wndClass.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; - wndClass.lpfnWndProc = RICHED32_WindowProc; + wndClass.lpfnWndProc = RichEdit10ANSIWndProc; wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = RTFInfoOffset + sizeof(RTFControl_Info*); + wndClass.cbWndExtra = 4; wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = RICHEDIT_CLASS10A; /* WC_RICHED32A; */ - RegisterClassA (&wndClass); -} + RegisterClassA(&wndClass); -/*** - * DESCRIPTION: - * Unregisters the window class. - * - * PARAMETER(S): - * None - * - * RETURN: - * None - */ -VOID RICHED32_Unregister(void) -{ - TRACE("\n"); - - UnregisterClassA(RICHEDIT_CLASS10A, NULL); + return TRUE; } - -/*** - * DESCRIPTION: - * Initialize edit control class info - */ -VOID RICHEDIT_InitEditControlInfo(void) +/* Initialization function */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - WNDCLASSA wcEdit; - - if (GetClassInfoA(0, "edit", &wcEdit)) + TRACE("\n"); + switch (fdwReason) { - lpfnEditWndProc = wcEdit.lpfnWndProc; - RTFInfoOffset = wcEdit.cbWndExtra; - } - else - ERR("Failed to retrieve edit control class info\n"); -} + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + return RICHED32_Register(); - -INT RICHEDIT_GetTextRange(HWND hwnd,TEXTRANGEA *tr) -{ - UINT alloc_size, text_size, range_size; - char *text; - - TRACE("start: 0x%x stop: 0x%x\n",(INT)tr->chrg.cpMin,(INT)tr->chrg.cpMax); - - if (!(alloc_size = SendMessageA(hwnd,WM_GETTEXTLENGTH,0,0))) return FALSE; - if (!(text = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (alloc_size+1)))) - return FALSE; - text_size = SendMessageA(hwnd,WM_GETTEXT,alloc_size,(INT)text); - - if (text_size > tr->chrg.cpMin) - { - range_size = (text_size> tr->chrg.cpMax) ? (tr->chrg.cpMax - tr->chrg.cpMin) : (text_size - tr->chrg.cpMin); - TRACE("EditText: %.30s ...\n",text+tr->chrg.cpMin); - memcpy(tr->lpstrText,text+tr->chrg.cpMin,range_size); + case DLL_PROCESS_DETACH: + return RICHED32_Unregister(); } - else range_size = 0; - HeapFree(GetProcessHeap(), 0, text); - - return range_size; + return TRUE; } - -INT RICHEDIT_GetSelText(HWND hwnd,LPSTR lpstrBuffer) -{ - TEXTRANGEA textrange; - - textrange.lpstrText = lpstrBuffer; - SendMessageA(hwnd,EM_GETSEL,(INT)&textrange.chrg.cpMin,(INT)&textrange.c hrg.cpMax); - return RICHEDIT_GetTextRange(hwnd,&textrange); -}

19 years, 6 months

[gvg] 14091: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: import Added: trunk/reactos/include/wine/richole.h Added: trunk/reactos/lib/riched20/ Added: trunk/reactos/lib/riched20/Makefile.ros-template Added: trunk/reactos/lib/riched20/makefile Modified: trunk/reactos/lib/uuid/uuid.c Modified: trunk/reactos/w32api/include/richedit.h _____ Added: trunk/reactos/include/wine/richole.h --- trunk/reactos/include/wine/richole.h 2005-03-15 09:01:28 UTC (rev 14090) +++ trunk/reactos/include/wine/richole.h 2005-03-15 09:04:29 UTC (rev 14091) @@ -0,0 +1,40 @@ +/* + * Compatibility header + * + * This header is wrapper to allow compilation of Wine DLLs under ReactOS + * build system. It contains definitions commonly refered to as Wineisms + * and definitions that are missing in w32api. + */ + +#include <richedit.h> + +#include_next <richole.h> + +#ifndef WINE_RICHOLE_H_INCLUDED +#define WINE_RICHOLE_H_INCLUDED + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IRichEditOle_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IRichEditOle_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IRichEditOle_Release(p) (p)->lpVtbl->Release(p) +/*** IRichEditOle methods ***/ +#define IRichEditOle_GetClientSite(p,a) (p)->lpVtbl->GetClientSite(p,a) +#define IRichEditOle_GetObjectCount(p) (p)->lpVtbl->GetObjectCount(p) +#define IRichEditOle_GetLinkCount(p) (p)->lpVtbl->GetLinkCount(p) +#define IRichEditOle_GetObject(p,a,b,c) (p)->lpVtbl->GetObject(p,a,b,c) +#define IRichEditOle_InsertObject(p,a) (p)->lpVtbl->InsertObject(p,a) +#define IRichEditOle_ConvertObject(p,a,b,c) (p)->lpVtbl->ConvertObject(p,a,b,c) +#define IRichEditOle_ActivateAs(p,a,b) (p)->lpVtbl->ActivateAs(p,a,b) +#define IRichEditOle_SetHostNames(p,a,b) (p)->lpVtbl->SetHostNames(p,a,b) +#define IRichEditOle_SetLinkAvailable(p,a,b) (p)->lpVtbl->SetLinkAvailable(p,a,b) +#define IRichEditOle_SetDvaspect(p,a,b) (p)->lpVtbl->SetDvaspect(p,a,b) +#define IRichEditOle_HandsOffStorage(p,a) (p)->lpVtbl->HandsOffStorage(p,a) +#define IRichEditOle_SaveCompleted(p,a,b) (p)->lpVtbl->SaveCompleted(p,a,b) +#define IRichEditOle_InPlaceDeactivate(p) (p)->lpVtbl->InPlaceDeactivate(p) +#define IRichEditOle_ContextSensitiveHelp(p,a) (p)->lpVtbl->ContextSensitiveHelp(p,a) +#define IRichEditOle_GetClipboardData(p,a,b,c) (p)->lpVtbl->GetClipboardData(p,a,b,c) +#define IRichEditOle_ImportDataObject(p,a,b,c) (p)->lpVtbl->ImportDataObject(p,a,b,c) +#endif + +#endif /* WINE_RICHOLE_H_INCLUDED */ Property changes on: trunk/reactos/include/wine/richole.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/riched20 (from rev 14090, vendor/wine/dlls/riched20/current) _____ Added: trunk/reactos/lib/riched20/Makefile.ros-template --- vendor/wine/dlls/riched20/current/Makefile.ros-template 2005-03-15 09:01:28 UTC (rev 14090) +++ trunk/reactos/lib/riched20/Makefile.ros-template 2005-03-15 09:04:29 UTC (rev 14091) @@ -0,0 +1,19 @@ +# $Id$ + +TARGET_NAME = riched20 + +TARGET_OBJECTS = @C_SRCS@ + +TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__ + +TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a + +TARGET_BASE = $(TARGET_BASE_LIB_SETUPAPI) + +TARGET_NORC = yes + +default: all + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(TOOLS_PATH)/depend.mk Property changes on: trunk/reactos/lib/riched20/Makefile.ros-template ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/riched20/makefile --- vendor/wine/dlls/riched20/current/makefile 2005-03-15 09:01:28 UTC (rev 14090) +++ trunk/reactos/lib/riched20/makefile 2005-03-15 09:04:29 UTC (rev 14091) @@ -0,0 +1,9 @@ +# $Id: makefile 12852 2005-01-06 13:58:04Z mf $ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = winedll + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____ Modified: trunk/reactos/lib/uuid/uuid.c --- trunk/reactos/lib/uuid/uuid.c 2005-03-15 09:01:28 UTC (rev 14090) +++ trunk/reactos/lib/uuid/uuid.c 2005-03-15 09:04:29 UTC (rev 14091) @@ -81,6 +81,9 @@ DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x 97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); DEFINE_GUID(FMTID_UserDefinedProperties,0xD5CDD505,0x2E9C,0x101B,0x93,0x 97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); +DEFINE_GUID(IID_IRichEditOle,0x00020D00,0,0,0xC0,0,0,0,0,0,0,0x46); +DEFINE_GUID(IID_IRichEditOleCallback,0x00020D03,0,0,0xC0,0,0,0,0,0,0,0x 46); + DEFINE_OLEGUID(IID_StdOle,0x00020430,0,0); DEFINE_GUID(CLSID_StdFont,0x0be35203,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0 x00,0x4b,0xb8,0x51); _____ Modified: trunk/reactos/w32api/include/richedit.h --- trunk/reactos/w32api/include/richedit.h 2005-03-15 09:01:28 UTC (rev 14090) +++ trunk/reactos/w32api/include/richedit.h 2005-03-15 09:04:29 UTC (rev 14091) @@ -29,8 +29,26 @@ #define CFM_FACE 0x20000000 #define CFM_OFFSET 0x10000000 #define CFM_CHARSET 0x08000000 +#define CFM_BACKCOLOR 0x04000000 +#define CFM_LCID 0x02000000 +#define CFM_UNDERLINETYPE 0x00800000 +#define CFM_WEIGHT 0x00400000 +#define CFM_SPACING 0x00200000 +#define CFM_KERNING 0x00100000 +#define CFM_STYLE 0x00080000 +#define CFM_ANIMATION 0x00040000 #define CFM_SUBSCRIPT 0x00030000 #define CFM_SUPERSCRIPT 0x00030000 +#define CFM_REVAUTHOR 0x00008000 +#define CFM_REVISED 0x00004000 +#define CFM_DISABLED 0x00002000 +#define CFM_IMPRINT 0x00001000 +#define CFM_EMBOSS 0x00000800 +#define CFM_SHADOW 0x00000400 +#define CFM_OUTLINE 0x00000200 +#define CFM_HIDDEN 0x00000100 +#define CFM_ALLCAPS 0x00000080 +#define CFM_SMALLCAPS 0x00000040 #define CFM_EFFECTS (CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_COLOR | CFM_STRIKEOUT | CFE_PROTECTED | CFM_LINK) #define CFE_BOLD 1 #define CFE_ITALIC 2 @@ -38,6 +56,7 @@ #define CFE_STRIKEOUT 8 #define CFE_PROTECTED 16 #define CFE_AUTOCOLOR 0x40000000 +#define CFE_AUTOBACKCOLOR 0x04000000 #define CFE_SUBSCRIPT 0x00010000 #define CFE_SUPERSCRIPT 0x00020000 #define IMF_FORCENONE 1

19 years, 6 months

[gvg] 14090: Make room for vendor import

by gvg＠svn.reactos.com

Make room for vendor import Deleted: trunk/reactos/lib/riched20/

19 years, 6 months

[gvg] 14089: Vendor drop

by gvg＠svn.reactos.com

Vendor drop Added: vendor/wine/dlls/riched20/ Added: vendor/wine/dlls/riched20/current/ Added: vendor/wine/dlls/riched20/current/Makefile.in Added: vendor/wine/dlls/riched20/current/caret.c Added: vendor/wine/dlls/riched20/current/context.c Added: vendor/wine/dlls/riched20/current/editor.c Added: vendor/wine/dlls/riched20/current/editor.h Added: vendor/wine/dlls/riched20/current/editstr.h Added: vendor/wine/dlls/riched20/current/list.c Added: vendor/wine/dlls/riched20/current/paint.c Added: vendor/wine/dlls/riched20/current/para.c Added: vendor/wine/dlls/riched20/current/reader.c Added: vendor/wine/dlls/riched20/current/riched20.spec Added: vendor/wine/dlls/riched20/current/richole.c Added: vendor/wine/dlls/riched20/current/row.c Added: vendor/wine/dlls/riched20/current/rtf.h Added: vendor/wine/dlls/riched20/current/run.c Added: vendor/wine/dlls/riched20/current/string.c Added: vendor/wine/dlls/riched20/current/style.c Added: vendor/wine/dlls/riched20/current/undo.c Added: vendor/wine/dlls/riched20/current/wrap.c _____ Added: vendor/wine/dlls/riched20/current/Makefile.in --- vendor/wine/dlls/riched20/current/Makefile.in 2005-03-15 08:10:52 UTC (rev 14088) +++ vendor/wine/dlls/riched20/current/Makefile.in 2005-03-15 08:22:05 UTC (rev 14089) @@ -0,0 +1,27 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = riched20.dll +IMPORTS = user32 gdi32 kernel32 +EXTRALIBS = -luuid + +C_SRCS = \ + caret.c \ + context.c \ + editor.c \ + list.c \ + paint.c \ + para.c \ + reader.c \ + richole.c \ + row.c \ + run.c \ + string.c \ + style.c \ + undo.c \ + wrap.c + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: vendor/wine/dlls/riched20/current/Makefile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/riched20/current/caret.c --- vendor/wine/dlls/riched20/current/caret.c 2005-03-15 08:10:52 UTC (rev 14088) +++ vendor/wine/dlls/riched20/current/caret.c 2005-03-15 08:22:05 UTC (rev 14089) @@ -0,0 +1,977 @@ +/* + * RichEdit - Caret and selection functions. + * + * Copyright 2004 by Krzysztof Foltman + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "editor.h" + +WINE_DEFAULT_DEBUG_CHANNEL(richedit); + +void ME_GetSelection(ME_TextEditor *editor, int *from, int *to) +{ + *from = ME_GetCursorOfs(editor, 0); + *to = ME_GetCursorOfs(editor, 1); + + if (*from > *to) + { + int tmp = *from; + *from = *to; + *to = tmp; + } +} + +int ME_GetTextLength(ME_TextEditor *editor) +{ + return ME_CharOfsFromRunOfs(editor, ME_FindItemBack(editor->pBuffer->pLast, diRun), 0); +} + +void ME_SetSelection(ME_TextEditor *editor, int from, int to) +{ + if (from == 0 && to == -1) + { + editor->pCursors[1].pRun = ME_FindItemFwd(editor->pBuffer->pFirst, diRun); + editor->pCursors[1].nOffset = 0; + editor->pCursors[0].pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); + editor->pCursors[0].nOffset = 0; + ME_Repaint(editor); + ME_ClearTempStyle(editor); + return; + } + if (from == -1) + { + editor->pCursors[1] = editor->pCursors[0]; + ME_Repaint(editor); + ME_ClearTempStyle(editor); + return; + } + if (from>to) + { + int tmp = from; + from = to; + to = tmp; + } + ME_RunOfsFromCharOfs(editor, from, &editor->pCursors[1].pRun, &editor->pCursors[1].nOffset); + ME_RunOfsFromCharOfs(editor, to, &editor->pCursors[0].pRun, &editor->pCursors[0].nOffset); +} + +void ME_MoveCaret(ME_TextEditor *editor) +{ + HDC hDC = GetDC(editor->hWnd); + ME_Context c; + + ME_Cursor *pCursor = &editor->pCursors[0]; + ME_DisplayItem *pCursorRun = pCursor->pRun; + ME_DisplayItem *pSizeRun = pCursor->pRun; + + ME_InitContext(&c, editor, hDC); + assert(!pCursor->nOffset || !editor->bCaretAtEnd); + + if (pCursorRun->type == diRun) { + ME_DisplayItem *row = ME_FindItemBack(pCursorRun, diStartRowOrParagraph); + if (row) { + ME_DisplayItem *run = pCursorRun; + ME_DisplayItem *para; + SIZE sz = {0, 0}; + if (!pCursor->nOffset && !editor->bCaretAtEnd) + { + ME_DisplayItem *prev = ME_FindItemBack(pCursorRun, diRunOrStartRow); + if (prev->type == diRun) + pSizeRun = prev; + } + assert(row->type == diStartRow); /* paragraph -> run without start row ?*/ + para = ME_FindItemBack(row, diParagraph); + if (editor->bCaretAtEnd && !pCursor->nOffset && + run == ME_FindItemFwd(row, diRun)) + { + ME_DisplayItem *tmp = ME_FindItemBack(row, diRunOrParagraph); + if (tmp->type == diRun) + { + row = ME_FindItemBack(tmp, diStartRow); + pSizeRun = run = tmp; + sz = ME_GetRunSize(&c, &run->member.run, ME_StrLen(run->member.run.strText)); + } + } + if (pCursor->nOffset && !(run->member.run.nFlags & MERF_SKIPPED)) { + sz = ME_GetRunSize(&c, &run->member.run, pCursor->nOffset); + } + CreateCaret(editor->hWnd, NULL, 0, pSizeRun->member.run.nAscent+pSizeRun->member.run.nDescent); + SetCaretPos(run->member.run.pt.x+sz.cx, + para->member.para.nYPos+row->member.row.nBaseline+pSizeRun->member.run.p t.y-pSizeRun->member.run.nAscent-GetScrollPos(editor->hWnd, SB_VERT)); + } else { + assert(0 == "Wrapped paragraph run without a row?"); + CreateCaret(editor->hWnd, NULL, 0, 10); + SetCaretPos(0,0); + } + } + else { + assert(0 == "Cursor not on a run"); + CreateCaret(editor->hWnd, NULL, 0, 10); /* FIXME use global font */ + SetCaretPos(0,0); + } + ME_DestroyContext(&c); + ReleaseDC(editor->hWnd, hDC); +} + +void ME_ShowCaret(ME_TextEditor *ed) +{ + ME_MoveCaret(ed); + ShowCaret(ed->hWnd); +} + +void ME_HideCaret(ME_TextEditor *ed) +{ + HideCaret(ed->hWnd); + DestroyCaret(); +} + +void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, + int nChars) +{ + ME_Cursor c; + int shift = 0; + + while(nChars > 0) + { + ME_Run *run; + ME_CursorFromCharOfs(editor, nOfs, &c); + run = &c.pRun->member.run; + if (run->nFlags & MERF_ENDPARA) { + if (!ME_FindItemFwd(c.pRun, diParagraph)) + { + return; + } + ME_JoinParagraphs(editor, ME_GetParagraph(c.pRun)); + /* ME_SkipAndPropagateCharOffset(p->pRun, shift); */ + ME_CheckCharOffsets(editor); + nChars--; + continue; + } + else + { + ME_Cursor cursor; + int nIntendedChars = nChars; + int nCharsToDelete = nChars; + int i; + int loc = c.nOffset; + + ME_FindItemBack(c.pRun, diParagraph)->member.para.nFlags |= MEPF_REWRAP; + + cursor = c; + ME_StrRelPos(run->strText, loc, &nChars); + /* nChars is the number of characters that should be deleted from the + FOLLOWING runs (these AFTER cursor.pRun) + nCharsToDelete is a number of chars to delete from THIS run */ + nCharsToDelete -= nChars; + shift -= nCharsToDelete; + TRACE("Deleting %d (intended %d-remaning %d) chars at %d in '%s' (%d)\n", + nCharsToDelete, nIntendedChars, nChars, c.nOffset, + debugstr_w(run->strText->szData), run->strText->nLen); + + if (!c.nOffset && ME_StrVLen(run->strText) == nCharsToDelete) + { + /* undo = reinsert whole run */ + /* nOfs is a character offset (from the start of the document + to the current (deleted) run */ + ME_UndoItem *pUndo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); + if (pUndo) + pUndo->di.member.run.nCharOfs = nOfs; + } + else + { + /* undo = reinsert partial run */ + ME_UndoItem *pUndo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); + if (pUndo) { + ME_DestroyString(pUndo->di.member.run.strText); + pUndo->di.member.run.nCharOfs = nOfs; + pUndo->di.member.run.strText = ME_MakeStringN(run->strText->szData+c.nOffset, nCharsToDelete); + } + } + TRACE("Post deletion string: %s (%d)\n", debugstr_w(run->strText->szData), run->strText->nLen); + TRACE("Shift value: %d\n", shift); + ME_StrDeleteV(run->strText, c.nOffset, nCharsToDelete); + + /* update cursors (including c) */ + for (i=-1; i<editor->nCursors; i++) { + ME_Cursor *pThisCur = editor->pCursors + i; + if (i == -1) pThisCur = &c; + if (pThisCur->pRun == cursor.pRun) { + if (pThisCur->nOffset > cursor.nOffset) { + if (pThisCur->nOffset-cursor.nOffset < nCharsToDelete) + pThisCur->nOffset = cursor.nOffset; + else + pThisCur->nOffset -= nCharsToDelete; + assert(pThisCur->nOffset >= 0); + assert(pThisCur->nOffset <= ME_StrVLen(run->strText)); + } + if (pThisCur->nOffset == ME_StrVLen(run->strText)) + { + pThisCur->pRun = ME_FindItemFwd(pThisCur->pRun, diRunOrParagraphOrEnd); + assert(pThisCur->pRun->type == diRun); + pThisCur->nOffset = 0; + } + } + } + + /* c = updated data now */ + + if (c.pRun == cursor.pRun) + ME_SkipAndPropagateCharOffset(c.pRun, shift); + else + ME_PropagateCharOffset(c.pRun, shift); + + if (!ME_StrVLen(cursor.pRun->member.run.strText)) + { + TRACE("Removing useless run\n"); + ME_Remove(cursor.pRun); + ME_DestroyDisplayItem(cursor.pRun); + } + + shift = 0; + /* + ME_CheckCharOffsets(editor); + */ + continue; + } + } +} + +void ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, + int nChars) +{ + assert(nCursor>=0 && nCursor<editor->nCursors); + ME_InternalDeleteText(editor, ME_GetCursorOfs(editor, nCursor), nChars); +} + +static WCHAR wszSpace[] = {' ', 0}; + +/* FIXME this is temporary, just to have something to test how bad graphics handler is */ +void ME_InsertGraphicsFromCursor(ME_TextEditor *editor, int nCursor) +{ + ME_Cursor *pCursor = &editor->pCursors[nCursor]; + ME_DisplayItem *pItem = NULL; + ME_DisplayItem *pNewRun = NULL; + ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); + ME_UndoItem *pUndo; + + /* FIXME no no no */ + if (ME_IsSelection(editor)) + ME_DeleteSelection(editor); + + pUndo = ME_AddUndoItem(editor, diUndoDeleteRun, NULL); + if (pUndo) { + pUndo->nStart = pCursor->nOffset + pCursor->pRun->member.run.nCharOfs + ME_GetParagraph(pCursor->pRun)->member.para.nCharOfs; + pUndo->nLen = 1; + } + if (pCursor->nOffset) + { + ME_SplitRunSimple(editor, pCursor->pRun, pCursor->nOffset); + } + pItem = pCursor->pRun; + pNewRun = ME_MakeRun(pStyle, ME_MakeStringN(wszSpace, 1), MERF_GRAPHICS); + pNewRun->member.run.nCharOfs = pCursor->pRun->member.run.nCharOfs; + ME_InsertBefore(pCursor->pRun, pNewRun); + ME_PropagateCharOffset(pItem, 1); + ME_CheckCharOffsets(editor); + ME_SendSelChange(editor); +} + +void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, + const WCHAR *str, int len, ME_Style *style) +{ + const WCHAR *pos; + ME_Cursor *p = NULL; + + assert(style); + editor->bCaretAtEnd = FALSE; + + /* + if (!style) + style = ME_GetInsertStyle(editor, nCursor); + else + ME_AddRefStyle(style); + */ + ME_AddRefStyle(style); + + /* FIXME really HERE ? */ + if (ME_IsSelection(editor)) + ME_DeleteSelection(editor); + + assert(nCursor>=0 && nCursor<editor->nCursors); + if (len == -1) + len = lstrlenW(str); + pos = str; + /* FIXME this sucks - no respect for unicode (what else can be a line separator in unicode?) */ + while(pos-str < len && *pos != '\r' && *pos != '\n') + pos++; + /* handle EOLs */ + if (pos-str < len) { + ME_DisplayItem *tp, *end_run; + ME_Paragraph *para; + ME_Style *tmp_style; + if (pos!=str) + ME_InsertTextFromCursor(editor, nCursor, str, pos-str, style); + p = &editor->pCursors[nCursor]; + tp = ME_FindItemBack(p->pRun, diParagraph); + para = &tp->member.para; + assert(tp); + if (p->nOffset) { + ME_SplitRunSimple(editor, p->pRun, p->nOffset); + p = &editor->pCursors[nCursor]; + } + tmp_style = ME_GetInsertStyle(editor, nCursor); + /* ME_SplitParagraph increases style refcount */ + tp = ME_SplitParagraph(editor, p->pRun, p->pRun->member.run.style); + p->pRun = ME_FindItemFwd(tp, diRun); + end_run = ME_FindItemBack(tp, diRun); + ME_ReleaseStyle(end_run->member.run.style); + end_run->member.run.style = tmp_style; + p->nOffset = 0; + if(pos-str < len && *pos =='\r') + pos++; + if(pos-str < len && *pos =='\n') + pos++; + if(pos-str < len) { + ME_InsertTextFromCursor(editor, nCursor, pos, len-(pos-str), style); + } + ME_ReleaseStyle(style); + return; + } + p = &editor->pCursors[nCursor]; + if (style) { + ME_DisplayItem *pNewRun = NULL; + + assert(p->pRun->type == diRun); + pNewRun = ME_MakeRun(style, ME_MakeStringN(str, len), 0); /* addrefs style */ + ME_InsertRun(editor, ME_CharOfsFromRunOfs(editor, p->pRun, p->nOffset), pNewRun); + ME_DestroyDisplayItem(pNewRun); + ME_ReleaseStyle(style); + return; + } else { + assert(0); + } +} + +BOOL ME_ArrowLeft(ME_TextEditor *editor, ME_Cursor *p) +{ + if (p->nOffset) { + p->nOffset = ME_StrRelPos2(p->pRun->member.run.strText, p->nOffset, -1); + return TRUE; + } + else + { + ME_DisplayItem *pRun = ME_FindItemBack(p->pRun, diRunOrParagraph); + assert(pRun); + if (pRun->type == diRun) { + p->pRun = pRun; + assert(p->pRun->type == diRun); + assert(pRun->member.run.strText->nLen); + p->nOffset = pRun->member.run.strText->nLen; + if (p->nOffset) { + p->nOffset = ME_StrRelPos2(pRun->member.run.strText, p->nOffset, -1); + return TRUE; + } + else + assert(0); + } + if (pRun->type == diParagraph) + { + if (pRun->member.para.prev_para->type == diTextStart) + return FALSE; + assert(pRun->member.para.prev_para->type == diParagraph); + pRun = ME_FindItemBack(pRun, diRunOrParagraph); + /* every paragraph ought to have at least one run */ + assert(pRun && pRun->type == diRun); + assert(pRun->member.run.nFlags & MERF_ENDPARA); + p->pRun = pRun; + p->nOffset = 0; + return TRUE; + } + assert(0); + } +} + +BOOL ME_ArrowRight(ME_TextEditor *editor, ME_Cursor *p) +{ + int new_ofs = ME_StrRelPos2(p->pRun->member.run.strText, p->nOffset, 1); + if (new_ofs<p->pRun->member.run.strText->nLen) { + p->nOffset = new_ofs; + } + else + { + ME_DisplayItem *pRun = ME_FindItemFwd(p->pRun, diRun); + if (pRun) { + p->pRun = pRun; + assert(p->pRun->type == diRun); + p->nOffset = 0; + } + } + return TRUE; +} + +int ME_GetCursorOfs(ME_TextEditor *editor, int nCursor) +{ + ME_Cursor *pCursor = &editor->pCursors[nCursor]; + + return ME_GetParagraph(pCursor->pRun)->member.para.nCharOfs + + pCursor->pRun->member.run.nCharOfs + pCursor->nOffset; +} + +int ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol) +{ + ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; + int rx = 0; + + if (is_eol) + *is_eol = 0; + + while(p != editor->pBuffer->pLast) + { + if (p->type == diParagraph) + { + int ry = y - p->member.para.nYPos; + if (ry < 0) + { + result->pRun = ME_FindItemFwd(p, diRun); + result->nOffset = 0; + return 0; + } + if (ry >= p->member.para.nHeight) + { + p = p->member.para.next_para; + continue; + } + p = ME_FindItemFwd(p, diStartRow); + y = ry; + continue; + } + if (p->type == diStartRow) + { + int ry = y - p->member.row.nYPos; + if (ry < 0) + return 0; + if (ry >= p->member.row.nHeight) + { + p = ME_FindItemFwd(p, diStartRowOrParagraphOrEnd); + if (p->type != diStartRow) + return 0; + continue; + } + p = ME_FindItemFwd(p, diRun); + continue; + } + if (p->type == diRun) + { + ME_DisplayItem *pp; + rx = x - p->member.run.pt.x; + if (rx < 0) + rx = 0; + if (rx >= p->member.run.nWidth) /* not this run yet... find next item */ + { + pp = p; + do { + p = p->next; + if (p->type == diRun) + { + rx = x - p->member.run.pt.x; + goto continue_search; + } + if (p->type == diStartRow) + { + p = ME_FindItemFwd(p, diRun); + if (is_eol) + *is_eol = 1; + rx = 0; /* FIXME not sure */ + goto found_here; + } + if (p->type == diParagraph || p->type == diTextEnd) + { + rx = 0; /* FIXME not sure */ + p = pp; + goto found_here; + } + } while(1); + continue; + } + found_here: + if (p->member.run.nFlags & MERF_ENDPARA) + rx = 0; + result->pRun = p; + result->nOffset = ME_CharFromPointCursor(editor, rx, &p->member.run); + if (editor->pCursors[0].nOffset == p->member.run.strText->nLen && rx) + { + result->pRun = ME_FindItemFwd(editor->pCursors[0].pRun, diRun); + result->nOffset = 0; + } + return 1; + } + assert(0); + continue_search: + ; + } + result->pRun = ME_FindItemBack(p, diRun); + result->nOffset = 0; + assert(result->pRun->member.run.nFlags & MERF_ENDPARA); + return 0; +} + +void ME_LButtonDown(ME_TextEditor *editor, int x, int y) +{ + ME_Cursor tmp_cursor; + int is_selection = 0; + + editor->nUDArrowX = -1; + + y += GetScrollPos(editor->hWnd, SB_VERT); + + tmp_cursor = editor->pCursors[0]; + is_selection = ME_IsSelection(editor); + + ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd); + + if (GetKeyState(VK_SHIFT)>=0) + { + editor->pCursors[1] = editor->pCursors[0]; + } + else + { + if (!is_selection) { + editor->pCursors[1] = tmp_cursor; + is_selection = 1; + } + } + HideCaret(editor->hWnd); + ME_MoveCaret(editor); + if (is_selection) + ME_Repaint(editor); + ShowCaret(editor->hWnd); + ME_ClearTempStyle(editor); + ME_SendSelChange(editor); +} + +void ME_MouseMove(ME_TextEditor *editor, int x, int y) +{ + ME_Cursor tmp_cursor; + + y += GetScrollPos(editor->hWnd, SB_VERT); + + tmp_cursor = editor->pCursors[0]; + if (!ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd)) + /* return */; + + if (tmp_cursor.pRun == editor->pCursors[0].pRun && + tmp_cursor.nOffset == editor->pCursors[0].nOffset) + return; + + HideCaret(editor->hWnd); + ME_MoveCaret(editor); + ME_Repaint(editor); + ShowCaret(editor->hWnd); + ME_SendSelChange(editor); +} + +static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, + int x, int *pOffset, int *pbCaretAtEnd) +{ + ME_DisplayItem *pNext, *pLastRun; + pNext = ME_FindItemFwd(pRow, diRunOrStartRow); + assert(pNext->type == diRun); + pLastRun = pNext; + *pbCaretAtEnd = FALSE; + do { + int run_x = pNext->member.run.pt.x; + int width = pNext->member.run.nWidth; + if (x < run_x) + { + if (pOffset) *pOffset = 0; + return pNext; + } + if (x >= run_x && x < run_x+width) + { + int ch = ME_CharFromPointCursor(editor, x-run_x, &pNext->member.run); + ME_String *s = pNext->member.run.strText; + if (ch < s->nLen) { + if (pOffset) + *pOffset = ch; + return pNext; + } + } + pLastRun = pNext; + pNext = ME_FindItemFwd(pNext, diRunOrStartRow); + } while(pNext && pNext->type == diRun); + + if ((pLastRun->member.run.nFlags & MERF_ENDPARA) == 0) + { + pNext = ME_FindItemFwd(pNext, diRun); + if (pbCaretAtEnd) *pbCaretAtEnd = 1; + if (pOffset) *pOffset = 0; + return pNext; + } else { + if (pbCaretAtEnd) *pbCaretAtEnd = 0; + if (pOffset) *pOffset = 0; + return pLastRun; + } +} + +static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) +{ + ME_DisplayItem *pRun = pCursor->pRun; + int x; + + if (editor->nUDArrowX != -1) + x = editor->nUDArrowX; + else { + if (editor->bCaretAtEnd) + { + pRun = ME_FindItemBack(pRun, diRun); + assert(pRun); + x = pRun->member.run.pt.x + pRun->member.run.nWidth; + } + else { + x = pRun->member.run.pt.x; + x += ME_PointFromChar(editor, &pRun->member.run, pCursor->nOffset); + } + editor->nUDArrowX = x; + } + return x; +} + +void ME_ArrowUp(ME_TextEditor *editor, ME_Cursor *pCursor) +{ + ME_DisplayItem *pRun = pCursor->pRun; + ME_DisplayItem *pItem, *pItem2; + int x = ME_GetXForArrow(editor, pCursor); + + if (editor->bCaretAtEnd && !pCursor->nOffset) + { + pRun = ME_FindItemBack(pRun, diRun); + if (!pRun) + return; + } + + /* start of this row */ + pItem = ME_FindItemBack(pRun, diStartRow); + assert(pItem); + /* start of the previous row */ + pItem2 = ME_FindItemBack(pItem, diStartRow); + /* no previous row = the first line of the first paragraph */ + if (!pItem2) /* can't go up - don't go BOL (as in MS richedit) */ + return; + /* FIXME + ME_WrapTextParagraph(editor, ME_FindItemBack(pItem2, diParagraph)); + */ + pCursor->pRun = ME_FindRunInRow(editor, pItem2, x, &pCursor->nOffset, &editor->bCaretAtEnd); +} + +void ME_ArrowDown(ME_TextEditor *editor, ME_Cursor *pCursor) +{ + ME_DisplayItem *pRun = pCursor->pRun; + ME_DisplayItem *pItem; + int x = ME_GetXForArrow(editor, pCursor); + if (!pCursor->nOffset && editor->bCaretAtEnd) + { + pRun = ME_FindItemBack(pRun, diRun); +/* x = pRun->member.run.pt.x + pRun->member.run.nWidth; */ + } + /* start of the next row */ + pItem = ME_FindItemFwd(pRun, diStartRow); + /* FIXME If diParagraph is before diStartRow, wrap the next paragraph? + */ + if (!pItem) + { + /* next row not found - ignore */ + return; + } + pCursor->pRun = ME_FindRunInRow(editor, pItem, x, &pCursor->nOffset, &editor->bCaretAtEnd); + assert(pCursor->pRun); + assert(pCursor->pRun->type == diRun); +} + +void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) +{ + ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); + if (pRow) { + ME_DisplayItem *pRun; + if (editor->bCaretAtEnd && !pCursor->nOffset) { + pRow = ME_FindItemBack(pRow, diStartRow); + if (!pRow) + return; + } + pRun = ME_FindItemFwd(pRow, diRun); + if (pRun) { + pCursor->pRun = pRun; + pCursor->nOffset = 0; + } + } + editor->bCaretAtEnd = FALSE; +} + +void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) +{ + ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diTextStart); + if (pRow) { + ME_DisplayItem *pRun = ME_FindItemFwd(pRow, diRun); + if (pRun) { + pCursor->pRun = pRun; + pCursor->nOffset = 0; + } + } +} + +void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) +{ + ME_DisplayItem *pRow; + + if (editor->bCaretAtEnd && !pCursor->nOffset) + return; + + pRow = ME_FindItemFwd(pCursor->pRun, diStartRowOrParagraphOrEnd); + assert(pRow); + if (pRow->type == diStartRow) { + /* FIXME WTF was I thinking about here ? */ + ME_DisplayItem *pRun = ME_FindItemFwd(pRow, diRun); + assert(pRun); + pCursor->pRun = pRun; + pCursor->nOffset = 0; + editor->bCaretAtEnd = 1; + return; + } + pCursor->pRun = ME_FindItemBack(pRow, diRun); + assert(pCursor->pRun && pCursor->pRun->member.run.nFlags & MERF_ENDPARA); + pCursor->nOffset = 0; + editor->bCaretAtEnd = FALSE; +} + +void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor) +{ + ME_DisplayItem *p = ME_FindItemFwd(pCursor->pRun, diTextEnd); + assert(p); + p = ME_FindItemBack(p, diRun); + assert(p); + assert(p->member.run.nFlags & MERF_ENDPARA); + pCursor->pRun = p; + pCursor->nOffset = 0; + editor->bCaretAtEnd = FALSE; +} + +BOOL ME_IsSelection(ME_TextEditor *editor) +{ + return memcmp(&editor->pCursors[0], &editor->pCursors[1], sizeof(ME_Cursor))!=0; +} + +int ME_GetSelCursor(ME_TextEditor *editor, int dir) +{ + int cdir = ME_GetCursorOfs(editor, 0) - ME_GetCursorOfs(editor, 1); + + if (cdir*dir>0) + return 0; + else + return 1; +} + +BOOL ME_CancelSelection(ME_TextEditor *editor, int dir) +{ + int cdir; + + if (GetKeyState(VK_SHIFT)<0) + return FALSE; + if (!memcmp(&editor->pCursors[0], &editor->pCursors[1], sizeof(ME_Cursor))) + return FALSE; + + cdir = ME_GetCursorOfs(editor, 0) - ME_GetCursorOfs(editor, 1); + + if (cdir*dir>0) + editor->pCursors[1] = editor->pCursors[0]; + else + editor->pCursors[0] = editor->pCursors[1]; + /* FIXME optimize */ + ME_MarkAllForWrapping(editor); + ME_Repaint(editor); + return TRUE; +} + +void ME_RepaintSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor) +{ + ME_Cursor old_anchor = editor->pCursors[1]; + BOOL bRedraw = FALSE; + bRedraw = memcmp(&editor->pCursors[0], &editor->pCursors[1], sizeof(ME_Cursor)); + + if (bRedraw) + { + /* FIXME optimize */ + ME_MarkAllForWrapping(editor); + } + + if (GetKeyState(VK_SHIFT)>=0) /* cancelling selection */ + { + /* any selection was present ? if so, it's no more, repaint ! */ + editor->pCursors[1] = editor->pCursors[0]; + if (memcmp(pTempCursor, &old_anchor, sizeof(ME_Cursor))) { + ME_Repaint(editor); + return; + } + return; + } + else + { + if (!memcmp(pTempCursor, &editor->pCursors[1], sizeof(ME_Cursor))) /* starting selection */ + { + editor->pCursors[1] = *pTempCursor; + } + } + + ME_Repaint(editor); +} + +void ME_DeleteSelection(ME_TextEditor *editor) +{ + int from, to; + ME_GetSelection(editor, &from, &to); + ME_DeleteTextAtCursor(editor, ME_GetSelCursor(editor,-1), to-from); +} + +ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) +{ + ME_Style *style; + int from, to; + ME_Cursor c; + + ME_GetSelection(editor, &from, &to); + ME_CursorFromCharOfs(editor, from, &c); + if (from != to) { + style = c.pRun->member.run.style; + ME_AddRefStyle(style); /* ME_GetInsertStyle has already done that */ + } + else + style = ME_GetInsertStyle(editor, 0); + return style; +} + +void ME_SendSelChange(ME_TextEditor *editor) +{ + SELCHANGE sc; + if (!(editor->nEventMask & ENM_SELCHANGE)) + return; + sc.nmhdr.hwndFrom = editor->hWnd; + sc.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); + sc.nmhdr.code = EN_SELCHANGE; + SendMessageW(editor->hWnd, EM_EXGETSEL, 0, (LPARAM)&sc.chrg); + sc.seltyp = SEL_EMPTY; + if (sc.chrg.cpMin != sc.chrg.cpMax) + sc.seltyp |= SEL_TEXT; + if (sc.chrg.cpMin < sc.chrg.cpMax+1) /* wth were RICHEDIT authors thinking ? */ + sc.seltyp |= SEL_MULTICHAR; + SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, sc.nmhdr.idFrom, (LPARAM)&sc); +} + +BOOL ME_ArrowKey(ME_TextEditor *editor, int nVKey, int nCtrl) +{ + int nCursor = 0; + ME_Cursor *p = &editor->pCursors[nCursor]; + ME_Cursor tmp_curs = *p; + + switch(nVKey) { + case VK_UP: + ME_ArrowUp(editor, p); + ME_ClearTempStyle(editor); + ME_RepaintSelection(editor, &tmp_curs); + ME_SendSelChange(editor); + return TRUE; + case VK_DOWN: + ME_ArrowDown(editor, p); + ME_ClearTempStyle(editor); + ME_RepaintSelection(editor, &tmp_curs); + ME_SendSelChange(editor); + return TRUE; + } + + editor->nUDArrowX = -1; + switch(nVKey) { + case VK_BACK: { /* FIXME backspace and delete aren't the same, they act different wrt paragraph style of the merged paragraph */ + if (GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_READONLY) + return FALSE; + if (ME_IsSelection(editor)) + { + editor->bCaretAtEnd = FALSE; /* FIXME or maybe not */ + ME_DeleteSelection(editor); + ME_UpdateRepaint(editor); + return TRUE; + } + if (ME_ArrowLeft(editor, p)) { + editor->bCaretAtEnd = FALSE; /* FIXME or maybe not */ + ME_MoveCaret(editor); + ME_DeleteTextAtCursor(editor, nCursor, 1); + ME_UpdateRepaint(editor); + } + return TRUE; + } + case VK_DELETE: { + if (GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_READONLY) + return FALSE; + /* editor->bCaretAtEnd = 0; FIXME or maybe not */ + if (ME_IsSelection(editor)) + { + ME_DeleteSelection(editor); + ME_UpdateRepaint(editor); + return TRUE; + } + ME_DeleteTextAtCursor(editor, nCursor, 1); + ME_UpdateRepaint(editor); + return TRUE; + } + case VK_HOME: { + if (GetKeyState(VK_CONTROL)<0) + ME_ArrowCtrlHome(editor, p); + else + ME_ArrowHome(editor, p); + editor->bCaretAtEnd = 0; + ME_ClearTempStyle(editor); + ME_RepaintSelection(editor, &tmp_curs); + ME_SendSelChange(editor); + return TRUE; + } + case VK_END: + if (GetKeyState(VK_CONTROL)<0) + ME_ArrowCtrlEnd(editor, p); + else + ME_ArrowEnd(editor, p); + ME_ClearTempStyle(editor); + ME_RepaintSelection(editor, &tmp_curs); + ME_SendSelChange(editor); + return TRUE; + case VK_LEFT: [truncated at 1000 lines; 10578 more skipped]

19 years, 6 months

[gvg] 14088: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: Alex Villacis Lasso <a_villacis(a)palosanto.com> - Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all resources, so that Spanish locales other than Spain also use Spanish resources. - eol-style stuff Modified: trunk/reactos/lib/oledlg/oledlg_Es.rc Deleted: trunk/reactos/lib/oledlg/oledlg_Fr.rc Added: trunk/reactos/lib/oledlg/oledlg_Fr.rc _____ Modified: trunk/reactos/lib/oledlg/oledlg_Es.rc --- trunk/reactos/lib/oledlg/oledlg_Es.rc 2005-03-15 03:51:11 UTC (rev 14087) +++ trunk/reactos/lib/oledlg/oledlg_Es.rc 2005-03-15 08:10:52 UTC (rev 14088) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU _____ Deleted: trunk/reactos/lib/oledlg/oledlg_Fr.rc --- trunk/reactos/lib/oledlg/oledlg_Fr.rc 2005-03-15 03:51:11 UTC (rev 14087) +++ trunk/reactos/lib/oledlg/oledlg_Fr.rc 2005-03-15 08:10:52 UTC (rev 14088) @@ -1,59 +0,0 @@ -/* - * oledlg dll resources - * French language support - * - * Copyright (C) 2005 Jonathan Ernst - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "InsÚrer Objet" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "Type d'objet:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Annuler",IDCANCEL,221,24,66,14 - GROUPBOX "RÚsultat",IDC_RESULT,7,103,208,41 - CONTROL "CrÚer Nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "CrÚer Contr¶le",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "CrÚer Depuis Fichier",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "&Ajoute Contr¶le...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Afficher Comme Ic¶ne",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Parcourir...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Fichier:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "InsÚrer un nouvel object %s dans votre document" - IDS_RESULTFILEOBJDESC "InsÞre le contenu du fichier comme un objet dans votre document afin que vous puissiez l'activer en utilisant le programme avec lequel vous l'avez crÚÚ." - IDS_BROWSE "Parcourir" - IDS_NOTOLEMOD "Le fichier ne semble pas Ûtre un module OLE valide. Impossible d'enregistrer le contr¶le OLE." - IDS_NOTOLEMODCAPTION "Ajouter Contr¶le" -} _____ Copied: trunk/reactos/lib/oledlg/oledlg_Fr.rc (from rev 14087, vendor/wine/dlls/oledlg/current/oledlg_Fr.rc)

19 years, 6 months

[royce] 14087: I give up, make's "directory target" support has a fatal flaw, converting to "dummy file" system

by royce＠svn.reactos.com

I give up, make's "directory target" support has a fatal flaw, converting to "dummy file" system Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak Modified: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c Modified: branches/xmlbuildsystem/reactos/tools/tools.mak Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-15 03:51:11 UTC (rev 14087) @@ -18,6 +18,8 @@ .PHONY: clean all: makefile.auto +.SUFFIXES: + ifeq ($(HOST),) ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) HOST=mingw32-windows @@ -40,6 +42,7 @@ endif endif ifeq ($(HALFVERBOSEECHO),yes) + ECHO_MKDIR =@echo [MKDIR] $@ ECHO_INVOKE =@echo [INVOKE] $< ECHO_PCH =@echo [PCH] $@ ECHO_CC =@echo [CC] $< @@ -59,6 +62,7 @@ ECHO_CDMAKE =@echo [CDMAKE] $@ ECHO_TEST =@echo [TEST] $@ else + ECHO_MKDIR = ECHO_INVOKE = ECHO_PCH = ECHO_CC = @@ -89,7 +93,7 @@ EXEPREFIX = ./ EXEPOSTFIX = SEP = / - nmkdir = $(Q)mkdir -p + nmkdir = -$(Q)mkdir -p gcc = $(Q)mingw32-gcc gpp = $(Q)mingw32-g++ ld = $(Q)mingw32-ld @@ -105,7 +109,7 @@ EXEPOSTFIX = .exe ROS_EMPTY = SEP = \$(ROS_EMPTY) - nmkdir = $(Q)mkdir + nmkdir = -$(Q)mkdir gcc = $(Q)gcc gpp = $(Q)g++ ld = $(Q)ld @@ -134,18 +138,21 @@ OUTPUT_NO_SLASH = obj-i386 endif -mkdir = $(Q)$(INTERMEDIATE)rmkdir +mkdir = -$(Q)$(INTERMEDIATE)rmkdir +EXISTS = .exists +INTERMEDIATE_EXISTS = $(INTERMEDIATE)$(EXISTS) -$(INTERMEDIATE_NO_SLASH): +$(INTERMEDIATE_EXISTS): ${nmkdir} $(INTERMEDIATE_NO_SLASH) + @echo . > $@ -NTOSKRNL_MC = .$(SEP)ntoskrnl$(SEP)ntoskrnl.mc -KERNEL32_MC = .$(SEP)lib$(SEP)kernel32$(SEP)kernel32.mc -BUILDNO_H = .$(SEP)include$(SEP)reactos$(SEP)buildno.h -BUGCODES_H = .$(SEP)include$(SEP)reactos$(SEP)bugcodes.h -BUGCODES_RC = .$(SEP)ntoskrnl$(SEP)bugcodes.rc -ERRCODES_H = .$(SEP)include$(SEP)reactos$(SEP)errcodes.h -ERRCODES_RC = .$(SEP)lib$(SEP)kernel32$(SEP)errcodes.rc +NTOSKRNL_MC = ntoskrnl$(SEP)ntoskrnl.mc +KERNEL32_MC = lib$(SEP)kernel32$(SEP)kernel32.mc +BUILDNO_H = include$(SEP)reactos$(SEP)buildno.h +BUGCODES_H = include$(SEP)reactos$(SEP)bugcodes.h +BUGCODES_RC = ntoskrnl$(SEP)bugcodes.rc +ERRCODES_H = include$(SEP)reactos$(SEP)errcodes.h +ERRCODES_RC = lib$(SEP)kernel32$(SEP)errcodes.rc include tools/tools.mak -include makefile.auto @@ -160,7 +167,7 @@ makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) - $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw + $(Q)$(RBUILD_TARGET) mingw $(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC) _____ Modified: branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak --- branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak 2005-03-15 03:51:11 UTC (rev 14087) @@ -2,6 +2,7 @@ ZLIB_BASE_DIR = $(INTERMEDIATE)$(ZLIB_BASE) + #$(ZLIB_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) # ${mkdir} $(INTERMEDIATE)$(ZLIB_BASE) @@ -9,8 +10,6 @@ $(INTERMEDIATE)$(ZLIB_BASE)$(SEP)zlib.host.a ZLIB_HOST_SOURCES = \ - $(ZLIB_BASE)$(SEP)cdmake.c \ - $(ZLIB_BASE)$(SEP)llmosrt.c \ $(ZLIB_BASE)$(SEP)adler32.c \ $(ZLIB_BASE)$(SEP)compress.c \ $(ZLIB_BASE)$(SEP)crc32.c \ @@ -32,6 +31,9 @@ ZLIB_HOST_CFLAGS = -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes +.PHONY: zlib_host +zlib_host: $(ZLIB_HOST_TARGET) + $(ZLIB_HOST_TARGET): $(ZLIB_HOST_BASE_DIR) $(ZLIB_HOST_OBJECTS) $(ECHO_AR) $(host_ar) -r $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS) _____ Modified: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak --- branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak 2005-03-15 03:51:11 UTC (rev 14087) @@ -1,12 +1,14 @@ -BIN2RES_BASE = tools$(SEP)bin2res +BIN2RES_BASE = $(TOOLS_BASE)$(SEP)bin2res BIN2RES_BASE_DIR = $(INTERMEDIATE)$(BIN2RES_BASE) +BIN2RES_BASE_DIR_EXISTS = $(BIN2RES_BASE_DIR)$(SEP)$(EXISTS) -$(BIN2RES_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) - ${mkdir} $(INTERMEDIATE)$(BIN2RES_BASE) +$(BIN2RES_BASE_DIR_EXISTS): $(TOOLS_BASE_DIR_EXISTS) + ${mkdir} $(BIN2RES_BASE_DIR) + @echo . >$(BIN2RES_BASE_DIR_EXISTS) BIN2RES_TARGET = \ - $(INTERMEDIATE)$(BIN2RES_BASE)$(SEP)bin2res$(EXEPOSTFIX) + $(BIN2RES_BASE_DIR)$(SEP)bin2res$(EXEPOSTFIX) BIN2RES_SOURCES = \ $(BIN2RES_BASE)$(SEP)bin2res.c \ @@ -19,14 +21,18 @@ BIN2RES_HOST_LFLAGS = -g -$(BIN2RES_TARGET): $(BIN2RES_BASE_DIR) $(BIN2RES_OBJECTS) +$(BIN2RES_TARGET): $(BIN2RES_OBJECTS) $(ECHO_LD) - ${host_gcc} $(BIN2RES_OBJECTS) $(BIN2RES_HOST_LFLAGS) -o $(BIN2RES_TARGET) + ${host_gcc} $(BIN2RES_OBJECTS) $(BIN2RES_HOST_LFLAGS) -o $@ -$(BIN2RES_OBJECTS): %.o : %.c $(BIN2RES_BASE_DIR) +$(BIN2RES_BASE_DIR)$(SEP)bin2res.o: $(BIN2RES_BASE)$(SEP)bin2res.c $(BIN2RES_BASE_DIR_EXISTS) $(ECHO_CC) ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ +$(BIN2RES_BASE_DIR)$(SEP)mkstemps.o: $(BIN2RES_BASE)$(SEP)mkstemps.c $(BIN2RES_BASE_DIR_EXISTS) + $(ECHO_CC) + ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ + .PHONY: bin2res_clean bin2res_clean: -@$(rm) $(BIN2RES_TARGET) $(BIN2RES_OBJECTS) 2>$(NUL) _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak --- branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-15 03:51:11 UTC (rev 14087) @@ -1,12 +1,15 @@ -BUILDNO_BASE = tools$(SEP)buildno +BUILDNO_BASE = $(TOOLS_BASE)$(SEP)buildno BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE) +BUILDNO_BASE_DIR_EXISTS = $(BUILDNO_BASE_DIR)$(SEP)$(EXISTS) -$(BUILDNO_BASE_DIR): $(RMKDIR_TARGET) - ${mkdir} $@ +$(BUILDNO_BASE_DIR_EXISTS): $(TOOLS_BASE_DIR_EXISTS) + $(ECHO_MKDIR) + ${mkdir} $(BUILDNO_BASE_DIR) + @echo. > $@ BUILDNO_TARGET = \ - $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX) + $(BUILDNO_BASE_DIR)$(SEP)buildno$(EXEPOSTFIX) BUILDNO_SOURCES = \ $(BUILDNO_BASE)$(SEP)buildno.cpp \ @@ -21,25 +24,25 @@ BUILDNO_HOST_LFLAGS = -g -$(BUILDNO_TARGET): $(BUILDNO_BASE_DIR) $(BUILDNO_OBJECTS) +$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) $(ECHO_LD) ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_LFLAGS) -o $(BUILDNO_TARGET) -$(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)buildno.cpp +$(BUILDNO_BASE_DIR)$(SEP)buildno.o: $(BUILDNO_BASE)$(SEP)buildno.cpp $(BUILDNO_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $(BUILDNO_BASE)$(SEP)buildno.cpp -o $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno.o + ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)exception.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)exception.cpp +$(BUILDNO_BASE_DIR)$(SEP)exception.o: $(BUILDNO_BASE)$(SEP)exception.cpp $(BUILDNO_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $(BUILDNO_BASE)$(SEP)exception.cpp -o $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)exception.o + ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)ssprintf.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)ssprintf.cpp +$(BUILDNO_BASE_DIR)$(SEP)ssprintf.o: $(BUILDNO_BASE)$(SEP)ssprintf.cpp $(BUILDNO_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $(BUILDNO_BASE)$(SEP)ssprintf.cpp -o $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)ssprintf.o + ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)XML.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)XML.cpp +$(BUILDNO_BASE_DIR)$(SEP)XML.o: $(BUILDNO_BASE)$(SEP)XML.cpp $(BUILDNO_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $(BUILDNO_BASE)$(SEP)XML.cpp -o $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)XML.o + ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ .PHONY: buildno_clean buildno_clean: @@ -47,4 +50,4 @@ clean: buildno_clean $(BUILDNO_H): $(BUILDNO_TARGET) - $(EXEPREFIX)$(BUILDNO_TARGET) $(BUILDNO_H) + $(BUILDNO_TARGET) $(BUILDNO_H) _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-03-15 03:51:11 UTC (rev 14087) @@ -6,7 +6,7 @@ ${mkdir} $(INTERMEDIATE)$(CABMAN_BASE) CABMAN_TARGET = \ - $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabman$(EXEPOSTFIX) + $(CABMAN_BASE_DIR)$(SEP)cabman$(EXEPOSTFIX) CABMAN_SOURCES = \ $(CABMAN_BASE)$(SEP)cabinet.cxx \ @@ -18,33 +18,36 @@ CABMAN_OBJECTS = \ $(addprefix $(INTERMEDIATE), $(CABMAN_SOURCES:.cxx=.o)) -CABMAN_HOST_CFLAGS = -Iinclude/reactos -g -Werror -Wall +CABMAN_HOST_CFLAGS = -Iinclude/reactos -Ilib/zlib -g -Werror -Wall CABMAN_HOST_LFLAGS = -g $(ZLIB_HOST_TARGET) -$(CABMAN_TARGET): $(CABMAN_BASE_DIR) $(CABMAN_OBJECTS) +.PHONY: cabman +cabman: $(CABMAN_TARGET) + +$(CABMAN_TARGET): $(CABMAN_OBJECTS) $(ZLIB_HOST_TARGET) $(ECHO_LD) - ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $(CABMAN_TARGET) + ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $@ -$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabinet.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)cabinet.cxx +$(CABMAN_BASE_DIR)$(SEP)cabinet.o: $(CABMAN_BASE)$(SEP)cabinet.cxx $(CABMAN_BASE_DIR) $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)cabinet.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabinet.o + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)dfp.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)dfp.cxx +$(CABMAN_BASE_DIR)$(SEP)dfp.o: $(CABMAN_BASE)$(SEP)dfp.cxx $(CABMAN_BASE_DIR) $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)dfp.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)dfp.o + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)main.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)main.cxx +$(CABMAN_BASE_DIR)$(SEP)main.o: $(CABMAN_BASE)$(SEP)main.cxx $(CABMAN_BASE_DIR) $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)main.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)main.o + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)mszip.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)mszip.cxx +$(CABMAN_BASE_DIR)$(SEP)mszip.o: $(CABMAN_BASE)$(SEP)mszip.cxx $(CABMAN_BASE_DIR) $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)mszip.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)mszip.o + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)raw.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)raw.cxx +$(CABMAN_BASE_DIR)$(SEP)raw.o: $(CABMAN_BASE)$(SEP)raw.cxx $(CABMAN_BASE_DIR) $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)raw.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)raw.o + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ .PHONY: cabman_clean cabman_clean: _____ Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak --- branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-03-15 03:51:11 UTC (rev 14087) @@ -1,32 +1,42 @@ -CDMAKE_BASE = tools$(SEP)cdmake +CDMAKE_BASE = $(TOOLS_BASE)$(SEP)cdmake CDMAKE_BASE_DIR = $(INTERMEDIATE)$(CDMAKE_BASE) +CDMAKE_BASE_DIR_EXISTS = $(CDMAKE_BASE_DIR)$(SEP)$(EXISTS) -$(CDMAKE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) - ${mkdir} $(INTERMEDIATE)$(CDMAKE_BASE) +$(CDMAKE_BASE_DIR_EXISTS): $(TOOLS_BASE_DIR_EXISTS) + $(ECHO_MKDIR) + ${mkdir} $(CDMAKE_BASE_DIR) + @echo . >$@ CDMAKE_TARGET = \ - $(INTERMEDIATE)$(CDMAKE_BASE)$(SEP)cdmake$(EXEPOSTFIX) + $(CDMAKE_BASE_DIR)$(SEP)cdmake$(EXEPOSTFIX) CDMAKE_SOURCES = \ $(CDMAKE_BASE)$(SEP)cdmake.c \ $(CDMAKE_BASE)$(SEP)llmosrt.c CDMAKE_OBJECTS = \ - $(CDMAKE_SOURCES:.c=.o) + $(addprefix $(INTERMEDIATE), $(CDMAKE_SOURCES:.c=.o)) CDMAKE_HOST_CFLAGS = -Iinclude -g -Werror -Wall CDMAKE_HOST_LFLAGS = -g -$(CDMAKE_TARGET): $(CDMAKE_BASE_DIR) $(CDMAKE_OBJECTS) +.PHONY: cdmake +cdmake: $(CDMAKE_TARGET) + +$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) $(ECHO_LD) - ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_LFLAGS) -o $(CDMAKE_TARGET) + ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_LFLAGS) -o $@ -$(CDMAKE_OBJECTS): %.o : %.c $(CDMAKE_BASE_DIR) +$(CDMAKE_BASE_DIR)$(SEP)cdmake.o: $(CDMAKE_BASE)$(SEP)cdmake.c $(CDMAKE_BASE_DIR_EXISTS) $(ECHO_CC) ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ +$(CDMAKE_BASE_DIR)$(SEP)llmosrt.o: $(CDMAKE_BASE)$(SEP)llmosrt.c $(CDMAKE_BASE_DIR_EXISTS) + $(ECHO_CC) + ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ + .PHONY: cdmake_clean cdmake_clean: -@$(rm) $(CDMAKE_TARGET) $(CDMAKE_OBJECTS) 2>$(NUL) _____ Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak --- branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-03-15 03:51:11 UTC (rev 14087) @@ -1,12 +1,14 @@ -NCI_BASE = tools$(SEP)nci +NCI_BASE = $(TOOLS_BASE)$(SEP)nci -CDMAKE_BASE_DIR = $(INTERMEDIATE)$(NCI_BASE) +NCI_BASE_DIR = $(INTERMEDIATE)$(NCI_BASE) +NCI_BASE_DIR_EXISTS = $(NCI_BASE_DIR)$(SEP)$(EXISTS) -$(CDMAKE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) - ${mkdir} $(INTERMEDIATE)$(NCI_BASE) +$(NCI_BASE_DIR_EXISTS): $(TOOLS_BASE_DIR_EXIST) + ${mkdir} $(NCI_BASE_DIR) + @echo . > $@ NCI_TARGET = \ - $(INTERMEDIATE)$(NCI_BASE)$(SEP)nci$(EXEPOSTFIX) + $(NCI_BASE_DIR)$(SEP)nci$(EXEPOSTFIX) NCI_SOURCES = \ $(NCI_BASE)$(SEP)ncitool.c @@ -18,13 +20,13 @@ NCI_HOST_LFLAGS = -g -$(NCI_TARGET): $(CDMAKE_BASE_DIR) $(NCI_OBJECTS) +$(NCI_TARGET): $(NCI_OBJECTS) $(ECHO_LD) ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_CFLAGS) -o $(NCI_TARGET) -$(INTERMEDIATE)$(NCI_BASE)$(SEP)ncitool.o: $(CDMAKE_BASE_DIR) $(NCI_BASE)$(SEP)ncitool.c +$(NCI_BASE_DIR)$(SEP)ncitool.o: $(NCI_BASE)$(SEP)ncitool.c $(NCI_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(NCI_HOST_CFLAGS) -c $(NCI_BASE)$(SEP)ncitool.c -o $(INTERMEDIATE)$(NCI_BASE)$(SEP)ncitool.o + ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ .PHONY: nci_clean nci_clean: @@ -53,7 +55,7 @@ $(NCI_SERVICE_FILES): $(NCI_TARGET) $(ECHO_NCI) - $(Q)$(EXEPREFIX)$(NCI_TARGET) \ + $(Q)$(NCI_TARGET) \ $(KERNEL_SVC_DB) \ $(WIN32K_SVC_DB) \ $(KERNEL_SERVICE_TABLE) \ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-03-15 03:51:11 UTC (rev 14087) @@ -21,9 +21,9 @@ isNonAutomaticDependency ( isNonAutomaticDependency ), youngestLastWriteTime ( 0 ) { - if ( parent != NULL ) + if ( parent != NULL ) parents.push_back ( parent ); - GetDirectoryAndFilenameParts (); + GetDirectoryAndFilenameParts (); } void @@ -41,7 +41,7 @@ filenamePart = filename; } } - + void SourceFile::Close () { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-15 03:51:11 UTC (rev 14087) @@ -1449,7 +1449,7 @@ clean_files ); string linker; - if ( IsCPlusPlusModule ( module ) ) + if ( module.cplusplus ) linker = "${host_gpp}"; else linker = "${host_gcc}"; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-03-15 03:51:11 UTC (rev 14087) @@ -1,10 +1,18 @@ -RBUILD_BASE = .$(SEP)tools$(SEP)rbuild +RBUILD_BASE = $(TOOLS_BASE)$(SEP)rbuild +RBUILD_BASE_DIR = $(INTERMEDIATE)$(RBUILD_BASE) +RBUILD_BASE_DIR_EXISTS = $(RBUILD_BASE_DIR)$(SEP)$(EXISTS) + +$(RBUILD_BASE_DIR_EXISTS): $(TOOLS_BASE_DIR_EXISTS) + $(ECHO_MKDIR) + ${mkdir} $(RBUILD_BASE_DIR) + @echo . >$@ + RBUILD_TARGET = \ - $(ROS_INTERMEDIATE)$(RBUILD_BASE)$(SEP)rbuild$(EXEPOSTFIX) + $(RBUILD_BASE_DIR)$(SEP)rbuild$(EXEPOSTFIX) RBUILD_TEST_TARGET = \ - $(ROS_INTERMEDIATE)$(RBUILD_BASE)$(SEP)rbuild_test$(EXEPOSTFIX) + $(RBUILD_BASE_DIR)$(SEP)rbuild_test$(EXEPOSTFIX) RBUILD_BACKEND_MINGW_BASE_SOURCES = \ backend$(SEP)mingw$(SEP)mingw.cpp \ @@ -87,7 +95,7 @@ .PHONY: rbuild rbuild: $(RBUILD_TARGET) -$(RBUILD_TARGET): $(RBUILD_OBJECTS) +$(RBUILD_TARGET): $(RBUILD_OBJECTS) $(RBUILD_BASE_DIR_EXISTS) $(ECHO_LD) ${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $(RBUILD_TARGET) @@ -99,7 +107,7 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) +$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_BASE_DIR_EXISTS) $(ECHO_LD) ${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $(RBUILD_TEST_TARGET) _____ Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c --- branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-03-15 03:51:11 UTC (rev 14087) @@ -2,7 +2,7 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#ifdef _MSC_VER +#ifdef WIN32 #include <direct.h> #else #include <unistd.h> @@ -32,10 +32,10 @@ { char* newpath; int i; - + newpath=malloc(strlen(origpath)+1); strcpy(newpath,origpath); - + i = 0; while (newpath[i] != 0) { @@ -74,15 +74,15 @@ char* path1; char* csec; char buf[256]; - + if (argc != 2) { fprintf(stderr, "Too many arguments\n"); exit(1); } - + path1 = convert_path(argv[1]); - + if (isalpha(path1[0]) && path1[1] == ':' && path1[2] == DIR_SEPARATOR_CHAR) { csec = strtok(path1, DIR_SEPARATOR_STRING); @@ -99,12 +99,12 @@ { csec = strtok(path1, DIR_SEPARATOR_STRING); } - + while (csec != NULL) { mkdir_p(csec); csec = strtok(NULL, DIR_SEPARATOR_STRING); } - + exit(0); } _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-15 03:51:11 UTC (rev 14087) @@ -1,13 +1,16 @@ RMKDIR_BASE = tools +RMKDIR_BASE_DIR = $(INTERMEDIATE) +RMKDIR_BASE_DIR_EXISTS = $(RMKDIR_BASE_DIR)$(EXISTS) + RMKDIR_TARGET = \ - $(INTERMEDIATE)rmkdir$(EXEPOSTFIX) + $(RMKDIR_BASE_DIR)rmkdir$(EXEPOSTFIX) RMKDIR_SOURCES = \ $(RMKDIR_BASE)$(SEP)rmkdir.c RMKDIR_OBJECTS = \ - $(INTERMEDIATE)rmkdir.o + $(RMKDIR_BASE_DIR)rmkdir.o RMKDIR_HOST_CFLAGS = -g -Werror -Wall @@ -16,13 +19,13 @@ .PHONY: rmkdir rmkdir: $(RMKDIR_TARGET) -$(RMKDIR_TARGET): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_OBJECTS) +$(RMKDIR_TARGET): $(RMKDIR_OBJECTS) $(ECHO_LD) - ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET) + ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $@ -$(INTERMEDIATE)rmkdir.o: $(INTERMEDIATE_NO_SLASH) $(RMKDIR_BASE)$(SEP)rmkdir.c +$(RMKDIR_BASE_DIR)rmkdir.o: $(RMKDIR_BASE)$(SEP)rmkdir.c $(RMKDIR_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $(RMKDIR_BASE)$(SEP)rmkdir.c -o $(INTERMEDIATE)rmkdir.o + ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $< -o $@ .PHONY: rmkdir_clean rmkdir_clean: @@ -30,10 +33,22 @@ clean: rmkdir_clean -RSYM_BASE = tools +TOOLS_BASE = tools +TOOLS_BASE_DIR = $(INTERMEDIATE)$(TOOLS_BASE) +TOOLS_BASE_DIR_EXISTS = $(TOOLS_BASE_DIR)$(EXISTS) +$(TOOLS_BASE_DIR_EXISTS): $(INTERMEDIATE_EXISTS) $(RMKDIR_TARGET) + ${mkdir} $(TOOLS_BASE_DIR) + @echo . >$@ + + +RSYM_BASE = $(TOOLS_BASE) + +RSYM_BASE_DIR = $(INTERMEDIATE)$(RSYM_BASE) +RSYM_BASE_DIR_EXISTS = $(RSYM_BASE_DIR)$(EXISTS) + RSYM_TARGET = \ - $(INTERMEDIATE)$(RSYM_BASE)$(SEP)rsym$(EXEPOSTFIX) + $(RSYM_BASE_DIR)$(SEP)rsym$(EXEPOSTFIX) RSYM_SOURCES = \ $(RSYM_BASE)$(SEP)rsym.c @@ -50,9 +65,9 @@ $(RSYM_TARGET): $(RSYM_OBJECTS) $(ECHO_LD) - ${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $(RSYM_TARGET) + ${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $@ -$(RSYM_OBJECTS): %.o : %.c +$(RSYM_OBJECTS): %.o : %.c $(RSYM_BASE_DIR_EXISTS) $(ECHO_CC) ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ @@ -61,9 +76,9 @@ -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL) clean: rsym_clean + include tools/bin2res/bin2res.mak include tools/buildno/buildno.mak -include tools/cabman/cabman.mak include tools/cdmake/cdmake.mak include tools/nci/nci.mak include tools/rbuild/rbuild.mak @@ -73,3 +88,6 @@ include tools/wpp/wpp.mak include tools/wrc/wrc.mak include lib/zlib/zlib.mak + +# cabman must come after zlib +include tools/cabman/cabman.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak --- branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-03-15 00:23:19 UTC (rev 14086) +++ branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-03-15 03:51:11 UTC (rev 14087) @@ -1,12 +1,15 @@ -UNICODE_BASE = tools$(SEP)unicode +UNICODE_BASE = $(TOOLS_BASE)$(SEP)unicode UNICODE_BASE_DIR = $(INTERMEDIATE)$(UNICODE_BASE) +UNICODE_BASE_DIR_EXISTS = $(UNICODE_BASE_DIR)$(SEP)$(EXISTS) -$(UNICODE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) - ${mkdir} $(INTERMEDIATE)$(UNICODE_BASE) +$(UNICODE_BASE_DIR_EXISTS): $(TOOLS_BASE_DIR_EXISTS) + $(ECHO_MKDIR) + ${mkdir} $(UNICODE_BASE_DIR) + @echo . >$(UNICODE_BASE_DIR_EXISTS) UNICODE_TARGET = \ - $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)libunicode.a + $(UNICODE_BASE_DIR)$(SEP)libunicode.a UNICODE_CODEPAGES = \ 037 \ @@ -91,277 +94,277 @@ .PHONY: unicode unicode: $(UNICODE_TARGET) -$(UNICODE_TARGET): $(UNICODE_BASE_DIR) $(UNICODE_OBJECTS) +$(UNICODE_TARGET): $(UNICODE_OBJECTS) $(ECHO_AR) - ${host_ar} -rc $(UNICODE_TARGET) $(UNICODE_OBJECTS) + ${host_ar} -rc $@ $(UNICODE_OBJECTS) -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)casemap.o: $(UNICODE_BASE)$(SEP)casemap.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)casemap.o: $(UNICODE_BASE)$(SEP)casemap.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)casemap.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)casemap.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)compose.o: $(UNICODE_BASE)$(SEP)compose.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)compose.o: $(UNICODE_BASE)$(SEP)compose.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)compose.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)compose.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)cptable.o: $(UNICODE_BASE)$(SEP)cptable.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)cptable.o: $(UNICODE_BASE)$(SEP)cptable.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)cptable.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)cptable.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)mbtowc.o: $(UNICODE_BASE)$(SEP)mbtowc.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)mbtowc.o: $(UNICODE_BASE)$(SEP)mbtowc.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)mbtowc.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)mbtowc.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)string.o: $(UNICODE_BASE)$(SEP)string.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)string.o: $(UNICODE_BASE)$(SEP)string.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)string.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)string.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctomb.o: $(UNICODE_BASE)$(SEP)wctomb.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)wctomb.o: $(UNICODE_BASE)$(SEP)wctomb.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)wctomb.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctomb.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctype.o: $(UNICODE_BASE)$(SEP)wctype.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)wctype.o: $(UNICODE_BASE)$(SEP)wctype.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)wctype.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctype.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_037.o: $(UNICODE_BASE)$(SEP)c_037.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_037.o: $(UNICODE_BASE)$(SEP)c_037.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_037.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_037.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_424.o: $(UNICODE_BASE)$(SEP)c_424.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_424.o: $(UNICODE_BASE)$(SEP)c_424.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_424.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_424.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_437.o: $(UNICODE_BASE)$(SEP)c_437.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_437.o: $(UNICODE_BASE)$(SEP)c_437.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_437.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_437.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_500.o: $(UNICODE_BASE)$(SEP)c_500.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_500.o: $(UNICODE_BASE)$(SEP)c_500.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_500.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_500.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_737.o: $(UNICODE_BASE)$(SEP)c_737.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_737.o: $(UNICODE_BASE)$(SEP)c_737.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_737.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_737.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_775.o: $(UNICODE_BASE)$(SEP)c_775.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_775.o: $(UNICODE_BASE)$(SEP)c_775.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_775.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_775.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_850.o: $(UNICODE_BASE)$(SEP)c_850.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_850.o: $(UNICODE_BASE)$(SEP)c_850.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_850.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_850.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_852.o: $(UNICODE_BASE)$(SEP)c_852.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_852.o: $(UNICODE_BASE)$(SEP)c_852.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_852.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_852.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_855.o: $(UNICODE_BASE)$(SEP)c_855.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_855.o: $(UNICODE_BASE)$(SEP)c_855.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_855.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_855.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_856.o: $(UNICODE_BASE)$(SEP)c_856.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_856.o: $(UNICODE_BASE)$(SEP)c_856.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_856.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_856.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_857.o: $(UNICODE_BASE)$(SEP)c_857.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_857.o: $(UNICODE_BASE)$(SEP)c_857.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_857.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_857.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_860.o: $(UNICODE_BASE)$(SEP)c_860.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_860.o: $(UNICODE_BASE)$(SEP)c_860.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_860.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_860.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_861.o: $(UNICODE_BASE)$(SEP)c_861.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_861.o: $(UNICODE_BASE)$(SEP)c_861.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_861.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_861.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_862.o: $(UNICODE_BASE)$(SEP)c_862.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_862.o: $(UNICODE_BASE)$(SEP)c_862.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_862.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_862.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_863.o: $(UNICODE_BASE)$(SEP)c_863.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_863.o: $(UNICODE_BASE)$(SEP)c_863.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_863.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_863.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_864.o: $(UNICODE_BASE)$(SEP)c_864.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_864.o: $(UNICODE_BASE)$(SEP)c_864.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_864.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_864.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_865.o: $(UNICODE_BASE)$(SEP)c_865.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_865.o: $(UNICODE_BASE)$(SEP)c_865.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_865.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_865.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_866.o: $(UNICODE_BASE)$(SEP)c_866.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_866.o: $(UNICODE_BASE)$(SEP)c_866.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_866.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_866.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_869.o: $(UNICODE_BASE)$(SEP)c_869.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_869.o: $(UNICODE_BASE)$(SEP)c_869.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_869.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_869.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_874.o: $(UNICODE_BASE)$(SEP)c_874.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_874.o: $(UNICODE_BASE)$(SEP)c_874.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_874.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_874.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_875.o: $(UNICODE_BASE)$(SEP)c_875.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_875.o: $(UNICODE_BASE)$(SEP)c_875.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_875.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_875.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_878.o: $(UNICODE_BASE)$(SEP)c_878.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_878.o: $(UNICODE_BASE)$(SEP)c_878.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_878.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_878.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_932.o: $(UNICODE_BASE)$(SEP)c_932.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_932.o: $(UNICODE_BASE)$(SEP)c_932.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_932.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_932.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_936.o: $(UNICODE_BASE)$(SEP)c_936.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_936.o: $(UNICODE_BASE)$(SEP)c_936.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_936.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_936.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_949.o: $(UNICODE_BASE)$(SEP)c_949.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_949.o: $(UNICODE_BASE)$(SEP)c_949.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_949.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_949.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_950.o: $(UNICODE_BASE)$(SEP)c_950.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_950.o: $(UNICODE_BASE)$(SEP)c_950.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_950.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_950.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1006.o: $(UNICODE_BASE)$(SEP)c_1006.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1006.o: $(UNICODE_BASE)$(SEP)c_1006.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1006.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1006.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1026.o: $(UNICODE_BASE)$(SEP)c_1026.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1026.o: $(UNICODE_BASE)$(SEP)c_1026.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1026.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1026.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1250.o: $(UNICODE_BASE)$(SEP)c_1250.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1250.o: $(UNICODE_BASE)$(SEP)c_1250.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1250.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1250.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1251.o: $(UNICODE_BASE)$(SEP)c_1251.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1251.o: $(UNICODE_BASE)$(SEP)c_1251.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1251.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1251.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1252.o: $(UNICODE_BASE)$(SEP)c_1252.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1252.o: $(UNICODE_BASE)$(SEP)c_1252.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1252.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1252.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1253.o: $(UNICODE_BASE)$(SEP)c_1253.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1253.o: $(UNICODE_BASE)$(SEP)c_1253.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1253.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1253.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1254.o: $(UNICODE_BASE)$(SEP)c_1254.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1254.o: $(UNICODE_BASE)$(SEP)c_1254.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1254.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1254.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1255.o: $(UNICODE_BASE)$(SEP)c_1255.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1255.o: $(UNICODE_BASE)$(SEP)c_1255.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1255.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1255.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1256.o: $(UNICODE_BASE)$(SEP)c_1256.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1256.o: $(UNICODE_BASE)$(SEP)c_1256.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1256.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1256.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1257.o: $(UNICODE_BASE)$(SEP)c_1257.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1257.o: $(UNICODE_BASE)$(SEP)c_1257.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1257.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1257.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1258.o: $(UNICODE_BASE)$(SEP)c_1258.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_1258.o: $(UNICODE_BASE)$(SEP)c_1258.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1258.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1258.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10000.o: $(UNICODE_BASE)$(SEP)c_10000.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_10000.o: $(UNICODE_BASE)$(SEP)c_10000.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10000.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10000.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10006.o: $(UNICODE_BASE)$(SEP)c_10006.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_10006.o: $(UNICODE_BASE)$(SEP)c_10006.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10006.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10006.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10007.o: $(UNICODE_BASE)$(SEP)c_10007.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_10007.o: $(UNICODE_BASE)$(SEP)c_10007.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10007.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10007.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10029.o: $(UNICODE_BASE)$(SEP)c_10029.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_10029.o: $(UNICODE_BASE)$(SEP)c_10029.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10029.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10029.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10079.o: $(UNICODE_BASE)$(SEP)c_10079.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_10079.o: $(UNICODE_BASE)$(SEP)c_10079.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10079.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10079.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10081.o: $(UNICODE_BASE)$(SEP)c_10081.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_10081.o: $(UNICODE_BASE)$(SEP)c_10081.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10081.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10081.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20866.o: $(UNICODE_BASE)$(SEP)c_20866.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_20866.o: $(UNICODE_BASE)$(SEP)c_20866.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_20866.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20866.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20932.o: $(UNICODE_BASE)$(SEP)c_20932.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_20932.o: $(UNICODE_BASE)$(SEP)c_20932.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_20932.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20932.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_21866.o: $(UNICODE_BASE)$(SEP)c_21866.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_21866.o: $(UNICODE_BASE)$(SEP)c_21866.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_21866.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_21866.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28591.o: $(UNICODE_BASE)$(SEP)c_28591.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_28591.o: $(UNICODE_BASE)$(SEP)c_28591.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28591.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28591.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28592.o: $(UNICODE_BASE)$(SEP)c_28592.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_28592.o: $(UNICODE_BASE)$(SEP)c_28592.c $(UNICODE_BASE_DIR_EXISTS) $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28592.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28592.o + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28593.o: $(UNICODE_BASE)$(SEP)c_28593.c $(UNICODE_BASE_DIR) +$(UNICODE_BASE_DIR)$(SEP)c_28593.o: $(UNICODE_BASE)$(SEP)c_28593.c $(UNICODE_BASE_DIR_EXISTS) [truncated at 1000 lines; 476 more skipped]

19 years, 6 months

[jimtabor] 14086: eol-style native

by jimtabor＠svn.reactos.com

eol-style native Modified: trunk/reactos/drivers/dd/serial/cleanup.c Modified: trunk/reactos/drivers/dd/serial/close.c Modified: trunk/reactos/drivers/dd/serial/create.c Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/info.c Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/power.c Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/cleanup.c --- trunk/reactos/drivers/dd/serial/cleanup.c 2005-03-14 23:44:13 UTC (rev 14085) +++ trunk/reactos/drivers/dd/serial/cleanup.c 2005-03-15 00:23:19 UTC (rev 14086) @@ -1,22 +1,22 @@ -/* $Id: - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/dd/serial/cleanup.c - * PURPOSE: Serial IRP_MJ_CLEANUP operations - * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) - */ - -#define NDEBUG -#include "serial.h" - -NTSTATUS STDCALL -SerialCleanup( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT("Serial: IRP_MJ_CLEANUP\n"); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; -} +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/cleanup.c + * PURPOSE: Serial IRP_MJ_CLEANUP operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS STDCALL +SerialCleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("Serial: IRP_MJ_CLEANUP\n"); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} Property changes on: trunk/reactos/drivers/dd/serial/cleanup.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/dd/serial/close.c --- trunk/reactos/drivers/dd/serial/close.c 2005-03-14 23:44:13 UTC (rev 14085) +++ trunk/reactos/drivers/dd/serial/close.c 2005-03-15 00:23:19 UTC (rev 14086) @@ -1,22 +1,22 @@ -/* $Id: - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/dd/serial/close.c - * PURPOSE: Serial IRP_MJ_CLOSE operations - * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) - */ - -#define NDEBUG -#include "serial.h" - -NTSTATUS STDCALL -SerialClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT("Serial: IRP_MJ_CLOSE\n"); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; -} +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/close.c + * PURPOSE: Serial IRP_MJ_CLOSE operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS STDCALL +SerialClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("Serial: IRP_MJ_CLOSE\n"); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} Property changes on: trunk/reactos/drivers/dd/serial/close.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/dd/serial/create.c --- trunk/reactos/drivers/dd/serial/create.c 2005-03-14 23:44:13 UTC (rev 14085) +++ trunk/reactos/drivers/dd/serial/create.c 2005-03-15 00:23:19 UTC (rev 14086) @@ -1,52 +1,52 @@ -/* $Id: - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/dd/serial/create.c - * PURPOSE: Serial IRP_MJ_CREATE operations - * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) - */ - -#define NDEBUG -#include "serial.h" - -NTSTATUS STDCALL -SerialCreate( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION Stack; - PFILE_OBJECT FileObject; - PSERIAL_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; - - DPRINT("Serial: IRP_MJ_CREATE\n"); - Stack = IoGetCurrentIrpStackLocation(Irp); - FileObject = Stack->FileObject; - DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (Stack->Parameters.Create.Options & FILE_DIRECTORY_FILE) - { - CHECKPOINT; - Status = STATUS_NOT_A_DIRECTORY; - goto ByeBye; - } - - if (FileObject->FileName.Length != 0 || - FileObject->RelatedFileObject != NULL) - { - CHECKPOINT; - Status = STATUS_ACCESS_DENIED; - goto ByeBye; - } - - DPRINT("Serial: open COM%lu: successfull\n", DeviceExtension->ComPort); - Status = STATUS_SUCCESS; - -ByeBye: - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; -} +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/create.c + * PURPOSE: Serial IRP_MJ_CREATE operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS STDCALL +SerialCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + PFILE_OBJECT FileObject; + PSERIAL_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DPRINT("Serial: IRP_MJ_CREATE\n"); + Stack = IoGetCurrentIrpStackLocation(Irp); + FileObject = Stack->FileObject; + DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (Stack->Parameters.Create.Options & FILE_DIRECTORY_FILE) + { + CHECKPOINT; + Status = STATUS_NOT_A_DIRECTORY; + goto ByeBye; + } + + if (FileObject->FileName.Length != 0 || + FileObject->RelatedFileObject != NULL) + { + CHECKPOINT; + Status = STATUS_ACCESS_DENIED; + goto ByeBye; + } + + DPRINT("Serial: open COM%lu: successfull\n", DeviceExtension->ComPort); + Status = STATUS_SUCCESS; + +ByeBye: + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} Property changes on: trunk/reactos/drivers/dd/serial/create.c ___________________________________________________________________ Name: cleanup.c + close.c Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-14 23:44:13 UTC (rev 14085) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-15 00:23:19 UTC (rev 14086) @@ -1,551 +1,551 @@ -/* $Id: - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/dd/serial/devctrl.c - * PURPOSE: Serial IRP_MJ_DEVICE_CONTROL operations - * - * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) - */ -/* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ - -#define NDEBUG -#include "serial.h" - -NTSTATUS STDCALL -SerialSetBaudRate( - IN PSERIAL_DEVICE_EXTENSION DeviceExtension, - IN ULONG NewBaudRate) -{ - USHORT divisor; - PUCHAR ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; - NTSTATUS Status = STATUS_SUCCESS; - - if (NewBaudRate & SERIAL_BAUD_USER) - { - divisor = (USHORT)(BAUD_CLOCK / (CLOCKS_PER_BIT * (NewBaudRate & ~SERIAL_BAUD_USER))); - } - else - { - switch (NewBaudRate) - { - case SERIAL_BAUD_075: divisor = 0x600; break; - case SERIAL_BAUD_110: divisor = 0x400; break; - case SERIAL_BAUD_134_5: divisor = 0x360; break; - case SERIAL_BAUD_150: divisor = 0x300; break; - case SERIAL_BAUD_300: divisor = 0x180; break; - case SERIAL_BAUD_600: divisor = 0xc0; break; - case SERIAL_BAUD_1200: divisor = 0x60; break; - case SERIAL_BAUD_1800: divisor = 0x40; break; - case SERIAL_BAUD_2400: divisor = 0x30; break; - case SERIAL_BAUD_4800: divisor = 0x18; break; - case SERIAL_BAUD_7200: divisor = 0x10; break; - case SERIAL_BAUD_9600: divisor = 0xc; break; - case SERIAL_BAUD_14400: divisor = 0x8; break; - case SERIAL_BAUD_38400: divisor = 0x3; break; - case SERIAL_BAUD_57600: divisor = 0x2; break; - case SERIAL_BAUD_115200: divisor = 0x1; break; - case SERIAL_BAUD_56K: divisor = 0x2; break; - case SERIAL_BAUD_128K: divisor = 0x1; break; - default: Status = STATUS_INVALID_PARAMETER; - } - } - - if (NT_SUCCESS(Status)) - { - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); - if (NT_SUCCESS(Status)) - { - UCHAR Lcr; - DPRINT("Serial: SerialSetBaudRate(COM%lu, %lu Bauds)\n", DeviceExtension->ComPort, BAUD_CLOCK / (CLOCKS_PER_BIT * divisor)); - /* FIXME: update DeviceExtension->LowerDevice when modifying LCR? */ - /* Set Bit 7 of LCR to expose baud registers */ - Lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)); - Lcr |= SR_LCR_DLAB; - WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); - /* Write the baud rate */ - WRITE_PORT_UCHAR(SER_DLL(ComPortBase), divisor & 0xff); - WRITE_PORT_UCHAR(SER_DLM(ComPortBase), divisor >> 8); - /* Switch back to normal registers */ - Lcr ^= SR_LCR_DLAB; - WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); - - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); - } - } - - if (NT_SUCCESS(Status)) - DeviceExtension->BaudRate = NewBaudRate; - return Status; -} - -NTSTATUS STDCALL -SerialSetLineControl( - IN PSERIAL_DEVICE_EXTENSION DeviceExtension, - IN PSERIAL_LINE_CONTROL NewSettings) -{ - UCHAR Lcr = 0; - NTSTATUS Status; - - DPRINT("Serial: SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", - DeviceExtension->ComPort, NewSettings->StopBits, NewSettings->Parity, NewSettings->WordLength); - - /* Verify parameters */ - switch (NewSettings->WordLength) - { - case 5: Lcr |= SR_LCR_CS5; break; - case 6: Lcr |= SR_LCR_CS6; break; - case 7: Lcr |= SR_LCR_CS7; break; - case 8: Lcr |= SR_LCR_CS8; break; - default: return STATUS_INVALID_PARAMETER; - } - - if (NewSettings->WordLength < 5 || NewSettings->WordLength > 8) - return STATUS_INVALID_PARAMETER; - - switch (NewSettings->Parity) - { - case NO_PARITY: Lcr |= SR_LCR_PNO; break; - case ODD_PARITY: Lcr |= SR_LCR_POD; break; - case EVEN_PARITY: Lcr |= SR_LCR_PEV; break; - case MARK_PARITY: Lcr |= SR_LCR_PMK; break; - case SPACE_PARITY: Lcr |= SR_LCR_PSP; break; - default: return STATUS_INVALID_PARAMETER; - } - - switch (NewSettings->StopBits) - { - case STOP_BIT_1: - Lcr |= SR_LCR_ST1; - break; - case STOP_BITS_1_5: - if (NewSettings->WordLength != 5) - return STATUS_INVALID_PARAMETER; - Lcr |= SR_LCR_ST2; - break; - case STOP_BITS_2: - if (NewSettings->WordLength < 6 || NewSettings->WordLength > 8) - return STATUS_INVALID_PARAMETER; - Lcr |= SR_LCR_ST2; - break; - default: - return STATUS_INVALID_PARAMETER; - } - - /* Update current parameters */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); - if (!NT_SUCCESS(Status)) - return Status; - WRITE_PORT_UCHAR(SER_LCR((PUCHAR)DeviceExtension->BaseAddress), Lcr); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); - - if (NT_SUCCESS(Status)) - DeviceExtension->SerialLineControl = *NewSettings; - - return Status; -} - -NTSTATUS STDCALL -SerialDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION Stack; - PSERIAL_DEVICE_EXTENSION DeviceExtension; - ULONG LengthIn, LengthOut; - ULONG Information = 0; - PUCHAR Buffer; - PUCHAR ComPortBase; - NTSTATUS Status; - - DPRINT("Serial: IRP_MJ_DEVICE_CONTROL dispatch\n"); - - /* FIXME: pend operation if possible */ - - Stack = IoGetCurrentIrpStackLocation(Irp); - LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; - LengthOut = Stack->Parameters.DeviceIoControl.OutputBufferLength; - Buffer = Irp->AssociatedIrp.SystemBuffer; - DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; - - /* FIXME: need to probe buffers */ - /* FIXME: see http://www.osronline.com/ddkx/serial/serref_61bm.htm */ - switch (Stack->Parameters.DeviceIoControl.IoControlCode) - { - case IOCTL_SERIAL_CLEAR_STATS: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_CLEAR_STATS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_CLR_DTR: - { - DPRINT("Serial: IOCTL_SERIAL_CLR_DTR\n"); - /* FIXME: If the handshake flow control of the device is configured to - * automatically use DTR, return STATUS_INVALID_PARAMETER */ - DeviceExtension->MCR &= ~SR_MCR_DTR; - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - Status = STATUS_SUCCESS; - break; - } - case IOCTL_SERIAL_CLR_RTS: - { - DPRINT("Serial: IOCTL_SERIAL_CLR_RTS\n"); - /* FIXME: If the handshake flow control of the device is configured to - * automatically use RTS, return STATUS_INVALID_PARAMETER */ - DeviceExtension->MCR &= ~SR_MCR_RTS; - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - Status = STATUS_SUCCESS; - break; - } - case IOCTL_SERIAL_CONFIG_SIZE: - { - /* Obsolete on Microsoft Windows 2000+ */ - PULONG pConfigSize; - DPRINT("Serial: IOCTL_SERIAL_CONFIG_SIZE\n"); - if (LengthOut != sizeof(ULONG) || Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - pConfigSize = (PULONG)Buffer; - *pConfigSize = 0; - Status = STATUS_SUCCESS; - } - break; - } - case IOCTL_SERIAL_GET_BAUD_RATE: - { - DPRINT("Serial: IOCTL_SERIAL_GET_BAUD_RATE\n"); - if (LengthOut < sizeof(SERIAL_BAUD_RATE)) - Status = STATUS_BUFFER_TOO_SMALL; - else if (Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - ((PSERIAL_BAUD_RATE)Buffer)->BaudRate = DeviceExtension->BaudRate; - Information = sizeof(SERIAL_BAUD_RATE); - Status = STATUS_SUCCESS; - } - } - case IOCTL_SERIAL_GET_CHARS: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_CHARS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_GET_COMMSTATUS: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_COMMSTATUS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_GET_DTRRTS: - { - PULONG pDtrRts; - DPRINT("Serial: IOCTL_SERIAL_GET_DTRRTS\n"); - if (LengthOut != sizeof(ULONG) || Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - pDtrRts = (PULONG)Buffer; - *pDtrRts = 0; - if (DeviceExtension->MCR & SR_MCR_DTR) - *pDtrRts |= SERIAL_DTR_STATE; - if (DeviceExtension->MCR & SR_MCR_RTS) - *pDtrRts |= SERIAL_RTS_STATE; - Status = STATUS_SUCCESS; - } - break; - } - case IOCTL_SERIAL_GET_HANDFLOW: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_HANDFLOW not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_GET_LINE_CONTROL: - { - DPRINT("Serial: IOCTL_SERIAL_GET_LINE_CONTROL\n"); - if (LengthOut < sizeof(SERIAL_LINE_CONTROL)) - Status = STATUS_BUFFER_TOO_SMALL; - else if (Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - *((PSERIAL_LINE_CONTROL)Buffer) = DeviceExtension->SerialLineControl; - Information = sizeof(SERIAL_LINE_CONTROL); - Status = STATUS_SUCCESS; - } - break; - } - case IOCTL_SERIAL_GET_MODEM_CONTROL: - { - PULONG pMCR; - DPRINT("Serial: IOCTL_SERIAL_GET_MODEM_CONTROL\n"); - if (LengthOut != sizeof(ULONG) || Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - pMCR = (PULONG)Buffer; - *pMCR = DeviceExtension->MCR; - Status = STATUS_SUCCESS; - } - break; - } - case IOCTL_SERIAL_GET_MODEMSTATUS: - { - PULONG pMSR; - DPRINT("Serial: IOCTL_SERIAL_GET_MODEMSTATUS\n"); - if (LengthOut != sizeof(ULONG) || Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - pMSR = (PULONG)Buffer; - *pMSR = DeviceExtension->MSR; - Status = STATUS_SUCCESS; - } - break; - } - case IOCTL_SERIAL_GET_PROPERTIES: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_PROPERTIES not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_GET_STATS: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_STATS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_GET_TIMEOUTS: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_TIMEOUTS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_GET_WAIT_MASK: - { - PULONG pWaitMask; - DPRINT("Serial: IOCTL_SERIAL_GET_WAIT_MASK\n"); - if (LengthOut != sizeof(ULONG) || Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - pWaitMask = (PULONG)Buffer; - *pWaitMask = DeviceExtension->WaitMask; - Status = STATUS_SUCCESS; - } - break; - } - case IOCTL_SERIAL_IMMEDIATE_CHAR: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_IMMEDIATE_CHAR not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_LSRMST_INSERT: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_LSRMST_INSERT not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_PURGE: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_PURGE not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_RESET_DEVICE: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_RESET_DEVICE not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_SET_BAUD_RATE: - { - PULONG pNewBaudRate; - DPRINT("Serial: IOCTL_SERIAL_SET_BAUD_RATE\n"); - if (LengthIn != sizeof(ULONG) || Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - pNewBaudRate = (PULONG)Buffer; - Status = SerialSetBaudRate(DeviceExtension, *pNewBaudRate); - } - break; - } - case IOCTL_SERIAL_SET_BREAK_OFF: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_BREAK_OFF not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_SET_BREAK_ON: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_BREAK_ON not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_SET_CHARS: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_CHARS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_SET_DTR: - { - /* FIXME: If the handshake flow control of the device is configured to - * automatically use DTR, return STATUS_INVALID_PARAMETER */ - DPRINT("Serial: IOCTL_SERIAL_SET_DTR\n"); - if (!(DeviceExtension->MCR & SR_MCR_DTR)) - { - DeviceExtension->MCR |= SR_MCR_DTR; - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - } - Status = STATUS_SUCCESS; - break; - } - case IOCTL_SERIAL_SET_FIFO_CONTROL: - { - DPRINT("Serial: IOCTL_SERIAL_SET_FIFO_CONTROL\n"); - if (LengthIn != sizeof(ULONG) || Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - WRITE_PORT_UCHAR(SER_FCR(ComPortBase), (UCHAR)((*(PULONG)Buffer) & 0xff)); - Status = STATUS_SUCCESS; - } - break; - } - case IOCTL_SERIAL_SET_HANDFLOW: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_HANDFLOW not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_SET_LINE_CONTROL: - { - DPRINT("Serial: IOCTL_SERIAL_SET_LINE_CONTROL\n"); - if (LengthIn < sizeof(SERIAL_LINE_CONTROL)) - Status = STATUS_BUFFER_TOO_SMALL; - else if (Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - Status = SerialSetLineControl(DeviceExtension, (PSERIAL_LINE_CONTROL)Buffer); - break; - } - case IOCTL_SERIAL_SET_MODEM_CONTROL: - { - PULONG pMCR; - DPRINT("Serial: IOCTL_SERIAL_SET_MODEM_CONTROL\n"); - if (LengthIn != sizeof(ULONG) || Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - pMCR = (PULONG)Buffer; - DeviceExtension->MCR = (UCHAR)(*pMCR & 0xff); - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - Status = STATUS_SUCCESS; - } - break; - } - case IOCTL_SERIAL_SET_QUEUE_SIZE: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_QUEUE_SIZE not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_SET_RTS: - { - /* FIXME: If the handshake flow control of the device is configured to - * automatically use DTR, return STATUS_INVALID_PARAMETER */ - DPRINT("Serial: IOCTL_SERIAL_SET_RTS\n"); - if (!(DeviceExtension->MCR & SR_MCR_RTS)) - { - DeviceExtension->MCR |= SR_MCR_RTS; - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - } - Status = STATUS_SUCCESS; - break; - } - case IOCTL_SERIAL_SET_TIMEOUTS: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_TIMEOUTS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_SET_WAIT_MASK: - { - PULONG pWaitMask; - DPRINT("Serial: IOCTL_SERIAL_SET_WAIT_MASK\n"); - if (LengthIn != sizeof(ULONG) || Buffer == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - pWaitMask = (PULONG)Buffer; - DeviceExtension->WaitMask = *pWaitMask; - Status = STATUS_SUCCESS; - } - break; - } - case IOCTL_SERIAL_SET_XOFF: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_XOFF not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_SET_XON: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_XON not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_WAIT_ON_MASK: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_WAIT_ON_MASK not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_SERIAL_XOFF_COUNTER: - { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_XOFF_COUNTER not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - default: - { - /* Pass Irp to lower driver */ - DPRINT("Serial: Unknown IOCTL code 0x%x\n", Stack->Parameters.DeviceIoControl.IoControlCode); - IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(DeviceExtension->LowerDevice, Irp); - } - } - - Irp->IoStatus.Information = Information; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; -} +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/devctrl.c + * PURPOSE: Serial IRP_MJ_DEVICE_CONTROL operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ +/* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS STDCALL +SerialSetBaudRate( + IN PSERIAL_DEVICE_EXTENSION DeviceExtension, + IN ULONG NewBaudRate) +{ + USHORT divisor; + PUCHAR ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + NTSTATUS Status = STATUS_SUCCESS; + + if (NewBaudRate & SERIAL_BAUD_USER) + { + divisor = (USHORT)(BAUD_CLOCK / (CLOCKS_PER_BIT * (NewBaudRate & ~SERIAL_BAUD_USER))); + } + else + { + switch (NewBaudRate) + { + case SERIAL_BAUD_075: divisor = 0x600; break; + case SERIAL_BAUD_110: divisor = 0x400; break; + case SERIAL_BAUD_134_5: divisor = 0x360; break; + case SERIAL_BAUD_150: divisor = 0x300; break; + case SERIAL_BAUD_300: divisor = 0x180; break; + case SERIAL_BAUD_600: divisor = 0xc0; break; + case SERIAL_BAUD_1200: divisor = 0x60; break; + case SERIAL_BAUD_1800: divisor = 0x40; break; + case SERIAL_BAUD_2400: divisor = 0x30; break; + case SERIAL_BAUD_4800: divisor = 0x18; break; + case SERIAL_BAUD_7200: divisor = 0x10; break; + case SERIAL_BAUD_9600: divisor = 0xc; break; + case SERIAL_BAUD_14400: divisor = 0x8; break; + case SERIAL_BAUD_38400: divisor = 0x3; break; + case SERIAL_BAUD_57600: divisor = 0x2; break; + case SERIAL_BAUD_115200: divisor = 0x1; break; + case SERIAL_BAUD_56K: divisor = 0x2; break; + case SERIAL_BAUD_128K: divisor = 0x1; break; + default: Status = STATUS_INVALID_PARAMETER; + } + } + + if (NT_SUCCESS(Status)) + { + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + UCHAR Lcr; + DPRINT("Serial: SerialSetBaudRate(COM%lu, %lu Bauds)\n", DeviceExtension->ComPort, BAUD_CLOCK / (CLOCKS_PER_BIT * divisor)); + /* FIXME: update DeviceExtension->LowerDevice when modifying LCR? */ + /* Set Bit 7 of LCR to expose baud registers */ + Lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)); + Lcr |= SR_LCR_DLAB; + WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); + /* Write the baud rate */ + WRITE_PORT_UCHAR(SER_DLL(ComPortBase), divisor & 0xff); + WRITE_PORT_UCHAR(SER_DLM(ComPortBase), divisor >> 8); + /* Switch back to normal registers */ + Lcr ^= SR_LCR_DLAB; + WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); + + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } + } + + if (NT_SUCCESS(Status)) + DeviceExtension->BaudRate = NewBaudRate; + return Status; +} + +NTSTATUS STDCALL +SerialSetLineControl( + IN PSERIAL_DEVICE_EXTENSION DeviceExtension, + IN PSERIAL_LINE_CONTROL NewSettings) +{ + UCHAR Lcr = 0; + NTSTATUS Status; + + DPRINT("Serial: SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", + DeviceExtension->ComPort, NewSettings->StopBits, NewSettings->Parity, NewSettings->WordLength); + + /* Verify parameters */ + switch (NewSettings->WordLength) + { + case 5: Lcr |= SR_LCR_CS5; break; + case 6: Lcr |= SR_LCR_CS6; break; + case 7: Lcr |= SR_LCR_CS7; break; + case 8: Lcr |= SR_LCR_CS8; break; + default: return STATUS_INVALID_PARAMETER; + } + + if (NewSettings->WordLength < 5 || NewSettings->WordLength > 8) + return STATUS_INVALID_PARAMETER; + + switch (NewSettings->Parity) + { + case NO_PARITY: Lcr |= SR_LCR_PNO; break; + case ODD_PARITY: Lcr |= SR_LCR_POD; break; + case EVEN_PARITY: Lcr |= SR_LCR_PEV; break; + case MARK_PARITY: Lcr |= SR_LCR_PMK; break; + case SPACE_PARITY: Lcr |= SR_LCR_PSP; break; + default: return STATUS_INVALID_PARAMETER; + } + + switch (NewSettings->StopBits) + { + case STOP_BIT_1: + Lcr |= SR_LCR_ST1; + break; + case STOP_BITS_1_5: + if (NewSettings->WordLength != 5) + return STATUS_INVALID_PARAMETER; + Lcr |= SR_LCR_ST2; + break; + case STOP_BITS_2: + if (NewSettings->WordLength < 6 || NewSettings->WordLength > 8) + return STATUS_INVALID_PARAMETER; + Lcr |= SR_LCR_ST2; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + /* Update current parameters */ + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (!NT_SUCCESS(Status)) + return Status; + WRITE_PORT_UCHAR(SER_LCR((PUCHAR)DeviceExtension->BaseAddress), Lcr); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + + if (NT_SUCCESS(Status)) + DeviceExtension->SerialLineControl = *NewSettings; + + return Status; +} + +NTSTATUS STDCALL +SerialDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + PSERIAL_DEVICE_EXTENSION DeviceExtension; + ULONG LengthIn, LengthOut; + ULONG Information = 0; + PUCHAR Buffer; + PUCHAR ComPortBase; + NTSTATUS Status; + + DPRINT("Serial: IRP_MJ_DEVICE_CONTROL dispatch\n"); + + /* FIXME: pend operation if possible */ + + Stack = IoGetCurrentIrpStackLocation(Irp); + LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; + LengthOut = Stack->Parameters.DeviceIoControl.OutputBufferLength; + Buffer = Irp->AssociatedIrp.SystemBuffer; + DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + + /* FIXME: need to probe buffers */ + /* FIXME: see http://www.osronline.com/ddkx/serial/serref_61bm.htm */ + switch (Stack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_SERIAL_CLEAR_STATS: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_CLEAR_STATS not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_CLR_DTR: + { + DPRINT("Serial: IOCTL_SERIAL_CLR_DTR\n"); + /* FIXME: If the handshake flow control of the device is configured to + * automatically use DTR, return STATUS_INVALID_PARAMETER */ + DeviceExtension->MCR &= ~SR_MCR_DTR; + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + Status = STATUS_SUCCESS; + break; + } + case IOCTL_SERIAL_CLR_RTS: + { + DPRINT("Serial: IOCTL_SERIAL_CLR_RTS\n"); + /* FIXME: If the handshake flow control of the device is configured to + * automatically use RTS, return STATUS_INVALID_PARAMETER */ + DeviceExtension->MCR &= ~SR_MCR_RTS; + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + Status = STATUS_SUCCESS; + break; + } + case IOCTL_SERIAL_CONFIG_SIZE: + { + /* Obsolete on Microsoft Windows 2000+ */ + PULONG pConfigSize; + DPRINT("Serial: IOCTL_SERIAL_CONFIG_SIZE\n"); + if (LengthOut != sizeof(ULONG) || Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pConfigSize = (PULONG)Buffer; + *pConfigSize = 0; + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_SERIAL_GET_BAUD_RATE: + { + DPRINT("Serial: IOCTL_SERIAL_GET_BAUD_RATE\n"); + if (LengthOut < sizeof(SERIAL_BAUD_RATE)) + Status = STATUS_BUFFER_TOO_SMALL; + else if (Buffer == NULL) [truncated at 1000 lines; 2116 more skipped]

19 years, 6 months

← Newer
1
...
28
29
30
31
32
33
34
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005