Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WIN32K:ENG] In PDEVOBJ_vRefreshModeList, find a proper match for the current display mode instead of assuming a constant index. CORE-15325
by Thomas Faber 16 Jun '19

16 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00e882c2b1ba302d01c2c… commit 00e882c2b1ba302d01c2c63a803d78e4fbac7168 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jun 15 21:25:01 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jun 16 12:45:58 2019 +0200 [WIN32K:ENG] In PDEVOBJ_vRefreshModeList, find a proper match for the current display mode instead of assuming a constant index. CORE-15325 --- win32ss/gdi/eng/pdevobj.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index 85098a58437..19c2fee06ba 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -266,6 +266,7 @@ PDEVOBJ_vRefreshModeList( PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEINFO pdminfo, pdmiNext; DEVMODEW dmDefault; + DEVMODEW dmCurrent; /* Lock the PDEV */ EngAcquireSemaphore(ppdev->hsemDevLock); @@ -274,6 +275,7 @@ PDEVOBJ_vRefreshModeList( /* Remember our default mode */ dmDefault = *pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm; + dmCurrent = *ppdev->pdmwDev; /* Clear out the modes */ for (pdminfo = pGraphicsDevice->pdevmodeInfo; @@ -293,7 +295,7 @@ PDEVOBJ_vRefreshModeList( DPRINT1("FIXME: EngpPopulateDeviceModeList failed, we just destroyed a perfectly good mode list\n"); } - ppdev->pdmwDev = pGraphicsDevice->pDevModeList[pGraphicsDevice->iCurrentMode].pdm; + ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, &dmCurrent); /* Unlock PDEV */ EngReleaseSemaphore(ppdev->hsemDevLock);

1 0

[reactos] 01/01: [HOSTNAME] Retrieve the DNS *host name* of the computer, and not the computer name. CORE-16095, ROSTESTS-326
by Hermès Bélusca-Maïto 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28ed2347ef8b382c0062e… commit 28ed2347ef8b382c0062e7001765ba3a9b5b7a3e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 16 01:00:40 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 16 01:00:40 2019 +0200 [HOSTNAME] Retrieve the DNS *host name* of the computer, and not the computer name. CORE-16095, ROSTESTS-326 --- base/applications/cmdutils/hostname/hostname.c | 69 ++++++++++++++------------ 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/base/applications/cmdutils/hostname/hostname.c b/base/applications/cmdutils/hostname/hostname.c index 4e49c5d4182..00ded61f1bf 100644 --- a/base/applications/cmdutils/hostname/hostname.c +++ b/base/applications/cmdutils/hostname/hostname.c @@ -1,28 +1,12 @@ /* - * ReactOS Win32 Applications - * Copyright (C) 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT : See COPYING in the top level directory - * PROJECT : ReactOS/Win32 get host name - * FILE : subsys/system/hostname/hostname.c - * PROGRAMMER: Emanuele Aliberti (ea(a)reactos.com) + * PROJECT: ReactOS Hostname Command + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Retrieves the current DNS host name of the computer. + * COPYRIGHT: Copyright 2005-2019 Emanuele Aliberti (ea(a)reactos.com) + * Copyright 2019 Hermes Belusca-Maito */ +#include <stdlib.h> #include <conio.h> #include <windef.h> @@ -35,35 +19,54 @@ int wmain(int argc, WCHAR* argv[]) { WCHAR Msg[100]; - if (1 == argc) + if (argc == 1) { - WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1] = L""; - DWORD ComputerNameSize = sizeof(ComputerName) / sizeof(ComputerName[0]); + BOOL bSuccess; + WCHAR LocalHostName[256] = L""; // MAX_COMPUTERNAME_LENGTH + 1 for NetBIOS name. + DWORD HostNameSize = _countof(LocalHostName); + PWSTR HostName = LocalHostName; + + /* Try to retrieve the host name using the local buffer */ + bSuccess = GetComputerNameExW(ComputerNameDnsHostname, HostName, &HostNameSize); + if (!bSuccess && (GetLastError() == ERROR_MORE_DATA)) + { + /* Retry with a larger buffer since the local buffer was too small */ + HostName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, HostNameSize * sizeof(WCHAR)); + if (HostName) + bSuccess = GetComputerNameExW(ComputerNameDnsHostname, HostName, &HostNameSize); + } - if (!GetComputerName(ComputerName, &ComputerNameSize)) + if (bSuccess) + { + /* Print out the host name */ + _cwprintf(L"%s\n", HostName); + } + + /* If a larger buffer has been allocated, free it */ + if (HostName && (HostName != LocalHostName)) + HeapFree(GetProcessHeap(), 0, HostName); + + if (!bSuccess) { /* Fail in case of error */ - LoadStringW(GetModuleHandle(NULL), IDS_ERROR, Msg, 100); + LoadStringW(GetModuleHandle(NULL), IDS_ERROR, Msg, _countof(Msg)); _cwprintf(L"%s %lu.\n", Msg, GetLastError()); return 1; } - - /* Print out the computer's name */ - _cwprintf(L"%s\n", ComputerName); } else { if ((wcsicmp(argv[1], L"-s") == 0) || (wcsicmp(argv[1], L"/s") == 0)) { - /* The program doesn't allow the user to set the computer's name */ - LoadStringW(GetModuleHandle(NULL), IDS_NOSET, Msg, 100); + /* The program doesn't allow the user to set the host name */ + LoadStringW(GetModuleHandle(NULL), IDS_NOSET, Msg, _countof(Msg)); _cwprintf(L"%s\n", Msg); return 1; } else { /* Let the user know what the program does */ - LoadStringW(GetModuleHandle(NULL), IDS_USAGE, Msg, 100); + LoadStringW(GetModuleHandle(NULL), IDS_USAGE, Msg, _countof(Msg)); _cwprintf(L"\n%s\n\n", Msg); } }

1 0

[reactos] 01/01: [ROSTESTS] Add a new test for "gethostname" in ws2_32_apitest. (#1630) ROSTESTS-326
by Doug-Lyons 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=077a1b8dba5dd643794e5… commit 077a1b8dba5dd643794e5c38118d6a318a95a954 Author: Doug-Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Jun 8 17:39:05 2019 -0500 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 16 00:15:55 2019 +0200 [ROSTESTS] Add a new test for "gethostname" in ws2_32_apitest. (#1630) ROSTESTS-326 Make the test more robust; clean up on failures. Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- modules/rostests/apitests/ws2_32/CMakeLists.txt | 3 +- modules/rostests/apitests/ws2_32/gethostname.c | 250 ++++++++++++++++++++++++ modules/rostests/apitests/ws2_32/testlist.c | 2 + 3 files changed, 254 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ws2_32/CMakeLists.txt b/modules/rostests/apitests/ws2_32/CMakeLists.txt index cae491a2fb2..d9ad4135c4a 100644 --- a/modules/rostests/apitests/ws2_32/CMakeLists.txt +++ b/modules/rostests/apitests/ws2_32/CMakeLists.txt @@ -3,6 +3,7 @@ list(APPEND SOURCE bind.c close.c getaddrinfo.c + gethostname.c getnameinfo.c getservbyname.c getservbyport.c @@ -22,6 +23,6 @@ list(APPEND SOURCE add_executable(ws2_32_apitest ${SOURCE} testlist.c) target_link_libraries(ws2_32_apitest wine ${PSEH_LIB}) set_module_type(ws2_32_apitest win32cui) -add_importlibs(ws2_32_apitest ws2_32 msvcrt iphlpapi kernel32 ntdll) +add_importlibs(ws2_32_apitest advapi32 iphlpapi ws2_32 msvcrt kernel32 ntdll) add_pch(ws2_32_apitest ws2_32.h SOURCE) add_rostests_file(TARGET ws2_32_apitest) diff --git a/modules/rostests/apitests/ws2_32/gethostname.c b/modules/rostests/apitests/ws2_32/gethostname.c new file mode 100644 index 00000000000..4bfb3c4a3db --- /dev/null +++ b/modules/rostests/apitests/ws2_32/gethostname.c @@ -0,0 +1,250 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Tests for Hostname command and Winsock gethostname() function. + * COPYRIGHT: Copyright 2019 Doug Lyons <douglyons(a)douglyons.com> + * Copyright 2019 Hermes Belusca-Maito + */ + +#include "ws2_32.h" + +#include <winreg.h> + +#define REG_HOSTNAME_KEY L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters" +#define REG_COMPUTERNAME_KEY L"System\\CurrentControlSet\\Control\\ComputerName\\ComputerName" + +HKEY +OpenRegKey( + IN HKEY hRootKey, + IN PCWSTR pszSubKey, + IN DWORD ulOptions) +{ + HKEY hKey = NULL; + LONG Error = RegOpenKeyExW(hRootKey, pszSubKey, 0, ulOptions, &hKey); + if (Error == ERROR_SUCCESS) + return hKey; + return NULL; +} + +BOOL +GetHostnameFromCommand( + OUT PSTR pszHostnameBuffer, + IN ULONG ulBufferSize) +{ + PCSTR file_name = "HostName123.txt"; + CHAR cmdline[MAX_PATH] = "hostname > "; + FILE *fp; + INT iResult; + INT len; + PCSTR ptr; + + ZeroMemory(pszHostnameBuffer, ulBufferSize * sizeof(CHAR)); + + /* Run the 'hostname' command, piping out its result to the temporary file */ + strcat(cmdline, file_name); + system(cmdline); + + /* Open the temporary file in read mode */ + fp = fopen(file_name, "r"); + ok(fp != NULL, "An error occurred while opening the file.\n"); + if (fp == NULL) + return FALSE; + + /* Read its contents */ + ptr = fgets(pszHostnameBuffer, ulBufferSize * sizeof(CHAR), fp); + ok(ptr != NULL, "An error occurred while reading the file.\n"); + if (ptr == NULL) + goto Cleanup; + + /* Delete the expected ending line feed character */ + len = strlen(pszHostnameBuffer); + if (pszHostnameBuffer[len-1] == '\r' || pszHostnameBuffer[len-1] == '\n') + pszHostnameBuffer[len-1] = ANSI_NULL; + +Cleanup: + /* Close and remove the file */ + iResult = fclose(fp); + ok(iResult == 0, "An error occurred while closing the file: %i.\n", iResult); + iResult = remove(file_name); + ok(iResult == 0, "An error occurred while deleting the file: %i.\n", iResult); + + return (ptr ? TRUE : FALSE); +} + +START_TEST(gethostname) +{ + INT pos; + HKEY hKeyHN; + DWORD cbData; + LONG Error; + INT hnError; + INT iResult; + WSADATA wsaData; + DWORD uApiHostNameSize; + CHAR szApiHostName[256] = ""; + CHAR szHostNameOld[256] = ""; + CHAR szHostNameNew[256] = ""; + CHAR hostbuffer[256] = ""; + +/* + * Notes about the retrieval of the computer name on Windows. + * + * - GetComputerName() (equivalently, GetComputerNameEx(ComputerNameNetBIOS)) + * retrieves the name cached in the registry value "ComputerName" under + * "System\\CurrentControlSet\\Control\\ComputerName\\ActiveComputerName" . + * + * - GetComputerNameEx(ComputerNameDnsHostname) as well as the 'hostname' command + return the registry value "Hostname" under "System\\CurrentControlSet\\Services\\Tcpip\\Parameters" . + * + * - In case a new computer name is set, its value is cached in the registry value + * "ComputerName" under "System\\CurrentControlSet\\Control\\ComputerName\\ComputerName", + * and also in the registry value "NV Hostname" under "System\\CurrentControlSet\\Services\\Tcpip\\Parameters" . + */ + + /* Retrieve the current host name using API */ + uApiHostNameSize = _countof(szApiHostName); + if (!GetComputerNameExA(ComputerNameDnsHostname, szApiHostName, &uApiHostNameSize)) + { + /* Fail in case of error */ + skip("GetComputerNameExA(ComputerNameDnsHostname) failed, error %lu\n", GetLastError()); + return; + } + printf("The Hostname from API is '%s'.\n", szApiHostName); + + /* Retrieve the current host name using the 'hostname' command */ + if (!GetHostnameFromCommand(hostbuffer, _countof(hostbuffer))) + { + /* Fail in case of error */ + skip("Error while retrieving the host name using the 'hostname' command!\n"); + return; + } + printf("The Hostname from command is '%s'.\n", hostbuffer); + + pos = strcmp(szApiHostName, hostbuffer); + printf("The test results were '%s'.\n", pos==0 ? "good" : "bad"); + ok(pos == 0, "hostbuffer '%s' should have been szApiHostName '%s'.\n", hostbuffer, szApiHostName); + + hKeyHN = OpenRegKey(HKEY_LOCAL_MACHINE, REG_HOSTNAME_KEY, KEY_ALL_ACCESS); + ok(hKeyHN != NULL, "Error while opening hostname registry key.\n"); + if (hKeyHN == NULL) + return; + + /* Get Old Hostname */ + szHostNameOld[0] = ANSI_NULL; + cbData = sizeof(szHostNameOld); + Error = RegQueryValueExA(hKeyHN, "Hostname", NULL, NULL, (LPBYTE)szHostNameOld, &cbData); + + printf("Hostname from Registry is '%s'.\n", szHostNameOld); + + pos = strcmp(szHostNameOld, szApiHostName); + printf("The test results were '%s'.\n", pos==0 ? "good" : "bad"); + ok(pos == 0, "szApiHostName '%s' should have been szHostNameOld '%s'.\n", szApiHostName, szHostNameOld); + + /* Change Hostname in the Registry */ + szHostNameNew[0] = ANSI_NULL; + strcat(szHostNameNew, "ROSHOSTNAME1"); + cbData = strlen(szHostNameNew) + 1; + + Error = RegSetValueExA(hKeyHN, "Hostname", 0, REG_SZ, (LPBYTE)szHostNameNew, cbData); + ok(Error == ERROR_SUCCESS, "Error setting new registry value (%ld).\n", GetLastError()); + + /* Retrieve the current host name using API */ + uApiHostNameSize = _countof(szApiHostName); + if (!GetComputerNameExA(ComputerNameDnsHostname, szApiHostName, &uApiHostNameSize)) + { + /* Fail in case of error */ + skip("GetComputerNameExA(ComputerNameDnsHostname) failed, error %lu\n", GetLastError()); + goto Cleanup; + } + printf("The Hostname from API is '%s'.\n", szApiHostName); + + /* Retrieve the current host name using the 'hostname' command */ + if (!GetHostnameFromCommand(hostbuffer, _countof(hostbuffer))) + { + /* Fail in case of error */ + skip("Error while retrieving the host name using the 'hostname' command!\n"); + goto Cleanup; + } + printf("The Hostname from command is '%s'.\n", hostbuffer); + + pos = strcmp(szHostNameNew, szApiHostName); + printf("The test results were '%s'.\n", pos==0 ? "good" : "bad"); + ok(pos == 0, "szApiHostName '%s' should be szHostNameNew '%s'.\n", szApiHostName, szHostNameNew); + + pos = strcmp(szHostNameNew, hostbuffer); + printf("The test results were '%s'.\n", pos==0 ? "good" : "bad"); + ok(pos == 0, "hostbuffer '%s' should have been szHostNameNew '%s'.\n", hostbuffer, szHostNameNew); + + /* Reset the original registry entry */ + cbData = strlen(szHostNameOld) + 1; + + Error = RegSetValueExA(hKeyHN, "Hostname", 0, REG_SZ, (LPBYTE)szHostNameOld, cbData); + ok(Error == ERROR_SUCCESS, "Error resetting new registry value back (%ld).\n", GetLastError()); + +/*============ Winsock Checks ===============*/ + + /* Start up Winsock to use gethostname() */ + iResult = WSAStartup(MAKEWORD(2,2), &wsaData); + ok(iResult == 0, "Error occurred starting Winsock"); + if (iResult != 0) + goto Cleanup; + + /* Retrieve gethostname() */ + hnError = gethostname(hostbuffer, sizeof(hostbuffer)); + ok(!hnError, "Winsock gethostname() Error is '%d'.\n", WSAGetLastError()); + + /* Display results */ + if (!hnError) + printf("Winsock gethostname() is '%s'.\n", hostbuffer); + + pos = strcmp(szHostNameOld, hostbuffer); + printf("The test results were '%s'.\n", pos==0 ? "good" : "bad"); + ok(pos == 0, "szHostNameOld '%s' should be hostbuffer '%s'.\n", szHostNameOld, hostbuffer); + + /* Change Hostname in the Registry */ + szHostNameNew[0] = ANSI_NULL; + strcat(szHostNameNew, "ROSHOSTNAME1"); + cbData = strlen(szHostNameNew) + 1; + + Error = RegSetValueExA(hKeyHN, "Hostname", 0, REG_SZ, (LPBYTE)szHostNameNew, cbData); + ok(Error == ERROR_SUCCESS, "Error setting new registry value (%ld).\n", GetLastError()); + + /* Retrieve gethostname() */ + hnError = gethostname(hostbuffer, sizeof(hostbuffer)); + ok(!hnError, "Winsock gethostname() Error is '%d'.\n", WSAGetLastError()); + + /* Display results */ + if (!hnError) + printf("Winsock gethostname() is '%s'.\n", hostbuffer); + + pos = strcmp(szHostNameNew, hostbuffer); + printf("The test results were '%s'.\n", pos==0 ? "good" : "bad"); + ok(pos == 0, "szHostNameNew '%s' should be hostbuffer '%s'.\n", szHostNameNew, hostbuffer); + + /* Reset the original registry entry */ + cbData = strlen(szHostNameOld) + 1; + + Error = RegSetValueExA(hKeyHN, "Hostname", 0, REG_SZ, (LPBYTE)szHostNameOld, cbData); + ok(Error == ERROR_SUCCESS, "Error resetting new registry value back (%ld).\n", GetLastError()); + + /* Retrieve gethostname() */ + hnError = gethostname(hostbuffer, sizeof(hostbuffer)); + ok(!hnError, "Winsock gethostname() Error is '%d'.\n", WSAGetLastError()); + + /* Display results */ + if (!hnError) + printf("Winsock gethostname() is '%s'.\n", hostbuffer); + + pos = strcmp(szHostNameOld, hostbuffer); + printf("The test results were '%s'.\n", pos==0 ? "good" : "bad"); + ok(pos == 0, "szHostNameOld '%s' should be hostbuffer '%s'.\n", szHostNameOld, hostbuffer); + +Cleanup: + iResult = WSACleanup(); + ok(iResult == 0, "WSACleanup error occurred ending Winsock"); + + Error = RegCloseKey(hKeyHN); + ok(Error == ERROR_SUCCESS, "Error closing registry key (%ld).\n", GetLastError()); + + return; +} diff --git a/modules/rostests/apitests/ws2_32/testlist.c b/modules/rostests/apitests/ws2_32/testlist.c index 8e33e8daa3f..acf4feaf592 100644 --- a/modules/rostests/apitests/ws2_32/testlist.c +++ b/modules/rostests/apitests/ws2_32/testlist.c @@ -6,6 +6,7 @@ extern void func_bind(void); extern void func_close(void); extern void func_getaddrinfo(void); +extern void func_gethostname(void); extern void func_getnameinfo(void); extern void func_getservbyname(void); extern void func_getservbyport(void); @@ -25,6 +26,7 @@ const struct test winetest_testlist[] = { "bind", func_bind }, { "close", func_close }, { "getaddrinfo", func_getaddrinfo }, + { "gethostname", func_gethostname }, { "getnameinfo", func_getnameinfo }, { "getservbyname", func_getservbyname }, { "getservbyport", func_getservbyport },

1 0

[reactos] 03/03: [WIN32K] Use KeStackAttachProcess
by Mark Jansen 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04712d418cad53d7df072… commit 04712d418cad53d7df072a8b55672f22a8212e71 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Jun 12 18:52:14 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jun 15 21:26:41 2019 +0200 [WIN32K] Use KeStackAttachProcess --- win32ss/user/ntuser/hook.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/win32ss/user/ntuser/hook.c b/win32ss/user/ntuser/hook.c index 735578d0eaf..792d195470a 100644 --- a/win32ss/user/ntuser/hook.c +++ b/win32ss/user/ntuser/hook.c @@ -1040,7 +1040,6 @@ IntRemoveHook(PVOID Object) PTHREADINFO ptiHook, pti; PDESKTOP pdo; PHOOK Hook = Object; - BOOL bOtherProcess; NT_ASSERT(UserIsEnteredExclusive()); @@ -1055,11 +1054,14 @@ IntRemoveHook(PVOID Object) if (IsListEmpty(&ptiHook->aphkStart[HOOKID_TO_INDEX(HookId)])) { + BOOL bOtherProcess; + KAPC_STATE ApcState; + ptiHook->fsHooks &= ~HOOKID_TO_FLAG(HookId); bOtherProcess = (ptiHook->ppi != pti->ppi); if (bOtherProcess) - KeAttachProcess(&ptiHook->ppi->peProcess->Pcb); + KeStackAttachProcess(&ptiHook->ppi->peProcess->Pcb, &ApcState); _SEH2_TRY { @@ -1073,7 +1075,7 @@ IntRemoveHook(PVOID Object) _SEH2_END; if (bOtherProcess) - KeDetachProcess(); + KeUnstackDetachProcess(&ApcState); } } else // Global @@ -1601,7 +1603,9 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, } else { - KeAttachProcess(&ptiHook->ppi->peProcess->Pcb); + KAPC_STATE ApcState; + + KeStackAttachProcess(&ptiHook->ppi->peProcess->Pcb, &ApcState); _SEH2_TRY { ptiHook->pClientInfo->fsHooks = ptiHook->fsHooks; @@ -1612,7 +1616,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, ERR("Problem writing to Remote ClientInfo!\n"); } _SEH2_END; - KeDetachProcess(); + KeUnstackDetachProcess(&ApcState); } } }

1 0

[reactos] 02/03: [WIN32K] Attach to the target process before unhooking CORE-16083
by Mark Jansen 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97d15909142b04f12b95e… commit 97d15909142b04f12b95ef21b7507a0835eb7741 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jun 10 19:47:50 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jun 15 21:26:41 2019 +0200 [WIN32K] Attach to the target process before unhooking CORE-16083 --- win32ss/user/ntuser/hook.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/hook.c b/win32ss/user/ntuser/hook.c index 904b53aa7b1..735578d0eaf 100644 --- a/win32ss/user/ntuser/hook.c +++ b/win32ss/user/ntuser/hook.c @@ -1037,12 +1037,15 @@ BOOLEAN IntRemoveHook(PVOID Object) { INT HookId; - PTHREADINFO ptiHook; + PTHREADINFO ptiHook, pti; PDESKTOP pdo; PHOOK Hook = Object; + BOOL bOtherProcess; + NT_ASSERT(UserIsEnteredExclusive()); HookId = Hook->HookId; + pti = PsGetCurrentThreadWin32Thread(); if (Hook->ptiHooked) // Local { @@ -1053,6 +1056,10 @@ IntRemoveHook(PVOID Object) if (IsListEmpty(&ptiHook->aphkStart[HOOKID_TO_INDEX(HookId)])) { ptiHook->fsHooks &= ~HOOKID_TO_FLAG(HookId); + bOtherProcess = (ptiHook->ppi != pti->ppi); + + if (bOtherProcess) + KeAttachProcess(&ptiHook->ppi->peProcess->Pcb); _SEH2_TRY { @@ -1064,6 +1071,9 @@ IntRemoveHook(PVOID Object) (void)0; } _SEH2_END; + + if (bOtherProcess) + KeDetachProcess(); } } else // Global

1 0

[reactos] 01/03: [WIN32K] Fix indenting in IntRemoveHook
by Mark Jansen 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a3937ddaf004753107f3… commit 7a3937ddaf004753107f33dd29ce2c2d80dea8a5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jun 10 19:43:12 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jun 15 21:26:35 2019 +0200 [WIN32K] Fix indenting in IntRemoveHook --- win32ss/user/ntuser/hook.c | 50 ++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/win32ss/user/ntuser/hook.c b/win32ss/user/ntuser/hook.c index 558f3f975a4..904b53aa7b1 100644 --- a/win32ss/user/ntuser/hook.c +++ b/win32ss/user/ntuser/hook.c @@ -1037,45 +1037,47 @@ BOOLEAN IntRemoveHook(PVOID Object) { INT HookId; - PTHREADINFO pti; + PTHREADINFO ptiHook; PDESKTOP pdo; PHOOK Hook = Object; + HookId = Hook->HookId; if (Hook->ptiHooked) // Local { - pti = Hook->ptiHooked; + ptiHook = Hook->ptiHooked; - IntFreeHook( Hook); + IntFreeHook(Hook); - if ( IsListEmpty(&pti->aphkStart[HOOKID_TO_INDEX(HookId)]) ) - { - pti->fsHooks &= ~HOOKID_TO_FLAG(HookId); - _SEH2_TRY - { - pti->pClientInfo->fsHooks = pti->fsHooks; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Do nothing */ - (void)0; - } - _SEH2_END; + if (IsListEmpty(&ptiHook->aphkStart[HOOKID_TO_INDEX(HookId)])) + { + ptiHook->fsHooks &= ~HOOKID_TO_FLAG(HookId); + + _SEH2_TRY + { + ptiHook->pClientInfo->fsHooks = ptiHook->fsHooks; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + (void)0; + } + _SEH2_END; } } else // Global { - IntFreeHook( Hook); + IntFreeHook(Hook); - pdo = IntGetActiveDesktop(); + pdo = IntGetActiveDesktop(); - if ( pdo && - pdo->pDeskInfo && - IsListEmpty(&pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) ) - { - pdo->pDeskInfo->fsHooks &= ~HOOKID_TO_FLAG(HookId); - } + if (pdo && + pdo->pDeskInfo && + IsListEmpty(&pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)])) + { + pdo->pDeskInfo->fsHooks &= ~HOOKID_TO_FLAG(HookId); + } } return TRUE;

1 0

[reactos] 01/01: [NTFS] Do not print debug message for every function call by default
by Victor Perevertkin 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=155243494059037a5cccd… commit 155243494059037a5cccd3b1c57f0b77ca897c95 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sat Jun 15 19:24:27 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Jun 15 19:24:27 2019 +0300 [NTFS] Do not print debug message for every function call by default --- drivers/filesystems/ntfs/btree.c | 30 +++++++++++++++--------------- drivers/filesystems/ntfs/create.c | 14 +++++++------- drivers/filesystems/ntfs/dirctl.c | 4 ++-- drivers/filesystems/ntfs/fcb.c | 14 +++++++------- drivers/filesystems/ntfs/finfo.c | 10 +++++----- drivers/filesystems/ntfs/fsctl.c | 10 +++++----- drivers/filesystems/ntfs/rw.c | 2 +- drivers/filesystems/ntfs/volinfo.c | 10 +++++----- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/drivers/filesystems/ntfs/btree.c b/drivers/filesystems/ntfs/btree.c index a702e25b335..2e772dd03c1 100644 --- a/drivers/filesystems/ntfs/btree.c +++ b/drivers/filesystems/ntfs/btree.c @@ -694,7 +694,7 @@ CreateBTreeFromIndex(PDEVICE_EXTENSION Vcb, PNTFS_ATTR_CONTEXT IndexAllocationContext = NULL; NTSTATUS Status; - DPRINT1("CreateBTreeFromIndex(%p, %p)\n", IndexRoot, NewTree); + DPRINT("CreateBTreeFromIndex(%p, %p)\n", IndexRoot, NewTree); if (!Tree || !RootNode || !CurrentKey) { @@ -920,7 +920,7 @@ CreateIndexRootFromBTree(PDEVICE_EXTENSION DeviceExt, DeviceExt->NtfsInfo.BytesPerFileRecord, TAG_NTFS); - DPRINT1("CreateIndexRootFromBTree(%p, %p, 0x%lx, %p, %p)\n", DeviceExt, Tree, MaxIndexSize, IndexRoot, Length); + DPRINT("CreateIndexRootFromBTree(%p, %p, 0x%lx, %p, %p)\n", DeviceExt, Tree, MaxIndexSize, IndexRoot, Length); #ifndef NDEBUG DumpBTree(Tree); @@ -1091,7 +1091,7 @@ DemoteBTreeRoot(PB_TREE Tree) PB_TREE_FILENAME_NODE NewSubNode, NewIndexRoot; PB_TREE_KEY DummyKey; - DPRINT1("Collapsing Index Root into sub-node.\n"); + DPRINT("Collapsing Index Root into sub-node.\n"); #ifndef NDEBUG DumpBTree(Tree); @@ -1192,7 +1192,7 @@ UpdateIndexAllocation(PDEVICE_EXTENSION DeviceExt, ULONG i; ULONG IndexAllocationOffset; - DPRINT1("UpdateIndexAllocation() called.\n"); + DPRINT("UpdateIndexAllocation() called.\n"); Status = FindAttribute(DeviceExt, FileRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationContext, &IndexAllocationOffset); if (NT_SUCCESS(Status)) @@ -1708,16 +1708,16 @@ NtfsInsertKey(PB_TREE Tree, *MedianKey = NULL; *NewRightHandSibling = NULL; - DPRINT1("NtfsInsertKey(%p, 0x%I64x, %p, %p, %s, %lu, %lu, %p, %p)\n", - Tree, - FileReference, - FileNameAttribute, - Node, - CaseSensitive ? "TRUE" : "FALSE", - MaxIndexRootSize, - IndexRecordSize, - MedianKey, - NewRightHandSibling); + DPRINT("NtfsInsertKey(%p, 0x%I64x, %p, %p, %s, %lu, %lu, %p, %p)\n", + Tree, + FileReference, + FileNameAttribute, + Node, + CaseSensitive ? "TRUE" : "FALSE", + MaxIndexRootSize, + IndexRecordSize, + MedianKey, + NewRightHandSibling); // Create the key for the filename attribute NewKey = CreateBTreeKeyFromFilename(FileReference, FileNameAttribute); @@ -1893,7 +1893,7 @@ SplitBTreeNode(PB_TREE Tree, ULONG SizeSum; ULONG i; - DPRINT1("SplitBTreeNode(%p, %p, %p, %p, %s) called\n", + DPRINT("SplitBTreeNode(%p, %p, %p, %p, %s) called\n", Tree, Node, MedianKey, diff --git a/drivers/filesystems/ntfs/create.c b/drivers/filesystems/ntfs/create.c index 0ce5771ae3c..f5b5d518ee2 100644 --- a/drivers/filesystems/ntfs/create.c +++ b/drivers/filesystems/ntfs/create.c @@ -111,7 +111,7 @@ NtfsMoonWalkID(PDEVICE_EXTENSION DeviceExt, WCHAR FullPath[MAX_PATH]; ULONG WritePosition = MAX_PATH - 1; - DPRINT1("NtfsMoonWalkID(%p, %I64x, %p)\n", DeviceExt, Id, OutPath); + DPRINT("NtfsMoonWalkID(%p, %I64x, %p)\n", DeviceExt, Id, OutPath); RtlZeroMemory(FullPath, sizeof(FullPath)); MftRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); @@ -181,7 +181,7 @@ NtfsOpenFileById(PDEVICE_EXTENSION DeviceExt, PNTFS_FCB FCB; PFILE_RECORD_HEADER MftRecord; - DPRINT1("NtfsOpenFileById(%p, %p, %I64x, %p)\n", DeviceExt, FileObject, MftId, FoundFCB); + DPRINT("NtfsOpenFileById(%p, %p, %I64x, %p)\n", DeviceExt, FileObject, MftId, FoundFCB); ASSERT(MftId < NTFS_FILE_FIRST_USER_FILE); if (MftId > 0xb) /* No entries are used yet beyond this */ @@ -250,7 +250,7 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt, NTSTATUS Status; PWSTR AbsFileName = NULL; - DPRINT1("NtfsOpenFile(%p, %p, %S, %s, %p)\n", + DPRINT("NtfsOpenFile(%p, %p, %S, %s, %p)\n", DeviceExt, FileObject, FileName, @@ -339,7 +339,7 @@ NtfsCreateFile(PDEVICE_OBJECT DeviceObject, UNICODE_STRING FullPath; PIRP Irp = IrpContext->Irp; - DPRINT1("NtfsCreateFile(%p, %p) called\n", DeviceObject, IrpContext); + DPRINT("NtfsCreateFile(%p, %p) called\n", DeviceObject, IrpContext); DeviceExt = DeviceObject->DeviceExtension; ASSERT(DeviceExt); @@ -695,7 +695,7 @@ NtfsCreateDirectory(PDEVICE_EXTENSION DeviceExt, ULONG MaxIndexRootSize; ULONG RootLength; - DPRINT1("NtfsCreateFileRecord(%p, %p, %s, %s)\n", + DPRINT("NtfsCreateFileRecord(%p, %p, %s, %s)\n", DeviceExt, FileObject, CaseSensitive ? "TRUE" : "FALSE", @@ -820,7 +820,7 @@ NtfsCreateEmptyFileRecord(PDEVICE_EXTENSION DeviceExt) PFILE_RECORD_HEADER FileRecord; PNTFS_ATTR_RECORD NextAttribute; - DPRINT1("NtfsCreateEmptyFileRecord(%p)\n", DeviceExt); + DPRINT("NtfsCreateEmptyFileRecord(%p)\n", DeviceExt); // allocate memory for file record FileRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); @@ -895,7 +895,7 @@ NtfsCreateFileRecord(PDEVICE_EXTENSION DeviceExt, ULONGLONG ParentMftIndex; ULONGLONG FileMftIndex; - DPRINT1("NtfsCreateFileRecord(%p, %p, %s, %s)\n", + DPRINT("NtfsCreateFileRecord(%p, %p, %s, %s)\n", DeviceExt, FileObject, CaseSensitive ? "TRUE" : "FALSE", diff --git a/drivers/filesystems/ntfs/dirctl.c b/drivers/filesystems/ntfs/dirctl.c index 4ad76fa3825..7ceb2638a44 100644 --- a/drivers/filesystems/ntfs/dirctl.c +++ b/drivers/filesystems/ntfs/dirctl.c @@ -378,7 +378,7 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) UNICODE_STRING Pattern; ULONG Written; - DPRINT1("NtfsQueryDirectory() called\n"); + DPRINT("NtfsQueryDirectory() called\n"); ASSERT(IrpContext); Irp = IrpContext->Irp; @@ -591,7 +591,7 @@ NtfsDirectoryControl(PNTFS_IRP_CONTEXT IrpContext) { NTSTATUS Status = STATUS_UNSUCCESSFUL; - DPRINT1("NtfsDirectoryControl() called\n"); + DPRINT("NtfsDirectoryControl() called\n"); switch (IrpContext->MinorFunction) { diff --git a/drivers/filesystems/ntfs/fcb.c b/drivers/filesystems/ntfs/fcb.c index 8a4f4605460..955b84a676e 100644 --- a/drivers/filesystems/ntfs/fcb.c +++ b/drivers/filesystems/ntfs/fcb.c @@ -389,7 +389,7 @@ NtfsMakeFCBFromDirEntry(PNTFS_VCB Vcb, PNTFS_FCB rcFCB; ULONGLONG Size, AllocatedSize; - DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p, %p)\n", Vcb, DirectoryFCB, Name, Stream, Record, fileFCB); + DPRINT("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p, %p)\n", Vcb, DirectoryFCB, Name, Stream, Record, fileFCB); FileName = GetBestFileNameFromRecord(Vcb, Record); if (!FileName) @@ -516,12 +516,12 @@ NtfsDirFindFile(PNTFS_VCB Vcb, PNTFS_ATTR_CONTEXT DataContext; USHORT Length = 0; - DPRINT1("NtfsDirFindFile(%p, %p, %S, %s, %p)\n", - Vcb, - DirectoryFcb, - FileToFind, - CaseSensitive ? "TRUE" : "FALSE", - FoundFCB); + DPRINT("NtfsDirFindFile(%p, %p, %S, %s, %p)\n", + Vcb, + DirectoryFcb, + FileToFind, + CaseSensitive ? "TRUE" : "FALSE", + FoundFCB); *FoundFCB = NULL; RtlInitUnicodeString(&File, FileToFind); diff --git a/drivers/filesystems/ntfs/finfo.c b/drivers/filesystems/ntfs/finfo.c index 9a1b44b3882..d7a55cbad39 100644 --- a/drivers/filesystems/ntfs/finfo.c +++ b/drivers/filesystems/ntfs/finfo.c @@ -46,7 +46,7 @@ NtfsGetStandardInformation(PNTFS_FCB Fcb, { UNREFERENCED_PARAMETER(DeviceObject); - DPRINT1("NtfsGetStandardInformation(%p, %p, %p, %p)\n", Fcb, DeviceObject, StandardInfo, BufferLength); + DPRINT("NtfsGetStandardInformation(%p, %p, %p, %p)\n", Fcb, DeviceObject, StandardInfo, BufferLength); if (*BufferLength < sizeof(FILE_STANDARD_INFORMATION)) return STATUS_BUFFER_TOO_SMALL; @@ -102,7 +102,7 @@ NtfsGetBasicInformation(PFILE_OBJECT FileObject, { PFILENAME_ATTRIBUTE FileName = &Fcb->Entry; - DPRINT1("NtfsGetBasicInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, BasicInfo, BufferLength); + DPRINT("NtfsGetBasicInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, BasicInfo, BufferLength); if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) return STATUS_BUFFER_TOO_SMALL; @@ -136,7 +136,7 @@ NtfsGetNameInformation(PFILE_OBJECT FileObject, UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(DeviceObject); - DPRINT1("NtfsGetNameInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, NameInfo, BufferLength); + DPRINT("NtfsGetNameInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, NameInfo, BufferLength); ASSERT(NameInfo != NULL); ASSERT(Fcb != NULL); @@ -200,7 +200,7 @@ NtfsGetNetworkOpenInformation(PNTFS_FCB Fcb, { PFILENAME_ATTRIBUTE FileName = &Fcb->Entry; - DPRINT1("NtfsGetNetworkOpenInformation(%p, %p, %p, %p)\n", Fcb, DeviceExt, NetworkInfo, BufferLength); + DPRINT("NtfsGetNetworkOpenInformation(%p, %p, %p, %p)\n", Fcb, DeviceExt, NetworkInfo, BufferLength); if (*BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) return STATUS_BUFFER_TOO_SMALL; @@ -727,7 +727,7 @@ NtfsSetInformation(PNTFS_IRP_CONTEXT IrpContext) PDEVICE_OBJECT DeviceObject; NTSTATUS Status = STATUS_NOT_IMPLEMENTED; - DPRINT1("NtfsSetInformation(%p)\n", IrpContext); + DPRINT("NtfsSetInformation(%p)\n", IrpContext); Irp = IrpContext->Irp; Stack = IrpContext->Stack; diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c index c85f1bfb9f6..a8c2a425619 100644 --- a/drivers/filesystems/ntfs/fsctl.c +++ b/drivers/filesystems/ntfs/fsctl.c @@ -50,7 +50,7 @@ NtfsHasFileSystem(PDEVICE_OBJECT DeviceToMount) PBOOT_SECTOR BootSector; NTSTATUS Status; - DPRINT1("NtfsHasFileSystem() called\n"); + DPRINT("NtfsHasFileSystem() called\n"); Size = sizeof(DISK_GEOMETRY); Status = NtfsDeviceIoControl(DeviceToMount, @@ -425,7 +425,7 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject, NTSTATUS Status; BOOLEAN Lookaside = FALSE; - DPRINT1("NtfsMountVolume() called\n"); + DPRINT("NtfsMountVolume() called\n"); if (DeviceObject != NtfsGlobalData->DeviceObject) { @@ -737,7 +737,7 @@ GetVolumeBitmap(PDEVICE_EXTENSION DeviceExt, ULONGLONG ToCopy; BOOLEAN Overflow = FALSE; - DPRINT1("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); + DPRINT("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); Stack = IoGetCurrentIrpStackLocation(Irp); @@ -904,7 +904,7 @@ NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject, PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExt; - DPRINT1("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); + DPRINT("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); Stack = IoGetCurrentIrpStackLocation(Irp); DeviceExt = DeviceObject->DeviceExtension; @@ -966,7 +966,7 @@ NtfsFileSystemControl(PNTFS_IRP_CONTEXT IrpContext) PIRP Irp; PDEVICE_OBJECT DeviceObject; - DPRINT1("NtfsFileSystemControl() called\n"); + DPRINT("NtfsFileSystemControl() called\n"); DeviceObject = IrpContext->DeviceObject; Irp = IrpContext->Irp; diff --git a/drivers/filesystems/ntfs/rw.c b/drivers/filesystems/ntfs/rw.c index fc3a62c7ccf..1d18b0648c6 100644 --- a/drivers/filesystems/ntfs/rw.c +++ b/drivers/filesystems/ntfs/rw.c @@ -60,7 +60,7 @@ NtfsReadFile(PDEVICE_EXTENSION DeviceExt, PCHAR ReadBuffer = (PCHAR)Buffer; ULONGLONG StreamSize; - DPRINT1("NtfsReadFile(%p, %p, %p, %lu, %lu, %lx, %p)\n", DeviceExt, FileObject, Buffer, Length, ReadOffset, IrpFlags, LengthRead); + DPRINT("NtfsReadFile(%p, %p, %p, %lu, %lu, %lx, %p)\n", DeviceExt, FileObject, Buffer, Length, ReadOffset, IrpFlags, LengthRead); *LengthRead = 0; diff --git a/drivers/filesystems/ntfs/volinfo.c b/drivers/filesystems/ntfs/volinfo.c index 565a6012bca..3e6123f8205 100644 --- a/drivers/filesystems/ntfs/volinfo.c +++ b/drivers/filesystems/ntfs/volinfo.c @@ -45,7 +45,7 @@ NtfsGetFreeClusters(PDEVICE_EXTENSION DeviceExt) ULONG Read = 0; RTL_BITMAP Bitmap; - DPRINT1("NtfsGetFreeClusters(%p)\n", DeviceExt); + DPRINT("NtfsGetFreeClusters(%p)\n", DeviceExt); BitmapRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); if (BitmapRecord == NULL) @@ -118,7 +118,7 @@ NtfsAllocateClusters(PDEVICE_EXTENSION DeviceExt, ULONG AssignedRun; ULONG LengthWritten; - DPRINT1("NtfsAllocateClusters(%p, %lu, %lu, %p, %p)\n", DeviceExt, FirstDesiredCluster, DesiredClusters, FirstAssignedCluster, AssignedClusters); + DPRINT("NtfsAllocateClusters(%p, %lu, %lu, %p, %p)\n", DeviceExt, FirstDesiredCluster, DesiredClusters, FirstAssignedCluster, AssignedClusters); BitmapRecord = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); if (BitmapRecord == NULL) @@ -151,9 +151,9 @@ NtfsAllocateClusters(PDEVICE_EXTENSION DeviceExt, return STATUS_INSUFFICIENT_RESOURCES; } - DPRINT1("Total clusters: %I64x\n", DeviceExt->NtfsInfo.ClusterCount); - DPRINT1("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8); - DPRINT1("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - DeviceExt->NtfsInfo.ClusterCount) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); + DPRINT("Total clusters: %I64x\n", DeviceExt->NtfsInfo.ClusterCount); + DPRINT("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8); + DPRINT("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - DeviceExt->NtfsInfo.ClusterCount) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); ReadAttribute(DeviceExt, DataContext, 0, (PCHAR)BitmapData, (ULONG)BitmapDataSize);

1 0

[reactos] 01/01: [MAGNIFY] Minor whitespace / formatting fixes; use the new file headers + some code simplifications here and there...
by Hermès Bélusca-Maïto 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16646fb19cda98530df80… commit 16646fb19cda98530df807a26b01440446d899be Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 15 19:09:28 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 15 19:11:21 2019 +0200 [MAGNIFY] Minor whitespace / formatting fixes; use the new file headers + some code simplifications here and there... --- base/applications/magnify/magnifier.c | 236 ++++++++++++++++------------------ base/applications/magnify/magnifier.h | 25 +--- base/applications/magnify/settings.c | 128 +++++++++--------- 3 files changed, 182 insertions(+), 207 deletions(-) diff --git a/base/applications/magnify/magnifier.c b/base/applications/magnify/magnifier.c index 3b3cc924e90..0fd19fff7e4 100644 --- a/base/applications/magnify/magnifier.c +++ b/base/applications/magnify/magnifier.c @@ -1,11 +1,9 @@ /* * PROJECT: ReactOS Magnify - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/magnify/magnifier.c + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Magnification of parts of the screen. - * AUTHORS: - * Marc Piulachs <marc.piulachs(a)codexchange.net> - * David Quintana <gigaherz(a)gmail.com> + * COPYRIGHT: Copyright 2007-2019 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2015-2019 David Quintana <gigaherz(a)gmail.com> */ /* TODO: Support AppBar types other than ABE_TOP */ @@ -86,11 +84,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine switch (GetUserDefaultUILanguage()) { case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): - SetProcessDefaultLayout(LAYOUT_RTL); - break; + SetProcessDefaultLayout(LAYOUT_RTL); + break; default: - break; + break; } /* Initialize global strings */ @@ -158,7 +156,7 @@ void DoAppBarStuff(DWORD mode) RECT rcWorkArea; SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0); - if(mode == ABM_NEW) + if (mode == ABM_NEW) { SHAppBarMessage(ABM_NEW, &data); @@ -197,36 +195,35 @@ void DoAppBarStuff(DWORD mode) data.uEdge = AppBarConfig.uEdge; uState = SHAppBarMessage(ABM_QUERYPOS, &data); - uState = SHAppBarMessage(ABM_SETPOS, &data); rcw = data.rc.right-data.rc.left; rch = data.rc.bottom-data.rc.top; uState = SHAppBarMessage(ABM_GETSTATE, &data); - if(uState & ABS_ALWAYSONTOP) + if (uState & ABS_ALWAYSONTOP) hWndOrder = HWND_TOPMOST; - SetWindowPos(hMainWnd, hWndOrder, data.rc.left, data.rc.top, rcw, rch, SWP_SHOWWINDOW|SWP_NOCOPYBITS); + SetWindowPos(hMainWnd, hWndOrder, data.rc.left, data.rc.top, rcw, rch, SWP_SHOWWINDOW | SWP_NOCOPYBITS); } - else if(mode == ABM_GETSTATE) + else if (mode == ABM_GETSTATE) { HWND hWndOrder = HWND_BOTTOM; uState = SHAppBarMessage(ABM_GETSTATE, &data); - if(uState & ABS_ALWAYSONTOP) + if (uState & ABS_ALWAYSONTOP) hWndOrder = HWND_TOPMOST; SetWindowPos(hMainWnd, hWndOrder, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); } - else if(mode == ABM_ACTIVATE) + else if (mode == ABM_ACTIVATE) { SHAppBarMessage(ABM_ACTIVATE, &data); } - else if(mode == ABM_WINDOWPOSCHANGED) + else if (mode == ABM_WINDOWPOSCHANGED) { SHAppBarMessage(ABM_WINDOWPOSCHANGED, &data); } - else if(mode == ABM_REMOVE) + else if (mode == ABM_REMOVE) { SHAppBarMessage(ABM_REMOVE, &data); } @@ -237,22 +234,22 @@ void AttachAppBar(INT uEdge) if (AppBarConfig.uEdge == uEdge) return; - if(AppBarConfig.uEdge < 0 && uEdge >= 0) + if (AppBarConfig.uEdge < 0 && uEdge >= 0) { SetWindowLongPtr(hMainWnd, GWL_STYLE, GetWindowLongPtr(hMainWnd, GWL_STYLE) & (~WS_CAPTION)); } - else if(uEdge < 0 && AppBarConfig.uEdge>=0) + else if (uEdge < 0 && AppBarConfig.uEdge >= 0) { SetWindowLongPtr(hMainWnd, GWL_STYLE, GetWindowLongPtr(hMainWnd, GWL_STYLE) | WS_CAPTION); SetWindowPos(hMainWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_FRAMECHANGED); } - if(AppBarConfig.uEdge >= 0) + if (AppBarConfig.uEdge >= 0) { DoAppBarStuff(ABM_REMOVE); } - if (uEdge >=0) + if (uEdge >= 0) { AppBarConfig.uEdge = uEdge; DoAppBarStuff(ABM_NEW); @@ -279,40 +276,37 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) hInst = hInstance; // Store instance handle in our global variable - if (AppBarConfig.uEdge<0) + if (AppBarConfig.uEdge <0 ) { dwStyles |= WS_CAPTION; exStyles |= WS_EX_TOPMOST; } /* Create the Window */ - hMainWnd = CreateWindowEx( - exStyles, - szWindowClass, - szTitle, - dwStyles, - rc.left, - rc.top, - rc.right-rc.left, - rc.bottom-rc.top, - NULL, - NULL, - hInstance, - NULL); - + hMainWnd = CreateWindowEx(exStyles, + szWindowClass, + szTitle, + dwStyles, + rc.left, + rc.top, + rc.right-rc.left, + rc.bottom-rc.top, + NULL, + NULL, + hInstance, + NULL); if (!hMainWnd) return FALSE; - if (AppBarConfig.uEdge>=0) DoAppBarStuff(ABM_NEW); - else SetWindowPos(hMainWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_SHOWWINDOW); + if (AppBarConfig.uEdge >= 0) + DoAppBarStuff(ABM_NEW); + else + SetWindowPos(hMainWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); // In Windows 2003's Magnifier, the "Start Minimized" setting // refers exclusively to the options dialog, not the main window itself. hOptionsDialog = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hMainWnd, OptionsProc); - if (bStartMinimized) - ShowWindow(hOptionsDialog, SW_HIDE); - else - ShowWindow(hOptionsDialog, SW_SHOW); + ShowWindow(hOptionsDialog, (bStartMinimized ? SW_HIDE : SW_SHOW)); if (bShowWarning) DialogBox(hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, WarningProc); @@ -320,7 +314,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) return TRUE; } -void Refresh() +void Refresh(void) { if (!IsIconic(hMainWnd)) { @@ -397,7 +391,7 @@ void Draw(HDC aDc) { bRecreateOffscreenDC = FALSE; - if(hdcOffscreen) + if (hdcOffscreen) { SelectObject(hdcOffscreen, hbmpOld); DeleteObject (hbmpOffscreen); @@ -411,13 +405,12 @@ void Draw(HDC aDc) hdcOffscreen = CreateCompatibleDC(desktopHdc); /* Create a bitmap compatible with the client area DC */ - hbmpOffscreen = CreateCompatibleBitmap( - desktopHdc, - sourceWidth, - sourceHeight); + hbmpOffscreen = CreateCompatibleBitmap(desktopHdc, + sourceWidth, + sourceHeight); /* Select our bitmap in memory DC and save the old one */ - hbmpOld = SelectObject(hdcOffscreen , hbmpOffscreen); + hbmpOld = SelectObject(hdcOffscreen, hbmpOffscreen); } GetWindowRect(hDesktopWindow, &sourceRect); @@ -429,16 +422,15 @@ void Draw(HDC aDc) GetBestOverlapWithMonitors(&sourceRect); /* Paint the screen bitmap to our in memory DC */ - BitBlt( - hdcOffscreen, - 0, - 0, - sourceWidth, - sourceHeight, - desktopHdc, - sourceRect.left, - sourceRect.top, - rop); + BitBlt(hdcOffscreen, + 0, + 0, + sourceWidth, + sourceHeight, + desktopHdc, + sourceRect.left, + sourceRect.top, + rop); if (IntersectRect(&intersectedRect, &sourceRect, &targetRect)) { @@ -447,25 +439,23 @@ void Draw(HDC aDc) } /* Draw the mouse pointer in the right position */ - DrawIcon( - hdcOffscreen , - pMouse.x - iinfo.xHotspot - sourceRect.left, // - 10, - pMouse.y - iinfo.yHotspot - sourceRect.top, // - 10, - cinfo.hCursor); + DrawIcon(hdcOffscreen, + pMouse.x - iinfo.xHotspot - sourceRect.left, // - 10, + pMouse.y - iinfo.yHotspot - sourceRect.top, // - 10, + cinfo.hCursor); /* Blast the stretched image from memory DC to window DC */ - StretchBlt( - aDc, - 0, - 0, - AppWidth, - AppHeight, - hdcOffscreen, - 0, - 0, - sourceWidth, - sourceHeight, - SRCCOPY | NOMIRRORBITMAP); + StretchBlt(aDc, + 0, + 0, + AppWidth, + AppHeight, + hdcOffscreen, + 0, + 0, + sourceWidth, + sourceHeight, + SRCCOPY | NOMIRRORBITMAP); /* Cleanup */ if (iinfo.hbmMask) @@ -485,7 +475,7 @@ void HandleNotifyIconMessage(HWND hWnd, WPARAM wParam, LPARAM lParam) PostMessage(hMainWnd, WM_COMMAND, IDM_OPTIONS, 0); break; case WM_RBUTTONUP: - GetCursorPos (&pt); + GetCursorPos(&pt); TrackPopupMenu(notifyMenu, 0, pt.x, pt.y, 0, hWnd, NULL); break; } @@ -525,7 +515,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } } - if(guiInfo.hwndActive != hMainWnd) + if (guiInfo.hwndActive != hMainWnd) { if (bFollowCaret) { @@ -540,7 +530,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) //Update to new position pCaret = ptCaret; pCaretWnd = guiInfo.hwndCaret; - if(!hasMoved) + if (!hasMoved) { ClientToScreen (guiInfo.hwndCaret, (LPPOINT) &ptCaret); cp = ptCaret; @@ -556,7 +546,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) if (bFollowFocus) { - if(guiInfo.hwndFocus && !guiInfo.hwndCaret) + if (guiInfo.hwndFocus && !guiInfo.hwndCaret) { POINT ptFocus; RECT activeRect; @@ -566,12 +556,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ptFocus.x = (activeRect.left + activeRect.right) / 2; ptFocus.y = (activeRect.top + activeRect.bottom) / 2; - if((guiInfo.hwndFocus != pFocusWnd) || !PointsAreEqual(pFocus, ptFocus)) + if ((guiInfo.hwndFocus != pFocusWnd) || !PointsAreEqual(pFocus, ptFocus)) { //Update to new position pFocus = ptFocus; pFocusWnd = guiInfo.hwndFocus; - if(!hasMoved) + if (!hasMoved) { cp = ptFocus; hasMoved = TRUE; @@ -585,17 +575,17 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } } - if(!hasMoved) + if (!hasMoved) { DWORD newTicks = GetTickCount(); DWORD elapsed = (newTicks - lastTicks); - if(elapsed > REPAINT_SPEED) + if (elapsed > REPAINT_SPEED) { hasMoved = TRUE; } } - if(hasMoved) + if (hasMoved) { lastTicks = GetTickCount(); Refresh(); @@ -611,14 +601,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) switch (wmId) { case IDM_OPTIONS: - if(bOptionsDialog) - { - ShowWindow(hOptionsDialog, SW_HIDE); - } - else - { - ShowWindow(hOptionsDialog, SW_SHOW); - } + ShowWindow(hOptionsDialog, (bOptionsDialog ? SW_HIDE : SW_SHOW)); break; case IDM_ABOUT: DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutProc); @@ -661,8 +644,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; } + case WM_MOUSEMOVE: - if(GetCapture() == hWnd) + if (GetCapture() == hWnd) { RECT rc; POINT pt; @@ -671,7 +655,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) GetCursorPos(&pt); GetWindowRect(hWnd, &rc); - if(AppBarConfig.uEdge>=0) + if (AppBarConfig.uEdge >= 0) { if (pt.x >= rcWorkArea.left && pt.x <= rcWorkArea.right && pt.y >= rcWorkArea.top && pt.y <= rcWorkArea.bottom) @@ -691,22 +675,22 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } else { - if(pt.x <= rcWorkArea.left+8 && nearEdge != ABE_LEFT) + if (pt.x <= rcWorkArea.left+8 && nearEdge != ABE_LEFT) { AttachAppBar(ABE_LEFT); nearEdge = ABE_LEFT; } - else if(pt.y <= rcWorkArea.top+8 && nearEdge != ABE_TOP) + else if (pt.y <= rcWorkArea.top+8 && nearEdge != ABE_TOP) { AttachAppBar(ABE_TOP); nearEdge = ABE_TOP; } - else if(pt.x >= rcWorkArea.right-8 && nearEdge != ABE_RIGHT) + else if (pt.x >= rcWorkArea.right-8 && nearEdge != ABE_RIGHT) { AttachAppBar(ABE_RIGHT); nearEdge = ABE_RIGHT; } - else if(pt.y >= rcWorkArea.bottom-8 && nearEdge != ABE_BOTTOM) + else if (pt.y >= rcWorkArea.bottom-8 && nearEdge != ABE_BOTTOM) { AttachAppBar(ABE_BOTTOM); nearEdge = ABE_BOTTOM; @@ -725,10 +709,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) Refresh(); } break; + case WM_LBUTTONUP: - if(GetCapture() == hWnd) + if (GetCapture() == hWnd) { - if (AppBarConfig.uEdge>=0) + if (AppBarConfig.uEdge >= 0) DoAppBarStuff(ABM_GETSTATE); else SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); @@ -737,7 +722,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_SIZE: - if(AppBarConfig.uEdge>=0) DoAppBarStuff(ABM_SETPOS); + if (AppBarConfig.uEdge >= 0) + DoAppBarStuff(ABM_SETPOS); /* fallthrough */ case WM_DISPLAYCHANGE: bRecreateOffscreenDC = TRUE; @@ -813,7 +799,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; case ABN_FULLSCREENAPP: { - if(!lParam) + if (!lParam) { DoAppBarStuff(ABM_GETSTATE); break; @@ -823,10 +809,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; } case ABN_WINDOWARRANGE: - if(lParam) - ShowWindow(hMainWnd, SW_HIDE); - else - ShowWindow(hMainWnd, SW_SHOW); + ShowWindow(hMainWnd, (lParam ? SW_HIDE : SW_SHOW)); break; } return 0; @@ -837,11 +820,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) return 0; case WM_ACTIVATE: - if(AppBarConfig.uEdge>=0) DoAppBarStuff(ABM_ACTIVATE); + if (AppBarConfig.uEdge >= 0) + DoAppBarStuff(ABM_ACTIVATE); break; case WM_WINDOWPOSCHANGED: - if(AppBarConfig.uEdge>=0) DoAppBarStuff(ABM_WINDOWPOSCHANGED); + if (AppBarConfig.uEdge >= 0) + DoAppBarStuff(ABM_WINDOWPOSCHANGED); Refresh(); break; @@ -875,11 +860,9 @@ INT_PTR CALLBACK AboutProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); + switch (message) { - case WM_SHOWWINDOW: - bOptionsDialog = wParam; - break; case WM_INITDIALOG: { /* Add the zoom items */ @@ -897,27 +880,31 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar SendDlgItemMessage(hDlg, IDC_ZOOM, CB_SETCURSEL, uiZoom - 1, 0); if (bFollowMouse) - SendDlgItemMessage(hDlg,IDC_FOLLOWMOUSECHECK,BM_SETCHECK , wParam ,0); + SendDlgItemMessage(hDlg,IDC_FOLLOWMOUSECHECK,BM_SETCHECK, wParam, 0); if (bFollowFocus) - SendDlgItemMessage(hDlg,IDC_FOLLOWKEYBOARDCHECK,BM_SETCHECK , wParam ,0); + SendDlgItemMessage(hDlg,IDC_FOLLOWKEYBOARDCHECK,BM_SETCHECK, wParam, 0); if (bFollowCaret) - SendDlgItemMessage(hDlg,IDC_FOLLOWTEXTEDITINGCHECK,BM_SETCHECK , wParam ,0); + SendDlgItemMessage(hDlg,IDC_FOLLOWTEXTEDITINGCHECK,BM_SETCHECK, wParam, 0); if (bInvertColors) - SendDlgItemMessage(hDlg,IDC_INVERTCOLORSCHECK,BM_SETCHECK , wParam ,0); + SendDlgItemMessage(hDlg,IDC_INVERTCOLORSCHECK,BM_SETCHECK, wParam, 0); if (bStartMinimized) - SendDlgItemMessage(hDlg,IDC_STARTMINIMIZEDCHECK,BM_SETCHECK , wParam ,0); + SendDlgItemMessage(hDlg,IDC_STARTMINIMIZEDCHECK,BM_SETCHECK, wParam, 0); if (bShowMagnifier) - SendDlgItemMessage(hDlg,IDC_SHOWMAGNIFIERCHECK,BM_SETCHECK , wParam ,0); + SendDlgItemMessage(hDlg,IDC_SHOWMAGNIFIERCHECK,BM_SETCHECK, wParam, 0); return (INT_PTR)TRUE; } - case WM_COMMAND: + case WM_SHOWWINDOW: + bOptionsDialog = wParam; + break; + + case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: @@ -927,8 +914,9 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar case IDC_BUTTON_HELP: /* Unimplemented */ - MessageBox(hDlg , TEXT("Magnifier help not available yet!") , TEXT("Help") , MB_OK); + MessageBox(hDlg, TEXT("Magnifier help not available yet!"), TEXT("Help"), MB_OK); break; + case IDC_ZOOM: if (HIWORD(wParam) == CBN_SELCHANGE) { @@ -936,7 +924,7 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar TCHAR currentZoomValue[2] = TEXT(""); /* Get index of current selection and the text of that selection */ - int currentSelectionIndex = ComboBox_GetCurSel(hCombo); + int currentSelectionIndex = ComboBox_GetCurSel(hCombo); ComboBox_GetLBText(hCombo, currentSelectionIndex, currentZoomValue); uiZoom = (UINT)_ttoi(currentZoomValue); /* The zoom factor cannot be smaller than 1 (and not zero) or greater than 9 */ @@ -950,6 +938,7 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar Refresh(); } break; + case IDC_INVERTCOLORSCHECK: bInvertColors = IsDlgButtonChecked(hDlg, IDC_INVERTCOLORSCHECK); Refresh(); @@ -968,10 +957,7 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar break; case IDC_SHOWMAGNIFIER: bShowMagnifier = IsDlgButtonChecked(hDlg, IDC_SHOWMAGNIFIERCHECK); - if (bShowMagnifier) - ShowWindow (hMainWnd , SW_SHOW); - else - ShowWindow (hMainWnd , SW_HIDE); + ShowWindow(hMainWnd, (bShowMagnifier ? SW_SHOW : SW_HIDE)); break; } } diff --git a/base/applications/magnify/magnifier.h b/base/applications/magnify/magnifier.h index 01e742d4ff1..2552823c31e 100644 --- a/base/applications/magnify/magnifier.h +++ b/base/applications/magnify/magnifier.h @@ -1,21 +1,9 @@ /* - * WineCalc (magnifier.h) - * - * Copyright 2007 Marc Piulachs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Magnify + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Magnification of parts of the screen. + * COPYRIGHT: Copyright 2007-2019 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2015-2019 David Quintana <gigaherz(a)gmail.com> */ #ifndef _MAGNIFIER_H_ @@ -26,7 +14,8 @@ extern UINT uiZoom; -struct _AppBarConfig_t { +struct _AppBarConfig_t +{ DWORD cbSize; INT uEdge; DWORD value3; diff --git a/base/applications/magnify/settings.c b/base/applications/magnify/settings.c index ab6c585b0ab..a5d57be8e68 100644 --- a/base/applications/magnify/settings.c +++ b/base/applications/magnify/settings.c @@ -1,10 +1,9 @@ /* * PROJECT: ReactOS Magnify - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/magnify/settings.c + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Magnification of parts of the screen. - * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> - * + * COPYRIGHT: Copyright 2007-2019 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2015-2019 David Quintana <gigaherz(a)gmail.com> */ #include "magnifier.h" @@ -24,7 +23,8 @@ BOOL bInvertColors = FALSE; BOOL bStartMinimized = FALSE; BOOL bShowMagnifier = TRUE; -struct _AppBarConfig_t AppBarConfig = { +struct _AppBarConfig_t AppBarConfig = +{ sizeof(struct _AppBarConfig_t), -2 /* ABE_TOP */, 0, 1, /* unknown */ @@ -32,96 +32,96 @@ struct _AppBarConfig_t AppBarConfig = { { 20, 20, 600, 200 }, /* floating window rect */ }; -void LoadSettings() +void LoadSettings(void) { HKEY hkey; LONG value; ULONG len; struct _AppBarConfig_t config_temp; - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, KEY_READ, &hkey) == ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, KEY_READ, &hkey) != ERROR_SUCCESS) + return; + + len = sizeof(AppBarConfig); + if (RegQueryValueEx(hkey, _T("AppBar"), 0, 0, (BYTE *)&config_temp, &len) == ERROR_SUCCESS) { - len = sizeof(AppBarConfig); - if (RegQueryValueEx(hkey, _T("AppBar"), 0, 0, (BYTE *)&config_temp, &len) == ERROR_SUCCESS) + if(config_temp.cbSize == sizeof(AppBarConfig)) { - if(config_temp.cbSize == sizeof(AppBarConfig)) - { - AppBarConfig = config_temp; - } + AppBarConfig = config_temp; } + } - len = sizeof(value); - if (RegQueryValueEx(hkey, _T("StationaryMagLevel"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) - { - if (value >= 0 && value <= 9) - uiZoom = value; - } + len = sizeof(value); + if (RegQueryValueEx(hkey, _T("StationaryMagLevel"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + { + if (value >= 0 && value <= 9) + uiZoom = value; + } - len = sizeof(value); - if (RegQueryValueEx(hkey, _T("ShowWarning"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) - bShowWarning = (value == 0 ? FALSE : TRUE); + len = sizeof(value); + if (RegQueryValueEx(hkey, _T("ShowWarning"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bShowWarning = !!value; - len = sizeof(value); - if (RegQueryValueEx(hkey, _T("StationaryInvertColors"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) - bInvertColors = (value == 0 ? FALSE : TRUE); + len = sizeof(value); + if (RegQueryValueEx(hkey, _T("StationaryInvertColors"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bInvertColors = !!value; - len = sizeof(value); - if (RegQueryValueEx(hkey, _T("StationaryStartMinimized"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) - bStartMinimized = (value == 0 ? FALSE : TRUE); + len = sizeof(value); + if (RegQueryValueEx(hkey, _T("StationaryStartMinimized"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bStartMinimized = !!value; - len = sizeof(value); - if (RegQueryValueEx(hkey, _T("StationaryTrackCursor"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) - bFollowMouse = (value == 0 ? FALSE : TRUE); + len = sizeof(value); + if (RegQueryValueEx(hkey, _T("StationaryTrackCursor"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bFollowMouse = !!value; - len = sizeof(value); - if (RegQueryValueEx(hkey, _T("StationaryTrackFocus"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) - bFollowFocus = (value == 0 ? FALSE : TRUE); + len = sizeof(value); + if (RegQueryValueEx(hkey, _T("StationaryTrackFocus"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bFollowFocus = !!value; - len = sizeof(value); - if (RegQueryValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) - bFollowFocus = (value == 0 ? FALSE : TRUE); + len = sizeof(value); + if (RegQueryValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bFollowFocus = !!value; - len = sizeof(value); - if (RegQueryValueEx(hkey, _T("StationaryTrackText"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) - bFollowCaret = (value == 0 ? FALSE : TRUE); + len = sizeof(value); + if (RegQueryValueEx(hkey, _T("StationaryTrackText"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bFollowCaret = !!value; - RegCloseKey(hkey); - } + RegCloseKey(hkey); } -void SaveSettings() +void SaveSettings(void) { HKEY hkey; LONG value; - if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, _T(""), 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) - { - RegSetValueEx(hkey, _T("AppBar"), 0, REG_BINARY, (BYTE *)&AppBarConfig, sizeof(AppBarConfig)); + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, _T(""), 0, KEY_WRITE, NULL, &hkey, NULL) != ERROR_SUCCESS) + return; - value = uiZoom; - RegSetValueEx(hkey, _T("StationaryMagLevel"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); + RegSetValueEx(hkey, _T("AppBar"), 0, REG_BINARY, (BYTE *)&AppBarConfig, sizeof(AppBarConfig)); - value = bShowWarning; - RegSetValueEx(hkey, _T("ShowWarning"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); + value = uiZoom; + RegSetValueEx(hkey, _T("StationaryMagLevel"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bInvertColors; - RegSetValueEx(hkey, _T("StationaryInvertColors"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); + value = bShowWarning; + RegSetValueEx(hkey, _T("ShowWarning"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bStartMinimized; - RegSetValueEx(hkey, _T("StationaryStartMinimized"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); + value = bInvertColors; + RegSetValueEx(hkey, _T("StationaryInvertColors"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bFollowMouse; - RegSetValueEx(hkey, _T("StationaryTrackCursor"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); + value = bStartMinimized; + RegSetValueEx(hkey, _T("StationaryStartMinimized"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bFollowFocus; - RegSetValueEx(hkey, _T("StationaryTrackFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); + value = bFollowMouse; + RegSetValueEx(hkey, _T("StationaryTrackCursor"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bFollowFocus; - RegSetValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); + value = bFollowFocus; + RegSetValueEx(hkey, _T("StationaryTrackFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bFollowCaret; - RegSetValueEx(hkey, _T("StationaryTrackText"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); + value = bFollowFocus; + RegSetValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - RegCloseKey(hkey); - } + value = bFollowCaret; + RegSetValueEx(hkey, _T("StationaryTrackText"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); + + RegCloseKey(hkey); }

1 0

[reactos] 01/01: [MAGNIFY] Minor fixes for zoom handling.
by Hermès Bélusca-Maïto 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e91b6d5dba722bc748bb… commit 4e91b6d5dba722bc748bb5eda72fd8133e2bc730 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 15 18:33:28 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 15 18:33:28 2019 +0200 [MAGNIFY] Minor fixes for zoom handling. - Zoom factor is unsigned. - It is comprised between 1 and 9, other values are invalid. - Check for value validity when reading the zoom string from the combo-list. --- base/applications/magnify/magnifier.c | 15 ++++++++++----- base/applications/magnify/magnifier.h | 2 +- base/applications/magnify/settings.c | 22 +++++++++++----------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/base/applications/magnify/magnifier.c b/base/applications/magnify/magnifier.c index 13a0a3cd190..3b3cc924e90 100644 --- a/base/applications/magnify/magnifier.c +++ b/base/applications/magnify/magnifier.c @@ -404,8 +404,8 @@ void Draw(HDC aDc) DeleteDC(hdcOffscreen); } - sourceWidth = AppWidth / iZoom; - sourceHeight = AppHeight / iZoom; + sourceWidth = AppWidth / uiZoom; + sourceHeight = AppHeight / uiZoom; /* Create a memory DC compatible with client area DC */ hdcOffscreen = CreateCompatibleDC(desktopHdc); @@ -882,7 +882,7 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar break; case WM_INITDIALOG: { - // Add the zoom items... + /* Add the zoom items */ SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("1")); SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("2")); SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("3")); @@ -891,8 +891,10 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("6")); SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("7")); SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("8")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("9")); - SendDlgItemMessage(hDlg, IDC_ZOOM, CB_SETCURSEL, iZoom - 1, 0); + if (uiZoom >= 1 && uiZoom <= 9) + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_SETCURSEL, uiZoom - 1, 0); if (bFollowMouse) SendDlgItemMessage(hDlg,IDC_FOLLOWMOUSECHECK,BM_SETCHECK , wParam ,0); @@ -936,7 +938,10 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar /* Get index of current selection and the text of that selection */ int currentSelectionIndex = ComboBox_GetCurSel(hCombo); ComboBox_GetLBText(hCombo, currentSelectionIndex, currentZoomValue); - iZoom = _ttoi(currentZoomValue); + uiZoom = (UINT)_ttoi(currentZoomValue); + /* The zoom factor cannot be smaller than 1 (and not zero) or greater than 9 */ + if (uiZoom < 1 || uiZoom > 9) + uiZoom = 1; /* Trigger the Draw function to rezoom (which will be set false automatically after rezooming) */ bRecreateOffscreenDC = TRUE; diff --git a/base/applications/magnify/magnifier.h b/base/applications/magnify/magnifier.h index 7f29006b834..01e742d4ff1 100644 --- a/base/applications/magnify/magnifier.h +++ b/base/applications/magnify/magnifier.h @@ -24,7 +24,7 @@ #include <stdarg.h> #include <windef.h> -extern int iZoom; +extern UINT uiZoom; struct _AppBarConfig_t { DWORD cbSize; diff --git a/base/applications/magnify/settings.c b/base/applications/magnify/settings.c index a6d4cf0af53..ab6c585b0ab 100644 --- a/base/applications/magnify/settings.c +++ b/base/applications/magnify/settings.c @@ -12,7 +12,7 @@ #include <tchar.h> #include <winreg.h> -int iZoom = 3; +UINT uiZoom = 3; BOOL bShowWarning = TRUE; @@ -50,38 +50,38 @@ void LoadSettings() } } - len = 4; + len = sizeof(value); if (RegQueryValueEx(hkey, _T("StationaryMagLevel"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) { if (value >= 0 && value <= 9) - iZoom = value; + uiZoom = value; } - len = 4; + len = sizeof(value); if (RegQueryValueEx(hkey, _T("ShowWarning"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) bShowWarning = (value == 0 ? FALSE : TRUE); - len = 4; + len = sizeof(value); if (RegQueryValueEx(hkey, _T("StationaryInvertColors"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) bInvertColors = (value == 0 ? FALSE : TRUE); - len = 4; + len = sizeof(value); if (RegQueryValueEx(hkey, _T("StationaryStartMinimized"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) bStartMinimized = (value == 0 ? FALSE : TRUE); - len = 4; + len = sizeof(value); if (RegQueryValueEx(hkey, _T("StationaryTrackCursor"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) bFollowMouse = (value == 0 ? FALSE : TRUE); - len = 4; + len = sizeof(value); if (RegQueryValueEx(hkey, _T("StationaryTrackFocus"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) bFollowFocus = (value == 0 ? FALSE : TRUE); - len = 4; + len = sizeof(value); if (RegQueryValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) bFollowFocus = (value == 0 ? FALSE : TRUE); - len = 4; + len = sizeof(value); if (RegQueryValueEx(hkey, _T("StationaryTrackText"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) bFollowCaret = (value == 0 ? FALSE : TRUE); @@ -98,7 +98,7 @@ void SaveSettings() { RegSetValueEx(hkey, _T("AppBar"), 0, REG_BINARY, (BYTE *)&AppBarConfig, sizeof(AppBarConfig)); - value = iZoom; + value = uiZoom; RegSetValueEx(hkey, _T("StationaryMagLevel"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); value = bShowWarning;

1 0

[reactos] 01/01: [MAGNIFY] Fix a string buffer misuage that led to division by zero exception. (#1655)
by Bișoc George 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ade0e7b04ede20a13a51… commit 9ade0e7b04ede20a13a512780ada2631fd645416 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Jun 14 20:52:41 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 15 18:12:54 2019 +0200 [MAGNIFY] Fix a string buffer misuage that led to division by zero exception. (#1655) The iZoom variable was wrongly initialized to zero because the _ttoi() called failed due to the fact the temporary string buffer was too small. --- base/applications/magnify/magnifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/magnify/magnifier.c b/base/applications/magnify/magnifier.c index cfca2519914..13a0a3cd190 100644 --- a/base/applications/magnify/magnifier.c +++ b/base/applications/magnify/magnifier.c @@ -931,7 +931,7 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar if (HIWORD(wParam) == CBN_SELCHANGE) { HWND hCombo = GetDlgItem(hDlg,IDC_ZOOM); - LPCTSTR currentZoomValue = TEXT(""); + TCHAR currentZoomValue[2] = TEXT(""); /* Get index of current selection and the text of that selection */ int currentSelectionIndex = ComboBox_GetCurSel(hCombo);

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