Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: webkit/plugins/npapi/webplugin_delegate_impl_win.cc

Issue 6090006: Regkey functions return error code instead of bool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" 5 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 mouse_hook_ = SetWindowsHookEx(WH_MOUSE, MouseHookProc, NULL, 410 mouse_hook_ = SetWindowsHookEx(WH_MOUSE, MouseHookProc, NULL,
411 GetCurrentThreadId()); 411 GetCurrentThreadId());
412 } 412 }
413 } 413 }
414 414
415 // On XP, WMP will use its old UI unless a registry key under HKLM has the 415 // On XP, WMP will use its old UI unless a registry key under HKLM has the
416 // name of the current process. We do it in the installer for admin users, 416 // name of the current process. We do it in the installer for admin users,
417 // for the rest patch this function. 417 // for the rest patch this function.
418 if ((quirks_ & PLUGIN_QUIRK_PATCH_REGENUMKEYEXW) && 418 if ((quirks_ & PLUGIN_QUIRK_PATCH_REGENUMKEYEXW) &&
419 base::win::GetVersion() == base::win::VERSION_XP && 419 base::win::GetVersion() == base::win::VERSION_XP &&
420 !base::win::RegKey().Open(HKEY_LOCAL_MACHINE, 420 (base::win::RegKey().Open(HKEY_LOCAL_MACHINE,
421 L"SOFTWARE\\Microsoft\\MediaPlayer\\ShimInclusionList\\chrome.exe", 421 L"SOFTWARE\\Microsoft\\MediaPlayer\\ShimInclusionList\\chrome.exe",
422 KEY_READ) && 422 KEY_READ) != ERROR_SUCCESS) &&
423 !g_iat_patch_reg_enum_key_ex_w.Pointer()->is_patched()) { 423 !g_iat_patch_reg_enum_key_ex_w.Pointer()->is_patched()) {
424 g_iat_patch_reg_enum_key_ex_w.Pointer()->Patch( 424 g_iat_patch_reg_enum_key_ex_w.Pointer()->Patch(
425 L"wmpdxm.dll", "advapi32.dll", "RegEnumKeyExW", 425 L"wmpdxm.dll", "advapi32.dll", "RegEnumKeyExW",
426 WebPluginDelegateImpl::RegEnumKeyExWPatch); 426 WebPluginDelegateImpl::RegEnumKeyExWPatch);
427 } 427 }
428 428
429 return true; 429 return true;
430 } 430 }
431 431
432 void WebPluginDelegateImpl::PlatformDestroyInstance() { 432 void WebPluginDelegateImpl::PlatformDestroyInstance() {
(...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after
1404 ::ReleaseCapture(); 1404 ::ReleaseCapture();
1405 break; 1405 break;
1406 1406
1407 default: 1407 default:
1408 break; 1408 break;
1409 } 1409 }
1410 } 1410 }
1411 1411
1412 } // namespace npapi 1412 } // namespace npapi
1413 } // namespace webkit 1413 } // namespace webkit
OLDNEW
« net/base/platform_mime_util_win.cc ('K') | « webkit/plugins/npapi/plugin_list_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698