Changeset 8048 for trunk/src/shell32/shlview.c

Timestamp:

Mar 8, 2002, 12:01:03 PM (24 years ago)

Author:

sandervl

Message:

PH: Wine resync + OS2 integration

File:

• trunk/src/shell32/shlview.c (modified) (5 diffs)

trunk/src/shell32/shlview.c

@@ -139 +139 @@
 typedef void (* CALLBACK PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
 #else
-typedef void CALLBACK (*PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
+typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
 #endif
 
@@ -536 +536 @@
           ListView_SetItemA(This->hWndList, &lvItem);
           ListView_Update(This->hWndList, nItem);
-          return TRUE;                                  /* fixme: better handling */
+          return TRUE;                                  /* FIXME: better handling */
         }
         return FALSE;
@@ -1152 +1152 @@
         
           case LVN_GETDISPINFOA:
-            TRACE("-- LVN_GETDISPINFOA %p\n",This);
+          case LVN_GETDISPINFOW:
+            TRACE("-- LVN_GETDISPINFO %p\n",This);
             pidl = (LPITEMIDLIST)lpdi->item.lParam;
 
@@ -1161 +1162 @@
                 SHELLDETAILS sd;
                 IShellFolder2_GetDetailsOf(This->pSF2Parent, pidl, lpdi->item.iSubItem, &sd);
+                if (lpnmh->code == LVN_GETDISPINFOA)
+                {
                 StrRetToStrNA( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL);
                 TRACE("-- text=%s\n",lpdi->item.pszText);               
+              }
+                else /* LVN_GETDISPINFOW */
+                {
+                    StrRetToStrNW( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL);
+                    TRACE("-- text=%s\n",debugstr_w((WCHAR*)(lpdi->item.pszText)));
+                }
               }
               else
@@ -1559 +1568 @@
         if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST))
         {
-          TRACE("-- key=0x04%x",lpmsg->wParam) ;
+          TRACE("-- key=0x04%x\n",lpmsg->wParam) ;
         }
         return S_FALSE; /* not handled */