Seem to have missed updating these previously....

svn path=/trunk/; revision=3448

diff --git a/reactos/lib/user32/Makefile b/reactos/lib/user32/Makefile
index 55de9f8..ee79b70 100644 (file)
--- a/reactos/lib/user32/Makefile
+++ b/reactos/lib/user32/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2002/08/28 21:56:50 jfilby Exp $
+# $Id: Makefile,v 1.3 2002/09/01 04:17:05 robd Exp $

 
 PATH_TO_TOP = ../..
 
 
 PATH_TO_TOP = ../..
 


@@ -26,12 +26,13 @@ CONTROLS_OBJECTS = \
        controls/scrollbar.o
 
 MISC_OBJECTS = \
        controls/scrollbar.o
 
 MISC_OBJECTS = \

-  misc/desktop.o  \
-       misc/dllmain.o  \
-       misc/sprintf.o  \
-       misc/stubs.o    \
-       misc/win32k.o   \
-       misc/winsta.o   \
+       misc/desktop.o \
+       misc/dllmain.o \
+       misc/sprintf.o \
+       misc/stubs.o \
+       misc/winhelp.o \
+       misc/win32k.o \
+       misc/winsta.o \

        misc/resources.o \
        misc/dde.o \
        misc/display.o \
        misc/resources.o \
        misc/dde.o \
        misc/display.o \


@@ -39,8 +40,8 @@ MISC_OBJECTS = \
        misc/timer.o
 
 WINDOWS_OBJECTS = \
        misc/timer.o
 
 WINDOWS_OBJECTS = \

-       windows/class.o    \
-       windows/message.o  \
+       windows/class.o \
+       windows/message.o \

        windows/window.o \
        windows/defwnd.o \
        windows/accel.o \
        windows/window.o \
        windows/defwnd.o \
        windows/accel.o \

diff --git a/reactos/lib/user32/user32.def b/reactos/lib/user32/user32.def
index b69cf50..0146515 100644 (file)
--- a/reactos/lib/user32/user32.def
+++ b/reactos/lib/user32/user32.def
@@ -687,8 +687,8 @@ VkKeyScanW@4
 WaitForInputIdle@8
 WaitMessage@0
 ;Win32PoolAllocationStats
 WaitForInputIdle@8
 WaitMessage@0
 ;Win32PoolAllocationStats

-;WinHelpA
-;WinHelpW
+WinHelpA
+WinHelpW

 WindowFromDC@4
 WindowFromPoint@8
 ;keybd_event
 WindowFromDC@4
 WindowFromPoint@8
 ;keybd_event

diff --git a/reactos/lib/user32/user32.edf b/reactos/lib/user32/user32.edf
index 9292e34..6199ec1 100644 (file)
--- a/reactos/lib/user32/user32.edf
+++ b/reactos/lib/user32/user32.edf
@@ -329,6 +329,7 @@ GetScrollRange=GetScrollRange@16
 GetSubMenu=GetSubMenu@8
 GetSysColor=GetSysColor@4
 GetSysColorBrush=GetSysColorBrush@4
 GetSubMenu=GetSubMenu@8
 GetSysColor=GetSysColor@4
 GetSysColorBrush=GetSysColorBrush@4

+GetSysColorPen@4=GetSysColorPen@4 ; ReactOS extension

 GetSystemMenu=GetSystemMenu@8
 GetSystemMetrics=GetSystemMetrics@4
 GetTabbedTextExtentA=GetTabbedTextExtentA@20
 GetSystemMenu=GetSystemMenu@8
 GetSystemMetrics=GetSystemMetrics@4
 GetTabbedTextExtentA=GetTabbedTextExtentA@20


@@ -686,8 +687,8 @@ VkKeyScanW=VkKeyScanW@4
 WaitForInputIdle=WaitForInputIdle@8
 WaitMessage=WaitMessage@0
 ;Win32PoolAllocationStats
 WaitForInputIdle=WaitForInputIdle@8
 WaitMessage=WaitMessage@0
 ;Win32PoolAllocationStats

-;WinHelpA
-;WinHelpW
+WinHelpA=WinHelpA@16
+WinHelpW=WinHelpW@16

 WindowFromDC=WindowFromDC@4
 WindowFromPoint=WindowFromPoint@8
 ;keybd_event
 WindowFromDC=WindowFromDC@4
 WindowFromPoint=WindowFromPoint@8
 ;keybd_event