Changeset 785

Timestamp:

Sep 2, 1999, 12:10:48 PM (26 years ago)

Author:

phaller

Message:

Fix: fixes in WINE macros and dependencies

Location:

trunk/include

Files:

• odin.h (modified) (2 diffs)
• win/commctrl.h (modified) (2 diffs)
• win/debugtools.h (modified) (2 diffs)
• win/prsht.h (modified) (2 diffs)
• win/resource.h (modified) (2 diffs)
• win/shellapi.h (modified) (4 diffs)

trunk/include/odin.h ¶

@@ -1 @@
-/* $Id: odin.h,v 1.6 1999-09-01 14:59:49 phaller Exp $ */
+/* $Id: odin.h,v 1.7 1999-09-02 10:10:48 phaller Exp $ */
 /*
  * ODIN - Build Environment Definition
@@ -77 +77 @@
   #define PASCAL    _Pascal
   #define UNALIGNED
+  #define NONAMELESSUNION
 #else
 

trunk/include/win/commctrl.h ¶

@@ -1 @@
-/* $Id: commctrl.h,v 1.11 1999-08-28 09:25:55 achimha Exp $ */
+/* $Id: commctrl.h,v 1.12 1999-09-02 10:10:10 phaller Exp $ */
 /*
  * Common controls definitions
@@ -15 +15 @@
 /* c++ likes nameless unions whereas c doesnt */
 /* (used in property sheet structures)        */
-#ifdef __cplusplus
+
+#if defined(__cplusplus) && !defined(NONAMELESSUNION)
 #define DUMMYUNIONNAME
 #define DUMMYUNIONNAME1

trunk/include/win/debugtools.h ¶

@@ -25 +25 @@
 #define __DPRINTF(dbcl,dbch) \
   (!__GET_DEBUGGING(dbcl,dbch) || \
-     (dprintf(("%s:%s:%s ", debug_cl_name[(dbcl)], debug_ch_name[(dbch)], __FUNCTION__)),0)) \
+     (dprintf(("%s:%s:%s ", debug_cl_name[(dbcl)], debug_ch_name[(dbch)], __line__)),0)) \
     ? 0 : WriteLog
 
@@ -77 +77 @@
 #endif  /* __WINE__ */
 
+#ifdef __WIN32OS2__
+#  undef TRACE
+#  define TRACE WriteLog
+#  undef FIXME
+#  define FIXME WriteLog
+#  undef WARN
+#  define WARN  WriteLog
+#endif
+
+
 #endif  /* __WINE_DEBUGTOOLS_H */

trunk/include/win/prsht.h ¶

@@ -1 @@
-/* $Id: prsht.h,v 1.2 1999-06-07 15:37:31 achimha Exp $ */
+/* $Id: prsht.h,v 1.3 1999-09-02 10:10:11 phaller Exp $ */
 
 #ifndef _WINE_PRSHT_H
@@ -39 +39 @@
 /* c++ likes nameless unions whereas c doesnt */
 /* (used in property sheet structures)        */
-#ifdef __cplusplus
+
+#if defined(__cplusplus) && !defined(NONAMELESSUNION)
 #define DUMMYUNIONNAME
 #define DUMMYUNIONNAME1

trunk/include/win/resource.h ¶

@@ -1 @@
-/* $Id: resource.h,v 1.1 1999-05-24 20:19:18 ktk Exp $ */
+/* $Id: resource.h,v 1.2 1999-09-02 10:08:38 phaller Exp $ */
 
 /*
@@ -36 +36 @@
     SYSRES_MENU_SYSMENU,
     SYSRES_MENU_EDITMENU,
-    SYSRES_DIALOG_MSGBOX,
+    SYSRES_DIALOG_MSGBOX
 } SYSTEM_RESOURCE;
 

trunk/include/win/shellapi.h ¶

@@ -1 @@
-/* $Id: shellapi.h,v 1.3 1999-09-01 19:12:13 phaller Exp $ */
+/* $Id: shellapi.h,v 1.4 1999-09-02 10:08:38 phaller Exp $ */
 
 #ifndef _WINE_SHELLAPI_H
@@ -191 +191 @@
 
 
+
+/*************************************
+ * code that is shared with shlobj.h *
+ *************************************/
+
+#ifndef __WINE_SHLOBJ_H
+
 /******************************************
  * ShellExecute
@@ -204 +211 @@
 HINSTANCE       WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);
 
-/******************************************
- * Tray Notification
- */
-typedef struct _NOTIFYICONDATAA
-{       DWORD cbSize;
-        HWND hWnd;
-        UINT uID;
-        UINT uFlags;
-        UINT uCallbackMessage;
-        HICON hIcon;
-        CHAR szTip[64];
-} NOTIFYICONDATAA, *PNOTIFYICONDATAA;
-
-typedef struct _NOTIFYICONDATAW
-{       DWORD cbSize;
-        HWND hWnd;
-        UINT uID;
-        UINT uFlags;
-        UINT uCallbackMessage;
-        HICON hIcon;
-        WCHAR szTip[64];
-} NOTIFYICONDATAW, *PNOTIFYICONDATAW;
-
-
-#define SEE_MASK_CLASSNAME      0x00000001
-#define SEE_MASK_CLASSKEY       0x00000003
-#define SEE_MASK_IDLIST         0x00000004
-#define SEE_MASK_INVOKEIDLIST   0x0000000c
-#define SEE_MASK_ICON           0x00000010
-#define SEE_MASK_HOTKEY         0x00000020
-#define SEE_MASK_NOCLOSEPROCESS 0x00000040
-#define SEE_MASK_CONNECTNETDRV  0x00000080
-#define SEE_MASK_FLAG_DDEWAIT   0x00000100
-#define SEE_MASK_DOENVSUBST     0x00000200
-#define SEE_MASK_FLAG_NO_UI     0x00000400
-#define SEE_MASK_UNICODE        0x00004000
-#define SEE_MASK_NO_CONSOLE     0x00008000
-#define SEE_MASK_ASYNCOK        0x00100000
 
 typedef struct _SHELLEXECUTEINFOA
@@ -283 +252 @@
 } SHELLEXECUTEINFOW, *LPSHELLEXECUTEINFOW;
 
+#endif
+
+
+
+/******************************************
+ * Tray Notification
+ */
+typedef struct _NOTIFYICONDATAA
+{       DWORD cbSize;
+        HWND hWnd;
+        UINT uID;
+        UINT uFlags;
+        UINT uCallbackMessage;
+        HICON hIcon;
+        CHAR szTip[64];
+} NOTIFYICONDATAA, *PNOTIFYICONDATAA;
+
+typedef struct _NOTIFYICONDATAW
+{       DWORD cbSize;
+        HWND hWnd;
+        UINT uID;
+        UINT uFlags;
+        UINT uCallbackMessage;
+        HICON hIcon;
+        WCHAR szTip[64];
+} NOTIFYICONDATAW, *PNOTIFYICONDATAW;
+
+
+#define SEE_MASK_CLASSNAME      0x00000001
+#define SEE_MASK_CLASSKEY       0x00000003
+#define SEE_MASK_IDLIST         0x00000004
+#define SEE_MASK_INVOKEIDLIST   0x0000000c
+#define SEE_MASK_ICON           0x00000010
+#define SEE_MASK_HOTKEY         0x00000020
+#define SEE_MASK_NOCLOSEPROCESS 0x00000040
+#define SEE_MASK_CONNECTNETDRV  0x00000080
+#define SEE_MASK_FLAG_DDEWAIT   0x00000100
+#define SEE_MASK_DOENVSUBST     0x00000200
+#define SEE_MASK_FLAG_NO_UI     0x00000400
+#define SEE_MASK_UNICODE        0x00004000
+#define SEE_MASK_NO_CONSOLE     0x00008000
+#define SEE_MASK_ASYNCOK        0x00100000
+
+
 /******************************************
  * Misc