Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68121: [AFD] - Probe for read access only in TdiSend/TdiSendDatagram CORE-9807 resolve
by tfaber＠svn.reactos.org 13 Jun '15

13 Jun '15

Author: tfaber Date: Sat Jun 13 12:30:33 2015 New Revision: 68121 URL: http://svn.reactos.org/svn/reactos?rev=68121&view=rev Log: [AFD] - Probe for read access only in TdiSend/TdiSendDatagram CORE-9807 resolve Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Sat Jun 13 12:30:33 2015 @@ -935,7 +935,7 @@ } _SEH2_TRY { - MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoReadAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); @@ -1202,7 +1202,7 @@ } _SEH2_TRY { - MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoReadAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl);

1 0

[tfaber] 68120: [WS2_32_APITEST] - Add a test for send/sendto with a read-only buffer CORE-9807
by tfaber＠svn.reactos.org 13 Jun '15

13 Jun '15

Author: tfaber Date: Sat Jun 13 12:29:07 2015 New Revision: 68120 URL: http://svn.reactos.org/svn/reactos?rev=68120&view=rev Log: [WS2_32_APITEST] - Add a test for send/sendto with a read-only buffer CORE-9807 Added: trunk/rostests/apitests/ws2_32/send.c (with props) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/testlist.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Sat Jun 13 12:29:07 2015 @@ -5,6 +5,7 @@ ioctlsocket.c nostartup.c recv.c + send.c WSAStartup.c testlist.c) Added: trunk/rostests/apitests/ws2_32/send.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/send.c?re… ============================================================================== --- trunk/rostests/apitests/ws2_32/send.c (added) +++ trunk/rostests/apitests/ws2_32/send.c [iso-8859-1] Sat Jun 13 12:29:07 2015 @@ -0,0 +1,185 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for send/sendto + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> +#include <winsock2.h> + +#define WIN32_NO_STATUS +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +static +PVOID +AllocateReadOnly( + _In_ SIZE_T SizeRequested) +{ + NTSTATUS Status; + SIZE_T Size = PAGE_ROUND_UP(SizeRequested); + PVOID VirtualMemory = NULL; + + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READONLY); + if (!NT_SUCCESS(Status)) + return NULL; + + return VirtualMemory; +} + +static +VOID +FreeReadOnly( + _In_ PVOID VirtualMemory) +{ + NTSTATUS Status; + SIZE_T Size = 0; + + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); +} + +static +VOID +test_send(void) +{ + SOCKET sock; + int ret; + int error; + PVOID buffer; + ULONG bufferSize; + struct sockaddr_in addr; + + bufferSize = 32; + buffer = AllocateReadOnly(bufferSize); + ok(buffer != NULL, "AllocateReadOnly failed\n"); + if (!buffer) + { + skip("No memory\n"); + return; + } + + ret = send(0, NULL, 0, 0); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "send returned %d\n", ret); + ok(error == WSAENOTSOCK, "error = %d\n", error); + + ret = send(0, buffer, bufferSize, 0); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "send returned %d\n", ret); + ok(error == WSAENOTSOCK, "error = %d\n", error); + + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "socket failed\n"); + if (sock == INVALID_SOCKET) + { + skip("No socket\n"); + FreeReadOnly(buffer); + return; + } + + ret = send(sock, NULL, 0, 0); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "send returned %d\n", ret); + ok(error == WSAENOTCONN, "error = %d\n", error); + + ret = send(sock, buffer, bufferSize, 0); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "send returned %d\n", ret); + ok(error == WSAENOTCONN, "error = %d\n", error); + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("8.8.8.8"); + addr.sin_port = htons(53); + ret = connect(sock, (const struct sockaddr *)&addr, sizeof(addr)); + error = WSAGetLastError(); + ok(ret == 0, "connect returned %d\n", ret); + ok(error == 0, "error = %d\n", error); + + ret = send(sock, NULL, 0, 0); + error = WSAGetLastError(); + ok(ret == 0, "send returned %d\n", ret); + ok(error == 0, "error = %d\n", error); + + ret = send(sock, buffer, bufferSize, 0); + error = WSAGetLastError(); + ok(ret == bufferSize, "send returned %d\n", ret); + ok(error == 0, "error = %d\n", error); + + closesocket(sock); + + FreeReadOnly(buffer); +} + +static +VOID +test_sendto(void) +{ + SOCKET sock; + int ret; + int error; + PVOID buffer; + ULONG bufferSize; + struct sockaddr_in addr; + + bufferSize = 32; + buffer = AllocateReadOnly(bufferSize); + ok(buffer != NULL, "AllocateReadOnly failed\n"); + if (!buffer) + { + skip("No memory\n"); + return; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("8.8.8.8"); + addr.sin_port = htons(53); + + ret = sendto(0, NULL, 0, 0, (const struct sockaddr *)&addr, sizeof(addr)); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "sendto returned %d\n", ret); + ok(error == WSAENOTSOCK, "error = %d\n", error); + + ret = sendto(0, buffer, bufferSize, 0, (const struct sockaddr *)&addr, sizeof(addr)); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "sendto returned %d\n", ret); + ok(error == WSAENOTSOCK, "error = %d\n", error); + + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ok(sock != INVALID_SOCKET, "socket failed\n"); + if (sock == INVALID_SOCKET) + { + skip("No socket\n"); + FreeReadOnly(buffer); + return; + } + + ret = sendto(sock, NULL, 0, 0, (const struct sockaddr *)&addr, sizeof(addr)); + error = WSAGetLastError(); + ok(ret == 0, "sendto returned %d\n", ret); + ok(error == 0, "error = %d\n", error); + + ret = sendto(sock, buffer, bufferSize, 0, (const struct sockaddr *)&addr, sizeof(addr)); + error = WSAGetLastError(); + ok(ret == bufferSize, "sendto returned %d\n", ret); + ok(error == 0, "error = %d\n", error); + + closesocket(sock); + + FreeReadOnly(buffer); +} + +START_TEST(send) +{ + int ret; + WSADATA wsad; + + ret = WSAStartup(MAKEWORD(2, 2), &wsad); + ok(ret == 0, "WSAStartup failed with %d\n", ret); + test_send(); + test_sendto(); + WSACleanup(); +} Propchange: trunk/rostests/apitests/ws2_32/send.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Sat Jun 13 12:29:07 2015 @@ -6,6 +6,7 @@ extern void func_getaddrinfo(void); extern void func_ioctlsocket(void); extern void func_recv(void); +extern void func_send(void); extern void func_WSAStartup(void); extern void func_nostartup(void); @@ -15,6 +16,7 @@ { "ioctlsocket", func_ioctlsocket }, { "nostartup", func_nostartup }, { "recv", func_recv }, + { "send", func_send }, { "WSAStartup", func_WSAStartup }, { 0, 0 } };

1 0

[akhaldi] 68119: [SERVMAN] Use a glob mechanism as resource files lists do not change often. CORE-9806
by akhaldi＠svn.reactos.org 13 Jun '15

13 Jun '15

Author: akhaldi Date: Sat Jun 13 11:41:32 2015 New Revision: 68119 URL: http://svn.reactos.org/svn/reactos?rev=68119&view=rev Log: [SERVMAN] Use a glob mechanism as resource files lists do not change often. CORE-9806 Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Sat Jun 13 11:41:32 2015 @@ -21,20 +21,7 @@ stop_dependencies.c precomp.h) -list(APPEND servman_rc_deps - ${CMAKE_CURRENT_SOURCE_DIR}/res/create.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/delete.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/driver.ico - ${CMAKE_CURRENT_SOURCE_DIR}/res/export.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/nodepends.ico - ${CMAKE_CURRENT_SOURCE_DIR}/res/pause.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/properties.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/refresh.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/restart.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/start.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/stop.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/system.ico) - +file(GLOB servman_rc_deps res/*.*) add_rc_deps(servman.rc ${servman_rc_deps}) add_executable(servman ${SOURCE} servman.rc) set_module_type(servman win32gui UNICODE)

1 0

[akhaldi] 68118: [SERVMAN] Properly track resource file dependencies. CORE-9806
by akhaldi＠svn.reactos.org 13 Jun '15

13 Jun '15

Author: akhaldi Date: Sat Jun 13 11:12:48 2015 New Revision: 68118 URL: http://svn.reactos.org/svn/reactos?rev=68118&view=rev Log: [SERVMAN] Properly track resource file dependencies. CORE-9806 Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Sat Jun 13 11:12:48 2015 @@ -21,6 +21,21 @@ stop_dependencies.c precomp.h) +list(APPEND servman_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/res/create.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/delete.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/driver.ico + ${CMAKE_CURRENT_SOURCE_DIR}/res/export.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/nodepends.ico + ${CMAKE_CURRENT_SOURCE_DIR}/res/pause.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/properties.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/refresh.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/restart.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/start.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/stop.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/system.ico) + +add_rc_deps(servman.rc ${servman_rc_deps}) add_executable(servman ${SOURCE} servman.rc) set_module_type(servman win32gui UNICODE) add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)

1 0

[akhaldi] 68117: [CMAKE] Introduce add_rc_deps() to take care of adding OBJECT_DEPENDS to rc source files. CORE-9806
by akhaldi＠svn.reactos.org 13 Jun '15

13 Jun '15

Author: akhaldi Date: Sat Jun 13 11:05:03 2015 New Revision: 68117 URL: http://svn.reactos.org/svn/reactos?rev=68117&view=rev Log: [CMAKE] Introduce add_rc_deps() to take care of adding OBJECT_DEPENDS to rc source files. CORE-9806 Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Jun 13 11:05:03 2015 @@ -800,3 +800,7 @@ else() set(ROSSYM_LIB "") endif() + +function(add_rc_deps _target_rc) + set_source_files_properties(${_target_rc} PROPERTIES OBJECT_DEPENDS "${ARGN}") +endfunction()

1 0

[akhaldi] 68116: [USER32][UXTHEME] Properly paint the general menubar when application is themed. Brought to you by Stefano Toncich aka Tonix. CORE-9585
by akhaldi＠svn.reactos.org 13 Jun '15

13 Jun '15

Author: akhaldi Date: Sat Jun 13 11:00:24 2015 New Revision: 68116 URL: http://svn.reactos.org/svn/reactos?rev=68116&view=rev Log: [USER32][UXTHEME] Properly paint the general menubar when application is themed. Brought to you by Stefano Toncich aka Tonix. CORE-9585 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c trunk/reactos/win32ss/user/user32/windows/font.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] Sat Jun 13 11:00:24 2015 @@ -513,11 +513,7 @@ GetMenuItemRect(pcontext->hWnd, Menu, imenu, &Rect); -#ifdef __REACTOS__ - OffsetRect(&Rect, -pcontext->wi.rcClient.left, -pcontext->wi.rcClient.top); -#else OffsetRect(&Rect, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); -#endif SetBkColor(pcontext->hDC, GetSysColor(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); SetTextColor(pcontext->hDC, GetSysColor(Item.fState & MF_GRAYED ? COLOR_GRAYTEXT : COLOR_MENUTEXT)); Modified: trunk/reactos/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] Sat Jun 13 11:00:24 2015 @@ -1212,14 +1212,41 @@ last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); +#ifdef __REACTOS__ + if (flags & DT_CENTER) + { + if (((rect->right - rect->left) < size.cx) && (flags & DT_CALCRECT)) + { + x = rect->left + size.cx; + } + else + { + x = (rect->left + rect->right - size.cx) / 2; + } + } +#else if (flags & DT_CENTER) x = (rect->left + rect->right - size.cx) / 2; +#endif else if (flags & DT_RIGHT) x = rect->right - size.cx; if (flags & DT_SINGLELINE) { if (flags & DT_VCENTER) - y = rect->top + (rect->bottom - rect->top) / 2 + (invert_y ? (size.cy / 2) : (-size.cy / 2)); +#ifdef __REACTOS__ + { + if (((rect->bottom - rect->top) < (invert_y ? -size.cy : size.cy)) && (flags & DT_CALCRECT)) + { + y = rect->top + (invert_y ? -size.cy : size.cy); + } + else + { +#endif + y = rect->top + (rect->bottom - rect->top) / 2 + (invert_y ? (size.cy / 2) : (-size.cy / 2)); +#ifdef __REACTOS__ + } + } +#endif else if (flags & DT_BOTTOM) y = rect->bottom + (invert_y ? 0 : -size.cy); }

1 0

[ekohl] 68115: [USETUP] Get rid of CheckForLinuxFdiskPartitions.
by ekohl＠svn.reactos.org 13 Jun '15

13 Jun '15

Author: ekohl Date: Sat Jun 13 10:08:36 2015 New Revision: 68115 URL: http://svn.reactos.org/svn/reactos?rev=68115&view=rev Log: [USETUP] Get rid of CheckForLinuxFdiskPartitions. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Jun 13 10:08:36 2015 @@ -80,8 +80,6 @@ static HSPFILEQ SetupFileQueue = NULL; -static BOOLEAN WarnLinuxPartitions = TRUE; - static PGENERIC_LIST ComputerList = NULL; static PGENERIC_LIST DisplayList = NULL; static PGENERIC_LIST KeyboardList = NULL; @@ -1472,29 +1470,6 @@ } DrawPartitionList(PartitionList); - - /* Warn about partitions created by Linux Fdisk */ - if (WarnLinuxPartitions == TRUE && - CheckForLinuxFdiskPartitions(PartitionList) == TRUE) - { - MUIDisplayError(ERROR_WARN_PARTITION, NULL, POPUP_WAIT_NONE); - - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ - { - return QUIT_PAGE; - } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ - { - WarnLinuxPartitions = FALSE; - return SELECT_PARTITION_PAGE; - } - } - } if (IsUnattendedSetup) { Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Jun 13 10:08:36 2015 @@ -2824,65 +2824,9 @@ } -BOOLEAN -CheckForLinuxFdiskPartitions( - PPARTLIST List) -{ -#if 0 - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - PLIST_ENTRY Entry1; - PLIST_ENTRY Entry2; - ULONG PartitionCount; - ULONG i; - - Entry1 = List->DiskListHead.Flink; - while (Entry1 != &List->DiskListHead) - { - DiskEntry = CONTAINING_RECORD(Entry1, - DISKENTRY, - ListEntry); - - Entry2 = DiskEntry->PartListHead.Flink; - while (Entry2 != &DiskEntry->PartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, - PARTENTRY, - ListEntry); - - if (PartEntry->Unpartitioned == FALSE) - { - PartitionCount = 0; - - for (i = 0; i < 4; i++) - { - if (!IsContainerPartition(PartEntry->PartInfo[i].PartitionType) && - PartEntry->PartInfo[i].PartitionLength.QuadPart != 0ULL) - { - PartitionCount++; - } - } - - if (PartitionCount > 1) - { - return TRUE; - } - } - - Entry2 = Entry2->Flink; - } - - Entry1 = Entry1->Flink; - } -#endif - - return FALSE; -} - - static NTSTATUS -WritePartitons( +WritePartitions( IN PPARTLIST List, IN PDISKENTRY DiskEntry) { @@ -2964,7 +2908,7 @@ if (DiskEntry->Dirty == TRUE) { - WritePartitons(List, DiskEntry); + WritePartitions(List, DiskEntry); DiskEntry->Dirty = FALSE; } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sat Jun 13 10:08:36 2015 @@ -264,10 +264,6 @@ PPARTLIST List); BOOLEAN -CheckForLinuxFdiskPartitions( - PPARTLIST List); - -BOOLEAN WritePartitionsToDisk( PPARTLIST List);

1 0

[dreimer] 68114: [USETUP] Update german language header.
by dreimer＠svn.reactos.org 12 Jun '15

12 Jun '15

Author: dreimer Date: Fri Jun 12 23:37:41 2015 New Revision: 68114 URL: http://svn.reactos.org/svn/reactos?rev=68114&view=rev Log: [USETUP] Update german language header. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Fri Jun 12 23:37:41 2015 @@ -1659,9 +1659,9 @@ {STRING_NONFORMATTEDPART, "Sie wollen ReactOS auf einer neuen/unformatierten Partition installieren."}, {STRING_NONFORMATTEDSYSTEMPART, - "The system partition is not formatted yet."}, + "Die Systempartition ist noch nicht formartiert."}, {STRING_NONFORMATTEDOTHERPART, - "The new partition is not formatted yet."}, + "Die neue Partition ist noch nicht formatiert."}, {STRING_INSTALLONPART, "ReactOS wird auf dieser Partition installiert."}, {STRING_CHECKINGPART,

1 0

[ekohl] 68113: [USETUP] Mark a disk as clean after the partition table has been written to the disk.
by ekohl＠svn.reactos.org 12 Jun '15

12 Jun '15

Author: ekohl Date: Fri Jun 12 22:56:36 2015 New Revision: 68113 URL: http://svn.reactos.org/svn/reactos?rev=68113&view=rev Log: [USETUP] Mark a disk as clean after the partition table has been written to the disk. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Jun 12 22:56:36 2015 @@ -2965,6 +2965,7 @@ if (DiskEntry->Dirty == TRUE) { WritePartitons(List, DiskEntry); + DiskEntry->Dirty = FALSE; } Entry = Entry->Flink;

1 0

[ekohl] 68112: [USETUP] - Implement mandatory filesystem selection, formatting and filesystem checks for all new partitons. - Implement optional filesystem selection, formatting and filesystem chec...
by ekohl＠svn.reactos.org 12 Jun '15

12 Jun '15

Author: ekohl Date: Fri Jun 12 21:51:57 2015 New Revision: 68112 URL: http://svn.reactos.org/svn/reactos?rev=68112&view=rev Log: [USETUP] - Implement mandatory filesystem selection, formatting and filesystem checks for all new partitons. - Implement optional filesystem selection, formatting and filesystem checks for formatted boot and install partitions. - Enable installing ReactOS on primary partitions other than the first one. Usetup will install Freeloader on the first (or active) partition (aka boot partition) and install ReactOS on the chosen partition (aka install partition). Modified: trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/fslist.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -35,7 +35,7 @@ VOID FS_AddProvider( IN OUT PFILE_SYSTEM_LIST List, - IN LPCWSTR FileSystem, + IN LPCWSTR FileSystemName, IN FORMATEX FormatFunc, IN CHKDSKEX ChkdskFunc) { @@ -45,7 +45,7 @@ if (!Item) return; - Item->FileSystem = FileSystem; + Item->FileSystemName = FileSystemName; Item->FormatFunc = FormatFunc; Item->ChkdskFunc = ChkdskFunc; Item->QuickFormat = TRUE; @@ -58,7 +58,7 @@ if (!Item) return; - Item->FileSystem = FileSystem; + Item->FileSystemName = FileSystemName; Item->FormatFunc = FormatFunc; Item->ChkdskFunc = ChkdskFunc; Item->QuickFormat = FALSE; @@ -99,7 +99,7 @@ while (ListEntry != &List->ListHead) { Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - if (Item->FileSystem && wcscmp(ForceFileSystem, Item->FileSystem) == 0) + if (Item->FileSystemName && wcscmp(ForceFileSystem, Item->FileSystemName) == 0) { List->Selected = Item; break; @@ -163,12 +163,12 @@ coPos, &Written); - if (Item->FileSystem) + if (Item->FileSystemName) { if (Item->QuickFormat) - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK1), Item->FileSystem); + snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK1), Item->FileSystemName); else - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystem); + snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystemName); } else snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_KEEPFORMAT)); @@ -210,4 +210,26 @@ } } + +PFILE_SYSTEM_ITEM +GetFileSystemByName( + IN PFILE_SYSTEM_LIST List, + IN LPWSTR FileSystemName) +{ + PLIST_ENTRY ListEntry; + PFILE_SYSTEM_ITEM Item; + + ListEntry = List->ListHead.Flink; + while (ListEntry != &List->ListHead) + { + Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); + if (Item->FileSystemName && wcsicmp(FileSystemName, Item->FileSystemName) == 0) + return Item; + + ListEntry = ListEntry->Flink; + } + + return NULL; +} + /* EOF */ Modified: trunk/reactos/base/setup/usetup/fslist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.h… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -31,7 +31,7 @@ typedef struct _FILE_SYSTEM_ITEM { LIST_ENTRY ListEntry; - LPCWSTR FileSystem; /* Not owned by the item */ + LPCWSTR FileSystemName; /* Not owned by the item */ FORMATEX FormatFunc; CHKDSKEX ChkdskFunc; BOOLEAN QuickFormat; @@ -48,7 +48,7 @@ VOID FS_AddProvider( IN OUT PFILE_SYSTEM_LIST List, - IN LPCWSTR FileSystem, + IN LPCWSTR FileSystemName, IN FORMATEX FormatFunc, IN CHKDSKEX ChkdskFunc); @@ -75,4 +75,9 @@ ScrollUpFileSystemList( IN PFILE_SYSTEM_LIST List); +PFILE_SYSTEM_ITEM +GetFileSystemByName( + IN PFILE_SYSTEM_LIST List, + IN LPWSTR FileSystemName); + /* EOF */ Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -2418,6 +2418,8 @@ PCHAR PartUnit; PCHAR PartType; + DPRINT("SelectFileSystemPage()\n"); + if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || PartitionList->CurrentPartition == NULL) @@ -2426,8 +2428,90 @@ return QUIT_PAGE; } - DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; + /* Find or set the active partition */ + CheckActiveBootPartition(PartitionList); + + if (PartitionList->BootDisk == NULL || + PartitionList->BootPartition == NULL) + { + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + + switch (PartitionList->FormatState) + { + case Start: + if (PartitionList->CurrentPartition != PartitionList->BootPartition) + { + PartitionList->TempDisk = PartitionList->BootDisk; + PartitionList->TempPartition = PartitionList->BootPartition; + PartitionList->TempPartition->NeedsCheck = TRUE; + + PartitionList->FormatState = FormatSystemPartition; + DPRINT1("FormatState: Start --> FormatSystemPartition\n"); + } + else + { + PartitionList->TempDisk = PartitionList->CurrentDisk; + PartitionList->TempPartition = PartitionList->CurrentPartition; + PartitionList->TempPartition->NeedsCheck = TRUE; + + PartitionList->FormatState = FormatInstallPartition; + DPRINT1("FormatState: Start --> FormatInstallPartition\n"); + } + break; + + case FormatSystemPartition: + PartitionList->TempDisk = PartitionList->CurrentDisk; + PartitionList->TempPartition = PartitionList->CurrentPartition; + PartitionList->TempPartition->NeedsCheck = TRUE; + + PartitionList->FormatState = FormatInstallPartition; + DPRINT1("FormatState: FormatSystemPartition --> FormatInstallPartition\n"); + break; + + case FormatInstallPartition: + if (GetNextUnformattedPartition(PartitionList, + &PartitionList->TempDisk, + &PartitionList->TempPartition)) + { + PartitionList->FormatState = FormatOtherPartition; + PartitionList->TempPartition->NeedsCheck = TRUE; + DPRINT1("FormatState: FormatInstallPartition --> FormatOtherPartition\n"); + } + else + { + PartitionList->FormatState = FormatDone; + DPRINT1("FormatState: FormatInstallPartition --> FormatDone\n"); + return CHECK_FILE_SYSTEM_PAGE; + } + break; + + case FormatOtherPartition: + if (GetNextUnformattedPartition(PartitionList, + &PartitionList->TempDisk, + &PartitionList->TempPartition)) + { + PartitionList->FormatState = FormatOtherPartition; + PartitionList->TempPartition->NeedsCheck = TRUE; + DPRINT1("FormatState: FormatOtherPartition --> FormatOtherPartition\n"); + } + else + { + PartitionList->FormatState = FormatDone; + DPRINT1("FormatState: FormatOtherPartition --> FormatDone\n"); + return CHECK_FILE_SYSTEM_PAGE; + } + break; + + default: + DPRINT1("FormatState: Invalid value %ld\n", PartitionList->FormatState); + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + + DiskEntry = PartitionList->TempDisk; + PartEntry = PartitionList->TempPartition; /* adjust disk size */ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; @@ -2513,7 +2597,24 @@ } else if (PartEntry->New == TRUE) { - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART)); + switch (PartitionList->FormatState) + { + case FormatSystemPartition: + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDSYSTEMPART)); + break; + + case FormatInstallPartition: + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART)); + break; + + case FormatOtherPartition: + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDOTHERPART)); + break; + + default: + break; + } + CONSOLE_SetTextXY(6, 10, MUIGetString(STRING_PARTFORMAT)); } else @@ -2577,6 +2678,8 @@ { if (UnattendFormatPartition) { + PartEntry->FileSystem = GetFileSystemByName(FileSystemList, + L"FAT"); return FORMAT_PARTITION_PAGE; } @@ -2616,10 +2719,11 @@ { if (!FileSystemList->Selected->FormatFunc) { - return CHECK_FILE_SYSTEM_PAGE; + return SELECT_FILE_SYSTEM_PAGE; } else { + PartEntry->FileSystem = FileSystemList->Selected; return FORMAT_PARTITION_PAGE; } } @@ -2632,6 +2736,7 @@ static ULONG FormatPartitionPage(PINPUT_RECORD Ir) { + UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -2643,18 +2748,20 @@ PLIST_ENTRY Entry; #endif + DPRINT("FormatPartitionPage()\n"); + MUIDisplayPage(FORMAT_PARTITION_PAGE); if (PartitionList == NULL || - PartitionList->CurrentDisk == NULL || - PartitionList->CurrentPartition == NULL) + PartitionList->TempDisk == NULL || + PartitionList->TempPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; + DiskEntry = PartitionList->TempDisk; + PartEntry = PartitionList->TempPartition; while (TRUE) { @@ -2677,7 +2784,7 @@ { CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) + if (wcscmp(PartEntry->FileSystem->FileSystemName, L"FAT") == 0) { if (PartEntry->SectorCount.QuadPart < 8192) { @@ -2720,17 +2827,24 @@ } } + DiskEntry->Dirty = TRUE; DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; + DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; } #if 0 - else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) + else if (wcscmp(PartEntry->FileSystem->FileSystemName, L"EXT2") == 0) { PartEntry->PartitionType = PARTITION_EXT2; + + DiskEntry->Dirty = TRUE; DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; + DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; } #endif - else if (!FileSystemList->Selected->FormatFunc) + else if (!PartEntry->FileSystem->FormatFunc) + { return QUIT_PAGE; + } #ifndef NDEBUG CONSOLE_PrintTextXY(6, 12, @@ -2740,7 +2854,7 @@ DiskEntry->TrackSize); Line = 13; - DiskEntry = PartitionList->CurrentDisk; + DiskEntry = PartitionList->TempDisk; Entry = DiskEntry->PartListHead.Flink; while (Entry != &DiskEntry->PrimaryPartListHead) @@ -2765,10 +2879,8 @@ } /* Restore the old entry */ - PartEntry = PartitionList->CurrentPartition; + PartEntry = PartitionList->TempPartition; #endif - - CheckActiveBootPartition(PartitionList); if (WritePartitionsToDisk(PartitionList) == FALSE) { @@ -2777,20 +2889,19 @@ return QUIT_PAGE; } - /* Set DestinationRootPath */ - RtlFreeUnicodeString(&DestinationRootPath); + /* Set PartitionRootPath */ swprintf(PathBuffer, L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->CurrentDisk->DiskNumber, - PartitionList->CurrentPartition->PartitionNumber); - RtlCreateUnicodeString(&DestinationRootPath, - PathBuffer); - DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); - - if (FileSystemList->Selected->FormatFunc) - { - Status = FormatPartition(&DestinationRootPath, - FileSystemList->Selected); + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, + PathBuffer); + DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); + + if (PartEntry->FileSystem->FormatFunc) + { + Status = FormatPartition(&PartitionRootPath, + PartEntry->FileSystem); if (!NT_SUCCESS(Status)) { DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); @@ -2799,7 +2910,6 @@ } PartEntry->New = FALSE; - } #ifndef NDEBUG @@ -2807,9 +2917,7 @@ CONSOLE_ConInKey(Ir); #endif - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - return INSTALL_DIRECTORY_PAGE; + return SELECT_FILE_SYSTEM_PAGE; } } @@ -2821,35 +2929,76 @@ CheckFileSystemPage(PINPUT_RECORD Ir) { PFILE_SYSTEM_ITEM CurrentFileSystem; + UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; CHAR Buffer[MAX_PATH]; + LPWSTR FileSystemName = NULL; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; NTSTATUS Status; - /* FIXME: code duplicated in FormatPartitionPage */ - /* Set DestinationRootPath */ - RtlFreeUnicodeString(&DestinationRootPath); + if (PartitionList == NULL) + { + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + + if (!GetNextUncheckedPartition(PartitionList, + &DiskEntry, + &PartEntry)) + { + return INSTALL_DIRECTORY_PAGE; + } + + /* Set PartitionRootPath */ swprintf(PathBuffer, L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->CurrentDisk->DiskNumber, - PartitionList->CurrentPartition->PartitionNumber); - RtlCreateUnicodeString(&DestinationRootPath, PathBuffer); - DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, PathBuffer); + DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - /* WRONG: first filesystem is not necesseraly the one of the current partition! */ - CurrentFileSystem = CONTAINING_RECORD(FileSystemList->ListHead.Flink, FILE_SYSTEM_ITEM, ListEntry); - - if (!CurrentFileSystem->ChkdskFunc) + CurrentFileSystem = PartEntry->FileSystem; + if (CurrentFileSystem->FileSystemName == NULL) + { + if ((PartEntry->PartitionType == PARTITION_FAT_12) || + (PartEntry->PartitionType == PARTITION_FAT_16) || + (PartEntry->PartitionType == PARTITION_HUGE) || + (PartEntry->PartitionType == PARTITION_XINT13)) + { + FileSystemName = L"FAT"; + } + else if ((PartEntry->PartitionType == PARTITION_FAT32) || + (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) + { + FileSystemName = L"FAT32"; + } + else if (PartEntry->PartitionType == PARTITION_EXT2) + { + FileSystemName = L"EXT2"; + } + else if (PartEntry->PartitionType == PARTITION_IFS) + { + FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ + } + + if (FileSystemName != NULL) + CurrentFileSystem = GetFileSystemByName(FileSystemList, + FileSystemName); + } + + if (CurrentFileSystem == NULL || CurrentFileSystem->ChkdskFunc == NULL) { sprintf(Buffer, "Setup is currently unable to check a partition formatted in %S.\n" "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - CurrentFileSystem->FileSystem); + CurrentFileSystem->FileSystemName); PopupError(Buffer, MUIGetString(STRING_QUITCONTINUE), @@ -2869,13 +3018,14 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == VK_RETURN) /* ENTER */ { - return INSTALL_DIRECTORY_PAGE; + PartEntry->NeedsCheck = FALSE; + return CHECK_FILE_SYSTEM_PAGE; } } } else { - Status = ChkdskPartition(&DestinationRootPath, CurrentFileSystem); + Status = ChkdskPartition(&PartitionRootPath, CurrentFileSystem); if (!NT_SUCCESS(Status)) { DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status); @@ -2889,7 +3039,8 @@ return QUIT_PAGE; } - return INSTALL_DIRECTORY_PAGE; + PartEntry->NeedsCheck = FALSE; + return CHECK_FILE_SYSTEM_PAGE; } } @@ -2905,6 +3056,15 @@ RtlFreeUnicodeString(&InstallPath); RtlCreateUnicodeString(&InstallPath, InstallDir); + + /* Create 'DestinationRootPath' string */ + RtlFreeUnicodeString(&DestinationRootPath); + swprintf(PathBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlCreateUnicodeString(&DestinationRootPath, PathBuffer); + DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); /* Create 'DestinationPath' string */ RtlFreeUnicodeString(&DestinationPath); @@ -2940,6 +3100,10 @@ PPARTENTRY PartEntry; WCHAR InstallDir[51]; ULONG Length; + + /* We do not need the filsystem list any more */ + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -3760,27 +3924,16 @@ CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - /* Find or set the active partition */ - CheckActiveBootPartition(PartitionList); - - /* Update the partition table because we may have changed the active partition */ - if (WritePartitionsToDisk(PartitionList) == FALSE) - { - DPRINT("WritePartitionsToDisk() failed\n"); - MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - RtlFreeUnicodeString(&SystemRootPath); swprintf(PathBuffer, L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->ActiveBootDisk->DiskNumber, - PartitionList->ActiveBootPartition->PartitionNumber); + PartitionList->BootDisk->DiskNumber, + PartitionList->BootPartition->PartitionNumber); RtlCreateUnicodeString(&SystemRootPath, PathBuffer); DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); - PartitionType = PartitionList->ActiveBootPartition->PartitionType; + PartitionType = PartitionList->BootPartition->PartitionType; if (IsUnattendedSetup) { @@ -3958,13 +4111,14 @@ return BOOT_LOADER_FLOPPY_PAGE; } + static PAGE_NUMBER BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) { UCHAR PartitionType; NTSTATUS Status; - PartitionType = PartitionList->ActiveBootPartition->PartitionType; + PartitionType = PartitionList->BootPartition->PartitionType; Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, @@ -3979,6 +4133,7 @@ return SUCCESS_PAGE; } + static PAGE_NUMBER BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) { @@ -3988,7 +4143,7 @@ WCHAR SourceMbrPathBuffer[MAX_PATH]; /* Step 1: Write the VBR */ - PartitionType = PartitionList->ActiveBootPartition->PartitionType; + PartitionType = PartitionList->BootPartition->PartitionType; Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, @@ -4003,7 +4158,7 @@ /* Step 2: Write the MBR */ swprintf(DestinationDevicePathBuffer, L"\\Device\\Harddisk%d\\Partition0", - PartitionList->ActiveBootDisk->DiskNumber); + PartitionList->BootDisk->DiskNumber); wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1669,6 +1669,10 @@ "à¥¤áâ®¨ ä®à¬ â¨à ¥ ¤ï« ."}, {STRING_NONFORMATTEDPART, "§¡à «¨ áâ¥ ¤ á«®¦¨â¥ ¥ ªâ ®¢ ¨«¨ ¥à §¯à¥¤¥«¥ ¤ï«."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "« £ ¥ ¥ ªâ ¢êàåã ¤ï«"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1653,6 +1653,10 @@ "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1662,6 +1662,10 @@ "Tento odd¡l bude zform tov n."}, {STRING_NONFORMATTEDPART, "Zvolili jste instalaci ReactOS na novì nebo nezform tovanì odd¡l."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Instalace nakop¡ruje ReactOS na odd¡l"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1658,6 +1658,10 @@ "Diese Partition wird als nchstes formatiert."}, {STRING_NONFORMATTEDPART, "Sie wollen ReactOS auf einer neuen/unformatierten Partition installieren."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "ReactOS wird auf dieser Partition installiert."}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1679,6 +1679,10 @@ "¬«æ «¦ Partition £¦¨àå £«á."}, {STRING_NONFORMATTEDPART, "§ ¢â¥« ¤ ¡«©«ã©« «¦ ReactOS © â¤ ¤â¦ ã £ £¦¨à£â¤¦ Partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup install ReactOS onto Partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1653,6 +1653,10 @@ "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1661,6 +1661,10 @@ "A continuaci¢n se formatear esta partici¢n."}, {STRING_NONFORMATTEDPART, "Ha elegido instalar ReactOS en una nueva partici¢n o en una partici¢n sin formato."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "El instalador est instalando ReactOS en la partici¢n"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1654,6 +1654,10 @@ "Jrgmisena vormindatakse seda partitsiooni."}, {STRING_NONFORMATTEDPART, "Oled valinud ReactOSi paigaldamise uuele väi vormindamata partitsioonile."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "ReactOS paigaldatakse partitsioonile"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1667,6 +1667,10 @@ "Cette Partition sera ensuite formate."}, {STRING_NONFORMATTEDPART, "Vous avez choisi d'installer ReactOS sur une nouvelle partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installe ReactOS sur la partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1655,6 +1655,10 @@ "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1658,6 +1658,10 @@ "Questa partizione sar formattata successivamente."}, {STRING_NONFORMATTEDPART, "Avete scelto di installare ReactOS su una partizione nuova o non formattata."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installer ReactOS sulla partitione"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1657,6 +1657,10 @@ "ºÉ Êß°Ã¨¼®ÝÊ Â·ÞÉ Ã¼ÞÝÃÞ Ì«°Ï¯Ä »ÚÏ½¡"}, {STRING_NONFORMATTEDPART, "ReactOS¦ ¼Ý· ÏÀÊ ÐÌ«°Ï¯ÄÉ Êß°Ã¨¼®ÝÆ ²Ý½Ä°Ù½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À¡"}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "¾¯Ä±¯ÌßÊ ReactOS¦ Êß°Ã¨¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1664,6 +1664,10 @@ "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1702,6 +1702,10 @@ "Deze partitie zal vervolgens geformatteerd worden."}, {STRING_NONFORMATTEDPART, "U wilt ReactOS installeren op een nieuwe of ongeformatteerde partitie."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installeert ReactOS op Partitie"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1664,6 +1664,10 @@ "Nast©puj¥ca partycja zostanie sformatowana."}, {STRING_NONFORMATTEDPART, "Mo¾esz zainstalowa ReactOS na nowej lub niesformatowanej partycji."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Instalator kopiuje pliki systemu na wybran¥ partycj©."}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1693,6 +1693,10 @@ "Esta partiÆo ser formatada logo em seguida."}, {STRING_NONFORMATTEDPART, "Voc solicitou instalar o ReactOS em uma partiÆo nova ou sem formato."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "O instalador instala o ReactOS na partiÆo"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1730,6 +1730,10 @@ "AceastÇ partiîie urmeazÇ sÇ fie formatatÇ."}, {STRING_NONFORMATTEDPART, "Alegeîi sÇ instalaîi ReactOS pe partiîie nouÇ sau neformatatÇ."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "ReactOS va fi instalat pe partiîia"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1655,6 +1655,10 @@ "â®â à §¤¥« ¡ã¤¥â ®âä®à¬ â¨à®¢ ¤ «¥¥."}, {STRING_NONFORMATTEDPART, "ë ¢ë¡à «¨ ãáâ ®¢ªã ReactOS ®¢ë© ¥®âä®à¬ â¨à®¢ ë© à §¤¥«."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "ReactOS ãáâ ¢«¨¢ ¥âáï à §¤¥«:"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1668,6 +1668,10 @@ "T to oblas sa bude form tova ako Ôalçia."}, {STRING_NONFORMATTEDPART, "Zvolili ste inçtal ciu systmu ReactOS na nov£ alebo nenaform tovan£ oblas."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Inçtal tor nainçtaluje systm ReactOS na oblas"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1660,6 +1660,10 @@ "Ky particion do t formatohet tani."}, {STRING_NONFORMATTEDPART, "Ju zgjodht ReactOS pr tu instaluar n nj particion t'ri t paformatuar."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Instalimi i ReactOS ne Particion"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1663,6 +1663,10 @@ "Denna Partition kommer att bli formaterad hrnst."}, {STRING_NONFORMATTEDPART, "Du valde att installera ReactOS p en oformaterad partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installerar ReactOS till Partitionen"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1641,6 +1641,10 @@ "Bu blm ileride biimlendirilecektir."}, {STRING_NONFORMATTEDPART, "ReactOS'u yeni ya da biimlendirilmemi bir blme kurmay setiniz."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Kur, ReactOS'u blm zerine kurar."}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1663,6 +1663,10 @@ "¥© à®§¤i« ¡ã¤¥ ¢i¤ä®à¬ â®¢ ®."}, {STRING_NONFORMATTEDPART, "¨ ¢¨¡à «¨ ¢áâ ®¢«¥ï ReactOS ®¢¨© ¡® ¥ä®à¬ â®¢ ¨© à®§¤i«."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "ReactOS ¢áâ ®¢«îóâìáï à®§¤i«"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -111,6 +111,8 @@ #define STRING_CREATEPARTITION 7 #define STRING_PARTFORMAT 8 #define STRING_NONFORMATTEDPART 9 +#define STRING_NONFORMATTEDSYSTEMPART 62 +#define STRING_NONFORMATTEDOTHERPART 63 #define STRING_INSTALLONPART 10 #define STRING_CHECKINGPART 11 #define STRING_QUITCONTINUE 12 Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -31,7 +31,7 @@ #define NDEBUG #include <debug.h> -#define DUMP_PARTITION_TABLE +//#define DUMP_PARTITION_TABLE /* FUNCTIONS ****************************************************************/ @@ -47,7 +47,7 @@ for (i = 0; i < DiskEntry->LayoutBuffer->PartitionCount; i++) { PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[i]; - DPRINT("\n%lu: %12I64u %12I64u %10lu %2lu %2x %c %c\n", + DPRINT1("\n%lu: %12I64u %12I64u %10lu %2lu %2x %c %c\n", i, PartitionInfo->StartingOffset.QuadPart, PartitionInfo->PartitionLength.QuadPart, @@ -1273,6 +1273,13 @@ List->CurrentDisk = NULL; List->CurrentPartition = NULL; + + List->BootDisk = NULL; + List->BootPartition = NULL; + + List->TempDisk = NULL; + List->TempPartition = NULL; + List->FormatState = Start; InitializeListHead(&List->DiskListHead); InitializeListHead(&List->BiosDiskListHead); @@ -2739,14 +2746,14 @@ /* Check for empty disk list */ if (IsListEmpty (&List->DiskListHead)) { - List->ActiveBootDisk = NULL; - List->ActiveBootPartition = NULL; + List->BootDisk = NULL; + List->BootPartition = NULL; return; } #if 0 - if (List->ActiveBootDisk != NULL && - List->ActiveBootPartition != NULL) + if (List->BootDisk != NULL && + List->BootPartition != NULL) { /* We already have an active boot partition */ return; @@ -2759,8 +2766,8 @@ /* Check for empty partition list */ if (IsListEmpty (&DiskEntry->PrimaryPartListHead)) { - List->ActiveBootDisk = NULL; - List->ActiveBootPartition = NULL; + List->BootDisk = NULL; + List->BootPartition = NULL; return; } @@ -2778,15 +2785,15 @@ DiskEntry->Dirty = TRUE; /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ - List->ActiveBootDisk = DiskEntry; - List->ActiveBootPartition = PartEntry; + List->BootDisk = DiskEntry; + List->BootPartition = PartEntry; return; } /* Disk is not new, scan all partitions to find a bootable one */ - List->ActiveBootDisk = NULL; - List->ActiveBootPartition = NULL; + List->BootDisk = NULL; + List->BootPartition = NULL; ListEntry = DiskEntry->PrimaryPartListHead.Flink; while (ListEntry != &DiskEntry->PrimaryPartListHead) @@ -2802,8 +2809,8 @@ PartEntry->BootIndicator) { /* Yes, we found it */ - List->ActiveBootDisk = DiskEntry; - List->ActiveBootPartition = PartEntry; + List->BootDisk = DiskEntry; + List->BootPartition = PartEntry; DPRINT("Found bootable partition disk %d, drive letter %c\n", DiskEntry->DiskNumber, PartEntry->DriveLetter); @@ -3104,4 +3111,114 @@ return ERROR_SUCCESS; } + +BOOL +GetNextUnformattedPartition( + IN PPARTLIST List, + OUT PDISKENTRY *pDiskEntry, + OUT PPARTENTRY *pPartEntry) +{ + PLIST_ENTRY Entry1, Entry2; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + + Entry1 = List->DiskListHead.Flink; + while (Entry1 != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry1, + DISKENTRY, + ListEntry); + + Entry2 = DiskEntry->PrimaryPartListHead.Flink; + while (Entry2 != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned && PartEntry->New) + { + *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; + } + + Entry2 = Entry2->Flink; + } + + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned && PartEntry->New) + { + *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; + } + + Entry2 = Entry2->Flink; + } + + Entry1 = Entry1->Flink; + } + + *pDiskEntry = NULL; + *pPartEntry = NULL; + + return FALSE; +} + + +BOOL +GetNextUncheckedPartition( + IN PPARTLIST List, + OUT PDISKENTRY *pDiskEntry, + OUT PPARTENTRY *pPartEntry) +{ + PLIST_ENTRY Entry1, Entry2; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + + Entry1 = List->DiskListHead.Flink; + while (Entry1 != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry1, + DISKENTRY, + ListEntry); + + Entry2 = DiskEntry->PrimaryPartListHead.Flink; + while (Entry2 != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry->NeedsCheck == TRUE) + { + *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; + } + + Entry2 = Entry2->Flink; + } + + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry->NeedsCheck == TRUE) + { + *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; + } + + Entry2 = Entry2->Flink; + } + + Entry1 = Entry1->Flink; + } + + *pDiskEntry = NULL; + *pPartEntry = NULL; + + return FALSE; +} + /* EOF */ Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -37,6 +37,18 @@ Formatted } FORMATSTATE, *PFORMATSTATE; +typedef enum _FORMATMACHINESTATE +{ + Start, + FormatSystemPartition, + FormatInstallPartition, + FormatOtherPartition, + FormatDone, + CheckSystemPartition, + CheckInstallPartition, + CheckOtherPartition, + CheckDone +} FORMATMACHINESTATE, *PFORMATMACHINESTATE; typedef struct _PARTENTRY { @@ -70,6 +82,10 @@ FORMATSTATE FormatState; + /* Partition must be checked */ + BOOLEAN NeedsCheck; + + struct _FILE_SYSTEM_ITEM *FileSystem; } PARTENTRY, *PPARTENTRY; @@ -141,8 +157,12 @@ PDISKENTRY CurrentDisk; PPARTENTRY CurrentPartition; - PDISKENTRY ActiveBootDisk; - PPARTENTRY ActiveBootPartition; + PDISKENTRY BootDisk; + PPARTENTRY BootPartition; + + PDISKENTRY TempDisk; + PPARTENTRY TempPartition; + FORMATMACHINESTATE FormatState; LIST_ENTRY DiskListHead; LIST_ENTRY BiosDiskListHead; @@ -263,4 +283,16 @@ LogicalPartitionCreationChecks( IN PPARTLIST List); +BOOL +GetNextUnformattedPartition( + IN PPARTLIST List, + OUT PDISKENTRY *pDiskEntry, + OUT PPARTENTRY *pPartEntry); + +BOOL +GetNextUncheckedPartition( + IN PPARTLIST List, + OUT PDISKENTRY *pDiskEntry, + OUT PPARTENTRY *pPartEntry); + /* EOF */

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