Changeset 21813 for branches/gcc-kmk/src


Ignore:
Timestamp:
Nov 15, 2011, 8:08:37 PM (14 years ago)
Author:
dmik
Message:

user32: Port GLOBALDATA segment to GCC.

Location:
branches/gcc-kmk/src/user32
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

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

    r21812 r21813  
    9393    auxthread.cpp \
    9494    initterm.cpp \
     95    globaldata.asm \
    9596    user32rsrc.orc
    9697

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

    r21811 r21813  
    4040#endif
    4141
    42 #pragma data_seg(_GLOBALDATA)
    43 
    44 static HWND hwndCaret = 0;
    45 static HBITMAP hbmCaret;
    46 static int CaretWidth, CaretHeight;
    47 static int CaretPosX, CaretPosY;
    48 static INT CaretIsVisible; //visible if > 0
    49 
    50 #pragma data_seg()
     42//
     43// Global DLL Data (keep it in sync with globaldata.asm!)
     44//
     45extern HWND hwndCaret; // = 0
     46extern HBITMAP hbmCaret; // = 0
     47extern int CaretWidth, CaretHeight; // = 0
     48extern int CaretPosX, CaretPosY; // = 0
     49extern INT CaretIsVisible; // =0, visible if > 0
    5150
    5251extern "C" {

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

    r21811 r21813  
    8181#define CHECK_MAGIC(a) ((a != 0) && (((HOOKDATA *)a)->magic == HOOK_MAGIC))
    8282
    83 //Global DLL Data
    8483//SvL: Disabled global system hooks for now
    8584//#define GLOBAL_HOOKS
    8685#ifdef GLOBAL_HOOKS
    87 #pragma data_seg(_GLOBALDATA)
    88 #endif
     86//
     87// Global DLL Data (keep it in sync with globaldata.asm!)
     88//
     89extern HANDLE HOOK_systemHooks[WH_NB_HOOKS]; // = { 0 }
     90static VMutex systemHookMutex(VMUTEX_SHARED, &hGlobalHookMutex);
     91#else
    8992static HANDLE HOOK_systemHooks[WH_NB_HOOKS] = { 0 };
    90 #ifdef GLOBAL_HOOKS
    91 static VMutex systemHookMutex(VMUTEX_SHARED, &hGlobalHookMutex);
    92 #pragma data_seg()
    93 #else
    9493static CRITICAL_SECTION systemCritSect = {0};
    9594#endif

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

    r21811 r21813  
    66CODE SHARED LOADONCALL
    77
    8 SEGMENTS
    9    _GLOBALDATA CLASS 'DATA'       SHARED LOADONCALL READWRITE
     8;
     9; Segments are done with LDFLAGS (emxomfld limitation)
     10;
     11; SEGMENTS
     12;
     13;   _GLOBALDATA CLASS 'DATA'       SHARED LOADONCALL READWRITE
     14;
    1015
    1116IMPORTS

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

    r21811 r21813  
    66CODE SHARED LOADONCALL
    77
    8 SEGMENTS
    9    _GLOBALDATA CLASS 'DATA'       SHARED LOADONCALL READWRITE
     8;
     9; Segments are done with LDFLAGS (emxomfld limitation)
     10;
     11; SEGMENTS
     12;
     13;   _GLOBALDATA CLASS 'DATA'       SHARED LOADONCALL READWRITE
     14;
    1015
    1116IMPORTS

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

    r21808 r21813  
    2828//******************************************************************************
    2929
    30 //Global DLL Data
    31 #pragma data_seg(_GLOBALDATA)
    32 ULONG                WindowHandleTable[MAX_WINDOW_HANDLES] = {0};
    33 CRITICAL_SECTION_OS2 globalwhandlecritsect = {0};
    34 ULONG                lastIndex = 0;
    35 #pragma data_seg()
     30//
     31// Global DLL Data (keep it in sync with globaldata.asm!)
     32//
     33extern ULONG                WindowHandleTable[MAX_WINDOW_HANDLES]; // = {0}
     34extern CRITICAL_SECTION_OS2 globalwhandlecritsect; // = {0}
     35extern ULONG                lastIndex; // = 0
     36
     37//******************************************************************************
     38//******************************************************************************
    3639
    3740static const char *pszWndHandleSemName = WINHANDLE_CRITSECTION_NAME;
Note: See TracChangeset for help on using the changeset viewer.