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/win32wbase.cpp

    r21641 r21916  
    6363#include "controls.h"
    6464#include <wprocess.h>
    65 #include <win\hook.h>
    66 #include <menu.h>
     65#include <win/hook.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;
    … …  
    307307BOOL Win32BaseWindow::IsWindowUnicode()
    308308{
    309     dprintf2(("IsWindowUnicode %x %d", getWindowHandle(), WINPROC_GetProcType(getWindowProc()) == WIN_PROC_32W));
    310     return (WINPROC_GetProcType(getWindowProc()) == WIN_PROC_32W);
     309    dprintf2(("IsWindowUnicode %x %d", getWindowHandle(),
     310              WINPROC_GetProcType((HWINDOWPROC)getWindowProc()) == WIN_PROC_32W));
     311    return (WINPROC_GetProcType((HWINDOWPROC)getWindowProc()) == WIN_PROC_32W);
    311312}
    312313//******************************************************************************
    … …  
    461462    }
    462463
    463     WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII), WINPROC_GetProcType(windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII)), WIN_PROC_WINDOW);
     464    WINPROC_SetProc((HWINDOWPROC *)&win32wndproc,
     465                    windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII),
     466                    WINPROC_GetProcType((HWINDOWPROC)windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII)),
     467                    WIN_PROC_WINDOW);
    464468    hInstance  = cs->hInstance;
    465469    dwStyle    = cs->style & ~WS_VISIBLE;
    … …  
    38603864                    type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
    38613865                }
    3862                 oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
     3866                oldval = (LONG)WINPROC_GetProc((HWINDOWPROC)win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
    38633867                dprintf(("SetWindowLong%c GWL_WNDPROC %x old %x new wndproc %x", (fUnicode) ? 'W' : 'A', getWindowHandle(), oldval, value));
    38643868                WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, type, WIN_PROC_WINDOW);
    … …  
    39163920        break;
    39173921    case GWL_WNDPROC:
    3918         value = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
     3922        value = (LONG)WINPROC_GetProc((HWINDOWPROC)win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
    39193923        break;
    39203924    case GWL_HINSTANCE:
    … …  
    41154119{
    41164120    lock(&critsect);
    4117     for(int i=0;i<MAX_OPENDCS;i++) {
     4121    int i;
     4122    for(i=0;i<MAX_OPENDCS;i++) {
    41184123        if(hdcWindow[i] == 0) {
    41194124            hdcWindow[i] = hdc;
    … …  
    41544159    }
    41554160    lock(&critsect);
    4156     for(int i=0;i<MAX_OPENDCS;i++) {
     4161    int i;
     4162    for(i=0;i<MAX_OPENDCS;i++) {
    41574163        if(hdcWindow[i] == hdc) {
    41584164            hdcWindow[i] = 0;
    … …  
    42944300//******************************************************************************
    42954301//******************************************************************************
    4296 LONG  Win32BaseWindow::release(char *function, int line)
     4302LONG  Win32BaseWindow::release(const char *function, int line)
    42974303{
    42984304//    dprintf2(("release %s %d %x %d", function, line, getWindowHandle(), getRefCount()-1));
Note: See TracChangeset for help on using the changeset viewer.