Window classes/Atom fixes

svn path=/trunk/; revision=6881

diff --git a/reactos/lib/user32/windows/class.c b/reactos/lib/user32/windows/class.c
index e23ac82..50cf2bf 100644 (file)
--- a/reactos/lib/user32/windows/class.c
+++ b/reactos/lib/user32/windows/class.c
@@ -1,4 +1,4 @@
-/* $Id: class.c,v 1.39 2003/11/11 20:28:21 gvg Exp $
+/* $Id: class.c,v 1.40 2003/12/07 10:31:21 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -353,21 +353,7 @@ GetClassNameW(
   LPWSTR lpClassName,
   int nMaxCount)
 {
-  int result;
-  LPWSTR ClassNameW;
-  
-  if(!lpClassName)
-    return 0;
-
-  ClassNameW = HEAP_alloc ( (nMaxCount+1) * sizeof(WCHAR) );
-
-  result = NtUserGetClassName ( hWnd, ClassNameW, nMaxCount );
-
-  RtlCopyMemory ( lpClassName, ClassNameW, result );
-
-  HEAP_free ( ClassNameW );
-
-  return result;
+   return NtUserGetClassName(hWnd, lpClassName, nMaxCount);
 }
 
 

diff --git a/reactos/ntoskrnl/rtl/atom.c b/reactos/ntoskrnl/rtl/atom.c
index 625c980..5add777 100644 (file)
--- a/reactos/ntoskrnl/rtl/atom.c
+++ b/reactos/ntoskrnl/rtl/atom.c
@@ -1,4 +1,4 @@
-/* $Id: atom.c,v 1.7 2003/10/28 17:43:42 navaraf Exp $
+/* $Id: atom.c,v 1.8 2003/12/07 10:31:21 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -578,6 +578,7 @@ RtlQueryAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable,
 {
    ULONG Length;
    PRTL_ATOM_ENTRY AtomEntry;
+   WCHAR TempAtomName[12];
 
    if (Atom == 0)
      {
@@ -596,10 +597,19 @@ RtlQueryAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable,
             *PinCount = 1;
          }
 
-       if ((AtomName != NULL) && (NameLength != NULL) && (NameLength > 0))
+       Length = swprintf(TempAtomName, L"#%lu", (ULONG)Atom);  
+
+       if (NameLength != NULL)
          {
-            Length = swprintf(AtomName, L"#%lu", (ULONG)Atom);
             *NameLength = Length * sizeof(WCHAR);
+            if (AtomName != NULL && *NameLength >= Length)
+              {
+                 wcscpy(AtomName, TempAtomName);
+              }
+            else
+              {
+                 return STATUS_BUFFER_TOO_SMALL;
+              }
          }
 
        return STATUS_SUCCESS;
@@ -629,17 +639,18 @@ RtlQueryAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable,
        *PinCount = (ULONG)AtomEntry->Locked;
      }
 
-   if ((AtomName != NULL) && (NameLength != NULL))
+   if (NameLength != NULL)
      {
-       if (*NameLength < AtomEntry->Name.Length)
+       *NameLength = AtomEntry->Name.Length;
+       if (AtomName != NULL && *NameLength >= AtomEntry->Name.Length)
          {
-            *NameLength = AtomEntry->Name.Length;
+            memcpy(AtomName, AtomEntry->Name.Buffer, AtomEntry->Name.Length);
+          }
+        else
+          {
             RtlpUnlockAtomTable(AtomTable);
             return STATUS_BUFFER_TOO_SMALL;
          }
-
-       memcpy(AtomName, AtomEntry->Name.Buffer, AtomEntry->Name.Length);
-       *NameLength = AtomEntry->Name.Length;
      }
 
    RtlpUnlockAtomTable(AtomTable);

diff --git a/reactos/subsys/win32k/include/class.h b/reactos/subsys/win32k/include/class.h
index d679948..9a8f77d 100644 (file)
--- a/reactos/subsys/win32k/include/class.h
+++ b/reactos/subsys/win32k/include/class.h
@@ -21,7 +21,7 @@ typedef struct _WNDCLASS_OBJECT
   HCURSOR hCursor;
   HBRUSH  hbrBackground;
   PUNICODE_STRING lpszMenuName;
-  PUNICODE_STRING lpszClassName;
+  RTL_ATOM Atom;
   HICON   hIconSm;
   BOOL Unicode;
   LIST_ENTRY ListEntry;
@@ -36,7 +36,7 @@ CleanupClassImpl(VOID);
 
 NTSTATUS STDCALL
 ClassReferenceClassByName(PWNDCLASS_OBJECT *Class,
-                         LPWSTR ClassName);
+                         LPCWSTR ClassName);
 
 NTSTATUS FASTCALL
 ClassReferenceClassByAtom(PWNDCLASS_OBJECT *Class,
@@ -44,7 +44,7 @@ ClassReferenceClassByAtom(PWNDCLASS_OBJECT *Class,
 
 NTSTATUS FASTCALL
 ClassReferenceClassByNameOrAtom(PWNDCLASS_OBJECT *Class,
-                               LPWSTR ClassNameOrAtom);
+                               LPCWSTR ClassNameOrAtom);
 PWNDCLASS_OBJECT FASTCALL
 IntCreateClass(CONST WNDCLASSEXW *lpwcx,
                BOOL bUnicodeClass,

diff --git a/reactos/subsys/win32k/ntuser/class.c b/reactos/subsys/win32k/ntuser/class.c
index 6e9fb43..ac64540 100644 (file)
--- a/reactos/subsys/win32k/ntuser/class.c
+++ b/reactos/subsys/win32k/ntuser/class.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: class.c,v 1.41 2003/11/24 16:15:00 gvg Exp $
+/* $Id: class.c,v 1.42 2003/12/07 10:31:21 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -71,7 +71,7 @@ ClassReferenceClassByAtom(PWNDCLASS_OBJECT* Class,
     {
     Current = CONTAINING_RECORD(CurrentEntry, WNDCLASS_OBJECT, ListEntry);
       
-       if (Current->lpszClassName == (PUNICODE_STRING)(ULONG)Atom)
+       if (Current->Atom == Atom)
        {
        *Class = Current;
        ObmReferenceObject(Current);
@@ -88,7 +88,7 @@ ClassReferenceClassByAtom(PWNDCLASS_OBJECT* Class,
 
 NTSTATUS STDCALL
 ClassReferenceClassByName(PWNDCLASS_OBJECT *Class,
-                         PWSTR ClassName)
+                         LPCWSTR ClassName)
 {
   PWINSTATION_OBJECT WinStaObject;
   NTSTATUS Status;
@@ -111,7 +111,7 @@ ClassReferenceClassByName(PWNDCLASS_OBJECT *Class,
     }
 
   Status  = RtlLookupAtomInAtomTable(WinStaObject->AtomTable,
-                                    ClassName,
+                                    (LPWSTR)ClassName,
                                     &ClassAtom);
 
   if (!NT_SUCCESS(Status))
@@ -128,7 +128,7 @@ ClassReferenceClassByName(PWNDCLASS_OBJECT *Class,
 
 NTSTATUS FASTCALL
 ClassReferenceClassByNameOrAtom(PWNDCLASS_OBJECT *Class,
-                               LPWSTR ClassNameOrAtom)
+                               LPCWSTR ClassNameOrAtom)
 {
   NTSTATUS Status;
 
@@ -152,112 +152,85 @@ ClassReferenceClassByNameOrAtom(PWNDCLASS_OBJECT *Class,
 }
 
 DWORD STDCALL
-NtUserGetClassInfo(HINSTANCE hInst,
-                  LPCWSTR str,
-                  LPWNDCLASSEXW wcex,
-                  BOOL Ansi,
-                  DWORD unknown3)
+NtUserGetClassInfo(HINSTANCE hInstance, LPCWSTR lpClassName,
+   LPWNDCLASSEXW lpWndClassEx, BOOL Ansi, DWORD unknown3)
 {
-       PWNDCLASS_OBJECT Class;
-       NTSTATUS Status;
-       Status = ClassReferenceClassByNameOrAtom(&Class,(LPWSTR)str);
-       if (!NT_SUCCESS(Status))
-       {
-               SetLastNtError(Status);
-               return 0;
-       }
-       wcex->cbSize = sizeof(LPWNDCLASSEXW);
-       wcex->style = Class->style;
-       if (Ansi)
-       {
-               wcex->lpfnWndProc = Class->lpfnWndProcA;
-       }
-       else
-       {
-               wcex->lpfnWndProc = Class->lpfnWndProcW;
-       }
-       wcex->cbClsExtra = Class->cbClsExtra;
-       wcex->cbWndExtra = Class->cbWndExtra;
-       wcex->hInstance = Class->hInstance;
-       wcex->hIcon = Class->hIcon;
-       wcex->hCursor = Class->hCursor;
-       wcex->hbrBackground = Class->hbrBackground;
-       if(Class->lpszMenuName)
-       {
-         if(!IS_INTRESOURCE((LPCWSTR)Class->lpszMenuName))
-           RtlCopyUnicodeString((PUNICODE_STRING)wcex->lpszMenuName, Class->lpszMenuName);
-      else
-        wcex->lpszMenuName = (LPCWSTR)Class->lpszMenuName;
-    }
-    else
-      wcex->lpszMenuName = (LPCWSTR)NULL;
-       if(Class->lpszClassName)
-       {
-         if(!IS_ATOM((LPCWSTR)Class->lpszClassName))
-           RtlCopyUnicodeString((PUNICODE_STRING)wcex->lpszClassName, Class->lpszClassName);
+   PWNDCLASS_OBJECT Class;
+   NTSTATUS Status;
+
+   Status = ClassReferenceClassByNameOrAtom(&Class, lpClassName);
+   if (!NT_SUCCESS(Status))
+   {
+      SetLastNtError(Status);
+      return 0;
+   }
+   lpWndClassEx->cbSize = sizeof(LPWNDCLASSEXW);
+   lpWndClassEx->style = Class->style;
+   if (Ansi)
+      lpWndClassEx->lpfnWndProc = Class->lpfnWndProcA;
+   else
+      lpWndClassEx->lpfnWndProc = Class->lpfnWndProcW;
+   lpWndClassEx->cbClsExtra = Class->cbClsExtra;
+   lpWndClassEx->cbWndExtra = Class->cbWndExtra;
+   lpWndClassEx->hInstance = Class->hInstance;
+   lpWndClassEx->hIcon = Class->hIcon;
+   lpWndClassEx->hCursor = Class->hCursor;
+   lpWndClassEx->hbrBackground = Class->hbrBackground;
+   if (Class->lpszMenuName)
+   {
+      if (!IS_INTRESOURCE((LPCWSTR)Class->lpszMenuName))
+         RtlCopyUnicodeString((PUNICODE_STRING)lpWndClassEx->lpszMenuName, Class->lpszMenuName);
       else
-        wcex->lpszClassName = (LPCWSTR)Class->lpszClassName;
-    }
-    else
-      wcex->lpszClassName = (LPCWSTR)NULL;
-       wcex->hIconSm = Class->hIconSm;
-       return 1;
+         lpWndClassEx->lpszMenuName = (LPCWSTR)Class->lpszMenuName;
+   }
+   else
+      lpWndClassEx->lpszMenuName = (LPCWSTR)NULL;
+   lpWndClassEx->lpszClassName = lpClassName;
+   lpWndClassEx->hIconSm = Class->hIconSm;
+
+   return Class->Atom;
 }
 
 ULONG FASTCALL
-IntGetClassName(struct _WINDOW_OBJECT *WindowObject,
-                  LPWSTR lpClassName,
-                  ULONG nMaxCount)
+IntGetClassName(struct _WINDOW_OBJECT *WindowObject, LPWSTR lpClassName,
+   ULONG nMaxCount)
 {
-  ULONG length;
-  LPWSTR name;
-  BOOL free;
-  PWINSTATION_OBJECT WinStaObject;
-  NTSTATUS Status;
-  if (IS_ATOM(WindowObject->Class->lpszClassName))
-  {
-       DPRINT("About to open window station handle (0x%X)\n", 
-       PROCESS_WINDOW_STATION());
-       Status = IntValidateWindowStationHandle(PROCESS_WINDOW_STATION(),
-       KernelMode,
-       0,
-       &WinStaObject);
-       if (!NT_SUCCESS(Status))
-       {
-               DPRINT("Validation of window station handle (0x%X) failed\n",
-               PROCESS_WINDOW_STATION());
-               return((RTL_ATOM)0);
-       }
-       length = 0;
-       Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable,(RTL_ATOM)(size_t)WindowObject->Class->lpszClassName,NULL,NULL,name,&length);
-        name = ExAllocatePool(PagedPool,length+sizeof(WCHAR));
-       free = TRUE;
-       Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable,(RTL_ATOM)(size_t)WindowObject->Class->lpszClassName,NULL,NULL,name,&length);
-       if (!NT_SUCCESS(Status))
-       {
-               DPRINT("Validation of window station handle (0x%X) failed\n",
-               PROCESS_WINDOW_STATION());
-               return((RTL_ATOM)0);
-       }
-       ObDereferenceObject(WinStaObject);
-  }
-  else
-  {
-    name = WindowObject->Class->lpszClassName->Buffer;
-    length = WindowObject->Class->lpszClassName->Length / sizeof(WCHAR);
-       free = FALSE;
-  }
-  if (length > nMaxCount)
-  {
-    length = nMaxCount;
-  }
-  *(lpClassName+length) = 0;
-  wcsncpy(lpClassName,name,length);
-  if (free)
-  {
-       ExFreePool(name);
-  }
-  return length;
+   ULONG Length;
+   LPWSTR Name;
+   PWINSTATION_OBJECT WinStaObject;
+   NTSTATUS Status;
+
+   Status = IntValidateWindowStationHandle(PROCESS_WINDOW_STATION(),
+      KernelMode, 0, &WinStaObject);
+   if (!NT_SUCCESS(Status))
+   {
+      DPRINT("Validation of window station handle (0x%X) failed\n",
+         PROCESS_WINDOW_STATION());
+      return 0;
+   }
+   Length = 0;
+   Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable,
+      WindowObject->Class->Atom, NULL, NULL, Name, &Length);
+   Name = ExAllocatePool(NonPagedPool, Length + sizeof(UNICODE_NULL));
+   Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable,
+      WindowObject->Class->Atom, NULL, NULL, Name, &Length);
+   if (!NT_SUCCESS(Status))
+   {
+      DPRINT("IntGetClassName: RtlQueryAtomInAtomTable failed\n");
+      return 0;
+   }
+   Length /= sizeof(WCHAR);
+   if (Length > nMaxCount)
+   {
+      Length = nMaxCount;
+   }
+   wcsncpy(lpClassName, Name, Length);
+   /* FIXME: Check buffer size before doing this! */
+   *(lpClassName + Length) = 0;
+   ExFreePool(Name);
+   ObDereferenceObject(WinStaObject);
+
+   return Length;
 }
 
 DWORD STDCALL
@@ -266,18 +239,18 @@ NtUserGetClassName (
   LPWSTR lpClassName,
   ULONG nMaxCount)
 {
-  PWINDOW_OBJECT WindowObject;
-  LONG Ret;
-
-  WindowObject = IntGetWindowObject(hWnd);
-  if (WindowObject == NULL)
-  {
-    SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
-    return 0;
-  }
-  Ret = IntGetClassName(WindowObject, lpClassName, nMaxCount);
-  IntReleaseWindowObject(WindowObject);
-  return(Ret);
+   PWINDOW_OBJECT WindowObject;
+   LONG Length;
+
+   WindowObject = IntGetWindowObject(hWnd);
+   if (WindowObject == NULL)
+   {
+      SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
+      return 0;
+   }
+   Length = IntGetClassName(WindowObject, lpClassName, nMaxCount);
+   IntReleaseWindowObject(WindowObject);
+   return Length;
 }
 
 DWORD STDCALL
@@ -326,7 +299,7 @@ IntCreateClass(CONST WNDCLASSEXW *lpwcx,
        ClassObject->hbrBackground = lpwcx->hbrBackground;
        ClassObject->Unicode = bUnicodeClass;
        ClassObject->hIconSm = lpwcx->hIconSm;
-       ClassObject->lpszClassName = (PUNICODE_STRING)(ULONG)Atom;
+       ClassObject->Atom = Atom;
        if (wpExtra == 0) {
        if (bUnicodeClass)
        {

diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index 50627b9..0f376c1 100644 (file)
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: window.c,v 1.150 2003/12/02 19:58:54 navaraf Exp $
+/* $Id: window.c,v 1.151 2003/12/07 10:31:22 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -3106,7 +3106,7 @@ static BOOL IsStaticClass(PWINDOW_OBJECT Window)
     BOOL rc = FALSE;
 
     ASSERT(0 != Window->Class);
-    ASSERT(0 != Window->Class->lpszClassName);
+    ASSERT(0 != Window->Class->Atom);
     
     DbgPrint("FIXME: Update IsStatic to really check if a window is a static\n");
     /*