From dacc05c9014d371ddde0653fe8a88d18025cf7e6 Mon Sep 17 00:00:00 2001 From: Royce Mitchell III Date: Thu, 14 Aug 2003 20:25:52 +0000 Subject: [PATCH] patch by Jonathon Wilson Implement PolyPatBlt, SetDeskWallpaper as a call to SystemParametersInfo, UserClientDllInitialize, WCSToMBEx, MBToWCSEx, MB_GetString, SetWindowWord, TranslateMessageEx, SetMessageQueue, IsHungAppWindow Added stubs for a bunch more functions from NT4SP6 user32.dll svn path=/trunk/; revision=5573 --- reactos/include/ascii.h | 69 +++ reactos/include/base.h | 3 + reactos/include/funcs.h | 351 ++++++++++++- reactos/include/structs.h | 6 +- reactos/include/unicode.h | 69 +++ reactos/lib/gdi32/gdi32.def | 3 +- reactos/lib/gdi32/gdi32.edf | 3 +- reactos/lib/gdi32/objects/bitblt.c | 21 + reactos/lib/user32/misc/dde.c | 4 +- reactos/lib/user32/misc/desktop.c | 9 +- reactos/lib/user32/misc/dllmain.c | 11 +- reactos/lib/user32/misc/sprintf.c | 74 +++ reactos/lib/user32/misc/stubs.c | 715 ++++++++++++++++++++++++++- reactos/lib/user32/user32.def | 124 ++--- reactos/lib/user32/user32.edf | 129 ++--- reactos/lib/user32/windows/class.c | 26 +- reactos/lib/user32/windows/message.c | 22 +- reactos/lib/user32/windows/window.c | 11 +- 18 files changed, 1488 insertions(+), 162 deletions(-) diff --git a/reactos/include/ascii.h b/reactos/include/ascii.h index 259ca8b0fa9..ccaa92aa840 100644 --- a/reactos/include/ascii.h +++ b/reactos/include/ascii.h @@ -35,6 +35,75 @@ extern "C" { #endif /* __cplusplus */ +WINBOOL +STDCALL +GetAltTabInfoA( + HWND hwnd, + int iItem, + PALTTABINFO pati, + LPSTR pszItemText, + UINT cchItemText + ); + +UINT +STDCALL +PrivateExtractIconsA( + LPCSTR szFileName, + int nIconIndex, + int cxIcon, + int cyIcon, + HICON *phicon, + UINT *piconid, + UINT nIcons, + UINT flags + ); + +UINT +STDCALL +RealGetWindowClassA( + HWND hwnd, + LPSTR pszType, + UINT cchType + ); + +LRESULT +STDCALL +MenuWindowProcA( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam + ); + +WINBOOL +STDCALL +DrawCaptionTempA( + HWND hwnd, + HDC hdc, + const RECT *rect, + HFONT hFont, + HICON hIcon, + LPCSTR str, + UINT uFlags + ); + +HHOOK +STDCALL +SetWindowsHookA( + int idHook, + HOOKPROC lpfn + ); + +HRESULT +STDCALL +PrivateExtractIconExA( + DWORD u, + DWORD v, + DWORD w, + DWORD x, + DWORD y + ); + WINBOOL STDCALL GetBinaryTypeA( diff --git a/reactos/include/base.h b/reactos/include/base.h index 3f08cda0dbc..344b8dd04d8 100644 --- a/reactos/include/base.h +++ b/reactos/include/base.h @@ -142,6 +142,9 @@ typedef HANDLE HSTMT; typedef HANDLE HSZ; typedef HANDLE HWINSTA; typedef HANDLE HWND; +typedef HANDLE HTASK; +typedef HANDLE HWINEVENTHOOK; +typedef VOID (CALLBACK* WINEVENTPROC)(HWINEVENTHOOK hWinEventHook,DWORD event,HWND hwnd,LONG idObject,LONG idChild,DWORD idEventThread,DWORD dwmsEventTime); typedef unsigned short LANGID; //typedef DWORD LCID; typedef DWORD LCTYPE; diff --git a/reactos/include/funcs.h b/reactos/include/funcs.h index db61eb42010..c3bb3b92a4b 100644 --- a/reactos/include/funcs.h +++ b/reactos/include/funcs.h @@ -109,6 +109,7 @@ typedef PPROGRESS_ROUTINE LPPROGRESS_ROUTINE; #define FindWindowEx FindWindowExW #define GetClassName GetClassNameW #define SetWindowsHookEx SetWindowsHookExW +#define SetWindowsHook SetWindowsHookW #define LoadBitmap LoadBitmapW #define LoadCursor LoadCursorW #define LoadCursorFromFile LoadCursorFromFileW @@ -207,7 +208,6 @@ typedef PPROGRESS_ROUTINE LPPROGRESS_ROUTINE; #define GetDlgItemText GetDlgItemTextW #define SendDlgItemMessage SendDlgItemMessageW #define DefDlgProc DefDlgProcW -#define CallMsgFilter CallMsgFilterW #define GetClipboardFormatName GetClipboardFormatNameW #define CharToOem CharToOemW #define OemToChar OemToCharW @@ -300,6 +300,8 @@ typedef PPROGRESS_ROUTINE LPPROGRESS_ROUTINE; #define ReportEvent ReportEventW #define CreateProcess CreateProcessW #define FatalAppExit FatalAppExitW +#define CallMessageFilter CallMessageFilterW +#define GetAltTabInfo GetAltTabInfoW #define GetStartupInfo GetStartupInfoW #define GetEnvironmentVariable GetEnvironmentVariableW #define GetCommandLine GetCommandLineW @@ -313,6 +315,7 @@ typedef PPROGRESS_ROUTINE LPPROGRESS_ROUTINE; #define EnumResourceLanguages EnumResourceLanguagesW #define BeginUpdateResource BeginUpdateResourceW #define UpdateResource UpdateResourceW +#define PrivateExtractIcons PrivateExtractIconsW #define EndUpdateResource EndUpdateResourceW #define GlobalAddAtom GlobalAddAtomW #define GlobalFindAtom GlobalFindAtomW @@ -521,6 +524,7 @@ typedef PPROGRESS_ROUTINE LPPROGRESS_ROUTINE; #define FindWindowEx FindWindowExA #define GetClassName GetClassNameA #define SetWindowsHookEx SetWindowsHookExA +#define SetWindowsHook SetWindowsHookA #define LoadBitmap LoadBitmapA #define LoadCursor LoadCursorA #define LoadCursorFromFile LoadCursorFromFileA @@ -616,7 +620,6 @@ typedef PPROGRESS_ROUTINE LPPROGRESS_ROUTINE; #define GetDlgItemText GetDlgItemTextA #define SendDlgItemMessage SendDlgItemMessageA #define DefDlgProc DefDlgProcA -#define CallMsgFilter CallMsgFilterA #define GetClipboardFormatName GetClipboardFormatNameA #define CharToOem CharToOemA #define OemToChar OemToCharA @@ -683,6 +686,8 @@ typedef PPROGRESS_ROUTINE LPPROGRESS_ROUTINE; #define SetComputerName SetComputerNameA #define GetUserName GetUserNameA #define CreateMailslot CreateMailslotA +#define CallMessageFilter CallMessageFilterA +#define GetAltTabInfo GetAltTabInfoA #define FormatMessage FormatMessageA #define GetEnvironmentStrings GetEnvironmentStringsA #define FreeEnvironmentStrings FreeEnvironmentStringsA @@ -791,6 +796,7 @@ typedef PPROGRESS_ROUTINE LPPROGRESS_ROUTINE; #define GetModuleFileName GetModuleFileNameA #define GetModuleHandle GetModuleHandleA #define GetUserObjectInformation GetUserObjectInformationA +#define PrivateExtractIcons PrivateExtractIconsA #define SetUserObjectInformation SetUserObjectInformationA #define RegisterWindowMessage RegisterWindowMessageA #define GetMessage GetMessageA @@ -884,22 +890,331 @@ typedef PPROGRESS_ROUTINE LPPROGRESS_ROUTINE; #endif /* UNICODE and ASCII defines */ #endif /* _DISABLE_TIDENTS */ - HWND STDCALL GetAncestor(HWND hWnd, UINT GaFlags); -WINBOOL STDCALL AbnormalTermination(VOID); -int STDCALL AbortDoc(HDC); -WINBOOL STDCALL AbortPath(HDC); -WINBOOL STDCALL AbortPrinter(HANDLE); -WINBOOL CALLBACK AbortProc(HDC, int); -WINBOOL STDCALL AccessCheck( - PSECURITY_DESCRIPTOR pSecurityDescriptor, - HANDLE ClientToken, - DWORD DesiredAccess, - PGENERIC_MAPPING GenericMapping, - PPRIVILEGE_SET PrivilegeSet, - LPDWORD PrivilegeSetLength, - LPDWORD GrantedAccess, - LPBOOL AccessStatus - ); +DWORD +WINAPI +SetSysColorsTemp( + const COLORREF *pPens, + const HBRUSH *pBrushes, + DWORD n + ); + +INT +STDCALL +UserClientDllInitialize( + HINSTANCE inst, + DWORD reason, + LPVOID reserved + ); + +DWORD +STDCALL +DrawMenuBarTemp( + HWND hwnd, + HDC hDC, + LPRECT lprect, + HMENU hMenu, + HFONT hFont + ); + +UINT +STDCALL +UserRealizePalette ( HDC hDC ); + +WINBOOL +STDCALL +DdeFreeStringHandle ( DWORD idInst, HSZ hsz ); + +WINBOOL +STDCALL +DeregisterShellHookWindow ( HWND hWnd ); + +WINBOOL +STDCALL +RegisterShellHookWindow ( HWND hWnd ); + +WINBOOL +STDCALL +EndTask( + HWND hWnd, + WINBOOL fShutDown, + WINBOOL fForce + ); + +DWORD +STDCALL +InternalGetWindowText( + HWND hWnd, + LPWSTR lpString, + int nMaxCount + ); + +WINBOOL +STDCALL +IsHungAppWindow ( HWND hwnd ); + +VOID +STDCALL +NotifyWinEvent( + DWORD event, + HWND hwnd, + LONG idObject, + LONG idChild + ); + +HWINEVENTHOOK +STDCALL +SetWinEventHook( + DWORD eventMin, + DWORD eventMax, + HMODULE hmodWinEventProc, + WINEVENTPROC pfnWinEventProc, + DWORD idProcess, + DWORD idThread, + DWORD dwFlags + ); + +VOID +STDCALL +SwitchToThisWindow( + HWND hwnd, + WINBOOL fUnknown ); + +WINBOOL +STDCALL +UnhookWinEvent ( HWINEVENTHOOK hWinEventHook ); + +LRESULT +STDCALL +EditWndProc( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam + ); + +WINBOOL +STDCALL +SetDeskWallpaper ( LPCSTR filename ); + +DWORD +STDCALL +GetAppCompatFlags ( HTASK hTask ); + +HDESK +STDCALL +GetInputDesktop ( VOID ); + +UINT +STDCALL +GetInternalWindowPos( + HWND hwnd, + LPRECT rectWnd, + LPPOINT ptIcon + ); + +HRESULT +STDCALL +GetProgmanWindow ( VOID ); + +HRESULT +STDCALL +GetTaskmanWindow ( VOID ); + +DWORD +STDCALL +SetWindowStationUser( + DWORD x1, + DWORD x2 + ); + +UINT +STDCALL +SetSystemTimer( + HWND hwnd, + UINT id, + UINT timeout, + TIMERPROC proc + ); + +WINBOOL +STDCALL +SetSystemMenu( + HWND hwnd, + HMENU hMenu + ); + +HRESULT +STDCALL +SetTaskmanWindow ( DWORD x ); + +HRESULT +STDCALL +SetProgmanWindow ( DWORD x ); + +VOID +STDCALL +ScrollChildren( + HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam + ); + +VOID +STDCALL +LoadLocalFonts ( VOID ); + +VOID +STDCALL +LoadRemoteFonts ( VOID ); + +VOID +STDCALL +SetInternalWindowPos( + HWND hwnd, + UINT showCmd, + LPRECT rect, + LPPOINT pt + ); + +VOID +STDCALL +RegisterSystemThread( + DWORD flags, + DWORD reserved + ); + +DWORD +STDCALL +RegisterLogonProcess( + HANDLE hprocess, + BOOL x + ); + +WINBOOL +STDCALL +KillSystemTimer( + HWND hwnd, + UINT id + ); + +DWORD +STDCALL +RegisterTasklist ( DWORD x ); + +DWORD +STDCALL +SetLogonNotifyWindow ( HWINSTA hwinsta, HWND hwnd ); + +WORD +STDCALL +CascadeChildWindows ( HWND hWndParent, WORD wFlags ); + +WORD +STDCALL +TileChildWindows ( HWND hWndParent, WORD wFlags ); + +WINBOOL +STDCALL +TranslateMessageEx ( CONST MSG *lpMsg, DWORD unk ); + +WINBOOL +STDCALL +DrawFrame( + HDC hDc, + RECT *r, + DWORD width, + DWORD type + ); + +WINBOOL +STDCALL +LockWindowStation ( HWINSTA hWinSta ); + +WINBOOL +STDCALL +UnlockWindowStation ( HWINSTA hWinSta ); + +WINBOOL +STDCALL +GetAccCursorInfo ( PCURSORINFO pci ); + +LPWSTR +STDCALL +MB_GetString ( DWORD string ); + +WINBOOL +STDCALL +ClientThreadSetup ( VOID ); + +WINBOOL +STDCALL +PolyPatBlt( + HDC hDC, + DWORD dwRop, + PPATRECT pRects, + int cRects, + ULONG Reserved + ); + +DWORD +STDCALL +WCSToMBEx( + WORD CodePage, + LPWSTR UnicodeString, + LONG UnicodeSize, + LPSTR *MBString, + LONG MBSize, + BOOL Allocate + ); + +DWORD +STDCALL +MBToWCSEx( + WORD CodePage, + LPSTR MBString, + LONG MBSize, + LPWSTR *UnicodeString, + LONG UnicodeSize, + BOOL Allocate + ); + +HWND +STDCALL +GetAncestor ( HWND hWnd, UINT GaFlags ); + +WINBOOL +STDCALL +AbnormalTermination ( VOID ); + +int +STDCALL +AbortDoc ( HDC ); + +WINBOOL +STDCALL +AbortPath ( HDC ); + +WINBOOL +STDCALL +AbortPrinter ( HANDLE ); + +WINBOOL +CALLBACK +AbortProc ( HDC, int ); + +WINBOOL +STDCALL +AccessCheck( + PSECURITY_DESCRIPTOR pSecurityDescriptor, + HANDLE ClientToken, + DWORD DesiredAccess, + PGENERIC_MAPPING GenericMapping, + PPRIVILEGE_SET PrivilegeSet, + LPDWORD PrivilegeSetLength, + LPDWORD GrantedAccess, + LPBOOL AccessStatus + ); #ifndef __NTDRIVER__ LONG diff --git a/reactos/include/structs.h b/reactos/include/structs.h index afd8fceac86..2763441b38d 100644 --- a/reactos/include/structs.h +++ b/reactos/include/structs.h @@ -59,7 +59,6 @@ # define typedef_tident(ident) #endif - typedef struct _VALENT_A { LPSTR ve_valuename; DWORD ve_valuelen; @@ -168,6 +167,11 @@ typedef struct _RECT { } RECT, *LPRECT, *LPCRECT, *PRECT, RECTL, *LPRECTL, *LPCRECTL, *PRECTL; +typedef struct _PATRECT { + RECT r; + HBRUSH hBrush; +} PATRECT, * PPATRECT; + #if 0 typedef struct _RECTL { LONG left; diff --git a/reactos/include/unicode.h b/reactos/include/unicode.h index c23af5fa226..21830a6cc9d 100644 --- a/reactos/include/unicode.h +++ b/reactos/include/unicode.h @@ -36,6 +36,75 @@ extern "C" { #endif /* __cplusplus */ +WINBOOL +STDCALL +GetAltTabInfoW( + HWND hwnd, + int iItem, + PALTTABINFO pati, + LPWSTR pszItemText, + UINT cchItemText + ); + +UINT +STDCALL +PrivateExtractIconsW( + LPCWSTR szFileName, + int nIconIndex, + int cxIcon, + int cyIcon, + HICON *phicon, + UINT *piconid, + UINT nIcons, + UINT flags + ); + +UINT +STDCALL +RealGetWindowClassW( + HWND hwnd, + LPWSTR pszType, + UINT cchType + ); + +LRESULT +STDCALL +MenuWindowProcW( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam + ); + +WINBOOL +STDCALL +DrawCaptionTempW( + HWND hwnd, + HDC hdc, + const RECT *rect, + HFONT hFont, + HICON hIcon, + LPCWSTR str, + UINT uFlags + ); + +HHOOK +STDCALL +SetWindowsHookW( + int idHook, + HOOKPROC lpfn + ); + +HRESULT +STDCALL +PrivateExtractIconExW( + DWORD u, + DWORD v, + DWORD w, + DWORD x, + DWORD y + ); + WINBOOL STDCALL GetBinaryTypeW( diff --git a/reactos/lib/gdi32/gdi32.def b/reactos/lib/gdi32/gdi32.def index bd9669d3595..ebe592fa50d 100644 --- a/reactos/lib/gdi32/gdi32.def +++ b/reactos/lib/gdi32/gdi32.def @@ -1,4 +1,4 @@ -; $Id: gdi32.def,v 1.6 2003/07/21 01:59:51 royce Exp $ +; $Id: gdi32.def,v 1.7 2003/08/14 20:25:52 royce Exp $ ; ; gdi32.def ; @@ -242,6 +242,7 @@ OffsetViewportOrgEx@16 OffsetWindowOrgEx@16 PaintRgn@8 PatBlt@24 +PolyPatBlt@20 PathToRegion@4 Pie@36 PlayEnhMetaFile@12 diff --git a/reactos/lib/gdi32/gdi32.edf b/reactos/lib/gdi32/gdi32.edf index ca50da828ab..ddc815fc171 100644 --- a/reactos/lib/gdi32/gdi32.edf +++ b/reactos/lib/gdi32/gdi32.edf @@ -1,4 +1,4 @@ -; $Id: gdi32.edf,v 1.4 2003/07/21 01:59:51 royce Exp $ +; $Id: gdi32.edf,v 1.5 2003/08/14 20:25:52 royce Exp $ ; ; gdi32.def ; @@ -242,6 +242,7 @@ OffsetViewportOrgEx=OffsetViewportOrgEx@16 OffsetWindowOrgEx=OffsetWindowOrgEx@16 PaintRgn=PaintRgn@8 PatBlt=PatBlt@24 +PolyPatBlt=PolyPatBlt@20 PathToRegion=PathToRegion@4 Pie=Pie@36 PlayEnhMetaFile=PlayEnhMetaFile@12 diff --git a/reactos/lib/gdi32/objects/bitblt.c b/reactos/lib/gdi32/objects/bitblt.c index d8a641ab65d..1e4ceb67b6c 100644 --- a/reactos/lib/gdi32/objects/bitblt.c +++ b/reactos/lib/gdi32/objects/bitblt.c @@ -334,6 +334,27 @@ PatBlt(HDC hDC, INT Top, INT Left, INT Width, INT Height, ULONG Rop) return(W32kPatBlt(hDC, Top, Left, Width, Height, Rop)); } +/* + * @implemented + */ +WINBOOL +STDCALL +PolyPatBlt(HDC hDC,DWORD dwRop,PPATRECT pRects,int cRects,ULONG Reserved) +{ + int i; + PATRECT r; + HBRUSH hBrOld; + for (i = 0;i #include #include +#include "strpool.h" #define WPRINTF_LEFTALIGN 0x0001 /* Align output on the left ('-' prefix) */ #define WPRINTF_PREFIX_HEX 0x0002 /* Prefix hex with 0x ('#' prefix) */ @@ -531,3 +532,76 @@ INT CDECL wsprintfW( LPWSTR buffer, LPCWSTR spec, ... ) va_end( valist ); return ( res == -1 ) ? 1024 : res; } +/* + * @implemented + */ +DWORD STDCALL WCSToMBEx(WORD CodePage,LPWSTR UnicodeString,LONG UnicodeSize,LPSTR *MBString,LONG MBSize,BOOL Allocate) +{ + DWORD Size; + if (UnicodeSize == -1) + { + UnicodeSize = wcslen(UnicodeString)+1; + } + if (MBSize == -1) + { + if (!Allocate) + { + return 0; + } + MBSize = UnicodeSize * 2; + } + if (Allocate) + { + *MBString = HEAP_alloc(MBSize); + } + if ((CodePage == 0) || (CodePage == NLS_ANSI_CODE_PAGE)) + { + RtlUnicodeToMultiByteN(*MBString,MBSize,&Size,UnicodeString,UnicodeSize); + } + else + { + WideCharToMultiByte(CodePage,0,UnicodeString,UnicodeSize,*MBString,MBSize,0,0); + } + return UnicodeSize; +} +/* + * @implemented + */ +DWORD STDCALL MBToWCSEx(WORD CodePage,LPSTR MBString,LONG MBSize,LPWSTR *UnicodeString,LONG UnicodeSize,BOOL Allocate) +{ + DWORD Size; + if (MBSize == -1) + { + MBSize = strlen(MBString)+1; + } + if (UnicodeSize == -1) + { + if (!Allocate) + { + return 0; + } + UnicodeSize = MBSize; + } + if (Allocate) + { + *UnicodeString = HEAP_alloc(UnicodeSize); + } + UnicodeSize *= sizeof(WCHAR); + if ((CodePage == 0) || (CodePage == NLS_ANSI_CODE_PAGE)) + { + RtlMultiByteToUnicodeN(*UnicodeString,UnicodeSize,&Size,MBString,MBSize); + } + else + { + Size = MultiByteToWideChar(CodePage,0,MBString,MBSize,*UnicodeString,UnicodeSize); + } + return Size; +} +const LPWSTR strings[14] = {L"OK",L"Cancel",L"&Abort",L"&Retry",L"&Ignore",L"&Yes",L"&No",L"&Close",L"Help",L"&Try Again",L"&Continue"}; +/* + * @implemented + */ +LPWSTR STDCALL MB_GetString(DWORD string) +{ + return heap_string_poolW(strings[string],wcslen(strings[string])); +} diff --git a/reactos/lib/user32/misc/stubs.c b/reactos/lib/user32/misc/stubs.c index cd01bb6722a..423f293c728 100644 --- a/reactos/lib/user32/misc/stubs.c +++ b/reactos/lib/user32/misc/stubs.c @@ -1,4 +1,4 @@ -/* $Id: stubs.c,v 1.29 2003/08/04 16:56:49 gdalsnes Exp $ +/* $Id: stubs.c,v 1.30 2003/08/14 20:25:52 royce Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -610,3 +610,716 @@ 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; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +EndTask( + HWND hWnd, + WINBOOL fShutDown, + WINBOOL fForce) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +UINT +STDCALL +PrivateExtractIconsW( + LPCWSTR szFileName, + int nIconIndex, + int cxIcon, + int cyIcon, + HICON *phicon, + UINT *piconid, + UINT nIcons, + UINT flags + ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +UINT +STDCALL +PrivateExtractIconsA( + LPCSTR szFileName, + int nIconIndex, + int cxIcon, + int cyIcon, + HICON *phicon, + UINT *piconid, + UINT nIcons, + UINT flags + ) +{ + 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 +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 + */ +HRESULT +STDCALL +PrivateExtractIconExW( + DWORD u, + DWORD v, + DWORD w, + DWORD x, + DWORD y + ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +HRESULT +STDCALL +PrivateExtractIconExA( + DWORD u, + DWORD v, + DWORD w, + DWORD x, + DWORD y + ) +{ + 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 + */ +VOID +STDCALL +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 + */ +DWORD +STDCALL +GetAppCompatFlags ( HTASK hTask ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +UINT +STDCALL +GetInternalWindowPos( + HWND hwnd, + LPRECT rectWnd, + LPPOINT ptIcon + ) +{ + UNIMPLEMENTED; + 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 + */ +UINT +STDCALL +SetSystemTimer( + HWND hwnd, + UINT id, + UINT timeout, + TIMERPROC proc + ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +SetSystemMenu ( HWND hwnd, HMENU hMenu ) +{ + 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 + */ +VOID +STDCALL +LoadLocalFonts ( VOID ) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID +STDCALL +LoadRemoteFonts ( VOID ) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID +STDCALL +SetInternalWindowPos( + HWND hwnd, + UINT showCmd, + LPRECT rect, + LPPOINT pt + ) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID +STDCALL +RegisterSystemThread ( DWORD flags, DWORD reserved ) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +DWORD +STDCALL +RegisterLogonProcess ( HANDLE hprocess, BOOL x ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +KillSystemTimer ( HWND hwnd, UINT id ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +DWORD +STDCALL +RegisterTasklist ( DWORD x ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +DWORD +STDCALL +SetLogonNotifyWindow ( HWINSTA hwinsta, HWND hwnd ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +DWORD +STDCALL +DragObject( + HWND hwnd1, + HWND hwnd2, + UINT u1, + DWORD dw1, + HCURSOR hc1 + ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +GetUserObjectSecurity( + HANDLE hObj, + PSECURITY_INFORMATION pSIRequested, + PSECURITY_DESCRIPTOR pSID, + DWORD nLength, + LPDWORD lpnLengthNeeded + ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +SetUserObjectSecurity( + HANDLE hObj, + PSECURITY_INFORMATION pSIRequested, + PSECURITY_DESCRIPTOR pSID + ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +UnhookWindowsHook ( int nCode, HOOKPROC pfnFilterProc ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +UINT +STDCALL +UserRealizePalette ( HDC hDC ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +DWORD +STDCALL +DrawMenuBarTemp( + HWND hwnd, + HDC hDC, + LPRECT lprect, + HMENU hMenu, + HFONT hFont + ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +SetSysColorsTemp( + const COLORREF *pPens, + const HBRUSH *pBrushes, + DWORD n + ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WORD +STDCALL +CascadeChildWindows ( HWND hWndParent, WORD wFlags ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WORD +STDCALL +TileChildWindows ( HWND hWndParent, WORD wFlags ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +HDESK +STDCALL +GetInputDesktop ( VOID ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +DrawFrame( + HDC hDc, + RECT *r, + DWORD width, + DWORD type + ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +LockWindowStation ( HWINSTA hWinSta ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +UnlockWindowStation ( HWINSTA hWinSta ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +GetAccCursorInfo ( PCURSORINFO pci ) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +WINBOOL +STDCALL +ClientThreadSetup ( VOID ) +{ + UNIMPLEMENTED; + return FALSE; +} diff --git a/reactos/lib/user32/user32.def b/reactos/lib/user32/user32.def index 8ee5c2371c5..239a3cb4455 100644 --- a/reactos/lib/user32/user32.def +++ b/reactos/lib/user32/user32.def @@ -19,21 +19,21 @@ BringWindowToTop@4 BroadcastSystemMessage@20 BroadcastSystemMessageA@20 BroadcastSystemMessageW@20 -;CallMsgFilter@8 +CallMsgFilter@8 CallMsgFilterA@8 CallMsgFilterW@8 CallNextHookEx@16 CallWindowProcA@20 CallWindowProcW@20 -;CascadeChildWindows +CascadeChildWindows@8 CascadeWindows@20 ChangeClipboardChain@8 ChangeDisplaySettingsA@8 ChangeDisplaySettingsExA@20 ChangeDisplaySettingsExW@20 ChangeDisplaySettingsW@8 -;ChangeMenuA -;ChangeMenuW +ChangeMenuA@20 +ChangeMenuW@20 CharLowerA@4 CharLowerBuffA@8 CharLowerBuffW@8 @@ -59,7 +59,7 @@ CheckRadioButton@16 ChildWindowFromPoint@12 ChildWindowFromPointEx@16 ;CliImmSetHotKey -;ClientThreadSetup +ClientThreadSetup@0 ClientToScreen@8 ClipCursor@4 CloseClipboard@0 @@ -110,7 +110,7 @@ DdeDisconnect@4 DdeDisconnectList@4 DdeEnableCallback@12 DdeFreeDataHandle@4 -;DdeFreeStringHandle@8 +DdeFreeStringHandle@8 DdeGetData@16 DdeGetLastError@4 ;DdeGetQualityOfService @@ -139,7 +139,7 @@ DefWindowProcA@16 DefWindowProcW@16 DeferWindowPos@32 DeleteMenu@12 -;DeregisterShellHookWindow +DeregisterShellHookWindow@4 DestroyAcceleratorTable@4 DestroyCaret@0 DestroyCursor@4 @@ -163,26 +163,26 @@ DlgDirSelectComboBoxExW@16 DlgDirSelectExA@16 DlgDirSelectExW@16 DragDetect@12 -;DragObject +DragObject@20 DrawAnimatedRects@16 DrawCaption@16 -;DrawCaptionTempA -;DrawCaptionTempW +DrawCaptionTempA@28 +DrawCaptionTempW@28 DrawEdge@16 DrawFocusRect@8 -;DrawFrame +DrawFrame@16 DrawFrameControl DrawIcon@16 DrawIconEx@36 DrawMenuBar@4 -;DrawMenuBarTemp +DrawMenuBarTemp@20 DrawStateA@40 DrawStateW@40 DrawTextA@20 DrawTextExA@24 DrawTextExW@24 DrawTextW@20 -;EditWndProc +EditWndProc@16 EmptyClipboard@0 EnableMenuItem@12 EnableScrollBar@12 @@ -191,7 +191,7 @@ EndDeferWindowPos@4 EndDialog@8 EndMenu@0 EndPaint@8 -;EndTask +EndTask@12 EnumChildWindows@12 EnumClipboardFormats@4 EnumDesktopWindows@12 @@ -224,11 +224,12 @@ FlashWindow@8 FlashWindowEx@4 FrameRect@12 FreeDDElParam@8 +GetAccCursorInfo@4 GetActiveWindow@0 GetAltTabInfoA@20 GetAltTabInfoW@20 GetAncestor@8 -;GetAppCompatFlags +GetAppCompatFlags@4 ;GetAppCompatFlags2 GetAsyncKeyState@4 GetCapture@0 @@ -271,9 +272,9 @@ GetForegroundWindow@0 GetGUIThreadInfo@8 GetGuiResources@8 GetIconInfo@8 -;GetInputDesktop +GetInputDesktop@0 GetInputState@0 -;GetInternalWindowPos +GetInternalWindowPos@12 GetKBCodePage@0 GetKeyNameTextA@12 GetKeyNameTextW@12 @@ -316,7 +317,7 @@ GetParent@4 GetPriorityClipboardFormat@8 GetProcessDefaultLayout@4 GetProcessWindowStation@0 -;GetProgmanWindow +GetProgmanWindow@0 GetPropA@8 GetPropW@8 GetQueueStatus@4 @@ -333,7 +334,7 @@ GetSystemMenu@8 GetSystemMetrics@4 GetTabbedTextExtentA@20 GetTabbedTextExtentW@20 -;GetTaskmanWindow +GetTaskmanWindow@0 GetThreadDesktop@4 GetTitleBarInfo@8 GetTopWindow@4 @@ -341,7 +342,7 @@ GetUpdateRect@12 GetUpdateRgn@12 GetUserObjectInformationA@20 GetUserObjectInformationW@20 -;GetUserObjectSecurity +GetUserObjectSecurity@20 ;GetWinStationInfo GetWindow@8 GetWindowContextHelpId@4 @@ -396,11 +397,11 @@ IsCharUpperA@4 IsCharUpperW@4 IsChild@8 IsClipboardFormatAvailable@4 -;IsDialogMessage@8 +IsDialogMessage@8 IsDialogMessageA@8 IsDialogMessageW@8 IsDlgButtonChecked@8 -;IsHungAppWindow +IsHungAppWindow@4 IsIconic@4 IsMenu@4 IsRectEmpty@4 @@ -409,7 +410,7 @@ IsWindowEnabled@4 IsWindowUnicode@4 IsWindowVisible@4 IsZoomed@4 -;KillSystemTimer +KillSystemTimer@8 KillTimer@8 LoadAcceleratorsA@8 LoadAcceleratorsW@8 @@ -426,16 +427,16 @@ LoadImageW@24 LoadKeyboardLayoutA@8 ;LoadKeyboardLayoutEx LoadKeyboardLayoutW@8 -;LoadLocalFonts +LoadLocalFonts@0 LoadMenuA@8 LoadMenuIndirectA@4 LoadMenuIndirectW@4 LoadMenuW@8 -;LoadRemoteFonts +LoadRemoteFonts@0 LoadStringA@16 LoadStringW@16 LockSetForegroundWindow@4 -;LockWindowStation +LockWindowStation@4 LockWindowUpdate@4 LockWorkStation@0 LookupIconIdFromDirectory@8 @@ -448,9 +449,10 @@ MapVirtualKeyExA@12 MapVirtualKeyExW@12 MapVirtualKeyW@8 MapWindowPoints@16 +MB_GetString@4 MenuItemFromPoint@16 -;MenuWindowProcA -;MenuWindowProcW +MenuWindowProcA@16 +MenuWindowProcW@16 MessageBeep@4 MessageBoxA@16 MessageBoxExA@20 @@ -466,7 +468,7 @@ MonitorFromWindow@8 MoveWindow@24 MsgWaitForMultipleObjects@20 MsgWaitForMultipleObjectsEx@20 -;NotifyWinEvent +NotifyWinEvent@16 OemKeyScan@4 OemToCharA@8 OemToCharBuffA@12 @@ -489,10 +491,10 @@ PostMessageW@16 PostQuitMessage@4 PostThreadMessageA@16 PostThreadMessageW@16 -;PrivateExtractIconExA -;PrivateExtractIconExW -;PrivateExtractIconsA -;PrivateExtractIconsW +PrivateExtractIconExA@20 +PrivateExtractIconExW@20 +PrivateExtractIconsA@32 +PrivateExtractIconsW@32 ;PrivateSetDbgTag ;PrivateSetRipFlags PtInRect@12 @@ -511,11 +513,11 @@ RegisterClipboardFormatW@4 ;RegisterDeviceNotificationA@12 ;RegisterDeviceNotificationW@12 RegisterHotKey@16 -;RegisterLogonProcess +RegisterLogonProcess@8 RegisterServicesProcess@4 -;RegisterShellHookWindow -;RegisterSystemThread -;RegisterTasklist +RegisterShellHookWindow@4 +RegisterSystemThread@8 +RegisterTasklist@4 RegisterWindowMessageA@4 RegisterWindowMessageW@4 ReleaseCapture@0 @@ -527,7 +529,7 @@ ReplyMessage@4 ;ResolveDesktopForWOW ReuseDDElParam@20 ScreenToClient@8 -;ScrollChildren +ScrollChildren@16 ScrollDC@28 ScrollWindow@20 ScrollWindowEx@32 @@ -558,7 +560,7 @@ SetCursor@4 ;SetCursorContents SetCursorPos@8 SetDebugErrorLevel@4 -;SetDeskWallpaper +SetDeskWallpaper@4 ;SetDesktopBitmap SetDlgItemInt@16 SetDlgItemTextA@12 @@ -566,11 +568,11 @@ SetDlgItemTextW@12 SetDoubleClickTime@4 SetFocus@4 SetForegroundWindow@4 -;SetInternalWindowPos +SetInternalWindowPos@16 SetKeyboardState@4 SetLastErrorEx@8 SetLayeredWindowAttributes@16 -;SetLogonNotifyWindow +SetLogonNotifyWindow@8 SetMenu@8 SetMenuContextHelpId@8 SetMenuDefaultItem@12 @@ -579,11 +581,11 @@ SetMenuItemBitmaps@20 SetMenuItemInfoA@16 SetMenuItemInfoW@16 SetMessageExtraInfo@4 -;SetMessageQueue +SetMessageQueue@4 SetParent@8 SetProcessDefaultLayout@4 SetProcessWindowStation@4 -;SetProgmanWindow +SetProgmanWindow@4 SetPropA@12 SetPropW@12 SetRect@20 @@ -594,31 +596,31 @@ SetScrollRange@20 SetShellWindow@4 SetShellWindowEx@8 SetSysColors@12 -;SetSysColorsTemp +SetSysColorsTemp@12 SetSystemCursor@8 -;SetSystemMenu -;SetSystemTimer -;SetTaskmanWindow +SetSystemMenu@8 +SetSystemTimer@16 +SetTaskmanWindow@4 SetThreadDesktop@4 SetTimer@16 SetUserObjectInformationA@16 SetUserObjectInformationW@16 -;SetUserObjectSecurity -;SetWinEventHook +SetUserObjectSecurity@12 +SetWinEventHook@28 SetWindowContextHelpId@8 SetWindowLongA@12 SetWindowLongW@12 SetWindowPlacement@8 SetWindowPos@28 SetWindowRgn@12 -;SetWindowStationUser +SetWindowStationUser@8 SetWindowTextA@8 SetWindowTextW@8 -;SetWindowWord -;SetWindowsHookA +SetWindowWord@12 +SetWindowsHookA@8 SetWindowsHookExA SetWindowsHookExW -;SetWindowsHookW +SetWindowsHookW@8 ShowCaret@4 ShowCursor@4 ShowOwnedPopups@8 @@ -630,12 +632,12 @@ SoftModalMessageBox@4 SubtractRect@12 SwapMouseButton@4 SwitchDesktop@4 -;SwitchToThisWindow +SwitchToThisWindow@8 SystemParametersInfoA@16 SystemParametersInfoW@16 TabbedTextOutA@32 TabbedTextOutW@32 -;TileChildWindows +TileChildWindows@8 TileWindows@20 ToAscii@20 ToAsciiEx@24 @@ -648,13 +650,13 @@ TranslateAcceleratorA@12 TranslateAcceleratorW@12 TranslateMDISysAccel@8 TranslateMessage@4 -;TranslateMessageEx -;UnhookWinEvent -;UnhookWindowsHook +TranslateMessageEx@8 +UnhookWinEvent@4 +UnhookWindowsHook@8 UnhookWindowsHookEx@4 UnionRect@12 UnloadKeyboardLayout@4 -;UnlockWindowStation +UnlockWindowStation@4 UnpackDDElParam@16 UnregisterClassA@8 UnregisterClassW@8 @@ -664,11 +666,11 @@ UpdateLayeredWindow@36 ;UpdatePerUserSystemParameters UpdateWindow@4 ;User32InitializeImmEntryTable -;UserClientDllInitialize +UserClientDllInitialize@12 UserHandleGrantAccess@12 ;UserLpkPSMTextOut ;UserLpkTabbedTextOut -;UserRealizePalette +UserRealizePalette@4 ;UserRegisterWowHandlers ;VRipOutput ;VTagOutput diff --git a/reactos/lib/user32/user32.edf b/reactos/lib/user32/user32.edf index c43423d204f..49c531e309c 100644 --- a/reactos/lib/user32/user32.edf +++ b/reactos/lib/user32/user32.edf @@ -19,21 +19,21 @@ BringWindowToTop=BringWindowToTop@4 BroadcastSystemMessage=BroadcastSystemMessage@20 BroadcastSystemMessageA=BroadcastSystemMessageA@20 BroadcastSystemMessageW=BroadcastSystemMessageW@20 -;CallMsgFilter@8 +CallMsgFilter=CallMsgFilterA@8 CallMsgFilterA=CallMsgFilterA@8 CallMsgFilterW=CallMsgFilterW@8 CallNextHookEx=CallNextHookEx@16 CallWindowProcA=CallWindowProcA@20 CallWindowProcW=CallWindowProcW@20 -;CascadeChildWindows +CascadeChildWindows=CascadeChildWindows@8 CascadeWindows=CascadeWindows@20 ChangeClipboardChain=ChangeClipboardChain@8 ChangeDisplaySettingsA=ChangeDisplaySettingsA@8 ChangeDisplaySettingsExA=ChangeDisplaySettingsExA@20 ChangeDisplaySettingsExW=ChangeDisplaySettingsExW@20 ChangeDisplaySettingsW=ChangeDisplaySettingsW@8 -;ChangeMenuA -;ChangeMenuW +ChangeMenuA=ChangeMenuA@20 +ChangeMenuW=ChangeMenuW@20 CharLowerA=CharLowerA@4 CharLowerBuffA=CharLowerBuffA@8 CharLowerBuffW=CharLowerBuffW@8 @@ -59,7 +59,7 @@ CheckRadioButton=CheckRadioButton@16 ChildWindowFromPoint=ChildWindowFromPoint@12 ChildWindowFromPointEx=ChildWindowFromPointEx@16 ;CliImmSetHotKey -;ClientThreadSetup +ClientThreadSetup=ClientThreadSetup@0 ClientToScreen=ClientToScreen@8 ClipCursor=ClipCursor@4 CloseClipboard=CloseClipboard@0 @@ -110,7 +110,7 @@ DdeDisconnect=DdeDisconnect@4 DdeDisconnectList=DdeDisconnectList@4 DdeEnableCallback=DdeEnableCallback@12 DdeFreeDataHandle=DdeFreeDataHandle@4 -;DdeFreeStringHandle@8 +DdeFreeStringHandle=DdeFreeStringHandle@8 DdeGetData=DdeGetData@16 DdeGetLastError=DdeGetLastError@4 ;DdeGetQualityOfService @@ -139,7 +139,7 @@ DefWindowProcA=DefWindowProcA@16 DefWindowProcW=DefWindowProcW@16 DeferWindowPos=DeferWindowPos@32 DeleteMenu=DeleteMenu@12 -;DeregisterShellHookWindow +DeregisterShellHookWindow=DeregisterShellHookWindow@4 DestroyAcceleratorTable=DestroyAcceleratorTable@4 DestroyCaret=DestroyCaret@0 DestroyCursor=DestroyCursor@4 @@ -163,26 +163,26 @@ DlgDirSelectComboBoxExW=DlgDirSelectComboBoxExW@16 DlgDirSelectExA=DlgDirSelectExA@16 DlgDirSelectExW=DlgDirSelectExW@16 DragDetect=DragDetect@12 -;DragObject +DragObject=DragObject@20 DrawAnimatedRects=DrawAnimatedRects@16 DrawCaption=DrawCaption@16 -;DrawCaptionTempA -;DrawCaptionTempW +DrawCaptionTempA=DrawCaptionTempA@28 +DrawCaptionTempW=DrawCaptionTempW@28 DrawEdge=DrawEdge@16 DrawFocusRect=DrawFocusRect@8 -;DrawFrame +DrawFrame=DrawFrame@16 DrawFrameControl=DrawFrameControl@16 DrawIcon=DrawIcon@16 DrawIconEx=DrawIconEx@36 DrawMenuBar=DrawMenuBar@4 -;DrawMenuBarTemp +DrawMenuBarTemp=DrawMenuBarTemp@20 DrawStateA=DrawStateA@40 DrawStateW=DrawStateW@40 DrawTextA=DrawTextA@20 DrawTextExA=DrawTextExA@24 DrawTextExW=DrawTextExW@24 DrawTextW=DrawTextW@20 -;EditWndProc +EditWndProc=EditWndProc@16 EmptyClipboard=EmptyClipboard@0 EnableMenuItem=EnableMenuItem@12 EnableScrollBar=EnableScrollBar@12 @@ -191,7 +191,7 @@ EndDeferWindowPos=EndDeferWindowPos@4 EndDialog=EndDialog@8 EndMenu=EndMenu@0 EndPaint=EndPaint@8 -;EndTask +EndTask=EndTask@12 EnumChildWindows=EnumChildWindows@12 EnumClipboardFormats=EnumClipboardFormats@4 EnumDesktopWindows=EnumDesktopWindows@12 @@ -224,11 +224,13 @@ FlashWindow=FlashWindow@8 FlashWindowEx=FlashWindowEx@4 FrameRect=FrameRect@12 FreeDDElParam=FreeDDElParam@8 +GetAccCursorInfo=GetAccCursorInfo@4 GetActiveWindow=GetActiveWindow@0 +GetAltTabInfo=GetAltTabInfoA@20 GetAltTabInfoA=GetAltTabInfoA@20 GetAltTabInfoW=GetAltTabInfoW@20 GetAncestor=GetAncestor@8 -;GetAppCompatFlags +GetAppCompatFlags=GetAppCompatFlags@4 ;GetAppCompatFlags2 GetAsyncKeyState=GetAsyncKeyState@4 GetCapture=GetCapture@0 @@ -271,9 +273,9 @@ GetForegroundWindow=GetForegroundWindow@0 GetGUIThreadInfo=GetGUIThreadInfo@8 GetGuiResources=GetGuiResources@8 GetIconInfo=GetIconInfo@8 -;GetInputDesktop +GetInputDesktop=GetInputDesktop@0 GetInputState=GetInputState@0 -;GetInternalWindowPos +GetInternalWindowPos=GetInternalWindowPos@12 GetKBCodePage=GetKBCodePage@0 GetKeyNameTextA=GetKeyNameTextA@12 GetKeyNameTextW=GetKeyNameTextW@12 @@ -316,7 +318,7 @@ GetParent=GetParent@4 GetPriorityClipboardFormat=GetPriorityClipboardFormat@8 GetProcessDefaultLayout=GetProcessDefaultLayout@4 GetProcessWindowStation=GetProcessWindowStation@0 -;GetProgmanWindow +GetProgmanWindow=GetProgmanWindow@0 GetPropA=GetPropA@8 GetPropW=GetPropW@8 GetQueueStatus=GetQueueStatus@4 @@ -333,7 +335,7 @@ GetSystemMenu=GetSystemMenu@8 GetSystemMetrics=GetSystemMetrics@4 GetTabbedTextExtentA=GetTabbedTextExtentA@20 GetTabbedTextExtentW=GetTabbedTextExtentW@20 -;GetTaskmanWindow +GetTaskmanWindow=GetTaskmanWindow@0 GetThreadDesktop=GetThreadDesktop@4 GetTitleBarInfo=GetTitleBarInfo@8 GetTopWindow=GetTopWindow@4 @@ -341,7 +343,7 @@ GetUpdateRect=GetUpdateRect@12 GetUpdateRgn=GetUpdateRgn@12 GetUserObjectInformationA=GetUserObjectInformationA@20 GetUserObjectInformationW=GetUserObjectInformationW@20 -;GetUserObjectSecurity +GetUserObjectSecurity=GetUserObjectSecurity@20 ;GetWinStationInfo GetWindow=GetWindow@8 GetWindowContextHelpId=GetWindowContextHelpId@4 @@ -396,11 +398,11 @@ IsCharUpperA=IsCharUpperA@4 IsCharUpperW=IsCharUpperW@4 IsChild=IsChild@8 IsClipboardFormatAvailable=IsClipboardFormatAvailable@4 -;IsDialogMessage@8 +IsDialogMessage=IsDialogMessageA@8 IsDialogMessageA=IsDialogMessageA@8 IsDialogMessageW=IsDialogMessageW@8 IsDlgButtonChecked=IsDlgButtonChecked@8 -;IsHungAppWindow +IsHungAppWindow=IsHungAppWindow@4 IsIconic=IsIconic@4 IsMenu=IsMenu@4 IsRectEmpty=IsRectEmpty@4 @@ -409,7 +411,7 @@ IsWindowEnabled=IsWindowEnabled@4 IsWindowUnicode=IsWindowUnicode@4 IsWindowVisible=IsWindowVisible@4 IsZoomed=IsZoomed@4 -;KillSystemTimer +KillSystemTimer=KillSystemTimer@8 KillTimer=KillTimer@8 LoadAcceleratorsA=LoadAcceleratorsA@8 LoadAcceleratorsW=LoadAcceleratorsW@8 @@ -426,16 +428,16 @@ LoadImageW=LoadImageW@24 LoadKeyboardLayoutA=LoadKeyboardLayoutA@8 ;LoadKeyboardLayoutEx LoadKeyboardLayoutW=LoadKeyboardLayoutW@8 -;LoadLocalFonts +LoadLocalFonts=LoadLocalFonts@0 LoadMenuA=LoadMenuA@8 LoadMenuIndirectA=LoadMenuIndirectA@4 LoadMenuIndirectW=LoadMenuIndirectW@4 LoadMenuW=LoadMenuW@8 -;LoadRemoteFonts +LoadRemoteFonts=LoadRemoteFonts@0 LoadStringA=LoadStringA@16 LoadStringW=LoadStringW@16 LockSetForegroundWindow=LockSetForegroundWindow@4 -;LockWindowStation +LockWindowStation=LockWindowStation@4 LockWindowUpdate=LockWindowUpdate@4 LockWorkStation=LockWorkStation@0 LookupIconIdFromDirectory=LookupIconIdFromDirectory@8 @@ -448,9 +450,10 @@ MapVirtualKeyExA=MapVirtualKeyExA@12 MapVirtualKeyExW=MapVirtualKeyExW@12 MapVirtualKeyW=MapVirtualKeyW@8 MapWindowPoints=MapWindowPoints@16 +MB_GetString=MB_GetString@4 MenuItemFromPoint=MenuItemFromPoint@16 -;MenuWindowProcA -;MenuWindowProcW +MenuWindowProcA=MenuWindowProcA@16 +MenuWindowProcW=MenuWindowProcW@16 MessageBeep=MessageBeep@4 MessageBoxA=MessageBoxA@16 MessageBoxExA=MessageBoxExA@20 @@ -466,7 +469,7 @@ MonitorFromWindow=MonitorFromWindow@8 MoveWindow=MoveWindow@24 MsgWaitForMultipleObjects=MsgWaitForMultipleObjects@20 MsgWaitForMultipleObjectsEx=MsgWaitForMultipleObjectsEx@20 -;NotifyWinEvent +NotifyWinEvent=NotifyWinEvent@16 OemKeyScan=OemKeyScan@4 OemToCharA=OemToCharA@8 OemToCharBuffA=OemToCharBuffA@12 @@ -489,16 +492,17 @@ PostMessageW=PostMessageW@16 PostQuitMessage=PostQuitMessage@4 PostThreadMessageA=PostThreadMessageA@16 PostThreadMessageW=PostThreadMessageW@16 -;PrivateExtractIconExA -;PrivateExtractIconExW -;PrivateExtractIconsA -;PrivateExtractIconsW +PrivateExtractIconExA=PrivateExtractIconExA@20 +PrivateExtractIconExW=PrivateExtractIconExW@20 +PrivateExtractIconsA=PrivateExtractIconsA@32 +PrivateExtractIconsW=PrivateExtractIconsW@32 ;PrivateSetDbgTag ;PrivateSetRipFlags PtInRect=PtInRect@12 ;QuerySendMessage ;QueryUserCounters RealChildWindowFromPoint=RealChildWindowFromPoint@12 +RealGetWindowClass=RealGetWindowClassA@12 RealGetWindowClassA=RealGetWindowClassA@12 RealGetWindowClassW=RealGetWindowClassW@12 RedrawWindow=RedrawWindow@16 @@ -511,11 +515,11 @@ RegisterClipboardFormatW=RegisterClipboardFormatW@4 ;RegisterDeviceNotificationA@12 ;RegisterDeviceNotificationW@12 RegisterHotKey=RegisterHotKey@16 -;RegisterLogonProcess +RegisterLogonProcess=RegisterLogonProcess@8 RegisterServicesProcess=RegisterServicesProcess@4 -;RegisterShellHookWindow -;RegisterSystemThread -;RegisterTasklist +RegisterShellHookWindow=RegisterShellHookWindow@4 +RegisterSystemThread=RegisterSystemThread@8 +RegisterTasklist=RegisterTasklist@4 RegisterWindowMessageA=RegisterWindowMessageA@4 RegisterWindowMessageW=RegisterWindowMessageW@4 ReleaseCapture=ReleaseCapture@0 @@ -527,7 +531,7 @@ ReplyMessage=ReplyMessage@4 ;ResolveDesktopForWOW ReuseDDElParam=ReuseDDElParam@20 ScreenToClient=ScreenToClient@8 -;ScrollChildren +ScrollChildren=ScrollChildren@16 ScrollDC=ScrollDC@28 ScrollWindow=ScrollWindow@20 ScrollWindowEx=ScrollWindowEx@32 @@ -558,7 +562,7 @@ SetCursor=SetCursor@4 ;SetCursorContents SetCursorPos=SetCursorPos@8 SetDebugErrorLevel=SetDebugErrorLevel@4 -;SetDeskWallpaper +SetDeskWallpaper=SetDeskWallpaper@4 ;SetDesktopBitmap SetDlgItemInt=SetDlgItemInt@16 SetDlgItemTextA=SetDlgItemTextA@12 @@ -566,11 +570,11 @@ SetDlgItemTextW=SetDlgItemTextW@12 SetDoubleClickTime=SetDoubleClickTime@4 SetFocus=SetFocus@4 SetForegroundWindow=SetForegroundWindow@4 -;SetInternalWindowPos +SetInternalWindowPos=SetInternalWindowPos@16 SetKeyboardState=SetKeyboardState@4 SetLastErrorEx=SetLastErrorEx@8 SetLayeredWindowAttributes=SetLayeredWindowAttributes@16 -;SetLogonNotifyWindow +SetLogonNotifyWindow=SetLogonNotifyWindow@8 SetMenu=SetMenu@8 SetMenuContextHelpId=SetMenuContextHelpId@8 SetMenuDefaultItem=SetMenuDefaultItem@12 @@ -579,11 +583,11 @@ SetMenuItemBitmaps=SetMenuItemBitmaps@20 SetMenuItemInfoA=SetMenuItemInfoA@16 SetMenuItemInfoW=SetMenuItemInfoW@16 SetMessageExtraInfo=SetMessageExtraInfo@4 -;SetMessageQueue +SetMessageQueue=SetMessageQueue@4 SetParent=SetParent@8 SetProcessDefaultLayout=SetProcessDefaultLayout@4 SetProcessWindowStation=SetProcessWindowStation@4 -;SetProgmanWindow +SetProgmanWindow=SetProgmanWindow@4 SetPropA=SetPropA@12 SetPropW=SetPropW@12 SetRect=SetRect@20 @@ -592,33 +596,33 @@ SetScrollInfo=SetScrollInfo@16 SetScrollPos=SetScrollPos@16 SetScrollRange=SetScrollRange@20 SetShellWindow=SetShellWindow@4 -;SetShellWindowEx +SetShellWindowEx=SetShellWindowEx@8 SetSysColors=SetSysColors@12 -;SetSysColorsTemp +SetSysColorsTemp=SetSysColorsTemp@12 SetSystemCursor=SetSystemCursor@8 -;SetSystemMenu -;SetSystemTimer -;SetTaskmanWindow +SetSystemMenu=SetSystemMenu@8 +SetSystemTimer=SetSystemTimer@16 +SetTaskmanWindow=SetTaskmanWindow@4 SetThreadDesktop=SetThreadDesktop@4 SetTimer=SetTimer@16 SetUserObjectInformationA=SetUserObjectInformationA@16 SetUserObjectInformationW=SetUserObjectInformationW@16 -;SetUserObjectSecurity -;SetWinEventHook +SetUserObjectSecurity=SetUserObjectSecurity@12 +SetWinEventHook=SetWinEventHook@28 SetWindowContextHelpId=SetWindowContextHelpId@8 SetWindowLongA=SetWindowLongA@12 SetWindowLongW=SetWindowLongW@12 SetWindowPlacement=SetWindowPlacement@8 SetWindowPos=SetWindowPos@28 SetWindowRgn=SetWindowRgn@12 -;SetWindowStationUser +SetWindowStationUser=SetWindowStationUser@8 SetWindowTextA=SetWindowTextA@8 SetWindowTextW=SetWindowTextW@8 -;SetWindowWord -;SetWindowsHookA +SetWindowWord=SetWindowWord@12 +SetWindowsHookA=SetWindowsHookA@8 SetWindowsHookExA=SetWindowsHookExA@16 SetWindowsHookExW=SetWindowsHookExW@16 -;SetWindowsHookW +SetWindowsHookW=SetWindowsHookW@8 ShowCaret=ShowCaret@4 ShowCursor=ShowCursor@4 ShowOwnedPopups=ShowOwnedPopups@8 @@ -630,12 +634,12 @@ SoftModalMessageBox=SoftModalMessageBox@4 SubtractRect=SubtractRect@12 SwapMouseButton=SwapMouseButton@4 SwitchDesktop=SwitchDesktop@4 -;SwitchToThisWindow +SwitchToThisWindow=SwitchToThisWindow@8 SystemParametersInfoA=SystemParametersInfoA@16 SystemParametersInfoW=SystemParametersInfoW@16 TabbedTextOutA=TabbedTextOutA@32 TabbedTextOutW=TabbedTextOutW@32 -;TileChildWindows +TileChildWindows=TileChildWindows@8 TileWindows=TileWindows@20 ToAscii=ToAscii@20 ToAsciiEx=ToAsciiEx@24 @@ -649,13 +653,13 @@ TranslateAcceleratorA=TranslateAcceleratorA@12 TranslateAcceleratorW=TranslateAcceleratorW@12 TranslateMDISysAccel=TranslateMDISysAccel@8 TranslateMessage=TranslateMessage@4 -;TranslateMessageEx -;UnhookWinEvent -;UnhookWindowsHook +TranslateMessageEx=TranslateMessageEx@8 +UnhookWinEvent=UnhookWinEvent@4 +UnhookWindowsHook=UnhookWindowsHook@8 UnhookWindowsHookEx=UnhookWindowsHookEx@4 UnionRect=UnionRect@12 UnloadKeyboardLayout=UnloadKeyboardLayout@4 -;UnlockWindowStation +UnlockWindowStation=UnlockWindowStation@4 UnpackDDElParam=UnpackDDElParam@16 UnregisterClassA=UnregisterClassA@8 UnregisterClassW=UnregisterClassW@8 @@ -665,11 +669,12 @@ UpdateLayeredWindow=UpdateLayeredWindow@36 ;UpdatePerUserSystemParameters UpdateWindow=UpdateWindow@4 ;User32InitializeImmEntryTable -;UserClientDllInitialize +DllMain=DllMain@12 +UserClientDllInitialize=DllMain@12 UserHandleGrantAccess=UserHandleGrantAccess@12 ;UserLpkPSMTextOut ;UserLpkTabbedTextOut -;UserRealizePalette +UserRealizePalette=UserRealizePalette@4 ;UserRegisterWowHandlers ;VRipOutput ;VTagOutput diff --git a/reactos/lib/user32/windows/class.c b/reactos/lib/user32/windows/class.c index 6a66c1d8c33..c877816e09e 100644 --- a/reactos/lib/user32/windows/class.c +++ b/reactos/lib/user32/windows/class.c @@ -1,4 +1,4 @@ -/* $Id: class.c,v 1.28 2003/08/09 07:09:57 jimtabor Exp $ +/* $Id: class.c,v 1.29 2003/08/14 20:25:52 royce Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -241,8 +241,9 @@ GetClassWord( /* * @implemented */ -LONG STDCALL -GetWindowLongA(HWND hWnd, int nIndex) +LONG +STDCALL +GetWindowLongA ( HWND hWnd, int nIndex ) { return NtUserGetWindowLong(hWnd, nIndex, TRUE); } @@ -251,7 +252,8 @@ GetWindowLongA(HWND hWnd, int nIndex) /* * @implemented */ -LONG STDCALL +LONG +STDCALL GetWindowLongW(HWND hWnd, int nIndex) { return NtUserGetWindowLong(hWnd, nIndex, FALSE); @@ -260,12 +262,23 @@ GetWindowLongW(HWND hWnd, int nIndex) /* * @implemented */ -WORD STDCALL +WORD +STDCALL GetWindowWord(HWND hWnd, int nIndex) { return (WORD)NtUserGetWindowLong(hWnd, nIndex, TRUE); } +/* + * @implemented + */ +WORD +STDCALL +SetWindowWord ( HWND hWnd,int nIndex,WORD wNewWord ) +{ + return (WORD)NtUserSetWindowLong ( hWnd, nIndex, (LONG)wNewWord, TRUE ); +} + /* * @implemented */ @@ -298,7 +311,8 @@ RealGetWindowClassA( /* * @implemented */ -ATOM STDCALL +ATOM +STDCALL RegisterClassA(CONST WNDCLASSA *lpWndClass) { WNDCLASSEXA Class; diff --git a/reactos/lib/user32/windows/message.c b/reactos/lib/user32/windows/message.c index 1024aafe81f..1efff5075a9 100644 --- a/reactos/lib/user32/windows/message.c +++ b/reactos/lib/user32/windows/message.c @@ -1,4 +1,4 @@ -/* $Id: message.c,v 1.23 2003/08/11 10:30:19 gvg Exp $ +/* $Id: message.c,v 1.24 2003/08/14 20:25:52 royce Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -689,7 +689,16 @@ SendNotifyMessageW( WINBOOL STDCALL TranslateMessage(CONST MSG *lpMsg) { - return(NtUserTranslateMessage((LPMSG)lpMsg, 0)); + return(TranslateMessageEx((LPMSG)lpMsg, 0)); +} + +/* + * @implemented + */ +WINBOOL STDCALL +TranslateMessageEx(CONST MSG *lpMsg, DWORD unk) +{ + return(NtUserTranslateMessage((LPMSG)lpMsg, unk)); } @@ -814,6 +823,15 @@ WINBOOL STDCALL GetInputState(VOID) return wake_bits & (QS_KEY | QS_MOUSEBUTTON); } +/* + * @implemented + */ +WINBOOL STDCALL SetMessageQueue(int cMessagesMax) +{ + /* Function does nothing on 32 bit windows */ + return TRUE; +} + /* EOF */ diff --git a/reactos/lib/user32/windows/window.c b/reactos/lib/user32/windows/window.c index 0da6a052f50..de163284191 100644 --- a/reactos/lib/user32/windows/window.c +++ b/reactos/lib/user32/windows/window.c @@ -1,4 +1,4 @@ -/* $Id: window.c,v 1.57 2003/08/12 22:27:55 weiden Exp $ +/* $Id: window.c,v 1.58 2003/08/14 20:25:52 royce Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -1617,4 +1617,13 @@ InternalGetWindowText(HWND hWnd, LPWSTR lpString, int nMaxCount) return res; } +/* + * @implemented + */ +WINBOOL STDCALL IsHungAppWindow(HWND hwnd) +{ + /* FIXME: ReactOS doesnt identify hung app windows yet */ + return FALSE; +} + /* EOF */