Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[greatlrd] 23068: Tempary fixing kbdclass and mouse class u can not call on IoDeleteDevice before disabler the keyboard or mouse driver other wise it will bsod at shoutdown of ReactOS, create the frist boot problem. that we have seen on BootCD; Hpoussin I have comment out iodevice for now, please look at it when u got time.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 16 00:14:44 2006 New Revision: 23068 URL: http://svn.reactos.org/svn/reactos?rev=23068&view=rev Log: Tempary fixing kbdclass and mouse class u can not call on IoDeleteDevice before disabler the keyboard or mouse driver other wise it will bsod at shoutdown of ReactOS, create the frist boot problem. that we have seen on BootCD; Hpoussin I have comment out iodevice for now, please look at it when u got time. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Sun Jul 16 00:14:44 2006 @@ -126,7 +126,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one device */ + /* We have at least one keyboard */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -711,7 +711,8 @@ PCLASS_DEVICE_EXTENSION ClassDeviceExtension; ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; ExFreePool(ClassDeviceExtension->PortData); - IoDeleteDevice(DeviceExtension->ClassDO); + /* FIXME BSOD for second boot when u press on finsih buttom or wait timeout */ + //IoDeleteDevice(DeviceExtension->ClassDO); } } if (Fdo) Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Sun Jul 16 00:14:44 2006 @@ -123,7 +123,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one device */ + /* We have at least one mouse */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -687,7 +687,8 @@ PCLASS_DEVICE_EXTENSION ClassDeviceExtension; ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; ExFreePool(ClassDeviceExtension->PortData); - IoDeleteDevice(DeviceExtension->ClassDO); + /* FIXME BSOD for second boot when u press on finsih buttom or wait timeout */ + // IoDeleteDevice(DeviceExtension->ClassDO); } } if (Fdo)

18 years, 5 months

[ion] 23067: - Remove some debug prints that are not needed anymore - NtCurrentTeb now returns the TEB instead of the KCPR, so re-enable the codepath that set the CurrentLocale and IdealProcessor in the TEB from the KTHREAD.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 16 00:10:13 2006 New Revision: 23067 URL: http://svn.reactos.org/svn/reactos?rev=23067&view=rev Log: - Remove some debug prints that are not needed anymore - NtCurrentTeb now returns the TEB instead of the KCPR, so re-enable the codepath that set the CurrentLocale and IdealProcessor in the TEB from the KTHREAD. Modified: trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Sun Jul 16 00:10:13 2006 @@ -9,10 +9,9 @@ /* * Alex FIXMEs: - * - CRITICAL: NtCurrentTeb returns KPCR. * - MAJOR: Use Process Rundown * - MAJOR: Use Process Pushlock Locks - * - MAJOR: Implement Safe Referencing (See PsGetNextProcess/Thread). + * - MAJOR: Use Safe Referencing in PsGetNextProcess/Thread. * - MAJOR: Use Guarded Mutex instead of Fast Mutex for Active Process Locks. * - Generate process cookie for user-more thread. * - Add security calls where necessary. @@ -56,15 +55,14 @@ if (Thread->DeadThread) { /* Remember that we're dead */ - DPRINT1("This thread is already dead\n"); DeadThread = TRUE; } else { /* Get the Locale ID and save Preferred Proc */ - Teb = NtCurrentTeb(); /* FIXME: This returns KPCR!!! */ - //Teb->CurrentLocale = MmGetSessionLocaleId(); - //Teb->IdealProcessor = Thread->Tcb.IdealProcessor; + Teb = NtCurrentTeb(); + Teb->CurrentLocale = MmGetSessionLocaleId(); + Teb->IdealProcessor = Thread->Tcb.IdealProcessor; } /* Check if this is a system thread, or if we're hiding */ @@ -191,11 +189,7 @@ } /* Check for success */ - if(!NT_SUCCESS(Status)) - { - DPRINT1("Invalid Process Handle, or no handle given\n"); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Also make sure that User-Mode isn't trying to create a system thread */ if ((PreviousMode != KernelMode) && (Process == PsInitialSystemProcess)) @@ -217,7 +211,6 @@ if (!NT_SUCCESS(Status)) { /* We failed; dereference the process and exit */ - DPRINT1("Failed to Create Thread Object\n"); ObDereferenceObject(Process); return Status; } @@ -236,7 +229,6 @@ if (!Thread->Cid.UniqueThread) { /* We couldn't create the CID, dereference everything and fail */ - DPRINT1("Failed to create Thread Handle (CID)\n"); ObDereferenceObject(Process); ObDereferenceObject(Thread); return STATUS_INSUFFICIENT_RESOURCES; @@ -628,11 +620,7 @@ if(KeGetPreviousMode() != KernelMode) { /* Make sure that we got a context */ - if (!ThreadContext) - { - DPRINT1("No context for User-Mode Thread!!\n"); - return STATUS_INVALID_PARAMETER; - } + if (!ThreadContext) return STATUS_INVALID_PARAMETER; /* Protect checks */ _SEH_TRY @@ -761,9 +749,8 @@ DesiredAccess, NULL, &hThread); - if (!NT_SUCCESS(Status)) DPRINT1("Could not open object by name\n"); - } - else if (ClientId != NULL) + } + else if (ClientId) { /* Open by Thread ID */ if (ClientId->UniqueProcess) @@ -780,11 +767,8 @@ &Thread); } - if(!NT_SUCCESS(Status)) - { - DPRINT1("Failure to find Thread\n"); - return Status; - } + /* Fail if we didn't find anything */ + if(!NT_SUCCESS(Status)) return Status; /* Open the Thread Object */ Status = ObOpenObjectByPointer(Thread, @@ -794,10 +778,6 @@ PsThreadType, PreviousMode, &hThread); - if(!NT_SUCCESS(Status)) - { - DPRINT1("Failure to open Thread\n"); - } /* Dereference the thread */ ObDereferenceObject(Thread); @@ -809,7 +789,7 @@ } /* Check for success */ - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Protect against bad user-mode pointers */ _SEH_TRY Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Sun Jul 16 00:10:13 2006 @@ -72,23 +72,15 @@ PAGED_CODE(); /* Validate the previous mode */ - if (KeGetPreviousMode() == KernelMode) - { - DPRINT1("Danger: win32k call being made in kernel-mode?!\n"); - return STATUS_INVALID_PARAMETER; - } + if (KeGetPreviousMode() == KernelMode) return STATUS_INVALID_PARAMETER; /* Make sure win32k is here */ - if (!PspW32ProcessCallout) - { - DPRINT1("Danger: Win32K call attempted but Win32k not ready!\n"); - return STATUS_ACCESS_DENIED; - } + if (!PspW32ProcessCallout) return STATUS_ACCESS_DENIED; /* Make sure it's not already win32 */ if (Thread->Tcb.ServiceTable != KeServiceDescriptorTable) { - DPRINT1("Danger: Thread is already a win32 thread. Limit bypassed?\n"); + /* We're already a win32 thread */ return STATUS_ALREADY_WIN32; } @@ -123,11 +115,7 @@ { /* Now tell win32k about us */ Status = PspW32ProcessCallout(Process, TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Danger: Win32k wasn't happy about us!\n"); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; } /* Set the new service table */ @@ -139,7 +127,6 @@ if (!NT_SUCCESS(Status)) { /* Revert our table */ - DPRINT1("Danger: Win32k wasn't happy about us!\n"); Thread->Tcb.ServiceTable = KeServiceDescriptorTable; }

18 years, 5 months

[greatlrd] 23066: reverting : patch from w3seek :Bug #: 1669 : Probing macros improvements and fixes reason : it break second boot, at when u press on finsh buttom with the mouse or wait until auto rest kick in, but we still have one more regress to found for second boot when u leave from vmware at center point the setup will crash (when u toch the keyboard) lest the mouse does not cause the bsod any longer. I will inform w3seek about it when he comes online

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jul 15 23:10:07 2006 New Revision: 23066 URL: http://svn.reactos.org/svn/reactos?rev=23066&view=rev Log: reverting : patch from w3seek :Bug #: 1669 : Probing macros improvements and fixes reason : it break second boot, at when u press on finsh buttom with the mouse or wait until auto rest kick in, but we still have one more regress to found for second boot when u leave from vmware at center point the setup will crash (when u toch the keyboard) lest the mouse does not cause the bsod any longer. I will inform w3seek about it when he comes online Modified: trunk/reactos/include/reactos/probe.h Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h (original) +++ trunk/reactos/include/reactos/probe.h Sat Jul 15 23:10:07 2006 @@ -40,19 +40,20 @@ #define ProbeForWriteInt(Ptr) ProbeForWriteGenericType(Ptr, INT) #define ProbeForWriteUlonglong(Ptr) ProbeForWriteGenericType(Ptr, ULONGLONG) #define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) +#define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) #define ProbeForWritePointer(Ptr) ProbeForWriteGenericType(Ptr, PVOID) #define ProbeForWriteHandle(Ptr) ProbeForWriteGenericType(Ptr, HANDLE) #define ProbeForWriteLangid(Ptr) ProbeForWriteGenericType(Ptr, LANGID) #define ProbeForWriteSize_t(Ptr) ProbeForWriteGenericType(Ptr, SIZE_T) -#define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&((PLARGE_INTEGER)Ptr)->QuadPart, LONGLONG) -#define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&((PULARGE_INTEGER)Ptr)->QuadPart, ULONGLONG) -#define ProbeForWriteUnicodeString(Ptr) ProbeForWriteGenericType((PUNICODE_STRING)Ptr, UNICODE_STRING) +#define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, LONGLONG) +#define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, ULONGLONG) +#define ProbeForWriteUnicodeString(Ptr) ProbeForWriteGenericType(Ptr, UNICODE_STRING) #define ProbeForReadGenericType(Ptr, Type, Default) \ (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ ExRaiseStatus (STATUS_ACCESS_VIOLATION), Default : \ - *(const volatile Type *)(Ptr)) + *(Type *)(Ptr)) #define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE) #define ProbeForReadUchar(Ptr) ProbeForReadGenericType(Ptr, UCHAR, 0) @@ -69,9 +70,9 @@ #define ProbeForReadHandle(Ptr) ProbeForReadGenericType(Ptr, HANDLE, NULL) #define ProbeForReadLangid(Ptr) ProbeForReadGenericType(Ptr, LANGID, 0) #define ProbeForReadSize_t(Ptr) ProbeForReadGenericType(Ptr, SIZE_T, 0) -#define ProbeForReadLargeInteger(Ptr) ProbeForReadGenericType((const LARGE_INTEGER *)(Ptr), LARGE_INTEGER, __emptyLargeInteger) -#define ProbeForReadUlargeInteger(Ptr) ProbeForReadGenericType((const ULARGE_INTEGER *)(Ptr), ULARGE_INTEGER, __emptyULargeInteger) -#define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType((const UNICODE_STRING *)(Ptr), UNICODE_STRING, __emptyUnicodeString) +#define ProbeForReadLargeInteger(Ptr) ProbeForReadGenericType(Ptr, LARGE_INTEGER, __emptyLargeInteger) +#define ProbeForReadUlargeInteger(Ptr) ProbeForReadGenericType(Ptr, ULARGE_INTEGER, __emptyULargeInteger) +#define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType(Ptr, UNICODE_STRING, __emptyUnicodeString) #define ProbeAndZeroHandle(Ptr) \ do { \ @@ -90,7 +91,7 @@ NTAPI ProbeAndCaptureUnicodeString(OUT PUNICODE_STRING Dest, IN KPROCESSOR_MODE CurrentMode, - IN const UNICODE_STRING *UnsafeSrc) + IN PUNICODE_STRING UnsafeSrc) { NTSTATUS Status = STATUS_SUCCESS; WCHAR *Buffer = NULL;

18 years, 5 months

[jimtabor] 23065: -User32: Fixed GetMenuItemInfoA so it should work closely to spec and reimplemented GetMenuItemInfoW so it should do the same. Added a string flag to GetMenuStringW. Tested with explorer, winefile, VIDE, Lazarus (nochg) and Miranda. Wine menu test 1178 failures now.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jul 15 05:40:10 2006 New Revision: 23065 URL: http://svn.reactos.org/svn/reactos?rev=23065&view=rev Log: -User32: Fixed GetMenuItemInfoA so it should work closely to spec and reimplemented GetMenuItemInfoW so it should do the same. Added a string flag to GetMenuStringW. Tested with explorer, winefile, VIDE, Lazarus (nochg) and Miranda. Wine menu test 1178 failures now. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Sat Jul 15 05:40:10 2006 @@ -3976,8 +3976,9 @@ BOOL ByPosition, LPMENUITEMINFOA mii) { + MENUITEMINFOW miiW; LPSTR AnsiBuffer; - MENUITEMINFOW miiW; + INT Count; if (mii->cbSize != sizeof(MENUITEMINFOA) && mii->cbSize != sizeof(MENUITEMINFOA) - sizeof(HBITMAP)) @@ -3992,39 +3993,38 @@ return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); } + AnsiBuffer = mii->dwTypeData; + Count = mii->cch; RtlCopyMemory(&miiW, mii, mii->cbSize); - AnsiBuffer = mii->dwTypeData; - - if (AnsiBuffer != NULL) + miiW.dwTypeData = 0; + + if (AnsiBuffer) { miiW.dwTypeData = RtlAllocateHeap(GetProcessHeap(), 0, miiW.cch * sizeof(WCHAR)); - if (miiW.dwTypeData == NULL) - return FALSE; + if (miiW.dwTypeData == NULL) return FALSE; } if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE)) + return FALSE; + + if (!AnsiBuffer || !Count) { - HeapFree(GetProcessHeap(), 0, miiW.dwTypeData); - return FALSE; + if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); + mii->cch = miiW.cch; + return TRUE; } - if (AnsiBuffer != NULL) + if (IS_STRING_ITEM(miiW.fType)) { - if (IS_STRING_ITEM(miiW.fType)) - { - WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer, + WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer, mii->cch, NULL, NULL); - } - RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); } + RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); RtlCopyMemory(mii, &miiW, miiW.cbSize); - if (AnsiBuffer) - { - mii->dwTypeData = AnsiBuffer; - mii->cch = strlen(AnsiBuffer); - } + mii->dwTypeData = AnsiBuffer; + mii->cch = strlen(AnsiBuffer); return TRUE; } @@ -4039,7 +4039,55 @@ BOOL ByPosition, LPMENUITEMINFOW mii) { - return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); + MENUITEMINFOW miiW; + LPWSTR String; + INT Count; + + if (mii->cbSize != sizeof(MENUITEMINFOW) && + mii->cbSize != sizeof(MENUITEMINFOW) - sizeof(HBITMAP)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ((mii->fMask & (MIIM_STRING | MIIM_TYPE)) == 0) + { + /* No text requested, just pass on */ + return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); + } + + String = mii->dwTypeData; + Count = mii->cch; + RtlCopyMemory(&miiW, mii, mii->cbSize); + miiW.dwTypeData = 0; + + if (String) + { + miiW.dwTypeData = RtlAllocateHeap(GetProcessHeap(), 0, + miiW.cch * sizeof(WCHAR)); + if (miiW.dwTypeData == NULL) return FALSE; + } + + if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE)) + return FALSE; + + if (!String || !Count) + { + if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); + mii->cch = miiW.cch; + return TRUE; + } + + if (IS_STRING_ITEM(miiW.fType)) + { + lstrcpynW( String, miiW.dwTypeData, Count ); + } + + RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); + RtlCopyMemory(mii, &miiW, miiW.cbSize); + mii->dwTypeData = String; + mii->cch = strlenW(String); + return TRUE; } @@ -4141,6 +4189,7 @@ MENUITEMINFOW miiW; miiW.dwTypeData = lpString; miiW.fMask = MIIM_STRING; + miiW.fType = MF_STRING; miiW.cbSize = sizeof(MENUITEMINFOW); miiW.cch = nMaxCount;

18 years, 5 months

[amunger] 23064: Partially sync newdev to trunk: revisions 22222, 22348, 22392, 22731, 22799, 22911, 23035. Merge 23027. Highlights: Adds the stability warning to newdev. Allows the NIC to be ready on third boot.

by amunger＠svn.reactos.org

Author: amunger Date: Sat Jul 15 02:48:31 2006 New Revision: 23064 URL: http://svn.reactos.org/svn/reactos?rev=23064&view=rev Log: Partially sync newdev to trunk: revisions 22222, 22348, 22392, 22731, 22799, 22911, 23035. Merge 23027. Highlights: Adds the stability warning to newdev. Allows the NIC to be ready on third boot. Modified: branches/ros-branch-0_3_0/reactos/dll/win32/netcfgx/netcfgx.c branches/ros-branch-0_3_0/reactos/dll/win32/newdev/De.rc branches/ros-branch-0_3_0/reactos/dll/win32/newdev/En.rc branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Es.rc branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc (contents, props changed) branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc (contents, props changed) branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Ru.rc branches/ros-branch-0_3_0/reactos/dll/win32/newdev/newdev.c branches/ros-branch-0_3_0/reactos/dll/win32/newdev/resource.h branches/ros-branch-0_3_0/reactos/dll/win32/newdev/wizard.c Modified: branches/ros-branch-0_3_0/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/netcfgx/netcfgx.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/netcfgx/netcfgx.c Sat Jul 15 02:48:31 2006 @@ -188,6 +188,7 @@ HKEY hLinkageKey = NULL; HKEY hNetworkKey = NULL; HKEY hConnectionKey = NULL; + SP_DEVINSTALL_PARAMS_W installParams; if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; @@ -437,7 +438,27 @@ * which are installed after its startup. So, we have to reboot to take * this new netcard into account. */ - MessageBox(NULL, TEXT("You need to reboot to finish the installation of your network card."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING); + /* Should we reboot? */ + installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + if (!SetupDiGetDeviceInstallParamsW( + DeviceInfoSet, + DeviceInfoData, + &installParams)) + { + rc = GetLastError(); + DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } + installParams.Flags |= DI_NEEDRESTART; + if (!SetupDiSetDeviceInstallParamsW( + DeviceInfoSet, + DeviceInfoData, + &installParams)) + { + rc = GetLastError(); + DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } rc = ERROR_SUCCESS; cleanup: Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/De.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/De.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/De.rc Sat Jul 15 02:48:31 2006 @@ -1,6 +1,6 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" @@ -8,43 +8,44 @@ BEGIN LTEXT "Willkommen",IDC_WELCOMETITLE,120,8,195,24 LTEXT "Dieser Assistent installiert einen neuen Gerätetreiber für:", - IDC_STATIC,120,40,195,16 + IDC_STATIC,120,21,195,16 LTEXT "Klicken Sie auf Weiter um fortzufahren.",IDC_STATIC,120,169,195,17 - LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,36,164,11 + LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16 CONTROL "Treiber automatisch installieren",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Treiber von einer bestimmten Position installieren",IDC_RADIO_MANUAL, "Button",BS_AUTORADIOBUTTON,120,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Installation fehlgeschlagen",IDC_FINISHTITLE,120,8,195,24 - LTEXT "Der Gerät konnte nicht installiert werden, da kein passender Treiber gefunden werden konnte.", + LTEXT "Das Gerät konnte nicht installiert werden, da kein passender Treiber gefunden wurde.", IDC_STATIC,120,40,195,19 - LTEXT "Klicken Sie auf Zurück, wenn Sie eine Treiber CD oder Diskette haben oder den Pfad zum Treiber kennen.", + LTEXT "Klicken Sie auf Zurück, wenn Sie eine Treiber-CD oder -Diskette besitzen oder den Pfad des Treibers kennen.", IDC_STATIC,120,98,181,24 CONTROL "Diesen Dialog nicht mehr anzeigen",IDC_DONOTSHOWDLG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Device installation" +CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation failed",IDC_FINISHTITLE,120,8,195,24 - LTEXT "The device could not be installed because an unexpected error happened.", + LTEXT "Installation fehlgeschlagen",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Das Gerät konnte aufgrund eines unerwarteten Fehlers nicht installiert werden.", IDC_STATIC,120,40,195,19 LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" @@ -62,7 +63,7 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" @@ -70,7 +71,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" @@ -78,7 +79,21 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/En.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/En.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/En.rc Sat Jul 15 02:48:31 2006 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -8,16 +8,17 @@ BEGIN LTEXT "Welcome",IDC_WELCOMETITLE,120,8,195,24 LTEXT "This wizard installs a new device driver for:", - IDC_STATIC,120,40,195,16 + IDC_STATIC,120,21,195,16 LTEXT "Click Next to continue.",IDC_STATIC,120,169,195,17 - LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,36,164,11 + LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16 CONTROL "Install driver automatically",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Install driver from specific location",IDC_RADIO_MANUAL, "Button",BS_AUTORADIOBUTTON,120,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -32,7 +33,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -44,7 +45,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" @@ -62,7 +63,7 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" @@ -70,7 +71,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" @@ -78,7 +79,21 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Es.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Es.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Es.rc Sat Jul 15 02:48:31 2006 @@ -1,6 +1,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalación de Dispositivos" @@ -8,16 +8,17 @@ BEGIN LTEXT "Bienvenido",IDC_WELCOMETITLE,120,8,195,24 LTEXT "Este asistente lo ayudará a instalar un nuevo controlador de dispositivos para:", - IDC_STATIC,120,40,195,16 + IDC_STATIC,120,21,195,16 LTEXT "Haga click en Siguiente para continuar.",IDC_STATIC,120,169,195,17 - LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,134,55,164,11 + LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,134,36,164,11 + LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16 CONTROL "Instalar controlador automáticamente",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Instalar controlador desde una ubicación específica",IDC_RADIO_MANUAL, "Button",BS_AUTORADIOBUTTON,120,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalación de Dispositivos" @@ -32,7 +33,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -44,7 +45,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalación de Dispositivos" FONT 8, "MS Shell Dlg" @@ -62,7 +63,7 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" @@ -70,7 +71,7 @@ LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" @@ -78,7 +79,21 @@ LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,51,20,169,16 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc Sat Jul 15 02:48:31 2006 @@ -1,38 +1,39 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenue",IDC_WELCOMETITLE,115,8,195,24 - LTEXT "Cet assistant installe un nouveau pilote pour:", - IDC_STATIC,115,40,195,16 + LTEXT "Cet assistant installe un nouveau pilote pour :", + IDC_STATIC,115,21,195,16 LTEXT "Cliquer sur Suivant pour continuer.",IDC_STATIC,115,169,195,17 - LTEXT "UNKNOWN DEVICE",IDC_DEVICE,129,55,164,11 + LTEXT "MATERIEL INCONNU",IDC_DEVICE,129,36,164,11 + LTEXT "ATTENTION ! L'INSTALLATION D'UN PILOTE PEUT ENTRAINER LE BLOCAGE DE VOTRE ORDINATEUR OU LE RENDRE INDEMARRABLE !",IDC_STATIC,105,59,210,16 CONTROL "Installer le pilote automatiquement",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,115,112,178,13 CONTROL "Installer le pilote depuis un endroit spécifié",IDC_RADIO_MANUAL, "Button",BS_AUTORADIOBUTTON,115,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" FONT 8, "MS Shell Dlg" BEGIN LTEXT "L'installation a échoué",IDC_FINISHTITLE,115,8,195,24 - LTEXT "Le périphérique n'a pu être installé car le pilote est introuvable.", + LTEXT "Le périphérique n'a pu être installé car aucun pilote adapté n'a pu être trouvé.", IDC_STATIC,115,40,195,19 - LTEXT "Clicquer sur Précédent si vous avez un disque pilote ou vous connaissez le chemin du pilote.", + LTEXT "Cliquer sur Précédent si vous avez un disque pilote ou vous connaissez le chemin du pilote.", IDC_STATIC,113,98,181,24 CONTROL "Ne plus afficher ce message",IDC_DONOTSHOWDLG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,114,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" @@ -44,7 +45,7 @@ LTEXT "Matériel inconnu",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" FONT 8, "MS Shell Dlg" @@ -62,30 +63,44 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Matériel Inconnu",IDC_DEVICE,51,20,169,16 + LTEXT "MATERIEL INCONNU",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Matériel Inconnu",IDC_DEVICE,51,20,169,16 + LTEXT "MATERIEL INCONNU",IDC_DEVICE,51,20,169,16 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Installation terminée",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Vous devez redémarrer l'ordinateur avant d'utiliser :", + IDC_STATIC,120,32,195,19 + LTEXT "Cliquer sur Terminer pour fermer l'assistant.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Installation de matériel" +FONT 8, "MS Shell Dlg" +BEGIN LTEXT "Installation terminée",IDC_FINISHTITLE,115,8,195,11 - LTEXT "L'assistant a fini d'installer le pilote pour:", + LTEXT "L'assistant a fini d'installer le pilote pour :", IDC_STATIC,115,32,195,19 LTEXT "Cliquer sur Terminer pour fermer l'assistant.",IDC_STATIC,115,174, 179,11 Propchange: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc Sat Jul 15 02:48:31 2006 @@ -1,95 +1,110 @@ -// Hungarian resource file by Robert Horvath - talley at cubeclub.hu -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL - -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "Hardver telepítõ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "welcome??",IDC_WELCOMETITLE,115,8,195,24 - LTEXT "A telepítõ a következõ hardverhez telepít fel eszközmeghatjtót:", - IDC_STATIC,120,40,195,16 - LTEXT "Kattints a Tovább gombra a folytatáshoz.",IDC_STATIC,115,169,195,17 - LTEXT "Ismeretlen eszköz!",IDC_DEVICE,129,55,164,11 - CONTROL "Automatikus telepítés",IDC_RADIO_AUTO,"Button", - BS_AUTORADIOBUTTON,120,112,178,13 - CONTROL "Eszközmeghajtó kiválasztása",IDC_RADIO_MANUAL, - "Button",BS_AUTORADIOBUTTON,120,133,164,14 -END - -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "Hardver telepítõ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "A telepítés sikertelen.",IDC_FINISHTITLE,115,8,195,24 - LTEXT "Az eszközmeghajtó nem található.", - IDC_STATIC,120,40,195,19 - LTEXT "Kattints a Vissza gombra, és az Eszközmeghajtó kiválasztása gombra, ha tudod, hol van az eszközmeghajtó.", - IDC_STATIC,120,98,181,24 - CONTROL "Ne mutasd ezt többször",IDC_DONOTSHOWDLG,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 -END - -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "Device installation" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Installation failed",IDC_FINISHTITLE,120,8,195,24 - LTEXT "The device could not be installed because an unexpected error happened.", - IDC_STATIC,120,40,195,19 - LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 -END - -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Hardver telepítõ" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Keresés ezeken a helyeken",IDC_RADIO_SEARCHHERE,"Button", - BS_AUTORADIOBUTTON,27,11,239,13 - CONTROL "Eszközmeghajtó kiválasztása",IDC_RADIO_CHOOSE,"Button", - BS_AUTORADIOBUTTON,27,98,171,12 - CONTROL "Keresés cserélhetõ lemezeken",IDC_CHECK_MEDIA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 - CONTROL "A következõ útvonalon keressen",IDC_CHECK_PATH,"Button", - WS_TABSTOP,47,54,162,10 - PUSHBUTTON "Böngészés",IDC_BROWSE,248,69,45,14 - COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | - WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL -END - -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Hardver telepítõ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16 -END - -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Hardver telepítõ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16 -END - -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "Hardver telepítõ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "A telepítés sikeresen befejezõdött",IDC_FINISHTITLE,120,8,195,11 - LTEXT "A telepítõ feltelepítette az eszközmeghajtókat a következõ eszközhöz:", - IDC_STATIC,120,32,195,19 - LTEXT "A kilépéshez kattints a Befejezés gombra.",IDC_STATIC,120,174, - 179,11 - LTEXT "Ismeretlen eszköz!",IDC_DEVICE,148,53,147,12 -END - +// Hungarian resource file by Robert Horvath - talley at cubeclub.hu +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Hardver telepítõ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "welcome??",IDC_WELCOMETITLE,115,8,195,24 + LTEXT "A telepítõ a következõ hardverhez telepít fel eszközmeghatjtót:", + IDC_STATIC,120,21,195,16 + LTEXT "Kattints a Tovább gombra a folytatáshoz.",IDC_STATIC,115,169,195,17 + LTEXT "Ismeretlen eszköz!",IDC_DEVICE,129,36,164,11 + LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16 + CONTROL "Automatikus telepítés",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "Eszközmeghajtó kiválasztása",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Hardver telepítõ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A telepítés sikertelen.",IDC_FINISHTITLE,115,8,195,24 + LTEXT "Az eszközmeghajtó nem található.", + IDC_STATIC,120,40,195,19 + LTEXT "Kattints a Vissza gombra, és az Eszközmeghajtó kiválasztása gombra, ha tudod, hol van az eszközmeghajtó.", + IDC_STATIC,120,98,181,24 + CONTROL "Ne mutasd ezt többször",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation failed",IDC_FINISHTITLE,120,8,195,24 + LTEXT "The device could not be installed because an unexpected error happened.", + IDC_STATIC,120,40,195,19 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 +END + +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hardver telepítõ" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Keresés ezeken a helyeken",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "Eszközmeghajtó kiválasztása",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "Keresés cserélhetõ lemezeken",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "A következõ útvonalon keressen",IDC_CHECK_PATH,"Button", + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "Böngészés",IDC_BROWSE,248,69,45,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hardver telepítõ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16 +END + +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hardver telepítõ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16 +END + +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Hardver telepítõ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A telepítés sikeresen befejezõdött",IDC_FINISHTITLE,120,8,195,11 + LTEXT "A telepítõ feltelepítette az eszközmeghajtókat a következõ eszközhöz:", + IDC_STATIC,120,32,195,19 + LTEXT "A kilépéshez kattints a Befejezés gombra.",IDC_STATIC,120,174, + 179,11 + LTEXT "Ismeretlen eszköz!",IDC_DEVICE,148,53,147,12 +END + Propchange: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Ru.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Ru.rc Sat Jul 15 02:48:31 2006 @@ -1,6 +1,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" @@ -8,16 +8,17 @@ BEGIN LTEXT "Âàñ ïðèâåòñòâóåò ìàñòåð óñòàíîâêè íîâîãî îáîðóäîâàíèÿ",IDC_WELCOMETITLE,120,8,195,24 LTEXT "Ýòîò ìàñòåð óñòàíàâëèâàåò äðàéâåð äëÿ:", - IDC_STATIC,120,40,195,16 + IDC_STATIC,120,21,195,16 LTEXT "Äëÿ ïðîäîëæåíèÿ íàæìèòå êíîïêó ""Äàëåå"".",IDC_STATIC,120,169,195,17 - LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,134,55,164,11 + LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,134,36,164,11 + LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16 CONTROL "Óñòàíîâèòü äðàéâåð àâòîìàòè÷åñêè",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Óñòàíîâèòü äðàéâåð èç óêàçàííîãî ìåñòà",IDC_RADIO_MANUAL, "Button",BS_AUTORADIOBUTTON,120,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" @@ -32,7 +33,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -44,7 +45,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" FONT 8, "MS Shell Dlg" @@ -62,7 +63,7 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" FONT 8, "MS Shell Dlg" @@ -70,7 +71,7 @@ LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" FONT 8, "MS Shell Dlg" @@ -78,7 +79,21 @@ LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,51,20,169,16 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/newdev.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/newdev.c Sat Jul 15 02:48:31 2006 @@ -325,22 +325,16 @@ return TRUE; } -static LPTSTR +static LPCTSTR GetFileExt(IN LPTSTR FileName) { - if (FileName == 0) + LPCTSTR Dot; + + Dot = _tcsrchr(FileName, _T('.')); + if (!Dot) return _T(""); - int i = _tcsclen(FileName); - while ((i >= 0) && (FileName[i] != _T('.'))) - i--; - - FileName = _tcslwr(FileName); - - if (i >= 0) - return &FileName[i]; - else - return _T(""); + return Dot; } static BOOL @@ -390,7 +384,7 @@ { LPCTSTR pszExtension = GetFileExt(FileName); - if ((_tcscmp(pszExtension, _T(".inf")) == 0) && (_tcscmp(LastDirPath, DirPath) != 0)) + if ((_tcsicmp(pszExtension, _T(".inf")) == 0) && (_tcscmp(LastDirPath, DirPath) != 0)) { _tcscpy(LastDirPath, DirPath); @@ -462,9 +456,6 @@ DWORD CustomTextLength = 0; DWORD LengthNeeded = 0; LPTSTR Buffer; - - TRACE("Include removable devices: %s\n", IncludeRemovableDevices ? "yes" : "no"); - TRACE("Include custom path : %s\n", IncludeCustomPath ? "yes" : "no"); /* Calculate length needed to store the search paths */ if (IncludeRemovableDevices) @@ -754,6 +745,20 @@ { /* Driver found ; install it */ retval = InstallCurrentDriver(DevInstData); + if (retval && Show != SW_HIDE) + { + /* Should we display the 'Need to reboot' page? */ + SP_DEVINSTALL_PARAMS installParams; + installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParams( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + &installParams)) + { + if (installParams.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT)) + retval = DisplayWizard(DevInstData, hWndParent, IDD_NEEDREBOOT); + } + } goto cleanup; } else if (Show == SW_HIDE) Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/resource.h (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/resource.h Sat Jul 15 02:48:31 2006 @@ -25,6 +25,8 @@ #define IDD_INSTALLDRV 3 #define IDD_NODRIVER 4 #define IDD_INSTALLFAILED 5 -#define IDD_FINISHPAGE 6 +#define IDD_NEEDREBOOT 6 +#define IDD_FINISHPAGE 7 +#define IDD_MAXIMUMPAGE IDD_FINISHPAGE #endif /* RESOURCE_H */ Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/wizard.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/wizard.c Sat Jul 15 02:48:31 2006 @@ -421,6 +421,7 @@ IN LPARAM lParam) { PDEVINSTDATA DevInstData; + UNREFERENCED_PARAMETER(wParam); /* Retrieve pointer to the global setup data */ DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); @@ -501,7 +502,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static void @@ -663,7 +664,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -758,7 +759,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -809,9 +810,25 @@ CloseHandle(hThread); hThread = 0; if (wParam == 0) - PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_FINISHPAGE); - else - PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED); + { + /* Should we reboot? */ + SP_DEVINSTALL_PARAMS installParams; + installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParams( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + &installParams)) + { + if (installParams.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT)) + { + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_NEEDREBOOT); + } + else + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_FINISHPAGE); + break; + } + } + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED); break; } @@ -848,7 +865,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -861,6 +878,8 @@ PDEVINSTDATA DevInstData; HWND hwndControl; + UNREFERENCED_PARAMETER(wParam); + /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); @@ -870,8 +889,12 @@ { BOOL DisableableDevice = FALSE; + /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + /* Center the wizard window */ + CenterWindow(GetParent(hwndDlg)); hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); ShowWindow(hwndControl, SW_HIDE); @@ -957,7 +980,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -968,6 +991,7 @@ IN LPARAM lParam) { PDEVINSTDATA DevInstData; + UNREFERENCED_PARAMETER(wParam); /* Retrieve pointer to the global setup data */ DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); @@ -981,6 +1005,9 @@ /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + /* Center the wizard window */ + CenterWindow(GetParent(hwndDlg)); hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); ShowWindow(hwndControl, SW_HIDE); @@ -1032,17 +1059,18 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK -FinishDlgProc( +NeedRebootDlgProc( IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) { PDEVINSTDATA DevInstData; + UNREFERENCED_PARAMETER(wParam); /* Retrieve pointer to the global setup data */ DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); @@ -1056,6 +1084,9 @@ /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + /* Center the wizard window */ + CenterWindow(GetParent(hwndDlg)); hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); ShowWindow(hwndControl, SW_HIDE); @@ -1107,7 +1138,86 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); +} + +static INT_PTR CALLBACK +FinishDlgProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PDEVINSTDATA DevInstData; + UNREFERENCED_PARAMETER(wParam); + + /* Retrieve pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + /* Center the wizard window */ + CenterWindow(GetParent(hwndDlg)); + + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow(hwndControl, SW_HIDE); + EnableWindow(hwndControl, FALSE); + + SendDlgItemMessage( + hwndDlg, + IDC_DEVICE, + WM_SETTEXT, + 0, + (LPARAM)DevInstData->drvInfoData.Description); + + /* Set title font */ + SendDlgItemMessage( + hwndDlg, + IDC_FINISHTITLE, + WM_SETFONT, + (WPARAM)DevInstData->hTitleFont, + (LPARAM)TRUE); + break; + } + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the correct buttons on for the active page */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + break; + + case PSN_WIZBACK: + /* Handle a Back button click, if necessary */ + break; + + case PSN_WIZFINISH: + /* Handle a Finish button click, if necessary */ + break; + + default: + break; + } + break; + } + + default: + break; + } + + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static HFONT @@ -1142,7 +1252,7 @@ IN UINT startPage) { PROPSHEETHEADER psh; - HPROPSHEETPAGE ahpsp[IDD_FINISHPAGE + 1]; + HPROPSHEETPAGE ahpsp[IDD_MAXIMUMPAGE + 1]; PROPSHEETPAGE psp; /* Create the Welcome page */ @@ -1151,43 +1261,49 @@ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.hInstance = hDllInstance; psp.lParam = (LPARAM)DevInstData; - psp.pfnDlgProc = WelcomeDlgProc; + psp.pfnDlgProc = (DLGPROC) WelcomeDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE); ahpsp[IDD_WELCOMEPAGE] = CreatePropertySheetPage(&psp); /* Create the Select Source page */ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pfnDlgProc = CHSourceDlgProc; + psp.pfnDlgProc = (DLGPROC) CHSourceDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_CHSOURCE); ahpsp[IDD_CHSOURCE] = CreatePropertySheetPage(&psp); /* Create the Search driver page */ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pfnDlgProc = SearchDrvDlgProc; + psp.pfnDlgProc = (DLGPROC) SearchDrvDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV); ahpsp[IDD_SEARCHDRV] = CreatePropertySheetPage(&psp); /* Create the Install driver page */ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pfnDlgProc = InstallDrvDlgProc; + psp.pfnDlgProc = (DLGPROC) InstallDrvDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV); ahpsp[IDD_INSTALLDRV] = CreatePropertySheetPage(&psp); /* Create the No driver page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; - psp.pfnDlgProc = NoDriverDlgProc; + psp.pfnDlgProc = (DLGPROC) NoDriverDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER); ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp); /* Create the Install failed page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; - psp.pfnDlgProc = InstallFailedDlgProc; + psp.pfnDlgProc = (DLGPROC) InstallFailedDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED); ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp); + /* Create the Need reboot page */ + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.pfnDlgProc = (DLGPROC) NeedRebootDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT); + ahpsp[IDD_NEEDREBOOT] = CreatePropertySheetPage(&psp); + /* Create the Finish page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; - psp.pfnDlgProc = FinishDlgProc; + psp.pfnDlgProc = (DLGPROC) FinishDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE); ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp); @@ -1196,7 +1312,7 @@ psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; psh.hInstance = hDllInstance; psh.hwndParent = hwndParent; - psh.nPages = IDD_FINISHPAGE + 1; + psh.nPages = IDD_MAXIMUMPAGE + 1; psh.nStartPage = startPage; psh.phpage = ahpsp; psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK);

18 years, 5 months

[ion] 23063: - Add IN/OUT annotations for KeWaitForSIngleObject - Set the wait block outside the loop, small optimization in case we get alerted by an APC and have to loop again. - Set the wait block pointer in the KTHREAD structure only *after* checking if a wait is actually needed. That way, if the object is already signaled, we don't set anything in the WaitBlockList. - Small optimization: only set the caller's WAitBlock as the next wait block if a timer wasn't specificed, else we ended up ov

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 15 01:45:27 2006 New Revision: 23063 URL: http://svn.reactos.org/svn/reactos?rev=23063&view=rev Log: - Add IN/OUT annotations for KeWaitForSIngleObject - Set the wait block outside the loop, small optimization in case we get alerted by an APC and have to loop again. - Set the wait block pointer in the KTHREAD structure only *after* checking if a wait is actually needed. That way, if the object is already signaled, we don't set anything in the WaitBlockList. - Small optimization: only set the caller's WAitBlock as the next wait block if a timer wasn't specificed, else we ended up overwriting the value. - Small optimziation: don't write the thread in the wait block, this is a wait for a signle object so this isn't needed. Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Sat Jul 15 01:45:27 2006 @@ -379,11 +379,11 @@ */ NTSTATUS NTAPI -KeWaitForSingleObject(PVOID Object, - KWAIT_REASON WaitReason, - KPROCESSOR_MODE WaitMode, - BOOLEAN Alertable, - PLARGE_INTEGER Timeout) +KeWaitForSingleObject(IN PVOID Object, + IN KWAIT_REASON WaitReason, + IN KPROCESSOR_MODE WaitMode, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL) { PKMUTANT CurrentObject; PKWAIT_BLOCK WaitBlock; @@ -406,6 +406,7 @@ } /* Start the actual Loop */ + WaitBlock = &CurrentThread->WaitBlock[0]; do { /* Check if a kernel APC is pending and we're below APC_LEVEL */ @@ -420,10 +421,6 @@ { /* Set default status */ CurrentThread->WaitStatus = STATUS_WAIT_0; - - /* Append wait block to the KTHREAD wait block list */ - WaitBlock = &CurrentThread->WaitBlock[0]; - CurrentThread->WaitBlockList = WaitBlock; /* Get the Current Object */ CurrentObject = (PKMUTANT)Object; @@ -460,12 +457,13 @@ goto DontWait; } + /* Append wait block to the KTHREAD wait block list */ + CurrentThread->WaitBlockList = WaitBlock; + /* Set up the Wait Block */ WaitBlock->Object = CurrentObject; - WaitBlock->Thread = CurrentThread; WaitBlock->WaitKey = (USHORT)(STATUS_SUCCESS); WaitBlock->WaitType = WaitAny; - WaitBlock->NextWaitBlock = WaitBlock; /* Make sure we can satisfy the Alertable request */ KiCheckAlertability(); @@ -508,6 +506,11 @@ WaitStatus = STATUS_TIMEOUT; goto DontWait; } + } + else + { + /* No timer block, so just set our wait block as next */ + WaitBlock->NextWaitBlock = WaitBlock; } /* Link the Object to this Wait Block */

18 years, 5 months

[fireball] 23062: Add tests for Create/Open/Set/Cancel Timer in Executive. Under Win2003 SP1 works perfectly, however ReactOS hangs.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jul 15 01:04:31 2006 New Revision: 23062 URL: http://svn.reactos.org/svn/reactos?rev=23062&view=rev Log: Add tests for Create/Open/Set/Cancel Timer in Executive. Under Win2003 SP1 works perfectly, however ReactOS hangs. Added: trunk/reactos/drivers/test/kmtest/ntos_ex.c Modified: trunk/reactos/drivers/test/kmtest/kmtest.c trunk/reactos/drivers/test/kmtest/kmtest.rbuild Modified: trunk/reactos/drivers/test/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.c (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.c Sat Jul 15 01:04:31 2006 @@ -106,6 +106,7 @@ VOID FASTCALL NtoskrnlIoMdlTest(); VOID FASTCALL NtoskrnlIoDeviceInterface(); VOID FASTCALL NtoskrnlObTest(); +VOID FASTCALL NtoskrnlExecutiveTests(); /* * DriverEntry @@ -116,6 +117,7 @@ PUNICODE_STRING RegistryPath) { DbgPrint("\n===============================================\nKernel Mode Regression Test driver starting...\n"); + NtoskrnlExecutiveTests(); NtoskrnlIoDeviceInterface(); NtoskrnlIoMdlTest(); NtoskrnlObTest(); Modified: trunk/reactos/drivers/test/kmtest/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.rbuild (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.rbuild Sat Jul 15 01:04:31 2006 @@ -7,6 +7,7 @@ <file>kmtest.c</file> <file>deviface.c</file> <file>deviface_test.c</file> + <file>ntos_ex.c</file> <file>ntos_io.c</file> <file>ntos_ob.c</file> <file>kmtest.rc</file> Added: trunk/reactos/drivers/test/kmtest/ntos_ex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_e… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_ex.c (added) +++ trunk/reactos/drivers/test/kmtest/ntos_ex.c Sat Jul 15 01:04:31 2006 @@ -1,0 +1,110 @@ +/* + * NTOSKRNL Executive Regressions KM-Test + * ReactOS Kernel Mode Regression Testing framework + * + * Copyright 2006 Aleksey Bragin <aleksey(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; see the file COPYING.LIB. + * If not, write to the Free Software Foundation, + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* INCLUDES *******************************************************************/ + +#include <ddk/ntddk.h> +#include <ntifs.h> +#include <ndk/ntndk.h> +#include "kmtest.h" + +#define NDEBUG +#include "debug.h" + +/* PRIVATE FUNCTIONS ***********************************************************/ + +VOID +ExTimerTest() +{ + UNICODE_STRING TimerName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE TimerHandle; + HANDLE HandleOpened; + LARGE_INTEGER DueTime; + BOOLEAN PreviousState, CurrentState; + NTSTATUS Status; + + StartTest(); + + // Create the timer + RtlInitUnicodeString(&TimerName, L"\\TestTimer"); + InitializeObjectAttributes(&ObjectAttributes, &TimerName, 0, NULL, NULL); + Status = ZwCreateTimer(&TimerHandle, TIMER_ALL_ACCESS, + &ObjectAttributes, NotificationTimer); + ok(Status == STATUS_SUCCESS, "ZwCreateTimer failed with Status=0x%08lX", Status); + + // Open the timer + Status = ZwOpenTimer(&HandleOpened, TIMER_ALL_ACCESS, &ObjectAttributes); + ok(Status == STATUS_SUCCESS, "ZwOpenTimer failed with Status=0x%08lX", Status); + + // Set the timer, to some rather high value so it doesn't expire + DueTime.LowPart = -10000; + DueTime.HighPart = -10; + PreviousState = TRUE; + Status = ZwSetTimer(HandleOpened, &DueTime, NULL, NULL, FALSE, 0L, &PreviousState); + ok(Status == STATUS_SUCCESS, "ZwSetTimer failed with Status=0x%08lX", Status); + ok(PreviousState == FALSE, "Incorrect PreviousState returned when setting the timer"); + + // Cancel the timer + CurrentState = TRUE; + Status = ZwCancelTimer(HandleOpened, &CurrentState); + ok(Status == STATUS_SUCCESS, "ZwCancelTimer failed with Status=0x%08lX", Status); + ok(CurrentState == FALSE, "Incorrect CurrentState returned when canceling the timer"); + + // Set the timer to some small value, because we'll wait for it to expire + DueTime.LowPart = -100; + DueTime.HighPart = -1; + PreviousState = TRUE; + Status = ZwSetTimer(HandleOpened, &DueTime, NULL, NULL, FALSE, 0L, &PreviousState); + ok(Status == STATUS_SUCCESS, "ZwSetTimer failed with Status=0x%08lX", Status); + ok(PreviousState == FALSE, "Incorrect PreviousState returned when setting the timer"); + + // Wait until it expires + Status = ZwWaitForSingleObject(HandleOpened, FALSE, NULL); + ok(Status == STATUS_SUCCESS, "ZwWaitForSingleObject failed with Status=0x%08lX", Status); + + // And cancel it + CurrentState = FALSE; + Status = ZwCancelTimer(HandleOpened, &CurrentState); + ok(Status == STATUS_SUCCESS, "ZwCancelTimer failed with Status=0x%08lX", Status); + ok(CurrentState == TRUE, "Incorrect CurrentState returned when setting the timer"); + + // TODO: Add tests for a timer with APC routines + + // Cleanup... + Status = ZwClose(HandleOpened); + ok(Status == STATUS_SUCCESS, "ZwClose failed with Status=0x%08lX", Status); + + Status = ZwClose(TimerHandle); + ok(Status == STATUS_SUCCESS, "ZwClose failed with Status=0x%08lX", Status); + + FinishTest("NTOSKRNL Executive Timer"); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID +FASTCALL +NtoskrnlExecutiveTests() +{ + ExTimerTest(); +}

18 years, 5 months

[greatlrd] 23061: [AUDLT] This code are clean and written by filip.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jul 14 21:20:21 2006 New Revision: 23061 URL: http://svn.reactos.org/svn/reactos?rev=23061&view=rev Log: [AUDLT] This code are clean and written by filip. Modified: trunk/reactos/drivers/video/displays/framebuf/enable.c (props changed) trunk/reactos/drivers/video/displays/framebuf/framebuf.def (props changed) trunk/reactos/drivers/video/displays/framebuf/framebuf.h (props changed) trunk/reactos/drivers/video/displays/framebuf/framebuf.rc (props changed) trunk/reactos/drivers/video/displays/framebuf/palette.c (props changed) trunk/reactos/drivers/video/displays/framebuf/pointer.c (props changed) trunk/reactos/drivers/video/displays/framebuf/screen.c (props changed) trunk/reactos/drivers/video/displays/framebuf/surface.c (props changed) Propchange: trunk/reactos/drivers/video/displays/framebuf/enable.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/framebuf.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/framebuf.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/framebuf.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/palette.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/pointer.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/screen.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/surface.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

[ion] 23060: - Implement Safe Referencing (an internal method for referencing objects when race conditions are possible) - Implement two Vista APIs and export them: ObIsKernelHandle and ObDeleteObjectDeferDelete. ZOMG! Vista APIs in the kernel!

by ion＠svn.reactos.org

Author: ion Date: Fri Jul 14 19:26:19 2006 New Revision: 23060 URL: http://svn.reactos.org/svn/reactos?rev=23060&view=rev Log: - Implement Safe Referencing (an internal method for referencing objects when race conditions are possible) - Implement two Vista APIs and export them: ObIsKernelHandle and ObDeleteObjectDeferDelete. ZOMG! Vista APIs in the kernel! Modified: trunk/reactos/ntoskrnl/ntoskrnl.def trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Fri Jul 14 19:26:19 2006 @@ -841,12 +841,14 @@ ObCreateObject@36 ObCreateObjectType@16 ObDereferenceObject@4 +ObDereferenceObjectDeferDelete@4 ObDereferenceSecurityDescriptor@8 @ObfDereferenceObject@4 ObFindHandleForObject@20 @ObfReferenceObject@4 ObGetObjectSecurity@12 ObInsertObject@24 +ObIsKernelHandle@4 ObLogSecurityDescriptor@12 ObMakeTemporaryObject@4 ObOpenObjectByName@28 Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Fri Jul 14 19:26:19 2006 @@ -2155,4 +2155,14 @@ ObDereferenceObject(SourceProcess); return Status; } + +#undef ObIsKernelHandle +BOOLEAN +NTAPI +ObIsKernelHandle(IN HANDLE Handle) +{ + /* We know we're kernel mode, so just check for the kernel handle flag */ + return (BOOLEAN)((ULONG_PTR)Handle & KERNEL_HANDLE_FLAG); +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Fri Jul 14 19:26:19 2006 @@ -17,6 +17,37 @@ /* PRIVATE FUNCTIONS *********************************************************/ +BOOLEAN +FASTCALL +ObReferenceObjectSafe(IN PVOID Object) +{ + POBJECT_HEADER ObjectHeader; + LONG OldValue, NewValue; + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + + /* Get the current reference count and fail if it's zero */ + OldValue = ObjectHeader->PointerCount; + if (!OldValue) return FALSE; + + /* Start reference loop */ + do + { + /* Increase the reference count */ + NewValue = InterlockedCompareExchange(&ObjectHeader->PointerCount, + OldValue + 1, + OldValue); + if (OldValue == NewValue) return TRUE; + + /* Keep looping */ + OldValue = NewValue; + } while (OldValue); + + /* If we got here, then the reference count is now 0 */ + return FALSE; +} + VOID NTAPI ObpDeferObjectDeletion(IN PVOID Object) @@ -129,7 +160,6 @@ /* Get the object and count */ Object = (PVOID)(Value &~ MAX_FAST_REFS); Count = Value & MAX_FAST_REFS; - DPRINT("Ref: %p\n", Object); /* Check if the reference count is over 1 */ if (Count > 1) return Object; @@ -172,7 +202,6 @@ ULONG_PTR Value, NewValue; /* Sanity checks */ - DPRINT("DeRef: %p\n", Object); ASSERT(Object); ASSERT(!(((ULONG_PTR)Object) & MAX_FAST_REFS)); @@ -287,10 +316,19 @@ } } -#ifdef ObDereferenceObject +VOID +NTAPI +ObDereferenceObjectDeferDelete(IN PVOID Object) +{ + /* Check whether the object can now be deleted. */ + if (!(InterlockedDecrement(&OBJECT_TO_OBJECT_HEADER(Object)->PointerCount))) + { + /* Add us to the deferred deletion list */ + ObpDeferObjectDeletion(Object); + } +} + #undef ObDereferenceObject -#endif - VOID NTAPI ObDereferenceObject(IN PVOID Object)

18 years, 5 months

[mbosma] 23059: Even more sizeof fixes.

by mbosma＠svn.reactos.org

Author: mbosma Date: Fri Jul 14 18:57:47 2006 New Revision: 23059 URL: http://svn.reactos.org/svn/reactos?rev=23059&view=rev Log: Even more sizeof fixes. Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Fri Jul 14 18:57:47 2006 @@ -3300,7 +3300,7 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Section"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(SECTION_OBJECT); + ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(ROS_SECTION_OBJECT); ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.GenericMapping = MmpSectionMapping; @@ -3353,7 +3353,7 @@ ObjectAttributes, ExGetPreviousMode(), NULL, - sizeof(SECTION_OBJECT), + sizeof(ROS_SECTION_OBJECT), 0, 0, (PVOID*)(PVOID)&Section);

18 years, 5 months

← Newer
1
...
31
32
33
34
35
36
37
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006