Changeset 4848 for trunk/src


Ignore:
Timestamp:
Dec 29, 2000, 7:41:23 PM (25 years ago)
Author:
sandervl
Message:

Win32ToOS2Handle & OS2ToWin32Handle exported with stdcall calling convention

Location:
trunk/src
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/gdi32/dibsect.cpp

    r4681 r4848  
    1 /* $Id: dibsect.cpp,v 1.43 2000-11-23 19:23:01 sandervl Exp $ */
     1/* $Id: dibsect.cpp,v 1.44 2000-12-29 18:40:43 sandervl Exp $ */
    22
    33/*
    … …  
    2525#include <win32api.h>
    2626#include <winconst.h>
    27 #include <win32wnd.h>
    2827#include <cpuhlp.h>
    2928#include <dcdata.h>

  • trunk/src/gdi32/gdi32.cpp

    r4602 r4848  
    1 /* $Id: gdi32.cpp,v 1.63 2000-11-16 16:34:48 sandervl Exp $ */
     1/* $Id: gdi32.cpp,v 1.64 2000-12-29 18:40:44 sandervl Exp $ */
    22
    33/*
    … …  
    1515#include <string.h>
    1616#include <odinwrap.h>
    17 #include "misc.h"
     17#include <misc.h>
    1818#include "callback.h"
    1919#include "unicode.h"
    … …  
    2323#include "oslibgdi.h"
    2424#include <dcdata.h>
    25 #include <win32wnd.h>
     25#include <winuser32.h>
    2626
    2727#define DBG_LOCALLOG    DBG_gdi32

  • trunk/src/gdi32/region.cpp

    r4755 r4848  
    1 /* $Id: region.cpp,v 1.18 2000-12-05 13:04:07 sandervl Exp $ */
     1/* $Id: region.cpp,v 1.19 2000-12-29 18:40:44 sandervl Exp $ */
    22
    33/*
    … …  
    2828#include <dcdata.h>
    2929#include <winuser32.h>
    30 #include <win32wnd.h>
    3130#include "oslibgpi.h"
    3231

  • trunk/src/gdi32/transform.cpp

    r4557 r4848  
    1 /* $Id: transform.cpp,v 1.1 2000-11-05 18:48:22 sandervl Exp $ */
     1/* $Id: transform.cpp,v 1.2 2000-12-29 18:40:44 sandervl Exp $ */
    22
    33/*
    … …  
    2727#include <dcdata.h>
    2828#include <winuser32.h>
    29 #include <win32wnd.h>
    3029#include "oslibgpi.h"
    3130

  • trunk/src/user32/USER32.DEF

    r4816 r4848  
    1 ; $Id: USER32.DEF,v 1.45 2000-12-16 23:24:36 bird Exp $
     1; $Id: USER32.DEF,v 1.46 2000-12-29 18:39:58 sandervl Exp $
    22
    33LIBRARY USER32 INITINSTANCE TERMINSTANCE
    … …  
    641641    GetPattern55AABitmap        = _GetPattern55AABitmap@0        @2004
    642642
    643     Win32ToOS2Handle__FUl      = Win32ToOS2Handle__15Win32BaseWindowFUl @2006
    644     OS2ToWin32Handle__FUl      = OS2ToWin32Handle__15Win32BaseWindowFUl @2012
    645 ;    IsOS2FrameWindowHandle__FUlUl = IsOS2FrameWindowHandle__15Win32BaseWindowFUlUl @2013
     643    _Win32ToOS2Handle@4                                          @2006
     644    _OS2ToWin32Handle@4                                          @2012
    646645
    647646    _MOUSE_Enable@4                                              @2007

  • trunk/src/user32/caret.cpp

    r4825 r4848  
    1 /* $Id: caret.cpp,v 1.14 2000-12-17 15:04:09 sandervl Exp $ */
     1/* $Id: caret.cpp,v 1.15 2000-12-29 18:39:58 sandervl Exp $ */
    22
    33/*
    … …  
    2020#include <win32api.h>
    2121#include <winconst.h>
     22#include <winuser32.h>
    2223#include <wprocess.h>
    2324#include <misc.h>
    … …  
    230231   CaretIsVisible++;
    231232   if (CaretIsVisible == 1)
    232      rc = _ShowCaret (Win32BaseWindow::Win32ToOS2Handle (hwnd));
     233     rc = _ShowCaret (Win32ToOS2Handle (hwnd));
    233234   else
    234235     rc = TRUE;
    … …  
    245246   CaretIsVisible--;
    246247   if (CaretIsVisible == 0)
    247      rc = _HideCaret (Win32BaseWindow::Win32ToOS2Handle (hwnd));
     248     rc = _HideCaret (Win32ToOS2Handle (hwnd));
    248249   else
    249250     rc = TRUE;
    … …  
    265266      SetCaretPos (CaretPosX, CaretPosY);
    266267      if (CaretIsVisible > 0)
    267         _ShowCaret(Win32BaseWindow::Win32ToOS2Handle(hwndCaret));
    268    }
    269 }
     268        _ShowCaret(Win32ToOS2Handle(hwndCaret));
     269   }
     270}

  • trunk/src/user32/dc.cpp

    r4762 r4848  
    1 /* $Id: dc.cpp,v 1.80 2000-12-07 11:59:45 sandervl Exp $ */
     1/* $Id: dc.cpp,v 1.81 2000-12-29 18:39:58 sandervl Exp $ */
    22
    33/*
    … …  
    2525#include <win32type.h>
    2626#include <win32api.h>
     27#include <winuser32.h>
    2728#include <winconst.h>
    2829#include <misc.h>
    … …  
    17681769   dprintf2(("USER32:  WindowFromDC %x", hdc));
    17691770   if ( pHps )
    1770       return Win32BaseWindow::OS2ToWin32Handle(pHps->hwnd);
     1771      return OS2ToWin32Handle(pHps->hwnd);
    17711772   else
    17721773      return 0;

  • trunk/src/user32/oslibmsg.cpp

    r4658 r4848  
    1 /* $Id: oslibmsg.cpp,v 1.34 2000-11-21 11:36:08 sandervl Exp $ */
     1/* $Id: oslibmsg.cpp,v 1.35 2000-12-29 18:39:58 sandervl Exp $ */
    22/*
    33 * Window message translation functions for OS/2
    … …  
    2626#include <winconst.h>
    2727#include <win32api.h>
    28 #include <win32wnd.h>
     28#include <winuser32.h>
    2929#include "oslibutil.h"
    3030#include "timer.h"
    … …  
    102102{
    103103//  memcpy(os2Msg, winMsg, sizeof(MSG));
    104 //  os2Msg->hwnd = Win32Window::Win32ToOS2Handle(winMsg->hwnd);
     104//  os2Msg->hwnd = Win32ToOS2Handle(winMsg->hwnd);
    105105//  os2Msg->reserved = 0;
    106106}
    … …  
    195195
    196196  if(hwnd) {
    197         hwndOS2 = Win32BaseWindow::Win32ToOS2Handle(hwnd);
     197        hwndOS2 = Win32ToOS2Handle(hwnd);
    198198        if(hwndOS2 == NULL) {
    199199                memset(pMsg, 0, sizeof(MSG));
    … …  
    292292
    293293  if(hwnd && hwnd != -1) {
    294         hwndOS2 = Win32BaseWindow::Win32ToOS2Handle(hwnd);
     294        hwndOS2 = Win32ToOS2Handle(hwnd);
    295295        if(hwndOS2 == NULL) {
    296296                dprintf(("PeekMsg: window %x NOT FOUND!", hwnd));

  • trunk/src/user32/oslibmsgtranslate.cpp

    r4658 r4848  
    1 /* $Id: oslibmsgtranslate.cpp,v 1.39 2000-11-21 11:36:08 sandervl Exp $ */
     1/* $Id: oslibmsgtranslate.cpp,v 1.40 2000-12-29 18:39:58 sandervl Exp $ */
    22/*
    33 * Window message translation functions for OS/2
    … …  
    2323#include <winconst.h>
    2424#include "oslibmsg.h"
    25 #include "win32wnd.h"
     25#include <winuser32.h>
    2626#include "win32wdesktop.h"
    2727#include "oslibutil.h"
    … …  
    265265      BOOL fMinimized = FALSE;
    266266
    267         hwndActivate = Win32BaseWindow::OS2ToWin32Handle(hwndActivate);
     267        hwndActivate = OS2ToWin32Handle(hwndActivate);
    268268        if(hwndActivate == 0) {
    269269                //another (non-win32) application's window
    … …  
    292292                hwndFocus = NULL;
    293293        }
    294         else    hwndFocus = Win32BaseWindow::OS2ToWin32Handle(hwndFocus);
     294        else    hwndFocus = OS2ToWin32Handle(hwndFocus);
    295295
    296296        if((ULONG)os2Msg->mp2 == TRUE) {

  • trunk/src/user32/pmwindow.cpp

    r4839 r4848  
    1 /* $Id: pmwindow.cpp,v 1.110 2000-12-24 14:54:07 sandervl Exp $ */
     1/* $Id: pmwindow.cpp,v 1.111 2000-12-29 18:39:58 sandervl Exp $ */
    22/*
    33 * Win32 Window Managment Code for OS/2
    … …  
    2222#include <win32type.h>
    2323#include <winconst.h>
     24#include <winuser32.h>
    2425#include <wprocess.h>
    2526#include <misc.h>
    … …  
    581582      HWND hwndFocus = (HWND)mp1;
    582583
    583         dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d", win32wnd->getWindowHandle(), mp1, Win32BaseWindow::OS2ToWin32Handle(hwndFocus), mp2));
     584        dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2));
    584585        if(WinQueryWindowULong(hwndFocus, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
    585586                //another (non-win32) application's window
    … …  
    588589        }
    589590        if((ULONG)mp2 == TRUE) {
    590                 HWND hwndFocusWin32 = Win32BaseWindow::OS2ToWin32Handle(hwndFocus);
     591                HWND hwndFocusWin32 = OS2ToWin32Handle(hwndFocus);
    591592                recreateCaret (hwndFocusWin32);
    592593                win32wnd->MsgSetFocus(hwndFocusWin32);
    593594        }
    594         else win32wnd->MsgKillFocus(Win32BaseWindow::OS2ToWin32Handle(hwndFocus));
     595        else win32wnd->MsgKillFocus(OS2ToWin32Handle(hwndFocus));
    595596        break;
    596597    }

  • trunk/src/user32/user32.cpp

    r4603 r4848  
    1 /* $Id: user32.cpp,v 1.89 2000-11-16 16:35:43 sandervl Exp $ */
     1/* $Id: user32.cpp,v 1.90 2000-12-29 18:39:59 sandervl Exp $ */
    22
    33/*
    … …  
    3333#include <os2win.h>
    3434#include <misc.h>
     35#include <winuser32.h>
    3536
    3637#include "user32.h"
    … …  
    13981399{
    13991400  dprintf(("USER32:  RegisterHotKey, not implemented\n"));
    1400   hwnd = Win32Window::Win32ToOS2Handle(hwnd);
     1401  hwnd = Win32ToOS2Handle(hwnd);
    14011402  return(TRUE);
    14021403}
    … …  
    14761477{
    14771478  dprintf(("USER32:  UnregisterHotKey, not implemented\n"));
    1478   hwnd = Win32Window::Win32ToOS2Handle(hwnd);
     1479  hwnd = Win32ToOS2Handle(hwnd);
    14791480
    14801481  return(TRUE);

  • trunk/src/user32/win32wbase.cpp

    r4843 r4848  
    1 /* $Id: win32wbase.cpp,v 1.227 2000-12-27 23:07:19 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.228 2000-12-29 18:39:59 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    3030#include <misc.h>
    3131#include <heapstring.h>
    32 #include <win32wbase.h>
     32#include <winuser32.h>
     33#include "win32wbase.h"
    3334#include "wndmsg.h"
    3435#include "oslibwin.h"
    … …  
    34083409//******************************************************************************
    34093410//******************************************************************************
    3410 HWND Win32BaseWindow::Win32ToOS2Handle(HWND hwnd)
    3411 {
    3412     Win32BaseWindow *window = GetWindowFromHandle(hwnd);
    3413 
    3414     if(window) {
    3415             return window->getOS2WindowHandle();
    3416     }
    3417 //    dprintf2(("Win32BaseWindow::Win32ToOS2Handle: not a win32 window %x", hwnd));
    3418     return hwnd;
    3419 }
    3420 //******************************************************************************
    3421 //******************************************************************************
    3422 HWND Win32BaseWindow::OS2ToWin32Handle(HWND hwnd)
    3423 {
    3424     Win32BaseWindow *window = GetWindowFromOS2Handle(hwnd);
    3425 
    3426     if(window) {
    3427             return window->getWindowHandle();
    3428     }
    3429 //    dprintf2(("Win32BaseWindow::OS2ToWin32Handle: not a win32 window %x", hwnd));
    3430     return 0;
    3431 //    else    return hwnd;    //OS/2 window handle
    3432 }
    3433 //******************************************************************************
    3434 //******************************************************************************
    34353411HWND Win32BaseWindow::getNextDlgTabItem(HWND hwndCtrl, BOOL fPrevious)
    34363412{
    … …  
    36803656//******************************************************************************
    36813657//******************************************************************************
     3658HWND WIN32API Win32ToOS2Handle(HWND hwnd)
     3659{
     3660    Win32BaseWindow *window = Win32BaseWindow::GetWindowFromHandle(hwnd);
     3661
     3662    if(window) {
     3663            return window->getOS2WindowHandle();
     3664    }
     3665//    dprintf2(("Win32BaseWindow::Win32ToOS2Handle: not a win32 window %x", hwnd));
     3666    return hwnd;
     3667}
     3668//******************************************************************************
     3669//******************************************************************************
     3670HWND WIN32API OS2ToWin32Handle(HWND hwnd)
     3671{
     3672    Win32BaseWindow *window = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
     3673
     3674    if(window) {
     3675            return window->getWindowHandle();
     3676    }
     3677//    dprintf2(("Win32BaseWindow::OS2ToWin32Handle: not a win32 window %x", hwnd));
     3678    return 0;
     3679//    else    return hwnd;    //OS/2 window handle
     3680}
     3681//******************************************************************************
     3682//******************************************************************************
    36823683
    36833684GenericObject *Win32BaseWindow::windows  = NULL;

  • trunk/src/user32/win32wbase.h

    r4628 r4848  
    1 /* $Id: win32wbase.h,v 1.101 2000-11-19 11:52:41 sandervl Exp $ */
     1/* $Id: win32wbase.h,v 1.102 2000-12-29 18:40:00 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    297297         INT    enumPropsExW(PROPENUMPROCEXW func, LPARAM lParam);
    298298
    299     static HWND Win32ToOS2Handle(HWND hwnd);
    300     static HWND OS2ToWin32Handle(HWND hwnd);
    301 
    302299static Win32BaseWindow *GetWindowFromHandle(HWND hwnd);
    303300static Win32BaseWindow *GetWindowFromOS2Handle(HWND hwnd);

  • trunk/src/user32/window.cpp

    r4825 r4848  
    1 /* $Id: window.cpp,v 1.85 2000-12-17 15:04:13 sandervl Exp $ */
     1/* $Id: window.cpp,v 1.86 2000-12-29 18:40:00 sandervl Exp $ */
    22/*
    33 * Win32 window apis for OS/2
    … …  
    3737#include <win\win.h>
    3838#include <heapstring.h>
     39#include <winuser32.h>
    3940
    4041#define DBG_LOCALLOG    DBG_window
    … …  
    669670    BOOL activate;
    670671
    671     hwnd_O    = Win32BaseWindow::Win32ToOS2Handle (hwnd);
     672    hwnd_O    = Win32ToOS2Handle (hwnd);
    672673    lastFocus = OSLibWinQueryFocus (OSLIB_HWND_DESKTOP);
    673674    activate  = ((hwnd_O == lastFocus) || OSLibWinIsChild (lastFocus, hwnd_O));
    674     lastFocus_W = Win32BaseWindow::OS2ToWin32Handle (lastFocus);
     675    lastFocus_W = OS2ToWin32Handle (lastFocus);
    675676
    676677    dprintf(("SetFocus %x (%x) -> %x (%x)\n", lastFocus_W, lastFocus, hwnd, hwnd_O));
    … …  
    685686
    686687    hwnd = OSLibWinQueryFocus(OSLIB_HWND_DESKTOP);
    687     hwnd = Win32BaseWindow::OS2ToWin32Handle(hwnd);
     688    hwnd = OS2ToWin32Handle(hwnd);
    688689    dprintf(("USER32: GetFocus %x\n", hwnd));
    689690    return hwnd;
    … …  
    705706{
    706707    dprintf(("USER32: LockWindowUpdate %x", hwnd));
    707     return OSLibWinLockWindowUpdate(Win32BaseWindow::Win32ToOS2Handle(hwnd));
     708    return OSLibWinLockWindowUpdate(Win32ToOS2Handle(hwnd));
    708709}
    709710//******************************************************************************
    … …  
    11481149{
    11491150    dprintf(("FlashWindow %x %d\n", hwnd, fFlash));
    1150 //    return OSLibWinFlashWindow(Win32BaseWindow::Win32ToOS2Handle(hwnd), fFlash);
     1151//    return OSLibWinFlashWindow(Win32ToOS2Handle(hwnd), fFlash);
    11511152    return 1;
    11521153}
    … …  
    15211522    if(hwndOS2)
    15221523    {
    1523       hwnd = Win32BaseWindow::OS2ToWin32Handle(hwndOS2);
     1524      hwnd = OS2ToWin32Handle(hwndOS2);
    15241525      if(hwnd) {
    15251526              dprintf(("WindowFromPoint (%d,%d) %x->%x\n", point.x, point.y, hwndOS2, hwnd));
    … …  
    15911592{
    15921593    dprintf(("USER32:  ArrangeIconicWindows %x", hwnd));
    1593     return O32_ArrangeIconicWindows(Win32BaseWindow::Win32ToOS2Handle(hwnd));
     1594    return O32_ArrangeIconicWindows(Win32ToOS2Handle(hwnd));
    15941595}
    15951596//******************************************************************************
    … …  
    16661667 HWND hwnd;
    16671668
    1668     hwnd = Win32BaseWindow::OS2ToWin32Handle(OSLibWinQueryActiveWindow());
     1669    hwnd = OS2ToWin32Handle(OSLibWinQueryActiveWindow());
    16691670    dprintf(("USER32: GetForegroundWindow returned %x", hwnd));
    16701671    return hwnd;
    … …  
    16761677 HWND hwnd;
    16771678
    1678     hwnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
    1679     hwnd = Win32BaseWindow::OS2ToWin32Handle(O32_GetLastActivePopup(hwnd));
     1679    hwnd = Win32ToOS2Handle(hWnd);
     1680    hwnd = OS2ToWin32Handle(O32_GetLastActivePopup(hwnd));
    16801681
    16811682    dprintf(("GetLastActivePopup %x returned %x NOT CORRECTLY IMPLEMENTED", hWnd, hwnd));
    … …  
    16871688{
    16881689    dprintf2(("USER32:  GetWindowThreadProcessId"));
    1689     hWnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
     1690    hWnd = Win32ToOS2Handle(hWnd);
    16901691
    16911692    return O32_GetWindowThreadProcessId(hWnd,lpdwProcessId);

  • trunk/src/user32/winmouse.cpp

    r4697 r4848  
    1 /* $Id: winmouse.cpp,v 1.11 2000-11-25 13:53:54 sandervl Exp $ */
     1/* $Id: winmouse.cpp,v 1.12 2000-12-29 18:40:00 sandervl Exp $ */
    22/*
    33 * Mouse handler for DINPUT
    … …  
    1212#include <misc.h>
    1313#include "win32wbase.h"
    14 #include "win32wnd.h"
     14#include <winuser32.h>
    1515#include <win\mouse.h>
    1616#include "winmouse.h"
    … …  
    110110 HWND hwnd;
    111111
    112     hwnd = Win32Window::OS2ToWin32Handle(OSLibWinQueryCapture());
     112    hwnd = OS2ToWin32Handle(OSLibWinQueryCapture());
    113113    dprintf(("USER32: GetCapture returned %x", hwnd));
    114114    return hwnd;
    … …  
    129129        ReleaseCapture();
    130130    }
    131     rc = OSLibWinSetCapture(Win32Window::Win32ToOS2Handle(hwnd));
     131    rc = OSLibWinSetCapture(Win32ToOS2Handle(hwnd));
    132132    dprintf(("USER32: SetCapture %x (prev %x) returned %d", hwnd, hwndPrev, rc));
    133133    if(hwndPrev) {
Note: See TracChangeset for help on using the changeset viewer.