Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[hbelusca] 66197: [WINLOGON] - Add DPRINTs to monitor how shutdown goes on (obviously they will go away when shutdown on ROS will be working). - Add dumb handler for LN_LOGOFF_CANCELED message (unu...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 7 20:46:27 2015 New Revision: 66197 URL: http://svn.reactos.org/svn/reactos?rev=66197&view=rev Log: [WINLOGON] - Add DPRINTs to monitor how shutdown goes on (obviously they will go away when shutdown on ROS will be working). - Add dumb handler for LN_LOGOFF_CANCELED message (unused for now...) [WIN32K]: DPRINTs added for monitoring shutdown. [WINSRV]: Start to plugin the whole thing (using pieces of Alex' shutdown patch): - We need to use a "shutdown" loop (for UserThreadInitiateShutdown win32k call) for being able to cancel shuts down (not implemented yet). - Add the "magic" call to CsrShutdownProcesses that calls the Shutdown callback of each CSR server for each Win32 process (these are those callbacks that do the real job of terminating the apps, displaying the "Kill the app" dialog, etc...). In few words, the old (disabled) code of InternalExitReactos need to go into those shutdown callbacks (but this is for other commits!). Part 9/X CORE-8322 #comment Continue plugging in the shutdown code (from Alex' patch) in WINSRV with adaptations into WINLOGON (+ adding DPRINTs for controlling the whole thing). Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/win32ss/user/ntuser/shutdown.c trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat Feb 7 20:46:27 2015 @@ -37,6 +37,8 @@ UINT Flags; PWLSESSION Session; } LOGOFF_SHUTDOWN_DATA, *PLOGOFF_SHUTDOWN_DATA; + +static BOOL ExitReactOSInProgress = FALSE; /* FUNCTIONS ****************************************************************/ @@ -499,25 +501,33 @@ LPVOID Parameter) { PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA)Parameter; - - if (LSData->Session->UserToken != NULL && !ImpersonateLoggedOnUser(LSData->Session->UserToken)) + UINT uFlags; + + if (LSData->Session->UserToken != NULL && + !ImpersonateLoggedOnUser(LSData->Session->UserToken)) { ERR("ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); return 0; } + uFlags = EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | + ((LSData->Flags & EWX_ACTION_MASK) == EWX_LOGOFF ? EWX_INTERNAL_FLAG_LOGOFF : 0); + + ERR("In LogoffShutdownThread with uFlags == 0x%x; exit_in_progress == %s\n", + uFlags, ExitReactOSInProgress ? "true" : "false"); + + ExitReactOSInProgress = TRUE; + /* Close processes of the interactive user */ - if (!ExitWindowsEx( - EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | - (EWX_LOGOFF == (LSData->Flags & EWX_ACTION_MASK) ? EWX_INTERNAL_FLAG_LOGOFF : 0), - 0)) + if (!ExitWindowsEx(uFlags, 0)) { ERR("Unable to kill user apps, error %lu\n", GetLastError()); RevertToSelf(); return 0; } - /* FIXME: Call ExitWindowsEx() to terminate COM processes */ + /* FIXME: Call ExitWindowsEx() to terminate COM processes only at logoff! */ + ERR("Should terminate COM processes only at logoff!\n"); if (LSData->Session->UserToken) RevertToSelf(); @@ -687,7 +697,7 @@ /* Run logoff thread */ hThread = CreateThread(psa, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); - /* we're done with the SECURITY_DESCRIPTOR */ + /* We're done with the SECURITY_DESCRIPTOR */ DestroyLogoffSecurityAttributes(psa); psa = NULL; @@ -1317,8 +1327,36 @@ } } + ERR("In LN_LOGOFF, exit_in_progress == %s\n", + ExitReactOSInProgress ? "true" : "false"); + + /* + * In case a parallel shutdown request is done (while we are + * being to shut down) and it was not done by Winlogon itself, + * then just stop here. + */ +#if 0 +// This code is commented at the moment (even if it's correct) because +// our log-offs do not really work: the shell is restarted, no app is killed +// etc... and as a result you just get explorer opening "My Documents". And +// if you try now a shut down, it won't work because winlogon thinks it is +// still in the middle of a shutdown. +// Maybe we also need to reset ExitReactOSInProgress somewhere else?? + if (ExitReactOSInProgress && (lParam & EWX_INTERNAL_FLAG) == 0) + { + break; + } +#endif /* Now do the shutdown action proper */ DoGenericAction(Session, wlxAction); + return 1; + } + case LN_LOGOFF_CANCELED: + { + ERR("Logoff canceled!!, before: exit_in_progress == %s, after will be false\n", + ExitReactOSInProgress ? "true" : "false"); + + ExitReactOSInProgress = FALSE; return 1; } default: Modified: trunk/reactos/win32ss/user/ntuser/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] Sat Feb 7 20:46:27 2015 @@ -228,11 +228,13 @@ if (PsGetThreadProcessId(Thread) != gpidLogon) { // FIXME: HACK!! Do more checks!! + ERR("UserInitiateShutdown -- Notify Winlogon for shutdown\n"); UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_LOGOFF, (LPARAM)Flags); return STATUS_PENDING; } // If we reach this point, that means it's Winlogon that triggered the shutdown. + ERR("UserInitiateShutdown -- Winlogon shuts down\n"); /* * FIXME: Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Sat Feb 7 20:46:27 2015 @@ -758,7 +758,7 @@ RegCloseKey(DesktopKey); } -static NTSTATUS FASTCALL +NTSTATUS FASTCALL InternalExitReactos(DWORD ProcessId, DWORD ThreadId, UINT Flags) { HANDLE CallerThread; @@ -772,7 +772,7 @@ TOKEN_USER *UserInfo; SHUTDOWN_SETTINGS ShutdownSettings; - if (ProcessId != (DWORD_PTR) LogonProcessId) + if (ProcessId != LogonProcessId) { DPRINT1("Internal ExitWindowsEx call not from winlogon\n"); return STATUS_ACCESS_DENIED; @@ -902,11 +902,17 @@ NTSTATUS Status; LUID CallerLuid; - // FIXME: HACK!! - /* - * Retrieve the caller's LUID so that we can only shutdown - * processes in the caller's LUID. + * Check for flags validity + */ + + /* Implicitely add the shutdown flag when we poweroff or reboot */ + if (Flags & (EWX_POWEROFF | EWX_REBOOT)) + Flags |= EWX_SHUTDOWN; + + /* + * Impersonate and retrieve the caller's LUID so that + * we can only shutdown processes in its context. */ if (!CsrImpersonateClient(NULL)) return STATUS_BAD_IMPERSONATION_LEVEL; @@ -920,27 +926,84 @@ DPRINT1("Caller LUID is: %lx.%lx\n", CallerLuid.HighPart, CallerLuid.LowPart); - /* Notify Win32k and potentially Winlogon of the shutdown */ - Status = NtUserSetInformationThread(CsrThread->ThreadHandle, - UserThreadInitiateShutdown, - &Flags, sizeof(Flags)); - DPRINT1("Win32k says: %lx\n", Status); - - /* If the message isn't handled, the return value is 0, so 0 doesn't indicate - success. Success is indicated by a 1 return value, if anything besides 0 - or 1 it's a NTSTATUS value */ - if (1 == Status) - { - Status = STATUS_SUCCESS; - } - else if (0 == Status) - { - Status = STATUS_NOT_IMPLEMENTED; - } + /* Shutdown loop */ + while (TRUE) + { + /* Notify Win32k and potentially Winlogon of the shutdown */ + Status = NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadInitiateShutdown, + &Flags, sizeof(Flags)); + DPRINT1("Win32k says: %lx\n", Status); + switch (Status) + { + /* We cannot wait here, the caller should start a new thread */ + case STATUS_CANT_WAIT: + DPRINT1("STATUS_CANT_WAIT\n"); + goto Quit; + + /* Shutdown is in progress */ + case STATUS_PENDING: + DPRINT1("STATUS_PENDING\n"); + goto Quit; + + /* Abort */ + case STATUS_RETRY: + { + DPRINT1("STATUS_RETRY\n"); + UNIMPLEMENTED; + continue; + } + + default: + { + if (!NT_SUCCESS(Status)) + { + // FIXME: Use some UserSetLastNTError or SetLastNtError + // that we have defined for user32 or win32k usage only... + SetLastError(RtlNtStatusToDosError(Status)); + goto Quit; + } + } + } + + /* All good */ + break; + } + + /* + * OK we can continue. Now magic happens: + * + * Terminate all Win32 processes, stop if we find one kicking + * and screaming it doesn't want to die. + * + * This function calls the ShutdownProcessCallback callback of + * each CSR server for each Win32 process. + */ + Status = CsrShutdownProcesses(&CallerLuid, Flags); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to shutdown processes, Status = 0x%08x\n", Status); + } + /* + * FIXME: + * At the moment the callbacks just do nothing so no process will be killed. + * It's not dramatic since: + * 1- We didn't do that before, + * 2- Related to point 1, the hackish InternalExitReactos call will end back + * into Winlogon that will directly call NtShutdownSystem. + */ + + // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason + + /* Tell Win32k and potentially Winlogon that we're done */ + NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadEndShutdown, + &Status, sizeof(Status)); DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); Quit: + /* We are done */ CsrRevertToSelf(); return Status; } @@ -970,33 +1033,35 @@ PCSR_THREAD CsrThread = CsrGetClientThread(); ULONG Flags = ExitReactosRequest->Flags; - /* - * Check for flags validity - */ - DWORD ProcessId = HandleToUlong(CsrThread->ClientId.UniqueProcess); DWORD ThreadId = HandleToUlong(CsrThread->ClientId.UniqueThread); DPRINT1("SrvExitWindowsEx(ClientId: %lx.%lx, Flags: 0x%x)\n", ProcessId, ThreadId, Flags); - /* Implicitely add the shutdown flag when we poweroff or reboot */ - if (Flags & (EWX_POWEROFF | EWX_REBOOT)) - Flags |= EWX_SHUTDOWN; - // FIXME: Everything else starting after this line is a HAAACK!! - if (0 == (Flags & EWX_INTERNAL_FLAG)) - { + if (Flags & EWX_INTERNAL_FLAG) + { + /* Only Winlogon can call this */ + if (ProcessId != LogonProcessId) + { + DPRINT1("SrvExitWindowsEx call not from Winlogon\n"); + return STATUS_ACCESS_DENIED; + } + + // This function is a HACK!! + // EWX_INTERNAL_FLAG --> For Winlogon only!! + // Status = InternalExitReactos(ProcessId, ThreadId, Flags); + + // This is this function that we need to call instead! Status = UserExitReactos(CsrThread, Flags); } else { - // EWX_INTERNAL_FLAG --> For Winlogon only!! - // FIXME: This is just a big HAAAACK!! - Status = InternalExitReactos(ProcessId, ThreadId, Flags); + Status = UserExitReactos(CsrThread, Flags); } ExitReactosRequest->Success = NT_SUCCESS(Status);

9 years, 9 months

[akhaldi] 66196: [WIN32K:INCLUDES] Some formatting fixes. NFC.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 7 19:14:42 2015 New Revision: 66196 URL: http://svn.reactos.org/svn/reactos?rev=66196&view=rev Log: [WIN32K:INCLUDES] Some formatting fixes. NFC. Modified: trunk/reactos/win32ss/include/ntuser.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Feb 7 19:14:42 2015 @@ -10,32 +10,32 @@ typedef HANDLE HIMC; #endif -#define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ -#define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ +#define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ +#define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ #define HANDLEENTRY_INDESTROY 1 typedef struct _USER_HANDLE_ENTRY { - void *ptr; /* pointer to object */ + void *ptr; /* pointer to object */ union { PVOID pi; - PTHREADINFO pti; // pointer to Win32ThreadInfo - PPROCESSINFO ppi; // pointer to W32ProcessInfo + PTHREADINFO pti; /* pointer to Win32ThreadInfo */ + PPROCESSINFO ppi; /* pointer to W32ProcessInfo */ }; - unsigned char type; /* object type (0 if free) */ - unsigned char flags; - unsigned short generation; /* generation counter */ -} USER_HANDLE_ENTRY, * PUSER_HANDLE_ENTRY; + unsigned char type; /* object type (0 if free) */ + unsigned char flags; + unsigned short generation; /* generation counter */ +} USER_HANDLE_ENTRY, *PUSER_HANDLE_ENTRY; typedef struct _USER_HANDLE_TABLE { - PUSER_HANDLE_ENTRY handles; - PUSER_HANDLE_ENTRY freelist; - int nb_handles; - int allocated_handles; -} USER_HANDLE_TABLE, * PUSER_HANDLE_TABLE; + PUSER_HANDLE_ENTRY handles; + PUSER_HANDLE_ENTRY freelist; + int nb_handles; + int allocated_handles; +} USER_HANDLE_TABLE, *PUSER_HANDLE_TABLE; typedef enum _HANDLE_TYPE { @@ -82,35 +82,51 @@ typedef struct _LARGE_UNICODE_STRING { - ULONG Length; - ULONG MaximumLength:31; - ULONG bAnsi:1; - PWSTR Buffer; + ULONG Length; + ULONG MaximumLength:31; + ULONG bAnsi:1; + PWSTR Buffer; } LARGE_UNICODE_STRING, *PLARGE_UNICODE_STRING; typedef struct _LARGE_STRING { - ULONG Length; - ULONG MaximumLength:31; - ULONG bAnsi:1; - PVOID Buffer; + ULONG Length; + ULONG MaximumLength:31; + ULONG bAnsi:1; + PVOID Buffer; } LARGE_STRING, *PLARGE_STRING; -// -// Based on ANSI_STRING -// + + +/* Based on ANSI_STRING */ typedef struct _LARGE_ANSI_STRING { - ULONG Length; - ULONG MaximumLength:31; - ULONG bAnsi:1; - PCHAR Buffer; + ULONG Length; + ULONG MaximumLength:31; + ULONG bAnsi:1; + PCHAR Buffer; } LARGE_ANSI_STRING, *PLARGE_ANSI_STRING; -VOID NTAPI RtlInitLargeAnsiString(IN OUT PLARGE_ANSI_STRING,IN PCSZ,IN INT); -VOID NTAPI RtlInitLargeUnicodeString(IN OUT PLARGE_UNICODE_STRING,IN PCWSTR,IN INT); -BOOL NTAPI RtlLargeStringToUnicodeString( PUNICODE_STRING, PLARGE_STRING); - -#define NB_HOOKS (WH_MAXHOOK-WH_MINHOOK+1) +VOID +NTAPI +RtlInitLargeAnsiString( + IN OUT PLARGE_ANSI_STRING, + IN PCSZ, + IN INT); + +VOID +NTAPI +RtlInitLargeUnicodeString( + IN OUT PLARGE_UNICODE_STRING, + IN PCWSTR, + IN INT); + +BOOL +NTAPI +RtlLargeStringToUnicodeString( + PUNICODE_STRING, + PLARGE_STRING); + +#define NB_HOOKS (WH_MAXHOOK - WH_MINHOOK + 1) typedef struct _DESKTOPINFO { @@ -123,7 +139,7 @@ HWND hTaskManWindow; HWND hProgmanWindow; HWND hShellWindow; - struct _WND * spwndShell; + struct _WND *spwndShell; PPROCESSINFO ppiShellProcess; @@ -132,7 +148,7 @@ UINT Dummy; struct { - UINT LastInputWasKbd : 1; + UINT LastInputWasKbd:1; }; }; @@ -145,77 +161,77 @@ typedef struct _CLIENTTHREADINFO { DWORD CTI_flags; - WORD fsChangeBits; - WORD fsWakeBits; - WORD fsWakeBitsJournal; - WORD fsWakeMask; + WORD fsChangeBits; + WORD fsWakeBits; + WORD fsWakeBitsJournal; + WORD fsWakeMask; ULONG tickLastMsgChecked; DWORD dwcPumpHook; } CLIENTTHREADINFO, *PCLIENTTHREADINFO; typedef struct _HEAD { - HANDLE h; - DWORD cLockObj; + HANDLE h; + DWORD cLockObj; } HEAD, *PHEAD; typedef struct _THROBJHEAD { - HEAD; - PTHREADINFO pti; + HEAD; + PTHREADINFO pti; } THROBJHEAD, *PTHROBJHEAD; typedef struct _THRDESKHEAD { - THROBJHEAD; - struct _DESKTOP *rpdesk; - PVOID pSelf; + THROBJHEAD; + struct _DESKTOP *rpdesk; + PVOID pSelf; } THRDESKHEAD, *PTHRDESKHEAD; typedef struct _PROCDESKHEAD { - HEAD; - DWORD_PTR hTaskWow; - struct _DESKTOP *rpdesk; - PVOID pSelf; + HEAD; + DWORD_PTR hTaskWow; + struct _DESKTOP *rpdesk; + PVOID pSelf; } PROCDESKHEAD, *PPROCDESKHEAD; typedef struct _PROCMARKHEAD { - HEAD; - ULONG hTaskWow; - PPROCESSINFO ppi; + HEAD; + ULONG hTaskWow; + PPROCESSINFO ppi; } PROCMARKHEAD, *PPROCMARKHEAD; #define UserHMGetHandle(obj) ((obj)->head.h) /* Window Client Information structure */ -struct _ETHREAD; - -#define WEF_SETBYWNDPTI 0x0001 +struct _ETHREAD; + +#define WEF_SETBYWNDPTI 0x0001 typedef struct tagHOOK { - THRDESKHEAD head; - struct tagHOOK *phkNext; /* This is for user space. */ - int HookId; /* Hook table index */ - ULONG_PTR offPfn; - ULONG flags; /* Some internal flags */ - INT ihmod; - PTHREADINFO ptiHooked; - struct _DESKTOP *rpdesk; - /* ReactOS */ - LIST_ENTRY Chain; /* Hook chain entry */ - HOOKPROC Proc; /* Hook function */ - BOOLEAN Ansi; /* Is it an Ansi hook? */ - UNICODE_STRING ModuleName; /* Module name for global hooks */ + THRDESKHEAD head; + struct tagHOOK *phkNext; /* This is for user space. */ + int HookId; /* Hook table index */ + ULONG_PTR offPfn; + ULONG flags; /* Some internal flags */ + INT ihmod; + PTHREADINFO ptiHooked; + struct _DESKTOP *rpdesk; + /* ReactOS */ + LIST_ENTRY Chain; /* Hook chain entry */ + HOOKPROC Proc; /* Hook function */ + BOOLEAN Ansi; /* Is it an Ansi hook? */ + UNICODE_STRING ModuleName; /* Module name for global hooks */ } HOOK, *PHOOK; typedef struct tagCLIPBOARDDATA { - HEAD head; - DWORD cbData; - BYTE Data[0]; + HEAD head; + DWORD cbData; + BYTE Data[0]; } CLIPBOARDDATA, *PCLIPBOARDDATA; /* THREADINFO Flags */ @@ -251,9 +267,9 @@ typedef struct _CALLBACKWND { - HWND hWnd; - struct _WND *pWnd; - PVOID pActCtx; + HWND hWnd; + struct _WND *pWnd; + PVOID pActCtx; } CALLBACKWND, *PCALLBACKWND; #define CI_TRANSACTION 0x00000001 @@ -271,7 +287,7 @@ DWORD dwExpWinVer; DWORD dwCompatFlags; DWORD dwCompatFlags2; - DWORD dwTIFlags; // ThreadInfo TIF_Xxx flags for User space. + DWORD dwTIFlags; /* ThreadInfo TIF_Xxx flags for User space. */ PDESKTOPINFO pDeskInfo; ULONG_PTR ulClientDelta; PHOOK phkCurrent; @@ -303,13 +319,13 @@ typedef struct tagDDEPACK { - UINT_PTR uiLo; - UINT_PTR uiHi; + UINT_PTR uiLo; + UINT_PTR uiHi; } DDEPACK, *PDDEPACK; -#define HRGN_NULL ( (HRGN) 0) // NULL empty region -#define HRGN_WINDOW ( (HRGN) 1) // region from window rcWindow -#define HRGN_MONITOR ( (HRGN) 2) // region from monitor region. +#define HRGN_NULL ((HRGN)0) /* NULL empty region */ +#define HRGN_WINDOW ((HRGN)1) /* region from window rcWindow */ +#define HRGN_MONITOR ((HRGN)2) /* region from monitor region. */ /* Menu Item fType. */ #define MFT_RTOL 0x6000 @@ -322,110 +338,109 @@ UINT fType; UINT fState; UINT wID; - struct tagMENU* spSubMenu; /* Pop-up menu. */ + struct tagMENU *spSubMenu; /* Pop-up menu. */ HANDLE hbmpChecked; HANDLE hbmpUnchecked; - USHORT* Xlpstr; /* Item text pointer. */ + USHORT *Xlpstr; /* Item text pointer. */ ULONG cch; DWORD_PTR dwItemData; - ULONG xItem; /* Item position. left */ - ULONG yItem; /* " top */ - ULONG cxItem; /* Item Size Width */ - ULONG cyItem; /* " Height */ - ULONG dxTab; /* X position of text after Tab */ - ULONG ulX; /* underline.. start position */ + ULONG xItem; /* Item position. left */ + ULONG yItem; /* " top */ + ULONG cxItem; /* Item Size Width */ + ULONG cyItem; /* " Height */ + ULONG dxTab; /* X position of text after Tab */ + ULONG ulX; /* underline.. start position */ ULONG ulWidth; /* underline.. width */ - HBITMAP hbmp; /* bitmap */ - INT cxBmp; /* Width Maximum size of the bitmap items in MIIM_BITMAP state */ - INT cyBmp; /* Height " */ - //// ReactOS + HBITMAP hbmp; /* bitmap */ + INT cxBmp; /* Width Maximum size of the bitmap items in MIIM_BITMAP state */ + INT cyBmp; /* Height " */ + /* ReactOS */ UNICODE_STRING lpstr; } ITEM, *PITEM; typedef struct tagMENULIST { - struct tagMENULIST* pNext; - struct tagMENU* pMenu; + struct tagMENULIST *pNext; + struct tagMENU *pMenu; } MENULIST, *PMENULIST; /* Menu fFlags, upper byte is MNS_X style flags. */ -#define MNF_POPUP 0x0001 -#define MNF_UNDERLINE 0x0004 -#define MNF_INACTIVE 0x0010 -#define MNF_RTOL 0x0020 -#define MNF_DESKTOPMN 0x0040 -#define MNF_SYSDESKMN 0x0080 -#define MNF_SYSSUBMENU 0x0100 -// Hack -#define MNF_SYSMENU 0x0200 +#define MNF_POPUP 0x0001 +#define MNF_UNDERLINE 0x0004 +#define MNF_INACTIVE 0x0010 +#define MNF_RTOL 0x0020 +#define MNF_DESKTOPMN 0x0040 +#define MNF_SYSDESKMN 0x0080 +#define MNF_SYSSUBMENU 0x0100 +/* Hack */ +#define MNF_SYSMENU 0x0200 typedef struct tagMENU { PROCDESKHEAD head; - ULONG fFlags; /* [Style flags | Menu flags] */ - INT iItem; /* nPos of selected item, if -1 not selected. AKA focused item */ - UINT cAlloced; /* Number of allocated items. Inc's of 8 */ - UINT cItems; /* Number of items in the menu */ - ULONG cxMenu; /* Width of the whole menu */ - ULONG cyMenu; /* Height of the whole menu */ - ULONG cxTextAlign; /* Offset of text when items have both bitmaps and text */ + ULONG fFlags; /* [Style flags | Menu flags] */ + INT iItem; /* nPos of selected item, if -1 not selected. AKA focused item */ + UINT cAlloced; /* Number of allocated items. Inc's of 8 */ + UINT cItems; /* Number of items in the menu */ + ULONG cxMenu; /* Width of the whole menu */ + ULONG cyMenu; /* Height of the whole menu */ + ULONG cxTextAlign; /* Offset of text when items have both bitmaps and text */ struct _WND *spwndNotify; /* window receiving the messages for ownerdraw */ - PITEM rgItems; /* Array of menu items */ - struct tagMENULIST* pParentMenus; /* If this is SubMenu, list of parents. */ + PITEM rgItems; /* Array of menu items */ + struct tagMENULIST *pParentMenus; /* If this is SubMenu, list of parents. */ DWORD dwContextHelpId; - ULONG cyMax; /* max height of the whole menu, 0 is screen height */ - DWORD_PTR dwMenuData; /* application defined value */ - HBRUSH hbrBack; /* brush for menu background */ - INT iTop; /* Current scroll position Top */ - INT iMaxTop; /* Current scroll position Max Top */ - DWORD dwArrowsOn:2; /* Arrows: 0 off, 1 on, 2 to the top, 3 to the bottom. */ - //// ReactOS + ULONG cyMax; /* max height of the whole menu, 0 is screen height */ + DWORD_PTR dwMenuData; /* application defined value */ + HBRUSH hbrBack; /* brush for menu background */ + INT iTop; /* Current scroll position Top */ + INT iMaxTop; /* Current scroll position Max Top */ + DWORD dwArrowsOn:2; /* Arrows: 0 off, 1 on, 2 to the top, 3 to the bottom. */ + /* ReactOS */ LIST_ENTRY ListEntry; - HWND hWnd; /* Window containing the menu, use POPUPMENU */ + HWND hWnd; /* Window containing the menu, use POPUPMENU */ BOOL TimeToHide; } MENU, *PMENU; typedef struct tagPOPUPMENU { - ULONG fIsMenuBar:1; - ULONG fHasMenuBar:1; - ULONG fIsSysMenu:1; - ULONG fIsTrackPopup:1; - ULONG fDroppedLeft:1; - ULONG fHierarchyDropped:1; - ULONG fRightButton:1; - ULONG fToggle:1; - ULONG fSynchronous:1; - ULONG fFirstClick:1; - ULONG fDropNextPopup:1; - ULONG fNoNotify:1; - ULONG fAboutToHide:1; - ULONG fShowTimer:1; - ULONG fHideTimer:1; - ULONG fDestroyed:1; - ULONG fDelayedFree:1; - ULONG fFlushDelayedFree:1; - ULONG fFreed:1; - ULONG fInCancel:1; - ULONG fTrackMouseEvent:1; - ULONG fSendUninit:1; - ULONG fRtoL:1; -// ULONG fDesktopMenu:1; - ULONG iDropDir:5; - ULONG fUseMonitorRect:1; - struct _WND *spwndNotify; - struct _WND *spwndPopupMenu; - struct _WND *spwndNextPopup; - struct _WND *spwndPrevPopup; - PMENU spmenu; - PMENU spmenuAlternate; - struct _WND *spwndActivePopup; - struct tagPOPUPMENU *ppopupmenuRoot; - struct tagPOPUPMENU *ppmDelayedFree; - UINT posSelectedItem; - UINT posDropped; + ULONG fIsMenuBar:1; + ULONG fHasMenuBar:1; + ULONG fIsSysMenu:1; + ULONG fIsTrackPopup:1; + ULONG fDroppedLeft:1; + ULONG fHierarchyDropped:1; + ULONG fRightButton:1; + ULONG fToggle:1; + ULONG fSynchronous:1; + ULONG fFirstClick:1; + ULONG fDropNextPopup:1; + ULONG fNoNotify:1; + ULONG fAboutToHide:1; + ULONG fShowTimer:1; + ULONG fHideTimer:1; + ULONG fDestroyed:1; + ULONG fDelayedFree:1; + ULONG fFlushDelayedFree:1; + ULONG fFreed:1; + ULONG fInCancel:1; + ULONG fTrackMouseEvent:1; + ULONG fSendUninit:1; + ULONG fRtoL:1; + // ULONG fDesktopMenu:1; + ULONG iDropDir:5; + ULONG fUseMonitorRect:1; + struct _WND *spwndNotify; + struct _WND *spwndPopupMenu; + struct _WND *spwndNextPopup; + struct _WND *spwndPrevPopup; + PMENU spmenu; + PMENU spmenuAlternate; + struct _WND *spwndActivePopup; + struct tagPOPUPMENU *ppopupmenuRoot; + struct tagPOPUPMENU *ppmDelayedFree; + UINT posSelectedItem; + UINT posDropped; } POPUPMENU, *PPOPUPMENU; - typedef struct _REGISTER_SYSCLASS { @@ -443,53 +458,53 @@ typedef struct _CLSMENUNAME { - LPSTR pszClientAnsiMenuName; - LPWSTR pwszClientUnicodeMenuName; - PUNICODE_STRING pusMenuName; + LPSTR pszClientAnsiMenuName; + LPWSTR pwszClientUnicodeMenuName; + PUNICODE_STRING pusMenuName; } CLSMENUNAME, *PCLSMENUNAME; typedef struct tagSBDATA { - INT posMin; - INT posMax; - INT page; - INT pos; + INT posMin; + INT posMax; + INT page; + INT pos; } SBDATA, *PSBDATA; typedef struct tagSBINFO { - INT WSBflags; - SBDATA Horz; - SBDATA Vert; + INT WSBflags; + SBDATA Horz; + SBDATA Vert; } SBINFO, *PSBINFO; typedef struct tagSBCALC { - INT posMin; - INT posMax; - INT page; - INT pos; - INT pxTop; - INT pxBottom; - INT pxLeft; - INT pxRight; - INT cpxThumb; - INT pxUpArrow; - INT pxDownArrow; - INT pxStart; - INT pxThumbBottom; - INT pxThumbTop; - INT cpx; - INT pxMin; + INT posMin; + INT posMax; + INT page; + INT pos; + INT pxTop; + INT pxBottom; + INT pxLeft; + INT pxRight; + INT cpxThumb; + INT pxUpArrow; + INT pxDownArrow; + INT pxStart; + INT pxThumbBottom; + INT pxThumbTop; + INT cpx; + INT pxMin; } SBCALC, *PSBCALC; typedef enum _GETCPD { - UserGetCPDA2U = 0x01, // " Unicode " - UserGetCPDU2A = 0X02, // " Ansi " - UserGetCPDClass = 0X10, - UserGetCPDWindow = 0X20, - UserGetCPDDialog = 0X40, + UserGetCPDA2U = 0x01, /* " Unicode " */ + UserGetCPDU2A = 0X02, /* " Ansi " */ + UserGetCPDClass = 0X10, + UserGetCPDWindow = 0X20, + UserGetCPDDialog = 0X40, UserGetCPDWndtoCls = 0X80 } GETCPD, *PGETCPD; @@ -501,14 +516,14 @@ GETCPD wType; } CALLPROCDATA, *PCALLPROCDATA; -#define CSF_SERVERSIDEPROC 0x0001 -#define CSF_ANSIPROC 0x0002 -#define CSF_WOWDEFERDESTROY 0x0004 -#define CSF_SYSTEMCLASS 0x0008 -#define CSF_WOWCLASS 0x0010 -#define CSF_WOWEXTRA 0x0020 -#define CSF_CACHEDSMICON 0x0040 -#define CSF_WIN40COMPAT 0x0080 +#define CSF_SERVERSIDEPROC 0x0001 +#define CSF_ANSIPROC 0x0002 +#define CSF_WOWDEFERDESTROY 0x0004 +#define CSF_SYSTEMCLASS 0x0008 +#define CSF_WOWCLASS 0x0010 +#define CSF_WOWEXTRA 0x0020 +#define CSF_CACHEDSMICON 0x0040 +#define CSF_WIN40COMPAT 0x0080 typedef struct _CLS { @@ -519,8 +534,8 @@ struct _DESKTOP *rpdeskParent; PVOID pdce; DWORD CSF_flags; - PSTR lpszClientAnsiMenuName; // For client use - PWSTR lpszClientUnicodeMenuName; // " " " + PSTR lpszClientAnsiMenuName; /* For client use */ + PWSTR lpszClientUnicodeMenuName; /* " " " */ PCALLPROCDATA spcpdFirst; struct _CLS *pclsBase; struct _CLS *pclsClone; @@ -531,38 +546,37 @@ INT cbwndExtra; HINSTANCE hModule; #ifdef NEW_CURSORICON - struct _CURICON_OBJECT* spicn; - struct _CURICON_OBJECT* spcur; + struct _CURICON_OBJECT *spicn; + struct _CURICON_OBJECT *spcur; #else HANDLE hIcon; /* FIXME - Use pointer! */ HANDLE hCursor; /* FIXME - Use pointer! */ #endif HBRUSH hbrBackground; - PWSTR lpszMenuName; // kernel use - PSTR lpszAnsiClassName; // " + PWSTR lpszMenuName; /* kernel use */ + PSTR lpszAnsiClassName; /* " */ #ifdef NEW_CURSORICON - struct _CURICON_OBJECT* spicnSm; + struct _CURICON_OBJECT *spicnSm; #else HANDLE hIconSm; /* FIXME - Use pointer! */ - //// ReactOS dosn't suppot cache icons. + //// ReactOS doesn't support cache icons. */ HICON hIconSmIntern; /* Internal small icon, derived from hIcon */ #endif //// - UINT Unicode : 1; // !CSF_ANSIPROC - UINT Global : 1; // CS_GLOBALCLASS or CSF_SERVERSIDEPROC - UINT MenuNameIsString : 1; - UINT NotUsed : 29; + UINT Unicode:1; // !CSF_ANSIPROC + UINT Global:1; // CS_GLOBALCLASS or CSF_SERVERSIDEPROC + UINT MenuNameIsString:1; + UINT NotUsed:29; } CLS, *PCLS; - typedef struct _SBINFOEX { - SCROLLBARINFO ScrollBarInfo; - SCROLLINFO ScrollInfo; + SCROLLBARINFO ScrollBarInfo; + SCROLLINFO ScrollInfo; } SBINFOEX, *PSBINFOEX; -// State Flags !Not Implemented! +/* State Flags !Not Implemented! */ #define WNDS_HASMENU 0X00000001 #define WNDS_HASVERTICALSCROOLLBAR 0X00000002 #define WNDS_HASHORIZONTALSCROLLBAR 0X00000004 @@ -581,7 +595,7 @@ #define WNDS_FORCEMENUDRAW 0X00008000 #define WNDS_DIALOGWINDOW 0X00010000 #define WNDS_HASCREATESTRUCTNAME 0X00020000 -#define WNDS_SERVERSIDEWINDOWPROC 0x00040000 // Call proc inside win32k. +#define WNDS_SERVERSIDEWINDOWPROC 0x00040000 /* Call proc inside win32k. */ #define WNDS_ANSIWINDOWPROC 0x00080000 #define WNDS_BEINGACTIVATED 0x00100000 #define WNDS_HASPALETTE 0x00200000 @@ -598,7 +612,7 @@ #define WNDSACTIVEFRAME 0x00000006 -// State2 Flags !Not Implemented! +/* State2 Flags !Not Implemented! */ #define WNDS2_WMPAINTSENT 0X00000001 #define WNDS2_ENDPAINTINVALIDATE 0X00000002 #define WNDS2_STARTPAINT 0X00000004 @@ -644,8 +658,8 @@ #define WS_EX2_CONSOLEWINDOW 0X00000400 #define WS_EX2_CHILDNOACTIVATE 0X00000800 -#define WPF_MININIT 0x0008 -#define WPF_MAXINIT 0x0010 +#define WPF_MININIT 0x0008 +#define WPF_MAXINIT 0x0010 typedef struct _WND { @@ -701,34 +715,34 @@ RECT NormalRect; POINT IconPos; POINT MaxPos; - UINT flags; // WPF_ flags. + UINT flags; /* WPF_ flags. */ } InternalPos; - UINT Unicode : 1; // !(WNDS_ANSICREATOR|WNDS_ANSIWINDOWPROC) ? - UINT InternalPosInitialized : 1; - UINT HideFocus : 1; // WS_EX_UISTATEFOCUSRECTHIDDEN ? - UINT HideAccel : 1; // WS_EX_UISTATEKBACCELHIDDEN ? - - /* Scrollbar info */ - PSBINFOEX pSBInfoex; // convert to PSBINFO - /* Entry in the list of thread windows. */ - LIST_ENTRY ThreadListEntry; + UINT Unicode:1; /* !(WNDS_ANSICREATOR|WNDS_ANSIWINDOWPROC) ? */ + UINT InternalPosInitialized:1; + UINT HideFocus:1; /* WS_EX_UISTATEFOCUSRECTHIDDEN ? */ + UINT HideAccel:1; /* WS_EX_UISTATEKBACCELHIDDEN ? */ + + /* Scrollbar info */ + PSBINFOEX pSBInfoex; // convert to PSBINFO + /* Entry in the list of thread windows. */ + LIST_ENTRY ThreadListEntry; } WND, *PWND; #define PWND_BOTTOM ((PWND)1) typedef struct _SBWND { - WND wnd; - BOOL fVert; - UINT wDisableFlags; - SBCALC SBCalc; + WND wnd; + BOOL fVert; + UINT wDisableFlags; + SBCALC SBCalc; } SBWND, *PSBWND; typedef struct _MENUWND { - WND wnd; - PPOPUPMENU ppopupmenu; + WND wnd; + PPOPUPMENU ppopupmenu; } MENUWND, *PMENUWND; typedef struct _PFNCLIENT @@ -763,7 +777,13 @@ Windows uses Ansi == TRUE, Wine uses Unicode == TRUE. */ -typedef LRESULT(CALLBACK *WNDPROC_EX)(HWND,UINT,WPARAM,LPARAM,BOOL); +typedef LRESULT +(CALLBACK *WNDPROC_EX)( + HWND, + UINT, + WPARAM, + LPARAM, + BOOL); typedef struct _PFNCLIENTWORKER { @@ -780,9 +800,15 @@ WNDPROC_EX pfnCtfHookProc; } PFNCLIENTWORKER, *PPFNCLIENTWORKER; -typedef LONG_PTR (NTAPI *PFN_FNID)(PWND, UINT, WPARAM, LPARAM, ULONG_PTR); - -// FNID's for NtUserSetWindowFNID, NtUserMessageCall +typedef LONG_PTR +(NTAPI *PFN_FNID)( + PWND, + UINT, + WPARAM, + LPARAM, + ULONG_PTR); + +/* FNID's for NtUserSetWindowFNID, NtUserMessageCall */ #define FNID_FIRST 0x029A #define FNID_SCROLLBAR 0x029A #define FNID_ICONTITLE 0x029B @@ -809,7 +835,7 @@ #define FNID_MDIACTIVATEDLGPROC 0x02B0 #define FNID_SENDMESSAGE 0x02B1 #define FNID_SENDMESSAGEFF 0x02B2 -// Kernel has option to use TimeOut or normal msg send, based on type of msg. +/* Kernel has option to use TimeOut or normal msg send, based on type of msg. */ #define FNID_SENDMESSAGEWTOOPTION 0x02B3 #define FNID_SENDMESSAGECALLPROC 0x02B4 #define FNID_BROADCASTSYSTEMMESSAGE 0x02B5 @@ -821,21 +847,21 @@ #define FNID_NUM FNID_LAST - FNID_FIRST + 1 #define FNID_NUMSERVERPROC FNID_SWITCH - FNID_FIRST + 1 -#define FNID_DDEML 0x2000 // Registers DDEML -#define FNID_DESTROY 0x4000 // This is sent when WM_NCDESTROY or in the support routine. - // Seen during WM_CREATE on error exit too. -#define FNID_FREED 0x8000 // Window being Freed... +#define FNID_DDEML 0x2000 /* Registers DDEML */ +#define FNID_DESTROY 0x4000 /* This is sent when WM_NCDESTROY or in the support routine. */ + /* Seen during WM_CREATE on error exit too. */ +#define FNID_FREED 0x8000 /* Window being Freed... */ #define ICLASS_TO_MASK(iCls) (1 << ((iCls))) -#define GETPFNCLIENTA(fnid)\ +#define GETPFNCLIENTA(fnid) \ (WNDPROC)(*(((ULONG_PTR *)&gpsi->apfnClientA) + (fnid - FNID_FIRST))) -#define GETPFNCLIENTW(fnid)\ +#define GETPFNCLIENTW(fnid) \ (WNDPROC)(*(((ULONG_PTR *)&gpsi->apfnClientW) + (fnid - FNID_FIRST))) #define GETPFNSERVER(fnid) gpsi->aStoCidPfn[fnid - FNID_FIRST] -// ICLS's for NtUserGetClassName FNID to ICLS, NtUserInitializeClientPfnArrays +/* ICLS's for NtUserGetClassName FNID to ICLS, NtUserInitializeClientPfnArrays */ #define ICLS_BUTTON 0 #define ICLS_EDIT 1 #define ICLS_STATIC 2 @@ -873,10 +899,10 @@ #define MAX_MB_STRINGS 11 #define SRVINFO_DBCSENABLED 0x0002 -#define SRVINFO_IMM32 0x0004 -#define SRVINFO_APIHOOK 0x0010 -#define SRVINFO_METRICS 0x0020 -#define SRVINFO_KBDPREF 0x0080 +#define SRVINFO_IMM32 0x0004 +#define SRVINFO_APIHOOK 0x0010 +#define SRVINFO_METRICS 0x0020 +#define SRVINFO_KBDPREF 0x0080 #define NUM_SYSCOLORS 31 @@ -897,15 +923,15 @@ typedef struct tagDPISERVERINFO { - INT gclBorder; /* 000 */ - HFONT hCaptionFont; /* 004 */ - HFONT hMsgFont; /* 008 */ - INT cxMsgFontChar; /* 00C */ - INT cyMsgFontChar; /* 010 */ - UINT wMaxBtnSize; /* 014 */ + INT gclBorder; /* 000 */ + HFONT hCaptionFont; /* 004 */ + HFONT hMsgFont; /* 008 */ + INT cxMsgFontChar; /* 00C */ + INT cyMsgFontChar; /* 010 */ + UINT wMaxBtnSize; /* 014 */ } DPISERVERINFO, *PDPISERVERINFO; -// PUSIFlags: +/* PUSIFlags: */ #define PUSIF_PALETTEDISPLAY 0x01 #define PUSIF_SNAPTO 0x02 #define PUSIF_COMBOBOXANIMATION 0x04 @@ -914,69 +940,69 @@ typedef struct _PERUSERSERVERINFO { - INT aiSysMet[SM_CMETRICS]; - ULONG argbSystemUnmatched[NUM_SYSCOLORS]; - COLORREF argbSystem[NUM_SYSCOLORS]; - HBRUSH ahbrSystem[NUM_SYSCOLORS]; - HBRUSH hbrGray; - POINT ptCursor; - POINT ptCursorReal; - DWORD dwLastRITEventTickCount; - INT nEvents; - UINT dtScroll; - UINT dtLBSearch; - UINT dtCaretBlink; - UINT ucWheelScrollLines; - UINT ucWheelScrollChars; - INT wMaxLeftOverlapChars; - INT wMaxRightOverlapChars; - INT cxSysFontChar; - INT cySysFontChar; - TEXTMETRICW tmSysFont; + INT aiSysMet[SM_CMETRICS]; + ULONG argbSystemUnmatched[NUM_SYSCOLORS]; + COLORREF argbSystem[NUM_SYSCOLORS]; + HBRUSH ahbrSystem[NUM_SYSCOLORS]; + HBRUSH hbrGray; + POINT ptCursor; + POINT ptCursorReal; + DWORD dwLastRITEventTickCount; + INT nEvents; + UINT dtScroll; + UINT dtLBSearch; + UINT dtCaretBlink; + UINT ucWheelScrollLines; + UINT ucWheelScrollChars; + INT wMaxLeftOverlapChars; + INT wMaxRightOverlapChars; + INT cxSysFontChar; + INT cySysFontChar; + TEXTMETRICW tmSysFont; DPISERVERINFO dpiSystem; - HICON hIconSmWindows; - HICON hIconWindows; - DWORD dwKeyCache; - DWORD dwAsyncKeyCache; - ULONG cCaptures; + HICON hIconSmWindows; + HICON hIconWindows; + DWORD dwKeyCache; + DWORD dwAsyncKeyCache; + ULONG cCaptures; OEMBITMAPINFO oembmi[93]; - RECT rcScreenReal; - USHORT BitCount; - USHORT dmLogPixels; - BYTE Planes; - BYTE BitsPixel; - ULONG PUSIFlags; - UINT uCaretWidth; - USHORT UILangID; - DWORD dwLastSystemRITEventTickCountUpdate; - ULONG adwDBGTAGFlags[35]; - DWORD dwTagCount; - DWORD dwRIPFlags; + RECT rcScreenReal; + USHORT BitCount; + USHORT dmLogPixels; + BYTE Planes; + BYTE BitsPixel; + ULONG PUSIFlags; + UINT uCaretWidth; + USHORT UILangID; + DWORD dwLastSystemRITEventTickCountUpdate; + ULONG adwDBGTAGFlags[35]; + DWORD dwTagCount; + DWORD dwRIPFlags; } PERUSERSERVERINFO, *PPERUSERSERVERINFO; typedef struct tagSERVERINFO { - DWORD dwSRVIFlags; - ULONG_PTR cHandleEntries; - PFN_FNID mpFnidPfn[FNID_NUM]; - WNDPROC aStoCidPfn[FNID_NUMSERVERPROC]; - USHORT mpFnid_serverCBWndProc[FNID_NUM]; - PFNCLIENT apfnClientA; - PFNCLIENT apfnClientW; + DWORD dwSRVIFlags; + ULONG_PTR cHandleEntries; + PFN_FNID mpFnidPfn[FNID_NUM]; + WNDPROC aStoCidPfn[FNID_NUMSERVERPROC]; + USHORT mpFnid_serverCBWndProc[FNID_NUM]; + PFNCLIENT apfnClientA; + PFNCLIENT apfnClientW; PFNCLIENTWORKER apfnClientWorker; - ULONG cbHandleTable; - ATOM atomSysClass[ICLS_NOTUSED+1]; - DWORD dwDefaultHeapBase; - DWORD dwDefaultHeapSize; - UINT uiShellMsg; - MBSTRING MBStrings[MAX_MB_STRINGS]; - ATOM atomIconSmProp; - ATOM atomIconProp; - ATOM atomContextHelpIdProp; - ATOM atomFrostedWindowProp; - CHAR acOemToAnsi[256]; - CHAR acAnsiToOem[256]; - DWORD dwInstalledEventHooks; + ULONG cbHandleTable; + ATOM atomSysClass[ICLS_NOTUSED+1]; + DWORD dwDefaultHeapBase; + DWORD dwDefaultHeapSize; + UINT uiShellMsg; + MBSTRING MBStrings[MAX_MB_STRINGS]; + ATOM atomIconSmProp; + ATOM atomIconProp; + ATOM atomContextHelpIdProp; + ATOM atomFrostedWindowProp; + CHAR acOemToAnsi[256]; + CHAR acAnsiToOem[256]; + DWORD dwInstalledEventHooks; PERUSERSERVERINFO; } SERVERINFO, *PSERVERINFO; @@ -985,7 +1011,7 @@ #endif -// Server event activity bits. +/* Server event activity bits. */ #define SRV_EVENT_MENU 0x0001 #define SRV_EVENT_END_APPLICATION 0x0002 #define SRV_EVENT_RUNNING 0x0004 @@ -997,25 +1023,25 @@ typedef struct _PROPLISTITEM { - ATOM Atom; - HANDLE Data; + ATOM Atom; + HANDLE Data; } PROPLISTITEM, *PPROPLISTITEM; typedef struct _PROPERTY { - LIST_ENTRY PropListEntry; - HANDLE Data; - ATOM Atom; - WORD fs; + LIST_ENTRY PropListEntry; + HANDLE Data; + ATOM Atom; + WORD fs; } PROPERTY, *PPROPERTY; typedef struct _BROADCASTPARM { - DWORD flags; - DWORD recipients; - HDESK hDesk; - HWND hWnd; - LUID luid; + DWORD flags; + DWORD recipients; + HDESK hDesk; + HWND hWnd; + LUID luid; } BROADCASTPARM, *PBROADCASTPARM; PTHREADINFO GetW32ThreadInfo(VOID); @@ -1023,47 +1049,46 @@ typedef struct _WNDMSG { - DWORD maxMsgs; - PINT abMsgs; + DWORD maxMsgs; + PINT abMsgs; } WNDMSG, *PWNDMSG; typedef struct _SHAREDINFO { - PSERVERINFO psi; // global Server Info - PVOID aheList; // Handle Entry List - PVOID pDispInfo; // global PDISPLAYINFO pointer - ULONG_PTR ulSharedDelta; // Heap delta - WNDMSG awmControl[FNID_LAST - FNID_FIRST]; - WNDMSG DefWindowMsgs; - WNDMSG DefWindowSpecMsgs; + PSERVERINFO psi; /* global Server Info */ + PVOID aheList; /* Handle Entry List */ + PVOID pDispInfo; /* global PDISPLAYINFO pointer */ + ULONG_PTR ulSharedDelta; /* Heap delta */ + WNDMSG awmControl[FNID_LAST - FNID_FIRST]; + WNDMSG DefWindowMsgs; + WNDMSG DefWindowSpecMsgs; } SHAREDINFO, *PSHAREDINFO; /* See also the USERSRV_API_CONNECTINFO #define in include/reactos/subsys/win/winmsg.h */ typedef struct _USERCONNECT { - ULONG ulVersion; - ULONG ulCurrentVersion; - DWORD dwDispatchCount; - SHAREDINFO siClient; + ULONG ulVersion; + ULONG ulCurrentVersion; + DWORD dwDispatchCount; + SHAREDINFO siClient; } USERCONNECT, *PUSERCONNECT; -// WinNT 5.0 compatible user32 / win32k -#define USER_VERSION MAKELONG(0x0000, 0x0005) +/* WinNT 5.0 compatible user32 / win32k */ +#define USER_VERSION MAKELONG(0x0000, 0x0005) #if defined(_M_IX86) C_ASSERT(sizeof(USERCONNECT) == 0x124); #endif - typedef struct tagGETCLIPBDATA { - UINT uFmtRet; - BOOL fGlobalHandle; - union - { - HANDLE hLocale; - HANDLE hPalette; - }; + UINT uFmtRet; + BOOL fGlobalHandle; + union + { + HANDLE hLocale; + HANDLE hPalette; + }; } GETCLIPBDATA, *PGETCLIPBDATA; typedef struct tagSETCLIPBDATA @@ -1072,33 +1097,33 @@ BOOL fIncSerialNumber; } SETCLIPBDATA, *PSETCLIPBDATA; -// Used with NtUserSetCursorIconData, last parameter. +/* Used with NtUserSetCursorIconData, last parameter. */ typedef struct tagCURSORDATA { - LPWSTR lpName; - LPWSTR lpModName; - USHORT rt; - USHORT dummy; - ULONG CURSORF_flags; - SHORT xHotspot; - SHORT yHotspot; - HBITMAP hbmMask; - HBITMAP hbmColor; - HBITMAP hbmAlpha; - RECT rcBounds; - HBITMAP hbmUserAlpha; // Could be in W7U, not in W2k - ULONG bpp; - ULONG cx; - ULONG cy; - INT cpcur; - INT cicur; - struct tagCURSORDATA * aspcur; - DWORD * aicur; - INT * ajifRate; - INT iicur; + LPWSTR lpName; + LPWSTR lpModName; + USHORT rt; + USHORT dummy; + ULONG CURSORF_flags; + SHORT xHotspot; + SHORT yHotspot; + HBITMAP hbmMask; + HBITMAP hbmColor; + HBITMAP hbmAlpha; + RECT rcBounds; + HBITMAP hbmUserAlpha; /* Could be in W7U, not in W2k */ + ULONG bpp; + ULONG cx; + ULONG cy; + INT cpcur; + INT cicur; + struct tagCURSORDATA *aspcur; + DWORD *aicur; + INT *ajifRate; + INT iicur; } CURSORDATA, *PCURSORDATA; /* !dso CURSORDATA */ -// CURSORF_flags: +/* CURSORF_flags: */ #define CURSORF_FROMRESOURCE 0x0001 #define CURSORF_GLOBAL 0x0002 #define CURSORF_LRSHARED 0x0004 @@ -1130,30 +1155,29 @@ typedef struct tagIMEUI { - PWND spwnd; - HIMC hIMC; - HWND hwndIMC; - HKL hKL; - HWND hwndUI; - INT nCntInIMEProc; - struct { - UINT fShowStatus:1; - UINT fActivate:1; - UINT fDestroy:1; - UINT fDefault:1; - UINT fChildThreadDef:1; - UINT fCtrlShowStatus:1; - UINT fFreeActiveEvent:1; - }; + PWND spwnd; + HIMC hIMC; + HWND hwndIMC; + HKL hKL; + HWND hwndUI; + INT nCntInIMEProc; + struct { + UINT fShowStatus:1; + UINT fActivate:1; + UINT fDestroy:1; + UINT fDefault:1; + UINT fChildThreadDef:1; + UINT fCtrlShowStatus:1; + UINT fFreeActiveEvent:1; + }; } IMEUI, *PIMEUI; -// Window Extra data container. +/* Window Extra data container. */ typedef struct _IMEWND { - WND; - PIMEUI pimeui; + WND; + PIMEUI pimeui; } IMEWND, *PIMEWND; - DWORD NTAPI @@ -1182,9 +1206,9 @@ DWORD NTAPI NtUserCheckMenuItem( - HMENU hmenu, - UINT uIDCheckItem, - UINT uCheck); + HMENU hmenu, + UINT uIDCheckItem, + UINT uCheck); DWORD NTAPI @@ -1196,30 +1220,30 @@ BOOL NTAPI NtUserDeleteMenu( - HMENU hMenu, - UINT uPosition, - UINT uFlags); + HMENU hMenu, + UINT uPosition, + UINT uFlags); BOOL NTAPI NtUserDestroyMenu( - HMENU hMenu); + HMENU hMenu); DWORD NTAPI NtUserDrawMenuBarTemp( - HWND hWnd, - HDC hDC, - PRECT hRect, - HMENU hMenu, - HFONT hFont); + HWND hWnd, + HDC hDC, + PRECT hRect, + HMENU hMenu, + HFONT hFont); UINT NTAPI NtUserEnableMenuItem( - HMENU hMenu, - UINT uIDEnableItem, - UINT uEnable); + HMENU hMenu, + UINT uIDEnableItem, + UINT uEnable); BOOL NTAPI @@ -1228,180 +1252,183 @@ BOOL NTAPI NtUserGetMenuBarInfo( - HWND hwnd, - LONG idObject, - LONG idItem, - PMENUBARINFO pmbi); + HWND hwnd, + LONG idObject, + LONG idItem, + PMENUBARINFO pmbi); UINT NTAPI NtUserGetMenuIndex( - HMENU hMenu, - HMENU hSubMenu); + HMENU hMenu, + HMENU hSubMenu); BOOL NTAPI NtUserGetMenuItemRect( - HWND hWnd, - HMENU hMenu, - UINT uItem, - LPRECT lprcItem); + HWND hWnd, + HMENU hMenu, + UINT uItem, + LPRECT lprcItem); HMENU NTAPI NtUserGetSystemMenu( - HWND hWnd, - BOOL bRevert); + HWND hWnd, + BOOL bRevert); BOOL NTAPI NtUserHiliteMenuItem( - HWND hWnd, - HMENU hMenu, - UINT uItemHilite, - UINT uHilite); + HWND hWnd, + HMENU hMenu, + UINT uItemHilite, + UINT uHilite); int NTAPI NtUserMenuItemFromPoint( - HWND hWnd, - HMENU hMenu, - DWORD X, - DWORD Y); + HWND hWnd, + HMENU hMenu, + DWORD X, + DWORD Y); BOOL NTAPI NtUserRemoveMenu( - HMENU hMenu, - UINT uPosition, - UINT uFlags); + HMENU hMenu, + UINT uPosition, + UINT uFlags); BOOL NTAPI NtUserSetMenu( - HWND hWnd, - HMENU hMenu, - BOOL bRepaint); + HWND hWnd, + HMENU hMenu, + BOOL bRepaint); BOOL NTAPI NtUserSetMenuContextHelpId( - HMENU hmenu, - DWORD dwContextHelpId); + HMENU hmenu, + DWORD dwContextHelpId); BOOL NTAPI NtUserSetMenuDefaultItem( - HMENU hMenu, - UINT uItem, - UINT fByPos); + HMENU hMenu, + UINT uItem, + UINT fByPos); BOOL NTAPI NtUserSetMenuFlagRtoL( - HMENU hMenu); + HMENU hMenu); BOOL NTAPI NtUserSetSystemMenu( - HWND hWnd, - HMENU hMenu); + HWND hWnd, + HMENU hMenu); BOOL NTAPI NtUserThunkedMenuInfo( - HMENU hMenu, - LPCMENUINFO lpcmi); + HMENU hMenu, + LPCMENUINFO lpcmi); BOOL NTAPI NtUserThunkedMenuItemInfo( - HMENU hMenu, - UINT uItem, - BOOL fByPosition, - BOOL bInsert, - LPMENUITEMINFOW lpmii, - PUNICODE_STRING lpszCaption); + HMENU hMenu, + UINT uItem, + BOOL fByPosition, + BOOL bInsert, + LPMENUITEMINFOW lpmii, + PUNICODE_STRING lpszCaption); BOOL NTAPI NtUserTrackPopupMenuEx( - HMENU hmenu, - UINT fuFlags, - int x, - int y, - HWND hwnd, - LPTPMPARAMS lptpm); + HMENU hmenu, + UINT fuFlags, + int x, + int y, + HWND hwnd, + LPTPMPARAMS lptpm); HKL NTAPI NtUserActivateKeyboardLayout( - HKL hKl, - ULONG Flags); + HKL hKl, + ULONG Flags); DWORD NTAPI NtUserAlterWindowStyle( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2); BOOL NTAPI NtUserAttachThreadInput( - IN DWORD idAttach, - IN DWORD idAttachTo, - IN BOOL fAttach); + IN DWORD idAttach, + IN DWORD idAttachTo, + IN BOOL fAttach); HDC NTAPI -NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* lPs); +NtUserBeginPaint( + HWND hWnd, + PAINTSTRUCT *lPs); BOOL NTAPI NtUserBitBltSysBmp( - HDC hdc, - INT nXDest, - INT nYDest, - INT nWidth, - INT nHeight, - INT nXSrc, - INT nYSrc, - DWORD dwRop ); + HDC hdc, + INT nXDest, + INT nYDest, + INT nWidth, + INT nHeight, + INT nXSrc, + INT nYSrc, + DWORD dwRop); BOOL NTAPI NtUserBlockInput( - BOOL BlockIt); + BOOL BlockIt); NTSTATUS NTAPI NtUserBuildHwndList( - HDESK hDesktop, - HWND hwndParent, - BOOLEAN bChildren, - ULONG dwThreadId, - ULONG lParam, - HWND* pWnd, - ULONG* pBufSize); - -NTSTATUS NTAPI + HDESK hDesktop, + HWND hwndParent, + BOOLEAN bChildren, + ULONG dwThreadId, + ULONG lParam, + HWND *pWnd, + ULONG *pBufSize); + +NTSTATUS +NTAPI NtUserBuildNameList( - HWINSTA hWinSta, - ULONG dwSize, - PVOID lpBuffer, - PULONG pRequiredSize); + HWINSTA hWinSta, + ULONG dwSize, + PVOID lpBuffer, + PULONG pRequiredSize); NTSTATUS NTAPI NtUserBuildPropList( - HWND hWnd, - LPVOID Buffer, - DWORD BufferSize, - DWORD *Count); + HWND hWnd, + LPVOID Buffer, + DWORD BufferSize, + DWORD *Count); /* apfnSimpleCall indices from Windows XP SP 2 */ /* TODO: Check for differences in Windows 2000, 2003 and 2008 */ -#define WIN32K_VERSION NTDDI_WINXPSP2 // FIXME: this should go somewhere else +#define WIN32K_VERSION NTDDI_WINXPSP2 /* FIXME: this should go somewhere else */ enum SimpleCallRoutines { @@ -1583,106 +1610,106 @@ DWORD NTAPI NtUserCallHwnd( - HWND hWnd, - DWORD Routine); + HWND hWnd, + DWORD Routine); BOOL NTAPI NtUserCallHwndLock( - HWND hWnd, - DWORD Routine); + HWND hWnd, + DWORD Routine); HWND NTAPI NtUserCallHwndOpt( - HWND hWnd, - DWORD Routine); + HWND hWnd, + DWORD Routine); DWORD NTAPI NtUserCallHwndParam( - HWND hWnd, - DWORD Param, - DWORD Routine); + HWND hWnd, + DWORD Param, + DWORD Routine); DWORD NTAPI NtUserCallHwndParamLock( - HWND hWnd, - DWORD Param, - DWORD Routine); + HWND hWnd, + DWORD Param, + DWORD Routine); BOOL NTAPI NtUserCallMsgFilter( - LPMSG msg, - INT code); + LPMSG msg, + INT code); LRESULT NTAPI NtUserCallNextHookEx( - int Code, - WPARAM wParam, - LPARAM lParam, - BOOL Ansi); + int Code, + WPARAM wParam, + LPARAM lParam, + BOOL Ansi); DWORD_PTR NTAPI NtUserCallNoParam( - DWORD Routine); + DWORD Routine); DWORD_PTR NTAPI NtUserCallOneParam( - DWORD_PTR Param, - DWORD Routine); + DWORD_PTR Param, + DWORD Routine); DWORD_PTR NTAPI NtUserCallTwoParam( - DWORD_PTR Param1, - DWORD_PTR Param2, - DWORD Routine); + DWORD_PTR Param1, + DWORD_PTR Param2, + DWORD Routine); BOOL NTAPI NtUserChangeClipboardChain( - HWND hWndRemove, - HWND hWndNewNext); + HWND hWndRemove, + HWND hWndNewNext); LONG NTAPI NtUserChangeDisplaySettings( - PUNICODE_STRING lpszDeviceName, - LPDEVMODEW lpDevMode, - HWND hwnd, - DWORD dwflags, - LPVOID lParam); + PUNICODE_STRING lpszDeviceName, + LPDEVMODEW lpDevMode, + HWND hwnd, + DWORD dwflags, + LPVOID lParam); BOOL NTAPI NtUserCheckDesktopByThreadId( - DWORD dwThreadId); + DWORD dwThreadId); BOOL NTAPI NtUserCheckWindowThreadDesktop( - HWND hwnd, - DWORD dwThreadId, - ULONG ReturnValue); + HWND hwnd, + DWORD dwThreadId, + ULONG ReturnValue); DWORD NTAPI NtUserCheckImeHotKey( - DWORD dwUnknown1, - LPARAM dwUnknown2); + DWORD dwUnknown1, + LPARAM dwUnknown2); HWND NTAPI NtUserChildWindowFromPointEx( - HWND Parent, - LONG x, - LONG y, - UINT Flags); + HWND Parent, + LONG x, + LONG y, + UINT Flags); BOOL NTAPI @@ -1696,12 +1723,12 @@ BOOL NTAPI NtUserCloseDesktop( - HDESK hDesktop); + HDESK hDesktop); BOOL NTAPI NtUserCloseWindowStation( - HWINSTA hWinSta); + HWINSTA hWinSta); /* Console commands for NtUserConsoleControl */ typedef enum _CONSOLECONTROL @@ -1721,15 +1748,15 @@ HANDLE NTAPI NtUserConvertMemHandle( - PVOID pData, - DWORD cbData); + PVOID pData, + DWORD cbData); ULONG NTAPI NtUserCopyAcceleratorTable( - HACCEL Table, - LPACCEL Entries, - ULONG EntriesCount); + HACCEL Table, + LPACCEL Entries, + ULONG EntriesCount); DWORD NTAPI @@ -1738,25 +1765,25 @@ HACCEL NTAPI NtUserCreateAcceleratorTable( - LPACCEL Entries, - ULONG EntriesCount); + LPACCEL Entries, + ULONG EntriesCount); BOOL NTAPI NtUserCreateCaret( - HWND hWnd, - HBITMAP hBitmap, - int nWidth, - int nHeight); + HWND hWnd, + HBITMAP hBitmap, + int nWidth, + int nHeight); HDESK NTAPI NtUserCreateDesktop( - POBJECT_ATTRIBUTES poa, - PUNICODE_STRING lpszDesktopDevice, - LPDEVMODEW lpdmw, - DWORD dwFlags, - ACCESS_MASK dwDesiredAccess); + POBJECT_ATTRIBUTES poa, + PUNICODE_STRING lpszDesktopDevice, + LPDEVMODEW lpdmw, + DWORD dwFlags, + ACCESS_MASK dwDesiredAccess); DWORD NTAPI @@ -1766,96 +1793,102 @@ NTSTATUS NTAPI NtUserCreateLocalMemHandle( - HANDLE hMem, - PVOID pData, - DWORD cbData, - DWORD *pcbData); + HANDLE hMem, + PVOID pData, + DWORD cbData, + DWORD *pcbData); HWND NTAPI NtUserCreateWindowEx( - DWORD dwExStyle, - PLARGE_STRING plstrClassName, - PLARGE_STRING plstrClsVersion, - PLARGE_STRING plstrWindowName, - DWORD dwStyle, - int x, - int y, - int nWidth, - int nHeight, - HWND hWndParent, - HMENU hMenu, - HINSTANCE hInstance, - LPVOID lpParam, - DWORD dwFlags, - PVOID acbiBuffer); + DWORD dwExStyle, + PLARGE_STRING plstrClassName, + PLARGE_STRING plstrClsVersion, + PLARGE_STRING plstrWindowName, + DWORD dwStyle, + int x, + int y, + int nWidth, + int nHeight, + HWND hWndParent, + HMENU hMenu, + HINSTANCE hInstance, + LPVOID lpParam, + DWORD dwFlags, + PVOID acbiBuffer); HWINSTA NTAPI NtUserCreateWindowStation( - POBJECT_ATTRIBUTES ObjectAttributes, - ACCESS_MASK dwDesiredAccess, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6); + POBJECT_ATTRIBUTES ObjectAttributes, + ACCESS_MASK dwDesiredAccess, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4, + DWORD Unknown5, + DWORD Unknown6); BOOL NTAPI NtUserDdeGetQualityOfService( - IN HWND hwndClient, - IN HWND hWndServer, - OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev); + IN HWND hwndClient, + IN HWND hWndServer, + OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev); DWORD NTAPI NtUserDdeInitialize( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4); BOOL NTAPI NtUserDdeSetQualityOfService( - IN HWND hwndClient, - IN PSECURITY_QUALITY_OF_SERVICE pqosNew, - OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev); - -HDWP NTAPI + IN HWND hwndClient, + IN PSECURITY_QUALITY_OF_SERVICE pqosNew, + OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev); + +HDWP +NTAPI NtUserDeferWindowPos( - HDWP WinPosInfo, - HWND Wnd, - HWND WndInsertAfter, - int x, - int y, - int cx, - int cy, - UINT Flags); - -BOOL NTAPI -NtUserDefSetText(HWND WindowHandle, PLARGE_STRING WindowText); + HDWP WinPosInfo, + HWND Wnd, + HWND WndInsertAfter, + int x, + int y, + int cx, + int cy, + UINT Flags); + +BOOL +NTAPI +NtUserDefSetText( + HWND WindowHandle, + PLARGE_STRING WindowText); BOOLEAN NTAPI NtUserDestroyAcceleratorTable( - HACCEL Table); + HACCEL Table); BOOL NTAPI NtUserDestroyCursor( - _In_ HANDLE Handle, - _In_ BOOL bForce); + _In_ HANDLE Handle, + _In_ BOOL bForce); DWORD NTAPI NtUserDestroyInputContext( DWORD dwUnknown1); -BOOLEAN NTAPI -NtUserDestroyWindow(HWND Wnd); +BOOLEAN +NTAPI +NtUserDestroyWindow( + HWND Wnd); DWORD NTAPI @@ -1864,73 +1897,74 @@ LRESULT NTAPI -NtUserDispatchMessage(PMSG pMsg); +NtUserDispatchMessage( + PMSG pMsg); BOOL NTAPI NtUserDragDetect( - HWND hWnd, - POINT pt); + HWND hWnd, + POINT pt); DWORD NTAPI NtUserDragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1); + HWND hwnd1, + HWND hwnd2, + UINT u1, + DWORD dw1, + HCURSOR hc1); BOOL NTAPI NtUserDrawAnimatedRects( - HWND hwnd, - INT idAni, - RECT *lprcFrom, - RECT *lprcTo); + HWND hwnd, + INT idAni, + RECT *lprcFrom, + RECT *lprcTo); BOOL NTAPI NtUserDrawCaption( - HWND hWnd, - HDC hDc, - LPCRECT lpRc, - UINT uFlags); + HWND hWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags); BOOL NTAPI NtUserDrawCaptionTemp( - HWND hWnd, - HDC hDC, - LPCRECT lpRc, - HFONT hFont, - HICON hIcon, - const PUNICODE_STRING str, - UINT uFlags); - -// Used with NtUserDrawIconEx, last parameter. + HWND hWnd, + HDC hDC, + LPCRECT lpRc, + HFONT hFont, + HICON hIcon, + const PUNICODE_STRING str, + UINT uFlags); + +/* Used with NtUserDrawIconEx, last parameter. */ typedef struct _DRAWICONEXDATA { - HBITMAP hbmMask; - HBITMAP hbmColor; - int cx; - int cy; + HBITMAP hbmMask; + HBITMAP hbmColor; + int cx; + int cy; } DRAWICONEXDATA, *PDRAWICONEXDATA; BOOL NTAPI NtUserDrawIconEx( - HDC hdc, - int xLeft, - int yTop, - HICON hIcon, - int cxWidth, - int cyWidth, - UINT istepIfAniCur, - HBRUSH hbrFlickerFreeDraw, - UINT diFlags, - BOOL bMetaHDC, - PVOID pDIXData); + HDC hdc, + int xLeft, + int yTop, + HICON hIcon, + int cxWidth, + int cyWidth, + UINT istepIfAniCur, + HBRUSH hbrFlickerFreeDraw, + UINT diFlags, + BOOL bMetaHDC, + PVOID pDIXData); BOOL NTAPI @@ -1939,99 +1973,106 @@ BOOL NTAPI NtUserEnableScrollBar( - HWND hWnd, - UINT wSBflags, - UINT wArrows); + HWND hWnd, + UINT wSBflags, + UINT wArrows); BOOL NTAPI NtUserEndDeferWindowPosEx( - HDWP WinPosInfo, - DWORD Unknown1); - -BOOL NTAPI -NtUserEndPaint(HWND hWnd, CONST PAINTSTRUCT* lPs); - -BOOL -NTAPI -NtUserEnumDisplayDevices ( - PUNICODE_STRING lpDevice, /* device name */ - DWORD iDevNum, /* display device */ - PDISPLAY_DEVICEW lpDisplayDevice, /* device information */ - DWORD dwFlags ); /* reserved */ - -/*BOOL -NTAPI -NtUserEnumDisplayMonitors ( - HDC hdc, - LPCRECT lprcClip, - MONITORENUMPROC lpfnEnum, - LPARAM dwData );*/ -/* FIXME: The call below is ros-specific and should be rewritten to use the same params as the correct call above. */ + HDWP WinPosInfo, + DWORD Unknown1); + +BOOL +NTAPI +NtUserEndPaint( + HWND hWnd, + CONST PAINTSTRUCT *lPs); + +BOOL +NTAPI +NtUserEnumDisplayDevices( + PUNICODE_STRING lpDevice, /* device name */ + DWORD iDevNum, /* display device */ + PDISPLAY_DEVICEW lpDisplayDevice, /* device information */ + DWORD dwFlags); /* reserved */ + +/* +BOOL +NTAPI +NtUserEnumDisplayMonitors( + HDC hdc, + LPCRECT lprcClip, + MONITORENUMPROC lpfnEnum, + LPARAM dwData); +*/ +/* FIXME: The call below is ros-specific and should be rewritten to use the same params as the correct call above. */ INT NTAPI NtUserEnumDisplayMonitors( - OPTIONAL IN HDC hDC, - OPTIONAL IN LPCRECT pRect, - OPTIONAL OUT HMONITOR *hMonitorList, - OPTIONAL OUT LPRECT monitorRectList, - OPTIONAL IN DWORD listSize ); + OPTIONAL IN HDC hDC, + OPTIONAL IN LPCRECT pRect, + OPTIONAL OUT HMONITOR *hMonitorList, + OPTIONAL OUT LPRECT monitorRectList, + OPTIONAL IN DWORD listSize); NTSTATUS NTAPI NtUserEnumDisplaySettings( - PUNICODE_STRING lpszDeviceName, - DWORD iModeNum, - LPDEVMODEW lpDevMode, /* FIXME is this correct? */ - DWORD dwFlags ); + PUNICODE_STRING lpszDeviceName, + DWORD iModeNum, + LPDEVMODEW lpDevMode, /* FIXME is this correct? */ + DWORD dwFlags); DWORD NTAPI NtUserEvent( - DWORD Unknown0); + DWORD Unknown0); DWORD NTAPI NtUserExcludeUpdateRgn( - HDC hDC, - HWND hWnd); + HDC hDC, + HWND hWnd); BOOL NTAPI NtUserFillWindow( - HWND hWndPaint, - HWND hWndPaint1, - HDC hDC, - HBRUSH hBrush); + HWND hWndPaint, + HWND hWndPaint1, + HDC hDC, + HBRUSH hBrush); HWND NTAPI NtUserFindWindowEx( - HWND hwndParent, - HWND hwndChildAfter, - PUNICODE_STRING ucClassName, - PUNICODE_STRING ucWindowName, - DWORD dwUnknown - ); + HWND hwndParent, + HWND hwndChildAfter, + PUNICODE_STRING ucClassName, + PUNICODE_STRING ucWindowName, + DWORD dwUnknown); BOOL NTAPI NtUserFlashWindowEx( - IN PFLASHWINFO pfwi); + IN PFLASHWINFO pfwi); BOOL NTAPI NtUserGetAltTabInfo( - HWND hwnd, - INT iItem, - PALTTABINFO pati, - LPWSTR pszItemText, - UINT cchItemText, - BOOL Ansi); - -HWND NTAPI -NtUserGetAncestor(HWND hWnd, UINT Flags); + HWND hwnd, + INT iItem, + PALTTABINFO pati, + LPWSTR pszItemText, + UINT cchItemText, + BOOL Ansi); + +HWND +NTAPI +NtUserGetAncestor( + HWND hWnd, + UINT Flags); DWORD NTAPI @@ -2041,10 +2082,10 @@ SHORT NTAPI NtUserGetAsyncKeyState( - INT Key); - -_Success_(return!=0) -_At_(pustrName->Buffer, _Out_z_bytecap_post_bytecount_(pustrName->MaximumLength, return*2+2)) + INT Key); + +_Success_(return != 0) +_At_(pustrName->Buffer, _Out_z_bytecap_post_bytecount_(pustrName->MaximumLength, return * 2 + 2)) ULONG APIENTRY NtUserGetAtomName( @@ -2058,33 +2099,36 @@ BOOL NTAPI NtUserGetCaretPos( - LPPOINT lpPoint); - -BOOL NTAPI -NtUserGetClassInfo(HINSTANCE hInstance, - PUNICODE_STRING ClassName, - LPWNDCLASSEXW wcex, - LPWSTR *ppszMenuName, - BOOL Ansi); + LPPOINT lpPoint); + +BOOL +NTAPI +NtUserGetClassInfo( + HINSTANCE hInstance, + PUNICODE_STRING ClassName, + LPWNDCLASSEXW wcex, + LPWSTR *ppszMenuName, + BOOL Ansi); INT NTAPI -NtUserGetClassName(HWND hWnd, - BOOL Real, // 0 GetClassNameW, 1 RealGetWindowClassA/W - PUNICODE_STRING ClassName); +NtUserGetClassName( + HWND hWnd, + BOOL Real, /* 0 GetClassNameW, 1 RealGetWindowClassA/W */ + PUNICODE_STRING ClassName); HANDLE NTAPI NtUserGetClipboardData( - UINT fmt, - PGETCLIPBDATA pgcd); + UINT fmt, + PGETCLIPBDATA pgcd); INT NTAPI NtUserGetClipboardFormatName( - UINT uFormat, - LPWSTR lpszFormatName, - INT cchMaxCount); + UINT uFormat, + LPWSTR lpszFormatName, + INT cchMaxCount); HWND NTAPI @@ -2101,60 +2145,60 @@ BOOL NTAPI NtUserGetClipCursor( - RECT *lpRect); + RECT *lpRect); BOOL NTAPI NtUserGetComboBoxInfo( - HWND hWnd, - PCOMBOBOXINFO pcbi); + HWND hWnd, + PCOMBOBOXINFO pcbi); HBRUSH NTAPI NtUserGetControlBrush( - HWND hwnd, - HDC hdc, - UINT ctlType); + HWND hwnd, + HDC hdc, + UINT ctlType); HBRUSH NTAPI NtUserGetControlColor( - HWND hwndParent, - HWND hwnd, - HDC hdc, - UINT CtlMsg); + HWND hwndParent, + HWND hwnd, + HDC hdc, + UINT CtlMsg); ULONG_PTR NTAPI NtUserGetCPD( - HWND hWnd, - GETCPD Flags, - ULONG_PTR Proc); + HWND hWnd, + GETCPD Flags, + ULONG_PTR Proc); HCURSOR NTAPI NtUserGetCursorFrameInfo( - HCURSOR hCursor, - DWORD istep, - INT* rate_jiffies, - DWORD* num_steps); + HCURSOR hCursor, + DWORD istep, + INT *rate_jiffies, + DWORD *num_steps); BOOL NTAPI NtUserGetCursorInfo( - PCURSORINFO pci); + PCURSORINFO pci); HDC NTAPI NtUserGetDC( - HWND hWnd); + HWND hWnd); HDC NTAPI NtUserGetDCEx( - HWND hWnd, - HANDLE hRegion, - ULONG Flags); + HWND hWnd, + HANDLE hRegion, + ULONG Flags); UINT NTAPI @@ -2167,41 +2211,41 @@ DWORD NTAPI NtUserGetGuiResources( - HANDLE hProcess, - DWORD uiFlags); + HANDLE hProcess, + DWORD uiFlags); BOOL NTAPI NtUserGetGUIThreadInfo( - DWORD idThread, - LPGUITHREADINFO lpgui); - -_Success_(return!=FALSE) + DWORD idThread, + LPGUITHREADINFO lpgui); + +_Success_(return != FALSE) BOOL NTAPI NtUserGetIconInfo( - _In_ HANDLE hCurIcon, - _Out_opt_ PICONINFO IconInfo, - _Inout_opt_ PUNICODE_STRING lpInstName, - _Inout_opt_ PUNICODE_STRING lpResName, - _Out_opt_ LPDWORD pbpp, - _In_ BOOL bInternal); + _In_ HANDLE hCurIcon, + _Out_opt_ PICONINFO IconInfo, + _Inout_opt_ PUNICODE_STRING lpInstName, + _Inout_opt_ PUNICODE_STRING lpResName, + _Out_opt_ LPDWORD pbpp, + _In_ BOOL bInternal); BOOL NTAPI NtUserGetIconSize( HANDLE Handle, UINT istepIfAniCur, - LONG *plcx, - LONG *plcy); + LONG *plcx, + LONG *plcy); DWORD NTAPI NtUserGetImeHotKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3); DWORD NTAPI @@ -2212,44 +2256,47 @@ DWORD NTAPI NtUserGetInternalWindowPos( - HWND hwnd, - LPRECT rectWnd, - LPPOINT ptIcon); + HWND hwnd, + LPRECT rectWnd, + LPPOINT ptIcon); HKL NTAPI NtUserGetKeyboardLayout( - DWORD dwThreadid); + DWORD dwThreadid); UINT NTAPI NtUserGetKeyboardLayoutList( - ULONG nItems, - HKL *pHklBuff); + ULONG nItems, + HKL *pHklBuff); BOOL NTAPI NtUserGetKeyboardLayoutName( - LPWSTR lpszName); + LPWSTR lpszName); DWORD NTAPI NtUserGetKeyboardState( - LPBYTE Unknown0); + LPBYTE Unknown0); DWORD NTAPI NtUserGetKeyboardType( - DWORD TypeFlag); - -DWORD -NTAPI -NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ); + DWORD TypeFlag); + +DWORD +NTAPI +NtUserGetKeyNameText( + LONG lParam, + LPWSTR lpString, + int nSize); SHORT NTAPI NtUserGetKeyState( - INT VirtKey); + INT VirtKey); BOOL NTAPI @@ -2262,31 +2309,33 @@ DWORD NTAPI NtUserGetListBoxInfo( - HWND hWnd); - -BOOL APIENTRY -NtUserGetMessage(PMSG pMsg, - HWND hWnd, - UINT MsgFilterMin, - UINT MsgFilterMax); + HWND hWnd); + +BOOL +APIENTRY +NtUserGetMessage( + PMSG pMsg, + HWND hWnd, + UINT MsgFilterMin, + UINT MsgFilterMax); DWORD NTAPI NtUserGetMouseMovePointsEx( - UINT cbSize, - LPMOUSEMOVEPOINT lppt, - LPMOUSEMOVEPOINT lpptBuf, - int nBufPoints, - DWORD resolution); + UINT cbSize, + LPMOUSEMOVEPOINT lppt, + LPMOUSEMOVEPOINT lpptBuf, + int nBufPoints, + DWORD resolution); BOOL NTAPI NtUserGetObjectInformation( - HANDLE hObject, - DWORD nIndex, - PVOID pvInformation, - DWORD nLength, - PDWORD nLengthNeeded); + HANDLE hObject, + DWORD nIndex, + PVOID pvInformation, + DWORD nLength, + PDWORD nLengthNeeded); HWND NTAPI @@ -2295,8 +2344,8 @@ INT NTAPI NtUserGetPriorityClipboardFormat( - UINT *paFormatPriorityList, - INT cFormats); + UINT *paFormatPriorityList, + INT cFormats); HWINSTA NTAPI @@ -2312,11 +2361,11 @@ DWORD NTAPI NtUserGetRawInputData( - HRAWINPUT hRawInput, - UINT uiCommand, - LPVOID pData, - PUINT pcbSize, - UINT cbSizeHeader); + HRAWINPUT hRawInput, + UINT uiCommand, + LPVOID pData, + PUINT pcbSize, + UINT cbSizeHeader); DWORD NTAPI @@ -2343,16 +2392,15 @@ BOOL NTAPI NtUserGetScrollBarInfo( - HWND hWnd, - LONG idObject, - PSCROLLBARINFO psbi); + HWND hWnd, + LONG idObject, + PSCROLLBARINFO psbi); HDESK NTAPI NtUserGetThreadDesktop( - DWORD dwThreadId, - DWORD Unknown1); - + DWORD dwThreadId, + DWORD Unknown1); enum ThreadStateRoutines { @@ -2374,40 +2422,44 @@ DWORD_PTR NTAPI NtUserGetThreadState( - DWORD Routine); + DWORD Routine); BOOLEAN NTAPI NtUserGetTitleBarInfo( - HWND hwnd, - PTITLEBARINFO pti); - -BOOL NTAPI -NtUserGetUpdateRect(HWND hWnd, LPRECT lpRect, BOOL fErase); + HWND hwnd, + PTITLEBARINFO pti); + +BOOL +NTAPI +NtUserGetUpdateRect( + HWND hWnd, + LPRECT lpRect, + BOOL fErase); int NTAPI NtUserGetUpdateRgn( - HWND hWnd, - HRGN hRgn, - BOOL bErase); + HWND hWnd, + HRGN hRgn, + BOOL bErase); HDC NTAPI NtUserGetWindowDC( - HWND hWnd); + HWND hWnd); BOOL NTAPI NtUserGetWindowPlacement( - HWND hWnd, - WINDOWPLACEMENT *lpwndpl); + HWND hWnd, + WINDOWPLACEMENT *lpwndpl); PCLS NTAPI NtUserGetWOWClass( - HINSTANCE hInstance, - PUNICODE_STRING ClassName); + HINSTANCE hInstance, + PUNICODE_STRING ClassName); DWORD NTAPI @@ -2419,46 +2471,46 @@ BOOL NTAPI NtUserImpersonateDdeClientWindow( - HWND hWndClient, - HWND hWndServer); + HWND hWndClient, + HWND hWndServer); NTSTATUS NTAPI NtUserInitialize( - DWORD dwWinVersion, - HANDLE hPowerRequestEvent, - HANDLE hMediaRequestEvent); + DWORD dwWinVersion, + HANDLE hPowerRequestEvent, + HANDLE hMediaRequestEvent); NTSTATUS NTAPI NtUserInitializeClientPfnArrays( - PPFNCLIENT pfnClientA, - PPFNCLIENT pfnClientW, - PPFNCLIENTWORKER pfnClientWorker, - HINSTANCE hmodUser); + PPFNCLIENT pfnClientA, + PPFNCLIENT pfnClientW, + PPFNCLIENTWORKER pfnClientWorker, + HINSTANCE hmodUser); DWORD NTAPI NtUserInitTask( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7, - DWORD Unknown8, - DWORD Unknown9, - DWORD Unknown10, - DWORD Unknown11); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4, + DWORD Unknown5, + DWORD Unknown6, + DWORD Unknown7, + DWORD Unknown8, + DWORD Unknown9, + DWORD Unknown10, + DWORD Unknown11); INT NTAPI NtUserInternalGetWindowText( - HWND hWnd, - LPWSTR lpString, - INT nMaxCount); + HWND hWnd, + LPWSTR lpString, + INT nMaxCount); BOOL NTAPI @@ -2477,36 +2529,34 @@ BOOL NTAPI NtUserIsClipboardFormatAvailable( - UINT format); - -BOOL -NTAPI -NtUserKillTimer -( - HWND hWnd, - UINT_PTR uIDEvent -); + UINT format); + +BOOL +NTAPI +NtUserKillTimer( + HWND hWnd, + UINT_PTR uIDEvent); HKL NTAPI NtUserLoadKeyboardLayoutEx( - IN HANDLE Handle, - IN DWORD offTable, - IN PUNICODE_STRING puszKeyboardName, - IN HKL hKL, - IN PUNICODE_STRING puszKLID, - IN DWORD dwKLID, - IN UINT Flags); + IN HANDLE Handle, + IN DWORD offTable, + IN PUNICODE_STRING puszKeyboardName, + IN HKL hKL, + IN PUNICODE_STRING puszKLID, + IN DWORD dwKLID, + IN UINT Flags); BOOL NTAPI NtUserLockWindowStation( - HWINSTA hWindowStation); + HWINSTA hWindowStation); BOOL NTAPI NtUserLockWindowUpdate( - HWND hWnd); + HWND hWnd); BOOL NTAPI @@ -2514,35 +2564,36 @@ UINT NTAPI -NtUserMapVirtualKeyEx(UINT keyCode, - UINT transType, - DWORD keyboardId, - HKL dwhkl); +NtUserMapVirtualKeyEx( + UINT keyCode, + UINT transType, + DWORD keyboardId, + HKL dwhkl); typedef struct tagDOSENDMESSAGE { - UINT uFlags; - UINT uTimeout; - ULONG_PTR Result; + UINT uFlags; + UINT uTimeout; + ULONG_PTR Result; } DOSENDMESSAGE, *PDOSENDMESSAGE; BOOL NTAPI NtUserMessageCall( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - ULONG_PTR ResultInfo, - DWORD dwType, // FNID_XX types - BOOL Ansi); + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + ULONG_PTR ResultInfo, + DWORD dwType, /* FNID_XX types */ + BOOL Ansi); DWORD NTAPI NtUserMinMaximize( HWND hWnd, - UINT cmd, // Wine SW_ commands + UINT cmd, /* Wine SW_ commands */ BOOL Hide); DWORD @@ -2552,14 +2603,14 @@ DWORD NTAPI NtUserMNDragOver( - DWORD Unknown0, - DWORD Unknown1); + DWORD Unknown0, + DWORD Unknown1); DWORD NTAPI NtUserModifyUserStartupInfoFlags( - DWORD Unknown0, - DWORD Unknown1); + DWORD Unknown0, + DWORD Unknown1); BOOL NTAPI @@ -2575,56 +2626,56 @@ DWORD NTAPI NtUserNotifyIMEStatus( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2); BOOL NTAPI NtUserNotifyProcessCreate( HANDLE NewProcessId, HANDLE ParentThreadId, - ULONG dwUnknown, - ULONG CreateFlags); + ULONG dwUnknown, + ULONG CreateFlags); VOID NTAPI NtUserNotifyWinEvent( - DWORD Event, - HWND hWnd, - LONG idObject, - LONG idChild); + DWORD Event, + HWND hWnd, + LONG idObject, + LONG idChild); BOOL NTAPI NtUserOpenClipboard( - HWND hWnd, - DWORD Unknown1); + HWND hWnd, + DWORD Unknown1); HDESK NTAPI NtUserOpenDesktop( - POBJECT_ATTRIBUTES ObjectAttributes, - DWORD dwFlags, - ACCESS_MASK dwDesiredAccess); + POBJECT_ATTRIBUTES ObjectAttributes, + DWORD dwFlags, + ACCESS_MASK dwDesiredAccess); HDESK NTAPI NtUserOpenInputDesktop( - DWORD dwFlags, - BOOL fInherit, - ACCESS_MASK dwDesiredAccess); + DWORD dwFlags, + BOOL fInherit, + ACCESS_MASK dwDesiredAccess); HWINSTA NTAPI NtUserOpenWindowStation( - POBJECT_ATTRIBUTES ObjectAttributes, - ACCESS_MASK dwDesiredAccess); + POBJECT_ATTRIBUTES ObjectAttributes, + ACCESS_MASK dwDesiredAccess); BOOL NTAPI NtUserPaintDesktop( - HDC hDC); + HDC hDC); DWORD NTAPI @@ -2636,42 +2687,44 @@ DWORD dwUnknown5, DWORD dwUnknown6); -BOOL APIENTRY -NtUserPeekMessage( PMSG pMsg, - HWND hWnd, - UINT MsgFilterMin, - UINT MsgFilterMax, - UINT RemoveMsg); +BOOL +APIENTRY +NtUserPeekMessage( + PMSG pMsg, + HWND hWnd, + UINT MsgFilterMin, + UINT MsgFilterMax, + UINT RemoveMsg); BOOL NTAPI NtUserPostMessage( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam); BOOL NTAPI NtUserPostThreadMessage( - DWORD idThread, - UINT Msg, - WPARAM wParam, - LPARAM lParam); + DWORD idThread, + UINT Msg, + WPARAM wParam, + LPARAM lParam); BOOL NTAPI NtUserPrintWindow( HWND hwnd, - HDC hdcBlt, + HDC hdcBlt, UINT nFlags); NTSTATUS NTAPI NtUserProcessConnect( - IN HANDLE ProcessHandle, + IN HANDLE ProcessHandle, OUT PUSERCONNECT pUserConnect, - IN ULONG Size); // sizeof(USERCONNECT) + IN ULONG Size); /* sizeof(USERCONNECT) */ NTSTATUS NTAPI @@ -2679,8 +2732,7 @@ IN HANDLE ThreadHandle, IN USERTHREADINFOCLASS ThreadInformationClass, OUT PVOID ThreadInformation, - IN ULONG ThreadInformationLength -); + IN ULONG ThreadInformationLength); DWORD NTAPI @@ -2691,29 +2743,30 @@ DWORD NTAPI NtUserQuerySendMessage( - DWORD Unknown0); + DWORD Unknown0); DWORD NTAPI NtUserQueryUserCounters( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4); - -#define QUERY_WINDOW_UNIQUE_PROCESS_ID 0x00 -#define QUERY_WINDOW_UNIQUE_THREAD_ID 0x01 -#define QUERY_WINDOW_ACTIVE 0x02 -#define QUERY_WINDOW_FOCUS 0x03 -#define QUERY_WINDOW_ISHUNG 0x04 -#define QUERY_WINDOW_REAL_ID 0x05 -#define QUERY_WINDOW_FOREGROUND 0x06 + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4); + +#define QUERY_WINDOW_UNIQUE_PROCESS_ID 0x00 +#define QUERY_WINDOW_UNIQUE_THREAD_ID 0x01 +#define QUERY_WINDOW_ACTIVE 0x02 +#define QUERY_WINDOW_FOCUS 0x03 +#define QUERY_WINDOW_ISHUNG 0x04 +#define QUERY_WINDOW_REAL_ID 0x05 +#define QUERY_WINDOW_FOREGROUND 0x06 + DWORD NTAPI NtUserQueryWindow( - HWND hWnd, - DWORD Index); + HWND hWnd, + DWORD Index); BOOL NTAPI @@ -2740,13 +2793,11 @@ BOOL NTAPI -NtUserRedrawWindow -( - HWND hWnd, - CONST RECT *lprcUpdate, - HRGN hrgnUpdate, - UINT flags -); +NtUserRedrawWindow( + HWND hWnd, + CONST RECT *lprcUpdate, + HRGN hrgnUpdate, + UINT flags); RTL_ATOM NTAPI @@ -2776,18 +2827,21 @@ BOOL NTAPI -NtUserRegisterHotKey(HWND hWnd, - int id, - UINT fsModifiers, - UINT vk); +NtUserRegisterHotKey( + HWND hWnd, + int id, + UINT fsModifiers, + UINT vk); DWORD NTAPI NtUserRegisterTasklist( - DWORD Unknown0); - -UINT NTAPI -NtUserRegisterWindowMessage(PUNICODE_STRING MessageName); + DWORD Unknown0); + +UINT +NTAPI +NtUserRegisterWindowMessage( + PUNICODE_STRING MessageName); DWORD NTAPI @@ -2812,8 +2866,11 @@ NTAPI NtUserRemoteStopScreenUpdates(VOID); -HANDLE NTAPI -NtUserRemoveProp(HWND hWnd, ATOM Atom); +HANDLE +NTAPI +NtUserRemoveProp( + HWND hWnd, + ATOM Atom); DWORD NTAPI @@ -2826,40 +2883,50 @@ DWORD NTAPI NtUserResolveDesktopForWOW( - DWORD Unknown0); + DWORD Unknown0); BOOL NTAPI NtUserSBGetParms( - HWND hwnd, - int fnBar, - PSBDATA pSBData, - LPSCROLLINFO lpsi); + HWND hwnd, + int fnBar, + PSBDATA pSBData, + LPSCROLLINFO lpsi); BOOL NTAPI NtUserScrollDC( - HDC hDC, - int dx, - int dy, - CONST RECT *lprcScroll, - CONST RECT *lprcClip , - HRGN hrgnUpdate, - LPRECT lprcUpdate); - -DWORD NTAPI -NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *rect, - const RECT *clipRect, HRGN hrgnUpdate, LPRECT rcUpdate, UINT flags); + HDC hDC, + int dx, + int dy, + CONST RECT *lprcScroll, + CONST RECT *lprcClip , + HRGN hrgnUpdate, + LPRECT lprcUpdate); + +DWORD +NTAPI +NtUserScrollWindowEx( + HWND hWnd, + INT dx, + INT dy, + const RECT *rect, + const RECT *clipRect, + HRGN hrgnUpdate, + LPRECT rcUpdate, + UINT flags); UINT NTAPI NtUserSendInput( - UINT nInputs, - LPINPUT pInput, - INT cbSize); - -HWND NTAPI -NtUserSetActiveWindow(HWND Wnd); + UINT nInputs, + LPINPUT pInput, + INT cbSize); + +HWND +NTAPI +NtUserSetActiveWindow( + HWND Wnd); DWORD NTAPI @@ -2867,68 +2934,71 @@ DWORD dwUnknown1, DWORD dwUnknown2); -HWND NTAPI -NtUserSetCapture(HWND Wnd); - -ULONG_PTR NTAPI +HWND +NTAPI +NtUserSetCapture( + HWND Wnd); + +ULONG_PTR +NTAPI NtUserSetClassLong( - HWND hWnd, - INT Offset, - ULONG_PTR dwNewLong, - BOOL Ansi ); + HWND hWnd, + INT Offset, + ULONG_PTR dwNewLong, + BOOL Ansi); WORD NTAPI NtUserSetClassWord( - HWND hWnd, - INT nIndex, - WORD wNewWord); + HWND hWnd, + INT nIndex, + WORD wNewWord); HANDLE NTAPI NtUserSetClipboardData( - UINT fmt, - HANDLE hMem, - PSETCLIPBDATA scd); + UINT fmt, + HANDLE hMem, + PSETCLIPBDATA scd); HWND NTAPI NtUserSetClipboardViewer( - HWND hWndNewViewer); + HWND hWndNewViewer); HPALETTE NTAPI NtUserSelectPalette( HDC hDC, - HPALETTE hpal, - BOOL ForceBackground -); + HPALETTE hpal, + BOOL ForceBackground); DWORD NTAPI NtUserSetConsoleReserveKeys( - DWORD Unknown0, - DWORD Unknown1); + DWORD Unknown0, + DWORD Unknown1); HCURSOR NTAPI NtUserSetCursor( - HCURSOR hCursor); + HCURSOR hCursor); BOOL NTAPI NtUserSetCursorContents( - HANDLE Handle, - PICONINFO IconInfo); + HANDLE Handle, + PICONINFO IconInfo); #ifdef NEW_CURSORICON + BOOL NTAPI NtUserSetCursorIconData( - _In_ HCURSOR hCursor, - _In_ PUNICODE_STRING pustrModule, - _In_ PUNICODE_STRING puSrcName, - _In_ const CURSORDATA* pCursorData); + _In_ HCURSOR hCursor, + _In_ PUNICODE_STRING pustrModule, + _In_ PUNICODE_STRING puSrcName, + _In_ const CURSORDATA *pCursorData); typedef struct _tagFINDEXISTINGCURICONPARAM { @@ -2940,48 +3010,51 @@ HICON NTAPI NtUserFindExistingCursorIcon( - _In_ PUNICODE_STRING pustrModule, - _In_ PUNICODE_STRING pustrRsrc, - _In_ FINDEXISTINGCURICONPARAM* param); -#else + _In_ PUNICODE_STRING pustrModule, + _In_ PUNICODE_STRING pustrRsrc, + _In_ FINDEXISTINGCURICONPARAM *param); + +#else /* NEW_CURSORICON */ + BOOL NTAPI NtUserSetCursorIconData( - HANDLE Handle, - PBOOL fIcon, - POINT *Hotspot, - HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc); + HANDLE Handle, + PBOOL fIcon, + POINT *Hotspot, + HMODULE hModule, + HRSRC hRsrc, + HRSRC hGroupRsrc); HICON NTAPI NtUserFindExistingCursorIcon( - HMODULE hModule, - HRSRC hRsrc, - LONG cx, - LONG cy); -#endif + HMODULE hModule, + HRSRC hRsrc, + LONG cx, + LONG cy); + +#endif /* NEW_CURSORICON */ DWORD NTAPI NtUserSetDbgTag( - DWORD Unknown0, - DWORD Unknown1); + DWORD Unknown0, + DWORD Unknown1); HWND NTAPI NtUserSetFocus( - HWND hWnd); + HWND hWnd); DWORD NTAPI NtUserSetImeHotKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4); DWORD NTAPI @@ -2991,8 +3064,8 @@ DWORD NTAPI NtUserSetImeOwnerWindow( - DWORD Unknown0, - DWORD Unknown1); + DWORD Unknown0, + DWORD Unknown1); DWORD NTAPI @@ -3008,111 +3081,112 @@ IN HANDLE ThreadHandle, IN USERTHREADINFOCLASS ThreadInformationClass, IN PVOID ThreadInformation, - IN ULONG ThreadInformationLength -); + IN ULONG ThreadInformationLength); DWORD NTAPI NtUserSetInternalWindowPos( - HWND hwnd, - UINT showCmd, - LPRECT rect, - LPPOINT pt); + HWND hwnd, + UINT showCmd, + LPRECT rect, + LPPOINT pt); BOOL NTAPI NtUserSetKeyboardState( - LPBYTE lpKeyState); + LPBYTE lpKeyState); BOOL NTAPI NtUserSetLayeredWindowAttributes( - HWND hwnd, - COLORREF crKey, - BYTE bAlpha, - DWORD dwFlags); + HWND hwnd, + COLORREF crKey, + BYTE bAlpha, + DWORD dwFlags); BOOL NTAPI NtUserSetLogonNotifyWindow( - HWND hWnd); + HWND hWnd); BOOL NTAPI NtUserSetObjectInformation( - HANDLE hObject, - DWORD nIndex, - PVOID pvInformation, - DWORD nLength); + HANDLE hObject, + DWORD nIndex, + PVOID pvInformation, + DWORD nLength); HWND NTAPI NtUserSetParent( - HWND hWndChild, - HWND hWndNewParent); + HWND hWndChild, + HWND hWndNewParent); BOOL NTAPI NtUserSetProcessWindowStation( - HWINSTA hWindowStation); - -BOOL NTAPI -NtUserSetProp(HWND hWnd, ATOM Atom, HANDLE Data); + HWINSTA hWindowStation); + +BOOL +NTAPI +NtUserSetProp( + HWND hWnd, + ATOM Atom, + HANDLE Data); DWORD NTAPI NtUserSetRipFlags( - DWORD Unknown0, - DWORD Unknown1); + DWORD Unknown0, + DWORD Unknown1); DWORD NTAPI NtUserSetScrollInfo( - HWND hwnd, - int fnBar, - LPCSCROLLINFO lpsi, - BOOL bRedraw); + HWND hwnd, + int fnBar, + LPCSCROLLINFO lpsi, + BOOL bRedraw); BOOL NTAPI NtUserSetShellWindowEx( - HWND hwndShell, - HWND hwndShellListView); + HWND hwndShell, + HWND hwndShellListView); BOOL NTAPI NtUserSetSysColors( - int cElements, - IN CONST INT *lpaElements, - IN CONST COLORREF *lpaRgbValues, - FLONG Flags); + int cElements, + IN CONST INT *lpaElements, + IN CONST COLORREF *lpaRgbValues, + FLONG Flags); BOOL NTAPI NtUserSetSystemCursor( - HCURSOR hcur, - DWORD id); + HCURSOR hcur, + DWORD id); BOOL NTAPI NtUserSetThreadDesktop( - HDESK hDesktop); + HDESK hDesktop); DWORD NTAPI NtUserSetThreadState( - DWORD Unknown0, - DWORD Unknown1); + DWORD Unknown0, + DWORD Unknown1); UINT_PTR NTAPI -NtUserSetSystemTimer -( - HWND hWnd, - UINT_PTR nIDEvent, - UINT uElapse, - TIMERPROC lpTimerFunc -); +NtUserSetSystemTimer( + HWND hWnd, + UINT_PTR nIDEvent, + UINT uElapse, + TIMERPROC lpTimerFunc); DWORD NTAPI @@ -3122,117 +3196,122 @@ UINT_PTR NTAPI -NtUserSetTimer -( - HWND hWnd, - UINT_PTR nIDEvent, - UINT uElapse, - TIMERPROC lpTimerFunc -); +NtUserSetTimer( + HWND hWnd, + UINT_PTR nIDEvent, + UINT uElapse, + TIMERPROC lpTimerFunc); BOOL NTAPI NtUserSetWindowFNID( - HWND hWnd, - WORD fnID); + HWND hWnd, + WORD fnID); LONG NTAPI NtUserSetWindowLong( - HWND hWnd, - DWORD Index, - LONG NewValue, - BOOL Ansi); + HWND hWnd, + DWORD Index, + LONG NewValue, + BOOL Ansi); BOOL NTAPI NtUserSetWindowPlacement( - HWND hWnd, - WINDOWPLACEMENT *lpwndpl); - -BOOL -NTAPI NtUserSetWindowPos( + HWND hWnd, + WINDOWPLACEMENT *lpwndpl); + +BOOL +NTAPI +NtUserSetWindowPos( HWND hWnd, HWND hWndInsertAfter, int X, int Y, int cx, int cy, - UINT uFlags -); + UINT uFlags); INT NTAPI NtUserSetWindowRgn( - HWND hWnd, - HRGN hRgn, - BOOL bRedraw); + HWND hWnd, + HRGN hRgn, + BOOL bRedraw); HHOOK NTAPI NtUserSetWindowsHookAW( - int idHook, - HOOKPROC lpfn, - BOOL Ansi); + int idHook, + HOOKPROC lpfn, + BOOL Ansi); HHOOK NTAPI NtUserSetWindowsHookEx( - HINSTANCE Mod, - PUNICODE_STRING ModuleName, - DWORD ThreadId, - int HookId, - HOOKPROC HookProc, - BOOL Ansi); + HINSTANCE Mod, + PUNICODE_STRING ModuleName, + DWORD ThreadId, + int HookId, + HOOKPROC HookProc, + BOOL Ansi); BOOL NTAPI NtUserSetWindowStationUser( - HWINSTA hWindowStation, - PLUID pluid, - PSID psid, - DWORD size); - -WORD NTAPI -NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewVal); + HWINSTA hWindowStation, + PLUID pluid, + PSID psid, + DWORD size); + +WORD +NTAPI +NtUserSetWindowWord( + HWND hWnd, + INT Index, + WORD NewVal); HWINEVENTHOOK NTAPI NtUserSetWinEventHook( - UINT eventMin, - UINT eventMax, - HMODULE hmodWinEventProc, - PUNICODE_STRING puString, - WINEVENTPROC lpfnWinEventProc, - DWORD idProcess, - DWORD idThread, - UINT dwflags); + UINT eventMin, + UINT eventMax, + HMODULE hmodWinEventProc, + PUNICODE_STRING puString, + WINEVENTPROC lpfnWinEventProc, + DWORD idProcess, + DWORD idThread, + UINT dwflags); BOOL NTAPI NtUserShowCaret( - HWND hWnd); + HWND hWnd); BOOL NTAPI NtUserHideCaret( - HWND hWnd); - -DWORD -NTAPI -NtUserShowScrollBar(HWND hWnd, int wBar, DWORD bShow); + HWND hWnd); + +DWORD +NTAPI +NtUserShowScrollBar( + HWND hWnd, + int wBar, + DWORD bShow); BOOL NTAPI NtUserShowWindow( - HWND hWnd, - LONG nCmdShow); + HWND hWnd, + LONG nCmdShow); BOOL NTAPI NtUserShowWindowAsync( - HWND hWnd, - LONG nCmdShow); + HWND hWnd, + LONG nCmdShow); BOOL NTAPI @@ -3241,15 +3320,15 @@ BOOL NTAPI NtUserSwitchDesktop( - HDESK hDesktop); + HDESK hDesktop); BOOL NTAPI NtUserSystemParametersInfo( - UINT uiAction, - UINT uiParam, - PVOID pvParam, - UINT fWinIni); + UINT uiAction, + UINT uiParam, + PVOID pvParam, + UINT fWinIni); DWORD NTAPI @@ -3265,57 +3344,58 @@ LPWSTR pwszBuff, int cchBuff, UINT wFlags, - HKL dwhkl ); + HKL dwhkl); BOOL NTAPI NtUserTrackMouseEvent( - LPTRACKMOUSEEVENT lpEventTrack); + LPTRACKMOUSEEVENT lpEventTrack); int NTAPI NtUserTranslateAccelerator( - HWND Window, - HACCEL Table, - LPMSG Message); + HWND Window, + HACCEL Table, + LPMSG Message); BOOL NTAPI NtUserTranslateMessage( - LPMSG lpMsg, - UINT flags ); + LPMSG lpMsg, + UINT flags ); BOOL NTAPI NtUserUnhookWindowsHookEx( - HHOOK Hook); + HHOOK Hook); BOOL NTAPI NtUserUnhookWinEvent( - HWINEVENTHOOK hWinEventHook); + HWINEVENTHOOK hWinEventHook); BOOL NTAPI NtUserUnloadKeyboardLayout( - HKL hKl); + HKL hKl); BOOL NTAPI NtUserUnlockWindowStation( - HWINSTA hWindowStation); + HWINSTA hWindowStation); BOOL NTAPI NtUserUnregisterClass( - PUNICODE_STRING ClassNameOrAtom, - HINSTANCE hInstance, - PCLSMENUNAME pClassMenuName); - -BOOL -NTAPI -NtUserUnregisterHotKey(HWND hWnd, - int id); + PUNICODE_STRING ClassNameOrAtom, + HINSTANCE hInstance, + PCLSMENUNAME pClassMenuName); + +BOOL +NTAPI +NtUserUnregisterHotKey( + HWND hWnd, + int id); BOOL NTAPI @@ -3324,49 +3404,49 @@ DWORD NTAPI NtUserUpdateInputContext( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2); DWORD NTAPI NtUserUpdateInstance( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2); BOOL NTAPI NtUserUpdateLayeredWindow( - HWND hwnd, - HDC hdcDst, - POINT *pptDst, - SIZE *psize, - HDC hdcSrc, - POINT *pptSrc, - COLORREF crKey, - BLENDFUNCTION *pblend, - DWORD dwFlags, - RECT *prcDirty); + HWND hwnd, + HDC hdcDst, + POINT *pptDst, + SIZE *psize, + HDC hdcSrc, + POINT *pptSrc, + COLORREF crKey, + BLENDFUNCTION *pblend, + DWORD dwFlags, + RECT *prcDirty); BOOL NTAPI NtUserUpdatePerUserSystemParameters( - DWORD dwReserved, - BOOL bEnable); + DWORD dwReserved, + BOOL bEnable); BOOL NTAPI NtUserUserHandleGrantAccess( - IN HANDLE hUserHandle, - IN HANDLE hJob, - IN BOOL bGrant); + IN HANDLE hUserHandle, + IN HANDLE hJob, + IN BOOL bGrant); BOOL NTAPI NtUserValidateHandleSecure( - HANDLE hHdl, - BOOL Restricted); + HANDLE hHdl, + BOOL Restricted); BOOL NTAPI @@ -3384,21 +3464,21 @@ DWORD NTAPI NtUserVkKeyScanEx( - WCHAR wChar, - HKL KeyboardLayout, - BOOL bUsehHK); + WCHAR wChar, + HKL KeyboardLayout, + BOOL bUsehHK); DWORD NTAPI NtUserWaitForInputIdle( - IN HANDLE hProcess, - IN DWORD dwMilliseconds, - IN BOOL Unknown2); // Always FALSE + IN HANDLE hProcess, + IN DWORD dwMilliseconds, + IN BOOL Unknown2); /* Always FALSE */ DWORD NTAPI NtUserWaitForMsgAndEvent( - DWORD Unknown0); + DWORD Unknown0); BOOL NTAPI @@ -3407,59 +3487,55 @@ DWORD NTAPI NtUserWin32PoolAllocationStats( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4, + DWORD Unknown5); HWND NTAPI NtUserWindowFromPoint( - LONG X, - LONG Y); + LONG X, + LONG Y); DWORD NTAPI NtUserYieldTask(VOID); - - - - - - /* NtUserBad * ReactOS-specific NtUser calls and their related structures, both which shouldn't exist. */ -#define NOPARAM_ROUTINE_ISCONSOLEMODE 0xffff0001 -#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 -#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d -#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e -#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 -#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0051 -#define HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE 0xfffd0052 - #define MSQ_STATE_CAPTURE 0x1 - #define MSQ_STATE_ACTIVE 0x2 - #define MSQ_STATE_FOCUS 0x3 - #define MSQ_STATE_MENUOWNER 0x4 - #define MSQ_STATE_MOVESIZE 0x5 - #define MSQ_STATE_CARET 0x6 -#define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 -#define HWNDPARAM_ROUTINE_ROS_NOTIFYWINEVENT 0x1005 +#define NOPARAM_ROUTINE_ISCONSOLEMODE 0xffff0001 +#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 +#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d +#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e +#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 +#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0051 +#define HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE 0xfffd0052 + +#define MSQ_STATE_CAPTURE 0x1 +#define MSQ_STATE_ACTIVE 0x2 +#define MSQ_STATE_FOCUS 0x3 +#define MSQ_STATE_MENUOWNER 0x4 +#define MSQ_STATE_MOVESIZE 0x5 +#define MSQ_STATE_CARET 0x6 + +#define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 +#define HWNDPARAM_ROUTINE_ROS_NOTIFYWINEVENT 0x1005 BOOL NTAPI NtUserGetMonitorInfo( - IN HMONITOR hMonitor, - OUT LPMONITORINFO pMonitorInfo); + IN HMONITOR hMonitor, + OUT LPMONITORINFO pMonitorInfo); /* Should be done in usermode */ /* (other FocusedItem values give the position of the focused item) */ -#define NO_SELECTED_ITEM 0xffff +#define NO_SELECTED_ITEM 0xffff typedef struct tagROSMENUINFO { @@ -3472,20 +3548,20 @@ DWORD dwContextHelpID; ULONG_PTR dwMenuData; /* ----------- Extra ----------- */ - ULONG fFlags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ - UINT iItem; /* Currently focused item */ - UINT cItems; /* Number of items in the menu */ - WORD cxMenu; /* Width of the whole menu */ - WORD cyMenu; /* Height of the whole menu */ + ULONG fFlags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ + UINT iItem; /* Currently focused item */ + UINT cItems; /* Number of items in the menu */ + WORD cxMenu; /* Width of the whole menu */ + WORD cyMenu; /* Height of the whole menu */ ULONG cxTextAlign; - PWND spwndNotify; /* window receiving the messages for ownerdraw */ + PWND spwndNotify; /* window receiving the messages for ownerdraw */ INT iTop; INT iMaxTop; DWORD dwArrowsOn:2; - HMENU Self; /* Handle of this menu */ - HWND Wnd; /* Window containing the menu */ - BOOL TimeToHide; /* Request hiding when receiving a second click in the top-level menu item */ + HMENU Self; /* Handle of this menu */ + HWND Wnd; /* Window containing the menu */ + BOOL TimeToHide; /* Request hiding when receiving a second click in the top-level menu item */ } ROSMENUINFO, *PROSMENUINFO; typedef struct tagROSMENUITEMINFO @@ -3504,45 +3580,43 @@ UINT cch; HBITMAP hbmpItem; /* ----------- Extra ----------- */ - RECT Rect; /* Item area (relative to menu window) */ - UINT dxTab; /* X position of text after Tab */ - LPWSTR lpstr; /* Copy of the text pointer in MenuItem->Text */ - SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP state */ + RECT Rect; /* Item area (relative to menu window) */ + UINT dxTab; /* X position of text after Tab */ + LPWSTR lpstr; /* Copy of the text pointer in MenuItem->Text */ + SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP state */ } ROSMENUITEMINFO, *PROSMENUITEMINFO; HMONITOR NTAPI NtUserMonitorFromPoint( - IN POINT point, - IN DWORD dwFlags); + IN POINT point, + IN DWORD dwFlags); HMONITOR NTAPI NtUserMonitorFromRect( - IN LPCRECT pRect, - IN DWORD dwFlags); + IN LPCRECT pRect, + IN DWORD dwFlags); HMONITOR NTAPI NtUserMonitorFromWindow( - IN HWND hWnd, - IN DWORD dwFlags); + IN HWND hWnd, + IN DWORD dwFlags); typedef struct _SETSCROLLBARINFO { - int nTrackPos; - int reserved; - DWORD rgstate[CCHILDREN_SCROLLBAR+1]; + int nTrackPos; + int reserved; + DWORD rgstate[CCHILDREN_SCROLLBAR + 1]; } SETSCROLLBARINFO, *PSETSCROLLBARINFO; BOOL NTAPI NtUserSetScrollBarInfo( - HWND hwnd, - LONG idObject, - SETSCROLLBARINFO *info); - - + HWND hwnd, + LONG idObject, + SETSCROLLBARINFO *info); #endif /* __WIN32K_NTUSER_H */

9 years, 9 months

[tkreuzer] 66195: [WIN32K] Fix the ROP code passed to IntEngStretchBlt from NtGdiStretchDIBitsInternal. Fixes crash of Nimbus Notes installer. CORE-9048 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 7 17:51:20 2015 New Revision: 66195 URL: http://svn.reactos.org/svn/reactos?rev=66195&view=rev Log: [WIN32K] Fix the ROP code passed to IntEngStretchBlt from NtGdiStretchDIBitsInternal. Fixes crash of Nimbus Notes installer. CORE-9048 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sat Feb 7 17:51:20 2015 @@ -1161,7 +1161,7 @@ DC_UnlockDc(pdc); /* Check if we can use NtGdiSetDIBitsToDeviceInternal */ - if (sizel.cx == cxSrc && sizel.cy == cySrc && dwRop == SRCCOPY) + if ((sizel.cx == cxSrc) && (sizel.cy == cySrc) && (dwRop == SRCCOPY)) { /* Yes, we can! */ return NtGdiSetDIBitsToDeviceInternal(hdc, @@ -1270,6 +1270,10 @@ RGB(0xff, 0xff, 0xff), pdc->pdcattr->crBackgroundClr, pdc->pdcattr->crForegroundClr); + + /* Mask away everything except foreground rop index */ + dwRop = dwRop & 0x00FF0000; + dwRop |= dwRop << 8; /* Perform the stretch operation */ bResult = IntEngStretchBlt(&psurfDst->SurfObj,

9 years, 9 months

[hbelusca] 66194: [WIN32k:includes] Whitespace fixes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 7 16:19:57 2015 New Revision: 66194 URL: http://svn.reactos.org/svn/reactos?rev=66194&view=rev Log: [WIN32k:includes] Whitespace fixes. Modified: trunk/reactos/win32ss/include/ntgdibad.h trunk/reactos/win32ss/include/ntuser.h Modified: trunk/reactos/win32ss/include/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntgdibad.h… ============================================================================== --- trunk/reactos/win32ss/include/ntgdibad.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntgdibad.h [iso-8859-1] Sat Feb 7 16:19:57 2015 @@ -75,41 +75,41 @@ BOOL APIENTRY NtGdiOffsetViewportOrgEx ( - HDC hDC, - int XOffset, - int YOffset, - LPPOINT Point - ); + HDC hDC, + int XOffset, + int YOffset, + LPPOINT Point + ); /* Needs to be done in user-mode. */ BOOL APIENTRY NtGdiOffsetWindowOrgEx ( - HDC hDC, - int XOffset, - int YOffset, - LPPOINT Point - ); + HDC hDC, + int XOffset, + int YOffset, + LPPOINT Point + ); /* Needs to be done in user-mode. */ BOOL APIENTRY NtGdiSetViewportOrgEx ( - HDC hDC, - int X, - int Y, - LPPOINT Point - ); + HDC hDC, + int X, + int Y, + LPPOINT Point + ); /* Needs to be done in user-mode. */ BOOL APIENTRY NtGdiSetWindowOrgEx ( - HDC hDC, - int X, - int Y, - LPPOINT Point - ); + HDC hDC, + int X, + int Y, + LPPOINT Point + ); #endif /* WIN32K_NTGDI_BAD_INCLUDED */ Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Feb 7 16:19:57 2015 @@ -1405,179 +1405,179 @@ enum SimpleCallRoutines { - NOPARAM_ROUTINE_CREATEMENU, - NOPARAM_ROUTINE_CREATEMENUPOPUP, + NOPARAM_ROUTINE_CREATEMENU, + NOPARAM_ROUTINE_CREATEMENUPOPUP, #if (WIN32K_VERSION >= NTDDI_VISTA) - NOPARAM_ROUTINE_ALLOWFOREGNDACTIVATION, - NOPARAM_ROUTINE_MSQCLEARWAKEMASK, - NOPARAM_ROUTINE_CREATESYSTEMTHREADS, - NOPARAM_ROUTINE_DESTROY_CARET, + NOPARAM_ROUTINE_ALLOWFOREGNDACTIVATION, + NOPARAM_ROUTINE_MSQCLEARWAKEMASK, + NOPARAM_ROUTINE_CREATESYSTEMTHREADS, + NOPARAM_ROUTINE_DESTROY_CARET, #endif - NOPARAM_ROUTINE_ENABLEPROCWNDGHSTING, + NOPARAM_ROUTINE_ENABLEPROCWNDGHSTING, #if (WIN32K_VERSION < NTDDI_VISTA) - NOPARAM_ROUTINE_MSQCLEARWAKEMASK, - NOPARAM_ROUTINE_ALLOWFOREGNDACTIVATION, - NOPARAM_ROUTINE_DESTROY_CARET, + NOPARAM_ROUTINE_MSQCLEARWAKEMASK, + NOPARAM_ROUTINE_ALLOWFOREGNDACTIVATION, + NOPARAM_ROUTINE_DESTROY_CARET, #endif - NOPARAM_ROUTINE_GETDEVICECHANGEINFO, - NOPARAM_ROUTINE_GETIMESHOWSTATUS, - NOPARAM_ROUTINE_GETINPUTDESKTOP, - NOPARAM_ROUTINE_GETMSESSAGEPOS, + NOPARAM_ROUTINE_GETDEVICECHANGEINFO, + NOPARAM_ROUTINE_GETIMESHOWSTATUS, + NOPARAM_ROUTINE_GETINPUTDESKTOP, + NOPARAM_ROUTINE_GETMSESSAGEPOS, #if (WIN32K_VERSION >= NTDDI_VISTA) - NOPARAM_ROUTINE_HANDLESYSTHRDCREATFAIL, + NOPARAM_ROUTINE_HANDLESYSTHRDCREATFAIL, #else - NOPARAM_ROUTINE_GETREMOTEPROCESSID, + NOPARAM_ROUTINE_GETREMOTEPROCESSID, #endif - NOPARAM_ROUTINE_HIDECURSORNOCAPTURE, - NOPARAM_ROUTINE_LOADCURSANDICOS, + NOPARAM_ROUTINE_HIDECURSORNOCAPTURE, + NOPARAM_ROUTINE_LOADCURSANDICOS, #if (WIN32K_VERSION >= NTDDI_VISTA) - NOPARAM_ROUTINE_LOADUSERAPIHOOK, - NOPARAM_ROUTINE_PREPAREFORLOGOFF, /* 0x0f */ + NOPARAM_ROUTINE_LOADUSERAPIHOOK, + NOPARAM_ROUTINE_PREPAREFORLOGOFF, /* 0x0f */ #endif - NOPARAM_ROUTINE_RELEASECAPTURE, - NOPARAM_ROUTINE_RESETDBLCLICK, - NOPARAM_ROUTINE_ZAPACTIVEANDFOUS, - NOPARAM_ROUTINE_REMOTECONSHDWSTOP, - NOPARAM_ROUTINE_REMOTEDISCONNECT, - NOPARAM_ROUTINE_REMOTELOGOFF, - NOPARAM_ROUTINE_REMOTENTSECURITY, - NOPARAM_ROUTINE_REMOTESHDWSETUP, - NOPARAM_ROUTINE_REMOTESHDWSTOP, - NOPARAM_ROUTINE_REMOTEPASSTHRUENABLE, - NOPARAM_ROUTINE_REMOTEPASSTHRUDISABLE, - NOPARAM_ROUTINE_REMOTECONNECTSTATE, - NOPARAM_ROUTINE_UPDATEPERUSERIMMENABLING, - NOPARAM_ROUTINE_USERPWRCALLOUTWORKER, + NOPARAM_ROUTINE_RELEASECAPTURE, + NOPARAM_ROUTINE_RESETDBLCLICK, + NOPARAM_ROUTINE_ZAPACTIVEANDFOUS, + NOPARAM_ROUTINE_REMOTECONSHDWSTOP, + NOPARAM_ROUTINE_REMOTEDISCONNECT, + NOPARAM_ROUTINE_REMOTELOGOFF, + NOPARAM_ROUTINE_REMOTENTSECURITY, + NOPARAM_ROUTINE_REMOTESHDWSETUP, + NOPARAM_ROUTINE_REMOTESHDWSTOP, + NOPARAM_ROUTINE_REMOTEPASSTHRUENABLE, + NOPARAM_ROUTINE_REMOTEPASSTHRUDISABLE, + NOPARAM_ROUTINE_REMOTECONNECTSTATE, + NOPARAM_ROUTINE_UPDATEPERUSERIMMENABLING, + NOPARAM_ROUTINE_USERPWRCALLOUTWORKER, #if (WIN32K_VERSION >= NTDDI_VISTA) - NOPARAM_ROUTINE_WAKERITFORSHTDWN, + NOPARAM_ROUTINE_WAKERITFORSHTDWN, #endif - NOPARAM_ROUTINE_INIT_MESSAGE_PUMP, - NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP, + NOPARAM_ROUTINE_INIT_MESSAGE_PUMP, + NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP, #if (WIN32K_VERSION < NTDDI_VISTA) - NOPARAM_ROUTINE_LOADUSERAPIHOOK, + NOPARAM_ROUTINE_LOADUSERAPIHOOK, #endif - ONEPARAM_ROUTINE_BEGINDEFERWNDPOS, + ONEPARAM_ROUTINE_BEGINDEFERWNDPOS, #if (WIN32K_VERSION >= NTDDI_VISTA) - ONEPARAM_ROUTINE_GETSENDMSGRECVR, + ONEPARAM_ROUTINE_GETSENDMSGRECVR, #endif - ONEPARAM_ROUTINE_WINDOWFROMDC, - ONEPARAM_ROUTINE_ALLOWSETFOREGND, - ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT, + ONEPARAM_ROUTINE_WINDOWFROMDC, + ONEPARAM_ROUTINE_ALLOWSETFOREGND, + ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT, #if (WIN32K_VERSION < NTDDI_VISTA) - ONEPARAM_ROUTINE_CREATESYSTEMTHREADS, + ONEPARAM_ROUTINE_CREATESYSTEMTHREADS, #endif - ONEPARAM_ROUTINE_CSDDEUNINITIALIZE, - ONEPARAM_ROUTINE_DIRECTEDYIELD, - ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS, + ONEPARAM_ROUTINE_CSDDEUNINITIALIZE, + ONEPARAM_ROUTINE_DIRECTEDYIELD, + ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS, #if (WIN32K_VERSION < NTDDI_VISTA) - ONEPARAM_ROUTINE_GETCURSORPOS, + ONEPARAM_ROUTINE_GETCURSORPOS, #endif - ONEPARAM_ROUTINE_GETINPUTEVENT, - ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT, - ONEPARAM_ROUTINE_GETKEYBOARDTYPE, - ONEPARAM_ROUTINE_GETPROCDEFLAYOUT, - ONEPARAM_ROUTINE_GETQUEUESTATUS, - ONEPARAM_ROUTINE_GETWINSTAINFO, + ONEPARAM_ROUTINE_GETINPUTEVENT, + ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT, + ONEPARAM_ROUTINE_GETKEYBOARDTYPE, + ONEPARAM_ROUTINE_GETPROCDEFLAYOUT, + ONEPARAM_ROUTINE_GETQUEUESTATUS, + ONEPARAM_ROUTINE_GETWINSTAINFO, #if (WIN32K_VERSION < NTDDI_VISTA) - ONEPARAM_ROUTINE_HANDLESYSTHRDCREATFAIL, + ONEPARAM_ROUTINE_HANDLESYSTHRDCREATFAIL, #endif - ONEPARAM_ROUTINE_LOCKFOREGNDWINDOW, - ONEPARAM_ROUTINE_LOADFONTS, - ONEPARAM_ROUTINE_MAPDEKTOPOBJECT, - ONEPARAM_ROUTINE_MESSAGEBEEP, - ONEPARAM_ROUTINE_PLAYEVENTSOUND, - ONEPARAM_ROUTINE_POSTQUITMESSAGE, + ONEPARAM_ROUTINE_LOCKFOREGNDWINDOW, + ONEPARAM_ROUTINE_LOADFONTS, + ONEPARAM_ROUTINE_MAPDEKTOPOBJECT, + ONEPARAM_ROUTINE_MESSAGEBEEP, + ONEPARAM_ROUTINE_PLAYEVENTSOUND, + ONEPARAM_ROUTINE_POSTQUITMESSAGE, #if (WIN32K_VERSION < NTDDI_VISTA) - ONEPARAM_ROUTINE_PREPAREFORLOGOFF, + ONEPARAM_ROUTINE_PREPAREFORLOGOFF, #endif - ONEPARAM_ROUTINE_REALIZEPALETTE, - ONEPARAM_ROUTINE_REGISTERLPK, + ONEPARAM_ROUTINE_REALIZEPALETTE, + ONEPARAM_ROUTINE_REGISTERLPK, #if (WIN32K_VERSION >= NTDDI_VISTA) - ONEPARAM_ROUTINE_REGISTERSYSTEMTHREAD, + ONEPARAM_ROUTINE_REGISTERSYSTEMTHREAD, #endif - ONEPARAM_ROUTINE_REMOTERECONNECT, - ONEPARAM_ROUTINE_REMOTETHINWIRESTATUS, - ONEPARAM_ROUTINE_RELEASEDC, + ONEPARAM_ROUTINE_REMOTERECONNECT, + ONEPARAM_ROUTINE_REMOTETHINWIRESTATUS, + ONEPARAM_ROUTINE_RELEASEDC, #if (WIN32K_VERSION >= NTDDI_VISTA) - ONEPARAM_ROUTINE_REMOTENOTIFY, + ONEPARAM_ROUTINE_REMOTENOTIFY, #endif - ONEPARAM_ROUTINE_REPLYMESSAGE, - ONEPARAM_ROUTINE_SETCARETBLINKTIME, - ONEPARAM_ROUTINE_SETDBLCLICKTIME, + ONEPARAM_ROUTINE_REPLYMESSAGE, + ONEPARAM_ROUTINE_SETCARETBLINKTIME, + ONEPARAM_ROUTINE_SETDBLCLICKTIME, #if (WIN32K_VERSION < NTDDI_VISTA) - ONEPARAM_ROUTINE_SETIMESHOWSTATUS, + ONEPARAM_ROUTINE_SETIMESHOWSTATUS, #endif - ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO, - ONEPARAM_ROUTINE_SETPROCDEFLAYOUT, + ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO, + ONEPARAM_ROUTINE_SETPROCDEFLAYOUT, #if (WIN32K_VERSION >= NTDDI_VISTA) - ONEPARAM_ROUTINE_SETWATERMARKSTRINGS, + ONEPARAM_ROUTINE_SETWATERMARKSTRINGS, #endif - ONEPARAM_ROUTINE_SHOWCURSOR, - ONEPARAM_ROUTINE_SHOWSTARTGLASS, - ONEPARAM_ROUTINE_SWAPMOUSEBUTTON, - X_ROUTINE_WOWMODULEUNLOAD, + ONEPARAM_ROUTINE_SHOWCURSOR, + ONEPARAM_ROUTINE_SHOWSTARTGLASS, + ONEPARAM_ROUTINE_SWAPMOUSEBUTTON, + X_ROUTINE_WOWMODULEUNLOAD, #if (WIN32K_VERSION < NTDDI_VISTA) - X_ROUTINE_REMOTENOTIFY, + X_ROUTINE_REMOTENOTIFY, #endif - HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW, - HWND_ROUTINE_DWP_GETENABLEDPOPUP, - HWND_ROUTINE_GETWNDCONTEXTHLPID, - HWND_ROUTINE_REGISTERSHELLHOOKWINDOW, - HWND_ROUTINE_SETMSGBOX, - HWNDOPT_ROUTINE_SETPROGMANWINDOW, - HWNDOPT_ROUTINE_SETTASKMANWINDOW, - HWNDPARAM_ROUTINE_GETCLASSICOCUR, - HWNDPARAM_ROUTINE_CLEARWINDOWSTATE, - HWNDPARAM_ROUTINE_KILLSYSTEMTIMER, - HWNDPARAM_ROUTINE_SETDIALOGPOINTER, - HWNDPARAM_ROUTINE_SETVISIBLE, - HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID, - HWNDPARAM_ROUTINE_SETWINDOWSTATE, - HWNDLOCK_ROUTINE_WINDOWHASSHADOW, /* correct prefix ? */ - HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS, - HWNDLOCK_ROUTINE_DRAWMENUBAR, - HWNDLOCK_ROUTINE_CHECKIMESHOWSTATUSINTHRD, - HWNDLOCK_ROUTINE_GETSYSMENUHANDLE, - HWNDLOCK_ROUTINE_REDRAWFRAME, - HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK, - HWNDLOCK_ROUTINE_SETDLGSYSMENU, - HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW, - HWNDLOCK_ROUTINE_SETSYSMENU, - HWNDLOCK_ROUTINE_UPDATECKIENTRECT, - HWNDLOCK_ROUTINE_UPDATEWINDOW, - X_ROUTINE_IMESHOWSTATUSCHANGE, - TWOPARAM_ROUTINE_ENABLEWINDOW, - TWOPARAM_ROUTINE_REDRAWTITLE, - TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS, - TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW, - TWOPARAM_ROUTINE_UPDATEWINDOWS, - TWOPARAM_ROUTINE_VALIDATERGN, + HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW, + HWND_ROUTINE_DWP_GETENABLEDPOPUP, + HWND_ROUTINE_GETWNDCONTEXTHLPID, + HWND_ROUTINE_REGISTERSHELLHOOKWINDOW, + HWND_ROUTINE_SETMSGBOX, + HWNDOPT_ROUTINE_SETPROGMANWINDOW, + HWNDOPT_ROUTINE_SETTASKMANWINDOW, + HWNDPARAM_ROUTINE_GETCLASSICOCUR, + HWNDPARAM_ROUTINE_CLEARWINDOWSTATE, + HWNDPARAM_ROUTINE_KILLSYSTEMTIMER, + HWNDPARAM_ROUTINE_SETDIALOGPOINTER, + HWNDPARAM_ROUTINE_SETVISIBLE, + HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID, + HWNDPARAM_ROUTINE_SETWINDOWSTATE, + HWNDLOCK_ROUTINE_WINDOWHASSHADOW, /* correct prefix ? */ + HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS, + HWNDLOCK_ROUTINE_DRAWMENUBAR, + HWNDLOCK_ROUTINE_CHECKIMESHOWSTATUSINTHRD, + HWNDLOCK_ROUTINE_GETSYSMENUHANDLE, + HWNDLOCK_ROUTINE_REDRAWFRAME, + HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK, + HWNDLOCK_ROUTINE_SETDLGSYSMENU, + HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW, + HWNDLOCK_ROUTINE_SETSYSMENU, + HWNDLOCK_ROUTINE_UPDATECKIENTRECT, + HWNDLOCK_ROUTINE_UPDATEWINDOW, + X_ROUTINE_IMESHOWSTATUSCHANGE, + TWOPARAM_ROUTINE_ENABLEWINDOW, + TWOPARAM_ROUTINE_REDRAWTITLE, + TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS, + TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW, + TWOPARAM_ROUTINE_UPDATEWINDOWS, + TWOPARAM_ROUTINE_VALIDATERGN, #if (WIN32K_VERSION >= NTDDI_VISTA) - TWOPARAM_ROUTINE_CHANGEWNDMSGFILTER, - TWOPARAM_ROUTINE_GETCURSORPOS, + TWOPARAM_ROUTINE_CHANGEWNDMSGFILTER, + TWOPARAM_ROUTINE_GETCURSORPOS, #endif - TWOPARAM_ROUTINE_GETHDEVNAME, - TWOPARAM_ROUTINE_INITANSIOEM, - TWOPARAM_ROUTINE_NLSSENDIMENOTIFY, + TWOPARAM_ROUTINE_GETHDEVNAME, + TWOPARAM_ROUTINE_INITANSIOEM, + TWOPARAM_ROUTINE_NLSSENDIMENOTIFY, #if (WIN32K_VERSION >= NTDDI_VISTA) - TWOPARAM_ROUTINE_REGISTERGHSTWND, + TWOPARAM_ROUTINE_REGISTERGHSTWND, #endif - TWOPARAM_ROUTINE_REGISTERLOGONPROCESS, + TWOPARAM_ROUTINE_REGISTERLOGONPROCESS, #if (WIN32K_VERSION >= NTDDI_VISTA) - TWOPARAM_ROUTINE_REGISTERSBLFROSTWND, + TWOPARAM_ROUTINE_REGISTERSBLFROSTWND, #else - TWOPARAM_ROUTINE_REGISTERSYSTEMTHREAD, + TWOPARAM_ROUTINE_REGISTERSYSTEMTHREAD, #endif - TWOPARAM_ROUTINE_REGISTERUSERHUNGAPPHANDLERS, - TWOPARAM_ROUTINE_SHADOWCLEANUP, - TWOPARAM_ROUTINE_REMOTESHADOWSTART, - TWOPARAM_ROUTINE_SETCARETPOS, - TWOPARAM_ROUTINE_SETCURSORPOS, + TWOPARAM_ROUTINE_REGISTERUSERHUNGAPPHANDLERS, + TWOPARAM_ROUTINE_SHADOWCLEANUP, + TWOPARAM_ROUTINE_REMOTESHADOWSTART, + TWOPARAM_ROUTINE_SETCARETPOS, + TWOPARAM_ROUTINE_SETCURSORPOS, #if (WIN32K_VERSION >= NTDDI_VISTA) - TWOPARAM_ROUTINE_SETPHYSCURSORPOS, + TWOPARAM_ROUTINE_SETPHYSCURSORPOS, #endif - TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK, - TWOPARAM_ROUTINE_WOWCLEANUP + TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK, + TWOPARAM_ROUTINE_WOWCLEANUP }; DWORD @@ -2062,10 +2062,10 @@ BOOL NTAPI NtUserGetClassInfo(HINSTANCE hInstance, - PUNICODE_STRING ClassName, - LPWNDCLASSEXW wcex, - LPWSTR *ppszMenuName, - BOOL Ansi); + PUNICODE_STRING ClassName, + LPWNDCLASSEXW wcex, + LPWSTR *ppszMenuName, + BOOL Ansi); INT NTAPI @@ -2514,10 +2514,10 @@ UINT NTAPI -NtUserMapVirtualKeyEx( UINT keyCode, - UINT transType, - DWORD keyboardId, - HKL dwhkl ); +NtUserMapVirtualKeyEx(UINT keyCode, + UINT transType, + DWORD keyboardId, + HKL dwhkl); typedef struct tagDOSENDMESSAGE { @@ -2702,13 +2702,13 @@ DWORD Unknown3, DWORD Unknown4); -#define QUERY_WINDOW_UNIQUE_PROCESS_ID 0x00 -#define QUERY_WINDOW_UNIQUE_THREAD_ID 0x01 -#define QUERY_WINDOW_ACTIVE 0x02 -#define QUERY_WINDOW_FOCUS 0x03 -#define QUERY_WINDOW_ISHUNG 0x04 -#define QUERY_WINDOW_REAL_ID 0x05 -#define QUERY_WINDOW_FOREGROUND 0x06 +#define QUERY_WINDOW_UNIQUE_PROCESS_ID 0x00 +#define QUERY_WINDOW_UNIQUE_THREAD_ID 0x01 +#define QUERY_WINDOW_ACTIVE 0x02 +#define QUERY_WINDOW_FOCUS 0x03 +#define QUERY_WINDOW_ISHUNG 0x04 +#define QUERY_WINDOW_REAL_ID 0x05 +#define QUERY_WINDOW_FOREGROUND 0x06 DWORD NTAPI NtUserQueryWindow( @@ -2777,9 +2777,9 @@ BOOL NTAPI NtUserRegisterHotKey(HWND hWnd, - int id, - UINT fsModifiers, - UINT vk); + int id, + UINT fsModifiers, + UINT vk); DWORD NTAPI @@ -3259,13 +3259,13 @@ INT NTAPI NtUserToUnicodeEx( - UINT wVirtKey, - UINT wScanCode, - PBYTE lpKeyState, - LPWSTR pwszBuff, - int cchBuff, - UINT wFlags, - HKL dwhkl ); + UINT wVirtKey, + UINT wScanCode, + PBYTE lpKeyState, + LPWSTR pwszBuff, + int cchBuff, + UINT wFlags, + HKL dwhkl ); BOOL NTAPI @@ -3315,7 +3315,7 @@ BOOL NTAPI NtUserUnregisterHotKey(HWND hWnd, - int id); + int id); BOOL NTAPI @@ -3434,21 +3434,21 @@ * ReactOS-specific NtUser calls and their related structures, both which shouldn't exist. */ -#define NOPARAM_ROUTINE_ISCONSOLEMODE 0xffff0001 -#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 -#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d -#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e -#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 -#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0051 -#define HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE 0xfffd0052 - #define MSQ_STATE_CAPTURE 0x1 - #define MSQ_STATE_ACTIVE 0x2 - #define MSQ_STATE_FOCUS 0x3 - #define MSQ_STATE_MENUOWNER 0x4 - #define MSQ_STATE_MOVESIZE 0x5 - #define MSQ_STATE_CARET 0x6 -#define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 -#define HWNDPARAM_ROUTINE_ROS_NOTIFYWINEVENT 0x1005 +#define NOPARAM_ROUTINE_ISCONSOLEMODE 0xffff0001 +#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 +#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d +#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e +#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 +#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0051 +#define HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE 0xfffd0052 + #define MSQ_STATE_CAPTURE 0x1 + #define MSQ_STATE_ACTIVE 0x2 + #define MSQ_STATE_FOCUS 0x3 + #define MSQ_STATE_MENUOWNER 0x4 + #define MSQ_STATE_MOVESIZE 0x5 + #define MSQ_STATE_CARET 0x6 +#define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 +#define HWNDPARAM_ROUTINE_ROS_NOTIFYWINEVENT 0x1005 BOOL NTAPI

9 years, 9 months

[tkreuzer] 66193: [FREELDR] - #ifdef DBG -> #if DBG - #if 0 DbgDumpMemoryMap()

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 7 15:52:18 2015 New Revision: 66193 URL: http://svn.reactos.org/svn/reactos?rev=66193&view=rev Log: [FREELDR] - #ifdef DBG -> #if DBG - #if 0 DbgDumpMemoryMap() Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Sat Feb 7 15:52:18 2015 @@ -34,7 +34,7 @@ ULONG BiosMemoryMapEntryCount; SIZE_T FrLdrImageSize; -#ifdef DBG +#if DBG typedef struct { TYPE_OF_MEMORY Type; @@ -213,7 +213,7 @@ List[Index].MemoryType = MemoryType; DescriptCount++; -#if DBG +#if 0 // only enable on demand! DbgDumpMemoryMap(List); #endif return DescriptCount;

9 years, 9 months

[hbelusca] 66192: [WINLOGON][WIN32K] Move the shutdown privilege check from winlogon to win32k (function "UserInitiateShutdown") as it should be done. [WIN32K] - Introduce the pair of UserInitiateS...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 7 15:26:42 2015 New Revision: 66192 URL: http://svn.reactos.org/svn/reactos?rev=66192&view=rev Log: [WINLOGON][WIN32K] Move the shutdown privilege check from winlogon to win32k (function "UserInitiateShutdown") as it should be done. [WIN32K] - Introduce the pair of UserInitiateShutdown/UserEndShutdown calls that should be called when WINSRV starts a shutdown (and when it finishes it). In particular it is in UserInitiateShutdown that we need to check whether the caller has the rights to perform a shutdown (it should also have a valid window station). - Remove the ROS-specific TWOPARAM_ROUTINE_EXITREACTOS call that is traded for Win2k3-compatible call to UserInitiateShutdown. [WINSRV] Hackfix our current ExitWindowsEx functionality (based on a patch by Alex made against r46050 for win32csr) to make it "compatible" with the improvements in win32k: impersonate the caller and call the UserInitiateShutdown win32k system call (instead of the TWOPARAM_ROUTINE_EXITREACTOS). More will come later on. [USER32] Win32k can require performing shutdown in an asynchronous way (needed also on WINSRV side) so we need to put all the code in a worker thread. Part 8/X (part 6 was r65693 and part 7 was r66186). CORE-8322 #comment Start to add Alex' win32csr shutdown patch in WINSRV; fixes for winlogon and additions to win32k. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/shutdown.c trunk/reactos/win32ss/user/ntuser/shutdown.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/user32/misc/exit.c trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat Feb 7 15:26:42 2015 @@ -1147,67 +1147,6 @@ return TRUE; } - -#if 0 -static -NTSTATUS -CheckForShutdownPrivilege( - IN DWORD RequestingProcessId) -{ - HANDLE Process; - HANDLE Token; - BOOL CheckResult; - PPRIVILEGE_SET PrivSet; - - TRACE("CheckForShutdownPrivilege()\n"); - - Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, RequestingProcessId); - if (!Process) - { - WARN("OpenProcess() failed with error %lu\n", GetLastError()); - return STATUS_INVALID_HANDLE; - } - if (!OpenProcessToken(Process, TOKEN_QUERY, &Token)) - { - WARN("OpenProcessToken() failed with error %lu\n", GetLastError()); - CloseHandle(Process); - return STATUS_INVALID_HANDLE; - } - CloseHandle(Process); - PrivSet = HeapAlloc(GetProcessHeap(), 0, sizeof(PRIVILEGE_SET) + sizeof(LUID_AND_ATTRIBUTES)); - if (!PrivSet) - { - ERR("Failed to allocate mem for privilege set\n"); - CloseHandle(Token); - return STATUS_NO_MEMORY; - } - PrivSet->PrivilegeCount = 1; - PrivSet->Control = PRIVILEGE_SET_ALL_NECESSARY; - if (!LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &PrivSet->Privilege[0].Luid)) - { - WARN("LookupPrivilegeValue() failed with error %lu\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, PrivSet); - CloseHandle(Token); - return STATUS_UNSUCCESSFUL; - } - if (!PrivilegeCheck(Token, PrivSet, &CheckResult)) - { - WARN("PrivilegeCheck() failed with error %lu\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, PrivSet); - CloseHandle(Token); - return STATUS_ACCESS_DENIED; - } - HeapFree(GetProcessHeap(), 0, PrivSet); - CloseHandle(Token); - - if (!CheckResult) - { - WARN("SE_SHUTDOWN privilege not enabled\n"); - return STATUS_ACCESS_DENIED; - } - return STATUS_SUCCESS; -} -#endif BOOL WINAPI @@ -1337,13 +1276,40 @@ UINT Action = Flags & EWX_ACTION_MASK; DWORD wlxAction; + TRACE("\tFlags : 0x%lx\n", lParam); + + /* + * Our caller (USERSRV) should have added the shutdown flag + * when setting also poweroff or reboot. + */ + if (Action & (EWX_POWEROFF | EWX_REBOOT)) + { + if ((Action & EWX_SHUTDOWN) == 0) + { + ERR("Missing EWX_SHUTDOWN flag for poweroff or reboot; action 0x%x\n", Action); + return STATUS_INVALID_PARAMETER; + } + + /* Now we can locally remove it for performing checks */ + Action &= ~EWX_SHUTDOWN; + } + /* Check parameters */ switch (Action) { - case EWX_LOGOFF: wlxAction = WLX_SAS_ACTION_LOGOFF; break; - case EWX_SHUTDOWN: wlxAction = WLX_SAS_ACTION_SHUTDOWN; break; - case EWX_REBOOT: wlxAction = WLX_SAS_ACTION_SHUTDOWN_REBOOT; break; - case EWX_POWEROFF: wlxAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; break; + case EWX_LOGOFF: + wlxAction = WLX_SAS_ACTION_LOGOFF; + break; + case EWX_SHUTDOWN: + wlxAction = WLX_SAS_ACTION_SHUTDOWN; + break; + case EWX_REBOOT: + wlxAction = WLX_SAS_ACTION_SHUTDOWN_REBOOT; + break; + case EWX_POWEROFF: + wlxAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; + break; + default: { ERR("Invalid ExitWindows action 0x%x\n", Action); @@ -1351,15 +1317,7 @@ } } -#if 0 - // FIXME: This check must be done by Win32k, not by us! - if (WLX_SHUTTINGDOWN(wlxAction)) - { - NTSTATUS Status = CheckForShutdownPrivilege(wParam); - if (!NT_SUCCESS(Status)) - return Status; - } -#endif + /* Now do the shutdown action proper */ DoGenericAction(Session, wlxAction); return 1; } Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Feb 7 15:26:42 2015 @@ -3439,9 +3439,8 @@ #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d #define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e #define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 -#define TWOPARAM_ROUTINE_EXITREACTOS 0xfffd0051 -#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0052 -#define HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE 0xfffd0053 +#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0051 +#define HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE 0xfffd0052 #define MSQ_STATE_CAPTURE 0x1 #define MSQ_STATE_ACTIVE 0x2 #define MSQ_STATE_FOCUS 0x3 Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Sat Feb 7 15:26:42 2015 @@ -412,7 +412,7 @@ { NTSTATUS Status = STATUS_SUCCESS; - /* Allow only Console Server to perform this operation (via CSRSS) */ + /* Allow only the Console Server to perform this operation (via CSRSS) */ if (PsGetCurrentProcess() != gpepCSRSS) return STATUS_ACCESS_DENIED; @@ -770,7 +770,6 @@ { NTSTATUS Status = STATUS_SUCCESS; PETHREAD Thread; - HANDLE CsrPortHandle; /* Allow only CSRSS to perform this operation */ if (PsGetCurrentProcess() != gpepCSRSS) @@ -792,24 +791,54 @@ case UserThreadInitiateShutdown: { ERR("Shutdown initiated\n"); - STUB; - Status = STATUS_NOT_IMPLEMENTED; + + if (ThreadInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + Status = UserInitiateShutdown(Thread, (PULONG)ThreadInformation); break; } case UserThreadEndShutdown: { + NTSTATUS ShutdownStatus; + ERR("Shutdown ended\n"); - STUB; - Status = STATUS_NOT_IMPLEMENTED; + + if (ThreadInformationLength != sizeof(ShutdownStatus)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + Status = STATUS_SUCCESS; + _SEH2_TRY + { + ProbeForRead(ThreadInformation, sizeof(ShutdownStatus), sizeof(PVOID)); + ShutdownStatus = *(NTSTATUS*)ThreadInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (NT_SUCCESS(Status)) + Status = UserEndShutdown(Thread, ShutdownStatus); + break; } case UserThreadCsrApiPort: { + HANDLE CsrPortHandle; + ERR("Set CSR API Port for Win32k\n"); - if (ThreadInformationLength != sizeof(HANDLE)) + if (ThreadInformationLength != sizeof(CsrPortHandle)) { Status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -818,7 +847,7 @@ Status = STATUS_SUCCESS; _SEH2_TRY { - ProbeForRead(ThreadInformation, sizeof(HANDLE), sizeof(PVOID)); + ProbeForRead(ThreadInformation, sizeof(CsrPortHandle), sizeof(PVOID)); CsrPortHandle = *(PHANDLE)ThreadInformation; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -828,9 +857,8 @@ _SEH2_END; if (NT_SUCCESS(Status)) - { Status = InitCsrApiPort(CsrPortHandle); - } + break; } Modified: trunk/reactos/win32ss/user/ntuser/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] Sat Feb 7 15:26:42 2015 @@ -7,7 +7,7 @@ */ #include <win32k.h> -// DBG_DEFAULT_CHANNEL(UserShutdown); +DBG_DEFAULT_CHANNEL(UserShutdown); /* * Based on CSRSS and described in pages 1115 - 1118 "Windows Internals, Fifth Edition". @@ -85,4 +85,172 @@ return lResult; } + +NTSTATUS +GetProcessLuid(IN PETHREAD Thread OPTIONAL, + OUT PLUID Luid) +{ + NTSTATUS Status; + PACCESS_TOKEN Token; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + BOOLEAN CopyOnOpen, EffectiveOnly; + + if (Thread == NULL) + Thread = PsGetCurrentThread(); + + /* Use a thread token */ + Token = PsReferenceImpersonationToken(Thread, + &CopyOnOpen, + &EffectiveOnly, + &ImpersonationLevel); + if (Token == NULL) + { + /* We don't have a thread token, use a process token */ + Token = PsReferencePrimaryToken(PsGetThreadProcess(Thread)); + + /* If no token, fail */ + if (Token == NULL) + return STATUS_NO_TOKEN; + } + + /* Query the LUID */ + Status = SeQueryAuthenticationIdToken(Token, Luid); + + /* Get rid of the token and return */ + ObDereferenceObject(Token); + return Status; +} + +BOOLEAN +HasPrivilege(IN PPRIVILEGE_SET Privilege) +{ + BOOLEAN Result; + SECURITY_SUBJECT_CONTEXT SubjectContext; + + /* Capture and lock the security subject context */ + SeCaptureSubjectContext(&SubjectContext); + SeLockSubjectContext(&SubjectContext); + + /* Do privilege check */ + Result = SePrivilegeCheck(Privilege, &SubjectContext, UserMode); + + /* Audit the privilege */ +#if 0 + SePrivilegeObjectAuditAlarm(NULL, + &SubjectContext, + 0, + Privilege, + Result, + UserMode); +#endif + + /* Unlock and release the security subject context and return */ + SeUnlockSubjectContext(&SubjectContext); + SeReleaseSubjectContext(&SubjectContext); + return Result; +} + +NTSTATUS +UserInitiateShutdown(IN PETHREAD Thread, + IN OUT PULONG pFlags) +{ + NTSTATUS Status; + ULONG Flags = *pFlags; + LUID CallerLuid; + // LUID SystemLuid = SYSTEM_LUID; + static PRIVILEGE_SET ShutdownPrivilege = + { + 1, PRIVILEGE_SET_ALL_NECESSARY, + { {{SE_SHUTDOWN_PRIVILEGE, 0}, 0} } + }; + + PPROCESSINFO ppi; + + ERR("UserInitiateShutdown\n"); + + if(hwndSAS == NULL) + return STATUS_NOT_FOUND; + + /* Get the caller's LUID */ + Status = GetProcessLuid(Thread, &CallerLuid); + if (!NT_SUCCESS(Status)) + { + ERR("GetProcessLuid failed\n"); + return Status; + } + + // FIXME: Check if this is the System LUID, and adjust flags if needed. + // if (RtlEqualLuid(&CallerLuid, &SystemLuid)) { Flags = ...; } + *pFlags = Flags; + + /* Retrieve the Win32 process info */ + ppi = PsGetProcessWin32Process(PsGetThreadProcess(Thread)); + if (ppi == NULL) + return STATUS_INVALID_HANDLE; + + /* If the caller is not Winlogon, do some security checks */ + if (PsGetThreadProcessId(Thread) != gpidLogon) + { + // FIXME: Play again with flags... + *pFlags = Flags; + + /* Check whether the current process is attached to a window station */ + if (ppi->prpwinsta == NULL) + return STATUS_INVALID_HANDLE; + + /* Check whether the window station of the current process can send exit requests */ + if (!RtlAreAllAccessesGranted(ppi->amwinsta, WINSTA_EXITWINDOWS)) + return STATUS_ACCESS_DENIED; + + /* + * NOTE: USERSRV automatically adds the shutdown flag when we poweroff or reboot. + * + * If the caller wants to shutdown / reboot / power-off... + */ + if (Flags & EWX_SHUTDOWN) + { + /* ... check whether it has shutdown privilege */ + if (!HasPrivilege(&ShutdownPrivilege)) + return STATUS_PRIVILEGE_NOT_HELD; + } + else + { + /* + * ... but if it just wants to log-off, in case its + * window station is a non-IO one, fail the call. + */ + if (ppi->prpwinsta->Flags & WSS_NOIO) + return STATUS_INVALID_DEVICE_REQUEST; + } + } + + /* If the caller is not Winlogon, notify it to perform the real shutdown */ + if (PsGetThreadProcessId(Thread) != gpidLogon) + { + // FIXME: HACK!! Do more checks!! + UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_LOGOFF, (LPARAM)Flags); + return STATUS_PENDING; + } + + // If we reach this point, that means it's Winlogon that triggered the shutdown. + + /* + * FIXME: + * Update and save the shutdown flags globally for renotifying Winlogon + * if needed, when calling EndShutdown. + */ + *pFlags = Flags; + + return STATUS_SUCCESS; +} + +NTSTATUS +UserEndShutdown(IN PETHREAD Thread, + IN NTSTATUS ShutdownStatus) +{ + ERR("UserEndShutdown\n"); + STUB; + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/shutdown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/shutdown.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/shutdown.h [iso-8859-1] Sat Feb 7 15:26:42 2015 @@ -4,3 +4,11 @@ IntClientShutdown(IN PWND pWindow, IN WPARAM wParam, IN LPARAM lParam); + +NTSTATUS +UserInitiateShutdown(IN PETHREAD Thread, + IN OUT PULONG pFlags); + +NTSTATUS +UserEndShutdown(IN PETHREAD Thread, + IN NTSTATUS ShutdownStatus); Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Feb 7 15:26:42 2015 @@ -7,8 +7,6 @@ */ #include <win32k.h> - -#include <winlogon.h> DBG_DEFAULT_CHANNEL(UserMisc); @@ -449,18 +447,6 @@ case TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK: RETURN( IntUnhookWindowsHook((int)Param1, (HOOKPROC)Param2)); - - case TWOPARAM_ROUTINE_EXITREACTOS: - { - UNREFERENCED_PARAMETER(Param1 /* ProcessId */); - - if(hwndSAS == NULL) - { - ASSERT(hwndSAS); - RETURN(STATUS_NOT_FOUND); - } - RETURN(co_IntSendMessage(hwndSAS, WM_LOGONNOTIFY, LN_LOGOFF, Param2 /* Flags */)); - } } ERR("Calling invalid routine number 0x%x in NtUserCallTwoParam(), Param1=0x%x Parm2=0x%x\n", Routine, Param1, Param2); Modified: trunk/reactos/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] Sat Feb 7 15:26:42 2015 @@ -9,6 +9,8 @@ #include <user32.h> #include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(user32); /* * Sequence of events: @@ -61,6 +63,130 @@ * the kernel and executive shutdown by calling NtShutdownSystem. */ +typedef struct +{ + UINT uFlags; + DWORD dwReserved; +} EXIT_REACTOS_DATA, *PEXIT_REACTOS_DATA; + +static BOOL +ExitWindowsWorker(UINT uFlags, + DWORD dwReserved, + BOOL bCalledFromThread); + +static DWORD +WINAPI +ExitWindowsThread(LPVOID Param) +{ + DWORD dwExitCode; + PEXIT_REACTOS_DATA ExitData = (PEXIT_REACTOS_DATA)Param; + + /* Do the exit asynchronously */ + if (ExitWindowsWorker(ExitData->uFlags, ExitData->dwReserved, TRUE)) + dwExitCode = ERROR_SUCCESS; + else + dwExitCode = GetLastError(); + + ExitThread(dwExitCode); + return ERROR_SUCCESS; +} + +static BOOL +ExitWindowsWorker(UINT uFlags, + DWORD dwReserved, + BOOL bCalledFromThread) +{ + EXIT_REACTOS_DATA ExitData; + HANDLE hExitThread; + DWORD ExitCode; + MSG msg; + + USER_API_MESSAGE ApiMessage; + PUSER_EXIT_REACTOS ExitReactosRequest = &ApiMessage.Data.ExitReactosRequest; + + /* + * 1- FIXME: Call NtUserCallOneParam(uFlags, ONEPARAM_ROUTINE_PREPAREFORLOGOFF); + * If success we can continue, otherwise we must fail. + */ + + /* + * 2- Send the Exit request to CSRSS (and to Win32k indirectly). + * We can shutdown synchronously or asynchronously. + */ + + // ExitReactosRequest->LastError = ERROR_SUCCESS; + ExitReactosRequest->Flags = uFlags; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpExitWindowsEx), + sizeof(*ExitReactosRequest)); + + /* Set the last error accordingly */ + if (NT_SUCCESS(ApiMessage.Status) || ApiMessage.Status == STATUS_CANT_WAIT) + { + if (ExitReactosRequest->LastError != ERROR_SUCCESS) + UserSetLastError(ExitReactosRequest->LastError); + } + else + { + UserSetLastNTError(ApiMessage.Status); + ExitReactosRequest->Success = FALSE; + } + + /* + * In case CSR call succeeded and we did a synchronous exit + * (STATUS_CANT_WAIT is considered as a non-success status), + * return the real state of the operation now. + */ + if (NT_SUCCESS(ApiMessage.Status)) + return ExitReactosRequest->Success; + + /* + * In case something failed: we have a non-success status and: + * - either we were doing a synchronous exit (Status != STATUS_CANT_WAIT), or + * - we were doing an asynchronous exit because we were called recursively via + * another thread but we failed to exit, + * then bail out immediately, otherwise we would enter an infinite loop of exit requests. + * + * On the contrary if we need to do an asynchronous exit (Status == STATUS_CANT_WAIT + * and not called recursively via another thread), then continue and do the exit. + */ + if (ApiMessage.Status != STATUS_CANT_WAIT || bCalledFromThread) + { + UserSetLastNTError(ApiMessage.Status); + return FALSE; + } + + /* + * 3- Win32k wants us to perform an asynchronous exit. Run the request in a thread. + * (ApiMessage.Status == STATUS_CANT_WAIT and not already called from a thread) + */ + ExitData.uFlags = uFlags; + ExitData.dwReserved = dwReserved; + hExitThread = CreateThread(NULL, 0, ExitWindowsThread, &ExitData, 0, NULL); + if (hExitThread == NULL) + return FALSE; + + /* Pump and discard any input events sent to the app(s) */ + while (MsgWaitForMultipleObjectsEx(1, &hExitThread, INFINITE, QS_ALLINPUT, 0)) + { + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessageW(&msg); + } + + /* Finally, return to caller */ + if (!GetExitCodeThread(hExitThread, &ExitCode)) + ExitCode = GetLastError(); + + CloseHandle(hExitThread); + + if (ExitCode != ERROR_SUCCESS) + UserSetLastError(ExitCode); + + return (ExitCode == ERROR_SUCCESS); +} + /* * @implemented */ @@ -68,23 +194,17 @@ ExitWindowsEx(UINT uFlags, DWORD dwReserved) { - NTSTATUS Status; - USER_API_MESSAGE ApiMessage; - - ApiMessage.Data.ExitReactosRequest.Flags = uFlags; - // ApiMessage.Data.ExitReactosRequest.Reserved = dwReserved; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpExitWindowsEx), - sizeof(USER_EXIT_REACTOS)); - if (!NT_SUCCESS(Status)) - { - UserSetLastNTError(Status); - return FALSE; - } - - return TRUE; + /* + * FIXME: + * 1- Calling the Exit worker must be done under certain conditions. + * We may also need to warn the user if there are other people logged + * on this computer (see http://pve.proxmox.com/wiki/Windows_2003_guest_best_practices ) + * 2- Call SrvRecordShutdownReason. + */ + + return ExitWindowsWorker(uFlags, dwReserved, FALSE); + + /* FIXME: Call SrvRecordShutdownReason if we failed */ } /* Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Sat Feb 7 15:26:42 2015 @@ -778,6 +778,7 @@ return STATUS_ACCESS_DENIED; } + // FIXME: HAAAAACK!! DPRINT1("FIXME: Need to close all user processes!\n"); return STATUS_SUCCESS; @@ -896,12 +897,34 @@ } static NTSTATUS FASTCALL -UserExitReactos(DWORD UserProcessId, UINT Flags) +UserExitReactos(PCSR_THREAD CsrThread, UINT Flags) { NTSTATUS Status; - - /* FIXME Inside 2000 says we should impersonate the caller here */ - Status = NtUserCallTwoParam(UserProcessId, Flags, TWOPARAM_ROUTINE_EXITREACTOS); + LUID CallerLuid; + + // FIXME: HACK!! + + /* + * Retrieve the caller's LUID so that we can only shutdown + * processes in the caller's LUID. + */ + if (!CsrImpersonateClient(NULL)) + return STATUS_BAD_IMPERSONATION_LEVEL; + + Status = CsrGetProcessLuid(NULL, &CallerLuid); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to get caller LUID, Status = 0x%08x\n", Status); + goto Quit; + } + + DPRINT1("Caller LUID is: %lx.%lx\n", CallerLuid.HighPart, CallerLuid.LowPart); + + /* Notify Win32k and potentially Winlogon of the shutdown */ + Status = NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadInitiateShutdown, + &Flags, sizeof(Flags)); + DPRINT1("Win32k says: %lx\n", Status); /* If the message isn't handled, the return value is 0, so 0 doesn't indicate success. Success is indicated by a 1 return value, if anything besides 0 @@ -915,6 +938,10 @@ Status = STATUS_NOT_IMPLEMENTED; } + DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); + +Quit: + CsrRevertToSelf(); return Status; } @@ -938,19 +965,42 @@ CSR_API(SrvExitWindowsEx) { + NTSTATUS Status; PUSER_EXIT_REACTOS ExitReactosRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactosRequest; - - if (0 == (ExitReactosRequest->Flags & EWX_INTERNAL_FLAG)) - { - return UserExitReactos((DWORD_PTR) ApiMessage->Header.ClientId.UniqueProcess, - ExitReactosRequest->Flags); + PCSR_THREAD CsrThread = CsrGetClientThread(); + ULONG Flags = ExitReactosRequest->Flags; + + /* + * Check for flags validity + */ + + DWORD ProcessId = HandleToUlong(CsrThread->ClientId.UniqueProcess); + DWORD ThreadId = HandleToUlong(CsrThread->ClientId.UniqueThread); + + DPRINT1("SrvExitWindowsEx(ClientId: %lx.%lx, Flags: 0x%x)\n", + ProcessId, ThreadId, Flags); + + /* Implicitely add the shutdown flag when we poweroff or reboot */ + if (Flags & (EWX_POWEROFF | EWX_REBOOT)) + Flags |= EWX_SHUTDOWN; + + + // FIXME: Everything else starting after this line is a HAAACK!! + + + if (0 == (Flags & EWX_INTERNAL_FLAG)) + { + Status = UserExitReactos(CsrThread, Flags); } else { - return InternalExitReactos((DWORD_PTR) ApiMessage->Header.ClientId.UniqueProcess, - (DWORD_PTR) ApiMessage->Header.ClientId.UniqueThread, - ExitReactosRequest->Flags); - } + // EWX_INTERNAL_FLAG --> For Winlogon only!! + // FIXME: This is just a big HAAAACK!! + Status = InternalExitReactos(ProcessId, ThreadId, Flags); + } + + ExitReactosRequest->Success = NT_SUCCESS(Status); + return Status; } CSR_API(SrvEndTask)

9 years, 9 months

[tkreuzer] 66191: [MKHIVE] Add back CmpAllocate prototype. Fixes MSVC warnings.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 7 15:05:04 2015 New Revision: 66191 URL: http://svn.reactos.org/svn/reactos?rev=66191&view=rev Log: [MKHIVE] Add back CmpAllocate prototype. Fixes MSVC warnings. Modified: trunk/reactos/tools/mkhive/ntoskrnl.h Modified: trunk/reactos/tools/mkhive/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/ntoskrnl.h?re… ============================================================================== --- trunk/reactos/tools/mkhive/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/ntoskrnl.h [iso-8859-1] Sat Feb 7 15:05:04 2015 @@ -4,3 +4,11 @@ #define NDEBUG #include "mkhive.h" + +PVOID +NTAPI +CmpAllocate( + IN SIZE_T Size, + IN BOOLEAN Paged, + IN ULONG Tag +);

9 years, 9 months

[gadamopoulos] 66190: [SHELL32] - Get rid of IDD_FILE_COPY dialog. It was never used, never completed and windows don't really have such a dialog. - Remove SHShowFileOperationDialog which was never...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Feb 7 14:42:39 2015 New Revision: 66190 URL: http://svn.reactos.org/svn/reactos?rev=66190&view=rev Log: [SHELL32] - Get rid of IDD_FILE_COPY dialog. It was never used, never completed and windows don't really have such a dialog. - Remove SHShowFileOperationDialog which was never completed. This will be replaced shortly with a working solution by Huw Davies Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shlfileop.cpp trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "ÐÐ±ÑÐ¸" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -401,16 +401,6 @@ PUSHBUTTON "Storno", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "KopÃrovÃ¡nÃ..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Storno", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Soubor", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "ObecnÃ©" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -401,16 +401,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Kopiere..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Abbrechen", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Allgemein" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "ÎÎºÏÏÎ¿", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -396,16 +396,6 @@ PUSHBUTTON "Cancelar", IDCANCEL, 226, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copiando..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancelar", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Archivo", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 294, 240 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Annuler", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "En cours de copie..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Annuler", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Fichier", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "GÃ©nÃ©ral" Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "×××××", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "××¢×ª××§..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "×××××", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "×§×××¥", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "××××" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Annulla", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copia in corso..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Annulla", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Generale" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "å¨è¬" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Avbryt", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Generielt" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Anuluj", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "OgÃ³lne" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copiando..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancelar", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Arquivo", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Geral" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Geral" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -397,16 +397,6 @@ PUSHBUTTON "A&nuleazÄ", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copiereâ¦" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "A&nuleazÄ", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "FiÈier", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Generale" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -397,16 +397,6 @@ PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Ð¤Ð°Ð¹Ð»", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "ÐÐ±ÑÐ¸Ðµ" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -399,16 +399,6 @@ PUSHBUTTON "Anulo", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Kopjim..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Anulo", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Dokument", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "PÃ«rgjithshÃ«m" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Ä°ptal", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "KopyalanÄ±yor..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Ä°ptal", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Dosya", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Genel" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -395,16 +395,6 @@ PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "ÐÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "Ð¤Ð°Ð¹Ð»", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "ÐÐ°Ð³Ð°Ð»ÑÐ½Ñ" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -404,16 +404,6 @@ PUSHBUTTON "åæ¶", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -403,16 +403,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END -IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 - CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 -END - IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -31,8 +31,6 @@ #define IsDotDir(x) ((x[0] == '.') && ((x[1] == 0) || ((x[1] == '.') && (x[2] == 0)))) #define FO_MASK 0xF -#define WM_FILE (WM_USER + 1) -#define TIMER_ID (100) static const WCHAR wWildcardFile[] = {'*',0}; static const WCHAR wWildcardChars[] = {'*','?',0}; @@ -563,164 +561,6 @@ } return GetLastError(); } - -static DWORD WINAPI SHOperationProgressRoutine(LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, LARGE_INTEGER StreamBytesTransferred, DWORD dwStreamNumber, DWORD dwCallbackReason, HANDLE hSourceFile, HANDLE hDestinationFile, LPVOID lpData) -{ - FILE_OPERATION_CONTEXT * Context; - LARGE_INTEGER Progress; - - /* get context */ - Context = (FILE_OPERATION_CONTEXT*)lpData; - - if (TotalBytesTransferred.QuadPart) - { - Progress.QuadPart = (TotalBytesTransferred.QuadPart * 100) / TotalFileSize.QuadPart; - } - else - { - Progress.QuadPart = 1; - } - - /* update progress bar */ - SendMessageW(Context->hDlgCtrl, PBM_SETPOS, (WPARAM)Progress.u.LowPart, 0); - - if (TotalBytesTransferred.QuadPart == TotalFileSize.QuadPart) - { - /* file was copied */ - Context->Index++; - PostMessageW(Context->hwndDlg, WM_FILE, 0, 0); - } - - return PROGRESS_CONTINUE; -} - -BOOL -QueueFile( - FILE_OPERATION_CONTEXT * Context) -{ - FILE_ENTRY * from, *to = NULL; - BOOL bRet = FALSE; - - if (Context->Index >= Context->from->dwNumFiles) - return FALSE; - - /* get current file */ - from = &Context->from->feFiles[Context->Index]; - - if (Context->op->req->wFunc != FO_DELETE) - to = &Context->to->feFiles[Context->Index]; - - /* update status */ - SetDlgItemTextW(Context->hwndDlg, 14001, from->szFullPath); - - if (Context->op->req->wFunc == FO_COPY) - { - bRet = CopyFileExW(from->szFullPath, to->szFullPath, SHOperationProgressRoutine, (LPVOID)Context, &Context->op->bCancelled, 0); - } - else if (Context->op->req->wFunc == FO_MOVE) - { - //bRet = MoveFileWithProgressW(from->szFullPath, to->szFullPath, SHOperationProgressRoutine, (LPVOID)Context, MOVEFILE_COPY_ALLOWED); - } - else if (Context->op->req->wFunc == FO_DELETE) - { - bRet = DeleteFile(from->szFullPath); - } - - return bRet; -} - -static INT_PTR CALLBACK SHOperationDialog(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - FILE_OPERATION_CONTEXT * Context; - - Context = (FILE_OPERATION_CONTEXT*) GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch(uMsg) - { - case WM_INITDIALOG: - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)lParam); - - /* get context */ - Context = (FILE_OPERATION_CONTEXT*)lParam; - - /* store progress bar handle */ - Context->hDlgCtrl = GetDlgItem(hwndDlg, 14000); - - /* store window handle */ - Context->hwndDlg = hwndDlg; - - /* set progress bar range */ - (void)SendMessageW(Context->hDlgCtrl, (UINT) PBM_SETRANGE, 0, MAKELPARAM(0, 100)); - - /* start file queueing */ - SetTimer(hwndDlg, TIMER_ID, 1000, NULL); - //QueueFile(Context); - - return TRUE; - - case WM_CLOSE: - Context->op->bCancelled = TRUE; - EndDialog(hwndDlg, Context->op->bCancelled); - return TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == 14002) - { - Context->op->bCancelled = TRUE; - EndDialog(hwndDlg, Context->op->bCancelled); - return TRUE; - }; break; - - case WM_TIMER: - if (wParam == TIMER_ID) - { - QueueFile(Context); - KillTimer(hwndDlg, TIMER_ID); - }; break; - - case WM_FILE: - if (!QueueFile(Context)) - EndDialog(hwndDlg, Context->op->bCancelled); - default: - break; - } - return FALSE; -} - -HRESULT -SHShowFileOperationDialog(FILE_OPERATION *op, FILE_LIST *flFrom, FILE_LIST *flTo) -{ - HWND hwnd; - BOOL bRet; - MSG msg; - FILE_OPERATION_CONTEXT Context; - - Context.from = flFrom; - Context.to = flTo; - Context.op = op; - Context.Index = 0; - Context.op->bCancelled = FALSE; - - hwnd = CreateDialogParam(shell32_hInstance, MAKEINTRESOURCE(IDD_FILE_COPY), NULL, SHOperationDialog, (LPARAM)&Context); - if (hwnd == NULL) - { - ERR("Failed to create dialog\n"); - return E_FAIL; - } - ShowWindow(hwnd, SW_SHOWNORMAL); - - while ((bRet = GetMessage(&msg, NULL, 0, 0)) != 0) - { - if (!IsWindow(hwnd) || !IsDialogMessage(hwnd, &msg)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - - return NOERROR; -} - /************************************************************************ * SHNotifyCopyFile [internal] Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Feb 7 14:42:39 2015 @@ -291,7 +291,6 @@ #define IDD_NOOPEN 27 /* Not used dialogs */ -#define IDD_FILE_COPY 28 #define IDD_SHUTDOWN 29 #define IDD_LOG_OFF 30 #define IDD_DISCONNECT 31

9 years, 9 months

[tfaber] 66189: [RTL] - Implement RtlIpv4StringToAddressW. Dedicated to Jérôme. Thanks to the countless reviewers. CORE-6490

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 7 13:24:29 2015 New Revision: 66189 URL: http://svn.reactos.org/svn/reactos?rev=66189&view=rev Log: [RTL] - Implement RtlIpv4StringToAddressW. Dedicated to Jérôme. Thanks to the countless reviewers. CORE-6490 Modified: trunk/reactos/lib/rtl/network.c trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=6618… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Sat Feb 7 13:24:29 2015 @@ -3,6 +3,7 @@ * PROJECT: ReactOS Runtime Library * PURPOSE: Network Address Translation implementation * PROGRAMMER: Alex Ionescu (alexi(a)tinykrnl.org) + * Thomas Faber (thomas.faber(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -21,7 +22,82 @@ /* network to host order conversion for little endian machines */ #define WN2H(w) (((w & 0xFF00) >> 8) | ((w & 0x00FF) << 8)) -/* FUNCTIONS ***************************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ + +static +NTSTATUS +RtlpStringToUlong( + _In_ PCWSTR String, + _In_ BOOLEAN Strict, + _Out_ PCWSTR *Terminator, + _Out_ PULONG Out) +{ + /* If we never see any digits, we'll return this */ + NTSTATUS Status = STATUS_INVALID_PARAMETER; + ULONG Result = 0; + ULONG Base = 10; + ULONG Digit; + + if (String[0] == L'0') + { + if (String[1] == L'x' || String[1] == L'X') + { + /* 0x/0X prefix -- hex */ + String += 2; + Base = 16; + } + else if (String[1] >= L'0' && String[1] <= L'9') + { + /* 0 prefix -- octal */ + String++; + Base = 8; + } + } + + /* Strict forbids anything but decimal */ + if (Strict && Base != 10) + { + Status = STATUS_INVALID_PARAMETER; + goto Done; + } + + while (1) + { + if (*String >= L'0' && *String <= L'7') + Digit = *String - L'0'; + else if (*String >= L'0' && *String <= L'9' && Base >= 10) + Digit = *String - L'0'; + else if (*String >= L'A' && *String <= L'F' && Base >= 16) + Digit = 10 + (*String - L'A'); + else if (*String >= L'a' && *String <= L'f' && Base >= 16) + Digit = 10 + (*String - L'a'); + else + break; + + Status = RtlULongMult(Result, Base, &Result); + if (!NT_SUCCESS(Status)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + Status = RtlULongAdd(Result, Digit, &Result); + if (!NT_SUCCESS(Status)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + String++; + } + +Done: + *Terminator = String; + *Out = Result; + return Status; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ /* * @implemented @@ -198,17 +274,66 @@ } /* -* @unimplemented -*/ -NTSTATUS -NTAPI -RtlIpv4StringToAddressW(IN PCWSTR String, - IN BOOLEAN Strict, - OUT PCWSTR *Terminator, - OUT struct in_addr *Addr) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + * @implemented + */ +NTSTATUS +NTAPI +RtlIpv4StringToAddressW( + _In_ PCWSTR String, + _In_ BOOLEAN Strict, + _Out_ PCWSTR *Terminator, + _Out_ struct in_addr *Addr) +{ + NTSTATUS Status; + ULONG Values[4]; + ULONG Result; + INT Parts = 0; + INT i; + + do + { + Status = RtlpStringToUlong(String, Strict, &String, &Values[Parts]); + Parts++; + + if (*String != L'.') + break; + + /* Already four parts, but a dot follows? */ + if (Parts == 4) + { + Status = STATUS_INVALID_PARAMETER; + goto Done; + } + + /* Skip the dot */ + String++; + } while (NT_SUCCESS(Status)); + + if (Strict && Parts < 4) + Status = STATUS_INVALID_PARAMETER; + + if (!NT_SUCCESS(Status)) + goto Done; + + /* Combine the parts */ + Result = Values[Parts - 1]; + for (i = 0; i < Parts - 1; i++) + { + INT Shift = CHAR_BIT * (3 - i); + + if (Values[i] > 0xFF || (Result & (0xFF << Shift)) != 0) + { + Status = STATUS_INVALID_PARAMETER; + goto Done; + } + Result |= Values[i] << Shift; + } + + Addr->S_un.S_addr = RtlUlongByteSwap(Result); + +Done: + *Terminator = String; + return Status; } /* Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=66189&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.h [iso-8859-1] Sat Feb 7 13:24:29 2015 @@ -27,6 +27,7 @@ #include <winbase.h> #include <winreg.h> #include <objbase.h> +#include <ntintsafe.h> #include <ndk/exfuncs.h> #include <ndk/iofuncs.h> #include <ndk/kefuncs.h>

9 years, 9 months

[tfaber] 66188: [WIN32K] - Do not use an uninitialized variable in UserSetProcessWindowStation. Feel free to fix this properly

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 7 11:11:37 2015 New Revision: 66188 URL: http://svn.reactos.org/svn/reactos?rev=66188&view=rev Log: [WIN32K] - Do not use an uninitialized variable in UserSetProcessWindowStation. Feel free to fix this properly Modified: trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Sat Feb 7 11:11:37 2015 @@ -933,7 +933,7 @@ ppi->prpwinsta = NewWinSta; ppi->hwinsta = hWindowStation; - ppi->amwinsta = ObjectHandleInfo.GrantedAccess; + ppi->amwinsta = hWindowStation != NULL ? ObjectHandleInfo.GrantedAccess : 0; ERR("WS : Granted Access %p\n",ppi->amwinsta); if (RtlAreAllAccessesGranted(ppi->amwinsta, WINSTA_READSCREEN))

9 years, 9 months

← Newer
1
...
29
30
31
32
33
34
35
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015