From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 645893857C45; Fri, 7 Aug 2020 14:09:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 645893857C45 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jon TURNEY To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: Use documented QueryWorkingSetEx() in dumper X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: e3f29b247250f95600c93934182a00d8ae81dacf X-Git-Newrev: 1be41b802ae151f0dbc4e67fd3fd1cc563978643 Message-Id: <20200807140903.645893857C45@sourceware.org> Date: Fri, 7 Aug 2020 14:09:03 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Aug 2020 14:09:03 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=1be41b802ae151f0dbc4e67fd3fd1cc563978643 commit 1be41b802ae151f0dbc4e67fd3fd1cc563978643 Author: Jon Turney Date: Wed Jul 29 15:19:13 2020 +0100 Cygwin: Use documented QueryWorkingSetEx() in dumper In dumper, use the documented QueryWorkingSetEx(), rather than the undocumented NtQueryVirtualMemory() with MemoryWorkingSetExInformation. Diff: --- winsup/utils/dumper.cc | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/winsup/utils/dumper.cc b/winsup/utils/dumper.cc index 25fd080c8..f21c93bf7 100644 --- a/winsup/utils/dumper.cc +++ b/winsup/utils/dumper.cc @@ -34,6 +34,7 @@ #include #include #include +#include #include "dumper.h" @@ -267,43 +268,20 @@ void protect_dump(DWORD protect, char *buf) strcat (buf, pt[i]); } -typedef enum _MEMORY_INFORMATION_CLASS -{ - MemoryWorkingSetExInformation = 4, // MEMORY_WORKING_SET_EX_INFORMATION -} MEMORY_INFORMATION_CLASS; - -extern "C" -NTSTATUS NTAPI -NtQueryVirtualMemory(HANDLE ProcessHandle, - LPVOID BaseAddress, - MEMORY_INFORMATION_CLASS MemoryInformationClass, - LPVOID MemoryInformation, - SIZE_T MemoryInformationLength, - SIZE_T *ReturnLength); - -typedef struct _MEMORY_WORKING_SET_EX_INFORMATION -{ - LPVOID VirtualAddress; - ULONG_PTR Long; -} MEMORY_WORKING_SET_EX_INFORMATION; - -#define MWSEI_ATTRIB_SHARED (0x1 << 15) +#define PSWSEI_ATTRIB_SHARED (0x1 << 15) static BOOL getRegionAttributes(HANDLE hProcess, LPVOID address, DWORD &attribs) { - MEMORY_WORKING_SET_EX_INFORMATION mwsei = { address }; - NTSTATUS status = NtQueryVirtualMemory(hProcess, 0, - MemoryWorkingSetExInformation, - &mwsei, sizeof(mwsei), 0); + PSAPI_WORKING_SET_EX_INFORMATION pswsei = { address }; - if (!status) + if (QueryWorkingSetEx(hProcess, &pswsei, sizeof(pswsei))) { - attribs = mwsei.Long; + attribs = pswsei.VirtualAttributes.Flags; return TRUE; } - deb_printf("MemoryWorkingSetExInformation failed status %08x\n", status); + deb_printf("QueryWorkingSetEx failed status %08x\n", GetLastError()); return FALSE; } @@ -338,7 +316,7 @@ dumper::collect_memory_sections () DWORD attribs = 0; if (getRegionAttributes(hProcess, current_page_address, attribs)) { - if (attribs & MWSEI_ATTRIB_SHARED) + if (attribs & PSWSEI_ATTRIB_SHARED) { skip_region_p = 1; disposition = "skipped due to shared MEM_IMAGE";