Changeset 250 for trunk/src

Timestamp:

Feb 16, 2010, 1:18:05 PM (16 years ago)

Author:

lpino

Message:

• New struct definition TREERECORD

Location:

trunk/src/plugins

Files:

• org.eclipse.swt.pm/classes.inc (modified) (1 diff)
• org.eclipse.swt/Eclipse SWT PI/pm/library/structs.c (modified) (2 diffs)
• org.eclipse.swt/Eclipse SWT PI/pm/library/structs.h (modified) (2 diffs)
• org.eclipse.swt/Eclipse SWT PI/pm/library/swt.c (modified) (1 diff)

trunk/src/plugins/org.eclipse.swt.pm/classes.inc

@@ -210 +210 @@
 org\eclipse\swt\internal\pm\SIZEL.java
 org\eclipse\swt\internal\pm\CNRINFO.java
+org\eclipse\swt\internal\pm\TREERECORD.java
 
 # SWT PI (+)

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

@@ -182 +182 @@
 SIZEL_FID_CACHE SIZELFc;
 CNRINFO_FID_CACHE CNRINFOFc;
+TREERECORD_FID_CACHE TREERECORDFc;
 
 /*@@TODO (dmik): remove
@@ -2029 +2030 @@
 }
 
+/* TREERECORD struct */
+void cacheTREERECORDFids(JNIEnv *env, jobject lpObject, PTREERECORD_FID_CACHE lpCache)
+{
+    if (lpCache->cached) return;
+    lpCache->clazz = (*env)->GetObjectClass(env, lpObject);
+    lpCache->item = (*env)->GetFieldID(env, lpCache->clazz, "item", "Lorg/eclipse/swt/internal/pm/TREERECORD;");
+    lpCache->lParam = (*env)->GetFieldID(env, lpCache->clazz, "usWeightClass", "I");
+    lpCache->cached = 1;
+}
+
+PTREERECORD getTREERECORDFields(JNIEnv *env, jobject lpObject, PTREERECORD lpStruct, PTREERECORD_FID_CACHE lpCache)
+{
+    if (!lpCache->cached) cacheTREERECORDFids(env, lpObject, lpCache);
+    {
+        jobject hItem = (*env)->GetObjectField(env, lpObject, lpCache->item);
+        if (hItem && &(lpStruct->item)) getRECORDCOREFields(env, hItem, &(lpStruct->item), &PGLOB(RECORDCOREFc));
+    }
+    lpStruct->lParam = (*env)->GetIntField(env, lpObject, lpCache->lParam);
+    return lpStruct;
+}
+
+void setTREERECORDFields(JNIEnv *env, jobject lpObject, PTREERECORD lpStruct, PTREERECORD_FID_CACHE lpCache)
+{
+    if (!lpCache->cached) cacheTREERECORDFids(env, lpObject, lpCache);
+    {
+        jobject hItem = (*env)->GetObjectField(env, lpObject, lpCache->item);
+        if (hItem && &(lpStruct->item)) setRECORDCOREFields(env, hItem, &(lpStruct->item), &PGLOB(RECORDCOREFc));
+    }
+    (*env)->SetIntField(env, lpObject, lpCache->lParam, lpStruct->lParam);
+
+}
+
 /*@@TODO (dmik): don't need, remove!
 void cacheFACENAMEDESCFids(JNIEnv *env, jobject lpObject, PFACENAMEDESC_FID_CACHE lpCache)

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

@@ -48 +48 @@
 PAPSZ getPAPSZArray(JNIEnv *env, jobjectArray j_papsz);
 void releasePAPSZArray(JNIEnv *env, jobjectArray j_papsz, PAPSZ papsz);
+
+/* Tree record struct */
+typedef struct TREERECORD{
+   RECORDCORE item;
+   ULONG           lParam;
+} TREERECORD;
+typedef TREERECORD *PTREERECORD;
+
+/* TREERECORD struct */
+typedef struct TREERECORD_FID_CACHE {
+    int cached;
+    jclass clazz;
+    jfieldID
+        item,
+        lParam;
+} TREERECORD_FID_CACHE;
+typedef TREERECORD_FID_CACHE *PTREERECORD_FID_CACHE;
+
+void cacheTREERECORDFids(JNIEnv *env, jobject lpObject, PTREERECORD_FID_CACHE lpCache);
+PTREERECORD getTREERECORDFields(JNIEnv *env, jobject lpObject, PTREERECORD lpStruct, PTREERECORD_FID_CACHE lpCache);
+void setTREERECORDFields(JNIEnv *env, jobject lpObject, PTREERECORD lpStruct, PTREERECORD_FID_CACHE lpCache);
 
 /* QMSG struct */
@@ -773 +794 @@
 extern SIZEL_FID_CACHE SIZELFc;
 extern CNRINFO_FID_CACHE CNRINFOFc;
+extern TREERECORD_FID_CACHE TREERECORDFc;
 /*@@TODO (dmik): remove! 
 extern FACENAMEDESC_FID_CACHE FACENAMEDESCFc;

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

@@ -731 +731 @@
 
     rc = (jboolean)WinSendMsg((HWND)hwnd, ulMsgid, (PCNRINFO)c_pmpParam1, (MPARAM)mpParam2);
+
+    if (mpParam1) setCNRINFOFields(env, mpParam1, c_pmpParam1, &PGLOB(CNRINFOFc));
+
+    return rc;
+}
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_pm_OS_WinSendMsg__IILorg_eclipse_swt_internal_pm_CNRINFO_2S
+        (JNIEnv *env, jclass that, jint hwnd, jint ulMsgid, jobject mpParam1, jshort mpParam2)
+{
+    DECL_GLOB(pGlob)
+    CNRINFO c_mpParam1, *c_pmpParam1 = NULL;
+    jint rc;
+
+    DEBUG_CALL("WinSendMsg\n")
+
+    if (mpParam1) c_pmpParam1 = getCNRINFOFields(env, mpParam1, &c_mpParam1, &PGLOB(CNRINFOFc));
+
+    rc = (jint)WinSendMsg((HWND)hwnd, ulMsgid, (PCNRINFO)c_pmpParam1, (MPARAM)mpParam2);
 
     if (mpParam1) setCNRINFOFields(env, mpParam1, c_pmpParam1, &PGLOB(CNRINFOFc));