Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

05/05: [HAL] Eliminate tail calls from HalpHardwareInterruptLevel. CORE-14076

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=888ace4397f8c4e1c5336… commit 888ace4397f8c4e1c5336b862b857f41dc857798 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 18 12:51:16 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 18 13:06:44 2018 +0100 [HAL] Eliminate tail calls from HalpHardwareInterruptLevel. CORE-14076 --- hal/halx86/up/pic.S | 1 + hal/halx86/up/pic.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hal/halx86/up/pic.S b/hal/halx86/up/pic.S index 1076bc5711..a5addcdf8c 100644 --- a/hal/halx86/up/pic.S +++ b/hal/halx86/up/pic.S @@ -75,5 +75,6 @@ DEFINE_END_INTERRUPT_WRAPPER HalpEndSoftwareInterrupt, HalpEndSoftwareInterrupt2 DEFINE_END_INTERRUPT_WRAPPER HalEndSystemInterrupt, HalEndSystemInterrupt2 DEFINE_INTERRUPT_WRAPPER HalpDispatchInterrupt, HalpDispatchInterrupt2 +DEFINE_INTERRUPT_WRAPPER HalpHardwareInterruptLevel, HalpHardwareInterruptLevel2 END diff --git a/hal/halx86/up/pic.c b/hal/halx86/up/pic.c index 6f68f1c5d0..d3e5529d7e 100644 --- a/hal/halx86/up/pic.c +++ b/hal/halx86/up/pic.c @@ -1015,9 +1015,9 @@ HalpDismissIrq07Level(IN KIRQL Irql, return _HalpDismissIrqLevel(Irql, Irq, OldIrql); } -VOID +PHAL_SW_INTERRUPT_HANDLER __cdecl -HalpHardwareInterruptLevel(VOID) +HalpHardwareInterruptLevel2(VOID) { PKPCR Pcr = KeGetPcr(); ULONG PendingIrqlMask, PendingIrql; @@ -1027,7 +1027,7 @@ HalpHardwareInterruptLevel(VOID) if (PendingIrqlMask) { /* Check for in-service delayed interrupt */ - if (Pcr->IrrActive & 0xFFFFFFF0) return; + if (Pcr->IrrActive & 0xFFFFFFF0) return NULL; /* Check if pending IRQL affects hardware state */ BitScanReverse(&PendingIrql, PendingIrqlMask); @@ -1036,8 +1036,10 @@ HalpHardwareInterruptLevel(VOID) Pcr->IRR ^= (1 << PendingIrql); /* Now handle pending interrupt */ - SWInterruptHandlerTable[PendingIrql](); + return SWInterruptHandlerTable[PendingIrql]; } + + return NULL; } /* SYSTEM INTERRUPTS **********************************************************/

6 years, 7 months

04/05: [HAL] Eliminate tail calls from HalpDispatchInterrupt[2]. CORE-14076

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4453242f7d7e71329b05… commit b4453242f7d7e71329b05b721066f11465add86e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 18 12:50:54 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 18 13:06:42 2018 +0100 [HAL] Eliminate tail calls from HalpDispatchInterrupt[2]. CORE-14076 --- hal/halx86/include/halp.h | 2 +- hal/halx86/up/pic.S | 24 ++++++++++++++++++++++++ hal/halx86/up/pic.c | 8 +++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 079b1adb6d..ed430910fd 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -576,7 +576,7 @@ HalpEnableInterruptHandler(IN UCHAR Flags, VOID NTAPI HalpInitializePICs(IN BOOLEAN EnableInterrupts); VOID __cdecl HalpApcInterrupt(VOID); VOID __cdecl HalpDispatchInterrupt(VOID); -VOID __cdecl HalpDispatchInterrupt2(VOID); +PHAL_SW_INTERRUPT_HANDLER __cdecl HalpDispatchInterrupt2(VOID); DECLSPEC_NORETURN VOID FASTCALL HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); DECLSPEC_NORETURN VOID FASTCALL HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); diff --git a/hal/halx86/up/pic.S b/hal/halx86/up/pic.S index 8211718585..1076bc5711 100644 --- a/hal/halx86/up/pic.S +++ b/hal/halx86/up/pic.S @@ -48,8 +48,32 @@ WrapperName&_CallIntHandler: .ENDP ENDM +MACRO(DEFINE_INTERRUPT_WRAPPER, WrapperName, HandlerName) +EXTERN _&HandlerName:PROC +PUBLIC _&WrapperName +.PROC _&WrapperName + FPO 0, 0, 0, 0, 0, FRAME_FPO + + /* Call the C function */ + call _&HandlerName + + /* Check if we got a pointer back */ + test eax, eax + jnz WrapperName&_CallIntHandler + + /* No? Just return */ + ret + +WrapperName&_CallIntHandler: + /* Optimize the tail call to avoid stack overflow */ + jmp eax +.ENDP +ENDM + DEFINE_END_INTERRUPT_WRAPPER HalpEndSoftwareInterrupt, HalpEndSoftwareInterrupt2 DEFINE_END_INTERRUPT_WRAPPER HalEndSystemInterrupt, HalEndSystemInterrupt2 +DEFINE_INTERRUPT_WRAPPER HalpDispatchInterrupt, HalpDispatchInterrupt2 + END diff --git a/hal/halx86/up/pic.c b/hal/halx86/up/pic.c index 2d1d6d10e3..6f68f1c5d0 100644 --- a/hal/halx86/up/pic.c +++ b/hal/halx86/up/pic.c @@ -382,7 +382,7 @@ PHAL_SW_INTERRUPT_HANDLER SWInterruptHandlerTable[20] = { (PHAL_SW_INTERRUPT_HANDLER)KiUnexpectedInterrupt, HalpApcInterrupt, - HalpDispatchInterrupt2, + HalpDispatchInterrupt, (PHAL_SW_INTERRUPT_HANDLER)KiUnexpectedInterrupt, HalpHardwareInterrupt0, HalpHardwareInterrupt1, @@ -1297,7 +1297,7 @@ HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) KiEoiHelper(TrapFrame); } -VOID +PHAL_SW_INTERRUPT_HANDLER __cdecl HalpDispatchInterrupt2(VOID) { @@ -1330,8 +1330,10 @@ HalpDispatchInterrupt2(VOID) } /* Now handle pending interrupt */ - SWInterruptHandlerTable[PendingIrql](); + return SWInterruptHandlerTable[PendingIrql]; } + + return NULL; } #else

6 years, 7 months

03/05: [HAL] Eliminate tail calls from HalEndSystemInterrupt. CORE-14076

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ade345427ff8d14549cf7… commit ade345427ff8d14549cf74c94f60e675f93d209b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 18 12:49:24 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 18 13:06:41 2018 +0100 [HAL] Eliminate tail calls from HalEndSystemInterrupt. CORE-14076 --- hal/halx86/up/pic.S | 1 + hal/halx86/up/pic.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hal/halx86/up/pic.S b/hal/halx86/up/pic.S index 170304788b..8211718585 100644 --- a/hal/halx86/up/pic.S +++ b/hal/halx86/up/pic.S @@ -50,5 +50,6 @@ ENDM DEFINE_END_INTERRUPT_WRAPPER HalpEndSoftwareInterrupt, HalpEndSoftwareInterrupt2 +DEFINE_END_INTERRUPT_WRAPPER HalEndSystemInterrupt, HalEndSystemInterrupt2 END diff --git a/hal/halx86/up/pic.c b/hal/halx86/up/pic.c index f61bf738d0..2d1d6d10e3 100644 --- a/hal/halx86/up/pic.c +++ b/hal/halx86/up/pic.c @@ -1139,10 +1139,10 @@ HalBeginSystemInterrupt(IN KIRQL Irql, /* * @implemented */ -VOID -NTAPI -HalEndSystemInterrupt(IN KIRQL OldIrql, - IN PKTRAP_FRAME TrapFrame) +PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY +FASTCALL +HalEndSystemInterrupt2(IN KIRQL OldIrql, + IN PKTRAP_FRAME TrapFrame) { ULONG PendingIrql, PendingIrqlMask, PendingIrqMask; PKPCR Pcr = KeGetPcr(); @@ -1156,7 +1156,7 @@ HalEndSystemInterrupt(IN KIRQL OldIrql, if (PendingIrqlMask) { /* Check for in-service delayed interrupt */ - if (Pcr->IrrActive & 0xFFFFFFF0) return; + if (Pcr->IrrActive & 0xFFFFFFF0) return NULL; /* Loop checking for pending interrupts */ while (TRUE) @@ -1172,7 +1172,7 @@ HalEndSystemInterrupt(IN KIRQL OldIrql, /* Now check if this specific interrupt is already in-service */ PendingIrqMask = (1 << PendingIrql); - if (Pcr->IrrActive & PendingIrqMask) return; + if (Pcr->IrrActive & PendingIrqMask) return NULL; /* Set active bit otherwise, and clear it from IRR */ Pcr->IrrActive |= PendingIrqMask; @@ -1191,11 +1191,12 @@ HalEndSystemInterrupt(IN KIRQL OldIrql, else { /* Now handle pending software interrupt */ - SWInterruptHandlerTable2[PendingIrql](TrapFrame); - UNREACHABLE; + return SWInterruptHandlerTable2[PendingIrql]; } } } + + return NULL; } /* SOFTWARE INTERRUPT TRAPS ***************************************************/

6 years, 7 months

02/05: [HAL] Create a macro for the HalpEndSoftwareInterrupt to allow reuse. CORE-14076

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a9474a6bb891bf979c2b… commit 7a9474a6bb891bf979c2bf3f0b37d745df98c12d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 18 12:42:18 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 18 13:06:39 2018 +0100 [HAL] Create a macro for the HalpEndSoftwareInterrupt to allow reuse. CORE-14076 --- hal/halx86/up/pic.S | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/hal/halx86/up/pic.S b/hal/halx86/up/pic.S index 5025a44254..170304788b 100644 --- a/hal/halx86/up/pic.S +++ b/hal/halx86/up/pic.S @@ -11,8 +11,6 @@ #include <ks386.inc> -EXTERN @HalpEndSoftwareInterrupt2@8:PROC - /* GLOBALS *******************************************************************/ .data @@ -21,23 +19,26 @@ ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING /* FUNCTIONS *****************************************************************/ .code -PUBLIC _HalpEndSoftwareInterrupt@8 -.PROC _HalpEndSoftwareInterrupt@8 + +MACRO(DEFINE_END_INTERRUPT_WRAPPER, WrapperName, HandlerName) +EXTERN @&HandlerName&@8:PROC +PUBLIC _&WrapperName&@8 +.PROC _&WrapperName&@8 FPO 0, 2, 0, 0, 0, FRAME_FPO /* Call the C function with the same arguments we got */ mov ecx, [esp+4] mov edx, [esp+8] - call @HalpEndSoftwareInterrupt2@8 + call @&HandlerName&@8 /* Check if we got a pointer back */ test eax, eax - jnz CallIntHandler + jnz WrapperName&_CallIntHandler /* No? Just return */ ret 8 -CallIntHandler: +WrapperName&_CallIntHandler: /* We got a pointer to call. Since it won't return, free up our stack space. Otherwise we could end up with some nasty deep recursion. The next function takes the trap frame as its (fastcall) argument. */ @@ -45,5 +46,9 @@ CallIntHandler: add esp, 12 jmp eax .ENDP +ENDM + + +DEFINE_END_INTERRUPT_WRAPPER HalpEndSoftwareInterrupt, HalpEndSoftwareInterrupt2 END

6 years, 7 months

01/05: [HAL] Convert HalpEndSoftwareInterrupt2 to fastcall. CORE-14076

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=040d78354e7da85350629… commit 040d78354e7da85350629a8b28f303d959a81f9c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 11 11:33:16 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 18 13:06:37 2018 +0100 [HAL] Convert HalpEndSoftwareInterrupt2 to fastcall. CORE-14076 --- hal/halx86/up/pic.S | 11 ++++++----- hal/halx86/up/pic.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hal/halx86/up/pic.S b/hal/halx86/up/pic.S index c9bd891407..5025a44254 100644 --- a/hal/halx86/up/pic.S +++ b/hal/halx86/up/pic.S @@ -11,7 +11,7 @@ #include <ks386.inc> -EXTERN _HalpEndSoftwareInterrupt2@8:PROC +EXTERN @HalpEndSoftwareInterrupt2@8:PROC /* GLOBALS *******************************************************************/ @@ -26,9 +26,9 @@ PUBLIC _HalpEndSoftwareInterrupt@8 FPO 0, 2, 0, 0, 0, FRAME_FPO /* Call the C function with the same arguments we got */ - push [esp+8] - push [esp+8] - call _HalpEndSoftwareInterrupt2@8 + mov ecx, [esp+4] + mov edx, [esp+8] + call @HalpEndSoftwareInterrupt2@8 /* Check if we got a pointer back */ test eax, eax @@ -39,7 +39,8 @@ PUBLIC _HalpEndSoftwareInterrupt@8 CallIntHandler: /* We got a pointer to call. Since it won't return, free up our stack - space, or we could end up with some nasty deep recursion */ + space. Otherwise we could end up with some nasty deep recursion. + The next function takes the trap frame as its (fastcall) argument. */ mov ecx, [esp+8] add esp, 12 jmp eax diff --git a/hal/halx86/up/pic.c b/hal/halx86/up/pic.c index a66526cd50..f61bf738d0 100644 --- a/hal/halx86/up/pic.c +++ b/hal/halx86/up/pic.c @@ -677,7 +677,7 @@ HalClearSoftwareInterrupt(IN KIRQL Irql) } PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY -NTAPI +FASTCALL HalpEndSoftwareInterrupt2(IN KIRQL OldIrql, IN PKTRAP_FRAME TrapFrame) {

6 years, 7 months

01/01: [RAPPS] Some fixes to our completely broken cert pinning attempt. - We should not open a new connection to request a certificate. - Update the issuer / subject for the LE certificate. - User proper types. - Require all fields that we check to be present.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b56193a27c8cb3180710f… commit b56193a27c8cb3180710f26f03af7084415479ce Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Feb 18 12:56:33 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Feb 18 13:01:02 2018 +0100 [RAPPS] Some fixes to our completely broken cert pinning attempt. - We should not open a new connection to request a certificate. - Update the issuer / subject for the LE certificate. - User proper types. - Require all fields that we check to be present. Without checking the public key or the entire certificate it's still not secure, but we are a step closer. Dedicated to Joachim Henze CORE-14350 --- base/applications/rapps/loaddlg.cpp | 81 ++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 47 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index d9d5aec84a..8e2e76ac44 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -47,8 +47,8 @@ #include "misc.h" #ifdef USE_CERT_PINNING -#define CERT_ISSUER_INFO "BE\r\nGlobalSign nv-sa\r\nGlobalSign Domain Validation CA - SHA256 - G2" -#define CERT_SUBJECT_INFO "Domain Control Validated\r\n*.reactos.org" +#define CERT_ISSUER_INFO "US\r\nLet's Encrypt\r\nLet's Encrypt Authority X3" +#define CERT_SUBJECT_INFO "svn.reactos.org" #endif enum DownloadStatus @@ -331,55 +331,42 @@ HRESULT WINAPI CDownloadDialog_Constructor(HWND Dlg, BOOL *pbCancelled, REFIID r } #ifdef USE_CERT_PINNING -static BOOL CertIsValid(HINTERNET hInternet, LPWSTR lpszHostName) +static BOOL CertIsValid(HINTERNET hFile, LPWSTR lpszHostName) { - HINTERNET hConnect; - HINTERNET hRequest; DWORD certInfoLength; - BOOL Ret = FALSE; - INTERNET_CERTIFICATE_INFOW certInfo; + INTERNET_CERTIFICATE_INFOA certInfo; + int ValidFlags = 0; + + /* Despite what the header indicates, the implementation of INTERNET_CERTIFICATE_INFO is not Unicode-aware. */ + certInfoLength = sizeof(certInfo); + if (!InternetQueryOptionA(hFile, + INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + &certInfo, + &certInfoLength)) + { + return FALSE; + } - hConnect = InternetConnectW(hInternet, lpszHostName, INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); - if (hConnect) + if (certInfo.lpszSubjectInfo) { - hRequest = HttpOpenRequestW(hConnect, L"HEAD", NULL, NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); - if (hRequest != NULL) - { - Ret = HttpSendRequestW(hRequest, L"", 0, NULL, 0); - if (Ret) - { - certInfoLength = sizeof(certInfo); - Ret = InternetQueryOptionW(hRequest, - INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, - &certInfo, - &certInfoLength); - if (Ret) - { - if (certInfo.lpszEncryptionAlgName) - LocalFree(certInfo.lpszEncryptionAlgName); - if (certInfo.lpszIssuerInfo) - { - if (strcmp((LPSTR) certInfo.lpszIssuerInfo, CERT_ISSUER_INFO) != 0) - Ret = FALSE; - LocalFree(certInfo.lpszIssuerInfo); - } - if (certInfo.lpszProtocolName) - LocalFree(certInfo.lpszProtocolName); - if (certInfo.lpszSignatureAlgName) - LocalFree(certInfo.lpszSignatureAlgName); - if (certInfo.lpszSubjectInfo) - { - if (strcmp((LPSTR) certInfo.lpszSubjectInfo, CERT_SUBJECT_INFO) != 0) - Ret = FALSE; - LocalFree(certInfo.lpszSubjectInfo); - } - } - } - InternetCloseHandle(hRequest); - } - InternetCloseHandle(hConnect); + if (strcmp(certInfo.lpszSubjectInfo, CERT_SUBJECT_INFO) == 0) + ValidFlags |= 1; + LocalFree(certInfo.lpszSubjectInfo); + } + if (certInfo.lpszIssuerInfo) + { + if (strcmp(certInfo.lpszIssuerInfo, CERT_ISSUER_INFO) == 0) + ValidFlags |= 2; + LocalFree(certInfo.lpszIssuerInfo); } - return Ret; + if (certInfo.lpszProtocolName) + LocalFree(certInfo.lpszProtocolName); + if (certInfo.lpszSignatureAlgName) + LocalFree(certInfo.lpszSignatureAlgName); + if (certInfo.lpszEncryptionAlgName) + LocalFree(certInfo.lpszEncryptionAlgName); + + return ValidFlags == 3; } #endif @@ -768,7 +755,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) // are we using HTTPS to download the RAPPS update package? check if the certificate is original if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && (wcscmp(InfoArray[iAppId].szUrl, APPLICATION_DATABASE_URL) == 0) && - (!CertIsValid(hOpen, urlComponents.lpszHostName))) + (!CertIsValid(hFile, urlComponents.lpszHostName))) { MessageBox_LoadString(hMainWnd, IDS_CERT_DOES_NOT_MATCH); goto end;

6 years, 7 months

01/01: [NTOSKRNL] Don't make CcScheduleReadAhead() too noisy

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e319f85e67b1d057fb1c0… commit e319f85e67b1d057fb1c0d0449a6756fa0d459ba Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Feb 18 11:30:51 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Feb 18 11:31:14 2018 +0100 [NTOSKRNL] Don't make CcScheduleReadAhead() too noisy --- ntoskrnl/cc/cacheman.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/cacheman.c b/ntoskrnl/cc/cacheman.c index 99abf84e5d..9ef906ee43 100644 --- a/ntoskrnl/cc/cacheman.c +++ b/ntoskrnl/cc/cacheman.c @@ -165,6 +165,7 @@ CcScheduleReadAhead ( LARGE_INTEGER NewOffset; PROS_SHARED_CACHE_MAP SharedCacheMap; PPRIVATE_CACHE_MAP PrivateCacheMap; + static ULONG Warn; SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; PrivateCacheMap = FileObject->PrivateCacheMap; @@ -214,7 +215,7 @@ CcScheduleReadAhead ( { /* FIXME: handle the other cases */ KeReleaseSpinLock(&PrivateCacheMap->ReadAheadSpinLock, OldIrql); - UNIMPLEMENTED; + if (!Warn++) UNIMPLEMENTED; return; } }

6 years, 7 months

04/04: [WIN32K:NTUSER] Safely handle allocation failure in IntCloneMenu. CORE-14222

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b030836b408700f45555e… commit b030836b408700f45555ee252e6a5fcaeb386e46 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Feb 1 11:08:14 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 18 11:27:35 2018 +0100 [WIN32K:NTUSER] Safely handle allocation failure in IntCloneMenu. CORE-14222 --- win32ss/user/ntuser/menu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 46382e4815..888b4ea696 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -815,6 +815,7 @@ IntCloneMenuItems(PMENU Destination, PMENU Source) NewMenuItem->Xlpstr = NewMenuItem->lpstr.Buffer; } NewMenuItem->hbmp = MenuItem->hbmp; + Destination->cItems = i + 1; } return TRUE; } @@ -847,7 +848,7 @@ IntCloneMenu(PMENU Source) Menu->spwndNotify = NULL; Menu->cyMenu = 0; Menu->cxMenu = 0; - Menu->cItems = Source->cItems; + Menu->cItems = 0; Menu->iTop = 0; Menu->iMaxTop = 0; Menu->cxTextAlign = 0;

6 years, 7 months

03/04: [WIN32K:NTUSER] Avoid allocating an extra item in IntCloneMenuItems. CORE-14222

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1969094028f166e7354ec… commit 1969094028f166e7354ec639a5d38e4ef02716e5 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Feb 1 11:07:39 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 18 11:27:32 2018 +0100 [WIN32K:NTUSER] Avoid allocating an extra item in IntCloneMenuItems. CORE-14222 --- win32ss/user/ntuser/menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 5ecffbb8e3..46382e4815 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -778,10 +778,10 @@ IntCloneMenuItems(PMENU Destination, PMENU Source) if(!Source->cItems) return FALSE; - NewMenuItem = DesktopHeapAlloc(Destination->head.rpdesk, (Source->cItems+1) * sizeof(ITEM)); + NewMenuItem = DesktopHeapAlloc(Destination->head.rpdesk, Source->cItems * sizeof(ITEM)); if(!NewMenuItem) return FALSE; - RtlZeroMemory(NewMenuItem, (Source->cItems+1) * sizeof(ITEM)); + RtlZeroMemory(NewMenuItem, Source->cItems * sizeof(ITEM)); Destination->rgItems = NewMenuItem;

6 years, 7 months

02/04: [WIN32K:NTUSER] Handle realloc failure in IntRemoveMenuItem. CORE-14222

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de455c4d50e6ba3b1d6b2… commit de455c4d50e6ba3b1d6b2897618feadb54a5e37f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Feb 1 11:06:50 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 18 11:27:29 2018 +0100 [WIN32K:NTUSER] Handle realloc failure in IntRemoveMenuItem. CORE-14222 --- win32ss/user/ntuser/menu.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 8432f3a83f..5ecffbb8e3 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -598,6 +598,7 @@ BOOL FASTCALL IntRemoveMenuItem( PMENU pMenu, UINT nPos, UINT wFlags, BOOL bRecurse ) { PITEM item; + PITEM newItems; TRACE("(menu=%p pos=%04x flags=%04x)\n",pMenu, nPos, wFlags); if (!(item = MENU_FindItem( &pMenu, &nPos, wFlags ))) return FALSE; @@ -617,13 +618,17 @@ IntRemoveMenuItem( PMENU pMenu, UINT nPos, UINT wFlags, BOOL bRecurse ) } else { - while(nPos < pMenu->cItems) - { - *item = *(item+1); - item++; - nPos++; - } - pMenu->rgItems = DesktopHeapReAlloc(pMenu->head.rpdesk, pMenu->rgItems, pMenu->cItems * sizeof(ITEM)); + while (nPos < pMenu->cItems) + { + *item = *(item+1); + item++; + nPos++; + } + newItems = DesktopHeapReAlloc(pMenu->head.rpdesk, pMenu->rgItems, pMenu->cItems * sizeof(ITEM)); + if (newItems) + { + pMenu->rgItems = newItems; + } } return TRUE; }

6 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
24
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 February 2018