Changeset 372 for trunk/src


Ignore:
Timestamp:
Jul 23, 1999, 5:55:46 PM (26 years ago)
Author:
cbratschi
Message:

atom updates

Location:
trunk/src/user32/new
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/new/button.cpp

    r351 r372  
    907907    WNDCLASSA wndClass;
    908908
    909     if (GlobalFindAtomA (ODINBUTTONCLASSNAME)) return FALSE;
    910 
    911     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     909    if (GlobalFindAtomA(BUTTONCLASSNAME)) return FALSE;
     910
     911    ZeroMemory(&wndClass,sizeof(WNDCLASSA));
    912912    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW | CS_PARENTDC;
    913913    wndClass.lpfnWndProc   = (WNDPROC)ButtonWndProc;
    914914    wndClass.cbClsExtra    = 0;
    915915    wndClass.cbWndExtra    = sizeof(BUTTONINFO);
    916     wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
    917     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
    918     wndClass.lpszClassName = ODINBUTTONCLASSNAME;
    919 
    920     return RegisterClassA (&wndClass);
     916    wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);
     917    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE+1);
     918    wndClass.lpszClassName = BUTTONCLASSNAME;
     919
     920    return RegisterClassA(&wndClass);
    921921}
    922922
    … …  
    924924BOOL BUTTON_Unregister()
    925925{
    926     if (GlobalFindAtomA (ODINBUTTONCLASSNAME))
    927         UnregisterClassA (ODINBUTTONCLASSNAME, (HINSTANCE)NULL);
    928     return TRUE; //always TRUE
    929 }
     926    if (GlobalFindAtomA(BUTTONCLASSNAME))
     927        return UnregisterClassA(BUTTONCLASSNAME,(HINSTANCE)NULL);
     928    else return FALSE;
     929}

  • trunk/src/user32/new/controls.cpp

    r357 r372  
    3131{
    3232  dprintf(("Unregister BUTTON class"));
    33   BUTTON_Unregister();
     33  if (!BUTTON_Unregister()) dprintf(("failed!!!"));
    3434
    3535  dprintf(("Unregister STATIC class"));
    36   STATIC_Unregister();
     36  if (!STATIC_Unregister()) dprintf(("failed!!!"));
    3737
    3838  dprintf(("Unregister SCROLLBAR class"));
    39   SCROLLBAR_Unregister();
     39  if (!SCROLLBAR_Unregister()) dprintf(("failed!!!"));
    4040}
    4141
    42 /* Win32 <-> internal control name */
    43 
    44 char* Win32ToOdinControlName(char* name)
    45 {
    46   if (!name) return NULL;
    47 
    48   if (stricmp(name,WIN32BUTTONCLASSNAME))
    49     return ODINBUTTONCLASSNAME;
    50 
    51   if (stricmp(name,WIN32STATICCLASSNAME))
    52     return ODINSTATICCLASSNAME;
    53 
    54   return name; //original name
    55 }
    56 
    57 char* OdinToWin32ControlName(char* name)
    58 {
    59   if (!name) return NULL;
    60 
    61   if (stricmp(name,ODINBUTTONCLASSNAME))
    62     return WIN32BUTTONCLASSNAME;
    63 
    64   if (stricmp(name,ODINSTATICCLASSNAME))
    65     return WIN32STATICCLASSNAME;
    66 
    67   return name; //original name
    68 }

  • trunk/src/user32/new/scroll.cpp

    r357 r372  
    14941494    WNDCLASSA wndClass;
    14951495
    1496     if (GlobalFindAtomA (ODINSCROLLBARCLASSNAME)) return FALSE;
    1497 
    1498     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     1496    if (GlobalFindAtomA(SCROLLBARCLASSNAME)) return FALSE;
     1497
     1498    ZeroMemory(&wndClass,sizeof(WNDCLASSA));
    14991499    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW | CS_PARENTDC;
    15001500    wndClass.lpfnWndProc   = (WNDPROC)ScrollBarWndProc;
    15011501    wndClass.cbClsExtra    = 0;
    15021502    wndClass.cbWndExtra    = sizeof(SCROLLBAR_INFO);
    1503     wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
    1504     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
    1505     wndClass.lpszClassName = ODINSCROLLBARCLASSNAME;
    1506 
    1507     return RegisterClassA (&wndClass);
     1503    wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);
     1504    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE+1);
     1505    wndClass.lpszClassName = SCROLLBARCLASSNAME;
     1506
     1507    return RegisterClassA(&wndClass);
    15081508}
    15091509
    … …  
    15111511BOOL SCROLLBAR_Unregister()
    15121512{
    1513     if (GlobalFindAtomA (ODINSCROLLBARCLASSNAME))
    1514         UnregisterClassA (ODINSCROLLBARCLASSNAME, (HINSTANCE)NULL);
    1515     return TRUE; //always TRUE
    1516 }
     1513    if (GlobalFindAtomA(SCROLLBARCLASSNAME))
     1514        return UnregisterClassA(SCROLLBARCLASSNAME,(HINSTANCE)NULL);
     1515    else return FALSE;
     1516}

  • trunk/src/user32/new/static.cpp

    r351 r372  
    585585    WNDCLASSA wndClass;
    586586
    587     if (GlobalFindAtomA (ODINSTATICCLASSNAME)) return FALSE;
    588 
    589     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     587    if (GlobalFindAtomA(STATICCLASSNAME)) return FALSE;
     588
     589    ZeroMemory(&wndClass,sizeof(WNDCLASSA));
    590590    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW | CS_PARENTDC;
    591591    wndClass.lpfnWndProc   = (WNDPROC)StaticWndProc;
    592592    wndClass.cbClsExtra    = 0;
    593593    wndClass.cbWndExtra    = sizeof(STATICINFO);
    594     wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
    595     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
    596     wndClass.lpszClassName = ODINSTATICCLASSNAME;
    597 
    598     return RegisterClassA (&wndClass);
     594    wndClass.hCursor       = LoadCursorA (0,IDC_ARROWA);
     595    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE+1);
     596    wndClass.lpszClassName = STATICCLASSNAME;
     597
     598    return RegisterClassA(&wndClass);
    599599}
    600600
    … …  
    602602BOOL STATIC_Unregister()
    603603{
    604     if (GlobalFindAtomA (ODINSTATICCLASSNAME))
    605         UnregisterClassA (ODINSTATICCLASSNAME, (HINSTANCE)NULL);
    606     return TRUE; //always TRUE
    607 }
     604    if (GlobalFindAtomA (STATICCLASSNAME))
     605        return UnregisterClassA(STATICCLASSNAME,(HINSTANCE)NULL);
     606    else return FALSE;
     607}

  • trunk/src/user32/new/win32class.cpp

    r311 r372  
    1 /* $Id: win32class.cpp,v 1.4 1999-07-15 18:54:55 sandervl Exp $ */
     1/* $Id: win32class.cpp,v 1.5 1999-07-23 15:55:46 cbratschi Exp $ */
    22/*
    33 * Win32 Window Class Managment Code for OS/2
    … …  
    106106Win32WndClass::~Win32WndClass()
    107107{
     108  if (classNameA) GlobalDeleteAtom(classAtom);
    108109  if(userClassLong)     free(userClassLong);
    109110  if(classNameA)        free(classNameA);
    … …  
    124125
    125126  if(HIWORD(id) != 0) {
     127//CB: read comment below!
    126128        if(stricmp(wndclass->classNameA, id) == 0 && wndclass->hInstance == hInstance) {
    127129                return(wndclass);
    … …  
    138140  }
    139141  else {
    140         if(wndclass->classAtom == (DWORD)id && wndclass->hInstance == hInstance) {
     142//CB: without HInstance check, test program finds class
     143//CB: need more code to compare instance; convert 0 to exe module handle
     144        if(wndclass->classAtom == (DWORD)id /*&& wndclass->hInstance == hInstance*/) {
    141145                return(wndclass);
    142146        }
    … …  
    144148                wndclass = (Win32WndClass *)wndclass->GetNext();
    145149                while(wndclass != NULL) {
    146                         if(wndclass->classAtom == (DWORD)id && wndclass->hInstance == hInstance) {
     150                        if(wndclass->classAtom == (DWORD)id/* && wndclass->hInstance == hInstance*/) {
    147151                                return(wndclass);
    148152                        }
Note: See TracChangeset for help on using the changeset viewer.