mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Use WPARAM as uint64_t and LPARAM as int64_t

Browse source
This commit is contained in:
Omri Litov 2015-10-28 21:54:50 +02:00
parent 2ac40cc28e
commit f22837523f
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_window.cc
View file

@ -190,7 +190,7 @@ void Window::OnExecuteWindowsCommand(const std::string& command_name) {
} }
#if defined(OS_WIN) #if defined(OS_WIN)
void Window::OnWindowMessage(UINT message, WPARAM w_param, uint64_t l_param) { void Window::OnWindowMessage(UINT message, uint64_t w_param, int64_t l_param) {
if (IsWindowMessageHooked(message)) { if (IsWindowMessageHooked(message)) {
messages_callback_map_[message].Run(w_param, l_param); messages_callback_map_[message].Run(w_param, l_param);
} }

3
atom/browser/api/atom_api_window.h
View file

@ -77,7 +77,8 @@ class Window : public mate::TrackableObject<Window>,
void OnExecuteWindowsCommand(const std::string& command_name) override; void OnExecuteWindowsCommand(const std::string& command_name) override;
#if defined(OS_WIN) #if defined(OS_WIN)
void OnWindowMessage(UINT message, WPARAM w_param, uint64_t l_param) override; void OnWindowMessage(UINT message, uint64_t w_param,
int64_t l_param) override;
#endif #endif
// mate::Wrappable: // mate::Wrappable:

3
atom/browser/native_window.cc
View file

@ -469,7 +469,8 @@ void NativeWindow::NotifyWindowMessage(UINT message, WPARAM w_param,
LPARAM l_param) { LPARAM l_param) {
FOR_EACH_OBSERVER( FOR_EACH_OBSERVER(
NativeWindowObserver, observers_, NativeWindowObserver, observers_,
OnWindowMessage(message, w_param, static_cast<uint64_t>(l_param))); OnWindowMessage(message, static_cast<uint64_t>(w_param),
static_cast<int64_t>(l_param)));
} }
#endif #endif

2
atom/browser/native_window_observer.h
View file

@ -61,7 +61,7 @@ class NativeWindowObserver {
// Called when window message received // Called when window message received
#if defined(OS_WIN) #if defined(OS_WIN)
virtual void OnWindowMessage(UINT message, WPARAM wparam, uint64_t lparam) {} virtual void OnWindowMessage(UINT message, uint64_t wparam, int64_t lparam) {}
#endif #endif
// Called when renderer is hung. // Called when renderer is hung.