Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[cwittich] 41611: sync shell32 with wine 1.1.24

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jun 25 18:39:01 2009 New Revision: 41611 URL: http://svn.reactos.org/svn/reactos?rev=41611&view=rev Log: sync shell32 with wine 1.1.24 Modified: trunk/rostests/winetests/shell32/appbar.c trunk/rostests/winetests/shell32/shlfolder.c Modified: trunk/rostests/winetests/shell32/appbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/appbar.… ============================================================================== --- trunk/rostests/winetests/shell32/appbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/appbar.c [iso-8859-1] Thu Jun 25 18:39:01 2009 @@ -36,6 +36,7 @@ { HWND hwnd; BOOL registered; + BOOL to_be_deleted; RECT desired_rect; UINT edge; RECT allocated_rect; @@ -55,6 +56,12 @@ if (!info || !info->registered) { + return; + } + + if (info->to_be_deleted) + { + win_skip("Some Win95 and NT4 systems send messages to removed taskbars\n"); return; } @@ -71,15 +78,15 @@ abd.rc.top = abd.rc.bottom - (info->desired_rect.bottom - info->desired_rect.top); break; case ABE_LEFT: - ok(info->desired_rect.right == abd.rc.right, "ABM_QUERYPOS changed right of rect from %i to %i\n", info->desired_rect.top, abd.rc.top); + ok(info->desired_rect.right == abd.rc.right, "ABM_QUERYPOS changed right of rect from %i to %i\n", info->desired_rect.right, abd.rc.right); abd.rc.right = abd.rc.left + (info->desired_rect.right - info->desired_rect.left); break; case ABE_RIGHT: - ok(info->desired_rect.left == abd.rc.left, "ABM_QUERYPOS changed left of rect from %i to %i\n", info->desired_rect.top, abd.rc.top); + ok(info->desired_rect.left == abd.rc.left, "ABM_QUERYPOS changed left of rect from %i to %i\n", info->desired_rect.left, abd.rc.left); abd.rc.left = abd.rc.right - (info->desired_rect.right - info->desired_rect.left); break; case ABE_TOP: - ok(info->desired_rect.bottom == abd.rc.bottom, "ABM_QUERYPOS changed bottom of rect from %i to %i\n", info->desired_rect.top, abd.rc.top); + ok(info->desired_rect.bottom == abd.rc.bottom, "ABM_QUERYPOS changed bottom of rect from %i to %i\n", info->desired_rect.bottom, abd.rc.bottom); abd.rc.bottom = abd.rc.top + (info->desired_rect.bottom - info->desired_rect.top); break; } @@ -221,6 +228,7 @@ /* dock windows[0] to the bottom of the screen */ windows[0].registered = TRUE; + windows[0].to_be_deleted = FALSE; windows[0].edge = ABE_BOTTOM; windows[0].desired_rect.left = 0; windows[0].desired_rect.right = screen_width; @@ -241,6 +249,7 @@ /* dock windows[1] to the bottom of the screen */ windows[1].registered = TRUE; + windows[1].to_be_deleted = FALSE; windows[1].edge = ABE_BOTTOM; windows[1].desired_rect.left = 0; windows[1].desired_rect.right = screen_width; @@ -272,6 +281,7 @@ /* dock windows[2] to the bottom of the screen */ windows[2].registered = TRUE; + windows[2].to_be_deleted = FALSE; windows[2].edge = ABE_BOTTOM; windows[2].desired_rect.left = 0; windows[2].desired_rect.right = screen_width; @@ -328,6 +338,7 @@ expected_bottom = max(windows[0].allocated_rect.bottom, windows[1].allocated_rect.bottom); abd.hWnd = windows[0].hwnd; + windows[0].to_be_deleted = TRUE; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[0].registered = FALSE; @@ -341,12 +352,14 @@ /* remove the other windows */ abd.hWnd = windows[1].hwnd; + windows[1].to_be_deleted = TRUE; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[1].registered = FALSE; DestroyWindow(windows[1].hwnd); abd.hWnd = windows[2].hwnd; + windows[2].to_be_deleted = TRUE; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[2].registered = FALSE; @@ -399,7 +412,9 @@ if(ret) { ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n"); - ok(abd.uEdge <= ABE_BOTTOM, "uEdge not returned\n"); + ok(abd.uEdge <= ABE_BOTTOM || + broken(abd.uEdge == 0xcccccccc), /* Some Win95 and NT4 */ + "uEdge not returned\n"); ok(abd.rc.left != 0xcccccccc, "rc not updated\n"); } Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… ============================================================================== --- trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] Thu Jun 25 18:39:01 2009 @@ -81,6 +81,15 @@ ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr); } +static const char *wine_dbgstr_w(LPCWSTR str) +{ + static char buf[512]; + if (!str) + return "(null)"; + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + static void test_ParseDisplayName(void) { HRESULT hr; @@ -265,13 +274,15 @@ for (i = 0; i < 5; i++) { SFGAOF flags; +#define SFGAO_VISTA SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY /* Native returns all flags no matter what we ask for */ flags = SFGAO_CANCOPY; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); ok(flags == (attrs[i]) || - flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */ + flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR) || /* Win9x, NT4 */ + flags == ((attrs[i] & ~SFGAO_CAPABILITYMASK) | SFGAO_VISTA), /* Vista and higher */ "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); flags = SFGAO_testfor; @@ -469,7 +480,8 @@ } /* WinXP and up store the filenames as both ANSI and UNICODE in the pidls */ if (pidlLast->mkid.cb >= 76) { - ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName), + ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName) || + (pidlLast->mkid.cb >= 94 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[64], wszFileName)), /* Vista */ "Filename should be stored as wchar-string at this position!\n"); } @@ -478,6 +490,7 @@ hr = IShellFolder_BindToObject(psfDesktop, pidlTestFile, NULL, &IID_IUnknown, (VOID**)&psfFile); todo_wine ok (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hr == E_NOTIMPL || /* Vista */ broken(SUCCEEDED(hr)), /* Win9x, W2K */ "hr = %08x\n", hr); if (SUCCEEDED(hr)) { @@ -960,7 +973,9 @@ wszPath[1] = '\0'; result = pSHGetPathFromIDListW(pidlMyComputer, wszPath); ok (!result, "SHGetPathFromIDListW succeeded where it shouldn't!\n"); - ok (GetLastError()==0xdeadbeef, "SHGetPathFromIDListW shouldn't set last error! Last error: %u\n", GetLastError()); + ok (GetLastError()==0xdeadbeef || + GetLastError()==ERROR_SUCCESS, /* Vista and higher */ + "Unexpected last error from SHGetPathFromIDListW: %u\n", GetLastError()); ok (!wszPath[0], "Expected empty path\n"); if (result) { IShellFolder_Release(psfDesktop); @@ -1116,6 +1131,10 @@ 'A','t','t','r','i','b','u','t','e','s',0 }; static const WCHAR wszResolveLinkFlags[] = { 'R','e','s','o','l','v','e','L','i','n','k','F','l','a','g','s',0 }; + static const WCHAR wszTargetKnownFolder[] = { + 'T','a','r','g','e','t','K','n','o','w','n','F','o','l','d','e','r',0 }; + static const WCHAR wszCLSID[] = { + 'C','L','S','I','D',0 }; if (!lstrcmpW(pszPropName, wszTargetSpecialFolder)) { ok(V_VT(pVar) == VT_I4 || @@ -1155,7 +1174,19 @@ return S_OK; } - ok(FALSE, "PropertyBag was asked for unknown property (vt=%d)!\n", V_VT(pVar)); + if (!lstrcmpW(pszPropName, wszTargetKnownFolder)) { + ok(V_VT(pVar) == VT_BSTR, "Wrong variant type for 'TargetKnownFolder' property!\n"); + /* TODO */ + return E_INVALIDARG; + } + + if (!lstrcmpW(pszPropName, wszCLSID)) { + ok(V_VT(pVar) == VT_EMPTY, "Wrong variant type for 'CLSID' property!\n"); + /* TODO */ + return E_INVALIDARG; + } + + ok(FALSE, "PropertyBag was asked for unknown property %s (vt=%d)!\n", wine_dbgstr_w(pszPropName), V_VT(pVar)); return E_INVALIDARG; } @@ -1529,7 +1560,7 @@ static char toolongpath[MAX_PATH+1]; if(!pSHGetFolderPathA) { - skip("SHGetFolderPathA not present!\n"); + win_skip("SHGetFolderPathA not present!\n"); return; } if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) @@ -1551,16 +1582,13 @@ skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); return; } - for(i=0; i< MAX_PATH; i++) - toolongpath[i] = '0' + i % 10; - toolongpath[MAX_PATH] = '\0'; /* test invalid second parameter */ ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); - /* test invalid forth parameter */ - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, wine, testpath); + /* test fourth parameter */ + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, winetemp, testpath); switch(ret) { case S_OK: /* winvista */ ok(!strncmp(appdata, testpath, strlen(appdata)), @@ -1590,6 +1618,9 @@ ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); + for(i=0; i< MAX_PATH; i++) + toolongpath[i] = '0' + i % 10; + toolongpath[MAX_PATH] = '\0'; ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); ok(HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) == ret, "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), ret); @@ -1620,15 +1651,6 @@ RemoveDirectoryA(testpath); sprintf(testpath, "%s\\%s", appdata, wine); RemoveDirectoryA(testpath); -} - -static const char *wine_dbgstr_w(LPCWSTR str) -{ - static char buf[512]; - if (!str) - return "(null)"; - WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); - return buf; } static void test_LocalizedNames(void)

15 years, 6 months

[dgorbachev] 41610: Remove a hack from NtAccessCheck(). Bug #4169.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Jun 25 17:29:58 2009 New Revision: 41610 URL: http://svn.reactos.org/svn/reactos?rev=41610&view=rev Log: Remove a hack from NtAccessCheck(). Bug #4169. Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Thu Jun 25 17:29:58 2009 @@ -49,7 +49,7 @@ SepExports.SeSystemEnvironmentPrivilege = SeSystemEnvironmentPrivilege; SepExports.SeChangeNotifyPrivilege = SeChangeNotifyPrivilege; SepExports.SeRemoteShutdownPrivilege = SeRemoteShutdownPrivilege; - + SepExports.SeNullSid = SeNullSid; SepExports.SeWorldSid = SeWorldSid; SepExports.SeLocalSid = SeLocalSid; @@ -72,11 +72,11 @@ SepExports.SeAuthenticatedUsersSid = SeAuthenticatedUsersSid; SepExports.SeRestrictedSid = SeRestrictedSid; SepExports.SeAnonymousLogonSid = SeAnonymousLogonSid; - + SepExports.SeUndockPrivilege = SeUndockPrivilege; SepExports.SeSyncAgentPrivilege = SeSyncAgentPrivilege; SepExports.SeEnableDelegationPrivilege = SeEnableDelegationPrivilege; - + SeExports = &SepExports; return TRUE; } @@ -92,18 +92,18 @@ if (!SepInitSDs()) return FALSE; SepInitPrivileges(); if (!SepInitExports()) return FALSE; - + /* Initialize the subject context lock */ ExInitializeResource(&SepSubjectContextLock); - + /* Initialize token objects */ SepInitializeTokenImplementation(); - + /* Clear impersonation info for the idle thread */ PsGetCurrentThread()->ImpersonationInfo = NULL; PspClearCrossThreadFlag(PsGetCurrentThread(), CT_ACTIVE_IMPERSONATION_INFO_BIT); - + /* Initialize the boot token */ ObInitializeFastReference(&PsGetCurrentProcess()->Token, NULL); ObInitializeFastReference(&PsGetCurrentProcess()->Token, @@ -117,7 +117,7 @@ { NTSTATUS Status; PAGED_CODE(); - + /* Insert the system token into the tree */ Status = ObInsertObject((PVOID)(PsGetCurrentProcess()->Token.Value & ~MAX_FAST_REFS), @@ -127,7 +127,7 @@ NULL, NULL); ASSERT(NT_SUCCESS(Status)); - + /* FIXME: TODO \\ Security directory */ return TRUE; } @@ -140,17 +140,17 @@ switch (ExpInitializationPhase) { case 0: - + /* Do Phase 0 */ return SepInitializationPhase0(); - + case 1: - + /* Do Phase 1 */ return SepInitializationPhase1(); - + default: - + /* Don't know any other phase! Bugcheck! */ KeBugCheckEx(UNEXPECTED_INITIALIZATION_CALL, 0, @@ -170,7 +170,7 @@ HANDLE DirectoryHandle; HANDLE EventHandle; NTSTATUS Status; - + /* Create '\Security' directory */ RtlInitUnicodeString(&Name, L"\\Security"); @@ -187,7 +187,7 @@ DPRINT1("Failed to create 'Security' directory!\n"); return FALSE; } - + /* Create 'LSA_AUTHENTICATION_INITALIZED' event */ RtlInitUnicodeString(&Name, L"\\LSA_AUTHENTICATION_INITALIZED"); @@ -207,12 +207,12 @@ NtClose(DirectoryHandle); return FALSE; } - + ZwClose(EventHandle); ZwClose(DirectoryHandle); - + /* FIXME: Create SRM port and listener thread */ - + return TRUE; } @@ -228,16 +228,16 @@ IN PGENERIC_MAPPING GenericMapping) { PAGED_CODE(); - + /* Select the operation type */ switch (OperationType) { /* Setting a new descriptor */ case SetSecurityDescriptor: - + /* Sanity check */ ASSERT((PoolType == PagedPool) || (PoolType == NonPagedPool)); - + /* Set the information */ return ObSetSecurityDescriptorInfo(Object, SecurityInformation, @@ -245,33 +245,33 @@ OldSecurityDescriptor, PoolType, GenericMapping); - + case QuerySecurityDescriptor: - + /* Query the information */ return ObQuerySecurityDescriptorInfo(Object, SecurityInformation, SecurityDescriptor, ReturnLength, OldSecurityDescriptor); - + case DeleteSecurityDescriptor: - + /* De-assign it */ return ObDeassignSecurity(OldSecurityDescriptor); - + case AssignSecurityDescriptor: - + /* Assign it */ ObAssignObjectSecurityDescriptor(Object, SecurityDescriptor, PoolType); return STATUS_SUCCESS; - + default: - + /* Bug check */ KeBugCheckEx(SECURITY_SYSTEM, 0, STATUS_INVALID_PARAMETER, 0, 0); } - + /* Should never reach here */ ASSERT(FALSE); return STATUS_SUCCESS; @@ -284,14 +284,14 @@ { ULONG i; PTOKEN Token = (PTOKEN)_Token; - + PAGED_CODE(); - + if (Token->UserAndGroupCount == 0) { return FALSE; } - + for (i=0; i<Token->UserAndGroupCount; i++) { if (RtlEqualSid(Sid, Token->UserAndGroups[i].Sid)) @@ -300,11 +300,11 @@ { return TRUE; } - + return FALSE; } } - + return FALSE; } @@ -314,7 +314,7 @@ OUT PACCESS_MASK DesiredAccess) { *DesiredAccess = 0; - + if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION)) { @@ -331,7 +331,7 @@ OUT PACCESS_MASK DesiredAccess) { *DesiredAccess = 0; - + if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) { *DesiredAccess |= WRITE_OWNER; @@ -374,7 +374,7 @@ PSID Sid; NTSTATUS Status; PAGED_CODE(); - + /* Check if this is kernel mode */ if (AccessMode == KernelMode) { @@ -391,12 +391,12 @@ /* Give the desired and previous access */ *GrantedAccess = DesiredAccess | PreviouslyGrantedAccess; } - + /* Success */ *AccessStatus = STATUS_SUCCESS; return TRUE; } - + /* Check if we didn't get an SD */ if (!SecurityDescriptor) { @@ -404,7 +404,7 @@ *AccessStatus = STATUS_ACCESS_DENIED; return FALSE; } - + /* Check for invalid impersonation */ if ((SubjectSecurityContext->ClientToken) && (SubjectSecurityContext->ImpersonationLevel < SecurityImpersonation)) @@ -412,7 +412,7 @@ *AccessStatus = STATUS_BAD_IMPERSONATION_LEVEL; return FALSE; } - + /* Check for no access desired */ if (!DesiredAccess) { @@ -423,31 +423,31 @@ *AccessStatus = STATUS_ACCESS_DENIED; return FALSE; } - + /* Return the previous access only */ *GrantedAccess = PreviouslyGrantedAccess; *AccessStatus = STATUS_SUCCESS; *Privileges = NULL; return TRUE; } - + /* Acquire the lock if needed */ if (!SubjectContextLocked) SeLockSubjectContext(SubjectSecurityContext); - + /* Map given accesses */ RtlMapGenericMask(&DesiredAccess, GenericMapping); if (PreviouslyGrantedAccess) RtlMapGenericMask(&PreviouslyGrantedAccess, GenericMapping); - - - + + + CurrentAccess = PreviouslyGrantedAccess; - - - + + + Token = SubjectSecurityContext->ClientToken ? SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken; - + /* Get the DACL */ Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, &Present, @@ -459,11 +459,11 @@ { SeUnlockSubjectContext(SubjectSecurityContext); } - + *AccessStatus = Status; return FALSE; } - + /* RULE 1: Grant desired access if the object is unprotected */ if (Present == TRUE && Dacl == NULL) { @@ -471,18 +471,18 @@ { SeUnlockSubjectContext(SubjectSecurityContext); } - + *GrantedAccess = DesiredAccess; *AccessStatus = STATUS_SUCCESS; return TRUE; } - + CurrentAccess = PreviouslyGrantedAccess; - + /* RULE 2: Check token for 'take ownership' privilege */ Privilege.Luid = SeTakeOwnershipPrivilege; Privilege.Attributes = SE_PRIVILEGE_ENABLED; - + if (SepPrivilegeCheck(Token, &Privilege, 1, @@ -497,13 +497,13 @@ { SeUnlockSubjectContext(SubjectSecurityContext); } - + *GrantedAccess = CurrentAccess; *AccessStatus = STATUS_SUCCESS; return TRUE; } } - + /* RULE 3: Check whether the token is the owner */ Status = RtlGetOwnerSecurityDescriptor(SecurityDescriptor, &Sid, @@ -515,11 +515,11 @@ { SeUnlockSubjectContext(SubjectSecurityContext); } - + *AccessStatus = Status; return FALSE; } - + if (Sid && SepSidInToken(Token, Sid)) { CurrentAccess |= (READ_CONTROL | WRITE_DAC); @@ -530,13 +530,13 @@ { SeUnlockSubjectContext(SubjectSecurityContext); } - + *GrantedAccess = CurrentAccess; *AccessStatus = STATUS_SUCCESS; return TRUE; } } - + /* Fail if DACL is absent */ if (Present == FALSE) { @@ -544,12 +544,12 @@ { SeUnlockSubjectContext(SubjectSecurityContext); } - + *GrantedAccess = 0; *AccessStatus = STATUS_ACCESS_DENIED; return FALSE; } - + /* RULE 4: Grant rights according to the DACL */ CurrentAce = (PACE)(Dacl + 1); for (i = 0; i < Dacl->AceCount; i++) @@ -563,13 +563,13 @@ { SeUnlockSubjectContext(SubjectSecurityContext); } - + *GrantedAccess = 0; *AccessStatus = STATUS_ACCESS_DENIED; return FALSE; } } - + else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) { if (SepSidInToken(Token, Sid)) @@ -585,17 +585,17 @@ } CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize); } - + if (SubjectContextLocked == FALSE) { SeUnlockSubjectContext(SubjectSecurityContext); } - + DPRINT("CurrentAccess %08lx\n DesiredAccess %08lx\n", CurrentAccess, DesiredAccess); - + *GrantedAccess = CurrentAccess & DesiredAccess; - + if (DesiredAccess & MAXIMUM_ALLOWED) { *GrantedAccess = CurrentAccess; @@ -688,32 +688,24 @@ SubjectSecurityContext.ProcessAuditId = NULL; SeLockSubjectContext(&SubjectSecurityContext); - /* FIXME */ /* Now perform the access check */ - if (SeAccessCheck(SecurityDescriptor, - &SubjectSecurityContext, - TRUE, - DesiredAccess, - 0, - &PrivilegeSet, //FIXME - GenericMapping, - PreviousMode, - GrantedAccess, - AccessStatus)) - { - Status = *AccessStatus; - } - else - { - Status = STATUS_ACCESS_DENIED; - } + SeAccessCheck(SecurityDescriptor, + &SubjectSecurityContext, + TRUE, + DesiredAccess, + 0, + &PrivilegeSet, //FIXME + GenericMapping, + PreviousMode, + GrantedAccess, + AccessStatus); /* Unlock subject context and dereference the token */ SeUnlockSubjectContext(&SubjectSecurityContext); ObDereferenceObject(Token); - /* Check succeeded? */ - return Status; + /* Check succeeded */ + return STATUS_SUCCESS; }

15 years, 6 months

[dreimer] 41609: Fix even more

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jun 25 15:53:57 2009 New Revision: 41609 URL: http://svn.reactos.org/svn/reactos?rev=41609&view=rev Log: Fix even more Modified: trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh Modified: trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/buildtoo… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh [iso-8859-1] Thu Jun 25 15:53:57 2009 @@ -28,8 +28,8 @@ WIN32_INSTALLDIR="c:/buildtoolchain/mingw" # Make sure we build an entirely native compiler, since MSYS might report subtle differences (i.e. "i686-pc-mingw32" instead of "mingw32") -BUILD="mingw32" -HOST="mingw32" +BUILD="$TARGET" +HOST="$TARGET" # The following variables need to be accessed by Make and its subprocesses. export CFLAGS

15 years, 6 months

[dreimer] 41608: Hopefully fixed Compatibility Problems with ROS on PI Machines.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jun 25 15:48:56 2009 New Revision: 41608 URL: http://svn.reactos.org/svn/reactos?rev=41608&view=rev Log: Hopefully fixed Compatibility Problems with ROS on PI Machines. Modified: trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh Modified: trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/buildtoo… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh [iso-8859-1] Thu Jun 25 15:48:56 2009 @@ -23,13 +23,13 @@ LDFLAGS="-s" MINGWDIR="/mingw" NEEDED_TOOLS="bison flex gcc g++ grep make makeinfo" -TARGET="mingw32" +TARGET="i586-pc-mingw32" TEMPDIR="/c/buildtoolchain" WIN32_INSTALLDIR="c:/buildtoolchain/mingw" # Make sure we build an entirely native compiler, since MSYS might report subtle differences (i.e. "i686-pc-mingw32" instead of "mingw32") -BUILD="$TARGET" -HOST="$TARGET" +BUILD="mingw32" +HOST="mingw32" # The following variables need to be accessed by Make and its subprocesses. export CFLAGS

15 years, 6 months

[hyperion] 41607: No reason to compile PSEH2 with other compilers than GCC

by hyperion＠svn.reactos.org

Author: hyperion Date: Thu Jun 25 14:27:57 2009 New Revision: 41607 URL: http://svn.reactos.org/svn/reactos?rev=41607&view=rev Log: No reason to compile PSEH2 with other compilers than GCC Modified: trunk/reactos/lib/pseh/pseh.rbuild Modified: trunk/reactos/lib/pseh/pseh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/pseh.rbuild?rev=4… ============================================================================== --- trunk/reactos/lib/pseh/pseh.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/pseh.rbuild [iso-8859-1] Thu Jun 25 14:27:57 2009 @@ -4,8 +4,11 @@ <if property="ARCH" value="i386"> <directory name="i386"> <file>framebased.S</file> - <file>framebased-gcchack.c</file> - <file>framebased-gcchack-asm.S</file> + + <group compilerset="gcc"> + <file>framebased-gcchack.c</file> + <file>framebased-gcchack-asm.S</file> + </group> </directory> </if> <if property="ARCH" value="powerpc">

15 years, 6 months

[janderwald] 41605: - Don't modify access status when function fails - reduces advapi32_winetest security failures by 3

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jun 25 11:16:26 2009 New Revision: 41605 URL: http://svn.reactos.org/svn/reactos?rev=41605&view=rev Log: - Don't modify access status when function fails - reduces advapi32_winetest security failures by 3 Modified: trunk/reactos/dll/win32/advapi32/token/token.c Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] Thu Jun 25 11:16:26 2009 @@ -172,7 +172,7 @@ { /* Access denied */ SetLastError(RtlNtStatusToDosError(NtAccessStatus)); - *AccessStatus = FALSE; + return FALSE; } else {

15 years, 6 months

[tkreuzer] 41604: Rewrite (NtUser)SystemParametersInfo and related. - Instead of getting the data from the window station and other strange places, the values are now mostly stored in a global variable. This is possible because NtUserSystemParametersInfo should fail anyway when being called from a non-interactive windowstation (tested on windows XP). - WM_SETTINGCHANGE is now properly sent not posted to all toplevel Windows also passing the registry string as the lParam value (strings could need

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jun 25 06:43:38 2009 New Revision: 41604 URL: http://svn.reactos.org/svn/reactos?rev=41604&view=rev Log: Rewrite (NtUser)SystemParametersInfo and related. - Instead of getting the data from the window station and other strange places, the values are now mostly stored in a global variable. This is possible because NtUserSystemParametersInfo should fail anyway when being called from a non-interactive windowstation (tested on windows XP). - WM_SETTINGCHANGE is now properly sent not posted to all toplevel Windows also passing the registry string as the lParam value (strings could need some testing). - SystemMetrics are now set and updated from system parameters. - Most values are now properly loaded from registry and also saved. - user32_winetest sysparams: before: 634 executed / 235 failures, after: 1093 executed, 11 failures - Fixes the non-bold caption font in 2nd stage. - Implements a number SPI codes. - Implements helper functions for registry and file access Thanks to all testers for all the regression testing :) See issue #4595 for more details. Added: trunk/reactos/subsystems/win32/win32k/include/sysparams.h (with props) trunk/reactos/subsystems/win32/win32k/misc/file.c (with props) trunk/reactos/subsystems/win32/win32k/misc/registry.c (with props) Modified: trunk/reactos/base/system/userinit/userinit.c trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/include/psdk/winuser.h trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/monitor.h trunk/reactos/subsystems/win32/win32k/include/win32k.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Added: trunk/reactos/subsystems/win32/win32k/include/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Added: trunk/reactos/subsystems/win32/win32k/misc/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Added: trunk/reactos/subsystems/win32/win32k/misc/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…

15 years, 6 months

[dgorbachev] 41603: Hack: partially undo r38510 changes to overcome regression (bug #4169).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Jun 25 02:23:29 2009 New Revision: 41603 URL: http://svn.reactos.org/svn/reactos?rev=41603&view=rev Log: Hack: partially undo r38510 changes to overcome regression (bug #4169). Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Thu Jun 25 02:23:29 2009 @@ -638,7 +638,7 @@ PTOKEN Token; NTSTATUS Status; PAGED_CODE(); - + /* Check if this is kernel mode */ if (PreviousMode == KernelMode) { @@ -654,7 +654,7 @@ /* Just give the desired access */ *GrantedAccess = DesiredAccess; } - + /* Success */ *AccessStatus = STATUS_SUCCESS; return STATUS_SUCCESS; @@ -688,24 +688,32 @@ SubjectSecurityContext.ProcessAuditId = NULL; SeLockSubjectContext(&SubjectSecurityContext); + /* FIXME */ /* Now perform the access check */ - SeAccessCheck(SecurityDescriptor, - &SubjectSecurityContext, - TRUE, - DesiredAccess, - 0, - &PrivilegeSet, //FIXME - GenericMapping, - PreviousMode, - GrantedAccess, - AccessStatus); + if (SeAccessCheck(SecurityDescriptor, + &SubjectSecurityContext, + TRUE, + DesiredAccess, + 0, + &PrivilegeSet, //FIXME + GenericMapping, + PreviousMode, + GrantedAccess, + AccessStatus)) + { + Status = *AccessStatus; + } + else + { + Status = STATUS_ACCESS_DENIED; + } /* Unlock subject context and dereference the token */ SeUnlockSubjectContext(&SubjectSecurityContext); ObDereferenceObject(Token); - /* Check succeeded */ - return STATUS_SUCCESS; + /* Check succeeded? */ + return Status; }

15 years, 6 months

[cwittich] 41602: fix typo

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jun 25 02:12:48 2009 New Revision: 41602 URL: http://svn.reactos.org/svn/reactos?rev=41602&view=rev Log: fix typo Modified: trunk/reactos/dll/win32/ws2_32_new/ws2_32.def Modified: trunk/reactos/dll/win32/ws2_32_new/ws2_32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_3… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.def [iso-8859-1] Thu Jun 25 02:12:48 2009 @@ -9,7 +9,7 @@ WSAAddressToStringA@20 @30 WSAAddressToStringW@20 @31 WSAAsyncGetHostByAddr@28 @102 -WSAAsyncGetHostByNam@20e @103 +WSAAsyncGetHostByName@20 @103 WSAAsyncGetProtoByName@20 @105 WSAAsyncGetProtoByNumber@20 @104 WSAAsyncGetServByName@24 @107

15 years, 6 months

[cwittich] 41601: fix formatting

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jun 25 02:07:50 2009 New Revision: 41601 URL: http://svn.reactos.org/svn/reactos?rev=41601&view=rev Log: fix formatting Modified: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c Modified: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/recm… ============================================================================== --- trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c [iso-8859-1] Thu Jun 25 02:07:50 2009 @@ -6,26 +6,26 @@ KeInitializeSpinLock( &RecMutex->SpinLock ); ExInitializeFastMutex( &RecMutex->Mutex ); KeInitializeEvent( &RecMutex->StateLockedEvent, - NotificationEvent, FALSE ); + NotificationEvent, FALSE ); } /* NOTE: When we leave, the FAST_MUTEX must have been released. The result - * is that we always exit in the same irql as entering */ +* is that we always exit in the same irql as entering */ SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToWrite ) { NTSTATUS Status = STATUS_SUCCESS; PVOID CurrentThread = KeGetCurrentThread(); KIRQL CurrentIrql; /* Wait for the previous user to unlock the RecMutex state. There might be - * multiple waiters waiting to change the state. We need to check each - * time we get the event whether somebody still has the state locked */ + * multiple waiters waiting to change the state. We need to check each + * time we get the event whether somebody still has the state locked */ if( !RecMutex ) return FALSE; if( CurrentThread == RecMutex->CurrentThread || - (!ToWrite && !RecMutex->Writer) ) { - RecMutex->LockCount++; - return TRUE; + (!ToWrite && !RecMutex->Writer) ) { + RecMutex->LockCount++; + return TRUE; } CurrentIrql = KeGetCurrentIrql(); @@ -33,29 +33,29 @@ ASSERT(CurrentIrql <= DISPATCH_LEVEL); if( CurrentIrql <= APC_LEVEL ) { - ExAcquireFastMutex( &RecMutex->Mutex ); - RecMutex->OldIrql = CurrentIrql; - while( RecMutex->Locked ) { - ExReleaseFastMutex( &RecMutex->Mutex ); - Status = KeWaitForSingleObject( &RecMutex->StateLockedEvent, - UserRequest, - KernelMode, - FALSE, - NULL ); - ExAcquireFastMutex( &RecMutex->Mutex ); - } - RecMutex->Locked = TRUE; - RecMutex->Writer = ToWrite; - RecMutex->CurrentThread = CurrentThread; - RecMutex->LockCount++; - ExReleaseFastMutex( &RecMutex->Mutex ); + ExAcquireFastMutex( &RecMutex->Mutex ); + RecMutex->OldIrql = CurrentIrql; + while( RecMutex->Locked ) { + ExReleaseFastMutex( &RecMutex->Mutex ); + Status = KeWaitForSingleObject( &RecMutex->StateLockedEvent, + UserRequest, + KernelMode, + FALSE, + NULL ); + ExAcquireFastMutex( &RecMutex->Mutex ); + } + RecMutex->Locked = TRUE; + RecMutex->Writer = ToWrite; + RecMutex->CurrentThread = CurrentThread; + RecMutex->LockCount++; + ExReleaseFastMutex( &RecMutex->Mutex ); } else { - KeAcquireSpinLockAtDpcLevel( &RecMutex->SpinLock ); + KeAcquireSpinLockAtDpcLevel( &RecMutex->SpinLock ); RecMutex->OldIrql = DISPATCH_LEVEL; - RecMutex->Locked = TRUE; - RecMutex->Writer = ToWrite; - RecMutex->CurrentThread = CurrentThread; - RecMutex->LockCount++; + RecMutex->Locked = TRUE; + RecMutex->Writer = ToWrite; + RecMutex->CurrentThread = CurrentThread; + RecMutex->LockCount++; } return TRUE; @@ -67,20 +67,20 @@ RecMutex->LockCount--; if( !RecMutex->LockCount ) { - RecMutex->CurrentThread = NULL; - if( RecMutex->OldIrql <= APC_LEVEL ) { - ExAcquireFastMutex( &RecMutex->Mutex ); - RecMutex->Locked = FALSE; - RecMutex->Writer = FALSE; - ExReleaseFastMutex( &RecMutex->Mutex ); - } else { - RecMutex->Locked = FALSE; - RecMutex->Writer = FALSE; - KeReleaseSpinLockFromDpcLevel( &RecMutex->SpinLock ); - } + RecMutex->CurrentThread = NULL; + if( RecMutex->OldIrql <= APC_LEVEL ) { + ExAcquireFastMutex( &RecMutex->Mutex ); + RecMutex->Locked = FALSE; + RecMutex->Writer = FALSE; + ExReleaseFastMutex( &RecMutex->Mutex ); + } else { + RecMutex->Locked = FALSE; + RecMutex->Writer = FALSE; + KeReleaseSpinLockFromDpcLevel( &RecMutex->SpinLock ); + } - KePulseEvent( &RecMutex->StateLockedEvent, IO_NETWORK_INCREMENT, - FALSE ); + KePulseEvent( &RecMutex->StateLockedEvent, IO_NETWORK_INCREMENT, + FALSE ); } }

15 years, 6 months

← Newer
1
...
9
10
11
12
13
14
15
...
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 June 2009