Changeset 1340 for trunk/src


Ignore:
Timestamp:
Oct 17, 1999, 6:59:58 PM (26 years ago)
Author:
sandervl
Message:

Bugfixes for enum* apis & findwindowex

Location:
trunk/src/user32
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/win32wbase.cpp

    r1337 r1340  
    1 /* $Id: win32wbase.cpp,v 1.50 1999-10-17 16:42:39 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.51 1999-10-17 16:59:58 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    22322232                hwnd = OSLibWinQueryClientWindow(hwnd);
    22332233                if(hwnd)  wnd = GetWindowFromOS2Handle(hwnd);
     2234                if(!hwnd) wnd = GetWindowFromOS2FrameHandle(hwnd);
    22342235            }
    22352236

  • trunk/src/user32/window.cpp

    r1337 r1340  
    1 /* $Id: window.cpp,v 1.18 1999-10-17 16:42:40 sandervl Exp $ */
     1/* $Id: window.cpp,v 1.19 1999-10-17 16:59:58 sandervl Exp $ */
    22/*
    33 * Win32 window apis for OS/2
    … …  
    367367//******************************************************************************
    368368//******************************************************************************
    369 #if 0
    370 BOOL WIN32API UpdateWindow(HWND hwnd)
    371 {
    372   Win32BaseWindow *window;
    373 
    374     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    375     if(!window) {
    376         dprintf(("UpdateWindow, window %x not found", hwnd));
    377         return 0;
    378     }
    379     dprintf(("UpdateWindow %x", hwnd));
    380     return window->UpdateWindow();
    381 }
    382 #endif
    383 //******************************************************************************
    384 //******************************************************************************
    385369BOOL WIN32API IsIconic( HWND hwnd)
    386370{
    … …  
    586570//******************************************************************************
    587571//******************************************************************************
    588 BOOL WIN32API IsZoomed( HWND arg1)
    589 {
    590 #ifdef DEBUG
    591     WriteLog("USER32:  IsZoomed\n");
    592 #endif
    593     return O32_IsZoomed(arg1);
    594 }
    595 //******************************************************************************
    596 //******************************************************************************
    597 BOOL WIN32API LockWindowUpdate( HWND arg1)
    598 {
    599 #ifdef DEBUG
    600     WriteLog("USER32:  LockWindowUpdate\n");
    601 #endif
    602     return O32_LockWindowUpdate(arg1);
    603 }
    604 //******************************************************************************
    605 //******************************************************************************
    606 
    607 #if 0
    608 BOOL WIN32API RedrawWindow( HWND arg1, const RECT * arg2, HRGN arg3, UINT arg4)
    609 {
    610  BOOL rc;
    611 
    612   rc = O32_RedrawWindow(arg1, arg2, arg3, arg4);
    613 #ifdef DEBUG
    614   WriteLog("USER32:  RedrawWindow %X , %X, %X, %X returned %d\n", arg1, arg2, arg3, arg4, rc);
    615 #endif
    616   InvalidateRect(arg1, arg2, TRUE);
    617   UpdateWindow(arg1);
    618   SendMessageA(arg1, WM_PAINT, 0, 0);
    619   return(rc);
    620 }
    621 #endif
     572BOOL WIN32API IsZoomed(HWND hwnd)
     573{
     574    dprintf(("USER32:  IsZoomed\n"));
     575    return O32_IsZoomed(Win32BaseWindow::Win32ToOS2FrameHandle(hwnd));
     576}
     577//******************************************************************************
     578//******************************************************************************
     579BOOL WIN32API LockWindowUpdate(HWND hwnd)
     580{
     581    dprintf(("USER32:  LockWindowUpdate\n"));
     582    return O32_LockWindowUpdate(Win32BaseWindow::Win32ToOS2FrameHandle(hwnd));
     583}
    622584//******************************************************************************
    623585//******************************************************************************
    … …  
    630592    if(!window) {
    631593        dprintf(("GetWindowRect, window %x not found", hwnd));
    632     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     594        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    633595        return 0;
    634596    }
    … …  
    646608    if(!window) {
    647609        dprintf(("GetWindowTextLength, window %x not found", hwnd));
    648     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     610        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    649611        return 0;
    650612    }
    … …  
    662624    if(!window) {
    663625        dprintf(("GetWindowTextA, window %x not found", hwnd));
    664     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     626        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    665627        return 0;
    666628    }
    … …  
    685647    if(!window) {
    686648        dprintf(("GetWindowTextW, window %x not found", hwnd));
    687     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     649        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    688650        return 0;
    689651    }
    … …  
    700662    if(!window) {
    701663        dprintf(("SetWindowTextA, window %x not found", hwnd));
    702     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     664        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    703665        return 0;
    704666    }
    … …  
    715677    if(!window) {
    716678        dprintf(("SetWindowTextA, window %x not found", hwnd));
    717     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     679        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    718680        return 0;
    719681    }
    … …  
    757719    if(!window) {
    758720        dprintf(("GetClientRect, window %x not found", hwnd));
    759     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     721        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    760722        return 0;
    761723    }
    … …  
    909871BOOL WIN32API ClientToScreen (HWND hwnd, PPOINT pt)
    910872{
    911 #ifdef DEBUG
    912    WriteLog("USER32:  ClientToScreen\n");
    913 #endif
    914873    Win32BaseWindow *wnd;
    915874    PRECT rcl;
    916875
     876    dprintf(("USER32:  ClientToScreen\n"));
    917877    if (!hwnd) {
    918     SetLastError(ERROR_INVALID_PARAMETER);
    919     return (FALSE);
     878        SetLastError(ERROR_INVALID_PARAMETER);
     879        return (FALSE);
    920880    }
    921881    wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
    922882    if (!wnd) {
    923     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    924     return (FALSE);
     883        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     884        return (FALSE);
    925885    }
    926886
    … …  
    11171077        if (GetWindowRect (hwndParent, &rect) == 0) {
    11181078                // oops, invalid handle
    1119         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     1079                SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    11201080                return NULL;
    11211081        }
    … …  
    11621122                }
    11631123
    1164         dprintf(("ChildWindowFromPointEx returned %x", hWnd));
     1124                dprintf(("ChildWindowFromPointEx returned %x", hWnd));
    11651125                // found it!
    11661126                return hWnd;
    … …  
    11691129        // the point is in the parentwindow but the parentwindow has no child
    11701130        // at this coordinate
    1171     dprintf(("ChildWindowFromPointEx returned parent %x", hwndParent));
     1131            dprintf(("ChildWindowFromPointEx returned parent %x", hwndParent));
    11721132        return hwndParent;
    11731133}
    … …  
    11811141    if(!window) {
    11821142        dprintf(("CloseWindow, window %x not found", hwnd));
    1183     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     1143        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    11841144        return 0;
    11851145    }
    … …  
    12101170    if(!window) {
    12111171        dprintf(("IsWindowUnicode, window %x not found", hwnd));
    1212     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     1172        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    12131173        return 0;
    12141174    }
    … …  
    12911251                continue;
    12921252
    1293         window = Win32BaseWindow::GetWindowFromHandle(hwndNext);
     1253        window = Win32BaseWindow::GetWindowFromOS2Handle(hwndNext);
    12941254        if(window == NULL) {
    1295                 //OS/2 window or non-frame window, so skip it
    1296                 continue;
     1255                window = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndNext);
     1256                if(!window) {
     1257                        //OS/2 window or non-frame window, so skip it
     1258                        continue;
     1259                }
    12971260        }
    12981261        if((rc = lpfn(window->getWindowHandle(), lParam)) == FALSE)
    … …  
    13161279  if(!parentwindow) {
    13171280        dprintf(("EnumChildWindows, window %x not found", hwnd));
    1318     SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     1281        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
    13191282        return FALSE;
    13201283  }
    … …  
    13231286  while ((hwndNext = OSLibWinGetNextWindow(henum)) != 0)
    13241287  {
    1325         window = Win32BaseWindow::GetWindowFromHandle(hwndNext);
     1288        window = Win32BaseWindow::GetWindowFromOS2Handle(hwndNext);
    13261289        if(window == NULL) {
    1327                 //OS/2 window or non-frame window, so skip it
    1328                 continue;
     1290                window = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndNext);
     1291                if(!window) {
     1292                        //OS/2 window or non-frame window, so skip it
     1293                        continue;
     1294                }
    13291295        }
    13301296        if((rc = lpfn(window->getWindowHandle(), lParam)) == FALSE)
    … …  
    13521318        while ((hwndNext = OSLibWinGetNextWindow(henum)) != 0)
    13531319        {
    1354                 window = Win32BaseWindow::GetWindowFromHandle(hwndNext);
     1320                window = Win32BaseWindow::GetWindowFromOS2Handle(hwndNext);
    13551321                if(window == NULL) {
    1356                         //OS/2 window or non-frame window, so skip it
    1357                         continue;
     1322                        window = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndNext);
     1323                        if(!window) {
     1324                            //OS/2 window or non-frame window, so skip it
     1325                            continue;
     1326                        }
    13581327                }
    13591328                if((rc = lpfn(window->getWindowHandle(), lParam)) == FALSE) {
    … …  
    13741343//******************************************************************************
    13751344//******************************************************************************
    1376 #if 0
    1377 BOOL WIN32API GetUpdateRect( HWND hwnd, PRECT lpRect, BOOL  bErase)
    1378 {
    1379     dprintf(("GetUpdateRect %x %d\n", hwnd, bErase));
    1380     if (!lpRect) return FALSE;
    1381 
    1382     return OSLibWinQueryUpdateRect(Win32BaseWindow::Win32ToOS2Handle(hwnd), lpRect);
    1383 }
    1384 #endif
    1385 //******************************************************************************
    1386 //******************************************************************************
    1387 #if 0
    1388 BOOL WIN32API InvalidateRect(HWND hWnd, const RECT *lpRect, BOOL bErase)
    1389 {
    1390 #ifdef DEBUG
    1391     if(lpRect)
    1392          WriteLog("USER32:  InvalidateRect for window %X (%d,%d)(%d,%d) %d\n", hWnd, lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, bErase);
    1393     else WriteLog("USER32:  InvalidateRect for window %X NULL, %d\n", hWnd, bErase);
    1394 #endif
    1395 
    1396     //CB: bErase no quite the same
    1397     hWnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
    1398     if (lpRect)
    1399     {
    1400          return OSLibWinInvalidateRect(hWnd, (PRECT)lpRect, bErase);
    1401     }
    1402     else return OSLibWinInvalidateRect(hWnd,NULL,bErase);
    1403 }
    1404 #endif
    1405 //******************************************************************************
    1406 //******************************************************************************
    14071345UINT WIN32API ArrangeIconicWindows( HWND arg1)
    14081346{
Note: See TracChangeset for help on using the changeset viewer.