606846 - nsPluginNativeWindowWin.cpp compilation broken on mingw

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Jacek Caban]

Attachment: fix v1.0

I get following errors:

In file included from /home/jacek/mozilla-build/mozilla-central/modules/plugin/base/src/nsPluginNativeWindowWin.cpp:55:0:
../../../../dist/include/nsWindowsDllInterceptor.h: In member function 'bool WindowsDllInterceptor::AddHook(const char*, void*, void**)':
../../../../dist/include/nsWindowsDllInterceptor.h:119:57: warning: ISO C++ forbids casting between pointer-to-function and pointer-to-object
/home/jacek/mozilla-build/mozilla-central/modules/plugin/base/src/nsPluginNativeWindowWin.cpp: In function 'void HookSetWindowLongPtr()':
/home/jacek/mozilla-build/mozilla-central/modules/plugin/base/src/nsPluginNativeWindowWin.cpp:508:67: error: no matching function for call to 'WindowsDllInterceptor::AddHook(const char [15], LONG (&)(HWND__*, int, LONG), void**)'
../../../../dist/include/nsWindowsDllInterceptor.h:112:8: note: candidate is: bool WindowsDllInterceptor::AddHook(const char*, void*, void**) <near match>
/home/jacek/mozilla-build/mozilla-central/modules/plugin/base/src/nsPluginNativeWindowWin.cpp:510:67: error: no matching function for call to 'WindowsDllInterceptor::AddHook(const char [15], LONG (&)(HWND__*, int, LONG), void**)'
../../../../dist/include/nsWindowsDllInterceptor.h:112:8: note: candidate is: bool WindowsDllInterceptor::AddHook(const char*, void*, void**) <near match>
/home/jacek/mozilla-build/mozilla-central/modules/plugin/base/src/nsPluginNativeWindowWin.cpp: In constructor 'nsPluginNativeWindowWin::nsPluginNativeWindowWin()':
/home/jacek/mozilla-build/mozilla-central/modules/plugin/base/src/nsPluginNativeWindowWin.cpp:531:17: warning: converting to non-pointer type 'LONG_PTR' from NULL
/home/jacek/mozilla-build/mozilla-central/modules/plugin/base/src/nsPluginNativeWindowWin.cpp: In member function 'nsresult nsPluginNativeWindowWin::UndoSubclassAndAssociateWindow()':
/home/jacek/mozilla-build/mozilla-central/modules/plugin/base/src/nsPluginNativeWindowWin.cpp:770:19: warning: converting to non-pointer type 'LONG_PTR' from NULL

GCC is stricter than MSVC for function pointer casts and it doesn't implicitly casts function pointers to void. The fix is as simple as adding an explicit cast.

While I was at this, I've fixed warnings about assigning NULL to integer type.

Comment 1

[Jim Mathies [:jimm]]

Comment on attachment 485612 [details] [diff] [review]
fix v1.0

nit, static_cast<void*>() vs the c style (void*).

Comment 2

[Jacek Caban]

(In reply to comment #1)
> Comment on attachment 485612 [details] [diff] [review]
> fix v1.0
> 
> nit, static_cast<void*>() vs the c style (void*).

Thanks for the review. I should write it in my first comment that static_cast won't work here. GCC doesn't consider such cast as safe:

nsPluginNativeWindowWin.cpp:507:83: error: invalid static_cast from type 'LONG(HWND__*, int, LONG)' to type 'void*'

Comment 3

[Jacek Caban]

http://hg.mozilla.org/mozilla-central/rev/09bb38fc6594