home *** CD-ROM | disk | FTP | other *** search
/ Power-Programmierung / CD1.mdf / magazine / msysjour / vol04 / 01b / macsl / h.dif < prev    next >
Text File  |  1988-09-21  |  19KB  |  568 lines
  1. ############################################################################## 
  2. # # # # c:\h\bsedos.h : d:\a\sleuth\mac\bsedos.h # # # # 
  3. ############################################################################## 
  4. 60c60
  5. < #if (defined(INCL_DOSPROCESS) | !defined(INCL_NOCOMMON))
  6. ---
  7. > #ifdef INCL_DOSPROCESS
  8. 86c86
  9. < typedef VOID (PASCAL FAR *PFNTHREAD)(VOID);
  10. ---
  11. > typedef VOID (PASCAL FAR *PFNTHREAD)(/*VOID*/);
  12. 118c118
  13. < typedef VOID (PASCAL FAR *PFNEXITLIST)(USHORT);
  14. ---
  15. > typedef VOID (PASCAL FAR *PFNEXITLIST)(/*USHORT*/);
  16. 251c251
  17. < #if (defined(INCL_DOSFILEMGR) | !defined(INCL_NOCOMMON))
  18. ---
  19. > #ifdef INCL_DOSFILEMGR
  20. 360c360
  21. < #if (defined(INCL_DOSMEMMGR) | !defined(INCL_NOCOMMON))
  22. ---
  23. > #ifdef INCL_DOSMEMMGR
  24. 400c400
  25. < #if (defined(INCL_DOSSEMAPHORES) | !defined(INCL_NOCOMMON))
  26. ---
  27. > #ifdef INCL_DOSSEMAPHORES
  28. 473c473
  29. < #if (defined(INCL_DOSDATETIME) | !defined(INCL_NOCOMMON))
  30. ---
  31. > #ifdef INCL_DOSDATETIME
  32. 521c521
  33. < #if (defined(INCL_DOSRESOURCES) | !defined(INCL_NOCOMMON))
  34. ---
  35. > #ifdef INCL_DOSRESOURCES
  36. ############################################################################## 
  37. # # # # c:\h\os2def.h : d:\a\sleuth\mac\os2def.h # # # # 
  38. ############################################################################## 
  39. 5c5
  40. < * OS/2 Common Definitions file
  41. ---
  42. > * OS/2 Common Definitions file - Macintosh version
  43. 12,14c12,14
  44. < #define PASCAL  pascal
  45. < #define FAR     far
  46. < #define NEAR    near
  47. ---
  48. > #define PASCAL
  49. > #define FAR
  50. > #define NEAR
  51. 18c18
  52. < typedef void far      *LHANDLE;
  53. ---
  54. > typedef void FAR      *LHANDLE;
  55. 20,21c20,21
  56. < #define EXPENTRY pascal far
  57. < #define APIENTRY pascal far
  58. ---
  59. > #define EXPENTRY PASCAL FAR
  60. > #define APIENTRY PASCAL FAR
  61. 43,44c43,44
  62. < typedef char far  *PSZ;
  63. < typedef char near *NPSZ;
  64. ---
  65. > typedef char FAR  *PSZ;
  66. > typedef char NEAR *NPSZ;
  67. 46,47c46,47
  68. < typedef char far  *PCH;
  69. < typedef char near *NPCH;
  70. ---
  71. > typedef char FAR  *PCH;
  72. > typedef char NEAR *NPCH;
  73. 49,51c49,51
  74. < typedef int   (pascal far  *PFN)();
  75. < typedef int   (pascal near *NPFN)();
  76. < typedef PFN far *PPFN;
  77. ---
  78. > typedef int   (PASCAL FAR  *PFN)();
  79. > typedef int   (PASCAL NEAR *NPFN)();
  80. > typedef PFN FAR *PPFN;
  81. 54c54
  82. < typedef BYTE   near *NPBYTE;
  83. ---
  84. > typedef BYTE   NEAR *NPBYTE;
  85. 89c89
  86. < #define MAKETYPE(v, type)   (*((type far *)&v))
  87. ---
  88. > #define MAKETYPE(v, type)   (*((type FAR *)&v))
  89. 182c182
  90. < typedef POINTL  near *NPPOINTL;
  91. ---
  92. > typedef POINTL  NEAR *NPPOINTL;
  93. 191c191
  94. < typedef RECTL near *NPRECTL;
  95. ---
  96. > typedef RECTL NEAR *NPRECTL;
  97. 193c193
  98. < typedef CHAR STR8[8];        /* str8 */
  99. ---
  100. > typedef CHAR STR8[8];     /* str8 */
  101. 241c241
  102. < typedef DRIVDATA far *PDRIVDATA;
  103. ---
  104. > typedef DRIVDATA FAR *PDRIVDATA;
  105. 312c312
  106. < typedef FATTRS far *PFATTRS;
  107. ---
  108. > typedef FATTRS FAR *PFATTRS;
  109. 367c367
  110. < typedef FONTMETRICS far *PFONTMETRICS;
  111. ---
  112. > typedef FONTMETRICS FAR *PFONTMETRICS;
  113. 371c371,376
  114. < typedef LHANDLE HWND;      /* hwnd */
  115. ---
  116. > #ifdef MACPM_INTERNAL
  117. >   typedef struct _MYWND **HWND;
  118. > #else
  119. >   typedef LHANDLE HWND;      /* hwnd */
  120. > #endif
  121. > 
  122. 385c390
  123. < typedef WRECT near *NPWRECT;
  124. ---
  125. > typedef WRECT NEAR *NPWRECT;
  126. 394c399
  127. < typedef WPOINT near *NPWPOINT;
  128. ---
  129. > typedef WPOINT NEAR *NPWPOINT;
  130. ############################################################################## 
  131. # # # # c:\h\pm.h : d:\a\sleuth\mac\pm.h # # # # 
  132. ############################################################################## 
  133. 5c5,6
  134. < * This is the top level include file for Presentation Manager
  135. ---
  136. > * This is the top level include file that includes all the files necessary
  137. > * for writing a Presentation Manager application.
  138. 6a8,16
  139. > * History:
  140. > *  24-Sep-87 MPerks    Created
  141. > *  14-Nov-87 MPerks    DCR23505
  142. > *  19-Nov-87 MPerks    taken out conditions
  143. > *                      1) AVIO needs FONTMETRICS/FATTRS from GPI
  144. > *                      2) HMF shared between DEV and GPI
  145. > *                      3) DRIVDATA shared between DEV and SPL
  146. > *   3-Dec-87 MPerks    implemented name change
  147. > *
  148. 14,24c24,30
  149. < *   INCL_PM               -  ALL of OS/2 Presentation Manager
  150. < *   INCL_WIN              -  OS/2 Window Manager
  151. < *   INCL_GPI              -  OS/2 GPI
  152. < *   INCL_DEV              -  OS/2 Device Support
  153. < *   INCL_AVIO             -  OS/2 Advanced VIO
  154. < *   INCL_SPL              -  OS/2 Spooler
  155. < *   INCL_PIC              -  OS/2 Picture
  156. < *   INCL_ORDERS           -  OS/2 Graphical Order Formats
  157. < *   INCL_BITMAPFILEFORMAT -  OS/2 Bitmap File Format
  158. < *   INCL_FONTFILEFORMAT   -  OS/2 Font File Format
  159. < *   INCL_ERRORS           -  OS/2 Errors
  160. ---
  161. > *   INCL_PM     -  ALL of OS/2 Presentation Manager
  162. > *   INCL_WIN    -  OS/2 Window Manager
  163. > *   INCL_GPI    -  OS/2 GPI
  164. > *   INCL_DEV    -  OS/2 Device Support
  165. > *   INCL_AVIO   -  OS/2 Advanced VIO
  166. > *   INCL_SPL    -  OS/2 Spooler
  167. > *   INCL_ERRORS -  OS/2 Errors
  168. 35,38d40
  169. <     #define INCL_PIC
  170. <     #define INCL_ORDERS
  171. <     #define INCL_BITMAPFILEFORMAT
  172. <     #define INCL_FONTFILEFORMAT
  173. 50,61d51
  174. < #endif
  175. < #ifdef INCL_PIC
  176. < #include <pmpic.h>     /* OS/2 Picture definitions */
  177. < #endif
  178. < #ifdef INCL_ORDERS
  179. < #include <pmord.h>     /* OS/2 Graphical Order Formats */
  180. < #endif
  181. < #ifdef INCL_BITMAPFILEFORMAT
  182. < #include <pmbitmap.h>  /* OS/2 Bitmap File Format definition */
  183. < #endif
  184. < #ifdef INCL_FONTFILEFORMAT
  185. < #include <pmfont.h>    /* OS/2 Font File Format definition */
  186. ############################################################################## 
  187. # # # # c:\h\pmgpi.h : d:\a\sleuth\mac\pmgpi.h # # # # 
  188. ############################################################################## 
  189. 110c110
  190. < #if (defined(INCL_GPICONTROL) | !defined(INCL_NOCOMMON))
  191. ---
  192. > #ifdef INCL_GPICONTROL
  193. 497c497
  194. < #if (defined(INCL_GPIPRIMITIVES) | !defined(INCL_NOCOMMON))
  195. ---
  196. > #ifdef INCL_GPIPRIMITIVES
  197. 1069c1069
  198. < #if (defined(INCL_GPIBITMAPS) | !defined(INCL_NOCOMMON))
  199. ---
  200. > #ifdef INCL_GPIBITMAPS
  201. ############################################################################## 
  202. # # # # c:\h\pmshl.h : d:\a\sleuth\mac\pmshl.h # # # # 
  203. ############################################################################## 
  204. 1,199c1
  205. < /**********************************************************************\
  206. < *                                                                      *
  207. < * Module Name: PMSHL.H                                                 *
  208. < *                                                                      *
  209. < * OS/2 Presentation Manager Shell constants, types, messages and       *
  210. < * function declarations                                                *
  211. < * Copyright (c) 1988  IBM Corporation                                  *
  212. < * Copyright (c) 1988  Microsoft Corporation                            *
  213. < *                                                                      *
  214. < * =====================================================================*
  215. < *                                                                      *
  216. < * The following symbols are used in this file for conditional sections.*
  217. < *                                                                      *
  218. < *   INCL_WINSHELLDATA    Include Winthorn Data private entries         *
  219. < *   INCL_SHLERRORS       defined if INCL_ERRORS is defined             *
  220. < *   INCL_WINSWITCHLIST   Include Switch List Calls                     *
  221. < *                                                                      *
  222. < * History:                                                             *
  223. < *  17June88  DCR 24018   AP - moved Switch List + Program List API's   *
  224. < *                             to PMSHLP.H                              *
  225. < *  23May88   DCR 23914   ...ies -> ize  - SD, part 2 (remove old)      *
  226. < *  16May88   DCR 23914   ...ies -> ize  - SD                           *
  227. < *   9May88   PTR 3944    Message values - SD                           *
  228. < *                                                                      *
  229. < \**********************************************************************/
  230. <  
  231. < /* common types, constants and function declarations             */
  232. <  
  233. < /* maximum file name length */
  234. < #define MAXNAMEL 60
  235. <  
  236. < /* program handle */
  237. < typedef LHANDLE HPROGRAM;       /* hprog */
  238. < typedef HPROGRAM FAR * PHPROGRAM;
  239. <  
  240. < /* window size structure */
  241. < typedef struct _XYWINSIZE {     /* xywin */
  242. <     SHORT x;
  243. <     SHORT y;
  244. <     SHORT cx;
  245. <     SHORT cy;
  246. <     SHORT fsWindow;
  247. < } XYWINSIZE;
  248. < typedef XYWINSIZE FAR *PXYWINSIZE;
  249. <  
  250. < /* Definitions for fsWindow */                            /* PTR 3317 */
  251. < #define XYF_NOAUTOCLOSE  0x0008                           /* PTR 3317 */
  252. < #define XYF_MINIMIZED    0x0004                           /* D23914 */
  253. < #define XYF_MAXIMIZED    0x0002                           /* D23914 */
  254. < #define XYF_INVISIBLE    0x0001
  255. < #define XYF_NORMAL       0X0000
  256. <  
  257. < #if (defined(INCL_WINSWITCHLIST) | !defined(INCL_NOCOMMON))
  258. <  
  259. < typedef LHANDLE HSWITCH;        /* hsw */
  260. < typedef HSWITCH FAR *PHSWITCH;
  261. <  
  262. < /* visibility flag for SWCNTRL structure */
  263. < #define SWL_VISIBLE   (BYTE)0x00
  264. < #define SWL_INVISIBLE (BYTE)0x01
  265. < #define SWL_GRAYED    (BYTE)0x02
  266. <  
  267. < /* visibility flag for SWCNTRL structure */
  268. < #define SWL_JUMPABLE    (BYTE)0x00
  269. < #define SWL_NOTJUMPABLE (BYTE)0x01
  270. <  
  271. < typedef struct _SWCNTRL {       /* swctl */                     /* DCR 23781 */
  272. <     HWND     hwnd;                                              /* DCR 23781 */
  273. <     HWND     hwndIcon;                                          /* DCR 23781 */
  274. <     HPROGRAM hprog;                                             /* DCR 23781 */
  275. <     USHORT   idProcess;                                         /* DCR 23781 */
  276. <     USHORT   idSession;                                         /* DCR 23781 */
  277. <     UCHAR    uchVisibility;                                     /* DCR 23781 */
  278. <     UCHAR    fbJump;                                            /* DCR 23781 */
  279. <     CHAR     szSwtitle[MAXNAMEL+1];                             /* DCR 23781 */
  280. <     BYTE     fReserved;        /* To align on word boundary */  /* DCR 23781 */
  281. < } SWCNTRL;
  282. < typedef SWCNTRL FAR *PSWCNTRL;
  283. <  
  284. < /*** Switching Program functions */
  285. < HSWITCH APIENTRY WinAddSwitchEntry( PSWCNTRL );
  286. < USHORT  APIENTRY WinRemoveSwitchEntry( HSWITCH );
  287. < USHORT  APIENTRY WinSave( PSZ );
  288. <  
  289. < /* PTR 3994 define message for WinSave */
  290. < #define WM_WINSAVE      0x008F   /* WM_SHELLFIRST + 0x0F */
  291. <  
  292. < #endif  /* not INCL_NOCOMMON */
  293. <  
  294. < #ifdef INCL_WINSWITCHLIST
  295. <  
  296. < USHORT   APIENTRY WinChangeSwitchEntry( HSWITCH, PSWCNTRL );
  297. < USHORT   APIENTRY WinQueryTaskTitle( USHORT, PSZ , USHORT );
  298. <  
  299. < #endif
  300. <  
  301. < /* if error definitions are required then allow Shell errors */
  302. < #ifdef INCL_ERRORS
  303. <     #define INCL_SHLERRORS
  304. < #endif /* INCL_ERRORS */
  305. <  
  306. < #ifdef INCL_WINSHELLDATA
  307. <  
  308. < /*** OS2.INI Access functions */
  309. < SHORT  APIENTRY WinQueryProfileInt ( HAB , PSZ , PSZ , SHORT );
  310. < USHORT APIENTRY WinQueryProfileString ( HAB , PVOID , PVOID
  311. <                                       , PVOID , PVOID , USHORT );
  312. < BOOL   APIENTRY WinWriteProfileString ( HAB , PSZ , PVOID , PVOID );
  313. < USHORT APIENTRY WinQueryProfileSize ( HAB , PSZ , PSZ , PUSHORT );
  314. < USHORT APIENTRY WinQueryProfileData ( HAB , PSZ , PSZ , PVOID , PUSHORT );
  315. < USHORT APIENTRY WinWriteProfileData ( HAB , PSZ , PSZ , PVOID , USHORT );
  316. <  
  317. < #endif /* INCL_WINSHELLDATA */
  318. <  
  319. < #ifdef INCL_SHLERRORS
  320. <  
  321. < #define PMERR_INVALID_PIB                0x1101
  322. < #define PMERR_INSUFF_SPACE_TO_ADD        0x1102
  323. < #define PMERR_INVALID_GROUP_HANDLE       0x1103
  324. < #define PMERR_DUPLICATE_TITLE            0x1104
  325. < #define PMERR_INVALID_TITLE              0x1105
  326. < #define PMERR_HANDLE_NOT_IN_GROUP        0x1107
  327. < #define PMERR_INVALID_TARGET_HANDLE      0x1106
  328. < #define PMERR_INVALID_PATH_STATEMENT     0x1108
  329. < #define PMERR_NO_PROGRAM_FOUND           0x1109
  330. < #define PMERR_INVALID_BUFFER_SIZE        0x110A
  331. < #define PMERR_BUFFER_TOO_SMALL           0x110B
  332. < #define PMERR_PL_INITIALISATION_FAIL     0x110C
  333. < #define PMERR_CANT_DESTROY_SYS_GROUP     0x110D
  334. < #define PMERR_INVALID_TYPE_CHANGE        0x110E
  335. < #define PMERR_INVALID_PROGRAM_HANDLE     0x110F
  336. <  
  337. < #define PMERR_NOT_CURRENT_PL_VERSION     0x1110
  338. < #define PMERR_INVALID_CIRCULAR_REF       0x1111
  339. < #define PMERR_MEMORY_ALLOCATION_ERR      0x1112
  340. < #define PMERR_MEMORY_DEALLOCATION_ERR    0x1113
  341. < #define PMERR_TASK_HEADER_TOO_BIG        0x1114
  342. <  
  343. < #define PMERR_DOS_ERROR                  0x1200
  344. <  
  345. < #define PMERR_NO_SPACE                   0x1201
  346. < #define PMERR_INVALID_SWITCH_HANDLE      0x1202
  347. < #define PMERR_NO_HANDLE                  0x1203
  348. < #define PMERR_INVALID_PROCESS_ID         0x1204
  349. < #define PMERR_NOT_SHELL                  0x1205
  350. < #define PMERR_INVALID_WINDOW             0x1206
  351. < #define PMERR_INVALID_POST_MSG           0x1207
  352. < #define PMERR_INVALID_PARAMETERS         0x1208
  353. < #define PMERR_INVALID_PROGRAM_TYPE       0x1209
  354. < #define PMERR_NOT_EXTENDED_FOCUS         0x120A
  355. < #define PMERR_INVALID_SESSION_ID         0x120B
  356. <  
  357. < #define PMERR_OPENING_INI_FILE           0x1301
  358. < #define PMERR_INI_FILE_CORRUPT           0x1302
  359. < #define PMERR_INVALID_PARM               0x1303
  360. < #define PMERR_NOT_IN_IDX                 0x1304
  361. <  
  362. < #define PMERR_INI_WRITE_FAIL             0x1306
  363. < #define PMERR_IDX_FULL                   0x1307
  364. < #define PMERR_INI_PROTECTED              0x1308
  365. < #define PMERR_MEMORY_ALLOC               0x1309
  366. < #define PMERR_INI_INIT_ALREADY_DONE      0x130A
  367. < #define PMERR_INVALID_INTEGER            0x130B
  368. < #define PMERR_INVALID_ASCIIZ             0x130C
  369. < #define PMERR_CAN_NOT_CALL_SPOOLER       0x130D
  370. < #define PMERR_VALIDATION_REJECTED        PMERR_CAN_NOT_CALL_SPOOLER
  371. <  
  372. < #define PMERR_WARNING_WINDOW_NOT_KILLED  0x1401
  373. < #define PMERR_ERROR_INVALID_WINDOW       0x1402
  374. < #define PMERR_ALREADY_INITIALIZED        0x1403
  375. < #define PMERR_MSG_PROG_NO_MOU            0x1405
  376. < #define PMERR_MSG_PROG_NON_RECOV         0x1406
  377. < #define PMERR_WINCONV_INVALID_PATH       0x1407
  378. < #define PMERR_PI_NOT_INITIALISED         0x1408
  379. < #define PMERR_PL_NOT_INITIALISED         0x1409
  380. < #define PMERR_NO_TASK_MANAGER            0x140A
  381. < #define PMERR_SAVE_NOT_IN_PROGRESS       0x140B
  382. < #define PMERR_NO_STACK_SPACE             0x140C
  383. < #define PMERR_INVALID_COLR_FIELD         0x140d
  384. < #define PMERR_INVALID_COLR_VALUE         0x140e
  385. < #define PMERR_COLR_WRITE                 0x140f
  386. <  
  387. < #define PMERR_TARGET_FILE_EXISTS         0x1501
  388. < #define PMERR_SOURCE_SAME_AS_TARGET      0x1502
  389. < #define PMERR_SOURCE_FILE_NOT_FOUND      0x1503
  390. < #define PMERR_INVALID_NEW_PATH           0x1504
  391. < #define PMERR_TARGET_FILE_NOT_FOUND      0x1505
  392. < #define PMERR_INVALID_DRIVE_NUMBER       0x1506
  393. < #define PMERR_NAME_TOO_LONG              0x1507
  394. < #define PMERR_NOT_ENOUGH_ROOM_ON_DISK    0x1508
  395. < #define PMERR_NOT_ENOUGH_MEM             0x1509
  396. <  
  397. < #define PMERR_LOG_DRV_DOES_NOT_EXIST     0x150B
  398. < #define PMERR_INVALID_DRIVE              0x150C
  399. < #define PMERR_ACCESS_DENIED              0x150D
  400. < #define PMERR_NO_FIRST_SLASH             0x150E
  401. < #define PMERR_READ_ONLY_FILE             0x150F
  402. <  
  403. < #endif /* INCL_SHLERRORS */
  404. ---
  405. > /* PmShl.h (empty dummy file) */
  406. ############################################################################## 
  407. # # # # c:\h\pmwin.h : d:\a\sleuth\mac\pmwin.h # # # # 
  408. ############################################################################## 
  409. 120,121c120
  410. < #if (defined(INCL_WINCOMMON) | !defined(INCL_NOCOMMON) |  \
  411. <      defined(INCL_WINMESSAGEMGR))
  412. ---
  413. > #if 1
  414. 159c158
  415. < typedef MRESULT (PASCAL FAR *PFNWP)(HWND, USHORT, MPARAM, MPARAM);
  416. ---
  417. > typedef MRESULT (PASCAL FAR *PFNWP)( /* HWND, USHORT, MPARAM, MPARAM */ );
  418. 307a307,313
  419. > #ifdef PM_MACINTOSH
  420. >     HWND   hwnd;
  421. >     HWND   hwndInsertBehind;
  422. >     SHORT  x;
  423. >     SHORT  y;
  424. >     SHORT  cx;
  425. >     SHORT  cy;
  426. 308a315,316
  427. > #else
  428. >     USHORT fs;
  429. 314a323
  430. > #endif
  431. 355c364
  432. <                  USHORT fs);
  433. ---
  434. >            USHORT fs);
  435. 363c372
  436. < #define DBM_IMAGEATTRS    0x0008
  437. ---
  438. > #define DBM_IMAGEATTRS  0x0008
  439. 367c376
  440. <                LONG clrFore, LONG clrBack, USHORT rgfCmd);
  441. ---
  442. >          LONG clrFore, LONG clrBack, USHORT rgfCmd);
  443. 385c394
  444. < #define DT_TEXTATTRS        0x0040
  445. ---
  446. > #define DT_TEXTATTRS      0x0040
  447. 389c398
  448. <                 LONG clrFore, LONG clrBack, USHORT rgfCmd);
  449. ---
  450. >           LONG clrFore, LONG clrBack, USHORT rgfCmd);
  451. 400c409
  452. < #define DB_AREAATTRS        0x0010
  453. ---
  454. > #define DB_AREAATTRS      0x0010
  455. 437c446
  456. < #if (defined(INCL_WINWINDOWMGR) | !defined(INCL_NOCOMMON))
  457. ---
  458. > #ifdef INCL_WINWINDOWMGR
  459. 447a457,469
  460. > #ifdef PM_MACINTOSH
  461. >     HWND   hwndParent;
  462. >     PSZ    pszClass;
  463. >     PSZ    pszText;
  464. >     ULONG  flStyle;
  465. >     SHORT  x;
  466. >     SHORT  y;
  467. >     SHORT  cx;
  468. >     SHORT  cy;
  469. >     HWND   hwndOwner;
  470. >     HWND   hwndInsertBehind;
  471. >     USHORT id;
  472. >     PVOID  pCtlData;
  473. 448a471,472
  474. > #else
  475. >     PVOID  pPresParams;
  476. 460a485
  477. > #endif
  478. 563c588
  479. < #if (defined(INCL_WINMESSAGEMGR) | !defined(INCL_NOCOMMON))
  480. ---
  481. > #ifdef INCL_WINMESSAGEMGR
  482. 655a681,683
  483. > 
  484. > #ifdef PM_MACINTOSH
  485. > 
  486. 656a685,696
  487. >     USHORT unused;          /* mp1 */
  488. >     USHORT cmd;
  489. >     BOOL   fMouse;          /* mp2 */
  490. >     USHORT source;
  491. > };
  492. > 
  493. > #define COMMANDMSG(pmsg) \
  494. >         ( (struct _COMMANDMSG FAR *)( (pmsg) + 1 ) )
  495. > 
  496. > #else
  497. > 
  498. > struct _COMMANDMSG {
  499. 665a706,707
  500. > #endif
  501. > 
  502. 812c854
  503. < #if (defined(INCL_WININPUT) | !defined(INCL_NOCOMMON))
  504. ---
  505. > #ifdef INCL_WININPUT
  506. 895a938,940
  507. > 
  508. > #ifdef PM_MACINTOSH
  509. > 
  510. 896a942,953
  511. >     SHORT  y;               /* mp1 */
  512. >     SHORT  x;
  513. >     USHORT unused;        /* mp2 */
  514. >     USHORT codeHitTest;
  515. > };
  516. > 
  517. > #define MOUSEMSG(pmsg) \
  518. >         ( (struct _MOUSEMSG FAR *)( (pmsg) + 1 ) )
  519. > 
  520. > #else
  521. > 
  522. > struct _MOUSEMSG {
  523. 905a963,964
  524. > #endif
  525. > 
  526. 909a969,971
  527. > 
  528. > #ifdef PM_MACINTOSH
  529. > 
  530. 910a973,985
  531. >     UCHAR  scancode;
  532. >     UCHAR  cRepeat;         /* mp1 */
  533. >     USHORT fs;
  534. >     USHORT vkey;            /* mp2 */
  535. >     USHORT chr;
  536. > };
  537. > 
  538. > #define CHARMSG(pmsg) \
  539. >         ( (struct _CHARMSG FAR *)( (pmsg) + 1 ) )
  540. > 
  541. > #else
  542. > 
  543. > struct _CHARMSG {
  544. 920a996,997
  545. > #endif
  546. > 
  547. 1005c1082
  548. < #if (defined(INCL_WINDIALOGS) | !defined(INCL_NOCOMMON))
  549. ---
  550. > #ifdef INCL_WINDIALOGS
  551. 1026c1103
  552. <                         MPARAM mp2);
  553. ---
  554. >             MPARAM mp2);
  555. 1593c1670
  556. < #if (defined(INCL_WINFRAMEMGR) | !defined(INCL_NOCOMMON))
  557. ---
  558. > #ifdef INCL_WINFRAMEMGR
  559. 2075c2152
  560. < #if (defined(INCL_WINCURSORS) | !defined(INCL_NOCOMMON))
  561. ---
  562. > #ifdef INCL_WINCURSORS
  563. 2273a2351
  564. > #ifndef PM_MACINTOSH
  565. 2274a2353
  566. > #endif
  567. ############################################################################## 
  568.