Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[tfaber] 66663: [DDK][NDK][XDK] - Update some definitions to match WDK8.1. Fixes a few compatibility issues between NDK and WDK. CORE-9356 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Mar 11 09:21:10 2015 New Revision: 66663 URL: http://svn.reactos.org/svn/reactos?rev=66663&view=rev Log: [DDK][NDK][XDK] - Update some definitions to match WDK8.1. Fixes a few compatibility issues between NDK and WDK. CORE-9356 #resolve Modified: trunk/reactos/include/asm/genincdata.c trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/halfuncs.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/include/xdk/ketypes.h Modified: trunk/reactos/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/genincdata.c?r… ============================================================================== --- trunk/reactos/include/asm/genincdata.c [iso-8859-1] (original) +++ trunk/reactos/include/asm/genincdata.c [iso-8859-1] Wed Mar 11 09:21:10 2015 @@ -2,6 +2,7 @@ #include <psdk/ntverp.h> /* DDK/IFS/NDK Headers */ +#define _NTSYSTEM_ #include <excpt.h> #include <setjmp.h> #include <ntdef.h> Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=66… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Wed Mar 11 09:21:10 2015 @@ -1938,6 +1938,12 @@ /****************************************************************************** * Kernel Types * ******************************************************************************/ + +typedef struct _EXCEPTION_REGISTRATION_RECORD +{ + struct _EXCEPTION_REGISTRATION_RECORD *Next; + PEXCEPTION_ROUTINE Handler; +} EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; typedef struct _NT_TIB { struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6666… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Wed Mar 11 09:21:10 2015 @@ -1151,6 +1151,7 @@ KD_OPTION_SET_BLOCK_ENABLE, } KD_OPTION; +#ifdef _NTSYSTEM_ typedef VOID (NTAPI *PKNORMAL_ROUTINE)( IN PVOID NormalContext OPTIONAL, @@ -1168,6 +1169,7 @@ IN OUT PVOID *NormalContext OPTIONAL, IN OUT PVOID *SystemArgument1 OPTIONAL, IN OUT PVOID *SystemArgument2 OPTIONAL); +#endif typedef struct _KAPC { UCHAR Type; @@ -1177,9 +1179,13 @@ ULONG SpareLong0; struct _KTHREAD *Thread; LIST_ENTRY ApcListEntry; +#ifdef _NTSYSTEM_ PKKERNEL_ROUTINE KernelRoutine; PKRUNDOWN_ROUTINE RundownRoutine; PKNORMAL_ROUTINE NormalRoutine; +#else + PVOID Reserved[3]; +#endif PVOID NormalContext; PVOID SystemArgument1; PVOID SystemArgument2; Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] Wed Mar 11 09:21:10 2015 @@ -52,16 +52,6 @@ #define KdUnmapVirtualAddress HALPRIVATEDISPATCH->KdUnmapVirtualAddress // -// The DDK steals these away from you. -// -#ifdef _MSC_VER -void __cdecl _enable(void); -void __cdecl _disable(void); -#pragma intrinsic(_enable) -#pragma intrinsic(_disable) -#endif - -// // Display Functions // NTHALAPI Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Wed Mar 11 09:21:10 2015 @@ -538,6 +538,26 @@ PVOID StartContext ); +#ifndef _NTSYSTEM_ +typedef VOID +(NTAPI *PKNORMAL_ROUTINE)( + IN PVOID NormalContext OPTIONAL, + IN PVOID SystemArgument1 OPTIONAL, + IN PVOID SystemArgument2 OPTIONAL); + +typedef VOID +(NTAPI *PKRUNDOWN_ROUTINE)( + IN struct _KAPC *Apc); + +typedef VOID +(NTAPI *PKKERNEL_ROUTINE)( + IN struct _KAPC *Apc, + IN OUT PKNORMAL_ROUTINE *NormalRoutine OPTIONAL, + IN OUT PVOID *NormalContext OPTIONAL, + IN OUT PVOID *SystemArgument1 OPTIONAL, + IN OUT PVOID *SystemArgument2 OPTIONAL); +#endif + // // APC Environment Types // Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Wed Mar 11 09:21:10 2015 @@ -848,11 +848,6 @@ CSHORT Milliseconds; CSHORT Weekday; } TIME_FIELDS, *PTIME_FIELDS; - -// -// Activation Context -// -typedef PVOID PACTIVATION_CONTEXT; // // Activation Context Frame @@ -1199,6 +1194,7 @@ PRTL_HANDLE_TABLE_ENTRY MaxReservedHandles; } RTL_HANDLE_TABLE, *PRTL_HANDLE_TABLE; +#ifdef NTOS_MODE_USER // // Exception Record // @@ -1207,6 +1203,7 @@ struct _EXCEPTION_REGISTRATION_RECORD *Next; PEXCEPTION_ROUTINE Handler; } EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; +#endif /* NTOS_MODE_USER */ // // Current Directory Structures Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Wed Mar 11 09:21:10 2015 @@ -476,6 +476,7 @@ KD_OPTION_SET_BLOCK_ENABLE, } KD_OPTION; +#ifdef _NTSYSTEM_ typedef VOID (NTAPI *PKNORMAL_ROUTINE)( IN PVOID NormalContext OPTIONAL, @@ -493,6 +494,7 @@ IN OUT PVOID *NormalContext OPTIONAL, IN OUT PVOID *SystemArgument1 OPTIONAL, IN OUT PVOID *SystemArgument2 OPTIONAL); +#endif typedef struct _KAPC { UCHAR Type; @@ -502,9 +504,13 @@ ULONG SpareLong0; struct _KTHREAD *Thread; LIST_ENTRY ApcListEntry; +#ifdef _NTSYSTEM_ PKKERNEL_ROUTINE KernelRoutine; PKRUNDOWN_ROUTINE RundownRoutine; PKNORMAL_ROUTINE NormalRoutine; +#else + PVOID Reserved[3]; +#endif PVOID NormalContext; PVOID SystemArgument1; PVOID SystemArgument2; @@ -992,6 +998,12 @@ $endif (_WDMDDK_) $if (_NTDDK_) + +typedef struct _EXCEPTION_REGISTRATION_RECORD +{ + struct _EXCEPTION_REGISTRATION_RECORD *Next; + PEXCEPTION_ROUTINE Handler; +} EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; typedef struct _NT_TIB { struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList;

9 years, 9 months

[hbelusca] 66662: [WIN32K] - Implement NtUserResolveDesktop, which opens a desktop and a window station based on a desktop path string (format: "WinSta\Desktop"). - Move NtUserConsoleControl to a m...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 11 01:21:29 2015 New Revision: 66662 URL: http://svn.reactos.org/svn/reactos?rev=66662&view=rev Log: [WIN32K] - Implement NtUserResolveDesktop, which opens a desktop and a window station based on a desktop path string (format: "WinSta\Desktop"). - Move NtUserConsoleControl to a more suitable file, and implement the control code that allows CSRSS to assign console input threads to given desktops. - Simplify a bit the code in NtUserSetInformationThread. [CONSRV] Turn the console input thread to a real one. There should be one such thread per desktop. When a console process is started, we open the desktop on which the process is going to start, we create a new input thread (attach it to the desktop) if needed, or reuse the existing one, and then we open the terminal on the correct desktop. CORE-9346 #resolve #comment Fixed in revision 66662. Added: trunk/reactos/win32ss/user/ntuser/console.c (with props) Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/desktop.h trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/console.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/init.c Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -197,7 +197,9 @@ ULONG TitleLength; WCHAR ConsoleTitle[MAX_PATH + 1]; // Console title or full path to the startup shortcut ULONG DesktopLength; - PWCHAR Desktop; + PWCHAR Desktop; // Contrary to the case of CONSOLE_ALLOCCONSOLE, the + // desktop string is allocated in the process' heap, + // and CSR will read it via NtReadVirtualMemory. ULONG AppNameLength; WCHAR AppName[128]; // Full path of the launched app ULONG CurDirLength; Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -100,6 +100,7 @@ user/ntuser/caret.c user/ntuser/class.c user/ntuser/clipboard.c + user/ntuser/console.c user/ntuser/csr.c user/ntuser/cursoricon.c user/ntuser/dde.c 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] Wed Mar 11 01:21:29 2015 @@ -1721,10 +1721,17 @@ /* Console commands for NtUserConsoleControl */ typedef enum _CONSOLECONTROL { - GuiConsoleWndClassAtom, + ConsoleCtrlDesktopConsoleThread = 0, + GuiConsoleWndClassAtom = 1, ConsoleMakePalettePublic = 5, ConsoleAcquireDisplayOwnership, } CONSOLECONTROL, *PCONSOLECONTROL; + +typedef struct _DESKTOP_CONSOLE_THREAD +{ + HDESK DesktopHandle; + ULONG_PTR ThreadId; +} DESKTOP_CONSOLE_THREAD, *PDESKTOP_CONSOLE_THREAD; NTSTATUS APIENTRY @@ -2860,13 +2867,13 @@ HWND hWnd, ATOM Atom); -DWORD -NTAPI +HDESK +APIENTRY NtUserResolveDesktop( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4); + IN HANDLE ProcessHandle, + IN PUNICODE_STRING DesktopPath, + DWORD dwUnknown, + OUT HWINSTA* phWinSta); DWORD NTAPI Added: trunk/reactos/win32ss/user/ntuser/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/consol… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/console.c (added) +++ trunk/reactos/win32ss/user/ntuser/console.c [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -0,0 +1,160 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32k subsystem + * PURPOSE: Console support functions for CONSRV + * FILE: subsystems/win32/win32k/ntuser/console.c + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#include <win32k.h> +DBG_DEFAULT_CHANNEL(UserMisc); + +NTSTATUS +APIENTRY +NtUserConsoleControl( + IN CONSOLECONTROL ConsoleCtrl, + IN PVOID ConsoleCtrlInfo, + IN ULONG ConsoleCtrlInfoLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + /* Allow only the Console Server to perform this operation (via CSRSS) */ + if (PsGetCurrentProcess() != gpepCSRSS) + return STATUS_ACCESS_DENIED; + + UserEnterExclusive(); + + switch (ConsoleCtrl) + { + case ConsoleCtrlDesktopConsoleThread: + { + DESKTOP_CONSOLE_THREAD DesktopConsoleThreadInfo; + PDESKTOP Desktop = NULL; + ULONG_PTR OldThreadId; + + if (ConsoleCtrlInfoLength != sizeof(DesktopConsoleThreadInfo)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + _SEH2_TRY + { + ProbeForWrite(ConsoleCtrlInfo, ConsoleCtrlInfoLength, sizeof(USHORT)); + DesktopConsoleThreadInfo = *(PDESKTOP_CONSOLE_THREAD)ConsoleCtrlInfo; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Reference the desktop */ + Status = ObReferenceObjectByHandle(DesktopConsoleThreadInfo.DesktopHandle, + 0, + ExDesktopObjectType, + UserMode, + (PVOID*)&Desktop, + NULL); + if (!NT_SUCCESS(Status)) break; + + /* Save the old thread ID, it is always returned to the caller */ + OldThreadId = Desktop->dwConsoleThreadId; + + /* Set the new console input thread ID for this desktop if required */ + if (DesktopConsoleThreadInfo.ThreadId != (ULONG_PTR)INVALID_HANDLE_VALUE) + { + Desktop->dwConsoleThreadId = DesktopConsoleThreadInfo.ThreadId; + } + + /* Always return the old thread ID */ + DesktopConsoleThreadInfo.ThreadId = OldThreadId; + + /* Dereference the desktop */ + ObDereferenceObject(Desktop); + + /* Return the information back to the caller */ + _SEH2_TRY + { + *(PDESKTOP_CONSOLE_THREAD)ConsoleCtrlInfo = DesktopConsoleThreadInfo; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + break; + } + + case GuiConsoleWndClassAtom: + { + if (ConsoleCtrlInfoLength != sizeof(ATOM)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + _SEH2_TRY + { + ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, sizeof(USHORT)); + gaGuiConsoleWndClass = *(ATOM*)ConsoleCtrlInfo; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + break; + } + + case ConsoleMakePalettePublic: + { + HPALETTE hPalette; + + if (ConsoleCtrlInfoLength != sizeof(hPalette)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + _SEH2_TRY + { + ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, sizeof(USHORT)); + hPalette = *(HPALETTE*)ConsoleCtrlInfo; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Make the palette handle public */ + GreSetObjectOwnerEx(hPalette, + GDI_OBJ_HMGR_PUBLIC, + GDIOBJFLAG_IGNOREPID); + break; + } + + case ConsoleAcquireDisplayOwnership: + { + ERR("NtUserConsoleControl - ConsoleAcquireDisplayOwnership is UNIMPLEMENTED\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + default: + ERR("Calling invalid control %d in NtUserConsoleControl\n", ConsoleCtrl); + Status = STATUS_INVALID_INFO_CLASS; + break; + } + + UserLeave(); + + return Status; +} + +/* EOF */ Propchange: trunk/reactos/win32ss/user/ntuser/console.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -1651,6 +1651,103 @@ } /* + * NtUserResolveDesktop + * + * The NtUserResolveDesktop function retrieves handles to the desktop and + * the window station specified by the desktop path string. + * + * Parameters + * ProcessHandle + * Handle to a user process. + * + * DesktopPath + * The desktop path string. + * + * Return Value + * Handle to the desktop (direct return value) and + * handle to the associated window station (by pointer). + * NULL in case of failure. + * + * Remarks + * Callable by CSRSS only. + * + * Status + * @implemented + */ + +HDESK +APIENTRY +NtUserResolveDesktop( + IN HANDLE ProcessHandle, + IN PUNICODE_STRING DesktopPath, + DWORD dwUnknown, + OUT HWINSTA* phWinSta) +{ + NTSTATUS Status; + PEPROCESS Process = NULL; + HWINSTA hWinSta = NULL; + HDESK hDesktop = NULL; + + /* Allow only the Console Server to perform this operation (via CSRSS) */ + if (PsGetCurrentProcess() != gpepCSRSS) + return NULL; + + /* Get the process object the user handle was referencing */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + *PsProcessType, + UserMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return NULL; + + // UserEnterShared(); + + _SEH2_TRY + { + UNICODE_STRING CapturedDesktopPath; + + /* Capture the user desktop path string */ + Status = IntSafeCopyUnicodeStringTerminateNULL(&CapturedDesktopPath, + DesktopPath); + if (!NT_SUCCESS(Status)) _SEH2_YIELD(goto Quit); + + /* Call the internal function */ + Status = IntParseDesktopPath(Process, + &CapturedDesktopPath, + &hWinSta, + &hDesktop); + if (!NT_SUCCESS(Status)) + { + ERR("IntParseDesktopPath failed, Status = 0x%08lx\n", Status); + hWinSta = NULL; + hDesktop = NULL; + } + + /* Return the window station handle */ + *phWinSta = hWinSta; + + /* Free the captured string */ + if (CapturedDesktopPath.Buffer) + ExFreePoolWithTag(CapturedDesktopPath.Buffer, TAG_STRING); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + +Quit: + // UserLeave(); + + /* Dereference the process object */ + ObDereferenceObject(Process); + + /* Return the desktop handle */ + return hDesktop; +} + +/* * NtUserSwitchDesktop * * Sets the current input (interactive) desktop. Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -23,6 +23,10 @@ PWIN32HEAP pheapDesktop; ULONG_PTR ulHeapSize; LIST_ENTRY PtiList; + + /* One console input thread per desktop, maintained by CONSRV */ + DWORD dwConsoleThreadId; + /* Use for tracking mouse moves. */ PWND spwndTrack; DWORD htEx; 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] Wed Mar 11 01:21:29 2015 @@ -403,92 +403,6 @@ return 0; } -NTSTATUS -APIENTRY -NtUserConsoleControl( - IN CONSOLECONTROL ConsoleCtrl, - IN PVOID ConsoleCtrlInfo, - IN ULONG ConsoleCtrlInfoLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - - /* Allow only the Console Server to perform this operation (via CSRSS) */ - if (PsGetCurrentProcess() != gpepCSRSS) - return STATUS_ACCESS_DENIED; - - UserEnterExclusive(); - - switch (ConsoleCtrl) - { - case GuiConsoleWndClassAtom: - { - if (ConsoleCtrlInfoLength != sizeof(ATOM)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - _SEH2_TRY - { - ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1); - gaGuiConsoleWndClass = *(ATOM*)ConsoleCtrlInfo; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - break; - } - - case ConsoleMakePalettePublic: - { - HPALETTE hPalette; - - if (ConsoleCtrlInfoLength != sizeof(HPALETTE)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - _SEH2_TRY - { - ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1); - hPalette = *(HPALETTE*)ConsoleCtrlInfo; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - /* Make the palette handle public */ - GreSetObjectOwnerEx(hPalette, - GDI_OBJ_HMGR_PUBLIC, - GDIOBJFLAG_IGNOREPID); - - break; - } - - case ConsoleAcquireDisplayOwnership: - { - ERR("NtUserConsoleControl - ConsoleAcquireDisplayOwnership is UNIMPLEMENTED\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - default: - ERR("Calling invalid control %d in NtUserConsoleControl\n", ConsoleCtrl); - Status = STATUS_INVALID_INFO_CLASS; - break; - } - - UserLeave(); - - return Status; -} - DWORD APIENTRY NtUserCreateInputContext( @@ -738,15 +652,10 @@ return 0; } -DWORD -APIENTRY -NtUserResolveDesktop( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; +DWORD APIENTRY +NtUserResolveDesktopForWOW(DWORD Unknown0) +{ + STUB return 0; } @@ -811,11 +720,11 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); } _SEH2_END; - if (NT_SUCCESS(Status)) - Status = UserInitiateShutdown(Thread, &CapturedFlags); + Status = UserInitiateShutdown(Thread, &CapturedFlags); /* Return the modified value to the caller */ _SEH2_TRY @@ -853,12 +762,11 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); } _SEH2_END; - if (NT_SUCCESS(Status)) - Status = UserEndShutdown(Thread, ShutdownStatus); - + Status = UserEndShutdown(Thread, ShutdownStatus); break; } @@ -884,12 +792,11 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); } _SEH2_END; - if (NT_SUCCESS(Status)) - Status = InitCsrApiPort(CsrPortHandle); - + Status = InitCsrApiPort(CsrPortHandle); break; } @@ -1103,20 +1010,6 @@ { STUB - return 0; -} - -/* - * NtUserResolveDesktopForWOW - * - * Status - * @unimplemented - */ - -DWORD APIENTRY -NtUserResolveDesktopForWOW(DWORD Unknown0) -{ - STUB return 0; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -342,7 +342,7 @@ ConSrvInitTerminal(IN OUT PTERMINAL Terminal, IN OUT PCONSOLE_INFO ConsoleInfo, IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId); + IN PCSR_PROCESS ConsoleLeaderProcess); NTSTATUS NTAPI ConSrvDeinitTerminal(IN OUT PTERMINAL Terminal); @@ -513,12 +513,13 @@ ConSrvInitConsole(OUT PHANDLE NewConsoleHandle, OUT PCONSRV_CONSOLE* NewConsole, IN OUT PCONSOLE_INIT_INFO ConsoleInitInfo, - IN ULONG ConsoleLeaderProcessId) + IN PCSR_PROCESS ConsoleLeaderProcess) { NTSTATUS Status; HANDLE ConsoleHandle; PCONSRV_CONSOLE Console; CONSOLE_INFO ConsoleInfo; + ULONG ConsoleLeaderProcessId = HandleToUlong(ConsoleLeaderProcess->ClientId.UniqueProcess); SIZE_T Length = 0; TERMINAL Terminal; /* The ConSrv terminal for this console */ @@ -545,7 +546,7 @@ Status = ConSrvInitTerminal(&Terminal, &ConsoleInfo, ConsoleInitInfo, - ConsoleLeaderProcessId); + ConsoleLeaderProcess); if (!NT_SUCCESS(Status)) { DPRINT1("CONSRV: Failed to initialize a terminal, Status = 0x%08lx\n", Status); Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.h [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -30,7 +30,7 @@ ConSrvInitConsole(OUT PHANDLE NewConsoleHandle, OUT struct _CONSRV_CONSOLE** /* PCONSRV_CONSOLE* */ NewConsole, IN OUT PCONSOLE_INIT_INFO ConsoleInitInfo, - IN ULONG ConsoleLeaderProcessId); + IN PCSR_PROCESS ConsoleLeaderProcess); VOID NTAPI ConSrvDeleteConsole(struct _CONSRV_CONSOLE* /* PCONSRV_CONSOLE */ Console); NTSTATUS Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -39,6 +39,11 @@ BOOL WindowSizeLock; HANDLE hGuiInitEvent; HANDLE hGuiTermEvent; + + // HANDLE InputThreadHandle; + ULONG_PTR InputThreadId; + HWINSTA WinSta; + HDESK Desktop; BOOLEAN IsWindowVisible; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -23,8 +23,8 @@ #define CONGUI_UPDATE_TIME 0 #define CONGUI_UPDATE_TIMER 1 -#define PM_CREATE_CONSOLE (WM_APP + 1) -#define PM_DESTROY_CONSOLE (WM_APP + 2) +#define PM_CREATE_CONSOLE (WM_APP + 1) +#define PM_DESTROY_CONSOLE (WM_APP + 2) /* GLOBALS ********************************************************************/ @@ -33,13 +33,15 @@ { PCONSOLE_INFO ConsoleInfo; PCONSOLE_START_INFO ConsoleStartInfo; - ULONG ProcessId; + ULONG_PTR ProcessId; + HANDLE GuiThreadStartupEvent; + ULONG_PTR InputThreadId; + HWINSTA WinSta; + HDESK Desktop; BOOLEAN IsWindowVisible; } GUI_INIT_INFO, *PGUI_INIT_INFO; -static BOOL ConsInitialized = FALSE; -static HANDLE hInputThread = NULL; -static DWORD dwInputThreadId = 0; +static BOOL ConsInitialized = FALSE; extern HICON ghDefaultIcon; extern HICON ghDefaultIconSm; @@ -137,20 +139,42 @@ VOID CreateSysMenu(HWND hWnd); -static DWORD NTAPI +static ULONG NTAPI GuiConsoleInputThread(PVOID Param) { - PHANDLE GraphicsStartupEvent = (PHANDLE)Param; + NTSTATUS Status; + PCSR_THREAD pcsrt = NULL; + PGUI_INIT_INFO GuiInitInfo = (PGUI_INIT_INFO)Param; + DESKTOP_CONSOLE_THREAD DesktopConsoleThreadInfo; + ULONG_PTR InputThreadId = HandleToUlong(NtCurrentTeb()->ClientId.UniqueThread); + LONG WindowCount = 0; MSG msg; /* * This thread dispatches all the console notifications to the - * notification window. It is common for all the console windows. - */ + * notification window. It is common for all the console windows + * in a given desktop in a window station. + */ + + /* Assign this console input thread to this desktop */ + DesktopConsoleThreadInfo.DesktopHandle = GuiInitInfo->Desktop; // Duplicated desktop handle + DesktopConsoleThreadInfo.ThreadId = InputThreadId; + Status = NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); + if (!NT_SUCCESS(Status)) goto Quit; + + /* Connect this CSR thread to the USER subsystem */ + pcsrt = CsrConnectToUser(); + if (pcsrt == NULL) goto Quit; + + /* Assign the desktop to this thread */ + if (!SetThreadDesktop(DesktopConsoleThreadInfo.DesktopHandle)) goto Quit; /* The thread has been initialized, set the event */ - NtSetEvent(*GraphicsStartupEvent, NULL); + NtSetEvent(GuiInitInfo->GuiThreadStartupEvent, NULL); + Status = STATUS_SUCCESS; while (GetMessageW(&msg, NULL, 0, 0)) { @@ -257,7 +281,7 @@ if (InterlockedDecrement(&WindowCount) == 0) { - DPRINT("CONSRV: Going to quit the Input Thread!!\n"); + DPRINT("CONSRV: Going to quit the Input Thread 0x%p\n", InputThreadId); goto Quit; } @@ -270,19 +294,41 @@ } Quit: - DPRINT("CONSRV: Quit the Input Thread!!\n"); - - hInputThread = NULL; - dwInputThreadId = 0; - - return 1; -} - + DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status); + + /* Remove this console input thread from this desktop */ + // DesktopConsoleThreadInfo.DesktopHandle; + DesktopConsoleThreadInfo.ThreadId = 0; + NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); + + /* Close the duplicated desktop handle */ + CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop + + /* Cleanup CSR thread */ + if (pcsrt) CsrDereferenceThread(pcsrt); + + /* Exit the thread */ + RtlExitUserThread(Status); + return 0; +} + +// FIXME: Maybe return a NTSTATUS static BOOL -GuiInit(VOID) -{ - /* Exit if we were already initialized */ - // if (ConsInitialized) return TRUE; +GuiInit(IN PCONSOLE_INIT_INFO ConsoleInitInfo, + IN PCSR_PROCESS ConsoleLeaderProcess, + IN OUT PGUI_INIT_INFO GuiInitInfo) +{ + BOOL Success = TRUE; + UNICODE_STRING DesktopPath; + DESKTOP_CONSOLE_THREAD DesktopConsoleThreadInfo; + HWINSTA hWinSta; + HDESK hDesk; + + NTSTATUS Status; + HANDLE hInputThread; + CLIENT_ID ClientId; /* * Initialize and register the console window class, if needed. @@ -294,39 +340,164 @@ } /* - * Set-up the console input thread - */ - if (hInputThread == NULL) - { - HANDLE GraphicsStartupEvent; - NTSTATUS Status; - - Status = NtCreateEvent(&GraphicsStartupEvent, EVENT_ALL_ACCESS, - NULL, SynchronizationEvent, FALSE); - if (!NT_SUCCESS(Status)) return FALSE; - - hInputThread = CreateThread(NULL, - 0, - GuiConsoleInputThread, - (PVOID)&GraphicsStartupEvent, - 0, - &dwInputThreadId); - if (hInputThread == NULL) - { - NtClose(GraphicsStartupEvent); - DPRINT1("CONSRV: Failed to create graphics console thread.\n"); - return FALSE; - } - SetThreadPriority(hInputThread, THREAD_PRIORITY_HIGHEST); - CloseHandle(hInputThread); - - WaitForSingleObject(GraphicsStartupEvent, INFINITE); - NtClose(GraphicsStartupEvent); - } - - // ConsInitialized = TRUE; - - return TRUE; + * Set-up the console input thread. We have + * one console input thread per desktop. + */ + + if (!CsrImpersonateClient(NULL)) + // return STATUS_BAD_IMPERSONATION_LEVEL; + return FALSE; + + if (ConsoleInitInfo->DesktopLength) + { + DesktopPath.MaximumLength = ConsoleInitInfo->DesktopLength; + DesktopPath.Length = DesktopPath.MaximumLength - sizeof(UNICODE_NULL); + DesktopPath.Buffer = ConsoleInitInfo->Desktop; + } + else + { + RtlInitUnicodeString(&DesktopPath, L"Default"); + } + + hDesk = NtUserResolveDesktop(ConsoleLeaderProcess->ProcessHandle, + &DesktopPath, + 0, + &hWinSta); + DPRINT("NtUserResolveDesktop(DesktopPath = '%wZ') returned hDesk = 0x%p; hWinSta = 0x%p\n", + &DesktopPath, hDesk, hWinSta); + + CsrRevertToSelf(); + + if (hDesk == NULL) return FALSE; + + /* + * We need to see whether we need to create a + * new console input thread for this desktop. + */ + DesktopConsoleThreadInfo.DesktopHandle = hDesk; + DesktopConsoleThreadInfo.ThreadId = (ULONG_PTR)INVALID_HANDLE_VALUE; // Special value to say we just want to retrieve the thread ID. + NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); + DPRINT("NtUserConsoleControl returned ThreadId = 0x%p\n", DesktopConsoleThreadInfo.ThreadId); + + /* + * Save the opened window station and desktop handles in the initialization + * structure. They will be used later on, and released, by the GUI frontend. + */ + GuiInitInfo->WinSta = hWinSta; + GuiInitInfo->Desktop = hDesk; + + /* Here GuiInitInfo contains original handles */ + + /* If we already have a console input thread on this desktop... */ + if (DesktopConsoleThreadInfo.ThreadId != 0) + { + /* ... just use it... */ + DPRINT("Using input thread InputThreadId = 0x%p\n", DesktopConsoleThreadInfo.ThreadId); + GuiInitInfo->InputThreadId = DesktopConsoleThreadInfo.ThreadId; + goto Quit; + } + + /* ... otherwise create a new one. */ + + /* Initialize a startup event for the thread to signal it */ + Status = NtCreateEvent(&GuiInitInfo->GuiThreadStartupEvent, EVENT_ALL_ACCESS, + NULL, SynchronizationEvent, FALSE); + if (!NT_SUCCESS(Status)) + { + Success = FALSE; + goto Quit; + } + + /* + * Duplicate the desktop handle for the console input thread internal needs. + * If it happens to need also a window station handle in the future, then + * it is there that you also need to duplicate the window station handle! + * + * Note also that we are going to temporarily overwrite the stored handles + * in GuiInitInfo because it happens that we use also this structure to give + * the duplicated handles to the input thread that is going to initialize. + * After the input thread finishes its initialization, we restore the handles + * in GuiInitInfo to their old values. + */ + Status = NtDuplicateObject(NtCurrentProcess(), + hDesk, + NtCurrentProcess(), + (PHANDLE)&GuiInitInfo->Desktop, + 0, 0, DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) + { + Success = FALSE; + goto Quit; + } + + /* Here GuiInitInfo contains duplicated handles */ + + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, // Start the thread in suspended state + 0, + 0, + 0, + (PVOID)GuiConsoleInputThread, + (PVOID)GuiInitInfo, + &hInputThread, + &ClientId); + if (NT_SUCCESS(Status)) + { + /* Add it as a static server thread and resume it */ + CsrAddStaticServerThread(hInputThread, &ClientId, 0); + Status = NtResumeThread(hInputThread, NULL); + } + DPRINT("Thread creation hInputThread = 0x%p, InputThreadId = 0x%p, Status = 0x%08lx\n", + hInputThread, ClientId.UniqueThread, Status); + + if (!NT_SUCCESS(Status) || hInputThread == NULL) + { + /* Close the thread's handle */ + if (hInputThread) NtClose(hInputThread); + + /* We need to close here the duplicated desktop handle */ + CloseDesktop(GuiInitInfo->Desktop); // NtUserCloseDesktop + + /* Close the startup event and bail out */ + NtClose(GuiInitInfo->GuiThreadStartupEvent); + + DPRINT1("CONSRV: Failed to create graphics console thread.\n"); + Success = FALSE; + goto Quit; + } + + /* No need to close hInputThread, this is done by CSR automatically */ + + /* Wait for the thread to finish its initialization, and close the startup event */ + NtWaitForSingleObject(GuiInitInfo->GuiThreadStartupEvent, FALSE, NULL); + NtClose(GuiInitInfo->GuiThreadStartupEvent); + + /* + * Save the input thread ID for later use, and restore the original handles. + * The copies are held by the console input thread. + */ + GuiInitInfo->InputThreadId = (ULONG_PTR)ClientId.UniqueThread; + GuiInitInfo->WinSta = hWinSta; + GuiInitInfo->Desktop = hDesk; + + /* Here GuiInitInfo contains again original handles */ + +Quit: + if (!Success) + { + /* + * Close the original handles. Do not use the copies in GuiInitInfo + * because we may have failed in the middle of the duplicate operation + * and the handles stored in GuiInitInfo may have changed. + */ + CloseDesktop(hDesk); // NtUserCloseDesktop + CloseWindowStation(hWinSta); // NtUserCloseWindowStation + } + + return Success; } @@ -362,7 +533,7 @@ ConsoleStartInfo = GuiInitInfo->ConsoleStartInfo; /* Terminal data allocation */ - GuiData = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(GUI_CONSOLE_DATA)); + GuiData = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(*GuiData)); if (!GuiData) { DPRINT1("CONSRV: Failed to create GUI_CONSOLE_DATA\n"); @@ -471,9 +642,13 @@ GuiData->LineSelection = FALSE; // Default to block selection // TODO: Retrieve the selection mode via the registry. + GuiData->InputThreadId = GuiInitInfo->InputThreadId; + GuiData->WinSta = GuiInitInfo->WinSta; + GuiData->Desktop = GuiInitInfo->Desktop; + /* Finally, finish to initialize the frontend structure */ This->Context = GuiData; - if (This->Context2) ConsoleFreeHeap(This->Context2); + ConsoleFreeHeap(This->Context2); This->Context2 = NULL; /* @@ -490,10 +665,10 @@ DPRINT("GUI - Checkpoint\n"); /* Create the terminal window */ - PostThreadMessageW(dwInputThreadId, PM_CREATE_CONSOLE, 0, (LPARAM)GuiData); + PostThreadMessageW(GuiData->InputThreadId, PM_CREATE_CONSOLE, 0, (LPARAM)GuiData); /* Wait until initialization has finished */ - WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE); + NtWaitForSingleObject(GuiData->hGuiInitEvent, FALSE, NULL); DPRINT("OK we created the console window\n"); NtClose(GuiData->hGuiInitEvent); GuiData->hGuiInitEvent = NULL; @@ -515,11 +690,14 @@ PGUI_CONSOLE_DATA GuiData = This->Context; DPRINT("Send PM_DESTROY_CONSOLE message and wait on hGuiTermEvent...\n"); - PostThreadMessageW(dwInputThreadId, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData); - WaitForSingleObject(GuiData->hGuiTermEvent, INFINITE); + PostThreadMessageW(GuiData->InputThreadId, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData); + NtWaitForSingleObject(GuiData->hGuiTermEvent, FALSE, NULL); DPRINT("hGuiTermEvent set\n"); NtClose(GuiData->hGuiTermEvent); GuiData->hGuiTermEvent = NULL; + + CloseDesktop(GuiData->Desktop); // NtUserCloseDesktop + CloseWindowStation(GuiData->WinSta); // NtUserCloseWindowStation DPRINT("Destroying icons !! - GuiData->hIcon = 0x%p ; ghDefaultIcon = 0x%p ; GuiData->hIconSm = 0x%p ; ghDefaultIconSm = 0x%p\n", GuiData->hIcon, ghDefaultIcon, GuiData->hIconSm, ghDefaultIconSm); @@ -897,9 +1075,9 @@ if (pSelectionInfo == NULL) return FALSE; - ZeroMemory(pSelectionInfo, sizeof(CONSOLE_SELECTION_INFO)); + ZeroMemory(pSelectionInfo, sizeof(*pSelectionInfo)); if (GuiData->Selection.dwFlags != CONSOLE_NO_SELECTION) - RtlCopyMemory(pSelectionInfo, &GuiData->Selection, sizeof(CONSOLE_SELECTION_INFO)); + RtlCopyMemory(pSelectionInfo, &GuiData->Selection, sizeof(*pSelectionInfo)); return TRUE; } @@ -1074,7 +1252,7 @@ GuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, IN OUT PCONSOLE_INFO ConsoleInfo, IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId) + IN PCSR_PROCESS ConsoleLeaderProcess) { PCONSOLE_INIT_INFO ConsoleInitInfo = ExtraConsoleInfo; PGUI_INIT_INFO GuiInitInfo; @@ -1082,21 +1260,25 @@ if (FrontEnd == NULL || ConsoleInfo == NULL || ConsoleInitInfo == NULL) return STATUS_INVALID_PARAMETER; - /* Initialize GUI terminal emulator common functionalities */ - if (!GuiInit()) return STATUS_UNSUCCESSFUL; - /* * Initialize a private initialization info structure for later use. * It must be freed by a call to GuiUnloadFrontEnd or GuiInitFrontEnd. */ - GuiInitInfo = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(GUI_INIT_INFO)); + GuiInitInfo = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(*GuiInitInfo)); if (GuiInitInfo == NULL) return STATUS_NO_MEMORY; + + /* Initialize GUI terminal emulator common functionalities */ + if (!GuiInit(ConsoleInitInfo, ConsoleLeaderProcess, GuiInitInfo)) + { + ConsoleFreeHeap(GuiInitInfo); + return STATUS_UNSUCCESSFUL; + } // HACK: We suppose that the pointers will be valid in GuiInitFrontEnd... // If not, then copy exactly what we need in GuiInitInfo. GuiInitInfo->ConsoleInfo = ConsoleInfo; GuiInitInfo->ConsoleStartInfo = ConsoleInitInfo->ConsoleStartInfo; - GuiInitInfo->ProcessId = ProcessId; + GuiInitInfo->ProcessId = HandleToUlong(ConsoleLeaderProcess->ClientId.UniqueProcess); GuiInitInfo->IsWindowVisible = ConsoleInitInfo->IsWindowVisible; /* Finally, initialize the frontend structure */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -96,7 +96,7 @@ TuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, IN OUT PCONSOLE_INFO ConsoleInfo, IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId); + IN PCSR_PROCESS ConsoleLeaderProcess); NTSTATUS NTAPI TuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd); #endif @@ -105,7 +105,7 @@ GuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, IN OUT PCONSOLE_INFO ConsoleInfo, IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId); + IN PCSR_PROCESS ConsoleLeaderProcess); NTSTATUS NTAPI GuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd); /***************/ @@ -114,7 +114,7 @@ NTSTATUS (NTAPI *FRONTEND_LOAD)(IN OUT PFRONTEND FrontEnd, IN OUT PCONSOLE_INFO ConsoleInfo, IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId); + IN PCSR_PROCESS ConsoleLeaderProcess); typedef NTSTATUS (NTAPI *FRONTEND_UNLOAD)(IN OUT PFRONTEND FrontEnd); @@ -156,7 +156,7 @@ ConSrvLoadFrontEnd(IN OUT PFRONTEND FrontEnd, IN OUT PCONSOLE_INFO ConsoleInfo, IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId) + IN PCSR_PROCESS ConsoleLeaderProcess) { NTSTATUS Status = STATUS_SUCCESS; ULONG i; @@ -171,7 +171,7 @@ Status = FrontEndLoadingMethods[i].FrontEndLoad(FrontEnd, ConsoleInfo, ExtraConsoleInfo, - ProcessId); + ConsoleLeaderProcess); if (NT_SUCCESS(Status)) { /* Save the unload callback */ @@ -206,7 +206,7 @@ ConSrvInitTerminal(IN OUT PTERMINAL Terminal, IN OUT PCONSOLE_INFO ConsoleInfo, IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId) + IN PCSR_PROCESS ConsoleLeaderProcess) { NTSTATUS Status; PFRONTEND FrontEnd; @@ -218,7 +218,7 @@ Status = ConSrvLoadFrontEnd(FrontEnd, ConsoleInfo, ExtraConsoleInfo, - ProcessId); + ConsoleLeaderProcess); if (!NT_SUCCESS(Status)) { DPRINT1("CONSRV: Failed to initialize a frontend, Status = 0x%08lx\n", Status); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -942,7 +942,7 @@ TuiLoadFrontEnd(IN OUT PFRONTEND FrontEnd, IN OUT PCONSOLE_INFO ConsoleInfo, IN OUT PVOID ExtraConsoleInfo, - IN ULONG ProcessId) + IN PCSR_PROCESS ConsoleLeaderProcess) { if (FrontEnd == NULL || ConsoleInfo == NULL) return STATUS_INVALID_PARAMETER; Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -494,10 +494,14 @@ ConSrvFreeHandlesTable(ProcessData); /* Initialize a new Console owned by this process */ + DPRINT("Initialization of console '%S' for process '%S' on desktop '%S'\n", + ConsoleInitInfo->ConsoleTitle ? ConsoleInitInfo->ConsoleTitle : L"n/a", + ConsoleInitInfo->AppName ? ConsoleInitInfo->AppName : L"n/a", + ConsoleInitInfo->Desktop ? ConsoleInitInfo->Desktop : L"n/a"); Status = ConSrvInitConsole(&ConsoleHandle, &Console, ConsoleInitInfo, - HandleToUlong(ProcessData->Process->ClientId.UniqueProcess)); + ProcessData->Process); if (!NT_SUCCESS(Status)) { DPRINT1("Console initialization failed\n"); Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Wed Mar 11 01:21:29 2015 @@ -414,7 +414,6 @@ NTSTATUS Status = STATUS_SUCCESS; PCONSRV_API_CONNECTINFO ConnectInfo = (PCONSRV_API_CONNECTINFO)ConnectionInfo; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); - CONSOLE_INIT_INFO ConsoleInitInfo; if ( ConnectionInfo == NULL || ConnectionInfoLength == NULL || @@ -433,22 +432,50 @@ DPRINT("ConnectInfo->IsConsoleApp = %s\n", ConnectInfo->IsConsoleApp ? "True" : "False"); if (!ConnectInfo->IsConsoleApp) return STATUS_SUCCESS; - /* Initialize the console initialization info structure */ - ConsoleInitInfo.ConsoleStartInfo = &ConnectInfo->ConsoleStartInfo; - ConsoleInitInfo.IsWindowVisible = ConnectInfo->IsWindowVisible; - ConsoleInitInfo.TitleLength = ConnectInfo->TitleLength; - ConsoleInitInfo.ConsoleTitle = ConnectInfo->ConsoleTitle; - ConsoleInitInfo.DesktopLength = ConnectInfo->DesktopLength; - ConsoleInitInfo.Desktop = ConnectInfo->Desktop; - ConsoleInitInfo.AppNameLength = ConnectInfo->AppNameLength; - ConsoleInitInfo.AppName = ConnectInfo->AppName; - ConsoleInitInfo.CurDirLength = ConnectInfo->CurDirLength; - ConsoleInitInfo.CurDir = ConnectInfo->CurDir; - /* If we don't inherit from an existing console, then create a new one... */ if (ConnectInfo->ConsoleStartInfo.ConsoleHandle == NULL) { + CONSOLE_INIT_INFO ConsoleInitInfo; + DPRINT("ConSrvConnect - Allocate a new console\n"); + + /* Initialize the console initialization info structure */ + ConsoleInitInfo.ConsoleStartInfo = &ConnectInfo->ConsoleStartInfo; + ConsoleInitInfo.IsWindowVisible = ConnectInfo->IsWindowVisible; + ConsoleInitInfo.TitleLength = ConnectInfo->TitleLength; + ConsoleInitInfo.ConsoleTitle = ConnectInfo->ConsoleTitle; + ConsoleInitInfo.DesktopLength = 0; + ConsoleInitInfo.Desktop = NULL; + ConsoleInitInfo.AppNameLength = ConnectInfo->AppNameLength; + ConsoleInitInfo.AppName = ConnectInfo->AppName; + ConsoleInitInfo.CurDirLength = ConnectInfo->CurDirLength; + ConsoleInitInfo.CurDir = ConnectInfo->CurDir; + + /* + * Contrary to the case of SrvAllocConsole, the desktop string is + * allocated in the process' heap, so we need to retrieve it by + * using NtReadVirtualMemory. + */ + if (ConnectInfo->DesktopLength) + { + ConsoleInitInfo.DesktopLength = ConnectInfo->DesktopLength; + + ConsoleInitInfo.Desktop = ConsoleAllocHeap(HEAP_ZERO_MEMORY, + ConsoleInitInfo.DesktopLength); + if (ConsoleInitInfo.Desktop == NULL) + return STATUS_NO_MEMORY; + + Status = NtReadVirtualMemory(ProcessData->Process->ProcessHandle, + ConnectInfo->Desktop, + ConsoleInitInfo.Desktop, + ConsoleInitInfo.DesktopLength, + NULL); + if (!NT_SUCCESS(Status)) + { + ConsoleFreeHeap(ConsoleInitInfo.Desktop); + return Status; + } + } /* * We are about to create a new console. However when ConSrvNewProcess @@ -467,6 +494,12 @@ &ConnectInfo->ConsoleStartInfo.OutputHandle, &ConnectInfo->ConsoleStartInfo.ErrorHandle, &ConsoleInitInfo); + + /* Free our local desktop string if any */ + if (ConsoleInitInfo.DesktopLength) + ConsoleFreeHeap(ConsoleInitInfo.Desktop); + + /* Check for success */ if (!NT_SUCCESS(Status)) { DPRINT1("Console allocation failed\n");

9 years, 9 months

[tkreuzer] 66661: [WIN32K] Don't set Message->DispatchingListEntry.Flink to NULL / compare against NULL, but use InitializeListHead and IsListEmpty. Make sure the list entry is properly initialize, ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 10 10:27:00 2015 New Revision: 66661 URL: http://svn.reactos.org/svn/reactos?rev=66661&view=rev Log: [WIN32K] Don't set Message->DispatchingListEntry.Flink to NULL / compare against NULL, but use InitializeListHead and IsListEmpty. Make sure the list entry is properly initialize, when the item is removed Fixes list corruption. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Tue Mar 10 10:27:00 2015 @@ -1698,7 +1698,8 @@ Message->ptiReceiver = ptiSendTo; Message->ptiSender = NULL; // mjmartin, you are right! This is null. Message->ptiCallBackSender = Win32Thread; - Message->DispatchingListEntry.Flink = NULL; + InitializeListHead(&Message->DispatchingListEntry); + //Message->DispatchingListEntry.Flink = NULL; Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; Message->HookMessage = MSQ_NORMAL; Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Tue Mar 10 10:27:00 2015 @@ -840,15 +840,16 @@ /* remove the message from the dispatching list if needed, so lock the sender's message queue */ if (Message->ptiSender && !(Message->ptiSender->TIF_flags & TIF_INCLEANUP)) { - if (Message->DispatchingListEntry.Flink != NULL) + if (!IsListEmpty(&Message->DispatchingListEntry)) { /* only remove it from the dispatching list if not already removed by a timeout */ RemoveEntryList(&Message->DispatchingListEntry); - } - } + InitializeListHead(&Message->DispatchingListEntry); + } + } + /* still keep the sender's message queue locked, so the sender can't exit the MsqSendMessage() function (if timed out) */ - if (Message->QS_Flags & QS_SMRESULT) { Result = Message->lResult; @@ -935,10 +936,11 @@ ClearMsgBitsMask(pti, SentMessage->QS_Flags); /* Only if the message has a sender was the queue referenced */ - if ((SentMessage->ptiSender) - && (SentMessage->DispatchingListEntry.Flink != NULL)) + if ((SentMessage->ptiSender) && + (!IsListEmpty(&SentMessage->DispatchingListEntry))) { RemoveEntryList(&SentMessage->DispatchingListEntry); + InitializeListHead(&SentMessage->DispatchingListEntry); } /* wake the sender's thread */ @@ -998,7 +1000,7 @@ Message->ptiReceiver = ptiReceiver; Message->ptiSender = NULL; Message->ptiCallBackSender = ptiSender; - Message->DispatchingListEntry.Flink = NULL; + InitializeListHead(&Message->DispatchingListEntry); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; Message->HookMessage = HookMessage; @@ -1180,7 +1182,7 @@ Message->CompletionEvent = NULL; Message->Result = NULL; RemoveEntryList(&Message->DispatchingListEntry); - Message->DispatchingListEntry.Flink = NULL; + InitializeListHead(&Message->DispatchingListEntry); break; } Entry = Entry->Flink; @@ -1221,6 +1223,7 @@ Message->Result = NULL; RemoveEntryList(&Message->ListEntry); RemoveEntryList(&Message->DispatchingListEntry); + InitializeListHead(&Message->DispatchingListEntry); ClearMsgBitsMask(ptirec, Message->QS_Flags); ExFreePoolWithTag(Message, TAG_USRMSG); break; @@ -1244,7 +1247,7 @@ Message->CompletionEvent = NULL; Message->Result = NULL; RemoveEntryList(&Message->DispatchingListEntry); - Message->DispatchingListEntry.Flink = NULL; + InitializeListHead(&Message->DispatchingListEntry); break; } Entry = Entry->Flink; @@ -2062,10 +2065,11 @@ TRACE("Notify the sender and remove a message from the queue that had not been dispatched\n"); /* Only if the message has a sender was the message in the DispatchingList */ - if ((CurrentSentMessage->ptiSender) - && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) + if ((CurrentSentMessage->ptiSender) && + (!IsListEmpty(&CurrentSentMessage->DispatchingListEntry))) { RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); + InitializeListHead(&CurrentSentMessage->DispatchingListEntry); } /* wake the sender's thread */ @@ -2092,9 +2096,10 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); /* remove the message from the dispatching list */ - if(CurrentSentMessage->DispatchingListEntry.Flink != NULL) + if (!IsListEmpty(&CurrentSentMessage->DispatchingListEntry)) { RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); + InitializeListHead(&CurrentSentMessage->DispatchingListEntry); } TRACE("Notify the sender, the thread has been terminated while dispatching a message!\n");

9 years, 9 months

[akhaldi] 66660: [ADVAPI32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 10 10:10:54 2015 New Revision: 66660 URL: http://svn.reactos.org/svn/reactos?rev=66660&view=rev Log: [ADVAPI32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/advapi32/CMakeLists.txt trunk/rostests/winetests/advapi32/registry.c trunk/rostests/winetests/advapi32/security.c trunk/rostests/winetests/advapi32/service.c Modified: trunk/rostests/winetests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] Tue Mar 10 10:10:54 2015 @@ -14,6 +14,11 @@ testlist.c) add_executable(advapi32_winetest ${SOURCE}) + +if(NOT MSVC) + add_target_compile_flags(advapi32_winetest "-Wno-format") +endif() + set_module_type(advapi32_winetest win32cui) add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32) add_cd_file(TARGET advapi32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… ============================================================================== --- trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] Tue Mar 10 10:10:54 2015 @@ -439,6 +439,21 @@ ret = RegSetValueExW(hkey_main, name2W, 0, REG_DWORD, (const BYTE *)1, 1); ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + if (pRegGetValueA) /* avoid a crash on Windows 2000 */ + { + ret = RegSetValueExW(hkey_main, NULL, 0, REG_SZ, NULL, 4); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + + ret = RegSetValueExW(hkey_main, NULL, 0, REG_SZ, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegSetValueExW(hkey_main, NULL, 0, REG_DWORD, NULL, 4); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + + ret = RegSetValueExW(hkey_main, NULL, 0, REG_DWORD, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + } + /* RegSetKeyValue */ if (!pRegSetKeyValueW) win_skip("RegSetKeyValue() is not supported.\n"); @@ -466,6 +481,12 @@ ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 0); ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 4); + ok(ret == ERROR_NOACCESS, "got %d\n", ret); + + ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_DWORD, NULL, 4); + ok(ret == ERROR_NOACCESS, "got %d\n", ret); RegCloseKey(subkey); } @@ -519,6 +540,33 @@ ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); res = RegSetValueExA( test_key, "Test", 0, REG_BINARY, NULL, 0 ); ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); + + /* test reading the value and data without setting them */ + val_count = 20; + data_count = 20; + type = 1234; + strcpy( value, "xxxxxxxxxx" ); + strcpy( data, "xxxxxxxxxx" ); + res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); + ok( data_count == 0, "data_count set to %d instead of 0\n", data_count ); + ok( type == REG_BINARY, "type %d is not REG_BINARY\n", type ); + ok( !strcmp( value, "Test" ), "value is '%s' instead of Test\n", value ); + ok( !strcmp( data, "xxxxxxxxxx" ), "data is '%s' instead of xxxxxxxxxx\n", data ); + + val_count = 20; + data_count = 20; + type = 1234; + memcpy( valueW, xxxW, sizeof(xxxW) ); + memcpy( dataW, xxxW, sizeof(xxxW) ); + res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); + ok( data_count == 0, "data_count set to %d instead of 0\n", data_count ); + ok( type == REG_BINARY, "type %d is not REG_BINARY\n", type ); + ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); + ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data is not 'xxxxxxxxxx'\n" ); res = RegSetValueExA( test_key, "Test", 0, REG_SZ, (const BYTE *)"foobar", 7 ); ok( res == 0, "RegSetValueExA failed error %d\n", res ); @@ -929,6 +977,11 @@ ok(hkResult != NULL, "hkResult != NULL\n"); RegCloseKey(hkResult); + /* trailing slashes */ + ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test\\\\", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + RegCloseKey(hkResult); + /* open nonexistent key * check that hkResult is set to NULL */ @@ -1112,7 +1165,7 @@ ok(error == ERROR_SUCCESS, "Expected RegSetKeySecurity to return success, got error %u\n", error); - bRet = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); + error = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); ok(error == ERROR_SUCCESS, "Expected RegSetKeySecurity to return success, got error %u\n", error); @@ -1190,9 +1243,15 @@ ok(ret == ERROR_BAD_PATHNAME, "expected ERROR_BAD_PATHNAME, got %d\n", ret); else { ok(!ret, "RegCreateKeyExA failed with error %d\n", ret); - RegDeleteKeyA(hkey1, NULL); + RegDeleteKeyA(hkey1, ""); RegCloseKey(hkey1); } + + /* trailing backslash characters */ + ret = RegCreateKeyExA(hkey_main, "Subkey4\\\\", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); + ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %d\n", ret); + RegDeleteKeyA(hkey1, ""); + RegCloseKey(hkey1); /* WOW64 flags - open an existing key */ hkey1 = NULL; @@ -1337,6 +1396,7 @@ static void test_reg_delete_key(void) { DWORD ret; + HKEY key; ret = RegDeleteKeyA(hkey_main, NULL); @@ -1355,6 +1415,15 @@ ret == ERROR_ACCESS_DENIED || ret == ERROR_BADKEY, /* Win95 */ "ret=%d\n", ret); + + ret = RegCreateKeyA(hkey_main, "deleteme", &key); + ok(ret == ERROR_SUCCESS, "Could not create key, got %d\n", ret); + ret = RegDeleteKeyA(key, ""); + ok(ret == ERROR_SUCCESS, "RegDeleteKeyA failed, got %d\n", ret); + RegCloseKey(key); + ret = RegOpenKeyA(hkey_main, "deleteme", &key); + ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %d\n", ret); + RegCloseKey(key); } static void test_reg_save_key(void) @@ -1522,7 +1591,7 @@ ret = RegQueryValueA(hkey_main, "subkey", val, NULL); ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlenA(val) == 0, "Expected val to be untouched, got %s\n", val); + ok(!val[0], "Expected val to be untouched, got %s\n", val); /* try a NULL value and size */ ret = RegQueryValueA(hkey_main, "subkey", NULL, NULL); @@ -1535,7 +1604,7 @@ ret = RegQueryValueA(hkey_main, "subkey", val, &size); ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlenA(val) == 0, "Expected val to be untouched, got %s\n", val); + ok(!val[0], "Expected val to be untouched, got %s\n", val); ok(size == 5, "Expected 5, got %d\n", size); /* successfully read the value using 'subkey' */ @@ -1564,7 +1633,7 @@ } ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlenW(valW) == 0, "Expected valW to be untouched\n"); + ok(!valW[0], "Expected valW to be untouched\n"); ok(size == sizeof(expected), "Got wrong size: %d\n", size); /* unicode - try size in WCHARS */ @@ -1573,7 +1642,7 @@ ret = RegQueryValueW(subkey, NULL, valW, &size); ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlenW(valW) == 0, "Expected valW to be untouched\n"); + ok(!valW[0], "Expected valW to be untouched\n"); ok(size == sizeof(expected), "Got wrong size: %d\n", size); /* unicode - successfully read the value */ @@ -1740,8 +1809,7 @@ ret = RegQueryValueA(subkey, NULL, buffer, &size); ok(ret == ERROR_SUCCESS, "Default value of subkey is not present\n"); - ok(!lstrlenA(buffer), - "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer); + ok(!buffer[0], "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer); size = MAX_PATH; ok(RegQueryValueA(subkey, "value", buffer, &size), "Value is still present\n"); @@ -2060,6 +2128,27 @@ check_key_value( key, "Wow6432Node\\Wine\\Winetest", 0, is_vista ? 32 : 0 ); check_key_value( key, "Wow6432Node\\Wine\\Winetest", KEY_WOW64_64KEY, is_vista ? 64 : 0 ); check_key_value( key, "Wow6432Node\\Wine\\Winetest", KEY_WOW64_32KEY, is_vista ? 32 : 0 ); + RegCloseKey( key ); + } + else + { + err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, + KEY_WOW64_64KEY | KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_SUCCESS, "RegCreateKeyExA failed: %u\n", err ); + check_key_value( key, "Wine\\Winetest", 0, 64 ); + check_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY, 64 ); + dw = get_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY ); + todo_wine ok( dw == 32, "wrong value %u\n", dw ); + check_key_value( key, "Wow6432Node\\Wine\\Winetest", 0, 32 ); + RegCloseKey( key ); + + err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, + KEY_WOW64_32KEY | KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_SUCCESS, "RegCreateKeyExA failed: %u\n", err ); + check_key_value( key, "Wine\\Winetest", 0, 32 ); + dw = get_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY ); + ok( dw == 32 || broken(dw == 64) /* vista */, "wrong value %u\n", dw ); + check_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY, 32 ); RegCloseKey( key ); } Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Tue Mar 10 10:10:54 2015 @@ -923,7 +923,6 @@ rc &= ~(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED|FILE_ATTRIBUTE_COMPRESSED); ok(rc == FILE_ATTRIBUTE_ARCHIVE, "expected FILE_ATTRIBUTE_ARCHIVE got %#x\n", rc); - retSize = 0xdeadbeef; rc = GetFileSecurityA(file, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, NULL, 0, &sdSize); ok(!rc, "GetFileSecurity should fail\n"); @@ -2535,12 +2534,12 @@ PTOKEN_OWNER owner; PTOKEN_PRIMARY_GROUP group; PSID AdminSid = NULL, UsersSid = NULL; - PACL Acl = NULL; - SECURITY_DESCRIPTOR *SecurityDescriptor = NULL; + PACL Acl = NULL, ThreadAcl = NULL; + SECURITY_DESCRIPTOR *SecurityDescriptor = NULL, *ThreadSecurityDescriptor = NULL; char buffer[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; - SECURITY_ATTRIBUTES psa; + SECURITY_ATTRIBUTES psa, tsa; HANDLE token, event; DWORD size; SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; @@ -2661,10 +2660,35 @@ psa.lpSecurityDescriptor = SecurityDescriptor; psa.bInheritHandle = TRUE; + ThreadSecurityDescriptor = HeapAlloc( GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH ); + res = InitializeSecurityDescriptor( ThreadSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION ); + ok(res, "InitializeSecurityDescriptor failed with error %d\n", GetLastError()); + + ThreadAcl = HeapAlloc( GetProcessHeap(), 0, 256 ); + res = InitializeAcl( ThreadAcl, 256, ACL_REVISION ); + ok(res, "InitializeAcl failed with error %d\n", GetLastError()); + res = AddAccessDeniedAce( ThreadAcl, ACL_REVISION, THREAD_SET_THREAD_TOKEN, AdminSid ); + ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError() ); + res = AddAccessAllowedAce( ThreadAcl, ACL_REVISION, THREAD_ALL_ACCESS, AdminSid ); + ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError()); + + res = SetSecurityDescriptorOwner( ThreadSecurityDescriptor, AdminSid, FALSE ); + ok(res, "SetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + res = SetSecurityDescriptorGroup( ThreadSecurityDescriptor, UsersSid, FALSE ); + ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + res = SetSecurityDescriptorDacl( ThreadSecurityDescriptor, TRUE, ThreadAcl, FALSE ); + ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + + tsa.nLength = sizeof(tsa); + tsa.lpSecurityDescriptor = ThreadSecurityDescriptor; + tsa.bInheritHandle = TRUE; + /* Doesn't matter what ACL say we should get full access for ourselves */ - res = CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + res = CreateProcessA( NULL, buffer, &psa, &tsa, FALSE, 0, NULL, NULL, &startup, &info ); ok(res, "CreateProcess with err:%d\n", GetLastError()); TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS_NT4, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); + TEST_GRANTED_ACCESS2( info.hThread, THREAD_ALL_ACCESS_NT4, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); @@ -2676,6 +2700,8 @@ HeapFree(GetProcessHeap(), 0, owner); HeapFree(GetProcessHeap(), 0, Acl); HeapFree(GetProcessHeap(), 0, SecurityDescriptor); + HeapFree(GetProcessHeap(), 0, ThreadAcl); + HeapFree(GetProcessHeap(), 0, ThreadSecurityDescriptor); } static void test_process_security_child(void) @@ -2699,7 +2725,6 @@ ret = DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle1, PROCESS_ALL_ACCESS, TRUE, 0 ); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_ACCESS_DENIED, "duplicating handle should have failed " "with STATUS_ACCESS_DENIED, instead of err:%d\n", err); @@ -2707,10 +2732,8 @@ /* These two should fail - they are denied by ACL */ handle = OpenProcess( PROCESS_VM_READ, FALSE, GetCurrentProcessId() ); - todo_wine ok(handle == NULL, "OpenProcess(PROCESS_VM_READ) should have failed\n"); handle = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); - todo_wine ok(handle == NULL, "OpenProcess(PROCESS_ALL_ACCESS) should have failed\n"); /* Documented privilege elevation */ @@ -2734,6 +2757,15 @@ TEST_GRANTED_ACCESS( handle1, PROCESS_VM_READ ); CloseHandle( handle1 ); CloseHandle( handle ); + + /* Test thread security */ + handle = OpenThread( THREAD_TERMINATE, FALSE, GetCurrentThreadId() ); + ok(handle != NULL, "OpenThread(THREAD_TERMINATE) with err:%d\n", GetLastError()); + TEST_GRANTED_ACCESS( handle, PROCESS_TERMINATE ); + CloseHandle( handle ); + + handle = OpenThread( THREAD_SET_THREAD_TOKEN, FALSE, GetCurrentThreadId() ); + ok(handle == NULL, "OpenThread(THREAD_SET_THREAD_TOKEN) should have failed\n"); } static void test_impersonation_level(void) @@ -3120,10 +3152,11 @@ ACL_SIZE_INFORMATION acl_size; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; + char tmpfile[MAX_PATH]; char tmpdir[MAX_PATH]; + HANDLE token, hTemp; struct _SID *owner; BOOL bret = TRUE; - HANDLE token; DWORD error; PACL pDacl; @@ -3195,10 +3228,10 @@ bret = pGetAce(pDacl, 0, (VOID **)&ace); ok(bret, "Failed to get Current User ACE.\n"); bret = EqualSid(&ace->SidStart, user_sid); - todo_wine ok(bret, "Current User ACE != Current User SID.\n"); - todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Current User ACE has unexpected flags (0x%x != 0x03)\n", - ((ACE_HEADER *)ace)->AceFlags); + ok(bret, "Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), + "Current User ACE has unexpected flags (0x%x != 0x03)\n", + ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } @@ -3207,14 +3240,51 @@ bret = pGetAce(pDacl, 1, (VOID **)&ace); ok(bret, "Failed to get Administators Group ACE.\n"); bret = EqualSid(&ace->SidStart, admin_sid); - todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); - todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", - ((ACE_HEADER *)ace)->AceFlags); + ok(bret, "Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), + "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", + ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } LocalFree(pSD); + + /* Test inheritance of ACLs */ + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, + FILE_FLAG_DELETE_ON_CLOSE, NULL); + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, (PSID*)&owner, + NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "Failed to get permissions on file.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", + acl_size.AceCount); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Inherited Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + ok(bret, "Inherited Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, + "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Inherited Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, + "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + CloseHandle(hTemp); done: HeapFree(GetProcessHeap(), 0, user); @@ -3387,7 +3457,7 @@ bret = pGetAce(pDacl, 0, (VOID **)&ace); ok(bret, "Failed to get Current User ACE.\n"); bret = EqualSid(&ace->SidStart, user_sid); - todo_wine ok(bret, "Current User ACE != Current User SID.\n"); + ok(bret, "Current User ACE != Current User SID.\n"); ok(((ACE_HEADER *)ace)->AceFlags == 0, "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", @@ -3398,8 +3468,75 @@ bret = pGetAce(pDacl, 1, (VOID **)&ace); ok(bret, "Failed to get Administators Group ACE.\n"); bret = EqualSid(&ace->SidStart, admin_sid); - todo_wine ok(bret || broken(!bret) /* win2k */, - "Administators Group ACE != Administators Group SID.\n"); + ok(bret || broken(!bret) /* win2k */, "Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */, + "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); + } + LocalFree(pSD); + CloseHandle(hTemp); + + /* Create security descriptor with no inheritance and test that it comes back the same */ + pSD = &sd; + pDacl = HeapAlloc(GetProcessHeap(), 0, 100); + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); + bret = InitializeAcl(pDacl, 100, ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); + ok(bret, "Failed to add Administrator Group to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + GetTempFileNameA(".", "foo", 0, tmpfile); + hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, + FILE_FLAG_DELETE_ON_CLOSE, NULL); + SetLastError(0xdeadbeef); + error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + DACL_SECURITY_INFORMATION|PROTECTED_DACL_SECURITY_INFORMATION, + NULL, NULL, pDacl, NULL); + HeapFree(GetProcessHeap(), 0, pDacl); + if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("SetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); + CloseHandle(hTemp); + return; + } + ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error); + SetLastError(0xdeadbeef); + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, &pSD); + if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("GetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); + CloseHandle(hTemp); + return; + } + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + ok(bret, "Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + ok(bret || broken(!bret) /* win2k */, "Administators Group ACE != Administators Group SID.\n"); ok(((ACE_HEADER *)ace)->AceFlags == 0, "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */, @@ -3943,11 +4080,17 @@ static void test_GetSecurityInfo(void) { + char domain_users_ptr[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; + PSID domain_users_sid = (PSID) domain_users_ptr, domain_sid; + SID_IDENTIFIER_AUTHORITY sia = { SECURITY_NT_AUTHORITY }; + int domain_users_ace_id = -1, admins_ace_id = -1, i; DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); PSID admin_sid = (PSID) admin_ptr, user_sid; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + BOOL owner_defaulted, group_defaulted; + BOOL dacl_defaulted, dacl_present; ACL_SIZE_INFORMATION acl_size; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; @@ -3955,6 +4098,7 @@ PSID owner, group; BOOL bret = TRUE; PACL pDacl; + BYTE flags; DWORD ret; if (!pGetSecurityInfo || !pSetSecurityInfo) @@ -4053,7 +4197,7 @@ bret = pGetAce(pDacl, 0, (VOID **)&ace); ok(bret, "Failed to get Current User ACE.\n"); bret = EqualSid(&ace->SidStart, user_sid); - todo_wine ok(bret, "Current User ACE != Current User SID.\n"); + ok(bret, "Current User ACE != Current User SID.\n"); ok(((ACE_HEADER *)ace)->AceFlags == 0, "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", @@ -4064,7 +4208,7 @@ bret = pGetAce(pDacl, 1, (VOID **)&ace); ok(bret, "Failed to get Administators Group ACE.\n"); bret = EqualSid(&ace->SidStart, admin_sid); - todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); + ok(bret, "Administators Group ACE != Administators Group SID.\n"); ok(((ACE_HEADER *)ace)->AceFlags == 0, "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", @@ -4072,6 +4216,84 @@ } LocalFree(pSD); CloseHandle(obj); + + /* Obtain the "domain users" SID from the user SID */ + if (!AllocateAndInitializeSid(&sia, 4, *GetSidSubAuthority(user_sid, 0), + *GetSidSubAuthority(user_sid, 1), + *GetSidSubAuthority(user_sid, 2), + *GetSidSubAuthority(user_sid, 3), 0, 0, 0, 0, &domain_sid)) + { + win_skip("Failed to get current domain SID\n"); + return; + } + sid_size = sizeof(domain_users_ptr); + pCreateWellKnownSid(WinAccountDomainUsersSid, domain_sid, domain_users_sid, &sid_size); + FreeSid(domain_sid); + + /* Test querying the ownership of a process */ + ret = pGetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, + OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!ret, "GetNamedSecurityInfo failed with error %d\n", ret); + + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); + ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + ok(owner != NULL, "owner should not be NULL\n"); + ok(EqualSid(owner, admin_sid) || EqualSid(owner, user_sid), + "Process owner SID != Administrators SID.\n"); + + bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); + ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + ok(group != NULL, "group should not be NULL\n"); + ok(EqualSid(group, domain_users_sid), "Process group SID != Domain Users SID.\n"); + LocalFree(pSD); + + /* Test querying the DACL of a process */ + ret = pGetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!ret, "GetSecurityInfo failed with error %d\n", ret); + + bret = GetSecurityDescriptorDacl(pSD, &dacl_present, &pDacl, &dacl_defaulted); + ok(bret, "GetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + ok(dacl_present, "DACL should be present\n"); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityDescriptorDacl returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + ok(acl_size.AceCount != 0, "GetAclInformation returned no ACLs\n"); + for (i=0; i<acl_size.AceCount; i++) + { + bret = pGetAce(pDacl, i, (VOID **)&ace); + ok(bret, "Failed to get ACE %d.\n", i); + bret = EqualSid(&ace->SidStart, domain_users_sid); + if (bret) domain_users_ace_id = i; + bret = EqualSid(&ace->SidStart, admin_sid); + if (bret) admins_ace_id = i; + } + ok(domain_users_ace_id != -1 || broken(domain_users_ace_id == -1) /* win2k */, + "Domain Users ACE not found.\n"); + if (domain_users_ace_id != -1) + { + bret = pGetAce(pDacl, domain_users_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Domain Users ACE.\n"); + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE), + "Domain Users ACE has unexpected flags (0x%x != 0x%x)\n", flags, + INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE); + ok(ace->Mask == GENERIC_READ, "Domain Users ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, GENERIC_READ); + } + ok(admins_ace_id != -1 || broken(admins_ace_id == -1) /* xp */, + "Builtin Admins ACE not found.\n"); + if (admins_ace_id != -1) + { + bret = pGetAce(pDacl, admins_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Builtin Admins ACE.\n"); + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == 0x0, "Builtin Admins ACE has unexpected flags (0x%x != 0x0)\n", flags); + ok(ace->Mask == PROCESS_ALL_ACCESS || broken(ace->Mask == 0x1f0fff) /* win2k */, + "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, PROCESS_ALL_ACCESS); + } + LocalFree(pSD); } static void test_GetSidSubAuthority(void) Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Tue Mar 10 10:10:54 2015 @@ -1401,8 +1401,8 @@ SERVICE_STATUS status = services[i].ServiceStatus; /* lpServiceName and lpDisplayName should always be filled */ - ok(lstrlenA(services[i].lpServiceName) > 0, "Expected a service name\n"); - ok(lstrlenA(services[i].lpDisplayName) > 0, "Expected a display name\n"); + ok(services[i].lpServiceName[0], "Expected a service name\n"); + ok(services[i].lpDisplayName[0], "Expected a display name\n"); /* Decrement the counters to see if the functions calls return the same * numbers as the contents of these structures. @@ -1704,8 +1704,8 @@ SERVICE_STATUS_PROCESS status = exservices[i].ServiceStatusProcess; /* lpServiceName and lpDisplayName should always be filled */ - ok(lstrlenA(exservices[i].lpServiceName) > 0, "Expected a service name\n"); - ok(lstrlenA(exservices[i].lpDisplayName) > 0, "Expected a display name\n"); + ok(exservices[i].lpServiceName[0], "Expected a service name\n"); + ok(exservices[i].lpDisplayName[0], "Expected a display name\n"); /* Decrement the counters to see if the functions calls return the * same numbers as the contents of these structures.

9 years, 9 months

[akhaldi] 66659: [MSVCRT_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 10 10:10:35 2015 New Revision: 66659 URL: http://svn.reactos.org/svn/reactos?rev=66659&view=rev Log: [MSVCRT_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/msvcrt/file.c trunk/rostests/winetests/msvcrt/headers.c trunk/rostests/winetests/msvcrt/printf.c trunk/rostests/winetests/msvcrt/string.c Modified: trunk/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/file.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/file.c [iso-8859-1] Tue Mar 10 10:10:35 2015 @@ -2244,6 +2244,7 @@ char *inbuffer; char *outbuffer; int size, fd; + fpos_t pos, pos2; fd = fileno(file); inbuffer = calloc(bufsize + 1, 1); @@ -2275,6 +2276,19 @@ fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); ok(memcmp(outbuffer, inbuffer, bufsize) != 0, "unexpected flush by %d/2 byte double write\n", bufsize); + + ok(!fseek(file, -1, SEEK_END), "fseek failed\n"); + ok(!fgetpos(file, &pos), "fgetpos failed\n"); + ok(fread(inbuffer, 1, 1, file) == 1, "fread failed\n"); + ok(file->_flag & _IOREAD, "file->_flag = %x\n", file->_flag); + ok(!file->_cnt, "file->_cnt = %d\n", file->_cnt); + ok(file->_ptr != file->_base, "file->_ptr == file->_base\n"); + ok(fwrite(outbuffer, 1, bufsize, file), "fwrite failed\n"); + ok(file->_flag & _IOREAD, "file->_flag = %x\n", file->_flag); + ok(!file->_cnt, "file->_cnt = %d\n", file->_cnt); + ok(file->_ptr == file->_base, "file->_ptr == file->_base\n"); + ok(!fgetpos(file, &pos2), "fgetpos failed\n"); + ok(pos+bufsize+1 == pos2, "pos = %d (%d)\n", (int)pos, (int)pos2); free(inbuffer); free(outbuffer); } Modified: trunk/rostests/winetests/msvcrt/headers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/headers.… ============================================================================== --- trunk/rostests/winetests/msvcrt/headers.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/headers.c [iso-8859-1] Tue Mar 10 10:10:35 2015 @@ -66,11 +66,10 @@ #define TYPEOF(type) int #endif #define MSVCRT(x) MSVCRT_##x -#define OFFSET(T,F) ((unsigned int)((char *)&((struct T *)0L)->F - (char *)0L)) #define CHECK_SIZE(e) ok(sizeof(e) == sizeof(MSVCRT(e)), "Element has different sizes\n") #define CHECK_TYPE(t) { TYPEOF(t) a = 0; TYPEOF(MSVCRT(t)) b = a; a = b; CHECK_SIZE(t); } #define CHECK_STRUCT(s) ok(sizeof(struct s) == sizeof(struct MSVCRT(s)), "Struct has different sizes\n") -#define CHECK_FIELD(s,e) ok(OFFSET(s,e) == OFFSET(MSVCRT(s),e), "Bad offset\n") +#define CHECK_FIELD(s,e) ok(offsetof(struct s,e) == offsetof(struct MSVCRT(s),e), "Bad offset\n") #define CHECK_DEF(d) ok(d == MSVCRT_##d, "Defines (MSVCRT_)" #d " are different: %d vs. %d\n", d, MSVCRT_##d) /************* Checking types ***************/ Modified: trunk/rostests/winetests/msvcrt/printf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/printf.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/printf.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/printf.c [iso-8859-1] Tue Mar 10 10:10:35 2015 @@ -1127,6 +1127,12 @@ ok( ret == 11, "got %d expected 11\n", ret ); WideCharToMultiByte( CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL ); ok( !strcmp(buf, "onetwothree"), "got %s expected 'onetwothree'\n", buf ); + + ret = _vsnwprintf_wrapper( str, 0, format, one, two, three ); + ok( ret == -1, "got %d, expected -1\n", ret ); + + ret = _vsnwprintf_wrapper( NULL, 0, format, one, two, three ); + ok( ret == 11 || broken(ret == -1 /* Win2k */), "got %d, expected 11\n", ret ); } static int __cdecl vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...) Modified: trunk/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/string.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/string.c [iso-8859-1] Tue Mar 10 10:10:35 2015 @@ -89,7 +89,10 @@ static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); +static double (__cdecl *p__atof_l)(const char*,_locale_t); +static double (__cdecl *p__strtod_l)(const char *,char**,_locale_t); static int (__cdecl *p__strnset_s)(char*,size_t,int,size_t); +static int (__cdecl *p__wcsset_s)(wchar_t*,size_t,wchar_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -1579,6 +1582,28 @@ ok(almost_equal(d, 0), "d = %lf\n", d); ok(end == white_chars, "incorrect end (%d)\n", (int)(end-white_chars)); + if (!p__strtod_l) + win_skip("_strtod_l not found\n"); + else + { + errno = EBADF; + d = strtod(NULL, NULL); + ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(errno == EINVAL, "errno = %x\n", errno); + + errno = EBADF; + end = (char *)0xdeadbeef; + d = strtod(NULL, &end); + ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(errno == EINVAL, "errno = %x\n", errno); + ok(!end, "incorrect end ptr %p\n", end); + + errno = EBADF; + d = p__strtod_l(NULL, NULL, NULL); + ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(errno == EINVAL, "errno = %x\n", errno); + } + /* Set locale with non '.' decimal point (',') */ if(!setlocale(LC_ALL, "Polish")) { win_skip("system with limited locales\n"); @@ -2622,6 +2647,36 @@ ok(r == 0, "atoi(4294967296) = %d\n", r); } +static void test_atof(void) +{ + double d; + + d = atof("0.0"); + ok(almost_equal(d, 0.0), "d = %lf\n", d); + + d = atof("1.0"); + ok(almost_equal(d, 1.0), "d = %lf\n", d); + + d = atof("-1.0"); + ok(almost_equal(d, -1.0), "d = %lf\n", d); + + if (!p__atof_l) + { + win_skip("_atof_l not found\n"); + return; + } + + errno = EBADF; + d = atof(NULL); + ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(errno == EINVAL, "errno = %x\n", errno); + + errno = EBADF; + d = p__atof_l(NULL, NULL); + ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(errno == EINVAL, "errno = %x\n", errno); +} + static void test_strncpy(void) { #define TEST_STRNCPY_LEN 10 @@ -2747,6 +2802,40 @@ r = p__strnset_s(buf, sizeof(buf)-1, 'c', 2); ok(r == EINVAL, "r = %d\n", r); ok(!buf[0] && buf[1]=='c' && buf[2]=='b', "buf = %s\n", buf); +} + +static void test__wcsset_s(void) +{ + wchar_t str[10]; + int r; + + if(!p__wcsset_s) { + win_skip("_wcsset_s not available\n"); + return; + } + + r = p__wcsset_s(NULL, 0, 'a'); + ok(r == EINVAL, "r = %d\n", r); + + str[0] = 'a'; + r = p__wcsset_s(str, 0, 'a'); + ok(r == EINVAL, "r = %d\n", r); + ok(str[0] == 'a', "str[0] = %d\n", str[0]); + + str[0] = 'a'; + str[1] = 'b'; + r = p__wcsset_s(str, 2, 'c'); + ok(r == EINVAL, "r = %d\n", r); + ok(!str[0], "str[0] = %d\n", str[0]); + ok(str[1] == 'b', "str[1] = %d\n", str[1]); + + str[0] = 'a'; + str[1] = 0; + str[2] = 'b'; + r = p__wcsset_s(str, 3, 'c'); + ok(str[0] == 'c', "str[0] = %d\n", str[0]); + ok(str[1] == 0, "str[1] = %d\n", str[1]); + ok(str[2] == 'b', "str[2] = %d\n", str[2]); } START_TEST(string) @@ -2796,7 +2885,10 @@ p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); p__atodbl_l = (void*)GetProcAddress(hMsvcrt, "_atodbl_l"); + p__atof_l = (void*)GetProcAddress(hMsvcrt, "_atof_l"); + p__strtod_l = (void*)GetProcAddress(hMsvcrt, "_strtod_l"); p__strnset_s = (void*)GetProcAddress(hMsvcrt, "_strnset_s"); + p__wcsset_s = (void*)GetProcAddress(hMsvcrt, "_wcsset_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -2848,7 +2940,9 @@ test__stricmp(); test__wcstoi64(); test_atoi(); + test_atof(); test_strncpy(); test_strxfrm(); test__strnset_s(); -} + test__wcsset_s(); +}

9 years, 9 months

[akhaldi] 66658: [NTDLL_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 10 10:10:04 2015 New Revision: 66658 URL: http://svn.reactos.org/svn/reactos?rev=66658&view=rev Log: [NTDLL_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/ntdll/directory.c trunk/rostests/winetests/ntdll/exception.c trunk/rostests/winetests/ntdll/file.c trunk/rostests/winetests/ntdll/info.c trunk/rostests/winetests/ntdll/om.c trunk/rostests/winetests/ntdll/reg.c trunk/rostests/winetests/ntdll/rtl.c trunk/rostests/winetests/ntdll/string.c Modified: trunk/rostests/winetests/ntdll/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/directory… ============================================================================== --- trunk/rostests/winetests/ntdll/directory.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/directory.c [iso-8859-1] Tue Mar 10 10:10:04 2015 @@ -51,7 +51,6 @@ /* The attribute sets to test */ static struct testfile_s { - BOOL todo; /* set if it doesn't work on wine yet */ BOOL attr_done; /* set if attributes were tested for this file already */ const DWORD attr; /* desired attribute */ const char *name; /* filename to use */ @@ -60,13 +59,13 @@ int nfound; /* How many were found (expect 1) */ WCHAR nameW[20]; /* unicode version of name (filled in later) */ } testfiles[] = { - { 0, 0, FILE_ATTRIBUTE_NORMAL, "n.tmp", NULL, "normal" }, - { 1, 0, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, - { 1, 0, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, - { 0, 0, FILE_ATTRIBUTE_DIRECTORY, "d.tmp", NULL, "directory" }, - { 0, 0, FILE_ATTRIBUTE_DIRECTORY, ".", NULL, ". directory" }, - { 0, 0, FILE_ATTRIBUTE_DIRECTORY, "..", NULL, ".. directory" }, - { 0, 0, 0, NULL } + { 0, FILE_ATTRIBUTE_NORMAL, "n.tmp", NULL, "normal" }, + { 0, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, + { 0, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, + { 0, FILE_ATTRIBUTE_DIRECTORY, "d.tmp", NULL, "directory" }, + { 0, FILE_ATTRIBUTE_DIRECTORY, ".", NULL, ". directory" }, + { 0, FILE_ATTRIBUTE_DIRECTORY, "..", NULL, ".. directory" }, + { 0, 0, NULL } }; static const int max_test_dir_size = 20; /* size of above plus some for .. etc */ @@ -147,12 +146,7 @@ if (namelen != len || memcmp(nameW, testfiles[i].nameW, len*sizeof(WCHAR))) continue; if (!testfiles[i].attr_done) { - if (testfiles[i].todo) { - todo_wine - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); - } else { - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); - } + ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); testfiles[i].attr_done = TRUE; } testfiles[i].nfound++; Modified: trunk/rostests/winetests/ntdll/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception… ============================================================================== --- trunk/rostests/winetests/ntdll/exception.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/exception.c [iso-8859-1] Tue Mar 10 10:10:04 2015 @@ -46,11 +46,14 @@ static PVOID (WINAPI *pRtlUnwind)(PVOID, PVOID, PEXCEPTION_RECORD, PVOID); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG first, PVECTORED_EXCEPTION_HANDLER func); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID handler); +static PVOID (WINAPI *pRtlAddVectoredContinueHandler)(ULONG first, PVECTORED_EXCEPTION_HANDLER func); +static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static NTSTATUS (WINAPI *pNtClose)(HANDLE); #if defined(__x86_64__) static BOOLEAN (CDECL *pRtlAddFunctionTable)(RUNTIME_FUNCTION*, DWORD, DWORD64); @@ -936,6 +939,16 @@ /* here we handle exception */ } } + else if (stage == 7 || stage == 8) + { + ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, + "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode, + EXCEPTION_INVALID_HANDLE); + ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, + "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); + + if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -1695,6 +1708,7 @@ #endif /* __x86_64__ */ +#if defined(__i386__) || defined(__x86_64__) static DWORD outputdebugstring_exceptions; static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -1713,7 +1727,7 @@ return EXCEPTION_CONTINUE_SEARCH; } -static void test_outputdebugstring(DWORD numexc, BOOL todo) +static void test_outputdebugstring(DWORD numexc) { PVOID vectored_handler; @@ -1728,13 +1742,8 @@ outputdebugstring_exceptions = 0; OutputDebugStringA("Hello World"); - if (todo) - todo_wine - ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", - outputdebugstring_exceptions, numexc); - else - ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", - outputdebugstring_exceptions, numexc); + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + outputdebugstring_exceptions, numexc); pRtlRemoveVectoredExceptionHandler(vectored_handler); } @@ -1788,6 +1797,91 @@ pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD invalid_handle_exceptions; + +static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == EXCEPTION_INVALID_HANDLE, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, EXCEPTION_INVALID_HANDLE); + ok(rec->NumberParameters == 0, "ExceptionParameters is %d instead of 0\n", rec->NumberParameters); + + invalid_handle_exceptions++; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +static void test_closehandle(DWORD numexc) +{ + PVOID vectored_handler; + NTSTATUS status; + DWORD res; + + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler || !pRtlRaiseException) + { + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler or RtlRaiseException not found\n"); + return; + } + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &invalid_handle_vectored_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + invalid_handle_exceptions = 0; + res = CloseHandle((HANDLE)0xdeadbeef); + ok(!res, "CloseHandle(0xdeadbeef) unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error code %d instead of %d", + GetLastError(), ERROR_INVALID_HANDLE); + ok(invalid_handle_exceptions == numexc, "CloseHandle generated %d exceptions, expected %d\n", + invalid_handle_exceptions, numexc); + + invalid_handle_exceptions = 0; + status = pNtClose((HANDLE)0xdeadbeef); + ok(status == STATUS_INVALID_HANDLE, "NtClose(0xdeadbeef) returned status %08x\n", status); + ok(invalid_handle_exceptions == numexc, "NtClose generated %d exceptions, expected %d\n", + invalid_handle_exceptions, numexc); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + +static void test_vectored_continue_handler(void) +{ + PVOID handler1, handler2; + ULONG ret; + + if (!pRtlAddVectoredContinueHandler || !pRtlRemoveVectoredContinueHandler) + { + skip("RtlAddVectoredContinueHandler or RtlRemoveVectoredContinueHandler not found\n"); + return; + } + + handler1 = pRtlAddVectoredContinueHandler(TRUE, (void *)0xdeadbeef); + ok(handler1 != 0, "RtlAddVectoredContinueHandler failed\n"); + + handler2 = pRtlAddVectoredContinueHandler(TRUE, (void *)0xdeadbeef); + ok(handler2 != 0, "RtlAddVectoredContinueHandler failed\n"); + ok(handler1 != handler2, "RtlAddVectoredContinueHandler returned same handler\n"); + + if (pRtlRemoveVectoredExceptionHandler) + { + ret = pRtlRemoveVectoredExceptionHandler(handler1); + ok(!ret, "RtlRemoveVectoredExceptionHandler succeeded\n"); + } + + ret = pRtlRemoveVectoredContinueHandler(handler1); + ok(ret, "RtlRemoveVectoredContinueHandler failed\n"); + + ret = pRtlRemoveVectoredContinueHandler(handler2); + ok(ret, "RtlRemoveVectoredContinueHandler failed\n"); + + ret = pRtlRemoveVectoredContinueHandler(handler1); + ok(!ret, "RtlRemoveVectoredContinueHandler succeeded\n"); + + ret = pRtlRemoveVectoredContinueHandler((void *)0x11223344); + ok(!ret, "RtlRemoveVectoredContinueHandler succeeded\n"); +} +#endif /* defined(__i386__) || defined(__x86_64__) */ + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -1802,6 +1896,7 @@ pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); + pNtClose = (void *)GetProcAddress( hntdll, "NtClose" ); pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" ); @@ -1809,6 +1904,10 @@ "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); + pRtlAddVectoredContinueHandler = (void *)GetProcAddress( hntdll, + "RtlAddVectoredContinueHandler" ); + pRtlRemoveVectoredContinueHandler = (void *)GetProcAddress( hntdll, + "RtlRemoveVectoredContinueHandler" ); pNtQueryInformationProcess = (void*)GetProcAddress( hntdll, "NtQueryInformationProcess" ); pNtSetInformationProcess = (void*)GetProcAddress( hntdll, @@ -1858,13 +1957,17 @@ run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); test_stage = 3; - test_outputdebugstring(0, FALSE); + test_outputdebugstring(0); test_stage = 4; - test_outputdebugstring(2, TRUE); /* is this a Windows bug? */ + test_outputdebugstring(2); test_stage = 5; test_ripevent(0); test_stage = 6; test_ripevent(1); + test_stage = 7; + test_closehandle(0); + test_stage = 8; + test_closehandle(1); } else skip( "RtlRaiseException not found\n" ); @@ -1876,8 +1979,10 @@ test_unwind(); test_exceptions(); test_rtlraiseexception(); - test_outputdebugstring(1, FALSE); + test_outputdebugstring(1); test_ripevent(1); + test_closehandle(0); + test_vectored_continue_handler(); test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); @@ -1894,8 +1999,10 @@ pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, "RtlLookupFunctionEntry" ); - test_outputdebugstring(1, FALSE); + test_outputdebugstring(1); test_ripevent(1); + test_closehandle(0); + test_vectored_continue_handler(); test_virtual_unwind(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/file.c [iso-8859-1] Tue Mar 10 10:10:04 2015 @@ -37,6 +37,33 @@ #include "winternl.h" #include "winuser.h" #include "wine/winioctl.h" + +/* FIXME */ +typedef struct _REPARSE_DATA_BUFFER { + ULONG ReparseTag; + USHORT ReparseDataLength; + USHORT Reserved; + _ANONYMOUS_UNION union { + struct { + USHORT SubstituteNameOffset; + USHORT SubstituteNameLength; + USHORT PrintNameOffset; + USHORT PrintNameLength; + ULONG Flags; + WCHAR PathBuffer[1]; + } SymbolicLinkReparseBuffer; + struct { + USHORT SubstituteNameOffset; + USHORT SubstituteNameLength; + USHORT PrintNameOffset; + USHORT PrintNameLength; + WCHAR PathBuffer[1]; + } MountPointReparseBuffer; + struct { + UCHAR DataBuffer[1]; + } GenericReparseBuffer; + } DUMMYUNIONNAME; +} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; #ifndef IO_COMPLETION_ALL_ACCESS #define IO_COMPLETION_ALL_ACCESS 0x001F0003 @@ -1234,7 +1261,7 @@ memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM\n", fbi.FileAttributes ); + ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM (ok in old linux without xattr)\n", fbi.FileAttributes ); /* Then HIDDEN */ memset(&fbi, 0, sizeof(fbi)); @@ -1247,7 +1274,7 @@ memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN\n", fbi.FileAttributes ); + ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN (ok in old linux without xattr)\n", fbi.FileAttributes ); /* Check NORMAL last of all (to make sure we can clear attributes) */ memset(&fbi, 0, sizeof(fbi)); @@ -1304,7 +1331,7 @@ memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); - todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM\n", fai_buf.fai.BasicInformation.FileAttributes ); + ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM (ok in old linux without xattr)\n", fai_buf.fai.BasicInformation.FileAttributes ); /* Then HIDDEN */ memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); @@ -1317,7 +1344,7 @@ memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN\n", fai_buf.fai.BasicInformation.FileAttributes ); + ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN (ok in old linux without xattr)\n", fai_buf.fai.BasicInformation.FileAttributes ); /* Check NORMAL last of all (to make sure we can clear attributes) */ memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); @@ -1371,7 +1398,6 @@ ok( res == STATUS_INVALID_INFO_CLASS || res == STATUS_NOT_IMPLEMENTED, "Unexpected NtQueryInformationFile result (expected STATUS_INVALID_INFO_CLASS, got %x)\n", res ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_ACCESS_DENIED, "unexpected FileDispositionInformation result (expected STATUS_ACCESS_DENIED, got %x)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1384,12 +1410,24 @@ ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - todo_wine ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* cannot set disposition on readonly file */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + DeleteFileA( buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); DeleteFileA( buffer ); /* cannot set disposition on readonly file */ @@ -1402,6 +1440,21 @@ ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); + DeleteFileA( buffer ); + + /* cannot set disposition on readonly file */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + DeleteFileA( buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); DeleteFileA( buffer ); @@ -1412,11 +1465,9 @@ ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1429,7 +1480,6 @@ ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1444,7 +1494,6 @@ CloseHandle( handle ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); CloseHandle( handle2 ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1459,11 +1508,9 @@ ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - todo_wine ok( fileDeleted, "Directory should have been deleted\n" ); RemoveDirectoryA( buffer ); @@ -1476,7 +1523,6 @@ RemoveDirectoryA( buffer ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - todo_wine ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1501,6 +1547,7 @@ buffer[dirpos] = '\0'; CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); RemoveDirectoryA( buffer ); } @@ -2683,6 +2730,178 @@ CloseHandle(hfile); } +static INT build_reparse_buffer(WCHAR *filename, REPARSE_DATA_BUFFER **pbuffer) +{ + REPARSE_DATA_BUFFER *buffer; + INT buffer_len, string_len; + WCHAR *dest; + + string_len = (lstrlenW(filename)+1)*sizeof(WCHAR); + buffer_len = FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer.PathBuffer[1]) + string_len; + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffer_len); + buffer->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; + buffer->ReparseDataLength = sizeof(buffer->MountPointReparseBuffer) + string_len; + buffer->MountPointReparseBuffer.SubstituteNameLength = string_len - sizeof(WCHAR); + buffer->MountPointReparseBuffer.PrintNameOffset = string_len; + dest = &buffer->MountPointReparseBuffer.PathBuffer[0]; + memcpy(dest, filename, string_len); + *pbuffer = buffer; + return buffer_len; +} + +static void test_junction_points(void) +{ + static const WCHAR junctionW[] = {'\\','j','u','n','c','t','i','o','n',0}; + WCHAR path[MAX_PATH], junction_path[MAX_PATH], target_path[MAX_PATH]; + static const WCHAR targetW[] = {'\\','t','a','r','g','e','t',0}; + FILE_BASIC_INFORMATION old_attrib, new_attrib; + static const WCHAR fooW[] = {'f','o','o',0}; + static WCHAR volW[] = {'c',':','\\',0}; + REPARSE_GUID_DATA_BUFFER guid_buffer; + static const WCHAR dotW[] = {'.',0}; + REPARSE_DATA_BUFFER *buffer = NULL; + DWORD dwret, dwLen, dwFlags, err; + INT buffer_len, string_len; + IO_STATUS_BLOCK iosb; + UNICODE_STRING nameW; + HANDLE hJunction; + WCHAR *dest; + BOOL bret; + + /* Create a temporary folder for the junction point tests */ + GetTempFileNameW(dotW, fooW, 0, path); + DeleteFileW(path); + if (!CreateDirectoryW(path, NULL)) + { + win_skip("Unable to create a temporary junction point directory.\n"); + return; + } + + /* Check that the volume this folder is located on supports junction points */ + pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL); + volW[0] = nameW.Buffer[4]; + pRtlFreeUnicodeString( &nameW ); + GetVolumeInformationW(volW, 0, 0, 0, &dwLen, &dwFlags, 0, 0); + if (!(dwFlags & FILE_SUPPORTS_REPARSE_POINTS)) + { + skip("File system does not support junction points.\n"); + RemoveDirectoryW(path); + return; + } + + /* Create the folder to be replaced by a junction point */ + lstrcpyW(junction_path, path); + lstrcatW(junction_path, junctionW); + bret = CreateDirectoryW(junction_path, NULL); + ok(bret, "Failed to create junction point directory.\n"); + + /* Create a destination folder for the junction point to target */ + lstrcpyW(target_path, path); + lstrcatW(target_path, targetW); + bret = CreateDirectoryW(target_path, NULL); + ok(bret, "Failed to create junction point target directory.\n"); + pRtlDosPathNameToNtPathName_U(target_path, &nameW, NULL, NULL); + + /* Create the junction point */ + hJunction = CreateFileW(junction_path, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, 0); + if (hJunction == INVALID_HANDLE_VALUE) + { + win_skip("Failed to open junction point directory handle (0x%x).\n", GetLastError()); + goto cleanup; + } + dwret = NtQueryInformationFile(hJunction, &iosb, &old_attrib, sizeof(old_attrib), FileBasicInformation); + ok(dwret == STATUS_SUCCESS, "Failed to get junction point folder's attributes (0x%x).\n", dwret); + buffer_len = build_reparse_buffer(nameW.Buffer, &buffer); + bret = DeviceIoControl(hJunction, FSCTL_SET_REPARSE_POINT, (LPVOID)buffer, buffer_len, NULL, 0, &dwret, 0); + ok(bret, "Failed to create junction point! (0x%x)\n", GetLastError()); + + /* Check the file attributes of the junction point */ + dwret = GetFileAttributesW(junction_path); + ok(dwret != (DWORD)~0, "Junction point doesn't exist (attributes: 0x%x)!\n", dwret); + ok(dwret & FILE_ATTRIBUTE_REPARSE_POINT, "File is not a junction point! (attributes: %d)\n", dwret); + + /* Read back the junction point */ + HeapFree(GetProcessHeap(), 0, buffer); + buffer_len = sizeof(*buffer) + MAX_PATH*sizeof(WCHAR); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffer_len); + bret = DeviceIoControl(hJunction, FSCTL_GET_REPARSE_POINT, NULL, 0, (LPVOID)buffer, buffer_len, &dwret, 0); + string_len = buffer->MountPointReparseBuffer.SubstituteNameLength; + dest = &buffer->MountPointReparseBuffer.PathBuffer[buffer->MountPointReparseBuffer.SubstituteNameOffset/sizeof(WCHAR)]; + ok(bret, "Failed to read junction point!\n"); + ok((memcmp(dest, nameW.Buffer, string_len) == 0), "Junction point destination does not match ('%s' != '%s')!\n", + wine_dbgstr_w(dest), wine_dbgstr_w(nameW.Buffer)); + + /* Delete the junction point */ + memset(&old_attrib, 0x00, sizeof(old_attrib)); + old_attrib.LastAccessTime.QuadPart = 0x200deadcafebeef; + dwret = NtSetInformationFile(hJunction, &iosb, &old_attrib, sizeof(old_attrib), FileBasicInformation); + ok(dwret == STATUS_SUCCESS, "Failed to set junction point folder's attributes (0x%x).\n", dwret); + memset(&guid_buffer, 0x00, sizeof(guid_buffer)); + guid_buffer.ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; + bret = DeviceIoControl(hJunction, FSCTL_DELETE_REPARSE_POINT, (LPVOID)&guid_buffer, + REPARSE_GUID_DATA_BUFFER_HEADER_SIZE, NULL, 0, &dwret, 0); + ok(bret, "Failed to delete junction point! (0x%x)\n", GetLastError()); + memset(&new_attrib, 0x00, sizeof(new_attrib)); + dwret = NtQueryInformationFile(hJunction, &iosb, &new_attrib, sizeof(new_attrib), FileBasicInformation); + ok(dwret == STATUS_SUCCESS, "Failed to get junction point folder's attributes (0x%x).\n", dwret); + ok(old_attrib.LastAccessTime.QuadPart == new_attrib.LastAccessTime.QuadPart, + "Junction point folder's access time does not match (0x%llx != 0x%llx).\n", + new_attrib.LastAccessTime.QuadPart, old_attrib.LastAccessTime.QuadPart); + CloseHandle(hJunction); + + /* Check deleting a junction point as if it were a directory */ + HeapFree(GetProcessHeap(), 0, buffer); + hJunction = CreateFileW(junction_path, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, 0); + buffer_len = build_reparse_buffer(nameW.Buffer, &buffer); + bret = DeviceIoControl(hJunction, FSCTL_SET_REPARSE_POINT, (LPVOID)buffer, buffer_len, NULL, 0, &dwret, 0); + ok(bret, "Failed to create junction point! (0x%x)\n", GetLastError()); + CloseHandle(hJunction); + bret = RemoveDirectoryW(junction_path); + ok(bret, "Failed to delete junction point as directory!\n"); + dwret = GetFileAttributesW(junction_path); + ok(dwret == (DWORD)~0, "Junction point still exists (attributes: 0x%x)!\n", dwret); + + /* Check deleting a junction point as if it were a file */ + HeapFree(GetProcessHeap(), 0, buffer); + bret = CreateDirectoryW(junction_path, NULL); + ok(bret, "Failed to create junction point target directory.\n"); + hJunction = CreateFileW(junction_path, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, 0); + buffer_len = build_reparse_buffer(nameW.Buffer, &buffer); + bret = DeviceIoControl(hJunction, FSCTL_SET_REPARSE_POINT, (LPVOID)buffer, buffer_len, NULL, 0, &dwret, 0); + ok(bret, "Failed to create junction point! (0x%x)\n", GetLastError()); + CloseHandle(hJunction); + bret = DeleteFileW(junction_path); + ok(!bret, "Succeeded in deleting junction point as file!\n"); + err = GetLastError(); + ok(err == ERROR_ACCESS_DENIED, "Expected last error 0x%x for DeleteFile on junction point (actually 0x%x)!\n", + ERROR_ACCESS_DENIED, err); + dwret = GetFileAttributesW(junction_path); + ok(dwret != (DWORD)~0, "Junction point doesn't exist (attributes: 0x%x)!\n", dwret); + ok(dwret & FILE_ATTRIBUTE_REPARSE_POINT, "File is not a junction point! (attributes: 0x%x)\n", dwret); + + /* Test deleting a junction point's target */ + dwret = GetFileAttributesW(junction_path); + ok(dwret == 0x410 || broken(dwret == 0x430) /* win2k */, + "Unexpected junction point attributes (0x%x != 0x410)!\n", dwret); + bret = RemoveDirectoryW(target_path); + ok(bret, "Failed to delete junction point target!\n"); + bret = CreateDirectoryW(target_path, NULL); + ok(bret, "Failed to create junction point target directory.\n"); + +cleanup: + /* Cleanup */ + pRtlFreeUnicodeString( &nameW ); + HeapFree(GetProcessHeap(), 0, buffer); + bret = RemoveDirectoryW(junction_path); + ok(bret, "Failed to remove temporary junction point directory!\n"); + bret = RemoveDirectoryW(target_path); + ok(bret, "Failed to remove temporary target directory!\n"); + RemoveDirectoryW(path); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -2736,4 +2955,5 @@ test_file_disposition_information(); test_query_volume_information_file(); test_query_attribute_information_file(); + test_junction_points(); } Modified: trunk/rostests/winetests/ntdll/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/info.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/info.c [iso-8859-1] Tue Mar 10 10:10:04 2015 @@ -737,6 +737,84 @@ HeapFree(GetProcessHeap(), 0, ppi); } +static void test_query_process_wow64(void) +{ + NTSTATUS status; + ULONG ReturnLength; + ULONG_PTR pbi[2], dummy; + + memset(&dummy, 0xcc, sizeof(dummy)); + + /* Do not give a handle and buffer */ + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, 0, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + /* Use a correct info class and buffer size, but still no handle and buffer */ + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE, got %08x\n", status); + + /* Use a correct info class, buffer size and handle, but no buffer */ + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_ACCESS_VIOLATION , "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + + /* Use a correct info class, buffer and buffer size, but no handle */ + pbi[0] = pbi[1] = dummy; + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + + /* Use a greater buffer size */ + pbi[0] = pbi[1] = dummy; + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + + /* Use no ReturnLength */ + pbi[0] = pbi[1] = dummy; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + trace( "Platform is_wow64 %d, ProcessInformation of ProcessWow64Information %lx\n", is_wow64, pbi[0]); + ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); + ok( pbi[0] != dummy, "pbi[0] %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + /* Test written size on 64 bit by checking high 32 bit buffer */ + if (sizeof(ULONG_PTR) > sizeof(DWORD)) + { + DWORD *ptr = (DWORD *)pbi; + ok( ptr[1] != (DWORD)dummy, "ptr[1] unchanged!\n"); + } + + /* Finally some correct calls */ + pbi[0] = pbi[1] = dummy; + ReturnLength = 0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %d\n", ReturnLength); + + /* Everything is correct except a too small buffer size */ + pbi[0] = pbi[1] = dummy; + ReturnLength = 0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) - 1, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength); + + /* Everything is correct except a too large buffer size */ + pbi[0] = pbi[1] = dummy; + ReturnLength = 0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength); +} + static void test_query_process_basic(void) { NTSTATUS status; @@ -1714,6 +1792,10 @@ trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); + /* 0x1A ProcessWow64Information */ + trace("Starting test_query_process_wow64()\n"); + test_query_process_wow64(); + /* 0x1B ProcessImageFileName */ trace("Starting test_query_process_image_file_name()\n"); test_query_process_image_file_name(); Modified: trunk/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… ============================================================================== --- trunk/rostests/winetests/ntdll/om.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/om.c [iso-8859-1] Tue Mar 10 10:10:04 2015 @@ -835,14 +835,14 @@ status = pNtOpenEvent(&Event2, GENERIC_ALL, &attr); ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08x\n", status ); - status = pNtClose(Event); + pNtClose(Event); status = pNtQueryEvent(Event2, EventBasicInformation, &info, sizeof(info), NULL); ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); ok( info.EventType == 1 && info.EventState == 0, "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); - status = pNtClose(Event2); + pNtClose(Event2); } static const WCHAR keyed_nameW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', Modified: trunk/rostests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/reg.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] Tue Mar 10 10:10:04 2015 @@ -129,11 +129,14 @@ static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG TitleIndex, const UNICODE_STRING *class, ULONG options, PULONG dispos ); +static NTSTATUS (WINAPI * pNtQueryKey)(HANDLE,KEY_INFORMATION_CLASS,PVOID,ULONG,PULONG); +static NTSTATUS (WINAPI * pNtQueryLicenseValue)(const UNICODE_STRING *,ULONG *,PVOID,ULONG,ULONG *); static NTSTATUS (WINAPI * pNtQueryValueKey)(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); static NTSTATUS (WINAPI * pNtSetValueKey)(HANDLE, const PUNICODE_STRING, ULONG, ULONG, const void*, ULONG ); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); +static LONG (WINAPI * pRtlCompareUnicodeString)(const PUNICODE_STRING,const PUNICODE_STRING,BOOLEAN); static BOOLEAN (WINAPI * pRtlCreateUnicodeString)(PUNICODE_STRING, LPCWSTR); static LPVOID (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); static NTSTATUS (WINAPI * pRtlAppendUnicodeToString)(PUNICODE_STRING, PCWSTR); @@ -166,7 +169,6 @@ NTDLL_GET_PROC(RtlCreateUnicodeStringFromAsciiz) NTDLL_GET_PROC(RtlCreateUnicodeString) NTDLL_GET_PROC(RtlFreeUnicodeString) - NTDLL_GET_PROC(NtDeleteValueKey) NTDLL_GET_PROC(RtlQueryRegistryValues) NTDLL_GET_PROC(RtlCheckRegistryKey) NTDLL_GET_PROC(RtlOpenCurrentUser) @@ -175,11 +177,13 @@ NTDLL_GET_PROC(NtCreateKey) NTDLL_GET_PROC(NtFlushKey) NTDLL_GET_PROC(NtDeleteKey) + NTDLL_GET_PROC(NtQueryKey) NTDLL_GET_PROC(NtQueryValueKey) NTDLL_GET_PROC(NtQueryInformationProcess) NTDLL_GET_PROC(NtSetValueKey) NTDLL_GET_PROC(NtOpenKey) NTDLL_GET_PROC(RtlFormatCurrentUserKeyPath) + NTDLL_GET_PROC(RtlCompareUnicodeString) NTDLL_GET_PROC(RtlReAllocateHeap) NTDLL_GET_PROC(RtlAppendUnicodeToString) NTDLL_GET_PROC(RtlUnicodeStringToAnsiString) @@ -188,6 +192,10 @@ NTDLL_GET_PROC(RtlZeroMemory) NTDLL_GET_PROC(RtlpNtQueryValueKey) NTDLL_GET_PROC(RtlOpenCurrentUser) + + /* optional functions */ + pNtQueryLicenseValue = (void *)GetProcAddress(hntdll, "NtQueryLicenseValue"); + return TRUE; } #undef NTDLL_GET_PROC @@ -640,6 +648,180 @@ status = pNtDeleteKey(hkey); ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08x\n", status); +} + +static void test_NtQueryLicenseKey(void) +{ + static const WCHAR emptyW[] = {'E','M','P','T','Y',0}; + UNICODE_STRING name; + WORD buffer[32]; + NTSTATUS status; + ULONG type, len; + DWORD value; + + if (!pNtQueryLicenseValue) + { + win_skip("NtQueryLicenseValue not found, skipping tests\n"); + return; + } + + type = 0xdead; + len = 0xbeef; + memset(&name, 0, sizeof(name)); + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + + /* test with empty key */ + pRtlCreateUnicodeStringFromAsciiz(&name, ""); + + type = 0xdead; + len = 0xbeef; + status = pNtQueryLicenseValue(NULL, &type, buffer, sizeof(buffer), &len); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + + type = 0xdead; + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), NULL); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + + len = 0xbeef; + status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + + type = 0xdead; + len = 0xbeef; + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + + pRtlFreeUnicodeString(&name); + + /* test with nonexistent licence key */ + pRtlCreateUnicodeStringFromAsciiz(&name, "Nonexistent-License-Value"); + + type = 0xdead; + len = 0xbeef; + status = pNtQueryLicenseValue(NULL, &type, buffer, sizeof(buffer), &len); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + + type = 0xdead; + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), NULL); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + + len = 0xbeef; + status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue returned %08x, expected STATUS_OBJECT_NAME_NOT_FOUND\n", status); + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + + type = 0xdead; + len = 0xbeef; + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected suceeded\n"); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + + pRtlFreeUnicodeString(&name); + + /* test with REG_SZ license key */ + pRtlCreateUnicodeStringFromAsciiz(&name, "Kernel-MUI-Language-Allowed"); + + type = 0xdead; + len = 0xbeef; + status = pNtQueryLicenseValue(NULL, &type, buffer, sizeof(buffer), &len); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + + type = 0xdead; + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), NULL); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + + type = 0xdead; + len = 0; + status = pNtQueryLicenseValue(&name, &type, buffer, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); + ok(type == REG_SZ, "expected type = REG_SZ, got %u\n", type); + ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len); + + len = 0; + status = pNtQueryLicenseValue(&name, NULL, buffer, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); + ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len); + + type = 0xdead; + len = 0; + memset(buffer, 0x11, sizeof(buffer)); + status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); + ok(status == STATUS_SUCCESS, "NtQueryLicenseValue returned %08x, expected STATUS_SUCCESS\n", status); + ok(type == REG_SZ, "expected type = REG_SZ, got %u\n", type); + ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len); + ok(!memcmp(buffer, emptyW, sizeof(emptyW)), "unexpected buffer content\n"); + + type = 0xdead; + len = 0; + memset(buffer, 0x11, sizeof(buffer)); + status = pNtQueryLicenseValue(&name, &type, buffer, 2, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); + ok(type == REG_SZ, "expected type REG_SZ, got %u\n", type); + ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len); + ok(buffer[0] == 0x1111, "expected buffer[0] = 0x1111, got %u\n", buffer[0]); + + pRtlFreeUnicodeString(&name); + + /* test with REG_DWORD license key */ + pRtlCreateUnicodeStringFromAsciiz(&name, "Kernel-MUI-Number-Allowed"); + + type = 0xdead; + len = 0xbeef; + status = pNtQueryLicenseValue(NULL, &type, &value, sizeof(value), &len); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + + type = 0xdead; + status = pNtQueryLicenseValue(&name, &type, &value, sizeof(value), NULL); + ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status); + ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); + + type = 0xdead; + len = 0; + status = pNtQueryLicenseValue(&name, &type, &value, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); + ok(type == REG_DWORD, "expected type = REG_DWORD, got %u\n", type); + ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len); + + len = 0; + status = pNtQueryLicenseValue(&name, NULL, &value, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); + ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len); + + type = 0xdead; + len = 0; + value = 0xdeadbeef; + status = pNtQueryLicenseValue(&name, &type, &value, sizeof(value), &len); + ok(status == STATUS_SUCCESS, "NtQueryLicenseValue returned %08x, expected STATUS_SUCCESS\n", status); + ok(type == REG_DWORD, "expected type = REG_DWORD, got %u\n", type); + ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len); + ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n"); + + type = 0xdead; + len = 0; + status = pNtQueryLicenseValue(&name, &type, &value, 2, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status); + ok(type == REG_DWORD, "expected type REG_DWORD, got %u\n", type); + ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len); + + pRtlFreeUnicodeString(&name); } static void test_RtlpNtQueryValueKey(void) @@ -1277,6 +1459,51 @@ pNtClose(key); } +static void test_NtQueryKey(void) +{ + HANDLE key; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + ULONG length, len; + KEY_NAME_INFORMATION *info = NULL; + UNICODE_STRING str; + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKey(&key, KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + + status = pNtQueryKey(key, KeyNameInformation, NULL, 0, &length); + if (status == STATUS_INVALID_PARAMETER) { + win_skip("KeyNameInformation is not supported\n"); + pNtClose(key); + return; + } + todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08x\n", status); + info = HeapAlloc(GetProcessHeap(), 0, length); + + /* non-zero buffer size, but insufficient */ + status = pNtQueryKey(key, KeyNameInformation, info, sizeof(*info), &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryKey Failed: 0x%08x\n", status); + ok(length == len, "got %d, expected %d\n", len, length); + ok(info->NameLength == winetestpath.Length, "got %d, expected %d\n", + info->NameLength, winetestpath.Length); + + /* correct buffer size */ + status = pNtQueryKey(key, KeyNameInformation, info, length, &len); + ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); + ok(length == len, "got %d, expected %d\n", len, length); + + str.Buffer = info->Name; + str.Length = info->NameLength; + ok(pRtlCompareUnicodeString(&winetestpath, &str, TRUE) == 0, + "got %s, expected %s\n", + wine_dbgstr_wn(str.Buffer, str.Length/sizeof(WCHAR)), + wine_dbgstr_wn(winetestpath.Buffer, winetestpath.Length/sizeof(WCHAR))); + + HeapFree(GetProcessHeap(), 0, info); + pNtClose(key); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; @@ -1297,7 +1524,9 @@ test_RtlQueryRegistryValues(); test_RtlpNtQueryValueKey(); test_NtFlushKey(); + test_NtQueryKey(); test_NtQueryValueKey(); + test_NtQueryLicenseKey(); test_long_value_name(); test_NtDeleteKey(); test_symlinks(); Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Tue Mar 10 10:10:04 2015 @@ -62,6 +62,8 @@ /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; +static PVOID (WINAPI *pWinSqmStartSession)(PVOID unknown1, DWORD unknown2, DWORD unknown3); +static NTSTATUS (WINAPI *pWinSqmEndSession)(PVOID unknown1); static SIZE_T (WINAPI *pRtlCompareMemory)(LPCVOID,LPCVOID,SIZE_T); static SIZE_T (WINAPI *pRtlCompareMemoryUlong)(PULONG, SIZE_T, ULONG); static NTSTATUS (WINAPI *pRtlDeleteTimer)(HANDLE, HANDLE, HANDLE); @@ -89,9 +91,14 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); +static NTSTATUS (WINAPI *pRtlIpv4StringToAddressExA)(PCSTR, BOOLEAN, IN_ADDR *, PUSHORT); static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG_PTR*); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); +static NTSTATUS (WINAPI *pRtlGetCompressionWorkSpaceSize)(USHORT, PULONG, PULONG); +static NTSTATUS (WINAPI *pRtlDecompressBuffer)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, PULONG); +static NTSTATUS (WINAPI *pRtlDecompressFragment)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, ULONG, PULONG, PVOID); +static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHAR, ULONG, ULONG, PULONG, PVOID); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -109,6 +116,8 @@ hntdll = LoadLibraryA("ntdll.dll"); ok(hntdll != 0, "LoadLibrary failed\n"); if (hntdll) { + pWinSqmStartSession = (void *)GetProcAddress(hntdll, "WinSqmStartSession"); + pWinSqmEndSession = (void *)GetProcAddress(hntdll, "WinSqmEndSession"); pRtlCompareMemory = (void *)GetProcAddress(hntdll, "RtlCompareMemory"); pRtlCompareMemoryUlong = (void *)GetProcAddress(hntdll, "RtlCompareMemoryUlong"); pRtlDeleteTimer = (void *)GetProcAddress(hntdll, "RtlDeleteTimer"); @@ -136,9 +145,14 @@ pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringA"); pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); + pRtlIpv4StringToAddressExA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressExA"); pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); pLdrLockLoaderLock = (void *)GetProcAddress(hntdll, "LdrLockLoaderLock"); pLdrUnlockLoaderLock = (void *)GetProcAddress(hntdll, "LdrUnlockLoaderLock"); + pRtlGetCompressionWorkSpaceSize = (void *)GetProcAddress(hntdll, "RtlGetCompressionWorkSpaceSize"); + pRtlDecompressBuffer = (void *)GetProcAddress(hntdll, "RtlDecompressBuffer"); + pRtlDecompressFragment = (void *)GetProcAddress(hntdll, "RtlDecompressFragment"); + pRtlCompressBuffer = (void *)GetProcAddress(hntdll, "RtlCompressBuffer"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -148,6 +162,46 @@ strcpy((char*)src_aligned_block, src_src); ok(strlen(src) == 15, "Source must be 16 bytes long!\n"); } + +#ifdef __i386__ +const char stdcall3_thunk[] = + "\x56" /* push %esi */ + "\x89\xE6" /* mov %esp, %esi */ + "\xFF\x74\x24\x14" /* pushl 20(%esp) */ + "\xFF\x74\x24\x14" /* pushl 20(%esp) */ + "\xFF\x74\x24\x14" /* pushl 20(%esp) */ + "\xFF\x54\x24\x14" /* calll 20(%esp) */ + "\x89\xF0" /* mov %esi, %eax */ + "\x29\xE0" /* sub %esp, %eax */ + "\x89\xF4" /* mov %esi, %esp */ + "\x5E" /* pop %esi */ + "\xC2\x10\x00" /* ret $16 */ +; + +static INT (WINAPI *call_stdcall_func3)(PVOID func, PVOID arg0, DWORD arg1, DWORD arg2) = NULL; + +static void test_WinSqm(void) +{ + INT args; + + if (!pWinSqmStartSession) + { + win_skip("WinSqmStartSession() is not available\n"); + return; + } + + call_stdcall_func3 = (void*) VirtualAlloc( NULL, sizeof(stdcall3_thunk) - 1, MEM_COMMIT, + PAGE_EXECUTE_READWRITE ); + memcpy( call_stdcall_func3, stdcall3_thunk, sizeof(stdcall3_thunk) - 1 ); + + args = 3 - call_stdcall_func3( pWinSqmStartSession, NULL, 0, 0 ) / 4; + ok(args == 3, "WinSqmStartSession expected to take %d arguments instead of 3\n", args); + args = 3 - call_stdcall_func3( pWinSqmEndSession, NULL, 0, 0 ) / 4; + ok(args == 1, "WinSqmEndSession expected to take %d arguments instead of 1\n", args); + + VirtualFree( call_stdcall_func3, 0, MEM_RELEASE ); +} +#endif #define COMP(str1,str2,cmplen,len) size = pRtlCompareMemory(str1, str2, cmplen); \ ok(size == len, "Expected %ld, got %ld\n", size, (SIZE_T)len) @@ -1492,6 +1546,94 @@ } } +static void test_RtlIpv4StringToAddressEx(void) +{ + NTSTATUS res; + IN_ADDR ip, expected_ip; + USHORT port; + struct + { + PCSTR address; + NTSTATUS res; + int ip[4]; + USHORT port; + } tests[] = + { + { "", STATUS_INVALID_PARAMETER, { -1 }, 0xdead }, + { " ", STATUS_INVALID_PARAMETER, { -1 }, 0xdead }, + { "1.1.1.1:", STATUS_INVALID_PARAMETER, { 1, 1, 1, 1 }, 0xdead }, + { "1.1.1.1+", STATUS_INVALID_PARAMETER, { 1, 1, 1, 1 }, 0xdead }, + { "1.1.1.1:1", STATUS_SUCCESS, { 1, 1, 1, 1 }, 0x100 }, + { "0.0.0.0:0", STATUS_INVALID_PARAMETER, { 0, 0, 0, 0 }, 0xdead }, + { "0.0.0.0:1", STATUS_SUCCESS, { 0, 0, 0, 0 }, 0x100 }, + { "1.2.3.4:65535", STATUS_SUCCESS, { 1, 2, 3, 4 }, 65535 }, + { "1.2.3.4:65536", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, + { "1.2.3.4:0xffff", STATUS_SUCCESS, { 1, 2, 3, 4 }, 65535 }, + { "1.2.3.4:0XfFfF", STATUS_SUCCESS, { 1, 2, 3, 4 }, 65535 }, + { "1.2.3.4:011064", STATUS_SUCCESS, { 1, 2, 3, 4 }, 0x3412 }, + { "1.2.3.4:1234a", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, + { "1.2.3.4:1234+", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, + { "1.2.3.4: 1234", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, + { "1.2.3.4:\t1234", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, + }; + const int testcount = sizeof(tests) / sizeof(tests[0]); + int i, Strict; + + if (!pRtlIpv4StringToAddressExA) + { + skip("RtlIpv4StringToAddressEx not available\n"); + return; + } + + /* do not crash, and do not touch the ip / port. */ + ip.S_un.S_addr = 0xabababab; + port = 0xdead; + res = pRtlIpv4StringToAddressExA(NULL, FALSE, &ip, &port); + ok(res == STATUS_INVALID_PARAMETER, "[null address] res = 0x%08x, expected 0x%08x\n", res, STATUS_INVALID_PARAMETER); + ok(ip.S_un.S_addr == 0xabababab, "RtlIpv4StringToAddressExA should not touch the ip!, ip == %x\n", ip.S_un.S_addr); + ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); + + port = 0xdead; + res = pRtlIpv4StringToAddressExA("1.1.1.1", FALSE, NULL, &port); + ok(res == STATUS_INVALID_PARAMETER, "[null ip] res = 0x%08x, expected 0x%08x\n", res, STATUS_INVALID_PARAMETER); + ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); + + ip.S_un.S_addr = 0xabababab; + port = 0xdead; + res = pRtlIpv4StringToAddressExA("1.1.1.1", FALSE, &ip, NULL); + ok(res == STATUS_INVALID_PARAMETER, "[null port] res = 0x%08x, expected 0x%08x\n", res, STATUS_INVALID_PARAMETER); + ok(ip.S_un.S_addr == 0xabababab, "RtlIpv4StringToAddressExA should not touch the ip!, ip == %x\n", ip.S_un.S_addr); + ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); + + for (i = 0; i < testcount; i++) + { + /* Strict is only relevant for the ip address, so make sure that it does not influence the port */ + for (Strict = 0; Strict < 2; Strict++) + { + ip.S_un.S_addr = 0xabababab; + port = 0xdead; + res = pRtlIpv4StringToAddressExA(tests[i].address, Strict, &ip, &port); + if (tests[i].ip[0] == -1) + { + expected_ip.S_un.S_addr = 0xabababab; + } + else + { + expected_ip.S_un.S_un_b.s_b1 = tests[i].ip[0]; + expected_ip.S_un.S_un_b.s_b2 = tests[i].ip[1]; + expected_ip.S_un.S_un_b.s_b3 = tests[i].ip[2]; + expected_ip.S_un.S_un_b.s_b4 = tests[i].ip[3]; + } + ok(res == tests[i].res, "[%s] res = 0x%08x, expected 0x%08x\n", + tests[i].address, res, tests[i].res); + ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08x, expected %08x\n", + tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); + ok(port == tests[i].port, "[%s] port = %u, expected %u\n", + tests[i].address, port, tests[i].port); + } + } +} + static void test_LdrAddRefDll(void) { HMODULE mod, mod2; @@ -1599,9 +1741,744 @@ pLdrUnlockLoaderLock(0, magic); } +static void test_RtlGetCompressionWorkSpaceSize(void) +{ + ULONG compress_workspace, decompress_workspace; + NTSTATUS status; + + if (!pRtlGetCompressionWorkSpaceSize) + { + win_skip("RtlGetCompressionWorkSpaceSize is not available\n"); + return; + } + + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_NONE, &compress_workspace, + &decompress_workspace); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); + + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_DEFAULT, &compress_workspace, + &decompress_workspace); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); + + status = pRtlGetCompressionWorkSpaceSize(0xFF, &compress_workspace, &decompress_workspace); + ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08x\n", status); + + compress_workspace = decompress_workspace = 0xdeadbeef; + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_LZNT1, &compress_workspace, + &decompress_workspace); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + ok(compress_workspace != 0, "got wrong compress_workspace %d\n", compress_workspace); + ok(decompress_workspace == 0x1000, "got wrong decompress_workspace %d\n", decompress_workspace); + + compress_workspace = decompress_workspace = 0xdeadbeef; + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_LZNT1 | COMPRESSION_ENGINE_MAXIMUM, + &compress_workspace, &decompress_workspace); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + ok(compress_workspace != 0, "got wrong compress_workspace %d\n", compress_workspace); + ok(decompress_workspace == 0x1000, "got wrong decompress_workspace %d\n", decompress_workspace); +} + +/* helper for test_RtlDecompressBuffer, checks if a chunk is incomplete */ +static BOOL is_incomplete_chunk(const UCHAR *compressed, ULONG compressed_size, BOOL check_all) +{ + ULONG chunk_size; + if (compressed_size <= sizeof(WORD)) + return TRUE; + while (compressed_size >= sizeof(WORD)) + { + chunk_size = (*(WORD *)compressed & 0xFFF) + 1; + if (compressed_size < sizeof(WORD) + chunk_size) + return TRUE; + if (!check_all) + break; + compressed += sizeof(WORD) + chunk_size; + compressed_size -= sizeof(WORD) + chunk_size; + } + return FALSE; +} + +#define DECOMPRESS_BROKEN_TRUNCATED 1 +#define DECOMPRESS_BROKEN_FRAGMENT0 2 +#define DECOMPRESS_BROKEN_FRAGMENT1 4 +#define DECOMPRESS_BROKEN_FRAGMENT4095 8 + +static void test_RtlDecompressBuffer(void) +{ + static const UCHAR test_multiple_chunks[] = {0x03, 0x30, 'W', 'i', 'n', 'e', + 0x03, 0x30, 'W', 'i', 'n', 'e'}; + static const struct + { + UCHAR compressed[32]; + ULONG compressed_size; + NTSTATUS status; + UCHAR uncompressed[32]; + ULONG uncompressed_size; + DWORD broken_flags; + } + test_lznt[] = + { + /* 4 byte uncompressed chunk */ + { + {0x03, 0x30, 'W', 'i', 'n', 'e'}, + 6, + STATUS_SUCCESS, + "Wine", + 4, + DECOMPRESS_BROKEN_FRAGMENT4095 | + DECOMPRESS_BROKEN_FRAGMENT1 | + DECOMPRESS_BROKEN_FRAGMENT0 + }, + /* 8 byte uncompressed chunk */ + { + {0x07, 0x30, 'W', 'i', 'n', 'e', 'W', 'i', 'n', 'e'}, + 10, + STATUS_SUCCESS, + "WineWine", + 8, + DECOMPRESS_BROKEN_FRAGMENT4095 | + DECOMPRESS_BROKEN_FRAGMENT1 | + DECOMPRESS_BROKEN_FRAGMENT0 + }, + /* 4 byte compressed chunk */ + { + {0x04, 0xB0, 0x00, 'W', 'i', 'n', 'e'}, + 7, + STATUS_SUCCESS, + "Wine", + 4 + }, + /* 8 byte compressed chunk */ + { + {0x08, 0xB0, 0x00, 'W', 'i', 'n', 'e', 'W', 'i', 'n', 'e'}, + 11, + STATUS_SUCCESS, + "WineWine", + 8 + }, + /* compressed chunk using backwards reference */ + { + {0x06, 0xB0, 0x10, 'W', 'i', 'n', 'e', 0x01, 0x30}, + 9, + STATUS_SUCCESS, + "WineWine", + 8, + DECOMPRESS_BROKEN_TRUNCATED + }, + /* compressed chunk using backwards reference with length > bytes_read */ + { + {0x06, 0xB0, 0x10, 'W', 'i', 'n', 'e', 0x05, 0x30}, + 9, + STATUS_SUCCESS, + "WineWineWine", + 12, + DECOMPRESS_BROKEN_TRUNCATED + }, + /* same as above, but unused bits != 0 */ + { + {0x06, 0xB0, 0x30, 'W', 'i', 'n', 'e', 0x01, 0x30}, + 9, + STATUS_SUCCESS, + "WineWine", + 8, + DECOMPRESS_BROKEN_TRUNCATED + }, + /* compressed chunk without backwards reference and unused bits != 0 */ + { + {0x01, 0xB0, 0x02, 'W'}, + 4, + STATUS_SUCCESS, + "W", + 1 + }, + /* termination sequence after first chunk */ + { + {0x03, 0x30, 'W', 'i', 'n', 'e', 0x00, 0x00, 0x03, 0x30, 'W', 'i', 'n', 'e'}, + 14, + STATUS_SUCCESS, + "Wine", + 4, + DECOMPRESS_BROKEN_FRAGMENT4095 | + DECOMPRESS_BROKEN_FRAGMENT1 | + DECOMPRESS_BROKEN_FRAGMENT0 + }, + /* compressed chunk using backwards reference with 4 bit offset, 12 bit length */ + { + {0x14, 0xB0, 0x00, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 0x00, 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 0x01, 0x01, 0xF0}, + 23, + STATUS_SUCCESS, + "ABCDEFGHIJKLMNOPABCD", + 20, + DECOMPRESS_BROKEN_TRUNCATED + }, + /* compressed chunk using backwards reference with 5 bit offset, 11 bit length */ + { + {0x15, 0xB0, 0x00, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 0x00, 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 0x02, 'A', 0x00, 0x78}, + 24, + STATUS_SUCCESS, + "ABCDEFGHIJKLMNOPABCD", + 20, + DECOMPRESS_BROKEN_TRUNCATED + }, + /* uncompressed chunk with invalid magic */ + { + {0x03, 0x20, 'W', 'i', 'n', 'e'}, + 6, + STATUS_SUCCESS, + "Wine", + 4, + DECOMPRESS_BROKEN_FRAGMENT4095 | + DECOMPRESS_BROKEN_FRAGMENT1 | + DECOMPRESS_BROKEN_FRAGMENT0 + }, + /* compressed chunk with invalid magic */ + { + {0x04, 0xA0, 0x00, 'W', 'i', 'n', 'e'}, + 7, + STATUS_SUCCESS, + "Wine", + 4 + }, + /* garbage byte after end of buffer */ + { + {0x00, 0xB0, 0x02, 0x01}, + 4, + STATUS_SUCCESS, + "", + 0 + }, + /* empty compressed chunk */ + { + {0x00, 0xB0, 0x00}, + 3, + STATUS_SUCCESS, + "", + 0 + }, + /* empty compressed chunk with unused bits != 0 */ + { + {0x00, 0xB0, 0x01}, + 3, + STATUS_SUCCESS, + "", + 0 + }, + /* empty input buffer */ + { + {0}, + 0, + STATUS_BAD_COMPRESSION_BUFFER, + }, + /* incomplete chunk header */ + { + {0x01}, + 1, + STATUS_BAD_COMPRESSION_BUFFER + }, + /* incomplete chunk header */ + { + {0x00, 0x30}, + 2, + STATUS_BAD_COMPRESSION_BUFFER + }, + /* compressed chunk with invalid backwards reference */ + { + {0x06, 0xB0, 0x10, 'W', 'i', 'n', 'e', 0x05, 0x40}, + 9, + STATUS_BAD_COMPRESSION_BUFFER + }, + /* compressed chunk with incomplete backwards reference */ + { + {0x05, 0xB0, 0x10, 'W', 'i', 'n', 'e', 0x05}, + 8, + STATUS_BAD_COMPRESSION_BUFFER + }, + /* incomplete uncompressed chunk */ + { + {0x07, 0x30, 'W', 'i', 'n', 'e'}, + 6, + STATUS_BAD_COMPRESSION_BUFFER + }, + /* incomplete compressed chunk */ + { + {0x08, 0xB0, 0x00, 'W', 'i', 'n', 'e'}, + 7, + STATUS_BAD_COMPRESSION_BUFFER + }, + /* two compressed chunks, the second one incomplete */ + { + {0x00, 0xB0, 0x02, 0x00, 0xB0}, + 5, + STATUS_BAD_COMPRESSION_BUFFER, + } + }; + + static UCHAR buf[0x2000], workspace[0x1000]; + NTSTATUS status, expected_status; + ULONG final_size; + int i; + + if (!pRtlDecompressBuffer || !pRtlDecompressFragment) + { + win_skip("RtlDecompressBuffer or RtlDecompressFragment is not available\n"); + return; + } + + /* test compression format / engine */ + final_size = 0xdeadbeef; + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_NONE, buf, sizeof(buf) - 1, test_lznt[0].compressed, + test_lznt[0].compressed_size, &final_size); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); + + final_size = 0xdeadbeef; + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_DEFAULT, buf, sizeof(buf) - 1, test_lznt[0].compressed, + test_lznt[0].compressed_size, &final_size); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); + + final_size = 0xdeadbeef; + status = pRtlDecompressBuffer(0xFF, buf, sizeof(buf) - 1, test_lznt[0].compressed, + test_lznt[0].compressed_size, &final_size); + ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08x\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); + + /* regular tests for RtlDecompressBuffer */ + for (i = 0; i < sizeof(test_lznt) / sizeof(test_lznt[0]); i++) + { + trace("Running test %d (compressed_size=%d, compressed_size=%d, status=%d)\n", + i, test_lznt[i].compressed_size, test_lznt[i].compressed_size, test_lznt[i].status); + + /* test with very big buffer */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, + test_lznt[i].compressed_size, &final_size); + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + if (!status) + { + ok(final_size == test_lznt[i].uncompressed_size, + "%d: got wrong final_size %d\n", i, final_size); + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), + "%d: got wrong decoded data\n", i); + ok(buf[test_lznt[i].uncompressed_size] == 0x11, + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size); + } + + /* test that modifier for compression engine is ignored */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1 | COMPRESSION_ENGINE_MAXIMUM, buf, sizeof(buf), + test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + if (!status) + { + ok(final_size == test_lznt[i].uncompressed_size, + "%d: got wrong final_size %d\n", i, final_size); + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), + "%d: got wrong decoded data\n", i); + ok(buf[test_lznt[i].uncompressed_size] == 0x11, + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size); + } + + /* test with expected output size */ + if (test_lznt[i].uncompressed_size > 0) + { + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, test_lznt[i].uncompressed_size, + test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + if (!status) + { + ok(final_size == test_lznt[i].uncompressed_size, + "%d: got wrong final_size %d\n", i, final_size); + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), + "%d: got wrong decoded data\n", i); + ok(buf[test_lznt[i].uncompressed_size] == 0x11, + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size); + } + } + + /* test with smaller output size */ + if (test_lznt[i].uncompressed_size > 1) + { + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, test_lznt[i].uncompressed_size - 1, + test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); + ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_TRUNCATED)), "%d: got wrong status 0x%08x\n", i, status); + if (!status) + { + ok(final_size == test_lznt[i].uncompressed_size - 1, + "%d: got wrong final_size %d\n", i, final_size); + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size - 1), + "%d: got wrong decoded data\n", i); + ok(buf[test_lznt[i].uncompressed_size - 1] == 0x11, + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size - 1); + } + } + + /* test with zero output size */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 0, test_lznt[i].compressed, + test_lznt[i].compressed_size, &final_size); + if (is_incomplete_chunk(test_lznt[i].compressed, test_lznt[i].compressed_size, FALSE)) + { + ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08x\n", i, status); + } + else + { + ok(status == STATUS_SUCCESS, "%d: got wrong status 0x%08x\n", i, status); + ok(final_size == 0, "%d: got wrong final_size %d\n", i, final_size); + ok(buf[0] == 0x11, "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size); + } + + /* test RtlDecompressBuffer with offset = 0 */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, + test_lznt[i].compressed_size, 0, &final_size, workspace); + ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT0)), "%d: got wrong status 0x%08x\n", i, status); + if (!status) + { + ok(final_size == test_lznt[i].uncompressed_size, + "%d: got wrong final_size %d\n", i, final_size); + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), + "%d: got wrong decoded data\n", i); + ok(buf[test_lznt[i].uncompressed_size] == 0x11, + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size); + } + + /* test RtlDecompressBuffer with offset = 1 */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, + test_lznt[i].compressed_size, 1, &final_size, workspace); + ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT1)), "%d: got wrong status 0x%08x\n", i, status); + if (!status) + { + if (test_lznt[i].uncompressed_size == 0) + { + todo_wine + ok(final_size == 4095, + "%d: got wrong final size %d\n", i, final_size); + /* Buffer doesn't contain any useful value on Windows */ + ok(buf[4095] == 0x11, + "%d: buf[4095] overwritten\n", i); + } + else + { + ok(final_size == test_lznt[i].uncompressed_size - 1, + "%d: got wrong final_size %d\n", i, final_size); + ok(!memcmp(buf, test_lznt[i].uncompressed + 1, test_lznt[i].uncompressed_size - 1), + "%d: got wrong decoded data\n", i); + ok(buf[test_lznt[i].uncompressed_size - 1] == 0x11, + "%d: buf[%d] overwritten\n", i, test_lznt[i].uncompressed_size - 1); + } + } + + /* test RtlDecompressBuffer with offset = 4095 */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, + test_lznt[i].compressed_size, 4095, &final_size, workspace); + ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT4095)), "%d: got wrong status 0x%08x\n", i, status); + if (!status) + { + todo_wine + ok(final_size == 1, + "%d: got wrong final size %d\n", i, final_size); + todo_wine + ok(buf[0] == 0, + "%d: padding is not zero\n", i); + ok(buf[1] == 0x11, + "%d: buf[1] overwritten\n", i); + } + + /* test RtlDecompressBuffer with offset = 4096 */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, + test_lznt[i].compressed_size, 4096, &final_size, workspace); + expected_status = is_incomplete_chunk(test_lznt[i].compressed, test_lznt[i].compressed_size, TRUE) ? + test_lznt[i].status : STATUS_SUCCESS; + ok(status == expected_status, "%d: got wrong status 0x%08x, expected 0x%08x\n", i, status, expected_status); + if (!status) + { + ok(final_size == 0, + "%d: got wrong final size %d\n", i, final_size); + ok(buf[0] == 0x11, + "%d: buf[4096] overwritten\n", i); + } + } + + /* test decoding of multiple chunks with pRtlDecompressBuffer */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, + sizeof(test_multiple_chunks), &final_size); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 4100, "got wrong final_size %d\n", final_size); + ok(!memcmp(buf, "Wine", 4), "got wrong decoded data at offset 0\n"); + ok(buf[4] == 0 && buf[4095] == 0, "padding is not zero\n"); + ok(!memcmp(buf + 4096, "Wine", 4), "got wrong decoded data at offset 4096\n"); + ok(buf[4100] == 0x11, "buf[4100] overwritten\n"); + } + + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 4097, test_multiple_chunks, + sizeof(test_multiple_chunks), &final_size); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 4097, "got wrong final_size %d\n", final_size); + ok(!memcmp(buf, "Wine", 4), "got wrong decoded data at offset 0\n"); + ok(buf[4] == 0 && buf[4095] == 0, "padding is not zero\n"); + ok(buf[4096], "got wrong decoded data at offset 4096\n"); + ok(buf[4097] == 0x11, "buf[4097] overwritten\n"); + } + + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 4096, test_multiple_chunks, + sizeof(test_multiple_chunks), &final_size); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 4, "got wrong final_size %d\n", final_size); + ok(!memcmp(buf, "Wine", 4), "got wrong decoded data at offset 0\n"); + ok(buf[4] == 0x11, "buf[4] overwritten\n"); + } + + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 4, test_multiple_chunks, + sizeof(test_multiple_chunks), &final_size); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 4, "got wrong final_size %d\n", final_size); + ok(!memcmp(buf, "Wine", 4), "got wrong decoded data at offset 0\n"); + ok(buf[4] == 0x11, "buf[4] overwritten\n"); + } + + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 3, test_multiple_chunks, + sizeof(test_multiple_chunks), &final_size); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 3, "got wrong final_size %d\n", final_size); + ok(!memcmp(buf, "Wine", 3), "got wrong decoded data at offset 0\n"); + ok(buf[3] == 0x11, "buf[3] overwritten\n"); + } + + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 0, test_multiple_chunks, + sizeof(test_multiple_chunks), &final_size); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 0, "got wrong final_size %d\n", final_size); + ok(buf[0] == 0x11, "buf[0] overwritten\n"); + } + + /* test multiple chunks in combination with RtlDecompressBuffer and offset=1 */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, + sizeof(test_multiple_chunks), 1, &final_size, workspace); + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), + "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 4099, "got wrong final_size %d\n", final_size); + ok(!memcmp(buf, "ine", 3), "got wrong decoded data at offset 0\n"); + ok(buf[3] == 0 && buf[4094] == 0, "padding is not zero\n"); + ok(!memcmp(buf + 4095, "Wine", 4), "got wrong decoded data at offset 4095\n"); + ok(buf[4099] == 0x11, "buf[4099] overwritten\n"); + } + + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, 4096, test_multiple_chunks, + sizeof(test_multiple_chunks), 1, &final_size, workspace); + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), + "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 4096, "got wrong final_size %d\n", final_size); + ok(!memcmp(buf, "ine", 3), "got wrong decoded data at offset 0\n"); + ok(buf[3] == 0 && buf[4094] == 0, "padding is not zero\n"); + ok(buf[4095] == 'W', "got wrong decoded data at offset 4095\n"); + ok(buf[4096] == 0x11, "buf[4096] overwritten\n"); + } + + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, 4095, test_multiple_chunks, + sizeof(test_multiple_chunks), 1, &final_size, workspace); + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), + "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 3, "got wrong final_size %d\n", final_size); + ok(!memcmp(buf, "ine", 3), "got wrong decoded data at offset 0\n"); + ok(buf[4] == 0x11, "buf[4] overwritten\n"); + } + + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, 3, test_multiple_chunks, + sizeof(test_multiple_chunks), 1, &final_size, workspace); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 3, "got wrong final_size %d\n", final_size); + ok(!memcmp(buf, "ine", 3), "got wrong decoded data at offset 0\n"); + ok(buf[3] == 0x11, "buf[3] overwritten\n"); + } + + /* test multiple chunks in combination with RtlDecompressBuffer and offset=4 */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, + sizeof(test_multiple_chunks), 4, &final_size, workspace); + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), + "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 4096, "got wrong final_size %d\n", final_size); + ok(buf[0] == 0 && buf[4091] == 0, "padding is not zero\n"); + ok(!memcmp(buf + 4092, "Wine", 4), "got wrong decoded data at offset 4092\n"); + ok(buf[4096] == 0x11, "buf[4096] overwritten\n"); + } + + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, + sizeof(test_multiple_chunks), 4095, &final_size, workspace); + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), + "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 5, "got wrong final_size %d\n", final_size); + ok(buf[0] == 0, "padding is not zero\n"); + ok(!memcmp(buf + 1, "Wine", 4), "got wrong decoded data at offset 1\n"); + ok(buf[5] == 0x11, "buf[5] overwritten\n"); + } + + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, + sizeof(test_multiple_chunks), 4096, &final_size, workspace); + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), + "got wrong status 0x%08x\n", status); + if (!status) + { + ok(final_size == 4, "got wrong final_size %d\n", final_size); + ok(!memcmp(buf, "Wine", 4), "got wrong decoded data at offset 0\n"); + ok(buf[4] == 0x11, "buf[4] overwritten\n"); + } + +} + +static void test_RtlCompressBuffer(void) +{ + ULONG compress_workspace, decompress_workspace; + static const UCHAR test_buffer[] = "WineWineWine"; + static UCHAR buf1[0x1000], buf2[0x1000], *workspace; + ULONG final_size, buf_size; + NTSTATUS status; + + if (!pRtlCompressBuffer || !pRtlGetCompressionWorkSpaceSize) + { + win_skip("RtlCompressBuffer or RtlGetCompressionWorkSpaceSize is not available\n"); + return; + } + + compress_workspace = decompress_workspace = 0xdeadbeef; + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_LZNT1, &compress_workspace, + &decompress_workspace); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + ok(compress_workspace != 0, "got wrong compress_workspace %d\n", compress_workspace); + + workspace = HeapAlloc( GetProcessHeap(), 0, compress_workspace ); + ok(workspace != NULL, "HeapAlloc failed %x\n", GetLastError()); + + /* test compression format / engine */ + final_size = 0xdeadbeef; + status = pRtlCompressBuffer(COMPRESSION_FORMAT_NONE, test_buffer, sizeof(test_buffer), + buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); + + final_size = 0xdeadbeef; + status = pRtlCompressBuffer(COMPRESSION_FORMAT_DEFAULT, test_buffer, sizeof(test_buffer), + buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); + + final_size = 0xdeadbeef; + status = pRtlCompressBuffer(0xFF, test_buffer, sizeof(test_buffer), + buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); + ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08x\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %d\n", final_size); + + /* test compression */ + final_size = 0xdeadbeef; + memset(buf1, 0x11, sizeof(buf1)); + status = pRtlCompressBuffer(COMPRESSION_FORMAT_LZNT1, test_buffer, sizeof(test_buffer), + buf1, sizeof(buf1), 4096, &final_size, workspace); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + ok((*(WORD *)buf1 & 0x7000) == 0x3000, "no chunk signature found %04x\n", *(WORD *)buf1); + buf_size = final_size; + todo_wine + ok(final_size < sizeof(test_buffer), "got wrong final_size %d\n", final_size); + + /* test decompression */ + final_size = 0xdeadbeef; + memset(buf2, 0x11, sizeof(buf2)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf2, sizeof(buf2), + buf1, buf_size, &final_size); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + ok(final_size == sizeof(test_buffer), "got wrong final_size %d\n", final_size); + ok(!memcmp(buf2, test_buffer, sizeof(test_buffer)), "got wrong decoded data\n"); + ok(buf2[sizeof(test_buffer)] == 0x11, "buf[%u] overwritten\n", (DWORD)sizeof(test_buffer)); + + /* buffer too small */ + final_size = 0xdeadbeef; + memset(buf1, 0x11, sizeof(buf1)); + status = pRtlCompressBuffer(COMPRESSION_FORMAT_LZNT1, test_buffer, sizeof(test_buffer), + buf1, 4, 4096, &final_size, workspace); + ok(status == STATUS_BUFFER_TOO_SMALL, "got wrong status 0x%08x\n", status); + + HeapFree(GetProcessHeap(), 0, workspace); +} + START_TEST(rtl) { InitFunctionPtrs(); + +#ifdef __i386__ + test_WinSqm(); +#else + skip("stdcall-style parameter checks are not supported on this platform.\n"); +#endif test_RtlCompareMemory(); test_RtlCompareMemoryUlong(); @@ -1623,6 +2500,10 @@ test_RtlIpv4AddressToString(); test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); + test_RtlIpv4StringToAddressEx(); test_LdrAddRefDll(); test_LdrLockLoaderLock(); -} + test_RtlGetCompressionWorkSpaceSize(); + test_RtlDecompressBuffer(); + test_RtlCompressBuffer(); +} Modified: trunk/rostests/winetests/ntdll/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/string.c?… ============================================================================== --- trunk/rostests/winetests/ntdll/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/string.c [iso-8859-1] Tue Mar 10 10:10:04 2015 @@ -1083,8 +1083,8 @@ result = p_atoi64(str2longlong[test_num].str); if (str2longlong[test_num].overflow) ok(result == str2longlong[test_num].value || - (result == (str2longlong[test_num].overflow == -1) ? - ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff)), + (result == ((str2longlong[test_num].overflow == -1) ? + ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff))), "(test %d): call failed: _atoi64(\"%s\") has result 0x%x%08x, expected: 0x%x%08x\n", test_num, str2longlong[test_num].str, (DWORD)(result >> 32), (DWORD)result, (DWORD)(str2longlong[test_num].value >> 32), (DWORD)str2longlong[test_num].value); @@ -1108,8 +1108,8 @@ result = p_wtoi64(uni.Buffer); if (str2longlong[test_num].overflow) ok(result == str2longlong[test_num].value || - (result == (str2longlong[test_num].overflow == -1) ? - ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff)), + (result == ((str2longlong[test_num].overflow == -1) ? + ULL(0x80000000,0x00000000) : ULL(0x7fffffff,0xffffffff))), "(test %d): call failed: _atoi64(\"%s\") has result 0x%x%08x, expected: 0x%x%08x\n", test_num, str2longlong[test_num].str, (DWORD)(result >> 32), (DWORD)result, (DWORD)(str2longlong[test_num].value >> 32), (DWORD)str2longlong[test_num].value);

9 years, 9 months

[akhaldi] 66657: [PSDK] Add missing KEY_NAME_INFORMATION structure. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 10 10:09:14 2015 New Revision: 66657 URL: http://svn.reactos.org/svn/reactos?rev=66657&view=rev Log: [PSDK] Add missing KEY_NAME_INFORMATION structure. CORE-9246 Modified: trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Tue Mar 10 10:09:14 2015 @@ -984,6 +984,11 @@ ULONG MaxValueDataLen; WCHAR Class[1]; } KEY_FULL_INFORMATION, *PKEY_FULL_INFORMATION; + +typedef struct _KEY_NAME_INFORMATION { + ULONG NameLength; + WCHAR Name[1]; +} KEY_NAME_INFORMATION, *PKEY_NAME_INFORMATION; typedef struct _KEY_VALUE_ENTRY {

9 years, 9 months

[tkreuzer] 66656: [WIN32K] Fix a typo introduced in r66644. Fixes icon corruption / testbot regression. CORE-9351 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 10 10:01:44 2015 New Revision: 66656 URL: http://svn.reactos.org/svn/reactos?rev=66656&view=rev Log: [WIN32K] Fix a typo introduced in r66644. Fixes icon corruption / testbot regression. CORE-9351 #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] Tue Mar 10 10:01:44 2015 @@ -1051,7 +1051,7 @@ { /* Probe and copy the BITMAPINFO */ ProbeForRead(pbmi, cjMaxInfo, 1); - RtlCopyMemory(pbmi, pbmi, cjMaxInfo); + RtlCopyMemory(pbmiSafe, pbmi, cjMaxInfo); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

9 years, 9 months

[tkreuzer] 66655: [NDK] Update no_sal2.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 10 09:10:14 2015 New Revision: 66655 URL: http://svn.reactos.org/svn/reactos?rev=66655&view=rev Log: [NDK] Update no_sal2.h Modified: trunk/reactos/include/ndk/no_sal2.h Modified: trunk/reactos/include/ndk/no_sal2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/no_sal2.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/no_sal2.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/no_sal2.h [iso-8859-1] Tue Mar 10 09:10:14 2015 @@ -3,523 +3,701 @@ #define _NO_SAL_2_H_ -#undef _Acquires_exclusive_lock_ -#undef _Acquires_lock_ -#undef _Acquires_nonreentrant_lock_ -#undef _Acquires_shared_lock_ -#undef _Always_ -#undef _Analysis_assume_ -#undef _Analysis_assume_lock_acquired_ -#undef _Analysis_assume_lock_held_ -#undef _Analysis_assume_lock_not_held_ -#undef _Analysis_assume_lock_released_ -#undef _Analysis_assume_same_lock_ -#undef _Analysis_mode_ -#undef _Analysis_noreturn_ -#undef _Analysis_suppress_lock_checking_ -#undef _At_ -#undef _At_buffer_ -#undef _Benign_race_begin_ -#undef _Benign_race_end_ -#undef _Check_return_ -#undef _COM_Outptr_ -#undef _COM_Outptr_opt_ -#undef _COM_Outptr_opt_result_maybenull_ -#undef _COM_Outptr_result_maybenull_ -#undef _Const_ -#undef _Create_lock_level_ -#undef _Deref_ -#undef _Deref_in_range_ -#undef _Deref_inout_range_ -#undef _Deref_out_range_ -#undef _Enum_is_bitflag_ -#undef _Field_range_ -#undef _Field_size_ -#undef _Field_size_bytes_ -#undef _Field_size_bytes_full_ -#undef _Field_size_bytes_full_opt_ -#undef _Field_size_bytes_opt_ -#undef _Field_size_bytes_part_ -#undef _Field_size_bytes_part_opt_ -#undef _Field_size_full_ -#undef _Field_size_full_opt_ -#undef _Field_size_opt_ -#undef _Field_size_part_ -#undef _Field_size_part_opt_ -#undef _Function_class_ -#undef _Function_ignore_lock_checking_ -#undef _Group_ -#undef _Guarded_by_ -#undef _Has_lock_kind_ -#undef _Has_lock_level_ -#undef _In_ -#undef _In_defensive_ -#undef _In_opt_ -#undef _In_opt_z_ -#undef _In_range_ -#undef _In_reads_ -#undef _In_reads_bytes_ -#undef _In_reads_bytes_opt_ -#undef _In_reads_opt_ -#undef _In_reads_opt_z_ -#undef _In_reads_or_z_ -#undef _In_reads_to_ptr_ -#undef _In_reads_to_ptr_opt_ -#undef _In_reads_to_ptr_opt_z_ -#undef _In_reads_to_ptr_z_ -#undef _In_reads_z_ -#undef _In_z_ -#undef _Inout_ -#undef _Inout_defensive_ -#undef _Inout_opt_ -#undef _Inout_opt_z_ -#undef _Inout_updates_ -#undef _Inout_updates_all_ -#undef _Inout_updates_all_opt_ -#undef _Inout_updates_bytes_ -#undef _Inout_updates_bytes_all_ -#undef _Inout_updates_bytes_all_opt_ -#undef _Inout_updates_bytes_opt_ -#undef _Inout_updates_bytes_to_ -#undef _Inout_updates_bytes_to_opt_ -#undef _Inout_updates_opt_ -#undef _Inout_updates_opt_z_ -#undef _Inout_updates_to_ -#undef _Inout_updates_to_opt_ -#undef _Inout_updates_z_ -#undef _Inout_z_ -#undef _Interlocked_ -#undef _Interlocked_operand_ -#undef _IRQL_always_function_max_ -#undef _IRQL_always_function_min_ -#undef _IRQL_is_cancel_ -#undef _IRQL_raises_ -#undef _IRQL_requires_ -#undef _IRQL_requires_max_ -#undef _IRQL_requires_min_ -#undef _IRQL_requires_same_ -#undef _IRQL_restores_ -#undef _IRQL_restores_global_ -#undef _IRQL_saves_ -#undef _IRQL_saves_global_ -#undef _IRQL_uses_cancel_ -#undef _Kernel_acquires_resource_ -#undef _Kernel_clear_do_init_ -#undef _Kernel_float_restored_ -#undef _Kernel_float_saved_ -#undef _Kernel_float_used_ -#undef _Kernel_IoGetDmaAdapter_ -#undef _Kernel_releases_resource_ -#undef _Kernel_requires_resource_held_ -#undef _Kernel_requires_resource_not_held_ -#undef _Literal_ -#undef _Lock_level_order_ -#undef _Maybe_raises_SEH_exception_ -#undef _Maybenull_ -#undef _Must_inspect_result_ -#undef _No_competing_thread_ -#undef _No_competing_thread_begin_ -#undef _No_competing_thread_end_ -#undef _Notliteral_ -#undef _Notnull_ -#undef _Notvalid_ -#undef _Null_ -#undef _Null_terminated_ -#undef _NullNull_terminated_ -#undef _On_failure_ -#undef _Out_ -#undef _Out_defensive_ -#undef _Out_opt_ -#undef _Out_range_ -#undef _Out_writes_ -#undef _Out_writes_all_ -#undef _Out_writes_all_opt_ -#undef _Out_writes_bytes_ -#undef _Out_writes_bytes_all_ -#undef _Out_writes_bytes_all_opt_ -#undef _Out_writes_bytes_opt_ -#undef _Out_writes_bytes_to_ -#undef _Out_writes_bytes_to_opt_ -#undef _Out_writes_opt_ -#undef _Out_writes_opt_z_ -#undef _Out_writes_to_ -#undef _Out_writes_to_opt_ -#undef _Out_writes_to_ptr_ -#undef _Out_writes_to_ptr_opt_ -#undef _Out_writes_to_ptr_opt_z_ -#undef _Out_writes_to_ptr_z_ -#undef _Out_writes_z_ -#undef _Outptr_ -#undef _Outptr_opt_ -#undef _Outptr_opt_result_buffer_ -#undef _Outptr_opt_result_buffer_to_ -#undef _Outptr_opt_result_bytebuffer_ -#undef _Outptr_opt_result_bytebuffer_to_ -#undef _Outptr_opt_result_maybenull_ -#undef _Outptr_opt_result_maybenull_z_ -#undef _Outptr_opt_result_nullonfailure_ -#undef _Outptr_opt_result_z_ -#undef _Outptr_result_buffer_ -#undef _Outptr_result_buffer_to_ -#undef _Outptr_result_bytebuffer_ -#undef _Outptr_result_bytebuffer_to_ -#undef _Outptr_result_maybenull_ -#undef _Outptr_result_maybenull_z_ -#undef _Outptr_result_nullonfailure_ -#undef _Outptr_result_z_ -#undef _Outref_ -#undef _Outref_result_buffer_ -#undef _Outref_result_buffer_all_ -#undef _Outref_result_buffer_all_maybenull_ -#undef _Outref_result_buffer_maybenull_ -#undef _Outref_result_buffer_to_ -#undef _Outref_result_buffer_to_maybenull_ -#undef _Outref_result_bytebuffer_ -#undef _Outref_result_bytebuffer_all_ -#undef _Outref_result_bytebuffer_all_maybenull_ -#undef _Outref_result_bytebuffer_maybenull_ -#undef _Outref_result_bytebuffer_to_ -#undef _Outref_result_bytebuffer_to_maybenull_ -#undef _Outref_result_maybenull_ -#undef _Outref_result_nullonfailure_ -#undef _Points_to_data_ -#undef _Post_ -#undef _Post_defensive_ -#undef _Post_equal_to_ -#undef _Post_invalid_ -#undef _Post_ptr_invalid_ -#undef _Post_readable_byte_size_ -#undef _Post_readable_size_ -#undef _Post_same_lock_ -#undef _Post_satisfies_ -#undef _Post_valid_ -#undef _Post_writable_byte_size_ -#undef _Post_writable_size_ -#undef _Post_z_ -#undef _Pre_ -#undef _Pre_defensive_ -#undef _Pre_equal_to_ -#undef _Pre_maybenull_ -#undef _Pre_notnull_ -#undef _Pre_null_ -#undef _Pre_opt_valid_ -#undef _Pre_readable_byte_size_ -#undef _Pre_readable_size_ -#undef _Pre_satisfies_ -#undef _Pre_unknown_ -#undef _Pre_valid_ -#undef _Pre_writable_byte_size_ -#undef _Pre_writable_size_ -#undef _Pre_z_ -#undef _Prepost_z_ -#undef _Printf_format_string_ -#undef _Printf_format_string_params_ -#undef _Raises_SEH_exception_ -#undef _Readable_bytes_ -#undef _Readable_elements_ -#undef _Releases_exclusive_lock_ -#undef _Releases_lock_ -#undef _Releases_nonreentrant_lock_ -#undef _Releases_shared_lock_ -#undef _Requires_exclusive_lock_held_ -#undef _Requires_lock_held_ -#undef _Requires_lock_not_held_ -#undef _Requires_no_locks_held_ -#undef _Requires_shared_lock_held_ -#undef _Reserved_ -#undef _Result_nullonfailure_ -#undef _Result_zeroonfailure_ -#undef _Ret_ -#undef _Ret_maybenull_ -#undef _Ret_maybenull_z_ -#undef _Ret_notnull_ -#undef _Ret_null_ -#undef _Ret_range_ -#undef _Ret_valid_ -#undef _Ret_writes_ -#undef _Ret_writes_bytes_ -#undef _Ret_writes_bytes_maybenull_ -#undef _Ret_writes_bytes_to_ -#undef _Ret_writes_bytes_to_maybenull_ -#undef _Ret_writes_maybenull_ -#undef _Ret_writes_maybenull_z_ -#undef _Ret_writes_to_ -#undef _Ret_writes_to_maybenull_ -#undef _Ret_writes_to_ptr_ -#undef _Ret_writes_to_ptr_z_ -#undef _Ret_writes_z_ -#undef _Ret_z_ -#undef _Return_type_success_ -#undef _Scanf_format_string_ -#undef _Scanf_format_string_params_ -#undef _Scanf_s_format_string_ -#undef _Scanf_s_format_string_params_ -#undef _Strict_type_match_ -#undef _Struct_size_bytes_ -#undef _Success_ -#undef _Use_decl_annotations_ -#undef _Valid_ -#undef _When_ -#undef _Writable_bytes_ -#undef _Writable_elements_ -#undef _Write_guarded_by_ -#define _Acquires_exclusive_lock_(e) -#define _Acquires_lock_(e) -#define _Acquires_nonreentrant_lock_(e) -#define _Acquires_shared_lock_(e) -#define _Always_(a) -#define _Analysis_assume_ -#define _Analysis_assume_lock_acquired_(e) -#define _Analysis_assume_lock_held_(e) -#define _Analysis_assume_lock_not_held_(e) -#define _Analysis_assume_lock_released_(e) -#define _Analysis_assume_same_lock_(e) -#define _Analysis_mode_(m) +/* From sal.h */ +#define _Always_(annos) #define _Analysis_noreturn_ -#define _Analysis_suppress_lock_checking_(e) -#define _At_(t,a) -#define _At_buffer_(t,i,c,a) -#define _Benign_race_begin_ -#define _Benign_race_end_ +#define _Analysis_assume_(expr) __analysis_assume(expr) +#define _At_(target, annos) +#define _At_buffer_(target, iter, bound, annos) #define _Check_return_ #define _COM_Outptr_ #define _COM_Outptr_opt_ #define _COM_Outptr_opt_result_maybenull_ #define _COM_Outptr_result_maybenull_ #define _Const_ -#define _Create_lock_level_(n) -#define _Deref_ -#define _Deref_in_range_(l,h) -#define _Deref_inout_range_(l,h) -#define _Deref_out_range_(l,h) -#define _Enum_is_bitflag_ -#define _Field_range_(l,h) -#define _Field_size_(s) -#define _Field_size_bytes_(s) -#define _Field_size_bytes_full_(s) -#define _Field_size_bytes_full_opt_(s) -#define _Field_size_bytes_opt_(s) -#define _Field_size_bytes_part_(s,c) -#define _Field_size_bytes_part_opt_(s,c) -#define _Field_size_full_(s) -#define _Field_size_full_opt_(s) -#define _Field_size_opt_(s) -#define _Field_size_part_(s,c) -#define _Field_size_part_opt_(s,c) -#define _Function_class_(n) -#define _Function_ignore_lock_checking_(e) -#define _Group_(a) -#define _Guarded_by_(e) -#define _Has_lock_kind_(n) -#define _Has_lock_level_(n) +#define _Deref_in_bound_ +#define _Deref_in_range_(lb,ub) +#define _Deref_inout_bound_ +#define _Deref_inout_z_ +#define _Deref_inout_z_bytecap_c_(size) +#define _Deref_inout_z_cap_c_(size) +#define _Deref_opt_out_ +#define _Deref_opt_out_opt_ +#define _Deref_opt_out_opt_z_ +#define _Deref_opt_out_z_ +#define _Deref_out_ +#define _Deref_out_bound_ +#define _Deref_out_opt_ +#define _Deref_out_opt_z_ +#define _Deref_out_range_(lb,ub) +#define _Deref_out_z_ +#define _Deref_out_z_bytecap_c_(size) +#define _Deref_out_z_cap_c_(size) +#define _Deref_post_bytecap_(size) +#define _Deref_post_bytecap_c_(size) +#define _Deref_post_bytecap_x_(size) +#define _Deref_post_bytecount_(size) +#define _Deref_post_bytecount_c_(size) +#define _Deref_post_bytecount_x_(size) +#define _Deref_post_cap_(size) +#define _Deref_post_cap_c_(size) +#define _Deref_post_cap_x_(size) +#define _Deref_post_count_(size) +#define _Deref_post_count_c_(size) +#define _Deref_post_count_x_(size) +#define _Deref_post_maybenull_ +#define _Deref_post_notnull_ +#define _Deref_post_null_ +#define _Deref_post_opt_bytecap_(size) +#define _Deref_post_opt_bytecap_c_(size) +#define _Deref_post_opt_bytecap_x_(size) +#define _Deref_post_opt_bytecount_(size) +#define _Deref_post_opt_bytecount_c_(size) +#define _Deref_post_opt_bytecount_x_(size) +#define _Deref_post_opt_cap_(size) +#define _Deref_post_opt_cap_c_(size) +#define _Deref_post_opt_cap_x_(size) +#define _Deref_post_opt_count_(size) +#define _Deref_post_opt_count_c_(size) +#define _Deref_post_opt_count_x_(size) +#define _Deref_post_opt_valid_ +#define _Deref_post_opt_valid_bytecap_(size) +#define _Deref_post_opt_valid_bytecap_c_(size) +#define _Deref_post_opt_valid_bytecap_x_(size) +#define _Deref_post_opt_valid_cap_(size) +#define _Deref_post_opt_valid_cap_c_(size) +#define _Deref_post_opt_valid_cap_x_(size) +#define _Deref_post_opt_z_ +#define _Deref_post_opt_z_bytecap_(size) +#define _Deref_post_opt_z_bytecap_c_(size) +#define _Deref_post_opt_z_bytecap_x_(size) +#define _Deref_post_opt_z_cap_(size) +#define _Deref_post_opt_z_cap_c_(size) +#define _Deref_post_opt_z_cap_x_(size) +#define _Deref_post_valid_ +#define _Deref_post_valid_bytecap_(size) +#define _Deref_post_valid_bytecap_c_(size) +#define _Deref_post_valid_bytecap_x_(size) +#define _Deref_post_valid_cap_(size) +#define _Deref_post_valid_cap_c_(size) +#define _Deref_post_valid_cap_x_(size) +#define _Deref_post_z_ +#define _Deref_post_z_bytecap_(size) +#define _Deref_post_z_bytecap_c_(size) +#define _Deref_post_z_bytecap_x_(size) +#define _Deref_post_z_cap_(size) +#define _Deref_post_z_cap_c_(size) +#define _Deref_post_z_cap_x_(size) +#define _Deref_pre_bytecap_(size) +#define _Deref_pre_bytecap_c_(size) +#define _Deref_pre_bytecap_x_(size) +#define _Deref_pre_bytecount_(size) +#define _Deref_pre_bytecount_c_(size) +#define _Deref_pre_bytecount_x_(size) +#define _Deref_pre_cap_(size) +#define _Deref_pre_cap_c_(size) +#define _Deref_pre_cap_x_(size) +#define _Deref_pre_count_(size) +#define _Deref_pre_count_c_(size) +#define _Deref_pre_count_x_(size) +#define _Deref_pre_invalid_ +#define _Deref_pre_maybenull_ +#define _Deref_pre_notnull_ +#define _Deref_pre_null_ +#define _Deref_pre_opt_bytecap_(size) +#define _Deref_pre_opt_bytecap_c_(size) +#define _Deref_pre_opt_bytecap_x_(size) +#define _Deref_pre_opt_bytecount_(size) +#define _Deref_pre_opt_bytecount_c_(size) +#define _Deref_pre_opt_bytecount_x_(size) +#define _Deref_pre_opt_cap_(size) +#define _Deref_pre_opt_cap_c_(size) +#define _Deref_pre_opt_cap_x_(size) +#define _Deref_pre_opt_count_(size) +#define _Deref_pre_opt_count_c_(size) +#define _Deref_pre_opt_count_x_(size) +#define _Deref_pre_opt_valid_ +#define _Deref_pre_opt_valid_bytecap_(size) +#define _Deref_pre_opt_valid_bytecap_c_(size) +#define _Deref_pre_opt_valid_bytecap_x_(size) +#define _Deref_pre_opt_valid_cap_(size) +#define _Deref_pre_opt_valid_cap_c_(size) +#define _Deref_pre_opt_valid_cap_x_(size) +#define _Deref_pre_opt_z_ +#define _Deref_pre_opt_z_bytecap_(size) +#define _Deref_pre_opt_z_bytecap_c_(size) +#define _Deref_pre_opt_z_bytecap_x_(size) +#define _Deref_pre_opt_z_cap_(size) +#define _Deref_pre_opt_z_cap_c_(size) +#define _Deref_pre_opt_z_cap_x_(size) +#define _Deref_pre_readonly_ +#define _Deref_pre_valid_ +#define _Deref_pre_valid_bytecap_(size) +#define _Deref_pre_valid_bytecap_c_(size) +#define _Deref_pre_valid_bytecap_x_(size) +#define _Deref_pre_valid_cap_(size) +#define _Deref_pre_valid_cap_c_(size) +#define _Deref_pre_valid_cap_x_(size) +#define _Deref_pre_writeonly_ +#define _Deref_pre_z_ +#define _Deref_pre_z_bytecap_(size) +#define _Deref_pre_z_bytecap_c_(size) +#define _Deref_pre_z_bytecap_x_(size) +#define _Deref_pre_z_cap_(size) +#define _Deref_pre_z_cap_c_(size) +#define _Deref_pre_z_cap_x_(size) +#define _Deref_prepost_bytecap_(size) +#define _Deref_prepost_bytecap_x_(size) +#define _Deref_prepost_bytecount_(size) +#define _Deref_prepost_bytecount_x_(size) +#define _Deref_prepost_cap_(size) +#define _Deref_prepost_cap_x_(size) +#define _Deref_prepost_count_(size) +#define _Deref_prepost_count_x_(size) +#define _Deref_prepost_opt_bytecap_(size) +#define _Deref_prepost_opt_bytecap_x_(size) +#define _Deref_prepost_opt_bytecount_(size) +#define _Deref_prepost_opt_bytecount_x_(size) +#define _Deref_prepost_opt_cap_(size) +#define _Deref_prepost_opt_cap_x_(size) +#define _Deref_prepost_opt_count_(size) +#define _Deref_prepost_opt_count_x_(size) +#define _Deref_prepost_opt_valid_ +#define _Deref_prepost_opt_valid_bytecap_(size) +#define _Deref_prepost_opt_valid_bytecap_x_(size) +#define _Deref_prepost_opt_valid_cap_(size) +#define _Deref_prepost_opt_valid_cap_x_(size) +#define _Deref_prepost_opt_z_ +#define _Deref_prepost_opt_z_bytecap_(size) +#define _Deref_prepost_opt_z_cap_(size) +#define _Deref_prepost_valid_ +#define _Deref_prepost_valid_bytecap_(size) +#define _Deref_prepost_valid_bytecap_x_(size) +#define _Deref_prepost_valid_cap_(size) +#define _Deref_prepost_valid_cap_x_(size) +#define _Deref_prepost_z_ +#define _Deref_prepost_z_bytecap_(size) +#define _Deref_prepost_z_cap_(size) +#define _Deref_ret_bound_ +#define _Deref_ret_opt_z_ +#define _Deref_ret_range_(lb,ub) +#define _Deref_ret_z_ +#define _Deref2_pre_readonly_ +#define _Field_range_(min,max) +#define _Field_size_(size) +#define _Field_size_bytes_(size) +#define _Field_size_bytes_full_(size) +#define _Field_size_bytes_full_opt_(size) +#define _Field_size_bytes_opt_(size) +#define _Field_size_bytes_part_(size, count) +#define _Field_size_bytes_part_opt_(size, count) +#define _Field_size_full_(size) +#define _Field_size_full_opt_(size) +#define _Field_size_opt_(size) +#define _Field_size_part_(size, count) +#define _Field_size_part_opt_(size, count) +#define _Field_z_ +#define _Function_class_(x) +#define _Group_(annos) #define _In_ -#define _In_defensive_(a) +#define _In_bound_ +#define _In_bytecount_(size) +#define _In_bytecount_c_(size) +#define _In_bytecount_x_(size) +#define _In_count_(size) +#define _In_count_c_(size) +#define _In_count_x_(size) +#define _In_defensive_(annotes) #define _In_opt_ +#define _In_opt_bytecount_(size) +#define _In_opt_bytecount_c_(size) +#define _In_opt_bytecount_x_(size) +#define _In_opt_count_(size) +#define _In_opt_count_c_(size) +#define _In_opt_count_x_(size) +#define _In_opt_ptrdiff_count_(size) #define _In_opt_z_ -#define _In_range_(l,h) -#define _In_reads_(s) -#define _In_reads_bytes_(s) -#define _In_reads_bytes_opt_(s) -#define _In_reads_opt_(s) -#define _In_reads_opt_z_(s) -#define _In_reads_or_z_(s) -#define _In_reads_to_ptr_(p) -#define _In_reads_to_ptr_opt_(p) -#define _In_reads_to_ptr_opt_z_(p) -#define _In_reads_to_ptr_z_(p) -#define _In_reads_z_(s) +#define _In_opt_z_bytecount_(size) +#define _In_opt_z_bytecount_c_(size) +#define _In_opt_z_count_(size) +#define _In_opt_z_count_c_(size) +#define _In_ptrdiff_count_(size) +#define _In_range_(lb,ub) +#define _In_reads_(size) +#define _In_reads_bytes_(size) +#define _In_reads_bytes_opt_(size) +#define _In_reads_opt_(size) +#define _In_reads_opt_z_(size) +#define _In_reads_or_z_(size) +#define _In_reads_to_ptr_(ptr) +#define _In_reads_to_ptr_opt_(ptr) +#define _In_reads_to_ptr_opt_z_(ptr) +#define _In_reads_to_ptr_z_(ptr) +#define _In_reads_z_(size) #define _In_z_ +#define _In_z_bytecount_(size) +#define _In_z_bytecount_c_(size) +#define _In_z_count_(size) +#define _In_z_count_c_(size) #define _Inout_ -#define _Inout_defensive_(a) +#define _Inout_bytecap_(size) +#define _Inout_bytecap_c_(size) +#define _Inout_bytecap_x_(size) +#define _Inout_bytecount_(size) +#define _Inout_bytecount_c_(size) +#define _Inout_bytecount_x_(size) +#define _Inout_cap_(size) +#define _Inout_cap_c_(size) +#define _Inout_cap_x_(size) +#define _Inout_count_(size) +#define _Inout_count_c_(size) +#define _Inout_count_x_(size) +#define _Inout_defensive_(annotes) #define _Inout_opt_ +#define _Inout_opt_bytecap_(size) +#define _Inout_opt_bytecap_c_(size) +#define _Inout_opt_bytecap_x_(size) +#define _Inout_opt_bytecount_(size) +#define _Inout_opt_bytecount_c_(size) +#define _Inout_opt_bytecount_x_(size) +#define _Inout_opt_cap_(size) +#define _Inout_opt_cap_c_(size) +#define _Inout_opt_cap_x_(size) +#define _Inout_opt_count_(size) +#define _Inout_opt_count_c_(size) +#define _Inout_opt_count_x_(size) +#define _Inout_opt_ptrdiff_count_(size) #define _Inout_opt_z_ -#define _Inout_updates_(s) -#define _Inout_updates_all_(s) -#define _Inout_updates_all_opt_(s) -#define _Inout_updates_bytes_(s) -#define _Inout_updates_bytes_all_(s) -#define _Inout_updates_bytes_all_opt_(s) -#define _Inout_updates_bytes_opt_(s) -#define _Inout_updates_bytes_to_(s,c) -#define _Inout_updates_bytes_to_opt_(s,c) -#define _Inout_updates_opt_(s) -#define _Inout_updates_opt_z_(s) -#define _Inout_updates_to_(s,c) -#define _Inout_updates_to_opt_(s,c) -#define _Inout_updates_z_(s) +#define _Inout_opt_z_bytecap_(size) +#define _Inout_opt_z_bytecap_c_(size) +#define _Inout_opt_z_bytecap_x_(size) +#define _Inout_opt_z_bytecount_(size) +#define _Inout_opt_z_bytecount_c_(size) +#define _Inout_opt_z_cap_(size) +#define _Inout_opt_z_cap_c_(size) +#define _Inout_opt_z_cap_x_(size) +#define _Inout_opt_z_count_(size) +#define _Inout_opt_z_count_c_(size) +#define _Inout_ptrdiff_count_(size) +#define _Inout_updates_(size) +#define _Inout_updates_all_(size) +#define _Inout_updates_all_opt_(size) +#define _Inout_updates_bytes_(size) +#define _Inout_updates_bytes_all_(size) +#define _Inout_updates_bytes_all_opt_(size) +#define _Inout_updates_bytes_opt_(size) +#define _Inout_updates_bytes_to_(size,count) +#define _Inout_updates_bytes_to_opt_(size,count) +#define _Inout_updates_opt_(size) +#define _Inout_updates_opt_z_(size) +#define _Inout_updates_to_(size,count) +#define _Inout_updates_to_opt_(size,count) +#define _Inout_updates_z_(size) #define _Inout_z_ -#define _Interlocked_ +#define _Inout_z_bytecap_(size) +#define _Inout_z_bytecap_c_(size) +#define _Inout_z_bytecap_x_(size) +#define _Inout_z_bytecount_(size) +#define _Inout_z_bytecount_c_(size) +#define _Inout_z_cap_(size) +#define _Inout_z_cap_c_(size) +#define _Inout_z_cap_x_(size) +#define _Inout_z_count_(size) +#define _Inout_z_count_c_(size) #define _Interlocked_operand_ -#define _IRQL_always_function_max_(i) -#define _IRQL_always_function_min_(i) -#define _IRQL_is_cancel_ -#define _IRQL_raises_(i) -#define _IRQL_requires_(i) -#define _IRQL_requires_max_(i) -#define _IRQL_requires_min_(i) -#define _IRQL_requires_same_ -#define _IRQL_restores_ -#define _IRQL_restores_global_(k,s) -#define _IRQL_saves_ -#define _IRQL_saves_global_(k,s) -#define _IRQL_uses_cancel_ -#define _Kernel_acquires_resource_(k) -#define _Kernel_clear_do_init_(yn) -#define _Kernel_float_restored_ -#define _Kernel_float_saved_ -#define _Kernel_float_used_ -#define _Kernel_IoGetDmaAdapter_ -#define _Kernel_releases_resource_(k) -#define _Kernel_requires_resource_held_(k) -#define _Kernel_requires_resource_not_held_(k) #define _Literal_ -#define _Lock_level_order_(n1,n2) -#define _Maybe_raises_SEH_exception_ #define _Maybenull_ +#define _Maybevalid_ +#define _Maybe_raises_SEH_exception #define _Must_inspect_result_ -#define _No_competing_thread_ -#define _No_competing_thread_begin_ -#define _No_competing_thread_end_ #define _Notliteral_ #define _Notnull_ +#define _Notref_ #define _Notvalid_ #define _Null_ #define _Null_terminated_ #define _NullNull_terminated_ -#define _On_failure_(a) +#define _On_failure_(annos) #define _Out_ -#define _Out_defensive_(a) +#define _Out_bound_ +#define _Out_bytecap_(size) +#define _Out_bytecap_c_(size) +#define _Out_bytecap_post_bytecount_(cap,count) +#define _Out_bytecap_x_(size) +#define _Out_bytecapcount_(capcount) +#define _Out_bytecapcount_x_(capcount) +#define _Out_cap_(size) +#define _Out_cap_c_(size) +#define _Out_cap_m_(mult,size) +#define _Out_cap_post_count_(cap,count) +#define _Out_cap_x_(size) +#define _Out_capcount_(capcount) +#define _Out_capcount_x_(capcount) +#define _Out_defensive_(annotes) #define _Out_opt_ -#define _Out_range_(l,h) -#define _Out_writes_(s) -#define _Out_writes_all_(s) -#define _Out_writes_all_opt_(s) -#define _Out_writes_bytes_(s) -#define _Out_writes_bytes_all_(s) -#define _Out_writes_bytes_all_opt_(s) -#define _Out_writes_bytes_opt_(s) -#define _Out_writes_bytes_to_(s,c) -#define _Out_writes_bytes_to_opt_(s,c) -#define _Out_writes_opt_(s) -#define _Out_writes_opt_z_(s) -#define _Out_writes_to_(s,c) -#define _Out_writes_to_opt_(s,c) -#define _Out_writes_to_ptr_(p) -#define _Out_writes_to_ptr_opt_(p) -#define _Out_writes_to_ptr_opt_z_(p) -#define _Out_writes_to_ptr_z_(p) -#define _Out_writes_z_(s) +#define _Out_opt_bytecap_(size) +#define _Out_opt_bytecap_c_(size) +#define _Out_opt_bytecap_post_bytecount_(cap,count) +#define _Out_opt_bytecap_x_(size) +#define _Out_opt_bytecapcount_(capcount) +#define _Out_opt_bytecapcount_x_(capcount) +#define _Out_opt_cap_(size) +#define _Out_opt_cap_c_(size) +#define _Out_opt_cap_m_(mult,size) +#define _Out_opt_cap_post_count_(cap,count) +#define _Out_opt_cap_x_(size) +#define _Out_opt_capcount_(capcount) +#define _Out_opt_capcount_x_(capcount) +#define _Out_opt_ptrdiff_cap_(size) +#define _Out_opt_z_bytecap_(size) +#define _Out_opt_z_bytecap_c_(size) +#define _Out_opt_z_bytecap_post_bytecount_(cap,count) +#define _Out_opt_z_bytecap_x_(size) +#define _Out_opt_z_bytecapcount_(capcount) +#define _Out_opt_z_cap_(size) +#define _Out_opt_z_cap_c_(size) +#define _Out_opt_z_cap_m_(mult,size) +#define _Out_opt_z_cap_post_count_(cap,count) +#define _Out_opt_z_cap_x_(size) +#define _Out_opt_z_capcount_(capcount) +#define _Out_ptrdiff_cap_(size) +#define _Out_range_(lb,ub) +#define _Out_writes_(size) +#define _Out_writes_all_(size) +#define _Out_writes_all_opt_(size) +#define _Out_writes_bytes_(size) +#define _Out_writes_bytes_all_(size) +#define _Out_writes_bytes_all_opt_(size) +#define _Out_writes_bytes_opt_(size) +#define _Out_writes_bytes_to_(size,count) +#define _Out_writes_bytes_to_opt_(size,count) +#define _Out_writes_opt_(size) +#define _Out_writes_opt_z_(size) +#define _Out_writes_to_(size,count) +#define _Out_writes_to_opt_(size,count) +#define _Out_writes_to_ptr_(ptr) +#define _Out_writes_to_ptr_opt_(ptr) +#define _Out_writes_to_ptr_opt_z_(ptr) +#define _Out_writes_to_ptr_z_(ptr) +#define _Out_writes_z_(size) +#define _Out_z_bytecap_(size) +#define _Out_z_bytecap_c_(size) +#define _Out_z_bytecap_post_bytecount_(cap,count) +#define _Out_z_bytecap_x_(size) +#define _Out_z_bytecapcount_(capcount) +#define _Out_z_cap_(size) +#define _Out_z_cap_c_(size) +#define _Out_z_cap_m_(mult,size) +#define _Out_z_cap_post_count_(cap,count) +#define _Out_z_cap_x_(size) +#define _Out_z_capcount_(capcount) #define _Outptr_ #define _Outptr_opt_ -#define _Outptr_opt_result_buffer_(s) -#define _Outptr_opt_result_buffer_to_(s,c) -#define _Outptr_opt_result_bytebuffer_(s) -#define _Outptr_opt_result_bytebuffer_to_(s,c) +#define _Outptr_opt_result_buffer_(size) +#define _Outptr_opt_result_buffer_all_(size) +#define _Outptr_opt_result_buffer_all_maybenull_(size) +#define _Outptr_opt_result_buffer_maybenull_(size) +#define _Outptr_opt_result_buffer_to_(size, count) +#define _Outptr_opt_result_buffer_to_maybenull_(size, count) +#define _Outptr_opt_result_bytebuffer_(size) +#define _Outptr_opt_result_bytebuffer_all_(size) +#define _Outptr_opt_result_bytebuffer_all_maybenull_(size) +#define _Outptr_opt_result_bytebuffer_maybenull_(size) +#define _Outptr_opt_result_bytebuffer_to_(size, count) +#define _Outptr_opt_result_bytebuffer_to_maybenull_(size, count) #define _Outptr_opt_result_maybenull_ #define _Outptr_opt_result_maybenull_z_ #define _Outptr_opt_result_nullonfailure_ #define _Outptr_opt_result_z_ -#define _Outptr_result_buffer_(s) -#define _Outptr_result_buffer_to_(s,c) -#define _Outptr_result_bytebuffer_(s) -#define _Outptr_result_bytebuffer_to_(s,c) +#define _Outptr_result_buffer_(size) +#define _Outptr_result_buffer_all_(size) +#define _Outptr_result_buffer_all_maybenull_(size) +#define _Outptr_result_buffer_maybenull_(size) +#define _Outptr_result_buffer_to_(size, count) +#define _Outptr_result_buffer_to_maybenull_(size, count) +#define _Outptr_result_bytebuffer_(size) +#define _Outptr_result_bytebuffer_all_(size) +#define _Outptr_result_bytebuffer_all_maybenull_(size) +#define _Outptr_result_bytebuffer_maybenull_(size) +#define _Outptr_result_bytebuffer_to_(size, count) +#define _Outptr_result_bytebuffer_to_maybenull_(size, count) #define _Outptr_result_maybenull_ #define _Outptr_result_maybenull_z_ #define _Outptr_result_nullonfailure_ #define _Outptr_result_z_ #define _Outref_ -#define _Outref_result_buffer_(s) -#define _Outref_result_buffer_all_(s) -#define _Outref_result_buffer_all_maybenull_(s) -#define _Outref_result_buffer_maybenull_(s) -#define _Outref_result_buffer_to_(s,c) -#define _Outref_result_buffer_to_maybenull_(s,c) -#define _Outref_result_bytebuffer_(s) -#define _Outref_result_bytebuffer_all_(s) -#define _Outref_result_bytebuffer_all_maybenull_(s) -#define _Outref_result_bytebuffer_maybenull_(s) -#define _Outref_result_bytebuffer_to_(s,c) -#define _Outref_result_bytebuffer_to_maybenull_(s,c) +#define _Outref_result_buffer_(size) +#define _Outref_result_buffer_all_(size) +#define _Outref_result_buffer_all_maybenull_(size) +#define _Outref_result_buffer_maybenull_(size) +#define _Outref_result_buffer_to_(size, count) +#define _Outref_result_buffer_to_maybenull_(size, count) +#define _Outref_result_bytebuffer_(size) +#define _Outref_result_bytebuffer_all_(size) +#define _Outref_result_bytebuffer_all_maybenull_(size) +#define _Outref_result_bytebuffer_maybenull_(size) +#define _Outref_result_bytebuffer_to_(size, count) +#define _Outref_result_bytebuffer_to_maybenull_(size, count) #define _Outref_result_maybenull_ #define _Outref_result_nullonfailure_ #define _Points_to_data_ #define _Post_ +#define _Post_bytecap_(size) +#define _Post_bytecount_(size) +#define _Post_bytecount_c_(size) +#define _Post_bytecount_x_(size) +#define _Post_cap_(size) +#define _Post_count_(size) +#define _Post_count_c_(size) +#define _Post_count_x_(size) #define _Post_defensive_ -#define _Post_equal_to_(e) -#define _Post_invalid_ _Post_ _Deref_ _Notvalid_ -#define _Post_ptr_invalid_ _Post_ _Notvalid_ -#define _Post_readable_byte_size_(s) _Post_ _Readable_bytes_(s) _Post_ _Valid_ -#define _Post_readable_size_(s) _Post_ _Readable_elements_(s) _Post_ _Valid_ -#define _Post_same_lock_(e1,e2) -#define _Post_satisfies_(e) -#define _Post_valid_ _Post_ _Valid_ -#define _Post_writable_byte_size_(s) _Post_ _Writable_bytes_(s) -#define _Post_writable_size_(s) _Post_ _Writable_elements_(s) -#define _Post_z_ _Post_ _Null_terminated_ +#define _Post_equal_to_(expr) +#define _Post_invalid_ +#define _Post_maybenull_ +#define _Post_maybez_ +#define _Post_notnull_ +#define _Post_null_ +#define _Post_ptr_invalid_ +#define _Post_readable_byte_size_(size) +#define _Post_readable_size_(size) +#define _Post_satisfies_(cond) +#define _Post_valid_ +#define _Post_writable_byte_size_(size) +#define _Post_writable_size_(size) +#define _Post_z_ +#define _Post_z_bytecount_(size) +#define _Post_z_bytecount_c_(size) +#define _Post_z_bytecount_x_(size) +#define _Post_z_count_(size) +#define _Post_z_count_c_(size) +#define _Post_z_count_x_(size) #define _Pre_ +#define _Pre_bytecap_(size) +#define _Pre_bytecap_c_(size) +#define _Pre_bytecap_x_(size) +#define _Pre_bytecount_(size) +#define _Pre_bytecount_c_(size) +#define _Pre_bytecount_x_(size) +#define _Pre_cap_(size) +#define _Pre_cap_c_(size) +#define _Pre_cap_c_one_ +#define _Pre_cap_for_(param) +#define _Pre_cap_m_(mult,size) +#define _Pre_cap_x_(size) +#define _Pre_count_(size) +#define _Pre_count_c_(size) +#define _Pre_count_x_(size) #define _Pre_defensive_ -#define _Pre_equal_to_(e) -#define _Pre_maybenull_ _Pre_ _Maybenull_ -#define _Pre_notnull_ _Pre_ _Notnull_ -#define _Pre_null_ _Pre_ _Null_ -#define _Pre_opt_valid_ _Pre_maybenull_ _Pre_ _Valid_ -#define _Pre_readable_byte_size_(s) _Pre_ _Readable_bytes_(s) _Pre_ _Valid_ -#define _Pre_readable_size_(s) _Pre_ _Readable_elements_(s) _Pre_ _Valid_ -#define _Pre_satisfies_(e) +#define _Pre_equal_to_(expr) +#define _Pre_invalid_ +#define _Pre_maybenull_ +#define _Pre_notnull_ +#define _Pre_null_ +#define _Pre_opt_bytecap_(size) +#define _Pre_opt_bytecap_c_(size) +#define _Pre_opt_bytecap_x_(size) +#define _Pre_opt_bytecount_(size) +#define _Pre_opt_bytecount_c_(size) +#define _Pre_opt_bytecount_x_(size) +#define _Pre_opt_cap_(size) +#define _Pre_opt_cap_c_(size) +#define _Pre_opt_cap_c_one_ +#define _Pre_opt_cap_for_(param) +#define _Pre_opt_cap_m_(mult,size) +#define _Pre_opt_cap_x_(size) +#define _Pre_opt_count_(size) +#define _Pre_opt_count_c_(size) +#define _Pre_opt_count_x_(size) +#define _Pre_opt_ptrdiff_cap_(ptr) +#define _Pre_opt_ptrdiff_count_(ptr) +#define _Pre_opt_valid_ +#define _Pre_opt_valid_bytecap_(size) +#define _Pre_opt_valid_bytecap_c_(size) +#define _Pre_opt_valid_bytecap_x_(size) +#define _Pre_opt_valid_cap_(size) +#define _Pre_opt_valid_cap_c_(size) +#define _Pre_opt_valid_cap_x_(size) +#define _Pre_opt_z_ +#define _Pre_opt_z_bytecap_(size) +#define _Pre_opt_z_bytecap_c_(size) +#define _Pre_opt_z_bytecap_x_(size) +#define _Pre_opt_z_cap_(size) +#define _Pre_opt_z_cap_c_(size) +#define _Pre_opt_z_cap_x_(size) +#define _Pre_ptrdiff_cap_(ptr) +#define _Pre_ptrdiff_count_(ptr) +#define _Pre_readable_byte_size_(size) +#define _Pre_readable_size_(size) +#define _Pre_readonly_ +#define _Pre_satisfies_(cond) #define _Pre_unknown_ -#define _Pre_valid_ _Pre_notnull_ _Pre_ _Valid_ -#define _Pre_writable_byte_size_(s) _Pre_ _Writable_bytes_(s) -#define _Pre_writable_size_(s) _Pre_ _Writable_elements_(s) -#define _Pre_z_ _Pre_ _Null_terminated_ -#define _Prepost_z_ _Pre_z_ _Post_z_ +#define _Pre_valid_ +#define _Pre_valid_bytecap_(size) +#define _Pre_valid_bytecap_c_(size) +#define _Pre_valid_bytecap_x_(size) +#define _Pre_valid_cap_(size) +#define _Pre_valid_cap_c_(size) +#define _Pre_valid_cap_x_(size) +#define _Pre_writable_byte_size_(size) +#define _Pre_writable_size_(size) +#define _Pre_writeonly_ +#define _Pre_z_ +#define _Pre_z_bytecap_(size) +#define _Pre_z_bytecap_c_(size) +#define _Pre_z_bytecap_x_(size) +#define _Pre_z_cap_(size) +#define _Pre_z_cap_c_(size) +#define _Pre_z_cap_x_(size) +#define _Prepost_bytecount_(size) +#define _Prepost_bytecount_c_(size) +#define _Prepost_bytecount_x_(size) +#define _Prepost_count_(size) +#define _Prepost_count_c_(size) +#define _Prepost_count_x_(size) +#define _Prepost_opt_bytecount_(size) +#define _Prepost_opt_bytecount_c_(size) +#define _Prepost_opt_bytecount_x_(size) +#define _Prepost_opt_count_(size) +#define _Prepost_opt_count_c_(size) +#define _Prepost_opt_count_x_(size) +#define _Prepost_opt_valid_ +#define _Prepost_opt_z_ +#define _Prepost_valid_ +#define _Prepost_z_ #define _Printf_format_string_ -#define _Printf_format_string_params_(x) #define _Raises_SEH_exception_ -#define _Readable_bytes_(s) -#define _Readable_elements_(s) -#define _Releases_exclusive_lock_(e) -#define _Releases_lock_(e) -#define _Releases_nonreentrant_lock_(e) -#define _Releases_shared_lock_(e) -#define _Requires_exclusive_lock_held_(e) -#define _Requires_lock_held_(e) -#define _Requires_lock_not_held_(e) -#define _Requires_no_locks_held_ -#define _Requires_shared_lock_held_(e) -#define _Reserved_ _Pre_equal_to_(0) _Pre_ _Null_ +#define _Maybe_raises_SEH_exception_ +#define _Readable_bytes_(size) +#define _Readable_elements_(size) +#define _Reserved_ #define _Result_nullonfailure_ #define _Result_zeroonfailure_ #define _Ret_ +#define _Ret_bound_ +#define _Ret_bytecap_(size) +#define _Ret_bytecap_c_(size) +#define _Ret_bytecap_x_(size) +#define _Ret_bytecount_(size) +#define _Ret_bytecount_c_(size) +#define _Ret_bytecount_x_(size) +#define _Ret_cap_(size) +#define _Ret_cap_c_(size) +#define _Ret_cap_x_(size) +#define _Ret_count_(size) +#define _Ret_count_c_(size) +#define _Ret_count_x_(size) #define _Ret_maybenull_ #define _Ret_maybenull_z_ #define _Ret_notnull_ #define _Ret_null_ -#define _Ret_range_(l,h) +#define _Ret_opt_ +#define _Ret_opt_bytecap_(size) +#define _Ret_opt_bytecap_c_(size) +#define _Ret_opt_bytecap_x_(size) +#define _Ret_opt_bytecount_(size) +#define _Ret_opt_bytecount_c_(size) +#define _Ret_opt_bytecount_x_(size) +#define _Ret_opt_cap_(size) +#define _Ret_opt_cap_c_(size) +#define _Ret_opt_cap_x_(size) +#define _Ret_opt_count_(size) +#define _Ret_opt_count_c_(size) +#define _Ret_opt_count_x_(size) +#define _Ret_opt_valid_ +#define _Ret_opt_z_ +#define _Ret_opt_z_bytecap_(size) +#define _Ret_opt_z_bytecount_(size) +#define _Ret_opt_z_cap_(size) +#define _Ret_opt_z_count_(size) +#define _Ret_range_(lb,ub) #define _Ret_valid_ -#define _Ret_writes_(s) -#define _Ret_writes_bytes_(s) -#define _Ret_writes_bytes_maybenull_(s) -#define _Ret_writes_bytes_to_(s,c) -#define _Ret_writes_bytes_to_maybenull_(s,c) -#define _Ret_writes_maybenull_(s) -#define _Ret_writes_maybenull_z_(s) -#define _Ret_writes_to_(s,c) -#define _Ret_writes_to_maybenull_(s,c) -#define _Ret_writes_to_ptr_(p) -#define _Ret_writes_to_ptr_z_(p) -#define _Ret_writes_z_(s) +#define _Ret_writes_(size) +#define _Ret_writes_bytes_(size) +#define _Ret_writes_bytes_maybenull_(size) +#define _Ret_writes_bytes_to_(size,count) +#define _Ret_writes_bytes_to_maybenull_(size,count) +#define _Ret_writes_maybenull_(size) +#define _Ret_writes_maybenull_z_(size) +#define _Ret_writes_to_(size,count) +#define _Ret_writes_to_maybenull_(size,count) +#define _Ret_writes_z_(size) #define _Ret_z_ -#define _Return_type_success_(c) +#define _Ret_z_bytecap_(size) +#define _Ret_z_bytecount_(size) +#define _Ret_z_cap_(size) +#define _Ret_z_count_(size) +#define _Return_type_success_(expr) #define _Scanf_format_string_ -#define _Scanf_format_string_params_(x) #define _Scanf_s_format_string_ -#define _Scanf_s_format_string_params_(x) -#define _Strict_type_match_ -#define _Struct_size_bytes_(s) -#define _Success_(c) +#define _Struct_size_bytes_(size) +#define _Success_(expr) +#define _Unchanged_(e) #define _Use_decl_annotations_ #define _Valid_ -#define _When_(c,a) -#define _Writable_bytes_(s) -#define _Writable_elements_(s) -#define _Write_guarded_by_(e) +#define _When_(expr, annos) +#define _Writable_bytes_(size) +#define _Writable_elements_(size) + +/* driverspecs.h */ +#define _Dispatch_type_(type) +#define _IRQL_always_function_max_(irql) +#define _IRQL_always_function_min_(irql) +#define _IRQL_is_cancel_ +#define _IRQL_raises_(irql) +#define _IRQL_requires_(irql) +#define _IRQL_requires_max_(irql) +#define _IRQL_requires_min_(irql) +#define _IRQL_requires_same_ +#define _IRQL_restores_ +#define _IRQL_restores_global_(kind,param) +#define _IRQL_saves_ +#define _IRQL_saves_global_(kind,param) +#define _IRQL_uses_cancel_ +#define _Kernel_clear_do_init_(yesNo) +#define _Kernel_float_restored_ +#define _Kernel_float_saved_ +#define _Kernel_float_used_ +#define _Kernel_IoGetDmaAdapter_ +#define _Kernel_releases_resource_(kind) +#define _Kernel_requires_resource_held_(kind) +#define _Kernel_requires_resource_not_held_(kind) +#define _Kernel_acquires_resource_(kind) +#define _Landmark_(name) + +/* concurrencysal.h */ +#define _Benign_race_begin_ __pragma(warning(push)) +#define _Benign_race_end_ __pragma(warning(pop)) +#define _No_competing_thread_begin_ __pragma(warning(push)) +#define _No_competing_thread_end_ __pragma(warning(pop)) +#define _Acquires_exclusive_lock_(lock) +#define _Acquires_lock_(lock) +#define _Acquires_nonreentrant_lock_(lock) +#define _Acquires_shared_lock_(lock) +#define _Analysis_assume_lock_acquired_(lock) +#define _Analysis_assume_lock_released_(lock) +#define _Analysis_assume_lock_held_(lock) +#define _Analysis_assume_lock_not_held_(lock) +#define _Analysis_assume_same_lock_(lock1, lock2) +#define _Analysis_suppress_lock_checking_(lock) +#define _Create_lock_level_(level) +#define _Csalcat1_(x,y) +#define _Csalcat2_(x,y) +#define _Function_ignore_lock_checking_(lock) +#define _Guarded_by_(lock) +#define _Has_lock_kind_(kind) +#define _Has_lock_level_(level) +#define _Interlocked_ +#define _Internal_lock_level_order_(a,b) +#define _Lock_level_order_(a,b) +#define _No_competing_thread_ +#define _Post_same_lock_(lock1,lock2) +#define _Releases_exclusive_lock_(lock) +#define _Releases_lock_(lock) +#define _Releases_nonreentrant_lock_(lock) +#define _Releases_shared_lock_(lock) +#define _Requires_exclusive_lock_held_(lock) +#define _Requires_shared_lock_held_(lock) +#define _Requires_lock_held_(lock) +#define _Requires_lock_not_held_(lock) +#define _Requires_no_locks_held_ +#define _Write_guarded_by_(lock)

9 years, 9 months

[tkreuzer] 66654: [SAL] - kernelspecs.h: Add IRQL level defines, remove a duplicate annotation and make some definitions more consistent - concurrencysal.h: Add missing annotations (only dummies so...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 10 09:10:00 2015 New Revision: 66654 URL: http://svn.reactos.org/svn/reactos?rev=66654&view=rev Log: [SAL] - kernelspecs.h: Add IRQL level defines, remove a duplicate annotation and make some definitions more consistent - concurrencysal.h: Add missing annotations (only dummies so far) - driverspecs.h: Add some missing annotations - sal_old.h: remove __inner_callback, which is in sal.h Modified: trunk/reactos/include/ddk/kernelspecs.h trunk/reactos/include/psdk/concurrencysal.h trunk/reactos/include/psdk/driverspecs.h trunk/reactos/include/psdk/sal_old.h Modified: trunk/reactos/include/ddk/kernelspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/kernelspecs.h?… ============================================================================== --- trunk/reactos/include/ddk/kernelspecs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/kernelspecs.h [iso-8859-1] Tue Mar 10 09:10:00 2015 @@ -26,6 +26,20 @@ #include "driverspecs.h" #ifdef _PREFAST_ + +/* Make sure we have IRQL level definitions early */ +#define DISPATCH_LEVEL 2 +#define APC_LEVEL 1 +#define PASSIVE_LEVEL 0 +#if defined(_X86_) +#define HIGH_LEVEL 31 +#elif defined(_AMD64_) +#define HIGH_LEVEL 15 +#elif defined(_ARM_) +#define HIGH_LEVEL 15 +#elif defined(_IA64_) +#define HIGH_LEVEL 15 +#endif #undef _IRQL_always_function_max_ #undef _IRQL_always_function_min_ @@ -68,18 +82,18 @@ #define _IRQL_saves_global_(kind,param) _Post_ _SA_annotes2(SAL_saveIRQLGlobal,#kind, param\t) #define _IRQL_uses_cancel_ _Post_ _SA_annotes0(SAL_UseCancelIrql) #define _IRQL_is_cancel_ _IRQL_uses_cancel_ _Releases_nonreentrant_lock_(_Global_cancel_spin_lock_) \ - _At_(return, _IRQL_always_function_min_(2 /*DISPATCH_LEVEL*/) _IRQL_requires_(2 /*DISPATCH_LEVEL*/)) + _At_(return, _IRQL_always_function_min_(DISPATCH_LEVEL) _IRQL_requires_(DISPATCH_LEVEL)) #define __drv_setsIRQL(irql) _Post_ _SA_annotes1(SAL_IRQL,irql) -#define __drv_raisesIRQL _IRQL_raises_ -#define __drv_requiresIRQL _IRQL_requires_ -#define __drv_maxIRQL _IRQL_requires_max_ -#define __drv_minIRQL _IRQL_requires_min_ +#define __drv_raisesIRQL(irql) _IRQL_raises_(irql) +#define __drv_requiresIRQL(irql) _IRQL_requires_(irql) +#define __drv_maxIRQL(irql) _IRQL_requires_max_(irql) +#define __drv_minIRQL(irql) _IRQL_requires_min_(irql) #define __drv_savesIRQL _IRQL_saves_ -#define __drv_savesIRQLGlobal _IRQL_saves_global_ +#define __drv_savesIRQLGlobal(kind,param) _IRQL_saves_global_(kind,param) #define __drv_restoresIRQL _IRQL_restores_ -#define __drv_restoresIRQLGlobal _IRQL_restores_global_ -#define __drv_minFunctionIRQL _IRQL_always_function_min_ -#define __drv_maxFunctionIRQL _IRQL_always_function_max_ +#define __drv_restoresIRQLGlobal(kind,param) _IRQL_restores_global_(kind,param) +#define __drv_minFunctionIRQL(irql) _IRQL_always_function_min_(irql) +#define __drv_maxFunctionIRQL(irql) _IRQL_always_function_max_(irql) #define __drv_sameIRQL _IRQL_requires_same_ #define __drv_useCancelIRQL _IRQL_uses_cancel_ #define __drv_isCancelIRQL _IRQL_is_cancel_ @@ -90,7 +104,6 @@ __ANNOTATION(SAL_IRQL(__int64);) __ANNOTATION(SAL_raiseIRQL(__int64);) -__ANNOTATION(SAL_IRQL(__int64);) __ANNOTATION(SAL_maxIRQL(__int64);) __ANNOTATION(SAL_minIRQL(__int64);) __ANNOTATION(SAL_saveIRQL(void);) Modified: trunk/reactos/include/psdk/concurrencysal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/concurrencysa… ============================================================================== --- trunk/reactos/include/psdk/concurrencysal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/concurrencysal.h [iso-8859-1] Tue Mar 10 09:10:00 2015 @@ -20,13 +20,98 @@ * */ +#if defined(_PREFAST_) + +#define _Benign_race_begin_ __pragma(warning(push)) __pragma(warning(disable:26100 26101 26150 26130 26180 26131 26181 28112)) +#define _Benign_race_end_ __pragma(warning(pop)) +#define _No_competing_thread_begin_ __pragma(warning(push)) __pragma(warning(disable:26100 26101 26150 26101 26151 26110 26160 26130 26180 26131 26181 28112)) +#define _No_competing_thread_end_ __pragma(warning(pop)) + +#define _Acquires_exclusive_lock_(lock) +#define _Acquires_lock_(lock) +#define _Acquires_nonreentrant_lock_(lock) +#define _Acquires_shared_lock_(lock) +#define _Analysis_assume_lock_acquired_(lock) +#define _Analysis_assume_lock_released_(lock) +#define _Analysis_assume_lock_held_(lock) +#define _Analysis_assume_lock_not_held_(lock) +#define _Analysis_assume_same_lock_(lock1, lock2) +#define _Analysis_suppress_lock_checking_(lock) +#define _Create_lock_level_(level) +#define _Csalcat1_(x,y) +#define _Csalcat2_(x,y) +#define _Function_ignore_lock_checking_(lock) +#define _Guarded_by_(lock) +#define _Has_lock_kind_(kind) +#define _Has_lock_level_(level) +#define _Interlocked_ +#define _Internal_lock_level_order_(a,b) +#define _Lock_level_order_(a,b) +#define _No_competing_thread_ +#define _Post_same_lock_(lock1,lock2) +#define _Releases_exclusive_lock_(lock) +#define _Releases_lock_(lock) +#define _Releases_nonreentrant_lock_(lock) +#define _Releases_shared_lock_(lock) +#define _Requires_exclusive_lock_held_(lock) +#define _Requires_shared_lock_held_(lock) +#define _Requires_lock_held_(lock) +#define _Requires_lock_not_held_(lock) +#define _Requires_no_locks_held_ +#define _Write_guarded_by_(lock) +const char _Lock_kind_mutex_[] = ""; +const char _Lock_kind_event_[] = ""; +const char _Lock_kind_semaphore_[] = ""; +const char _Lock_kind_spin_lock_[] = ""; +const char _Lock_kind_critical_section_[] = ""; + +#else /* _PREFAST_ */ + +#define _Benign_race_begin_ __pragma(warning(push)) +#define _Benign_race_end_ __pragma(warning(pop)) +#define _No_competing_thread_begin_ __pragma(warning(push)) +#define _No_competing_thread_end_ __pragma(warning(pop)) + +#define _Acquires_exclusive_lock_(lock) +#define _Acquires_lock_(lock) +#define _Acquires_nonreentrant_lock_(lock) +#define _Acquires_shared_lock_(lock) +#define _Analysis_assume_lock_acquired_(lock) +#define _Analysis_assume_lock_released_(lock) +#define _Analysis_assume_lock_held_(lock) +#define _Analysis_assume_lock_not_held_(lock) +#define _Analysis_assume_same_lock_(lock1, lock2) +#define _Analysis_suppress_lock_checking_(lock) +#define _Create_lock_level_(level) +#define _Csalcat1_(x,y) +#define _Csalcat2_(x,y) +#define _Function_ignore_lock_checking_(lock) +#define _Guarded_by_(lock) +#define _Has_lock_kind_(kind) +#define _Has_lock_level_(level) +#define _Interlocked_ +#define _Internal_lock_level_order_(a,b) +#define _Lock_level_order_(a,b) +#define _No_competing_thread_ +#define _Post_same_lock_(lock1,lock2) +#define _Releases_exclusive_lock_(lock) +#define _Releases_lock_(lock) +#define _Releases_nonreentrant_lock_(lock) +#define _Releases_shared_lock_(lock) +#define _Requires_exclusive_lock_held_(lock) +#define _Requires_shared_lock_held_(lock) #define _Requires_lock_held_(lock) #define _Requires_lock_not_held_(lock) -#define _Acquires_lock_(lock) -#define _Acquires_shared_lock_(lock) -#define _Acquires_exclusive_lock_(lock) -#define _Releases_lock_(lock) -#define _Post_same_lock_(lock1,lock2) +#define _Requires_no_locks_held_ +#define _Write_guarded_by_(lock) +#endif /* _PREFAST_ */ + +#if 0 /* Check these */ +#define _Internal_set_lock_count_(lock, count) +#define _Internal_set_lock_count_to_zero_(lock) +#define _Internal_set_lock_count_to_one_(lock) +#endif // 0 + Modified: trunk/reactos/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h… ============================================================================== --- trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] Tue Mar 10 09:10:00 2015 @@ -13,6 +13,7 @@ #include <specstrings.h> #endif +//#include "sdv_driverspecs.h" #include <concurrencysal.h> #ifdef _PREFAST_ @@ -34,7 +35,7 @@ #define _IRQL_uses_cancel_ #define __drv_setsIRQL(irql) -#define _Dispatch_type_ _Function_class_ +#define _Dispatch_type_(x) _Function_class_(x) #define _Kernel_clear_do_init_(yesNo) _Post_ _SA_annotes1(SAL_clearDoInit,yesNo) #define _Kernel_float_restored_ _Post_ _SA_annotes0(SAL_floatRestored) #define _Kernel_float_saved_ _Post_ _SA_annotes0(SAL_floatSaved) @@ -44,7 +45,7 @@ #define _Kernel_requires_resource_held_(kind) _Pre_ _SA_annotes1(SAL_mustHold, #kind) #define _Kernel_requires_resource_not_held_(kind) _Pre_ _SA_annotes1(SAL_neverHold, #kind) #define _Kernel_acquires_resource_(kind) _Post_ _SA_annotes1(SAL_acquire, #kind) - +#define _Landmark_(name) #define __drv_acquiresCancelSpinLock _Acquires_nonreentrant_lock_(_Global_cancel_spin_lock_) #define __drv_acquiresCriticalRegion _Acquires_lock_(_Global_critical_region_) #define __drv_acquiresExclusiveResource(kind) _Acquires_nonreentrant_lock_(_Curr_) @@ -70,7 +71,7 @@ #define __drv_formatString(kind) _SA_annotes1(SAL_IsFormatString, #kind) #define __drv_freesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__no) #define __drv_fun(annotes) _At_(return, annotes) -#define __drv_functionClass _Function_class_ +#define __drv_functionClass(x) _Function_class_(x) #define __drv_holdsCancelSpinLock() _Holds_resource_global_("CancelSpinLock",) #define __drv_holdsCriticalRegion() _Holds_resource_global_("CriticalRegion",) #define __drv_holdsPriorityRegion() _Holds_resource_global_("PriorityRegion",) @@ -81,6 +82,7 @@ #define __drv_innerNeverHoldGlobal(kind,param) #define __drv_innerReleasesGlobal(kind,param) #define __drv_interlocked +#define __drv_inTry #define __drv_IoGetDmaAdapter #define __drv_isCancelIRQL _IRQL_is_cancel_ #define __drv_isObjectPointer @@ -118,7 +120,7 @@ #define __drv_reportError(why) #define __drv_requiresIRQL(irql) #define __drv_restoresIRQL -#define __drv_restoresIRQLGlobal +#define __drv_restoresIRQLGlobal(kind,param) #define __drv_ret(annotes) #define __drv_sameIRQL #define __drv_savesIRQL @@ -143,8 +145,19 @@ #define ___drv_unit_user_code #define ___drv_unit_user_driver +#define __drv_typeConst 0 +#define __drv_typeCond 1 +#define __drv_typeBitset 2 +#define __drv_typeExpr 3 + +#ifdef __cplusplus +extern "C" { +#endif + __ANNOTATION(SAL_neverHold(_In_ char *);) +__ANNOTATION(SAL_neverHoldGlobal(__In_impl_ char *, ...);) __ANNOTATION(SAL_acquire(_In_ char *);) +__ANNOTATION(SAL_acquireGlobal(__In_impl_ char *, ...);) __ANNOTATION(SAL_floatUsed(void);) __ANNOTATION(SAL_floatSaved(void);) __ANNOTATION(SAL_floatRestored(void);) @@ -153,8 +166,34 @@ __ANNOTATION(SAL_IsAliased(void);) __ANNOTATION(SAL_NeedsRelease(enum __SAL_YesNo);) __ANNOTATION(SAL_mustHold(_In_ char *);) +__ANNOTATION(SAL_mustHoldGlobal(__In_impl_ char *, ...);) __ANNOTATION(SAL_release(_In_ char *);) +__ANNOTATION(SAL_releaseGlobal(__In_impl_ char *, ...);) __ANNOTATION(SAL_IoGetDmaAdapter(void);) +__ANNOTATION(SAL_kernel();) +__ANNOTATION(SAL_nokernel();) +__ANNOTATION(SAL_driver();) +__ANNOTATION(SAL_nodriver();) +__ANNOTATION(SAL_internal_kernel_driver();) +__ANNOTATION(SAL_landmark(__In_impl_ char *);) +__ANNOTATION(SAL_return(__In_impl_ __AuToQuOtE char *);) +__ANNOTATION(SAL_strictType(__In_impl_ __AuToQuOtE char *);) +__ANNOTATION(SAL_strictTypeMatch(__int64);) +__ANNOTATION(SAL_preferredFunction(__In_impl_ __AuToQuOtE char *, __In_impl_ __AuToQuOtE char *);) +__ANNOTATION(SAL_preferredFunction3(__In_impl_ __AuToQuOtE char *, __In_impl_ __AuToQuOtE char *, __In_impl_ __int64);) +__ANNOTATION(SAL_error(__In_impl_ __AuToQuOtE char *);) +__ANNOTATION(SAL_error2(__In_impl_ __AuToQuOtE char *, __In_impl_ __int64);) +__ANNOTATION(SAL_IsFormatString(__In_impl_ char *);) +__ANNOTATION(SAL_completionType(__In_impl_ __AuToQuOtE char *);) +__ANNOTATION(SAL_callbackType(__In_impl_ __AuToQuOtE char *);) +//__PRIMOP(int, _Holds_resource_(__In_impl_ __deferTypecheck char *,__In_impl_ char *);) +//__PRIMOP(int, _Holds_resource_global_(__In_impl_ char *, ...);) +//__PRIMOP(int, _Is_kernel_(void);) +//__PRIMOP(int, _Is_driver_(void);) + +#ifdef __cplusplus +} +#endif #else @@ -182,6 +221,7 @@ #define _Kernel_requires_resource_held_(kind) #define _Kernel_requires_resource_not_held_(kind) #define _Kernel_acquires_resource_(kind) +#define _Landmark_(name) #define __drv_acquiresCancelSpinLock #define __drv_acquiresCriticalRegion #define __drv_acquiresExclusiveResource(kind) @@ -218,6 +258,7 @@ #define __drv_innerNeverHoldGlobal(kind,param) #define __drv_innerReleasesGlobal(kind,param) #define __drv_interlocked +#define __drv_inTry #define __drv_IoGetDmaAdapter #define __drv_isCancelIRQL #define __drv_isObjectPointer @@ -255,7 +296,7 @@ #define __drv_reportError(why) #define __drv_requiresIRQL(irql) #define __drv_restoresIRQL -#define __drv_restoresIRQLGlobal +#define __drv_restoresIRQLGlobal(kind,param) #define __drv_ret(annotes) #define __drv_sameIRQL #define __drv_savesIRQL Modified: trunk/reactos/include/psdk/sal_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal_old.h?rev… ============================================================================== --- trunk/reactos/include/psdk/sal_old.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal_old.h [iso-8859-1] Tue Mar 10 09:10:00 2015 @@ -45,7 +45,6 @@ #define __exceptthat __declspec("SAL_except") #define __execeptthat __exceptthat #define __inner_blocksOn(resource) __declspec("SAL_blocksOn("SPECSTRINGIZE(resource)")") -#define __inner_callback __declspec("__callback") #define __inner_checkReturn __declspec("SAL_checkReturn") #define __inner_control_entrypoint(category) __declspec("SAL_entrypoint(controlEntry, "SPECSTRINGIZE(category)")") #define __inner_data_entrypoint(category) __declspec("SAL_entrypoint(dataEntry, "SPECSTRINGIZE(category)")") @@ -80,7 +79,6 @@ #define __exceptthat #define __execeptthat #define __inner_blocksOn(resource) -#define __inner_callback #define __inner_checkReturn #define __inner_control_entrypoint(category) #define __inner_data_entrypoint(category)

9 years, 9 months

← Newer
1
...
32
33
34
35
36
37
38
...
50
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 March 2015