Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 23030: Symbolic link should start with \??\, to be able to open the object from kernel mode
by hpoussin＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: hpoussin Date: Thu Jul 13 00:41:28 2006 New Revision: 23030 URL: http://svn.reactos.org/svn/reactos?rev=23030&view=rev Log: Symbolic link should start with \??\, to be able to open the object from kernel mode Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Thu Jul 13 00:41:28 2006 @@ -634,8 +634,8 @@ ASSERT_IRQL(PASSIVE_LEVEL); - DPRINT("IoRegisterDeviceInterface(): PDO %p, RefString: %p, SLName: %p\n", - PhysicalDeviceObject, ReferenceString, SymbolicLinkName); + DPRINT("IoRegisterDeviceInterface(): PDO %p, RefString: %wZ\n", + PhysicalDeviceObject, ReferenceString); /* Parameters must pass three border of checks */ DeviceObjectExtension = (PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension; @@ -916,14 +916,7 @@ DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); ExFreePool(SymbolicLinkName->Buffer); } - - /* Remove \\?\ at the start of symbolic link name */ - SymbolicLinkName->Length -= 4 * sizeof(WCHAR); - SymbolicLinkName->MaximumLength -= 4 * sizeof(WCHAR); - RtlMoveMemory( - SymbolicLinkName->Buffer, - &SymbolicLinkName->Buffer[4], - SymbolicLinkName->Length); + SymbolicLinkName->Buffer[1] = '?'; ZwClose(SubKey); ZwClose(InterfaceKey); @@ -962,7 +955,6 @@ { PDEVICE_OBJECT PhysicalDeviceObject; PFILE_OBJECT FileObject; - UNICODE_STRING ObjectName; UNICODE_STRING GuidString; PWCHAR StartPosition; PWCHAR EndPosition; @@ -974,7 +966,7 @@ DPRINT("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); - /* Symbolic link name is ACPI#PNP0501#1#{GUID}\ReferenceString */ + /* Symbolic link name is \??\ACPI#PNP0501#1#{GUID}\ReferenceString */ /* Get GUID from SymbolicLinkName */ StartPosition = wcschr(SymbolicLinkName->Buffer, L'{'); EndPosition = wcschr(SymbolicLinkName->Buffer, L'}'); @@ -986,24 +978,15 @@ GuidString.Buffer = StartPosition; GuidString.MaximumLength = GuidString.Length = (ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition; - /* Create \??\SymbolicLinkName string */ - ObjectName.Length = 0; - ObjectName.MaximumLength = SymbolicLinkName->Length + 4 * sizeof(WCHAR); - ObjectName.Buffer = ExAllocatePool(PagedPool, ObjectName.MaximumLength); - if (!ObjectName.Buffer) - return STATUS_INSUFFICIENT_RESOURCES; - RtlAppendUnicodeToString(&ObjectName, L"\\??\\"); - RtlAppendUnicodeStringToString(&ObjectName, SymbolicLinkName); - /* Get pointer to the PDO */ - Status = IoGetDeviceObjectPointer(&ObjectName, + Status = IoGetDeviceObjectPointer( + SymbolicLinkName, 0, /* DesiredAccess */ &FileObject, &PhysicalDeviceObject); if (!NT_SUCCESS(Status)) { DPRINT("IoGetDeviceObjectPointer() failed with status 0x%08lx\n", Status); - ExFreePool(ObjectName.Buffer); return Status; } @@ -1016,7 +999,6 @@ (PVOID)SymbolicLinkName); ObDereferenceObject(FileObject); - ExFreePool(ObjectName.Buffer); return STATUS_SUCCESS; }

1 0

[mwirth] 23029: Updated MediaWiki to 1.7.1
by mwirth＠svn.reactos.org 12 Jul '06

12 Jul '06

1 0

[janderwald] 23028: * set FontName array to max of LF_FACESIZE * read WindowSize from registry * create GUI_CONSOLE_DATA directly in GuiInitConsole * wait untill GuiWindow has been created (needed for synchronization with variable window sizes)
by janderwald＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: janderwald Date: Wed Jul 12 20:48:58 2006 New Revision: 23028 URL: http://svn.reactos.org/svn/reactos?rev=23028&view=rev Log: * set FontName array to max of LF_FACESIZE * read WindowSize from registry * create GUI_CONSOLE_DATA directly in GuiInitConsole * wait untill GuiWindow has been created (needed for synchronization with variable window sizes) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Wed Jul 12 20:48:58 2006 @@ -114,6 +114,7 @@ Buffer->MaxY = Console->Size.Y; Buffer->ShowX = 0; Buffer->ShowY = 0; + //FIXME Buffer->Buffer = HeapAlloc(Win32CsrApiHeap, 0, Buffer->MaxX * Buffer->MaxY * 2); if (NULL == Buffer->Buffer) { @@ -146,6 +147,7 @@ Console->Title.MaximumLength = Console->Title.Length = 0; Console->Title.Buffer = NULL; + //FIXME RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); Console->Header.ReferenceCount = 0; @@ -3022,7 +3024,8 @@ Record->Echoed = FALSE; Record->Fake = FALSE; - Record->InputEvent = *InputRecord++; + //Record->InputEvent = *InputRecord++; + memcpy(&Record->InputEvent, &InputRecord[i], sizeof(INPUT_RECORD)); if (KEY_EVENT == Record->InputEvent.EventType) { /* FIXME - convert from unicode to ascii!! */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Wed Jul 12 20:48:58 2006 @@ -31,7 +31,8 @@ POINT SelectionStart; BOOL MouseDown; HMODULE ConsoleLibrary; - WCHAR FontName[128]; + HANDLE hGuiInitEvent; + WCHAR FontName[LF_FACESIZE]; DWORD FontSize; DWORD FontWeight; DWORD CursorSize; @@ -39,6 +40,7 @@ DWORD FullScreen; DWORD QuickEdit; DWORD InsertMode; + DWORD WindowSize; } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; #ifndef WM_APP @@ -270,6 +272,10 @@ { GuiData->HistoryNoDup = Value; } + else if (!wcscmp(szValueName, L"WindowSize")) + { + GuiData->WindowSize = Value; + } else if (!wcscmp(szValueName, L"FullScreen")) { GuiData->FullScreen = Value; @@ -293,6 +299,7 @@ wcscpy(GuiData->FontName, L"Bitstream Vera Sans Mono"); GuiData->FontSize = 0x0008000C; // font is 8x12 + GuiData->WindowSize = 0x00190050; // default window size is 25x80 GuiData->FontWeight = FW_NORMAL; GuiData->CursorSize = 0; GuiData->HistoryNoDup = FALSE; @@ -308,16 +315,13 @@ { RECT Rect; PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) Create->lpCreateParams; - PGUI_CONSOLE_DATA GuiData; + PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)Console->PrivateData; HDC Dc; HFONT OldFont; TEXTMETRICW Metrics; PCSRSS_PROCESS_DATA ProcessData; HKEY hKey; - GuiData = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, - sizeof(GUI_CONSOLE_DATA) + - (Console->Size.X + 1) * sizeof(WCHAR)); if (NULL == GuiData) { DPRINT1("GuiConsoleNcCreate: HeapAlloc failed\n"); @@ -335,9 +339,13 @@ } } + Console->Size.X = LOWORD(GuiData->WindowSize); + Console->Size.Y = HIWORD(GuiData->WindowSize); + InitializeCriticalSection(&GuiData->Lock); - GuiData->LineBuffer = (PWCHAR)(GuiData + 1); + GuiData->LineBuffer = (PWCHAR)HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, + Console->Size.X * sizeof(WCHAR)); GuiData->Font = CreateFontW(LOWORD(GuiData->FontSize), 0, //HIWORD(GuiData->FontSize), @@ -396,7 +404,7 @@ GuiData->ForceCursorOff = FALSE; GuiData->Selection.left = -1; - + DPRINT("Console %p GuiData %p\n", Console, GuiData); Console->PrivateData = GuiData; SetWindowLongPtrW(hWnd, GWL_USERDATA, (DWORD_PTR) Console); @@ -409,6 +417,7 @@ Rect.bottom - Rect.top, FALSE); SetTimer(hWnd, 1, CURSOR_BLINK_TIME, NULL); + SetEvent(GuiData->hGuiInitEvent); return (BOOL) DefWindowProcW(hWnd, WM_NCCREATE, 0, (LPARAM) Create); } @@ -1487,6 +1496,7 @@ { HANDLE GraphicsStartupEvent; HANDLE ThreadHandle; + PGUI_CONSOLE_DATA GuiData; if (! ConsInitialized) { @@ -1499,8 +1509,6 @@ } Console->Vtbl = &GuiVtbl; - Console->Size.X = 80; - Console->Size.Y = 25; if (NULL == NotifyWnd) { GraphicsStartupEvent = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -1533,8 +1541,31 @@ return STATUS_UNSUCCESSFUL; } } - - PostMessageW(NotifyWnd, PM_CREATE_CONSOLE, 0, (LPARAM) Console); + GuiData = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, + sizeof(GUI_CONSOLE_DATA)); + if (!GuiData) + { + DPRINT1("Win32Csr: Failed to create GUI_CONSOLE_DATA\n"); + return STATUS_UNSUCCESSFUL; + } + + Console->PrivateData = (PVOID) GuiData; + /* + * we need to wait untill the GUI has been fully initialized + * to retrieve custom settings i.e. WindowSize etc.. + * Ideally we could use SendNotifyMessage for this but its not + * yet implemented. + * + */ + GuiData->hGuiInitEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + /* create console */ + PostMessageW(NotifyWnd, PM_CREATE_CONSOLE, 0, (LPARAM) Console); + + /* wait untill initialization has finished */ + WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE); + DPRINT("received event Console %p GuiData %p X %d Y %d\n", Console, Console->PrivateData, Console->Size.X, Console->Size.Y); + CloseHandle(GuiData->hGuiInitEvent); + GuiData->hGuiInitEvent = NULL; return STATUS_SUCCESS; }

1 0

[hpoussin] 23027: Implement the 'You need to reboot' wizard page, and use it instead of the network message box. Main advantage is that the message box doesn't appear anymore during second stage setup.
by hpoussin＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: hpoussin Date: Wed Jul 12 19:30:09 2006 New Revision: 23027 URL: http://svn.reactos.org/svn/reactos?rev=23027&view=rev Log: Implement the 'You need to reboot' wizard page, and use it instead of the network message box. Main advantage is that the message box doesn't appear anymore during second stage setup. Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/dll/win32/newdev/De.rc trunk/reactos/dll/win32/newdev/En.rc trunk/reactos/dll/win32/newdev/Es.rc trunk/reactos/dll/win32/newdev/Fr.rc trunk/reactos/dll/win32/newdev/Hu.rc trunk/reactos/dll/win32/newdev/Ru.rc trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/resource.h trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c Wed Jul 12 19:30:09 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: trunk/reactos/dll/win32/newdev/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/De.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/De.rc (original) +++ trunk/reactos/dll/win32/newdev/De.rc Wed Jul 12 19:30:09 2006 @@ -79,6 +79,20 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT 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 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 DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/newdev/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/En.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/En.rc (original) +++ trunk/reactos/dll/win32/newdev/En.rc Wed Jul 12 19:30:09 2006 @@ -79,6 +79,20 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT 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 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 DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/newdev/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Es.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Es.rc (original) +++ trunk/reactos/dll/win32/newdev/Es.rc Wed Jul 12 19:30:09 2006 @@ -79,6 +79,20 @@ LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT 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 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 DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/newdev/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Fr.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Fr.rc (original) +++ trunk/reactos/dll/win32/newdev/Fr.rc Wed Jul 12 19:30:09 2006 @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenue",IDC_WELCOMETITLE,115,8,195,24 - LTEXT "Cet assistant installe un nouveau pilote pour:", + 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 "MATERIEL INCONNU",IDC_DEVICE,129,36,164,11 @@ -79,6 +79,20 @@ LTEXT "MATERIEL INCONNU",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT 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 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 DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -86,7 +100,7 @@ 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 Modified: trunk/reactos/dll/win32/newdev/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Hu.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Hu.rc (original) +++ trunk/reactos/dll/win32/newdev/Hu.rc Wed Jul 12 19:30:09 2006 @@ -80,6 +80,20 @@ LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT 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 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 DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/newdev/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Ru.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Ru.rc (original) +++ trunk/reactos/dll/win32/newdev/Ru.rc Wed Jul 12 19:30:09 2006 @@ -79,6 +79,20 @@ LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT 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 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 DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c (original) +++ trunk/reactos/dll/win32/newdev/newdev.c Wed Jul 12 19:30:09 2006 @@ -457,9 +457,6 @@ 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) { @@ -748,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: trunk/reactos/dll/win32/newdev/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/resource.… ============================================================================== --- trunk/reactos/dll/win32/newdev/resource.h (original) +++ trunk/reactos/dll/win32/newdev/resource.h Wed Jul 12 19:30:09 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: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c (original) +++ trunk/reactos/dll/win32/newdev/wizard.c Wed Jul 12 19:30:09 2006 @@ -502,7 +502,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static void @@ -664,7 +664,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -759,7 +759,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -810,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; } @@ -849,7 +865,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -873,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); @@ -960,7 +980,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -985,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); @@ -1036,11 +1059,11 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK -FinishDlgProc( +NeedRebootDlgProc( IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -1061,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); @@ -1112,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 @@ -1147,7 +1252,7 @@ IN UINT startPage) { PROPSHEETHEADER psh; - HPROPSHEETPAGE ahpsp[IDD_FINISHPAGE + 1]; + HPROPSHEETPAGE ahpsp[IDD_MAXIMUMPAGE + 1]; PROPSHEETPAGE psp; /* Create the Welcome page */ @@ -1190,6 +1295,12 @@ 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 = (DLGPROC) FinishDlgProc; @@ -1201,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);

1 0

[fireball] 23026: Stub one more WMI api used by drivers. Kernel just ignores WMI information for now, but drivers are happy since they successfully submit it.
by fireball＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: fireball Date: Wed Jul 12 18:00:21 2006 New Revision: 23026 URL: http://svn.reactos.org/svn/reactos?rev=23026&view=rev Log: Stub one more WMI api used by drivers. Kernel just ignores WMI information for now, but drivers are happy since they successfully submit it. Modified: trunk/reactos/ntoskrnl/wmi/wmi.c Modified: trunk/reactos/ntoskrnl/wmi/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmi.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmi.c (original) +++ trunk/reactos/ntoskrnl/wmi/wmi.c Wed Jul 12 18:00:21 2006 @@ -62,8 +62,10 @@ NTAPI IoWMIWriteEvent(IN PVOID WnodeEventItem) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + DPRINT1("IoWMIWriteEvent() called for WnodeEventItem %p, returning success\n", + WnodeEventItem); + + return STATUS_SUCCESS; } /*

1 0

[hpoussin] 23025: Add commit step (disabled by default)
by hpoussin＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: hpoussin Date: Wed Jul 12 16:57:17 2006 New Revision: 23025 URL: http://svn.reactos.org/svn/reactos?rev=23025&view=rev Log: Add commit step (disabled by default) Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=23025&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Wed Jul 12 16:57:17 2006 @@ -222,6 +222,9 @@ IF ERRORLEVEL 1 GOTO :eof ECHO Compilation successful. You should try to run ReactOS to see if ECHO no visible regressions appeared before committing the changes. +FOR %%m IN (%WINE_LIST%) DO ( + REM svn.exe commit "%WINE_ROS_DIR%\dll\win32\%%m" -m "Autosyncing with Wine HEAD" --username LOGIN --password PASSWORD --non-interactive +) GOTO :eof :internal_analyseline

1 0

[winesync] 23024: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: winesync Date: Wed Jul 12 16:40:40 2006 New Revision: 23024 URL: http://svn.reactos.org/svn/reactos?rev=23024&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/crypt32.spec trunk/reactos/dll/win32/crypt32/decode.c trunk/reactos/dll/win32/riched32/richedit.c Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c (original) +++ trunk/reactos/dll/win32/crypt32/cert.c Wed Jul 12 16:40:40 2006 @@ -307,6 +307,40 @@ ret = TRUE; } break; + case CERT_KEY_IDENTIFIER_PROP_ID: + ret = CertContext_GetProperty((void *)pCertContext, dwPropId, + pvData, pcbData); + if (!ret) + SetLastError(ERROR_INVALID_DATA); + break; + case CERT_KEY_PROV_HANDLE_PROP_ID: + { + CERT_KEY_CONTEXT keyContext; + DWORD size = sizeof(keyContext); + + ret = CertContext_GetProperty((void *)pCertContext, + CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); + if (ret) + { + if (!pvData) + { + *pcbData = sizeof(HCRYPTPROV); + ret = TRUE; + } + else if (*pcbData < sizeof(HCRYPTPROV)) + { + SetLastError(ERROR_MORE_DATA); + *pcbData = sizeof(HCRYPTPROV); + ret = FALSE; + } + else + { + *(HCRYPTPROV *)pvData = keyContext.hCryptProv; + ret = TRUE; + } + } + break; + } case CERT_KEY_PROV_INFO_PROP_ID: ret = CertContext_GetProperty((void *)pCertContext, dwPropId, pvData, pcbData); @@ -397,11 +431,6 @@ if (!properties) ret = FALSE; - else if (!pvData) - { - ContextPropertyList_RemoveProperty(properties, dwPropId); - ret = TRUE; - } else { switch (dwPropId) @@ -424,20 +453,76 @@ case CERT_CROSS_CERT_DIST_POINTS_PROP_ID: case CERT_RENEWAL_PROP_ID: { - PCRYPT_DATA_BLOB blob = (PCRYPT_DATA_BLOB)pvData; - - ret = ContextPropertyList_SetProperty(properties, dwPropId, - blob->pbData, blob->cbData); + if (pvData) + { + PCRYPT_DATA_BLOB blob = (PCRYPT_DATA_BLOB)pvData; + + ret = ContextPropertyList_SetProperty(properties, dwPropId, + blob->pbData, blob->cbData); + } + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } break; } case CERT_DATE_STAMP_PROP_ID: - ret = ContextPropertyList_SetProperty(properties, dwPropId, - (LPBYTE)pvData, sizeof(FILETIME)); + if (pvData) + ret = ContextPropertyList_SetProperty(properties, dwPropId, + (LPBYTE)pvData, sizeof(FILETIME)); + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } break; + case CERT_KEY_CONTEXT_PROP_ID: + { + if (pvData) + { + PCERT_KEY_CONTEXT keyContext = (PCERT_KEY_CONTEXT)pvData; + + ret = ContextPropertyList_SetProperty(properties, dwPropId, + (const BYTE *)keyContext, keyContext->cbSize); + } + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } + break; + } case CERT_KEY_PROV_INFO_PROP_ID: - ret = CertContext_SetKeyProvInfoProperty(properties, - (PCRYPT_KEY_PROV_INFO)pvData); + if (pvData) + ret = CertContext_SetKeyProvInfoProperty(properties, + (PCRYPT_KEY_PROV_INFO)pvData); + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } break; + case CERT_KEY_PROV_HANDLE_PROP_ID: + { + CERT_KEY_CONTEXT keyContext; + DWORD size = sizeof(keyContext); + + ret = CertContext_GetProperty(context, CERT_KEY_CONTEXT_PROP_ID, + &keyContext, &size); + if (ret) + { + if (!(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) + CryptReleaseContext(keyContext.hCryptProv, 0); + if (pvData) + keyContext.hCryptProv = *(HCRYPTPROV *)pvData; + else + keyContext.hCryptProv = 0; + ret = CertContext_SetProperty(context, CERT_KEY_CONTEXT_PROP_ID, + 0, &keyContext); + } + break; + } default: FIXME("%ld: stub\n", dwPropId); ret = FALSE; @@ -470,6 +555,132 @@ ret = CertContext_SetProperty((void *)pCertContext, dwPropId, dwFlags, pvData); TRACE("returning %d\n", ret); + return ret; +} + +/* Acquires the private key using the key provider info, retrieving info from + * the certificate if info is NULL. The acquired provider is returned in + * *phCryptProv, and the key spec for the provider is returned in *pdwKeySpec. + */ +static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, + PCRYPT_KEY_PROV_INFO info, HCRYPTPROV *phCryptProv, DWORD *pdwKeySpec) +{ + DWORD size = 0; + BOOL allocated = FALSE, ret = TRUE; + + if (!info) + { + ret = CertGetCertificateContextProperty(pCert, + CERT_KEY_PROV_INFO_PROP_ID, 0, &size); + if (ret) + { + info = (PCRYPT_KEY_PROV_INFO)HeapAlloc(GetProcessHeap(), 0, size); + if (info) + { + ret = CertGetCertificateContextProperty(pCert, + CERT_KEY_PROV_INFO_PROP_ID, info, &size); + allocated = TRUE; + } + } + else + SetLastError(CRYPT_E_NO_KEY_PROPERTY); + } + if (ret) + { + ret = CryptAcquireContextW(phCryptProv, info->pwszContainerName, + info->pwszProvName, info->dwProvType, 0); + if (ret) + { + DWORD i; + + for (i = 0; i < info->cProvParam; i++) + { + CryptSetProvParam(*phCryptProv, + info->rgProvParam[i].dwParam, info->rgProvParam[i].pbData, + info->rgProvParam[i].dwFlags); + } + *pdwKeySpec = info->dwKeySpec; + } + else + SetLastError(CRYPT_E_NO_KEY_PROPERTY); + } + if (allocated) + HeapFree(GetProcessHeap(), 0, info); + return ret; +} + +BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, + DWORD dwFlags, void *pvReserved, HCRYPTPROV *phCryptProv, DWORD *pdwKeySpec, + BOOL *pfCallerFreeProv) +{ + BOOL ret = FALSE, cache = FALSE; + PCRYPT_KEY_PROV_INFO info = NULL; + CERT_KEY_CONTEXT keyContext; + DWORD size; + + TRACE("(%p, %08lx, %p, %p, %p, %p)\n", pCert, dwFlags, pvReserved, + phCryptProv, pdwKeySpec, pfCallerFreeProv); + + if (dwFlags & CRYPT_ACQUIRE_USE_PROV_INFO_FLAG) + { + DWORD size = 0; + + ret = CertGetCertificateContextProperty(pCert, + CERT_KEY_PROV_INFO_PROP_ID, 0, &size); + if (ret) + { + info = (PCRYPT_KEY_PROV_INFO)HeapAlloc( + GetProcessHeap(), 0, size); + ret = CertGetCertificateContextProperty(pCert, + CERT_KEY_PROV_INFO_PROP_ID, info, &size); + if (ret) + cache = info->dwFlags & CERT_SET_KEY_CONTEXT_PROP_ID; + } + } + else if (dwFlags & CRYPT_ACQUIRE_CACHE_FLAG) + cache = TRUE; + *phCryptProv = 0; + if (cache) + { + size = sizeof(keyContext); + ret = CertGetCertificateContextProperty(pCert, CERT_KEY_CONTEXT_PROP_ID, + &keyContext, &size); + if (ret) + { + *phCryptProv = keyContext.hCryptProv; + if (pdwKeySpec) + *pdwKeySpec = keyContext.dwKeySpec; + if (pfCallerFreeProv) + *pfCallerFreeProv = !cache; + } + } + if (!*phCryptProv) + { + ret = CRYPT_AcquirePrivateKeyFromProvInfo(pCert, info, + &keyContext.hCryptProv, &keyContext.dwKeySpec); + if (ret) + { + *phCryptProv = keyContext.hCryptProv; + if (pdwKeySpec) + *pdwKeySpec = keyContext.dwKeySpec; + if (cache) + { + keyContext.cbSize = sizeof(keyContext); + if (CertSetCertificateContextProperty(pCert, + CERT_KEY_CONTEXT_PROP_ID, 0, &keyContext)) + { + if (pfCallerFreeProv) + *pfCallerFreeProv = FALSE; + } + } + else + { + if (pfCallerFreeProv) + *pfCallerFreeProv = TRUE; + } + } + } + HeapFree(GetProcessHeap(), 0, info); return ret; } @@ -1658,7 +1869,7 @@ else GetSystemTimeAsFileTime(&info->NotBefore); if (pEndTime) - SystemTimeToFileTime(pStartTime, &info->NotAfter); + SystemTimeToFileTime(pEndTime, &info->NotAfter); else { SYSTEMTIME endTime; Modified: trunk/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.spec (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.spec Wed Jul 12 16:40:40 2006 @@ -95,6 +95,7 @@ @ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) @ stub CryptStringToBinaryW # (wstr long long ptr ptr ptr ptr) @ stub CryptAcquireContextU +@ stdcall CryptAcquireCertificatePrivateKey(ptr long ptr ptr ptr ptr) @ stub CryptCloseAsyncHandle @ stub CryptCreateAsyncHandle @ stub CryptDecodeMessage Modified: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/decode.c (original) +++ trunk/reactos/dll/win32/crypt32/decode.c Wed Jul 12 16:40:40 2006 @@ -561,7 +561,8 @@ itemSizes = CryptMemAlloc( cItems * sizeof(struct AsnArrayItemSize)); - memcpy(itemSizes, &itemSize, sizeof(itemSize)); + if (itemSizes) + memcpy(itemSizes, &itemSize, sizeof(itemSize)); } if (itemSizes) { Modified: trunk/reactos/dll/win32/riched32/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched32/richedi… ============================================================================== --- trunk/reactos/dll/win32/riched32/richedit.c (original) +++ trunk/reactos/dll/win32/riched32/richedit.c Wed Jul 12 16:40:40 2006 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h>

1 0

[janderwald] 23023: revert prev commit
by janderwald＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: janderwald Date: Wed Jul 12 16:36:31 2006 New Revision: 23023 URL: http://svn.reactos.org/svn/reactos?rev=23023&view=rev Log: revert prev commit Added: trunk/reactos/base/applications/regedit/clb/ (props changed) - copied from r23020, trunk/reactos/base/applications/regedit/clb/ Modified: trunk/reactos/base/applications/regedit/regedit.rbuild Propchange: trunk/reactos/base/applications/regedit/clb/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jul 12 16:36:31 2006 @@ -1,0 +1,2 @@ +GNUmakefile +*.vcproj Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rbuild (original) +++ trunk/reactos/base/applications/regedit/regedit.rbuild Wed Jul 12 16:36:31 2006 @@ -31,3 +31,6 @@ <file>regedit.rc</file> <pch>regedit.h</pch> </module> +<directory name="clb"> + <xi:include href="clb/clb.rbuild" /> +</directory>

1 0

[fireball] 23022: Add flags for CryptAcquireCertificatePrivateKey() API
by fireball＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: fireball Date: Wed Jul 12 16:27:46 2006 New Revision: 23022 URL: http://svn.reactos.org/svn/reactos?rev=23022&view=rev Log: Add flags for CryptAcquireCertificatePrivateKey() API Modified: trunk/reactos/include/psdk/wincrypt.h Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h (original) +++ trunk/reactos/include/psdk/wincrypt.h Wed Jul 12 16:27:46 2006 @@ -2560,6 +2560,12 @@ #define CERT_CREATE_SELFSIGN_NO_SIGN 1 #define CERT_CREATE_SELFSIGN_NO_KEY_INFO 2 +/* flags for CryptAcquireCertificatePrivateKey */ +#define CRYPT_ACQUIRE_CACHE_FLAG 0x00000001 +#define CRYPT_ACQUIRE_USE_PROV_INFO_FLAG 0x00000002 +#define CRYPT_ACQUIRE_COMPARE_KEY_FLAG 0x00000004 +#define CRYPT_ACQUIRE_SILENT_FLAG 0x00000040 + /* function declarations */ /* advapi32.dll */ BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer, @@ -2982,6 +2988,10 @@ DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, void *pvAuxInfo, HCRYPTKEY *phKey); +BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, + DWORD dwFlags, void *pvReserved, HCRYPTPROV *phCryptProv, DWORD *pdwKeySpec, + BOOL *pfCallerFreeProv); + BOOL WINAPI CryptProtectData( DATA_BLOB* pDataIn, LPCWSTR szDataDescr, DATA_BLOB* pOptionalEntropy, PVOID pvReserved, CRYPTPROTECT_PROMPTSTRUCT* pPromptStruct, DWORD dwFlags, DATA_BLOB* pDataOut );

1 0

[janderwald] 23021: * remove unused/unimplemented clb library * you need to delete Makefile.auto after this commit
by janderwald＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: janderwald Date: Wed Jul 12 16:27:26 2006 New Revision: 23021 URL: http://svn.reactos.org/svn/reactos?rev=23021&view=rev Log: * remove unused/unimplemented clb library * you need to delete Makefile.auto after this commit Removed: trunk/reactos/base/applications/regedit/clb/ Modified: trunk/reactos/base/applications/regedit/regedit.rbuild Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rbuild (original) +++ trunk/reactos/base/applications/regedit/regedit.rbuild Wed Jul 12 16:27:26 2006 @@ -31,6 +31,3 @@ <file>regedit.rc</file> <pch>regedit.h</pch> </module> -<directory name="clb"> - <xi:include href="clb/clb.rbuild" /> -</directory>

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