From 017f478b2503614cbd907e5095443121f77a4528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 May 2003 18:52:14 +0000
Subject: [PATCH] Implemented IsWindow()

svn path=/trunk/; revision=4679
---
 reactos/lib/user32/windows/window.c   | 9 ++++++---
 reactos/subsys/win32k/ntuser/window.c | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/reactos/lib/user32/windows/window.c b/reactos/lib/user32/windows/window.c
index 5b9f66e6ee2..62d23412398 100644
--- a/reactos/lib/user32/windows/window.c
+++ b/reactos/lib/user32/windows/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.27 2003/05/04 15:41:40 gvg Exp $
+/* $Id: window.c,v 1.28 2003/05/12 18:52:14 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -332,7 +332,8 @@ CreateWindowExA(DWORD dwExStyle,
   UNICODE_STRING ClassName;
   HWND Handle;
   INT sw;
-  
+
+OutputDebugStringA("CreateWindowEx\n");  
   if (IS_ATOM(lpClassName)) 
     {
       RtlInitUnicodeString(&ClassName, NULL);
@@ -807,7 +808,9 @@ IsIconic(HWND hWnd)
 WINBOOL STDCALL
 IsWindow(HWND hWnd)
 {
-  return FALSE;
+  DWORD WndProc = NtUserGetWindowLong(hWnd, GWL_WNDPROC);
+
+  return (0 != WndProc || ERROR_INVALID_HANDLE != GetLastError());
 }
 
 WINBOOL STDCALL
diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index f9dbc90afe7..8375ce3e010 100644
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.41 2003/05/02 07:52:33 gvg Exp $
+/* $Id: window.c,v 1.42 2003/05/12 18:52:14 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -1122,6 +1122,7 @@ NtUserGetWindowLong(HWND hWnd, DWORD Index)
 			       (PVOID*)&WindowObject);
   if (!NT_SUCCESS(Status))
     {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
       return(0);
     }