- Timestamp:
- Jun 26, 1999, 8:25:08 PM (26 years ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/kernel32/KERNEL32.DEF
r126 r223 1 ; $Id: KERNEL32.DEF,v 1.1 2 1999-06-20 10:55:35sandervl Exp $1 ; $Id: KERNEL32.DEF,v 1.13 1999-06-26 18:24:49 sandervl Exp $ 2 2 3 3 ;Created by BLAST for IBM's compiler … … 967 967 RestoreOS2TIB = _RestoreOS2TIB@0 @1228 968 968 SetWin32TIB = _SetWin32TIB@0 @1229 969 RestoreOS2FS = RestoreOS2FS @1230 -
trunk/src/kernel32/except.asm
r123 r223 1 ; $Id: except.asm,v 1. 4 1999-06-19 13:57:51sandervl Exp $1 ; $Id: except.asm,v 1.5 1999-06-26 18:24:50 sandervl Exp $ 2 2 3 3 ;/* … … 181 181 getSS endp 182 182 183 PUBLIC RestoreOS2FS 184 RestoreOS2FS proc near 185 push 150bh 186 mov ax, fs 187 pop fs 188 ret 189 RestoreOS2FS endp 183 190 CODE32 ENDS 184 191 -
trunk/src/kernel32/kernel32exp.def
r126 r223 1 ; $Id: kernel32exp.def,v 1. 5 1999-06-20 10:55:36sandervl Exp $1 ; $Id: kernel32exp.def,v 1.6 1999-06-26 18:24:50 sandervl Exp $ 2 2 3 3 ;Created by BLAST for IBM's compiler … … 832 832 _RestoreOS2TIB@0 @1228 833 833 _SetWin32TIB@0 @1229 834 RestoreOS2FS @1230 -
trunk/src/user32/wndclass.cpp
r220 r223 1 /* $Id: wndclass.cpp,v 1.1 2 1999-06-26 15:07:01sandervl Exp $ */1 /* $Id: wndclass.cpp,v 1.13 1999-06-26 18:25:08 sandervl Exp $ */ 2 2 3 3 /* … … 25 25 #include <nameid.h> 26 26 #include <spy.h> 27 #include <wprocess.h> 27 28 #include "hooks.h" 28 29 … … 70 71 LRESULT rc; 71 72 73 //Restore our FS selector 74 SetWin32TIB(); 75 72 76 PostSpyMessage(hwnd, Msg, wParam, lParam); 73 77 switch(Msg) … … 75 79 case WM_LBUTTONDOWN: 76 80 rc = ButtonHandler(hwnd, Msg, wParam, lParam); 81 //Restore our FS selector 82 SetWin32TIB(); 77 83 78 84 NotifyParent(hwnd, Msg, wParam, lParam); … … 97 103 case WM_RBUTTONDOWN: 98 104 rc = ButtonHandler(hwnd, Msg, wParam, lParam); 105 //Restore our FS selector 106 SetWin32TIB(); 99 107 NotifyParent(hwnd, Msg, wParam, lParam); 108 RestoreOS2TIB(); 100 109 return rc; 101 110 … … 104 113 break; 105 114 } 106 return ButtonHandler(hwnd, Msg, wParam, lParam); 115 rc = ButtonHandler(hwnd, Msg, wParam, lParam); 116 RestoreOS2TIB(); 117 return rc; 107 118 } 108 119 //****************************************************************************** … … 827 838 Win32WindowProc *window; 828 839 840 //Restore our FS selector 841 SetWin32TIB(); 842 829 843 if(Msg == WM_MOUSEACTIVATE) 830 844 { … … 839 853 840 854 if(HkCBT::OS2HkCBTProc(hwnd, Msg, wParam, lParam) == TRUE) {//hook swallowed msg 855 RestoreOS2TIB(); 841 856 return(0); 842 857 } … … 862 877 863 878 NotifyParent(hwnd, WM_CREATE, wParam, lParam); 879 RestoreOS2TIB(); 864 880 return(rc); 865 881 … … 898 914 break; 899 915 } 900 return wclass->GetWinCallback()(hwnd, Msg, wParam, lParam); 916 rc = wclass->GetWinCallback()(hwnd, Msg, wParam, lParam); 917 RestoreOS2TIB(); 918 return rc; 901 919 } 902 920 } 903 921 dprintf(("OS2ToWinCallback: couldn't find class procedure of window %X\n", hwnd)); 922 RestoreOS2TIB(); 904 923 return(0); 905 924 } -
trunk/src/user32/wndproc.cpp
r218 r223 1 /* $Id: wndproc.cpp,v 1.1 0 1999-06-26 14:09:45sandervl Exp $ */1 /* $Id: wndproc.cpp,v 1.11 1999-06-26 18:25:08 sandervl Exp $ */ 2 2 3 3 /* … … 21 21 #include <wndclass.h> 22 22 #include <spy.h> 23 #include <wprocess.h> 23 24 #include "dlgconvert.h" 24 25 #include "hooks.h" … … 289 290 LRESULT rc; 290 291 292 //Restore our FS selector 293 SetWin32TIB(); 294 291 295 if(Msg == WM_MOUSEACTIVATE) 292 296 { … … 302 306 303 307 if(HkCBT::OS2HkCBTProc(hwnd, Msg, wParam, lParam) == TRUE) {//hook swallowed msg 308 RestoreOS2TIB(); 304 309 return(0); 305 310 } … … 321 326 case WM_CREATE: //Open32 isn't sending WM_NCCREATE messages!! 322 327 if(curwnd->SendMessageA(hwnd, WM_NCCREATE, 0, lParam) == 0) { 323 dprintf(("WM_NCCREATE returned FALSE\n")); 324 return(-1); //don't create window 328 dprintf(("WM_NCCREATE returned FALSE\n")); 329 RestoreOS2TIB(); 330 return(-1); //don't create window 325 331 } 326 332 … … 329 335 #if 0 330 336 if(curwnd->SendMessageA(hwnd, WM_NCCALCSIZE, 0, lParam) == 0) { 337 RestoreOS2TIB(); 331 338 return(-1); //don't create window 332 339 } … … 357 364 delete curwnd; 358 365 } 366 RestoreOS2TIB(); 359 367 return rc; 360 368 } … … 370 378 wnd = new Win32WindowProc(wclass->GetClassCallback(szClass)); 371 379 wnd->SetWindowHandle(hwnd); 372 return(WndCallback(hwnd, Msg, wParam, lParam)); 380 rc = WndCallback(hwnd, Msg, wParam, lParam); 381 RestoreOS2TIB(); 382 return rc; 373 383 } 374 384 } 375 385 dprintf(("wnd Callback, can't find window %X %d!!!!\n", hwnd, Msg)); 386 RestoreOS2TIB(); 376 387 return 0; 377 388 }
Note:
See TracChangeset
for help on using the changeset viewer.