Changeset 241 for trunk/src/plugins

Timestamp:

Dec 22, 2009, 2:49:09 PM (16 years ago)

Author:

lpino

Message:

• New structures needed to work with containers (tree view)

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) (7 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

@@ -204 +204 @@
 org\eclipse\swt\internal\pm\SLDCDATA.java
 org\eclipse\swt\internal\pm\POINTS.java
+org\eclipse\swt\internal\pm\MINIRECORDCORE.java
+org\eclipse\swt\internal\pm\TREEITEMDESC.java
+org\eclipse\swt\internal\pm\RECORDCORE.java
+org\eclipse\swt\internal\pm\RECORDINSERT.java
 
 # SWT PI (+)

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

@@ -176 +176 @@
 SLDCDATA_FID_CACHE SLDCDATAFc;
 POINTS_FID_CACHE POINTSFc;
+MINIRECORDCORE_FID_CACHE MINIRECORDCOREFc;
+TREEITEMDESC_FID_CACHE TREEITEMDESCFc;
 
 /*@@TODO (dmik): remove
@@ -997 +999 @@
             lpStruct->pszPtSizeList = getPSZBytes(env, pszS);
     }
-    lpStruct->pfnDlgProc = (*env)->GetIntField(env, lpObject, lpCache->pfnDlgProc);
+    lpStruct->pfnDlgProc = (PFNWP)((*env)->GetIntField(env, lpObject, lpCache->pfnDlgProc));
     {
         jobject pszF = (*env)->GetObjectField(env, lpObject, lpCache->pszFamilyname);
@@ -1065 +1067 @@
     }
 
-    (*env)->SetIntField(env, lpObject, lpCache->pfnDlgProc, lpStruct->pfnDlgProc);
+    (*env)->SetIntField(env, lpObject, lpCache->pfnDlgProc, (ULONG)lpStruct->pfnDlgProc);
 
     {
@@ -1486 +1488 @@
         jobjectArray aaccel = (*env)->GetObjectField(env, lpObject, lpCache->aaccel);
         jsize length = (*env)->GetArrayLength(env, aaccel);
-
+        
         if (aaccel) {
             DEBUG_CALL("getACCELTABLEFields:aaccel array.\n")
-            jint ulAccelLen = sizeof( sizeof(ACCEL )*length) + sizeof( ACCELTABLE );
-            PACCELTABLE pacctAccelTable = (PACCELTABLE) malloc ( ulAccelLen );
+//            jint ulAccelLen = sizeof( sizeof(ACCEL )*length) + sizeof( ACCELTABLE );
+//            PACCELTABLE pacctAccelTable = (PACCELTABLE) malloc ( ulAccelLen );
 
             ACCEL c_pacctAccel, *c_ppacctAccel = NULL;
@@ -1496 +1498 @@
             for(i=0; i<length;i++){
                 jobject jaccel = (*env)->GetObjectArrayElement(env, aaccel, i);
-                if (pacctAccelTable) c_ppacctAccel = getACCELFields(env, jaccel, &c_pacctAccel, &PGLOB(ACCELFc));
+//                if (pacctAccelTable) 
+                        c_ppacctAccel = getACCELFields(env, jaccel, &c_pacctAccel, &PGLOB(ACCELFc));
                 lpStruct->aaccel[i] = *c_ppacctAccel;
             }
@@ -1509 +1512 @@
     (*env)->SetShortField(env, lpObject, lpCache->cAccel, lpStruct->cAccel);
     (*env)->SetShortField(env, lpObject, lpCache->codepage, lpStruct->codepage);
+        
     {
         jobjectArray aaccel = (*env)->GetObjectField(env, lpObject, lpCache->aaccel);
-        (*env)->SetObjectField(env, lpObject, lpCache->aaccel, aaccel);
-    }
+        jsize length = (*env)->GetArrayLength(env, aaccel);
+
+        ACCEL *c_ppacctAccel = NULL;    
+        int i=0;
+        for(i=0; i<length;i++){
+                jobject jaccel = (*env)->GetObjectArrayElement(env, aaccel, i);
+                setACCELFields(env, jaccel, c_ppacctAccel, &PGLOB(ACCELFc));
+                lpStruct->aaccel[i] = *c_ppacctAccel;
+        }
+ 
+        (*env)->SetObjectField(env, lpObject, lpCache->aaccel, aaccel);
+    }
+        printf("setACCELTABLEFields \n");
 }
 
@@ -1654 +1669 @@
 }
 
-/***************************************** FACENAMEDESC struct ********************************************/
+/***************************************** MINIRECORDCORE struct ********************************************/
+void cacheMINIRECORDCOREFids(JNIEnv *env, jobject lpObject, PMINIRECORDCORE_FID_CACHE lpCache)
+{
+    if (lpCache->cached) return;
+    lpCache->clazz = (*env)->GetObjectClass(env, lpObject);
+    lpCache->cb = (*env)->GetFieldID(env, lpCache->clazz, "cb", "I");
+    lpCache->flRecordAttr = (*env)->GetFieldID(env, lpCache->clazz, "flRecordAttr", "I");
+    lpCache->ptlIcon = (*env)->GetFieldID(env, lpCache->clazz, "ptlIcon", "Lorg/eclipse/swt/internal/pm/POINTL;");
+    lpCache->preccNextRecord = (*env)->GetFieldID(env, lpCache->clazz, "preccNextRecord", "I");
+    lpCache->pszIcon = (*env)->GetFieldID(env, lpCache->clazz, "pszIcon", "Lorg/eclipse/swt/internal/pm/PSZ;");
+    lpCache->hptrIcon = (*env)->GetFieldID(env, lpCache->clazz, "hptrIcon", "I");
+    lpCache->cached = 1;
+}
+
+PMINIRECORDCORE getMINIRECORDCOREFields(JNIEnv *env, jobject lpObject, PMINIRECORDCORE lpStruct, PMINIRECORDCORE_FID_CACHE lpCache)
+{
+    if (!lpCache->cached) cacheMINIRECORDCOREFids(env, lpObject, lpCache);
+    lpStruct->cb = (*env)->GetIntField(env, lpObject, lpCache->cb);
+    lpStruct->flRecordAttr = (*env)->GetIntField(env, lpObject, lpCache->flRecordAttr);
+    {
+        jobject pptlIcon = (*env)->GetObjectField(env, lpObject, lpCache->ptlIcon);
+        if (pptlIcon && &(lpStruct->ptlIcon)) getPOINTLFields(env, pptlIcon, &(lpStruct->ptlIcon), &PGLOB(POINTLFc));
+    }
+    lpStruct->preccNextRecord = (PMINIRECORDCORE)((*env)->GetIntField(env, lpObject, lpCache->preccNextRecord));
+   {
+        jobject psz = (*env)->GetObjectField(env, lpObject, lpCache->pszIcon);
+        if(psz)
+            lpStruct->pszIcon = getPSZBytes(env,psz);
+    }
+    lpStruct->hptrIcon = (*env)->GetIntField(env, lpObject, lpCache->hptrIcon);
+    return lpStruct;
+}
+
+void setMINIRECORDCOREFields(JNIEnv *env, jobject lpObject, PMINIRECORDCORE lpStruct, PMINIRECORDCORE_FID_CACHE lpCache)
+{
+    if (!lpCache->cached) cacheMINIRECORDCOREFids(env, lpObject, lpCache);
+    (*env)->SetIntField(env, lpObject, lpCache->cb, lpStruct->cb);
+    (*env)->SetIntField(env, lpObject, lpCache->flRecordAttr, lpStruct->flRecordAttr);
+    {
+        jobject pptlIcon = (*env)->GetObjectField(env, lpObject, lpCache->ptlIcon);
+        if (pptlIcon && &(lpStruct->ptlIcon)) setPOINTLFields(env, pptlIcon, &(lpStruct->ptlIcon), &PGLOB(POINTLFc));
+    }
+    (*env)->SetIntField(env, lpObject, lpCache->preccNextRecord, (ULONG)lpStruct->preccNextRecord);
+    {
+        jobject psz = (*env)->GetObjectField(env, lpObject, lpCache->pszIcon);
+        if (psz)
+            releasePSZBytes(env, psz, lpStruct->pszIcon);
+    }
+    (*env)->SetIntField(env, lpObject, lpCache->hptrIcon, lpStruct->hptrIcon);
+}
+
+/***************************************** TREEITEMDESC struct ********************************************/
+
+void cacheTREEITEMDESCFids(JNIEnv *env, jobject lpObject, PTREEITEMDESC_FID_CACHE lpCache)
+{
+    if (lpCache->cached) return;
+    lpCache->clazz = (*env)->GetObjectClass(env, lpObject);
+    lpCache->hbmExpanded = (*env)->GetFieldID(env, lpCache->clazz, "hbmExpanded", "I");
+    lpCache->hbmCollapsed = (*env)->GetFieldID(env, lpCache->clazz, "hbmCollapsed", "I");
+    lpCache->hptrExpanded = (*env)->GetFieldID(env, lpCache->clazz, "hptrExpanded", "I");
+    lpCache->hptrCollapsed = (*env)->GetFieldID(env, lpCache->clazz, "hptrCollapsed", "I");
+    lpCache->cached = 1;
+}
+
+PTREEITEMDESC getTREEITEMDESCFields(JNIEnv *env, jobject lpObject, PTREEITEMDESC lpStruct, PTREEITEMDESC_FID_CACHE lpCache)
+{
+    if (!lpCache->cached) cacheTREEITEMDESCFids(env, lpObject, lpCache);
+    lpStruct->hbmExpanded = (*env)->GetIntField(env, lpObject, lpCache->hbmExpanded);
+    lpStruct->hbmCollapsed = (*env)->GetIntField(env, lpObject, lpCache->hbmCollapsed);
+    lpStruct->hptrExpanded= (*env)->GetIntField(env, lpObject, lpCache->hptrExpanded);
+    lpStruct->hptrCollapsed= (*env)->GetIntField(env, lpObject, lpCache->hptrCollapsed);
+    return lpStruct;
+}
+
+void setTREEITEMDESCFields(JNIEnv *env, jobject lpObject, PTREEITEMDESC lpStruct, PTREEITEMDESC_FID_CACHE lpCache)
+{
+    if (!lpCache->cached) cacheTREEITEMDESCFids(env, lpObject, lpCache);
+    (*env)->SetIntField(env, lpObject, lpCache->hbmExpanded, lpStruct->hbmExpanded);
+    (*env)->SetIntField(env, lpObject, lpCache->hbmCollapsed, lpStruct->hbmCollapsed);
+    (*env)->SetIntField(env, lpObject, lpCache->hptrExpanded, lpStruct->hptrExpanded);
+    (*env)->SetIntField(env, lpObject, lpCache->hptrCollapsed, lpStruct->hptrCollapsed);
+}
+
 /*@@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

@@ -597 +597 @@
 void setPOINTSFields(JNIEnv *env, jobject lpObject, PPOINTS lpStruct, PPOINTS_FID_CACHE lpCache);
 
+/* MINIRECORDCORE struct */
+typedef struct MINIRECORDCORE_FID_CACHE {
+    int cached;
+    jclass clazz;
+    jfieldID
+        cb,        
+        flRecordAttr,
+        ptlIcon,
+        preccNextRecord,
+        pszIcon,
+        hptrIcon;        
+} MINIRECORDCORE_FID_CACHE;
+typedef MINIRECORDCORE_FID_CACHE *PMINIRECORDCORE_FID_CACHE;
+
+void cacheMINIRECORDCOREFids(JNIEnv *env, jobject lpObject, PMINIRECORDCORE_FID_CACHE lpCache);
+PMINIRECORDCORE getMINIRECORDCOREFields(JNIEnv *env, jobject lpObject, PMINIRECORDCORE lpStruct, PMINIRECORDCORE_FID_CACHE lpCache);
+void setMINIRECORDCOREFields(JNIEnv *env, jobject lpObject, PMINIRECORDCORE lpStruct, PMINIRECORDCORE_FID_CACHE lpCache);
+
+/* TREEITEMDESC struct */
+typedef struct TREEITEMDESC_FID_CACHE {
+    int cached;
+    jclass clazz;
+    jfieldID
+        hbmExpanded,        
+        hbmCollapsed,
+        hptrExpanded,
+        hptrCollapsed;
+        
+} TREEITEMDESC_FID_CACHE;
+typedef TREEITEMDESC_FID_CACHE *PTREEITEMDESC_FID_CACHE;
+
+void cacheTREEITEMDESCFids(JNIEnv *env, jobject lpObject, PTREEITEMDESC_FID_CACHE lpCache);
+PTREEITEMDESC getTREEITEMDESCFields(JNIEnv *env, jobject lpObject, PTREEITEMDESC lpStruct, PTREEITEMDESC_FID_CACHE lpCache);
+void setTREEITEMDESCFields(JNIEnv *env, jobject lpObject, PTREEITEMDESC lpStruct, PTREEITEMDESC_FID_CACHE lpCache);
+
 /* FACENAMEDESC struct */
 /*@@TODO (dmik): remove!
@@ -644 +679 @@
 extern SLDCDATA_FID_CACHE SLDCDATAFc;
 extern POINTS_FID_CACHE POINTSFc;
+extern MINIRECORDCORE_FID_CACHE MINIRECORDCOREFc;
+extern TREEITEMDESC_FID_CACHE TREEITEMDESCFc;
 /*@@TODO (dmik): remove! 
 extern FACENAMEDESC_FID_CACHE FACENAMEDESCFc;

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

@@ -1712 +1712 @@
     DEBUG_CALL("WinQueryClipbrdData\n")
 
-    return (jint)WinQueryClipbrdData((HAB)hab, (MPARAM)fmt);
+    return (jint)WinQueryClipbrdData((HAB)hab, (ULONG)fmt);
 }