- Timestamp:
- Oct 13, 1999, 6:05:25 PM (26 years ago)
- Location:
- trunk/src/user32
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/user32/dc.cpp
r1087 r1267 1 /* $Id: dc.cpp,v 1.1 1 1999-09-28 18:14:57 dengertExp $ */1 /* $Id: dc.cpp,v 1.12 1999-10-13 16:02:41 phaller Exp $ */ 2 2 3 3 /* … … 8 8 */ 9 9 10 /***************************************************************************** 11 * Includes * 12 *****************************************************************************/ 13 14 #include <odin.h> 15 #include <odinwrap.h> 16 #include <os2sel.h> 17 10 18 #define INCL_WIN 11 19 #define INCL_GPI … … 14 22 #include <os2.h> 15 23 #include <pmddi.h> 16 #include <os2sel.h>17 24 #include <stdlib.h> 18 25 #include "win32type.h" … … 25 32 #include "oslibwin.h" 26 33 #include "dcdata.h" 34 35 36 ODINDEBUGCHANNEL(USER32-DC) 37 27 38 28 39 #undef SEVERITY_ERROR … … 1017 1028 // RDW_UPDATENOW 1018 1029 1019 BOOL WIN32API RedrawWindow (HWND hwnd, const RECT *pRect, HRGN hrgn, DWORD redraw) 1030 ODINFUNCTION4(BOOL,RedrawWindow,HWND, hwnd, 1031 const RECT*, pRect, 1032 HRGN, hrgn, 1033 DWORD, redraw) 1020 1034 { 1021 1035 Win32BaseWindow *wnd; … … 1027 1041 } 1028 1042 1029 USHORT sel = RestoreOS2FS(); 1030 dprintf(("USER32: RedrawWindow %X, %X %X %X", hwnd, pRect, hrgn, redraw)); 1031 1032 if (hwnd == NULLHANDLE) { 1043 //@@@PH USHORT sel = RestoreOS2FS(); 1044 //@@@PH dprintf(("USER32: RedrawWindow %X, %X %X %X", hwnd, pRect, hrgn, redraw)); 1045 1046 if (hwnd == NULLHANDLE) 1047 { 1033 1048 hwnd = HWND_DESKTOP; 1034 1049 wnd = Win32BaseWindow::GetWindowFromOS2Handle(OSLIB_HWND_DESKTOP); 1050 1051 if (!wnd) 1052 { 1053 dprintf(("USER32:dc: RedrawWindow can't find desktop window %08xh\n", 1054 hwnd)); 1055 _O32_SetLastError (ERROR_INVALID_PARAMETER); 1056 //@@@PH SetFS(sel); 1057 return FALSE; 1058 } 1059 1035 1060 } 1036 1061 else … … 1040 1065 if (!wnd) 1041 1066 { 1067 dprintf(("USER32:dc: RedrawWindow can't find window %08xh\n", 1068 hwnd)); 1042 1069 _O32_SetLastError (ERROR_INVALID_PARAMETER); 1043 SetFS(sel);1070 //@@@PH SetFS(sel); 1044 1071 return FALSE; 1045 1072 } … … 1179 1206 _O32_SetLastError (ERROR_INVALID_PARAMETER); 1180 1207 1181 SetFS(sel);1208 //@@@PH SetFS(sel); 1182 1209 return (success); 1183 1210 } -
trunk/src/user32/user32.cpp
r1265 r1267 1 /* $Id: user32.cpp,v 1.4 0 1999-10-13 14:24:25 sandervlExp $ */1 /* $Id: user32.cpp,v 1.41 1999-10-13 16:02:42 phaller Exp $ */ 2 2 3 3 /* … … 22 22 //Attention: many functions belong to other subsystems, move them to their 23 23 // right place! 24 25 #include <odin.h> 26 #include <odinwrap.h> 27 #include <os2sel.h> 24 28 25 29 #include <os2win.h> … … 74 78 // WIN32API YieldTask 75 79 80 ODINDEBUGCHANNEL(USER32-USER32) 81 82 76 83 /* Coordinate Transformation */ 77 84 … … 1796 1803 1797 1804 /* Synchronization Functions */ 1798 1799 DWORD WIN32API MsgWaitForMultipleObjects( DWORD nCount, LPHANDLE pHandles, BOOL fWaitAll, DWORD dwMilliseconds, DWORD dwWakeMask) 1800 { 1801 #ifdef DEBUG 1802 WriteLog("USER32: MsgWaitForMultipleObjects\n"); 1803 #endif 1804 return O32_MsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask); 1805 ODINFUNCTION5(DWORD,MsgWaitForMultipleObjects,DWORD, nCount, 1806 LPHANDLE, pHandles, 1807 BOOL, fWaitAll, 1808 DWORD, dwMilliseconds, 1809 DWORD, dwWakeMask) 1810 { 1811 // @@@PH that's a really difficult function to implement 1812 1813 // @@@PH this is a temporary bugfix for WINFILE.EXE 1814 if (nCount == 0) 1815 { 1816 // only listens to incoming thread messages. 1817 return (WAIT_OBJECT_0); 1818 } 1819 1820 return O32_MsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask); 1805 1821 } 1806 1822
Note:
See TracChangeset
for help on using the changeset viewer.