Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[ion] 17228: remove another invalid ObjectAttribute

by ion＠svn.reactos.com

remove another invalid ObjectAttribute Modified: trunk/reactos/subsys/smss/debug.c _____ Modified: trunk/reactos/subsys/smss/debug.c --- trunk/reactos/subsys/smss/debug.c 2005-08-09 04:43:54 UTC (rev 17227) +++ trunk/reactos/subsys/smss/debug.c 2005-08-09 04:56:29 UTC (rev 17228) @@ -92,7 +92,7 @@ RtlInitUnicodeString (& PortName, wcPortName); InitializeObjectAttributes (& ObjectAttributes, & PortName, - PORT_ALL_ACCESS, + 0, NULL, NULL); Status = NtCreatePort (hPort,

19 years, 1 month

[ion] 17227: - Fix a large amount of bugs in ObpAllocateObjectAttributes & Name

by ion＠svn.reactos.com

- Fix a large amount of bugs in ObpAllocateObjectAttributes & Name Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-08-09 04:03:14 UTC (rev 17226) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-08-09 04:43:54 UTC (rev 17227) @@ -549,13 +549,15 @@ } /* Block the Thread */ - DPRINT("Blocking the Thread: %d, %d, %d, %x\n", Alertable, WaitMode, WaitReason, KeGetCurrentThread()); + DPRINT("Blocking the Thread: %d, %d, %d, %x\n", Alertable, WaitMode, + WaitReason, KeGetCurrentThread()); KiBlockThread(&Status, Alertable, WaitMode, (UCHAR)WaitReason); /* Check if we were executing an APC */ + DPRINT("Thread is back\n"); if (Status != STATUS_KERNEL_APC) { /* Return Status */ @@ -568,7 +570,7 @@ } while (TRUE); /* Release the Lock, we are done */ - DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", KeGetCurrentThread(), Status); + DPRINT("Returning, %x. Status: %d\n", KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return Status; @@ -577,7 +579,8 @@ KiAdjustQuantumThread(CurrentThread); /* Release & Return */ - DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n. We did not wait.", KeGetCurrentThread(), Status); + DPRINT("Returning, %x. Status: %d\n. We did not wait.", + KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return Status; } _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-08-09 04:03:14 UTC (rev 17226) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-08-09 04:43:54 UTC (rev 17227) @@ -65,30 +65,26 @@ PVOID Object = NULL; UNICODE_STRING RemainingPath; UNICODE_STRING ObjectName; - OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_CREATE_INFORMATION ObjectCreateInfo; NTSTATUS Status; PAGED_CODE(); - InitializeObjectAttributes(&ObjectAttributes, - ObjectPath, - Attributes | OBJ_OPENIF, - NULL, - NULL); - - /* Capture all the info */ - DPRINT("Capturing Create Info\n"); - Status = ObpCaptureObjectAttributes(&ObjectAttributes, - AccessMode, - ObjectType, - &ObjectCreateInfo, - &ObjectName); + /* Capture the name */ + DPRINT("Capturing Name\n"); + Status = ObpCaptureObjectName(&ObjectName, ObjectPath, AccessMode); if (!NT_SUCCESS(Status)) { - DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); + DPRINT("ObpCaptureObjectName() failed (Status %lx)\n", Status); return Status; } + + /* + * Create a fake ObjectCreateInfo structure. Note that my upcoming + * ObFindObject refactoring will remove the need for this hack. + */ + ObjectCreateInfo.RootDirectory = NULL; + ObjectCreateInfo.Attributes = Attributes; Status = ObFindObject(&ObjectCreateInfo, &ObjectName, @@ -96,7 +92,6 @@ &RemainingPath, ObjectType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-08-09 04:03:14 UTC (rev 17226) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-08-09 04:43:54 UTC (rev 17227) @@ -17,6 +17,7 @@ #define UNICODE_PATH_SEP L'\\' #define UNICODE_NO_PATH L"..." +#define OB_NAME_TAG TAG('O','b','N','m') typedef struct _RETENTION_CHECK_PARAMS { @@ -33,78 +34,85 @@ IN KPROCESSOR_MODE AccessMode) { NTSTATUS Status = STATUS_SUCCESS; + ULONG StringLength; + PWCHAR StringBuffer; UNICODE_STRING LocalName = {}; /* <= GCC 4.0 + Optimizer */ - /* First Probe the String */ - DPRINT("ObpCaptureObjectName: %wZ\n", ObjectName); - if (AccessMode != KernelMode) + /* Initialize the Input String */ + RtlInitUnicodeString(CapturedName, NULL); + + /* Protect everything */ + _SEH_TRY { - DPRINT("Probing Struct\n"); - _SEH_TRY + /* First Probe the String */ + DPRINT("ObpCaptureObjectName: %wZ\n", ObjectName); + if (AccessMode != KernelMode) { - /* FIXME: Explorer or win32 broken I think */ - #if 0 ProbeForRead(ObjectName, sizeof(UNICODE_STRING), sizeof(USHORT)); - #endif LocalName = *ObjectName; + + ProbeForRead(LocalName.Buffer, + LocalName.Length, + sizeof(WCHAR)); } - _SEH_HANDLE + else { - Status = _SEH_GetExceptionCode(); + /* No probing needed */ + LocalName = *ObjectName; } - _SEH_END; - - if (NT_SUCCESS(Status)) + + /* Make sure there really is a string */ + DPRINT("Probing OK\n"); + if ((StringLength = LocalName.Length)) { - DPRINT("Probing OK\n"); - _SEH_TRY + /* Check that the size is a valid WCHAR multiple */ + if ((StringLength & (sizeof(WCHAR) - 1)) || + /* Check that the NULL-termination below will work */ + (StringLength == (MAXUSHORT - sizeof(WCHAR) + 1))) { - #if 0 - DPRINT("Probing buffer\n"); - ProbeForRead(LocalName.Buffer, - LocalName.Length, - sizeof(USHORT)); - #endif + /* PS: Please keep the checks above expanded for clarity */ + DPRINT1("Invalid String Length\n"); + Status = STATUS_OBJECT_NAME_INVALID; } - _SEH_HANDLE + else { - Status = _SEH_GetExceptionCode(); + /* Allocate a non-paged buffer for this string */ + DPRINT("Capturing String\n"); + CapturedName->Length = StringLength; + CapturedName->MaximumLength = StringLength + sizeof(WCHAR); + if ((StringBuffer = ExAllocatePoolWithTag(NonPagedPool, + StringLength + sizeof(WCHAR), + OB_NAME_TAG))) + { + /* Copy the string and null-terminate it */ + RtlMoveMemory(StringBuffer, LocalName.Buffer, StringLength); + StringBuffer[StringLength / sizeof(WCHAR)] = UNICODE_NULL; + CapturedName->Buffer = StringBuffer; + DPRINT("String Captured: %wZ\n", CapturedName); + } + else + { + /* Fail */ + DPRINT1("Out of Memory!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + } } - _SEH_END; } - - /* Fail if anything up to here died */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("Probing failed\n"); - return Status; - } } - else + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - LocalName = *ObjectName; + Status = _SEH_GetExceptionCode(); + + /* Remember to free the buffer in case of failure */ + DPRINT1("Failed\n"); + if (StringBuffer) ExFreePool(StringBuffer); } + _SEH_END; - /* Make sure there really is a string */ - DPRINT("Probing OK\n"); - if (LocalName.Length) - { - /* Allocate a non-paged buffer for this string */ - DPRINT("Capturing String\n"); - CapturedName->Length = LocalName.Length; - CapturedName->MaximumLength = LocalName.Length + sizeof(WCHAR); - CapturedName->Buffer = ExAllocatePoolWithTag(NonPagedPool, - CapturedName->MaximumLength, - TAG('O','b','N','m')); - - /* Copy the string and null-terminate it */ - RtlMoveMemory(CapturedName->Buffer, LocalName.Buffer, LocalName.Length); - CapturedName->Buffer[LocalName.Length / sizeof(WCHAR)] = UNICODE_NULL; - DPRINT("String Captured: %p, %wZ\n", CapturedName, CapturedName); - } - + /* Return */ + DPRINT("Returning: %lx\n", Status); return Status; } @@ -125,115 +133,102 @@ DPRINT("ObpCaptureObjectAttributes\n"); RtlZeroMemory(ObjectCreateInfo, sizeof(OBJECT_CREATE_INFORMATION)); - /* Check if we got Oba */ - if (ObjectAttributes) + /* SEH everything here for protection */ + _SEH_TRY { - if (AccessMode != KernelMode) + /* Check if we got Oba */ + if (ObjectAttributes) { - DPRINT("Probing OBA\n"); - _SEH_TRY + if (AccessMode != KernelMode) { - /* FIXME: SMSS SENDS BULLSHIT. */ - #if 0 + DPRINT("Probing OBA\n"); ProbeForRead(ObjectAttributes, - sizeof(ObjectAttributes), + sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); - #endif } - _SEH_HANDLE + + /* Validate the Size and Attributes */ + DPRINT("Validating OBA\n"); + if ((ObjectAttributes->Length != sizeof(OBJECT_ATTRIBUTES)) || + (ObjectAttributes->Attributes & ~OBJ_VALID_ATTRIBUTES)) { - Status = _SEH_GetExceptionCode(); + Status = STATUS_INVALID_PARAMETER; + DPRINT1("Invalid Size: %lx or Attributes: %lx\n", + ObjectAttributes->Length, ObjectAttributes->Attributes); + goto Quickie; } - _SEH_END; - } - /* Validate the Size */ - DPRINT("Validating OBA\n"); - if (ObjectAttributes->Length != sizeof(OBJECT_ATTRIBUTES)) - { - Status = STATUS_INVALID_PARAMETER; - } - - /* Fail if SEH or Size Validation failed */ - if(!NT_SUCCESS(Status)) - { - DPRINT1("ObpCaptureObjectAttributes failed to probe object attributes\n"); - goto fail; - } + /* Set some Create Info */ + DPRINT("Creating OBCI\n"); + ObjectCreateInfo->RootDirectory = ObjectAttributes->RootDirectory; + ObjectCreateInfo->Attributes = ObjectAttributes->Attributes; + LocalObjectName = ObjectAttributes->ObjectName; + SecurityDescriptor = ObjectAttributes->SecurityDescriptor; + SecurityQos = ObjectAttributes->SecurityQualityOfService; - /* Set some Create Info */ - DPRINT("Creating OBCI\n"); - ObjectCreateInfo->RootDirectory = ObjectAttributes->RootDirectory; - ObjectCreateInfo->Attributes = ObjectAttributes->Attributes; - LocalObjectName = ObjectAttributes->ObjectName; - SecurityDescriptor = ObjectAttributes->SecurityDescriptor; - SecurityQos = ObjectAttributes->SecurityQualityOfService; - - /* Validate the SD */ - if (SecurityDescriptor) - { - DPRINT("Probing SD: %x\n", SecurityDescriptor); - Status = SeCaptureSecurityDescriptor(SecurityDescriptor, - AccessMode, - NonPagedPool, - TRUE, - &ObjectCreateInfo->SecurityDescriptor); - if(!NT_SUCCESS(Status)) + /* Validate the SD */ + if (SecurityDescriptor) { - DPRINT1("Unable to capture the security descriptor!!!\n"); - ObjectCreateInfo->SecurityDescriptor = NULL; - goto fail; - } + DPRINT("Probing SD: %x\n", SecurityDescriptor); + Status = SeCaptureSecurityDescriptor(SecurityDescriptor, + AccessMode, + NonPagedPool, + TRUE, + &ObjectCreateInfo->SecurityDescriptor); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Unable to capture the security descriptor!!!\n"); + ObjectCreateInfo->SecurityDescriptor = NULL; + goto Quickie; + } - DPRINT("Probe done\n"); - ObjectCreateInfo->SecurityDescriptorCharge = 0; /* FIXME */ - ObjectCreateInfo->ProbeMode = AccessMode; - } + DPRINT("Probe done\n"); + ObjectCreateInfo->SecurityDescriptorCharge = 2048; /* FIXME */ + ObjectCreateInfo->ProbeMode = AccessMode; + } - /* Validate the QoS */ - if (SecurityQos) - { - if (AccessMode != KernelMode) + /* Validate the QoS */ + if (SecurityQos) { - DPRINT("Probing QoS\n"); - _SEH_TRY + if (AccessMode != KernelMode) { + DPRINT("Probing QoS\n"); ProbeForRead(SecurityQos, sizeof(SECURITY_QUALITY_OF_SERVICE), sizeof(ULONG)); } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - if(!NT_SUCCESS(Status)) - { - DPRINT1("Unable to capture QoS!!!\n"); - goto fail; - } - ObjectCreateInfo->SecurityQualityOfService = *SecurityQos; - ObjectCreateInfo->SecurityQos = &ObjectCreateInfo->SecurityQualityOfService; + /* Save Info */ + ObjectCreateInfo->SecurityQualityOfService = *SecurityQos; + ObjectCreateInfo->SecurityQos = &ObjectCreateInfo->SecurityQualityOfService; + } } + else + { + LocalObjectName = NULL; + } } - - /* Clear Local Object Name */ - DPRINT("Clearing name\n"); - RtlZeroMemory(ObjectName, sizeof(UNICODE_STRING)); - + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + Status = _SEH_GetExceptionCode(); + DPRINT1("Failed\n"); + goto Quickie; + } + _SEH_END; + /* Now check if the Object Attributes had an Object Name */ if (LocalObjectName) { - DPRINT("Name Buffer: %x\n", LocalObjectName->Buffer); + DPRINT("Name Buffer: %wZ\n", LocalObjectName); Status = ObpCaptureObjectName(ObjectName, LocalObjectName, AccessMode); } else { + /* Clear the string */ + RtlInitUnicodeString(ObjectName, NULL); + /* He can't have specified a Root Directory */ if (ObjectCreateInfo->RootDirectory) { @@ -242,14 +237,14 @@ } } -fail: +Quickie: if (!NT_SUCCESS(Status)) { DPRINT1("Failed to capture, cleaning up\n"); ObpReleaseCapturedAttributes(ObjectCreateInfo); } - DPRINT("Return to caller\n"); + DPRINT("Return to caller %x\n", Status); return Status; } @@ -795,7 +790,7 @@ /* Capture all the info */ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, - AccessMode, + ObjectAttributesAccessMode, Type, ObjectCreateInfo, &ObjectName);

19 years, 1 month

[ion] 17226: - Send the pointer to the handle, not the NULL handle itself. This fixes another winetest bugcheck.

by ion＠svn.reactos.com

- Send the pointer to the handle, not the NULL handle itself. This fixes another winetest bugcheck. Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-08-09 03:38:34 UTC (rev 17225) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-08-09 04:03:14 UTC (rev 17226) @@ -705,7 +705,7 @@ PreviousMode, DesiredAccess, NULL, - hThread); + &hThread); if (Status != STATUS_SUCCESS) { @@ -747,7 +747,7 @@ DesiredAccess, PsThreadType, PreviousMode, - hThread); + &hThread); if(!NT_SUCCESS(Status)) { DPRINT1("Failure to open Thread\n");

19 years, 1 month

[ion] 17225: - Use the actual previous mode (spotted by Thomas)

by ion＠svn.reactos.com

- Use the actual previous mode (spotted by Thomas) Modified: trunk/reactos/ntoskrnl/lpc/connect.c _____ Modified: trunk/reactos/ntoskrnl/lpc/connect.c --- trunk/reactos/ntoskrnl/lpc/connect.c 2005-08-09 03:31:22 UTC (rev 17224) +++ trunk/reactos/ntoskrnl/lpc/connect.c 2005-08-09 03:38:34 UTC (rev 17225) @@ -410,7 +410,7 @@ NULL, PORT_ALL_ACCESS, /* DesiredAccess */ LpcPortObjectType, - UserMode, + PreviousMode, NULL, (PVOID*)&NamedPort); if (!NT_SUCCESS(Status)) @@ -430,7 +430,7 @@ Status = ObReferenceObjectByHandle(WriteMap.SectionHandle, SECTION_MAP_READ | SECTION_MAP_WRITE, MmSectionObjectType, - UserMode, + PreviousMode, (PVOID*)&SectionObject, NULL); if (!NT_SUCCESS(Status)) @@ -669,6 +669,7 @@ PEPORT_CONNECT_REQUEST_MESSAGE CRequest; PEPORT_CONNECT_REPLY_MESSAGE CReply; ULONG Size; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); Size = sizeof(EPORT_CONNECT_REPLY_MESSAGE); if (LpcMessage) @@ -685,7 +686,7 @@ Status = ObReferenceObjectByHandle(NamedPortHandle, PORT_ALL_ACCESS, LpcPortObjectType, - UserMode, + PreviousMode, (PVOID*)&NamedPort, NULL); if (!NT_SUCCESS(Status)) @@ -699,10 +700,10 @@ */ if (AcceptIt) { - Status = ObCreateObject(ExGetPreviousMode(), + Status = ObCreateObject(PreviousMode, LpcPortObjectType, NULL, - ExGetPreviousMode(), + PreviousMode, NULL, sizeof(EPORT), 0, @@ -789,7 +790,7 @@ Status = ObReferenceObjectByHandle(WriteMap->SectionHandle, SECTION_MAP_READ | SECTION_MAP_WRITE, MmSectionObjectType, - UserMode, + PreviousMode, (PVOID*)&SectionObject, NULL); if (!NT_SUCCESS(Status))

19 years, 1 month

[ion] 17224: Fix invalid Object Attributes

by ion＠svn.reactos.com

Fix invalid Object Attributes Modified: trunk/reactos/subsys/smss/smapi.c _____ Modified: trunk/reactos/subsys/smss/smapi.c --- trunk/reactos/subsys/smss/smapi.c 2005-08-09 03:29:51 UTC (rev 17223) +++ trunk/reactos/subsys/smss/smapi.c 2005-08-09 03:31:22 UTC (rev 17224) @@ -362,7 +362,7 @@ InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, - PORT_ALL_ACCESS, + 0, NULL, NULL);

19 years, 1 month

[ion] 17223: Add some DDK limits that were missing

by ion＠svn.reactos.com

Add some DDK limits that were missing Modified: trunk/reactos/w32api/include/ntdef.h _____ Modified: trunk/reactos/w32api/include/ntdef.h --- trunk/reactos/w32api/include/ntdef.h 2005-08-09 01:07:06 UTC (rev 17222) +++ trunk/reactos/w32api/include/ntdef.h 2005-08-09 03:29:51 UTC (rev 17223) @@ -73,4 +73,14 @@ #define NOTHING #define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } #define TYPE_ALIGNMENT( t ) FIELD_OFFSET( struct { char x; t test; }, test ) + +#define MINCHAR 0x80 +#define MAXCHAR 0x7f +#define MINSHORT 0x8000 +#define MAXSHORT 0x7fff +#define MINLONG 0x80000000 +#define MAXLONG 0x7fffffff +#define MAXUCHAR 0xff +#define MAXUSHORT 0xffff +#define MAXULONG 0xffffffff #endif /* _NTDEF_H */

19 years, 1 month

[ion] 17222: - Fix broken loop, this fixes the WINE thread wait tests

by ion＠svn.reactos.com

- Fix broken loop, this fixes the WINE thread wait tests Modified: trunk/reactos/ntoskrnl/ob/wait.c _____ Modified: trunk/reactos/ntoskrnl/ob/wait.c --- trunk/reactos/ntoskrnl/ob/wait.c 2005-08-09 00:02:24 UTC (rev 17221) +++ trunk/reactos/ntoskrnl/ob/wait.c 2005-08-09 01:07:06 UTC (rev 17222) @@ -182,11 +182,14 @@ /* For a Waitall, we can't have the same object more then once */ if (WaitType == WaitAll) { + /* Clear the main loop variable */ + i = 0; + /* Start the loop */ do { /* Check the current and forward object */ - for (i = 0, j = i + 1; j < ObjectCount; j++) + for (j = i + 1; j < ObjectCount; j++) { /* Make sure they don't match */ if (WaitObjects[i] == WaitObjects[j]) @@ -244,6 +247,7 @@ if (LockInUse) KeLeaveCriticalRegion(); /* Return status */ + DPRINT1("Returning: %x\n", Status); return Status; }

19 years, 1 month

[ion] 17221: Fix exception handling by not reseting PreviousMode to kernel when a user-mode exception occurs. This fixes some winetest bugchecks

by ion＠svn.reactos.com

Fix exception handling by not reseting PreviousMode to kernel when a user-mode exception occurs. This fixes some winetest bugchecks Modified: trunk/reactos/lib/rtl/exception.c _____ Modified: trunk/reactos/lib/rtl/exception.c --- trunk/reactos/lib/rtl/exception.c 2005-08-08 22:14:04 UTC (rev 17220) +++ trunk/reactos/lib/rtl/exception.c 2005-08-09 00:02:24 UTC (rev 17221) @@ -67,7 +67,7 @@ ExceptionRecord->ExceptionAddress = (PVOID)(*(((PULONG)Context.Ebp)+1)); Context.ContextFlags = CONTEXT_FULL; - Status = ZwRaiseException(ExceptionRecord, &Context, TRUE); + Status = NtRaiseException(ExceptionRecord, &Context, TRUE); RtlRaiseException(ExceptionRecord); RtlRaiseStatus(Status); }

19 years, 1 month

[hpoussin] 17220: Remove console debug output

by hpoussin＠svn.reactos.com

Remove console debug output Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-08-08 21:29:25 UTC (rev 17219) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-08-08 22:14:04 UTC (rev 17220) @@ -100,7 +100,7 @@ if (!hItem) hItem = TreeView_GetSelection(hwndTV); if (!hItem) return NULL; if (!get_item_path(hwndTV, hItem, phRootKey, &pathBuffer, &pathLen, &maxLen)) return NULL; - printf("hRoot=%p, keyPath='%s'\n", *phRootKey, pathBuffer); + /*printf("hRoot=%p, keyPath='%s'\n", *phRootKey, pathBuffer);*/ return pathBuffer; } @@ -242,7 +242,7 @@ RegCloseKey(hKey); } if (errCode != ERROR_SUCCESS) dwSubCount = 0; - printf("dwSubCount=%ld, Name=%s\n", dwSubCount, Name); + /*printf("dwSubCount=%ld, Name=%s\n", dwSubCount, Name);*/ AddEntryToTree(hwndTV, pnmtv->itemNew.hItem, Name, NULL, dwSubCount, TVI_FIRST); }

19 years, 1 month

[greatlrd] 17219: Add a check to see if surface can be create, it return it can be create, but still createsurface return invaild param

by greatlrd＠svn.reactos.com

Add a check to see if surface can be create, it return it can be create, but still createsurface return invaild param Modified: trunk/reactos/lib/ddraw/main/surface.c _____ Modified: trunk/reactos/lib/ddraw/main/surface.c --- trunk/reactos/lib/ddraw/main/surface.c 2005-08-08 18:59:56 UTC (rev 17218) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-08-08 21:29:25 UTC (rev 17219) @@ -63,12 +63,26 @@ CreateData.dwSCnt = 1; CreateData.lplpSList = &pLocal; - if(This->owner->DriverCallbacks.DdMain.CreateSurface (&CreateData) != DDHAL_DRIVER_HANDLED) - return DDERR_INVALIDPARAMS; + DDHAL_CANCREATESURFACEDATA CanCreateData; + memset(&CanCreateData, 0, sizeof(DD_CANCREATESURFACEDATA)); + CanCreateData.lpDD = &This->owner->DirectDrawGlobal; + CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; + + if (This->owner->DriverCallbacks.DdMain.CanCreateSurface (&CanCreateData) == DDHAL_DRIVER_NOTHANDLED) + return DDERR_INVALIDPARAMS; + if(CreateData.ddRVal != DD_OK) + return CanCreateData.ddRVal; + + + if(This->owner->DriverCallbacks.DdMain.CreateSurface (&CreateData) == DDHAL_DRIVER_NOTHANDLED) + return DDERR_INVALIDPARAMS; + + if(CreateData.ddRVal != DD_OK) return CreateData.ddRVal; + OutputDebugString(L"This does not get hit."); return DD_OK;

19 years, 1 month

← Newer
1
...
35
36
37
38
39
40
41
...
67
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 August 2005