Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 37981: Added a FIXME that I'll fix it later, when allocation will have been done in the good way
by pschweitzer＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: pschweitzer Date: Tue Dec 9 13:22:20 2008 New Revision: 37981 URL: http://svn.reactos.org/svn/reactos?rev=37981&view=rev Log: Added a FIXME that I'll fix it later, when allocation will have been done in the good way Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Tue Dec 9 13:22:20 2008 @@ -812,6 +812,11 @@ return STATUS_OBJECT_NAME_COLLISION; } + /* FIXME + * Free memory allocated for upcased strings! + * FIXME + */ + return STATUS_NOT_IMPLEMENTED; }

1 0

[pschweitzer] 37980: Continue basic implementation of VfatSetRenameInformation Have a look to bug #3900
by pschweitzer＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: pschweitzer Date: Tue Dec 9 13:16:23 2008 New Revision: 37980 URL: http://svn.reactos.org/svn/reactos?rev=37980&view=rev Log: Continue basic implementation of VfatSetRenameInformation Have a look to bug #3900 Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Tue Dec 9 13:16:23 2008 @@ -752,24 +752,64 @@ VfatSetRenameInformation(PVFAT_IRP_CONTEXT IrpContext) { PIRP Irp; + NTSTATUS Status; PVFATFCB FCB, NewFCB; PIO_STACK_LOCATION Stack; + PDEVICE_EXTENSION DeviceExt; PFILE_OBJECT FileObject, NewFileObject; + BOOLEAN ReplaceIfExists, ChangeCaseOnly = FALSE; + UNICODE_STRING UpcasedPathName, UpcasedNewPathName; DPRINT1("VfatSetRenameInformation is stubplemented!\n"); Irp = IrpContext->Irp; Stack = IoGetCurrentIrpStackLocation(Irp); + DeviceExt = IrpContext->DeviceExt; + FileObject = IrpContext->FileObject; FCB = FileObject->FsContext; NewFileObject = Stack->Parameters.SetFile.FileObject; + ReplaceIfExists = Stack->Parameters.SetFile.ReplaceIfExists; NewFCB = NewFileObject->FsContext; - if (FsRtlAreNamesEqual(&(FCB->LongNameU), &(NewFCB->LongNameU), FALSE, NULL)) - { - return STATUS_SUCCESS; + /* Don't allow root directory rename */ + if (vfatFCBIsRoot(FCB)) + { + return STATUS_INVALID_PARAMETER; + } + + /* FIXME: Don't let RTL lib allocate memory, do it from kernel ! */ + Status = RtlUpcaseUnicodeString(&UpcasedPathName, &(FCB->PathNameU), TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + Status = RtlUpcaseUnicodeString(&UpcasedNewPathName, &(NewFCB->PathNameU), TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + if ((FCB->parentFcb) == (NewFCB->parentFcb)) + { + /* Run a quick test to know if new and old filenames are the same */ + if (FsRtlAreNamesEqual(&(FCB->LongNameU), &(NewFCB->LongNameU), FALSE, NULL)) + { + return STATUS_SUCCESS; + } + + /* Check both filenames to see if it's only a change case rename */ + if (FsRtlAreNamesEqual(&(FCB->LongNameU), &(NewFCB->LongNameU), TRUE, NULL)) + { + ChangeCaseOnly = TRUE; + } + } + + if (vfatGrabFCBFromTable(DeviceExt, &(NewFCB->PathNameU)) && !ReplaceIfExists) + { + return STATUS_OBJECT_NAME_COLLISION; } return STATUS_NOT_IMPLEMENTED;

1 0

[sginsberg] 37979: - Remove traces
by sginsberg＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: sginsberg Date: Tue Dec 9 13:00:46 2008 New Revision: 37979 URL: http://svn.reactos.org/svn/reactos?rev=37979&view=rev Log: - Remove traces Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Dec 9 13:00:46 2008 @@ -1288,7 +1288,6 @@ if (SecurityDescriptorSize) *SecurityDescriptorSize = relativeSdSize; *SecurityDescriptor = relativeSd; - DbgPrint("ConvertStringSecurityDescriptorToSecurityDescriptorW: relativeSd: %p\n", relativeSd); cleanup: if (GetSecurityDescriptorOwner(sd, &pSid, &dummy)) Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Tue Dec 9 13:00:46 2008 @@ -52,7 +52,6 @@ /* Allocate heap for it */ Ptr = RtlAllocateHeap(hProcessHeap, Flags, dwBytes); BASE_TRACE_ALLOC2(Ptr); - if ((ULONG_PTR)Ptr == 0xC) DbgPrint("LocalAlloc: Ptr is 0xC\n"); return Ptr; } @@ -132,12 +131,10 @@ } /* Set the pointer */ - if ((ULONG_PTR)hMemory == 0xC) DbgPrint("LocalAlloc: hMemory is 0xC\n"); Ptr = hMemory; } /* Return the pointer */ - if ((ULONG_PTR)Ptr == 0xC) DbgPrint("LocalAlloc: Ptr is 0xC\n"); return Ptr; }

1 0

[sginsberg] 37978: - Initialize pointer to null
by sginsberg＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: sginsberg Date: Tue Dec 9 12:48:28 2008 New Revision: 37978 URL: http://svn.reactos.org/svn/reactos?rev=37978&view=rev Log: - Initialize pointer to null Modified: trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Tue Dec 9 12:48:28 2008 @@ -2390,7 +2390,7 @@ { SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION|SACL_SECURITY_INFORMATION; SECURITY_DESCRIPTOR_CONTROL ctrl; - PSECURITY_DESCRIPTOR sec; + PSECURITY_DESCRIPTOR sec = NULL; DWORD dwDescSize; DWORD dwRevision; DWORD retSize;

1 0

[sginsberg] 37977: - Remove trace, change trace
by sginsberg＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: sginsberg Date: Tue Dec 9 12:35:06 2008 New Revision: 37977 URL: http://svn.reactos.org/svn/reactos?rev=37977&view=rev Log: - Remove trace, change trace Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Tue Dec 9 12:35:06 2008 @@ -308,8 +308,6 @@ { NTSTATUS Status; - DbgPrint("SetSecurityDescriptorControl: Received %p\n", pSecurityDescriptor); - Status = RtlSetControlSecurityDescriptor(pSecurityDescriptor, ControlBitsOfInterest, ControlBitsToSet); Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Dec 9 12:35:06 2008 @@ -1288,7 +1288,7 @@ if (SecurityDescriptorSize) *SecurityDescriptorSize = relativeSdSize; *SecurityDescriptor = relativeSd; - if ((ULONG_PTR)relativeSd == 0xC) DbgPrint("ConvertStringSecurityDescriptorToSecurityDescriptorW: relativeSd is 0xC\n"); + DbgPrint("ConvertStringSecurityDescriptorToSecurityDescriptorW: relativeSd: %p\n", relativeSd); cleanup: if (GetSecurityDescriptorOwner(sd, &pSid, &dummy))

1 0

[khornicek] 37976: - basic implementation of GdiEntry7 and GdiEntry8
by khornicek＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: khornicek Date: Tue Dec 9 12:33:34 2008 New Revision: 37976 URL: http://svn.reactos.org/svn/reactos?rev=37976&view=rev Log: - basic implementation of GdiEntry7 and GdiEntry8 Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Tue Dec 9 12:33:34 2008 @@ -2378,12 +2378,13 @@ DdGetDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, LPPALETTEENTRY pColorTable) { - /* Fixme for opengl hel emulations */ - HEL_OGL_STUB; -#if 0 - /* Call win32k directly */ - return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface); -#endif + IWineD3DSurface * pWineD3DSurface = (IWineD3DSurface*) pSurfaceLocal->hDDSurface; + HDC hDC; + + IWineD3DSurface_GetDC( pWineD3DSurface, &hDC); + pSurfaceLocal->hDC = (ULONG_PTR)hDC; + + return hDC; } /* @@ -2395,12 +2396,12 @@ WINAPI DdReleaseDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) { - /* Fixme for opengl hel emulations */ - HEL_OGL_STUB; -#if 0 - /* Call win32k directly */ - return NtGdiDdReleaseDC((HANDLE) pSurfaceLocal->hDDSurface); -#endif + IWineD3DSurface * pWineD3DSurface = (IWineD3DSurface*) pSurfaceLocal->hDDSurface; + + if (IWineD3DSurface_ReleaseDC( pWineD3DSurface, (HDC)pSurfaceLocal->hDC) == DD_OK) + return TRUE; + + return FALSE; } /*

1 0

[sginsberg] 37975: - More trace :/
by sginsberg＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: sginsberg Date: Tue Dec 9 12:20:18 2008 New Revision: 37975 URL: http://svn.reactos.org/svn/reactos?rev=37975&view=rev Log: - More trace :/ Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Tue Dec 9 12:20:18 2008 @@ -307,6 +307,8 @@ SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) { NTSTATUS Status; + + DbgPrint("SetSecurityDescriptorControl: Received %p\n", pSecurityDescriptor); Status = RtlSetControlSecurityDescriptor(pSecurityDescriptor, ControlBitsOfInterest,

1 0

[sginsberg] 37974: - Temporarily add tracing to ConvertStringSecurityDescriptorToSecurityDescriptorW and LocalAlloc to figure out why the tests crashes on build server -- will be reverted ASAP
by sginsberg＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: sginsberg Date: Tue Dec 9 12:04:58 2008 New Revision: 37974 URL: http://svn.reactos.org/svn/reactos?rev=37974&view=rev Log: - Temporarily add tracing to ConvertStringSecurityDescriptorToSecurityDescriptorW and LocalAlloc to figure out why the tests crashes on build server -- will be reverted ASAP Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Dec 9 12:04:58 2008 @@ -1288,6 +1288,7 @@ if (SecurityDescriptorSize) *SecurityDescriptorSize = relativeSdSize; *SecurityDescriptor = relativeSd; + if ((ULONG_PTR)relativeSd == 0xC) DbgPrint("ConvertStringSecurityDescriptorToSecurityDescriptorW: relativeSd is 0xC\n"); cleanup: if (GetSecurityDescriptorOwner(sd, &pSid, &dummy)) Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Tue Dec 9 12:04:58 2008 @@ -52,6 +52,7 @@ /* Allocate heap for it */ Ptr = RtlAllocateHeap(hProcessHeap, Flags, dwBytes); BASE_TRACE_ALLOC2(Ptr); + if ((ULONG_PTR)Ptr == 0xC) DbgPrint("LocalAlloc: Ptr is 0xC\n"); return Ptr; } @@ -131,10 +132,12 @@ } /* Set the pointer */ + if ((ULONG_PTR)hMemory == 0xC) DbgPrint("LocalAlloc: hMemory is 0xC\n"); Ptr = hMemory; } /* Return the pointer */ + if ((ULONG_PTR)Ptr == 0xC) DbgPrint("LocalAlloc: Ptr is 0xC\n"); return Ptr; }

1 0

[sginsberg] 37973: - Add back debug print -- build server still crashes
by sginsberg＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: sginsberg Date: Tue Dec 9 11:44:27 2008 New Revision: 37973 URL: http://svn.reactos.org/svn/reactos?rev=37973&view=rev Log: - Add back debug print -- build server still crashes Modified: trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Tue Dec 9 11:44:27 2008 @@ -2410,6 +2410,7 @@ "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); buf = HeapAlloc(GetProcessHeap(), 0, dwDescSize); + DbgPrint("Received %p\n", sec); pSetSecurityDescriptorControl(sec, SE_DACL_PROTECTED, SE_DACL_PROTECTED); GetSecurityDescriptorControl(sec, &ctrl, &dwRevision); todo_wine expect_eq(ctrl, 0x9014, int, "%x");

1 0

[sginsberg] 37972: - Revert the debug print
by sginsberg＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: sginsberg Date: Tue Dec 9 10:39:33 2008 New Revision: 37972 URL: http://svn.reactos.org/svn/reactos?rev=37972&view=rev Log: - Revert the debug print Modified: trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Tue Dec 9 10:39:33 2008 @@ -2409,7 +2409,6 @@ "G:S-1-5-21-93476-23408-4576" "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); - DbgPrint("Received %p\n", sec); buf = HeapAlloc(GetProcessHeap(), 0, dwDescSize); pSetSecurityDescriptorControl(sec, SE_DACL_PROTECTED, SE_DACL_PROTECTED); GetSecurityDescriptorControl(sec, &ctrl, &dwRevision);

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