Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue 863. Uses the MEMORY_BASIC_INFORMATION64 struct and retur… #864

Closed
wants to merge 2 commits into from
Closed

Fixed issue 863. Uses the MEMORY_BASIC_INFORMATION64 struct and retur… #864

wants to merge 2 commits into from

Conversation

jhumble
Copy link

@jhumble jhumble commented Jul 21, 2016

…ns a 64bit baseAddress when compiled for 64 bit windows

…ns a 64bit baseAddress when compiled for 64 bit windows
MEMORY_BASIC_INFORMATION64 basicInfo;
#else
MEMORY_BASIC_INFORMATION basicInfo;
#endif
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please indent the ifdefs properly (no spaces) and also the variable names should be indented like the others below

@giampaolo
Copy link
Owner

I added some comments inline. Other than that, can you please also update HISTORY and CREDITS files? Thanks a lot.

@coveralls
Copy link

coveralls commented Jul 21, 2016

Coverage Status

Coverage remained the same at 89.753% when pulling c09fa2a on jhumble:863-fix-64bit-memory_map into 178bc92 on giampaolo:0-wiz-0-master.

@jhumble
Copy link
Author

jhumble commented Jul 21, 2016

I made your suggested changes. Let me know if I missed anything. Thanks!

@coveralls
Copy link

coveralls commented Jul 21, 2016

Coverage Status

Coverage increased (+0.03%) to 89.783% when pulling 6cf3708 on jhumble:863-fix-64bit-memory_map into 178bc92 on giampaolo:0-wiz-0-master.

"(kssI)",
(unsigned long)baseAddress,
#endif
(unsigned long long)baseAddress,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks wrong. Shouldn't this line be inside the ifdef statement?
You should do:



 +#ifdef _WIN64
 +         py_tuple = Py_BuildValue(
 +            "(KssI)",
 +            (unsigned long long)baseAddress,
 +#else
 +         py_tuple = Py_BuildValue(
 +            "(kssI)",
 +            (unsigned long)baseAddress,
 +#endif
              ...

@jhumble
Copy link
Author

jhumble commented Jul 21, 2016

You're right on both. Sorry, I'm pretty new to pull requests here. I'll try to just delete this request and make a new one off of master.

@jhumble jhumble closed this Jul 21, 2016
@giampaolo giampaolo added the bug label Nov 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants