Changeset 21811 for branches/gcc-kmk/src


Ignore:
Timestamp:
Nov 15, 2011, 12:27:32 PM (14 years ago)
Author:
dmik
Message:

Port USER32.DLL (funal bunch).

Location:
branches/gcc-kmk/src/user32
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • branches/gcc-kmk/src/user32/Makefile.kmk

    r21808 r21811  
    106106    $(PATH_STAGE_LIB)/gdi32.lib \
    107107    $(PATH_STAGE_LIB)/kernel32.lib \
    108 
    109 #    $(PATH_STAGE_LIB)/unicode.lib \
    110 #    $(PATH_STAGE_LIB)/imm32os2.lib \
     108    $(PATH_STAGE_LIB)/imm32os2.lib
    111109
    112110include $(FILE_KBUILD_SUB_FOOTER)

  • branches/gcc-kmk/src/user32/caret.cpp

    r21808 r21811  
    5050#pragma data_seg()
    5151
     52extern "C" {
    5253
    5354BOOL WIN32API CreateCaret (HWND hwnd, HBITMAP hBmp, int width, int height)
    … …  
    262263}
    263264
     265} // extern "C"
     266
    264267void recreateCaret (HWND hwndFocus)
    265268{

  • branches/gcc-kmk/src/user32/caret.h

    r2468 r21811  
    99
    1010extern void recreateCaret (HWND hwndFocus);
    11 extern BOOL WIN32API SetCaretPos (int x, int y);
    12 extern BOOL WIN32API GetCaretPos (PPOINT pPoint);
     11extern "C" BOOL WIN32API SetCaretPos (int x, int y);
     12extern "C" BOOL WIN32API GetCaretPos (PPOINT pPoint);
    1313
    1414

  • branches/gcc-kmk/src/user32/clipboard.cpp

    r21573 r21811  
    276276                do { } while(0)
    277277#endif
     278extern "C" {
    278279UINT WIN32API   clipboardPMToOdinFormat(ULONG ulPMFormat);
    279280ULONG WIN32API  clipboardOdinToPMFormat(UINT uOdinFormat);
     281}
    280282static ULONG    clipboardAddDynFormat(UINT uFormat, const char *pszFormatName);
    281283static BOOL     clipboardIsRWOwner(void);
    … …  
    321323 * @param   ulPMFormat  PM Clipboard format number.
    322324 */
    323 UINT       clipboardPMToOdinFormat(ULONG ulPMFormat)
     325UINT WIN32API clipboardPMToOdinFormat(ULONG ulPMFormat)
    324326{
    325327    for (int i = 0; i < sizeof(gaFormats) / sizeof(gaFormats[0]); i++)
    … …  
    377379 * @todo    serialize this!
    378380 */
    379 ULONG    clipboardAddDynFormat(UINT uFormat, const char *pszFormatName)
     381ULONG clipboardAddDynFormat(UINT uFormat, const char *pszFormatName)
    380382{
    381383    char szFormat[64];
    … …  
    432434 * @param   ulPMFormat  PM Clipboard format number.
    433435 */
    434 ULONG       clipboardOdinToPMFormat(UINT uOdinFormat)
     436ULONG WIN32API clipboardOdinToPMFormat(UINT uOdinFormat)
    435437{
    436438    if (uOdinFormat == 0)
    … …  
    606608 * @returns Success indicator.
    607609 */
     610extern "C"
    608611BOOL WIN32API InitClipboardFormats(void)
    609612{

  • branches/gcc-kmk/src/user32/dc.cpp

    r21808 r21811  
    617617   return erased;
    618618}
     619
     620extern "C" {
     621
    619622//******************************************************************************
    620623//******************************************************************************
    … …  
    17431746//******************************************************************************
    17441747
     1748} // extern "C"

  • branches/gcc-kmk/src/user32/dc.h

    r10379 r21811  
    2121BOOL GetOS2UpdateRect(Win32BaseWindow *window,LPRECT pRect);
    2222
    23 int WIN32API GetUpdateRgnFrame(HWND hwnd, HRGN hrgn);
     23extern "C" int WIN32API GetUpdateRgnFrame(HWND hwnd, HRGN hrgn);
    2424
    2525#ifdef DEBUG

  • branches/gcc-kmk/src/user32/dcrgn.cpp

    r21808 r21811  
    6565#endif
    6666
     67extern "C" {
     68
    6769//******************************************************************************
    6870//******************************************************************************
    … …  
    342344//******************************************************************************
    343345//******************************************************************************
     346
     347} // extern "C"

  • branches/gcc-kmk/src/user32/hook.cpp

    r21808 r21811  
    872872//******************************************************************************
    873873//******************************************************************************
     874extern "C"
    874875LRESULT HOOK_CallOdinHookA(INT code, WPARAM wParam, LPARAM lParam)
    875876{

  • branches/gcc-kmk/src/user32/icon.cpp

    r21808 r21811  
    273273  return (void *)iconhdr;
    274274}
     275
     276extern "C" {
     277
    275278//******************************************************************************
    276279//******************************************************************************
    … …  
    467470//******************************************************************************
    468471//******************************************************************************
     472
     473} // extern "C"

  • branches/gcc-kmk/src/user32/initterm.cpp

    r21808 r21811  
    4343#include "dbglocal.h"
    4444
    45 extern INT __cdecl wsnprintfA(LPSTR,UINT,LPCSTR,...);
     45extern "C" INT __cdecl wsnprintfA(LPSTR,UINT,LPCSTR,...);
    4646
    4747// Win32 resource table (produced by wrc)

  • branches/gcc-kmk/src/user32/oslibkbd.cpp

    r9810 r21811  
    2626#include "dbglocal.h"
    2727
     28extern "C" {
     29
    2830SHORT APIENTRY16 WinGetScanState( HWND, USHORT );
    2931BOOL  APIENTRY16 WinSetScanStateTable(HWND,unsigned char *,BOOL);
     32
     33} // extern "C"
    3034
    3135//******************************************************************************

  • branches/gcc-kmk/src/user32/oslibmsgtranslate.cpp

    r21341 r21811  
    5353static MSG  doubleClickMsg = {0};
    5454
    55 extern UINT WINAPI GetACP(void); // from winnls.h
     55extern "C" UINT WINAPI GetACP(void); // from winnls.h
     56extern "C" UINT WIN32API clipboardPMToOdinFormat(ULONG ulPMFormat);
    5657
    5758//For wheel mouse translation
    … …  
    11151116    case WM_RENDERFMT:
    11161117        winMsg->message = WINWM_RENDERFORMAT;
    1117         extern UINT WIN32API clipboardPMToOdinFormat(ULONG ulPMFormat);
    11181118        winMsg->wParam  = (UINT)clipboardPMToOdinFormat((ULONG)os2Msg->mp1);
    11191119        if (!winMsg->wParam)

  • branches/gcc-kmk/src/user32/timer.cpp

    r21808 r21811  
    252252}
    253253
     254extern "C" {
     255
    254256/***********************************************************************
    255257 *           SetTimer32   (USER32.511)
    … …  
    304306}
    305307
     308} // extern "C"

  • branches/gcc-kmk/src/user32/user32.def

    r21807 r21811  
    3232    _OpenClipbrd                = PMMERGE.10021
    3333
    34     WINSETSCANSTATETABLE        = PMMERGE.3266
    35     WINGETSCANSTATE             = PMMERGE.3138
     34    _WinSetScanStateTable       = PMMERGE.3266
     35    _WinGetScanState            = PMMERGE.3138
    3636
    3737;;;; Present in WGSS50

  • branches/gcc-kmk/src/user32/user32api.h

    r10316 r21811  
    55#define __USER32API_H_
    66
     7#ifdef __cplusplus
     8extern "C" {
     9#endif
     10
    711//Notify that focus has changed (necessary for SetFocus(0) handling)
    812void SetFocusChanged();
    … …  
    1014extern BOOL fIgnoreKeystrokes;
    1115
     16#ifdef __cplusplus
     17} // extern "C"
    1218#endif
     19
     20#endif

  • branches/gcc-kmk/src/user32/user32dbg.def

    r21807 r21811  
    3232    _OpenClipbrd                = PMMERGE.10021
    3333
    34     WINSETSCANSTATETABLE        = PMMERGE.3266
    35     WINGETSCANSTATE             = PMMERGE.3138
     34    _WinSetScanStateTable       = PMMERGE.3266
     35    _WinGetScanState            = PMMERGE.3138
    3636
    3737;;;; Present in WGSS50

  • branches/gcc-kmk/src/user32/winevent.cpp

    r21808 r21811  
    4343ODINDEBUGCHANNEL(USER32-WINEVENT)
    4444
     45extern "C" {
    4546
    4647/*****************************************************************************
    … …  
    8990  return 0;
    9091}
     92
     93} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.