Changeset 10275 for trunk/src


Ignore:
Timestamp:
Oct 20, 2003, 7:17:23 PM (22 years ago)
Author:
sandervl
Message:

PM windows should have no owner if none is specified. (instead of their parent)

Location:
trunk/src/user32
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/oslibmsgtranslate.cpp

    r10216 r10275  
    1 /* $Id: oslibmsgtranslate.cpp,v 1.115 2003-08-08 13:30:19 sandervl Exp $ */
     1/* $Id: oslibmsgtranslate.cpp,v 1.116 2003-10-20 17:17:21 sandervl Exp $ */
    22/*
    33 * Window message translation functions for OS/2
    … …  
    6868{
    6969  // check if the single slot is occupied already
    70   if (teb->o.odin.fTranslated == TRUE)
    71     // there's still an already translated message to be processed
    72     return FALSE;
     70  if (teb->o.odin.fTranslated == TRUE) {
     71      // there's still an already translated message to be processed
     72      dprintf(("WARNING: translated message already pending!"));
     73      return FALSE;
     74  }
    7375
    7476  teb->o.odin.fTranslated = TRUE;

  • trunk/src/user32/oslibwin.cpp

    r10031 r10275  
    1 /* $Id: oslibwin.cpp,v 1.143 2003-04-23 18:00:58 sandervl Exp $ */
     1/* $Id: oslibwin.cpp,v 1.144 2003-10-20 17:17:22 sandervl Exp $ */
    22/*
    33 * Window API wrappers for OS/2
    … …  
    9292
    9393    dprintf(("WinCreateWindow %x %s %x task %d shell %d classstyle %x winstyle %x bottom %d", hwndParent, pszName, id, fTaskList, fShellPosition, classStyle, dwWinStyle, fHWND_BOTTOM));
     94    dprintf(("WinCreateWindow parent %x, owner %x", hwndParent, Owner));
    9495
    9596    //Must not use WS_CLIPCHILDREN style with frame window. Transparency won't work otherwise.

  • trunk/src/user32/pmwindow.cpp

    r10240 r10275  
    1 /* $Id: pmwindow.cpp,v 1.219 2003-08-22 13:16:45 sandervl Exp $ */
     1/* $Id: pmwindow.cpp,v 1.220 2003-10-20 17:17:22 sandervl Exp $ */
    22/*
    33 * Win32 Window Managment Code for OS/2
    … …  
    1919#define INCL_DOSDEVIOCTL
    2020#define INCL_WINTRACKRECT
     21#define INCL_BASE
    2122
    2223#include <os2wrap.h>
    … …  
    5354#include <winscan.h>
    5455#include <oslibdnd.h>
     56#include <custombuild.h>
    5557#include <win\dbt.h>
    5658#include "dragdrop.h"
    … …  
    504506 POSTMSG_PACKET  *postmsg;
    505507 OSLIBPOINT       point, ClientPoint;
    506 
     508 EXCEPTIONREGISTRATIONRECORD exceptRegRec = {0,0};
     509
     510    ODIN_SetExceptionHandler(&exceptRegRec);
    507511    // restore our FS selector
    508512    SetWin32TIB();
    … …  
    581585        RELEASE_WNDOBJ(win32wnd);
    582586        RestoreOS2TIB();
     587        ODIN_UnsetExceptionHandler(&exceptRegRec);
    583588
    584589#ifdef DEBUG
    … …  
    749754    }
    750755   
     756#ifdef DEBUG
    751757    case WM_SETFOCUS:
    752758    {
    753759        HWND hwndFocus = (HWND)mp1;
    754760        dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d cur focus %x", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2, WinQueryFocus(HWND_DESKTOP)));
    755         break;
    756     }
     761        if(WinQueryFocus(HWND_DESKTOP) == win32wnd->getOS2FrameWindowHandle()) {
     762            dprintf(("WARNING: Focus set to frame window"));
     763        }
     764        break;
     765    }
     766#endif
    757767
    758768    //Handle all focus processed during WM_FOCUSCHANGED; PM doesn't like focus
    … …  
    11481158    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
    11491159    RestoreOS2TIB();
     1160    ODIN_UnsetExceptionHandler(&exceptRegRec);
    11501161
    11511162#ifdef DEBUG
    … …  
    11571168//  dprintf(("OS2: RunDefWndProc msg %x for %x", msg, hwnd));
    11581169    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     1170
    11591171    RestoreOS2TIB();
     1172    ODIN_UnsetExceptionHandler(&exceptRegRec);
    11601173
    11611174#ifdef DEBUG
    … …  
    11741187 MRESULT          rc = 0;
    11751188 MSG              winMsg, *pWinMsg;
     1189 EXCEPTIONREGISTRATIONRECORD exceptRegRec = {0,0};
    11761190
    11771191#ifdef DEBUG
    … …  
    11791193#endif
    11801194
     1195    ODIN_SetExceptionHandler(&exceptRegRec);
    11811196    //Restore our FS selector
    11821197    SetWin32TIB();
    … …  
    18901905        rc = pfnFrameWndProc(hwnd, msg, mp1, mp2);
    18911906        SetWin32TIB();
    1892         dprintf2(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x returned %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), (mp2) ? OS2ToWin32Handle((DWORD)mp2) : 0, (rc) ? OS2ToWin32Handle((DWORD)rc) : 0));
     1907        dprintf2(("PMFRAME:WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x returned %x (%x)", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), (mp2) ? OS2ToWin32Handle((DWORD)mp2) : 0, (rc) ? OS2ToWin32Handle((DWORD)rc) : 0, rc));
    18931908        break;
    18941909//        goto RunDefFrameWndProc;
    … …  
    21642179    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
    21652180    RestoreOS2TIB();
     2181    ODIN_UnsetExceptionHandler(&exceptRegRec);
    21662182
    21672183#ifdef DEBUG
    … …  
    21742190    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
    21752191    RestoreOS2TIB();
     2192    ODIN_UnsetExceptionHandler(&exceptRegRec);
    21762193
    21772194#ifdef DEBUG
    … …  
    21842201    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
    21852202    RestoreOS2TIB();
     2203    ODIN_UnsetExceptionHandler(&exceptRegRec);
     2204
    21862205    //calling WinDefWindowProc here breaks Opera hotlist window (WM_ADJUSTWINDOWPOS)
    21872206//    return pfnFrameWndProc(hwnd, msg, mp1, mp2);
    … …  
    22002219    TEB             *teb;
    22012220    MRESULT          rc = 0;
     2221    EXCEPTIONREGISTRATIONRECORD exceptRegRec = {0,0};
    22022222
    22032223    //Restore our FS selector
    … …  
    22182238    RestoreOS2TIB();
    22192239    rc = pfnOldWindowProc(hwnd, msg, mp1, mp2);
     2240
     2241    ODIN_SetExceptionHandler(&exceptRegRec);
    22202242    SetWin32TIB();
    22212243    switch(msg) {
    … …  
    22392261    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
    22402262    RestoreOS2TIB();
     2263    ODIN_UnsetExceptionHandler(&exceptRegRec);
    22412264    return rc;
    22422265

  • trunk/src/user32/user32.cpp

    r10197 r10275  
    1 /* $Id: user32.cpp,v 1.128 2003-08-01 10:07:43 sandervl Exp $ */
     1/* $Id: user32.cpp,v 1.129 2003-10-20 17:17:23 sandervl Exp $ */
    22
    33/*
    … …  
    117117      return FALSE;
    118118    }
    119 
     119 
     120    dprintf2(("USER32:  EqualRect (%d,%d)(%d,%d) (%d,%d)(%d,%d)", lprc1->left, lprc1->top, lprc1->right, lprc1->bottom, lprc2->left, lprc2->top, lprc2->right, lprc2->bottom));
    120121    return (lprc1->left == lprc2->left &&
    121122            lprc1->right == lprc2->right &&
    … …  
    167168      lprcDst->top    = MAX(lprcSrc1->top,lprcSrc2->top);
    168169      lprcDst->bottom = MIN(lprcSrc1->bottom,lprcSrc2->bottom);
     170      dprintf2(("USER32: IntersectRect result: (%d,%d)(%d,%d)", lprcDst->left, lprcDst->top, lprcDst->right, lprcDst->bottom));
    169171    }
    170172

  • trunk/src/user32/win32wbase.cpp

    r10261 r10275  
    1 /* $Id: win32wbase.cpp,v 1.378 2003-10-06 09:49:38 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.379 2003-10-20 17:17:23 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    505505                                   dwOSFrameStyle,
    506506                                   (char *)windowNameA,
    507                                    (owner) ? owner->getOS2WindowHandle() : hwndOS2Frame,
     507                                   (owner) ? owner->getOS2WindowHandle() : 0,
    508508                                   (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
    509509                                   0,
Note: See TracChangeset for help on using the changeset viewer.