mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 606846 - nsPluginNativeWindowWin.cpp compilation broken on mingw r=jmathies a=benjamin 

--HG--
extra : rebase_source : 07b87af2bba5542e022490765c6402f749871642
This commit is contained in:
Jacek Caban 2010-11-06 14:25:34 +00:00
Родитель facbb12c80
Коммит db669ec98c
1 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
modules/plugin/base/src/nsPluginNativeWindowWin.cpp
Просмотреть файл

@ -499,14 +499,14 @@ HookSetWindowLongPtr()
sUser32Intercept.Init("user32.dll"); sUser32Intercept.Init("user32.dll");
#ifdef _WIN64 #ifdef _WIN64
sUser32Intercept.AddHook("SetWindowLongPtrA", SetWindowLongPtrAHook, sUser32Intercept.AddHook("SetWindowLongPtrA", (void*)SetWindowLongPtrAHook,
(void**) &sUser32SetWindowLongAHookStub); (void**) &sUser32SetWindowLongAHookStub);
sUser32Intercept.AddHook("SetWindowLongPtrW", SetWindowLongPtrWHook, sUser32Intercept.AddHook("SetWindowLongPtrW", (void*)SetWindowLongPtrWHook,
(void**) &sUser32SetWindowLongWHookStub); (void**) &sUser32SetWindowLongWHookStub);
#else #else
sUser32Intercept.AddHook("SetWindowLongA", SetWindowLongAHook, sUser32Intercept.AddHook("SetWindowLongA", (void*)SetWindowLongAHook,
(void**) &sUser32SetWindowLongAHookStub); (void**) &sUser32SetWindowLongAHookStub);
sUser32Intercept.AddHook("SetWindowLongW", SetWindowLongWHook, sUser32Intercept.AddHook("SetWindowLongW", (void*)SetWindowLongWHook,
(void**) &sUser32SetWindowLongWHookStub); (void**) &sUser32SetWindowLongWHookStub);
#endif #endif
} }
@ -528,7 +528,7 @@ nsPluginNativeWindowWin::nsPluginNativeWindowWin() : nsPluginNativeWindow()
mPluginType = nsPluginType_Unknown; mPluginType = nsPluginType_Unknown;
mParentWnd = NULL; mParentWnd = NULL;
mParentProc = NULL; mParentProc = 0;
if (!sWM_FLASHBOUNCEMSG) { if (!sWM_FLASHBOUNCEMSG) {
sWM_FLASHBOUNCEMSG = ::RegisterWindowMessage(NS_PLUGIN_CUSTOM_MSG_ID); sWM_FLASHBOUNCEMSG = ::RegisterWindowMessage(NS_PLUGIN_CUSTOM_MSG_ID);
@ -767,7 +767,7 @@ nsresult nsPluginNativeWindowWin::UndoSubclassAndAssociateWindow()
if (mPluginType == nsPluginType_PDF && mParentWnd) { if (mPluginType == nsPluginType_PDF && mParentWnd) {
::SetWindowLongPtr(mParentWnd, GWLP_WNDPROC, mParentProc); ::SetWindowLongPtr(mParentWnd, GWLP_WNDPROC, mParentProc);
mParentWnd = NULL; mParentWnd = NULL;
mParentProc = NULL; mParentProc = 0;
} }
return NS_OK; return NS_OK;