Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/user32/oslibkbd.cpp

    r9810 r21916  
    2626#include "dbglocal.h"
    2727
     28#ifdef __EMX__
     29
     30USHORT _THUNK_FUNCTION (Win16GetScanState) ();
     31USHORT APIENTRY WinGetScanState (HWND hwnd, USHORT vk)
     32{
     33    return ((USHORT)
     34            (_THUNK_PASCAL_PROLOG (4+2);
     35             _THUNK_PASCAL_LONG ((ULONG) hwnd);
     36             _THUNK_PASCAL_SHORT (vk);
     37             _THUNK_PASCAL_CALL (Win16GetScanState)));
     38}
     39
     40USHORT _THUNK_FUNCTION (Win16SetScanStateTable) ();
     41BOOL APIENTRY WinSetScanStateTable (HWND hwnd, PUCHAR pTable, BOOL bFlag)
     42{
     43    return ((BOOL)
     44            (_THUNK_PASCAL_PROLOG (4+4+4);
     45             _THUNK_PASCAL_LONG ((ULONG) hwnd);
     46             _THUNK_PASCAL_FLAT ((void *) pTable);
     47             _THUNK_PASCAL_LONG (bFlag);
     48             _THUNK_PASCAL_CALL (Win16SetScanStateTable)));
     49}
     50
     51#else
     52
    2853SHORT APIENTRY16 WinGetScanState( HWND, USHORT );
    2954BOOL  APIENTRY16 WinSetScanStateTable(HWND,unsigned char *,BOOL);
     55
     56#endif
    3057
    3158//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.