Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 26047: Remove IopCreateDriverObject, which was buggy and duplicating IoCreateDriver functionality. Add IopCreateDriver to contain common code, called by IoCreateDriver and ex-callers of IopCreateDriverObject.
by hpoussin＠svn.reactos.org 09 Mar '07

09 Mar '07

Author: hpoussin Date: Fri Mar 9 21:14:34 2007 New Revision: 26047 URL: http://svn.reactos.org/svn/reactos?rev=26047&view=rev Log: Remove IopCreateDriverObject, which was buggy and duplicating IoCreateDriver functionality. Add IopCreateDriver to contain common code, called by IoCreateDriver and ex-callers of IopCreateDriverObject. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Fri Mar 9 21:14:34 2007 @@ -799,21 +799,16 @@ VOID ); +NTSTATUS +NTAPI +IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, + IN PDRIVER_INITIALIZE InitializationFunction, + OUT PDRIVER_OBJECT *pDriverObject); + VOID NTAPI IopDeleteDriver( IN PVOID ObjectBody -); - -NTSTATUS -FASTCALL -IopCreateDriverObject( - OUT PDRIVER_OBJECT *DriverObject, - IN PUNICODE_STRING ServiceName, - IN ULONG CreateAttributes, - IN BOOLEAN FileSystemDriver, - IN PVOID DriverImageStart, - IN ULONG DriverImageSize ); NTSTATUS Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri Mar 9 21:14:34 2007 @@ -83,7 +83,7 @@ if (DriverObject->DriverExtension->ServiceKeyName.Buffer) { /* Free it */ - ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); + //ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); } } @@ -96,7 +96,6 @@ PDRIVER_OBJECT Object; WCHAR NameBuffer[MAX_PATH]; UNICODE_STRING DriverName; - OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; DPRINT("IopOpenDriverObject(%p '%wZ' %x)\n", @@ -121,18 +120,10 @@ DPRINT("Driver name: '%wZ'\n", &DriverName); - /* Initialize ObjectAttributes for driver object */ - InitializeObjectAttributes( - &ObjectAttributes, - &DriverName, - OBJ_OPENIF | OBJ_KERNEL_HANDLE, - NULL, - NULL); - /* Open driver object */ Status = ObReferenceObjectByName( &DriverName, - 0, /* Attributes */ + OBJ_OPENIF | OBJ_KERNEL_HANDLE, /* Attributes */ NULL, /* PassedAccessState */ 0, /* DesiredAccess */ IoDriverObjectType, @@ -142,116 +133,6 @@ if (!NT_SUCCESS(Status)) return Status; - - *DriverObject = Object; - - return STATUS_SUCCESS; -} - -NTSTATUS FASTCALL -IopCreateDriverObject( - PDRIVER_OBJECT *DriverObject, - PUNICODE_STRING ServiceName, - ULONG CreateAttributes, - BOOLEAN FileSystem, - PVOID DriverImageStart, - ULONG DriverImageSize) -{ - PDRIVER_OBJECT Object; - WCHAR NameBuffer[MAX_PATH]; - UNICODE_STRING DriverName; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - ULONG i; - PWSTR Buffer = NULL; - - DPRINT("IopCreateDriverObject(%p '%wZ' %x %p %x)\n", - DriverObject, ServiceName, FileSystem, DriverImageStart, DriverImageSize); - - *DriverObject = NULL; - - /* Create ModuleName string */ - if (ServiceName != NULL && ServiceName->Buffer != NULL) - { - if (FileSystem == TRUE) - wcscpy(NameBuffer, FILESYSTEM_ROOT_NAME); - else - wcscpy(NameBuffer, DRIVER_ROOT_NAME); - wcscat(NameBuffer, ServiceName->Buffer); - - RtlInitUnicodeString(&DriverName, NameBuffer); - DPRINT("Driver name: '%wZ'\n", &DriverName); - - Buffer = (PWSTR)ExAllocatePool(PagedPool, DriverName.Length + sizeof(WCHAR)); - /* If we don't success, it is not a problem. Our driver - * object will not have associated driver name... */ - } - else - { - RtlInitUnicodeString(&DriverName, NULL); - } - - /* Initialize ObjectAttributes for driver object */ - InitializeObjectAttributes( - &ObjectAttributes, - &DriverName, - CreateAttributes | OBJ_PERMANENT, - NULL, - NULL); - - /* Create driver object */ - Status = ObCreateObject( - KernelMode, - IoDriverObjectType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(DRIVER_OBJECT), - 0, - 0, - (PVOID*)&Object); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - /* Create driver extension */ - Object->DriverExtension = (PDRIVER_EXTENSION) - ExAllocatePoolWithTag( - NonPagedPool, - sizeof(EXTENDED_DRIVER_EXTENSION), - TAG_DRIVER_EXTENSION); - - if (Object->DriverExtension == NULL) - { - return STATUS_NO_MEMORY; - } - - RtlZeroMemory(Object->DriverExtension, sizeof(EXTENDED_DRIVER_EXTENSION)); - - Object->Type = IO_TYPE_DRIVER; - - for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - Object->MajorFunction[i] = IopInvalidDeviceRequest; - - Object->HardwareDatabase = &IopHardwareDatabaseKey; - - Object->DriverStart = DriverImageStart; - Object->DriverSize = DriverImageSize; - if (Buffer) - { - if (!Object->DriverName.Buffer) - { - Object->DriverName.Buffer = Buffer; - Object->DriverName.Length = DriverName.Length; - Object->DriverName.MaximumLength = DriverName.Length + sizeof(WCHAR); - RtlCopyMemory(Object->DriverName.Buffer, DriverName.Buffer, DriverName.Length); - Object->DriverName.Buffer[Object->DriverName.Length / sizeof(WCHAR)] = L'\0'; - } - else - ExFreePool(Buffer); - } *DriverObject = Object; @@ -457,6 +338,13 @@ return Status; } +static NTSTATUS +NTAPI +IopDriverInitializeEmpty(IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath) +{ + return STATUS_SUCCESS; +} + /* * IopInitializeDriverModule * @@ -490,6 +378,8 @@ OUT PDRIVER_OBJECT *DriverObject) { const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; + WCHAR NameBuffer[MAX_PATH]; + UNICODE_STRING DriverName; UNICODE_STRING RegistryKey; PDRIVER_INITIALIZE DriverEntry; PDRIVER_OBJECT Driver; @@ -515,19 +405,34 @@ RtlInitUnicodeString(&RegistryKey, NULL); } - Status = IopCreateDriverObject( - &Driver, - ServiceName, - 0, - FileSystemDriver, - ModuleObject->DllBase, - ModuleObject->SizeOfImage); + /* Create ModuleName string */ + if (ServiceName && ServiceName->Length > 0) + { + if (FileSystemDriver == TRUE) + wcscpy(NameBuffer, FILESYSTEM_ROOT_NAME); + else + wcscpy(NameBuffer, DRIVER_ROOT_NAME); + wcscat(NameBuffer, ServiceName->Buffer); + + RtlInitUnicodeString(&DriverName, NameBuffer); + DPRINT("Driver name: '%wZ'\n", &DriverName); + Status = IopCreateDriver(&DriverName, IopDriverInitializeEmpty, &Driver); + } + else + { + Status = IopCreateDriver(NULL, IopDriverInitializeEmpty, &Driver); + } + *DriverObject = Driver; if (!NT_SUCCESS(Status)) { - DPRINT("IopCreateDriverObject failed (Status %x)\n", Status); + DPRINT("IopCreateDriver() failed (Status 0x%08lx)\n", Status); return Status; } + + Driver->HardwareDatabase = &IopHardwareDatabaseKey; + Driver->DriverStart = ModuleObject->DllBase; + Driver->DriverSize = ModuleObject->SizeOfImage; DPRINT("RegistryKey: %wZ\n", &RegistryKey); DPRINT("Calling driver entrypoint at %08lx\n", DriverEntry); @@ -1202,15 +1107,11 @@ } } -/* PUBLIC FUNCTIONS ***********************************************************/ - -/* - * @implemented - */ NTSTATUS NTAPI -IoCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, - IN PDRIVER_INITIALIZE InitializationFunction) +IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, + IN PDRIVER_INITIALIZE InitializationFunction, + OUT PDRIVER_OBJECT *pDriverObject) { WCHAR NameBuffer[100]; USHORT NameLength; @@ -1338,9 +1239,28 @@ ObMakeTemporaryObject(DriverObject); ObDereferenceObject(DriverObject); } + else + { + /* Returns to caller the object */ + *pDriverObject = DriverObject; + } /* Return the Status */ return Status; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +IoCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, + IN PDRIVER_INITIALIZE InitializationFunction) +{ + PDRIVER_OBJECT DriverObject; + return IopCreateDriver(DriverName, InitializationFunction, &DriverObject); } /* Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Fri Mar 9 21:14:34 2007 @@ -3248,6 +3248,13 @@ } } +static NTSTATUS INIT_FUNCTION +NTAPI +PnpDriverInitializeEmpty(IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath) +{ + return STATUS_SUCCESS; +} + VOID INIT_FUNCTION PnpInit(VOID) { @@ -3275,7 +3282,7 @@ * Create root device node */ - Status = IopCreateDriverObject(&IopRootDriverObject, NULL, 0, FALSE, NULL, 0); + Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, &IopRootDriverObject); if (!NT_SUCCESS(Status)) { CPRINT("IoCreateDriverObject() failed\n");

1 0

[ion] 26046: - Fix building the BootCD.
by ion＠svn.reactos.org 09 Mar '07

09 Mar '07

Author: ion Date: Fri Mar 9 11:31:05 2007 New Revision: 26046 URL: http://svn.reactos.org/svn/reactos?rev=26046&view=rev Log: - Fix building the BootCD. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Mar 9 11:31:05 2007 @@ -36,16 +36,10 @@ base\applications\cmdutils\find\find.exe 1 base\applications\cmdutils\more\more.exe 1 base\applications\control\control.exe 1 -base\applications\devmgr\devmgrapp.exe 1 base\applications\mscutils\devmgmt\devmgmt.exe 1 -base\applications\downloader\downloader.exe 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\winemine\winemine.exe 1 -base\applications\getfirefox\getfirefox.exe 1 -;base\applications\gettype\gettype.exe 1 base\applications\hostname\hostname.exe 1 -base\applications\ibrowser\ibrowser.exe 1 -base\applications\imagesoft\imagesoft.exe 1 base\applications\msconfig\msconfig.exe 1 base\applications\network\arp\arp.exe 1 base\applications\network\route\route.exe 1 @@ -60,19 +54,13 @@ base\applications\notepad\notepad.exe 1 base\applications\regedit\regedit.exe 4 base\applications\regedit\clb\clb.dll 1 -;base\applications\reporterror\reporterror.exe 1 base\applications\sc\sc.exe 1 -base\applications\screenshot\screenshot.exe 1 base\applications\screensavers\matrix\matrix.scr 1 base\applications\mscutils\servman\servman.exe 1 base\applications\shutdown\shutdown.exe 1 -base\applications\sm\sm.exe 1 base\applications\sndvol32\sndvol32.exe 1 base\applications\taskmgr\taskmgr.exe 1 -;base\applications\utils\rosperf\rosperf.exe 1 -;base\applications\utils\ps\ps.exe 1 -base\applications\winefile\winefile.exe 1 -;base\applications\winver\winver.exe 1 +base\applications\winver\winver.exe 1 base\applications\wordpad\wordpad.exe 1 base\services\dhcp\dhcp.exe 1

1 0

[hpoussin] 26045: Do not access to not initialized variable
by hpoussin＠svn.reactos.org 08 Mar '07

08 Mar '07

Author: hpoussin Date: Fri Mar 9 01:50:48 2007 New Revision: 26045 URL: http://svn.reactos.org/svn/reactos?rev=26045&view=rev Log: Do not access to not initialized variable Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Fri Mar 9 01:50:48 2007 @@ -2887,6 +2887,7 @@ DPRINT("ZwQueryValueKey() failed with status 0x%08lx\n", Status); goto nextdevice; } + ValueName.Length = ValueName.MaximumLength = 0; } else if (pValueInformation->Type != REG_SZ) {

1 0

[fireball] 26044: Add lake.bmp as a default wallpaper in 0.3.1.
by fireball＠svn.reactos.org 08 Mar '07

08 Mar '07

Author: fireball Date: Fri Mar 9 00:50:58 2007 New Revision: 26044 URL: http://svn.reactos.org/svn/reactos?rev=26044&view=rev Log: Add lake.bmp as a default wallpaper in 0.3.1. Modified: branches/ros-branch-0_3_1/reactos/boot/bootdata/hivedef.inf branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff branches/ros-branch-0_3_1/reactos/modules/directory.rbuild Modified: branches/ros-branch-0_3_1/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_1/reactos/boot/bootdata/hivedef.inf (original) +++ branches/ros-branch-0_3_1/reactos/boot/bootdata/hivedef.inf Fri Mar 9 00:50:58 2007 @@ -20,7 +20,8 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"C:\ReactOS\System32\Lake.bmp" +HKCU,"Control Panel\Desktop","WallpaperStyle",0x00010001,0x00000000 HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409" Modified: branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff (original) +++ branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff Fri Mar 9 00:50:58 2007 @@ -466,3 +466,4 @@ modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional modules\rosapps\sysutils\tcat\cat.exe 1 optional modules\rosapps\sysutils\tlist\tlist.exe 1 optional +modules\wallpaper\lake.bmp 1 optional Modified: branches/ros-branch-0_3_1/reactos/modules/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/module… ============================================================================== --- branches/ros-branch-0_3_1/reactos/modules/directory.rbuild (original) +++ branches/ros-branch-0_3_1/reactos/modules/directory.rbuild Fri Mar 9 00:50:58 2007 @@ -34,6 +34,13 @@ </xi:fallback> </xi:include> </directory> + <directory name="wallpaper"> + <xi:include href="wallpaper/directory.rbuild"> + <xi:fallback> + <xi:include href="empty.rbuild" /> + </xi:fallback> + </xi:include> + </directory> <directory name="windows"> <xi:include href="windows/directory.rbuild"> <xi:fallback>

1 0

[fireball] 26043: Add bitmap version of the Lake wallpaper and directory.rbuild. trunk/wallpaper is to be checked out into the "modules" directory! (so it can be optional)
by fireball＠svn.reactos.org 08 Mar '07

08 Mar '07

Author: fireball Date: Fri Mar 9 00:45:10 2007 New Revision: 26043 URL: http://svn.reactos.org/svn/reactos?rev=26043&view=rev Log: Add bitmap version of the Lake wallpaper and directory.rbuild. trunk/wallpaper is to be checked out into the "modules" directory! (so it can be optional) Added: trunk/wallpaper/directory.rbuild (with props) trunk/wallpaper/lake.bmp (with props) Added: trunk/wallpaper/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/directory.rbuild?rev=260… ============================================================================== --- trunk/wallpaper/directory.rbuild (added) +++ trunk/wallpaper/directory.rbuild Fri Mar 9 00:45:10 2007 @@ -1,0 +1,3 @@ +<group> + <installfile base="system32">lake.bmp</installfile> +</group> Propchange: trunk/wallpaper/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/wallpaper/lake.bmp URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/lake.bmp?rev=26043&view=… ============================================================================== Binary file - no diff available. Propchange: trunk/wallpaper/lake.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[greatlrd] 26042: wallpaper from harteex
by greatlrd＠svn.reactos.org 08 Mar '07

08 Mar '07

Author: greatlrd Date: Fri Mar 9 00:02:53 2007 New Revision: 26042 URL: http://svn.reactos.org/svn/reactos?rev=26042&view=rev Log: wallpaper from harteex Added: trunk/wallpaper/ReadMe.txt (with props) trunk/wallpaper/clouds.jpg (with props) trunk/wallpaper/lake.jpg (with props) Added: trunk/wallpaper/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/ReadMe.txt?rev=26042&vie… ============================================================================== --- trunk/wallpaper/ReadMe.txt (added) +++ trunk/wallpaper/ReadMe.txt Fri Mar 9 00:02:53 2007 @@ -1,0 +1,10 @@ +wallpaper + +posten in ReactOS Forum May 17, 2006 7:31 pm +cluds.jpg +Copyright by Andreas Bjerkeholt (harteex at gmail dot com) + +lake.jpg +Copyright by Andreas Bjerkeholt (harteex at gmail dot com) + + Propchange: trunk/wallpaper/ReadMe.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/wallpaper/clouds.jpg URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/clouds.jpg?rev=26042&vie… ============================================================================== Binary file - no diff available. Propchange: trunk/wallpaper/clouds.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/wallpaper/lake.jpg URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/lake.jpg?rev=26042&view=… ============================================================================== Binary file - no diff available. Propchange: trunk/wallpaper/lake.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[greatlrd] 26041: Created folder wallpaper remotely for adding diffrent offical wallpaper
by greatlrd＠svn.reactos.org 08 Mar '07

08 Mar '07

Author: greatlrd Date: Thu Mar 8 23:27:14 2007 New Revision: 26041 URL: http://svn.reactos.org/svn/reactos?rev=26041&view=rev Log: Created folder wallpaper remotely for adding diffrent offical wallpaper Added: trunk/wallpaper/

1 0

[tretiakov] 26040: ReEnable assert (as Alex suggested)
by tretiakov＠svn.reactos.org 08 Mar '07

08 Mar '07

Author: tretiakov Date: Thu Mar 8 23:09:50 2007 New Revision: 26040 URL: http://svn.reactos.org/svn/reactos?rev=26040&view=rev Log: ReEnable assert (as Alex suggested) Modified: trunk/reactos/ntoskrnl/ex/fmutex.c Modified: trunk/reactos/ntoskrnl/ex/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fmutex.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fmutex.c (original) +++ trunk/reactos/ntoskrnl/ex/fmutex.c Thu Mar 8 23:09:50 2007 @@ -28,13 +28,13 @@ /* Enter the Critical Region */ KeEnterCriticalRegion(); - /* + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || (Thread == NULL) || (Thread->CombinedApcDisable != 0) || (Thread->Teb == NULL) || (Thread->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); - */ + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || (Thread == NULL) || (Thread->CombinedApcDisable != 0)); @@ -59,14 +59,14 @@ FASTCALL ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(PFAST_MUTEX FastMutex) { - /* + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || (KeGetCurrentThread() == NULL) || (KeGetCurrentThread()->CombinedApcDisable != 0) || (KeGetCurrentThread()->Teb == NULL) || (KeGetCurrentThread()->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); - */ + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || (KeGetCurrentThread() == NULL) || (KeGetCurrentThread()->CombinedApcDisable != 0));

1 0

[tretiakov] 26039: Forget to enter critical region
by tretiakov＠svn.reactos.org 08 Mar '07

08 Mar '07

Author: tretiakov Date: Thu Mar 8 22:45:32 2007 New Revision: 26039 URL: http://svn.reactos.org/svn/reactos?rev=26039&view=rev Log: Forget to enter critical region Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Thu Mar 8 22:45:32 2007 @@ -82,15 +82,18 @@ VOID FASTCALL UserEnterShared(VOID) { + KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&UserLock, TRUE); } VOID FASTCALL UserEnterExclusive(VOID) { + KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&UserLock, TRUE); } VOID FASTCALL UserLeave(VOID) { ExReleaseResourceLite(&UserLock); + KeLeaveCriticalRegion(); }

1 0

[tretiakov] 26038: Fix build: - Add missing function protype. - Move IntSetupClipboard to winsta.c
by tretiakov＠svn.reactos.org 08 Mar '07

08 Mar '07

Author: tretiakov Date: Thu Mar 8 22:44:36 2007 New Revision: 26038 URL: http://svn.reactos.org/svn/reactos?rev=26038&view=rev Log: Fix build: - Add missing function protype. - Move IntSetupClipboard to winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/clipboard.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/clipboard.h Thu Mar 8 22:44:36 2007 @@ -40,6 +40,9 @@ } CLIPBOARDSYSTEM, *PCLIPBOARDSYSTEM; +VOID FASTCALL +IntClipboardFreeWindow(PWINDOW_OBJECT window); + /* UINT FASTCALL IntEnumClipboardFormats(UINT format); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Thu Mar 8 22:44:36 2007 @@ -1202,17 +1202,6 @@ return sn; } -BOOL FASTCALL -IntSetupClipboard(PWINSTATION_OBJECT WinStaObj) -{ - WinStaObj->Clipboard = ExAllocatePool(PagedPool, sizeof(CLIPBOARDSYSTEM)); - if (WinStaObj->Clipboard) - { - RtlZeroMemory(WinStaObj->Clipboard, sizeof(CLIPBOARDSYSTEM)); - return TRUE; - } - return FALSE; -} /**************** VISTA FUNCTIONS******************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Thu Mar 8 22:44:36 2007 @@ -55,6 +55,7 @@ WINSTA_READATTRIBUTES | WINSTA_READSCREEN | WINSTA_WRITEATTRIBUTES }; + NTSTATUS FASTCALL InitWindowStationImpl(VOID) { @@ -90,6 +91,18 @@ CleanupWindowStationImpl(VOID) { return STATUS_SUCCESS; +} + +BOOL FASTCALL +IntSetupClipboard(PWINSTATION_OBJECT WinStaObj) +{ + WinStaObj->Clipboard = ExAllocatePool(PagedPool, sizeof(CLIPBOARDSYSTEM)); + if (WinStaObj->Clipboard) + { + RtlZeroMemory(WinStaObj->Clipboard, sizeof(CLIPBOARDSYSTEM)); + return TRUE; + } + return FALSE; } /* OBJECT CALLBACKS **********************************************************/

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