Changeset 2694 for trunk/include

Timestamp:

Feb 9, 2000, 2:40:23 PM (26 years ago)

Author:

sandervl

Message:

YD: header updates + added WaitForInputIdle

Location:

trunk/include

Files:

• OS2WIN.H (modified) (3 diffs)
• odin.h (modified) (2 diffs)
• win/commdlg.h (modified) (2 diffs)
• win/windef.h (modified) (2 diffs)
• win/windowsx.h (modified) (3 diffs)
• win/winuser.h (modified) (2 diffs)

trunk/include/OS2WIN.H

@@ -1 @@
-/* $Id: OS2WIN.H,v 1.7 1999-06-26 18:24:20 sandervl Exp $ */
+/* $Id: OS2WIN.H,v 1.8 2000-02-09 13:40:21 sandervl Exp $ */
 #ifndef _OS2WIN_H
 #define _OS2WIN_H
@@ -1524 +1524 @@
 DWORD   OPEN32API _O32_WaitForSingleObject( HANDLE, DWORD );
 
+DWORD   OPEN32API _O32_WaitForInputIdle(HANDLE hProcess, DWORD dwTimeOut);
+
 BOOL    OPEN32API _O32_WaitMessage( void);
 
@@ -9805 +9807 @@
 } 
 
+inline DWORD O32_WaitForInputIdle(HANDLE hProcess, DWORD dwTimeOut)
+{
+ DWORD yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = _O32_WaitForInputIdle(hProcess, dwTimeOut);
+    SetFS(sel);
+
+    return yyrc;
+}
 
 #endif    /* ifdef _OS2WIN_H */

trunk/include/odin.h

@@ -1 @@
-/* $Id: odin.h,v 1.12 2000-01-06 23:17:27 sandervl Exp $ */
+/* $Id: odin.h,v 1.13 2000-02-09 13:40:22 sandervl Exp $ */
 /*
  * ODIN - Build Environment Definition
@@ -79 +79 @@
   #define __inline__ inline
 
+#ifndef RC_INVOKED
 //  #if (__IBMCPP__ == 300) || (__IBMC__ == 300)
   #define NONAMELESSUNION
 //  #endif
+#endif
 
   #include <builtin.h>

trunk/include/win/commdlg.h

@@ -1 @@
-/* $Id: commdlg.h,v 1.4 2000-02-03 13:26:22 sandervl Exp $ */
+/* $Id: commdlg.h,v 1.5 2000-02-09 13:40:23 sandervl Exp $ */
 /* 
  * COMMDLG - Common Wine Dialog ... :-)
@@ -591 +591 @@
 #define PSD_ENABLEPAGEPAINTHOOK           0x00040000
 #define PSD_DISABLEPAGEPAINTING           0x00080000
+
+#define CommDlg_OpenSave_GetSpecA(_hdlg, _psz, _cbmax) \
+        (int)SNDMSG(_hdlg, CDM_GETSPEC, (WPARAM)_cbmax, (LPARAM)(LPSTR)_psz)
+#define CommDlg_OpenSave_GetSpecW(_hdlg, _psz, _cbmax) \
+        (int)SNDMSG(_hdlg, CDM_GETSPEC, (WPARAM)_cbmax, (LPARAM)(LPWSTR)_psz)
+#define     CommDlg_OpenSave_GetSpec WINELIB_NAME_AW(CommDlg_OpenSave_GetSpec)
 
 BOOL16  WINAPI ChooseColor16(LPCHOOSECOLOR16 lpChCol);

trunk/include/win/windef.h

@@ -1 @@
-/* $Id: windef.h,v 1.19 2000-01-26 23:17:49 sandervl Exp $ */
+/* $Id: windef.h,v 1.20 2000-02-09 13:40:23 sandervl Exp $ */
 
 /*
@@ -114 +114 @@
 
 #ifndef __export
-  #define __export    __stdcall
+  #define __export    
 #endif
 

trunk/include/win/windowsx.h

@@ -1 @@
-/* $Id: windowsx.h,v 1.7 2000-01-26 23:17:50 sandervl Exp $ */
+/* $Id: windowsx.h,v 1.8 2000-02-09 13:40:23 sandervl Exp $ */
 
 /* Copyright (C) 1999 Corel Corporation (Paul Quinn) */
@@ -1053 +1053 @@
         ((void)SendMessage((hwndCtl), EM_SETSEL, (ichStart), (ichEnd)))
 
+#define Edit_GetSel(hwndCtl)                    ((DWORD)SendMessage((hwndCtl), EM_GETSEL, 0L, 0L))
+#define Edit_ReplaceSel(hwndCtl, lpszReplace)   ((void)SendMessage((hwndCtl), EM_REPLACESEL, 0L, (LPARAM)(LPCTSTR)(lpszReplace)))
+
 #define Edit_GetText(hwndCtl, lpch, cchMax)     GetWindowText((hwndCtl), (lpch), (cchMax))
 #define Edit_GetTextLength(hwndCtl)             GetWindowTextLength(hwndCtl)
@@ -1064 +1067 @@
 #define Edit_SetModify(hwndCtl, fModified) \
         ((void)SendMessage((hwndCtl), EM_SETMODIFY, (WPARAM)(UINT)(fModified), 0L))
+
+#define Edit_ScrollCaret(hwndCtl)               ((BOOL)(DWORD)SendMessage((hwndCtl), EM_SCROLLCARET, 0, 0L))
         
 /* void Cls_OnMeasureItem(HWND hwnd, MEASUREITEMSTRUCT * lpMeasureItem) */

trunk/include/win/winuser.h

@@ -1 @@
-/* $Id: winuser.h,v 1.31 2000-01-26 23:47:20 sandervl Exp $ */
+/* $Id: winuser.h,v 1.32 2000-02-09 13:40:23 sandervl Exp $ */
 
 #ifndef __INCLUDE_WINUSER_H
@@ -3675 +3675 @@
 BOOL      WINAPI UnregisterClassA(LPCSTR,HINSTANCE);
 BOOL      WINAPI UnregisterClassW(LPCWSTR,HINSTANCE);
+#define     UnregisterClass WINELIB_NAME_AW(UnregisterClass)
+
 BOOL        WINAPI UpdateWindow(HWND);
 BOOL        WINAPI ValidateRect(HWND,const RECT*);