Ros-diffs January 2022

ros-diffs@reactos.org

28 participants
173 discussions

[reactos] 02/02: [DESK] Update available settings when selecting another display

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=236ddd4f50777799b3ef3… commit 236ddd4f50777799b3ef36b68c8a91b354621ec1 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Jan 11 18:05:36 2022 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 11 23:47:55 2022 +0100 [DESK] Update available settings when selecting another display --- dll/cpl/desk/settings.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dll/cpl/desk/settings.c b/dll/cpl/desk/settings.c index eaf9bfb76b3..fb8a2d475f5 100644 --- a/dll/cpl/desk/settings.c +++ b/dll/cpl/desk/settings.c @@ -879,6 +879,15 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lPar ApplyDisplaySettings(hwndDlg, pData); } } + else if (lpnm->code == MSLN_MONITORCHANGED) + { + PMONSL_MONNMMONITORCHANGING lpnmi = (PMONSL_MONNMMONITORCHANGING)lParam; + PDISPLAY_DEVICE_ENTRY Current = pData->DisplayDeviceList; + ULONG i; + for (i = 0; i < lpnmi->hdr.Index; i++) + Current = Current->Flink; + OnDisplayDeviceChanged(hwndDlg, pData, Current); + } break; }

2 years, 11 months

[reactos] 01/02: [DESK] Factorize changing device description to OnDisplayDeviceChanged()

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6caf7124b5a4cc093bf60… commit 6caf7124b5a4cc093bf60b050c593294ce2f8e2a Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Jan 11 18:05:04 2022 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 11 23:47:55 2022 +0100 [DESK] Factorize changing device description to OnDisplayDeviceChanged() --- dll/cpl/desk/settings.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/cpl/desk/settings.c b/dll/cpl/desk/settings.c index 300ef616853..eaf9bfb76b3 100644 --- a/dll/cpl/desk/settings.c +++ b/dll/cpl/desk/settings.c @@ -300,6 +300,9 @@ OnDisplayDeviceChanged(IN HWND hwndDlg, IN PSETTINGS_DATA pData, IN PDISPLAY_DEV } } + /* Fill device description */ + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pDeviceEntry->DeviceDescription); + /* Fill resolutions slider */ SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_CLEARTICS, TRUE, 0); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETRANGE, TRUE, MAKELONG(0, pDeviceEntry->ResolutionsCount - 1)); @@ -354,7 +357,6 @@ SettingsOnInitDialog(IN HWND hwndDlg) MONSL_MONINFO monitors; /* Single video adapter */ - SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pData->DisplayDeviceList->DeviceDescription); OnDisplayDeviceChanged(hwndDlg, pData, pData->DisplayDeviceList); monitors.Position.x = monitors.Position.y = 0; @@ -372,7 +374,6 @@ SettingsOnInitDialog(IN HWND hwndDlg) PMONSL_MONINFO pMonitors; DWORD i; - SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pData->DisplayDeviceList->DeviceDescription); OnDisplayDeviceChanged(hwndDlg, pData, pData->DisplayDeviceList); pMonitors = (PMONSL_MONINFO)HeapAlloc(GetProcessHeap(), 0, sizeof(MONSL_MONINFO) * Result);

2 years, 11 months

[reactos] 01/01: [SHELL32:WINE][PSDK] Addendum to 0bf768a1: Add missing FARPROC16 definition for CallCPLEntry16() prototype.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1df87d7fe98ff0aab1e35… commit 1df87d7fe98ff0aab1e354a995aa4bd624084343 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jan 11 23:31:26 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 11 23:31:26 2022 +0100 [SHELL32:WINE][PSDK] Addendum to 0bf768a1: Add missing FARPROC16 definition for CallCPLEntry16() prototype. --- dll/win32/shell32/wine/control.c | 2 +- sdk/include/psdk/shlobj.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index 725f13dc3c0..272747dc3f0 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -25,7 +25,6 @@ #include <windef.h> #include <winbase.h> -#include <shlobj.h> #define NO_SHLWAPI_REG #include <shlwapi.h> #include <shellapi.h> @@ -945,6 +944,7 @@ void WINAPI RunDll_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, #ifndef __REACTOS__ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6) #else +DECLARE_HANDLE(FARPROC16); LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC16 pFunc, HWND dw3, UINT dw4, LPARAM dw5, LPARAM dw6) #endif { diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 193b84f7d26..9423e15c4b0 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -2660,11 +2660,13 @@ DECLARE_INTERFACE_(IShellFolderBand, IUnknown) }; #undef INTERFACE - +#if (NTDDI_VERSION >= NTDDI_WIN2K) && (NTDDI_VERSION <= NTDDI_WINXPSP2) /***************************************************************************** * Control Panel functions */ +DECLARE_HANDLE(FARPROC16); LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC16 pFunc, HWND dw3, UINT dw4, LPARAM dw5, LPARAM dw6); +#endif #ifdef __cplusplus } /* extern "C" */

2 years, 11 months

[reactos] 01/01: [SHELL32:WINE][PSDK] Fix the prototype of CallCPLEntry16().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bf768a14564ddc1b6b33… commit 0bf768a14564ddc1b6b3397a099a92b8b3d8e3fa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 10 20:07:49 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 11 23:03:25 2022 +0100 [SHELL32:WINE][PSDK] Fix the prototype of CallCPLEntry16(). --- dll/win32/shell32/wine/control.c | 5 +++++ sdk/include/psdk/shlobj.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index 34c7b3bcf5b..725f13dc3c0 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -25,6 +25,7 @@ #include <windef.h> #include <winbase.h> +#include <shlobj.h> #define NO_SHLWAPI_REG #include <shlwapi.h> #include <shellapi.h> @@ -941,7 +942,11 @@ void WINAPI RunDll_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, * hMod("DeskCp16.Dll"), pFunc("CplApplet"), 0, 1, 0xc, 0 * */ +#ifndef __REACTOS__ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6) +#else +LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC16 pFunc, HWND dw3, UINT dw4, LPARAM dw5, LPARAM dw6) +#endif { FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); return 0x0deadbee; diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 9f7b215bff8..193b84f7d26 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -2664,7 +2664,7 @@ DECLARE_INTERFACE_(IShellFolderBand, IUnknown) /***************************************************************************** * Control Panel functions */ -LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC pFunc, HWND dw3, UINT dw4, LPARAM dw5, LPARAM dw6); +LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC16 pFunc, HWND dw3, UINT dw4, LPARAM dw5, LPARAM dw6); #ifdef __cplusplus } /* extern "C" */

2 years, 11 months

[reactos] 02/02: [KERNEL32] Add missing NTOS_MODE_USER when including the NDK.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afb04208f721f953b8ccb… commit afb04208f721f953b8ccb9432e4ed81eaef1cd82 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jan 11 22:44:03 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 11 22:45:15 2022 +0100 [KERNEL32] Add missing NTOS_MODE_USER when including the NDK. --- dll/win32/kernel32/k32.h | 1 + dll/win32/kernel32/kernel32_vista/k32_vista.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dll/win32/kernel32/k32.h b/dll/win32/kernel32/k32.h index ec2543a4f00..c84dabe0086 100644 --- a/dll/win32/kernel32/k32.h +++ b/dll/win32/kernel32/k32.h @@ -32,6 +32,7 @@ #undef NTDDI_VERSION #define NTDDI_VERSION NTDDI_WS03SP1 +#define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/exfuncs.h> #include <ndk/iofuncs.h> diff --git a/dll/win32/kernel32/kernel32_vista/k32_vista.h b/dll/win32/kernel32/kernel32_vista/k32_vista.h index 7f78e53e68a..6b0c3ce42ae 100644 --- a/dll/win32/kernel32/kernel32_vista/k32_vista.h +++ b/dll/win32/kernel32/kernel32_vista/k32_vista.h @@ -10,6 +10,7 @@ #undef NTDDI_VERSION #define NTDDI_VERSION NTDDI_WS03SP1 +#define NTOS_MODE_USER #include <ndk/iofuncs.h> #include <ndk/kefuncs.h> #include <ndk/obfuncs.h>

2 years, 11 months

[reactos] 01/02: [CPORTLIB] Remove any usage of debug.h since this lib implements the support for said debugging output.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1a8dce23c2e6002186d6… commit c1a8dce23c2e6002186d65cb4d7cfa064f9592a7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jan 11 22:41:52 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 11 22:45:14 2022 +0100 [CPORTLIB] Remove any usage of debug.h since this lib implements the support for said debugging output. --- sdk/lib/cportlib/cport.c | 7 ++----- sdk/lib/cportlib/cport_pc98.c | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sdk/lib/cportlib/cport.c b/sdk/lib/cportlib/cport.c index 984dfe12b50..ab3c3af396f 100644 --- a/sdk/lib/cportlib/cport.c +++ b/sdk/lib/cportlib/cport.c @@ -30,14 +30,11 @@ /* INCLUDES *******************************************************************/ -#include <cportlib/cportlib.h> -#include <drivers/serial/ns16550.h> #include <intrin.h> #include <ioaccess.h> #include <ntstatus.h> - -#define NDEBUG -#include <debug.h> +#include <cportlib/cportlib.h> +#include <drivers/serial/ns16550.h> /* GLOBALS ********************************************************************/ diff --git a/sdk/lib/cportlib/cport_pc98.c b/sdk/lib/cportlib/cport_pc98.c index 5973e71f9a7..2980c1d71ac 100644 --- a/sdk/lib/cportlib/cport_pc98.c +++ b/sdk/lib/cportlib/cport_pc98.c @@ -12,16 +12,12 @@ #include <intrin.h> #include <ioaccess.h> #include <ntstatus.h> -#include <ntstatus.h> #include <cportlib/cportlib.h> #include <drivers/pc98/serial.h> #include <drivers/pc98/sysport.h> #include <drivers/pc98/pit.h> #include <drivers/pc98/cpu.h> -#define NDEBUG -#include <debug.h> - /* GLOBALS ********************************************************************/ #define TIMEOUT_COUNT 1024 * 200

2 years, 11 months

[reactos] 01/01: [CRT/arm64] Fix handling of intrinsics

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a523c81356bb0349b7e5… commit 9a523c81356bb0349b7e545611bcad8ca3325b69 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jan 11 20:52:48 2022 +0300 [CRT/arm64] Fix handling of intrinsics Fix msvc14.1-arm64-Release build. Follow-up to db41787 (0.4.15-dev-2914). CORE-17518 --- sdk/include/crt/math.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/crt/math.h b/sdk/include/crt/math.h index d4d2de29ee4..2f92da209fe 100644 --- a/sdk/include/crt/math.h +++ b/sdk/include/crt/math.h @@ -202,9 +202,9 @@ _Check_return_ float __cdecl tanhf(_In_ float x); #if defined(_MSC_VER) /* Make sure intrinsics don't get in our way */ -#if defined(_M_AMD64) || defined(_M_ARM) +#if defined(_M_AMD64) || defined(_M_ARM) || defined(_M_ARM64) #pragma function(acosf,asinf,atanf,atan2f,ceilf,cosf,coshf,expf,floorf,fmodf,logf,log10f,powf,sinf,sinhf,sqrtf,tanf,tanhf) -#endif /* defined(_M_AMD64) || defined(_M_ARM) */ +#endif /* defined(_M_AMD64) || defined(_M_ARM) || defined(_M_ARM64) */ #if (_MSC_VER >= 1920) #pragma function(_hypotf) #endif

2 years, 11 months

[reactos] 01/01: [CRT/arm64] Build wine/except_arm64.c

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=724774505e0a2833de39f… commit 724774505e0a2833de39f74966040aedd65f47a3 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jan 11 20:52:34 2022 +0300 [CRT/arm64] Build wine/except_arm64.c Follow-up to 9efafd6 (0.4.14-dev-934). CORE-17518 --- sdk/lib/crt/wine/wine.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/lib/crt/wine/wine.cmake b/sdk/lib/crt/wine/wine.cmake index 6a4346d64e3..d16da073c31 100644 --- a/sdk/lib/crt/wine/wine.cmake +++ b/sdk/lib/crt/wine/wine.cmake @@ -18,6 +18,10 @@ elseif(ARCH STREQUAL "arm") list(APPEND CRT_WINE_SOURCE wine/except_arm.c ) +elseif(ARCH STREQUAL "arm64") + list(APPEND CRT_WINE_SOURCE + wine/except_arm64.c + ) endif() # includes for wine code

2 years, 11 months

[reactos] 01/01: [BCRYPT] Add ECDSA P384 to known algorithms

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3e0df06113b67a4c3967… commit c3e0df06113b67a4c3967cd018220c4f2bd7fa2b Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jan 11 20:52:02 2022 +0300 [BCRYPT] Add ECDSA P384 to known algorithms Add missing structs and handler in BCryptOpenAlgorithmProvider(). Cherry-pick a part of Michael Müller's https://source.winehq.org/git/wine.git/commit/76b6c360fa7f3d6a0a14ed935075f… Follow-up to e0a47b7 (0.4.15-dev-3603). CORE-14198 --- dll/win32/bcrypt/bcrypt_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/bcrypt/bcrypt_main.c b/dll/win32/bcrypt/bcrypt_main.c index 4b80ac0e94a..56234006bcd 100644 --- a/dll/win32/bcrypt/bcrypt_main.c +++ b/dll/win32/bcrypt/bcrypt_main.c @@ -268,6 +268,7 @@ enum alg_id ALG_ID_SHA384, ALG_ID_SHA512, ALG_ID_ECDSA_P256, + ALG_ID_ECDSA_P384, }; static const struct { @@ -281,6 +282,7 @@ static const struct { /* ALG_ID_SHA384 */ { 48, BCRYPT_SHA384_ALGORITHM }, /* ALG_ID_SHA512 */ { 64, BCRYPT_SHA512_ALGORITHM }, /* ALG_ID_ECDSA_P256 */ { 0, BCRYPT_ECDSA_P256_ALGORITHM }, + /* ALG_ID_ECDSA_P384 */ { 0, BCRYPT_ECDSA_P384_ALGORITHM }, }; struct algorithm @@ -354,6 +356,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512; else if (!strcmpW( id, BCRYPT_ECDSA_P256_ALGORITHM )) alg_id = ALG_ID_ECDSA_P256; + else if (!strcmpW( id, BCRYPT_ECDSA_P384_ALGORITHM )) alg_id = ALG_ID_ECDSA_P384; else { FIXME( "algorithm %s not supported\n", debugstr_w(id) );

2 years, 11 months

[reactos] 01/01: [NTOS:PS] Use quota types on process quota querying

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be56aff102b28e6580691… commit be56aff102b28e6580691a1d6b10ba7e21a626f1 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Jan 11 11:21:15 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Jan 11 11:21:15 2022 +0100 [NTOS:PS] Use quota types on process quota querying Quota limits on a block are enumerated on a per quota type basis thus we should use the values from PS_QUOTA_TYPE enumeration, not from POOL_TYPE. --- ntoskrnl/ps/query.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 7211a63e964..7b6f8aecf0e 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -210,11 +210,11 @@ NtQueryInformationProcess( { /* Get limits from non-default quota block */ QuotaLimits->PagedPoolLimit = - Process->QuotaBlock->QuotaEntry[PagedPool].Limit; + Process->QuotaBlock->QuotaEntry[PsPagedPool].Limit; QuotaLimits->NonPagedPoolLimit = - Process->QuotaBlock->QuotaEntry[NonPagedPool].Limit; + Process->QuotaBlock->QuotaEntry[PsNonPagedPool].Limit; QuotaLimits->PagefileLimit = - Process->QuotaBlock->QuotaEntry[2].Limit; + Process->QuotaBlock->QuotaEntry[PsPageFile].Limit; } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)

2 years, 11 months

← Newer
1
...
8
9
10
11
12
13
14
...
18
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 January 2022