Ros-diffs April 2006

ros-diffs@reactos.org

14 participants
324 discussions

[gedmurphy] 21607: [AUDIT] finger BSD derived code

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sun Apr 16 16:30:40 2006 New Revision: 21607 URL: http://svn.reactos.ru/svn/reactos?rev=21607&view=rev Log: [AUDIT] finger BSD derived code Modified: trunk/reactos/base/applications/network/finger/err.c (props changed) trunk/reactos/base/applications/network/finger/err.h (props changed) trunk/reactos/base/applications/network/finger/finger.c (props changed) trunk/reactos/base/applications/network/finger/getopt.c (props changed) trunk/reactos/base/applications/network/finger/getopt.h (props changed) trunk/reactos/base/applications/network/finger/net.c (props changed) trunk/reactos/base/applications/network/finger/various.h (props changed) Propchange: trunk/reactos/base/applications/network/finger/err.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/finger/err.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/finger/finger.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/finger/getopt.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/finger/getopt.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/finger/net.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/finger/various.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 6 months

[gedmurphy] 21606: [AUDIT] whois BSD derived code

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sun Apr 16 16:28:10 2006 New Revision: 21606 URL: http://svn.reactos.ru/svn/reactos?rev=21606&view=rev Log: [AUDIT] whois BSD derived code Modified: trunk/reactos/base/applications/network/whois/whois.c (props changed) Propchange: trunk/reactos/base/applications/network/whois/whois.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 6 months

[gedmurphy] 21605: [AUDIT] ping modular code and obviously clean.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sun Apr 16 16:25:54 2006 New Revision: 21605 URL: http://svn.reactos.ru/svn/reactos?rev=21605&view=rev Log: [AUDIT] ping modular code and obviously clean. Modified: trunk/reactos/base/applications/network/ping/ping.c (props changed) Propchange: trunk/reactos/base/applications/network/ping/ping.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 6 months

[greatlrd] 21604: [AUDIT] clean from http://www.catch22.net shall not this be in vendoer drop ??

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Apr 16 14:40:43 2006 New Revision: 21604 URL: http://svn.reactos.ru/svn/reactos?rev=21604&view=rev Log: [AUDIT] clean from http://www.catch22.net shall not this be in vendoer drop ?? Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.h (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardcolor.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardcolor.h (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardcount.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardcount.h (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.h (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardstack.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardstack.h (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.h (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/dropzone.cpp (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/dropzone.h (props changed) trunk/reactos/base/applications/games/solitaire/cardlib/globals.h (props changed) Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardcolor.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardcolor.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardcount.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardcount.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardstack.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardstack.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/dropzone.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/dropzone.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/globals.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 6 months

[greatlrd] 21603: [AUDIT] clean : winemine icon/bmp from wine.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Apr 16 14:33:54 2006 New Revision: 21603 URL: http://svn.reactos.ru/svn/reactos?rev=21603&view=rev Log: [AUDIT] clean : winemine icon/bmp from wine. Modified: trunk/reactos/base/applications/games/winemine/De.rc (contents, props changed) trunk/reactos/base/applications/games/winemine/En.rc (contents, props changed) trunk/reactos/base/applications/games/winemine/rc/faces.bmp (props changed) trunk/reactos/base/applications/games/winemine/rc/leds.bmp (props changed) trunk/reactos/base/applications/games/winemine/rc/mines.bmp (props changed) trunk/reactos/base/applications/games/winemine/rc/winemine.ico (props changed) Modified: trunk/reactos/base/applications/games/winemine/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/games/win… ============================================================================== --- trunk/reactos/base/applications/games/winemine/De.rc (original) +++ trunk/reactos/base/applications/games/winemine/De.rc Sun Apr 16 14:33:54 2006 @@ -1,83 +1,83 @@ -#include "resource.h" - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -STRINGTABLE { - IDS_APPNAME, "WineMine" - -} - -MENU_WINEMINE MENU DISCARDABLE -{ - POPUP "&Optionen" { - MENUITEM "&Neu", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&Mark Question", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Anfänger", IDM_BEGINNER - MENUITEM "&Fortgeschrittene", IDM_ADVANCED - MENUITEM "&Experten", IDM_EXPERT - MENUITEM "&Benutzerdefiniert", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "Beenden", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Bestzeiten", IDM_TIMES - MENUITEM "&Über", IDM_ABOUT - } -} - -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Bestzeiten" -{ - GROUPBOX "Bestzeiten", IDNONE, 10, 10, 140, 45 - LTEXT "Anfänger", IDNONE, 20, 20, 40, 8 - LTEXT "Fortgeschrittene", IDNONE, 20, 30, 40, 8 - LTEXT "Experten", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 -} - -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Glückwunsch!" -{ - LTEXT "Bitte geben Sie ihren Namen ein", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 -} - -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Benutzerdefiniertes Spiel" -{ - LTEXT "Zeilen", IDNONE, 5, 5, 30, 10 - LTEXT "Spalten", IDNONE, 5, 35, 30, 10 - LTEXT "Minen", IDNONE, 5, 65, 30, 10 - EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Abbrechen", IDCANCEL, 40, 50, 50, 15 -} - -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "About" -{ - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 - LTEXT "unter der Wine Lizenz", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 -} +#include "resource.h" + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE { + IDS_APPNAME, "WineMine" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Optionen" { + MENUITEM "&Neu", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Mark Question", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Anfänger", IDM_BEGINNER + MENUITEM "&Fortgeschrittene", IDM_ADVANCED + MENUITEM "&Experten", IDM_EXPERT + MENUITEM "&Benutzerdefiniert", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "Beenden", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&Bestzeiten", IDM_TIMES + MENUITEM "&Über", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Bestzeiten" +{ + GROUPBOX "Bestzeiten", IDNONE, 10, 10, 140, 45 + LTEXT "Anfänger", IDNONE, 20, 20, 40, 8 + LTEXT "Fortgeschrittene", IDNONE, 20, 30, 40, 8 + LTEXT "Experten", IDNONE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Glückwunsch!" +{ + LTEXT "Bitte geben Sie ihren Namen ein", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Benutzerdefiniertes Spiel" +{ + LTEXT "Zeilen", IDNONE, 5, 5, 30, 10 + LTEXT "Spalten", IDNONE, 5, 35, 30, 10 + LTEXT "Minen", IDNONE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Abbrechen", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "About" +{ + LTEXT "Winemine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "unter der Wine Lizenz", IDNONE, 35, 35, 100, 10 + ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 +} Propchange: trunk/reactos/base/applications/games/winemine/De.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winemine/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/games/win… ============================================================================== --- trunk/reactos/base/applications/games/winemine/En.rc (original) +++ trunk/reactos/base/applications/games/winemine/En.rc Sun Apr 16 14:33:54 2006 @@ -1,83 +1,83 @@ -#include "resource.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -STRINGTABLE { - IDS_APPNAME, "WineMine" - -} - -MENU_WINEMINE MENU DISCARDABLE -{ - POPUP "&Options" { - MENUITEM "&New", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&Mark Question", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Beginner", IDM_BEGINNER - MENUITEM "&Advanced", IDM_ADVANCED - MENUITEM "&Expert", IDM_EXPERT - MENUITEM "&Custom", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Fastest Times", IDM_TIMES - MENUITEM "&About", IDM_ABOUT - } -} - -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Fastest Times" -{ - GROUPBOX "Fastest Times", IDNONE, 10, 10, 140, 45 - LTEXT "Beginner", IDNONE, 20, 20, 40, 8 - LTEXT "Advanced", IDNONE, 20, 30, 40, 8 - LTEXT "Expert", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 -} - -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Congratulations!" -{ - LTEXT "Please enter your name", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 -} - -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Custom Game" -{ - LTEXT "Rows", IDNONE, 5, 5, 30, 10 - LTEXT "Cols", IDNONE, 5, 35, 30, 10 - LTEXT "Mines", IDNONE, 5, 65, 30, 10 - EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 -} - -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "About" -{ - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 - LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 -} +#include "resource.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE { + IDS_APPNAME, "WineMine" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Options" { + MENUITEM "&New", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Mark Question", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Beginner", IDM_BEGINNER + MENUITEM "&Advanced", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "&Custom", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "E&xit", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&Fastest Times", IDM_TIMES + MENUITEM "&About", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Fastest Times" +{ + GROUPBOX "Fastest Times", IDNONE, 10, 10, 140, 45 + LTEXT "Beginner", IDNONE, 20, 20, 40, 8 + LTEXT "Advanced", IDNONE, 20, 30, 40, 8 + LTEXT "Expert", IDNONE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Congratulations!" +{ + LTEXT "Please enter your name", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Custom Game" +{ + LTEXT "Rows", IDNONE, 5, 5, 30, 10 + LTEXT "Cols", IDNONE, 5, 35, 30, 10 + LTEXT "Mines", IDNONE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "About" +{ + LTEXT "Winemine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 + ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 +} Propchange: trunk/reactos/base/applications/games/winemine/En.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/games/winemine/rc/faces.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/winemine/rc/leds.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/winemine/rc/mines.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/winemine/rc/winemine.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 6 months

[mbosma] 21602: Flat toolbar buttons for ibrowser

by mbosma＠svn.reactos.org

Author: mbosma Date: Sun Apr 16 14:24:11 2006 New Revision: 21602 URL: http://svn.reactos.ru/svn/reactos?rev=21602&view=rev Log: Flat toolbar buttons for ibrowser Modified: trunk/reactos/base/applications/ibrowser/mainframe.cpp Modified: trunk/reactos/base/applications/ibrowser/mainframe.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/ibrowser/… ============================================================================== --- trunk/reactos/base/applications/ibrowser/mainframe.cpp (original) +++ trunk/reactos/base/applications/ibrowser/mainframe.cpp Sun Apr 16 14:24:11 2006 @@ -89,7 +89,7 @@ #ifndef _NO_REBAR CCS_NOPARENTALIGN|CCS_NORESIZE| #endif - WS_CHILD|WS_VISIBLE, IDW_TOOLBAR, 2, g_hInstance, IDB_TOOLBAR, + WS_CHILD|WS_VISIBLE|TBSTYLE_FLAT, IDW_TOOLBAR, 2, g_hInstance, IDB_TOOLBAR, toolbarBtns, sizeof(toolbarBtns)/sizeof(TBBUTTON), 16, 15, 16, 15, sizeof(TBBUTTON));

18 years, 6 months

[gedmurphy] 21601: [AUDIT] ibrowser obviously clean, this is not a derivative of an MS product.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sun Apr 16 14:23:20 2006 New Revision: 21601 URL: http://svn.reactos.ru/svn/reactos?rev=21601&view=rev Log: [AUDIT] ibrowser obviously clean, this is not a derivative of an MS product. Modified: trunk/reactos/base/applications/ibrowser/expat-license.txt (props changed) trunk/reactos/base/applications/ibrowser/favorites.cpp (props changed) trunk/reactos/base/applications/ibrowser/favorites.h (props changed) trunk/reactos/base/applications/ibrowser/ibrowser.cpp (props changed) trunk/reactos/base/applications/ibrowser/ibrowser.h (props changed) trunk/reactos/base/applications/ibrowser/ibrowser_intres.h (props changed) trunk/reactos/base/applications/ibrowser/mainframe.cpp (props changed) trunk/reactos/base/applications/ibrowser/mainframe.h (props changed) trunk/reactos/base/applications/ibrowser/precomp.cpp (props changed) trunk/reactos/base/applications/ibrowser/precomp.h (props changed) trunk/reactos/base/applications/ibrowser/res/dot.ico (props changed) trunk/reactos/base/applications/ibrowser/res/dot_red.ico (props changed) trunk/reactos/base/applications/ibrowser/res/dot_trans.ico (props changed) trunk/reactos/base/applications/ibrowser/res/favorites.ico (props changed) trunk/reactos/base/applications/ibrowser/res/ibrowser.ico (props changed) trunk/reactos/base/applications/ibrowser/res/network.ico (props changed) trunk/reactos/base/applications/ibrowser/res/reactos.ico (props changed) trunk/reactos/base/applications/ibrowser/res/toolbar.bmp (props changed) trunk/reactos/base/applications/ibrowser/utility/comutil.h (props changed) trunk/reactos/base/applications/ibrowser/utility/utility.cpp (props changed) trunk/reactos/base/applications/ibrowser/utility/utility.h (props changed) trunk/reactos/base/applications/ibrowser/utility/window.cpp (props changed) trunk/reactos/base/applications/ibrowser/utility/window.h (props changed) trunk/reactos/base/applications/ibrowser/utility/xmlstorage.cpp (props changed) trunk/reactos/base/applications/ibrowser/utility/xmlstorage.h (props changed) trunk/reactos/base/applications/ibrowser/webchild.cpp (props changed) trunk/reactos/base/applications/ibrowser/webchild.h (props changed) Propchange: trunk/reactos/base/applications/ibrowser/expat-license.txt ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/favorites.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/favorites.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/ibrowser.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/ibrowser.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/ibrowser_intres.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/mainframe.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/mainframe.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/precomp.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/res/dot.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/res/dot_red.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/res/dot_trans.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/res/favorites.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/res/ibrowser.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/res/network.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/res/reactos.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/res/toolbar.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/utility/comutil.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/utility/utility.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/utility/utility.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/utility/window.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/utility/window.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/utility/xmlstorage.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/utility/xmlstorage.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/webchild.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/ibrowser/webchild.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 6 months

[gedmurphy] 21600: [AUDIT] Network tools Unlock code I am the author of. Code was produced using clean methods

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sun Apr 16 14:18:54 2006 New Revision: 21600 URL: http://svn.reactos.ru/svn/reactos?rev=21600&view=rev Log: [AUDIT] Network tools Unlock code I am the author of. Code was produced using clean methods Modified: trunk/reactos/base/applications/network/arp/arp.c (props changed) trunk/reactos/base/applications/network/ipconfig/ipconfig.c (props changed) trunk/reactos/base/applications/network/netstat/netstat.c (props changed) trunk/reactos/base/applications/network/tracert/tracert.c (props changed) trunk/reactos/base/applications/network/tracert/tracert.h (props changed) Propchange: trunk/reactos/base/applications/network/arp/arp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ipconfig/ipconfig.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/netstat/netstat.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/tracert/tracert.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/tracert/tracert.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 6 months

[hpoussin] 21599: kbdclass and mouclass: - Better synchronization of code between kbdclass and mouclass - Better cleanup in ClassAddDevice in case of error - Better support of legacy devices kbdclass only: - Send IOCTLs to lower device

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Apr 16 11:17:34 2006 New Revision: 21599 URL: http://svn.reactos.ru/svn/reactos?rev=21599&view=rev Log: kbdclass and mouclass: - Better synchronization of code between kbdclass and mouclass - Better cleanup in ClassAddDevice in case of error - Better support of legacy devices kbdclass only: - Send IOCTLs to lower device Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/input/mouclass/mouclass.h Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdc… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Sun Apr 16 11:17:34 2006 @@ -107,7 +107,6 @@ switch (IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode) { -#if 0 case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: case IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION: case IOCTL_KEYBOARD_QUERY_INDICATORS: @@ -146,10 +145,10 @@ } break; } -#endif default: DPRINT1("IRP_MJ_DEVICE_CONTROL / unknown I/O control code 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode); + ASSERT(FALSE); break; } @@ -536,8 +535,8 @@ IN PDEVICE_OBJECT Pdo) { PCLASS_DRIVER_EXTENSION DriverExtension; - PDEVICE_OBJECT Fdo; - PPORT_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT Fdo = NULL; + PPORT_DEVICE_EXTENSION DeviceExtension = NULL; NTSTATUS Status; DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); @@ -561,7 +560,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); - return Status; + goto cleanup; } DeviceExtension = (PPORT_DEVICE_EXTENSION)Fdo->DeviceExtension; @@ -573,8 +572,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); - IoDeleteDevice(Fdo); - return Status; + goto cleanup; } if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) Fdo->Flags |= DO_POWER_PAGABLE; @@ -582,16 +580,25 @@ Fdo->Flags |= DO_BUFFERED_IO; if (DriverExtension->ConnectMultiplePorts) - Status = ConnectPortDriver(Fdo, DriverExtension->MainClassDeviceObject); + DeviceExtension->ClassDO = DriverExtension->MainClassDeviceObject; else - Status = ConnectPortDriver(Fdo, Fdo); + { + /* We need a new class device object for this Fdo */ + Status = CreateClassDeviceObject( + DriverObject, + &DeviceExtension->ClassDO); + if (!NT_SUCCESS(Status)) + { + DPRINT("CreateClassDeviceObject() failed with status 0x%08lx\n", Status); + goto cleanup; + } + } + Status = ConnectPortDriver(Fdo, DeviceExtension->ClassDO); if (!NT_SUCCESS(Status)) { DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); - IoDetachDevice(DeviceExtension->LowerDevice); ObDereferenceObject(Fdo); - IoDeleteDevice(Fdo); - return Status; + goto cleanup; } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -601,13 +608,35 @@ &GUID_DEVINTERFACE_KEYBOARD, NULL, &DeviceExtension->InterfaceName); - if (!NT_SUCCESS(Status)) + if (Status == STATUS_INVALID_PARAMETER_1) + { + /* The Pdo was a strange one ; maybe it is a legacy device. + * Ignore the error. */ + return STATUS_SUCCESS; + } + else if (!NT_SUCCESS(Status)) { DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); - return Status; + goto cleanup; } return STATUS_SUCCESS; + +cleanup: + if (DeviceExtension) + { + if (DeviceExtension->LowerDevice) + IoDetachDevice(DeviceExtension->LowerDevice); + if (DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) + { + PCLASS_DEVICE_EXTENSION ClassDeviceExtension; + ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; + ExFreePool(ClassDeviceExtension->PortData); + } + } + if (Fdo) + IoDeleteDevice(Fdo); + return Status; } static VOID NTAPI @@ -748,34 +777,13 @@ DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", Status); continue; } - - /* Connect the port device object */ - if (DriverExtension->ConnectMultiplePorts) - { - Status = ConnectPortDriver(PortDeviceObject, DriverExtension->MainClassDeviceObject); - if (!NT_SUCCESS(Status)) - { - /* FIXME: Log the error */ - DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); - } - } - else - { - PDEVICE_OBJECT ClassDO; - Status = CreateClassDeviceObject(DriverObject, &ClassDO); - if (!NT_SUCCESS(Status)) - { - /* FIXME: Log the error */ - DPRINT("CreatePointerClassDeviceObject() failed with status 0x%08lx\n", Status); - continue; - } - Status = ConnectPortDriver(PortDeviceObject, ClassDO); - if (!NT_SUCCESS(Status)) - { - /* FIXME: Log the error */ - DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); - IoDeleteDevice(ClassDO); - } + DPRINT("Legacy driver found: %wZ\n", &PortDeviceObject->DriverObject->DriverName); + + Status = ClassAddDevice(DriverObject, PortDeviceObject); + if (!NT_SUCCESS(Status)) + { + /* FIXME: Log the error */ + DPRINT("ClassAddDevice() failed with status 0x%08lx\n", Status); } } if (Status == STATUS_NO_MORE_ENTRIES) Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdc… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h Sun Apr 16 11:17:34 2006 @@ -39,6 +39,7 @@ PDEVICE_OBJECT DeviceObject; PORT_DEVICE_STATE PnpState; PDEVICE_OBJECT LowerDevice; + PDEVICE_OBJECT ClassDO; UNICODE_STRING InterfaceName; } PORT_DEVICE_EXTENSION, *PPORT_DEVICE_EXTENSION; Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/mouclass/mouc… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Sun Apr 16 11:17:34 2006 @@ -125,6 +125,7 @@ default: DPRINT1("IRP_MJ_DEVICE_CONTROL / unknown I/O control code 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode); + ASSERT(FALSE); break; } @@ -506,8 +507,8 @@ IN PDEVICE_OBJECT Pdo) { PCLASS_DRIVER_EXTENSION DriverExtension; - PDEVICE_OBJECT Fdo; - PPORT_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT Fdo = NULL; + PPORT_DEVICE_EXTENSION DeviceExtension = NULL; NTSTATUS Status; DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); @@ -531,7 +532,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); - return Status; + goto cleanup; } DeviceExtension = (PPORT_DEVICE_EXTENSION)Fdo->DeviceExtension; @@ -543,8 +544,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); - IoDeleteDevice(Fdo); - return Status; + goto cleanup; } if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) Fdo->Flags |= DO_POWER_PAGABLE; @@ -552,16 +552,25 @@ Fdo->Flags |= DO_BUFFERED_IO; if (DriverExtension->ConnectMultiplePorts) - Status = ConnectPortDriver(Fdo, DriverExtension->MainClassDeviceObject); + DeviceExtension->ClassDO = DriverExtension->MainClassDeviceObject; else - Status = ConnectPortDriver(Fdo, Fdo); + { + /* We need a new class device object for this Fdo */ + Status = CreateClassDeviceObject( + DriverObject, + &DeviceExtension->ClassDO); + if (!NT_SUCCESS(Status)) + { + DPRINT("CreateClassDeviceObject() failed with status 0x%08lx\n", Status); + goto cleanup; + } + } + Status = ConnectPortDriver(Fdo, DeviceExtension->ClassDO); if (!NT_SUCCESS(Status)) { DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); - IoDetachDevice(DeviceExtension->LowerDevice); ObDereferenceObject(Fdo); - IoDeleteDevice(Fdo); - return Status; + goto cleanup; } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -571,13 +580,35 @@ &GUID_DEVINTERFACE_MOUSE, NULL, &DeviceExtension->InterfaceName); - if (!NT_SUCCESS(Status)) + if (Status == STATUS_INVALID_PARAMETER_1) + { + /* The Pdo was a strange one ; maybe it is a legacy device. + * Ignore the error. */ + return STATUS_SUCCESS; + } + else if (!NT_SUCCESS(Status)) { DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); - return Status; + goto cleanup; } return STATUS_SUCCESS; + +cleanup: + if (DeviceExtension) + { + if (DeviceExtension->LowerDevice) + IoDetachDevice(DeviceExtension->LowerDevice); + if (DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) + { + PCLASS_DEVICE_EXTENSION ClassDeviceExtension; + ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; + ExFreePool(ClassDeviceExtension->PortData); + } + } + if (Fdo) + IoDeleteDevice(Fdo); + return Status; } static VOID NTAPI @@ -718,6 +749,7 @@ DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", Status); continue; } + DPRINT("Legacy driver found: %wZ\n", &PortDeviceObject->DriverObject->DriverName); Status = ClassAddDevice(DriverObject, PortDeviceObject); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/mouclass/mouc… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.h (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.h Sun Apr 16 11:17:34 2006 @@ -39,6 +39,7 @@ PDEVICE_OBJECT DeviceObject; PORT_DEVICE_STATE PnpState; PDEVICE_OBJECT LowerDevice; + PDEVICE_OBJECT ClassDO; UNICODE_STRING InterfaceName; } PORT_DEVICE_EXTENSION, *PPORT_DEVICE_EXTENSION;

18 years, 6 months

[hpoussin] 21598: [AUDIT] No suspicious code detected in kbdclass and mouclass. The code is quite understandable and have comments for harder parts + they share most of their code

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Apr 16 11:11:56 2006 New Revision: 21598 URL: http://svn.reactos.ru/svn/reactos?rev=21598&view=rev Log: [AUDIT] No suspicious code detected in kbdclass and mouclass. The code is quite understandable and have comments for harder parts + they share most of their code Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c (props changed) trunk/reactos/drivers/input/kbdclass/kbdclass.h (props changed) trunk/reactos/drivers/input/kbdclass/kbdclass.rc (props changed) trunk/reactos/drivers/input/kbdclass/misc.c (props changed) trunk/reactos/drivers/input/mouclass/misc.c (props changed) trunk/reactos/drivers/input/mouclass/mouclass.c (props changed) trunk/reactos/drivers/input/mouclass/mouclass.h (props changed) trunk/reactos/drivers/input/mouclass/mouclass.rc (props changed) Propchange: trunk/reactos/drivers/input/kbdclass/kbdclass.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/input/kbdclass/kbdclass.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/input/kbdclass/kbdclass.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/input/kbdclass/misc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/input/mouclass/misc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/input/mouclass/mouclass.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/input/mouclass/mouclass.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/input/mouclass/mouclass.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 6 months

← Newer
1
...
13
14
15
16
17
18
19
...
33
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 April 2006