Changeset 4494 for trunk/src


Ignore:
Timestamp:
Oct 17, 2000, 7:11:09 PM (25 years ago)
Author:
sandervl
Message:

syscolor fix + added debugint3 system menu option

Location:
trunk/src/user32
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/syscolor.cpp

    r3625 r4494  
    1 /* $Id: syscolor.cpp,v 1.22 2000-05-28 16:43:46 sandervl Exp $ */
     1/* $Id: syscolor.cpp,v 1.23 2000-10-17 17:11:07 sandervl Exp $ */
    22
    33/*
    … …  
    6767  RGB(0,0,255),     //COLOR_HOTLIGHT
    6868  RGB(16,136,208),  //COLOR_GRADIENTACTIVECAPTION
    69   RGB(16,136,208)   //COLOR_GRADIENTINACTIVECAPTION
     69//  RGB(16,136,208)   //COLOR_GRADIENTINACTIVECAPTION
     70  RGB(198,195,198)  //COLOR_GRADIENTINACTIVECAPTION
    7071};
    7172

  • trunk/src/user32/user32rsrc.orc

    r4045 r4494  
    1 /* $Id: user32rsrc.orc,v 1.2 2000-08-19 13:00:46 sandervl Exp $ */
     1/* $Id: user32rsrc.orc,v 1.3 2000-10-17 17:11:08 sandervl Exp $ */
    22/* converted from WINE */
    33
    … …  
    2222 MENUITEM SEPARATOR
    2323 MENUITEM "&Put mark in debug log", 61762
     24 MENUITEM "&DebugInt3", 61763
    2425}
    2526

  • trunk/src/user32/win32wbasenonclient.cpp

    r3662 r4494  
    1 /* $Id: win32wbasenonclient.cpp,v 1.24 2000-06-07 14:51:32 sandervl Exp $ */
     1/* $Id: win32wbasenonclient.cpp,v 1.25 2000-10-17 17:11:08 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2 (non-client methods)
    … …  
    13341334        if (wParam == SC_PUTMARK)
    13351335            WriteLog(("Mark requested by user\n"));
     1336        else
     1337        if (wParam == SC_DEBUGINT3)
     1338            DebugInt3();
    13361339#endif
    13371340        break;

  • trunk/src/user32/windowclass.cpp

    r3702 r4494  
    1 /* $Id: windowclass.cpp,v 1.11 2000-06-13 21:26:30 sandervl Exp $ */
     1/* $Id: windowclass.cpp,v 1.12 2000-10-17 17:11:09 sandervl Exp $ */
    22/*
    33 * Win32 Window Class Code for OS/2
    … …  
    2121#include <controls.h>
    2222
    23 #define DBG_LOCALLOG    DBG_windowclass
     23#define DBG_LOCALLOG    DBG_windowclass
    2424#include "dbglocal.h"
    2525
    … …  
    2828void RegisterSystemClasses(ULONG hModule)
    2929{
    30   dprintf(("RegisterSystemClasses\n"));
    31   CONTROLS_Register();
     30    dprintf(("RegisterSystemClasses\n"));
     31    CONTROLS_Register();
    3232}
    3333//******************************************************************************
    … …  
    3535void UnregisterSystemClasses()
    3636{
    37   dprintf(("UnregisterSystemClasses\n"));
    38   CONTROLS_Unregister();
    39 }
    40 //******************************************************************************
     37    dprintf(("UnregisterSystemClasses\n"));
     38    CONTROLS_Unregister();
     39}
     40//******************************************************************************
     41//Note: RegisterClassA does NOT change the last error if successful! (verified in NT 4, SP6)
    4142//******************************************************************************
    4243ATOM WIN32API RegisterClassA(CONST WNDCLASSA *lpWndClass)
    … …  
    4546 Win32WndClass *wclass;
    4647
    47    dprintf(("RegisterClassA\n"));
    48    //CB: size new in ex structure
    49    wc.cbSize = sizeof(wc);
    50    memcpy(&wc.style, lpWndClass, sizeof(WNDCLASSA));
    51    wc.hIconSm = 0;
    52 
    53    if(Win32WndClass::FindClass(wc.hInstance, (LPSTR)wc.lpszClassName)) {
    54         dprintf(("RegisterClassA %x %x already exists", wc.hInstance, wc.lpszClassName));
    55         SetLastError(ERROR_CLASS_ALREADY_EXISTS);
    56         return 0;
    57    }
    58 
    59    wclass = new Win32WndClass(&wc,FALSE);
    60    if(wclass == NULL) {
     48    dprintf(("RegisterClassA\n"));
     49    //CB: size new in ex structure
     50    wc.cbSize = sizeof(wc);
     51    memcpy(&wc.style, lpWndClass, sizeof(WNDCLASSA));
     52    wc.hIconSm = 0;
     53
     54    if(Win32WndClass::FindClass(wc.hInstance, (LPSTR)wc.lpszClassName)) {
     55        if(HIWORD(wc.lpszClassName)) {
     56                dprintf(("RegisterClassA %x %s already exists", wc.hInstance, wc.lpszClassName));
     57        }
     58        else    dprintf(("RegisterClassA %x %x already exists", wc.hInstance, wc.lpszClassName));
     59        SetLastError(ERROR_CLASS_ALREADY_EXISTS);
     60        return 0;
     61    }
     62
     63    wclass = new Win32WndClass(&wc,FALSE);
     64    if(wclass == NULL) {
    6165        dprintf(("ERROR: RegisterClassA winclass == NULL!"));
    62         DebugInt3();
    63         return(0);
    64    }
    65    return(wclass->getAtom());
    66 }
    67 //******************************************************************************
     66        DebugInt3();
     67        return(0);
     68    }
     69    return(wclass->getAtom());
     70}
     71//******************************************************************************
     72//Note: RegisterClassA does NOT change the last error if successful! (verified in NT 4, SP6)
    6873//******************************************************************************
    6974ATOM WIN32API RegisterClassExA(CONST WNDCLASSEXA *lpWndClass)
    … …  
    7176 Win32WndClass *wclass;
    7277
    73    if(Win32WndClass::FindClass(lpWndClass->hInstance, (LPSTR)lpWndClass->lpszClassName)) {
    74         dprintf(("RegisterClassExA %x %x already exists", lpWndClass->hInstance, lpWndClass->lpszClassName));
    75         SetLastError(ERROR_CLASS_ALREADY_EXISTS);
    76         return 0;
    77    }
    78 
    79    dprintf(("RegisterClassExA\n"));
    80    wclass = new Win32WndClass((WNDCLASSEXA *)lpWndClass,FALSE);
    81    if(wclass == NULL) {
     78    if(Win32WndClass::FindClass(lpWndClass->hInstance, (LPSTR)lpWndClass->lpszClassName)) {
     79        if(HIWORD(lpWndClass->lpszClassName)) {
     80                dprintf(("RegisterClassExA %x %s already exists", lpWndClass->hInstance, lpWndClass->lpszClassName));
     81        }
     82        else    dprintf(("RegisterClassExA %x %x already exists", lpWndClass->hInstance, lpWndClass->lpszClassName));
     83        SetLastError(ERROR_CLASS_ALREADY_EXISTS);
     84        return 0;
     85    }
     86
     87    dprintf(("RegisterClassExA\n"));
     88    wclass = new Win32WndClass((WNDCLASSEXA *)lpWndClass,FALSE);
     89    if(wclass == NULL) {
    8290        dprintf(("ERROR: RegisterClassExA winclass == NULL!"));
    83         DebugInt3();
    84         return(0);
    85    }
    86    return(wclass->getAtom());
    87 }
    88 //******************************************************************************
     91        DebugInt3();
     92        return(0);
     93    }
     94    return(wclass->getAtom());
     95}
     96//******************************************************************************
     97//Note: RegisterClassA does NOT change the last error if successful! (verified in NT 4, SP6)
    8998//******************************************************************************
    9099WORD WIN32API RegisterClassW(CONST WNDCLASSW *lpwc)
    … …  
    100109
    101110    if(Win32WndClass::FindClass(wc.hInstance, (LPWSTR)wc.lpszClassName)) {
    102         dprintf(("RegisterClassW %x %x already exists", wc.hInstance, wc.lpszClassName));
    103         SetLastError(ERROR_CLASS_ALREADY_EXISTS);
    104         return 0;
     111        dprintf(("RegisterClassW %x %x already exists", wc.hInstance, wc.lpszClassName));
     112        SetLastError(ERROR_CLASS_ALREADY_EXISTS);
     113        return 0;
    105114    }
    106115
    … …  
    108117    if(winclass == NULL) {
    109118        dprintf(("ERROR: RegisterClassW winclass == NULL!"));
    110         DebugInt3();
    111         return 0;
     119        DebugInt3();
     120        return 0;
    112121    }
    113122    rc = winclass->getAtom();
    … …  
    116125}
    117126//******************************************************************************
     127//Note: RegisterClassA does NOT change the last error if successful! (verified in NT 4, SP6)
    118128//******************************************************************************
    119129ATOM WIN32API RegisterClassExW(CONST WNDCLASSEXW *lpwc)
    … …  
    127137
    128138    if(Win32WndClass::FindClass(wc.hInstance, (LPWSTR)wc.lpszClassName)) {
    129         dprintf(("RegisterClassW %x %x already exists", wc.hInstance, wc.lpszClassName));
    130         SetLastError(ERROR_CLASS_ALREADY_EXISTS);
    131         return 0;
     139        dprintf(("RegisterClassW %x %x already exists", wc.hInstance, wc.lpszClassName));
     140        SetLastError(ERROR_CLASS_ALREADY_EXISTS);
     141        return 0;
    132142    }
    133143
    … …  
    135145    if(winclass == NULL) {
    136146        dprintf(("ERROR: RegisterClassExW winclass == NULL!"));
    137         DebugInt3();
     147        DebugInt3();
    138148        return(0);
    139149    }
    … …  
    178188 Win32WndClass *wndclass;
    179189
    180   dprintf(("USER32:  GetClassInfoA\n"));
     190  if(HIWORD(lpszClass) != 0) {
     191        dprintf(("USER32: GetClassInfoA %x %s %x", hInstance, lpszClass, lpwc));
     192  }
     193  else  dprintf(("USER32: GetClassInfoA %x %x %x", hInstance, lpszClass, lpwc));
    181194
    182195  wndclass = Win32WndClass::FindClass(hInstance, (LPSTR)lpszClass);
    … …  
    247260  if(wndclass) {
    248261        wndclass->getClassInfo(lpwcx);
    249         lpwcx->cbSize = sizeof(WNDCLASSEXA);
     262        lpwcx->cbSize = sizeof(WNDCLASSEXA);
    250263        return(TRUE);
    251264  }
    … …  
    289302  if(wndclass) {
    290303        wndclass->getClassInfo(lpwcx);
    291         lpwcx->cbSize = sizeof(WNDCLASSEXW);
     304        lpwcx->cbSize = sizeof(WNDCLASSEXW);
    292305        return(TRUE);
    293306  }
Note: See TracChangeset for help on using the changeset viewer.