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

Unified Diff: content/browser/gamepad/platform_data_fetcher_win.h

Issue 10781023: use Loadlibrary/GetProcAddress for XInput, rather than /DELAYLOAD (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fixes Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/gamepad/platform_data_fetcher_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gamepad/platform_data_fetcher_win.h
diff --git a/content/browser/gamepad/platform_data_fetcher_win.h b/content/browser/gamepad/platform_data_fetcher_win.h
index c93e62a87989b2421c17d97c135277c1b02c84c0..9cae9cc438b2973389d7d79ab5adccef654f530e 100644
--- a/content/browser/gamepad/platform_data_fetcher_win.h
+++ b/content/browser/gamepad/platform_data_fetcher_win.h
@@ -15,6 +15,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/scoped_native_library.h"
#include "content/browser/gamepad/data_fetcher.h"
namespace content {
@@ -22,11 +23,32 @@ namespace content {
class GamepadPlatformDataFetcherWin : public GamepadDataFetcher {
public:
GamepadPlatformDataFetcherWin();
+ virtual ~GamepadPlatformDataFetcherWin();
virtual void GetGamepadData(WebKit::WebGamepads* pads,
bool devices_changed_hint) OVERRIDE;
private:
+ // The three function types we use from xinput1_3.dll.
+ typedef void (WINAPI *XInputEnableFunc)(BOOL enable);
+ typedef DWORD (WINAPI *XInputGetCapabilitiesFunc)(
+ DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities);
+ typedef DWORD (WINAPI *XInputGetStateFunc)(
+ DWORD dwUserIndex, XINPUT_STATE* pState);
+
+ // Get functions from dynamically loaded xinput1_3.dll. We don't use
+ // DELAYLOAD because the import library for Win8 SDK pulls xinput1_4 which
+ // isn't redistributable. Returns true if loading was successful. We include
+ // xinput1_3.dll with Chrome.
+ bool GetXinputDllFunctions();
+
+ base::ScopedNativeLibrary xinput_dll_;
bool xinput_available_;
+ // Function pointers to XInput functionality, retrieved in
+ // |GetXinputDllFunctions|.
+ XInputEnableFunc xinput_enable_;
+ XInputGetCapabilitiesFunc xinput_get_capabilities_;
+ XInputGetStateFunc xinput_get_state_;
+
DISALLOW_COPY_AND_ASSIGN(GamepadPlatformDataFetcherWin);
};
« no previous file with comments | « no previous file | content/browser/gamepad/platform_data_fetcher_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698