Changeset 1629 for trunk/src


Ignore:
Timestamp:
Nov 8, 1999, 2:44:41 PM (26 years ago)
Author:
sandervl
Message:

Dinput additions + PostThreadMessageA/W fix

Location:
trunk/src/user32
Files:
3 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/Makefile

    r1599 r1629  
    1 # $Id: Makefile,v 1.41 1999-11-04 19:00:59 sandervl Exp $
     1# $Id: Makefile,v 1.42 1999-11-08 13:44:13 sandervl Exp $
    22
    33#
    … …  
    2525
    2626OBJS =  user32.obj loadres.obj \
    27         dde.obj win32wndhandle.obj wsprintf.obj \
    28         icon.obj hook.obj hooks.obj winmenu.obj \
     27        dde.obj win32wndhandle.obj wsprintf.obj winmouse.obj \
     28        icon.obj hook.obj hooks.obj winmenu.obj winkeyboard.obj \
    2929        defwndproc.obj syscolor.obj char.obj initterm.obj \
    3030        uitools.obj unknown.obj spy.obj wndmsg.obj \
    … …  
    8383
    8484user32.obj: user32.cpp $(PDWIN32_INCLUDE)\wndproc.h \
    85             $(PDWIN32_INCLUDE)\winicon.h syscolor.h
     85            $(PDWIN32_INCLUDE)\winicon.h syscolor.h pmwindow.h
    8686dummy.obj: dummy.cpp
    8787char.obj: char.cpp user32.h
    … …  
    125125pmframe.obj: pmframe.cpp win32class.h win32wbase.h pmframe.h win32wndchild.h
    126126win32class.obj: win32class.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h
    127 win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h controls.h
     127win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h controls.h winmouse.h
    128128win32wbasepos.obj: win32wbasepos.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h
    129129win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
    … …  
    149149wsprintf.obj:   wsprintf.cpp
    150150
     151winmouse.obj:   winmouse.cpp winmouse.h oslibmsg.h pmwindow.h win32wbase.h
     152winkeyboard.obj: winkeyboard.cpp $(PDWIN32_INCLUDE)\winkeyboard.h
     153
    151154clean:
    152155        $(RM) *.obj *.lib *.dll *.map *.pch *.res

  • trunk/src/user32/USER32.DEF

    r1583 r1629  
    1 ; $Id: USER32.DEF,v 1.18 1999-11-03 22:04:21 cbratschi Exp $
     1; $Id: USER32.DEF,v 1.19 1999-11-08 13:44:13 sandervl Exp $
    22
    33;Created by BLAST for IBM's compiler
    … …  
    632632
    633633    Win32ToOS2Handle__FUl      = Win32ToOS2Handle__15Win32BaseWindowFUl @2006
     634
     635    _MOUSE_Enable@4                                              @2007
     636    _KeyTranslatePMToWin@4                                       @2008
     637    _KeyTranslatePMToWinBuf@12                                   @2009

  • trunk/src/user32/oslibmsg.cpp

    r1612 r1629  
    1 /* $Id: oslibmsg.cpp,v 1.8 1999-11-05 12:54:10 sandervl Exp $ */
     1/* $Id: oslibmsg.cpp,v 1.9 1999-11-08 13:44:14 sandervl Exp $ */
    22/*
    33 * Window message translation functions for OS/2
    … …  
    228228//******************************************************************************
    229229//******************************************************************************
     230ULONG OSLibWinQueryMsgTime()
     231{
     232  return WinQueryMsgTime(GetThreadHAB());
     233}
     234//******************************************************************************
     235//******************************************************************************

  • trunk/src/user32/oslibmsg.h

    r1371 r1629  
    1 /* $Id: oslibmsg.h,v 1.2 1999-10-20 08:08:31 sandervl Exp $ */
     1/* $Id: oslibmsg.h,v 1.3 1999-11-08 13:44:14 sandervl Exp $ */
    22/*
    33 * Window message translation functions for OS/2
    … …  
    3030LONG  OSLibWinDispatchMsg(MSG *msg, BOOL isUnicode = FALSE);
    3131
     32ULONG OSLibWinQueryMsgTime();
    3233BOOL  OSLibInitMsgQueue();
    3334

  • trunk/src/user32/pmwindow.cpp

    r1583 r1629  
    1 /* $Id: pmwindow.cpp,v 1.51 1999-11-03 22:04:22 cbratschi Exp $ */
     1/* $Id: pmwindow.cpp,v 1.52 1999-11-08 13:44:14 sandervl Exp $ */
    22/*
    33 * Win32 Window Managment Code for OS/2
    … …  
    1313#define INCL_GPI
    1414
    15 #include <os2.h>                        /* PM header file               */
    1615#include <os2wrap.h>
    1716#include <stdlib.h>

  • trunk/src/user32/pmwindow.h

    r1522 r1629  
    1 /* $Id: pmwindow.h,v 1.3 1999-10-30 15:16:57 dengert Exp $ */
     1/* $Id: pmwindow.h,v 1.4 1999-11-08 13:44:14 sandervl Exp $ */
    22/*
    33 * Win32 Window Managment Code for OS/2
    … …  
    1919void UnregisterSystemClasses();
    2020
     21extern ULONG ScreenWidth;
     22extern ULONG ScreenHeight;
     23
    2124#endif

  • trunk/src/user32/user32.cpp

    r1593 r1629  
    1 /* $Id: user32.cpp,v 1.50 1999-11-04 18:35:42 phaller Exp $ */
     1/* $Id: user32.cpp,v 1.51 1999-11-08 13:44:14 sandervl Exp $ */
    22
    33/*
    … …  
    3333#include <winicon.h>
    3434#include "syscolor.h"
     35#include "pmwindow.h"
    3536
    3637#include <wchar.h>
    … …  
    817818        rc = 0;
    818819        break;
     820    case SM_CXSCREEN:
     821
     822        return ScreenWidth;
     823    case SM_CYSCREEN:
     824        return ScreenHeight;
     825
    819826    case SM_CXVIRTUALSCREEN:
    820827        rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CXSCREEN);

  • trunk/src/user32/user32exp.def

    r1583 r1629  
    578578    _TrackWin32Window@8                       @2003
    579579    Win32ToOS2Handle__FUl                     @2006
     580    _MOUSE_Enable@4                           @2007
     581    _KeyTranslatePMToWin@4                    @2008
     582    _KeyTranslatePMToWinBuf@12                @2009

  • trunk/src/user32/win32wbase.cpp

    r1606 r1629  
    1 /* $Id: win32wbase.cpp,v 1.76 1999-11-05 09:16:22 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.77 1999-11-08 13:44:15 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    4141#include "controls.h"
    4242#include <wprocess.h>
     43#include "winmouse.h"
    4344
    4445#define HAS_DLGFRAME(style,exStyle) \
    … …  
    10331034 ULONG win32ncmsg;
    10341035 BOOL  fClick = FALSE;
     1036
     1037    if(ISMOUSE_CAPTURED()) {
     1038        if(DInputMouseHandler(getWindowHandle(), MOUSEMSG_BUTTON, ncx, ncy, msg))
     1039                return 0;
     1040    }
    10351041
    10361042    dprintf(("MsgButton to (%d,%d)", ncx, ncy));
    … …  
    11471153 ULONG setcursormsg = WM_MOUSEMOVE;
    11481154
     1155    if(ISMOUSE_CAPTURED()) {
     1156        POINT point = {x,y};
     1157       
     1158        MapWindowPoints(getWindowHandle(), HWND_DESKTOP, &point, 1);
     1159        if(DInputMouseHandler(getWindowHandle(), MOUSEMSG_MOVE, point.x, point.y, keystate))
     1160                return 0;
     1161    }
     1162
    11491163    if(keystate & WMMOVE_LBUTTON)
    11501164        winstate |= MK_LBUTTON;

  • trunk/src/user32/windowmsg.cpp

    r1521 r1629  
    1 /* $Id: windowmsg.cpp,v 1.3 1999-10-30 13:21:56 sandervl Exp $ */
     1/* $Id: windowmsg.cpp,v 1.4 1999-11-08 13:44:17 sandervl Exp $ */
    22/*
    33 * Win32 window message APIs for OS/2
    … …  
    207207//******************************************************************************
    208208//******************************************************************************
    209 BOOL WIN32API PostThreadMessageA( DWORD arg1, UINT arg2, WPARAM arg3, LPARAM  arg4)
    210 {
    211 #ifdef DEBUG
    212     WriteLog("USER32:  PostThreadMessageA\n");
    213 #endif
    214     return O32_PostThreadMessage(arg1, arg2, arg3, arg4);
    215 }
    216 //******************************************************************************
    217 //******************************************************************************
    218 BOOL WIN32API PostThreadMessageW( DWORD arg1, UINT arg2, WPARAM arg3, LPARAM  arg4)
    219 {
    220 #ifdef DEBUG
    221     WriteLog("USER32:  PostThreadMessageW\n");
    222 #endif
    223     // NOTE: This will not work as is (needs UNICODE support)
    224     return O32_PostThreadMessage(arg1, arg2, arg3, arg4);
     209BOOL WIN32API PostThreadMessageA( DWORD threadid, UINT msg, WPARAM wParam, LPARAM lParam)
     210{
     211    dprintf(("USER32:  PostThreadMessageA\n"));
     212    return O32_PostThreadMessage(threadid, WIN32APP_USERMSGBASE+msg, wParam, lParam);
     213}
     214//******************************************************************************
     215//******************************************************************************
     216BOOL WIN32API PostThreadMessageW( DWORD threadid, UINT msg, WPARAM wParam, LPARAM lParam)
     217{
     218    dprintf(("USER32:  PostThreadMessageW\n"));
     219    return O32_PostThreadMessage(threadid, WIN32APP_USERMSGBASE+msg, wParam, lParam);
    225220}
    226221//******************************************************************************

  • trunk/src/user32/winmenu.cpp

    r1612 r1629  
    1 /* $Id: winmenu.cpp,v 1.14 1999-11-05 12:54:11 sandervl Exp $ */
     1/* $Id: winmenu.cpp,v 1.15 1999-11-08 13:44:17 sandervl Exp $ */
    22
    33/*
    … …  
    441441
    442442    rc = ODIN_GetMenuStringA(hMenu, idItem, astring, cchMax, fuFlags);
     443    if(rc)
     444    {
     445            dprintf(("USER32: GetMenuStringW %s\n", astring));
     446            AsciiToUnicode(astring, lpsz);
     447    }
     448    else    lpsz[0] = 0;
    443449    free(astring);
    444     if(rc)
    445     {
    446             dprintf(("USER32: OS2GetMenuStringW %s\n", astring));
    447                      AsciiToUnicode(astring, lpsz);
    448     }
    449     else    lpsz[0] = 0;
    450450
    451451    return(rc);
Note: See TracChangeset for help on using the changeset viewer.