Changeset 6394 for trunk/src


Ignore:
Timestamp:
Jul 28, 2001, 2:57:57 PM (24 years ago)
Author:
sandervl
Message:

set/getwindowword additions

Location:
trunk/src/user32
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/user32/char.cpp

    r5465 r6394  
    1 /* $Id: char.cpp,v 1.15 2001-04-03 20:55:46 sandervl Exp $ */
     1/* $Id: char.cpp,v 1.16 2001-07-28 12:57:57 sandervl Exp $ */
    22
    33/*
     
    433433    return get_char_typeW(x) & (C1_ALPHA|C1_LOWER|C1_UPPER);
    434434}
    435 
    436 //******************************************************************************
    437 //TODO:
    438 //******************************************************************************
    439 BOOL WIN32API IsCharAlphaA( CHAR arg1)
    440 {
    441     dprintf(("USER32: IsCharAlphaA %x", arg1));
    442     return O32_IsCharAlpha(arg1);
    443 }
    444 //******************************************************************************
    445 //******************************************************************************
    446 BOOL WIN32API IsCharAlphaNumericA( CHAR arg1)
    447 {
    448     dprintf(("USER32: IsCharAlphaNumericA %x", arg1));
    449     return O32_IsCharAlphaNumeric(arg1);
    450 }
     435//******************************************************************************
     436//******************************************************************************
     437BOOL WIN32API IsCharAlphaA( CHAR x)
     438{
     439    WCHAR wch;
     440
     441    dprintf(("USER32: IsCharAlphaA %x", x));
     442    MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1);
     443    return IsCharAlphaW(wch);
     444}
     445//******************************************************************************
     446//******************************************************************************
     447BOOL WIN32API IsCharAlphaNumericA( CHAR x)
     448{
     449    dprintf(("USER32: IsCharAlphaNumericA %x", x));
     450    return (get_char_typeW(x) & C1_ALPHA) != 0;
     451}
     452//******************************************************************************
     453//******************************************************************************
  • trunk/src/user32/win32wbase.cpp

    r6375 r6394  
    1 /* $Id: win32wbase.cpp,v 1.277 2001-07-20 15:34:17 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.278 2001-07-28 12:57:57 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
     
    36303630        return oldval;
    36313631    }
    3632     dprintf(("WARNING: SetWindowWord %x %d %x returned %x INVALID index!", getWindowHandle(), index, value));
    3633     SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
    3634     return 0;
     3632    switch(index)
     3633    {
     3634    case GWW_HINSTANCE:
     3635        oldval = hInstance;
     3636        hInstance = value;
     3637        break;
     3638
     3639    case GWW_HWNDPARENT:
     3640        oldval = SetParent((HWND)(WNDHANDLE_MAGIC_HIGHWORD | value));
     3641        break;
     3642
     3643    case GWW_ID:
     3644        oldval = getWindowId();
     3645        setWindowId(value);
     3646        break;
     3647
     3648    default:
     3649        dprintf(("WARNING: SetWindowWord %x %d %x returned %x INVALID index!", getWindowHandle(), index, value));
     3650        SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
     3651        return 0;
     3652    }
     3653    //Note: NT4, SP6 does not set the last error to 0
     3654    SetLastError(ERROR_SUCCESS);
     3655    dprintf2(("SetWindowWord %x %d %x returned %x", getWindowHandle(), index, value, oldval));
     3656    return oldval;
    36353657}
    36363658//******************************************************************************
     
    36453667        return *(WORD *)(userWindowBytes + index);
    36463668    }
     3669    switch(index)
     3670    {
     3671    case GWW_ID:         
     3672        if(HIWORD(getWindowId()))
     3673            dprintf(("WARNING: GWW_ID: discards high bits of 0x%08x!\n", getWindowId()));
     3674        return (WORD)getWindowId();
     3675
     3676    case GWW_HWNDPARENT:
     3677        dprintf(("WARNING: GWW_HWNDPARENT: discards high bits of 0x%08x!\n", GetParent()));
     3678        return (WORD) GetParent();
     3679
     3680    case GWW_HINSTANCE: 
     3681        if (HIWORD(hInstance))
     3682            dprintf(("WARNING: GWW_HINSTANCE: discards high bits of 0x%08x!\n", hInstance));
     3683        return (WORD)hInstance;
     3684    }
     3685
    36473686    dprintf(("WARNING: GetWindowWord %x %d returned %x INVALID index!", getWindowHandle(), index));
    36483687    SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
Note: See TracChangeset for help on using the changeset viewer.