[fireball] 42024: - Fix user32 compiling/linking. - Add missing function declarations to winuser.h

Author: fireball
Date: Fri Jul 17 23:29:46 2009
New Revision: 42024

URL: http://svn.reactos.org/svn/reactos?rev=42024&view=rev
Log:
- Fix user32 compiling/linking.
- Add missing function declarations to winuser.h

Modified:
    branches/arwinss/reactos/dll/win32/user32/user_private.h
    branches/arwinss/reactos/include/psdk/winuser.h
    branches/arwinss/reactos/include/reactos/wine/server.h

Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32...
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] Fri Jul 17 23:29:46 2009
@@ -32,7 +32,7 @@
 #include "wine/winbase16.h"

extern WORD USER_HeapSel DECLSPEC_HIDDEN;
-
+NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...);
 static inline HLOCAL16 LOCAL_Alloc( HANDLE16 ds, UINT16 flags, WORD size )
 {
     DbgPrint("LOCAL_Alloc unimplemented!\n");

Modified: branches/arwinss/reactos/include/psdk/winuser.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/win...
==============================================================================
--- branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] Fri Jul 17 23:29:46 2009
@@ -3810,6 +3810,7 @@
 long WINAPI BroadcastSystemMessageExA(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
 long WINAPI BroadcastSystemMessageExW(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
 #endif /* (_WIN32_WINNT >= 0x0501) */
+void WINAPI CalcChildScroll(HWND, INT);
 BOOL WINAPI CallMsgFilterA(LPMSG,INT);
 BOOL WINAPI CallMsgFilterW(LPMSG,INT);
 LRESULT WINAPI CallNextHookEx(HHOOK,int,WPARAM,LPARAM);
@@ -4215,6 +4216,7 @@
 BOOL WINAPI IsZoomed(HWND);
 VOID WINAPI keybd_event(BYTE,BYTE,DWORD,ULONG_PTR);
 BOOL WINAPI KillTimer(HWND,UINT_PTR);
+BOOL WINAPI KillSystemTimer(HWND,UINT_PTR);
 HACCEL WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR);
 HACCEL WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR);
 HBITMAP WINAPI LoadBitmapA(HINSTANCE,LPCSTR);
@@ -4325,6 +4327,7 @@
 HANDLE WINAPI RemovePropW(HWND,LPCWSTR);
 BOOL WINAPI ReplyMessage(LRESULT);
 BOOL WINAPI ScreenToClient(HWND,LPPOINT);
+VOID WINAPI ScrollChildren(HWND,UINT,WPARAM,LPARAM);
 BOOL WINAPI ScrollDC(HDC,int,int,LPCRECT,LPCRECT,HRGN,LPRECT);
 BOOL WINAPI ScrollWindow(HWND,int,int,LPCRECT,LPCRECT);
 int WINAPI ScrollWindowEx(HWND,int,int,LPCRECT,LPCRECT,HRGN,LPRECT,UINT);
@@ -4360,6 +4363,7 @@
 HCURSOR WINAPI SetCursor(HCURSOR);
 BOOL WINAPI SetCursorPos(int,int);
 VOID WINAPI SetDebugErrorLevel(DWORD);
+BOOL WINAPI SetDeskWallPaper(LPCSTR);
 BOOL WINAPI SetDlgItemInt(HWND,int,UINT,BOOL);
 BOOL WINAPI SetDlgItemTextA(HWND,int,LPCSTR);
 BOOL WINAPI SetDlgItemTextW(HWND,int,LPCWSTR);
@@ -4395,6 +4399,7 @@
 BOOL WINAPI SetSystemMenu(HWND,HMENU);
 BOOL WINAPI SetThreadDesktop(HDESK);
 UINT_PTR WINAPI SetTimer(HWND,UINT_PTR,UINT,TIMERPROC);
+UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC);
 BOOL WINAPI SetUserObjectInformationA(HANDLE,int,PVOID,DWORD);
 BOOL WINAPI SetUserObjectInformationW(HANDLE,int,PVOID,DWORD);
 BOOL WINAPI SetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR);

Modified: branches/arwinss/reactos/include/reactos/wine/server.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos/...
==============================================================================
--- branches/arwinss/reactos/include/reactos/wine/server.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/reactos/wine/server.h [iso-8859-1] Fri Jul 17 23:29:46 2009
@@ -49,7 +49,11 @@
     struct __server_iovec data[__SERVER_MAX_DATA];  /* request variable size data */
 };

-W32KAPI UINT APIENTRY wine_server_call(void *req_ptr);
+#ifndef W32KAPI
+#define W32KAPI  DECLSPEC_ADDRSAFE
+#endif
+
+W32KAPI unsigned int APIENTRY wine_server_call(void *req_ptr);
 extern void CDECL wine_server_send_fd( int fd );
 extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle );
 extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options );