Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[hbelusca] 74584: [NTOS]: Close an opened handle after usage.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 18 23:32:00 2017 New Revision: 74584 URL: http://svn.reactos.org/svn/reactos?rev=74584&view=rev Log: [NTOS]: Close an opened handle after usage. Modified: trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Thu May 18 23:32:00 2017 @@ -186,7 +186,7 @@ Skip = 0; while (NT_SUCCESS(Status)) { - Status = NtQueryDirectoryObject (DirectoryHandle, + Status = ZwQueryDirectoryObject (DirectoryHandle, DirectoryInfo, 2 * PAGE_SIZE, FALSE, @@ -223,6 +223,9 @@ } } } + + ZwClose(DirectoryHandle); + ExFreePoolWithTag(DirectoryInfo, TAG_FILE_SYSTEM); return RDiskCount; }

7 years, 4 months

[gedmurphy] 74583: [FLTLIB] - Implement FilterConnectCommunicationPort - Add the remaining IOCTLs fltlib sends to the fltmgr

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu May 18 22:06:49 2017 New Revision: 74583 URL: http://svn.reactos.org/svn/reactos?rev=74583&view=rev Log: [FLTLIB] - Implement FilterConnectCommunicationPort - Add the remaining IOCTLs fltlib sends to the fltmgr Added: trunk/reactos/dll/win32/fltlib/fltlib.h (with props) trunk/reactos/dll/win32/fltlib/message.c (with props) Modified: trunk/reactos/dll/win32/fltlib/CMakeLists.txt trunk/reactos/dll/win32/fltlib/fltlib.c trunk/reactos/dll/win32/fltlib/stubs.c trunk/reactos/sdk/include/ddk/fltuserstructures.h trunk/reactos/sdk/include/psdk/ntstatus.h trunk/reactos/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h Modified: trunk/reactos/dll/win32/fltlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fltlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fltlib/CMakeLists.txt [iso-8859-1] Thu May 18 22:06:49 2017 @@ -9,11 +9,13 @@ list(APPEND SOURCE fltlib.c + message.c stubs.c ${CMAKE_CURRENT_BINARY_DIR}/fltlib.def) add_library(fltlib SHARED ${SOURCE} rsrc.rc) set_module_type(fltlib win32dll) target_link_libraries(fltlib wine) +add_target_compile_definitions(fltlib NTDDI_VERSION=NTDDI_WS03SP1) add_importlibs(fltlib msvcrt kernel32 ntdll) add_cd_file(TARGET fltlib DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/fltlib/fltlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/fltlib.c?… ============================================================================== --- trunk/reactos/dll/win32/fltlib/fltlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fltlib/fltlib.c [iso-8859-1] Thu May 18 22:06:49 2017 @@ -60,6 +60,18 @@ /* PRIVATE FUNCTIONS ****************************************************************/ +HRESULT +NtStatusToHResult(_In_ NTSTATUS Status) +{ + HRESULT hr; + hr = RtlNtStatusToDosError(Status); + if (hr != ERROR_SUCCESS) + { + hr = (ULONG)hr | 0x80070000; + } + return hr; +} + static HRESULT FilterLoadUnload(_In_z_ LPCWSTR lpFilterName, @@ -103,7 +115,7 @@ /* Tell the filter manager to load the filter for us */ dwError = SendIoctl(hFltMgr, - Load ? IOCTL_LOAD_FILTER : IOCTL_UNLOAD_FILTER, + Load ? IOCTL_FILTER_LOAD : IOCTL_FILTER_UNLOAD, FilterName, BufferLength); Added: trunk/reactos/dll/win32/fltlib/fltlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/fltlib.h?… ============================================================================== --- trunk/reactos/dll/win32/fltlib/fltlib.h (added) +++ trunk/reactos/dll/win32/fltlib/fltlib.h [iso-8859-1] Thu May 18 22:06:49 2017 @@ -0,0 +1,6 @@ +#pragma once + +HRESULT +NtStatusToHResult( + _In_ NTSTATUS Status +); Propchange: trunk/reactos/dll/win32/fltlib/fltlib.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/fltlib/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/message.c… ============================================================================== --- trunk/reactos/dll/win32/fltlib/message.c (added) +++ trunk/reactos/dll/win32/fltlib/message.c [iso-8859-1] Thu May 18 22:06:49 2017 @@ -0,0 +1,180 @@ +/* +* PROJECT: Filesystem Filter Manager library +* LICENSE: GPL - See COPYING in the top level directory +* FILE: dll/win32/fltlib/message.c +* PURPOSE: Handles messaging to and from the filter manager +* PROGRAMMERS: Ged Murphy (ged.murphy(a)reactos.org) +*/ + +//#include <stdarg.h> + +#define WIN32_NO_STATUS + +#include "windef.h" +#include "winbase.h" + +#define NTOS_MODE_USER +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> + +#include "fltuser.h" +#include "fltlib.h" +#include <fltmgr_shared.h> + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(fltlib); + + +_Must_inspect_result_ +HRESULT +WINAPI +FilterConnectCommunicationPort(_In_ LPCWSTR lpPortName, + _In_ DWORD dwOptions, + _In_reads_bytes_opt_(wSizeOfContext) LPCVOID lpContext, + _In_ WORD wSizeOfContext, + _In_opt_ LPSECURITY_ATTRIBUTES lpSecurityAttributes, + _Outptr_ HANDLE *hPort) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PFILTER_PORT_DATA PortData; + UNICODE_STRING DeviceName; + UNICODE_STRING PortName; + HANDLE FileHandle; + ULONG PortNameSize; + ULONG BufferSize; + PCHAR Ptr; + NTSTATUS Status; + HRESULT hr; + + *hPort = INVALID_HANDLE_VALUE; + + /* Sanity check */ + if (lpContext && wSizeOfContext == 0) + { + return E_INVALIDARG; + } + + /* Get the length of the port name */ + PortNameSize = wcslen(lpPortName) * sizeof(WCHAR); + + /* Calculate and allocate the size of the required buffer */ + BufferSize = sizeof(FILTER_PORT_DATA) + PortNameSize + wSizeOfContext; + PortData = RtlAllocateHeap(GetProcessHeap(), 0, BufferSize); + if (PortData == NULL) return E_OUTOFMEMORY; + + /* Clear out the buffer and find the end of the fixed struct */ + RtlZeroMemory(PortData, BufferSize); + Ptr = (PCHAR)(PortData + 1); + + PortData->Size = BufferSize; + PortData->Options = dwOptions; + + /* Setup the port name */ + RtlInitUnicodeString(&PortName, lpPortName); + PortData->PortName.Buffer = (PWCH)Ptr; + PortData->PortName.MaximumLength = PortNameSize; + RtlCopyUnicodeString(&PortData->PortName, &PortName); + Ptr += PortData->PortName.Length; + + /* Check if we were given a context */ + if (lpContext) + { + /* Add that into the buffer too */ + PortData->Context = Ptr; + RtlCopyMemory(PortData->Context, lpContext, wSizeOfContext); + } + + /* Initialize the object attributes */ + RtlInitUnicodeString(&DeviceName, L"\\Global??\\FltMgrMsg"); + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + OBJ_EXCLUSIVE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Check if we were passed any security attributes */ + if (lpSecurityAttributes) + { + /* Add these manually and update the flags if we were asked to make it inheritable */ + ObjectAttributes.SecurityDescriptor = lpSecurityAttributes->lpSecurityDescriptor; + if (lpSecurityAttributes->bInheritHandle) + { + ObjectAttributes.Attributes |= OBJ_INHERIT; + } + } + + /* Now get a handle to the device */ + Status = NtCreateFile(&FileHandle, + SYNCHRONIZE | FILE_READ_DATA | FILE_WRITE_DATA, + &ObjectAttributes, + &IoStatusBlock, + 0, + 0, + 0, + FILE_OPEN_IF, + 0, + PortData, + BufferSize); + if (NT_SUCCESS(Status)) + { + *hPort = FileHandle; + hr = S_OK; + } + else + { + hr = NtStatusToHResult(Status); + } + + /* Cleanup and return */ + RtlFreeHeap(GetProcessHeap(), 0, PortData); + return hr; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterSendMessage(_In_ HANDLE hPort, + _In_reads_bytes_(dwInBufferSize) LPVOID lpInBuffer, + _In_ DWORD dwInBufferSize, + _Out_writes_bytes_to_opt_(dwOutBufferSize, *lpBytesReturned) LPVOID lpOutBuffer, + _In_ DWORD dwOutBufferSize, + _Out_ LPDWORD lpBytesReturned) +{ + UNREFERENCED_PARAMETER(hPort); + UNREFERENCED_PARAMETER(lpInBuffer); + UNREFERENCED_PARAMETER(dwInBufferSize); + UNREFERENCED_PARAMETER(lpOutBuffer); + UNREFERENCED_PARAMETER(dwOutBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterGetMessage(_In_ HANDLE hPort, + _Out_writes_bytes_(dwMessageBufferSize) PFILTER_MESSAGE_HEADER lpMessageBuffer, + _In_ DWORD dwMessageBufferSize, + _Inout_opt_ LPOVERLAPPED lpOverlapped) +{ + UNREFERENCED_PARAMETER(hPort); + UNREFERENCED_PARAMETER(lpMessageBuffer); + UNREFERENCED_PARAMETER(dwMessageBufferSize); + UNREFERENCED_PARAMETER(lpOverlapped); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterReplyMessage(_In_ HANDLE hPort, + _In_reads_bytes_(dwReplyBufferSize) PFILTER_REPLY_HEADER lpReplyBuffer, + _In_ DWORD dwReplyBufferSize) +{ + UNREFERENCED_PARAMETER(hPort); + UNREFERENCED_PARAMETER(lpReplyBuffer); + UNREFERENCED_PARAMETER(dwReplyBufferSize); + return E_NOTIMPL; +} Propchange: trunk/reactos/dll/win32/fltlib/message.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/fltlib/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/fltlib/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fltlib/stubs.c [iso-8859-1] Thu May 18 22:06:49 2017 @@ -6,10 +6,6 @@ * PROGRAMMERS: Ged Murphy (ged.murphy(a)reactos.org) */ -// Hack - our SDK reports NTDDI_VERSION as 0x05020100 (from _WIN32_WINNT 0x502) -// which doesn't pass the FLT_MGR_BASELINE check in fltkernel.h -#define NTDDI_VERSION NTDDI_WS03SP1 - #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -322,73 +318,6 @@ return E_NOTIMPL; } - -_Must_inspect_result_ -HRESULT -WINAPI -FilterConnectCommunicationPort(_In_ LPCWSTR lpPortName, - _In_ DWORD dwOptions, - _In_reads_bytes_opt_(wSizeOfContext) LPCVOID lpContext, - _In_ WORD wSizeOfContext, - _In_opt_ LPSECURITY_ATTRIBUTES lpSecurityAttributes, - _Outptr_ HANDLE *hPort) -{ - UNREFERENCED_PARAMETER(lpPortName); - UNREFERENCED_PARAMETER(dwOptions); - UNREFERENCED_PARAMETER(lpContext); - UNREFERENCED_PARAMETER(wSizeOfContext); - UNREFERENCED_PARAMETER(lpSecurityAttributes); - UNREFERENCED_PARAMETER(hPort); - return E_NOTIMPL; -} - -_Must_inspect_result_ -HRESULT -WINAPI -FilterSendMessage(_In_ HANDLE hPort, - _In_reads_bytes_(dwInBufferSize) LPVOID lpInBuffer, - _In_ DWORD dwInBufferSize, - _Out_writes_bytes_to_opt_(dwOutBufferSize, *lpBytesReturned) LPVOID lpOutBuffer, - _In_ DWORD dwOutBufferSize, - _Out_ LPDWORD lpBytesReturned) -{ - UNREFERENCED_PARAMETER(hPort); - UNREFERENCED_PARAMETER(lpInBuffer); - UNREFERENCED_PARAMETER(dwInBufferSize); - UNREFERENCED_PARAMETER(lpOutBuffer); - UNREFERENCED_PARAMETER(dwOutBufferSize); - UNREFERENCED_PARAMETER(lpBytesReturned); - return E_NOTIMPL; -} - -_Must_inspect_result_ -HRESULT -WINAPI -FilterGetMessage(_In_ HANDLE hPort, - _Out_writes_bytes_(dwMessageBufferSize) PFILTER_MESSAGE_HEADER lpMessageBuffer, - _In_ DWORD dwMessageBufferSize, - _Inout_opt_ LPOVERLAPPED lpOverlapped) -{ - UNREFERENCED_PARAMETER(hPort); - UNREFERENCED_PARAMETER(lpMessageBuffer); - UNREFERENCED_PARAMETER(dwMessageBufferSize); - UNREFERENCED_PARAMETER(lpOverlapped); - return E_NOTIMPL; -} - -_Must_inspect_result_ -HRESULT -WINAPI -FilterReplyMessage(_In_ HANDLE hPort, - _In_reads_bytes_(dwReplyBufferSize) PFILTER_REPLY_HEADER lpReplyBuffer, - _In_ DWORD dwReplyBufferSize) -{ - UNREFERENCED_PARAMETER(hPort); - UNREFERENCED_PARAMETER(lpReplyBuffer); - UNREFERENCED_PARAMETER(dwReplyBufferSize); - return E_NOTIMPL; -} - _Must_inspect_result_ HRESULT WINAPI Modified: trunk/reactos/sdk/include/ddk/fltuserstructures.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/fltuserstr… ============================================================================== --- trunk/reactos/sdk/include/ddk/fltuserstructures.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/fltuserstructures.h [iso-8859-1] Thu May 18 22:06:49 2017 @@ -35,7 +35,9 @@ typedef HANDLE HFILTER, HFILTER_INSTANCE, HFILTER_VOLUME; +#ifndef _NTDEF_H typedef _Return_type_success_(return >= 0) LONG NTSTATUS, *PNTSTATUS; +#endif /* Known File System Types */ Modified: trunk/reactos/sdk/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ntstatus.… ============================================================================== --- trunk/reactos/sdk/include/psdk/ntstatus.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ntstatus.h [iso-8859-1] Thu May 18 22:06:49 2017 @@ -946,6 +946,7 @@ #define STATUS_ASSERTION_FAILURE ((NTSTATUS)0xC0000420L) #define STATUS_CALLBACK_POP_STACK ((NTSTATUS)0xC0000423) #define STATUS_ELEVATION_REQUIRED ((NTSTATUS)0xC000042C) +#define STATUS_ALREADY_REGISTERED ((NTSTATUS)0xC0000718) #define STATUS_WOW_ASSERTION ((NTSTATUS)0xC0009898) #define STATUS_INVALID_SIGNATURE ((NTSTATUS)0xC000A000) #define STATUS_HMAC_NOT_SUPPORTED ((NTSTATUS)0xC000A001) Modified: trunk/reactos/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h [iso-8859-1] Thu May 18 22:06:49 2017 @@ -1,11 +1,16 @@ #pragma once -#define IOCTL_LOAD_FILTER CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x01, 0, FILE_WRITE_DATA) //88004 -#define IOCTL_UNLOAD_FILTER CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x02, 0, FILE_WRITE_DATA) //88008 -#define IOCTL_INIT_FIND CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x03, 0, FILE_READ_DATA) //8400C - -//84024 find first -//84028 find next +#define IOCTL_FILTER_LOAD CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x01, METHOD_BUFFERED, FILE_WRITE_DATA) //88004 +#define IOCTL_FILTER_UNLOAD CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x02, METHOD_BUFFERED, FILE_WRITE_DATA) //88008 +#define IOCTL_FILTER_CREATE CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x03, METHOD_BUFFERED, FILE_READ_DATA) //8400C +#define IOCTL_FILTER_ATTATCH CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x04, METHOD_BUFFERED, FILE_WRITE_DATA) //88010 +#define IOCTL_FILTER_DETATCH CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x05, METHOD_BUFFERED, FILE_WRITE_DATA) //88014 +#define IOCTL_FILTER_SEND_MESSAGE CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x06, METHOD_NEITHER, FILE_WRITE_DATA) //8801B +#define IOCTL_FILTER_GET_MESSAGE CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x07, METHOD_NEITHER, FILE_READ_DATA) //8401F +#define IOCTL_FILTER_REPLY_MESSAGE CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x08, METHOD_NEITHER, FILE_WRITE_DATA) //88023 +#define IOCTL_FILTER_FIND_FIRST CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x09, METHOD_BUFFERED, FILE_READ_DATA) //84024 +#define IOCTL_FILTER_FIND_NEXT CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x0A, METHOD_BUFFERED, FILE_READ_DATA) //84028 +#define IOCTL_FILTER_GET_INFO CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x0B, METHOD_BUFFERED, FILE_READ_DATA) //8402C typedef struct _FILTER_NAME @@ -14,3 +19,15 @@ WCHAR FilterName[1]; } FILTER_NAME, *PFILTER_NAME; + + + +typedef struct _FILTER_PORT_DATA +{ + ULONG Size; + UNICODE_STRING PortName; + ULONG Options; + PVOID Context; + ULONG ContextSize; + +} FILTER_PORT_DATA, *PFILTER_PORT_DATA;

7 years, 4 months

[ekohl] 74582: [INTL] - Add custom draw function for the codepages listview. - User gray text color for codepages that cannot be uninstalled. CORE-13242

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 18 21:56:24 2017 New Revision: 74582 URL: http://svn.reactos.org/svn/reactos?rev=74582&view=rev Log: [INTL] - Add custom draw function for the codepages listview. - User gray text color for codepages that cannot be uninstalled. CORE-13242 Modified: trunk/reactos/dll/cpl/intl/advanced.c Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Thu May 18 21:56:24 2017 @@ -1,15 +1,21 @@ #include "intl.h" +#include <wingdi.h> #include <debug.h> typedef struct CPStruct { - WORD Status; UINT CodePage; + DWORD Flags; WCHAR Name[MAX_PATH]; struct CPStruct *NextItem; } CPAGE, *PCPAGE; +#define CODEPAGE_INSTALLED 0x00000001 +#define CODEPAGE_NOT_REMOVEABLE 0x00000002 +#define CODEPAGE_INSTALL 0x00000004 +#define CODEPAGE_REMOVE 0x00000008 + static PCPAGE PCPage = NULL; static BOOL bSpain = FALSE; static HWND hLangList; @@ -18,7 +24,8 @@ GetSupportedCP( HINF hInf) { - INFCONTEXT Context; + WCHAR szSection[MAX_PATH]; + INFCONTEXT Context, Context2; PCPAGE pCodePage; CPINFOEX cpInfEx; UINT uiCodePage; @@ -38,7 +45,7 @@ return FALSE; pCodePage->CodePage = uiCodePage; - pCodePage->Status = 0; + pCodePage->Flags = 0; (pCodePage->Name)[0] = UNICODE_NULL; if (GetCPInfoExW(uiCodePage, 0, &cpInfEx)) @@ -59,6 +66,14 @@ { HeapFree(GetProcessHeap(), 0, pCodePage); } + + wsprintf(szSection, L"CODEPAGE_REMOVE_%d", uiCodePage); + if ((uiCodePage == GetACP()) || + (uiCodePage == GetOEMCP()) || + (!SetupFindFirstLineW(hInf, szSection, L"AddReg", &Context2))) + { + pCodePage->Flags |= CODEPAGE_NOT_REMOVEABLE; + } } if (!SetupFindNextLine(&Context, &Context)) @@ -84,7 +99,7 @@ if (lpCP->CodePage == uiCP) { - lpCP->Status |= 0x0001; + lpCP->Flags |= CODEPAGE_INSTALLED; break; } @@ -155,7 +170,7 @@ ItemIndex = ListView_InsertItem(hList, &item); if (ItemIndex != -1) { - if (pCodePage->Status & 0x0001) + if (pCodePage->Flags & CODEPAGE_INSTALLED) { ListView_SetItemState(hList, ItemIndex, INDEXTOSTATEIMAGEMASK(LVIS_SELECTED), @@ -371,6 +386,37 @@ RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, valuesize); RegCloseKey(langKey); +} + + +LRESULT +ListViewCustomDraw( + LPARAM lParam) +{ + LPNMLVCUSTOMDRAW lplvcd = (LPNMLVCUSTOMDRAW)lParam; + + switch (lplvcd->nmcd.dwDrawStage) + { + case CDDS_PREPAINT: + return CDRF_NOTIFYITEMDRAW; + + case CDDS_ITEMPREPAINT: + if (((PCPAGE)lplvcd->nmcd.lItemlParam)->Flags & CODEPAGE_NOT_REMOVEABLE) + { + lplvcd->clrText = GetSysColor(COLOR_GRAYTEXT); + lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW); + return CDRF_NEWFONT; + } + else + { + lplvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); + lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW); + return CDRF_NEWFONT; + } + break; + } + + return CDRF_DODEFAULT; } @@ -441,7 +487,7 @@ break; case WM_NOTIFY: - if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + if (((LPNMHDR)lParam)->code == PSN_APPLY) { PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg); @@ -449,6 +495,14 @@ SaveFontSubstitutionSettings(hwndDlg, pGlobalData); SaveFontLinkingSettings(hwndDlg, pGlobalData); } + else if (((LPNMHDR)lParam)->idFrom == IDC_CONV_TABLES && + ((LPNMHDR)lParam)->code == NM_CUSTOMDRAW) + { + SetWindowLong(hwndDlg, + DWL_MSGRESULT, + (LONG)ListViewCustomDraw(lParam)); + return TRUE; + } break; }

7 years, 4 months

[tfaber] 74581: [VIDEOPRT] - Guard Ke386CallBios calls against concurrent execution. CORE-13214

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 18 21:29:24 2017 New Revision: 74581 URL: http://svn.reactos.org/svn/reactos?rev=74581&view=rev Log: [VIDEOPRT] - Guard Ke386CallBios calls against concurrent execution. CORE-13214 Modified: trunk/reactos/win32ss/drivers/videoprt/int10.c trunk/reactos/win32ss/drivers/videoprt/videoprt.c trunk/reactos/win32ss/drivers/videoprt/videoprt.h Modified: trunk/reactos/win32ss/drivers/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/i… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] Thu May 18 21:29:24 2017 @@ -296,7 +296,9 @@ BiosContext.SegEs = BiosArguments->SegEs; /* Do the ROM BIOS call */ + (void)KeWaitForMutexObject(&VideoPortInt10Mutex, Executive, KernelMode, FALSE, NULL); Status = Ke386CallBios(0x10, &BiosContext); + KeReleaseMutex(&VideoPortInt10Mutex, FALSE); /* Return the arguments */ BiosArguments->Eax = BiosContext.Eax; @@ -354,7 +356,9 @@ BiosContext.Ebp = BiosArguments->Ebp; /* Do the ROM BIOS call */ + (void)KeWaitForMutexObject(&VideoPortInt10Mutex, Executive, KernelMode, FALSE, NULL); Status = Ke386CallBios(0x10, &BiosContext); + KeReleaseMutex(&VideoPortInt10Mutex, FALSE); /* Return the arguments */ BiosArguments->Eax = BiosContext.Eax; Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] Thu May 18 21:29:24 2017 @@ -33,6 +33,7 @@ ULONG CsrssInitialized = FALSE; PKPROCESS Csrss = NULL; ULONG VideoPortDeviceNumber = 0; +KMUTEX VideoPortInt10Mutex; /* PRIVATE FUNCTIONS **********************************************************/ @@ -464,8 +465,15 @@ NTSTATUS Status; PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; BOOLEAN PnpDriver = FALSE, LegacyDetection = FALSE; + static BOOLEAN Int10MutexInitialized; TRACE_(VIDEOPRT, "VideoPortInitialize\n"); + + if (!Int10MutexInitialized) + { + KeInitializeMutex(&VideoPortInt10Mutex, 0); + Int10MutexInitialized = TRUE; + } /* As a first thing do parameter checks. */ if (HwInitializationData->HwInitDataSize > sizeof(VIDEO_HW_INITIALIZATION_DATA)) Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] Thu May 18 21:29:24 2017 @@ -247,6 +247,7 @@ extern ULONG CsrssInitialized; extern PKPROCESS Csrss; extern ULONG VideoPortDeviceNumber; +extern KMUTEX VideoPortInt10Mutex; VOID FASTCALL IntAttachToCSRSS(PKPROCESS *CallingProcess, PKAPC_STATE ApcState);

7 years, 4 months

[gadamopoulos] 74580: [UXTHEME] -Remove a debug print that was never meant to be committed.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu May 18 17:53:33 2017 New Revision: 74580 URL: http://svn.reactos.org/svn/reactos?rev=74580&view=rev Log: [UXTHEME] -Remove a debug print that was never meant to be committed. Modified: trunk/reactos/dll/win32/uxtheme/draw.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Thu May 18 17:53:33 2017 @@ -1410,8 +1410,6 @@ hr = GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_TEXTSHADOWTYPE, &iShadowType); if (SUCCEEDED(hr)) { - ERR("Got shadow type %d\n", iShadowType); - hr = GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTSHADOWCOLOR, &shadowColor); if (FAILED(hr)) {

7 years, 4 months

[gadamopoulos] 74579: [UXTHEME] -Apply some suggestions by Thomas.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu May 18 17:15:22 2017 New Revision: 74579 URL: http://svn.reactos.org/svn/reactos?rev=74579&view=rev Log: [UXTHEME] -Apply some suggestions by Thomas. Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Thu May 18 17:15:22 2017 @@ -119,11 +119,11 @@ len++; /* From now on this is the size of the buffer so include the null */ - if (len > 50) - { - pszText = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (len > ARRAYSIZE(buffer)) + { + pszText = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!pszText) - return E_FAIL; + return E_OUTOFMEMORY; } InternalGetWindowText(pcontext->hWnd, pszText, len);

7 years, 4 months

[phater] 74578: [MSTSC] Addendum to r74577. CORE-13263

by phater＠svn.reactos.org

Author: phater Date: Thu May 18 08:57:26 2017 New Revision: 74578 URL: http://svn.reactos.org/svn/reactos?rev=74578&view=rev Log: [MSTSC] Addendum to r74577. CORE-13263 Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ss… ============================================================================== --- trunk/reactos/base/applications/mstsc/ssl_calls.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/ssl_calls.c [iso-8859-1] Thu May 18 08:57:26 2017 @@ -1675,6 +1675,18 @@ if (!ret) { dwErr = GetLastError(); + if (dwErr == NTE_BAD_KEYSET) + { + ret = CryptAcquireContext(&hCryptProv, + L"MSTSC", + MS_ENHANCED_PROV, + PROV_RSA_FULL, + CRYPT_NEWKEYSET); + } + } + if (!ret) + { + dwErr = GetLastError(); error("CryptAcquireContext call failed with %lx\n", dwErr); return NULL; }

7 years, 4 months

[phater] 74577: [MSTSC] Fix BSOD when we can't acquire context from CryptoAPI. CORE-13263 #resolve

by phater＠svn.reactos.org

Author: phater Date: Thu May 18 08:47:30 2017 New Revision: 74577 URL: http://svn.reactos.org/svn/reactos?rev=74577&view=rev Log: [MSTSC] Fix BSOD when we can't acquire context from CryptoAPI. CORE-13263 #resolve Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ss… ============================================================================== --- trunk/reactos/base/applications/mstsc/ssl_calls.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/ssl_calls.c [iso-8859-1] Thu May 18 08:47:30 2017 @@ -59,10 +59,22 @@ return NULL; } ret = CryptAcquireContext(&info->hCryptProv, - NULL, + L"MSTSC", MS_ENHANCED_PROV, PROV_RSA_FULL, 0); + if (!ret) + { + dwErr = GetLastError(); + if (dwErr == NTE_BAD_KEYSET) + { + ret = CryptAcquireContext(&info->hCryptProv, + L"MSTSC", + MS_ENHANCED_PROV, + PROV_RSA_FULL, + CRYPT_NEWKEYSET); + } + } if (!ret) { dwErr = GetLastError(); @@ -214,10 +226,22 @@ return NULL; } ret = CryptAcquireContext(&info->hCryptProv, - NULL, + L"MSTSC", MS_ENHANCED_PROV, PROV_RSA_FULL, 0); + if (!ret) + { + dwErr = GetLastError(); + if (dwErr == NTE_BAD_KEYSET) + { + ret = CryptAcquireContext(&info->hCryptProv, + L"MSTSC", + MS_ENHANCED_PROV, + PROV_RSA_FULL, + CRYPT_NEWKEYSET); + } + } if (!ret) { dwErr = GetLastError(); @@ -451,10 +475,22 @@ return; } ret = CryptAcquireContext(&hCryptProv, - NULL, + L"MSTSC", MS_ENHANCED_PROV, PROV_RSA_FULL, 0); + if (!ret) + { + dwErr = GetLastError(); + if (dwErr == NTE_BAD_KEYSET) + { + ret = CryptAcquireContext(&hCryptProv, + L"MSTSC", + MS_ENHANCED_PROV, + PROV_RSA_FULL, + CRYPT_NEWKEYSET); + } + } if (!ret) { dwErr = GetLastError(); @@ -1566,9 +1602,13 @@ { return 1; } + md5 = rdssl_md5_info_create(); + if (!md5) + { + return 1; + } key = (char*)xmalloc(176); md5_final = (char*)xmalloc(64); - md5 = rdssl_md5_info_create(); // copy the test key memcpy(key, testkey, 176); // replace e and n

7 years, 4 months

[hbelusca] 74576: [USETUP]: Implement most of the "upgrade" page (where existing NTOS installations are listed). - Modify a bit the page flow so that the upgrade page is inserted before the Device-...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 18 01:24:41 2017 New Revision: 74576 URL: http://svn.reactos.org/svn/reactos?rev=74576&view=rev Log: [USETUP]: Implement most of the "upgrade" page (where existing NTOS installations are listed). - Modify a bit the page flow so that the upgrade page is inserted before the Device-settings page, and after the Install-Intro page. - Insert some extra 'RepairUpdateFlag' checks in SelectPartitionPage() and InstallDirectoryPage() to take specific actions in case the flag is TRUE. - As overviewed in r74573, move 'TempPartition' and 'FormatState' back to USETUP. Added: branches/setup_improvements/base/setup/usetup/osdetect.h (with props) Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/osdetect.c branches/setup_improvements/base/setup/usetup/usetup.h Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Thu May 18 01:24:41 2017 @@ -58,7 +58,11 @@ WCHAR DefaultKBLayout[20]; BOOLEAN RepairUpdateFlag = FALSE; HANDLE hPnpThread = INVALID_HANDLE_VALUE; + PPARTLIST PartitionList = NULL; +PPARTENTRY TempPartition = NULL; +FORMATMACHINESTATE FormatState = Start; + /* LOCALS *******************************************************************/ @@ -86,11 +90,14 @@ static UNICODE_STRING DestinationArcPath; static UNICODE_STRING DestinationRootPath; -static WCHAR DestinationDriveLetter; +static WCHAR DestinationDriveLetter; // FIXME: Is it really useful?? static HINF SetupInf; static HSPFILEQ SetupFileQueue = NULL; + +static PNTOS_INSTALLATION CurrentInstallation = NULL; +static PGENERIC_LIST NtOsInstallsList = NULL; static PGENERIC_LIST ComputerList = NULL; static PGENERIC_LIST DisplayList = NULL; @@ -936,7 +943,7 @@ * * Next pages: * InstallIntroPage (default) - * RepairIntroPage + * RecoveryPage * LicensePage * QuitPage * @@ -966,7 +973,7 @@ } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ { - return REPAIR_INTRO_PAGE; + return RECOVERY_PAGE; } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'L') /* L */ { @@ -1007,48 +1014,127 @@ /* - * Displays the RepairIntroPage. + * Displays the UpgradeRepairPage. * * Next pages: * RebootPage (default) * InstallIntroPage * RecoveryPage - * IntroPage + * WelcomePage * * RETURNS * Number of the next page. */ static PAGE_NUMBER -RepairIntroPage(PINPUT_RECORD Ir) +UpgradeRepairPage(PINPUT_RECORD Ir) { - MUIDisplayPage(REPAIR_INTRO_PAGE); - - while(TRUE) + GENERIC_LIST_UI ListUi; + +/*** HACK!! ***/ + if (PartitionList == NULL) + { + PartitionList = CreatePartitionList(); + if (PartitionList == NULL) + { + /* FIXME: show an error dialog */ + MUIDisplayError(ERROR_DRIVE_INFORMATION, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + else if (IsListEmpty(&PartitionList->DiskListHead)) + { + MUIDisplayError(ERROR_NO_HDD, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + TempPartition = NULL; + FormatState = Start; + } +/**************/ + + NtOsInstallsList = CreateNTOSInstallationsList(PartitionList); + if (!NtOsInstallsList) + DPRINT1("Failed to get a list of NTOS installations; continue installation...\n"); + if (!NtOsInstallsList || GetNumberOfListEntries(NtOsInstallsList) == 0) + { + RepairUpdateFlag = FALSE; + + // return INSTALL_INTRO_PAGE; + return DEVICE_SETTINGS_PAGE; + // return SCSI_CONTROLLER_PAGE; + } + + MUIDisplayPage(UPGRADE_REPAIR_PAGE); + + InitGenericListUi(&ListUi, NtOsInstallsList); + DrawGenericList(&ListUi, + 2, 23, + xScreen - 3, + yScreen - 3); + + SaveGenericListState(NtOsInstallsList); + + // return HandleGenericList(&ListUi, DEVICE_SETTINGS_PAGE, Ir); + while (TRUE) { CONSOLE_ConInKey(Ir); - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return REBOOT_PAGE; - } - else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'U') /* U */ - { - RepairUpdateFlag = TRUE; - return INSTALL_INTRO_PAGE; - } - else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ - { - return RECOVERY_PAGE; + if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ + { + ScrollDownGenericList(&ListUi); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ + { + ScrollUpGenericList(&ListUi); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_NEXT)) /* PAGE DOWN */ + { + ScrollPageDownGenericList(&ListUi); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_PRIOR)) /* PAGE UP */ + { + ScrollPageUpGenericList(&ListUi); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ + { + if (ConfirmQuit(Ir) == TRUE) + return QUIT_PAGE; + else + RedrawGenericList(&ListUi); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { - return WELCOME_PAGE; - } - } - - return REPAIR_INTRO_PAGE; + RestoreGenericListState(NtOsInstallsList); + // return nextPage; // prevPage; + } + // else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'U') /* U */ + { + /* Retrieve the current installation */ + CurrentInstallation = (PNTOS_INSTALLATION)GetListEntryUserData(GetCurrentListEntry(NtOsInstallsList)); + DPRINT1("Selected installation for repair: \"%S\" ; DiskNumber = %d , PartitionNumber = %d\n", + CurrentInstallation->InstallationName, CurrentInstallation->DiskNumber, CurrentInstallation->PartitionNumber); + + RepairUpdateFlag = TRUE; + + // return nextPage; + /***/return INSTALL_INTRO_PAGE;/***/ + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar > 0x60) && (Ir->Event.KeyEvent.uChar.AsciiChar < 0x7b)) + { + /* a-z */ + GenericListKeyPress(&ListUi, Ir->Event.KeyEvent.uChar.AsciiChar); + } + } + + return UPGRADE_REPAIR_PAGE; } + /* * Displays the InstallIntroPage. @@ -1067,8 +1153,17 @@ { if (RepairUpdateFlag) { - //return SELECT_PARTITION_PAGE; +#if 1 /* Old code that looks good */ + + // return SELECT_PARTITION_PAGE; return DEVICE_SETTINGS_PAGE; + +#else /* Possible new code? */ + + return DEVICE_SETTINGS_PAGE; + // return SCSI_CONTROLLER_PAGE; + +#endif } if (IsUnattendedSetup) @@ -1090,8 +1185,7 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - return DEVICE_SETTINGS_PAGE; - // return SCSI_CONTROLLER_PAGE; + return UPGRADE_REPAIR_PAGE; } } @@ -1555,6 +1649,25 @@ MUIDisplayError(ERROR_NO_HDD, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } + + TempPartition = NULL; + FormatState = Start; + } + + if (RepairUpdateFlag) + { + /* Determine the selected installation disk & partition */ + if (!SelectPartition(PartitionList, + CurrentInstallation->DiskNumber, + CurrentInstallation->PartitionNumber)) + { + DPRINT1("Whaaaaaat?!?! ASSERT!\n"); + ASSERT(FALSE); + } + + DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; + + return SELECT_FILE_SYSTEM_PAGE; } MUIDisplayPage(SELECT_PARTITION_PAGE); @@ -2602,25 +2715,25 @@ return QUIT_PAGE; } - PreviousFormatState = PartitionList->FormatState; - switch (PartitionList->FormatState) + PreviousFormatState = FormatState; + switch (FormatState) { case Start: { if (PartitionList->CurrentPartition != PartitionList->SystemPartition) { - PartitionList->TempPartition = PartitionList->SystemPartition; - PartitionList->TempPartition->NeedsCheck = TRUE; - - PartitionList->FormatState = FormatSystemPartition; + TempPartition = PartitionList->SystemPartition; + TempPartition->NeedsCheck = TRUE; + + FormatState = FormatSystemPartition; DPRINT1("FormatState: Start --> FormatSystemPartition\n"); } else { - PartitionList->TempPartition = PartitionList->CurrentPartition; - PartitionList->TempPartition->NeedsCheck = TRUE; - - PartitionList->FormatState = FormatInstallPartition; + TempPartition = PartitionList->CurrentPartition; + TempPartition->NeedsCheck = TRUE; + + FormatState = FormatInstallPartition; DPRINT1("FormatState: Start --> FormatInstallPartition\n"); } break; @@ -2628,10 +2741,10 @@ case FormatSystemPartition: { - PartitionList->TempPartition = PartitionList->CurrentPartition; - PartitionList->TempPartition->NeedsCheck = TRUE; - - PartitionList->FormatState = FormatInstallPartition; + TempPartition = PartitionList->CurrentPartition; + TempPartition->NeedsCheck = TRUE; + + FormatState = FormatInstallPartition; DPRINT1("FormatState: FormatSystemPartition --> FormatInstallPartition\n"); break; } @@ -2640,15 +2753,15 @@ { if (GetNextUnformattedPartition(PartitionList, NULL, - &PartitionList->TempPartition)) - { - PartitionList->FormatState = FormatOtherPartition; - PartitionList->TempPartition->NeedsCheck = TRUE; + &TempPartition)) + { + FormatState = FormatOtherPartition; + TempPartition->NeedsCheck = TRUE; DPRINT1("FormatState: FormatInstallPartition --> FormatOtherPartition\n"); } else { - PartitionList->FormatState = FormatDone; + FormatState = FormatDone; DPRINT1("FormatState: FormatInstallPartition --> FormatDone\n"); return CHECK_FILE_SYSTEM_PAGE; } @@ -2659,15 +2772,15 @@ { if (GetNextUnformattedPartition(PartitionList, NULL, - &PartitionList->TempPartition)) - { - PartitionList->FormatState = FormatOtherPartition; - PartitionList->TempPartition->NeedsCheck = TRUE; + &TempPartition)) + { + FormatState = FormatOtherPartition; + TempPartition->NeedsCheck = TRUE; DPRINT1("FormatState: FormatOtherPartition --> FormatOtherPartition\n"); } else { - PartitionList->FormatState = FormatDone; + FormatState = FormatDone; DPRINT1("FormatState: FormatOtherPartition --> FormatDone\n"); return CHECK_FILE_SYSTEM_PAGE; } @@ -2682,7 +2795,7 @@ } } - PartEntry = PartitionList->TempPartition; + PartEntry = TempPartition; DiskEntry = PartEntry->DiskEntry; /* Adjust disk size */ @@ -2743,7 +2856,7 @@ } else if (PartEntry->New == TRUE) { - switch (PartitionList->FormatState) + switch (FormatState) { case FormatSystemPartition: CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDSYSTEMPART)); @@ -2851,7 +2964,7 @@ else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { - PartitionList->FormatState = Start; + FormatState = Start; return SELECT_PARTITION_PAGE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && @@ -2873,7 +2986,7 @@ } } - PartitionList->FormatState = PreviousFormatState; + FormatState = PreviousFormatState; return SELECT_FILE_SYSTEM_PAGE; } @@ -2914,14 +3027,13 @@ MUIDisplayPage(FORMAT_PARTITION_PAGE); - if (PartitionList == NULL || - PartitionList->TempPartition == NULL) + if (PartitionList == NULL || TempPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - PartEntry = PartitionList->TempPartition; + PartEntry = TempPartition; DiskEntry = PartEntry->DiskEntry; SelectedFileSystem = FileSystemList->Selected; @@ -3238,6 +3350,8 @@ if (IsUnattendedSetup) wcscpy(InstallDir, UnattendInstallationDirectory); + else if (RepairUpdateFlag) + wcscpy(InstallDir, CurrentInstallation->SystemRoot); else wcscpy(InstallDir, L"\\ReactOS"); @@ -3248,6 +3362,13 @@ // FIXME: Check the validity of the InstallDir; however what to do // if it is invalid but we are in unattended setup? (case of somebody // specified an invalid installation directory in the unattended file). + + if (RepairUpdateFlag) + { + return InstallDirectoryPage1(InstallDir, + DiskEntry, + PartEntry); + } if (IsUnattendedSetup) { @@ -4441,12 +4562,21 @@ { MUIDisplayPage(QUIT_PAGE); + /* Destroy the NTOS installations list */ + if (NtOsInstallsList != NULL) + { + DestroyGenericList(NtOsInstallsList, TRUE); + NtOsInstallsList = NULL; + } + /* Destroy the partition list */ if (PartitionList != NULL) { DestroyPartitionList(PartitionList); PartitionList = NULL; } + TempPartition = NULL; + FormatState = Start; /* Destroy the filesystem list */ if (FileSystemList != NULL) @@ -4745,8 +4875,8 @@ break; /* Repair pages */ - case REPAIR_INTRO_PAGE: - Page = RepairIntroPage(&Ir); + case UPGRADE_REPAIR_PAGE: + Page = UpgradeRepairPage(&Ir); break; case SUCCESS_PAGE: Modified: branches/setup_improvements/base/setup/usetup/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] Thu May 18 01:24:41 2017 @@ -563,16 +563,6 @@ return Success; } -typedef struct _NTOS_INSTALLATION -{ - LIST_ENTRY ListEntry; - ULONG DiskNumber; - ULONG PartitionNumber; -// Vendor???? - WCHAR SystemRoot[MAX_PATH]; -/**/WCHAR InstallationName[MAX_PATH];/**/ -} NTOS_INSTALLATION, *PNTOS_INSTALLATION; - static VOID ListNTOSInstalls( IN PGENERIC_LIST List) @@ -682,6 +672,7 @@ PVOID ViewBase; WCHAR PathBuffer[MAX_PATH]; WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; /* Set PartitionRootPath */ swprintf(PathBuffer, @@ -741,7 +732,9 @@ { DPRINT1("Found a valid NTOS installation in disk #%d, partition #%d, SystemRoot %S\n", DiskNumber, PartitionNumber, SystemRoot); - AddNTOSInstallation(List, DiskNumber, PartitionNumber, SystemRoot, L"Install_Windows"); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C: \\Device\\Harddisk%lu\\Partition%lu\\%s \"%s\"", + 'X' /* FIXME: Partition letter */, DiskNumber, PartitionNumber, SystemRoot, L"Windows (placeholder)"); + AddNTOSInstallation(List, DiskNumber, PartitionNumber, SystemRoot, InstallNameW); } // Here we get a SystemRootPath for each installation // FIXME! @@ -751,7 +744,9 @@ { DPRINT1("Found a valid NTOS installation in disk #%d, partition #%d, SystemRoot %S\n", DiskNumber, PartitionNumber, SystemRoot); - AddNTOSInstallation(List, DiskNumber, PartitionNumber, SystemRoot, L"Install_ReactOS"); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C: \\Device\\Harddisk%lu\\Partition%lu\\%s \"%s\"", + 'X' /* FIXME: Partition letter */, DiskNumber, PartitionNumber, SystemRoot, L"ReactOS (placeholder)"); + AddNTOSInstallation(List, DiskNumber, PartitionNumber, SystemRoot, InstallNameW); } /* Finally, unmap and close the file */ Added: branches/setup_improvements/base/setup/usetup/osdetect.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/osdetect.h (added) +++ branches/setup_improvements/base/setup/usetup/osdetect.h [iso-8859-1] Thu May 18 01:24:41 2017 @@ -0,0 +1,15 @@ + +typedef struct _NTOS_INSTALLATION +{ + LIST_ENTRY ListEntry; + ULONG DiskNumber; + ULONG PartitionNumber; +// Vendor???? + WCHAR SystemRoot[MAX_PATH]; +/**/WCHAR InstallationName[MAX_PATH];/**/ +} NTOS_INSTALLATION, *PNTOS_INSTALLATION; + +// EnumerateNTOSInstallations +PGENERIC_LIST +CreateNTOSInstallationsList( + IN PPARTLIST List); Propchange: branches/setup_improvements/base/setup/usetup/osdetect.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/setup_improvements/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] Thu May 18 01:24:41 2017 @@ -72,6 +72,7 @@ #include "cabinet.h" #include "filesup.h" #include "genlist.h" +#include "osdetect.h" #include "host.h" #include "mui.h"

7 years, 4 months

[hbelusca] 74575: [USETUP]: Massage the USETUP interface code: - The "intro" page is renamed into the "Welcome" page, because its corresponding resource indeed is the welcome screen; - Because the ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 18 01:05:39 2017 New Revision: 74575 URL: http://svn.reactos.org/svn/reactos?rev=74575&view=rev Log: [USETUP]: Massage the USETUP interface code: - The "intro" page is renamed into the "Welcome" page, because its corresponding resource indeed is the welcome screen; - Because the "setup start" page can only be displayed once, move it out of the while-loop, and use its result as the initial value of the 'Page' variable. - Remove unneeded _PAGE_NUMBER_DEFINED guards; - Add a DPRINT in the RepairUpdateFlag case of RegistryPage() (because we don't implement yet a correct upgrading or repairing of the registry. - Use the previously-introduced 'PreparePartitionForFormatting()' function; set the FormatState of the newly-formatted partition to Formatted. - In InstallIntroPage(), display the page itself only if needed (i.e. after all the validation checks & repair/update or unattended checks are done). Similar modifications are done also in DeviceSettingsPage(), SelectPartitionPage() - Remove the hackish call to CreateFileSystemList() in SelectFileSystemPage(). - Turn both CheckUnattendedSetup() and UpdateKBLayout() into static functions. - Put large "case"-blocks into brackets. - Fix the code of ScsiControllerPage() so that it can be compiled if needed, and add a dummy OemDriverPage(). Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/usetup.h Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Thu May 18 01:05:39 2017 @@ -413,7 +413,7 @@ } -VOID +static VOID CheckUnattendedSetup(VOID) { WCHAR UnattendInfPath[MAX_PATH]; @@ -587,7 +587,7 @@ } -VOID +static VOID UpdateKBLayout(VOID) { PGENERIC_LIST_ENTRY ListEntry; @@ -627,7 +627,7 @@ /* * Displays the LanguagePage. * - * Next pages: IntroPage, QuitPage + * Next pages: WelcomePage, QuitPage * * SIDEEFFECTS * Init SelectedLanguageId @@ -650,7 +650,7 @@ if (LanguageList == NULL) { PopupError("Setup failed to initialize available translations", NULL, NULL, POPUP_WAIT_NONE); - return INTRO_PAGE; + return WELCOME_PAGE; } } @@ -664,7 +664,7 @@ if (GenericListHasSingleEntry(LanguageList)) { LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); - return INTRO_PAGE; + return WELCOME_PAGE; } InitGenericListUi(&ListUi, LanguageList); @@ -728,7 +728,7 @@ /* Load the font */ SetConsoleCodePage(); - return INTRO_PAGE; + return WELCOME_PAGE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar > 0x60) && (Ir->Event.KeyEvent.uChar.AsciiChar < 0x7b)) { @@ -759,7 +759,7 @@ } } - return INTRO_PAGE; + return WELCOME_PAGE; } @@ -932,7 +932,7 @@ /* - * Displays the IntroPage. + * Displays the WelcomePage. * * Next pages: * InstallIntroPage (default) @@ -944,9 +944,9 @@ * Number of the next page. */ static PAGE_NUMBER -IntroPage(PINPUT_RECORD Ir) -{ - MUIDisplayPage(START_PAGE); +WelcomePage(PINPUT_RECORD Ir) +{ + MUIDisplayPage(WELCOME_PAGE); while (TRUE) { @@ -974,7 +974,7 @@ } } - return INTRO_PAGE; + return WELCOME_PAGE; } @@ -982,7 +982,7 @@ * Displays the License page. * * Next page: - * IntroPage (default) + * WelcomePage (default) * * RETURNS * Number of the next page. @@ -998,7 +998,7 @@ if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - return INTRO_PAGE; + return WELCOME_PAGE; } } @@ -1043,7 +1043,7 @@ else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { - return INTRO_PAGE; + return WELCOME_PAGE; } } @@ -1065,8 +1065,6 @@ static PAGE_NUMBER InstallIntroPage(PINPUT_RECORD Ir) { - MUIDisplayPage(INSTALL_INTRO_PAGE); - if (RepairUpdateFlag) { //return SELECT_PARTITION_PAGE; @@ -1074,9 +1072,9 @@ } if (IsUnattendedSetup) - { return SELECT_PARTITION_PAGE; - } + + MUIDisplayPage(INSTALL_INTRO_PAGE); while (TRUE) { @@ -1105,19 +1103,20 @@ static PAGE_NUMBER ScsiControllerPage(PINPUT_RECORD Ir) { - SetTextXY(6, 8, "Setup detected the following mass storage devices:"); + // MUIDisplayPage(SCSI_CONTROLLER_PAGE); + + CONSOLE_SetTextXY(6, 8, "Setup detected the following mass storage devices:"); /* FIXME: print loaded mass storage driver descriptions */ #if 0 - SetTextXY(8, 10, "TEST device"); + CONSOLE_SetTextXY(8, 10, "TEST device"); #endif - - SetStatusText(" ENTER = Continue F3 = Quit"); + CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); while (TRUE) { - ConInKey(Ir); + CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1134,6 +1133,38 @@ } return SCSI_CONTROLLER_PAGE; +} + +static PAGE_NUMBER +OemDriverPage(PINPUT_RECORD Ir) +{ + // MUIDisplayPage(OEM_DRIVER_PAGE); + + CONSOLE_SetTextXY(6, 8, "This is the OEM driver page!"); + + /* FIXME: Implement!! */ + + CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); + + while (TRUE) + { + CONSOLE_ConInKey(Ir); + + if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ + { + if (ConfirmQuit(Ir) == TRUE) + return QUIT_PAGE; + + break; + } + else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + { + return DEVICE_SETTINGS_PAGE; + } + } + + return OEM_DRIVER_PAGE; } #endif @@ -1163,7 +1194,6 @@ DeviceSettingsPage(PINPUT_RECORD Ir) { static ULONG Line = 16; - MUIDisplayPage(DEVICE_SETTINGS_PAGE); /* Initialize the computer settings list */ if (ComputerList == NULL) @@ -1210,20 +1240,20 @@ } } + if (RepairUpdateFlag) + return SELECT_PARTITION_PAGE; + + // if (IsUnattendedSetup) + // return SELECT_PARTITION_PAGE; + MUIDisplayPage(DEVICE_SETTINGS_PAGE); - - CONSOLE_SetTextXY(25, 11, GetListEntryText(GetCurrentListEntry((ComputerList)))); - CONSOLE_SetTextXY(25, 12, GetListEntryText(GetCurrentListEntry((DisplayList)))); - CONSOLE_SetTextXY(25, 13, GetListEntryText(GetCurrentListEntry((KeyboardList)))); - CONSOLE_SetTextXY(25, 14, GetListEntryText(GetCurrentListEntry((LayoutList)))); + CONSOLE_SetTextXY(25, 11, GetListEntryText(GetCurrentListEntry(ComputerList))); + CONSOLE_SetTextXY(25, 12, GetListEntryText(GetCurrentListEntry(DisplayList))); + CONSOLE_SetTextXY(25, 13, GetListEntryText(GetCurrentListEntry(KeyboardList))); + CONSOLE_SetTextXY(25, 14, GetListEntryText(GetCurrentListEntry(LayoutList))); CONSOLE_InvertTextXY(24, Line, 48, 1); - - if (RepairUpdateFlag) - { - return SELECT_PARTITION_PAGE; - } while (TRUE) { @@ -1511,8 +1541,6 @@ PARTLIST_UI ListUi; ULONG Error; - MUIDisplayPage(SELECT_PARTITION_PAGE); - if (PartitionList == NULL) { PartitionList = CreatePartitionList(); @@ -1528,6 +1556,8 @@ return QUIT_PAGE; } } + + MUIDisplayPage(SELECT_PARTITION_PAGE); InitPartitionListUi(&ListUi, PartitionList, 2, @@ -2564,23 +2594,8 @@ return QUIT_PAGE; } -#if 0 - /*** HACK! ***/ - if (FileSystemList == NULL) - { - FileSystemList = CreateFileSystemList(6, 26, PartitionList->CurrentPartition->New, L"FAT"); - if (FileSystemList == NULL) - { - /* FIXME: show an error dialog */ - return QUIT_PAGE; - } - - /* FIXME: Add file systems to list */ - } -#endif - /* Find or set the active system partition */ - CheckActiveSystemPartition(PartitionList /*, FileSystemList*/); + CheckActiveSystemPartition(PartitionList); if (PartitionList->SystemPartition == NULL) { /* FIXME: show an error dialog */ @@ -2591,6 +2606,7 @@ switch (PartitionList->FormatState) { case Start: + { if (PartitionList->CurrentPartition != PartitionList->SystemPartition) { PartitionList->TempPartition = PartitionList->SystemPartition; @@ -2608,16 +2624,20 @@ DPRINT1("FormatState: Start --> FormatInstallPartition\n"); } break; + } case FormatSystemPartition: + { PartitionList->TempPartition = PartitionList->CurrentPartition; PartitionList->TempPartition->NeedsCheck = TRUE; PartitionList->FormatState = FormatInstallPartition; DPRINT1("FormatState: FormatSystemPartition --> FormatInstallPartition\n"); break; + } case FormatInstallPartition: + { if (GetNextUnformattedPartition(PartitionList, NULL, &PartitionList->TempPartition)) @@ -2633,8 +2653,10 @@ return CHECK_FILE_SYSTEM_PAGE; } break; + } case FormatOtherPartition: + { if (GetNextUnformattedPartition(PartitionList, NULL, &PartitionList->TempPartition)) @@ -2650,11 +2672,14 @@ return CHECK_FILE_SYSTEM_PAGE; } break; + } default: - DPRINT1("FormatState: Invalid value %ld\n", PartitionList->FormatState); + { + DPRINT1("FormatState: Invalid value %ld\n", FormatState); /* FIXME: show an error dialog */ return QUIT_PAGE; + } } PartEntry = PartitionList->TempPartition; @@ -2784,8 +2809,6 @@ /* FIXME: show an error dialog */ return QUIT_PAGE; } - - /* FIXME: Add file systems to list */ } DrawFileSystemList(FileSystemList); @@ -2807,7 +2830,6 @@ * which file system to use in unattended installations, in the * txtsetup.sif file. */ - // PartEntry->FileSystem = GetFileSystemByName(FileSystemList, L"FAT"); return FORMAT_PARTITION_PAGE; } @@ -2845,14 +2867,9 @@ else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { if (!FileSystemList->Selected->FileSystem) - { return SELECT_FILE_SYSTEM_PAGE; - } else - { - // PartEntry->FileSystem = FileSystemList->Selected; return FORMAT_PARTITION_PAGE; - } } } @@ -2907,7 +2924,7 @@ PartEntry = PartitionList->TempPartition; DiskEntry = PartEntry->DiskEntry; - SelectedFileSystem = FileSystemList->Selected; // PartEntry->FileSystem; // FIXME!!!! + SelectedFileSystem = FileSystemList->Selected; while (TRUE) { @@ -2928,60 +2945,7 @@ { CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - if (wcscmp(SelectedFileSystem->FileSystemName, L"FAT") == 0) - { - if (PartEntry->SectorCount.QuadPart < 8192) - { - /* FAT12 CHS partition (disk is smaller than 4.1MB) */ - SetPartitionType(PartEntry, PARTITION_FAT_12); - } - else if (PartEntry->StartSector.QuadPart < 1450560) - { - /* Partition starts below the 8.4GB boundary ==> CHS partition */ - - if (PartEntry->SectorCount.QuadPart < 65536) - { - /* FAT16 CHS partition (partition size < 32MB) */ - SetPartitionType(PartEntry, PARTITION_FAT_16); - } - else if (PartEntry->SectorCount.QuadPart < 1048576) - { - /* FAT16 CHS partition (partition size < 512MB) */ - SetPartitionType(PartEntry, PARTITION_HUGE); - } - else - { - /* FAT32 CHS partition (partition size >= 512MB) */ - SetPartitionType(PartEntry, PARTITION_FAT32); - } - } - else - { - /* Partition starts above the 8.4GB boundary ==> LBA partition */ - - if (PartEntry->SectorCount.QuadPart < 1048576) - { - /* FAT16 LBA partition (partition size < 512MB) */ - SetPartitionType(PartEntry, PARTITION_XINT13); - } - else - { - /* FAT32 LBA partition (partition size >= 512MB) */ - SetPartitionType(PartEntry, PARTITION_FAT32_XINT13); - } - } - } -#if 0 - else if (wcscmp(SelectedFileSystem->FileSystemName, L"EXT2") == 0) - { - SetPartitionType(PartEntry, PARTITION_EXT2); - } - else if (wcscmp(SelectedFileSystem->FileSystemName, L"NTFS") == 0) - { - SetPartitionType(PartEntry, PARTITION_IFS); - } -#endif - else if (!SelectedFileSystem->FileSystem) + if (!PreparePartitionForFormatting(PartEntry, SelectedFileSystem->FileSystem)) { /* FIXME: show an error dialog */ return QUIT_PAGE; @@ -3014,7 +2978,8 @@ } #endif - if (WritePartitionsToDisk(PartitionList) == FALSE) + /* Commit the partition changes to the disk */ + if (!WritePartitionsToDisk(PartitionList)) { DPRINT("WritePartitionsToDisk() failed\n"); MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); @@ -3030,6 +2995,7 @@ PathBuffer); DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); + /* Format the partition */ if (SelectedFileSystem->FileSystem) { Status = FormatPartition(&PartitionRootPath, @@ -3041,6 +3007,8 @@ return QUIT_PAGE; } + PartEntry->FormatState = Formatted; + // PartEntry->FileSystem = FileSystem; PartEntry->New = FALSE; } @@ -3185,7 +3153,7 @@ * Number of the next page. */ static PAGE_NUMBER -InstallDirectoryPage1(PWCHAR InstallDir, +InstallDirectoryPage1(PWSTR InstallDir, PDISKENTRY DiskEntry, PPARTENTRY PartEntry) { @@ -3985,6 +3953,8 @@ if (RepairUpdateFlag) { + // FIXME! + DPRINT1("FIXME: Updating / repairing the registry is NOT implemented yet!\n"); return SUCCESS_PAGE; } @@ -4641,35 +4611,34 @@ /* Hide the cursor */ CONSOLE_SetCursorType(TRUE, FALSE); - Page = START_PAGE; + /* Global Initialization page */ + CONSOLE_ClearScreen(); + CONSOLE_Flush(); + Page = SetupStartPage(&Ir); + while (Page != REBOOT_PAGE && Page != RECOVERY_PAGE) { CONSOLE_ClearScreen(); CONSOLE_Flush(); - //CONSOLE_SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); - //CONSOLE_Flush(); + // CONSOLE_SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); + // CONSOLE_Flush(); switch (Page) { - /* Start page */ - case START_PAGE: - Page = SetupStartPage(&Ir); - break; - /* Language page */ case LANGUAGE_PAGE: Page = LanguagePage(&Ir); break; + /* Welcome page */ + case WELCOME_PAGE: + Page = WelcomePage(&Ir); + break; + /* License page */ case LICENSE_PAGE: Page = LicensePage(&Ir); - break; - - /* Intro page */ - case INTRO_PAGE: - Page = IntroPage(&Ir); break; /* Install pages */ Modified: branches/setup_improvements/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] Thu May 18 01:05:39 2017 @@ -112,17 +112,15 @@ #endif /* __REACTOS__ */ -#ifndef _PAGE_NUMBER_DEFINED -#define _PAGE_NUMBER_DEFINED typedef enum _PAGE_NUMBER { LANGUAGE_PAGE, - INTRO_PAGE, WELCOME_PAGE, LICENSE_PAGE, INSTALL_INTRO_PAGE, // SCSI_CONTROLLER_PAGE, +// OEM_DRIVER_PAGE, // REPAIR_INTRO_PAGE, UPGRADE_REPAIR_PAGE, @@ -159,7 +157,6 @@ REBOOT_PAGE, /* Virtual page */ RECOVERY_PAGE, /* Virtual page */ } PAGE_NUMBER, *PPAGE_NUMBER; -#endif #define POPUP_WAIT_NONE 0 #define POPUP_WAIT_ANY_KEY 1

7 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2017