Changeset 70 for trunk/src

Timestamp:

May 23, 2008, 6:14:29 PM (17 years ago)

Author:

lpino

Message:

• (swt.c) Fixed the WinSendMsg call

File:

• trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/swt.c (modified) (2 diffs)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/swt.c

@@ -515 +515 @@
          (JNIEnv *env, jclass that, jint hwnd, jint ulMsgid, jobject mpParam1, jobject mpParam2)
 {
-    PAPSZ c_mpParam2 = NULL;
+    PSZ c_mpParam2 = NULL;
     MENUITEM c_mpParam1, *c_pmpParam1 = NULL;
     jint rc;
     if (mpParam2) 
-        c_mpParam2 = getPAPSZArray(env, mpParam2);
+        c_mpParam2 = getPSZBytes(env, mpParam2);
     if (mpParam1) 
         c_pmpParam1 = getMENUITEMFields(env, mpParam1, &c_mpParam1, &PGLOB(MENUITEMFc));
-
     rc = (jint)WinSendMsg((HWND)hwnd, ulMsgid, c_pmpParam1, c_mpParam2);
-
     if (mpParam2)
-        releasePAPSZArray(env, mpParam2, c_mpParam2);
+        releasePSZBytes(env, mpParam2, c_mpParam2);
     if (mpParam1)
         setMENUITEMFields(env, mpParam1, c_pmpParam1, &PGLOB(MENUITEMFc));
     return rc;
-
 }
 
@@ -536 +533 @@
          (JNIEnv *env, jclass that, jint hwnd, jint ulMsgid, jint mpParam1, jobject mpParam2)
 {
+
     MENUITEM c_mpParam2, *c_pmpParam2 = NULL;
-    jboolean rc;
+    jboolean rc, rc2;
+
     if (mpParam2) 
-        c_pmpParam2 = getMENUITEMFields(env, mpParam1, &c_mpParam2, &PGLOB(MENUITEMFc));
-
-    rc = (jboolean)WinSendMsg((HWND)hwnd, ulMsgid, (MPARAM)mpParam1, c_pmpParam2);
-
+        c_pmpParam2 = getMENUITEMFields(env, mpParam2, &c_mpParam2, &PGLOB(MENUITEMFc));
+
+    rc = (jboolean)WinSendMsg((HWND)hwnd, ulMsgid, (MPARAM)mpParam1, MPFROMP(c_pmpParam2));
     if (mpParam2)
         setMENUITEMFields(env, mpParam2, c_pmpParam2, &PGLOB(MENUITEMFc));
-
     return rc;
 }