Changeset 903 for trunk/src/user32
- Timestamp:
- Sep 10, 1999, 9:00:11 PM (26 years ago)
- Location:
- trunk/src/user32/new
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/user32/new/dc.cpp
r896 r903 1 /* $Id: dc.cpp,v 1. 1 1999-09-09 18:05:45dengert Exp $ */1 /* $Id: dc.cpp,v 1.2 1999-09-10 19:00:10 dengert Exp $ */ 2 2 3 3 /* … … 250 250 void OPEN32API DeleteHDC (HDC hdc); 251 251 BOOL OPEN32API _O32_EndPaint (HWND hwnd, const PAINTSTRUCT_W *lpps); 252 int OPEN32API _O32_GetUpdateRgn (HWND hwnd, HRGN hrgn, BOOL erase); 252 253 253 254 #define FLOAT_TO_FIXED(x) ((FIXED) ((x) * 65536.0)) … … 728 729 return TRUE; 729 730 } 731 732 BOOL WIN32API GetUpdateRect (HWND hwnd, LPRECT pRect, BOOL erase) 733 { 734 if (hwnd) 735 { 736 // SET_ERROR_WIN( ERROR_INVALID_HANDLE_W ); 737 return FALSE; 738 } 739 740 RECTL rectl; 741 USHORT sel = RestoreOS2FS(); 742 Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd); 743 744 BOOL updateRegionExists = WinQueryUpdateRect (hwnd, pRect ? &rectl : NULL); 745 if (!pRect) { 746 SetFS(sel); 747 return (updateRegionExists); 748 } 749 750 if (updateRegionExists) 751 { 752 if (wnd->isOwnDC()) 753 { 754 pDCData pHps = NULL; 755 pHps = (pDCData)GpiQueryDCData(wnd->getOwnDC()); 756 if (!pHps) 757 { 758 // SET_ERROR_WIN(ERROR_INVALID_HANDLE_W); 759 SetFS(sel); 760 return FALSE; 761 } 762 GpiConvert (pHps->hps, CVTC_DEVICE, CVTC_WORLD, 2, (PPOINTL)&rectl); 763 } 764 else 765 { 766 long height = wnd->getWindowHeight(); 767 rectl.yTop = height - rectl.yTop; 768 rectl.yBottom = height - rectl.yBottom; 769 } 770 771 if (pRect) 772 WINRECT_FROM_PMRECT (*pRect, rectl); 773 774 if (erase) 775 sendEraseBkgnd (wnd); 776 } 777 else 778 { 779 if (pRect) 780 pRect->left = pRect->top = pRect->right = pRect->bottom = 0; 781 } 782 783 SetFS(sel); 784 return updateRegionExists; 785 } 786 787 int WIN32API GetUpdateRgn (HWND hwnd, HRGN hrgn, BOOL erase) 788 { 789 USHORT sel = RestoreOS2FS(); 790 LONG Complexity; 791 792 Complexity = _O32_GetUpdateRgn (hwnd, hrgn, FALSE); 793 if (erase && (Complexity > NULLREGION_W)) { 794 Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd); 795 sendEraseBkgnd (wnd); 796 } 797 798 SetFS(sel); 799 return Complexity; 800 } 801 730 802 //****************************************************************************** 731 803 //****************************************************************************** -
trunk/src/user32/new/user32.cpp
r839 r903 1 /* $Id: user32.cpp,v 1. 19 1999-09-05 17:11:24 sandervlExp $ */1 /* $Id: user32.cpp,v 1.20 1999-09-10 19:00:11 dengert Exp $ */ 2 2 3 3 /* … … 325 325 lprcDst->right = MAX(lprcSrc1->right,lprcSrc2->right); 326 326 lprcDst->top = MIN(lprcSrc1->top,lprcSrc2->top); 327 lprcDst->bottom = MAX(lprcSrc1->bottom,lprcSrc2->bottom); 327 lprcDst->bottom = MAX(lprcSrc1->bottom,lprcSrc2->bottom); 328 328 } 329 329 } … … 1038 1038 //****************************************************************************** 1039 1039 //****************************************************************************** 1040 #if 0 1040 1041 int WIN32API GetUpdateRgn( HWND arg1, HRGN arg2, BOOL arg3) 1041 1042 { … … 1045 1046 return O32_GetUpdateRgn(arg1, arg2, arg3); 1046 1047 } 1048 #endif 1047 1049 //****************************************************************************** 1048 1050 … … 1241 1243 case SPI_GETICONTITLELOGFONT: 1242 1244 { 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1245 LPLOGFONTA lpLogFont = (LPLOGFONTA)pvParam; 1246 1247 /* from now on we always have an alias for MS Sans Serif */ 1248 strcpy(lpLogFont->lfFaceName, "MS Sans Serif"); 1249 lpLogFont->lfHeight = -GetProfileIntA("Desktop","IconTitleSize", 8); 1250 lpLogFont->lfWidth = 0; 1251 lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0; 1252 lpLogFont->lfWeight = FW_NORMAL; 1253 lpLogFont->lfItalic = FALSE; 1254 lpLogFont->lfStrikeOut = FALSE; 1255 lpLogFont->lfUnderline = FALSE; 1256 lpLogFont->lfCharSet = ANSI_CHARSET; 1257 lpLogFont->lfOutPrecision = OUT_DEFAULT_PRECIS; 1258 lpLogFont->lfClipPrecision = CLIP_DEFAULT_PRECIS; 1259 lpLogFont->lfPitchAndFamily = DEFAULT_PITCH | FF_SWISS; 1260 break; 1259 1261 } 1260 1262 case SPI_GETBORDER: 1261 1262 1263 *(INT *)pvParam = GetSystemMetrics( SM_CXFRAME ); 1264 break; 1263 1265 1264 1266 case SPI_GETWORKAREA: 1265 1266 1267 1268 1269 1267 SetRect( (RECT *)pvParam, 0, 0, 1268 GetSystemMetrics( SM_CXSCREEN ), 1269 GetSystemMetrics( SM_CYSCREEN ) 1270 ); 1271 break; 1270 1272 1271 1273 case 104: //TODO: Undocumented … … 1316 1318 case SPI_GETICONTITLELOGFONT: 1317 1319 { 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1320 LPLOGFONTW lpLogFont = (LPLOGFONTW)pvParam; 1321 1322 /* from now on we always have an alias for MS Sans Serif */ 1323 lstrcpyW(lpLogFont->lfFaceName, (LPCWSTR)L"MS Sans Serif"); 1324 lpLogFont->lfHeight = -GetProfileIntA("Desktop","IconTitleSize", 8); 1325 lpLogFont->lfWidth = 0; 1326 lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0; 1327 lpLogFont->lfWeight = FW_NORMAL; 1328 lpLogFont->lfItalic = FALSE; 1329 lpLogFont->lfStrikeOut = FALSE; 1330 lpLogFont->lfUnderline = FALSE; 1331 lpLogFont->lfCharSet = ANSI_CHARSET; 1332 lpLogFont->lfOutPrecision = OUT_DEFAULT_PRECIS; 1333 lpLogFont->lfClipPrecision = CLIP_DEFAULT_PRECIS; 1334 lpLogFont->lfPitchAndFamily = DEFAULT_PITCH | FF_SWISS; 1335 return TRUE; 1334 1336 } 1335 1337 default: -
trunk/src/user32/new/window.cpp
r833 r903 1 /* $Id: window.cpp,v 1.2 3 1999-09-05 12:03:34 sandervlExp $ */1 /* $Id: window.cpp,v 1.24 1999-09-10 19:00:11 dengert Exp $ */ 2 2 /* 3 3 * Win32 window apis for OS/2 … … 73 73 // Wine seems to assume it's a string though... 74 74 if(!stricmp(className, MDICLIENTCLASSNAMEA)) { 75 75 window = (Win32BaseWindow *) new Win32MDIClientWindow(&cs, classAtom, FALSE); 76 76 } 77 77 else { 78 78 window = new Win32BaseWindow( &cs, classAtom, FALSE ); 79 79 } 80 80 if(window == NULL) … … 137 137 // Wine seems to assume it's a string though... 138 138 if(!lstrcmpW(className, (LPWSTR)MDICLIENTCLASSNAMEW)) { 139 139 window = (Win32BaseWindow *) new Win32MDIClientWindow(&cs, classAtom, TRUE); 140 140 } 141 141 else { 142 142 window = new Win32BaseWindow( &cs, classAtom, TRUE ); 143 143 } 144 144 if(window == NULL) … … 821 821 *****************************************************************************/ 822 822 823 HWND WIN32API ChildWindowFromPointEx (HWND hwndParent, POINT pt, UINT uFlags) 823 HWND WIN32API ChildWindowFromPointEx (HWND hwndParent, POINT pt, UINT uFlags) 824 824 { 825 825 RECT rect; … … 995 995 //****************************************************************************** 996 996 //****************************************************************************** 997 #if 0 997 998 BOOL WIN32API GetUpdateRect( HWND hwnd, PRECT lpRect, BOOL bErase) 998 999 { … … 1002 1003 return OSLibWinQueryUpdateRect(Win32BaseWindow::Win32ToOS2Handle(hwnd), lpRect); 1003 1004 } 1005 #endif 1004 1006 //****************************************************************************** 1005 1007 //******************************************************************************
Note:
See TracChangeset
for help on using the changeset viewer.