Changeset 21808 for branches/gcc-kmk/src


Ignore:
Timestamp:
Nov 14, 2011, 11:03:47 PM (14 years ago)
Author:
dmik
Message:

Port USER32.DLL (continued).

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

Legend:

Unmodified
Added
Removed

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

    r21803 r21808  
    1212
    1313user32_SOURCES      = \
     14    dc.cpp \
     15    dcrgn.cpp \
     16    dcscroll.cpp \
     17    user32.cpp \
     18    dde.cpp \
     19    wsprintf.cpp \
     20    winkeyboard.cpp \
     21    oslibkbd.cpp \
     22    winmouse.cpp \
     23    winevent.cpp \
     24    defwndproc.cpp \
     25    syscolor.cpp \
     26    uitools.cpp \
     27    unknown.cpp \
     28    spy.cpp \
     29    wndmsg.cpp \
     30    display.cpp \
     31    pmwindow.cpp \
     32    oslibmsgtranslate.cpp \
     33    msgbox.c \
     34    window.cpp \
     35    gen_object.cpp \
     36    win32wndchild.cpp \
     37    win32wbase.cpp \
     38    win32wbasenonclient.cpp \
     39    win32wbasepos.cpp \
     40    win32wbaseprop.cpp \
     41    win32wndhandle.cpp \
     42    win32wmisc.cpp \
     43    win32wdesktop.cpp \
     44    win32wfake.cpp \
     45    windowword.cpp \
     46    windowmsg.cpp \
     47    callwrap.asm \
     48    message.cpp \
     49    winproc.cpp \
     50    oslibmsg.cpp \
     51    hook.cpp \
     52    win32wmdiclient.cpp \
     53    mdi.c \
     54    win32dlg.cpp \
     55    windlgmsg.cpp \
     56    windlg.cpp \
     57    win32class.cpp \
     58    windowclass.cpp \
     59    oslibwin.cpp \
     60    controls.cpp \
     61    button.cpp \
     62    static.cpp \
     63    scroll.cpp \
     64    listbox.c \
     65    menu.c \
     66    combo.c \
     67    edit.c \
     68    winswitch.cpp \
     69    icontitle.cpp \
     70    clipboard.cpp \
     71    oslibutil.cpp \
     72    dib.cpp \
     73    oslibdos.cpp \
     74    oslibgdi.cpp \
     75    oslibres.cpp \
     76    loadres.cpp \
     77    winaccel.cpp \
     78    icon.cpp \
     79    winicon.cpp \
     80    timer.cpp \
     81    dbglocal.cpp \
     82    caret.cpp \
     83    text.c \
     84    exticon.c \
     85    wintrack.cpp \
     86    oldnls32.cpp \
     87    oslibprf.cpp \
     88    dragdrop.cpp \
     89    oslibdnd.cpp \
     90    oslibclipbrd.cpp \
     91    cp_cvt.cpp \
     92    stats.cpp \
     93    auxthread.cpp \
    1494    initterm.cpp \
    1595    user32rsrc.orc
     96
     97user32_SOURCES.release += \
     98    user32.def
     99user32_SOURCES.debug += \
     100    dbgwrap.cpp \
     101    user32dbg.def
    16102
    17103user32_LIBS         = \

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

    r10379 r21808  
    2323#include <wprocess.h>
    2424#include <misc.h>
    25 #include <win32wbase.h>
     25#include "win32wbase.h"
    2626#include "oslibwin.h"
    2727#include <dcdata.h>

  • branches/gcc-kmk/src/user32/combo.c

    r21356 r21808  
    14281428       switch( HIWORD(wParam) )
    14291429       {
    1430        case LBN_ERRSPACE:
     1430       case (WORD)LBN_ERRSPACE:
    14311431        CB_NOTIFY( lphc, CBN_ERRSPACE );
    14321432        break;

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

    r21459 r21808  
    2828#include <winconst.h>
    2929#include <misc.h>
    30 #include <win32wbase.h>
    3130#include <math.h>
    3231#include <limits.h>
     32#include "win32wbase.h"
    3333#include "oslibwin.h"
    3434#include "oslibmsg.h"
    … …  
    12441244
    12451245        BytesNeeded = GetRegionData (hrgn, 0, NULL);
    1246         RgnData = (PRGNDATA)_alloca (BytesNeeded);
     1246        RgnData = (PRGNDATA)alloca (BytesNeeded);
    12471247        if (RgnData == NULL)
    12481248          goto error;

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

    r10316 r21808  
    2727#include <winconst.h>
    2828#include <misc.h>
    29 #include <win32wbase.h>
    3029#include <math.h>
    3130#include <limits.h>
     31#include "win32wbase.h"
    3232#include "oslibwin.h"
    3333#include "oslibmsg.h"

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

    r4601 r21808  
    1919#define __DIB_H__
    2020
    21 //must use WIN32API as it's exported
     21#ifdef __cplusplus
     22extern "C" {
     23#endif
     24
     25// must use WIN32API as it's exported
    2226int WIN32API DIB_GetDIBWidthBytes( int width, int depth );
     27int  WIN32API BITMAP_GetWidthBytes( INT width, INT depth );
     28
     29#ifdef __cplusplus
     30} // extern "C"
     31#endif
    2332
    2433int DIB_GetDIBImageBytes( int width, int height, int depth );
    … …  
    2736                              int *height, WORD *bpp, WORD *compr );
    2837void DIB_FixColorsToLoadflags(BITMAPINFO * bmi, UINT loadflags, BYTE pix);
    29 int  WIN32API BITMAP_GetWidthBytes( INT width, INT depth );
    3038
    3139#endif

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

    r9974 r21808  
    2727#define NRMODES 5
    2828#define NRDEPTHS 4
    29 struct {
    30         int w,h;
     29static struct {
     30    int w,h;
    3131} modes[NRMODES]={{512,384},{640,400},{640,480},{800,600},{1024,768}};
    3232int depths[4] = {8,16,24,32};

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

    r10587 r21808  
    1515#include <misc.h>
    1616#include <win32type.h>
    17 #include <gen_object.h>
     17#include "gen_object.h"
    1818
    1919#define DBG_LOCALLOG    DBG_gen_object

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

    r21692 r21808  
    653653                                 HINSTANCE hInst, DWORD dwThreadId )
    654654{
    655     return HOOK_SetHook( id, proc, HOOK_WIN32A, hInst, dwThreadId );
     655    return HOOK_SetHook( id, (LPVOID)proc, HOOK_WIN32A, hInst, dwThreadId );
    656656}
    657657
    … …  
    662662                                 DWORD dwThreadId )
    663663{
    664     return HOOK_SetHook( id, proc, HOOK_WIN32W, hInst, dwThreadId );
     664    return HOOK_SetHook( id, (LPVOID)proc, HOOK_WIN32W, hInst, dwThreadId );
    665665}
    666666

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

    r9851 r21808  
    2121#include <string.h>
    2222#include <stdlib.h>
     23#include <string.h>
     24#ifndef __EMX__
    2325#include <iostream.h>
    24 #include <string.h>
     26#endif
    2527
    2628#include <win32api.h>

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

    r21802 r21808  
    1616#define  INCL_WINSHELLDATA
    1717#define  INCL_WINERRORS
     18#define  INCL_GPILCIDS
    1819#include <os2wrap.h>    //Odin32 OS/2 api wrappers
    1920#include <stdlib.h>

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

    r21720 r21808  
    1919 */
    2020#include <os2win.h>
    21 #include <user32.h>
     21#include "user32.h"
    2222#include <heapstring.h>
    23 #include <oslibres.h>
     23#include "oslibres.h"
    2424#include <win/virtual.h>
    2525#include "dib.h"

  • branches/gcc-kmk/src/user32/mdi.c

    r21356 r21808  
    9999#ifdef __WIN32OS2__
    100100#include "mdi.h"
    101 #include <win32wmisc.h>
     101#include "win32wmisc.h"
    102102#else
    103103#define MDI_MAXLISTLENGTH       0x40

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

    r6762 r21808  
    3434#define MDIF_NEEDUPDATE         0x0001
    3535
    36 LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );
    37 LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );
    38 
    3936typedef struct
    4037{

  • branches/gcc-kmk/src/user32/menu.c

    r21356 r21808  
    757757    if (id && IS_MAGIC_ITEM( id ))
    758758    {
    759         switch(LOWORD(id))
     759        switch((HBITMAP)LOWORD(id))
    760760        {
    761761        case HBMMENU_SYSTEM:
    … …  
    813813        RECT r;
    814814
    815         switch(LOWORD(lpitem->text))
     815        switch((HBITMAP)LOWORD(lpitem->text))
    816816        {
    817817        case HBMMENU_SYSTEM:

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

    r21553 r21808  
    2121#include <os2win.h>
    2222#include <misc.h>
    23 #include <win32wbase.h>
     23#include "win32wbase.h"
    2424#include <win.h>
    2525#include <heapstring.h>

  • branches/gcc-kmk/src/user32/new/winmenu.cpp

    r2400 r21808  
    2525#include <stdlib.h>
    2626#include <string.h>
    27 #include <win32wbase.h>
     27#include "win32wbase.h"
    2828#include "oslibmenu.h"
    2929#include "oslibwin.h"

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

    r5685 r21808  
    1717#include <misc.h>
    1818#include <winconst.h>
    19 #include <oslibgdi.h>
    20 #include <oslibwin.h>
     19#include "oslibgdi.h"
     20#include "oslibwin.h"
    2121#include "win32wbase.h"
    2222

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

    r5685 r21808  
    1414
    1515#ifdef OS2_INCLUDED
    16 #include "win32type.h"
     16#include <win32type.h>
    1717#endif
    18 #include <win32wbase.h>
     18#include "win32wbase.h"
    1919
    2020typedef struct

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

    r6327 r21808  
    1919#include "oslibprf.h"
    2020
    21 LONG OSLibPrfQueryProfileInt(OSLIB_HINI hini, char *pszApp, char *pszKey, LONG sDefault)
     21LONG OSLibPrfQueryProfileInt(OSLIB_HINI hini, const char *pszApp, const char *pszKey, LONG sDefault)
    2222{
    2323    return PrfQueryProfileInt(hini, pszApp, pszKey, sDefault);
    2424}
    2525
    26 LONG OSLibPrfQueryProfileString(OSLIB_HINI hini, char *pszApp, char *pszKey, char *pszDefault, char *buffer, ULONG buflen)
     26LONG OSLibPrfQueryProfileString(OSLIB_HINI hini, const char *pszApp, const char *pszKey, const char *pszDefault, char *buffer, ULONG buflen)
    2727{
    2828    return PrfQueryProfileString(hini, pszApp, pszKey, pszDefault, buffer, buflen);

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

    r9854 r21808  
    2323extern "C" {
    2424
    25 LONG OSLibPrfQueryProfileInt(OSLIB_HINI hini, char *pszApp, char *pszKey, LONG sDefault);
    26 LONG OSLibPrfQueryProfileString(OSLIB_HINI hini, char *pszApp, char *pszKey, char *pszDefault, char *buffer, ULONG buflen);
     25LONG OSLibPrfQueryProfileInt(OSLIB_HINI hini, const char *pszApp, const char *pszKey, LONG sDefault);
     26LONG OSLibPrfQueryProfileString(OSLIB_HINI hini, const char *pszApp, const char *pszKey, const char *pszDefault, char *buffer, ULONG buflen);
    2727
    2828}

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

    r10540 r21808  
    276276    HPS hpsDest = 0;
    277277    SIZEL sizl = { 0, 0 };  /* use same page size as device         */
    278     DEVOPENSTRUC dop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
     278    DEVOPENSTRUC dop = {0L, (PSZ)"DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
    279279    LONG lHits;
    280280    char *bmpbuffer = 0;

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

    r21544 r21808  
    969969PVOID OSLibWinSubclassWindow(HWND hwnd,PVOID newWndProc)
    970970{
    971   return WinSubclassWindow(hwnd,(PFNWP)newWndProc);
     971  return (PVOID)WinSubclassWindow(hwnd,(PFNWP)newWndProc);
    972972}
    973973//******************************************************************************

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

    r10396 r21808  
    1515
    1616#ifdef __cplusplus
    17 #include <oslibgdi.h>
     17#include "oslibgdi.h"
    1818
    1919#ifndef WIN_INCLUDED
    … …  
    332332}
    333333
     334#ifdef __cplusplus
     335extern "C" {
     336#endif
     337
    334338ULONG OSLibGetScreenHeight();
    335339ULONG OSLibGetScreenWidth();
     340
     341#ifdef __cplusplus
     342} // extern "C"
     343#endif
    336344
    337345BOOL   OSLibWinLockWindowUpdate(HWND hwnd);

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

    r21720 r21808  
    3232#include <wprocess.h>
    3333#include <dbglog.h>
    34 #include <win32wbase.h>
    35 #include <win32wfake.h>
    36 #include <win32dlg.h>
     34#include "win32wbase.h"
     35#include "win32wfake.h"
     36#include "win32dlg.h"
    3737#include "win32wdesktop.h"
    3838#include "pmwindow.h"
    … …  
    257257    HDC   hdc;              /* Device-context handle                */
    258258    /* context data structure */
    259     DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL,
     259    DEVOPENSTRUC dop = {NULL, (PSZ)"DISPLAY", NULL, NULL, NULL, NULL,
    260260                        NULL, NULL, NULL};
    261261
    … …  
    328328        HMODULE hModDisplay;
    329329        HDC   hdc;              /* Device-context handle                */
    330         DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL,
     330        DEVOPENSTRUC dop = {NULL, (PSZ)"DISPLAY", NULL, NULL, NULL, NULL,
    331331                            NULL, NULL, NULL};
    332332
    … …  
    25262526PVOID PMWinSubclassFakeWindow(HWND hwndOS2)
    25272527{
    2528     return WinSubclassWindow(hwndOS2, Win32FakeWindowProc);
     2528    return (PVOID)WinSubclassWindow(hwndOS2, Win32FakeWindowProc);
    25292529}
    25302530//******************************************************************************

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

    r9787 r21808  
    7575};
    7676
    77 static char* ColorNames[NUM_SYS_COLORS] =
     77static const char* ColorNames[NUM_SYS_COLORS] =
    7878{
    7979  "SCROLLBAR",

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

    r10544 r21808  
    2020#include <winconst.h>
    2121#include <misc.h>
    22 #include <win32wbase.h>
     22#include "win32wbase.h"
    2323#include "oslibutil.h"
    2424#include "timer.h"

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

    r3662 r21808  
    1414#define DBG_LOCALLOG    DBG_unknown
    1515#include "dbglocal.h"
     16
     17#ifdef __cplusplus
     18extern "C" {
     19#endif
    1620
    1721/*****************************************************************************
    … …  
    179183}
    180184
    181 
    182 
     185#ifdef __cplusplus
     186} // extern "C"
     187#endif

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

    r10523 r21808  
    4646#include <stdlib.h>
    4747#include <string.h>
    48 //#include <oslibwin.h>
    49 #include <win32wnd.h>
     48//#include "oslibwin.h"
    5049#include <winuser.h>
     50#include "win32wnd.h"
    5151#include "initterm.h"
    5252
    … …  
    9090ODINDEBUGCHANNEL(USER32-USER32)
    9191
     92#ifdef __cplusplus
     93extern "C" {
     94#endif
    9295
    9396/* Coordinate Transformation */
    … …  
    22402243}
    22412244
    2242 
     2245#ifdef __cplusplus
     2246} // extern "C"
     2247#endif

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

    r21720 r21808  
    3232#include <assert.h>
    3333#include <misc.h>
    34 #include <win32class.h>
    35 #include <win32wnd.h>
     34#include "win32class.h"
     35#include "win32wnd.h"
    3636#include <win/winproc.h>
    3737#include <unicode.h>
    … …  
    4040#include "dbglocal.h"
    4141
    42 static fDestroyAll = FALSE;
     42static BOOL fDestroyAll = FALSE;
    4343
    4444//******************************************************************************
    … …  
    169169
    170170  if(pfnWindowProcA)
    171       WINPROC_FreeProc(pfnWindowProcA, WIN_PROC_CLASS);
     171      WINPROC_FreeProc((HWINDOWPROC)pfnWindowProcA, WIN_PROC_CLASS);
    172172  if(pfnWindowProcW)
    173       WINPROC_FreeProc(pfnWindowProcW, WIN_PROC_CLASS);
     173      WINPROC_FreeProc((HWINDOWPROC)pfnWindowProcW, WIN_PROC_CLASS);
    174174
    175175  if(userClassBytes)    free(userClassBytes);
    … …  
    457457                        pfnWindowProc = pfnWindowProcW;
    458458                }
    459                 return (ULONG) WINPROC_GetProc(pfnWindowProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
     459                return (ULONG) WINPROC_GetProc((HWINDOWPROC)pfnWindowProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
    460460        }
    461461        case GCW_ATOM: //TODO: does this really happen in windows?
    … …  
    556556                        proc = &pfnWindowProcW;
    557557                }
    558                 rc = (LONG)WINPROC_GetProc(*proc, type );
     558                rc = (LONG)WINPROC_GetProc((HWINDOWPROC)*proc, type );
    559559                WINPROC_SetProc((HWINDOWPROC *)proc, (WNDPROC)lNewVal, type, WIN_PROC_CLASS);
    560560
    … …  
    564564                    if (proc == &pfnWindowProcA)
    565565                    {
    566                         WINPROC_FreeProc( pfnWindowProcW, WIN_PROC_CLASS );
     566                        WINPROC_FreeProc( (HWINDOWPROC)pfnWindowProcW, WIN_PROC_CLASS );
    567567                        pfnWindowProcW = 0;
    568568                    }
    569569                    else
    570570                    {
    571                         WINPROC_FreeProc( pfnWindowProcA, WIN_PROC_CLASS );
     571                        WINPROC_FreeProc( (HWINDOWPROC)pfnWindowProcA, WIN_PROC_CLASS );
    572572                        pfnWindowProcA = 0;
    573573                    }

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

    r21720 r21808  
    1717#include <string.h>
    1818#include <misc.h>
    19 #include <win32dlg.h>
     19#include "win32dlg.h"
    2020#include <win/winproc.h>
    2121#include "oslibmsg.h"
    … …  
    229229    if (hMenu) DestroyMenu( hMenu );
    230230
    231     WINPROC_FreeProc(Win32DlgProc, WIN_PROC_WINDOW);
     231    WINPROC_FreeProc((HWINDOWPROC)Win32DlgProc, WIN_PROC_WINDOW);
    232232}
    233233//******************************************************************************
    … …  
    11851185            type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
    11861186        }
    1187         oldval = (LONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
     1187        oldval = (LONG)WINPROC_GetProc((HWINDOWPROC)Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
    11881188        WINPROC_SetProc((HWINDOWPROC *)&Win32DlgProc, (WNDPROC)value, type, WIN_PROC_WINDOW);
    11891189        return oldval;
    … …  
    12091209    {
    12101210    case DWL_DLGPROC:
    1211         return (ULONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
     1211        return (ULONG)WINPROC_GetProc((HWINDOWPROC)Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
    12121212    case DWL_MSGRESULT:
    12131213        return msgResult;

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

    r9366 r21808  
    1313#define __WIN32DLG_H__
    1414
    15 #include <win32wbase.h>
     15#include "win32wbase.h"
    1616
    1717#ifdef __cplusplus

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

    r21720 r21808  
    6464#include <wprocess.h>
    6565#include <win/hook.h>
    66 #include <menu.h>
     66#include "menu.h"
    6767#define INCL_TIMERWIN32
    6868#include "timer.h"
    … …  
    7979void PrintWindowStyle(DWORD dwStyle, DWORD dwExStyle);
    8080
    81 static fDestroyAll = FALSE;
     81static BOOL fDestroyAll = FALSE;
    8282//For quick lookup of current process id
    8383static ULONG currentProcessId = -1;
    … …  
    308308{
    309309    dprintf2(("IsWindowUnicode %x %d", getWindowHandle(), WINPROC_GetProcType(getWindowProc()) == WIN_PROC_32W));
    310     return (WINPROC_GetProcType(getWindowProc()) == WIN_PROC_32W);
     310    return (WINPROC_GetProcType((HWINDOWPROC)getWindowProc()) == WIN_PROC_32W);
    311311}
    312312//******************************************************************************
    … …  
    461461    }
    462462
    463     WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII), WINPROC_GetProcType(windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII)), WIN_PROC_WINDOW);
     463    WINPROC_SetProc((HWINDOWPROC *)&win32wndproc,
     464                    windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII),
     465                    WINPROC_GetProcType((HWINDOWPROC)windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII)),
     466                    WIN_PROC_WINDOW);
    464467    hInstance  = cs->hInstance;
    465468    dwStyle    = cs->style & ~WS_VISIBLE;
    … …  
    38603863                    type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
    38613864                }
    3862                 oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
     3865                oldval = (LONG)WINPROC_GetProc((HWINDOWPROC)win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
    38633866                dprintf(("SetWindowLong%c GWL_WNDPROC %x old %x new wndproc %x", (fUnicode) ? 'W' : 'A', getWindowHandle(), oldval, value));
    38643867                WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, type, WIN_PROC_WINDOW);
    … …  
    39163919        break;
    39173920    case GWL_WNDPROC:
    3918         value = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
     3921        value = (LONG)WINPROC_GetProc((HWINDOWPROC)win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
    39193922        break;
    39203923    case GWL_HINSTANCE:
    … …  
    41154118{
    41164119    lock(&critsect);
    4117     for(int i=0;i<MAX_OPENDCS;i++) {
     4120    int i;
     4121    for(i=0;i<MAX_OPENDCS;i++) {
    41184122        if(hdcWindow[i] == 0) {
    41194123            hdcWindow[i] = hdc;
    … …  
    41544158    }
    41554159    lock(&critsect);
    4156     for(int i=0;i<MAX_OPENDCS;i++) {
     4160    int i;
     4161    for(i=0;i<MAX_OPENDCS;i++) {
    41574162        if(hdcWindow[i] == hdc) {
    41584163            hdcWindow[i] = 0;

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

    r21642 r21808  
    2323#include <misc.h>
    2424#include <heapstring.h>
    25 #include <win32wbase.h>
     25#include "win32wbase.h"
    2626#include "wndmsg.h"
    2727#include "oslibwin.h"
    … …  
    3737#include "controls.h"
    3838#include "pmwindow.h"
    39 #include <menu.h>
     39#include "menu.h"
    4040
    4141#define DBG_LOCALLOG    DBG_win32wbasenonclient

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

    r21720 r21808  
    2424#include <assert.h>
    2525#include <misc.h>
    26 #include <win32wbase.h>
     26#include "win32wbase.h"
    2727#include <spy.h>
    2828#include "wndmsg.h"

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

    r10031 r21808  
    1212 */
    1313#include <string.h>
    14 #include <user32.h>
     14#include "user32.h"
    1515#include <heapstring.h>
    1616#include <misc.h>

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

    r10379 r21808  
    1212#include <os2win.h>
    1313#include <misc.h>
    14 #include <win32wbase.h>
    15 #include <win32wdesktop.h>
     14#include "win32wbase.h"
     15#include "win32wdesktop.h"
    1616#include "oslibwin.h"
    1717#include "win32wndhandle.h"

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

    r21720 r21808  
    1515#include <dbglog.h>
    1616#include <win/winproc.h>
    17 #include <win32wbase.h>
    18 #include <win32wfake.h>
     17#include "win32wbase.h"
     18#include "win32wfake.h"
    1919#include "oslibwin.h"
    2020#include "win32wndhandle.h"
    … …  
    113113    }
    114114
    115     WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII), WINPROC_GetProcType(windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII)), WIN_PROC_WINDOW);
     115    WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII), WINPROC_GetProcType((HWINDOWPROC)windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII)), WIN_PROC_WINDOW);
    116116    hInstance  = NULL;
    117117    dwStyle    = WS_VISIBLE;

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

    r10031 r21808  
    1313#define __WIN32WFAKE_H__
    1414
    15 #include <win32wbase.h>
     15#include "win32wbase.h"
    1616
    1717class Win32FakeWindow : public Win32BaseWindow

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

    r9523 r21808  
    2323#include <misc.h>
    2424#include <heapstring.h>
    25 #include <win32wnd.h>
    26 #include <win32wmdiclient.h>
     25#include "win32wnd.h"
     26#include "win32wmdiclient.h"
    2727#include <spy.h>
    2828#include "wndmsg.h"
    29 #include <oslibwin.h>
    30 #include <oslibutil.h>
    31 #include <oslibgdi.h>
    32 #include <oslibres.h>
     29#include "oslibwin.h"
     30#include "oslibutil.h"
     31#include "oslibgdi.h"
     32#include "oslibres.h"
    3333#include "oslibdos.h"
    3434#include "syscolor.h"

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

    r6762 r21808  
    1111#define __WIN32WMDICLIENT_H__
    1212
    13 #include <win32wbase.h>
     13#include "win32wbase.h"
    1414#include "mdi.h"
    1515

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

    r21356 r21808  
    2121#include <assert.h>
    2222#include <dbglog.h>
    23 #include <win32wnd.h>
     23#include "win32wnd.h"
    2424#include <heapstring.h>
    2525#include <spy.h>
    2626#include "wndmsg.h"
    27 #include <oslibwin.h>
    28 #include <oslibutil.h>
    29 #include <oslibgdi.h>
    30 #include <oslibres.h>
     27#include "oslibwin.h"
     28#include "oslibutil.h"
     29#include "oslibgdi.h"
     30#include "oslibres.h"
    3131#include "oslibdos.h"
    3232#include "win32wndhandle.h"

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

    r5935 r21808  
    2121#include <assert.h>
    2222#include <misc.h>
    23 #include <win32wnd.h>
     23#include "win32wnd.h"
    2424#include <heapstring.h>
    2525#include <spy.h>
    2626#include "wndmsg.h"
    27 #include <oslibwin.h>
    28 #include <oslibutil.h>
    29 #include <oslibgdi.h>
    30 #include <oslibres.h>
     27#include "oslibwin.h"
     28#include "oslibutil.h"
     29#include "oslibgdi.h"
     30#include "oslibres.h"
    3131#include "oslibdos.h"
    3232#include "syscolor.h"

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

    r6762 r21808  
    1111#define __WIN32WND_H__
    1212
    13 #include <win32wbase.h>
     13#include "win32wbase.h"
    1414
    1515//******************************************************************************

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

    r10587 r21808  
    1111 */
    1212#include <os2win.h>
    13 #include <win32wndchild.h>
     13#include "win32wndchild.h"
    1414#include <misc.h>
    1515

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

    r10544 r21808  
    3535#pragma data_seg()
    3636
    37 static char *pszWndHandleSemName = WINHANDLE_CRITSECTION_NAME;
     37static const char *pszWndHandleSemName = WINHANDLE_CRITSECTION_NAME;
    3838
    3939//******************************************************************************
    … …  
    7171        lastIndex = 0;
    7272  }
    73   for(int i=lastIndex;i<MAX_WINDOW_HANDLES;i++) {
     73  int i;
     74  for(i=lastIndex;i<MAX_WINDOW_HANDLES;i++) {
    7475        if(WindowHandleTable[i] == 0) {
    7576                lastIndex = i;

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

    r21720 r21808  
    696696
    697697    /* If the path exists and is a directory, chdir to it */
    698     if (!spec || !spec[0] || SetCurrentDirectoryA( spec )) spec = "*.*";
     698    if (!spec || !spec[0] || SetCurrentDirectoryA( spec )) spec = (LPSTR)"*.*";
    699699    else
    700700    {

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

    r21726 r21808  
    2929#include <string.h>
    3030#include <stdio.h>
    31 #include <win32wbase.h>
    32 #include <win32wmdiclient.h>
    33 #include <win32wdesktop.h>
     31#include "win32wbase.h"
     32#include "win32wmdiclient.h"
     33#include "win32wdesktop.h"
    3434#include "win32dlg.h"
    35 #include <oslibwin.h>
    36 #include <oslibgdi.h>
     35#include "oslibwin.h"
     36#include "oslibgdi.h"
    3737#include "user32.h"
    3838#include "winicon.h"
    … …  
    5252ODINDEBUGCHANNEL(USER32-WINDOW)
    5353
     54#ifdef __cplusplus
     55extern "C" {
     56#endif
    5457
    5558//******************************************************************************
    … …  
    22622265  return (FALSE);
    22632266}
     2267
     2268#ifdef __cplusplus
     2269} // extern "C"
     2270#endif

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

    r21303 r21808  
    1818#include <misc.h>
    1919#include <unicode.h>
    20 #include <win32class.h>
    21 #include <win32wbase.h>
    22 #include <controls.h>
     20#include "win32class.h"
     21#include "win32wbase.h"
     22#include "controls.h"
    2323
    2424#define DBG_LOCALLOG    DBG_windowclass

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

    r21555 r21808  
    2323#include <os2win.h>
    2424#include <misc.h>
    25 #include <win32wbase.h>
     25#include "win32wbase.h"
    2626#include <win.h>
    2727#include <heapstring.h>

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

    r10119 r21808  
    1212#include <os2win.h>
    1313#include <dbglog.h>
    14 #include <ctrlconf.h>
     14#include "ctrlconf.h"
    1515
    16 #include <win32wbase.h>
     16#include "win32wbase.h"
    1717
    1818#define DBG_LOCALLOG    DBG_windowword

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

    r7866 r21808  
    3333#include <stdlib.h>
    3434#include <string.h>
    35 //#include <oslibwin.h>
    36 #include <win32wnd.h>
     35//#include "oslibwin.h"
    3736#include <winuser.h>
     37#include "win32wnd.h"
    3838#include "initterm.h"
    3939

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

    r21344 r21808  
    321321  /* index is the VKey value */
    322322  BYTE  bPMScanCode;
    323   LPSTR lpstrName;
     323  LPCSTR lpstrName;
    324324} WINVKEYTOPMSCAN, *PWINVKEYTOPMSCAN;
    325325
    … …  
    587587
    588588// @@PF reflect Num Enter key
    589 LPSTR lpstrNumEnter = "Num Enter";
     589LPCSTR lpstrNumEnter = "Num Enter";
    590590
    591591// @@@PH
    … …  
    13351335}
    13361336
     1337extern "C"
    13371338int WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
    13381339                       LPWSTR lpwStr, int size, UINT flags, HKL hkl)
    … …  
    14081409  memset(lpString, 0, nSize);
    14091410 
    1410   LPSTR lpstrKey;
     1411  LPCSTR lpstrKey;
    14111412  lpstrKey = abWinVKeyToPMScan[ucWinVKey].lpstrName;
    14121413
Note: See TracChangeset for help on using the changeset viewer.