Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[weiden] 17208: don't dereference a NULL pointer

by weiden＠svn.reactos.com

don't dereference a NULL pointer Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-08-08 15:46:41 UTC (rev 17207) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-08-08 15:49:37 UTC (rev 17208) @@ -347,7 +347,7 @@ if (!NT_SUCCESS(Status)) { - if (ObjectName->Buffer) + if (ObjectName != NULL && ObjectName->Buffer) { ExFreePool(ObjectName->Buffer); }

19 years, 1 month

[weiden] 17207: remove a bugcheck that was only used for debug purpose

by weiden＠svn.reactos.com

remove a bugcheck that was only used for debug purpose Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-08-08 15:41:02 UTC (rev 17206) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-08-08 15:46:41 UTC (rev 17207) @@ -148,7 +148,6 @@ if(!NT_SUCCESS(Status)) { DPRINT1("ObpCaptureObjectAttributes failed to probe object attributes 0x%p\n", ObjectAttributes); - KEBUGCHECK(0); goto failbasiccleanup; } }

19 years, 1 month

[greatlrd] 17206: Fix some error checking for DireactDrawCreate and DireactDrawCreateEx, we checking if the param is right or not.

by greatlrd＠svn.reactos.com

Fix some error checking for DireactDrawCreate and DireactDrawCreateEx, we checking if the param is right or not. Modified: trunk/reactos/lib/ddraw/main.c _____ Modified: trunk/reactos/lib/ddraw/main.c --- trunk/reactos/lib/ddraw/main.c 2005-08-08 15:39:35 UTC (rev 17205) +++ trunk/reactos/lib/ddraw/main.c 2005-08-08 15:41:02 UTC (rev 17206) @@ -15,10 +15,7 @@ HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, IUnknown* pUnkOuter, BOOL ex) -{ - if (pUnkOuter!=NULL) - return DDERR_INVALIDPARAMS; - +{ IDirectDrawImpl* This = (IDirectDrawImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawImpl)); if (This == NULL) @@ -32,15 +29,33 @@ } HRESULT WINAPI DirectDrawCreate (LPGUID lpGUID, LPDIRECTDRAW* lplpDD, LPUNKNOWN pUnkOuter) -{ +{ + + /* check see if pUnkOuter is null or not */ + if (!pUnkOuter) + { + /* we do not use same error code as MS, ms use 0x8004110 */ + return DDERR_INVALIDPARAMS; + } + return Create_DirectDraw (lpGUID, lplpDD, pUnkOuter, FALSE); } HRESULT WINAPI DirectDrawCreateEx(LPGUID lpGUID, LPVOID* lplpDD, REFIID iid, LPUNKNOWN pUnkOuter) -{ +{ + /* check see if pUnkOuter is null or not */ + if (!pUnkOuter) + { + /* we do not use same error code as MS, ms use 0x8004110 */ + return DDERR_INVALIDPARAMS; + } + + /* Is it a DirectDraw 7 Request or not */ if (!IsEqualGUID(iid, &IID_IDirectDraw7)) - return DDERR_INVALIDPARAMS; - + { + return DDERR_INVALIDPARAMS; + } + return Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, pUnkOuter, TRUE); }

19 years, 1 month

[weiden] 17205: - reverted ObpCaptureObjectAttributes back to my old implementation (slightly modified and extended) because that one at least does what it's supposed to correctly

by weiden＠svn.reactos.com

- reverted ObpCaptureObjectAttributes back to my old implementation (slightly modified and extended) because that one at least does what it's supposed to correctly Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/lpc/connect.c Modified: trunk/reactos/ntoskrnl/ob/handle.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-08-08 15:33:04 UTC (rev 17204) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-08-08 15:39:35 UTC (rev 17205) @@ -192,20 +192,19 @@ PWSTR Start; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; + KPROCESSOR_MODE PreviousMode; unsigned i; PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); - DPRINT("NtCreateKey (Name %wZ KeyHandle 0x%p Root 0x%p)\n", - ObjectAttributes->ObjectName, - KeyHandle, - ObjectAttributes->RootDirectory); - /* Capture all the info */ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, - KeGetPreviousMode(), - CmiKeyType, + PreviousMode, + PagedPool, + FALSE, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -219,8 +218,10 @@ (PVOID*)&Object, &RemainingPath, CmiKeyType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + ObpReleaseCapturedAttributes(&ObjectCreateInfo, + &ObjectName, + PreviousMode, + FALSE); if (!NT_SUCCESS(Status)) { DPRINT("CmpFindObject failed, Status: 0x%x\n", Status); @@ -1169,7 +1170,8 @@ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, PreviousMode, - CmiKeyType, + PagedPool, + FALSE, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -1185,8 +1187,10 @@ (PVOID*)&Object, &RemainingPath, CmiKeyType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + ObpReleaseCapturedAttributes(&ObjectCreateInfo, + &ObjectName, + PreviousMode, + FALSE); if (!NT_SUCCESS(Status)) { DPRINT("CmpFindObject() returned 0x%08lx\n", Status); _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-08-08 15:33:04 UTC (rev 17204) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-08-08 15:39:35 UTC (rev 17205) @@ -705,7 +705,8 @@ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(KeyObjectAttributes, KernelMode, - CmiKeyType, + PagedPool, + FALSE, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -719,8 +720,10 @@ (PVOID*)&ParentKey, &RemainingPath, CmiKeyType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + ObpReleaseCapturedAttributes(&ObjectCreateInfo, + &ObjectName, + KernelMode, + FALSE); if (!NT_SUCCESS(Status)) { return Status; _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-08-08 15:33:04 UTC (rev 17204) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-08-08 15:39:35 UTC (rev 17205) @@ -173,14 +173,6 @@ /* Secure object information functions */ -typedef struct _CAPTURED_OBJECT_ATTRIBUTES -{ - HANDLE RootDirectory; - ULONG Attributes; - PSECURITY_DESCRIPTOR SecurityDescriptor; - PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService; -} CAPTURED_OBJECT_ATTRIBUTES, *PCAPTURED_OBJECT_ATTRIBUTES; - NTSTATUS STDCALL ObpCaptureObjectName(IN PUNICODE_STRING CapturedName, @@ -189,16 +181,19 @@ NTSTATUS STDCALL -ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, +ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN KPROCESSOR_MODE AccessMode, - IN POBJECT_TYPE ObjectType, - IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, - OUT PUNICODE_STRING ObjectName); + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + OUT POBJECT_CREATE_INFORMATION CapturedObjectAttributes OPTIONAL, + OUT PUNICODE_STRING ObjectName OPTIONAL); VOID STDCALL -ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo); - +ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION CapturedObjectAttributes OPTIONAL, + IN PUNICODE_STRING ObjectName OPTIONAL, + IN KPROCESSOR_MODE AccessMode, + IN BOOLEAN CaptureIfKernel); /* object information classes */ #define ICIF_QUERY 0x1 _____ Modified: trunk/reactos/ntoskrnl/lpc/connect.c --- trunk/reactos/ntoskrnl/lpc/connect.c 2005-08-08 15:33:04 UTC (rev 17204) +++ trunk/reactos/ntoskrnl/lpc/connect.c 2005-08-08 15:39:35 UTC (rev 17205) @@ -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)) _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-08-08 15:33:04 UTC (rev 17204) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-08-08 15:39:35 UTC (rev 17205) @@ -955,7 +955,7 @@ /* First try to find the Object */ if (ObjectNameInfo && ObjectNameInfo->Name.Buffer) { - DPRINT("Object has a name. Trying to find it: %wZ.\n", &ObjectNameInfo->Name); + DPRINT("Object has a name. Trying to find it: \"%wZ\".\n", &ObjectNameInfo->Name); Status = ObFindObject(ObjectCreateInfo, &ObjectNameInfo->Name, &FoundObject, @@ -1132,7 +1132,10 @@ /* We can delete the Create Info now */ Header->ObjectCreateInfo = NULL; - ObpReleaseCapturedAttributes(ObjectCreateInfo); + ObpReleaseCapturedAttributes(ObjectCreateInfo, + NULL, + ObjectCreateInfo->ProbeMode, + FALSE); ExFreePool(ObjectCreateInfo); DPRINT("Status %x\n", Status); _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-08-08 15:33:04 UTC (rev 17204) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-08-08 15:39:35 UTC (rev 17205) @@ -70,20 +70,35 @@ NTSTATUS Status; PAGED_CODE(); + + /* capture the ObjectPath */ + Status = RtlCaptureUnicodeString(&ObjectName, + AccessMode, + NonPagedPool, /* FIXME */ + FALSE, + ObjectPath); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlCaptureUnicodeString() failed (Status %lx)\n", Status); + return Status; + } InitializeObjectAttributes(&ObjectAttributes, - ObjectPath, + &ObjectName, Attributes | OBJ_OPENIF, NULL, NULL); - /* Capture all the info */ + /* "Capture" all the info, it doesn't make sense to capture from the kernel + stack as the information should be safe anyway...just do a raw copy of the + data into the OBJECT_CREATE_INFORMATION structure */ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(&ObjectAttributes, - AccessMode, - ObjectType, + KernelMode, /* raw copy! */ + NonPagedPool, + FALSE, &ObjectCreateInfo, - &ObjectName); + NULL); if (!NT_SUCCESS(Status)) { DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); @@ -96,9 +111,19 @@ &RemainingPath, ObjectType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + /* we don't need to release the "captured" object attributes! Nothing was allocated! */ +#if 0 + ObpReleaseCapturedAttributes(&ObjectCreateInfo, + NULL, + AccessMode, + FALSE); +#endif + /* free the captured ObjectPath if needed */ + RtlReleaseCapturedUnicodeString(&ObjectName, + AccessMode, + FALSE); + if (!NT_SUCCESS(Status)) { return(Status); @@ -169,7 +194,8 @@ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, AccessMode, - ObjectType, + PagedPool, + FALSE, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -183,8 +209,10 @@ &Object, &RemainingPath, ObjectType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + ObpReleaseCapturedAttributes(&ObjectCreateInfo, + &ObjectName, + AccessMode, + FALSE); if (!NT_SUCCESS(Status)) { DPRINT("ObFindObject() failed (Status %lx)\n", Status); _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-08-08 15:33:04 UTC (rev 17204) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-08-08 15:39:35 UTC (rev 17205) @@ -110,162 +110,298 @@ NTSTATUS STDCALL -ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, +ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN KPROCESSOR_MODE AccessMode, - IN POBJECT_TYPE ObjectType, - IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, - OUT PUNICODE_STRING ObjectName) + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + OUT POBJECT_CREATE_INFORMATION CapturedObjectAttributes OPTIONAL, + OUT PUNICODE_STRING ObjectName OPTIONAL) { + OBJECT_ATTRIBUTES AttributesCopy; NTSTATUS Status = STATUS_SUCCESS; - PSECURITY_DESCRIPTOR SecurityDescriptor; - PSECURITY_QUALITY_OF_SERVICE SecurityQos; - PUNICODE_STRING LocalObjectName = NULL; - /* Zero out the Capture Data */ - DPRINT("ObpCaptureObjectAttributes\n"); - RtlZeroMemory(ObjectCreateInfo, sizeof(OBJECT_CREATE_INFORMATION)); - - /* Check if we got Oba */ - if (ObjectAttributes) + /* at least one output parameter must be != NULL! */ + ASSERT(CapturedObjectAttributes != NULL || ObjectName != NULL); + + if (ObjectAttributes == NULL) { - if (AccessMode != KernelMode) + /* we're going to return STATUS_SUCCESS! */ + goto failbasiccleanup; + } + + if (AccessMode != KernelMode) + { + _SEH_TRY { - DPRINT("Probing OBA\n"); - _SEH_TRY + ProbeForRead(ObjectAttributes, + sizeof(ObjectAttributes), + sizeof(ULONG)); + /* make a copy on the stack */ + AttributesCopy = *ObjectAttributes; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + DPRINT1("ObpCaptureObjectAttributes failed to probe object attributes 0x%p\n", ObjectAttributes); + KEBUGCHECK(0); + goto failbasiccleanup; + } + } + else if (!CaptureIfKernel) + { + if (ObjectAttributes->Length == sizeof(OBJECT_ATTRIBUTES)) + { + if (ObjectName != NULL) { - /* FIXME: SMSS SENDS BULLSHIT. */ - #if 0 - ProbeForRead(ObjectAttributes, - sizeof(ObjectAttributes), - sizeof(ULONG)); - #endif + /* we don't have to capture any memory, the caller considers the passed data + as valid */ + if (ObjectAttributes->ObjectName != NULL) + { + *ObjectName = *ObjectAttributes->ObjectName; + } + else + { + ObjectName->Length = ObjectName->MaximumLength = 0; + ObjectName->Buffer = NULL; + } } - _SEH_HANDLE + if (CapturedObjectAttributes != NULL) { - Status = _SEH_GetExceptionCode(); + CapturedObjectAttributes->RootDirectory = ObjectAttributes->RootDirectory; + CapturedObjectAttributes->Attributes = ObjectAttributes->Attributes; + CapturedObjectAttributes->SecurityDescriptor = ObjectAttributes->SecurityDescriptor; + CapturedObjectAttributes->SecurityDescriptorCharge = 0; /* FIXME */ + CapturedObjectAttributes->ProbeMode = AccessMode; } - _SEH_END; + + return STATUS_SUCCESS; } - - /* Validate the Size */ - DPRINT("Validating OBA\n"); - if (ObjectAttributes->Length != sizeof(OBJECT_ATTRIBUTES)) + else { Status = STATUS_INVALID_PARAMETER; + goto failbasiccleanup; } + } + else + { + AttributesCopy = *ObjectAttributes; + } - /* Fail if SEH or Size Validation failed */ - if(!NT_SUCCESS(Status)) + /* if Length isn't as expected, bail with an invalid parameter status code so + the caller knows he passed garbage... */ + if (AttributesCopy.Length != sizeof(OBJECT_ATTRIBUTES)) + { + Status = STATUS_INVALID_PARAMETER; + goto failbasiccleanup; + } + + if (CapturedObjectAttributes != NULL) + { + CapturedObjectAttributes->RootDirectory = AttributesCopy.RootDirectory; + CapturedObjectAttributes->Attributes = AttributesCopy.Attributes; + + if (AttributesCopy.SecurityDescriptor != NULL) { - 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; - - /* Validate the SD */ - if (SecurityDescriptor) - { - DPRINT("Probing SD: %x\n", SecurityDescriptor); - Status = SeCaptureSecurityDescriptor(SecurityDescriptor, + Status = SeCaptureSecurityDescriptor(AttributesCopy.SecurityDescriptor, AccessMode, - NonPagedPool, + PoolType, TRUE, - &ObjectCreateInfo->SecurityDescriptor); - if(!NT_SUCCESS(Status)) + &CapturedObjectAttributes->SecurityDescriptor); + if (!NT_SUCCESS(Status)) { DPRINT1("Unable to capture the security descriptor!!!\n"); - ObjectCreateInfo->SecurityDescriptor = NULL; - goto fail; + goto failbasiccleanup; } - - DPRINT("Probe done\n"); - ObjectCreateInfo->SecurityDescriptorCharge = 0; /* FIXME */ - ObjectCreateInfo->ProbeMode = AccessMode; + CapturedObjectAttributes->SecurityDescriptorCharge = 0; /* FIXME */ } - - /* Validate the QoS */ - if (SecurityQos) + else { + CapturedObjectAttributes->SecurityDescriptor = NULL; + CapturedObjectAttributes->SecurityDescriptorCharge = 0; + } + } + + if (ObjectName != NULL) + { + ObjectName->Buffer = NULL; + + if (AttributesCopy.ObjectName != NULL) + { + UNICODE_STRING OriginalCopy = {0}; + if (AccessMode != KernelMode) { - DPRINT("Probing QoS\n"); _SEH_TRY { - ProbeForRead(SecurityQos, - sizeof(SECURITY_QUALITY_OF_SERVICE), + /* probe the ObjectName structure and make a local stack copy of it */ + ProbeForRead(AttributesCopy.ObjectName, + sizeof(UNICODE_STRING), sizeof(ULONG)); + OriginalCopy = *AttributesCopy.ObjectName; + if (OriginalCopy.Length > 0) + { + ProbeForRead(OriginalCopy.Buffer, + OriginalCopy.Length, + sizeof(WCHAR)); + } } _SEH_HANDLE { Status = _SEH_GetExceptionCode(); } _SEH_END; + + if (NT_SUCCESS(Status)) + { + ObjectName->Length = OriginalCopy.Length; + + if(OriginalCopy.Length > 0) + { + ObjectName->MaximumLength = OriginalCopy.Length + sizeof(WCHAR); + ObjectName->Buffer = ExAllocatePool(PoolType, + ObjectName->MaximumLength); + if (ObjectName->Buffer != NULL) + { + _SEH_TRY + { + /* no need to probe OriginalCopy.Buffer again, we already did that + when capturing the UNICODE_STRING structure itself */ + RtlCopyMemory(ObjectName->Buffer, OriginalCopy.Buffer, OriginalCopy.Length); + ObjectName->Buffer[OriginalCopy.Length / sizeof(WCHAR)] = L'\0'; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ObpCaptureObjectAttributes failed to copy the unicode string!\n"); + } + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else if(AttributesCopy.RootDirectory != NULL /* && OriginalCopy.Length == 0 */) + { + /* if the caller specified a root directory, there must be an object name! */ + Status = STATUS_OBJECT_NAME_INVALID; + } + else + { + ObjectName->Length = ObjectName->MaximumLength = 0; + } + } +#ifdef DBG + else + { + DPRINT1("ObpCaptureObjectAttributes failed to probe the object name UNICODE_STRING structure!\n"); + } +#endif } + else /* AccessMode == KernelMode */ + { + OriginalCopy = *AttributesCopy.ObjectName; + ObjectName->Length = OriginalCopy.Length; - if(!NT_SUCCESS(Status)) - { - DPRINT1("Unable to capture QoS!!!\n"); - goto fail; + if (OriginalCopy.Length > 0) + { + ObjectName->MaximumLength = OriginalCopy.Length + sizeof(WCHAR); + ObjectName->Buffer = ExAllocatePool(PoolType, + ObjectName->MaximumLength); + if (ObjectName->Buffer != NULL) + { + RtlCopyMemory(ObjectName->Buffer, OriginalCopy.Buffer, OriginalCopy.Length); + ObjectName->Buffer[OriginalCopy.Length / sizeof(WCHAR)] = L'\0'; + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else if (AttributesCopy.RootDirectory != NULL /* && OriginalCopy.Length == 0 */) + { + /* if the caller specified a root directory, there must be an object name! */ + Status = STATUS_OBJECT_NAME_INVALID; + } + else + { + ObjectName->Length = ObjectName->MaximumLength = 0; + } } - - ObjectCreateInfo->SecurityQualityOfService = *SecurityQos; - ObjectCreateInfo->SecurityQos = &ObjectCreateInfo->SecurityQualityOfService; } - } - - /* Clear Local Object Name */ - DPRINT("Clearing name\n"); - RtlZeroMemory(ObjectName, sizeof(UNICODE_STRING)); - - /* Now check if the Object Attributes had an Object Name */ - if (LocalObjectName) - { - DPRINT("Name Buffer: %x\n", LocalObjectName->Buffer); - Status = ObpCaptureObjectName(ObjectName, - LocalObjectName, - AccessMode); - } - else - { - /* He can't have specified a Root Directory */ - if (ObjectCreateInfo->RootDirectory) + else { - DPRINT1("Invalid name\n"); - Status = STATUS_OBJECT_NAME_INVALID; + ObjectName->Length = ObjectName->MaximumLength = 0; } } -fail: + CapturedObjectAttributes->ProbeMode = AccessMode; + if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to capture, cleaning up\n"); - ObpReleaseCapturedAttributes(ObjectCreateInfo); + if (ObjectName->Buffer) + { + ExFreePool(ObjectName->Buffer); + } + if (CapturedObjectAttributes != NULL) + { + /* cleanup allocated resources */ + SeReleaseSecurityDescriptor(CapturedObjectAttributes->SecurityDescriptor , + AccessMode, + TRUE); + } + +failbasiccleanup: + if (ObjectName != NULL) + { + ObjectName->Length = ObjectName->MaximumLength = 0; + ObjectName->Buffer = NULL; + } + if (CapturedObjectAttributes != NULL) + { + RtlZeroMemory(CapturedObjectAttributes, sizeof(OBJECT_CREATE_INFORMATION)); + } } - - DPRINT("Return to caller\n"); + return Status; } VOID STDCALL -ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) +ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION CapturedObjectAttributes OPTIONAL, + IN PUNICODE_STRING ObjectName OPTIONAL, + IN KPROCESSOR_MODE AccessMode, + IN BOOLEAN CaptureIfKernel) { - /* Release the SD, it's the only thing we allocated */ - if (ObjectCreateInfo->SecurityDescriptor) + /* WARNING - You need to pass the same parameters to this function as you passed + to ObpCaptureObjectAttributes() to avoid memory leaks */ + if(AccessMode != KernelMode || CaptureIfKernel) + { + if(CapturedObjectAttributes != NULL && + CapturedObjectAttributes->SecurityDescriptor != NULL) { - SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, - ObjectCreateInfo->ProbeMode, - TRUE); - ObjectCreateInfo->SecurityDescriptor = NULL; + ExFreePool(CapturedObjectAttributes->SecurityDescriptor); + +#ifdef DBG + RtlZeroMemory(CapturedObjectAttributes, sizeof(OBJECT_CREATE_INFORMATION)); +#endif } + if(ObjectName != NULL && + ObjectName->Length > 0) + { + ExFreePool(ObjectName->Buffer); + } + } } @@ -348,7 +484,7 @@ ObjectName->Buffer[0] != L'\\') { ObDereferenceObject (CurrentObject); - DPRINT1("failed\n"); + DPRINT1("failed: \"%wZ\"\n", ObjectName); return STATUS_UNSUCCESSFUL; } @@ -795,8 +931,9 @@ /* Capture all the info */ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, - AccessMode, - Type, + ObjectAttributesAccessMode, + NonPagedPool, + TRUE, ObjectCreateInfo, &ObjectName); @@ -822,8 +959,10 @@ /* Release the Capture Info, we don't need it */ DPRINT1("Allocation failed\n"); - ObpReleaseCapturedAttributes(ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + ObpReleaseCapturedAttributes(ObjectCreateInfo, + &ObjectName, + ObjectAttributesAccessMode, + TRUE); } /* We failed, so release the Buffer */ @@ -977,7 +1116,10 @@ } if (Header->ObjectCreateInfo) { - ObpReleaseCapturedAttributes(Header->ObjectCreateInfo); + ObpReleaseCapturedAttributes(Header->ObjectCreateInfo, + NULL, + Header->ObjectCreateInfo->ProbeMode, + FALSE); ExFreePool(Header->ObjectCreateInfo); }

19 years, 1 month

[weiden] 17204: pass the correct access mode to ObOpenObjectByName

by weiden＠svn.reactos.com

pass the correct access mode to ObOpenObjectByName Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-08-08 15:01:03 UTC (rev 17203) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-08-08 15:33:04 UTC (rev 17204) @@ -248,7 +248,7 @@ Status = ObOpenObjectByName(&ObjectAttributes, ExWindowStationObjectType, NULL, - UserMode, + KernelMode, 0, NULL, (HANDLE*)hWinSta); @@ -282,7 +282,7 @@ Status = ObOpenObjectByName(&ObjectAttributes, ExDesktopObjectType, NULL, - UserMode, + KernelMode, 0, NULL, (HANDLE*)hDesktop); @@ -766,7 +766,7 @@ * Try to open already existing desktop */ - DPRINT("Trying to open desktop (%wZ)\n", &DesktopName); + DPRINT1("Trying to open desktop (%wZ)\n", &DesktopName); /* Initialize ObjectAttributes for the desktop object */ InitializeObjectAttributes( @@ -780,7 +780,7 @@ &ObjectAttributes, ExDesktopObjectType, NULL, - UserMode, + KernelMode, dwDesiredAccess, NULL, (HANDLE*)&Desktop); _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-08-08 15:01:03 UTC (rev 17203) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-08-08 15:33:04 UTC (rev 17204) @@ -466,7 +466,7 @@ &ObjectAttributes, ExWindowStationObjectType, NULL, - UserMode, + KernelMode, dwDesiredAccess, NULL, (PVOID*)&WindowStation);

19 years, 1 month

[sedwards] 17203: add setupapi test for stringtable functions. At this time they only pass on Ros and Windows 2000. I will fix the test to pass on later versions of Windows soon.

by sedwards＠svn.reactos.com

add setupapi test for stringtable functions. At this time they only pass on Ros and Windows 2000. I will fix the test to pass on later versions of Windows soon. Modified: trunk/reactos/regtests/winetests/directory.xml Added: trunk/reactos/regtests/winetests/setupapi/ Added: trunk/reactos/regtests/winetests/setupapi/setupapi.xml Added: trunk/reactos/regtests/winetests/setupapi/stringtable.c Added: trunk/reactos/regtests/winetests/setupapi/testlist.c _____ Modified: trunk/reactos/regtests/winetests/directory.xml --- trunk/reactos/regtests/winetests/directory.xml 2005-08-08 14:54:24 UTC (rev 17202) +++ trunk/reactos/regtests/winetests/directory.xml 2005-08-08 15:01:03 UTC (rev 17203) @@ -20,6 +20,9 @@ <directory name="psapi"> <xi:include href="psapi/psapi.xml" /> </directory> +<directory name="setupapi"> + <xi:include href="setupapi/setupapi.xml" /> +</directory> <directory name="shlwapi"> <xi:include href="shlwapi/shlwapi.xml" /> </directory> _____ Added: trunk/reactos/regtests/winetests/setupapi/setupapi.xml --- trunk/reactos/regtests/winetests/setupapi/setupapi.xml 2005-08-08 14:54:24 UTC (rev 17202) +++ trunk/reactos/regtests/winetests/setupapi/setupapi.xml 2005-08-08 15:01:03 UTC (rev 17203) @@ -0,0 +1,8 @@ +<module name="setupapi_winetest" type="win32cui" installbase="bin" installname="setupapi_winetest.exe" warnings="true"> + <include base="setupapi_winetest">.</include> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>setupapi</library> + <file>testlist.c</file> + <file>stringtable.c</file> +</module> _____ Added: trunk/reactos/regtests/winetests/setupapi/stringtable.c --- trunk/reactos/regtests/winetests/setupapi/stringtable.c 2005-08-08 14:54:24 UTC (rev 17202) +++ trunk/reactos/regtests/winetests/setupapi/stringtable.c 2005-08-08 15:01:03 UTC (rev 17203) @@ -0,0 +1,97 @@ +/* + * Unit test suite for StringTable functions + * + * Copyright 2005 Steven Edwards for ReactOS + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* TODO: + * Add case sensitivity test for StringTableAddString/StringTableLookupString + * Add test for StringTableStringFromIdEx + * + * BUGS: + * These functions are undocumented and exported under another name on + * Windows XP and Windows Server 2003. This test assumes the Windows 2000 + * implementation. + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "setupapi.h" + +#include "wine/test.h" + +HANDLE table, table2; /* Handles pointing to our tables */ +static WCHAR string[] = {'s','t','r','i','n','g',0}; + +static void test_StringTableInitialize() +{ + table=StringTableInitialize(); + ok(table!=NULL,"Failed to Initialize String Table\n"); +} + +static void test_StringTableAddString() +{ + DWORD retval; + + retval=StringTableAddString(table,string,0); + ok(retval!=-1,"Failed to add string to String Table\n"); +} + +static void test_StringTableDuplicate() +{ + table2=StringTableDuplicate(table); + ok(table2!=NULL,"Failed to duplicate String Table\n"); +} + +static void test_StringTableLookUpString() +{ + DWORD retval, retval2; + + retval=StringTableLookUpString(table,string,0); + ok(retval!=-1,"Failed find string in String Table 1\n"); + + retval2=StringTableLookUpString(table2,string,0); + ok(retval2!=-1,"Failed find string in String Table 2\n"); +} + +static void test_StringTableStringFromId() +{ + WCHAR *string2; + int result; + + string2=StringTableStringFromId(table,0); + ok(string2!=NULL,"Failed to look up string by ID from String Table\n"); + + result=lstrcmpiW(string, string2); + ok(result==0,"String %p does not match requested StringID %p\n",string,string2); +} + +START_TEST(stringtable) +{ + test_StringTableInitialize(); + test_StringTableAddString(); + test_StringTableDuplicate(); + test_StringTableLookUpString(); + test_StringTableStringFromId(); + + /* Cleanup */ + StringTableDestroy(table); +} Property changes on: trunk/reactos/regtests/winetests/setupapi/stringtable.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/regtests/winetests/setupapi/testlist.c --- trunk/reactos/regtests/winetests/setupapi/testlist.c 2005-08-08 14:54:24 UTC (rev 17202) +++ trunk/reactos/regtests/winetests/setupapi/testlist.c 2005-08-08 15:01:03 UTC (rev 17203) @@ -0,0 +1,25 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +/* stdarg.h is needed for Winelib */ +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include "windef.h" +#include "winbase.h" + +extern void func_stringtable(void); + +struct test +{ + const char *name; + void (*func)(void); +}; + +static const struct test winetest_testlist[] = +{ + { "stringtable", func_stringtable }, + { 0, 0 } +}; + +#define WINETEST_WANT_MAIN +#include "wine/test.h" Property changes on: trunk/reactos/regtests/winetests/setupapi/testlist.c ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

19 years, 1 month

[mbosma] 17202: Remove exclamation mark that does not belong there. Thanks to Salamander again.

by mbosma＠svn.reactos.com

Remove exclamation mark that does not belong there. Thanks to Salamander again. 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 14:20:05 UTC (rev 17201) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-08-08 14:54:24 UTC (rev 17202) @@ -63,14 +63,14 @@ CreateData.dwSCnt = 1; CreateData.lplpSList = &pLocal; - if(!This->owner->DriverCallbacks.DdMain.CreateSurface (&CreateData) != DDHAL_DRIVER_HANDLED) + if(This->owner->DriverCallbacks.DdMain.CreateSurface (&CreateData) != DDHAL_DRIVER_HANDLED) return DDERR_INVALIDPARAMS; - OutputDebugString(L"This does not get hit."); - if(CreateData.ddRVal != DD_OK) return CreateData.ddRVal; + OutputDebugString(L"This does not get hit."); + return DD_OK; }

19 years, 1 month

[mbosma] 17201: Forgot it again. :)

by mbosma＠svn.reactos.com

Forgot it again. :) Added: trunk/reactos/lib/ddraw/regsvr.c _____ Added: trunk/reactos/lib/ddraw/regsvr.c --- trunk/reactos/lib/ddraw/regsvr.c 2005-08-08 14:19:20 UTC (rev 17200) +++ trunk/reactos/lib/ddraw/regsvr.c 2005-08-08 14:20:05 UTC (rev 17201) @@ -0,0 +1,497 @@ +/* + * self-registerable dll functions for ddraw.dll + * + * Copyright (C) 2003 John K. Hohm + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * this file are from wine ddraw with some modification + */ + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "ddraw.h" + + +//#include "wine/debug.h" + +//WINE_DEFAULT_DEBUG_CHANNEL(ddraw); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +/********************************************************************** * + * interface for self-registering + */ +struct regsvr_interface +{ + IID const *iid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + IID const *base_iid; /* can be NULL to omit */ + int num_methods; /* can be <0 to omit */ + CLSID const *ps_clsid; /* can be NULL to omit */ + CLSID const *ps_clsid32; /* can be NULL to omit */ +}; + +static HRESULT register_interfaces(struct regsvr_interface const *list); +static HRESULT unregister_interfaces(struct regsvr_interface const *list); + +struct regsvr_coclass +{ + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit */ + LPCSTR clsid_str; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +/********************************************************************** * + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; + +/********************************************************************** * + * static helper functions + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); +static LONG recursive_delete_key(HKEY key); +static LONG recursive_delete_keyA(HKEY base, char const *name); +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); + +/********************************************************************** * + * register_interfaces + */ +static HRESULT register_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + HKEY iid_key; + + StringFromGUID2(list->iid, buf, 39); + res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_interface_key; + + if (list->name) { + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->base_iid) { + register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (0 <= list->num_methods) { + static WCHAR const fmt[3] = { '%', 'd', 0 }; + HKEY key; + + res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + + wsprintfW(buf, fmt, list->num_methods); + res = RegSetValueExW(key, NULL, 0, REG_SZ, + (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid) { + register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid32) { + register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + error_close_iid_key: + RegCloseKey(iid_key); + } + +error_close_interface_key: + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * unregister_interfaces + */ +static HRESULT unregister_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, + KEY_READ | KEY_WRITE, &interface_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->iid, buf, 39); + res = recursive_delete_keyW(interface_key, buf); + } + + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->clsid_str) { + res = register_key_defvalueA(clsid_key, clsid_keyname, + list->clsid_str); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + HKEY progid_key; + + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_key_defvalueW(progid_key, clsid_keyname, buf); + RegCloseKey(progid_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = recursive_delete_keyW(coclass_key, buf); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** * + * regsvr_key_guid + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) +{ + WCHAR buf[39]; + + StringFromGUID2(guid, buf, 39); + return register_key_defvalueW(base, name, buf); +} + +/********************************************************************** * + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (lstrlenW(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/********************************************************************** * + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/********************************************************************** * + * recursive_delete_key + */ +static LONG recursive_delete_key(HKEY key) +{ + LONG res; + WCHAR subkey_name[MAX_PATH]; + DWORD cName; + HKEY subkey; + + for (;;) { + cName = sizeof(subkey_name) / sizeof(WCHAR); + res = RegEnumKeyExW(key, 0, subkey_name, &cName, + NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { + res = ERROR_SUCCESS; /* presumably we're done enumerating */ + break; + } + res = RegOpenKeyExW(key, subkey_name, 0, + KEY_READ | KEY_WRITE, &subkey); + if (res == ERROR_FILE_NOT_FOUND) continue; + if (res != ERROR_SUCCESS) break; + + res = recursive_delete_key(subkey); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) break; + } + + if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); + return res; +} + +/********************************************************************** * + * recursive_delete_keyA + */ +static LONG recursive_delete_keyA(HKEY base, char const *name) +{ + LONG res; + HKEY key; + + res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/********************************************************************** * + * recursive_delete_keyW + */ +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) +{ + LONG res; + HKEY key; + + res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/********************************************************************** * + * coclass list + */ + +static struct regsvr_coclass const coclass_list[] = { + { &CLSID_DirectDraw, + "DirectDraw Object", + NULL, + "ddraw.dll", + "Both" + }, + { &CLSID_DirectDrawClipper, + "DirectDraw Clipper Object", + NULL, + "ddraw.dll", + "Both" + }, + { NULL } /* list terminator */ +}; + +/********************************************************************** * + * interface list + */ + +static struct regsvr_interface const interface_list[] = { + { NULL } /* list terminator */ +}; + +/********************************************************************** * + * DllRegisterServer (DDRAW.@) + */ +HRESULT WINAPI DDRAW_DllRegisterServer() +{ + HRESULT hr; + + //TRACE("\n"); + + hr = register_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = register_interfaces(interface_list); + return hr; +} + +/********************************************************************** * + * DllUnregisterServer (DDRAW.@) + */ +HRESULT WINAPI DDRAW_DllUnregisterServer() +{ + HRESULT hr; + + //TRACE("\n"); + + hr = unregister_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = unregister_interfaces(interface_list); + return hr; +} Property changes on: trunk/reactos/lib/ddraw/regsvr.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

19 years, 1 month

[mbosma] 17200: Fix wrong syntax, missing file and non existing module in makefile. Thanks to Salamander and Usurp.

by mbosma＠svn.reactos.com

Fix wrong syntax, missing file and non existing module in makefile. Thanks to Salamander and Usurp. Modified: trunk/reactos/lib/ddraw/ddraw.xml Modified: trunk/reactos/lib/ddraw/main/ddraw.c Modified: trunk/reactos/lib/ddraw/main/surface.c _____ Modified: trunk/reactos/lib/ddraw/ddraw.xml --- trunk/reactos/lib/ddraw/ddraw.xml 2005-08-08 13:29:50 UTC (rev 17199) +++ trunk/reactos/lib/ddraw/ddraw.xml 2005-08-08 14:19:20 UTC (rev 17200) @@ -13,7 +13,6 @@ <library>d3d8thk</library> <library>dxguid</library> <library>ole32</library> - <library>dciman32</library> <file>main.c</file> <file>regsvr.c</file> _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-08-08 13:29:50 UTC (rev 17199) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-08-08 14:19:20 UTC (rev 17200) @@ -86,7 +86,7 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; // this only for exclusive mode - if(!This->cooperative_level & DDSCL_EXCLUSIVE) + if(!(This->cooperative_level & DDSCL_EXCLUSIVE)) return DDERR_NOEXCLUSIVEMODE; // change the resolution using normal WinAPI function _____ Modified: trunk/reactos/lib/ddraw/main/surface.c --- trunk/reactos/lib/ddraw/main/surface.c 2005-08-08 13:29:50 UTC (rev 17199) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-08-08 14:19:20 UTC (rev 17200) @@ -21,7 +21,7 @@ if(sizeof(DDSURFACEDESC2) != pDDSD->dwSize) return DDERR_UNSUPPORTED; - if(!pDDSD->dwFlags & DDSD_CAPS) + if(!(pDDSD->dwFlags & DDSD_CAPS)) return DDERR_INVALIDPARAMS; This->owner = (IDirectDrawImpl*)pDD;

19 years, 1 month

[mbosma] 17199: The beginning of a ddraw implementation. Does not work yet for unknown reason.

by mbosma＠svn.reactos.com

The beginning of a ddraw implementation. Does not work yet for unknown reason. Deleted: trunk/reactos/lib/ddraw/ddraw.c Added: trunk/reactos/lib/ddraw/ddraw.xml Deleted: trunk/reactos/lib/ddraw/ddraw_hal.c Deleted: trunk/reactos/lib/ddraw/ddraw_private.h Deleted: trunk/reactos/lib/ddraw/ddraw_user.c Added: trunk/reactos/lib/ddraw/hal/ Added: trunk/reactos/lib/ddraw/hal/ddraw.c Added: trunk/reactos/lib/ddraw/hal/surface.c Added: trunk/reactos/lib/ddraw/main/ Added: trunk/reactos/lib/ddraw/main/ddraw.c Added: trunk/reactos/lib/ddraw/main/surface.c Added: trunk/reactos/lib/ddraw/main.c Deleted: trunk/reactos/lib/ddraw/regsvr.c Deleted: trunk/reactos/lib/ddraw/rosddraw.h Added: trunk/reactos/lib/ddraw/rosdraw.h Added: trunk/reactos/lib/ddraw/soft/ Added: trunk/reactos/lib/ddraw/soft/ddraw.c Added: trunk/reactos/lib/ddraw/soft/surface.c Added: trunk/reactos/lib/ddraw/thunks/ _____ Deleted: trunk/reactos/lib/ddraw/ddraw.c --- trunk/reactos/lib/ddraw/ddraw.c 2005-08-08 10:54:32 UTC (rev 17198) +++ trunk/reactos/lib/ddraw/ddraw.c 2005-08-08 13:29:50 UTC (rev 17199) @@ -1,119 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/opengl32/opengl32.c - * PURPOSE: OpenGL32 lib - * PROGRAMMER: Anich Gregor (blight), Royce Mitchell III - * UPDATE HISTORY: - * Feb 1, 2004: Created - */ - -#include <windows.h> -#include "ddraw.h" -#include "rosddraw.h" - -HRESULT WINAPI DirectDrawCreate(LPGUID lpGUID, LPDIRECTDRAW* lplpDD, LPUNKNOWN pUnkOuter) -{ - if (pUnkOuter!=NULL) return DDERR_INVALIDPARAMS; - return DDRAW_Create(lpGUID, (LPVOID*) lplpDD, pUnkOuter, &IID_IDirectDraw, FALSE); -} - - -HRESULT WINAPI DirectDrawCreateEx(LPGUID lpGUID, LPVOID* lplpDD, REFIID iid, LPUNKNOWN pUnkOuter) -{ - if (pUnkOuter!=NULL) return DDERR_INVALIDPARAMS; - if (!IsEqualGUID(iid, &IID_IDirectDraw7)) return DDERR_INVALIDPARAMS; - - return DDRAW_Create(lpGUID, lplpDD, pUnkOuter, iid, TRUE); -} - -HRESULT WINAPI DirectDrawEnumerateA( - LPDDENUMCALLBACKA lpCallback, - LPVOID lpContext -) -{ - return DD_OK; -} - - -HRESULT WINAPI DirectDrawEnumerateW( - LPDDENUMCALLBACKW lpCallback, - LPVOID lpContext -) -{ - return DD_OK; -} - -HRESULT WINAPI DirectDrawEnumerateExA( - LPDDENUMCALLBACKEXA lpCallback, - LPVOID lpContext, - DWORD dwFlags -) -{ - return DD_OK; -} - -HRESULT WINAPI DirectDrawEnumerateExW( - LPDDENUMCALLBACKEXW lpCallback, - LPVOID lpContext, - DWORD dwFlags -) -{ - return DD_OK; -} - -HRESULT WINAPI DirectDrawCreateClipper( - DWORD dwFlags, - LPDIRECTDRAWCLIPPER* lplpDDClipper, - LPUNKNOWN pUnkOuter -) -{ - return DD_OK; -} - -HRESULT DDRAW_Create( - LPGUID lpGUID, LPVOID *lplpDD, LPUNKNOWN pUnkOuter, REFIID iid, BOOL ex) -{ - - HRESULT hr; - - - /* TODO 1: - check the GUID are right - add scanner that DirectDrawCreate / DirectDrawCreateEx select right driver. - now we will assume it is the current display driver - */ - - /* TODO 2: - do not only use hardware mode. - */ - - hr = HAL_DirectDraw_Create(lpGUID, lplpDD, pUnkOuter, iid, ex); - - /* old code - //HDC desktop; - - desktop = GetWindowDC(GetDesktopWindow()); - lplpDD = OsThunkDdCreateDirectDrawObject(desktop); - if (lplpDD == NULL) return DDERR_NODIRECTDRAWHW; - */ - - return hr; -} - -BOOL WINAPI DllMain(HINSTANCE hInstance,DWORD fwdReason, LPVOID lpvReserved) -{ - switch(fwdReason) - { - case DLL_PROCESS_ATTACH: - break; - case DLL_THREAD_ATTACH: - break; - case DLL_PROCESS_DETACH: - break; - case DLL_THREAD_DETACH: - break; - } - return(TRUE); -} _____ Added: trunk/reactos/lib/ddraw/ddraw.xml --- trunk/reactos/lib/ddraw/ddraw.xml 2005-08-08 10:54:32 UTC (rev 17198) +++ trunk/reactos/lib/ddraw/ddraw.xml 2005-08-08 13:29:50 UTC (rev 17199) @@ -0,0 +1,35 @@ +<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll"> + <importlibrary definition="ddraw.def" /> + <include base="ddraw">.</include> + <include base="d3d8thk">.</include> + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <define name="WINVER">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + + <library>ntdll</library> + <library>kernel32</library> + <library>gdi32</library> + <library>d3d8thk</library> + <library>dxguid</library> + <library>ole32</library> + <library>dciman32</library> + + <file>main.c</file> + <file>regsvr.c</file> + + <directory name="hal"> + <file>ddraw.c</file> + <file>surface.c</file> + </directory> + + <directory name="main"> + <file>ddraw.c</file> + <file>surface.c</file> + </directory> + + <directory name="soft"> + <file>ddraw.c</file> + <file>surface.c</file> + </directory> +</module> _____ Deleted: trunk/reactos/lib/ddraw/ddraw_hal.c --- trunk/reactos/lib/ddraw/ddraw_hal.c 2005-08-08 10:54:32 UTC (rev 17198) +++ trunk/reactos/lib/ddraw/ddraw_hal.c 2005-08-08 13:29:50 UTC (rev 17199) @@ -1,342 +0,0 @@ - - - -#include <windows.h> -#include "ddraw.h" -#include "rosddraw.h" -#include "ddraw_private.h" - -static IDirectDraw7Vtbl HAL_DirectDraw_VTable; - - -HRESULT HAL_DirectDraw_Construct(IDirectDrawImpl *This, BOOL ex) -{ - //This->local.lpGbl = &dd_gbl; - - This->final_release = HAL_DirectDraw_final_release; - This->set_exclusive_mode = HAL_DirectDrawSet_exclusive_mode; - // This->create_palette = HAL_DirectDrawPalette_Create; - - This->create_primary = HAL_DirectDraw_create_primary; - This->create_backbuffer = HAL_DirectDraw_create_backbuffer; - This->create_texture = HAL_DirectDraw_create_texture; - - // ICOM_INIT_INTERFACE(This, IDirectDraw7, HAL_DirectDraw_VTable); - return S_OK; -} - -void HAL_DirectDraw_final_release(IDirectDrawImpl *This) -{ - -} - -HRESULT HAL_DirectDrawSet_exclusive_mode(IDirectDrawImpl *This, DWORD dwEnterExcl) -{ - return DDERR_UNSUPPORTED; -} - - -HRESULT HAL_DirectDraw_create_primary(IDirectDrawImpl* This, const DDSURFACEDESC2* pDDSD, LPDIRECTDRAWSURFACE7* ppSurf, - IUnknown* pUnkOuter) - -{ - return DDERR_UNSUPPORTED; - } - -HRESULT HAL_DirectDraw_create_backbuffer(IDirectDrawImpl* This, - const DDSURFACEDESC2* pDDSD, - LPDIRECTDRAWSURFACE7* ppSurf, - IUnknown* pUnkOuter, - IDirectDrawSurfaceImpl* primary) -{ - return DDERR_UNSUPPORTED; - } - -HRESULT HAL_DirectDraw_create_texture(IDirectDrawImpl* This, - const DDSURFACEDESC2* pDDSD, - LPDIRECTDRAWSURFACE7* ppSurf, - LPUNKNOWN pOuter, - DWORD dwMipMapLevel) -{ - return DDERR_UNSUPPORTED; - } - - - - - - -/* basic funtion for the com object */ -HRESULT WINAPI HAL_DirectDraw_QueryInterface(LPDIRECTDRAW7 iface,REFIID refiid,LPVOID *obj) -{ - return DDERR_UNSUPPORTED; - } - -ULONG WINAPI HAL_DirectDraw_AddRef(LPDIRECTDRAW7 iface) -{ - IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); - - //TRACE("(%p)->() incrementing from %lu.\n", This, ref -1); - - return ref; -} - -ULONG WINAPI HAL_DirectDraw_Release(LPDIRECTDRAW7 iface) -{ - IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); - - if (ref == 0) - { - if (This->final_release != NULL) - This->final_release(This); - - /* We free the private. This is an artifact of the fact that I don't - * have the destructors set up correctly. */ - if (This->private != (This+1)) - HeapFree(GetProcessHeap(), 0, This->private); - - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -HRESULT WINAPI HAL_DirectDraw_Compact(LPDIRECTDRAW7 iface) -{ - - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) -{ - return DDERR_UNSUPPORTED; -} -HRESULT WINAPI HAL_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPPALETTEENTRY palent,LPDIRECTDRAWPALETTE* ppPalette,LPUNKNOWN pUnknown) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_CreateSurface(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf,IUnknown *pUnkOuter) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, - LPDIRECTDRAWSURFACE7* dst) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPDDSURFACEDESC2 lpDDSD2, LPVOID context, - LPDDENUMSURFACESCALLBACK7 callback) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) -{ -return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, - LPDDCAPS pHELCaps) -{ -return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) -{ - return DDERR_UNSUPPORTED; -} - - -HRESULT WINAPI HAL_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) -{ - - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, - LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) -{ - - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL status) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_Initialize(LPDIRECTDRAW7 iface, LPGUID lpGuid) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_SetCooperativeLevel(LPDIRECTDRAW7 iface, HWND hwnd, - DWORD cooplevel) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_SetDisplayMode(LPDIRECTDRAW7 iface, DWORD dwWidth, - DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - - return DDERR_UNSUPPORTED; -} - - -HRESULT WINAPI HAL_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, - HANDLE h) -{ - - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) - -{ - - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, - LPDIRECTDRAWSURFACE7 *lpDDS) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, - LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, - DWORD dwNumModes, DWORD dwFlags) -{ - return DDERR_UNSUPPORTED; -} - -HRESULT WINAPI HAL_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) -{ - return DDERR_UNSUPPORTED; -} - -/* End com interface */ - - - - -HRESULT WINAPI HAL_DirectDraw_Create(const GUID* pGUID, LPDIRECTDRAW7* pIface, - IUnknown* pUnkOuter, BOOL ex) -{ - - HRESULT hr; - IDirectDrawImpl* This; - HDC desktop; - - /* - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(IDirectDrawImpl) - + sizeof(HAL_DirectDrawImpl)); - */ - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(IDirectDrawImpl)); - - if (This == NULL) return E_OUTOFMEMORY; - - /* Note that this relation does *not* hold true if the DD object was - * CoCreateInstanced then Initialized. */ - //This->private = (HAL_DirectDrawImpl *)(This+1); - - /* Initialize the DDCAPS structure */ - This->caps.dwSize = sizeof(This->caps); - - hr = HAL_DirectDraw_Construct(This, ex); - if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, This); - else *pIface = ICOM_INTERFACE(This, IDirectDraw7); - - /* create a scaner that check which driver we should get the HDC from */ - /* for now we always asume it is the active dirver that should be use. */ - - desktop = GetWindowDC(GetDesktopWindow()); - *pIface = OsThunkDdCreateDirectDrawObject(desktop); - if (pIface == NULL) hr == DDERR_NODIRECTDRAWHW; - - return DDERR_UNSUPPORTED; -} - -static IDirectDraw7Vtbl HAL_DirectDraw_VTable = -{ - HAL_DirectDraw_QueryInterface, - HAL_DirectDraw_AddRef, - HAL_DirectDraw_Release, - HAL_DirectDraw_Compact, - HAL_DirectDraw_CreateClipper, - HAL_DirectDraw_CreatePalette, - HAL_DirectDraw_CreateSurface, - HAL_DirectDraw_DuplicateSurface, - HAL_DirectDraw_EnumDisplayModes, - HAL_DirectDraw_EnumSurfaces, - HAL_DirectDraw_FlipToGDISurface, - HAL_DirectDraw_GetCaps, - HAL_DirectDraw_GetDisplayMode, - HAL_DirectDraw_GetFourCCCodes, - HAL_DirectDraw_GetGDISurface, - HAL_DirectDraw_GetMonitorFrequency, - HAL_DirectDraw_GetScanLine, - HAL_DirectDraw_GetVerticalBlankStatus, - HAL_DirectDraw_Initialize, - HAL_DirectDraw_RestoreDisplayMode, - HAL_DirectDraw_SetCooperativeLevel, - HAL_DirectDraw_SetDisplayMode, - HAL_DirectDraw_WaitForVerticalBlank, - HAL_DirectDraw_GetAvailableVidMem, - HAL_DirectDraw_GetSurfaceFromDC, - HAL_DirectDraw_RestoreAllSurfaces, - HAL_DirectDraw_TestCooperativeLevel, - HAL_DirectDraw_GetDeviceIdentifier, - HAL_DirectDraw_StartModeTest, - HAL_DirectDraw_EvaluateMode -}; _____ Deleted: trunk/reactos/lib/ddraw/ddraw_private.h --- trunk/reactos/lib/ddraw/ddraw_private.h 2005-08-08 10:54:32 UTC (rev 17198) +++ trunk/reactos/lib/ddraw/ddraw_private.h 2005-08-08 13:29:50 UTC (rev 17199) @@ -1,482 +0,0 @@ -/* - * Copyright 2000-2001 TransGaming Technologies Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef _DDCOMIMPL_H_ -#define _DDCOMIMPL_H_ - -#include <stddef.h> - -/* Generates the name for a vtable pointer for a given interface. */ -/* The canonical name for a single interface is "lpVtbl". */ -#define ICOM_VFIELD_MULTI_NAME2(iface) ITF_##iface -#define ICOM_VFIELD_MULTI_NAME(iface) ICOM_VFIELD_MULTI_NAME2(iface) - -/* Declares a vtable pointer field in an implementation. */ -#define ICOM_VFIELD_MULTI(iface) \ - iface ICOM_VFIELD_MULTI_NAME(iface) - -/* Returns the offset of a vtable pointer within an implementation object. */ -#define ICOM_VFIELD_OFFSET(impltype, iface) \ - offsetof(impltype, ICOM_VFIELD_MULTI_NAME(iface)) - -/* Given an interface pointer, returns the implementation pointer. */ -#define ICOM_OBJECT(impltype, ifacename, ifaceptr) \ - (impltype*)((ifaceptr) == NULL ? NULL \ - : (char*)(ifaceptr) - ICOM_VFIELD_OFFSET(impltype,ifacename)) - -#define ICOM_THIS_FROM(impltype, ifacename, ifaceptr) \ - impltype* This = ICOM_OBJECT(impltype, ifacename, ifaceptr) - -/* Given an object and interface name, returns a pointer to that interface. */ -#define ICOM_INTERFACE(implobj, iface) \ - (&((implobj)->ICOM_VFIELD_MULTI_NAME(iface))) - -#define ICOM_INIT_INTERFACE(implobj, ifacename, vtblname) \ - do { \ - (implobj)->ICOM_VFIELD_MULTI_NAME(ifacename).lpVtbl = &(vtblname); \ - } while (0) - -#define COM_INTERFACE_CAST(impltype, ifnamefrom, ifnameto, ifaceptr) \ - ICOM_INTERFACE(ICOM_OBJECT(impltype, ifnamefrom, ifaceptr), ifnameto) - -#endif /* _DDCOMIMPL_H_ */ - -#ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H -#define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H - -/* MAY NOT CONTAIN X11 or DGA specific includes/defines/structs! */ - -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "ddraw.h" -#include "d3d.h" -#include "ddrawi.h" - -/* XXX Put this somewhere proper. */ -#define DD_STRUCT_INIT(x) \ - do { \ - memset((x), 0, sizeof(*(x))); \ - (x)->dwSize = sizeof(*x); \ - } while (0) - -#define DD_STRUCT_COPY_BYSIZE(to,from) \ - do { \ - DWORD __size = (to)->dwSize; \ - DWORD __copysize = __size; \ - DWORD __resetsize = __size; \ - if (__resetsize > sizeof(*to)) \ - __resetsize = sizeof(*to); \ - memset(to,0,__resetsize); \ - if ((from)->dwSize < __size) \ - __copysize = (from)->dwSize; \ - memcpy(to,from,__copysize); \ - (to)->dwSize = __size;/*restore size*/ \ - } while (0) - -#define MAKE_FOURCC(a,b,c,d) ((a << 0) | (b << 8) | (c << 16) | (d << 24)) - -/********************************************************************** ******* - * IDirectDraw implementation structure - */ - -typedef struct IDirectDrawImpl IDirectDrawImpl; -typedef struct IDirectDrawPaletteImpl IDirectDrawPaletteImpl; -typedef struct IDirectDrawClipperImpl IDirectDrawClipperImpl; -typedef struct IDirectDrawSurfaceImpl IDirectDrawSurfaceImpl; -typedef struct IDirect3DDeviceImpl IDirect3DDeviceImpl; - -typedef void (*pixel_convert_func)(void *src, void *dst, DWORD width, - DWORD height, LONG pitch, - IDirectDrawPaletteImpl *palette); - -typedef void (*palette_convert_func)(LPPALETTEENTRY palent, - void *screen_palette, DWORD start, - DWORD count); - -struct IDirectDrawImpl -{ - ICOM_VFIELD_MULTI(IDirectDraw7); - ICOM_VFIELD_MULTI(IDirectDraw4); - ICOM_VFIELD_MULTI(IDirectDraw2); - ICOM_VFIELD_MULTI(IDirectDraw); - ICOM_VFIELD_MULTI(IDirect3D7); - ICOM_VFIELD_MULTI(IDirect3D3); - ICOM_VFIELD_MULTI(IDirect3D2); - ICOM_VFIELD_MULTI(IDirect3D); - - DWORD ref; - - /* TRUE if created via DirectDrawCreateEx or CoCreateInstance, - * FALSE if created via DirectDrawCreate. */ - BOOL ex; - - /* Linked list of surfaces, joined by next_ddraw in IDirectSurfaceImpl. */ - IDirectDrawSurfaceImpl* surfaces; - /* Linked list of palettes, joined by next_ddraw. */ - IDirectDrawPaletteImpl* palettes; - /* Linked list of clippers, joined by next_ddraw. */ - IDirectDrawClipperImpl* clippers; - - IDirectDrawSurfaceImpl* primary_surface; - - DDRAWI_DIRECTDRAW_LCL local; - DDCAPS caps; - - HWND window; - DWORD cooperative_level; - WNDPROC original_wndproc; - - DWORD width, height; - LONG pitch; - DDPIXELFORMAT pixelformat; - DWORD cur_scanline; - - /* Should each of these go into some structure? */ - DWORD orig_width, orig_height; - LONG orig_pitch; - DDPIXELFORMAT orig_pixelformat; - - /* Called when the refcount goes to 0. */ - void (*final_release)(IDirectDrawImpl *This); - - HRESULT (*set_exclusive_mode)(IDirectDrawImpl *This, DWORD dwExcl); - - HRESULT (*create_palette)(IDirectDrawImpl* This, DWORD dwFlags, - LPDIRECTDRAWPALETTE* ppPalette, - LPUNKNOWN pUnkOuter); - - /* Surface creation functions. For all of these, pOuter == NULL. */ - - /* Do not create any backbuffers or the flipping chain. */ - HRESULT (*create_primary)(IDirectDrawImpl* This, - const DDSURFACEDESC2* pDDSD, - LPDIRECTDRAWSURFACE7* ppSurf, LPUNKNOWN pOuter); - - /* Primary may be NULL if we are creating an unattached backbuffer. */ - HRESULT (*create_backbuffer)(IDirectDrawImpl* This, - const DDSURFACEDESC2* pDDSD, - LPDIRECTDRAWSURFACE7* ppSurf, - LPUNKNOWN pOuter, - IDirectDrawSurfaceImpl* primary); - - /* shiny happy offscreenplain surfaces */ - HRESULT (*create_offscreen)(IDirectDrawImpl* This, - const DDSURFACEDESC2* pDDSD, - LPDIRECTDRAWSURFACE7* ppSurf, - LPUNKNOWN pOuter); - - /* dwMipMapLevel is specified as per OpenGL. (i.e. 0 is base) */ - HRESULT (*create_texture)(IDirectDrawImpl* This, - const DDSURFACEDESC2* pDDSD, - LPDIRECTDRAWSURFACE7* ppSurf, LPUNKNOWN pOuter, - DWORD dwMipMapLevel); - - HRESULT (*create_zbuffer)(IDirectDrawImpl* This, - const DDSURFACEDESC2* pDDSD, - LPDIRECTDRAWSURFACE7* ppSurf, LPUNKNOWN pOuter); - - LPVOID private; - - /* Everything below here is still questionable. */ - - DDPIXELFORMAT screen_pixelformat; - - int pixmap_depth; - // pixel_convert_func pixel_convert; - // palette_convert_func palette_convert; - - /* Use to fool some too strict games */ - INT32 (*allocate_memory)(IDirectDrawImpl *This, DWORD mem); - void (*free_memory)(IDirectDrawImpl *This, DWORD mem); - DWORD total_vidmem, available_vidmem; - - /* IDirect3D fields */ - LPVOID d3d_private; - - /* Used as a callback function to create a texture */ - HRESULT (*d3d_create_texture)(IDirectDrawImpl *d3d, IDirectDrawSurfaceImpl *tex, BOOLEAN at_creation, IDirectDrawSurfaceImpl *main); - - /* Used as a callback for Devices to tell to the D3D object it's been created */ - HRESULT (*d3d_added_device)(IDirectDrawImpl *d3d, IDirect3DDeviceImpl *device); - HRESULT (*d3d_removed_device)(IDirectDrawImpl *d3d, IDirect3DDeviceImpl *device); - - /* This is needed for delayed texture creation and Z buffer blits */ - IDirect3DDeviceImpl *current_device; - - /* This is for the fake mainWindow */ - ATOM winclass; - PAINTSTRUCT ps; - BOOL paintable; -}; - -/********************************************************************** ******* - * IDirectDrawPalette implementation structure - */ -struct IDirectDrawPaletteImpl -{ - /* IUnknown fields */ - ICOM_VFIELD_MULTI(IDirectDrawPalette); - DWORD ref; - - DDRAWI_DDRAWPALETTE_LCL local; - DDRAWI_DDRAWPALETTE_GBL global; - - /* IDirectDrawPalette fields */ - HPALETTE hpal; - WORD palVersion, palNumEntries; /* LOGPALETTE */ - PALETTEENTRY palents[256]; - /* This is to store the palette in 'screen format' */ - int screen_palents[256]; - - VOID (*final_release)(IDirectDrawPaletteImpl* This); - - IDirectDrawImpl* ddraw_owner; - IDirectDrawPaletteImpl* prev_ddraw; - IDirectDrawPaletteImpl* next_ddraw; - - LPVOID private; -}; - -/********************************************************************** ******* - * IDirectDrawClipper implementation structure - */ -struct IDirectDrawClipperImpl -{ - /* IUnknown fields */ - ICOM_VFIELD_MULTI(IDirectDrawClipper); - DWORD ref; - - /* IDirectDrawClipper fields */ - HWND hWnd; - - IDirectDrawImpl* ddraw_owner; - IDirectDrawClipperImpl* prev_ddraw; - IDirectDrawClipperImpl* next_ddraw; -}; - -/********************************************************************** ******* - * IDirectDrawSurface implementation structure - */ - -struct IDirectDrawSurfaceImpl -{ - /* IUnknown fields */ - ICOM_VFIELD_MULTI(IDirectDrawSurface7); - ICOM_VFIELD_MULTI(IDirectDrawSurface3); - ICOM_VFIELD_MULTI(IDirectDrawGammaControl); - ICOM_VFIELD_MULTI(IDirect3DTexture2); - ICOM_VFIELD_MULTI(IDirect3DTexture); - DWORD ref; - - struct IDirectDrawSurfaceImpl* attached; /* attached surfaces */ - - struct IDirectDrawSurfaceImpl* next_ddraw; /* ddraw surface chain */ - struct IDirectDrawSurfaceImpl* prev_ddraw; - struct IDirectDrawSurfaceImpl* next_attached; /* attached surface chain */ - struct IDirectDrawSurfaceImpl* prev_attached; - - IDirectDrawImpl* ddraw_owner; - IDirectDrawSurfaceImpl* surface_owner; - - IDirectDrawPaletteImpl* palette; /* strong ref */ - IDirectDrawClipperImpl* clipper; /* strong ref */ - - DDRAWI_DDRAWSURFACE_LCL local; - DDRAWI_DDRAWSURFACE_MORE more; - /* FIXME: since Flip should swap the GBL structures, they should - * probably not be embedded into the IDirectDrawSurfaceImpl structure... */ - LPDDRAWI_DDRAWSURFACE_GBL_MORE gmore; - DDRAWI_DDRAWSURFACE_GBL global; - DDRAWI_DDRAWSURFACE_GBL_MORE global_more; - - DDSURFACEDESC2 surface_desc; - - HDC hDC; - RECT lastlockrect; - DWORD lastlocktype; - BOOL dc_in_use; - BOOL locked; - - HRESULT (*duplicate_surface)(IDirectDrawSurfaceImpl* src, - LPDIRECTDRAWSURFACE7* dst); - void (*final_release)(IDirectDrawSurfaceImpl *This); - HRESULT (*late_allocate)(IDirectDrawSurfaceImpl *This); - BOOL (*attach)(IDirectDrawSurfaceImpl *This, IDirectDrawSurfaceImpl *to); - BOOL (*detach)(IDirectDrawSurfaceImpl *This); - void (*lock_update)(IDirectDrawSurfaceImpl* This, LPCRECT pRect, DWORD dwFlags); - void (*unlock_update)(IDirectDrawSurfaceImpl* This, LPCRECT pRect); - void (*lose_surface)(IDirectDrawSurfaceImpl* This); - BOOL (*flip_data)(IDirectDrawSurfaceImpl* front, - IDirectDrawSurfaceImpl* back, - DWORD dwFlags); - void (*flip_update)(IDirectDrawSurfaceImpl* front, DWORD dwFlags); - HRESULT (*get_dc)(IDirectDrawSurfaceImpl* This, HDC* phDC); - HRESULT (*release_dc)(IDirectDrawSurfaceImpl* This, HDC hDC); - void (*set_palette)(IDirectDrawSurfaceImpl* This, IDirectDrawPaletteImpl* pal); - void (*update_palette)(IDirectDrawSurfaceImpl* This, IDirectDrawPaletteImpl* pal, - DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent); - HWND (*get_display_window)(IDirectDrawSurfaceImpl *This); - HRESULT (*get_gamma_ramp)(IDirectDrawSurfaceImpl *This, DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp); - HRESULT (*set_gamma_ramp)(IDirectDrawSurfaceImpl *This, DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp); - - struct PrivateData* private_data; - - DWORD max_lod; - DWORD priority; - - BOOL lost; - - DWORD uniqueness_value; - - LPVOID private; - - /* Everything below here is dodgy. */ - /* For Direct3D use */ - LPVOID aux_ctx, aux_data; - void (*aux_release)(LPVOID ctx, LPVOID data); - BOOL (*aux_flip)(LPVOID ctx, LPVOID data); - void (*aux_unlock)(LPVOID ctx, LPVOID data, LPRECT lpRect); - HRESULT (*aux_blt)(struct IDirectDrawSurfaceImpl *This, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx); - HRESULT (*aux_bltfast)(struct IDirectDrawSurfaceImpl *This, DWORD dstx, DWORD dsty, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD trans); - HRESULT (*aux_setcolorkey_cb)(struct IDirectDrawSurfaceImpl *texture, DWORD dwFlags, LPDDCOLORKEY ckey ); - /* This is to get the D3DDevice object associated to this surface */ - struct IDirect3DDeviceImpl *d3ddevice; - /* This is for texture */ - IDirectDrawSurfaceImpl *mip_main; - int mipmap_level; - LPVOID tex_private; - void (*lock_update_prev)(IDirectDrawSurfaceImpl* This, LPCRECT pRect, DWORD dwFlags); - void (*unlock_update_prev)(IDirectDrawSurfaceImpl* This, LPCRECT pRect); - BOOLEAN (*get_dirty_status)(IDirectDrawSurfaceImpl* This, LPCRECT pRect); -}; - -/********************************************************************** ******* - * Driver initialisation functions. - */ -BOOL DDRAW_HAL_Init(HINSTANCE, DWORD, LPVOID); -BOOL DDRAW_User_Init(HINSTANCE, DWORD, LPVOID); - -typedef struct { - const DDDEVICEIDENTIFIER2* info; - int preference; /* how good we are. dga might get 100, xlib 50*/ - HRESULT (*create)(const GUID*, LPDIRECTDRAW7*, LPUNKNOWN, BOOL ex); - - /* For IDirectDraw7::Initialize. */ - HRESULT (*init)(IDirectDrawImpl *, const GUID*); -} ddraw_driver; - -void DDRAW_register_driver(const ddraw_driver*); - -const ddraw_driver* DDRAW_FindDriver(const GUID* guid); - -/********************************************************************** ******** - * Random utilities - */ - -/* Get DDSCAPS of surface (shortcutmacro) */ -#define SDDSCAPS(iface) ((iface)->s.surface_desc.ddsCaps.dwCaps) -/* Get the number of bytes per pixel for a given surface */ -#define PFGET_BPP(pf) (pf.dwFlags&DDPF_PALETTEINDEXED8?1:((pf.u1.dwRGBBitCount+7)/8)) -#define GET_BPP(desc) PFGET_BPP(desc.u4.ddpfPixelFormat) - -LONG DDRAW_width_bpp_to_pitch(DWORD width, DWORD bpp); - -typedef struct { - unsigned short bpp,depth; - unsigned int rmask,gmask,bmask; -} ConvertMode; - -typedef struct { - void (*pixel_convert)(void *src, void *dst, DWORD width, DWORD height, LONG pitch, IDirectDrawPaletteImpl* palette); - void (*palette_convert)(LPPALETTEENTRY palent, void *screen_palette, DWORD start, DWORD count); -} ConvertFuncs; - -typedef struct { - ConvertMode screen, dest; - ConvertFuncs funcs; -} Convert; - -extern Convert ModeEmulations[8]; -extern int _common_depth_to_pixelformat(DWORD depth,LPDIRECTDRAW ddraw); -extern BOOL opengl_initialized; -extern BOOL s3tc_initialized; - -typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT1)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); -typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT3)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); -typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT5)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); - -extern FUNC_FETCH_2D_TEXEL_RGBA_DXT1 fetch_2d_texel_rgba_dxt1; -extern FUNC_FETCH_2D_TEXEL_RGBA_DXT3 fetch_2d_texel_rgba_dxt3; -extern FUNC_FETCH_2D_TEXEL_RGBA_DXT5 fetch_2d_texel_rgba_dxt5; - -/********************************************************************** ******** - * Structure conversion (for thunks) - */ -void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS* pIn, DDSCAPS2* pOut); -void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2* pIn, - DDDEVICEIDENTIFIER* pOut); - -/********************************************************************** ******** - * Debugging / Flags output functions - */ -extern void DDRAW_dump_DDBLTFX(DWORD flagmask); -extern void DDRAW_dump_DDBLTFAST(DWORD flagmask); -extern void DDRAW_dump_DDBLT(DWORD flagmask); -extern void DDRAW_dump_DDSCAPS(const DDSCAPS *in); -extern void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in); -extern void DDRAW_dump_pixelformat_flag(DWORD flagmask); -extern void DDRAW_dump_paletteformat(DWORD dwFlags); -extern void DDRAW_dump_pixelformat(const DDPIXELFORMAT *in); -extern void DDRAW_dump_colorkeyflag(DWORD ck); -extern void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd); -extern void DDRAW_dump_cooperativelevel(DWORD cooplevel); -extern void DDRAW_dump_lockflag(DWORD lockflag); -extern void DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *in); -extern void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps); -extern void DDRAW_dump_surface_to_disk(IDirectDrawSurfaceImpl *surface, FILE *f, int scale) ; - -/* Used for generic dumping */ -typedef struct -{ - DWORD val; - const char* name; -} flag_info; - -#define FE(x) { x, #x } - -typedef struct -{ - DWORD val; - const char* name; - void (*func)(const void *); - ptrdiff_t offset; -} member_info; - -#define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1) -#define ME(x,f,e) { x, #x, (void (*)(const void *))(f), offsetof(STRUCT, e) } - -extern void DDRAW_dump_flags_(DWORD flags, const flag_info* names, size_t num_names, int newline); -extern void DDRAW_dump_members(DWORD flags, const void* data, const member_info* mems, size_t num_mems); - - -#endif /* __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H */ _____ Deleted: trunk/reactos/lib/ddraw/ddraw_user.c --- trunk/reactos/lib/ddraw/ddraw_user.c 2005-08-08 10:54:32 UTC (rev 17198) [truncated at 1001 lines; 2143 more skipped]

19 years, 1 month

← Newer
1
...
37
38
39
40
41
42
43
...
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