Bug 20725 – GTK_WINDOW_HWND not GTK_WINDOWING_HWND

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Luke Kenneth Casson Leighton]

Index: WebCore/plugins/gtk/PluginViewGtk.cpp
===================================================================
--- WebCore/plugins/gtk/PluginViewGtk.cpp       (revision 36129)
+++ WebCore/plugins/gtk/PluginViewGtk.cpp       (working copy)
@@ -447,7 +447,7 @@
             *((XID *)w) = GDK_WINDOW_XWINDOW(containingWindow()->window);
 #endif
 #ifdef GDK_WINDOWING_WIN32
-            *((HWND *)w) = GDK_WINDOWING_HWND(containingWindow()->window);
+            *((HWND *)w) = GDK_WINDOW_HWND(containingWindow()->window);
 #endif
             return NPERR_NO_ERROR;
         }

[Luke Kenneth Casson Leighton]

actually there's a compile error with that:
ebCore/plugins/gtk/PluginViewGtk.cpp: In member function ‘NPError WebCore::PluginView::getValue(NPNVariable, void*)’:
WebCore/plugins/gtk/PluginViewGtk.cpp:450: error: invalid conversion from ‘void*’ to ‘HWND__*’
./JavaScriptCore/wtf/OwnPtr.h: In function ‘void WTF::deleteOwnedPtr(T*) [with T = WebCore::PluginMessageThrottlerWin]’:
./JavaScriptCore/wtf/OwnPtr.h:69:   instantiated from ‘WTF::OwnPtr<T>::~OwnPtr() [with T = WebCore::PluginMessageThrottlerWin]’
WebCore/plugins/gtk/PluginViewGtk.cpp:479:   instantiated from here
./JavaScriptCore/wtf/OwnPtr.h:49: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::PluginMessageThrottlerWin’ 
./JavaScriptCore/wtf/OwnPtr.h:49: error: creating array with negative size (‘-0x00000000000000001’)
./JavaScriptCore/wtf/OwnPtr.h:50: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::PluginMessageThrottlerWin’ 
./JavaScriptCore/wtf/OwnPtr.h:50: error: creating array with negative size (‘-0x00000000000000001’)
./JavaScriptCore/wtf/OwnPtr.h:51: warning: possible problem detected in invocation of delete operator:
./JavaScriptCore/wtf/OwnPtr.h:47: warning: ‘ptr’ has incomplete type
./WebCore/plugins/PluginView.h:67: warning: forward declaration of ‘struct WebCore::PluginMessageThrottlerWin’
./JavaScriptCore/wtf/OwnPtr.h:51: note: neither the destructor nor the class-specific operator delete will be called, even if they are declared when the class is defined.
WebCore/plugins/gtk/PluginViewGtk.cpp: At global scope:
WebCore/plugins/gtk/PluginViewGtk.cpp:495: warning: ‘gboolean WebCore::plug_removed_cb(GtkSocket*, void*)’ defined but not used

[Luke Kenneth Casson Leighton]

Created attachment 23260 [details]
HWND issue

got a compile - no idea if it works (will find out soon enough...)

[Darin Adler]

Comment on attachment 23260 [details]
HWND issue

This patch includes no ChangeLog. The code change looks fine.

I'm going to say review- to get this out of the review queue, since it does need a ChangeLog.

[Jan Alonzo]

Created attachment 24103 [details]
ChangeLog and updated to ToT

ChangeLog added as requested by Darin. Also updated the patch to match ToT.

[Dave Hyatt]

Comment on attachment 24103 [details]
ChangeLog and updated to ToT

r=me

[Jan Alonzo]

Thanks for the review. Landed in r37319

[Luke Kenneth Casson Leighton]

there are quite a few like this.  little things that got caught
with cross-compilation under mingw32, which were a bit lairy.

[Alberto Garcia]

*** Bug 20727 has been marked as a duplicate of this bug. ***