Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [WIN32SS][USER32] Fix SwitchToThisWindow (#929)
by Katayama Hirofumi MZ 24 Oct '18

24 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62da6246899e58582e554… commit 62da6246899e58582e55432e8039e6da5334d368 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 20:02:27 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 20:02:27 2018 +0900 [WIN32SS][USER32] Fix SwitchToThisWindow (#929) I'm not sure but it seems like no one can investigate it. I commit it. --- win32ss/user/user32/windows/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 227ab9cb33..048673ff10 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -85,13 +85,13 @@ SwitchToThisWindow(HWND hwnd, BOOL fAltTab) if (fAltTab) { if (IsIconic(hwnd)) - ShowWindowAsync(hwnd, SW_RESTORE); + PostMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); SetForegroundWindow(hwnd); } else { hwndFG = GetForegroundWindow(); - ShowWindow(hwnd, SW_RESTORE | SW_SHOWNA); + PostMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); SetWindowPos(hwnd, hwndFG, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); SetWindowPos(hwndFG, hwnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); }

1 0

01/01: [FONT][WIN32SS] Improve readability of IntGdiGetFontResourceInfo (#945)
by Katayama Hirofumi MZ 24 Oct '18

24 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2410bcb133e3651da775a… commit 2410bcb133e3651da775a699850efc84d4be2835 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 19:58:03 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 19:58:03 2018 +0900 [FONT][WIN32SS] Improve readability of IntGdiGetFontResourceInfo (#945) Make it human friendly code. --- win32ss/gdi/ntgdi/freetype.c | 59 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 10fb8655d7..aca18ccd6c 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5063,7 +5063,7 @@ IntGdiGetFontResourceInfo( DWORD dwType) { UNICODE_STRING EntryFileName; - POBJECT_NAME_INFORMATION NameInfo1, NameInfo2; + POBJECT_NAME_INFORMATION NameInfo1 = NULL, NameInfo2 = NULL; PLIST_ENTRY ListEntry; PFONT_ENTRY FontEntry; ULONG Size, i, Count; @@ -5071,47 +5071,46 @@ IntGdiGetFontResourceInfo( BOOL IsEqual; FONTFAMILYINFO *FamInfo; const ULONG MaxFamInfo = 64; + const ULONG MAX_FAM_INFO_BYTES = sizeof(FONTFAMILYINFO) * MaxFamInfo; BOOL bSuccess; + const ULONG NAMEINFO_SIZE = sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR); DPRINT("IntGdiGetFontResourceInfo: dwType == %lu\n", dwType); - /* Create buffer for full path name */ - Size = sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR); - NameInfo1 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF); - if (!NameInfo1) + do { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } + /* Create buffer for full path name */ + NameInfo1 = ExAllocatePoolWithTag(PagedPool, NAMEINFO_SIZE, TAG_FINF); + if (!NameInfo1) + break; - /* Get the full path name */ - if (!IntGetFullFileName(NameInfo1, Size, FileName)) - { - ExFreePoolWithTag(NameInfo1, TAG_FINF); - return FALSE; - } + /* Get the full path name */ + if (!IntGetFullFileName(NameInfo1, NAMEINFO_SIZE, FileName)) + break; - /* Create a buffer for the entries' names */ - NameInfo2 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF); - if (!NameInfo2) - { - ExFreePoolWithTag(NameInfo1, TAG_FINF); - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } + /* Create a buffer for the entries' names */ + NameInfo2 = ExAllocatePoolWithTag(PagedPool, NAMEINFO_SIZE, TAG_FINF); + if (!NameInfo2) + break; - FamInfo = ExAllocatePoolWithTag(PagedPool, - sizeof(FONTFAMILYINFO) * MaxFamInfo, - TAG_FINF); - if (!FamInfo) + FamInfo = ExAllocatePoolWithTag(PagedPool, MAX_FAM_INFO_BYTES, TAG_FINF); + } while (0); + + if (!NameInfo1 || !NameInfo2 || !FamInfo) { - ExFreePoolWithTag(NameInfo2, TAG_FINF); - ExFreePoolWithTag(NameInfo1, TAG_FINF); + if (NameInfo2) + ExFreePoolWithTag(NameInfo2, TAG_FINF); + + if (NameInfo1) + ExFreePoolWithTag(NameInfo1, TAG_FINF); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - /* Try to find the pathname in the global font list */ + Count = 0; + + /* Try to find the pathname in the global font list */ IntLockGlobalFonts(); for (ListEntry = g_FontListHead.Flink; ListEntry != &g_FontListHead; ListEntry = ListEntry->Flink) @@ -5121,7 +5120,7 @@ IntGdiGetFontResourceInfo( continue; RtlInitUnicodeString(&EntryFileName , FontEntry->Font->Filename); - if (!IntGetFullFileName(NameInfo2, Size, &EntryFileName)) + if (!IntGetFullFileName(NameInfo2, NAMEINFO_SIZE, &EntryFileName)) continue; if (!RtlEqualUnicodeString(&NameInfo1->Name, &NameInfo2->Name, FALSE))

1 0

01/01: [WIN32SS][MENU] Fix menu text Y positioning (#887)
by Katayama Hirofumi MZ 24 Oct '18

24 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3545475f91e666dc0dd6f… commit 3545475f91e666dc0dd6f79430ffb216c2417175 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 19:54:41 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 19:54:41 2018 +0900 [WIN32SS][MENU] Fix menu text Y positioning (#887) Fix the vertical position of menu bar text. CORE-15094 --- win32ss/user/ntuser/menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 48d9dcc169..f4159030cc 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2099,7 +2099,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, PMENU lppop, PWND pwnd //TRACE("lprect %p %s\n", lprect, wine_dbgstr_rect( lprect)); lppop->cxMenu = lprect->right - lprect->left; lppop->cyMenu = 0; - maxY = lprect->top+1; + maxY = lprect->top; start = 0; helpPos = ~0U; lppop->cxTextAlign = 0; @@ -2140,7 +2140,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, PMENU lppop, PWND pwnd start = i; /* This works! */ } - lprect->bottom = maxY; + lprect->bottom = maxY + 1; lppop->cyMenu = lprect->bottom - lprect->top; /* Flush right all items between the MF_RIGHTJUSTIFY and */

1 0

01/01: [SHIMGVW] Play gif animation (#934)
by Katayama Hirofumi MZ 24 Oct '18

24 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=375a78e70680718d4525b… commit 375a78e70680718d4525b89d1ec061844b3f10e0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 19:51:30 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 19:51:30 2018 +0900 [SHIMGVW] Play gif animation (#934) Make "Picture and Fax Viewer" able to play GIF animation. CORE-12680 --- dll/win32/shimgvw/shimgvw.c | 180 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 177 insertions(+), 3 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 8339b66b16..683e9b3c7e 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -9,6 +9,7 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define INITGUID #include <stdarg.h> @@ -31,7 +32,6 @@ #include "shimgvw.h" - HINSTANCE hInstance; SHIMGVW_SETTINGS shiSettings; SHIMGVW_FILENODE *currentFile; @@ -49,6 +49,137 @@ static const UINT ZoomSteps[] = 10, 25, 50, 100, 200, 400, 800, 1600 }; +/* animation */ +UINT m_nFrameIndex = 0; +UINT m_nFrameCount = 0; +UINT m_nLoopIndex = 0; +UINT m_nLoopCount = (UINT)-1; +PropertyItem *m_pDelayItem = NULL; + +#define ANIME_TIMER_ID 9999 + +static void Anime_FreeInfo(void) +{ + if (m_pDelayItem) + { + free(m_pDelayItem); + m_pDelayItem = NULL; + } + m_nFrameIndex = 0; + m_nFrameCount = 0; + m_nLoopIndex = 0; + m_nLoopCount = (UINT)-1; +} + +static BOOL Anime_LoadInfo(void) +{ + GUID *dims; + UINT nDimCount = 0; + UINT cbItem; + UINT result; + PropertyItem *pItem; + + Anime_FreeInfo(); + KillTimer(hDispWnd, ANIME_TIMER_ID); + + if (!image) + return FALSE; + + GdipImageGetFrameDimensionsCount(image, &nDimCount); + if (nDimCount) + { + dims = (GUID *)calloc(nDimCount, sizeof(GUID)); + if (dims) + { + GdipImageGetFrameDimensionsList(image, dims, nDimCount); + GdipImageGetFrameCount(image, dims, &result); + m_nFrameCount = result; + free(dims); + } + } + + result = 0; + GdipGetPropertyItemSize(image, PropertyTagFrameDelay, &result); + cbItem = result; + if (cbItem) + { + m_pDelayItem = (PropertyItem *)malloc(cbItem); + GdipGetPropertyItem(image, PropertyTagFrameDelay, cbItem, m_pDelayItem); + } + + result = 0; + GdipGetPropertyItemSize(image, PropertyTagLoopCount, &result); + cbItem = result; + if (cbItem) + { + pItem = (PropertyItem *)malloc(cbItem); + if (pItem) + { + if (GdipGetPropertyItem(image, PropertyTagLoopCount, cbItem, pItem) == Ok) + { + m_nLoopCount = *(WORD *)pItem->value; + } + free(pItem); + } + } + + if (m_pDelayItem) + { + SetTimer(hDispWnd, ANIME_TIMER_ID, 0, NULL); + } + + return m_pDelayItem != NULL; +} + +static void Anime_SetFrameIndex(UINT nFrameIndex) +{ + if (nFrameIndex < m_nFrameCount) + { + GUID guid = FrameDimensionTime; + if (Ok != GdipImageSelectActiveFrame(image, &guid, nFrameIndex)) + { + guid = FrameDimensionPage; + GdipImageSelectActiveFrame(image, &guid, nFrameIndex); + } + } + m_nFrameIndex = nFrameIndex; +} + +DWORD Anime_GetFrameDelay(UINT nFrameIndex) +{ + if (nFrameIndex < m_nFrameCount && m_pDelayItem) + { + return ((DWORD *)m_pDelayItem->value)[m_nFrameIndex] * 10; + } + return 0; +} + +BOOL Anime_Step(DWORD *pdwDelay) +{ + *pdwDelay = INFINITE; + if (m_nLoopCount == (UINT)-1) + return FALSE; + + if (m_nFrameIndex + 1 < m_nFrameCount) + { + *pdwDelay = Anime_GetFrameDelay(m_nFrameIndex); + Anime_SetFrameIndex(m_nFrameIndex); + ++m_nFrameIndex; + return TRUE; + } + + if (m_nLoopCount == 0 || m_nLoopIndex < m_nLoopCount) + { + *pdwDelay = Anime_GetFrameDelay(m_nFrameIndex); + Anime_SetFrameIndex(m_nFrameIndex); + m_nFrameIndex = 0; + ++m_nLoopIndex; + return TRUE; + } + + return FALSE; +} + static void ZoomInOrOut(BOOL bZoomIn) { INT i; @@ -171,6 +302,7 @@ static void pLoadImage(LPWSTR szOpenFileName) DPRINT1("GdipLoadImageFromFile() failed\n"); return; } + Anime_LoadInfo(); /* reset zoom */ ResetZoom(); @@ -257,9 +389,26 @@ static void pSaveImageAs(HWND hwnd) if (GetSaveFileNameW(&sfn)) { - if (GdipSaveImageToFile(image, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) + if (m_pDelayItem) + { + /* save animation */ + KillTimer(hDispWnd, ANIME_TIMER_ID); + + DPRINT1("FIXME: save animation\n"); + if (GdipSaveImageToFile(image, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) + { + DPRINT1("GdipSaveImageToFile() failed\n"); + } + + SetTimer(hDispWnd, ANIME_TIMER_ID, 0, NULL); + } + else { - DPRINT1("GdipSaveImageToFile() failed\n"); + /* save non-animation */ + if (GdipSaveImageToFile(image, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) + { + DPRINT1("GdipSaveImageToFile() failed\n"); + } } } @@ -595,6 +744,19 @@ ImageView_CreateToolBar(HWND hwnd) return FALSE; } +static void ImageView_OnTimer(HWND hwnd) +{ + DWORD dwDelay; + + KillTimer(hwnd, ANIME_TIMER_ID); + InvalidateRect(hwnd, NULL, TRUE); + + if (Anime_Step(&dwDelay)) + { + SetTimer(hwnd, ANIME_TIMER_ID, dwDelay, NULL); + } +} + LRESULT CALLBACK ImageView_DispWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { @@ -605,6 +767,15 @@ ImageView_DispWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) ImageView_DrawImage(hwnd); return 0L; } + case WM_TIMER: + { + if (wParam == ANIME_TIMER_ID) + { + ImageView_OnTimer(hwnd); + return 0; + } + break; + } } return CallWindowProc(PrevProc, hwnd, Message, wParam, lParam); } @@ -874,6 +1045,9 @@ ImageView_CreateWindow(HWND hwnd, LPWSTR szFileName) if (image) GdipDisposeImage(image); + + Anime_FreeInfo(); + GdiplusShutdown(gdiplusToken); return -1; }

1 0

01/01: [REGEDIT] Improve the layout of controls (#967)
by Katayama Hirofumi MZ 24 Oct '18

24 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=efbebf983cc1708eca691… commit efbebf983cc1708eca69194fa6461d6d54622707 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 18:19:48 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 18:19:48 2018 +0900 [REGEDIT] Improve the layout of controls (#967) The horizontal scroll bar of the listview was wrongly hidden. CORE-15187 --- base/applications/regedit/childwnd.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index b1fb9fd0c5..e6511fc03f 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -42,7 +42,9 @@ extern void ResizeWnd(int cx, int cy) { HDWP hdwp = BeginDeferWindowPos(4); RECT rt, rs, rb; - const int tHeight = 22; + const int nButtonWidth = 44; + const int nButtonHeight = 22; + int cyEdge = GetSystemMetrics(SM_CYEDGE); const UINT uFlags = SWP_NOZORDER | SWP_NOACTIVATE; SetRect(&rt, 0, 0, cx, cy); cy = 0; @@ -56,22 +58,26 @@ extern void ResizeWnd(int cx, int cy) if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, NULL, rt.left, rt.top, - rt.right - rt.left - 2*tHeight, tHeight, + rt.right - rt.left - nButtonWidth, nButtonHeight, uFlags); if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, NULL, - rt.right - 2*tHeight, rt.top, - 2*tHeight, tHeight, + rt.right - nButtonWidth, rt.top, + nButtonWidth, nButtonHeight, uFlags); if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, NULL, - rt.left, rt.top + tHeight + 2, - g_pChildWnd->nSplitPos - SPLIT_WIDTH/2 - rt.left, rt.bottom - rt.top - cy, + rt.left, + rt.top + nButtonHeight + cyEdge, + g_pChildWnd->nSplitPos - SPLIT_WIDTH/2 - rt.left, + rt.bottom - rt.top - cy - 2 * cyEdge, uFlags); if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hListWnd, NULL, - rt.left + cx, rt.top + tHeight + 2, - rt.right - cx, rt.bottom - rt.top - cy, + rt.left + cx, + rt.top + nButtonHeight + cyEdge, + rt.right - cx, + rt.bottom - rt.top - cy - 2 * cyEdge, uFlags); if (hdwp) EndDeferWindowPos(hdwp);

1 0

01/01: [REGEDIT] Don't paint background in WM_PAINT (#970)
by Katayama Hirofumi MZ 24 Oct '18

24 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4c2cff6c8ba1bb6a61e8… commit e4c2cff6c8ba1bb6a61e89e0dd3527e255c81eb3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 18:17:28 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 18:17:28 2018 +0900 [REGEDIT] Don't paint background in WM_PAINT (#970) Use the background brush or WM_ERASEBKGND message instead. There was graphical glidge. CORE-15187 --- base/applications/regedit/childwnd.c | 15 --------------- base/applications/regedit/main.c | 1 + 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index 3afe53a740..b1fb9fd0c5 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -105,17 +105,6 @@ static void draw_splitbar(HWND hWnd, int x) ReleaseDC(hWnd, hdc); } -static void OnPaint(HWND hWnd) -{ - PAINTSTRUCT ps; - RECT rt; - - GetClientRect(hWnd, &rt); - BeginPaint(hWnd, &ps); - FillRect(ps.hdc, &rt, GetSysColorBrush(COLOR_BTNFACE)); - EndPaint(hWnd, &ps); -} - /******************************************************************************* * finish_splitbar [internal] * @@ -384,7 +373,6 @@ UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath) * PURPOSE: Processes messages for the child windows. * * WM_COMMAND - process the application menu - * WM_PAINT - Paint the main window * WM_DESTROY - post a quit message and return * */ @@ -449,9 +437,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa goto def; } break; - case WM_PAINT: - OnPaint(hWnd); - return 0; case WM_SETCURSOR: if (LOWORD(lParam) == HTCLIENT) { diff --git a/base/applications/regedit/main.c b/base/applications/regedit/main.c index e8cdc02561..fc187689ec 100644 --- a/base/applications/regedit/main.c +++ b/base/applications/regedit/main.c @@ -71,6 +71,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); wcFrame.hCursor = LoadCursorW(NULL, IDC_ARROW); + wcFrame.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); wcFrame.lpszClassName = szFrameClass; hFrameWndClass = RegisterClassExW(&wcFrame); /* register frame window class */

1 0

02/02: [USETUP] Reshuffle a bit the main-function of USetup.
by Hermès Bélusca-Maïto 23 Oct '18

23 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dffe964a3f7b5af7e627… commit 3dffe964a3f7b5af7e6277707ae97d78c8d755f2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 9 16:37:53 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:55:16 2018 +0200 [USETUP] Reshuffle a bit the main-function of USetup. svn path=/branches/setup_improvements/; revision=74975 --- base/setup/usetup/usetup.c | 57 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index d83be76f24..9170b23225 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4855,16 +4855,22 @@ PnpEventThread(IN LPVOID lpParameter); /* * The start routine and page management */ -VOID +NTSTATUS RunUSetup(VOID) { + NTSTATUS Status; INPUT_RECORD Ir; PAGE_NUMBER Page; - LARGE_INTEGER Time; - NTSTATUS Status; BOOLEAN Old; - NtQuerySystemTime(&Time); + InfSetHeap(ProcessHeap); + +#if 0 + /* Tell the Cm this is a setup boot, and it has to behave accordingly */ + Status = NtInitializeRegistry(CM_BOOT_FLAG_SETUP); + if (!NT_SUCCESS(Status)) + DPRINT1("NtInitializeRegistry() failed (Status 0x%08lx)\n", Status); +#endif /* Create the PnP thread in suspended state */ Status = RtlCreateUserThread(NtCurrentProcess(), @@ -4886,9 +4892,8 @@ RunUSetup(VOID) PrintString(MUIGetString(STRING_CONSOLEFAIL2)); PrintString(MUIGetString(STRING_CONSOLEFAIL3)); - /* Raise a hard error (crash the system/BSOD) */ - NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, - 0,0,0,0,0); + /* We failed to initialize the video, just quit the installer */ + return STATUS_APP_INIT_FAILURE; } /* Initialize global unicode strings */ @@ -5065,26 +5070,50 @@ RunUSetup(VOID) FreeConsole(); - /* Avoid bugcheck */ - Time.QuadPart += 50000000; - NtDelayExecution(FALSE, &Time); - /* Reboot */ RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); NtShutdownSystem(ShutdownReboot); RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, Old, FALSE, &Old); - NtTerminateProcess(NtCurrentProcess(), 0); + + return STATUS_SUCCESS; } VOID NTAPI NtProcessStartup(PPEB Peb) { + NTSTATUS Status; + LARGE_INTEGER Time; + RtlNormalizeProcessParams(Peb->ProcessParameters); ProcessHeap = Peb->ProcessHeap; - InfSetHeap(ProcessHeap); - RunUSetup(); + + NtQuerySystemTime(&Time); + + Status = RunUSetup(); + + if (NT_SUCCESS(Status)) + { + /* + * Avoid a bugcheck if RunUSetup() finishes too quickly by implementing + * a protective waiting. + * This wait is needed because, since we are started as SMSS.EXE, + * the NT kernel explicitly waits 5 seconds for the initial process + * SMSS.EXE to initialize (as a protective measure), and otherwise + * bugchecks with the code SESSION5_INITIALIZATION_FAILED. + */ + Time.QuadPart += 50000000; + NtDelayExecution(FALSE, &Time); + } + else + { + /* The installer failed to start: raise a hard error (crash the system/BSOD) */ + Status = NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, + 0, 0, NULL, 0, NULL); + } + + NtTerminateProcess(NtCurrentProcess(), Status); } /* EOF */

1 0

01/02: [USETUP] The 'DestinationDriveLetter' variable (that is just used for SetDefaultPagefile()...) just needs to be initialized at one place only.
by Hermès Bélusca-Maïto 23 Oct '18

23 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fd27d34a51d4086d509d… commit 3fd27d34a51d4086d509d5bffd6d7db29dc4001e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 8 02:01:56 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:55:13 2018 +0200 [USETUP] The 'DestinationDriveLetter' variable (that is just used for SetDefaultPagefile()...) just needs to be initialized at one place only. svn path=/branches/setup_improvements/; revision=74951 --- base/setup/usetup/usetup.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 410e25753a..d83be76f24 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -93,7 +93,8 @@ static UNICODE_STRING DestinationPath; static UNICODE_STRING DestinationArcPath; static UNICODE_STRING DestinationRootPath; -static WCHAR DestinationDriveLetter; // FIXME: Is it really useful?? +// FIXME: Is it really useful?? Just used for SetDefaultPagefile... +static WCHAR DestinationDriveLetter; static HINF SetupInf; @@ -1527,7 +1528,6 @@ IsDiskSizeValid(PPARTENTRY PartEntry) * QuitPage * * SIDEEFFECTS - * Init DestinationDriveLetter (only if unattended or not free space is selected) * Set InstallShortcut (only if not unattended + free space is selected) * * RETURNS @@ -1594,8 +1594,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; } } @@ -1611,8 +1609,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; } } @@ -1707,8 +1703,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */ @@ -3254,6 +3248,9 @@ BuildInstallPaths(PWSTR InstallDir, PartEntry->PartitionNumber); ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallDir); RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); + + /* Initialize DestinationDriveLetter */ + DestinationDriveLetter = (WCHAR)PartEntry->DriveLetter; }

1 0

04/04: [USETUP] Whitespace fixes only.
by Hermès Bélusca-Maïto 23 Oct '18

23 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b714cbe6a1ed5126b40e… commit 0b714cbe6a1ed5126b40ef1701f028729e6d82de Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue May 23 21:01:10 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:35:54 2018 +0200 [USETUP] Whitespace fixes only. svn path=/branches/setup_improvements/; revision=74636 svn path=/branches/setup_improvements/; revision=74639 --- base/setup/usetup/cabinet.c | 4 +- base/setup/usetup/consup.c | 10 ++--- base/setup/usetup/lang/it-IT.h | 84 +++++++++++++++++++++--------------------- base/setup/usetup/lang/nl-NL.h | 4 +- base/setup/usetup/lang/pt-BR.h | 2 +- base/setup/usetup/lang/sq-AL.h | 2 +- base/setup/usetup/lang/sv-SE.h | 2 +- base/setup/usetup/lang/tr-TR.h | 2 +- base/setup/usetup/lang/uk-UA.h | 2 +- 9 files changed, 56 insertions(+), 56 deletions(-) diff --git a/base/setup/usetup/cabinet.c b/base/setup/usetup/cabinet.c index 8cc35aa796..f6bc22b485 100644 --- a/base/setup/usetup/cabinet.c +++ b/base/setup/usetup/cabinet.c @@ -765,7 +765,7 @@ CabinetFindNext(PCAB_SEARCH Search) Search->CFData = NULL; Search->Offset = 0; } - + /* don't match the file we started with */ if (wcscmp(Search->Search, L"*") == 0) { @@ -1033,7 +1033,7 @@ CabinetExtractFile(PCAB_SEARCH Search) CurrentOffset += CFData->UncompSize; CFData = (PCFDATA)((char *)(CFData + 1) + DataReserved + CFData->CompSize); } - + Search->CFData = CFData; Search->Offset = CurrentOffset; diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index 4103c0a0f9..3c4bf3d011 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -685,11 +685,11 @@ CONSOLE_SetStyledText( if (Flags & TEXT_ALIGN_CENTER) { - coPos.X = (xScreen - Length) /2; + coPos.X = (xScreen - Length) /2; } else if(Flags & TEXT_ALIGN_RIGHT) { - coPos.X = coPos.X - Length; + coPos.X = coPos.X - Length; if (Flags & TEXT_PADDING_SMALL) { @@ -697,7 +697,7 @@ CONSOLE_SetStyledText( } else if (Flags & TEXT_PADDING_MEDIUM) { - coPos.X -= 2; + coPos.X -= 2; } else if (Flags & TEXT_PADDING_BIG) { @@ -712,8 +712,8 @@ CONSOLE_SetStyledText( } else if (Flags & TEXT_PADDING_MEDIUM) { - coPos.X += 2; - } + coPos.X += 2; + } else if (Flags & TEXT_PADDING_BIG) { coPos.X += 3; diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index f4e00ed7d6..e7da50725e 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -56,7 +56,7 @@ static MUI_ENTRY itITLanguagePageEntries[] = static MUI_ENTRY itITWelcomePageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -92,7 +92,7 @@ static MUI_ENTRY itITWelcomePageEntries[] = TEXT_STYLE_NORMAL }, { - 8, + 8, 19, "\x07 Premere L per vedere i termini e condizioni della licenza.", TEXT_STYLE_NORMAL @@ -104,14 +104,14 @@ static MUI_ENTRY itITWelcomePageEntries[] = TEXT_STYLE_NORMAL }, { - 6, + 6, 23, "Per maggiori informazioni riguardo ReactOS, visitate il sito:", TEXT_STYLE_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_STYLE_HIGHLIGHT }, @@ -188,7 +188,7 @@ static MUI_ENTRY itITIntroPageEntries[] = { 0, 0, - "ENTER = Continua F3 = Termina", + "INVIO = Continua F3 = Termina", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -202,7 +202,7 @@ static MUI_ENTRY itITIntroPageEntries[] = static MUI_ENTRY itITLicensePageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -279,43 +279,43 @@ static MUI_ENTRY itITLicensePageEntries[] = "della licenza GNU GPL con ReactOS, visiti il sito:", TEXT_STYLE_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_STYLE_HIGHLIGHT }, - { + { 8, 22, "Garanzia:", TEXT_STYLE_HIGHLIGHT }, - { + { 8, 24, "Questo software \x8A libero; vedere il codice per le condizioni di copia.", TEXT_STYLE_NORMAL }, - { + { 8, 25, "NON esiste garanzia; n\x8A di COMMERCIABILIT\x85", TEXT_STYLE_NORMAL }, - { + { 8, 26, "o adeguatezza ad un uso particolare", TEXT_STYLE_NORMAL }, - { + { 0, 0, " INVIO = Ritorna", TEXT_TYPE_STATUS }, - { + { 0, 0, NULL, @@ -326,13 +326,13 @@ static MUI_ENTRY itITLicensePageEntries[] = static MUI_ENTRY itITDevicePageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { - 6, + 6, 8, "L'elenco che segue mostra le impostazioni correnti delle periferiche.", TEXT_STYLE_NORMAL @@ -368,7 +368,7 @@ static MUI_ENTRY itITDevicePageEntries[] = TEXT_STYLE_NORMAL }, { - 25, + 25, 16, "Accettare queste impostazioni", TEXT_STYLE_NORMAL }, @@ -379,25 +379,25 @@ static MUI_ENTRY itITDevicePageEntries[] = TEXT_STYLE_NORMAL }, { - 6, - 20, + 6, + 20, "e modificarlo premendo INVIO per selezionare un valore alternativo.", TEXT_STYLE_NORMAL }, { - 6, + 6, 21, " ", TEXT_STYLE_NORMAL }, { - 6, - 23, + 6, + 23, "Quando le impostazioni saranno corrette, selezionare", TEXT_STYLE_NORMAL }, { - 6, + 6, 24, "\"Accettare queste impostazioni\" e premere INVIO.", TEXT_STYLE_NORMAL @@ -419,7 +419,7 @@ static MUI_ENTRY itITDevicePageEntries[] = static MUI_ENTRY itITRepairPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -483,7 +483,7 @@ static MUI_ENTRY itITRepairPageEntries[] = static MUI_ENTRY itITComputerPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -499,7 +499,7 @@ static MUI_ENTRY itITComputerPageEntries[] = 10, "\x07 Premere i tasti SU e GI\xEB per scegliere il tipo.", TEXT_STYLE_NORMAL - }, + }, { 8, 11, @@ -535,7 +535,7 @@ static MUI_ENTRY itITComputerPageEntries[] = static MUI_ENTRY itITFlushPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -575,7 +575,7 @@ static MUI_ENTRY itITFlushPageEntries[] = static MUI_ENTRY itITQuitPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -621,7 +621,7 @@ static MUI_ENTRY itITQuitPageEntries[] = static MUI_ENTRY itITDisplayPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -672,7 +672,7 @@ static MUI_ENTRY itITDisplayPageEntries[] = static MUI_ENTRY itITSuccessPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -718,7 +718,7 @@ static MUI_ENTRY itITSuccessPageEntries[] = static MUI_ENTRY itITBootPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -765,7 +765,7 @@ static MUI_ENTRY itITBootPageEntries[] = static MUI_ENTRY itITSelectPartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -835,7 +835,7 @@ static MUI_ENTRY itITSelectPartitionEntries[] = static MUI_ENTRY itITConfirmDeleteSystemPartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -935,7 +935,7 @@ static MUI_ENTRY itITConfirmDeleteSystemPartitionEntries[] = static MUI_ENTRY itITFormatPartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -969,7 +969,7 @@ static MUI_ENTRY itITFormatPartitionEntries[] = static MUI_ENTRY itITInstallDirectoryEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1021,7 +1021,7 @@ static MUI_ENTRY itITInstallDirectoryEntries[] = static MUI_ENTRY itITFileCopyEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1061,7 +1061,7 @@ static MUI_ENTRY itITFileCopyEntries[] = static MUI_ENTRY itITBootLoaderEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1113,7 +1113,7 @@ static MUI_ENTRY itITBootLoaderEntries[] = static MUI_ENTRY itITKeyboardSettingsEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1165,7 +1165,7 @@ static MUI_ENTRY itITKeyboardSettingsEntries[] = static MUI_ENTRY itITLayoutSettingsEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1218,7 +1218,7 @@ static MUI_ENTRY itITLayoutSettingsEntries[] = static MUI_ENTRY itITPrepareCopyEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1247,7 +1247,7 @@ static MUI_ENTRY itITPrepareCopyEntries[] = static MUI_ENTRY itITSelectFSEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1294,7 +1294,7 @@ static MUI_ENTRY itITSelectFSEntries[] = static MUI_ENTRY itITDeletePartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 773598de21..d3872cc8f8 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -44,7 +44,7 @@ static MUI_ENTRY nlNLLanguagePageEntries[] = }, { 8, - 13, + 13, "\x07 Deze taal wordt later als standaard taal door het systeem gebruikt.", TEXT_STYLE_NORMAL }, @@ -1475,7 +1475,7 @@ MUI_ERROR nlNLErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + //ERROR_DELETE_SPACE, "U kunt ongebruikte schijfruimte voor partities niet verwijderen!\n" "\n" " * Druk op een willekeurige toets om door te gaan.", diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 1b35608c7d..a28ecefabb 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1054,7 +1054,7 @@ static MUI_ENTRY ptBRFileCopyEntries[] = { 50, 0, - "\xB3 Por favor, aguarde...", + "\xB3 Por favor, aguarde...", TEXT_TYPE_STATUS }, { diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 59ed8c9b4d..2874983dca 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1,4 +1,4 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) * DATE OF TR: 29-11-2013 */ diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index f6fac58029..b3a370e607 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Setup - * FILE: base/setup/usetup/lang/sv-SE.h + * FILE: base/setup/usetup/lang/sv-SE.h * PURPOSE: Swedish resource file * Translation: Jaix Bly plus perhaps GreatLord if blame and translate.reactos.se is consulted. */ diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index ed011e9f29..63e780c64d 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1415,7 +1415,7 @@ MUI_ERROR trTRErrorEntries[] = //ERROR_WARN_PARTITION, "Kur, d�zg�n y�netilemeyen bir uyumsuz b�l�m tablosu i�eren en az\n" "bir s�bit disk buldu!\n" - "\n" + "\n" "B�l�mleri olu�turmak vey� silmek b�l�m tablosunu yok edebilir.\n" "\n" " \x07 Kur'dan ��kmak i�in F3'e bas�n�z.\n" diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 424d8d5f90..fdb4dcf692 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1,7 +1,7 @@ /* * translated by Artem Reznikov, Igor Paliychuk, 2010 * http://www.reactos.org/uk/ - */ + */ #pragma once

1 0

03/04: [USETUP] Small formatting changes + two functions turned into FORCEINLINE.
by Hermès Bélusca-Maïto 23 Oct '18

23 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=043a024d613b6153dc0f5… commit 043a024d613b6153dc0f5e7576b0a84b9d76917d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:34:03 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:35:54 2018 +0200 [USETUP] Small formatting changes + two functions turned into FORCEINLINE. Based on: svn path=/branches/setup_improvements/; revision=74616 --- base/setup/lib/partlist.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index 71fd77a005..f5e062b6cb 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -107,15 +107,13 @@ GetDriverName( WCHAR KeyName[32]; NTSTATUS Status; - RtlInitUnicodeString(&DiskEntry->DriverName, - NULL); + RtlInitUnicodeString(&DiskEntry->DriverName, NULL); RtlStringCchPrintfW(KeyName, ARRAYSIZE(KeyName), L"\\Scsi\\Scsi Port %hu", DiskEntry->Port); - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); + RtlZeroMemory(&QueryTable, sizeof(QueryTable)); QueryTable[0].Name = L"Driver"; QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; @@ -364,7 +362,7 @@ EnumerateBiosDiskEntries( } AdapterCount = 0; - while (1) + while (TRUE) { RtlStringCchPrintfW(Name, ARRAYSIZE(Name), L"%s\\%lu", @@ -389,7 +387,7 @@ EnumerateBiosDiskEntries( NULL); if (NT_SUCCESS(Status)) { - while (1) + while (TRUE) { RtlStringCchPrintfW(Name, ARRAYSIZE(Name), L"%s\\%lu\\DiskController\\0", @@ -421,7 +419,7 @@ EnumerateBiosDiskEntries( QueryTable[1].QueryRoutine = DiskConfigurationDataQueryRoutine; DiskCount = 0; - while (1) + while (TRUE) { BiosDiskEntry = (BIOSDISKENTRY*)RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(BIOSDISKENTRY)); if (BiosDiskEntry == NULL) @@ -828,7 +826,7 @@ SetDiskSignature( Buffer = (PUCHAR)&DiskEntry->LayoutBuffer->Signature; - while (1) + while (TRUE) { NtQuerySystemTime(&SystemTime); RtlTimeToTimeFields(&SystemTime, &TimeFields); @@ -1264,7 +1262,6 @@ CreatePartitionList(VOID) if (NT_SUCCESS(Status)) { AddDiskToList(FileHandle, DiskNumber, List); - NtClose(FileHandle); } } @@ -1755,7 +1752,8 @@ GetPrevPartition( return NULL; } -static +// static +FORCEINLINE BOOLEAN IsEmptyLayoutEntry( IN PPARTITION_INFORMATION PartitionInfo) @@ -1769,7 +1767,8 @@ IsEmptyLayoutEntry( return FALSE; } -static +// static +FORCEINLINE BOOLEAN IsSamePrimaryLayoutEntry( IN PPARTITION_INFORMATION PartitionInfo,

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