Changeset 2126 for trunk/src/comctl32/listview.c

Timestamp:

Dec 18, 1999, 9:57:01 PM (26 years ago)

Author:

achimha

Message:

WINE 991212 updates - treeview missing

File:

• trunk/src/comctl32/listview.c (modified) (13 diffs)

trunk/src/comctl32/listview.c

@@ -19 +19 @@
  *
  * Data structure:
- *   LISTVIEW_SetItemCount : empty stub 
+ *   LISTVIEW_SetItemCount : not completed
  * 
  * Unicode:
@@ -34 +34 @@
  *   LISTVIEW_GetISearchString : not implemented 
  *   LISTVIEW_GetBkImage : not implemented
- *   LISTVIEW_GetColumnOrderArray : not implemented
- *   LISTVIEW_SetColumnOrderArray : not implemented
+ *   LISTVIEW_GetColumnOrderArray : simple hack only
+ *   LISTVIEW_SetColumnOrderArray : simple hack only
  *   LISTVIEW_Arrange : empty stub
  *   LISTVIEW_ApproximateViewRect : incomplete
@@ -43 +43 @@
  */
 
-/* WINE 991114 level */
+/* WINE 991212 level */
 
 #include <string.h>
@@ -2038 +2038 @@
   nLast = nItem + LISTVIEW_GetCountPerColumn(hwnd) + 1;
   nLast = min(nLast, GETITEMCOUNT(infoPtr));
+
+//AH required for Odin?
+#if 0
+  /* send cache hint notification */
+  if (GetWindowLongA(hwnd,GWL_STYLE) & LVS_OWNERDATA)
+  {
+    NMLVCACHEHINT nmlv;
+
+    nmlv.hdr.hwndFrom = hwnd;
+    nmlv.hdr.idFrom = GetWindowLongA(hwnd,GWL_ID);
+    nmlv.hdr.code = LVN_ODCACHEHINT;
+    nmlv.iFrom = nItem;
+    nmlv.iTo   = nLast;
+
+    SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)nmlv.hdr.idFrom,
+                 (LPARAM)&nmlv);
+  }
+#endif
+
   for (; nItem < nLast; nItem++)
   {
@@ -3332 +3351 @@
 
 /* LISTVIEW_GetColumnW */
-/* LISTVIEW_GetColumnOrderArray */
+
+static LRESULT LISTVIEW_GetColumnOrderArray(HWND hwnd, INT iCount, LPINT lpiArray)
+{
+/*  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); */
+    INT i;
+
+    if (!lpiArray)
+        return FALSE;
+
+    /* little hack */
+    for (i = 0; i < iCount; i++)
+        lpiArray[i] = i;
+
+    return TRUE;
+}
 
 /***
@@ -3573 +3606 @@
               }
               strncpy(lpLVItem->pszText, dispInfo.item.pszText, lpLVItem->cchTextMax);
+              lpLVItem->pszText[lpLVItem->cchTextMax-1]='\0';
             }
             else if (lpLVItem->mask & LVIF_TEXT)
             {
               strncpy(lpLVItem->pszText, lpItem->pszText, lpLVItem->cchTextMax);
+              lpLVItem->pszText[lpLVItem->cchTextMax-1]='\0';
             }
 
@@ -3668 +3703 @@
               }
               strncpy(lpLVItem->pszText, dispInfo.item.pszText, lpLVItem->cchTextMax);
+              lpLVItem->pszText[lpLVItem->cchTextMax-1]='\0';
             }
             else if (lpLVItem->mask & LVIF_TEXT)
             {
               strncpy(lpLVItem->pszText, lpSubItem->pszText, lpLVItem->cchTextMax);
+              lpLVItem->pszText[lpLVItem->cchTextMax-1]='\0';
             }
           }
@@ -5125 +5162 @@
 
 /* LISTVIEW_SetColumnW */
-/* LISTVIEW_SetColumnOrderArray */
+
+/***
+ * DESCRIPTION:
+ * Sets the column order array
+ *
+ * PARAMETERS:
+ * [I] HWND : window handle
+ * [I] INT : number of elements in column order array
+ * [I] INT : pointer to column order array
+ *
+ * RETURN:
+ *   SUCCESS : TRUE
+ *   FAILURE : FALSE
+ */
+static LRESULT LISTVIEW_SetColumnOrderArray(HWND hwnd, INT iCount, LPINT lpiArray)
+{
+/*  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); */
+
+//    FIXME("iCount %d lpiArray %p\n", iCount, lpiArray);
+
+    if (!lpiArray)
+        return FALSE;
+
+    return TRUE;
+}
 
 /***
@@ -5318 +5379 @@
  * PARAMETER(S):
  * [I] HWND : window handle
- * [I] INT : item count (prjected number of items)
+ * [I] INT : item count (projected number of items)
  * [I] DWORD : update flags
  *
@@ -5328 +5389 @@
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+
 //  FIXME("(%d %08lx)empty stub!\n", nItems, dwFlags);
+
   if (nItems == 0)
     return LISTVIEW_DeleteAllItems (hwnd);
+
+  if (GetWindowLongA(hwnd, GWL_STYLE) & LVS_OWNERDATA)
+  {
+//    FIXME("LVS_OWNERDATA is set!\n");
+  }
+  else
+  {
   if (nItems > GETITEMCOUNT(infoPtr))
 {
     /* append items */
 //    FIXME("append items\n");
+
   }
   else if (nItems < GETITEMCOUNT(infoPtr))
@@ -5340 +5411 @@
     /* remove items */
 //    FIXME("remove items\n");
-  }
+
+  }
+  }
+
   return TRUE;
 }
@@ -6950 +7024 @@
 
   case LVM_GETCOLUMNORDERARRAY:
-    //FIXME("Unimplemented msg LVM_GETCOLUMNORDERARRAY\n");
-    return 0;
-
+    return LISTVIEW_GetColumnOrderArray(hwnd, (INT)wParam, (LPINT)lParam);
 
   case LVM_GETCOLUMNWIDTH:
@@ -7082 +7154 @@
 
   case LVM_SETCOLUMNORDERARRAY:
-    //FIXME("Unimplemented msg LVM_SETCOLUMNORDERARRAY\n");
-    return 0;
+    return LISTVIEW_SetColumnOrderArray(hwnd, (INT)wParam, (LPINT)lParam);
 
   case LVM_SETCOLUMNWIDTH: