Fix high cpu usage for splitter drag (report/fix by RamMerlabs)
Fix security dialog regression (reported by RamMerlabs)
Backport from 1.8.7
This commit is contained in:
hfiref0x 2020-06-29 23:25:48 +07:00
parent bd195fb550
commit 1405f3968b
No known key found for this signature in database
GPG Key ID: 5A20EE3C6F09AF95
5 changed files with 23 additions and 19 deletions

Binary file not shown.

View File

@ -6,7 +6,7 @@
*
* VERSION: 1.86
*
* DATE: 26 May 2020
* DATE: 28 June 2020
*
* Program entry point and main window handler.
*
@ -778,6 +778,7 @@ LRESULT CALLBACK MainWindowProc(
)
{
INT mark;
LONG NewSplitterPos;
RECT ToolBarRect, crc;
LPDRAWITEMSTRUCT pds;
LPMEASUREITEMSTRUCT pms;
@ -853,13 +854,16 @@ LRESULT CALLBACK MainWindowProc(
case WM_MOUSEMOVE:
if ((wParam & MK_LBUTTON) != 0) {
GetClientRect(MainWindow, &ToolBarRect);
SplitterPos = (SHORT)LOWORD(lParam);
if (SplitterPos < SplitterMargin)
SplitterPos = SplitterMargin;
if (SplitterPos > ToolBarRect.right - SplitterMargin)
SplitterPos = ToolBarRect.right - SplitterMargin;
SendMessage(MainWindow, WM_SIZE, 0, 0);
UpdateWindow(MainWindow);
NewSplitterPos = (SHORT)LOWORD(lParam);
if (NewSplitterPos < SplitterMargin)
NewSplitterPos = SplitterMargin;
if (NewSplitterPos > ToolBarRect.right - SplitterMargin)
NewSplitterPos = ToolBarRect.right - SplitterMargin;
if (SplitterPos != NewSplitterPos) {
SplitterPos = NewSplitterPos;
SendMessage(MainWindow, WM_SIZE, 0, 0);
UpdateWindow(MainWindow);
}
}
break;

View File

@ -6,7 +6,7 @@
*
* VERSION: 1.86
*
* DATE: 26 May 2020
* DATE: 28 June 2020
*
* THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
* ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED

View File

@ -4,9 +4,9 @@
*
* TITLE: PROPSECURITY.C
*
* VERSION: 1.83
* VERSION: 1.86
*
* DATE: 05 Jan 2020
* DATE: 28 June 2020
*
* THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
* ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED
@ -367,7 +367,7 @@ HRESULT STDMETHODCALLTYPE GetSecurity(
);
}
hResult = HRESULT_FROM_NT(status);
hResult = HRESULT_FROM_WIN32(RtlNtStatusToDosError(status));
*ppSecurityDescriptor = PSD;
Done:
@ -395,7 +395,7 @@ HRESULT STDMETHODCALLTYPE SetSecurity(
//cleanup
This->CloseObjectMethod(This->ObjectContext, hObject);
return HRESULT_FROM_NT(status);
return HRESULT_FROM_WIN32(RtlNtStatusToDosError(status));
}
HRESULT STDMETHODCALLTYPE MapGeneric(
@ -498,7 +498,7 @@ HRESULT propSecurityConstructor(
bytesNeeded = 0;
status = NtQueryObject(hObject, ObjectTypeInformation, NULL, 0, &bytesNeeded);
if (bytesNeeded == 0) {
hResult = HRESULT_FROM_NT(status);
hResult = HRESULT_FROM_WIN32(RtlNtStatusToDosError(status));
break;
}
@ -511,7 +511,7 @@ HRESULT propSecurityConstructor(
status = NtQueryObject(hObject, ObjectTypeInformation, TypeInfo,
bytesNeeded, &bytesNeeded);
if (!NT_SUCCESS(status)) {
hResult = HRESULT_FROM_NT(status);
hResult = HRESULT_FROM_WIN32(RtlNtStatusToDosError(status));
break;
}

View File

@ -2,7 +2,7 @@
e192abb83dded0fe227f3fe69cb0ac7aaa197941917afd497b4cf8796a03e041 *Compiled\WHATSNEW_173.md
fa001b1ac9bbbb6c954d5dd609de60fa2b0277a6cfe35f6428591e4b4b1e8453 *Compiled\WHATSNEW_180.md
932098b8b1e331eed4d52e1d8c5014a11a9b770e0783139a9736cf64ed8087cf *Compiled\WinObjEx64.chm
e54f83b7427562158c2335450c21da9aa74bfd1a8feab3da98be4691d412df71 *Compiled\WinObjEx64.exe
95ad83c19290f48d1c033136343710a50ab4bb0d80d25532a3704b1779c353d0 *Compiled\WinObjEx64.exe
6a721a314fa7cb6843b5ad393bbbcc5226babb1853a9aa4b8092ebb3d50d53c5 *Compiled\plugins\ApiSetView.dll
79b1e709764ee1e1ff0da7f6264615c6a17252d098766bbdcf5c67b890c1cf4a *Compiled\plugins\ExamplePlugin.dll
4ce146e8a8a8dbe65b4d406bc6bbb7770bd3721162e1ce8ae3552672f4c91ec4 *Compiled\plugins\Sonar.dll
@ -121,7 +121,7 @@ b8163b025cfcc9b20e16648e137544b0067bb02e06d6007957ab9f84433eb51a *Source\WinObjE
c01b020555ba5e12d42780ed27e6d42f479a5cdc67b571ee6de2ddd1f8bf55ca *Source\WinObjEx64\ksymbols.h
95d7a0848b06bebcdfcf31edd297a81dcc6b3d29988b238a34a254d6d45cf8a7 *Source\WinObjEx64\list.c
b490a01e298d0567ae624c0d1aecd5921cd56f5cba3e9512c88053faec089799 *Source\WinObjEx64\list.h
a34df3cb3f50a7fe0a1f24bf1596b3deff6897404e2ffb8172ae08dbe1f8cb7a *Source\WinObjEx64\main.c
2428333bcf3e8015bcb4754547267758eb1f99fa33c5fbe41f956e37d524de0b *Source\WinObjEx64\main.c
5d2b9be96b42044e0f09a6a901c194934a1dc2d2e7cf14d65e6414b22ec89765 *Source\WinObjEx64\msvcver.h
2e2e98f95e03de096697010893fa5e000a7ef2268c6c38062b1c8dee8b57aef2 *Source\WinObjEx64\objects.c
47f476e0778b726b0a9af5a5afeb3b155700a10c26bb45666c89a6c8c1707be6 *Source\WinObjEx64\objects.h
@ -169,7 +169,7 @@ cfe50c9f14a26e8c0c40d6929b6cc73e0c5536457d79ff71bc75dbde526ab73f *Source\WinObjE
ee611560bd097cf394093dea2581b56e0b3e11d54638253cd5fae3509075634f *Source\WinObjEx64\props\propBasicConsts.h
c915cd21df479a43b9ab814f2d81118eb2c9eb5557dc52760417f8cc003168ee *Source\WinObjEx64\props\propDesktop.c
047e4d17c76908889af6e7e80da91b04a3707a190acc0f7d2b26e98bcf80e3b2 *Source\WinObjEx64\props\propDesktop.h
9fd8b8c680ddbe576dab4c7fb1411e2dfcb2c46b66e4e2ab3d64637e6a6007eb *Source\WinObjEx64\props\propDlg.c
e40bc93dbd76d57ef1bc06630062f02e693a1a2edd7a6f91f2dda0ea721918ea *Source\WinObjEx64\props\propDlg.c
8f6bc3bd53e6efad1d80ad56dd61fe818cad4fb8f68da5025a8503d67d6998dc *Source\WinObjEx64\props\propDlg.h
4cda893692e76c4770ad30934e5418f4dc36c27d64d7549d7c0446712103a8a2 *Source\WinObjEx64\props\propDriver.c
8dd63e57115728cdea4c326e5cde9acfe6015b2b088ec36022cd9f81e216e179 *Source\WinObjEx64\props\propDriver.h
@ -179,7 +179,7 @@ c55e5606da84685b03c72f7c6b48f7a3538cfca6ee42507056d52e29ac92c883 *Source\WinObjE
f656714826f30709b5b8da55f921605440a2e7b8ede704b6a5dad154d3822612 *Source\WinObjEx64\props\propObjectDumpConsts.h
85f899a6e07995ef0b72b2aa3198b358dd3fb1c0765f55c844b9c21ed529f6be *Source\WinObjEx64\props\propProcess.c
7ce4c79b1d7a93691cc457d01836209b51f25addc07a0875888e01a6c9a77358 *Source\WinObjEx64\props\propProcess.h
a6f71195df7c84e18388a017dd889691e1d5d9570cc3c166c8c4b37ea801480f *Source\WinObjEx64\props\propSecurity.c
b356098d50ecee5cd1588230a568f74a1763b029ee606e2aa842faf0837108d3 *Source\WinObjEx64\props\propSecurity.c
730ba43d81c4d0e2925560c8fae0ae167b38d2254d442971822f48391c35d319 *Source\WinObjEx64\props\propSecurity.h
11159c4e5a46fc496b18d045573fe19e620a0a8145c0e81d995cfba7d291a025 *Source\WinObjEx64\props\propSecurityConsts.h
4edca068b3958aa938495a1ca0d7bb8278f2468d54dae679ad57ee386dbbf5b7 *Source\WinObjEx64\props\propToken.c