Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 41520: Move gcc -g and -Wall options out of rbuild and into .rbuild files Move non-architecture-specific msc options to ReactOS-generic.rbuild
by hyperion＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: hyperion Date: Mon Jun 22 02:13:28 2009 New Revision: 41520 URL: http://svn.reactos.org/svn/reactos?rev=41520&view=rev Log: Move gcc -g and -Wall options out of rbuild and into .rbuild files Move non-architecture-specific msc options to ReactOS-generic.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-i386.rbuild trunk/reactos/ReactOS-ppc.rbuild trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=415… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009 @@ -13,6 +13,9 @@ <define name="_ARM_" /> <define name="__arm__" /> <define name="TARGET_arm" host="true" /> + + <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> + <compilerflag compiler="as">-gstabs+</compilerflag> <if property="DBG" value="1"> <define name="DBG">1</define> Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009 @@ -126,7 +126,14 @@ <xi:include href="tools/tools.rbuild" /> </directory> - <compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag> + <group compilerset="gcc"> + <compilerflag>-Wall</compilerflag> + <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> + </group> - <compilerflag compilerset="msc">/wd4711</compilerflag> + <group compilerset="msc"> + <compilerflag>/Zl</compilerflag> + <compilerflag>/Zi</compilerflag> + <compilerflag>/W1</compilerflag> + </group> </group> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=41… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009 @@ -43,6 +43,8 @@ <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-multichar</compilerflag> + + <compilerflag>-gstabs+</compilerflag>  </group> @@ -70,10 +72,9 @@ </if> <compilerflag>/GS-</compilerflag> - <compilerflag>/Zl</compilerflag> - <compilerflag>/Zi</compilerflag> - <compilerflag>/Wall</compilerflag> </group> + + <compilerflag compiler="as">-gstabs+</compilerflag> <group linkerset="ld"> <linkerflag>-disable-stdcall-fixup</linkerflag> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=415… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009 @@ -20,4 +20,6 @@ <compilerflag>-meabi</compilerflag> <compilerflag>-O2</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> + <compilerflag compiler="as">-gstabs+</compilerflag> </project> Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Jun 22 02:13:28 2009 @@ -455,8 +455,6 @@ if ( ProjectNode.configuration.Compiler == GnuGcc ) { - fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS += -Wall\n" ); fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" ); @@ -465,10 +463,6 @@ fprintf ( fMakefile, "PROJECT_CFLAGS += -mtune=$(TUNE)\n" ); fprintf ( fMakefile, "PROJECT_CXXFLAGS += -mtune=$(TUNE)\n" ); fprintf ( fMakefile, "endif\n" ); - - fprintf ( fMakefile, "PROJECT_CFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); - fprintf ( fMakefile, "PROJECT_ASFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); if ( usePipe ) {

1 0

[hyperion] 41519: Compilers other than GCC deserve offsetof, don't they?
by hyperion＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: hyperion Date: Mon Jun 22 01:40:37 2009 New Revision: 41519 URL: http://svn.reactos.org/svn/reactos?rev=41519&view=rev Log: Compilers other than GCC deserve offsetof, don't they? Modified: trunk/reactos/include/crt/stddef.h Modified: trunk/reactos/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stddef.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/stddef.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stddef.h [iso-8859-1] Mon Jun 22 01:40:37 2009 @@ -287,7 +287,7 @@ symbols in the _FOO_T_ family, stays defined even after its corresponding type is defined). If we define wchar_t, then we must undef _WCHAR_T_; for BSD/386 1.1 (and perhaps others), if - we undef _WCHAR_T_, then we must also define rune_t, since + we undef _WCHAR_T_, then we must also define rune_t, since headers like runetype.h assume that if machine/ansi.h is included, and _BSD_WCHAR_T_ is not defined, then rune_t is available. machine/ansi.h says, "Note that _WCHAR_T_ and _RUNE_T_ must be of @@ -390,7 +390,11 @@ #ifndef offsetof /* Offset of member MEMBER in a struct of type TYPE. */ +#if defined(__GNUC__) #define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER) +#else +#define offsetof(TYPE, MEMBER) ((size_t)&(((TYPE *)0)->MEMBER)) +#endif #endif /* !offsetof */

1 0

[hyperion] 41518: Don't change an std::set in the loop that enumerates it. Patch by Daniel Zimmermann <netzimme@aim.com> See issue #3128 for more details.
by hyperion＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: hyperion Date: Mon Jun 22 01:37:47 2009 New Revision: 41518 URL: http://svn.reactos.org/svn/reactos?rev=41518&view=rev Log: Don't change an std::set in the loop that enumerates it. Patch by Daniel Zimmermann <netzimme(a)aim.com> See issue #3128 for more details. Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Mon Jun 22 01:37:47 2009 @@ -400,11 +400,7 @@ fprintf ( OUT, ";" ); string unescaped = *it1; - defines.erase(unescaped); - const string& escaped = _replace_str(unescaped, "\"",""); - - defines.insert(escaped); - fprintf ( OUT, "%s", escaped.c_str() ); + fprintf ( OUT, "%s", _replace_str(unescaped, "\"","").c_str() ); } fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"%s\"\r\n", "warning.h");

1 0

[janderwald] 41517: - Fix a buffer overrun
by janderwald＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: janderwald Date: Mon Jun 22 01:35:40 2009 New Revision: 41517 URL: http://svn.reactos.org/svn/reactos?rev=41517&view=rev Log: - Fix a buffer overrun Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Mon Jun 22 01:35:40 2009 @@ -775,9 +775,9 @@ if (IoStack->FileObject->FileName.Buffer[0] != L'{') { RtlMoveMemory(IoStack->FileObject->FileName.Buffer, &IoStack->FileObject->FileName.Buffer[Length+1], - IoStack->FileObject->FileName.Length - Length * sizeof(WCHAR)); - - IoStack->FileObject->FileName.Length -= Length * sizeof(WCHAR); + IoStack->FileObject->FileName.Length - (Length + 1) * sizeof(WCHAR)); + + IoStack->FileObject->FileName.Length -= (Length + 1)* sizeof(WCHAR); }

1 0

[dreimer] 41516: Bug 4626: slovak update by Mario Kacmar
by dreimer＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: dreimer Date: Mon Jun 22 00:00:00 2009 New Revision: 41516 URL: http://svn.reactos.org/svn/reactos?rev=41516&view=rev Log: Bug 4626: slovak update by Mario Kacmar Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/main/lang/sk-SK.rc Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Mon Jun 22 00:00:00 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 01-03-2008 - * LAST CHANGE: 17-02-2009 + * LAST CHANGE: 14-06-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -90,14 +90,14 @@ IDS_KEYBOARD "Klávesnica" IDS_NONE "(Nie je)" IDS_UNKNOWN "(Neznáme)" - IDS_RESTART "Do you want to restart your computer now?" + IDS_RESTART "Chcete teraz retartova Vá poèítaè?" IDS_WHATS_THIS "Èo je toto?" IDS_LANGUAGE "Jazyk" IDS_LAYOUT "Rozloenie klávesnice" - IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_REM_QUESTION "Chcete odstráni vybrané rozloenie klávesnice?" IDS_CONFIRMATION "Potvrdenie" //Confirmation - IDS_LAYOUT_EXISTS "This layout already exists." - IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_LAYOUT_EXISTS "Toto rozloenie u existuje." + IDS_LAYOUT_EXISTS2 "Toto rozloenie u existuje a nemôe by pridané." IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "¼avý Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" Modified: trunk/reactos/dll/cpl/main/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/sk-SK.rc [iso-8859-1] Mon Jun 22 00:00:00 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 02-02-2008 - * LAST CHANGE: 17-06-2008 + * LAST CHANGE: 14-06-2009 * ______________________________________________ * NOTE: this file is not fully translated */ @@ -12,23 +12,23 @@ CAPTION "Rýchlos" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Character repeat", -1, 5, 5, 230, 130 + GROUPBOX "Opakovanie znakov", -1, 5, 5, 230, 130 ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 - LTEXT "Repeat &delay", -1, 40, 15, 50, 10 - LTEXT "Long", -1, 40, 30, 20, 10 - LTEXT "Short", -1, 200, 30, 20, 10 + LTEXT "Oneskorenie pre&d opakovaním:", -1, 40, 15, 50, 10 + LTEXT "dlhé", -1, 40, 30, 20, 10 + LTEXT "krátke", -1, 200, 30, 20, 10 CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 - LTEXT "&Repeat rate", -1, 40, 70, 50, 10 - LTEXT "Slow", -1, 40, 85, 20, 10 - LTEXT "Fast", -1, 200, 85, 20, 10 + LTEXT "&Rýchlos opakovania:", -1, 40, 70, 50, 10 + LTEXT "malá", -1, 40, 85, 20, 10 //pomaly + LTEXT "ve¾ká", -1, 200, 85, 20, 10 //rýchlo CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 - LTEXT "Click here and hold down a key to &test repeat rate:", -1, 15, 105, 150, 10 + LTEXT "Kliknite sem a podrte kláves k o&testovaniu rýchlosti opakovania:", -1, 15, 105, 150, 10 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Cursor &blink rate:", -1, 5, 145, 230, 50 + GROUPBOX "&Blikanie kurzora:", -1, 5, 145, 230, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 - LTEXT "None", -1, 40, 165, 30, 10 - LTEXT "Fast", -1, 200, 165, 30, 10 + LTEXT "iadne", -1, 40, 165, 30, 10 + LTEXT "rýchle", -1, 200, 165, 30, 10 CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 END

1 0

[fireball] 41515: - Implement two helper functions to correctly set permissions for a window station and desktops. Those are unused now, but they are going to solve two problems in current winlogon. First of them being a "big HACK" in CreateWindowStationAndDesktops(), which has to do CloseDesktop / OpenDesktopW to get a non-inheritable handle with GENERIC_ALL righs. Second problem is that security attributes structure passed to CreateWindowStationW and CreateDesktopW are invalid because now lpSe
by fireball＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: fireball Date: Sun Jun 21 23:23:06 2009 New Revision: 41515 URL: http://svn.reactos.org/svn/reactos?rev=41515&view=rev Log: - Implement two helper functions to correctly set permissions for a window station and desktops. Those are unused now, but they are going to solve two problems in current winlogon. First of them being a "big HACK" in CreateWindowStationAndDesktops(), which has to do CloseDesktop / OpenDesktopW to get a non-inheritable handle with GENERIC_ALL righs. Second problem is that security attributes structure passed to CreateWindowStationW and CreateDesktopW are invalid because now lpSecurityDescriptor points to an ACL but it's supposed to point to an actual SECURITY_DESCRIPTOR structure. Information from: http://msdn.microsoft.com/en-us/library/aa379608.aspx. Modified: trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Sun Jun 21 23:23:06 2009 @@ -15,6 +15,20 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winlogon); + +#define DESKTOP_ALL (DESKTOP_READOBJECTS | DESKTOP_CREATEWINDOW | \ + DESKTOP_CREATEMENU | DESKTOP_HOOKCONTROL | DESKTOP_JOURNALRECORD | \ + DESKTOP_JOURNALPLAYBACK | DESKTOP_ENUMERATE | DESKTOP_WRITEOBJECTS | \ + DESKTOP_SWITCHDESKTOP | STANDARD_RIGHTS_REQUIRED) + +#define WINSTA_ALL (WINSTA_ENUMDESKTOPS | WINSTA_READATTRIBUTES | \ + WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | \ + WINSTA_WRITEATTRIBUTES | WINSTA_ACCESSGLOBALATOMS | \ + WINSTA_EXITWINDOWS | WINSTA_ENUMERATE | WINSTA_READSCREEN | \ + STANDARD_RIGHTS_REQUIRED) + +#define GENERIC_ACCESS (GENERIC_READ | GENERIC_WRITE | \ + GENERIC_EXECUTE | GENERIC_ALL) /* GLOBALS ******************************************************************/ @@ -758,6 +772,185 @@ } BOOL +AddAceToWindowStation( + IN HWINSTA WinSta, + IN PSID Sid) +{ + DWORD AclSize; + SECURITY_INFORMATION SecurityInformation; + PACL pDefaultAcl = NULL; + PSECURITY_DESCRIPTOR WinstaSd = NULL; + PACCESS_ALLOWED_ACE Ace = NULL; + BOOL Ret = FALSE; + + /* Allocate space for an ACL */ + AclSize = sizeof(ACL) + + 2 * (FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(Sid)); + pDefaultAcl = HeapAlloc(GetProcessHeap(), 0, AclSize); + if (!pDefaultAcl) + { + ERR("WL: HeapAlloc() failed\n"); + goto cleanup; + } + + /* Initialize it */ + if (!InitializeAcl(pDefaultAcl, AclSize, ACL_REVISION)) + { + ERR("WL: InitializeAcl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Initialize new security descriptor */ + WinstaSd = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); + if (!InitializeSecurityDescriptor(WinstaSd, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("WL: InitializeSecurityDescriptor() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Allocate memory for access allowed ACE */ + Ace = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACCESS_ALLOWED_ACE)+ + GetLengthSid(Sid) - sizeof(DWORD)); + + /* Create the first ACE for the window station */ + Ace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + Ace->Header.AceFlags = CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE; + Ace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE) + GetLengthSid(Sid) - sizeof(DWORD); + Ace->Mask = GENERIC_ACCESS; + + /* Copy the sid */ + if (!CopySid(GetLengthSid(Sid), &Ace->SidStart, Sid)) + { + ERR("WL: CopySid() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add the first ACE */ + if (!AddAce(pDefaultAcl, ACL_REVISION, MAXDWORD, (LPVOID)Ace, Ace->Header.AceSize)) + { + ERR("WL: AddAce() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add the second ACE to the end of ACL */ + Ace->Header.AceFlags = NO_PROPAGATE_INHERIT_ACE; + Ace->Mask = WINSTA_ALL; + if (!AddAce(pDefaultAcl, ACL_REVISION, MAXDWORD, (LPVOID)Ace, Ace->Header.AceSize)) + { + ERR("WL: AddAce() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add ACL to winsta's security descriptor */ + if (!SetSecurityDescriptorDacl(WinstaSd, TRUE, pDefaultAcl, FALSE)) + { + ERR("WL: SetSecurityDescriptorDacl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Apply security to the window station */ + SecurityInformation = DACL_SECURITY_INFORMATION; + if (!SetUserObjectSecurity(WinSta, &SecurityInformation, WinstaSd)) + { + ERR("WL: SetUserObjectSecurity() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Indicate success */ + Ret = TRUE; + +cleanup: + /* Free allocated stuff */ + if (pDefaultAcl) HeapFree(GetProcessHeap(), 0, pDefaultAcl); + if (WinstaSd) HeapFree(GetProcessHeap(), 0, WinstaSd); + if (Ace) HeapFree(GetProcessHeap(), 0, Ace); + + return Ret; +} + +BOOL +AddAceToDesktop( + IN HDESK Desktop, + IN PSID WinlogonSid, + IN PSID UserSid) +{ + DWORD AclSize; + SECURITY_INFORMATION SecurityInformation; + PACL Acl = NULL; + PSECURITY_DESCRIPTOR DesktopSd = NULL; + BOOL Ret = FALSE; + + /* Allocate ACL */ + AclSize = sizeof(ACL) + + FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(WinlogonSid); + + /* Take user's sid into account */ + if (UserSid) + AclSize += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(UserSid); + + Acl = HeapAlloc(GetProcessHeap(), 0, AclSize); + if (!Acl) + { + ERR("WL: HeapAlloc() failed\n"); + goto cleanup; + } + + /* Initialize ACL */ + if (!InitializeAcl(Acl, AclSize, ACL_REVISION)) + { + ERR("WL: InitializeAcl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add full desktop access ACE for winlogon */ + if (!AddAccessAllowedAce(Acl, ACL_REVISION, DESKTOP_ALL, WinlogonSid)) + { + ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add full desktop access ACE for a user (if provided) */ + if (UserSid && !AddAccessAllowedAce(Acl, ACL_REVISION, DESKTOP_ALL, UserSid)) + { + ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Initialize new security descriptor */ + DesktopSd = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); + if (!InitializeSecurityDescriptor(DesktopSd, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("WL: InitializeSecurityDescriptor() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add ACL to the security descriptor */ + if (!SetSecurityDescriptorDacl(DesktopSd, TRUE, Acl, FALSE)) + { + ERR("WL: SetSecurityDescriptorDacl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Apply security to the window station */ + SecurityInformation = DACL_SECURITY_INFORMATION; + if (!SetUserObjectSecurity(Desktop, &SecurityInformation, DesktopSd)) + { + ERR("WL: SetUserObjectSecurity() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Indicate success */ + Ret = TRUE; + +cleanup: + /* Free allocated stuff */ + if (Acl) HeapFree(GetProcessHeap(), 0, Acl); + if (DesktopSd) HeapFree(GetProcessHeap(), 0, DesktopSd); + + return Ret; +} + +BOOL CreateWindowStationAndDesktops( IN OUT PWLSESSION Session) {

1 0

[gedmurphy] 41514: Add a built in command '.cls' command for clearing the output. Built in commands will be prepended with a period.
by gedmurphy＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: gedmurphy Date: Sun Jun 21 22:25:18 2009 New Revision: 41514 URL: http://svn.reactos.org/svn/reactos?rev=41514&view=rev Log: Add a built in command '.cls' command for clearing the output. Built in commands will be prepended with a period. Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Sun Jun 21 22:25:18 2009 @@ -28,6 +28,7 @@ List<string> textToAdd = new List<string>(); string kdbPrompt = "\r\nkdb:> "; + private string[] builtinCommands = { ".cls", ".reload" }; public RawTraffic() @@ -48,6 +49,36 @@ mConnection = conn; conn.DebugRawTrafficEvent += DebugRawTrafficEvent; } + + private void ParseBuiltinCommand(string command) + { + if (command == ".cls") + { + AddCommandToList(command); + RawTrafficText.Text = string.Empty; + } + } + + private void ParseGdbCommand(string command) + { + AddCommandToList(command); + RawTrafficTextBox.Text += '\r'; //FIXME: remove this + SendCommandToDebugger(); + RawTrafficTextBox.Text = string.Empty; + } + + private void ParseCommand(string command) + { + if (command.StartsWith(".")) + { + ParseBuiltinCommand(command); + } + else + { + ParseGdbCommand(command); + } + } + void UpdateText() { @@ -81,6 +112,12 @@ private void AddCommandToList(string cmd) { + if (prevCommand.Count > 0 && + prevCommand[prevCommand.Count - 1] == cmd) + { + return; + } + if (prevCommand.Count == maxCommands) { for (int i = 0; i < prevCommand.Count; i++) @@ -175,10 +212,10 @@ switch (e.KeyCode) { case Keys.Enter: - AddCommandToList(RawTrafficTextBox.Text); - RawTrafficTextBox.Text += '\r'; //FIXME: remove this - SendCommandToDebugger(); - RawTrafficTextBox.Text = string.Empty; + if (RawTrafficTextBox.Text.Length > 0) + { + ParseCommand(RawTrafficTextBox.Text); + } break; case Keys.Up: Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Sun Jun 21 22:25:18 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.62")] -[assembly: AssemblyFileVersion("1.0.2.62")] +[assembly: AssemblyVersion("1.0.2.63")] +[assembly: AssemblyFileVersion("1.0.2.63")]

1 0

[sginsberg] 41513: - Define noreturn attribute for KeBugCheckWithTf and KiBugCheckDebugBreak in a msvc compatible way
by sginsberg＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: sginsberg Date: Sun Jun 21 21:06:34 2009 New Revision: 41513 URL: http://svn.reactos.org/svn/reactos?rev=41513&view=rev Log: - Define noreturn attribute for KeBugCheckWithTf and KiBugCheckDebugBreak in a msvc compatible way Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sun Jun 21 21:06:34 2009 @@ -790,6 +790,7 @@ IN OUT PCONTEXT Context ); +DECLSPEC_NORETURN VOID NTAPI KeBugCheckWithTf( Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4151… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Jun 21 21:06:34 2009 @@ -546,9 +546,9 @@ } } +DECLSPEC_NORETURN VOID NTAPI -__declspec(noreturn) KiBugCheckDebugBreak(IN ULONG StatusCode) { /* If KDBG isn't connected, freeze the CPU, otherwise, break */ @@ -751,7 +751,6 @@ VOID NTAPI -__declspec(noreturn) KeBugCheckWithTf(IN ULONG BugCheckCode, IN ULONG_PTR BugCheckParameter1, IN ULONG_PTR BugCheckParameter2,

1 0

[janderwald] 41512: - Don't release object which drivers should release - Fixes a few crashes when starting another audio stream
by janderwald＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: janderwald Date: Sun Jun 21 14:48:09 2009 New Revision: 41512 URL: http://svn.reactos.org/svn/reactos?rev=41512&view=rev Log: - Don't release object which drivers should release - Fixes a few crashes when starting another audio stream Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sun Jun 21 14:48:09 2009 @@ -692,8 +692,6 @@ } This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); - This->ServiceGroup->lpVtbl->Release(This->ServiceGroup); - This->DmaChannel->lpVtbl->Release(This->DmaChannel); Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); if (NT_SUCCESS(Status)) @@ -735,7 +733,6 @@ This->Filter->lpVtbl->FreePin(This->Filter, (IPortPinWaveCyclic*)This); DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->lpVtbl->Release(Stream); - /* this line is never reached */ } } @@ -1064,8 +1061,8 @@ Status = This->Stream->lpVtbl->SetNotificationFreq(This->Stream, 10, &This->FrameSize); //This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); - DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); - DPRINT1("Setting state to pause %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); + DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); + DPRINT1("Setting state to pause %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); This->State = KSSTATE_PAUSE; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Sun Jun 21 14:48:09 2009 @@ -391,14 +391,12 @@ if (This->State != KSSTATE_STOP) { This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); - KeStallExecutionProcessor(10); } } if (This->ServiceGroup) { This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); - This->ServiceGroup->lpVtbl->Release(This->ServiceGroup); } Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); @@ -407,20 +405,15 @@ Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); if (NT_SUCCESS(Status)) { - ISubDevice->lpVtbl->Release(ISubDevice); Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount--; } + ISubDevice->lpVtbl->Release(ISubDevice); } if (This->Format) { ExFreePool(This->Format); This->Format = NULL; - } - - if (This->WaveStream) - { - This->WaveStream->lpVtbl->Release(This->WaveStream); } /* complete the irp */ @@ -440,7 +433,6 @@ This->Stream = NULL; DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->lpVtbl->Release(Stream); - /* this line is never reached */ } } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] Sun Jun 21 14:48:09 2009 @@ -702,9 +702,9 @@ Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); if (NT_SUCCESS(Status)) { - ISubDevice->lpVtbl->Release(ISubDevice); Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount--; } + ISubDevice->lpVtbl->Release(ISubDevice); } if (This->Format) @@ -735,7 +735,6 @@ This->Stream = NULL; DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->lpVtbl->Release(Stream); - /* this line is never reached */ } }

1 0

[ros-arm-bringup] 41511: - MC_NPPOOL is special-cased in the memory balancer core to always force the allocation of a page, even in low-memory conditions (which in ReactOS, occur early-on because, in a stroke of typical ReactOS genius, the balancer core is called before the balancer initailizes its values and thresholds). Make MC_SYSTEM special-cased as well, so we never fail to allocate page tables early-on. - This fixes booting on systems which required enough page tables such that the balance
by ros-arm-bringup＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: ros-arm-bringup Date: Sun Jun 21 13:08:05 2009 New Revision: 41511 URL: http://svn.reactos.org/svn/reactos?rev=41511&view=rev Log: - MC_NPPOOL is special-cased in the memory balancer core to always force the allocation of a page, even in low-memory conditions (which in ReactOS, occur early-on because, in a stroke of typical ReactOS genius, the balancer core is called before the balancer initailizes its values and thresholds). Make MC_SYSTEM special-cased as well, so we never fail to allocate page tables early-on. - This fixes booting on systems which required enough page tables such that the balancer refused the allocation of new pages (around 64+16 pages for page tables of 4KB each, ie. 320MB). Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sun Jun 21 13:08:05 2009 @@ -85,6 +85,8 @@ MiMemoryConsumers[MC_PPOOL].PagesTarget = NrAvailablePages / 2; MiMemoryConsumers[MC_NPPOOL].PagesTarget = 0xFFFFFFFF; MiMemoryConsumers[MC_NPPOOL].PagesUsed = NrSystemPages; + MiMemoryConsumers[MC_SYSTEM].PagesTarget = 0xFFFFFFFF; + MiMemoryConsumers[MC_SYSTEM].PagesUsed = 0; } VOID @@ -221,7 +223,7 @@ /* * Allocate always memory for the non paged pool and for the pager thread. */ - if (Consumer == MC_NPPOOL || MiIsBalancerThread()) + if ((Consumer == MC_NPPOOL) || (Consumer == MC_SYSTEM) || MiIsBalancerThread()) { Page = MmAllocPage(Consumer, 0); if (Page == 0)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs