Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [SYSDM] Improvements to the user profile page
by Eric Kohl 02 Jun '18

02 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ce2ca540b8755ce21436… commit 6ce2ca540b8755ce2143601b25327284f4f95936 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 2 16:11:10 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 2 16:11:50 2018 +0200 [SYSDM] Improvements to the user profile page - Store the full profile user name in the listview item for later use in the delete and copy functions. - Change the button state according to the selected profile. - Fix some hard-coded string sizes. --- dll/cpl/sysdm/userprofile.c | 193 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 150 insertions(+), 43 deletions(-) diff --git a/dll/cpl/sysdm/userprofile.c b/dll/cpl/sysdm/userprofile.c index 203505cbef..e0868a8fbb 100644 --- a/dll/cpl/sysdm/userprofile.c +++ b/dll/cpl/sysdm/userprofile.c @@ -14,6 +14,7 @@ typedef struct _PROFILEDATA { + BOOL bMyProfile; PWSTR pszFullName; } PROFILEDATA, *PPROFILEDATA; @@ -34,43 +35,45 @@ SetListViewColumns(HWND hwndListView) column.fmt = LVCFMT_LEFT; column.cx = (INT)((rect.right - rect.left) * 0.40); column.iSubItem = 0; - LoadString(hApplet, IDS_USERPROFILE_NAME, szStr, 32); + LoadString(hApplet, IDS_USERPROFILE_NAME, szStr, ARRAYSIZE(szStr)); column.pszText = szStr; (void)ListView_InsertColumn(hwndListView, 0, &column); column.fmt = LVCFMT_RIGHT; column.cx = (INT)((rect.right - rect.left) * 0.15); column.iSubItem = 1; - LoadString(hApplet, IDS_USERPROFILE_SIZE, szStr, 32); + LoadString(hApplet, IDS_USERPROFILE_SIZE, szStr, ARRAYSIZE(szStr)); column.pszText = szStr; (void)ListView_InsertColumn(hwndListView, 1, &column); column.fmt = LVCFMT_LEFT; column.cx = (INT)((rect.right - rect.left) * 0.15); column.iSubItem = 2; - LoadString(hApplet, IDS_USERPROFILE_TYPE, szStr, 32); + LoadString(hApplet, IDS_USERPROFILE_TYPE, szStr, ARRAYSIZE(szStr)); column.pszText = szStr; (void)ListView_InsertColumn(hwndListView, 2, &column); column.fmt = LVCFMT_LEFT; column.cx = (INT)((rect.right - rect.left) * 0.15); column.iSubItem = 3; - LoadString(hApplet, IDS_USERPROFILE_STATUS, szStr, 32); + LoadString(hApplet, IDS_USERPROFILE_STATUS, szStr, ARRAYSIZE(szStr)); column.pszText = szStr; (void)ListView_InsertColumn(hwndListView, 3, &column); column.fmt = LVCFMT_LEFT; column.cx = (INT)((rect.right - rect.left) * 0.15) - GetSystemMetrics(SM_CYHSCROLL); column.iSubItem = 4; - LoadString(hApplet, IDS_USERPROFILE_MODIFIED, szStr, 32); + LoadString(hApplet, IDS_USERPROFILE_MODIFIED, szStr, ARRAYSIZE(szStr)); column.pszText = szStr; (void)ListView_InsertColumn(hwndListView, 4, &column); } static VOID -AddUserProfile(HWND hwndListView, - LPTSTR lpProfileSid) +AddUserProfile( + _In_ HWND hwndListView, + _In_ LPTSTR lpProfileSid, + _In_ PSID pMySid) { PPROFILEDATA pProfileData = NULL; PWSTR pszAccountName = NULL; @@ -129,25 +132,25 @@ AddUserProfile(HWND hwndListView, if (pProfileData == NULL) goto done; + pProfileData->bMyProfile = EqualSid(pMySid, pSid); + ptr = (PWSTR)((ULONG_PTR)pProfileData + sizeof(PROFILEDATA)); pProfileData->pszFullName = ptr; wsprintf(pProfileData->pszFullName, L"%s\\%s", pszDomainName, pszAccountName); memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE; + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; lvi.pszText = pProfileData->pszFullName; lvi.state = 0; + lvi.lParam = (LPARAM)pProfileData; ListView_InsertItem(hwndListView, &lvi); done: - if (pProfileData == NULL) - HeapFree(GetProcessHeap(), 0, pProfileData); - - if (pszDomainName == NULL) + if (pszDomainName != NULL) HeapFree(GetProcessHeap(), 0, pszDomainName); - if (pszAccountName == NULL) + if (pszAccountName != NULL) HeapFree(GetProcessHeap(), 0, pszAccountName); if (pSid != NULL) @@ -158,36 +161,64 @@ done: static VOID AddUserProfiles(HWND hwndListView) { - HKEY hKeyUserProfiles; + HKEY hKeyUserProfiles = INVALID_HANDLE_VALUE; DWORD dwIndex; - TCHAR szProfileSid[64]; + WCHAR szProfileSid[64]; DWORD dwSidLength; FILETIME ftLastWrite; + DWORD dwSize; + HANDLE hToken = NULL; + PTOKEN_USER pTokenUser = NULL; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList"), - 0, - KEY_READ, - &hKeyUserProfiles)) + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) return; + GetTokenInformation(hToken, TokenUser, NULL, 0, &dwSize); + if (dwSize == 0) + goto done; + + pTokenUser = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (pTokenUser == NULL) + goto done; + + if (!GetTokenInformation(hToken, TokenUser, pTokenUser, dwSize, &dwSize)) + goto done; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_READ, + &hKeyUserProfiles)) + goto done; + for (dwIndex = 0; ; dwIndex++) { - dwSidLength = 64; - if (RegEnumKeyEx(hKeyUserProfiles, - dwIndex, - szProfileSid, - &dwSidLength, - NULL, - NULL, - NULL, - &ftLastWrite)) + dwSidLength = ARRAYSIZE(szProfileSid); + if (RegEnumKeyExW(hKeyUserProfiles, + dwIndex, + szProfileSid, + &dwSidLength, + NULL, + NULL, + NULL, + &ftLastWrite)) break; - AddUserProfile(hwndListView, szProfileSid); + AddUserProfile(hwndListView, szProfileSid, pTokenUser->User.Sid); } - RegCloseKey(hKeyUserProfiles); + if (ListView_GetItemCount(hwndListView) != 0) + ListView_SetItemState(hwndListView, 0, LVIS_SELECTED, LVIS_SELECTED); + +done: + if (hKeyUserProfiles != INVALID_HANDLE_VALUE) + RegCloseKey(hKeyUserProfiles); + + if (pTokenUser != NULL) + HeapFree(GetProcessHeap(), 0, pTokenUser); + + if (hToken != NULL) + CloseHandle(hToken); } @@ -208,6 +239,80 @@ OnInitUserProfileDialog(HWND hwndDlg) } +static +VOID +OnDestroy( + _In_ HWND hwndDlg) +{ + HWND hwndList; + INT nItems, i; + LVITEM Item; + + hwndList = GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST); + + nItems = ListView_GetItemCount(hwndList); + for (i = 0; i < nItems; i++) + { + Item.iItem = i; + Item.iSubItem = 0; + if (ListView_GetItem(hwndList, &Item)) + { + if (Item.lParam != 0) + HeapFree(GetProcessHeap(), 0, (PVOID)Item.lParam); + } + } +} + + +static +VOID +OnNotify( + _In_ HWND hwndDlg, + _In_ NMHDR *nmhdr) +{ + if (nmhdr->idFrom == IDC_USERACCOUNT_LINK && nmhdr->code == NM_CLICK) + { + ShellExecuteW(hwndDlg, NULL, L"usrmgr.cpl", NULL, NULL, 0); + } + else if (nmhdr->idFrom == IDC_USERPROFILE_LIST && nmhdr->code == LVN_ITEMCHANGED) + { + if (ListView_GetSelectedCount(nmhdr->hwndFrom) == 0) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_USERPROFILE_CHANGE), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_USERPROFILE_DELETE), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_USERPROFILE_COPY), FALSE); + } + else + { + LVITEM Item; + INT iSelected; + BOOL bMyProfile = FALSE; + + iSelected = ListView_GetNextItem(nmhdr->hwndFrom, -1, LVNI_SELECTED); + if (iSelected != -1) + { + Item.iItem = iSelected; + Item.iSubItem = 0; + if (ListView_GetItem(nmhdr->hwndFrom, &Item)) + { + if (Item.lParam != 0) + { + bMyProfile = ((PPROFILEDATA)Item.lParam)->bMyProfile; + } + } + } + + EnableWindow(GetDlgItem(hwndDlg, IDC_USERPROFILE_CHANGE), TRUE); + if (IsUserAnAdmin() && !bMyProfile) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_USERPROFILE_DELETE), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_USERPROFILE_COPY), TRUE); + } + } + } +} + + /* Property page dialog callback */ INT_PTR CALLBACK UserProfileDlgProc(HWND hwndDlg, @@ -221,25 +326,27 @@ UserProfileDlgProc(HWND hwndDlg, OnInitUserProfileDialog(hwndDlg); break; + case WM_DESTROY: + OnDestroy(hwndDlg); + break; + case WM_COMMAND: - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + switch (LOWORD(wParam)) { - EndDialog(hwndDlg, - LOWORD(wParam)); - return TRUE; + case IDOK: + case IDCANCEL: + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; + + case IDC_USERPROFILE_DELETE: + break; } break; case WM_NOTIFY: - { - NMHDR *nmhdr = (NMHDR *)lParam; - - if (nmhdr->idFrom == IDC_USERACCOUNT_LINK && nmhdr->code == NM_CLICK) - { - ShellExecuteW(hwndDlg, NULL, L"usrmgr.cpl", NULL, NULL, 0); - } + OnNotify(hwndDlg, (NMHDR *)lParam); break; - } } return FALSE;

1 0

01/01: [CRT] Reimplement qsort() using FreeBSD implementation.
by Pierre Schweitzer 02 Jun '18

02 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dfe5e3f463ca4d7eb920… commit 2dfe5e3f463ca4d7eb920d25c2a33b29a70f3e27 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 2 13:52:09 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 2 13:56:42 2018 +0200 [CRT] Reimplement qsort() using FreeBSD implementation. Our implementation had a bug that could be triggered while building our USBD library on ReactOS: the compare function could be called with a NULL pointer instead of a valid value. With this bug fixed (and the cmd hack in CORE-14648), ReactOS can totally selfhost :-)! I was able to build LiveCD and BootCD without any trouble, crash, deadlock or whatever. (Next step: having a buildbot slave hosted on ReactOS ;-)). Enjoy: https://twitter.com/HeisSpiter/status/1002880397103988737 CORE-14680 --- sdk/lib/crt/stdlib/qsort.c | 353 ++++++++++++++++++--------------------------- 1 file changed, 138 insertions(+), 215 deletions(-) diff --git a/sdk/lib/crt/stdlib/qsort.c b/sdk/lib/crt/stdlib/qsort.c index 62f365177d..d6bca5f06c 100644 --- a/sdk/lib/crt/stdlib/qsort.c +++ b/sdk/lib/crt/stdlib/qsort.c @@ -1,170 +1,81 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ - -#include <stdlib.h> -#include <search.h> - /*- - * Copyright (c) 1980, 1983 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. * - * Redistribution and use in source and binary forms are permitted - * provided that: (1) source distributions retain this entire copyright - * notice and comment, and (2) distributions including binaries display - * the following acknowledgement: ``This product includes software - * developed by the University of California, Berkeley and its contributors'' - * in the documentation or other materials provided with the distribution - * and in all advertising materials mentioning features or use of this - * software. Neither the name of the University nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ -/* - * qsort.c: - * Our own version of the system qsort routine which is faster by an average - * of 25%, with lows and highs of 10% and 50%. - * The THRESHold below is the insertion sort threshold, and has been adjusted - * for records of size 48 bytes. - * The MTHREShold is where we stop finding a better median. - */ +#include <stdlib.h> +#include <search.h> -#define THRESH 4 /* threshold for insertion */ -#define MTHRESH 6 /* threshold for median */ +#define min(a, b) (a) < (b) ? (a) : (b) /* - * qst: - * Do a quicksort - * First, find the median element, and put that one in the first place as the - * discriminator. (This "median" is just the median of the first, last and - * middle elements). (Using this median instead of the first element is a big - * win). Then, the usual partitioning/swapping, followed by moving the - * discriminator into the right place. Then, figure out the sizes of the two - * partions, do the smaller one recursively and the larger one via a repeat of - * this code. Stopping when there are less than THRESH elements in a partition - * and cleaning up with an insertion sort (in our caller) is a huge win. - * All data swaps are done in-line, which is space-losing but time-saving. - * (And there are only three places where this is done). + * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function". */ +#define swapcode(TYPE, parmi, parmj, n) { \ + long i = (n) / sizeof (TYPE); \ + register TYPE *pi = (TYPE *) (parmi); \ + register TYPE *pj = (TYPE *) (parmj); \ + do { \ + register TYPE t = *pi; \ + *pi++ = *pj; \ + *pj++ = t; \ + } while (--i > 0); \ +} -static void __cdecl -qst(size_t size, int (__cdecl *compar)(const void*, const void*), char *base, char *max) +#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \ + es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1; + +static __inline void +swapfunc(char *a, char *b, int n, int swaptype) { - char c, *i, *j, *jj; - size_t ii; - char *mid, *tmp; - size_t lo, hi; - size_t thresh; - size_t mthresh; + if(swaptype <= 1) + swapcode(long, a, b, n) + else + swapcode(char, a, b, n) +} - thresh = size * THRESH; - mthresh = size * MTHRESH; +#define swap(a, b) \ + if (swaptype == 0) { \ + long t = *(long *)(a); \ + *(long *)(a) = *(long *)(b); \ + *(long *)(b) = t; \ + } else \ + swapfunc(a, b, es, swaptype) - /* - * At the top here, lo is the number of characters of elements in the - * current partition. (Which should be max - base). - * Find the median of the first, last, and middle element and make - * that the middle element. Set j to largest of first and middle. - * If max is larger than that guy, then it's that guy, else compare - * max with loser of first and take larger. Things are set up to - * prefer the middle, then the first in case of ties. - */ - lo = max - base; /* number of elements as chars */ - do { - mid = i = base + size * ((lo / size) >> 1); - if (lo >= mthresh) - { - j = (compar((jj = base), i) > 0 ? jj : i); - if (compar(j, (tmp = max - size)) > 0) - { - /* switch to first loser */ - j = (j == jj ? i : jj); - if (compar(j, tmp) < 0) - j = tmp; - } - if (j != i) - { - ii = size; - do { - c = *i; - *i++ = *j; - *j++ = c; - } while (--ii); - } - } - /* - * Semi-standard quicksort partitioning/swapping - */ - for (i = base, j = max - size; ; ) - { - while (i < mid && compar(i, mid) <= 0) - i += size; - while (j > mid) - { - if (compar(mid, j) <= 0) - { - j -= size; - continue; - } - tmp = i + size; /* value of i after swap */ - if (i == mid) - { - /* j <-> mid, new mid is j */ - mid = jj = j; - } - else - { - /* i <-> j */ - jj = j; - j -= size; - } - goto swap; - } - if (i == mid) - { - break; - } - else - { - /* i <-> mid, new mid is i */ - jj = mid; - tmp = mid = i; /* value of i after swap */ - j -= size; - } - swap: - ii = size; - do { - c = *i; - *i++ = *jj; - *jj++ = c; - } while (--ii); - i = tmp; - } - /* - * Look at sizes of the two partitions, do the smaller - * one first by recursion, then do the larger one by - * making sure lo is its size, base and max are update - * correctly, and branching back. But only repeat - * (recursively or by branching) if the partition is - * of at least size THRESH. - */ - i = (j = mid) + size; - if ((lo = j - base) <= (hi = max - i)) - { - if (lo >= thresh) - qst(size, compar, base, j); - base = i; - lo = hi; - } - else - { - if (hi >= thresh) - qst(size, compar, i, max); - max = j; - } - } while (lo >= thresh); +#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype) + +#define CMP(x, y) (cmp((x), (y))) + +static __inline char * +med3(char *a, char *b, char *c, int (__cdecl *cmp)(const void*, const void*)) +{ + return CMP(a, b) < 0 ? + (CMP(b, c) < 0 ? b : (CMP(a, c) < 0 ? c : a )) + :(CMP(b, c) > 0 ? b : (CMP(a, c) < 0 ? a : c )); } /* @@ -177,67 +88,79 @@ qst(size_t size, int (__cdecl *compar)(const void*, const void*), char *base, ch */ void __cdecl -qsort(void *base0, size_t n, size_t size, int (__cdecl *compar)(const void*, const void*)) +qsort(void *a, size_t n, size_t es, int (__cdecl *cmp)(const void*, const void*)) { - char *base = (char *)base0; - char c, *i, *j, *lo, *hi; - char *min, *max; - size_t thresh; + char *pa, *pb, *pc, *pd, *pl, *pm, *pn; + int d, r, swaptype, swap_cnt; - if (n <= 1) - return; +loop: SWAPINIT(a, es); + swap_cnt = 0; + if (n < 7) { + for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) + for (pl = pm; pl > (char *)a && CMP(pl - es, pl) > 0; + pl -= es) + swap(pl, pl - es); + return; + } + pm = (char *)a + (n / 2) * es; + if (n > 7) { + pl = a; + pn = (char *)a + (n - 1) * es; + if (n > 40) { + d = (n / 8) * es; + pl = med3(pl, pl + d, pl + 2 * d, cmp); + pm = med3(pm - d, pm, pm + d, cmp); + pn = med3(pn - 2 * d, pn - d, pn, cmp); + } + pm = med3(pl, pm, pn, cmp); + } + swap(a, pm); + pa = pb = (char *)a + es; + + pc = pd = (char *)a + (n - 1) * es; + for (;;) { + while (pb <= pc && (r = CMP(pb, a)) <= 0) { + if (r == 0) { + swap_cnt = 1; + swap(pa, pb); + pa += es; + } + pb += es; + } + while (pb <= pc && (r = CMP(pc, a)) >= 0) { + if (r == 0) { + swap_cnt = 1; + swap(pc, pd); + pd -= es; + } + pc -= es; + } + if (pb > pc) + break; + swap(pb, pc); + swap_cnt = 1; + pb += es; + pc -= es; + } + if (swap_cnt == 0) { /* Switch to insertion sort */ + for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) + for (pl = pm; pl > (char *)a && CMP(pl - es, pl) > 0; + pl -= es) + swap(pl, pl - es); + return; + } - if (size == 0) - return; - thresh = size * THRESH; - max = base + n * size; - if (n >= THRESH) - { - qst(size, compar, base, max); - hi = base + thresh; - } - else - { - hi = max; - } - /* - * First put smallest element, which must be in the first THRESH, in - * the first position as a sentinel. This is done just by searching - * the first THRESH elements (or the first n if n < THRESH), finding - * the min, and swapping it into the first position. - */ - for (j = lo = base; (lo += size) < hi; ) - if (compar(j, lo) > 0) - j = lo; - if (j != base) - { - /* swap j into place */ - for (i = base, hi = base + size; i < hi; ) - { - c = *j; - *j++ = *i; - *i++ = c; - } - } - /* - * With our sentinel in place, we now run the following hyper-fast - * insertion sort. For each remaining element, min, from [1] to [n-1], - * set hi to the index of the element AFTER which this one goes. - * Then, do the standard insertion sort shift on a character at a time - * basis for each element in the frob. - */ - for (min = base; (hi = min += size) < max; ) - { - while (compar(hi -= size, min) > 0) - /* void */; - if ((hi += size) != min) { - for (lo = min + size; --lo >= min; ) - { - c = *lo; - for (i = j = lo; (j -= size) >= hi; i = j) - *i = *j; - *i = c; - } - } - } + pn = (char *)a + n * es; + r = min(pa - (char *)a, pb - pa); + vecswap(a, pb - r, r); + r = min(pd - pc, pn - pd - es); + vecswap(pb, pn - r, r); + if ((r = pb - pa) > es) + qsort(a, r / es, es, cmp); + if ((r = pd - pc) > es) { + /* Iterate rather than recurse to save stack space */ + a = pn - r; + n = r / es; + goto loop; + } }

1 0

01/01: [COMCTL32] Fix regression CORE-14649
by Joachim Henze 02 Jun '18

02 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16d6c9b5e05ffd7a0fff2… commit 16d6c9b5e05ffd7a0fff29531f69e18b010124c0 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Jun 2 12:26:48 2018 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Jun 2 12:28:47 2018 +0200 [COMCTL32] Fix regression CORE-14649 Fixes a regression that was introduced by Wine Staging 3.3 Sync. Symptom was missing button text and icons for specific buttons in Delphi applications, e.g. Double-Commander, Lazarus, Peazip. The patch restores and ifdef-guards previous changes of Giannis. --- dll/win32/comctl32/button.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index c313aa81e8..514d5a7785 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -1177,7 +1177,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc) UINT dtStyle = BUTTON_BStoDT( style, ex_style ); RECT r = *rc; INT n; -#ifdef __REACTOS__ +#if !defined(_USER32_) && defined(__REACTOS__) BOOL bHasIml = BUTTON_DrawIml(hdc, &infoPtr->imlData, &r, TRUE, 0); #endif @@ -1229,12 +1229,16 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc) default: empty_rect: +#if !defined(_USER32_) && defined(__REACTOS__) + if (bHasIml) + break; +#endif rc->right = r.left; rc->bottom = r.top; return (UINT)-1; } -#ifdef __REACTOS__ +#if !defined(_USER32_) && defined(__REACTOS__) if (bHasIml) { if (infoPtr->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT) @@ -1318,7 +1322,7 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, * I don't have Win31 on hand to verify that, so I leave it as is. */ -#ifdef __REACTOS__ +#if !defined(_USER32_) && defined(__REACTOS__) RECT rcText = *rc; BUTTON_DrawIml(hdc, &infoPtr->imlData, &rcText, FALSE, 0); #endif

1 0

01/01: [SYSDM] Retrieve and show the domain and user names for the user profiles
by Eric Kohl 02 Jun '18

02 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3905cc68a0d85d183c86… commit e3905cc68a0d85d183c86924f8b30fbcfda14c6b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 2 12:18:19 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 2 12:18:19 2018 +0200 [SYSDM] Retrieve and show the domain and user names for the user profiles Fixes CORE-11789 --- dll/cpl/sysdm/userprofile.c | 83 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/userprofile.c b/dll/cpl/sysdm/userprofile.c index d0608389dd..203505cbef 100644 --- a/dll/cpl/sysdm/userprofile.c +++ b/dll/cpl/sysdm/userprofile.c @@ -9,6 +9,14 @@ */ #include "precomp.h" +#include <sddl.h> + + +typedef struct _PROFILEDATA +{ + PWSTR pszFullName; +} PROFILEDATA, *PPROFILEDATA; + static VOID SetListViewColumns(HWND hwndListView) @@ -64,13 +72,86 @@ static VOID AddUserProfile(HWND hwndListView, LPTSTR lpProfileSid) { + PPROFILEDATA pProfileData = NULL; + PWSTR pszAccountName = NULL; + PWSTR pszDomainName = NULL; + SID_NAME_USE Use; + DWORD dwAccountNameSize, dwDomainNameSize; + DWORD dwProfileData; + PWSTR ptr; + PSID pSid = NULL; LV_ITEM lvi; + if (!ConvertStringSidToSid(lpProfileSid, + &pSid)) + return; + + dwAccountNameSize = 0; + dwDomainNameSize = 0; + LookupAccountSidW(NULL, + pSid, + NULL, + &dwAccountNameSize, + NULL, + &dwDomainNameSize, + &Use); + + pszDomainName = HeapAlloc(GetProcessHeap(), + 0, + dwDomainNameSize * sizeof(WCHAR)); + if (pszDomainName == NULL) + goto done; + + pszAccountName = HeapAlloc(GetProcessHeap(), + 0, + dwAccountNameSize * sizeof(WCHAR)); + if (pszAccountName == NULL) + goto done; + + if (!LookupAccountSidW(NULL, + pSid, + pszAccountName, + &dwAccountNameSize, + pszDomainName, + &dwDomainNameSize, + &Use)) + goto done; + + /* Show only the user accounts */ + if (Use != SidTypeUser) + goto done; + + dwProfileData = sizeof(PROFILEDATA) + + ((wcslen(pszDomainName) + wcslen(pszAccountName) + 2) * sizeof(WCHAR)); + pProfileData = HeapAlloc(GetProcessHeap(), + 0, + dwProfileData); + if (pProfileData == NULL) + goto done; + + ptr = (PWSTR)((ULONG_PTR)pProfileData + sizeof(PROFILEDATA)); + pProfileData->pszFullName = ptr; + + wsprintf(pProfileData->pszFullName, L"%s\\%s", pszDomainName, pszAccountName); + memset(&lvi, 0x00, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_STATE; - lvi.pszText = lpProfileSid; + lvi.pszText = pProfileData->pszFullName; lvi.state = 0; ListView_InsertItem(hwndListView, &lvi); + +done: + if (pProfileData == NULL) + HeapFree(GetProcessHeap(), 0, pProfileData); + + if (pszDomainName == NULL) + HeapFree(GetProcessHeap(), 0, pszDomainName); + + if (pszAccountName == NULL) + HeapFree(GetProcessHeap(), 0, pszAccountName); + + if (pSid != NULL) + LocalFree(pSid); }

1 0

01/01: [KERNEL32] Get/SetTimeZoneInformation: Convert the Milliseconds value between TIME_FIELDS and SYSTEMTIME too
by Eric Kohl 01 Jun '18

01 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd2f3d39a924836799861… commit bd2f3d39a92483679986107466636fe84e0420af Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Jun 1 12:49:26 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Jun 1 12:49:26 2018 +0200 [KERNEL32] Get/SetTimeZoneInformation: Convert the Milliseconds value between TIME_FIELDS and SYSTEMTIME too CORE-14658 --- dll/win32/kernel32/wine/timezone.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/kernel32/wine/timezone.c b/dll/win32/kernel32/wine/timezone.c index 8869848d49..18f9c6b318 100644 --- a/dll/win32/kernel32/wine/timezone.c +++ b/dll/win32/kernel32/wine/timezone.c @@ -287,6 +287,7 @@ GetTimeZoneInformation(LPTIME_ZONE_INFORMATION lpTimeZoneInformation) lpTimeZoneInformation->StandardDate.wHour = TimeZoneInformation.StandardDate.Hour; lpTimeZoneInformation->StandardDate.wMinute = TimeZoneInformation.StandardDate.Minute; lpTimeZoneInformation->StandardDate.wSecond = TimeZoneInformation.StandardDate.Second; + lpTimeZoneInformation->StandardDate.wMilliseconds = TimeZoneInformation.StandardDate.Milliseconds; lpTimeZoneInformation->StandardDate.wDayOfWeek = TimeZoneInformation.StandardDate.Weekday; lpTimeZoneInformation->StandardBias = TimeZoneInformation.StandardBias; @@ -299,6 +300,7 @@ GetTimeZoneInformation(LPTIME_ZONE_INFORMATION lpTimeZoneInformation) lpTimeZoneInformation->DaylightDate.wHour = TimeZoneInformation.DaylightDate.Hour; lpTimeZoneInformation->DaylightDate.wMinute = TimeZoneInformation.DaylightDate.Minute; lpTimeZoneInformation->DaylightDate.wSecond = TimeZoneInformation.DaylightDate.Second; + lpTimeZoneInformation->DaylightDate.wMilliseconds = TimeZoneInformation.DaylightDate.Milliseconds; lpTimeZoneInformation->DaylightDate.wDayOfWeek = TimeZoneInformation.DaylightDate.Weekday; lpTimeZoneInformation->DaylightBias = TimeZoneInformation.DaylightBias; @@ -329,6 +331,7 @@ SetTimeZoneInformation(CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation) TimeZoneInformation.StandardDate.Hour = lpTimeZoneInformation->StandardDate.wHour; TimeZoneInformation.StandardDate.Minute = lpTimeZoneInformation->StandardDate.wMinute; TimeZoneInformation.StandardDate.Second = lpTimeZoneInformation->StandardDate.wSecond; + TimeZoneInformation.StandardDate.Milliseconds = lpTimeZoneInformation->StandardDate.wMilliseconds; TimeZoneInformation.StandardDate.Weekday = lpTimeZoneInformation->StandardDate.wDayOfWeek; TimeZoneInformation.StandardBias = lpTimeZoneInformation->StandardBias; @@ -341,6 +344,7 @@ SetTimeZoneInformation(CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation) TimeZoneInformation.DaylightDate.Hour = lpTimeZoneInformation->DaylightDate.wHour; TimeZoneInformation.DaylightDate.Minute = lpTimeZoneInformation->DaylightDate.wMinute; TimeZoneInformation.DaylightDate.Second = lpTimeZoneInformation->DaylightDate.wSecond; + TimeZoneInformation.DaylightDate.Milliseconds = lpTimeZoneInformation->DaylightDate.wMilliseconds; TimeZoneInformation.DaylightDate.Weekday = lpTimeZoneInformation->DaylightDate.wDayOfWeek; TimeZoneInformation.DaylightBias = lpTimeZoneInformation->DaylightBias;

1 0

01/01: Create a Code of conduct to complete the Github community checklist (#431)
by Dheeraj Bhaskar 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce5d4fd3e14047402955e… commit ce5d4fd3e14047402955e14fe002f4cc37c64e12 Author: Dheeraj Bhaskar <dheerajthe1(a)gmail.com> AuthorDate: Fri Jun 1 02:56:33 2018 +0530 Commit: David Quintana <gigaherz(a)gmail.com> CommitDate: Thu May 31 23:26:33 2018 +0200 Create a Code of conduct to complete the Github community checklist (#431) --- CODE_OF_CONDUCT.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..8109c09b77 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,3 @@ +# Code of Conduct + +Be respectful toward other members of the community. Don't initiate or engage in discussions that are designed to insult, inflame, attack, or incite hate/discrimination/bullying against others. Don't feed the trolls. If we detect any kind of behaviour we consider unacceptable, we reserve the right to ban, block, or remove the involved members from any or all of our communities.

1 0

01/01: [MSPAINT] use __targv[1] instead of lpszArgument
by Benedikt Freisen 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=313ded449ce3ecff1c1fb… commit 313ded449ce3ecff1c1fb2412a6fbd8732739fc7 Author: Benedikt Freisen <b.freisen(a)gmx.net> AuthorDate: Thu May 31 20:17:30 2018 +0200 Commit: Benedikt Freisen <b.freisen(a)gmx.net> CommitDate: Thu May 31 20:17:30 2018 +0200 [MSPAINT] use __targv[1] instead of lpszArgument This should make Paint's handling of command line strings less brittle. CORE-13293 --- base/applications/mspaint/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 510688ea98..8b0bfe7bf8 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -259,15 +259,15 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument RECT imageAreaPos = {3, 3, 3 + imageModel.GetWidth(), 3 + imageModel.GetHeight()}; imageArea.Create(scrlClientWindow.m_hWnd, imageAreaPos, NULL, WS_CHILD | WS_VISIBLE); - if (lpszArgument[0] != 0) + if (__argc >= 2) { HBITMAP bmNew = NULL; - LoadDIBFromFile(&bmNew, lpszArgument, &fileTime, &fileSize, &fileHPPM, &fileVPPM); + LoadDIBFromFile(&bmNew, __targv[1], &fileTime, &fileSize, &fileHPPM, &fileVPPM); if (bmNew != NULL) { TCHAR *temp; imageModel.Insert(bmNew); - GetFullPathName(lpszArgument, SIZEOF(filepathname), filepathname, &temp); + GetFullPathName(__targv[1], SIZEOF(filepathname), filepathname, &temp); CPath pathFileName(filepathname); pathFileName.StripPath(); CString strTitle;

1 0

01/01: [USETUP] Some fixes/improvements suggested by Thomas (2/2).
by Hermès Bélusca-Maïto 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c434a5ab21780b3ca4229… commit c434a5ab21780b3ca42299da3dc6f5b46b978bc3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 22 17:55:16 2017 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 19:54:09 2018 +0200 [USETUP] Some fixes/improvements suggested by Thomas (2/2). - In the partlist.c disk getters: Remove useless "IsListEmpty(&List->DiskListHead)" checks, because this is actually the kind of check the while() loop does just after... - Fix few DPRINTs. svn path=/branches/setup_improvements/; revision=74629 --- base/setup/lib/partlist.c | 16 ---------------- base/setup/usetup/filesup.c | 21 +++++---------------- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index d2d3f36768..7b74cda8f0 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -1352,10 +1352,6 @@ GetDiskByBiosNumber( PDISKENTRY DiskEntry; PLIST_ENTRY Entry; - /* Check for empty disks */ - if (IsListEmpty(&List->DiskListHead)) - return NULL; - /* Loop over the disks and find the correct one */ Entry = List->DiskListHead.Flink; while (Entry != &List->DiskListHead) @@ -1382,10 +1378,6 @@ GetDiskByNumber( PDISKENTRY DiskEntry; PLIST_ENTRY Entry; - /* Check for empty disks */ - if (IsListEmpty(&List->DiskListHead)) - return NULL; - /* Loop over the disks and find the correct one */ Entry = List->DiskListHead.Flink; while (Entry != &List->DiskListHead) @@ -1414,10 +1406,6 @@ GetDiskBySCSI( PDISKENTRY DiskEntry; PLIST_ENTRY Entry; - /* Check for empty disks */ - if (IsListEmpty(&List->DiskListHead)) - return NULL; - /* Loop over the disks and find the correct one */ Entry = List->DiskListHead.Flink; while (Entry != &List->DiskListHead) @@ -1446,10 +1434,6 @@ GetDiskBySignature( PDISKENTRY DiskEntry; PLIST_ENTRY Entry; - /* Check for empty disks */ - if (IsListEmpty(&List->DiskListHead)) - return NULL; - /* Loop over the disks and find the correct one */ Entry = List->DiskListHead.Flink; while (Entry != &List->DiskListHead) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index b7fdf692f1..b466e4e38d 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -679,12 +679,7 @@ NtPathToDiskPartComponents( DiskNumber = wcstoul(Path, (PWSTR*)&Path, 10); /* Either NULL termination, or a path separator must be present now */ - if (!Path) - { - DPRINT1("An error happened!\n"); - return FALSE; - } - else if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) + if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) { DPRINT1("'%S' : expected a path separator!\n", Path); return FALSE; @@ -717,13 +712,7 @@ NtPathToDiskPartComponents( PartNumber = wcstoul(Path, (PWSTR*)&Path, 10); /* Either NULL termination, or a path separator must be present now */ - if (!Path) - { - /* We fail here because wcstoul failed for whatever reason */ - DPRINT1("An error happened!\n"); - return FALSE; - } - else if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) + if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) { /* We shouldn't fail here because it just means this part of path is actually not a partition specifier. Or should we? */ DPRINT1("'%S' : expected a path separator!\n", Path); @@ -788,7 +777,7 @@ OpenAndMapFile( FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &Name, Status); return Status; } @@ -810,7 +799,7 @@ OpenAndMapFile( } if (FileInfo.EndOfFile.HighPart != 0) - DPRINT1("WARNING!! The file %wZ is too large!\n", Name); + DPRINT1("WARNING!! The file '%wZ' is too large!\n", &Name); *FileSize = FileInfo.EndOfFile.LowPart; @@ -829,7 +818,7 @@ OpenAndMapFile( *FileHandle); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create a memory section for file %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to create a memory section for file '%wZ', Status 0x%08lx\n", &Name, Status); NtClose(*FileHandle); *FileHandle = NULL; return Status;

1 0

07/07: [USETUP] Further improve the OS detection code.
by Hermès Bélusca-Maïto 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f88d029c9d3f58ce92afe… commit f88d029c9d3f58ce92afefe965bd0d800e6ae254 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 22 22:59:11 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:01:01 2018 +0200 [USETUP] Further improve the OS detection code. - Improve FindExistingNTOSInstall() so that we can find an existing installation either by system root ARC path or NT path. This is used during the enumeration of available installations from the boot.ini/freeldr.ini and during other existence & validity checks of NTOS installations. - Improve AddNTOSInstallation() so that we can save the system root ARC path and NT path of the installation, as well as its partition entry structure pointer, for caching & later retrieval purposes. - Remove some deprecated comments & todos, and implement other todos. - Improve the output of some DPRINTs. - Fix the return value of FindSubStrI. svn path=/branches/setup_improvements/; revision=74632 --- base/setup/usetup/osdetect.c | 314 ++++++++++++++++++++++++++----------------- base/setup/usetup/osdetect.h | 10 +- 2 files changed, 199 insertions(+), 125 deletions(-) diff --git a/base/setup/usetup/osdetect.c b/base/setup/usetup/osdetect.c index 34c18e7b11..97cc6430ea 100644 --- a/base/setup/usetup/osdetect.c +++ b/base/setup/usetup/osdetect.c @@ -29,7 +29,7 @@ static const PCWSTR KnownVendors[] = { L"ReactOS", L"Microsoft" }; BOOL IsWindowsOS(VOID) { - // TODO: + // TODO? : // Load the "SystemRoot\System32\Config\SOFTWARE" hive and mount it, // then go to (SOFTWARE\\)Microsoft\\Windows NT\\CurrentVersion, // check the REG_SZ value "ProductName" and see whether it's "Windows" @@ -100,12 +100,22 @@ IsValidNTOSInstallation( IN HANDLE SystemRootDirectory OPTIONAL, IN PCWSTR SystemRoot OPTIONAL); +static PNTOS_INSTALLATION +FindExistingNTOSInstall( + IN PGENERIC_LIST List, + IN PCWSTR SystemRootArcPath OPTIONAL, + IN PUNICODE_STRING SystemRootNtPath OPTIONAL // or PCWSTR ? + ); + static PNTOS_INSTALLATION AddNTOSInstallation( IN PGENERIC_LIST List, + IN PCWSTR SystemRootArcPath, + IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ? + IN PCWSTR PathComponent, // Pointer inside SystemRootNtPath buffer IN ULONG DiskNumber, IN ULONG PartitionNumber, - IN PCWSTR SystemRoot, + IN PPARTENTRY PartEntry OPTIONAL, IN PCWSTR InstallationName); static NTSTATUS @@ -121,7 +131,15 @@ FreeLdrEnumerateInstallations( PINICACHEITERATOR Iterator; PINICACHESECTION IniSection, OsIniSection; PWCHAR SectionName, KeyData; - WCHAR InstallName[MAX_PATH]; + UNICODE_STRING InstallName; + + HANDLE SystemRootDirectory; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PNTOS_INSTALLATION NtOsInstall; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; /* Open an *existing* FreeLdr.ini configuration file */ Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); @@ -149,16 +167,16 @@ FreeLdrEnumerateInstallations( PWCHAR End = wcschr(Begin, L'"'); if (!End) End = Begin + wcslen(Begin); - StringCchCopyNW(InstallName, ARRAYSIZE(InstallName), - Begin, End - Begin); + RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); + InstallName.Length = InstallName.MaximumLength; } else { /* Non-quoted name, copy everything */ - StringCchCopyW(InstallName, ARRAYSIZE(InstallName), KeyData); + RtlInitUnicodeString(&InstallName, KeyData); } - DPRINT1("Possible installation '%S' in OS section '%S'\n", InstallName, SectionName); + DPRINT1("Possible installation '%wZ' in OS section '%S'\n", &InstallName, SectionName); /* Search for an existing ReactOS entry */ OsIniSection = IniCacheGetSection(IniCache, SectionName); @@ -188,27 +206,25 @@ FreeLdrEnumerateInstallations( Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); if (!NT_SUCCESS(Status)) { - DPRINT1(" A Win2k3 install '%S' without an ARC path?!\n", InstallName); + DPRINT1(" A Win2k3 install '%wZ' without an ARC path?!\n", &InstallName); continue; } - { - HANDLE SystemRootDirectory; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING SystemRootPath; - WCHAR SystemRoot[MAX_PATH]; - WCHAR InstallNameW[MAX_PATH]; - - DPRINT1(" Found a candidate Win2k3 install '%S' with ARC path '%S'\n", InstallName, KeyData); + DPRINT1(" Found a candidate Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, KeyData); - // Note that in ARC path, the disk number is the BIOS disk number, so a conversion - // should be done. + // TODO: Normalize the ARC path. - // TODO 1: Normalize the ARC path. - - // TODO 2: Check whether we already have an installation with this ARC path. - // If that's the case, stop there. If not, continue... + /* + * Check whether we already have an installation with this ARC path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, KeyData, NULL); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); + continue; + } /* * Convert the ARC path into an NT path, from which we will deduce @@ -218,18 +234,26 @@ FreeLdrEnumerateInstallations( RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); if (!ArcPathToNtPath(&SystemRootPath, KeyData, PartList)) { - DPRINT1("ArcPathToNtPath(%S) failed, installation skipped.\n", KeyData); - // FIXME: Do not continue! + DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", KeyData); continue; } - DPRINT1("ArcPathToNtPath() succeeded: %S --> %wZ\n", KeyData, &SystemRootPath); + DPRINT1("ArcPathToNtPath() succeeded: '%S' --> '%wZ'\n", KeyData, &SystemRootPath); - // TODO 3: Check whether we already have an installation with this NT path. - // If that's the case, stop there. If not, continue... + /* + * Check whether we already have an installation with this NT path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, NULL /*KeyData*/, &SystemRootPath); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); + continue; + } /* Set SystemRootPath */ - DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: %wZ\n", &SystemRootPath); + DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); /* Open SystemRootPath */ InitializeObjectAttributes(&ObjectAttributes, @@ -245,18 +269,18 @@ FreeLdrEnumerateInstallations( FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open SystemRoot %wZ, Status 0x%08lx\n", &SystemRootPath, Status); + DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", &SystemRootPath, Status); continue; } if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) { - ULONG DiskNumber, PartitionNumber; - PCWSTR PathComponent; + ULONG DiskNumber = 0, PartitionNumber = 0; + PCWSTR PathComponent = NULL; PDISKENTRY DiskEntry = NULL; PPARTENTRY PartEntry = NULL; - DPRINT1("Found a valid NTOS installation in SystemRoot ARC path %S, NT path %wZ\n", KeyData, &SystemRootPath); + DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", KeyData, &SystemRootPath); /* From the NT path, compute the disk, partition and path components */ if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) @@ -276,20 +300,21 @@ FreeLdrEnumerateInstallations( if (PartEntry && PartEntry->DriveLetter) { /* We have retrieved a partition that is mounted */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%s\"", - PartEntry->DriveLetter, PathComponent, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", + PartEntry->DriveLetter, PathComponent, &InstallName); } else { /* We failed somewhere, just show the NT path */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%s\"", - &SystemRootPath, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", + &SystemRootPath, &InstallName); } - AddNTOSInstallation(List, 0, 0 /*DiskNumber, PartitionNumber*/, KeyData, InstallNameW); + AddNTOSInstallation(List, KeyData, &SystemRootPath, PathComponent, + DiskNumber, PartitionNumber, PartEntry, + InstallNameW); } NtClose(SystemRootDirectory); - } } while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); @@ -313,7 +338,15 @@ NtLdrEnumerateInstallations( PINICACHEITERATOR Iterator; PINICACHESECTION IniSection; PWCHAR SectionName, KeyData; - WCHAR InstallName[MAX_PATH]; + UNICODE_STRING InstallName; + + HANDLE SystemRootDirectory; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PNTOS_INSTALLATION NtOsInstall; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; /* Open an *existing* FreeLdr.ini configuration file */ Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); @@ -341,40 +374,32 @@ NtLdrEnumerateInstallations( PWCHAR End = wcschr(Begin, L'"'); if (!End) End = Begin + wcslen(Begin); - StringCchCopyNW(InstallName, ARRAYSIZE(InstallName), - Begin, End - Begin); + RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); + InstallName.Length = InstallName.MaximumLength; } else { /* Non-quoted name, copy everything */ - StringCchCopyW(InstallName, ARRAYSIZE(InstallName), KeyData); + RtlInitUnicodeString(&InstallName, KeyData); } - DPRINT1("Possible installation '%S' with ARC path '%S'\n", InstallName, SectionName); + DPRINT1("Possible installation '%wZ' with ARC path '%S'\n", &InstallName, SectionName); - // FIXME TODO: Determine whether we indeed have an ARC path, in which case - // this is an NT installation, or, whether we have something else like a DOS - // path, which means that we are booting a boot sector... + DPRINT1(" Found a Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, SectionName); - DPRINT1(" Found a Win2k3 install '%S' with ARC path '%S'\n", InstallName, SectionName); - // TODO: Dissect it in order to retrieve the real disk drive & partition numbers. - // Note that in ARC path, the disk number is the BIOS disk number, so a conversion - // should be done. - { - HANDLE SystemRootDirectory; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING SystemRootPath; - WCHAR SystemRoot[MAX_PATH]; - WCHAR InstallNameW[MAX_PATH]; + // TODO: Normalize the ARC path. - // Note that in ARC path, the disk number is the BIOS disk number, so a conversion - // should be done. - - // TODO 1: Normalize the ARC path. - - // TODO 2: Check whether we already have an installation with this ARC path. - // If that's the case, stop there. If not, continue... + /* + * Check whether we already have an installation with this ARC path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, SectionName, NULL); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); + continue; + } /* * Convert the ARC path into an NT path, from which we will deduce @@ -384,18 +409,26 @@ NtLdrEnumerateInstallations( RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); if (!ArcPathToNtPath(&SystemRootPath, SectionName, PartList)) { - DPRINT1("ArcPathToNtPath(%S) failed, installation skipped.\n", SectionName); - // FIXME: Do not continue! + DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", SectionName); continue; } - DPRINT1("ArcPathToNtPath() succeeded: %S --> %wZ\n", SectionName, &SystemRootPath); + DPRINT1("ArcPathToNtPath() succeeded: '%S' --> '%wZ'\n", SectionName, &SystemRootPath); - // TODO 3: Check whether we already have an installation with this NT path. - // If that's the case, stop there. If not, continue... + /* + * Check whether we already have an installation with this NT path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, NULL /*SectionName*/, &SystemRootPath); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); + continue; + } /* Set SystemRootPath */ - DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: %wZ\n", &SystemRootPath); + DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); /* Open SystemRootPath */ InitializeObjectAttributes(&ObjectAttributes, @@ -411,18 +444,18 @@ NtLdrEnumerateInstallations( FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open SystemRoot %wZ, Status 0x%08lx\n", &SystemRootPath, Status); + DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", &SystemRootPath, Status); continue; } if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) { - ULONG DiskNumber, PartitionNumber; - PCWSTR PathComponent; + ULONG DiskNumber = 0, PartitionNumber = 0; + PCWSTR PathComponent = NULL; PDISKENTRY DiskEntry = NULL; PPARTENTRY PartEntry = NULL; - DPRINT1("Found a valid NTOS installation in SystemRoot ARC path %S, NT path %wZ\n", SectionName, &SystemRootPath); + DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", SectionName, &SystemRootPath); /* From the NT path, compute the disk, partition and path components */ if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) @@ -442,20 +475,21 @@ NtLdrEnumerateInstallations( if (PartEntry && PartEntry->DriveLetter) { /* We have retrieved a partition that is mounted */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%s\"", - PartEntry->DriveLetter, PathComponent, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", + PartEntry->DriveLetter, PathComponent, &InstallName); } else { /* We failed somewhere, just show the NT path */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%s\"", - &SystemRootPath, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", + &SystemRootPath, &InstallName); } - AddNTOSInstallation(List, 0, 0 /*DiskNumber, PartitionNumber*/, SectionName, InstallNameW); + AddNTOSInstallation(List, SectionName, &SystemRootPath, PathComponent, + DiskNumber, PartitionNumber, PartEntry, + InstallNameW); } NtClose(SystemRootDirectory); - } } while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); @@ -471,18 +505,18 @@ Quit: * Searches for a sub-string 'strSearch' inside 'str', similarly to what * wcsstr(str, strSearch) does, but ignores the case during the comparisons. */ -PWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) +PCWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) { - PWSTR cp = (PWSTR)str; - PWSTR s1, s2; + PCWSTR cp = str; + PCWSTR s1, s2; if (!*strSearch) - return (PWSTR)str; + return str; while (*cp) { s1 = cp; - s2 = (PWSTR)strSearch; + s2 = strSearch; while (*s1 && *s2 && (towupper(*s1) == towupper(*s2))) ++s1, ++s2; @@ -523,14 +557,14 @@ CheckForValidPEAndVendor( &FileHandle, &SectionHandle, &ViewBase, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open and map file %S, Status 0x%08lx\n", FileName, Status); + DPRINT1("Failed to open and map file '%S', Status 0x%08lx\n", FileName, Status); return FALSE; // Status; } /* Make sure it's a valid PE file */ if (!RtlImageNtHeader(ViewBase)) { - DPRINT1("File %S does not seem to be a valid PE, bail out\n", FileName); + DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", FileName); Status = STATUS_INVALID_IMAGE_FORMAT; goto UnmapFile; } @@ -542,7 +576,7 @@ CheckForValidPEAndVendor( Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get version resource for file %S, Status 0x%08lx\n", FileName, Status); + DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", FileName, Status); goto UnmapFile; } @@ -568,7 +602,7 @@ CheckForValidPEAndVendor( if (NT_SUCCESS(Status) /*&& pvData*/) { /* BufLen includes the NULL terminator count */ - DPRINT1("Found version vendor: \"%S\" for file %S\n", pvData, FileName); + DPRINT1("Found version vendor: \"%S\" for file '%S'\n", pvData, FileName); StringCbCopyNW(VendorName->Buffer, VendorName->MaximumLength, pvData, BufLen * sizeof(WCHAR)); @@ -579,7 +613,7 @@ CheckForValidPEAndVendor( } if (!NT_SUCCESS(Status)) - DPRINT1("No version vendor found for file %S\n", FileName); + DPRINT1("No version vendor found for file '%S'\n", FileName); UnmapFile: /* Finally, unmap and close the file */ @@ -602,8 +636,8 @@ IsValidNTOSInstallation( { BOOLEAN Success = FALSE; USHORT i; - WCHAR PathBuffer[MAX_PATH]; UNICODE_STRING VendorName; + WCHAR PathBuffer[MAX_PATH]; /* * Use either the 'SystemRootDirectory' handle or the 'SystemRoot' string, @@ -623,7 +657,7 @@ IsValidNTOSInstallation( StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\"); if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { - // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } @@ -631,7 +665,7 @@ IsValidNTOSInstallation( StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\drivers\\"); if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { - // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } @@ -639,7 +673,7 @@ IsValidNTOSInstallation( StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\config\\"); if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { - // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } @@ -650,12 +684,12 @@ IsValidNTOSInstallation( */ if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SYSTEM")) { - // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SOFTWARE")) { - // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } #endif @@ -723,9 +757,9 @@ DumpNTOSInstalls( NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); Entry = GetNextListEntry(Entry); - DPRINT1(" On disk #%d, partition #%d: Installation \"%S\" in SystemRoot %S\n", + DPRINT1(" On disk #%d, partition #%d: Installation \"%S\" in SystemRoot '%wZ'\n", NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, - NtOsInstall->InstallationName, NtOsInstall->SystemRoot); + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); } DPRINT1("Done.\n"); @@ -734,12 +768,22 @@ DumpNTOSInstalls( static PNTOS_INSTALLATION FindExistingNTOSInstall( IN PGENERIC_LIST List, - IN ULONG DiskNumber, - IN ULONG PartitionNumber, - IN PCWSTR SystemRoot) + IN PCWSTR SystemRootArcPath OPTIONAL, + IN PUNICODE_STRING SystemRootNtPath OPTIONAL // or PCWSTR ? + ) { PGENERIC_LIST_ENTRY Entry; PNTOS_INSTALLATION NtOsInstall; + UNICODE_STRING SystemArcPath; + + /* + * We search either via ARC path or NT path. + * If both pointers are NULL then we fail straight away. + */ + if (!SystemRootArcPath && !SystemRootNtPath) + return NULL; + + RtlInitUnicodeString(&SystemArcPath, SystemRootArcPath); Entry = GetFirstListEntry(List); while (Entry) @@ -747,9 +791,17 @@ FindExistingNTOSInstall( NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); Entry = GetNextListEntry(Entry); - if (NtOsInstall->DiskNumber == DiskNumber && - NtOsInstall->PartitionNumber == PartitionNumber && - _wcsicmp(NtOsInstall->SystemRoot, SystemRoot) == 0) + /* + * Note that if both ARC paths are equal, then the corresponding + * NT paths must be the same. However, two ARC paths may be different + * but resolve into the same NT path. + */ + if ( (SystemRootArcPath && + RtlEqualUnicodeString(&NtOsInstall->SystemArcPath, + &SystemArcPath, TRUE)) || + (SystemRootNtPath && + RtlEqualUnicodeString(&NtOsInstall->SystemNtPath, + SystemRootNtPath, TRUE)) ) { /* Found it! */ return NtOsInstall; @@ -762,20 +814,24 @@ FindExistingNTOSInstall( static PNTOS_INSTALLATION AddNTOSInstallation( IN PGENERIC_LIST List, + IN PCWSTR SystemRootArcPath, + IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ? + IN PCWSTR PathComponent, // Pointer inside SystemRootNtPath buffer IN ULONG DiskNumber, IN ULONG PartitionNumber, - IN PCWSTR SystemRoot, + IN PPARTENTRY PartEntry OPTIONAL, IN PCWSTR InstallationName) { PNTOS_INSTALLATION NtOsInstall; + SIZE_T ArcPathLength, NtPathLength; CHAR InstallNameA[MAX_PATH]; /* Is there already any installation with these settings? */ - NtOsInstall = FindExistingNTOSInstall(List, DiskNumber, PartitionNumber, SystemRoot); + NtOsInstall = FindExistingNTOSInstall(List, SystemRootArcPath, SystemRootNtPath); if (NtOsInstall) { - DPRINT1("An NTOS installation with name \"%S\" already exists on disk #%d, partition #%d, in SystemRoot %S\n", - NtOsInstall->InstallationName, NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, NtOsInstall->SystemRoot); + DPRINT1("An NTOS installation with name \"%S\" already exists on disk #%d, partition #%d, in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, &NtOsInstall->SystemNtPath); // // NOTE: We may use its "IsDefault" attribute, and only keep the entries that have IsDefault == TRUE... // Setting IsDefault to TRUE would imply searching for the "Default" entry in the loader configuration file. @@ -783,14 +839,34 @@ AddNTOSInstallation( return NtOsInstall; } + ArcPathLength = (wcslen(SystemRootArcPath) + 1) * sizeof(WCHAR); + // NtPathLength = ROUND_UP(SystemRootNtPath->Length + sizeof(UNICODE_NULL), sizeof(WCHAR)); + NtPathLength = SystemRootNtPath->Length + sizeof(UNICODE_NULL); + /* None was found, so add a new one */ - NtOsInstall = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(*NtOsInstall)); + NtOsInstall = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, + sizeof(*NtOsInstall) + + ArcPathLength + NtPathLength); if (!NtOsInstall) return NULL; NtOsInstall->DiskNumber = DiskNumber; NtOsInstall->PartitionNumber = PartitionNumber; - StringCchCopyW(NtOsInstall->SystemRoot, ARRAYSIZE(NtOsInstall->SystemRoot), SystemRoot); + NtOsInstall->PartEntry = PartEntry; + + RtlInitEmptyUnicodeString(&NtOsInstall->SystemArcPath, + (PWCHAR)(NtOsInstall + 1), + ArcPathLength); + RtlCopyMemory(NtOsInstall->SystemArcPath.Buffer, SystemRootArcPath, ArcPathLength); + NtOsInstall->SystemArcPath.Length = ArcPathLength - sizeof(UNICODE_NULL); + + RtlInitEmptyUnicodeString(&NtOsInstall->SystemNtPath, + (PWCHAR)((ULONG_PTR)(NtOsInstall + 1) + ArcPathLength), + NtPathLength); + RtlCopyUnicodeString(&NtOsInstall->SystemNtPath, SystemRootNtPath); + NtOsInstall->PathComponent = NtOsInstall->SystemNtPath.Buffer + + (PathComponent - SystemRootNtPath->Buffer); + StringCchCopyW(NtOsInstall->InstallationName, ARRAYSIZE(NtOsInstall->InstallationName), InstallationName); // Having the GENERIC_LIST storing the display item string plainly sucks... @@ -807,27 +883,25 @@ FindNTOSInstallations( IN PPARTENTRY PartEntry) { NTSTATUS Status; - UINT i; + ULONG DiskNumber = PartEntry->DiskEntry->DiskNumber; + ULONG PartitionNumber = PartEntry->PartitionNumber; HANDLE PartitionHandle, FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING PartitionRootPath; + UINT i; HANDLE SectionHandle; // SIZE_T ViewSize; ULONG FileSize; PVOID ViewBase; WCHAR PathBuffer[MAX_PATH]; -PDISKENTRY DiskEntry = PartEntry->DiskEntry; -ULONG DiskNumber = DiskEntry->DiskNumber; -ULONG PartitionNumber = PartEntry->PartitionNumber; - /* Set PartitionRootPath */ StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", DiskNumber, PartitionNumber); RtlInitUnicodeString(&PartitionRootPath, PathBuffer); - DPRINT1("FindNTOSInstallations: PartitionRootPath: %wZ\n", &PartitionRootPath); + DPRINT1("FindNTOSInstallations: PartitionRootPath: '%wZ'\n", &PartitionRootPath); /* Open the partition */ InitializeObjectAttributes(&ObjectAttributes, @@ -843,7 +917,7 @@ ULONG PartitionNumber = PartEntry->PartitionNumber; FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); + DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", &PartitionRootPath, Status); return; } @@ -854,7 +928,7 @@ ULONG PartitionNumber = PartEntry->PartitionNumber; if (!DoesFileExist(PartitionHandle, NULL, NtosBootLoaders[i].LoaderExecutable)) { /* The loader does not exist, continue with another one */ - DPRINT1("Loader executable %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); + DPRINT1("Loader executable '%S' does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); continue; } @@ -865,7 +939,7 @@ ULONG PartitionNumber = PartEntry->PartitionNumber; { /* The loader does not exist, continue with another one */ // FIXME: Consider it might be optional?? - DPRINT1("Loader configuration file %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderConfigurationFile); + DPRINT1("Loader configuration file '%S' does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderConfigurationFile); continue; } diff --git a/base/setup/usetup/osdetect.h b/base/setup/usetup/osdetect.h index bef666a172..5076784086 100644 --- a/base/setup/usetup/osdetect.h +++ b/base/setup/usetup/osdetect.h @@ -9,15 +9,15 @@ typedef struct _NTOS_INSTALLATION { LIST_ENTRY ListEntry; - ULONG DiskNumber; - ULONG PartitionNumber; - PPARTENTRY PartEntry; // BOOLEAN IsDefault; // TRUE / FALSE whether this installation is marked as "default" in its corresponding loader configuration file. // Vendor???? (Microsoft / ReactOS) -/**/WCHAR SystemRoot[MAX_PATH];/**/ UNICODE_STRING SystemArcPath; // Normalized ARC path UNICODE_STRING SystemNtPath; // Corresponding NT path -/**/WCHAR InstallationName[MAX_PATH];/**/ + PCWSTR PathComponent; // Pointer inside SystemNtPath.Buffer + ULONG DiskNumber; + ULONG PartitionNumber; + PPARTENTRY PartEntry; + WCHAR InstallationName[MAX_PATH]; } NTOS_INSTALLATION, *PNTOS_INSTALLATION; // EnumerateNTOSInstallations

1 0

06/07: [USETUP] Some fixes/improvements suggested by Thomas (1/2).
by Hermès Bélusca-Maïto 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3074ad7159f830ed5184e… commit 3074ad7159f830ed5184e0a6627b3d8a5ab9b1a3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 22 17:55:16 2017 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:01:00 2018 +0200 [USETUP] Some fixes/improvements suggested by Thomas (1/2). - isspace('\0') returns FALSE anyways so no need to separately test for a NULL character; - The (str/wcs)toul function cannot return a NULL pointer from its second paramter; - VersionInfo32_FindChild(): the third argument is indeed a number of characters (not bytes), so rename the parameter to make this fact clear. The function is however correctly used within this module. svn path=/branches/setup_improvements/; revision=74629 --- base/setup/lib/arcname.c | 5 ++--- base/setup/lib/ntverrsrc.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/base/setup/lib/arcname.c b/base/setup/lib/arcname.c index d2ea9d927a..60af00dbb1 100644 --- a/base/setup/lib/arcname.c +++ b/base/setup/lib/arcname.c @@ -142,7 +142,7 @@ ArcGetNextTokenA( KeyValue = strtoul(p, (PSTR*)&p, 10); /* Skip any trailing whitespace */ - while (*p && isspace(*p)) ++p; + while (isspace(*p)) ++p; /* The token must terminate with ')' */ if (*p != ')') @@ -202,10 +202,9 @@ ArcGetNextTokenU( */ // KeyValue = _wtoi(p); KeyValue = wcstoul(p, (PWSTR*)&p, 10); - ASSERT(p); /* Skip any trailing whitespace */ - while (*p && iswspace(*p)) ++p; + while (iswspace(*p)) ++p; /* The token must terminate with ')' */ if (*p != L')') diff --git a/base/setup/lib/ntverrsrc.c b/base/setup/lib/ntverrsrc.c index e788e12b12..d8c1c64fc6 100644 --- a/base/setup/lib/ntverrsrc.c +++ b/base/setup/lib/ntverrsrc.c @@ -104,13 +104,13 @@ static PCVS_VERSION_INFO_STRUCT32 VersionInfo32_FindChild( IN PCVS_VERSION_INFO_STRUCT32 info, IN PCWSTR szKey, - IN UINT cbKey) + IN UINT cchKey) { PCVS_VERSION_INFO_STRUCT32 child = VersionInfo32_Children(info); while ((ULONG_PTR)child < (ULONG_PTR)info + info->wLength) { - if (!_wcsnicmp(child->szKey, szKey, cbKey) && !child->szKey[cbKey]) + if (!_wcsnicmp(child->szKey, szKey, cchKey) && !child->szKey[cchKey]) return child; if (child->wLength == 0) return NULL;

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