diff --git a/reactos/lib/user32/misc/stubs.c b/reactos/lib/user32/misc/stubs.c
index d42eb5f0729..36a71175015 100644
--- a/reactos/lib/user32/misc/stubs.c
+++ b/reactos/lib/user32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.48 2003/11/07 19:13:02 sedwards Exp $
+/* $Id: stubs.c,v 1.49 2003/11/09 13:50:03 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING WINBOOLthe top level directory
  * PROJECT:         ReactOS user32.dll
@@ -126,18 +126,6 @@ CopyImage(
 }
 
 
-/*
- * @unimplemented
- */
-HWND
-STDCALL
-GetFocus(VOID)
-{
-  UNIMPLEMENTED;
-  return (HWND)0;
-}
-
-
 /*
  * @unimplemented
  */
@@ -269,30 +257,6 @@ MsgWaitForMultipleObjectsEx(
   return 0;
 }
 
-#if 0
-HDEVNOTIFY
-STDCALL
-RegisterDeviceNotificationA(
-  HANDLE hRecipient,
-  LPVOID NotificationFilter,
-  DWORD Flags)
-{
-  UNIMPLEMENTED;
-  return (HDEVNOTIFY)0;
-}
-
-HDEVNOTIFY
-STDCALL
-RegisterDeviceNotificationW(
-  HANDLE hRecipient,
-  LPVOID NotificationFilter,
-  DWORD Flags)
-{
-  UNIMPLEMENTED;
-  return (HDEVNOTIFY)0;
-}
-#endif
-
 
 /*
  * @unimplemented
@@ -386,38 +350,6 @@ WaitForInputIdle(
 }
 
 
-/*
- * @unimplemented
- */
-HHOOK
-STDCALL
-SetWindowsHookExA(
-    int idHook,
-    HOOKPROC lpfn,
-    HINSTANCE hMod,
-    DWORD dwThreadId)
-{
-  UNIMPLEMENTED;
-  return 0;
-}
-
-
-/*
- * @unimplemented
- */
-HHOOK
-STDCALL
-SetWindowsHookExW(
-    int idHook,
-    HOOKPROC lpfn,
-    HINSTANCE hMod,
-    DWORD dwThreadId)
-{
-  UNIMPLEMENTED;
-  return 0;
-}
-
-
 /*
  * @unimplemented
  */
@@ -468,60 +400,6 @@ SetDebugErrorLevel( DWORD dwLevel )
 
 /* EOF */
 
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-ChangeMenuW(
-    HMENU hMenu,
-    UINT cmd,
-    LPCWSTR lpszNewItem,
-    UINT cmdInsert,
-    UINT flags)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-ChangeMenuA(
-    HMENU hMenu,
-    UINT cmd,
-    LPCSTR lpszNewItem,
-    UINT cmdInsert,
-    UINT flags)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-DeregisterShellHookWindow(HWND hWnd)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-RegisterShellHookWindow(HWND hWnd)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /*
  * @implemented
  */
@@ -545,132 +423,6 @@ EndTask(
     return TRUE;
 }
 
-/*
- * @unimplemented
- */
-LRESULT
-STDCALL
-MenuWindowProcA(
-		HWND   hWnd,
-		UINT   Msg,
-		WPARAM wParam,
-		LPARAM lParam
-		)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-LRESULT
-STDCALL
-MenuWindowProcW(
-		HWND   hWnd,
-		UINT   Msg,
-		WPARAM wParam,
-		LPARAM lParam
-		)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-DrawCaptionTempW(
-		 HWND        hwnd,
-		 HDC         hdc,
-		 const RECT *rect,
-		 HFONT       hFont,
-		 HICON       hIcon,
-		 LPCWSTR     str,
-		 UINT        uFlags
-		 )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-DrawCaptionTempA(
-		 HWND        hwnd,
-		 HDC         hdc,
-		 const RECT *rect,
-		 HFONT       hFont,
-		 HICON       hIcon,
-		 LPCSTR      str,
-		 UINT        uFlags
-		 )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-HHOOK
-STDCALL
-SetWindowsHookW ( int idHook, HOOKPROC lpfn )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-HHOOK
-STDCALL
-SetWindowsHookA ( int idHook, HOOKPROC lpfn )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-NotifyWinEvent(
-	       DWORD event,
-	       HWND  hwnd,
-	       LONG  idObject,
-	       LONG  idChild
-	       )
-{
-  UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-HWINEVENTHOOK
-STDCALL
-SetWinEventHook(
-		DWORD        eventMin,
-		DWORD        eventMax,
-		HMODULE      hmodWinEventProc,
-		WINEVENTPROC pfnWinEventProc,
-		DWORD        idProcess,
-		DWORD        idThread,
-		DWORD        dwFlags
-		)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /*
  * @unimplemented
  */
@@ -681,33 +433,6 @@ SwitchToThisWindow ( HWND hwnd, WINBOOL fUnknown )
   UNIMPLEMENTED;
 }
 
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-UnhookWinEvent ( HWINEVENTHOOK hWinEventHook )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-LRESULT
-STDCALL
-EditWndProc(
-	    HWND   hWnd,
-	    UINT   Msg,
-	    WPARAM wParam,
-	    LPARAM lParam
-	    )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /*
  * @unimplemented
  */
@@ -734,78 +459,6 @@ GetInternalWindowPos(
   return FALSE;
 }
 
-/*
- * @unimplemented
- */
-HRESULT
-STDCALL
-GetProgmanWindow ( VOID )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-HRESULT
-STDCALL
-GetTaskmanWindow ( VOID )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-DWORD
-STDCALL
-SetWindowStationUser ( DWORD x1, DWORD x2 )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-HRESULT
-STDCALL
-SetTaskmanWindow ( DWORD x )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-HRESULT
-STDCALL
-SetProgmanWindow ( DWORD x )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-/*
-VOID
-STDCALL
-ScrollChildren(
-	       HWND   hWnd,
-	       UINT   uMsg,
-	       WPARAM wParam,
-	       LPARAM lParam
-	       )
-{
-  UNIMPLEMENTED;
-}
-*/
-
 /*
  * @unimplemented
  */
@@ -897,8 +550,7 @@ DragObject(
 	   HCURSOR hc1
 	   )
 {
-  UNIMPLEMENTED;
-  return FALSE;
+  return NtUserDragObject(hwnd1, hwnd2, u1, dw1, hc1);
 }
 
 /*
@@ -933,17 +585,6 @@ SetUserObjectSecurity(
   return FALSE;
 }
 
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-UnhookWindowsHook ( int nCode, HOOKPROC pfnFilterProc )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /*
  * @unimplemented
  */
@@ -955,23 +596,6 @@ UserRealizePalette ( HDC hDC )
   return FALSE;
 }
 
-/*
- * @unimplemented
- */
-DWORD
-STDCALL
-DrawMenuBarTemp(
-		HWND   hwnd,
-		HDC    hDC,
-		LPRECT lprect,
-		HMENU  hMenu,
-		HFONT  hFont
-		)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /*
  * @unimplemented
  */
@@ -1020,28 +644,6 @@ GetInputDesktop ( VOID )
   return FALSE;
 }
 
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-LockWindowStation ( HWINSTA hWinSta )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-UnlockWindowStation ( HWINSTA hWinSta )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /*
  * @unimplemented
  */
@@ -1308,18 +910,6 @@ IsGUIThread(
   return FALSE;
 }
 
-/*
- * @unimplemented
- */
-WINBOOL
-STDCALL
-IsWinEventHookInstalled(
-    DWORD event)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /*
  * @unimplemented
  */
diff --git a/reactos/lib/user32/misc/winsta.c b/reactos/lib/user32/misc/winsta.c
index fdef2c49bd1..f8d7111a763 100644
--- a/reactos/lib/user32/misc/winsta.c
+++ b/reactos/lib/user32/misc/winsta.c
@@ -1,4 +1,4 @@
-/* $Id: winsta.c,v 1.11 2003/08/21 20:29:43 weiden Exp $
+/* $Id: winsta.c,v 1.12 2003/11/09 13:50:03 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -169,5 +169,43 @@ SetProcessWindowStation(HWINSTA hWinSta)
   return NtUserSetProcessWindowStation(hWinSta);
 }
 
+
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+SetWindowStationUser(
+  DWORD Unknown1,
+  DWORD Unknown2,
+  DWORD Unknown3,
+  DWORD Unknown4
+  )
+{
+  return NtUserSetWindowStationUser(Unknown1, Unknown2, Unknown3, Unknown4);
+}
+
+
+/*
+ * @implemented
+ */
+WINBOOL
+STDCALL
+LockWindowStation(HWINSTA hWinSta)
+{
+  return NtUserLockWindowStation(hWinSta);
+}
+
+
+/*
+ * @implemented
+ */
+WINBOOL
+STDCALL
+UnlockWindowStation(HWINSTA hWinSta)
+{
+  return NtUserUnlockWindowStation(hWinSta);
+}
+
 /* EOF */
 
diff --git a/reactos/lib/user32/user32.edf b/reactos/lib/user32/user32.edf
index 1bbee62a8d4..71ab0e0d3b7 100644
--- a/reactos/lib/user32/user32.edf
+++ b/reactos/lib/user32/user32.edf
@@ -194,7 +194,7 @@ DrawTextA=DrawTextA@20
 DrawTextExA=DrawTextExA@24
 DrawTextExW=DrawTextExW@24
 DrawTextW=DrawTextW@20
-EditWndProc=EditWndProc@16
+EditWndProc=EditWndProcA@16
 EmptyClipboard=EmptyClipboard@0
 EnableMenuItem=EnableMenuItem@12
 EnableScrollBar=EnableScrollBar@12
diff --git a/reactos/lib/user32/windows/hook.c b/reactos/lib/user32/windows/hook.c
index 25a5c64b61d..729e4774370 100644
--- a/reactos/lib/user32/windows/hook.c
+++ b/reactos/lib/user32/windows/hook.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: hook.c,v 1.10 2003/07/10 21:04:32 chorns Exp $
+/* $Id: hook.c,v 1.11 2003/11/09 13:50:04 navaraf Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -100,3 +100,148 @@ CallNextHookEx(
   UNIMPLEMENTED;
   return (LRESULT)0;
 }
+
+/*
+ * @unimplemented
+ */
+HHOOK
+STDCALL
+SetWindowsHookW ( int idHook, HOOKPROC lpfn )
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+HHOOK
+STDCALL
+SetWindowsHookA ( int idHook, HOOKPROC lpfn )
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+WINBOOL
+STDCALL
+DeregisterShellHookWindow(HWND hWnd)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+WINBOOL
+STDCALL
+RegisterShellHookWindow(HWND hWnd)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+WINBOOL
+STDCALL
+UnhookWindowsHook ( int nCode, HOOKPROC pfnFilterProc )
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+NotifyWinEvent(
+	       DWORD event,
+	       HWND  hwnd,
+	       LONG  idObject,
+	       LONG  idChild
+	       )
+{
+  UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+HWINEVENTHOOK
+STDCALL
+SetWinEventHook(
+		DWORD        eventMin,
+		DWORD        eventMax,
+		HMODULE      hmodWinEventProc,
+		WINEVENTPROC pfnWinEventProc,
+		DWORD        idProcess,
+		DWORD        idThread,
+		DWORD        dwFlags
+		)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+WINBOOL
+STDCALL
+UnhookWinEvent ( HWINEVENTHOOK hWinEventHook )
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+WINBOOL
+STDCALL
+IsWinEventHookInstalled(
+    DWORD event)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HHOOK
+STDCALL
+SetWindowsHookExA(
+    int idHook,
+    HOOKPROC lpfn,
+    HINSTANCE hMod,
+    DWORD dwThreadId)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+
+/*
+ * @unimplemented
+ */
+HHOOK
+STDCALL
+SetWindowsHookExW(
+    int idHook,
+    HOOKPROC lpfn,
+    HINSTANCE hMod,
+    DWORD dwThreadId)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
diff --git a/reactos/lib/user32/windows/menu.c b/reactos/lib/user32/windows/menu.c
index 95ea9747aac..f8b9dfafb8a 100644
--- a/reactos/lib/user32/windows/menu.c
+++ b/reactos/lib/user32/windows/menu.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: menu.c,v 1.35 2003/11/08 15:35:58 mf Exp $
+/* $Id: menu.c,v 1.36 2003/11/09 13:50:04 navaraf Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/menu.c
@@ -1385,3 +1385,83 @@ GetMenuContextHelpId(HMENU hmenu)
   return 0;
 }
 
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+DrawMenuBarTemp(
+		HWND   hwnd,
+		HDC    hDC,
+		LPRECT lprect,
+		HMENU  hMenu,
+		HFONT  hFont
+		)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+LRESULT
+STDCALL
+MenuWindowProcA(
+		HWND   hWnd,
+		UINT   Msg,
+		WPARAM wParam,
+		LPARAM lParam
+		)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+LRESULT
+STDCALL
+MenuWindowProcW(
+		HWND   hWnd,
+		UINT   Msg,
+		WPARAM wParam,
+		LPARAM lParam
+		)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+WINBOOL
+STDCALL
+ChangeMenuW(
+    HMENU hMenu,
+    UINT cmd,
+    LPCWSTR lpszNewItem,
+    UINT cmdInsert,
+    UINT flags)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+WINBOOL
+STDCALL
+ChangeMenuA(
+    HMENU hMenu,
+    UINT cmd,
+    LPCSTR lpszNewItem,
+    UINT cmdInsert,
+    UINT flags)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
diff --git a/reactos/lib/user32/windows/nonclient.c b/reactos/lib/user32/windows/nonclient.c
index 730c4a7482d..fc66397380a 100644
--- a/reactos/lib/user32/windows/nonclient.c
+++ b/reactos/lib/user32/windows/nonclient.c
@@ -1142,3 +1142,41 @@ DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags)
         return result;
 }
 
+
+/*
+ * @unimplemented
+ */
+WINBOOL
+STDCALL
+DrawCaptionTempW(
+		 HWND        hwnd,
+		 HDC         hdc,
+		 const RECT *rect,
+		 HFONT       hFont,
+		 HICON       hIcon,
+		 LPCWSTR     str,
+		 UINT        uFlags
+		 )
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+WINBOOL
+STDCALL
+DrawCaptionTempA(
+		 HWND        hwnd,
+		 HDC         hdc,
+		 const RECT *rect,
+		 HFONT       hFont,
+		 HICON       hIcon,
+		 LPCSTR      str,
+		 UINT        uFlags
+		 )
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
diff --git a/reactos/lib/user32/windows/window.c b/reactos/lib/user32/windows/window.c
index 6df77e61299..c904ea8bdc9 100644
--- a/reactos/lib/user32/windows/window.c
+++ b/reactos/lib/user32/windows/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.79 2003/11/09 11:42:08 navaraf Exp $
+/* $Id: window.c,v 1.80 2003/11/09 13:50:04 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -1661,4 +1661,59 @@ GetSystemMenu(
   return NtUserGetSystemMenu(hWnd, bRevert);
 }
 
+/*
+ * @unimplemented
+ */
+HWND
+STDCALL
+GetFocus(VOID)
+{
+  UNIMPLEMENTED;
+  return (HWND)0;
+}
+
+/*
+ * @unimplemented
+ */
+HWND
+STDCALL
+SetTaskmanWindow(HWND x)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+HWND
+STDCALL
+SetProgmanWindow(HWND x)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+HWND
+STDCALL
+GetProgmanWindow(VOID)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+HWND
+STDCALL
+GetTaskmanWindow(VOID)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
 /* EOF */