Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[tfaber] 66277: [KMTESTS:KE] - Enable KeSpinLock test that apparently never made it into testlist.c for some reason?

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 15 09:29:32 2015 New Revision: 66277 URL: http://svn.reactos.org/svn/reactos?rev=66277&view=rev Log: [KMTESTS:KE] - Enable KeSpinLock test that apparently never made it into testlist.c for some reason? Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sun Feb 15 09:29:32 2015 @@ -36,6 +36,7 @@ KMT_TESTFUNC Test_KeIrql; KMT_TESTFUNC Test_KeMutex; KMT_TESTFUNC Test_KeProcessor; +KMT_TESTFUNC Test_KeSpinLock; KMT_TESTFUNC Test_KeTimer; KMT_TESTFUNC Test_KernelType; KMT_TESTFUNC Test_MmSection; @@ -93,6 +94,7 @@ { "KeIrql", Test_KeIrql }, { "KeMutex", Test_KeMutex }, { "-KeProcessor", Test_KeProcessor }, + { "KeSpinLock", Test_KeSpinLock }, { "KeTimer", Test_KeTimer }, { "-KernelType", Test_KernelType }, { "MmSection", Test_MmSection },

9 years, 10 months

[janderwald] 66276: [INF] - add wdmaudio.inf

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Feb 15 09:03:08 2015 New Revision: 66276 URL: http://svn.reactos.org/svn/reactos?rev=66276&view=rev Log: [INF] - add wdmaudio.inf Added: trunk/reactos/media/inf/wdmaudio.inf (with props) Modified: trunk/reactos/media/inf/CMakeLists.txt Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Sun Feb 15 09:03:08 2015 @@ -39,6 +39,7 @@ usb.inf usbport.inf usbstor.inf + wdmaudio.inf xboxdisp.inf) foreach(item ${INF_FILES}) Added: trunk/reactos/media/inf/wdmaudio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wdmaudio.inf?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/wdmaudio.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

9 years, 10 months

[hbelusca] 66275: [WINLOGON][USER32] Fix the explanations of how Windows/ReactOS should shut down (it's winlogon itself that calls NtShutdownSystem, not something else; that story about "SMSS API #...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 15 02:07:23 2015 New Revision: 66275 URL: http://svn.reactos.org/svn/reactos?rev=66275&view=rev Log: [WINLOGON][USER32] Fix the explanations of how Windows/ReactOS should shut down (it's winlogon itself that calls NtShutdownSystem, not something else; that story about "SMSS API #1" concerns the SMSS API SmpSessionCompleteApi called by the helper function SmSessionComplete which is in turn called by CSRSS function CsrDereferenceNtSession, when all win32 processes are gone, as it should). The webpage http://www.reactos.org/wiki/ShutdownProcess should be corrected for. [USER32] Whitespace fixes for winstation code. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/win32ss/user/user32/misc/exit.c trunk/reactos/win32ss/user/user32/misc/winsta.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Feb 15 02:07:23 2015 @@ -898,7 +898,8 @@ /* Destroy SAS window */ UninitializeSAS(Session); - FIXME("FIXME: Call SMSS API #1\n"); + /* Now we can shut down NT */ + ERR("Shutting down NT...\n"); RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) { Modified: trunk/reactos/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] Sun Feb 15 02:07:23 2015 @@ -17,10 +17,10 @@ * * - App (usually explorer) calls ExitWindowsEx() * - ExitWindowsEx() sends a message to CSRSS - * - CSRSS impersonates the caller and sends a message to a hidden WinLogon window - * - WinLogon checks if the caller has the required privileges - * - WinLogon enters pending log-out state - * - WinLogon impersonates the interactive user and calls ExitWindowsEx() again, + * - CSRSS impersonates the caller and sends a message to a hidden Winlogon window + * - Winlogon checks if the caller has the required privileges + * - Winlogon enters pending log-out state + * - Winlogon impersonates the interactive user and calls ExitWindowsEx() again, * passing some special internal flags * - CSRSS loops over all processes of the interactive user (sorted by their * SetProcessShutdownParameters() level), sending WM_QUERYENDSESSION and @@ -39,28 +39,24 @@ * If the handler doesn't respond in time the same activities as for GUI * apps (i.e. display dialog box etc) take place. This also happens if * the handler returns TRUE. - * - This ends the processing for the first ExitWindowsEx() call from WinLogon. - * Execution continues in WinLogon, which calls ExitWindowsEx() again to + * - This ends the processing for the first ExitWindowsEx() call from Winlogon. + * Execution continues in Winlogon, which calls ExitWindowsEx() again to * terminate COM processes in the interactive user's session. - * - WinLogon stops impersonating the interactive user (whose processes are + * - Winlogon stops impersonating the interactive user (whose processes are * all dead by now). and enters log-out state - * - If the ExitWindowsEx() request was for a logoff, WinLogon sends a SAS - * event (to display the "press ctrl+alt+del") to the GINA. WinLogon then + * - If the ExitWindowsEx() request was for a logoff, Winlogon sends a SAS + * event (to display the "press ctrl+alt+del") to the GINA. Winlogon then * waits for the GINA to send a SAS event to login. - * - If the ExitWindowsEx() request was for shutdown/restart, WinLogon calls + * - If the ExitWindowsEx() request was for shutdown/restart, Winlogon calls * ExitWindowsEx() again in the system process context. * - CSRSS goes through the motions of sending WM_QUERYENDSESSION/WM_ENDSESSION * to GUI processes running in the system process context but won't display * dialog boxes or kill threads/processes. Same for console processes, * using the CTRL_SHUTDOWN_EVENT. The Service Control Manager is one of * these console processes and has a special timeout value WaitToKillServiceTimeout. - * - WinLogon issues a "InitiateSystemShutdown" request to the SM (SMSS API # 1) - * - the SM propagates the shutdown request to every environment subsystem it - * started since bootstrap time (still active ones, of course) - * - each environment subsystem, on shutdown request, releases every resource - * it aquired during its life (processes, memory etc), then dies - * - when every environment subsystem has gone to bed, the SM actually initiates - * the kernel and executive shutdown by calling NtShutdownSystem. + * - After CSRSS has finished its pass notifying processes that system is shutting down, + * Winlogon finishes the shutdown process by calling the executive subsystem + * function NtShutdownSystem. */ typedef struct Modified: trunk/reactos/win32ss/user/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/w… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] Sun Feb 15 02:07:23 2015 @@ -19,9 +19,9 @@ */ HWINSTA WINAPI CreateWindowStationA(LPCSTR lpwinsta, - DWORD dwReserved, - ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpsa) + DWORD dwReserved, + ACCESS_MASK dwDesiredAccess, + LPSECURITY_ATTRIBUTES lpsa) { UNICODE_STRING WindowStationNameU; HWINSTA hWinSta; @@ -53,55 +53,55 @@ */ HWINSTA WINAPI CreateWindowStationW(LPCWSTR lpwinsta, - DWORD dwReserved, - ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpsa) -{ - UNICODE_STRING WindowStationName; - UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hWindowStationsDir; - NTSTATUS Status; - HWINSTA hwinsta; - - /* Open WindowStations directory */ - InitializeObjectAttributes(&ObjectAttributes, - &WindowStationsDir, - OBJ_CASE_INSENSITIVE, - 0, - 0); - - Status = NtOpenDirectoryObject(&hWindowStationsDir, - DIRECTORY_CREATE_OBJECT, - &ObjectAttributes); - if(!NT_SUCCESS(Status)) - { - ERR("Failed to open WindowStations directory\n"); - return NULL; - } - - RtlInitUnicodeString(&WindowStationName, lpwinsta); - - /* Create the window station object */ - InitializeObjectAttributes(&ObjectAttributes, - &WindowStationName, - OBJ_CASE_INSENSITIVE, - hWindowStationsDir, - 0); - - /* Check if the handle should be inheritable */ - if (lpsa && lpsa->bInheritHandle) - { - ObjectAttributes.Attributes |= OBJ_INHERIT; - } - - hwinsta = NtUserCreateWindowStation(&ObjectAttributes, - dwDesiredAccess, - 0, 0, 0, 0, 0); - - NtClose(hWindowStationsDir); - - return hwinsta; + DWORD dwReserved, + ACCESS_MASK dwDesiredAccess, + LPSECURITY_ATTRIBUTES lpsa) +{ + UNICODE_STRING WindowStationName; + UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hWindowStationsDir; + NTSTATUS Status; + HWINSTA hwinsta; + + /* Open WindowStations directory */ + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationsDir, + OBJ_CASE_INSENSITIVE, + 0, + 0); + + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_CREATE_OBJECT, + &ObjectAttributes); + if(!NT_SUCCESS(Status)) + { + ERR("Failed to open WindowStations directory\n"); + return NULL; + } + + RtlInitUnicodeString(&WindowStationName, lpwinsta); + + /* Create the window station object */ + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationName, + OBJ_CASE_INSENSITIVE, + hWindowStationsDir, + 0); + + /* Check if the handle should be inheritable */ + if (lpsa && lpsa->bInheritHandle) + { + ObjectAttributes.Attributes |= OBJ_INHERIT; + } + + hwinsta = NtUserCreateWindowStation(&ObjectAttributes, + dwDesiredAccess, + 0, 0, 0, 0, 0); + + NtClose(hWindowStationsDir); + + return hwinsta; } /* @@ -110,87 +110,78 @@ BOOL FASTCALL EnumNamesW(HWINSTA WindowStation, NAMEENUMPROCW EnumFunc, - LPARAM Context, + LPARAM Context, BOOL Desktops) { - char Buffer[256]; - PVOID NameList; - PWCHAR Name; - NTSTATUS Status; - ULONG RequiredSize; - ULONG CurrentEntry, EntryCount; - BOOL Ret; - - /* - * Check parameters - */ - if (NULL == WindowStation && Desktops) - { - WindowStation = GetProcessWindowStation(); - } - - /* - * Try with fixed-size buffer - */ - Status = NtUserBuildNameList(WindowStation, sizeof(Buffer), Buffer, &RequiredSize); - if (NT_SUCCESS(Status)) - { - /* Fixed-size buffer is large enough */ - NameList = (PWCHAR) Buffer; - } - else if (Status == STATUS_BUFFER_TOO_SMALL) - { - /* Allocate a larger buffer */ - NameList = HeapAlloc(GetProcessHeap(), 0, RequiredSize); - if (NULL == NameList) - { - return FALSE; - } - /* Try again */ - Status = NtUserBuildNameList(WindowStation, RequiredSize, NameList, NULL); - if (! NT_SUCCESS(Status)) - { - HeapFree(GetProcessHeap(), 0, NameList); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - } - else - { - /* Some unrecognized error occured */ - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - /* - * Enum the names one by one - */ - EntryCount = *((DWORD *) NameList); - Name = (PWCHAR) ((PCHAR) NameList + sizeof(DWORD)); - Ret = TRUE; - for (CurrentEntry = 0; CurrentEntry < EntryCount && Ret; ++CurrentEntry) - { - Ret = (*EnumFunc)(Name, Context); - Name += wcslen(Name) + 1; - } - - /* - * Cleanup - */ - if (NameList != Buffer) - { - HeapFree(GetProcessHeap(), 0, NameList); - } - - return Ret; + CHAR Buffer[256]; + PVOID NameList; + PWCHAR Name; + NTSTATUS Status; + ULONG RequiredSize; + ULONG CurrentEntry, EntryCount; + BOOL Ret; + + /* Check parameters */ + if (WindowStation == NULL && Desktops) + { + WindowStation = GetProcessWindowStation(); + } + + /* Try with fixed-size buffer */ + Status = NtUserBuildNameList(WindowStation, sizeof(Buffer), Buffer, &RequiredSize); + if (NT_SUCCESS(Status)) + { + /* Fixed-size buffer is large enough */ + NameList = (PWCHAR) Buffer; + } + else if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Allocate a larger buffer */ + NameList = HeapAlloc(GetProcessHeap(), 0, RequiredSize); + if (NameList == NULL) + return FALSE; + + /* Try again */ + Status = NtUserBuildNameList(WindowStation, RequiredSize, NameList, NULL); + if (!NT_SUCCESS(Status)) + { + HeapFree(GetProcessHeap(), 0, NameList); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + else + { + /* Some unrecognized error occured */ + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + /* Enum the names one by one */ + EntryCount = *((DWORD *) NameList); + Name = (PWCHAR) ((PCHAR) NameList + sizeof(DWORD)); + Ret = TRUE; + for (CurrentEntry = 0; CurrentEntry < EntryCount && Ret; ++CurrentEntry) + { + Ret = (*EnumFunc)(Name, Context); + Name += wcslen(Name) + 1; + } + + /* Cleanup */ + if (NameList != Buffer) + { + HeapFree(GetProcessHeap(), 0, NameList); + } + + return Ret; } /* For W->A conversion */ typedef struct tagENUMNAMESASCIICONTEXT { - NAMEENUMPROCA UserEnumFunc; - LPARAM UserContext; + NAMEENUMPROCA UserEnumFunc; + LPARAM UserContext; } ENUMNAMESASCIICONTEXT, *PENUMNAMESASCIICONTEXT; /* @@ -200,65 +191,59 @@ BOOL CALLBACK EnumNamesCallback(LPWSTR Name, LPARAM Param) { - PENUMNAMESASCIICONTEXT Context = (PENUMNAMESASCIICONTEXT) Param; - char FixedNameA[32]; - LPSTR NameA; - int Len; - BOOL Ret; - - /* - * Determine required size of Ascii string and see if we can use - * fixed buffer - */ - Len = WideCharToMultiByte(CP_ACP, 0, Name, -1, NULL, 0, NULL, NULL); - if (Len <= 0) - { - /* Some strange error occured */ - return FALSE; - } - else if (Len <= sizeof(FixedNameA)) - { - /* Fixed-size buffer is large enough */ - NameA = FixedNameA; - } - else - { - /* Allocate a larger buffer */ - NameA = HeapAlloc(GetProcessHeap(), 0, Len); - if (NULL == NameA) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - - /* - * Do the Unicode ->Ascii conversion - */ - if (0 == WideCharToMultiByte(CP_ACP, 0, Name, -1, NameA, Len, NULL, NULL)) - { - /* Something went wrong, clean up */ - if (NameA != FixedNameA) - { - HeapFree(GetProcessHeap(), 0, NameA); - } - return FALSE; - } - - /* - * Call user callback - */ - Ret = Context->UserEnumFunc(NameA, Context->UserContext); - - /* - * Clean up - */ - if (NameA != FixedNameA) - { - HeapFree(GetProcessHeap(), 0, NameA); - } - - return Ret; + PENUMNAMESASCIICONTEXT Context = (PENUMNAMESASCIICONTEXT) Param; + CHAR FixedNameA[32]; + LPSTR NameA; + INT Len; + BOOL Ret; + + /* + * Determine required size of Ascii string and see + * if we can use fixed buffer. + */ + Len = WideCharToMultiByte(CP_ACP, 0, Name, -1, NULL, 0, NULL, NULL); + if (Len <= 0) + { + /* Some strange error occured */ + return FALSE; + } + else if (Len <= sizeof(FixedNameA)) + { + /* Fixed-size buffer is large enough */ + NameA = FixedNameA; + } + else + { + /* Allocate a larger buffer */ + NameA = HeapAlloc(GetProcessHeap(), 0, Len); + if (NULL == NameA) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + + /* Do the Unicode ->Ascii conversion */ + if (0 == WideCharToMultiByte(CP_ACP, 0, Name, -1, NameA, Len, NULL, NULL)) + { + /* Something went wrong, clean up */ + if (NameA != FixedNameA) + { + HeapFree(GetProcessHeap(), 0, NameA); + } + return FALSE; + } + + /* Call user callback */ + Ret = Context->UserEnumFunc(NameA, Context->UserContext); + + /* Cleanup */ + if (NameA != FixedNameA) + { + HeapFree(GetProcessHeap(), 0, NameA); + } + + return Ret; } /* @@ -267,15 +252,15 @@ BOOL FASTCALL EnumNamesA(HWINSTA WindowStation, NAMEENUMPROCA EnumFunc, - LPARAM Context, + LPARAM Context, BOOL Desktops) { - ENUMNAMESASCIICONTEXT PrivateContext; - - PrivateContext.UserEnumFunc = EnumFunc; - PrivateContext.UserContext = Context; - - return EnumNamesW(WindowStation, EnumNamesCallback, (LPARAM) &PrivateContext, Desktops); + ENUMNAMESASCIICONTEXT PrivateContext; + + PrivateContext.UserEnumFunc = EnumFunc; + PrivateContext.UserContext = Context; + + return EnumNamesW(WindowStation, EnumNamesCallback, (LPARAM) &PrivateContext, Desktops); } /* @@ -283,9 +268,9 @@ */ BOOL WINAPI EnumWindowStationsA(WINSTAENUMPROCA EnumFunc, - LPARAM Context) -{ - return EnumNamesA(NULL, EnumFunc, Context, FALSE); + LPARAM Context) +{ + return EnumNamesA(NULL, EnumFunc, Context, FALSE); } @@ -294,9 +279,9 @@ */ BOOL WINAPI EnumWindowStationsW(WINSTAENUMPROCW EnumFunc, - LPARAM Context) -{ - return EnumNamesW(NULL, EnumFunc, Context, FALSE); + LPARAM Context) +{ + return EnumNamesW(NULL, EnumFunc, Context, FALSE); } @@ -305,8 +290,8 @@ */ HWINSTA WINAPI OpenWindowStationA(LPCSTR lpszWinSta, - BOOL fInherit, - ACCESS_MASK dwDesiredAccess) + BOOL fInherit, + ACCESS_MASK dwDesiredAccess) { UNICODE_STRING WindowStationNameU; HWINSTA hWinSta; @@ -340,48 +325,48 @@ BOOL fInherit, ACCESS_MASK dwDesiredAccess) { - UNICODE_STRING WindowStationName; - UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hWindowStationsDir; - NTSTATUS Status; - HWINSTA hwinsta; - - /* Open WindowStations directory */ - InitializeObjectAttributes(&ObjectAttributes, - &WindowStationsDir, - OBJ_CASE_INSENSITIVE, - 0, - 0); - - Status = NtOpenDirectoryObject(&hWindowStationsDir, - DIRECTORY_TRAVERSE, - &ObjectAttributes); - if(!NT_SUCCESS(Status)) - { - ERR("Failed to open WindowStations directory\n"); - return NULL; - } - - /* Open the window station object */ - RtlInitUnicodeString(&WindowStationName, lpszWinSta); - - InitializeObjectAttributes(&ObjectAttributes, - &WindowStationName, - OBJ_CASE_INSENSITIVE, - hWindowStationsDir, - 0); - - if( fInherit ) - { - ObjectAttributes.Attributes |= OBJ_INHERIT; - } - - hwinsta = NtUserOpenWindowStation(&ObjectAttributes, dwDesiredAccess); - - NtClose(hWindowStationsDir); - - return hwinsta; + UNICODE_STRING WindowStationName; + UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hWindowStationsDir; + NTSTATUS Status; + HWINSTA hwinsta; + + /* Open WindowStations directory */ + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationsDir, + OBJ_CASE_INSENSITIVE, + 0, + 0); + + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_TRAVERSE, + &ObjectAttributes); + if(!NT_SUCCESS(Status)) + { + ERR("Failed to open WindowStations directory\n"); + return NULL; + } + + /* Open the window station object */ + RtlInitUnicodeString(&WindowStationName, lpszWinSta); + + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationName, + OBJ_CASE_INSENSITIVE, + hWindowStationsDir, + 0); + + if(fInherit) + { + ObjectAttributes.Attributes |= OBJ_INHERIT; + } + + hwinsta = NtUserOpenWindowStation(&ObjectAttributes, dwDesiredAccess); + + NtClose(hWindowStationsDir); + + return hwinsta; } @@ -390,15 +375,12 @@ */ BOOL WINAPI -SetWindowStationUser( - HWINSTA hWindowStation, - PLUID pluid, - PSID psid, - DWORD size - ) -{ - return NtUserSetWindowStationUser(hWindowStation, pluid, psid, size); +SetWindowStationUser(HWINSTA hWindowStation, + PLUID pluid, + PSID psid, + DWORD size) +{ + return NtUserSetWindowStationUser(hWindowStation, pluid, psid, size); } /* EOF */ -

9 years, 10 months

[tkreuzer] 66274: [NTOSKRNL] Demote the "HACK: RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n" from DPRINT1 to DPRINT, since it's massively spamming the log. See CORE-9184

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 15 00:26:41 2015 New Revision: 66274 URL: http://svn.reactos.org/svn/reactos?rev=66274&view=rev Log: [NTOSKRNL] Demote the "HACK: RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n" from DPRINT1 to DPRINT, since it's massively spamming the log. See CORE-9184 Modified: trunk/reactos/ntoskrnl/se/accesschk.c Modified: trunk/reactos/ntoskrnl/se/accesschk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Sun Feb 15 00:26:41 2015 @@ -250,7 +250,7 @@ /* Fail if some rights have not been granted */ if (RemainingAccess != 0) { - DPRINT1("HACK: RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess); + DPRINT("HACK: RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess); #if 0 /* HACK HACK HACK */ Status = STATUS_ACCESS_DENIED;

9 years, 10 months

[tkreuzer] 66273: [WIN32K] In NtGdiGetDIBitsInternal limit the size of what is being copied back to to usermode to the cjMaxInfo parameter. Fixes crash of Firefox when downloading files. CORE-8895 ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 15 00:05:50 2015 New Revision: 66273 URL: http://svn.reactos.org/svn/reactos?rev=66273&view=rev Log: [WIN32K] In NtGdiGetDIBitsInternal limit the size of what is being copied back to to usermode to the cjMaxInfo parameter. Fixes crash of Firefox when downloading files. CORE-8895 #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] Sun Feb 15 00:05:50 2015 @@ -674,7 +674,7 @@ RGBQUAD* rgbQuads; VOID* colorPtr; - DPRINT("Entered NtGdiGetDIBitsInternal()\n"); + DPRINT("Entered GreGetDIBitsInternal()\n"); if ((Usage && Usage != DIB_PAL_COLORS) || !Info || !hBitmap) return 0; @@ -1090,7 +1090,7 @@ _SEH2_TRY { /* Copy the data back */ - cjMaxInfo = DIB_BitmapInfoSize(pbmi, (WORD)iUsage); + cjMaxInfo = min(cjMaxInfo, DIB_BitmapInfoSize(pbmi, (WORD)iUsage)); ProbeForWrite(pbmiUser, cjMaxInfo, 1); RtlCopyMemory(pbmiUser, pbmi, cjMaxInfo); }

9 years, 10 months

[pschweitzer] 66272: [NTFS] Query the value of NtfsMftZoneReservation on mount. Not used yet. CORE-8725

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 14 20:55:47 2015 New Revision: 66272 URL: http://svn.reactos.org/svn/reactos?rev=66272&view=rev Log: [NTFS] Query the value of NtfsMftZoneReservation on mount. Not used yet. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sat Feb 14 20:55:47 2015 @@ -168,6 +168,28 @@ static +ULONG +NtfsQueryMftZoneReservation(VOID) +{ + ULONG ZoneReservation = 1; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].Name = L"NtfsMftZoneReservation"; + QueryTable[0].EntryContext = &ZoneReservation; + + RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"FileSystem", + QueryTable, + NULL, + NULL); + + return ZoneReservation; +} + + +static NTSTATUS NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject, PDEVICE_EXTENSION DeviceExt) @@ -361,6 +383,8 @@ } ExFreePool(VolumeRecord); + + NtfsInfo->MftZoneReservation = NtfsQueryMftZoneReservation(); return Status; } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat Feb 14 20:55:47 2015 @@ -75,6 +75,7 @@ UCHAR MinorVersion; USHORT Flags; + ULONG MftZoneReservation; } NTFS_INFO, *PNTFS_INFO; #define NTFS_TYPE_CCB '20SF'

9 years, 10 months

[hbelusca] 66271: [SHELL32] - magic_value--; - Don't assign a desktop background colour by default. So that we can get the safe-mode background working (in safe mode), while having the default desk...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 14 19:56:04 2015 New Revision: 66271 URL: http://svn.reactos.org/svn/reactos?rev=66271&view=rev Log: [SHELL32] - magic_value--; - Don't assign a desktop background colour by default. So that we can get the safe-mode background working (in safe mode), while having the default desktop background colours in normal situations. Patch by Giannis. Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDesktop… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] Sat Feb 14 19:56:04 2015 @@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(desktop); -#define SHDESK_TAG 0x4b534544 +#define SHDESK_TAG 'KSED' static const WCHAR szProgmanClassName [] = L"Progman"; static const WCHAR szProgmanWindowName [] = L"Program Manager"; @@ -551,7 +551,7 @@ wcProgman.hInstance = shell32_hInstance; wcProgman.hIcon = NULL; wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW); - wcProgman.hbrBackground = (HBRUSH)(COLOR_BACKGROUND + 1); + wcProgman.hbrBackground = NULL; wcProgman.lpszMenuName = NULL; wcProgman.lpszClassName = szProgmanClassName;

9 years, 10 months

[tfaber] 66270: [RTL] - Implement RtlIpv4StringToAddressExW. Patch by Mark Jansen. CORE-6490

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 14 19:14:32 2015 New Revision: 66270 URL: http://svn.reactos.org/svn/reactos?rev=66270&view=rev Log: [RTL] - Implement RtlIpv4StringToAddressExW. Patch by Mark Jansen. CORE-6490 Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=6627… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Sat Feb 14 19:14:32 2015 @@ -337,17 +337,52 @@ } /* -* @unimplemented -*/ -NTSTATUS -NTAPI -RtlIpv4StringToAddressExW(IN PCWSTR AddressString, - IN BOOLEAN Strict, - OUT struct in_addr *Address, - OUT PUSHORT Port) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +* @implemented +*/ +NTSTATUS +NTAPI +RtlIpv4StringToAddressExW( + _In_ PCWSTR AddressString, + _In_ BOOLEAN Strict, + _Out_ struct in_addr *Address, + _Out_ PUSHORT Port) +{ + PCWSTR CurrentChar; + ULONG ConvertedPort; + NTSTATUS Status; + + if (!AddressString || !Address || !Port) + return STATUS_INVALID_PARAMETER; + + Status = RtlIpv4StringToAddressW(AddressString, + Strict, + &CurrentChar, + Address); + if (!NT_SUCCESS(Status)) + return Status; + + if (!*CurrentChar) + { + *Port = 0; + return STATUS_SUCCESS; + } + + if (*CurrentChar != L':') + return STATUS_INVALID_PARAMETER; + ++CurrentChar; + + Status = RtlpStringToUlong(CurrentChar, + FALSE, + &CurrentChar, + &ConvertedPort); + if (!NT_SUCCESS(Status)) + return Status; + + if (*CurrentChar || !ConvertedPort || ConvertedPort > 0xffff) + return STATUS_INVALID_PARAMETER; + + *Port = WN2H(ConvertedPort); + return STATUS_SUCCESS; } /*

9 years, 10 months

[tkreuzer] 66269: [DRIVERS] Fix a few MSVC warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 19:07:36 2015 New Revision: 66269 URL: http://svn.reactos.org/svn/reactos?rev=66269&view=rev Log: [DRIVERS] Fix a few MSVC warnings Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbstor/fdo.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Sat Feb 14 19:07:36 2015 @@ -28,7 +28,7 @@ * 1. via "Device Specific (D-State) Control" * 2. via "Power Resource Control". * This module is used to manage devices relying on Power Resource Control. - * + * * An ACPI "power resource object" describes a software controllable power * plane, clock plane, or other resource used by a power managed device. * A device may rely on multiple power resources, and a power resource @@ -37,7 +37,7 @@ /* * Modified for ReactOS and latest ACPICA - * Copyright (C)2009 Samuel Serapion + * Copyright (C)2009 Samuel Serapion */ #include <precomp.h> @@ -346,13 +346,14 @@ /* * Prepare a wakeup device, two steps (Ref ACPI 2.0:P229): - * 1. Power on the power resources required for the wakeup device + * 1. Power on the power resources required for the wakeup device * 2. Execute _DSW (Device Sleep Wake) or (deprecated in ACPI 3.0) _PSW (Power * State Wake) for the device, if present */ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state) { - int i, err = 0; + unsigned int i; + int err = 0; if (!dev || !dev->wakeup.flags.valid) return -1; @@ -396,7 +397,8 @@ */ int acpi_disable_wakeup_device_power(struct acpi_device *dev) { - int i, err = 0; + unsigned int i; + int err = 0; if (!dev || !dev->wakeup.flags.valid) return -1; @@ -486,7 +488,7 @@ int result = 0; struct acpi_handle_list *cl = NULL; /* Current Resources */ struct acpi_handle_list *tl = NULL; /* Target Resources */ - int i = 0; + unsigned int i = 0; if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3)) return_VALUE(-1); @@ -589,14 +591,14 @@ break; } - + DPRINT("%s [%s] (%s)\n", acpi_device_name(device), acpi_device_bid(device), state?"on":"off"); end: if (result) ExFreePool(resource); - + return result; } @@ -654,7 +656,7 @@ return 0; } -int +int acpi_power_init (void) { int result = 0; Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sat Feb 14 19:07:36 2015 @@ -210,7 +210,7 @@ PHUB_DEVICE_EXTENSION HubDeviceExtension; PWORK_ITEM_DATA WorkItemData; PORT_STATUS_CHANGE PortStatus; - LONG PortId; + ULONG PortId; BOOLEAN SignalResetComplete = FALSE; DPRINT("Entered DeviceStatusChangeThread, Context %x\n", Context); Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat Feb 14 19:07:36 2015 @@ -307,7 +307,7 @@ case IOCTL_INTERNAL_USB_GET_PORT_STATUS: { PORT_STATUS_CHANGE PortStatus; - LONG PortId; + ULONG PortId; PUCHAR PortStatusBits; PortStatusBits = (PUCHAR)Stack->Parameters.Others.Argument1; Modified: trunk/reactos/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] Sat Feb 14 19:07:36 2015 @@ -40,7 +40,7 @@ IN OUT PIRP Irp) { ULONG DeviceCount = 0; - ULONG Index; + LONG Index; PDEVICE_RELATIONS DeviceRelations; PIO_STACK_LOCATION IoStack; @@ -63,7 +63,7 @@ // // go through array and count device objects // - for(Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++) + for (Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++) { if (DeviceExtension->ChildPDO[Index]) { @@ -391,7 +391,7 @@ case IRP_MN_QUERY_CAPABILITIES: { // - // FIXME: set custom capabilities + // FIXME: set custom capabilities // IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp);

9 years, 10 months

[tkreuzer] 66268: [CMAKE] Disable MSVC linker warning LNK4078 (multiple sections found with different attributes) for INIT sections.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 18:58:52 2015 New Revision: 66268 URL: http://svn.reactos.org/svn/reactos?rev=66268&view=rev Log: [CMAKE] Disable MSVC linker warning LNK4078 (multiple sections found with different attributes) for INIT sections. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=66268… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Feb 14 18:58:52 2015 @@ -229,9 +229,10 @@ if((${TYPE} STREQUAL "win32dll") OR (${TYPE} STREQUAL "win32ocx") OR (${TYPE} STREQUAL "cpl")) add_target_link_flags(${MODULE} "/DLL") elseif(${TYPE} STREQUAL "kernelmodedriver") - add_target_link_flags(${MODULE} "/DRIVER") + # Disable linker warning 4078 (multiple sections found with different attributes) for INIT section use + add_target_link_flags(${MODULE} "/DRIVER /IGNORE:4078") elseif(${TYPE} STREQUAL "wdmdriver") - add_target_link_flags(${MODULE} "/DRIVER:WDM") + add_target_link_flags(${MODULE} "/DRIVER:WDM /IGNORE:4078") endif() if(RUNTIME_CHECKS)

9 years, 10 months

← Newer
1
...
21
22
23
24
25
26
27
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015