Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/04: [LPK] Refactoring (#622).
by Baruch Rutman 26 Jul '18

26 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33d3e56cf4abbe57a7b0f… commit 33d3e56cf4abbe57a7b0f6cee682055894c92155 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Mon Jun 18 12:07:16 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 27 00:46:02 2018 +0200 [LPK] Refactoring (#622). - Moved lpDx and lpGlyphs operations to seperate brackets. - lpGlyphs == NULL checks + memory managment additions. CORE-14732 --- dll/win32/lpk/lpk.c | 67 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c index fde181cc52..656808ea5b 100644 --- a/dll/win32/lpk/lpk.c +++ b/dll/win32/lpk/lpk.c @@ -63,9 +63,6 @@ LpkExtTextOut( const INT *lpDx, INT unknown) { - LPWORD glyphs = NULL; - INT cGlyphs; - UNREFERENCED_PARAMETER(unknown); if (!(fuOptions & ETO_IGNORELANGUAGE)) @@ -81,16 +78,30 @@ LpkExtTextOut( /* Check if the string requires complex script processing and not a "glyph indices" array */ if (ScriptIsComplex(lpString, uCount, SIC_COMPLEX) == S_OK && !(fuOptions & ETO_GLYPH_INDEX)) { + LPWORD glyphs = NULL; + LPWSTR reordered_str = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WCHAR)); + INT cGlyphs; + BOOL bResult; + BIDI_Reorder(hdc, lpString, uCount, GCP_REORDER, (fuOptions & ETO_RTLREADING) ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR, - NULL, uCount, NULL, &glyphs, &cGlyphs); + reordered_str, uCount, NULL, &glyphs, &cGlyphs); - fuOptions |= ETO_GLYPH_INDEX; + if (glyphs) + { + fuOptions |= ETO_GLYPH_INDEX; - if (uCount > cGlyphs) - cGlyphs = uCount; + if (uCount != cGlyphs) + uCount = cGlyphs; + } - return ExtTextOutW(hdc, x, y, fuOptions, lprc, (LPWSTR)glyphs, cGlyphs, lpDx); + bResult = ExtTextOutW(hdc, x, y, fuOptions, lprc, + glyphs ? (LPWSTR)glyphs : reordered_str, uCount, lpDx); + + HeapFree(GetProcessHeap(), 0, glyphs); + HeapFree(GetProcessHeap(), 0, reordered_str); + + return bResult; } return ExtTextOutW(hdc, x, y, fuOptions, lprc, lpString, uCount, lpDx); @@ -132,28 +143,38 @@ LpkGetCharacterPlacement( lpResults->nGlyphs = (UINT)cGlyphs; if (lpResults->lpGlyphs) - wcscpy(lpResults->lpGlyphs, lpGlyphs); - - if (lpResults->lpDx && !(dwFlags & GCP_GLYPHSHAPE)) { - int c; - for (i = 0; i < nSet; i++) - { - if (GetCharWidth32W(hdc, lpResults->lpOutString[i], lpResults->lpOutString[i], &c)) - lpResults->lpDx[i] = c; - } + if (lpGlyphs) + wcscpy(lpResults->lpGlyphs, lpGlyphs); + + else if (lpResults->lpOutString) + GetGlyphIndicesW(hdc, lpResults->lpOutString, nSet, lpResults->lpGlyphs, 0); } - /* If glyph shaping was requested */ - else if (lpResults->lpDx && (dwFlags & GCP_GLYPHSHAPE)) + if (lpResults->lpDx) { - int c; + /* If glyph shaping was requested */ + if(dwFlags & GCP_GLYPHSHAPE) + { + int c; + + if (lpResults->lpGlyphs) + { + for (i = 0; i < lpResults->nGlyphs; i++) + { + if (GetCharWidth32W(hdc, lpResults->lpGlyphs[i], lpResults->lpGlyphs[i], &c)) + lpResults->lpDx[i] = c; + } + } + } - if (lpResults->lpGlyphs) + else { - for (i = 0; i < lpResults->nGlyphs; i++) + int c; + + for (i = 0; i < nSet; i++) { - if (GetCharWidth32W(hdc, lpGlyphs[i], lpGlyphs[i], &c)) + if (GetCharWidth32W(hdc, lpResults->lpOutString[i], lpResults->lpOutString[i], &c)) lpResults->lpDx[i] = c; } }

1 0

01/01: [USER32][WIN32SS] Implement TileWindows function (#678)
by Katayama Hirofumi MZ 26 Jul '18

26 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfc6b719cfccb199ce8b0… commit bfc6b719cfccb199ce8b0f656dce174a1a9a3a79 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 26 21:34:00 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jul 26 14:34:00 2018 +0200 [USER32][WIN32SS] Implement TileWindows function (#678) CORE-14815 --- win32ss/user/user32/windows/mdi.c | 189 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 181 insertions(+), 8 deletions(-) diff --git a/win32ss/user/user32/windows/mdi.c b/win32ss/user/user32/windows/mdi.c index 5e892de252..5d9d8bd6ff 100644 --- a/win32ss/user/user32/windows/mdi.c +++ b/win32ss/user/user32/windows/mdi.c @@ -2047,7 +2047,7 @@ GetCascadeChildProc(HWND hwnd, LPARAM lParam) return TRUE; } -static void +static BOOL QuerySizeFix(HWND hwnd, LPINT pcx, LPINT pcy) { MINMAXINFO mmi; @@ -2060,7 +2060,9 @@ QuerySizeFix(HWND hwnd, LPINT pcx, LPINT pcy) { *pcx = min(max(*pcx, mmi.ptMinTrackSize.x), mmi.ptMaxTrackSize.x); *pcy = min(max(*pcy, mmi.ptMinTrackSize.y), mmi.ptMaxTrackSize.y); + return TRUE; } + return FALSE; } WORD WINAPI @@ -2162,9 +2164,11 @@ CascadeWindows(HWND hwndParent, UINT wFlags, LPCRECT lpRect, if (cx != cxNew || cy != cyNew) { /* too large. shrink if we can */ - QuerySizeFix(hwnd, &cxNew, &cyNew); - cx = cxNew; - cy = cyNew; + if (QuerySizeFix(hwnd, &cxNew, &cyNew)) + { + cx = cxNew; + cy = cyNew; + } } } @@ -2216,11 +2220,180 @@ WORD WINAPI CascadeChildWindows( HWND parent, UINT flags ) * Failure: 0 */ WORD WINAPI -TileWindows (HWND hwndParent, UINT wFlags, LPCRECT lpRect, - UINT cKids, const HWND *lpKids) +TileWindows(HWND hwndParent, UINT wFlags, LPCRECT lpRect, + UINT cKids, const HWND *lpKids) { - FIXME("(%p,0x%08x,...,%u,...): stub\n", hwndParent, wFlags, cKids); - return 0; + HWND hwnd, hwndTop, hwndPrev; + CASCADE_INFO info; + RECT rcWork, rcWnd; + DWORD i, iRow, iColumn, cRows, cColumns, ret = 0; + INT x, y, cx, cy, cxNew, cyNew, cxWork, cyWork, cxCell, cyCell, cxMin2, cyMin3; + HDWP hDWP; + MONITORINFO mi; + HMONITOR hMon; + POINT pt; + + TRACE("(%p,0x%08x,...,%u,...)\n", hwndParent, wFlags, cKids); + + hwndTop = GetTopWindow(hwndParent); + + ZeroMemory(&info, sizeof(info)); + info.hwndDesktop = GetDesktopWindow(); + info.hTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL); + info.hwndProgman = FindWindowW(L"Progman", NULL); + info.hwndParent = hwndParent; + info.wFlags = wFlags; + + if (cKids == 0 || lpKids == NULL) + { + info.hwndTop = hwndTop; + EnumChildWindows(hwndParent, GetCascadeChildProc, (LPARAM)&info); + + info.hwndTop = NULL; + GetCascadeChildProc(hwndTop, (LPARAM)&info); + } + else + { + info.chwnd = cKids; + info.ahwnd = (HWND *)lpKids; + } + + if (info.chwnd == 0 || info.ahwnd == NULL) + return ret; + + if (lpRect) + { + rcWork = *lpRect; + } + else if (hwndParent) + { + GetClientRect(hwndParent, &rcWork); + } + else + { + pt.x = pt.y = 0; + hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTOPRIMARY); + mi.cbSize = sizeof(mi); + GetMonitorInfoW(hMon, &mi); + rcWork = mi.rcWork; + } + + cxWork = rcWork.right - rcWork.left; + cyWork = rcWork.bottom - rcWork.top; + + cxMin2 = GetSystemMetrics(SM_CXMIN) * 2; + cyMin3 = GetSystemMetrics(SM_CYMIN) * 3; + + /* calculate the numbers and widths of columns and rows */ + if (info.wFlags & MDITILE_HORIZONTAL) + { + cColumns = info.chwnd; + cRows = 1; + for (;;) + { + cxCell = cxWork / cColumns; + cyCell = cyWork / cRows; + if (cyCell <= cyMin3 || cxCell >= cxMin2) + break; + + ++cRows; + cColumns = (info.chwnd + cRows - 1) / cRows; + } + } + else + { + cRows = info.chwnd; + cColumns = 1; + for (;;) + { + cxCell = cxWork / cColumns; + cyCell = cyWork / cRows; + if (cxCell <= cxMin2 || cyCell >= cyMin3) + break; + + ++cColumns; + cRows = (info.chwnd + cColumns - 1) / cColumns; + } + } + + hDWP = BeginDeferWindowPos(info.chwnd); + if (hDWP == NULL) + goto cleanup; + + x = rcWork.left; + y = rcWork.top; + hwndPrev = NULL; + iRow = iColumn = 0; + for (i = info.chwnd; i > 0;) /* in reverse order */ + { + --i; + hwnd = info.ahwnd[i]; + + if (IsZoomed(hwnd)) + ShowWindow(hwnd, SW_RESTORE | SW_SHOWNA); + + GetWindowRect(hwnd, &rcWnd); + cx = rcWnd.right - rcWnd.left; + cy = rcWnd.bottom - rcWnd.top; + + /* if we can change the window size */ + if (GetWindowLongPtrW(hwnd, GWL_STYLE) & WS_THICKFRAME) + { + cxNew = cxCell; + cyNew = cyCell; + /* shrink if we can */ + if (QuerySizeFix(hwnd, &cxNew, &cyNew)) + { + cx = cxNew; + cy = cyNew; + } + } + + hDWP = DeferWindowPos(hDWP, hwnd, HWND_TOP, x, y, cx, cy, SWP_NOACTIVATE); + if (hDWP == NULL) + { + ret = 0; + goto cleanup; + } + + if (info.wFlags & MDITILE_HORIZONTAL) + { + x += cxCell; + ++iColumn; + if (iColumn >= cColumns) + { + iColumn = 0; + ++iRow; + x = rcWork.left; + y += cyCell; + } + } + else + { + y += cyCell; + ++iRow; + if (iRow >= cRows) + { + iRow = 0; + ++iColumn; + x += cxCell; + y = rcWork.top; + } + } + hwndPrev = hwnd; + ++ret; + } + + EndDeferWindowPos(hDWP); + + if (hwndPrev) + SetForegroundWindow(hwndPrev); + +cleanup: + if (cKids == 0 || lpKids == NULL) + HeapFree(GetProcessHeap(), 0, info.ahwnd); + + return (WORD)ret; }

1 0

01/01: [AUTOCHK] Improve readability of messages
by David Knapp 26 Jul '18

26 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bbb6bd4b5c8bb5e768ad… commit 7bbb6bd4b5c8bb5e768ade7e682677ebfee2c5dc Author: David Knapp <mazecraze96(a)gmail.com> AuthorDate: Thu Jul 26 01:28:42 2018 -0400 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Jul 26 07:28:42 2018 +0200 [AUTOCHK] Improve readability of messages --- base/system/autochk/autochk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/system/autochk/autochk.c b/base/system/autochk/autochk.c index 1940c651ec..5c133a8c5e 100644 --- a/base/system/autochk/autochk.c +++ b/base/system/autochk/autochk.c @@ -361,7 +361,7 @@ CheckVolume( return Status; } - PrintString(" The file system type is %S.\r\n", FileSystem); + PrintString(" The file system type is %S.\r\n\r\n", FileSystem); /* Call provider */ for (Count = 0; Count < sizeof(FileSystems) / sizeof(FileSystems[0]); ++Count) @@ -391,8 +391,8 @@ CheckVolume( /* Let the user decide whether to repair */ PrintString(" The file system on this volume needs to be checked for problems.\r\n"); - PrintString(" You may cancel this check, but it's recommended that you continue.\r\n"); - PrintString(" Press any key within %d second(s) to cancel and resume startup.\r\n", TimeOut); + PrintString(" You may cancel this check, but it's recommended that you continue.\r\n\r\n"); + PrintString(" Press any key within %d second(s) to cancel and resume startup.\r\n\r\n", TimeOut); /* Timeout == fix it! */ WaitStatus = WaitForKeyboard(TimeOut); @@ -404,7 +404,7 @@ CheckVolume( TRUE, // CheckOnlyIfDirty FALSE,// ScanDrive ChkdskCallback); - PrintString(" The system will now check the file system.\r\n"); + PrintString(" The system will now check the file system.\r\n\r\n"); } else {

1 0

02/02: [KMTESTS] Add compile time asserts for IO_STACK_LOCATION offsets CORE-14782
by Mark Jansen 25 Jul '18

25 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6ea0bcbbf59237c5c4d2… commit e6ea0bcbbf59237c5c4d2d270d7927a3cb49137a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 22 13:03:51 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jul 25 20:22:36 2018 +0200 [KMTESTS] Add compile time asserts for IO_STACK_LOCATION offsets CORE-14782 --- modules/rostests/kmtests/CMakeLists.txt | 1 + modules/rostests/kmtests/kmtest_drv/structs.c | 71 +++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index bb4ee5beba..bcc95c5e91 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -31,6 +31,7 @@ list(APPEND COMMON_SOURCE list(APPEND KMTEST_DRV_SOURCE kmtest_drv/guid.c kmtest_drv/kmtest_drv.c + kmtest_drv/structs.c kmtest_drv/testlist.c example/Example.c diff --git a/modules/rostests/kmtests/kmtest_drv/structs.c b/modules/rostests/kmtests/kmtest_drv/structs.c new file mode 100644 index 0000000000..9ee74dd64b --- /dev/null +++ b/modules/rostests/kmtests/kmtest_drv/structs.c @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite Struct alignment tests + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <kmt_test.h> + +// When searching for the correct offset, +// this will generate a compile-time error including the offset: +// char (*__kaboom1)[FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.EaLength)] = 1; +// Taken from https://stackoverflow.com/a/35261673 + +#if !defined(_AMD64_) + +C_ASSERT(sizeof(IO_STACK_LOCATION) == 36); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, MajorFunction) == 0); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, MinorFunction) == 1); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Flags) == 2); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Control) == 3); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.SecurityContext) == 4); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.Options) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.FileAttributes) == 12); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.ShareAccess) == 14); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.EaLength) == 16); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.WhichSpace) == 4); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Buffer) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Offset) == 12); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Length) == 16); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.Length) == 4); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.FileInformationClass) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.FileObject) == 12); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.ReplaceIfExists) == 16); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.AdvanceOnly) == 17); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.ClusterCount) == 16); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.DeleteHandle) == 16); + +#else + +C_ASSERT(sizeof(IO_STACK_LOCATION) == 72); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, MajorFunction) == 0); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, MinorFunction) == 1); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Flags) == 2); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Control) == 3); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.SecurityContext) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.Options) == 16); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.FileAttributes) == 24); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.ShareAccess) == 26); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.EaLength) == 32); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.WhichSpace) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Buffer) == 16); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Offset) == 24); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Length) == 32); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.Length) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.FileInformationClass) == 16); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.FileObject) == 24); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.ReplaceIfExists) == 32); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.AdvanceOnly) == 33); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.ClusterCount) == 32); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.DeleteHandle) == 32); + +#endif

1 0

01/02: [XDK][NDK] Restore struct alignment for IO_STACK_LOCATION CORE-14782
by Mark Jansen 25 Jul '18

25 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=370ffd112363898c9d071… commit 370ffd112363898c9d071797099517350999e910 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 22 13:02:20 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jul 25 20:22:36 2018 +0200 [XDK][NDK] Restore struct alignment for IO_STACK_LOCATION CORE-14782 --- sdk/include/xdk/iotypes.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h index d2a76b8451..8abcd02236 100644 --- a/sdk/include/xdk/iotypes.h +++ b/sdk/include/xdk/iotypes.h @@ -2746,6 +2746,10 @@ typedef struct _ACPI_INTERFACE_STANDARD2 { PUNREGISTER_FOR_DEVICE_NOTIFICATIONS2 UnregisterForDeviceNotifications; } ACPI_INTERFACE_STANDARD2, *PACPI_INTERFACE_STANDARD2; +#if !defined(_AMD64_) && !defined(_ARM_) +#include <pshpack4.h> +#endif + typedef struct _IO_STACK_LOCATION { UCHAR MajorFunction; UCHAR MinorFunction; @@ -2954,6 +2958,11 @@ typedef struct _IO_STACK_LOCATION { PVOID Context; } IO_STACK_LOCATION, *PIO_STACK_LOCATION; +#if !defined(_AMD64_) && !defined(_ARM_) +#include "poppack.h" +#endif + + /* IO_STACK_LOCATION.Control */ #define SL_PENDING_RETURNED 0x01

1 0

01/01: [EXPLORER] Fix creation of shortcuts in the start menu.
by Jared Smudde 24 Jul '18

24 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f2f03dd76f698795eaf3… commit 1f2f03dd76f698795eaf38730a695d7588dbdd2d Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Sun Jul 22 11:05:50 2018 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 25 00:57:58 2018 +0200 [EXPLORER] Fix creation of shortcuts in the start menu. --- base/shell/explorer/startmnucust.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/startmnucust.cpp b/base/shell/explorer/startmnucust.cpp index 92c41e6cdb..3c0334357f 100644 --- a/base/shell/explorer/startmnucust.cpp +++ b/base/shell/explorer/startmnucust.cpp @@ -26,7 +26,7 @@ VOID OnAddStartMenuItems(HWND hDlg) { WCHAR szPath[MAX_PATH]; - if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath))) + if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PROGRAMS, NULL, 0, szPath))) { WCHAR szCommand[MAX_PATH] = L"appwiz.cpl,NewLinkHere "; if (SUCCEEDED(StringCchCatW(szCommand, _countof(szCommand), szPath)))

1 0

01/01: Update README.md with the latest release
by Alisson Lauffer 24 Jul '18

24 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7572ff067bc671e6fa5c0… commit 7572ff067bc671e6fa5c021c925b6f62ee258687 Author: Alisson Lauffer <alissonvitortc(a)gmail.com> AuthorDate: Mon Jul 23 20:10:49 2018 -0300 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Jul 24 07:29:06 2018 +0200 Update README.md with the latest release --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4c11c75c83..bd125d188f 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ --- <p align=center> - <a href="https://reactos.org/project-news/reactos-048-released"> - <img alt="ReactOS 0.4.8 Release" src="https://img.shields.io/badge/release-0.4.8-0688CB.svg"> + <a href="https://reactos.org/project-news/reactos-049-released"> + <img alt="ReactOS 0.4.9 Release" src="https://img.shields.io/badge/release-0.4.9-0688CB.svg"> </a> <a href="https://reactos.org/download"> <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">

1 0

01/01: [SERVICES] Keep a global service bits variable that combines the service bits of all running services
by Eric Kohl 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66981e1b07519a5bdce8f… commit 66981e1b07519a5bdce8f3f29498d18a2e38b716 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 22 15:17:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Jul 23 01:48:49 2018 +0200 [SERVICES] Keep a global service bits variable that combines the service bits of all running services --- base/system/services/rpcserver.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 2e6e8087f1..fcfb1115a3 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -97,6 +97,7 @@ ScmServiceMapping = {SERVICE_READ, SERVICE_EXECUTE, SERVICE_ALL_ACCESS}; +DWORD g_dwServiceBits = 0; /* FUNCTIONS ***************************************************************/ @@ -1884,14 +1885,20 @@ RI_ScSetServiceBitsW( if (bSetBitsOn) { DPRINT("Old service bits: %08lx\n", pService->dwServiceBits); + DPRINT("Old global service bits: %08lx\n", g_dwServiceBits); pService->dwServiceBits |= dwServiceBits; + g_dwServiceBits |= dwServiceBits; DPRINT("New service bits: %08lx\n", pService->dwServiceBits); + DPRINT("New global service bits: %08lx\n", g_dwServiceBits); } else { DPRINT("Old service bits: %08lx\n", pService->dwServiceBits); + DPRINT("Old global service bits: %08lx\n", g_dwServiceBits); pService->dwServiceBits &= ~dwServiceBits; + g_dwServiceBits &= ~dwServiceBits; DPRINT("New service bits: %08lx\n", pService->dwServiceBits); + DPRINT("New global service bits: %08lx\n", g_dwServiceBits); } return ERROR_SUCCESS; @@ -2540,7 +2547,6 @@ RCreateServiceW( goto done; } -DPRINT1("\n"); /* Write the security descriptor */ dwError = ScmWriteSecurityDescriptor(hServiceKey, lpService->pSecurityDescriptor);

1 0

01/01: [KERNEL32] Use RtlStringCbCopyNW() to correctly fill the WIN32_FIND_DATA.cFileName and cAlternateFileName members without any overflow and with a terminating NULL character.
by Hermès Bélusca-Maïto 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2158f31b7128fea95f0ab… commit 2158f31b7128fea95f0ab5e40067dd93e70b8dca Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 22 21:32:38 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 21:32:38 2018 +0200 [KERNEL32] Use RtlStringCbCopyNW() to correctly fill the WIN32_FIND_DATA.cFileName and cAlternateFileName members without any overflow and with a terminating NULL character. --- dll/win32/kernel32/client/file/disk.c | 1 - dll/win32/kernel32/client/file/find.c | 39 +++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dll/win32/kernel32/client/file/disk.c b/dll/win32/kernel32/client/file/disk.c index 6d13e64acb..7fe8061666 100644 --- a/dll/win32/kernel32/client/file/disk.c +++ b/dll/win32/kernel32/client/file/disk.c @@ -19,7 +19,6 @@ */ #include <k32.h> -#include <strsafe.h> #define NDEBUG #include <debug.h> diff --git a/dll/win32/kernel32/client/file/find.c b/dll/win32/kernel32/client/file/find.c index 4a2d1520e6..b5fe7713e5 100644 --- a/dll/win32/kernel32/client/file/find.c +++ b/dll/win32/kernel32/client/file/find.c @@ -5,12 +5,14 @@ * PURPOSE: Find functions * PROGRAMMERS: Ariadne (ariadne(a)xs4all.nl) * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) - * Hermes BELUSCA - MAITO (hermes.belusca(a)sfr.fr) + * Hermes Belusca-Maito */ /* INCLUDES *******************************************************************/ #include <k32.h> +#include <ntstrsafe.h> + #define NDEBUG #include <debug.h> DEBUG_CHANNEL(kernel32file); @@ -71,7 +73,7 @@ typedef struct _FIND_FILE_DATA /* * For handling STATUS_BUFFER_OVERFLOW errors emitted by - * NtQueryDirectoryFile in the FildNextFile function. + * NtQueryDirectoryFile in the FindNextFile function. */ BOOLEAN HasMoreData; @@ -128,9 +130,9 @@ CopyDeviceFindData(OUT LPWIN32_FIND_DATAW lpFindFileData, /* Return the data */ RtlZeroMemory(lpFindFileData, sizeof(*lpFindFileData)); lpFindFileData->dwFileAttributes = FILE_ATTRIBUTE_ARCHIVE; - RtlCopyMemory(lpFindFileData->cFileName, - DeviceName, - Length); + RtlStringCbCopyNW(lpFindFileData->cFileName, + sizeof(lpFindFileData->cFileName), + DeviceName, Length); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -175,22 +177,22 @@ do { \ if (fInfoLevelId == FindExInfoStandard) { - RtlCopyMemory(lpFindFileData->cFileName, - DirInfo.BothDirInfo->FileName, - DirInfo.BothDirInfo->FileNameLength); - lpFindFileData->cFileName[DirInfo.BothDirInfo->FileNameLength / sizeof(WCHAR)] = UNICODE_NULL; - - RtlCopyMemory(lpFindFileData->cAlternateFileName, - DirInfo.BothDirInfo->ShortName, - DirInfo.BothDirInfo->ShortNameLength); - lpFindFileData->cAlternateFileName[DirInfo.BothDirInfo->ShortNameLength / sizeof(WCHAR)] = UNICODE_NULL; + RtlStringCbCopyNW(lpFindFileData->cFileName, + sizeof(lpFindFileData->cFileName), + DirInfo.BothDirInfo->FileName, + DirInfo.BothDirInfo->FileNameLength); + + RtlStringCbCopyNW(lpFindFileData->cAlternateFileName, + sizeof(lpFindFileData->cAlternateFileName), + DirInfo.BothDirInfo->ShortName, + DirInfo.BothDirInfo->ShortNameLength); } else if (fInfoLevelId == FindExInfoBasic) { - RtlCopyMemory(lpFindFileData->cFileName, - DirInfo.FullDirInfo->FileName, - DirInfo.FullDirInfo->FileNameLength); - lpFindFileData->cFileName[DirInfo.FullDirInfo->FileNameLength / sizeof(WCHAR)] = UNICODE_NULL; + RtlStringCbCopyNW(lpFindFileData->cFileName, + sizeof(lpFindFileData->cFileName), + DirInfo.FullDirInfo->FileName, + DirInfo.FullDirInfo->FileNameLength); lpFindFileData->cAlternateFileName[0] = UNICODE_NULL; } @@ -554,6 +556,7 @@ FindClose(HANDLE hFindFile) _SEH2_YIELD(return FALSE); } _SEH2_END; + return TRUE; }

1 0

02/02: [WIN32SS:NTUSER] Update SetWindowStationUser() and NtUserSetWindowStationUser() prototypes. Also, improve NtUserSetWindowStationUser() capture order, make psid optional as it should (and avoid a user-mode triggered BSOD), and initialize luidUser only when everything succeeded.
by Hermès Bélusca-Maïto 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b003d68ca58ce94766141… commit b003d68ca58ce94766141c779332e4c42b7fc430 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 8 20:39:19 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 19:26:53 2018 +0200 [WIN32SS:NTUSER] Update SetWindowStationUser() and NtUserSetWindowStationUser() prototypes. Also, improve NtUserSetWindowStationUser() capture order, make psid optional as it should (and avoid a user-mode triggered BSOD), and initialize luidUser only when everything succeeded. --- win32ss/include/ntuser.h | 8 ++-- win32ss/user/ntuser/winsta.c | 80 ++++++++++++++++++++++++++------------- win32ss/user/user32/misc/winsta.c | 6 +-- 3 files changed, 61 insertions(+), 33 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 724e3e612c..9e4b70938b 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -3289,10 +3289,10 @@ NtUserSetWindowsHookEx( BOOL NTAPI NtUserSetWindowStationUser( - HWINSTA hWindowStation, - PLUID pluid, - PSID psid, - DWORD size); + IN HWINSTA hWindowStation, + IN PLUID pluid, + IN PSID psid OPTIONAL, + IN DWORD size); WORD NTAPI diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index e999ba8a2c..44a8f40505 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -1482,16 +1482,18 @@ NtUserLockWorkStation(VOID) return ret; } -BOOL APIENTRY +BOOL +NTAPI NtUserSetWindowStationUser( - HWINSTA hWindowStation, - PLUID pluid, - PSID psid, - DWORD size) + IN HWINSTA hWindowStation, + IN PLUID pluid, + IN PSID psid OPTIONAL, + IN DWORD size) { + BOOL Ret = FALSE; NTSTATUS Status; PWINSTATION_OBJECT WindowStation = NULL; - BOOL Ret = FALSE; + LUID luidUser; UserEnterExclusive(); @@ -1501,53 +1503,79 @@ NtUserSetWindowStationUser( goto Leave; } + /* Validate the window station */ Status = IntValidateWindowStationHandle(hWindowStation, UserMode, 0, &WindowStation, - 0); + NULL); if (!NT_SUCCESS(Status)) { goto Leave; } - if (WindowStation->psidUser) - { - ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); - } - - WindowStation->psidUser = ExAllocatePoolWithTag(PagedPool, size, USERTAG_SECURITY); - if (WindowStation->psidUser == NULL) - { - EngSetLastError(ERROR_OUTOFMEMORY); - goto Leave; - } - + /* Capture the user LUID */ _SEH2_TRY { - ProbeForRead(psid, size, 1); ProbeForRead(pluid, sizeof(LUID), 1); - - RtlCopyMemory(WindowStation->psidUser, psid, size); - WindowStation->luidUser = *pluid; + luidUser = *pluid; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(goto Leave); } _SEH2_END; - if (!NT_SUCCESS(Status)) + /* Reset the window station user LUID */ + RtlZeroMemory(&WindowStation->luidUser, sizeof(LUID)); + + /* Reset the window station user SID */ + if (WindowStation->psidUser) { ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); WindowStation->psidUser = NULL; - goto Leave; } + /* Copy the new user SID if one has been provided */ + if (psid) + { + WindowStation->psidUser = ExAllocatePoolWithTag(PagedPool, size, USERTAG_SECURITY); + if (WindowStation->psidUser == NULL) + { + EngSetLastError(ERROR_OUTOFMEMORY); + goto Leave; + } + + Status = STATUS_SUCCESS; + _SEH2_TRY + { + ProbeForRead(psid, size, 1); + RtlCopyMemory(WindowStation->psidUser, psid, size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); + WindowStation->psidUser = NULL; + goto Leave; + } + } + + /* Copy the new user LUID */ + WindowStation->luidUser = luidUser; + Ret = TRUE; Leave: - if (WindowStation) ObDereferenceObject(WindowStation); + if (WindowStation) + ObDereferenceObject(WindowStation); + UserLeave(); return Ret; } diff --git a/win32ss/user/user32/misc/winsta.c b/win32ss/user/user32/misc/winsta.c index 11d4bb5a00..24f6d893b2 100644 --- a/win32ss/user/user32/misc/winsta.c +++ b/win32ss/user/user32/misc/winsta.c @@ -399,8 +399,8 @@ BOOL WINAPI SetWindowStationUser( IN HWINSTA hWindowStation, - IN PLUID pluid OPTIONAL, - IN PSID psid, + IN PLUID pluid, + IN PSID psid OPTIONAL, IN DWORD size) { BOOL Success; @@ -410,7 +410,7 @@ SetWindowStationUser( { /* Signal log-on/off to WINSRV */ - /* User is logging on if pluid != LuidNone, otherwise it is a log-off */ + /* User is logging on if *pluid != LuidNone, otherwise it is a log-off */ LUID LuidNone = {0, 0}; BOOL IsLogon = (pluid && !RtlEqualLuid(pluid, &LuidNone));

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