summaryrefslogtreecommitdiffstats
path: root/base/process_util_win.cc
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 22:46:17 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 22:46:17 +0000
commitf56d158f195ac3f01fd4effcab065afaaf1bde29 (patch)
tree7c4309b68f36d61c94694542530b3e652b6003d2 /base/process_util_win.cc
parent96ccb0775beb6054adc6f5c45e1f09c20c5c222b (diff)
downloadchromium_src-f56d158f195ac3f01fd4effcab065afaaf1bde29.zip
chromium_src-f56d158f195ac3f01fd4effcab065afaaf1bde29.tar.gz
chromium_src-f56d158f195ac3f01fd4effcab065afaaf1bde29.tar.bz2
Fix base::GetModuleFromAddress() not to increment the module's reference count,
to match the behaviour expected by calling code. The original change was reverted by https://chromiumcodereview.appspot.com/10384209. BUG=124091,127933 Review URL: https://chromiumcodereview.appspot.com/10391169 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_win.cc')
-rw-r--r--base/process_util_win.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/base/process_util_win.cc b/base/process_util_win.cc
index 4fab4c6..9b2e100 100644
--- a/base/process_util_win.cc
+++ b/base/process_util_win.cc
@@ -176,13 +176,14 @@ ProcessHandle GetCurrentProcessHandle() {
}
HMODULE GetModuleFromAddress(void* address) {
- HMODULE hinst = NULL;
- if (!::GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
+ HMODULE instance = NULL;
+ if (!::GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+ GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
static_cast<char*>(address),
- &hinst)) {
+ &instance)) {
NOTREACHED();
}
- return hinst;
+ return instance;
}
bool OpenProcessHandle(ProcessId pid, ProcessHandle* handle) {