- Timestamp:
- Feb 10, 2000, 7:49:53 PM (26 years ago)
- Location:
- trunk/src/user32
- Files:
-
- 6 edited
-
USER32.DEF (modified) (10 diffs)
-
menu.cpp (modified) (4 diffs)
-
syscolor.cpp (modified) (4 diffs)
-
user32.cpp (modified) (2 diffs)
-
win32wbasenonclient.cpp (modified) (2 diffs)
-
win32wdesktop.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/user32/USER32.DEF
r2628 r2739 1 ; $Id: USER32.DEF,v 1.2 6 2000-02-03 23:04:50 sandervlExp $1 ; $Id: USER32.DEF,v 1.27 2000-02-10 18:49:50 cbratschi Exp $ 2 2 3 3 ;Created by BLAST for IBM's compiler … … 23 23 24 24 EXPORTS 25 ActivateKeyboardLayout = _ActivateKeyboardLayout@8 26 AdjustWindowRect = _AdjustWindowRect@12 27 AdjustWindowRectEx = _AdjustWindowRectEx@16 28 AnyPopup = _AnyPopup@0 29 AppendMenuA = _AppendMenuA@16 30 AppendMenuW = _AppendMenuW@16 31 ArrangeIconicWindows = _ArrangeIconicWindows@4 32 AttachThreadInput = _AttachThreadInput@12 33 BeginDeferWindowPos = _BeginDeferWindowPos@4 34 BeginPaint = _BeginPaint@8 35 BringWindowToTop = _BringWindowToTop@4 36 BroadcastSystemMessage = _BroadcastSystemMessage@20 37 ; CalcChildScroll = _CalcChildScroll@??@1325 ActivateKeyboardLayout = _ActivateKeyboardLayout@8 @1 26 AdjustWindowRect = _AdjustWindowRect@12 @2 27 AdjustWindowRectEx = _AdjustWindowRectEx@16 @3 28 AnyPopup = _AnyPopup@0 @4 29 AppendMenuA = _AppendMenuA@16 @5 30 AppendMenuW = _AppendMenuW@16 @6 31 ArrangeIconicWindows = _ArrangeIconicWindows@4 @7 32 AttachThreadInput = _AttachThreadInput@12 @8 33 BeginDeferWindowPos = _BeginDeferWindowPos@4 @9 34 BeginPaint = _BeginPaint@8 @10 35 BringWindowToTop = _BringWindowToTop@4 @11 36 BroadcastSystemMessage = _BroadcastSystemMessage@20 @12 37 CalcChildScroll = _CalcChildScroll@8 @13 38 38 CallMsgFilter = _CallMsgFilterA@8 @14 39 39 CallMsgFilterA = _CallMsgFilterA@8 @15 … … 64 64 CharToOemBuffA = _CharToOemBuffA@12 @40 65 65 CharToOemBuffW = _CharToOemBuffW@12 @41 66 CharToOemW = _CharToOemW@8 @4267 CharUpperA = _CharUpperA@4 @4368 CharUpperBuffA = _CharUpperBuffA@8 @4469 CharUpperBuffW = _CharUpperBuffW@8 @4570 CharUpperW = _CharUpperW@4 @4666 CharToOemW = _CharToOemW@8 @42 67 CharUpperA = _CharUpperA@4 @43 68 CharUpperBuffA = _CharUpperBuffA@8 @44 69 CharUpperBuffW = _CharUpperBuffW@8 @45 70 CharUpperW = _CharUpperW@4 @46 71 71 CheckDlgButton = _CheckDlgButton@12 @47 72 72 CheckMenuItem = _CheckMenuItem@12 @48 … … 77 77 ; ClientThreadConnect = _ClientThreadConnect@?? @53 78 78 ClientToScreen = _ClientToScreen@8 @54 79 ClipCursor = _ClipCursor@4 @5579 ClipCursor = _ClipCursor@4 @55 80 80 CloseClipboard = _CloseClipboard@0 @56 81 81 CloseDesktop = _CloseDesktop@4 @57 … … 191 191 DrawTextExW = _DrawTextExW@24 @167 192 192 DrawTextW = _DrawTextW@20 @168 193 ; EditWndProc = _EditWndProc@??@169193 EditWndProc = _EditWndProc@16 @169 194 194 EmptyClipboard = _EmptyClipboard@0 @170 195 195 EnableMenuItem = _EnableMenuItem@12 @171 … … 247 247 GetClipboardOwner = _GetClipboardOwner@0 @223 248 248 GetClipboardViewer = _GetClipboardViewer@0 @224 249 GetCursor = _GetCursor@0 @225250 GetCursorPos = _GetCursorPos@4 @226249 GetCursor = _GetCursor@0 @225 250 GetCursorPos = _GetCursorPos@4 @226 251 251 GetDC = _GetDC@4 @227 252 252 GetDCEx = _GetDCEx@12 @228 … … 268 268 GetKeyNameTextA = _GetKeyNameTextA@12 @244 269 269 GetKeyNameTextW = _GetKeyNameTextW@12 @245 270 GetKeyState = _GetKeyState@4 @246270 GetKeyState = _GetKeyState@4 @246 271 271 GetKeyboardLayout = _GetKeyboardLayout@4 @247 272 272 GetKeyboardLayoutList = _GetKeyboardLayoutList@8 @248 … … 274 274 GetKeyboardLayoutNameW = _GetKeyboardLayoutNameW@4 @250 275 275 GetKeyboardState = _GetKeyboardState@4 @251 276 GetKeyboardType = _GetKeyboardType@4 276 GetKeyboardType = _GetKeyboardType@4 @252 277 277 GetLastActivePopup = _GetLastActivePopup@4 @253 278 278 GetMenu = _GetMenu@4 @254 … … 491 491 SetClassWord = _SetClassWord@12 @463 492 492 SetClipboardData = _SetClipboardData@8 @464 493 SetClipboardViewer = _SetClipboardViewer@4 @465493 SetClipboardViewer = _SetClipboardViewer@4 @465 494 494 SetCursor = _SetCursor@4 @466 495 495 SetCursorPos = _SetCursorPos@8 @467 496 496 SetDebugErrorLevel = _SetDebugErrorLevel@4 @468 497 ; SetDeskWallpaper = _SetDeskWallpaper@??@469497 SetDeskWallPaper = _SetDeskWallPaper@4 @469 498 498 ; SetDesktopBitmap = _SetDesktopBitmap@?? @470 499 499 SetDlgItemInt = _SetDlgItemInt@16 @471 … … 506 506 SetKeyboardState = _SetKeyboardState@4 @478 507 507 SetLastErrorEx = _SetLastErrorEx@8 @479 508 ; SetLogonNotifyWindow = _SetLogonNotifyWindow@??@480508 SetLogonNotifyWindow = _SetLogonNotifyWindow@8 @480 509 509 SetMenu = _SetMenu@8 @481 510 510 SetMenuContextHelpId = _SetMenuContextHelpId@8 @482 -
trunk/src/user32/menu.cpp
r2611 r2739 1 /* $Id: menu.cpp,v 1.1 5 2000-02-03 17:13:00 cbratschi Exp $*/1 /* $Id: menu.cpp,v 1.16 2000-02-10 18:49:50 cbratschi Exp $*/ 2 2 /* 3 3 * Menu functions … … 1087 1087 /// for everything except the 1st menu item 1088 1088 RECT dummy = rect; 1089 dummy.bottom = dummy.top+1; 1090 dummy.right = dummy.right+1; 1089 1091 1090 FillRect( hdc, &dummy, GetSysColorBrush(COLOR_HIGHLIGHT) ); 1092 FillRect( hdc, &rect, GetSysColorBrush(COLOR_MENU) ); 1091 FillRect( hdc, &rect, GetSysColorBrush(COLOR_MENU) ); //CB: back color switching bug? 1093 1092 } 1094 1093 … … 2663 2662 hmenu = MENU_PtMenu(mt.hTopMenu,pt,inMenuBar); 2664 2663 2665 //CB: todo: Win32 dispatches at least some mouse messages!2664 //CB: todo: solve conflicts with OS/2's single message queue architecture 2666 2665 2667 2666 switch(msg.message) … … 2707 2706 2708 2707 fEndMenu |= !MENU_MouseMove( &mt, hmenu, wFlags ); 2709 //CB: dispatch message2710 if (!fEndMenu && !hmenu) DispatchMessageA(&msg);2711 2712 2708 } /* switch(msg.message) - mouse */ 2713 2709 } -
trunk/src/user32/syscolor.cpp
r2471 r2739 1 /* $Id: syscolor.cpp,v 1.1 6 2000-01-18 20:21:29 sandervlExp $ */1 /* $Id: syscolor.cpp,v 1.17 2000-02-10 18:49:51 cbratschi Exp $ */ 2 2 3 3 /* … … 185 185 } 186 186 187 if ( nIndex >= 0 && nIndex < NUM_SYS_COLORS)187 if ((nIndex >= 0) && (nIndex < NUM_SYS_COLORS)) 188 188 { 189 189 if (USEWINCOLORS) return SysColors[nIndex]; … … 243 243 } 244 244 245 if (nIndex >= 0 && nIndex < NUM_SYS_COLORS) return SysColorBrushes[nIndex]; 246 else return(GetStockObject(LTGRAY_BRUSH)); 247 245 return ((nIndex >= 0) && (nIndex < NUM_SYS_COLORS)) ? SysColorBrushes[nIndex]:0; 248 246 } 249 247 /*********************************************************************** … … 260 258 } 261 259 262 if (index >= 0 && index < NUM_SYS_COLORS) return SysColorPens[index]; 263 else return 0; 260 return ((index >= 0) && (index < NUM_SYS_COLORS)) ? SysColorPens[index]:0; 264 261 } 265 262 //****************************************************************************** -
trunk/src/user32/user32.cpp
r2697 r2739 1 /* $Id: user32.cpp,v 1.7 0 2000-02-09 13:42:38 sandervlExp $ */1 /* $Id: user32.cpp,v 1.71 2000-02-10 18:49:51 cbratschi Exp $ */ 2 2 3 3 /* … … 2808 2808 return TRUE; 2809 2809 } 2810 2811 2810 /*********************************************************************** 2811 * SetLogonNotifyWindow (USER32.486) 2812 */ 2813 DWORD WIN32API SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) 2814 { 2815 dprintf(("USER32: SetLogonNotifyWindow - empty stub!")); 2816 2817 return 1; 2818 } 2819 -
trunk/src/user32/win32wbasenonclient.cpp
r2666 r2739 1 /* $Id: win32wbasenonclient.cpp,v 1. 9 2000-02-05 19:45:19cbratschi Exp $ */1 /* $Id: win32wbasenonclient.cpp,v 1.10 2000-02-10 18:49:52 cbratschi Exp $ */ 2 2 /* 3 3 * Win32 Window Base Class for OS/2 (non-client methods) … … 932 932 SetBkMode(memDC, TRANSPARENT ); 933 933 r.left += 2; 934 DrawTextA(memDC, buffer, -1, &r, 935 DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT ); 934 DrawTextExA(memDC,buffer,-1,&r,DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT | DT_END_ELLIPSIS,NULL); 936 935 DeleteObject (SelectObject (memDC, hOldFont)); 937 936 } -
trunk/src/user32/win32wdesktop.cpp
r2469 r2739 1 /* $Id: win32wdesktop.cpp,v 1.1 0 2000-01-18 20:10:58 sandervlExp $ */1 /* $Id: win32wdesktop.cpp,v 1.11 2000-02-10 18:49:53 cbratschi Exp $ */ 2 2 /* 3 3 * Win32 Desktop Window for OS/2 … … 89 89 //****************************************************************************** 90 90 //****************************************************************************** 91 BOOL WIN32API SetDeskWallPaper(LPCSTR filename) 92 { 93 dprintf(("USER32: SetDeskWallPaper - empty stub!")); 94 95 return TRUE; 96 } 97 //****************************************************************************** 98 //****************************************************************************** 91 99 BOOL DESKTOP_Register() 92 100 {
Note:
See TracChangeset
for help on using the changeset viewer.
