Fixed Issue 863. Added to HISTORY/CREDITS

Jeremy Humble · Jeremy Humble · commit e83c0fb9ccaa · 2016-07-21T16:51:39.000-04:00
diff --git a/CREDITS b/CREDITS
@@ -390,3 +390,7 @@ I: 823
 N: Jake Omann
 E: https://github.com/jhomann
 I: 816
+
+N: Jeremy Humble
+W: https://github.com/jhumble
+I: 863
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -8,6 +8,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues
 - #854: Process.as_dict() raises ValueError if passed an erroneous attrs name.
 - #858: Process.as_dict() should not return memory_info_ex() because it's
   deprecated.
+- #863: [Windows] memory_map truncates addresses above 32 bits
 
 
 4.3.0 - 2016-06-18
diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
@@ -2782,9 +2782,13 @@ static char *get_region_protection_string(ULONG protection) {
  */
 static PyObject *
 psutil_proc_memory_maps(PyObject *self, PyObject *args) {
+#ifdef _WIN64
+	MEMORY_BASIC_INFORMATION64 basicInfo;
+#else
+	MEMORY_BASIC_INFORMATION basicInfo;
+#endif
     DWORD pid;
     HANDLE hProcess = NULL;
-    MEMORY_BASIC_INFORMATION basicInfo;
     PVOID baseAddress;
     PVOID previousAllocationBase;
     CHAR mappedFileName[MAX_PATH];
@@ -2815,12 +2819,20 @@ psutil_proc_memory_maps(PyObject *self, PyObject *args) {
         if (GetMappedFileNameA(hProcess, baseAddress, mappedFileName,
                                sizeof(mappedFileName)))
         {
-            py_tuple = Py_BuildValue(
-                "(kssI)",
-                (unsigned long)baseAddress,
-                get_region_protection_string(basicInfo.Protect),
-                mappedFileName,
-                basicInfo.RegionSize);
+#ifdef _WIN64
+		   py_tuple = Py_BuildValue(
+			  "(KssI)",
+			  (unsigned long long)baseAddress,
+
+#else
+		   py_tuple = Py_BuildValue(
+			  "(kssI)",
+			  (unsigned long)baseAddress,
+#endif
+			  get_region_protection_string(basicInfo.Protect),
+			  mappedFileName,
+			  basicInfo.RegionSize);
+           
             if (!py_tuple)
                 goto error;
             if (PyList_Append(py_retlist, py_tuple))
