From 04572bc608287889e0afaf9909c0dd38b7e577b1 Mon Sep 17 00:00:00 2001
From: Richard Campbell <betam4x@gmail.com>
Date: Fri, 23 May 2003 17:07:12 +0000
Subject: [PATCH] - Implemented FindWindowEx*()  (it was already implemented in
 subsys\win32k\ntuser\window.c with the exception of a small bug, but wasn't
 mapped to by user32??) FIXED

- FindWindow() is also implemented, though not properly. (Someone has it set up to use FindWindowEx, this isn't the proper way to do this...FindWindow doesn't search children...)

svn path=/trunk/; revision=4744
---
 reactos/iface/addsys/w32ksvc.db       | 2 +-
 reactos/include/win32k/ntuser.h       | 6 +++---
 reactos/lib/user32/windows/window.c   | 5 ++---
 reactos/subsys/win32k/ntuser/window.c | 7 +++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/reactos/iface/addsys/w32ksvc.db b/reactos/iface/addsys/w32ksvc.db
index 0f74f0a0d75..7bc8a935784 100644
--- a/reactos/iface/addsys/w32ksvc.db
+++ b/reactos/iface/addsys/w32ksvc.db
@@ -348,7 +348,7 @@ NtUserEvent                             1
 NtUserExcludeUpdateRgn                  2
 NtUserFillWindow                        4
 NtUserFindExistingCursorIcon            3
-NtUserFindWindowEx                      5
+NtUserFindWindowEx                      4
 NtUserFlashWindowEx                     1
 NtUserGetAltTabInfo                     6
 NtUserGetAncestor                       2
diff --git a/reactos/include/win32k/ntuser.h b/reactos/include/win32k/ntuser.h
index 35d4f277aba..ea309d8a890 100644
--- a/reactos/include/win32k/ntuser.h
+++ b/reactos/include/win32k/ntuser.h
@@ -499,9 +499,9 @@ STDCALL
 NtUserFindWindowEx(
   HWND  hwndParent,
   HWND  hwndChildAfter,
-  PUNICODE_STRING  ucClassName,
-  PUNICODE_STRING  ucWindowName,
-  DWORD Unknown4);
+  LPCWSTR  ucClassName,
+  LPCWSTR  ucWindowName
+  );
 
 DWORD
 STDCALL
diff --git a/reactos/lib/user32/windows/window.c b/reactos/lib/user32/windows/window.c
index 56fd852c067..9b68cc8962f 100644
--- a/reactos/lib/user32/windows/window.c
+++ b/reactos/lib/user32/windows/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.34 2003/05/23 16:44:12 rcampbell Exp $
+/* $Id: window.c,v 1.35 2003/05/23 17:07:12 rcampbell Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -671,8 +671,7 @@ FindWindowExW(HWND hwndParent,
 	      LPCWSTR lpszClass,
 	      LPCWSTR lpszWindow)
 {
-  UNIMPLEMENTED;
-  return (HWND)0;
+  return NtUserFindWindowEx(hwndParent, hwndChildAfter, lpszClass, lpszWindow);
 }
 
 WINBOOL STDCALL
diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index b6e39d35202..1d05eb29972 100644
--- 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.46 2003/05/23 16:44:12 rcampbell Exp $
+/* $Id: window.c,v 1.47 2003/05/23 17:07:12 rcampbell Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -756,9 +756,8 @@ NtUserFillWindow(DWORD Unknown0,
 HWND STDCALL
 NtUserFindWindowEx(HWND hwndParent,
 		   HWND hwndChildAfter,
-		   PUNICODE_STRING ucClassName,
-		   PUNICODE_STRING ucWindowName,
-		   DWORD Unknown4)
+		   LPCWSTR ucClassName,
+		   LPCWSTR ucWindowName)
 {
 #if 0
   NTSTATUS status;