Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 19226: Add .inf file for Realtek netcards (8029 compatibles)
by hpoussin＠svn.reactos.com 14 Nov '05

14 Nov '05

Add .inf file for Realtek netcards (8029 compatibles) Remove NE2000 compatible card in Root bus, as QEMU enumerates it as PCI Add .inf file for Xbox display card Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/media/inf/inf.xml Added: trunk/reactos/media/inf/netrtpnt.inf Added: trunk/reactos/media/inf/xboxdisp.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-14 16:36:26 UTC (rev 19225) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-14 17:33:38 UTC (rev 19226) @@ -568,10 +568,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00 000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSys Rq",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x000 00000,"i8042prt" -;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","ClassGUID",0x0 0000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" -;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","Service",0x000 00000,"i8042prt" -;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","ClassGUID",0x0 0000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010 001,0x00000000 @@ -627,10 +623,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Start",0x00010001,0x00000 000 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x000000 01 -; NE2000 network card -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP80D6\0000","HardwareID",0x 00010000,"*PNP80D6" -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP80D6\0000","DeviceDesc",0x 00000000,"Network card" - ; PCI driver HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","HardwareID",0x0 0010000,"*PNP0A03" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","DeviceDesc",0x0 0000000,"PCI bus" @@ -731,15 +723,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Start",0x00010001,0x000 00000 HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Type",0x00010001,0x0000 0002 -; Xbox Nvidia driver -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","ErrorControl",0x00010 001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Group",0x00000000,"Vi deo" -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","ImagePath",0x00020000 ,"system32\drivers\xboxvmp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Start",0x00010001,0x0 0000001 -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp\Device0","InstalledDisp layDrivers",0x00010000,"framebuf" -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10DE&DEV_02A0&SUBSYS_000000 00&REV_A1\0000","Service",0x00000000,"XboxVmp" - ; VBE SVGA driver HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0 x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save SVGA" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-14 16:36:26 UTC (rev 19225) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-14 17:33:38 UTC (rev 19226) @@ -301,15 +301,17 @@ media\inf\layout.inf 6 media\inf\machine.inf 6 media\inf\mouse.inf 6 -media\inf\keyboard.inf 6 +media\inf\keyboard.inf 6 media\inf\NET_NIC.inf 6 media\inf\netamd.inf 6 media\inf\netisa.inf 6 +media\inf\netrtpnt.inf 6 media\inf\ports.inf 6 media\inf\scsi.inf 6 media\inf\syssetup.inf 6 media\inf\usbport.inf 6 media\inf\usbstor.inf 6 +media\inf\xboxdisp.inf 6 modules\os2\server\os2srv.dll 1 optional modules\os2\lib\doscalls\doscalls.dll 1 optional modules\posix\server\psxsrv.dll 1 optional _____ Modified: trunk/reactos/media/inf/inf.xml --- trunk/reactos/media/inf/inf.xml 2005-11-14 16:36:26 UTC (rev 19225) +++ trunk/reactos/media/inf/inf.xml 2005-11-14 17:33:38 UTC (rev 19226) @@ -3,16 +3,18 @@ <installfile base="inf">cdrom.inf</installfile> <installfile base="inf">display.inf</installfile> <installfile base="inf">hdc.inf</installfile> +<installfile base="inf">keyboard.inf</installfile> <installfile base="inf">layout.inf</installfile> <installfile base="inf">machine.inf</installfile> <installfile base="inf">mouse.inf</installfile> -<installfile base="inf">keyboard.inf</installfile> <installfile base="inf">NET_NIC.inf</installfile> <installfile base="inf">netamd.inf</installfile> <installfile base="inf">netisa.inf</installfile> +<installfile base="inf">netrtpnt.inf</installfile> <installfile base="inf">ports.inf</installfile> <installfile base="inf">scsi.inf</installfile> <installfile base="inf">syssetup.inf</installfile> <installfile base="inf">usbport.inf</installfile> <installfile base="inf">usbstor.inf</installfile> +<installfile base="inf">xboxdisp.inf</installfile> <group> \ No newline at end of file _____ Added: trunk/reactos/media/inf/netrtpnt.inf --- trunk/reactos/media/inf/netrtpnt.inf 2005-11-14 16:36:26 UTC (rev 19225) +++ trunk/reactos/media/inf/netrtpnt.inf 2005-11-14 17:33:38 UTC (rev 19226) @@ -0,0 +1,55 @@ +; NETRTPNT.INF + +; Installation file for 8029 compatible netcards + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Net +ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 11/14/2005,1.00 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%RealtekMfg% = RealtekMfg + +[RealtekMfg] +%PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst,PCI\VEN_10EC&DEV_8029 + +;---------------------------- NE2000 DRIVER ----------------------------- + +[NE2000_Inst.NT] +AddReg = NE2000_AddReg.NT +CopyFiles = NE2000_CopyFiles.NT + +[NE2000_AddReg.NT] +HKR,,Characteristics,0x00010001,0x00000000 +HKR,,BusType,0x00000000,"5" +HKR,,Port,0x00000000,"c100" +HKR,,Irq,0x00000000,"B" +HKR,,NetworkAddress,0x00000000,"001122334455" + +[NE2000_CopyFiles.NT] +ne2000.sys + +[NE2000_Inst.NT.Services] +AddService = ne2000, 0x00000002, ne2000_Service_Inst + +[ne2000_Service_Inst] +ServiceType = 3 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\ne2000.sys +LoadOrderGroup = NDIS + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +RealtekMfg = "Realtek Semiconductor Co., Ltd." +PCI\VEN_10EC&DEV_8029.DeviceDesc = "RTL-8029(AS)" _____ Added: trunk/reactos/media/inf/xboxdisp.inf --- trunk/reactos/media/inf/xboxdisp.inf 2005-11-14 16:36:26 UTC (rev 19225) +++ trunk/reactos/media/inf/xboxdisp.inf 2005-11-14 17:33:38 UTC (rev 19226) @@ -0,0 +1,53 @@ +; xboxdisp.inf + +; Installation file for the Xbox display card + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Display +ClassGUID = {4D36E968-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 11/11/2005,1.00 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%nVidiaMfg% = nVidiaMfg + +[nVidiaMfg] +%PCI\VEN_10DE&DEV_02A0.DeviceDesc% = XboxVmp_Inst,PCI\VEN_10DE&DEV_02A0 + +;---------------------------- XboxVmp DRIVER ---------------------------- + +[XboxVmp_Inst.NT] +CopyFiles = XboxVmp_CopyFiles.NT + +[XboxVmp_CopyFiles.NT] +xboxvmp.sys + +[XboxVmp_Inst.NT.Services] +AddService = xboxvmp, 0x00000002, xboxvmp_Service_Inst + +[xboxvmp_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 0 +ServiceBinary = %12%\xboxvmp.sys +LoadOrderGroup = Video + +[xboxvmp.SoftwareSettings] +AddReg = xboxvmp_SoftwareDeviceSettings + +[xboxvmp_SoftwareDeviceSettings] +HKR,,InstalledDisplayDrivers,0x00010000,framebuf + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +nVidiaMfg = "nVidia Corporation" +PCI\VEN_10DE&DEV_02A0.DeviceDesc = "NV2A Xbox Graphics Processing Unit"

1 0

[gvg] 19225: Only debug 1 thread at a time
by gvg＠svn.reactos.com 14 Nov '05

14 Nov '05

Only debug 1 thread at a time Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-14 15:35:41 UTC (rev 19224) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-14 16:36:26 UTC (rev 19225) @@ -103,6 +103,8 @@ static PETHREAD GspDbgThread; static PETHREAD GspEnumThread; +static FAST_MUTEX GspLock; + extern LIST_ENTRY PsActiveProcessHead; KD_PORT_INFORMATION GdbPortInfo = { 2, 115200, 0 }; /* FIXME hardcoded for COM2, 115200 baud */ @@ -1137,6 +1139,9 @@ } else { + /* Can only debug 1 thread at a time... */ + ExAcquireFastMutex(&GspLock); + /* Make sure we're debugging the current thread. */ if (NULL != GspDbgThread) { @@ -1390,6 +1395,7 @@ GspDbgThread = NULL; } + ExReleaseFastMutex(&GspLock); return kdContinue; break; } @@ -1538,6 +1544,8 @@ if (BootPhase == 0) { + ExInitializeFastMutex(&GspLock); + /* Write out the functions that we support for now */ WrapperTable->KdpInitRoutine = KdpGdbStubInit; WrapperTable->KdpPrintRoutine = KdpGdbDebugPrint;

1 0

[hpoussin] 19224: Set SystemSetupInProgress to 0 at the end of second stage setup
by hpoussin＠svn.reactos.com 14 Nov '05

14 Nov '05

Set SystemSetupInProgress to 0 at the end of second stage setup Remove dead code Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/syssetup/wizard.c _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-11-14 13:45:28 UTC (rev 19223) +++ trunk/reactos/lib/syssetup/install.c 2005-11-14 15:35:41 UTC (rev 19224) @@ -236,58 +236,7 @@ Dst); } -VOID -SetupIsActive( DWORD dw ) -{ - HKEY hKey = 0; - if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, _T("SYSTEM\\Setup"), 0, KEY_WRITE, &hKey ) == ERROR_SUCCESS) { - RegSetValueEx( hKey, _T("SystemSetupInProgress"), 0, REG_DWORD, (CONST BYTE *)&dw, sizeof(dw) ); - RegCloseKey( hKey ); - } -} -INT_PTR CALLBACK -RestartDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch(msg) - { - case WM_INITDIALOG: - SendDlgItemMessage(hWnd, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, - MAKELPARAM(0, 300)); - SetTimer(hWnd, 1, 50, NULL); - return TRUE; - - case WM_TIMER: - { - INT Position; - HWND hWndProgress; - - hWndProgress = GetDlgItem(hWnd, IDC_RESTART_PROGRESS); - Position = SendMessage(hWndProgress, PBM_GETPOS, 0, 0); - if (Position == 300) - { - SetupIsActive(0); - EndDialog(hWnd, 0); - } - else - SendMessage(hWndProgress, PBM_SETPOS, Position + 1, 0); - } - return TRUE; - - case WM_COMMAND: - switch (wParam) - { - case IDOK: - case IDCANCEL: - EndDialog(hWnd, 0); - return TRUE; - } - break; - } - - return FALSE; -} - static VOID CreateTempDir(LPCWSTR VarName) { _____ Modified: trunk/reactos/lib/syssetup/wizard.c --- trunk/reactos/lib/syssetup/wizard.c 2005-11-14 13:45:28 UTC (rev 19223) +++ trunk/reactos/lib/syssetup/wizard.c 2005-11-14 15:35:41 UTC (rev 19224) @@ -1375,7 +1375,17 @@ } +static VOID +SetupIsActive( DWORD dw ) +{ + HKEY hKey = 0; + if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, _T("SYSTEM\\Setup"), 0, KEY_WRITE, &hKey ) == ERROR_SUCCESS) { + RegSetValueEx( hKey, _T("SystemSetupInProgress"), 0, REG_DWORD, (CONST BYTE *)&dw, sizeof(dw) ); + RegCloseKey( hKey ); + } +} + static INT_PTR CALLBACK FinishDlgProc(HWND hwndDlg, UINT uMsg, @@ -1401,6 +1411,10 @@ } break; + case WM_DESTROY: + SetupIsActive(0); + return TRUE; + case WM_TIMER: { INT Position;

1 0

[navaraf] 19223: Add definition for vsprintfW.
by navaraf＠svn.reactos.com 14 Nov '05

14 Nov '05

Add definition for vsprintfW. Modified: trunk/reactos/include/wine/unicode.h _____ Modified: trunk/reactos/include/wine/unicode.h --- trunk/reactos/include/wine/unicode.h 2005-11-14 13:43:34 UTC (rev 19222) +++ trunk/reactos/include/wine/unicode.h 2005-11-14 13:45:28 UTC (rev 19223) @@ -35,6 +35,7 @@ #define strlwrW(s) _wcslwr((wchar_t *)(s)) #define struprW(s) _wcsupr((wchar_t *)(s)) #define sprintfW swprintf +#define vsprintfW vswprintf #define snprintfW _snwprintf #define vsnprintfW vsnwprintf

1 0

[navaraf] 19222: Revert r19221.
by navaraf＠svn.reactos.com 14 Nov '05

14 Nov '05

Revert r19221. Modified: branches/cache_manager_rewrite/reactos/include/wine/unicode.h _____ Modified: branches/cache_manager_rewrite/reactos/include/wine/unicode.h --- branches/cache_manager_rewrite/reactos/include/wine/unicode.h 2005-11-14 13:41:58 UTC (rev 19221) +++ branches/cache_manager_rewrite/reactos/include/wine/unicode.h 2005-11-14 13:43:34 UTC (rev 19222) @@ -35,7 +35,6 @@ #define strlwrW(s) _wcslwr((wchar_t *)(s)) #define struprW(s) _wcsupr((wchar_t *)(s)) #define sprintfW swprintf -#define vsprintfW vswprintf #define snprintfW _snwprintf #define vsnprintfW vsnwprintf

1 0

[navaraf] 19221: Add definition for vsprintfW.
by navaraf＠svn.reactos.com 14 Nov '05

14 Nov '05

Add definition for vsprintfW. Modified: branches/cache_manager_rewrite/reactos/include/wine/unicode.h _____ Modified: branches/cache_manager_rewrite/reactos/include/wine/unicode.h --- branches/cache_manager_rewrite/reactos/include/wine/unicode.h 2005-11-14 03:51:31 UTC (rev 19220) +++ branches/cache_manager_rewrite/reactos/include/wine/unicode.h 2005-11-14 13:41:58 UTC (rev 19221) @@ -35,6 +35,7 @@ #define strlwrW(s) _wcslwr((wchar_t *)(s)) #define struprW(s) _wcsupr((wchar_t *)(s)) #define sprintfW swprintf +#define vsprintfW vswprintf #define snprintfW _snwprintf #define vsnprintfW vsnwprintf

1 0

[jimtabor] 19220: Add devmgr.xml for testing.
by jimtabor＠svn.reactos.com 14 Nov '05

14 Nov '05

Add devmgr.xml for testing. Added: trunk/reactos/lib/devmgr/devmgr.xml _____ Added: trunk/reactos/lib/devmgr/devmgr.xml --- trunk/reactos/lib/devmgr/devmgr.xml 2005-11-14 02:16:04 UTC (rev 19219) +++ trunk/reactos/lib/devmgr/devmgr.xml 2005-11-14 03:51:31 UTC (rev 19220) @@ -0,0 +1,19 @@ +<module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVMGR}" installbase="system32" installname="devmgr.dll" allowwarnings="true"> + <importlibrary definition="devmgr.def" /> + <include base="devmgr">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <file>devmgr.c</file> + <file>stubs.c</file> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <file>devmgr.rc</file> +</module>

1 0

[jimtabor] 19219: Fix xml name conflict.
by jimtabor＠svn.reactos.com 14 Nov '05

14 Nov '05

Fix xml name conflict. Deleted: trunk/reactos/subsys/system/devmgr/devmgr.xml _____ Deleted: trunk/reactos/subsys/system/devmgr/devmgr.xml --- trunk/reactos/subsys/system/devmgr/devmgr.xml 2005-11-14 02:14:23 UTC (rev 19218) +++ trunk/reactos/subsys/system/devmgr/devmgr.xml 2005-11-14 02:16:04 UTC (rev 19219) @@ -1,12 +0,0 @@ -<module name="devmgrapp" type="win32cui" installbase="system32" installname="devmgr.exe"> - <define name="__USE_W32API" /> - <define name="DEFINE_GUID" /> - <library>ntdll</library> - <library>setupapi</library> - <library>gdi32</library> - <library>kernel32</library> - <library>user32</library> - <library>comctl32</library> - <file>devmgr.c</file> - <efile>devmgr.rc</efile> -</module>

1 0

[jimtabor] 19218: Fix xml name conflict.
by jimtabor＠svn.reactos.com 14 Nov '05

14 Nov '05

Fix xml name conflict. Added: trunk/reactos/subsys/system/devmgr/devmgrapp.xml _____ Copied: trunk/reactos/subsys/system/devmgr/devmgrapp.xml (from rev 19217, trunk/reactos/subsys/system/devmgr/devmgr.xml)

1 0

[jimtabor] 19217: Fix xml name conflict.
by jimtabor＠svn.reactos.com 14 Nov '05

14 Nov '05

Fix xml name conflict. Modified: trunk/reactos/subsys/system/directory.xml _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-11-14 01:23:44 UTC (rev 19216) +++ trunk/reactos/subsys/system/directory.xml 2005-11-14 01:30:50 UTC (rev 19217) @@ -9,7 +9,7 @@ <xi:include href="cmd/cmd.xml" /> </directory> <directory name="devmgr"> - <xi:include href="devmgr/devmgr.xml" /> + <xi:include href="devmgr/devmgrapp.xml" /> </directory> <directory name="expand"> <xi:include href="expand/expand.xml" />

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs