mozilla-inbound: changeset 73332:de99c5ffafd0a31cd962d506d847b5d2f6607b23

author	Jacek Caban <jacek@codeweavers.com>
	Tue, 26 Jul 2011 12:24:20 +0200
changeset 73332	de99c5ffafd0a31cd962d506d847b5d2f6607b23
parent 73331	ee078de32bbae5b80b9a10053796ead673a48b03
child 73333	1ad3b39977f14742622aefa82c12d240cae2bd22
push id	772
push user	jacek@codeweavers.com
push date	Tue, 26 Jul 2011 10:33:36 +0000
treeherder	mozilla-inbound@1ad3b39977f1 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	benjamin
bugs	670912
milestone	8.0a1
first release with	nightly linux32 0a936ddb70e9 / 8.0a1 / 20110727030839 / files nightly linux64 0a936ddb70e9 / 8.0a1 / 20110727030839 / files nightly mac 0a936ddb70e9 / 8.0a1 / 20110727030839 / files nightly win32 0a936ddb70e9 / 8.0a1 / 20110727030839 / files nightly win64 e4c8a1e7b373 / 8.0a1 / 20110727081800 / files
last release without	nightly linux32 58c04967ac5b / 8.0a1 / 20110726030825 / files nightly linux64 58c04967ac5b / 8.0a1 / 20110726030825 / files nightly mac 58c04967ac5b / 8.0a1 / 20110726030825 / files nightly win32 58c04967ac5b / 8.0a1 / 20110726030825 / files nightly win64 58c04967ac5b / 8.0a1 / 20110726030825 / files

--- a/dom/plugins/test/testplugin/nptest_windows.cpp
+++ b/dom/plugins/test/testplugin/nptest_windows.cpp
@@ -503,17 +503,17 @@ LRESULT CALLBACK PluginWndProc(HWND hWnd
 {
 	WNDPROC wndProc = (WNDPROC)GetProp(hWnd, "MozillaWndProc");
   if (!wndProc)
     return 0;
   InstanceData* pInstance = (InstanceData*)GetProp(hWnd, "InstanceData");
   if (!pInstance)
     return 0;
 
-  NPEvent event = { uMsg, wParam, lParam };
+  NPEvent event = { static_cast<uint16_t>(uMsg), wParam, lParam };
 
   LRESULT result = 0;
   if (handleEventInternal(pInstance, &event, &result))
     return result;
 
   if (uMsg == WM_CLOSE) {
     ClearSubclass((HWND)pInstance->window.window);
   }