Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 50041: [user32_winetest] -deactivate some tests that hang in reactos that have already been deactived and reactivded by mistake twice
by gadamopoulos＠svn.reactos.org 16 Dec '10

16 Dec '10

Author: gadamopoulos Date: Thu Dec 16 18:49:10 2010 New Revision: 50041 URL: http://svn.reactos.org/svn/reactos?rev=50041&view=rev Log: [user32_winetest] -deactivate some tests that hang in reactos that have already been deactived and reactivded by mistake twice Modified: trunk/rostests/winetests/user32/menu.c Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Thu Dec 16 18:49:10 2010 @@ -3067,6 +3067,9 @@ ok( g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); } ok( g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); + + skip("skipping TrackPopupMenu, that hangs on reactos\n"); +#if 0 /* menu owner is child window */ g_hwndtosend = hwndchild; ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); @@ -3079,6 +3082,7 @@ g_hwndtosend = hwnd; ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); ok( g_got_enteridle == 2, "received %d WM_ENTERIDLE messages, should be 2\n", g_got_enteridle); +#endif /* cleanup */ DestroyMenu( menu); DestroyWindow( hwndchild);

1 0

[greatlrd] 50040: [dxg.sys] add stub.c not yet in use
by greatlrd＠svn.reactos.org 16 Dec '10

16 Dec '10

Author: greatlrd Date: Thu Dec 16 18:49:05 2010 New Revision: 50040 URL: http://svn.reactos.org/svn/reactos?rev=50040&view=rev Log: [dxg.sys] add stub.c not yet in use Added: branches/reactx/reactos/drivers/directx/dxg/stub.c (with props) Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild [iso-8859-1] Thu Dec 16 18:49:05 2010 @@ -10,5 +10,6 @@ <file>ddhmg.c</file> <file>eng.c</file> <file>historic.c</file> + <file>stub.c</file> <file>dxg.rc</file> </module> Added: branches/reactx/reactos/drivers/directx/dxg/stub.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/stub.c (added) +++ branches/reactx/reactos/drivers/directx/dxg/stub.c [iso-8859-1] Thu Dec 16 18:49:05 2010 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native driver for dxg implementation + * FILE: drivers/directx/dxg/stub.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 16/12-2010 Magnus Olsen + */ + + +#include <dxg_int.h> +#include "dxg_driver.h" + Propchange: branches/reactx/reactos/drivers/directx/dxg/stub.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 50039: [CMAKE] - Update some more base addresses. Thanks to Roel for his help.
by akhaldi＠svn.reactos.org 16 Dec '10

16 Dec '10

Author: akhaldi Date: Thu Dec 16 15:42:17 2010 New Revision: 50039 URL: http://svn.reactos.org/svn/reactos?rev=50039&view=rev Log: [CMAKE] - Update some more base addresses. Thanks to Roel for his help. Modified: branches/cmake-bringup/baseaddress.cmake Modified: branches/cmake-bringup/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/baseaddress.cmake… ============================================================================== --- branches/cmake-bringup/baseaddress.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/baseaddress.cmake [iso-8859-1] Thu Dec 16 15:42:17 2010 @@ -84,7 +84,7 @@ set(baseaddress_oleacc 0x69640000) set(baseaddress_winmm 0x697d0000) set(baseaddress_msimg32 0x69cc0000) -set(baseaddress_browseui 0x69cd0000) + set(baseaddress_netplwiz 0x6a240000) set(baseaddress_shell32 0x6a360000) set(baseaddress_unicode 0x6b200000) @@ -94,7 +94,6 @@ set(baseaddress_dbghelp 0x6b330000) set(baseaddress_dinput8 0x6b340000) set(baseaddress_dxdiagn 0x6b350000) -set(baseaddress_dsound 0x6b360000) set(baseaddress_glu32 0x6b370000) set(baseaddress_mesa32 0x6b380000) set(baseaddress_opengl32 0x6b390000) @@ -162,7 +161,6 @@ set(baseaddress_msimtf 0x746b0000) set(baseaddress_msctf 0x746e0000) set(baseaddress_kbsdll 0x74720000) -set(baseaddress_quartz 0x747d0000) set(baseaddress_userenv 0x74850000) set(baseaddress_powrprof 0x74ad0000) set(baseaddress_msxml3 0x74ae0000) @@ -194,13 +192,11 @@ set(baseaddress_midimap 0x76600000) set(baseaddress_wavemap 0x76610000) set(baseaddress_mpr 0x76620000) -set(baseaddress_mshtml 0x76650000) set(baseaddress_odbc32 0x76710000) set(baseaddress_setupapi 0x76730000) set(baseaddress_cryptdll 0x768f0000) set(baseaddress_shfolder 0x76900000) set(baseaddress_ntdsapi 0x76910000) -set(baseaddress_ntmarta 0x76920000) set(baseaddress_rasdlg 0x76930000) set(baseaddress_gdiplus 0x76a70000) set(baseaddress_atl 0x76ac0000) @@ -218,7 +214,6 @@ set(baseaddress_rasman 0x76e90000) set(baseaddress_rasapi32 0x76ee0000) set(baseaddress_wtsapi32 0x76f50000) -set(baseaddress_msvfw32 0x76f60000) set(baseaddress_msacm32 0x77400000) set(baseaddress_crtdll 0x77630000) set(baseaddress_authz 0x77690000) @@ -253,8 +248,14 @@ set(baseaddress_urlmon 0x7d1e0000) set(baseaddress_ws2_32 0x7d2f0000) set(baseaddress_syssetup 0x7d340000) -set(baseaddress_query 0x7d9a0000) -set(baseaddress_hhctrl 0x7e410000) -set(baseaddress_sxs 0x7e690000) -set(baseaddress_beepmidi 0x7ef00000) +set(baseaddress_browseui 0x7d410000) +set(baseaddress_dsound 0x7d530000) +set(baseaddress_quartz 0x7d5e0000) +set(baseaddress_msvfw32 0x7d7a0000) +set(baseaddress_mshtml 0x7d7f0000) +set(baseaddress_query 0x7da30000) +set(baseaddress_hhctrl 0x7da60000) +set(baseaddress_sxs 0x7dad0000) +set(baseaddress_beepmidi 0x7db00000) +set(baseaddress_ntmarta 0x7db20000) set(baseaddress_ftfd 0x7f000000)

1 0

[akhaldi] 50038: [CMAKE] - Assign a base address to ftfd.
by akhaldi＠svn.reactos.org 16 Dec '10

16 Dec '10

Author: akhaldi Date: Thu Dec 16 15:03:13 2010 New Revision: 50038 URL: http://svn.reactos.org/svn/reactos?rev=50038&view=rev Log: [CMAKE] - Assign a base address to ftfd. Modified: branches/cmake-bringup/baseaddress.cmake branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt Modified: branches/cmake-bringup/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/baseaddress.cmake… ============================================================================== --- branches/cmake-bringup/baseaddress.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/baseaddress.cmake [iso-8859-1] Thu Dec 16 15:03:13 2010 @@ -257,3 +257,4 @@ set(baseaddress_hhctrl 0x7e410000) set(baseaddress_sxs 0x7e690000) set(baseaddress_beepmidi 0x7ef00000) +set(baseaddress_ftfd 0x7f000000) Modified: branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/fon… ============================================================================== --- branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] Thu Dec 16 15:03:13 2010 @@ -13,6 +13,7 @@ set_entrypoint(ftfd FtfdEnableDriver@12) set_subsystem(ftfd native) +set_image_base(ftfd ${baseaddress_ftfd}) target_link_libraries(ftfd freetype

1 0

[akhaldi] 50037: [CMAKE] - Update some base addresses to adapt to new binary sizes. Thanks to Roel for his help.
by akhaldi＠svn.reactos.org 16 Dec '10

16 Dec '10

Author: akhaldi Date: Thu Dec 16 14:35:26 2010 New Revision: 50037 URL: http://svn.reactos.org/svn/reactos?rev=50037&view=rev Log: [CMAKE] - Update some base addresses to adapt to new binary sizes. Thanks to Roel for his help. Modified: branches/cmake-bringup/baseaddress.cmake Modified: branches/cmake-bringup/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/baseaddress.cmake… ============================================================================== --- branches/cmake-bringup/baseaddress.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/baseaddress.cmake [iso-8859-1] Thu Dec 16 14:35:26 2010 @@ -100,7 +100,6 @@ set(baseaddress_opengl32 0x6b390000) set(baseaddress_secur32 0x6b3a0000) set(baseaddress_smdll 0x6b3b0000) -set(baseaddress_urlmon 0x6b3c0000) set(baseaddress_serialui 0x6b3d0000) set(baseaddress_hlink 0x6c6e0000) set(baseaddress_deskmon 0x6d400000) @@ -165,8 +164,6 @@ set(baseaddress_kbsdll 0x74720000) set(baseaddress_quartz 0x747d0000) set(baseaddress_userenv 0x74850000) -set(baseaddress_syssetup 0x74a10000) -set(baseaddress_ws2_32 0x74aa0000) set(baseaddress_powrprof 0x74ad0000) set(baseaddress_msxml3 0x74ae0000) set(baseaddress_printui 0x74b40000) @@ -184,10 +181,7 @@ set(baseaddress_localspl 0x75b80000) set(baseaddress_cryptnet 0x75e60000) set(baseaddress_rpcrt4 0x76000000) -set(baseaddress_shlwapi 0x76100000) set(baseaddress_inetcomm 0x76140000) -set(baseaddress_comctl32 0x76170000) -set(baseaddress_comdlg32 0x76230000) set(baseaddress_winsta 0x762f0000) set(baseaddress_imm32 0x76320000) set(baseaddress_d3d8thk 0x76340000) @@ -243,18 +237,23 @@ set(baseaddress_olepro32 0x77b20000) set(baseaddress_activeds 0x77cb0000) set(baseaddress_advapi32 0x77dc0000) -set(baseaddress_user32 0x77e50000) -set(baseaddress_gdi32 0x77f70000) set(baseaddress_dnsapi 0x77fb0000) set(baseaddress_msvcrt 0x78000000) set(baseaddress_msvcrt20 0x78500000) set(baseaddress_msvcrt40 0x78700000) set(baseaddress_mscoree 0x79000000) set(baseaddress_fusion 0x79040000) -set(baseaddress_kernel32 0x7c700000) set(baseaddress_ntdll 0x7c900000) +set(baseaddress_kernel32 0x7ca10000) +set(baseaddress_user32 0x7cbf0000) +set(baseaddress_gdi32 0x7cdd0000) +set(baseaddress_comctl32 0x7ce60000) +set(baseaddress_comdlg32 0x7d010000) +set(baseaddress_shlwapi 0x7d110000) +set(baseaddress_urlmon 0x7d1e0000) +set(baseaddress_ws2_32 0x7d2f0000) +set(baseaddress_syssetup 0x7d340000) set(baseaddress_query 0x7d9a0000) set(baseaddress_hhctrl 0x7e410000) set(baseaddress_sxs 0x7e690000) set(baseaddress_beepmidi 0x7ef00000) -set(baseaddress_freetype 0x7f000000)

1 0

[janderwald] 50036: [AUDIO-BRINGUP] - Implement SwDispatchPower
by janderwald＠svn.reactos.org 16 Dec '10

16 Dec '10

Author: janderwald Date: Thu Dec 16 11:56:12 2010 New Revision: 50036 URL: http://svn.reactos.org/svn/reactos?rev=50036&view=rev Log: [AUDIO-BRINGUP] - Implement SwDispatchPower Modified: branches/audio-bringup/drivers/ksfilter/swenum/swenum.c Modified: branches/audio-bringup/drivers/ksfilter/swenum/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/swenum/swenum.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/swenum/swenum.c [iso-8859-1] Thu Dec 16 11:56:12 2010 @@ -18,8 +18,56 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - - UNIMPLEMENTED; + NTSTATUS Status, PnpStatus; + BOOLEAN ChildDevice; + PIO_STACK_LOCATION IoStack; + PDEVICE_OBJECT PnpDeviceObject = NULL; + + /* get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* check if the device object is a child device */ + Status = KsIsBusEnumChildDevice(DeviceObject, &ChildDevice); + + /* get bus enum pnp object */ + PnpStatus = KsGetBusEnumPnpDeviceObject(DeviceObject, &PnpDeviceObject); + + /* check for success */ + if (!NT_SUCCESS(Status) || !NT_SUCCESS(PnpStatus)) + { + /* start next power irp */ + PoStartNextPowerIrp(Irp); + + /* just complete the irp */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* complete the irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ + return STATUS_SUCCESS; + } + + if (IoStack->MinorFunction == IRP_MN_SET_POWER || IoStack->MinorFunction == IRP_MN_QUERY_POWER) + { + /* fake success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + } + + if (!ChildDevice) + { + /* forward to pnp device object */ + PoStartNextPowerIrp(Irp); + + /* skip current location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* done */ + return PoCallDriver(PnpDeviceObject, Irp); + } + + /* start next power irp */ + PoStartNextPowerIrp(Irp); /* just complete the irp */ Irp->IoStatus.Status = STATUS_SUCCESS; @@ -29,7 +77,6 @@ /* done */ return STATUS_SUCCESS; - } NTSTATUS

1 0

[janderwald] 50035: [AUDIO-BRINGUP] - Fix several bugs in SwDispatchPnp routine - Routine did not complete requests, when KsServiceBusEnumPnpRequest successfully handled the request - Software bus ...
by janderwald＠svn.reactos.org 16 Dec '10

16 Dec '10

Author: janderwald Date: Thu Dec 16 11:10:45 2010 New Revision: 50035 URL: http://svn.reactos.org/svn/reactos?rev=50035&view=rev Log: [AUDIO-BRINGUP] - Fix several bugs in SwDispatchPnp routine - Routine did not complete requests, when KsServiceBusEnumPnpRequest successfully handled the request - Software bus driver did not handle resource lists irps - Software bus driver did not support querying pnp device state - Software bus driver leaked the irp for IOCTL_SWENUM_GET_BUS_ID requests in SwDispatchDeviceControl - Software bus driver is now successfully initializes in XP and audio devices are present Modified: branches/audio-bringup/drivers/ksfilter/swenum/swenum.c Modified: branches/audio-bringup/drivers/ksfilter/swenum/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/swenum/swenum.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/swenum/swenum.c [iso-8859-1] Thu Dec 16 11:10:45 2010 @@ -43,6 +43,9 @@ PIO_STACK_LOCATION IoStack; PDEVICE_OBJECT PnpDeviceObject = NULL; + /* get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + /* check if the device object is a child device */ Status = KsIsBusEnumChildDevice(DeviceObject, &ChildDevice); @@ -55,10 +58,30 @@ return Status; } + DPRINT1("SwDispatchPnp ChildDevice %u Request %x\n", ChildDevice, IoStack->MinorFunction); + /* let ks handle it */ Status = KsServiceBusEnumPnpRequest(DeviceObject, Irp); - if (!NT_SUCCESS(Status)) + /* check if the request was for a pdo */ + if (!ChildDevice) + { + if (Status != STATUS_NOT_SUPPORTED) + { + /* store result */ + Irp->IoStatus.Status = Status; + } + + /* complete request */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ + return Status; + } + + DPRINT1("SwDispatchPnp KsServiceBusEnumPnpRequest Status %x\n", Status); + + if (NT_SUCCESS(Status)) { /* invalid request or not supported */ Irp->IoStatus.Status = Status; @@ -69,6 +92,8 @@ /* get bus enum pnp object */ Status = KsGetBusEnumPnpDeviceObject(DeviceObject, &PnpDeviceObject); + DPRINT1("SwDispatchPnp KsGetBusEnumPnpDeviceObject Status %x\n", Status); + /* check for success */ if (!NT_SUCCESS(Status)) { @@ -89,11 +114,49 @@ /* delete the device */ IoDeleteDevice(DeviceObject); } - - /* skip current location */ - IoSkipCurrentIrpStackLocation(Irp); - /* call the pnp device object */ - return IoCallDriver(PnpDeviceObject, Irp); + else + { + if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCES || IoStack->MinorFunction == IRP_MN_QUERY_RESOURCE_REQUIREMENTS) + { + /* no resources required */ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip current location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* call the pnp device object */ + return IoCallDriver(PnpDeviceObject, Irp); + } + + if (IoStack->MajorFunction == IRP_MN_QUERY_PNP_DEVICE_STATE) + { + /* device cannot be disabled */ + Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip current location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* call the pnp device object */ + return IoCallDriver(PnpDeviceObject, Irp); + } + + if (Status == STATUS_NOT_SUPPORTED) + { + /* skip current location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* call the pnp device object */ + return IoCallDriver(PnpDeviceObject, Irp); + } + } + + /* complete the request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } NTSTATUS @@ -149,7 +212,7 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -158,16 +221,25 @@ { /* install interface */ Status = KsInstallBusEnumInterface(Irp); + DPRINT1("SwDispatchDeviceControl IOCTL_SWENUM_INSTALL_INTERFACE %x\n", Status); } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SWENUM_REMOVE_INTERFACE) { /* remove interface */ Status = KsRemoveBusEnumInterface(Irp); + DPRINT1("SwDispatchDeviceControl IOCTL_SWENUM_REMOVE_INTERFACE %x\n", Status); + } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SWENUM_GET_BUS_ID) { /* get bus id */ - return KsGetBusEnumIdentifier(Irp); + Status = KsGetBusEnumIdentifier(Irp); + DPRINT1("SwDispatchDeviceControl IOCTL_SWENUM_GET_BUS_ID %x\n", Status); + } + else + { + DPRINT1("SwDispatchDeviceControl Unknown IOCTL %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_INVALID_PARAMETER; } /* store result */ @@ -192,6 +264,8 @@ /* check if the device object is a child device */ Status = KsIsBusEnumChildDevice(DeviceObject, &ChildDevice); + + DPRINT1("SwDispatchCreate %x\n", Status); /* check for success */ if (NT_SUCCESS(Status)) @@ -205,6 +279,7 @@ } /* perform the create request */ Status = KsServiceBusEnumCreateRequest(DeviceObject, Irp); + DPRINT1("SwDispatchCreate %x\n", Status); } /* check the irp is pending */ @@ -246,7 +321,6 @@ PDEVICE_OBJECT FunctionalDeviceObject; DPRINT1("SWENUM AddDevice\n"); - DbgBreakPoint(); /* create the device */ Status = IoCreateDevice(DriverObject, sizeof(KSDEVICE_HEADER), NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &FunctionalDeviceObject); @@ -307,7 +381,6 @@ DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = SwDispatchSystemControl; DPRINT1("SWENUM loaded\n"); - DbgBreakPoint(); return STATUS_SUCCESS; }

1 0

[janderwald] 50034: [AUDIO-BRINGUP] - Trying to activate the software bus driver. Needs more work
by janderwald＠svn.reactos.org 16 Dec '10

16 Dec '10

Author: janderwald Date: Thu Dec 16 09:09:43 2010 New Revision: 50034 URL: http://svn.reactos.org/svn/reactos?rev=50034&view=rev Log: [AUDIO-BRINGUP] - Trying to activate the software bus driver. Needs more work Modified: branches/audio-bringup/boot/bootdata/hivesys_i386.inf branches/audio-bringup/boot/bootdata/packages/reactos.dff branches/audio-bringup/boot/bootdata/txtsetup.sif branches/audio-bringup/drivers/ksfilter/directory.rbuild branches/audio-bringup/drivers/ksfilter/swenum/swenum.c branches/audio-bringup/media/inf/machine.inf Modified: branches/audio-bringup/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/boot/bootdata/hiv… ============================================================================== --- branches/audio-bringup/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/audio-bringup/boot/bootdata/hivesys_i386.inf [iso-8859-1] Thu Dec 16 09:09:43 2010 @@ -1254,6 +1254,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ImagePath",0x00020000,"system32\drivers\packet.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x00000001 + +; Software BUS Driver +HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","Group",0x00000000,"Boot Bus +HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","Tag",0x00010001,0x00000002 ; PCI Bus driver HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001 Modified: branches/audio-bringup/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/boot/bootdata/pac… ============================================================================== --- branches/audio-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/audio-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Dec 16 09:09:43 2010 @@ -514,6 +514,7 @@ drivers\input\sermouse\sermouse.sys 2 drivers\ksfilter\ks\ks.sys 2 +drivers\ksfilter\swenum\swenum.sys 2 ;drivers\multimedia\bdasup\bdasup.sys 2 drivers\network\afd\afd.sys 2 Modified: branches/audio-bringup/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/boot/bootdata/txt… ============================================================================== --- branches/audio-bringup/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/audio-bringup/boot/bootdata/txtsetup.sif [iso-8859-1] Thu Dec 16 09:09:43 2010 @@ -36,6 +36,7 @@ l_intl.nls=,,,,,,,,,,,,2 ntfs.sys=,,,,,,,,,,,,4 pci.sys=,,,,,,,,,,,,4 +swenum.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 @@ -47,11 +48,13 @@ *PNP0C08 = acpi ;PCI\CC_0601 = isapnp PCI\CC_0604 = pci +ROOT\SWENUM = swenum [BootBusExtenders.Load] acpi = acpi.sys pci = pci.sys isapnp = isapnp.sys +swenum = swenum.sys [Cabinets] Cabinet=reactos.cab Modified: branches/audio-bringup/drivers/ksfilter/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/directory.rbuild [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/directory.rbuild [iso-8859-1] Thu Dec 16 09:09:43 2010 @@ -4,8 +4,8 @@ <directory name="ks"> <xi:include href="ks/ks.rbuild" /> </directory> -  + </directory> </group> Modified: branches/audio-bringup/drivers/ksfilter/swenum/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/swenum/swenum.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/swenum/swenum.c [iso-8859-1] Thu Dec 16 09:09:43 2010 @@ -245,6 +245,9 @@ NTSTATUS Status; PDEVICE_OBJECT FunctionalDeviceObject; + DPRINT1("SWENUM AddDevice\n"); + DbgBreakPoint(); + /* create the device */ Status = IoCreateDevice(DriverObject, sizeof(KSDEVICE_HEADER), NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &FunctionalDeviceObject); @@ -303,7 +306,8 @@ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = SwDispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = SwDispatchSystemControl; - + DPRINT1("SWENUM loaded\n"); + DbgBreakPoint(); return STATUS_SUCCESS; } Modified: branches/audio-bringup/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/media/inf/machine… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 50033: [CMAKE] - Arty: Add usermode addresses translation support. WIP.
by akhaldi＠svn.reactos.org 15 Dec '10

15 Dec '10

Author: akhaldi Date: Wed Dec 15 23:37:54 2010 New Revision: 50033 URL: http://svn.reactos.org/svn/reactos?rev=50033&view=rev Log: [CMAKE] - Arty: Add usermode addresses translation support. WIP. Modified: branches/cmake-bringup/lib/rossym/delete.c branches/cmake-bringup/lib/rossym/dwarf.h branches/cmake-bringup/lib/rossym/dwarfinfo.c branches/cmake-bringup/lib/rossym/dwarfopen.c branches/cmake-bringup/lib/rossym/dwarfpc.c branches/cmake-bringup/lib/rossym/fromfile.c branches/cmake-bringup/lib/rossym/initum.c branches/cmake-bringup/lib/rossym/pe.c branches/cmake-bringup/lib/rossym/zwfile.c branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c Modified: branches/cmake-bringup/lib/rossym/delete.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/delete… ============================================================================== --- branches/cmake-bringup/lib/rossym/delete.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/delete.c [iso-8859-1] Wed Dec 15 23:37:54 2010 @@ -22,11 +22,6 @@ VOID RosSymDelete(PROSSYM_INFO RosSymInfo) { - int i; - for (i = 0; i < RosSymInfo->pe->nsections; i++) { - RtlFreeAnsiString(ANSI_NAME_STRING(&RosSymInfo->pe->sect[i])); - } - RosSymFreeMem(RosSymInfo->pe->sect); dwarfclose(RosSymInfo); } Modified: branches/cmake-bringup/lib/rossym/dwarf.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarf.… ============================================================================== --- branches/cmake-bringup/lib/rossym/dwarf.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/dwarf.h [iso-8859-1] Wed Dec 15 23:37:54 2010 @@ -252,7 +252,7 @@ uchar framebase; uchar friend; uchar highpc; - uchar entrypc; + uchar entrypc; uchar identifiercase; uchar import; uchar inlined; @@ -315,7 +315,7 @@ DwarfVal framebase; ulong friend; ulong highpc; - ulong entrypc; + ulong entrypc; ulong identifiercase; ulong import; ulong inlined; Modified: branches/cmake-bringup/lib/rossym/dwarfinfo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfi… ============================================================================== --- branches/cmake-bringup/lib/rossym/dwarfinfo.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/dwarfinfo.c [iso-8859-1] Wed Dec 15 23:37:54 2010 @@ -366,7 +366,7 @@ { DwarfAttrFrameBase, OFFSET(framebase), TBlock|TConstant }, { DwarfAttrFriend, OFFSET(friend), TReference }, { DwarfAttrHighpc, OFFSET(highpc), TAddress }, - { DwarfAttrEntrypc, OFFSET(entrypc), TAddress }, + { DwarfAttrEntrypc, OFFSET(entrypc), TAddress }, { DwarfAttrIdentifierCase, OFFSET(identifiercase), TConstant }, { DwarfAttrImport, OFFSET(import), TReference }, { DwarfAttrInline, OFFSET(inlined), TConstant }, Modified: branches/cmake-bringup/lib/rossym/dwarfopen.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfo… ============================================================================== --- branches/cmake-bringup/lib/rossym/dwarfopen.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/dwarfopen.c [iso-8859-1] Wed Dec 15 23:37:54 2010 @@ -40,6 +40,7 @@ return d; err: + DPRINT("Failed to open dwarf\n"); free(d->abbrev.data); free(d->aranges.data); free(d->frame.data); Modified: branches/cmake-bringup/lib/rossym/dwarfpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfp… ============================================================================== --- branches/cmake-bringup/lib/rossym/dwarfpc.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/dwarfpc.c [iso-8859-1] Wed Dec 15 23:37:54 2010 @@ -50,7 +50,7 @@ { uchar *prog, *opcount, *end, *dirs; ulong off, unit, len, vers, x, start, lastline; - int i, first, op, a, l, quantum, isstmt, linebase, linerange, opcodebase, nf; + int i, first, firstline, op, a, l, quantum, isstmt, linebase, linerange, opcodebase, nf; char *files, *s; DwarfBuf b; DwarfSym sym; @@ -150,6 +150,7 @@ if(trace) werrstr("program @ %lu ... %.*H opbase = %d\n", b.p - d->line.data, b.ep-b.p, b.p, opcodebase); first = 1; while(b.p != nil){ + firstline = 0; op = dwarfget1(&b); if(trace) werrstr("\tline %lu, addr 0x%x, op %d %.10H", cur.line, cur.addr, op, b.p); if(op >= opcodebase){ @@ -162,12 +163,16 @@ if(first){ if(cur.addr > pc){ werrstr("found wrong line mapping 0x%x for pc 0x%x", cur.addr, pc); - goto out; + /* This is an overzealous check. gcc can produce discontiguous ranges + and reorder statements, so it's possible for a future line to start + ahead of pc and still find a matching one. */ + /*goto out;*/ + firstline = 1; } first = 0; start = cur.addr; } - if(cur.addr > pc) + if(cur.addr > pc && !firstline) break; if(b.p == nil){ werrstr("buffer underflow in line mapping"); Modified: branches/cmake-bringup/lib/rossym/fromfile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/fromfi… ============================================================================== --- branches/cmake-bringup/lib/rossym/fromfile.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/fromfile.c [iso-8859-1] Wed Dec 15 23:37:54 2010 @@ -20,6 +20,8 @@ #define NDEBUG #include <debug.h> +extern NTSTATUS RosSymStatus; + BOOLEAN RosSymCreateFromFile(PVOID FileContext, PROSSYM_INFO *RosSymInfo) { @@ -30,10 +32,14 @@ unsigned SymbolTable, NumSymbols; /* Load DOS header */ - DPRINT("About to read file\n"); + if (! RosSymSeekFile(FileContext, 0)) + { + DPRINT1("Could not rewind file\n"); + return FALSE; + } if (! RosSymReadFile(FileContext, &DosHeader, sizeof(IMAGE_DOS_HEADER))) { - DPRINT1("Failed to read DOS header\n"); + DPRINT1("Failed to read DOS header %x\n", RosSymStatus); return FALSE; } if (! ROSSYM_IS_VALID_DOS_HEADER(&DosHeader)) @@ -70,6 +76,7 @@ DPRINT1("Failed seeking to section headers\n"); return FALSE; } + DPRINT("Alloc section headers\n"); SectionHeaders = RosSymAllocMem(NtHeaders.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER)); if (NULL == SectionHeaders) @@ -178,7 +185,9 @@ pe->imagebase = pe->loadbase = NtHeaders.OptionalHeader.ImageBase; pe->imagesize = NtHeaders.OptionalHeader.SizeOfImage; pe->loadsection = loaddisksection; + DPRINT("do dwarfopen\n"); *RosSymInfo = dwarfopen(pe); + DPRINT("done %x\n", *RosSymInfo); return TRUE; Modified: branches/cmake-bringup/lib/rossym/initum.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/initum… ============================================================================== --- branches/cmake-bringup/lib/rossym/initum.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/initum.c [iso-8859-1] Wed Dec 15 23:37:54 2010 @@ -7,9 +7,12 @@ * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) */ +#define WIN32_NO_STATUS #include <windows.h> #include <reactos/rossym.h> #include "rossympriv.h" +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #define NDEBUG #include <debug.h> @@ -17,13 +20,13 @@ static PVOID RosSymAllocMemUM(ULONG_PTR Size) { - return HeapAlloc(GetProcessHeap(), 0, Size); + return RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); } static VOID RosSymFreeMemUM(PVOID Area) { - HeapFree(GetProcessHeap(), 0, Area); + RtlFreeHeap(RtlGetProcessHeap(), 0, Area); } VOID Modified: branches/cmake-bringup/lib/rossym/pe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/pe.c?r… ============================================================================== --- branches/cmake-bringup/lib/rossym/pe.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/pe.c [iso-8859-1] Wed Dec 15 23:37:54 2010 @@ -111,6 +111,10 @@ for (i = 0; i < pe->nsections; i++) { RtlFreeAnsiString(ANSI_NAME_STRING(&pe->sect[i])); } + for (i = 0; i < pe->nsymbols; i++) { + free(pe->symtab[i].name); + } + free(pe->symtab); free(pe->sect); free(pe); } Modified: branches/cmake-bringup/lib/rossym/zwfile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/zwfile… ============================================================================== --- branches/cmake-bringup/lib/rossym/zwfile.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/zwfile.c [iso-8859-1] Wed Dec 15 23:37:54 2010 @@ -15,38 +15,40 @@ #define NDEBUG #include <debug.h> +NTSTATUS RosSymStatus; + BOOLEAN RosSymZwReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) { - NTSTATUS Status; + //NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; - Status = ZwReadFile(*((HANDLE *) FileContext), + RosSymStatus = ZwReadFile(*((HANDLE *) FileContext), 0, 0, 0, &IoStatusBlock, Buffer, Size, 0, 0); - return NT_SUCCESS(Status) && IoStatusBlock.Information == Size; + return NT_SUCCESS(RosSymStatus) && IoStatusBlock.Information == Size; } BOOLEAN RosSymZwSeekFile(PVOID FileContext, ULONG_PTR Position) { - NTSTATUS Status; + //NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; FILE_POSITION_INFORMATION NewPosition; NewPosition.CurrentByteOffset.u.HighPart = 0; NewPosition.CurrentByteOffset.u.LowPart = Position; - Status = ZwSetInformationFile(*((HANDLE *) FileContext), + RosSymStatus = ZwSetInformationFile(*((HANDLE *) FileContext), &IoStatusBlock, (PVOID) &NewPosition, sizeof(FILE_POSITION_INFORMATION), FilePositionInformation); - return NT_SUCCESS(Status); + return NT_SUCCESS(RosSymStatus); } /* EOF */ Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/kdb… ============================================================================== --- branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Wed Dec 15 23:37:54 2010 @@ -29,6 +29,8 @@ static BOOLEAN LoadSymbols; static LIST_ENTRY SymbolFileListHead; static KSPIN_LOCK SymbolFileListLock; +static PROSSYM_INFO KdbpRosSymInfo; +static ULONG_PTR KdbpImageBase; BOOLEAN KdbpSymbolsInitialized = FALSE; /* FUNCTIONS ****************************************************************/ @@ -124,7 +126,13 @@ KdbSymPrintAddress( IN PVOID Address) { + PMEMORY_AREA MemoryArea = NULL; + HANDLE FileHandle = NULL; + PROS_SECTION_OBJECT SectionObject; PLDR_DATA_TABLE_ENTRY LdrEntry; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING ModuleFileName; ULONG_PTR RelativeAddress; NTSTATUS Status; ULONG LineNumber; @@ -144,11 +152,79 @@ { DbgPrint("<%wZ:%x (%s:%d (%s))>", &LdrEntry->BaseDllName, RelativeAddress, FileName, LineNumber, FunctionName); - } - else - { - DbgPrint("<%wZ:%x>", &LdrEntry->BaseDllName, RelativeAddress); - } + return TRUE; + } + else if (Address < MmSystemRangeStart) + { + MemoryArea = MmLocateMemoryAreaByAddress(&PsGetCurrentProcess()->Vm, Address); + if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) + { + goto end; + } + SectionObject = MemoryArea->Data.SectionData.Section; + if (!(SectionObject->AllocationAttributes & SEC_IMAGE)) goto end; + if (SectionObject->ImageSection->ImageBase != KdbpImageBase) + { + if (KdbpRosSymInfo) + { + RosSymDelete(KdbpRosSymInfo); + KdbpRosSymInfo = NULL; + } + + Status = MmGetFileNameForAddress(Address, &ModuleFileName); + if (!NT_SUCCESS(Status)) + goto end; + + InitializeObjectAttributes + (&ObjectAttributes, + &ModuleFileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + if (!NT_SUCCESS + (ZwOpenFile + (&FileHandle, + FILE_READ_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT))) + { + goto end; + } + + if (!RosSymCreateFromFile(&FileHandle, &KdbpRosSymInfo)) + { + KdbpRosSymInfo = NULL; + } + + ZwClose(FileHandle); + KdbpImageBase = SectionObject->ImageSection->ImageBase; + } + + if (KdbpRosSymInfo) + { + RelativeAddress = (ULONG_PTR)Address - KdbpImageBase; + Status = KdbSymGetAddressInformation + (KdbpRosSymInfo, + RelativeAddress, + &LineNumber, + FileName, + FunctionName); + if (NT_SUCCESS(Status)) + { + DbgPrint + ("<%wZ:%x (%s:%d (%s))>", + &SectionObject->FileObject->FileName, + RelativeAddress, FileName, LineNumber, FunctionName); + return TRUE; + } + } + } + +end: + DbgPrint("<%wZ:%x>", &LdrEntry->BaseDllName, RelativeAddress); return TRUE; } @@ -208,8 +284,6 @@ PLIST_ENTRY CurrentEntry; KIRQL Irql; - DPRINT("Looking for cached symbol file %wZ\n", FileName); - KeAcquireSpinLock(&SymbolFileListLock, &Irql); CurrentEntry = SymbolFileListHead.Flink; @@ -217,7 +291,6 @@ { Current = CONTAINING_RECORD(CurrentEntry, IMAGE_SYMBOL_INFO_CACHE, ListEntry); - DPRINT("Current->FileName %wZ FileName %wZ\n", &Current->FileName, FileName); if (RtlEqualUnicodeString(&Current->FileName, FileName, TRUE)) { Current->RefCount++; @@ -311,7 +384,6 @@ } KeReleaseSpinLock(&SymbolFileListLock, Irql); - DPRINT1("Warning: Removing unknown symbol file: RosSymInfo = %p\n", RosSymInfo); } /*! \brief Loads a symbol file. @@ -411,7 +483,6 @@ LdrEntry->DllBase, (PVOID)(LdrEntry->SizeOfImage + (ULONG_PTR)LdrEntry->DllBase), LdrEntry->PatchInformation); - } VOID

1 0

[fireball] 50032: [NTOS] - Roel Messiant: Fix NtQueryObject to return the required buffer size if the buffer provided was too small. Unimplemented paths behaviour is preserved.
by fireball＠svn.reactos.org 15 Dec '10

15 Dec '10

Author: fireball Date: Wed Dec 15 20:12:03 2010 New Revision: 50032 URL: http://svn.reactos.org/svn/reactos?rev=50032&view=rev Log: [NTOS] - Roel Messiant: Fix NtQueryObject to return the required buffer size if the buffer provided was too small. Unimplemented paths behaviour is preserved. Modified: trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Wed Dec 15 20:12:03 2010 @@ -1549,6 +1549,7 @@ /* Information about all types */ case ObjectTypesInformation: DPRINT1("NOT IMPLEMENTED!\n"); + InfoLength = Length; Status = STATUS_NOT_IMPLEMENTED; break; @@ -1580,6 +1581,7 @@ default: /* Fail it */ + InfoLength = Length; Status = STATUS_INVALID_INFO_CLASS; break; } @@ -1588,7 +1590,7 @@ if (ResultLength) { /* Write the length */ - *ResultLength = Length; + *ResultLength = InfoLength; } } _SEH2_EXCEPT(ExSystemExceptionFilter())

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