Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 29374: - Silence badly placed debug message. DPRINT1 equals FIXME and ERR, but not TRACE!
by fireball＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: fireball Date: Wed Oct 3 16:01:13 2007 New Revision: 29374 URL: http://svn.reactos.org/svn/reactos?rev=29374&view=rev Log: - Silence badly placed debug message. DPRINT1 equals FIXME and ERR, but not TRACE! Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Wed Oct 3 16:01:13 2007 @@ -1505,8 +1505,8 @@ { NTSTATUS Status = STATUS_SUCCESS; - /* remove this when all spi are implement */ - DPRINT1("UserSystemParametersInfo_StructSet SPI Action 0x%x (uiParam: 0x%x, fWinIni: 0x%x)\n",uiAction, uiParam, fWinIni); + DPRINT("UserSystemParametersInfo_StructSet SPI Action 0x%x (uiParam: 0x%x, fWinIni: 0x%x)\n", + uiAction, uiParam, fWinIni); _SEH_TRY {

1 0

[fireball] 29373: - Use IopLoanUnloadDriver() for calling unload routine too, in the context of system process, when needed.
by fireball＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: fireball Date: Wed Oct 3 15:54:31 2007 New Revision: 29373 URL: http://svn.reactos.org/svn/reactos?rev=29373&view=rev Log: - Use IopLoanUnloadDriver() for calling unload routine too, in the context of system process, when needed. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.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 Wed Oct 3 15:54:31 2007 @@ -358,6 +358,7 @@ PUNICODE_STRING ServiceName; WORK_QUEUE_ITEM WorkItem; KEVENT Event; + PDRIVER_OBJECT DriverObject; } LOAD_UNLOAD_PARAMS, *PLOAD_UNLOAD_PARAMS; // @@ -840,6 +841,12 @@ IopLoadServiceModule( IN PUNICODE_STRING ServiceName, OUT PLDR_DATA_TABLE_ENTRY *ModuleObject +); + +VOID +NTAPI +IopLoadUnloadDriver( + IN OUT PLOAD_UNLOAD_PARAMS LoadParams ); 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 Wed Oct 3 15:54:31 2007 @@ -927,6 +927,7 @@ UNICODE_STRING ServiceName; UNICODE_STRING ObjectName; PDRIVER_OBJECT DriverObject; + LOAD_UNLOAD_PARAMS LoadParams; NTSTATUS Status; LPWSTR Start; @@ -1019,8 +1020,35 @@ * Unload the module and release the references to the device object */ + /* Call the load/unload routine, depending on current process */ if (DriverObject->DriverUnload) - (*DriverObject->DriverUnload)(DriverObject); + { + if (PsGetCurrentProcess() == PsInitialSystemProcess) + { + /* Just call right away */ + (*DriverObject->DriverUnload)(DriverObject); + } + else + { + /* Load/Unload must be called from system process */ + + /* Prepare parameters block */ + LoadParams.DriverObject = DriverObject; + KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); + + ExInitializeWorkItem(&LoadParams.WorkItem, + (PWORKER_THREAD_ROUTINE)IopLoadUnloadDriver, + (PVOID)&LoadParams); + + /* Queue it */ + ExQueueWorkItem(&LoadParams.WorkItem, DelayedWorkQueue); + + /* And wait when it completes */ + KeWaitForSingleObject(&LoadParams.Event, UserRequest, KernelMode, + FALSE, NULL); + } + } + ObDereferenceObject(DriverObject); ObDereferenceObject(DriverObject); MmUnloadSystemImage(DriverObject->DriverSection); @@ -1477,6 +1505,17 @@ PLDR_DATA_TABLE_ENTRY ModuleObject; PDRIVER_OBJECT DriverObject; WCHAR *cur; + + /* Check if it's an unload request */ + if (LoadParams->DriverObject) + { + (*DriverObject->DriverUnload)(DriverObject); + + /* Return success and signal the event */ + LoadParams->Status = STATUS_SUCCESS; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } RtlInitUnicodeString(&ImagePath, NULL); @@ -1675,6 +1714,7 @@ DPRINT("NtLoadDriver('%wZ')\n", &CapturedDriverServiceName); LoadParams.ServiceName = &CapturedDriverServiceName; + LoadParams.DriverObject = NULL; KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); /* Call the load/unload routine, depending on current process */

1 0

[hpoussin] 29372: Try to fix Linux build
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 15:24:56 2007 New Revision: 29372 URL: http://svn.reactos.org/svn/reactos?rev=29372&view=rev Log: Try to fix Linux build Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=29372&r1=2937… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Oct 3 15:24:56 2007 @@ -277,7 +277,11 @@ ifneq ($(ROS_PREFIX),) PREFIX_ := $(ROS_PREFIX)- else - PREFIX_ := + ifeq ($(HOST),mingw32-linux) + PREFIX_ := mingw32- + else + PREFIX_ := + endif endif ifeq ($(TARGET_CC),) TARGET_CC = $(PREFIX_)gcc

1 0

[hpoussin] 29371: Support custom C and C++ compilers, by variables HOST_CC, HOST_CPP, TARGET_CC and TARGET_CPP Simplify usage of ROS_PREFIX variable
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 15:12:25 2007 New Revision: 29371 URL: http://svn.reactos.org/svn/reactos?rev=29371&view=rev Log: Support custom C and C++ compilers, by variables HOST_CC, HOST_CPP, TARGET_CC and TARGET_CPP Simplify usage of ROS_PREFIX variable Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=29371&r1=2937… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Oct 3 15:12:25 2007 @@ -260,77 +260,67 @@ ECHO_STRIP = endif - -host_gcc = $(Q)gcc -host_gpp = $(Q)g++ +# Set host compiler/linker +ifeq ($(HOST_CC),) + HOST_CC = gcc +endif +ifeq ($(HOST_CPP),) + HOST_CPP = g++ +endif +host_gcc = $(Q)$(HOST_CC) +host_gpp = $(Q)$(HOST_CPP) host_ld = $(Q)ld host_ar = $(Q)ar host_objcopy = $(Q)objcopy + +# Set target compiler/linker +ifneq ($(ROS_PREFIX),) + PREFIX_ := $(ROS_PREFIX)- +else + PREFIX_ := +endif +ifeq ($(TARGET_CC),) + TARGET_CC = $(PREFIX_)gcc +endif +ifeq ($(TARGET_CPP),) + TARGET_CPP = $(PREFIX_)g++ +endif +gcc = $(Q)$(TARGET_CC) +gpp = $(Q)$(TARGET_CPP) +ld = $(Q)$(PREFIX_)ld +nm = $(Q)$(PREFIX_)nm +objdump = $(Q)$(PREFIX_)objdump +ar = $(Q)$(PREFIX_)ar +objcopy = $(Q)$(PREFIX_)objcopy +dlltool = $(Q)$(PREFIX_)dlltool +strip = $(Q)$(PREFIX_)strip +windres = $(Q)$(PREFIX_)windres + +# Set utilities +ifeq ($(OSTYPE),msys) + HOST=mingw32-linux +endif ifeq ($(HOST),mingw32-linux) export EXEPREFIX = ./ -ifeq ($(OSTYPE),msys) - export EXEPOSTFIX = .exe -else - export EXEPOSTFIX = -endif + ifeq ($(OSTYPE),msys) + export EXEPOSTFIX = .exe + else + export EXEPOSTFIX = + endif export SEP = / mkdir = -$(Q)mkdir -p - gcc = $(Q)$(PREFIX)-gcc - gpp = $(Q)$(PREFIX)-g++ - ld = $(Q)$(PREFIX)-ld - nm = $(Q)$(PREFIX)-nm - objdump = $(Q)$(PREFIX)-objdump - ar = $(Q)$(PREFIX)-ar - objcopy = $(Q)$(PREFIX)-objcopy - dlltool = $(Q)$(PREFIX)-dlltool - strip = $(Q)$(PREFIX)-strip - windres = $(Q)$(PREFIX)-windres rm = $(Q)rm -f cp = $(Q)cp NUL = /dev/null else # mingw32-windows - ifeq ($(OSTYPE),msys) - HOST=mingw32-linux - export EXEPREFIX = ./ - export EXEPOSTFIX = .exe - export SEP = / - mkdir = -$(Q)mkdir -p - rm = $(Q)rm -f - cp = $(Q)cp - NUL = /dev/null - else - export EXEPREFIX = - export EXEPOSTFIX = .exe - ROS_EMPTY = - export SEP = \$(ROS_EMPTY) - mkdir = -$(Q)mkdir - rm = $(Q)del /f /q - cp = $(Q)copy /y - NUL = NUL - endif - ifeq ($(ROS_PREFIX),) - gcc = $(Q)gcc - gpp = $(Q)g++ - ld = $(Q)ld - nm = $(Q)nm - objdump = $(Q)objdump - ar = $(Q)ar - objcopy = $(Q)objcopy - dlltool = $(Q)dlltool - strip = $(Q)strip - windres = $(Q)windres - else - gcc = $(Q)$(ROS_PREFIX)-gcc - gpp = $(Q)$(ROS_PREFIX)-g++ - ld = $(Q)$(ROS_PREFIX)-ld - nm = $(Q)$(ROS_PREFIX)-nm - objdump = $(Q)$(ROS_PREFIX)-objdump - ar = $(Q)$(ROS_PREFIX)-ar - objcopy = $(Q)$(ROS_PREFIX)-objcopy - dlltool = $(Q)$(ROS_PREFIX)-dlltool - strip = $(Q)$(ROS_PREFIX)-strip - windres = $(Q)$(ROS_PREFIX)-windres - endif + export EXEPREFIX = + export EXEPOSTFIX = .exe + ROS_EMPTY = + export SEP = \$(ROS_EMPTY) + mkdir = -$(Q)mkdir + rm = $(Q)del /f /q + cp = $(Q)copy /y + NUL = NUL endif ifneq ($(ROS_INTERMEDIATE),)

1 0

[fireball] 29370: - NtLoadDriver APIs refactor/improvent: * Move loading of a driver to the common (in future) routine IopLoadUnloadDriver (name taken from http://wasm.ru/forum/viewtopic.php?pid=166891). * Fix a bug: NtLoadDriver should always load drivers in a context of the system process, explanation here: http://www.osronline.com/showthread.cfm?link=114687 * Reformat NtLoadDriver's code.
by fireball＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: fireball Date: Wed Oct 3 14:17:04 2007 New Revision: 29370 URL: http://svn.reactos.org/svn/reactos?rev=29370&view=rev Log: - NtLoadDriver APIs refactor/improvent: * Move loading of a driver to the common (in future) routine IopLoadUnloadDriver (name taken from http://wasm.ru/forum/viewtopic.php?pid=166891). * Fix a bug: NtLoadDriver should always load drivers in a context of the system process, explanation here: http://www.osronline.com/showthread.cfm?link=114687 * Reformat NtLoadDriver's code. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.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 Wed Oct 3 14:17:04 2007 @@ -350,6 +350,17 @@ } OPEN_PACKET, *POPEN_PACKET; // +// Parameters packet for Load/Unload work item's context +// +typedef struct _LOAD_UNLOAD_PARAMS +{ + NTSTATUS Status; + PUNICODE_STRING ServiceName; + WORK_QUEUE_ITEM WorkItem; + KEVENT Event; +} LOAD_UNLOAD_PARAMS, *PLOAD_UNLOAD_PARAMS; + +// // List of Bus Type GUIDs // typedef struct _IO_BUS_TYPE_GUID_LIST 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 Wed Oct 3 14:17:04 2007 @@ -1465,29 +1465,12 @@ return DriverExtensions + 1; } -/* - * NtLoadDriver - * - * Loads a device driver. - * - * Parameters - * DriverServiceName - * Name of the service to load (registry key). - * - * Return Value - * Status - * - * Status - * implemented - */ -NTSTATUS STDCALL -NtLoadDriver(IN PUNICODE_STRING DriverServiceName) +VOID NTAPI +IopLoadUnloadDriver(PLOAD_UNLOAD_PARAMS LoadParams) { RTL_QUERY_REGISTRY_TABLE QueryTable[3]; UNICODE_STRING ImagePath; UNICODE_STRING ServiceName; - UNICODE_STRING CapturedDriverServiceName = {0}; - KPROCESSOR_MODE PreviousMode; NTSTATUS Status; ULONG Type; PDEVICE_NODE DeviceNode; @@ -1495,50 +1478,24 @@ PDRIVER_OBJECT DriverObject; WCHAR *cur; - PAGED_CODE(); - - PreviousMode = KeGetPreviousMode(); - - /* - * Check security privileges - */ - -/* FIXME: Uncomment when privileges will be correctly implemented. */ -#if 0 - if (!SeSinglePrivilegeCheck(SeLoadDriverPrivilege, PreviousMode)) - { - DPRINT("Privilege not held\n"); - return STATUS_PRIVILEGE_NOT_HELD; - } -#endif - - Status = ProbeAndCaptureUnicodeString(&CapturedDriverServiceName, - PreviousMode, - DriverServiceName); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - DPRINT("NtLoadDriver('%wZ')\n", &CapturedDriverServiceName); - RtlInitUnicodeString(&ImagePath, NULL); /* * Get the service name from the registry key name. */ - ASSERT(CapturedDriverServiceName.Length >= sizeof(WCHAR)); - - ServiceName = CapturedDriverServiceName; - cur = CapturedDriverServiceName.Buffer + (CapturedDriverServiceName.Length / sizeof(WCHAR)) - 1; - while (CapturedDriverServiceName.Buffer != cur) + ASSERT(LoadParams->ServiceName->Length >= sizeof(WCHAR)); + + ServiceName = *LoadParams->ServiceName; + cur = LoadParams->ServiceName->Buffer + + (LoadParams->ServiceName->Length / sizeof(WCHAR)) - 1; + while (LoadParams->ServiceName->Buffer != cur) { if(*cur == L'\\') { ServiceName.Buffer = cur + 1; - ServiceName.Length = CapturedDriverServiceName.Length - + ServiceName.Length = LoadParams->ServiceName->Length - (USHORT)((ULONG_PTR)ServiceName.Buffer - - (ULONG_PTR)CapturedDriverServiceName.Buffer); + (ULONG_PTR)LoadParams->ServiceName->Buffer); break; } cur--; @@ -1561,13 +1518,15 @@ QueryTable[1].EntryContext = &ImagePath; Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - CapturedDriverServiceName.Buffer, QueryTable, NULL, NULL); + LoadParams->ServiceName->Buffer, QueryTable, NULL, NULL); if (!NT_SUCCESS(Status)) { DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); ExFreePool(ImagePath.Buffer); - goto ReleaseCapturedString; + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } /* @@ -1579,7 +1538,9 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopNormalizeImagePath() failed (Status %x)\n", Status); - goto ReleaseCapturedString; + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } DPRINT("FullImagePath: '%wZ'\n", &ImagePath); @@ -1595,7 +1556,9 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopCreateDeviceNode() failed (Status %lx)\n", Status); - goto ReleaseCapturedString; + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } /* Get existing DriverObject pointer (in case the driver has @@ -1617,7 +1580,9 @@ { DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); IopFreeDeviceNode(DeviceNode); - goto ReleaseCapturedString; + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } /* @@ -1644,7 +1609,9 @@ DPRINT("IopInitializeDriver() failed (Status %lx)\n", Status); MmUnloadSystemImage(ModuleObject); IopFreeDeviceNode(DeviceNode); - goto ReleaseCapturedString; + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } } @@ -1653,13 +1620,88 @@ } IopInitializeDevice(DeviceNode, DriverObject); - Status = IopStartDevice(DeviceNode); - -ReleaseCapturedString: - ReleaseCapturedUnicodeString(&CapturedDriverServiceName, - PreviousMode); - - return Status; + LoadParams->Status = IopStartDevice(DeviceNode); + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); +} + +/* + * NtLoadDriver + * + * Loads a device driver. + * + * Parameters + * DriverServiceName + * Name of the service to load (registry key). + * + * Return Value + * Status + * + * Status + * implemented + */ +NTSTATUS STDCALL +NtLoadDriver(IN PUNICODE_STRING DriverServiceName) +{ + UNICODE_STRING CapturedDriverServiceName = {0}; + KPROCESSOR_MODE PreviousMode; + LOAD_UNLOAD_PARAMS LoadParams; + NTSTATUS Status; + + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + + /* + * Check security privileges + */ + + /* FIXME: Uncomment when privileges will be correctly implemented. */ +#if 0 + if (!SeSinglePrivilegeCheck(SeLoadDriverPrivilege, PreviousMode)) + { + DPRINT("Privilege not held\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } +#endif + + Status = ProbeAndCaptureUnicodeString(&CapturedDriverServiceName, + PreviousMode, + DriverServiceName); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT("NtLoadDriver('%wZ')\n", &CapturedDriverServiceName); + + LoadParams.ServiceName = &CapturedDriverServiceName; + KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); + + /* Call the load/unload routine, depending on current process */ + if (PsGetCurrentProcess() == PsInitialSystemProcess) + { + /* Just call right away */ + IopLoadUnloadDriver(&LoadParams); + } + else + { + /* Load/Unload must be called from system process */ + ExInitializeWorkItem(&LoadParams.WorkItem, + (PWORKER_THREAD_ROUTINE)IopLoadUnloadDriver, + (PVOID)&LoadParams); + + /* Queue it */ + ExQueueWorkItem(&LoadParams.WorkItem, DelayedWorkQueue); + + /* And wait when it completes */ + KeWaitForSingleObject(&LoadParams.Event, UserRequest, KernelMode, + FALSE, NULL); + } + + ReleaseCapturedUnicodeString(&CapturedDriverServiceName, + PreviousMode); + + return LoadParams.Status; } /*

1 0

[hpoussin] 29369: Separe right code from hack
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 12:28:16 2007 New Revision: 29369 URL: http://svn.reactos.org/svn/reactos?rev=29369&view=rev Log: Separe right code from hack Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Wed Oct 3 12:28:16 2007 @@ -388,20 +388,30 @@ UseDummyFile = ((OpenPacket->QueryOnly) || (OpenPacket->DeleteOnly)); /* Check if this is a direct open */ - /* FIXME: Small hack still exists, because there is probably - a small bug somewhere in vfat */ if (!(RemainingName->Length) && !(OpenPacket->RelatedFileObject) && - (((DesiredAccess & ~(SYNCHRONIZE | + ((DesiredAccess & ~(SYNCHRONIZE | FILE_READ_ATTRIBUTES | READ_CONTROL | ACCESS_SYSTEM_SECURITY | WRITE_OWNER | - WRITE_DAC)) == 0) || - (wcsstr(CompleteName->Buffer, L"Harddisk"))) && + WRITE_DAC)) == 0) && !(UseDummyFile)) { /* Remember this for later */ + DirectOpen = TRUE; + } + + /* FIXME: Small hack still exists, have to check why... + * This is triggered multiple times by usetup and then once per boot. + */ + if (!(DirectOpen) && + !(RemainingName->Length) && + !(OpenPacket->RelatedFileObject) && + ((wcsstr(CompleteName->Buffer, L"Harddisk"))) && + !(UseDummyFile)) + { + DPRINT1("Using IopParseDevice() hack\n"); DirectOpen = TRUE; }

1 0

[fireball] 29368: - Fix a typo in shell32 resources. See issue #2717 for more details.
by fireball＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: fireball Date: Wed Oct 3 12:20:13 2007 New Revision: 29368 URL: http://svn.reactos.org/svn/reactos?rev=29368&view=rev Log: - Fix a typo in shell32 resources. See issue #2717 for more details. Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_En.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_En.rc Wed Oct 3 12:20:13 2007 @@ -346,7 +346,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" }

1 0

[jimtabor] 29367: Move DCX_EXCLUDEUPDATE to the psdk where it belongs.
by jimtabor＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: jimtabor Date: Wed Oct 3 08:08:22 2007 New Revision: 29367 URL: http://svn.reactos.org/svn/reactos?rev=29367&view=rev Log: Move DCX_EXCLUDEUPDATE to the psdk where it belongs. Modified: trunk/reactos/include/psdk/winuser.h trunk/reactos/subsystems/win32/win32k/include/dce.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Wed Oct 3 08:08:22 2007 @@ -1921,6 +1921,7 @@ #define DCX_EXCLUDERGN 64 #define DCX_INTERSECTRGN 128 #define DCX_VALIDATE 0x200000 +#define DCX_EXCLUDEUPDATE 0x100 #define GMDI_GOINTOPOPUPS 2 #define GMDI_USEDISABLED 1 #define FKF_AVAILABLE 2 Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h Wed Oct 3 08:08:22 2007 @@ -37,7 +37,6 @@ } DCE; /* PDCE already declared at top of file */ /* internal DCX flags, see psdk/winuser.h for the rest */ -#define DCX_EXCLUDEUPDATE 0x00000100 #define DCX_DCEEMPTY 0x00000800 #define DCX_DCEBUSY 0x00001000 #define DCX_DCEDIRTY 0x00002000

1 0

[jimtabor] 29366: Add dprint to debug the change to ownership for shutdown. Also free fake save DC if all window DCE are free.
by jimtabor＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: jimtabor Date: Wed Oct 3 04:39:20 2007 New Revision: 29366 URL: http://svn.reactos.org/svn/reactos?rev=29366&view=rev Log: Add dprint to debug the change to ownership for shutdown. Also free fake save DC if all window DCE are free. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Wed Oct 3 04:39:20 2007 @@ -652,6 +652,7 @@ if(Force && !GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, pdce->hDC)) { + DPRINT1("Change ownership for DCE!\n"); DC_SetOwnership( pdce->hDC, PsGetCurrentProcess()); } @@ -663,6 +664,12 @@ DCE_Cleanup(pdce); ExFreePoolWithTag(pdce, TAG_PDCE); + + if (FirstDce == NULL) + { + ExFreePoolWithTag(defaultDCstate, TAG_DC); + defaultDCstate = NULL; + } return ret; }

1 0

[dreimer] 29365: You forgot something in your Translation janderwald.
by dreimer＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: dreimer Date: Wed Oct 3 03:48:56 2007 New Revision: 29365 URL: http://svn.reactos.org/svn/reactos?rev=29365&view=rev Log: You forgot something in your Translation janderwald. Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc Wed Oct 3 03:48:56 2007 @@ -46,7 +46,7 @@ IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Create Shortcut" +CAPTION "Verknüpfung erstellen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Mit diesem Assistenten können Sie Verknüpfungen mit\nlokalen oder vernetzten Programmen, Dateien, Ordnern,\nComputern oder Internetaddressen erstellen.", -1, 120, 15, 200, 30 @@ -58,7 +58,7 @@ IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Select a Title for the Program" +CAPTION "Bezeichnung für das Programm" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Geben Sie den Namen für die Verknüpfung ein:", -1, 120, 15, 150, 10

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