Ros-diffs April 2006

ros-diffs@reactos.org

14 participants
324 discussions

[tretiakov] 21506: control.exe is not a control panel applet. Moved to applications.

by aleksey＠studiocerebral.com

Author: tretiakov Date: Fri Apr 7 19:07:50 2006 New Revision: 21506 URL: http://svn.reactos.ru/svn/reactos?rev=21506&view=rev Log: control.exe is not a control panel applet. Moved to applications. Added: trunk/reactos/base/applications/control/ - copied from r21485, trunk/reactos/dll/cpl/control/ Removed: trunk/reactos/dll/cpl/control/ Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/cpl/cpl.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/applicati… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Fri Apr 7 19:07:50 2006 @@ -58,4 +58,7 @@ <directory name="wordpad"> <xi:include href="wordpad/wordpad.rbuild" /> </directory> +<directory name="control"> + <xi:include href="control/control.rbuild" /> +</directory> </group> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/packages/reac… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Apr 7 19:07:50 2006 @@ -63,6 +63,7 @@ ;base\applications\utils\ps\ps.exe 1 base\applications\winefile\winefile.exe 1 ;base\applications\winver\winver.exe 1 +base\applications\control\control.exe 1 base\services\dhcp\dhcp.exe 1 base\services\eventlog\eventlog.exe 1 @@ -98,7 +99,6 @@ dll\cpl\access\access.cpl 1 dll\cpl\appwiz\appwiz.cpl 1 -dll\cpl\control\control.exe 1 dll\cpl\desk\desk.cpl 1 dll\cpl\intl\intl.cpl 1 dll\cpl\main\main.cpl 1 Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=2150… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Fri Apr 7 19:07:50 2006 @@ -3,9 +3,6 @@ </directory> <directory name="appwiz"> <xi:include href="appwiz/appwiz.rbuild" /> -</directory> -<directory name="control"> - <xi:include href="control/control.rbuild" /> </directory> <directory name="desk"> <xi:include href="desk/desk.rbuild" />

18 years, 8 months

[tretiakov] 21505: Thomas Weidenmueller is not author of this control panel applet. From svn log I found that former author was Johannes Anderwald (j_anderw@sbox.tugraz.at). Updated headers.

by aleksey＠studiocerebral.com

Author: tretiakov Date: Fri Apr 7 17:03:59 2006 New Revision: 21505 URL: http://svn.reactos.ru/svn/reactos?rev=21505&view=rev Log: Thomas Weidenmueller is not author of this control panel applet. From svn log I found that former author was Johannes Anderwald (j_anderw(a)sbox.tugraz.at). Updated headers. Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/access.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/sysdm.c * PURPOSE: ReactOS System Control Panel - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */ Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/display.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/advanced.c * PURPOSE: Memory, start-up and profiles settings - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */ Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/advanced.c * PURPOSE: Memory, start-up and profiles settings - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */ Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/advanced.c * PURPOSE: Memory, start-up and profiles settings - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */ Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/advanced.c * PURPOSE: Memory, start-up and profiles settings - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */ Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/advanced.c * PURPOSE: Memory, start-up and profiles settings - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */

18 years, 8 months

[tretiakov] 21504: [AUDIT] \trunk\reactos\dll\cpl\access (unlocked) This code seems clean, it does nothing useful. Thomas Weidenmueller agreed it's clean too.

by aleksey＠studiocerebral.com

Author: tretiakov Date: Fri Apr 7 16:24:00 2006 New Revision: 21504 URL: http://svn.reactos.ru/svn/reactos?rev=21504&view=rev Log: [AUDIT] \trunk\reactos\dll\cpl\access (unlocked) This code seems clean, it does nothing useful. Thomas Weidenmueller agreed it's clean too. Modified: trunk/reactos/dll/cpl/access/access.c (props changed) trunk/reactos/dll/cpl/access/access.h (props changed) trunk/reactos/dll/cpl/access/display.c (props changed) trunk/reactos/dll/cpl/access/general.c (props changed) trunk/reactos/dll/cpl/access/keyboard.c (props changed) trunk/reactos/dll/cpl/access/mouse.c (props changed) trunk/reactos/dll/cpl/access/resource.h (props changed) trunk/reactos/dll/cpl/access/resources/applet.ico (props changed) trunk/reactos/dll/cpl/access/sound.c (props changed) Propchange: trunk/reactos/dll/cpl/access/access.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/access.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/display.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/general.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/keyboard.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/mouse.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/resources/applet.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/sound.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 8 months

[tretiakov] 21503: Add some audit notes for desk.cpl

by aleksey＠studiocerebral.com

Author: tretiakov Date: Fri Apr 7 15:46:42 2006 New Revision: 21503 URL: http://svn.reactos.ru/svn/reactos?rev=21503&view=rev Log: Add some audit notes for desk.cpl Added: trunk/documentation/audit/dll/ trunk/documentation/audit/dll/cpl/ trunk/documentation/audit/dll/cpl/deskcpl.txt Added: trunk/documentation/audit/dll/cpl/deskcpl.txt URL: http://svn.reactos.ru/svn/reactos/trunk/documentation/audit/dll/cpl/deskcpl… ============================================================================== --- trunk/documentation/audit/dll/cpl/deskcpl.txt (added) +++ trunk/documentation/audit/dll/cpl/deskcpl.txt Fri Apr 7 15:46:42 2006 @@ -1,0 +1,64 @@ +Here is a full list of api functions desk.cpl calls: + +KERNEL32.DLL: + AddAtom - Documented in msdn. + FindAtom - Documented in msdn. + GetAtomName - Documented in msdn. + +ADVAPI32.DLL: + RegCloseKey - Documented in msdn. + RegCreateKeyEx - Documented in msdn. + RegOpenKeyEx - Documented in msdn. + RegQueryValueEx - Documented in msdn. + RegSetValueEx - Documented in msdn. + +COMCTL32.DLL: + PropertySheet - Documented in msdn. + +COMDLG32.DLL: + GetOpenFileName - Documented in msdn. + +GDI32.DLL: + CreateIC - Documented in msdn. + DeleteDC - Documented in msdn. + GetDeviceCaps - Documented in msdn. + SetStretchBltMode - Documented in msdn. + StretchDIBits - Documented in msdn. + +SETUPAPI.DLL: + SetupCloseInfFile - Documented in msdn. + SetupDiGetActualSectionToInstall - Documented in msdn. + SetupDiGetDeviceInstallParams - Documented in msdn. + SetupDiGetDeviceRegistryProperty - Documented in msdn. + SetupDiGetDriverInfoDetail - Documented in msdn. + SetupDiGetSelectedDriver - Documented in msdn. + SetupDiInstallDevice - Documented in msdn. + SetupDiOpenDevRegKey - Documented in msdn. + SetupDiSetDeviceInstallParams - Documented in msdn. + SetupInstallFromInfSection - Documented in msdn. + SetupOpenInfFile - Documented in msdn. + +SHELL32.DLL: + SHGetFileInfo - Documented in msdn. + +USER32.DLL: + ChangeDisplaySettingsEx - Documented in msdn. + EnableWindow - Documented in msdn. + EnumDisplayDevices - Documented in msdn. + EnumDisplaySettingsEx - Documented in msdn. + FillRect - Documented in msdn. + GetClientRect - Documented in msdn. + GetDlgItem - Documented in msdn. + GetParent - Documented in msdn. + GetSysColorBrush - Documented in msdn. + GetSystemMetrics - Documented in msdn. + InvalidateRect - Documented in msdn. + LoadIcon - Documented in msdn. + LoadString - Documented in msdn. + MessageBox - Documented in msdn. + SendDlgItemMessage - Documented in msdn. + SendMessage - Documented in msdn. + SystemParametersInfo - Documented in msdn. + + +Resolution: desk.cpl uses only documented functions.

18 years, 8 months

[tretiakov] 21502: [AUDIT] \trunk\reactos\dll\cpl\liccpa (Unlocked) Clean. Stewen Edwards quote: "This application does almost nothing and its really good at it."

by aleksey＠studiocerebral.com

Author: tretiakov Date: Fri Apr 7 14:23:05 2006 New Revision: 21502 URL: http://svn.reactos.ru/svn/reactos?rev=21502&view=rev Log: [AUDIT] \trunk\reactos\dll\cpl\liccpa (Unlocked) Clean. Stewen Edwards quote: "This application does almost nothing and its really good at it." Modified: trunk/reactos/dll/cpl/liccpa/liccpa.c (props changed) trunk/reactos/dll/cpl/liccpa/liccpa.h (props changed) trunk/reactos/dll/cpl/liccpa/resource.h (props changed) trunk/reactos/dll/cpl/liccpa/resources/cpl_icon1.ico (props changed) Propchange: trunk/reactos/dll/cpl/liccpa/liccpa.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/liccpa/liccpa.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/liccpa/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/liccpa/resources/cpl_icon1.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 8 months

[tretiakov] 21501: [AUDIT] \trunk\reactos\dll\cpl\intl (Unlocked) I reviewed the code and it seems clean to me. This control panel applet is very incomplete.

by aleksey＠studiocerebral.com

Author: tretiakov Date: Fri Apr 7 14:21:29 2006 New Revision: 21501 URL: http://svn.reactos.ru/svn/reactos?rev=21501&view=rev Log: [AUDIT] \trunk\reactos\dll\cpl\intl (Unlocked) I reviewed the code and it seems clean to me. This control panel applet is very incomplete. Modified: trunk/reactos/dll/cpl/intl/currency.c (props changed) trunk/reactos/dll/cpl/intl/date.c (props changed) trunk/reactos/dll/cpl/intl/general.c (props changed) trunk/reactos/dll/cpl/intl/intl.c (props changed) trunk/reactos/dll/cpl/intl/intl.h (props changed) trunk/reactos/dll/cpl/intl/locale.c (props changed) trunk/reactos/dll/cpl/intl/numbers.c (props changed) trunk/reactos/dll/cpl/intl/resource.h (props changed) trunk/reactos/dll/cpl/intl/resources/applet.ico (props changed) trunk/reactos/dll/cpl/intl/resources/flags.ico (props changed) trunk/reactos/dll/cpl/intl/time.c (props changed) Propchange: trunk/reactos/dll/cpl/intl/currency.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/intl/date.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/intl/general.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/intl/intl.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/intl/intl.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/intl/locale.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/intl/numbers.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/intl/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/intl/resources/applet.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/intl/resources/flags.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/intl/time.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 8 months

[tretiakov] 21500: [AUDIT] \trunk\reactos\dll\cpl\desk (Unlocked) I reviewed the code and it seems clean to me.

by aleksey＠studiocerebral.com

Author: tretiakov Date: Fri Apr 7 14:20:39 2006 New Revision: 21500 URL: http://svn.reactos.ru/svn/reactos?rev=21500&view=rev Log: [AUDIT] \trunk\reactos\dll\cpl\desk (Unlocked) I reviewed the code and it seems clean to me. Modified: trunk/reactos/dll/cpl/desk/appearance.c (props changed) trunk/reactos/dll/cpl/desk/background.c (props changed) trunk/reactos/dll/cpl/desk/classinst.c (props changed) trunk/reactos/dll/cpl/desk/desk.c (props changed) trunk/reactos/dll/cpl/desk/desk.h (props changed) trunk/reactos/dll/cpl/desk/dibitmap.c (props changed) trunk/reactos/dll/cpl/desk/resource.h (props changed) trunk/reactos/dll/cpl/desk/screensaver.c (props changed) trunk/reactos/dll/cpl/desk/settings.c (props changed) Propchange: trunk/reactos/dll/cpl/desk/appearance.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/desk/background.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/desk/classinst.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/desk/desk.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/desk/desk.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/desk/dibitmap.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/desk/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/desk/screensaver.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/desk/settings.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 8 months

[tretiakov] 21499: [AUDIT] \trunk\reactos\base\services\dhcpd (Unlocked) 3rd party code. Has nothing to do with reverse engeneering. Authors: Carlos Duclos Vergara, <carlos at embedded dot cl> Pablo Bleyer Kocik, <pbleyer at embedded dot cl> Manuel Jander, <mjander at embedded dot cl>

by aleksey＠studiocerebral.com

Author: tretiakov Date: Fri Apr 7 14:16:12 2006 New Revision: 21499 URL: http://svn.reactos.ru/svn/reactos?rev=21499&view=rev Log: [AUDIT] \trunk\reactos\base\services\dhcpd (Unlocked) 3rd party code. Has nothing to do with reverse engeneering. Authors: Carlos Duclos Vergara, <carlos at embedded dot cl> Pablo Bleyer Kocik, <pbleyer at embedded dot cl> Manuel Jander, <mjander at embedded dot cl> Modified: trunk/reactos/base/services/dhcpd/AUTHORS (props changed) trunk/reactos/base/services/dhcpd/COPYING (props changed) trunk/reactos/base/services/dhcpd/ChangeLog (props changed) trunk/reactos/base/services/dhcpd/INSTALL (props changed) trunk/reactos/base/services/dhcpd/Makefile.am (props changed) trunk/reactos/base/services/dhcpd/Makefile.in (props changed) trunk/reactos/base/services/dhcpd/NEWS (props changed) trunk/reactos/base/services/dhcpd/README (props changed) trunk/reactos/base/services/dhcpd/README.ROS (props changed) trunk/reactos/base/services/dhcpd/TODO (props changed) trunk/reactos/base/services/dhcpd/aclocal.m4 (props changed) trunk/reactos/base/services/dhcpd/config.cache (props changed) trunk/reactos/base/services/dhcpd/config.h (props changed) trunk/reactos/base/services/dhcpd/config.h.in (props changed) trunk/reactos/base/services/dhcpd/config.h.top (props changed) trunk/reactos/base/services/dhcpd/config.log (props changed) trunk/reactos/base/services/dhcpd/config.status (props changed) trunk/reactos/base/services/dhcpd/configure (props changed) trunk/reactos/base/services/dhcpd/configure.in (props changed) trunk/reactos/base/services/dhcpd/dhcpd.rc (props changed) trunk/reactos/base/services/dhcpd/install-sh (props changed) trunk/reactos/base/services/dhcpd/missing (props changed) trunk/reactos/base/services/dhcpd/mkinstalldirs (props changed) trunk/reactos/base/services/dhcpd/samples/dhcp.conf (props changed) trunk/reactos/base/services/dhcpd/src/Makefile.am (props changed) trunk/reactos/base/services/dhcpd/src/Makefile.in (props changed) trunk/reactos/base/services/dhcpd/src/dhcp.conf (props changed) trunk/reactos/base/services/dhcpd/src/display/display.c (props changed) trunk/reactos/base/services/dhcpd/src/include/datatypes.h (props changed) trunk/reactos/base/services/dhcpd/src/include/display.h (props changed) trunk/reactos/base/services/dhcpd/src/include/headers.h (props changed) trunk/reactos/base/services/dhcpd/src/include/iputils.h (props changed) trunk/reactos/base/services/dhcpd/src/include/leases.h (props changed) trunk/reactos/base/services/dhcpd/src/include/lock.h (props changed) trunk/reactos/base/services/dhcpd/src/include/macutils.h (props changed) trunk/reactos/base/services/dhcpd/src/include/options.h (props changed) trunk/reactos/base/services/dhcpd/src/include/parser.h (props changed) trunk/reactos/base/services/dhcpd/src/include/utils.h (props changed) trunk/reactos/base/services/dhcpd/src/include/wutils.h (props changed) trunk/reactos/base/services/dhcpd/src/leases/leases.c (props changed) trunk/reactos/base/services/dhcpd/src/lock/locker.c (props changed) trunk/reactos/base/services/dhcpd/src/main.c (props changed) trunk/reactos/base/services/dhcpd/src/parsing/parser.c (props changed) trunk/reactos/base/services/dhcpd/src/utils/iputils.c (props changed) trunk/reactos/base/services/dhcpd/src/utils/macutils.c (props changed) trunk/reactos/base/services/dhcpd/src/utils/macutils.h (props changed) trunk/reactos/base/services/dhcpd/src/utils/utils.h (props changed) trunk/reactos/base/services/dhcpd/src/utils/wutils.c (props changed) trunk/reactos/base/services/dhcpd/stamp-h (props changed) trunk/reactos/base/services/dhcpd/stamp-h.in (props changed) Propchange: trunk/reactos/base/services/dhcpd/AUTHORS ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/COPYING ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/ChangeLog ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/INSTALL ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/Makefile.am ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/Makefile.in ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/NEWS ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/README ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/README.ROS ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/TODO ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/aclocal.m4 ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/config.cache ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/config.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/config.h.in ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/config.h.top ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/config.log ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/config.status ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/configure ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/configure.in ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/dhcpd.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/install-sh ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/missing ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/mkinstalldirs ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/samples/dhcp.conf ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/Makefile.am ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/Makefile.in ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/dhcp.conf ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/display/display.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/datatypes.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/display.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/headers.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/iputils.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/leases.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/lock.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/macutils.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/options.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/parser.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/utils.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/include/wutils.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/leases/leases.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/lock/locker.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/main.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/parsing/parser.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/utils/iputils.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/utils/macutils.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/utils/macutils.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/utils/utils.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/src/utils/wutils.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/stamp-h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/dhcpd/stamp-h.in ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 8 months

[tretiakov] 21498: [AUDIT] \trunk\reactos\drivers\base\parallel (Unlocked) Clean. This driver does nothing useful.

by aleksey＠studiocerebral.com

Author: tretiakov Date: Fri Apr 7 14:15:34 2006 New Revision: 21498 URL: http://svn.reactos.ru/svn/reactos?rev=21498&view=rev Log: [AUDIT] \trunk\reactos\drivers\base\parallel (Unlocked) Clean. This driver does nothing useful. Modified: trunk/reactos/drivers/base/parallel/parallel.c (props changed) trunk/reactos/drivers/base/parallel/parallel.h (props changed) trunk/reactos/drivers/base/parallel/parallel.rc (props changed) Propchange: trunk/reactos/drivers/base/parallel/parallel.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/parallel/parallel.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/parallel/parallel.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 8 months

[greatlrd] 21497: This is frist directdraw version than can run reactos ddraw demo in windows with our own ddraw.dll 1. Implement DdBlt in ddraw it is not a complete implement it does not blt from a source surface to destination surface. for we do not create other types that primary surface for now. and it is always primary is the destination. Rember it does not working in fullscreen that is a bug.

by aleksey＠studiocerebral.com

Author: greatlrd Date: Fri Apr 7 14:15:21 2006 New Revision: 21497 URL: http://svn.reactos.ru/svn/reactos?rev=21497&view=rev Log: This is frist directdraw version than can run reactos ddraw demo in windows with our own ddraw.dll 1. Implement DdBlt in ddraw it is not a complete implement it does not blt from a source surface to destination surface. for we do not create other types that primary surface for now. and it is always primary is the destination. Rember it does not working in fullscreen that is a bug. Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Fri Apr 7 14:15:21 2006 @@ -17,7 +17,7 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DDHAL_CREATESURFACEDATA mDdCreateSurface; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; @@ -25,18 +25,15 @@ mDdCreateSurface.lpDD = &This->mDDrawGlobal; mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - - /* create primare surface now */ + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - memset(&This->mddsdPrimary, 0, sizeof(DDSURFACEDESC)); - This->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); - This->mddsdPrimary.dwFlags = pDDSD->dwFlags; - This->mddsdPrimary.ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; // pDDSD; - - if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + memcpy(&This->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); + This->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; + + if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; } @@ -64,10 +61,9 @@ /* FIXME Check the flags if we shall create a primaresurface for overlay or something else - Examine windows which flags are being set for we assume this is right + Examine windows which flags are being set for we assume this is right unsue I think */ - - This->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; + //This->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; This->mPrimaryLocal.ddsCaps.dwCaps = This->mddsdPrimary.ddsCaps.dwCaps; This->mpPrimaryLocals[0] = &This->mPrimaryLocal; @@ -90,19 +86,20 @@ } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { - memset(&This->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); + //memset(&This->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); + memcpy(&This->mddsdOverlay,pDDSD,sizeof(DDSURFACEDESC)); This->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - This->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - - This->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - This->mddsdOverlay.dwWidth = 100; //pels; - This->mddsdOverlay.dwHeight = 100; // lines; - This->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - This->mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - This->mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; - This->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; + //This->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; + + //This->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + + //This->mddsdOverlay.dwWidth = 100; //pels; + //This->mddsdOverlay.dwHeight = 100; // lines; + //This->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; + + //This->mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + //This->mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; + //This->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; @@ -205,19 +202,19 @@ return DD_OK; - } + } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) - { - DX_STUB; - } + { + DX_STUB; + } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - { - DX_STUB; - } + { + DX_STUB; + } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - { - DX_STUB; - } + { + DX_STUB; + } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) { DX_STUB; @@ -229,69 +226,65 @@ HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest, LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { - DX_STUB; - // DDHAL_BLTDATA mDdBlt; - // mDdBlt.lpDDDestSurface = This->mpPrimaryLocals[0]; - - // if (!DdResetVisrgn(This->mpPrimaryLocals[0], NULL)) - // { - // // derr(L"DirectDrawImpl[%08x]::_clear DdResetVisrgn failed", this); - // return DDERR_NOGDI; - // } - - // memset(&mDdBlt, 0, sizeof(DDHAL_BLTDATA)); - // memset(&mDdBlt.bltFX, 0, sizeof(DDBLTFX)); - // mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); - - // mDdBlt.lpDD = &This->mDDrawGlobal; - // mDdBlt.Blt = This->mCallbacks.HALDDSurface.Blt; - // mDdBlt.lpDDDestSurface = This->mpPrimaryLocals[0]; - // - // This->mpPrimaryLocals[0]->hDC = (ULONG_PTR)GetDC(This->CooperativeHWND); - // mDdBlt.rDest.top = 50; - // mDdBlt.rDest.bottom = 100; - // mDdBlt.rDest.left = 0; - // mDdBlt.rDest.right = 100; - // mDdBlt.lpDDSrcSurface = NULL; - // mDdBlt.IsClipped = FALSE; - // mDdBlt.bltFX.dwFillColor = 0xFFFF00; - // mDdBlt.dwFlags = DDBLT_COLORFILL | DDBLT_WAIT; - - // if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) - //{ - // return DDHAL_DRIVER_HANDLED; - // } - - // - - // if (mDdBlt.ddRVal!=DD_OK) - //{ - // return mDdBlt.ddRVal; - // } - - - - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src; + DDHAL_BLTDATA mDdBlt; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + //IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src; - if (!(This->owner->mDDrawGlobal.lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_BLT)) - { - return DDERR_NODRIVERSUPPORT; - } - - DDHAL_BLTDATA BltData; - BltData.lpDD = &This->owner->mDDrawGlobal; - BltData.dwFlags = dwFlags; - BltData.lpDDDestSurface = &This->Local; - if(rDest) BltData.rDest = *(RECTL*)rDest; - if(rSrc) BltData.rSrc = *(RECTL*)rSrc; - if(That) BltData.lpDDSrcSurface = &That->Local; - if(lpbltfx) BltData.bltFX = *lpbltfx; - - if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDDSurface.Blt(&BltData) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - return BltData.ddRVal; + if (!(This->owner->mDDrawGlobal.lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_BLT)) + { + return DDERR_NODRIVERSUPPORT; + } + + mDdBlt.lpDDDestSurface = This->owner->mpPrimaryLocals[0]; + + if (!DdResetVisrgn(This->owner->mpPrimaryLocals[0], NULL)) + { + return DDERR_NOGDI; + } + + memset(&mDdBlt, 0, sizeof(DDHAL_BLTDATA)); + memset(&mDdBlt.bltFX, 0, sizeof(DDBLTFX)); + + if (lpbltfx!=NULL) + { + memcpy(&mDdBlt.bltFX, lpbltfx, sizeof(DDBLTFX)); + } + + if (rDest!=NULL) + { + memcpy(& mDdBlt.rDest, rDest, sizeof(DDBLTFX)); + } + + if (rSrc!=NULL) + { + memcpy(& mDdBlt.rDest, rSrc, sizeof(DDBLTFX)); + } + + + // FIXME setup src surface + mDdBlt.lpDDSrcSurface = NULL; //src-> + + mDdBlt.lpDD = &This->owner->mDDrawGlobal; + mDdBlt.Blt = This->owner->mCallbacks.HALDDSurface.Blt; + mDdBlt.lpDDDestSurface = This->owner->mpPrimaryLocals[0]; + + mDdBlt.dwFlags = dwFlags; + + This->owner->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; + + // FIXME dectect if it clipped or not + mDdBlt.IsClipped = FALSE; + + if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) + { + return DDHAL_DRIVER_HANDLED; + } + + + if (mDdBlt.ddRVal!=DD_OK) + { + return mDdBlt.ddRVal; + } + + return DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Fri Apr 7 14:15:21 2006 @@ -136,8 +136,6 @@ // set the data This->mDDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); - - This->CooperativeHWND = hwnd; /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Fri Apr 7 14:15:21 2006 @@ -63,11 +63,10 @@ DDRAWI_DDRAWSURFACE_MORE mOverlayMore[6]; - /* ExclusiveOwner */ - DDRAWI_DIRECTDRAW_LCL ExclusiveOwner; + /* ExclusiveOwner */ DWORD cooperative_level; - HWND CooperativeHWND; + BOOL InitializeDraw;

18 years, 8 months

← Newer
1
...
23
24
25
26
27
28
29
...
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