commit 575b4d52445f589e29181e970af707121f4b06c6
author scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Thu Mar 06 01:01:47 2008 +0000
committer scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Thu Mar 06 01:01:47 2008 +0000
tree f72e10ce16e4c1b79f9800fe49d00ddfad535aea
parent cf3bfd05b07f021c0c2c47a1b278d393f01789c7

JsValueIE6 now queries for IUnknown to determine unique pointer, per COM rules.  This makes JavaScriptObject$ identity match JavaScript object identity more closely.

Found by: ecc
Suggested by: bruce
Review by: bruce


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@2029 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/windows/src/com/google/gwt/dev/shell/ie/JsValueIE6.java

diff --git a/dev/windows/src/com/google/gwt/dev/shell/ie/JsValueIE6.java b/dev/windows/src/com/google/gwt/dev/shell/ie/JsValueIE6.java
index 7682c8f..175d3e9 100644
--- a/dev/windows/src/com/google/gwt/dev/shell/ie/JsValueIE6.java
+++ b/dev/windows/src/com/google/gwt/dev/shell/ie/JsValueIE6.java
@@ -154,7 +154,13 @@
   @Override
   public int getJavaScriptObjectPointer() {
     if (isJavaScriptObject()) {
-      return variant.getDispatch().getAddress();
+      // The canonical pointer is obtained by QI'ing for IUnknown.
+      int[] ppvObject = new int[1];
+      variant.getDispatch().QueryInterface(COM.IIDIUnknown, ppvObject);
+      int pvObject = ppvObject[0];
+      // Release the returned pointer.
+      COM.VtblCall(2, pvObject);
+      return pvObject;
     } else {
       return 0;
     }