Changeset 22081 for branches/swt/include/win/shellapi.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/shellapi.h (modified) (4 diffs)

branches/swt/include/win/shellapi.h

@@ -3 +3 @@
 
 #include "windef.h"
+///-------------------------------------------------------------------[swt-os2]
+#include "guiddef.h"
+///----------------------------------------------------------------------------
 
 #ifdef __cplusplus
@@ -228 +231 @@
  * Tray Notification
  */
+///-------------------------------------------------------------------[swt-os2]
+/// Substituted the Wine structures, which are different in layout and size.
+/*
 typedef struct _NOTIFYICONDATAA
 {       DWORD cbSize;
@@ -237 +243 @@
         CHAR szTip[64];
 } NOTIFYICONDATAA, *PNOTIFYICONDATAA;
-
+*/
+typedef struct _NOTIFYICONDATAA
+{       DWORD cbSize;
+        HWND hWnd;
+        UINT uID;
+        UINT uFlags;
+        UINT uCallbackMessage;
+        HICON hIcon;
+        CHAR szTip[128];
+        DWORD dwState;
+        DWORD dwStateMask;
+        CHAR szInfo[256];
+        union {
+            UINT uTimeout;
+            UINT uVersion;
+        } DUMMYUNIONNAME;
+        CHAR szInfoTitle[64];
+        DWORD dwInfoFlags;
+        GUID guidItem;
+        HICON hBalloonIcon;
+} NOTIFYICONDATAA, *PNOTIFYICONDATAA;
+/*
 typedef struct _NOTIFYICONDATAW
 {       DWORD cbSize;
@@ -247 +274 @@
         WCHAR szTip[64];
 } NOTIFYICONDATAW, *PNOTIFYICONDATAW;
+*/
+typedef struct _NOTIFYICONDATAW
+{       DWORD cbSize;
+        HWND hWnd;
+        UINT uID;
+        UINT uFlags;
+        UINT uCallbackMessage;
+        HICON hIcon;
+        WCHAR szTip[128];
+        DWORD dwState;
+        DWORD dwStateMask;
+        WCHAR szInfo[256];
+        union {
+            UINT uTimeout;
+            UINT uVersion;
+        } DUMMYUNIONNAME;
+        WCHAR szInfoTitle[64];
+        DWORD dwInfoFlags;
+        GUID guidItem;
+        HICON hBalloonIcon;
+} NOTIFYICONDATAW, *PNOTIFYICONDATAW;
+///----------------------------------------------------------------------------
 
 DECL_WINELIB_TYPE_AW(NOTIFYICONDATA)