Changeset 22081 for branches/swt/include/win/commctrl.h

Timestamp:

Aug 23, 2014, 4:21:44 PM (11 years ago)

Author:

rousseau

Message:

Modified or replaced some structures

structures:
o DEVMODEA
o DEVMODEW
o NMLVCUSTOMDRAW
o NOTIFYICONDATAA
o NOTIFYICONDATAW
o OPENFILENAME
o OSVERSIONINFOA
o OSVERSIONINFOW
o OSVERSIONINFOEXA
o OSVERSIONINFOEXW
o SCROLLBARINFO
o SHELLEXECUTEINFOA
o SHELLEXECUTEINFOW
o TTTOOLINFOA
o TTTOOLINFOW

All sources for swt.dll now compile.

File:

• branches/swt/include/win/commctrl.h (modified) (4 diffs)

branches/swt/include/win/commctrl.h

@@ -1608 +1608 @@
     LPSTR lpszText;
     LPARAM lParam;
+///-------------------------------------------------------------------[swt-os2]
+    void *lpReserved;
+///----------------------------------------------------------------------------
 } TTTOOLINFOA, *LPTOOLINFOA, *PTOOLINFOA, *LPTTTOOLINFOA;
 
@@ -1619 +1622 @@
     LPWSTR lpszText;
     LPARAM lParam;
+///-------------------------------------------------------------------[swt-os2]
+    void *lpReserved;
+///----------------------------------------------------------------------------
 } TTTOOLINFOW, *LPTOOLINFOW, *PTOOLINFOW, *LPTTTOOLINFOW;
 
@@ -3232 +3238 @@
 #define NMLVCUSTOMDRAW_V3_SIZE CCSIZEOF_STRUCT(NMLCUSTOMDRW, clrTextBk)
 
+///-------------------------------------------------------------------[swt-os2]
+/// Substituted the Wine structure, which is different in layout and size.
+/*
 typedef struct tagNMLVCUSTOMDRAW
 {
@@ -3239 +3248 @@
     int iSubItem;
 } NMLVCUSTOMDRAW, *LPNMLVCUSTOMDRAW;
+*/
+typedef struct tagNMLVCUSTOMDRAW
+{
+    NMCUSTOMDRAW nmcd;
+    COLORREF clrText;
+    COLORREF clrTextBk;
+    int iSubItem;       /* (_WIN32_IE >= 0x0400) */
+    DWORD dwItemType;   /* (_WIN32_IE >= 0x560) */
+    COLORREF clrFace;   /* (_WIN32_IE >= 0x560) */
+    int iIconEffect;    /* (_WIN32_IE >= 0x560) */
+    int iIconPhase;     /* (_WIN32_IE >= 0x560) */
+    int iPartId;        /* (_WIN32_IE >= 0x560) */
+    int iStateId;       /* (_WIN32_IE >= 0x560) */
+    RECT rcText;        /* (_WIN32_IE >= 0x560) */
+    UINT uAlign;        /* (_WIN32_IE >= 0x560) */
+} NMLVCUSTOMDRAW, *LPNMLVCUSTOMDRAW;
+///----------------------------------------------------------------------------
 
 typedef struct tagNMLVCACHEHINT