From 576c4e61fe091f20b7d9dbbf0a060caa94ded549 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Thu, 25 Jun 2009 21:00:16 +0000
Subject: [PATCH] - Fix ATOM check for HCBT_CREATEWND callback.

svn path=/trunk/; revision=41615
---
 .../subsystems/win32/win32k/ntuser/callback.c  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/ntuser/callback.c b/reactos/subsystems/win32/win32k/ntuser/callback.c
index 49ed2af6617..ed9dc82fa8f 100644
--- a/reactos/subsystems/win32/win32k/ntuser/callback.c
+++ b/reactos/subsystems/win32/win32k/ntuser/callback.c
@@ -377,14 +377,18 @@ co_IntCallHookProc(INT HookId,
                   ArgumentLength += WindowName.Length + sizeof(WCHAR);
                }
 
-               if (Ansi)
-                  RtlInitAnsiString(asClassName, (PCSZ)CbtCreateWnd->lpcs->lpszClass);
-               else
-                  RtlInitUnicodeString(&ClassName, CbtCreateWnd->lpcs->lpszClass);
-
-               if (! IS_ATOM(ClassName.Buffer))
+               if (! IS_ATOM(CbtCreateWnd->lpcs->lpszClass))
                {
-                  ArgumentLength += ClassName.Length + sizeof(WCHAR);
+                  if (Ansi)
+                  {
+                     RtlInitAnsiString(asClassName, (PCSZ)CbtCreateWnd->lpcs->lpszClass);
+                     ArgumentLength += ClassName.Length + sizeof(CHAR);
+                  }
+                  else
+                  {
+                     RtlInitUnicodeString(&ClassName, CbtCreateWnd->lpcs->lpszClass);
+                     ArgumentLength += ClassName.Length + sizeof(WCHAR);
+                  }
                }
                break;
             default: