Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [MEDIA][FONTS] Improve tahoma.ttf (Cyrillic and Latin) No.18

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dda81852976fb529ea9a1… commit dda81852976fb529ea9a10b81557ae1419e66920 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 19 20:30:12 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Nov 19 20:33:15 2019 +0900 [MEDIA][FONTS] Improve tahoma.ttf (Cyrillic and Latin) No.18 Tahoma font. Version 0.012 khmz. 11px LATIN CAPTIAL LETTER J. 11px LATIN CAPTIAL LETTER E WITH MACRON. 11px LATIN CAPITAL LETTER E WITH BREVE. 11px LATIN CAPITAL LETTER E WITH DOT ABOVE. 11px LATIN CAPITAL LETTER E WITH OGONEK. 11px LATIN CAPITAL LETTER E WITH CARON. 11px CYRILLIC CAPITAL LETTER IO. 11px CYRILLIC CAPITAL LETTER YERU. 11px CYRILLIC CAPITAL LETTER JE. 11px CYRILLIC CAPITAL LETTER KJE. CORE-8408 --- media/fonts/tahoma.ttf | Bin 155304 -> 155308 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index 80db951662a..44c8cd9b448 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

5 years, 1 month

[reactos] 01/01: [NTUSER] Fix condition of HSHELL_WINDOWCREATED (#2046)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=141cf04239f3049c1c180… commit 141cf04239f3049c1c180fb2c6c3aa84b13c8590 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 19 17:54:23 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 19 17:54:23 2019 +0900 [NTUSER] Fix condition of HSHELL_WINDOWCREATED (#2046) CORE-15655 If the owner window doesn't exist or is invisible or has WS_EX_TOOLWINDOW style, HSHELL_WINDOWCREATED regards the window a non-owned window. You can watch the shell hook information by using CORE-15655 ShellHookChecker.zip. --- win32ss/user/ntuser/window.c | 18 +++++++++++------- win32ss/user/ntuser/winpos.c | 16 +++++++++++----- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index c34dcea55f0..ee65215959d 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2351,13 +2351,17 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, IntSendParentNotify(Window, WM_CREATE); /* Notify the shell that a new window was created */ - if (UserIsDesktopWindow(Window->spwndParent) && - Window->spwndOwner == NULL && - (Window->style & WS_VISIBLE) && - (!(Window->ExStyle & WS_EX_TOOLWINDOW) || - (Window->ExStyle & WS_EX_APPWINDOW))) - { - co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)hWnd, 0); + if (Window->spwndOwner == NULL || + !(Window->spwndOwner->style & WS_VISIBLE) || + (Window->spwndOwner->ExStyle & WS_EX_TOOLWINDOW)) + { + if (UserIsDesktopWindow(Window->spwndParent) && + (Window->style & WS_VISIBLE) && + (!(Window->ExStyle & WS_EX_TOOLWINDOW) || + (Window->ExStyle & WS_EX_APPWINDOW))) + { + co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)hWnd, 0); + } } /* Initialize and show the window's scrollbars */ diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 10ec112e346..6467c2cad86 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1904,11 +1904,17 @@ co_WinPosSetWindowPos( } else if (WinPos.flags & SWP_SHOWWINDOW) { - if (UserIsDesktopWindow(Window->spwndParent) && - Window->spwndOwner == NULL && - (!(Window->ExStyle & WS_EX_TOOLWINDOW) || - (Window->ExStyle & WS_EX_APPWINDOW))) - co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); + if (Window->spwndOwner == NULL || + !(Window->spwndOwner->style & WS_VISIBLE) || + (Window->spwndOwner->ExStyle & WS_EX_TOOLWINDOW)) + { + if (UserIsDesktopWindow(Window->spwndParent) && + (!(Window->ExStyle & WS_EX_TOOLWINDOW) || + (Window->ExStyle & WS_EX_APPWINDOW))) + { + co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); + } + } Window->style |= WS_VISIBLE; //IntSetStyle( Window, WS_VISIBLE, 0 ); Window->head.pti->cVisWindows++;

5 years, 1 month

[reactos] 01/01: [USER32] Check whether the window is minimized upon SM_REPOSITION CORE-16490

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa264251a74e4d6e45f84… commit fa264251a74e4d6e45f843179c1dfa6985240754 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 19 10:32:06 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Nov 19 10:32:06 2019 +0900 [USER32] Check whether the window is minimized upon SM_REPOSITION CORE-16490 --- win32ss/user/user32/windows/dialog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 09879a74789..1acb4f55306 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -1190,6 +1190,9 @@ static void DEFDLG_Reposition(HWND hwnd) if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) return; + if (IsIconic(hwnd)) + return; + hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); if (!GetMonitorInfoW(hMon, &mi) || !GetWindowRect(hwnd, &rc))

5 years, 1 month

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.17

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36163a235b32433e31f2e… commit 36163a235b32433e31f2e4ed7530ef19452ad386 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 19 09:36:10 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Nov 19 09:36:10 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.17 Tahoma Bold. Version 0.009 khmz. 11px LATIN CAPITAL LETTER J. 11px LATIN SMALL LETTER F. 11px LATIN SMALL LETTER K. 11px CYRILLIC CAPITAL LETTER ZHE. 11px CYRILLIC CAPITAL LETTER EL. 11px CYRILLIC CAPITAL LETTER U. 11px CYRILLIC CAPITAL LETTER EF. 11px CYRILLIC CAPITAL LETTER SHA. 11px CYRILLIC CAPITAL LETTER YERU. 11px CYRILLIC CAPITAL LETTER YU. 11px CYRILLIC CAPITAL LETTER I. 11px CYRILLIC CAPITAL LETTER SHORT I. 11px CYRILLIC SMALL LETTER HARD SIGN. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160488 -> 160488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 1b0ef28bdd9..c527b28c786 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

5 years, 1 month

[reactos] 02/02: [SHELLBTRFS] Use again .data() method of vector class

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30986920687b2e35a0bc2… commit 30986920687b2e35a0bc280a71da85f8743d216c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Nov 14 15:01:55 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Nov 18 23:50:33 2019 +0100 [SHELLBTRFS] Use again .data() method of vector class This reverts commit 45a643a136eedf8b39d22f5add94fd372320fdee. This reverts commit a3c13c624f4a115f99560990f065dd94e4526304. This reverts commit 1725ddfd8f06bbff1b853c93be35f2b0ab672a01. --- dll/shellext/shellbtrfs/contextmenu.cpp | 20 -------------- dll/shellext/shellbtrfs/mountmgr_local.cpp | 44 ------------------------------ 2 files changed, 64 deletions(-) diff --git a/dll/shellext/shellbtrfs/contextmenu.cpp b/dll/shellext/shellbtrfs/contextmenu.cpp index bf4b5e92c09..3fbca1cb7c2 100755 --- a/dll/shellext/shellbtrfs/contextmenu.cpp +++ b/dll/shellext/shellbtrfs/contextmenu.cpp @@ -833,25 +833,15 @@ void BtrfsContextMenu::reflink_copy(HWND hwnd, const WCHAR* fn, const WCHAR* dir streambufsize += 0x1000; streambuf.resize(streambufsize); -#ifndef __REACTOS__ memset(streambuf.data(), 0, streambufsize); Status = NtQueryInformationFile(source, &iosb, streambuf.data(), streambufsize, FileStreamInformation); -#else - memset(&streambuf[0], 0, streambufsize); - - Status = NtQueryInformationFile(source, &iosb, &streambuf[0], streambufsize, FileStreamInformation); -#endif } while (Status == STATUS_BUFFER_OVERFLOW); if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); -#ifndef __REACTOS__ auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(streambuf.data()); -#else - auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(&streambuf[0]); -#endif while (true) { if (fsi->StreamNameLength > 0) { @@ -1535,25 +1525,15 @@ static void reflink_copy2(const wstring& srcfn, const wstring& destdir, const ws streambufsize += 0x1000; streambuf.resize(streambufsize); -#ifndef __REACTOS__ memset(streambuf.data(), 0, streambufsize); Status = NtQueryInformationFile(source, &iosb, streambuf.data(), streambufsize, FileStreamInformation); -#else - memset(&streambuf[0], 0, streambufsize); - - Status = NtQueryInformationFile(source, &iosb, &streambuf[0], streambufsize, FileStreamInformation); -#endif } while (Status == STATUS_BUFFER_OVERFLOW); if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); -#ifndef __REACTOS__ auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(streambuf.data()); -#else - auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(&streambuf[0]); -#endif while (true) { if (fsi->StreamNameLength > 0) { diff --git a/dll/shellext/shellbtrfs/mountmgr_local.cpp b/dll/shellext/shellbtrfs/mountmgr_local.cpp index 45a47e68e15..164cf4d4804 100644 --- a/dll/shellext/shellbtrfs/mountmgr_local.cpp +++ b/dll/shellext/shellbtrfs/mountmgr_local.cpp @@ -33,11 +33,7 @@ void mountmgr::create_point(const wstring_view& symlink, const wstring_view& dev IO_STATUS_BLOCK iosb; vector<uint8_t> buf(sizeof(MOUNTMGR_CREATE_POINT_INPUT) + ((symlink.length() + device.length()) * sizeof(WCHAR))); -#ifndef __REACTOS__ auto mcpi = reinterpret_cast<MOUNTMGR_CREATE_POINT_INPUT*>(buf.data()); -#else - auto mcpi = reinterpret_cast<MOUNTMGR_CREATE_POINT_INPUT*>(&buf[0]); -#endif mcpi->SymbolicLinkNameOffset = sizeof(MOUNTMGR_CREATE_POINT_INPUT); mcpi->SymbolicLinkNameLength = (USHORT)(symlink.length() * sizeof(WCHAR)); @@ -48,11 +44,7 @@ void mountmgr::create_point(const wstring_view& symlink, const wstring_view& dev memcpy((uint8_t*)mcpi + mcpi->DeviceNameOffset, device.data(), device.length() * sizeof(WCHAR)); Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_CREATE_POINT, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), nullptr, 0); -#else - &buf[0], (ULONG)buf.size(), nullptr, 0); -#endif if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); @@ -63,11 +55,7 @@ void mountmgr::delete_points(const wstring_view& symlink, const wstring_view& un IO_STATUS_BLOCK iosb; vector<uint8_t> buf(sizeof(MOUNTMGR_MOUNT_POINT) + ((symlink.length() + unique_id.length() + device_name.length()) * sizeof(WCHAR))); -#ifndef __REACTOS__ auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(buf.data()); -#else - auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(&buf[0]); -#endif memset(mmp, 0, sizeof(MOUNTMGR_MOUNT_POINT)); @@ -100,28 +88,16 @@ void mountmgr::delete_points(const wstring_view& symlink, const wstring_view& un } vector<uint8_t> buf2(sizeof(MOUNTMGR_MOUNT_POINTS)); -#ifndef __REACTOS__ auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data()); -#else - auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(&buf2[0]); -#endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_DELETE_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif if (Status == STATUS_BUFFER_OVERFLOW) { buf2.resize(mmps->Size); Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_DELETE_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif } if (!NT_SUCCESS(Status)) @@ -134,11 +110,7 @@ vector<mountmgr_point> mountmgr::query_points(const wstring_view& symlink, const vector<mountmgr_point> v; vector<uint8_t> buf(sizeof(MOUNTMGR_MOUNT_POINT) + ((symlink.length() + unique_id.length() + device_name.length()) * sizeof(WCHAR))); -#ifndef __REACTOS__ auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(buf.data()); -#else - auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(&buf[0]); -#endif memset(mmp, 0, sizeof(MOUNTMGR_MOUNT_POINT)); @@ -171,35 +143,19 @@ vector<mountmgr_point> mountmgr::query_points(const wstring_view& symlink, const } vector<uint8_t> buf2(sizeof(MOUNTMGR_MOUNT_POINTS)); -#ifndef __REACTOS__ auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data()); -#else - auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(&buf2[0]); -#endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) throw ntstatus_error(Status); buf2.resize(mmps->Size); -#ifndef __REACTOS__ mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data()); -#else - mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(&buf2[0]); -#endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif if (!NT_SUCCESS(Status)) throw ntstatus_error(Status);

5 years, 1 month

[reactos] 01/02: [SDK] Implement std::vector.data()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=114556b1c97859f81cf73… commit 114556b1c97859f81cf73881c5f2a5ad0de1c2df Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Nov 13 22:56:16 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Nov 18 23:50:33 2019 +0100 [SDK] Implement std::vector.data() --- sdk/include/c++/stlport/stl/_vector.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/c++/stlport/stl/_vector.h b/sdk/include/c++/stlport/stl/_vector.h index ed243ef3749..4eb9d755278 100644 --- a/sdk/include/c++/stlport/stl/_vector.h +++ b/sdk/include/c++/stlport/stl/_vector.h @@ -210,6 +210,9 @@ public: reference at(size_type __n) { _M_range_check(__n); return (*this)[__n]; } const_reference at(size_type __n) const { _M_range_check(__n); return (*this)[__n]; } + _Tp* data() { return this->_M_start; } + const _Tp* data() const { return this->_M_start; } + #if !defined (_STLP_DONT_SUP_DFLT_PARAM) explicit vector(const allocator_type& __a = allocator_type()) #else

5 years, 1 month

[reactos] 01/01: [OSK] Validate the registry value data on query (#2050)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48d81f845dd294d71f21d… commit 48d81f845dd294d71f21d3312a5a16c426c4904e Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Nov 18 21:25:51 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 18 21:25:51 2019 +0100 [OSK] Validate the registry value data on query (#2050) Ensure that the value data we query on loading the registry configuration settings matches with its data size --- base/applications/osk/settings.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/osk/settings.c b/base/applications/osk/settings.c index b1bcb210f96..1f4d9c94800 100644 --- a/base/applications/osk/settings.c +++ b/base/applications/osk/settings.c @@ -16,7 +16,7 @@ BOOL LoadDataFromRegistry(VOID) HKEY hKey; LONG lResult; DWORD dwValue; - DWORD cbData = sizeof(DWORD); + DWORD cbData = sizeof(dwValue); /* Initialize the registry application settings */ Globals.bShowWarning = TRUE; @@ -49,7 +49,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey); @@ -67,7 +67,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey); @@ -85,7 +85,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey); @@ -103,7 +103,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey); @@ -120,7 +120,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey); @@ -137,7 +137,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey);

5 years, 1 month

[reactos] 01/01: [OSK] Reduce the delay when redrawing LED keyboard resources (#1385)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=411a59961002b4e5ec9a7… commit 411a59961002b4e5ec9a79c3681c7a6e2fff6af7 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Nov 18 21:24:45 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 18 21:24:45 2019 +0100 [OSK] Reduce the delay when redrawing LED keyboard resources (#1385) 200 ms would mean that the LEDs redraw each 0,2 second and this adds a slight delay. This can be seen if you press the Num lock key (for example) many times in a row and the LED resources won't update instantly. Therefore reducing the value of uElapse should significantly decrease the delay and the LEDs should update in a realistic way. Furthermore, before invalidating the LED resource check the toggle state of the keys. --- base/applications/osk/main.c | 59 ++++++++++++++++++++++++++++++++++++----- base/applications/osk/precomp.h | 9 +++++++ 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index a467eb24518..7994571dfee 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -14,6 +14,13 @@ OSK_GLOBALS Globals; +OSK_KEYLEDINDICATOR LedKey[] = +{ + {VK_NUMLOCK, IDC_LED_NUM, 0x0145, FALSE}, + {VK_CAPITAL, IDC_LED_CAPS, 0x013A, FALSE}, + {VK_SCROLL, IDC_LED_SCROLL, 0x0146, FALSE} +}; + /* FUNCTIONS ******************************************************************/ /*********************************************************************** @@ -237,7 +244,7 @@ int OSK_DlgInitDialog(HWND hDlg) Globals.hBrushGreenLed = CreateSolidBrush(RGB(0, 255, 0)); /* Set a timer for periodics tasks */ - Globals.iTimer = SetTimer(hDlg, 0, 200, NULL); + Globals.iTimer = SetTimer(hDlg, 0, 50, NULL); return TRUE; } @@ -281,6 +288,29 @@ int OSK_DlgClose(void) return TRUE; } +/*********************************************************************** + * + * OSK_RefreshLEDKeys + * + * Updates (invalidates) the LED icon resources then the respective + * keys (Caps Lock, Scroll Lock or Num Lock) are being held down + */ +VOID OSK_RefreshLEDKeys(VOID) +{ + INT i; + BOOL bKeyIsPressed; + + for (i = 0; i < _countof(LedKey); i++) + { + bKeyIsPressed = (GetAsyncKeyState(LedKey[i].vKey) & 0x8000) != 0; + if (LedKey[i].bWasKeyPressed != bKeyIsPressed) + { + LedKey[i].bWasKeyPressed = bKeyIsPressed; + InvalidateRect(GetDlgItem(Globals.hMainWnd, LedKey[i].DlgResource), NULL, FALSE); + } + } +} + /*********************************************************************** * * OSK_DlgTimer @@ -298,10 +328,11 @@ int OSK_DlgTimer(void) Globals.hActiveWnd = hWndActiveWindow; } - /* Always redraw leds because it can be changed by the real keyboard) */ - InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_NUM), NULL, TRUE); - InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_CAPS), NULL, TRUE); - InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_SCROLL), NULL, TRUE); + /* + Update the LED key indicators accordingly to their state (if one + of the specific keys is held down). + */ + OSK_RefreshLEDKeys(); return TRUE; } @@ -320,6 +351,7 @@ BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl) BOOL bKeyDown; BOOL bKeyUp; LONG WindowStyle; + INT i; /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */ if (Globals.hActiveWnd) @@ -357,8 +389,23 @@ BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl) bKeyUp = TRUE; } - /* Extended key ? */ + /* Get the key from dialog control key command */ ScanCode = wCommand; + + /* + The user could've pushed one of the key buttons of the dialog that + can trigger particular function toggling (Caps Lock, Num Lock or Scroll Lock). Update + (invalidate) the LED icon resources accordingly. + */ + for (i = 0; i < _countof(LedKey); i++) + { + if (LedKey[i].wScanCode == ScanCode) + { + InvalidateRect(GetDlgItem(Globals.hMainWnd, LedKey[i].DlgResource), NULL, FALSE); + } + } + + /* Extended key ? */ if (ScanCode & 0x0200) bExtendedKey = TRUE; else diff --git a/base/applications/osk/precomp.h b/base/applications/osk/precomp.h index c1e7e50543d..e2503f787e4 100644 --- a/base/applications/osk/precomp.h +++ b/base/applications/osk/precomp.h @@ -46,6 +46,14 @@ typedef struct INT PosY; } OSK_GLOBALS; +typedef struct +{ + INT vKey; + INT DlgResource; + WORD wScanCode; + BOOL bWasKeyPressed; +} OSK_KEYLEDINDICATOR; + /* PROTOTYPES *****************************************************************/ /* main.c */ @@ -59,6 +67,7 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw); int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int); VOID OSK_RestoreDlgPlacement(HWND hDlg); +VOID OSK_RefreshLEDKeys(VOID); /* settings.c */ BOOL LoadDataFromRegistry(VOID);

5 years, 1 month

[reactos] 01/01: [CMAKE] Define HAVE_* constants unconditionally (follow-up to PR #2041) (#2052)

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb0f16433b0012b84bc13… commit eb0f16433b0012b84bc13c0a70afb4ee38f41d23 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Mon Nov 18 18:57:35 2019 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 18:57:35 2019 +0100 [CMAKE] Define HAVE_* constants unconditionally (follow-up to PR #2041) (#2052) sys/types.h is guaranteed to be available on all our supported host platforms and always contains a pid_t definition. --- sdk/include/host/CMakeLists.txt | 18 +----------------- sdk/include/host/{config.h.in => config.h} | 5 +++-- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/sdk/include/host/CMakeLists.txt b/sdk/include/host/CMakeLists.txt index 216e0120bdb..651367404a3 100644 --- a/sdk/include/host/CMakeLists.txt +++ b/sdk/include/host/CMakeLists.txt @@ -1,19 +1,3 @@ -include(CheckIncludeFile) -include(CheckTypeSize) - -# check for <sys/types.h> -CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) - -# check for pid_t definition -if (HAVE_SYS_TYPES_H) - set(CMAKE_EXTRA_INCLUDE_FILES "sys/types.h") - #this sets HAVE_PID_T - CHECK_TYPE_SIZE("pid_t" PID_T) - unset(CMAKE_EXTRA_INCLUDE_FILES) -endif() - -configure_file(config.h.in config.h @ONLY) - add_library(host_includes INTERFACE) -target_include_directories(host_includes INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(host_includes INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/sdk/include/host/config.h.in b/sdk/include/host/config.h similarity index 97% rename from sdk/include/host/config.h.in rename to sdk/include/host/config.h index 5ba4eaa7460..4da9f3baa59 100644 --- a/sdk/include/host/config.h.in +++ b/sdk/include/host/config.h @@ -4,11 +4,12 @@ #define __WINE_CONFIG_H /* Define to 1 if you have the <sys/types.h> header file. */ -#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ +#define HAVE_SYS_TYPES_H 1 /* Define to 1 if the system has the type `pid_t'. */ -#cmakedefine HAVE_PID_T 1 +#define HAVE_PID_T 1 +/* Define to 1 if you have the `spawnvp' function. */ #define HAVE_SPAWNVP 1 /* Define to 1 if you have the `z' library (-lz). */

5 years, 1 month

[reactos] 01/01: [SHELL32_APITEST] Add EnumPropW call CORE-11701

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=803532b8c2f87870fdf6a… commit 803532b8c2f87870fdf6a73bf63089b75a54558d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 18 20:20:12 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Nov 18 20:20:12 2019 +0900 [SHELL32_APITEST] Add EnumPropW call CORE-11701 --- modules/rostests/apitests/shell32/SHLimitInputEdit.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp index 2b08bd55226..9112b8f7f21 100644 --- a/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp +++ b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp @@ -228,6 +228,16 @@ STDMETHODIMP CShellFolder::GetValidCharacters( return S_OK; } +static BOOL CALLBACK +PropEnumProc( + HWND hwnd, + LPCWSTR lpszString, + HANDLE hData) +{ + trace("PropEnumProc: '%S' --> %p\n", lpszString, hData); + return TRUE; +} + static INT_PTR CALLBACK DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -266,6 +276,8 @@ DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) trace("GWLP_WNDPROC: %p\n", (void *)GetWindowLongPtr(hEdt1, GWLP_WNDPROC)); + EnumPropsW(hEdt1, PropEnumProc); + n = (INT)SendMessageW(hEdt1, EM_GETLIMITTEXT, 0, 0); ok_int(n, 234); }

5 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2019