Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[greatlrd] 17218: fixing bug 690 by Brandon Turner. note ms only allown start "notepad" or "note"pad not notep"ad or notepad" but we do that, for we think it is a bug in ms cmd that only allowing " at start of a file name to start the apps.

by greatlrd＠svn.reactos.com

fixing bug 690 by Brandon Turner. note ms only allown start "notepad" or "note"pad not notep"ad or notepad" but we do that, for we think it is a bug in ms cmd that only allowing " at start of a file name to start the apps. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-08-08 16:58:30 UTC (rev 17217) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-08-08 18:59:56 UTC (rev 17218) @@ -287,14 +287,18 @@ /* * This command (in first) was not found in the command table * - * first - first word on command line - * rest - rest of command line + * Full - whole command line + * First - first word on command line + * Rest - rest of command line */ static VOID -Execute (LPTSTR full, LPTSTR first, LPTSTR rest) +Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest) { TCHAR szFullName[MAX_PATH]; + TCHAR first[MAX_PATH]; + TCHAR rest[MAX_PATH]; + TCHAR full[MAX_PATH]; #ifndef __REACTOS__ TCHAR szWindowTitle[MAX_PATH]; #endif @@ -304,6 +308,51 @@ DebugPrintf (_T("Execute: \'%s\' \'%s\'\n"), first, rest); #endif + /* Though it was already parsed once, we have a different set of rules + for parsing before we pass to CreateProccess */ + if(!_tcschr(Full,_T('\"'))) + { + _tcscpy(first,First); + _tcscpy(rest,Rest); + _tcscpy(full,Full); + } + else + { + INT i = 0; + BOOL bInside = FALSE; + rest[0] = _T('\0'); + full[0] = _T('\0'); + first[0] = _T('\0'); + _tcscpy(first,Full); + /* find the end of the command and start of the args */ + for(i = 0; i < _tcslen(first); i++) + { + if(!_tcsncmp(&first[i], _T("\""), 1)) + bInside = !bInside; + if(!_tcsncmp(&first[i], _T(" "), 1) && !bInside) + { + _tcscpy(rest,&first[i]); + first[i] = _T('\0'); + break; + } + + } + i = 0; + /* remove any slashes */ + while(i < _tcslen(first)) + { + if(!_tcsncmp (&first[i], _T("\""), 1)) + memcpy(&first[i],&first[i + 1], _tcslen(&first[i])); + else + i++; + } + /* Drop quotes around it just in case there is a space */ + _tcscpy(full,_T("\"")); + _tcscat(full,first); + _tcscat(full,_T("\" ")); + _tcscat(full,rest); + } + /* check for a drive change */ if ((_istalpha (first[0])) && (!_tcscmp (first + 1, _T(":")))) {

19 years, 1 month

[weiden] 17217: revert my last changes back to Alex's version of ObpCaptureObjectAttributes as I'm being an incompetent ass. This will introduce several vulnerabilities and bugs again.

by weiden＠svn.reactos.com

revert my last changes back to Alex's version of ObpCaptureObjectAttributes as I'm being an incompetent ass. This will introduce several vulnerabilities and bugs again. 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 16:57:50 UTC (rev 17216) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-08-08 16:58:30 UTC (rev 17217) @@ -192,19 +192,20 @@ 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, - PreviousMode, - PagedPool, - FALSE, + KeGetPreviousMode(), + CmiKeyType, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -218,10 +219,8 @@ (PVOID*)&Object, &RemainingPath, CmiKeyType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo, - &ObjectName, - PreviousMode, - FALSE); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) { DPRINT("CmpFindObject failed, Status: 0x%x\n", Status); @@ -1170,8 +1169,7 @@ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, PreviousMode, - PagedPool, - FALSE, + CmiKeyType, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -1187,10 +1185,8 @@ (PVOID*)&Object, &RemainingPath, CmiKeyType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo, - &ObjectName, - PreviousMode, - FALSE); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); 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 16:57:50 UTC (rev 17216) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-08-08 16:58:30 UTC (rev 17217) @@ -705,8 +705,7 @@ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(KeyObjectAttributes, KernelMode, - PagedPool, - FALSE, + CmiKeyType, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -720,10 +719,8 @@ (PVOID*)&ParentKey, &RemainingPath, CmiKeyType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo, - &ObjectName, - KernelMode, - FALSE); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) { return Status; _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-08-08 16:57:50 UTC (rev 17216) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-08-08 16:58:30 UTC (rev 17217) @@ -173,6 +173,14 @@ /* 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, @@ -181,19 +189,16 @@ NTSTATUS STDCALL -ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, +ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, IN KPROCESSOR_MODE AccessMode, - IN POOL_TYPE PoolType, - IN BOOLEAN CaptureIfKernel, - OUT POBJECT_CREATE_INFORMATION CapturedObjectAttributes OPTIONAL, - OUT PUNICODE_STRING ObjectName OPTIONAL); + IN POBJECT_TYPE ObjectType, + IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, + OUT PUNICODE_STRING ObjectName); VOID STDCALL -ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION CapturedObjectAttributes OPTIONAL, - IN PUNICODE_STRING ObjectName OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN BOOLEAN CaptureIfKernel); +ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo); + /* object information classes */ #define ICIF_QUERY 0x1 _____ Modified: trunk/reactos/ntoskrnl/lpc/connect.c --- trunk/reactos/ntoskrnl/lpc/connect.c 2005-08-08 16:57:50 UTC (rev 17216) +++ trunk/reactos/ntoskrnl/lpc/connect.c 2005-08-08 16:58:30 UTC (rev 17217) @@ -410,7 +410,7 @@ NULL, PORT_ALL_ACCESS, /* DesiredAccess */ LpcPortObjectType, - PreviousMode, + UserMode, NULL, (PVOID*)&NamedPort); if (!NT_SUCCESS(Status)) @@ -430,7 +430,7 @@ Status = ObReferenceObjectByHandle(WriteMap.SectionHandle, SECTION_MAP_READ | SECTION_MAP_WRITE, MmSectionObjectType, - PreviousMode, + UserMode, (PVOID*)&SectionObject, NULL); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-08-08 16:57:50 UTC (rev 17216) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-08-08 16:58:30 UTC (rev 17217) @@ -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,10 +1132,7 @@ /* We can delete the Create Info now */ Header->ObjectCreateInfo = NULL; - ObpReleaseCapturedAttributes(ObjectCreateInfo, - NULL, - ObjectCreateInfo->ProbeMode, - FALSE); + ObpReleaseCapturedAttributes(ObjectCreateInfo); ExFreePool(ObjectCreateInfo); DPRINT("Status %x\n", Status); _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-08-08 16:57:50 UTC (rev 17216) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-08-08 16:58:30 UTC (rev 17217) @@ -70,35 +70,20 @@ 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, - &ObjectName, + ObjectPath, Attributes | OBJ_OPENIF, NULL, NULL); - /* "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 */ + /* Capture all the info */ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(&ObjectAttributes, - KernelMode, /* raw copy! */ - NonPagedPool, - FALSE, + AccessMode, + ObjectType, &ObjectCreateInfo, - NULL); + &ObjectName); if (!NT_SUCCESS(Status)) { DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); @@ -111,19 +96,9 @@ &RemainingPath, ObjectType); - /* we don't need to release the "captured" object attributes! Nothing was allocated! */ -#if 0 - ObpReleaseCapturedAttributes(&ObjectCreateInfo, - NULL, - AccessMode, - FALSE); -#endif + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); - /* free the captured ObjectPath if needed */ - RtlReleaseCapturedUnicodeString(&ObjectName, - AccessMode, - FALSE); - if (!NT_SUCCESS(Status)) { return(Status); @@ -194,8 +169,7 @@ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, AccessMode, - PagedPool, - FALSE, + ObjectType, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) @@ -209,10 +183,8 @@ &Object, &RemainingPath, ObjectType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo, - &ObjectName, - AccessMode, - FALSE); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); 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 16:57:50 UTC (rev 17216) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-08-08 16:58:30 UTC (rev 17217) @@ -110,297 +110,162 @@ NTSTATUS STDCALL -ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, +ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, IN KPROCESSOR_MODE AccessMode, - IN POOL_TYPE PoolType, - IN BOOLEAN CaptureIfKernel, - OUT POBJECT_CREATE_INFORMATION CapturedObjectAttributes OPTIONAL, - OUT PUNICODE_STRING ObjectName OPTIONAL) + IN POBJECT_TYPE ObjectType, + IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, + OUT PUNICODE_STRING ObjectName) { - OBJECT_ATTRIBUTES AttributesCopy; NTSTATUS Status = STATUS_SUCCESS; + PSECURITY_DESCRIPTOR SecurityDescriptor; + PSECURITY_QUALITY_OF_SERVICE SecurityQos; + PUNICODE_STRING LocalObjectName = NULL; - /* at least one output parameter must be != NULL! */ - ASSERT(CapturedObjectAttributes != NULL || ObjectName != NULL); - - if (ObjectAttributes == NULL) + /* Zero out the Capture Data */ + DPRINT("ObpCaptureObjectAttributes\n"); + RtlZeroMemory(ObjectCreateInfo, sizeof(OBJECT_CREATE_INFORMATION)); + + /* Check if we got Oba */ + if (ObjectAttributes) { - /* we're going to return STATUS_SUCCESS! */ - goto failbasiccleanup; - } - - if (AccessMode != KernelMode) - { - _SEH_TRY + if (AccessMode != KernelMode) { - 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); - goto failbasiccleanup; - } - } - else if (!CaptureIfKernel) - { - if (ObjectAttributes->Length == sizeof(OBJECT_ATTRIBUTES)) - { - if (ObjectName != NULL) + DPRINT("Probing OBA\n"); + _SEH_TRY { - /* 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; - } + /* FIXME: SMSS SENDS BULLSHIT. */ + #if 0 + ProbeForRead(ObjectAttributes, + sizeof(ObjectAttributes), + sizeof(ULONG)); + #endif } - if (CapturedObjectAttributes != NULL) + _SEH_HANDLE { - CapturedObjectAttributes->RootDirectory = ObjectAttributes->RootDirectory; - CapturedObjectAttributes->Attributes = ObjectAttributes->Attributes; - CapturedObjectAttributes->SecurityDescriptor = ObjectAttributes->SecurityDescriptor; - CapturedObjectAttributes->SecurityDescriptorCharge = 0; /* FIXME */ - CapturedObjectAttributes->ProbeMode = AccessMode; + Status = _SEH_GetExceptionCode(); } - - return STATUS_SUCCESS; + _SEH_END; } - else + + /* Validate the Size */ + DPRINT("Validating OBA\n"); + if (ObjectAttributes->Length != sizeof(OBJECT_ATTRIBUTES)) { Status = STATUS_INVALID_PARAMETER; - goto failbasiccleanup; } - } - else - { - AttributesCopy = *ObjectAttributes; - } - /* 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) + /* Fail if SEH or Size Validation failed */ + if(!NT_SUCCESS(Status)) { - Status = SeCaptureSecurityDescriptor(AttributesCopy.SecurityDescriptor, + 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, AccessMode, - PoolType, + NonPagedPool, TRUE, - &CapturedObjectAttributes->SecurityDescriptor); - if (!NT_SUCCESS(Status)) + &ObjectCreateInfo->SecurityDescriptor); + if(!NT_SUCCESS(Status)) { DPRINT1("Unable to capture the security descriptor!!!\n"); - goto failbasiccleanup; + ObjectCreateInfo->SecurityDescriptor = NULL; + goto fail; } - CapturedObjectAttributes->SecurityDescriptorCharge = 0; /* FIXME */ + + DPRINT("Probe done\n"); + ObjectCreateInfo->SecurityDescriptorCharge = 0; /* FIXME */ + ObjectCreateInfo->ProbeMode = AccessMode; } - else + + /* Validate the QoS */ + if (SecurityQos) { - 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 { - /* probe the ObjectName structure and make a local stack copy of it */ - ProbeForRead(AttributesCopy.ObjectName, - sizeof(UNICODE_STRING), + ProbeForRead(SecurityQos, + sizeof(SECURITY_QUALITY_OF_SERVICE), 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 (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; - } + if(!NT_SUCCESS(Status)) + { + DPRINT1("Unable to capture QoS!!!\n"); + goto fail; } + + ObjectCreateInfo->SecurityQualityOfService = *SecurityQos; + ObjectCreateInfo->SecurityQos = &ObjectCreateInfo->SecurityQualityOfService; } - else + } + + /* 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) { - ObjectName->Length = ObjectName->MaximumLength = 0; + DPRINT1("Invalid name\n"); + Status = STATUS_OBJECT_NAME_INVALID; } } - CapturedObjectAttributes->ProbeMode = AccessMode; - +fail: if (!NT_SUCCESS(Status)) { - if (ObjectName != NULL && 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)); - } + DPRINT1("Failed to capture, cleaning up\n"); + ObpReleaseCapturedAttributes(ObjectCreateInfo); } - + + DPRINT("Return to caller\n"); return Status; } VOID STDCALL -ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION CapturedObjectAttributes OPTIONAL, - IN PUNICODE_STRING ObjectName OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN BOOLEAN CaptureIfKernel) +ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) { - /* 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) + /* Release the SD, it's the only thing we allocated */ + if (ObjectCreateInfo->SecurityDescriptor) { - ExFreePool(CapturedObjectAttributes->SecurityDescriptor); - -#ifdef DBG - RtlZeroMemory(CapturedObjectAttributes, sizeof(OBJECT_CREATE_INFORMATION)); -#endif + SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, + ObjectCreateInfo->ProbeMode, + TRUE); + ObjectCreateInfo->SecurityDescriptor = NULL; } - if(ObjectName != NULL && - ObjectName->Length > 0) - { - ExFreePool(ObjectName->Buffer); - } - } } @@ -483,7 +348,7 @@ ObjectName->Buffer[0] != L'\\') { ObDereferenceObject (CurrentObject); - DPRINT1("failed: \"%wZ\"\n", ObjectName); + DPRINT1("failed\n"); return STATUS_UNSUCCESSFUL; } @@ -930,9 +795,8 @@ /* Capture all the info */ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, - ObjectAttributesAccessMode, - NonPagedPool, - TRUE, + AccessMode, + Type, ObjectCreateInfo, &ObjectName); @@ -958,10 +822,8 @@ /* Release the Capture Info, we don't need it */ DPRINT1("Allocation failed\n"); - ObpReleaseCapturedAttributes(ObjectCreateInfo, - &ObjectName, - ObjectAttributesAccessMode, - TRUE); + ObpReleaseCapturedAttributes(ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); } /* We failed, so release the Buffer */ @@ -1115,10 +977,7 @@ } if (Header->ObjectCreateInfo) { - ObpReleaseCapturedAttributes(Header->ObjectCreateInfo, - NULL, - Header->ObjectCreateInfo->ProbeMode, - FALSE); + ObpReleaseCapturedAttributes(Header->ObjectCreateInfo); ExFreePool(Header->ObjectCreateInfo); }

19 years, 1 month

[amunger] 17216: Merge bug 659 fix into 0.2.7 branch.

by amunger＠svn.reactos.com

Merge bug 659 fix into 0.2.7 branch. Modified: branches/ros-branch-0_2_7/reactos/lib/user32/resources/oic_reactos.ico _____ Modified: branches/ros-branch-0_2_7/reactos/lib/user32/resources/oic_reactos.ico (Binary files differ)

19 years, 1 month

[greatlrd] 17215: fix a simple bug that I did intrudes with my last commit

by greatlrd＠svn.reactos.com

fix a simple bug that I did intrudes with my last commit Modified: trunk/reactos/lib/ddraw/main.c _____ Modified: trunk/reactos/lib/ddraw/main.c --- trunk/reactos/lib/ddraw/main.c 2005-08-08 16:21:35 UTC (rev 17214) +++ trunk/reactos/lib/ddraw/main.c 2005-08-08 16:36:39 UTC (rev 17215) @@ -30,32 +30,32 @@ HRESULT WINAPI DirectDrawCreate (LPGUID lpGUID, LPDIRECTDRAW* lplpDD, LPUNKNOWN pUnkOuter) { - /* check see if pUnkOuter is null or not */ - if (!pUnkOuter) + 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) + 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 Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, pUnkOuter, TRUE); }

19 years, 1 month

[hpoussin] 17214: I forgot to add SetupDiDeleteDeviceInfo to .spec file in rev 17212

by hpoussin＠svn.reactos.com

I forgot to add SetupDiDeleteDeviceInfo to .spec file in rev 17212 Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-08-08 16:18:44 UTC (rev 17213) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-08-08 16:21:35 UTC (rev 17214) @@ -288,7 +288,7 @@ @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr) @ stdcall SetupDiCreateDeviceInfoListExW(ptr long wstr ptr) @ stub SetupDiDeleteDevRegKey -@ stub SetupDiDeleteDeviceInfo +@ stdcall SetupDiDeleteDeviceInfo(long ptr) @ stub SetupDiDeleteDeviceInterfaceData @ stub SetupDiDeleteDeviceRegKey @ stub SetupDiDestroyClassImageList

19 years, 1 month

[mbosma] 17213: Fix another bug thanks to GreatLord.

by mbosma＠svn.reactos.com

Fix another bug thanks to GreatLord. Modified: trunk/reactos/lib/ddraw/main/ddraw.c _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-08-08 16:09:48 UTC (rev 17212) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-08-08 16:18:44 UTC (rev 17213) @@ -24,7 +24,7 @@ This->lpGUID = lpGUID; // get the HDC - This->hdc = CreateDC (L"Display", NULL, NULL, NULL); + This->hdc = GetWindowDC(GetDesktopWindow()); This->Height = GetDeviceCaps(This->hdc, HORZRES); This->Width = GetDeviceCaps(This->hdc, VERTRES); This->Bpp = GetDeviceCaps(This->hdc, BITSPIXEL);

19 years, 1 month

[hpoussin] 17212: Implement SetupDiBuildDriverInfoList, SetupDiOpenDeviceInfoA/W, SetupDiEnumDriverInfoA/W, SetupDiCreateDeviceInfoW

by hpoussin＠svn.reactos.com

Implement SetupDiBuildDriverInfoList, SetupDiOpenDeviceInfoA/W, SetupDiEnumDriverInfoA/W, SetupDiCreateDeviceInfoW Add stubs for SetupDiDeleteDeviceInfo, SetupDiDestroyDriverInfoList Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-08-08 16:08:30 UTC (rev 17211) +++ trunk/reactos/lib/setupapi/devinst.c 2005-08-08 16:09:48 UTC (rev 17212) @@ -2787,8 +2787,904 @@ DWORD CreationFlags, PSP_DEVINFO_DATA DeviceInfoData) { - FIXME("%p %s %s %s %p %lx %p\n", DeviceInfoSet, debugstr_w(DeviceName), - debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), hwndParent, - CreationFlags, DeviceInfoData); + struct DeviceInfoSet *list; + BOOL ret = FALSE; + + TRACE("%p %S %s %S %p %lx %p\n", DeviceInfoSet, DeviceName, + debugstr_guid(ClassGuid), DeviceDescription, + hwndParent, CreationFlags, DeviceInfoData); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!ClassGuid) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!IsEqualIID(&list->ClassGuid, &GUID_NULL) && !IsEqualIID(&list->ClassGuid, ClassGuid)) + SetLastError(ERROR_CLASS_MISMATCH); + else if (CreationFlags & ~(DICD_GENERATE_ID | DICD_INHERIT_CLASSDRVS)) + { + TRACE("Unknown flags: 0x%08lx\n", CreationFlags & ~(DICD_GENERATE_ID | DICD_INHERIT_CLASSDRVS)); + SetLastError(ERROR_INVALID_PARAMETER); + } + else + { + SP_DEVINFO_DATA DevInfo; + + if (CreationFlags & DICD_GENERATE_ID) + { + /* Generate a new unique ID for this device */ + SetLastError(ERROR_GEN_FAILURE); + FIXME("not implemented\n"); + } + else + { + /* Device name is fully qualified. Try to open it */ + BOOL rc; + + DevInfo.cbSize = sizeof(SP_DEVINFO_DATA); + rc = SetupDiOpenDeviceInfoW( + DeviceInfoSet, + DeviceName, + NULL, /* hwndParent */ + CreationFlags & DICD_INHERIT_CLASSDRVS ? DIOD_INHERIT_CLASSDRVS : 0, + &DevInfo); + + if (rc) + { + /* SetupDiOpenDeviceInfoW has already added + * the device info to the device info set + */ + SetLastError(ERROR_DEVINST_ALREADY_EXISTS); + } + else if (GetLastError() == ERROR_FILE_NOT_FOUND) + { + struct DeviceInfoElement *deviceInfo; + + deviceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfoElement) + (wcslen(DeviceName) + 1) * sizeof(WCHAR)); + if (!deviceInfo) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + /* Fill members of the new structure */ + wcscpy(deviceInfo->Data, DeviceName); + deviceInfo->DeviceName = deviceInfo->Data; + deviceInfo->UniqueId = wcsrchr(deviceInfo->Data, '\\'); + deviceInfo->DeviceDescription = NULL; + //FIXME memcpy(&deviceInfo->ClassGuid, pClassGuid, sizeof(GUID)); + deviceInfo->CreationFlags = 0; + deviceInfo->hwndParent = hwndParent; + deviceInfo->Flags = 0; /* FIXME */ + deviceInfo->FlagsEx = 0; /* FIXME */ + InitializeListHead(&deviceInfo->DriverListHead); + InitializeListHead(&deviceInfo->InterfaceHead); + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); + + if (!DeviceInfoData) + ret = TRUE; + else + { + if (DeviceInfoData->cbSize != sizeof(PSP_DEVINFO_DATA)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + } + else + { + memcpy(&DeviceInfoData->ClassGuid, ClassGuid, sizeof(GUID)); + DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->Reserved = (ULONG_PTR)deviceInfo; + ret = TRUE; + } + } + } + } + } + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * + * Helper functions for SetupDiBuildDriverInfoList + */ +static BOOL +AddDriverToList( + IN PLIST_ENTRY DriverListHead, + IN DWORD DriverType, /* SPDIT_CLASSDRIVER or SPDIT_COMPATDRIVER */ + IN INFCONTEXT ContextDevice, + IN LPCWSTR InfFile, + IN LPCWSTR ProviderName, + IN LPCWSTR ManufacturerName, + FILETIME DriverDate, + DWORDLONG DriverVersion, + IN DWORD Rank, + IN DWORD SubRank) +{ + struct DriverInfoElement *driverInfo; + DWORD RequiredSize = 128; /* Initial buffer size */ + BOOL Result = FALSE; + LPWSTR DeviceDescription = NULL; + LPWSTR InfInstallSection = NULL; + + driverInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DriverInfoElement)); + if (!driverInfo) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + SetLastError(ERROR_INSUFFICIENT_BUFFER); + while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + HeapFree(GetProcessHeap(), 0, DeviceDescription); + DeviceDescription = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!DeviceDescription) + return FALSE; + Result = SetupGetStringFieldW( + &ContextDevice, + 0, /* Field index */ + DeviceDescription, RequiredSize, + &RequiredSize); + } + if (!Result) + { + HeapFree(GetProcessHeap(), 0, driverInfo); + HeapFree(GetProcessHeap(), 0, DeviceDescription); + return FALSE; + } + + Result = FALSE; + RequiredSize = 128; /* Initial buffer size */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + HeapFree(GetProcessHeap(), 0, InfInstallSection); + InfInstallSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!InfInstallSection) + { + HeapFree(GetProcessHeap(), 0, driverInfo); + HeapFree(GetProcessHeap(), 0, DeviceDescription); + return FALSE; + } + Result = SetupGetStringFieldW( + &ContextDevice, + 1, /* Field index */ + InfInstallSection, RequiredSize, + &RequiredSize); + } + if (!Result) + { + HeapFree(GetProcessHeap(), 0, driverInfo); + HeapFree(GetProcessHeap(), 0, DeviceDescription); + HeapFree(GetProcessHeap(), 0, InfInstallSection); + return FALSE; + } + + TRACE("Adding driver '%S' [%S/%S]\n", DeviceDescription, InfFile, InfInstallSection); + + driverInfo->Info.DriverType = DriverType; + driverInfo->Info.Reserved = (ULONG_PTR)driverInfo; + wcsncpy(driverInfo->Info.Description, DeviceDescription, LINE_LEN - 1); + driverInfo->Info.Description[LINE_LEN - 1] = '\0'; + wcsncpy(driverInfo->Info.MfgName, ManufacturerName, LINE_LEN - 1); + driverInfo->Info.MfgName[LINE_LEN - 1] = '\0'; + if (ProviderName) + { + wcsncpy(driverInfo->Info.ProviderName, ProviderName, LINE_LEN - 1); + driverInfo->Info.ProviderName[LINE_LEN - 1] = '\0'; + } + else + driverInfo->Info.ProviderName[0] = '\0'; + driverInfo->Info.DriverDate = DriverDate; + driverInfo->Info.DriverVersion = DriverVersion; + InsertTailList(DriverListHead, &driverInfo->ListEntry); + + HeapFree(GetProcessHeap(), 0, DeviceDescription); + HeapFree(GetProcessHeap(), 0, InfInstallSection); + return TRUE; +} + +static BOOL +GetVersionInformationFromInfFile( + IN HINF hInf, + OUT LPGUID ClassGuid, + OUT LPWSTR* pProviderName, + OUT FILETIME* DriverDate, + OUT DWORDLONG* DriverVersion) +{ + DWORD RequiredSize; + WCHAR guidW[MAX_GUID_STRING_LEN + 1]; + LPWSTR ProviderName = NULL; + BOOL Result; + + if (!SetupGetLineTextW( + NULL, /* Context */ + hInf, + L"Version", L"ClassGUID", + guidW, sizeof(guidW), + NULL /* Required size */)) + { + return FALSE; + } + + /* Get Provider name, driver date, and driver version */ + + guidW[37] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&guidW[1], ClassGuid) != RPC_S_OK) + { + return FALSE; + } + Result = SetupGetLineTextW( + NULL, /* Context */ + hInf, L"Version", L"Provider", + NULL, 0, + &RequiredSize); + if (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + ProviderName = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!ProviderName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + Result = SetupGetLineTextW( + NULL, /* Context */ + hInf, L"Version", L"Provider", + ProviderName, RequiredSize, + &RequiredSize); + } + //FIXME: DriverDate = Version.DriverVer => invalid date = 00/00/00 + //FIXME: DriverVersion = Version.DriverVer => invalid = 0 + + *pProviderName = ProviderName; + return TRUE; +} + +/********************************************************************** * + * SetupDiBuildDriverInfoList (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiBuildDriverInfoList( + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN DWORD DriverType) +{ + struct DeviceInfoSet *list; + PVOID Buffer = NULL; + HINF hInf = INVALID_HANDLE_VALUE; + LPWSTR ProviderName = NULL; + LPWSTR ManufacturerName = NULL; + LPWSTR ManufacturerSection = NULL; + LPWSTR HardwareIDs = NULL; + LPWSTR CompatibleIDs = NULL; + FILETIME DriverDate; + DWORDLONG DriverVersion; + DWORD RequiredSize; + BOOL ret = FALSE; + + TRACE("%p %p %ld\n", DeviceInfoSet, DeviceInfoData, DriverType); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (list->HKLM != HKEY_LOCAL_MACHINE) + SetLastError(ERROR_INVALID_HANDLE); + else if (DriverType != SPDIT_CLASSDRIVER && DriverType != SPDIT_COMPATDRIVER) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DriverType == SPDIT_CLASSDRIVER && DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DriverType == SPDIT_COMPATDRIVER && !DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + BOOL Result = FALSE; + + if (DriverType == SPDIT_COMPATDRIVER) + { + /* Get hardware IDs list */ + Result = FALSE; + RequiredSize = 512; /* Initial buffer size */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + HeapFree(GetProcessHeap(), 0, HardwareIDs); + HardwareIDs = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!HardwareIDs) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto done; + } + Result = SetupDiGetDeviceRegistryPropertyW( + DeviceInfoSet, + DeviceInfoData, + SPDRP_HARDWAREID, + NULL, + (PBYTE)HardwareIDs, + RequiredSize, + &RequiredSize); + } + if (!Result) + goto done; + + /* Get compatible IDs list */ + Result = FALSE; + RequiredSize = 512; /* Initial buffer size */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + HeapFree(GetProcessHeap(), 0, CompatibleIDs); + CompatibleIDs = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!CompatibleIDs) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto done; + } + Result = SetupDiGetDeviceRegistryPropertyW( + DeviceInfoSet, + DeviceInfoData, + SPDRP_COMPATIBLEIDS, + NULL, + (PBYTE)CompatibleIDs, + RequiredSize, + &RequiredSize); + if (!Result && GetLastError() == ERROR_FILE_NOT_FOUND) + { + /* No compatible ID for this device */ + HeapFree(GetProcessHeap(), 0, CompatibleIDs); + CompatibleIDs = NULL; + Result = TRUE; + } + } + if (!Result) + goto done; + } + + /* Enumerate .inf files */ + Result = FALSE; + RequiredSize = 32768; /* Initial buffer size */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + HeapFree(GetProcessHeap(), 0, Buffer); + Buffer = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!Buffer) + { + Result = FALSE; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + break; + } + Result = SetupGetInfFileListW( + NULL, /* Directory path */ + INF_STYLE_WIN4, + Buffer, RequiredSize, + &RequiredSize); + } + if (Result) + { + LPCWSTR filename; + for (filename = (LPCWSTR)Buffer; *filename; filename += wcslen(filename) + 1) + { + INFCONTEXT ContextManufacturer, ContextDevice; + GUID ClassGuid; + TRACE("Opening file %S\n", filename); + + hInf = SetupOpenInfFileW(filename, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + continue; + + if (!GetVersionInformationFromInfFile( + hInf, + &ClassGuid, + &ProviderName, + &DriverDate, + &DriverVersion)) + { + SetupCloseInfFile(hInf); + hInf = INVALID_HANDLE_VALUE; + continue; + } + + if (DriverType == SPDIT_CLASSDRIVER) + { + /* Check if the ClassGuid in this .inf file is corresponding with our needs */ + if (!IsEqualIID(&list->ClassGuid, &GUID_NULL) && !IsEqualIID(&list->ClassGuid, &ClassGuid)) + { + SetupCloseInfFile(hInf); + hInf = INVALID_HANDLE_VALUE; + continue; + } + } + + /* Get the manufacturers list */ + Result = SetupFindFirstLineW(hInf, L"Manufacturer", NULL, &ContextManufacturer); + while (Result) + { + Result = SetupGetStringFieldW( + &ContextManufacturer, + 0, /* Field index */ + NULL, 0, + &RequiredSize); + if (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + ManufacturerName = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!ManufacturerName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto done; + } + Result = SetupGetStringFieldW( + &ContextManufacturer, + 0, /* Field index */ + ManufacturerName, RequiredSize, + &RequiredSize); + } + Result = SetupGetStringFieldW( + &ContextManufacturer, + 1, /* Field index */ + NULL, 0, + &RequiredSize); + if (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + ManufacturerSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!ManufacturerSection) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto done; + } + Result = SetupGetStringFieldW( + &ContextManufacturer, + 1, /* Field index */ + ManufacturerSection, RequiredSize, + &RequiredSize); + } + + TRACE("Enumerating devices in manufacturer %S\n", ManufacturerSection); + Result = SetupFindFirstLineW(hInf, ManufacturerSection, NULL, &ContextDevice); + while (Result) + { + if (DriverType == SPDIT_CLASSDRIVER) + { + /* FIXME: read [ControlFlags] / ExcludeFromSelect */ + if (!AddDriverToList( + &list->DriverListHead, + DriverType, + ContextDevice, + filename, + ProviderName, + ManufacturerName, + DriverDate, DriverVersion, + 0, 0)) + { + break; + } + } + else /* DriverType = SPDIT_COMPATDRIVER */ + { + /* 1. Get all fields */ + DWORD FieldCount = SetupGetFieldCount(&ContextDevice); + DWORD DriverRank; + DWORD i; + LPCWSTR currentId; + BOOL DriverAlreadyAdded; + + for (i = 2; i <= FieldCount; i++) + { + LPWSTR DeviceId = NULL; + Result = FALSE; + RequiredSize = 128; /* Initial buffer size */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + HeapFree(GetProcessHeap(), 0, DeviceId); + DeviceId = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!DeviceId) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto done; + } + Result = SetupGetStringFieldW( + &ContextDevice, + i, + DeviceId, RequiredSize, + &RequiredSize); + } + if (!Result) + { + HeapFree(GetProcessHeap(), 0, DeviceId); + goto done; + } + DriverRank = 0; + DriverAlreadyAdded = FALSE; + for (currentId = (LPCWSTR)HardwareIDs; !DriverAlreadyAdded && *currentId; currentId += wcslen(currentId) + 1, DriverRank++) + { + if (wcscmp(DeviceId, currentId) == 0) + { + AddDriverToList( + &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->DriverListHead, + DriverType, + ContextDevice, + filename, + ProviderName, + ManufacturerName, + DriverDate, DriverVersion, + DriverRank, i); + DriverAlreadyAdded = TRUE; + } + } + if (CompatibleIDs) + { + for (currentId = (LPCWSTR)CompatibleIDs; !DriverAlreadyAdded && *currentId; currentId += wcslen(currentId) + 1, DriverRank++) + { + if (wcscmp(DeviceId, currentId) == 0) + { + AddDriverToList( + &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->DriverListHead, + DriverType, + ContextDevice, + filename, + ProviderName, + ManufacturerName, + DriverDate, DriverVersion, + DriverRank, i); + DriverAlreadyAdded = TRUE; + } + } + } + HeapFree(GetProcessHeap(), 0, DeviceId); + } + } + Result = SetupFindNextLine(&ContextDevice, &ContextDevice); + } + + HeapFree(GetProcessHeap(), 0, ManufacturerName); + HeapFree(GetProcessHeap(), 0, ManufacturerSection); + ManufacturerName = ManufacturerSection = NULL; + Result = SetupFindNextLine(&ContextManufacturer, &ContextManufacturer); + } + HeapFree(GetProcessHeap(), 0, ProviderName); + ProviderName = NULL; + ret = TRUE; + + SetupCloseInfFile(hInf); + hInf = INVALID_HANDLE_VALUE; + } + ret = TRUE; + } + } + +done: + HeapFree(GetProcessHeap(), 0, ProviderName); + HeapFree(GetProcessHeap(), 0, ManufacturerName); + HeapFree(GetProcessHeap(), 0, ManufacturerSection); + HeapFree(GetProcessHeap(), 0, HardwareIDs); + HeapFree(GetProcessHeap(), 0, CompatibleIDs); + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + HeapFree(GetProcessHeap(), 0, Buffer); + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * + * SetupDiDeleteDeviceInfo (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiDeleteDeviceInfo( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + FIXME("not implemented\n"); + SetLastError(ERROR_GEN_FAILURE); return FALSE; } + + +/********************************************************************** * + * SetupDiDestroyDriverInfoList (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiDestroyDriverInfoList( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + IN DWORD DriverType) +{ + TRACE("%p %p 0x%lx\n", DeviceInfoSet, DeviceInfoData, DriverType); + + FIXME("not implemented\n"); + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + + +/********************************************************************** * + * SetupDiOpenDeviceInfoA (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiOpenDeviceInfoA( + IN HDEVINFO DeviceInfoSet, + IN PCSTR DeviceInstanceId, + IN HWND hwndParent OPTIONAL, + IN DWORD OpenFlags, + OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + LPWSTR DeviceInstanceIdW = NULL; + BOOL bResult; + + TRACE("%p %s %p %lx %p\n", DeviceInfoSet, DeviceInstanceId, hwndParent, OpenFlags, DeviceInfoData); + + DeviceInstanceIdW = MultiByteToUnicode(DeviceInstanceId, CP_ACP); + if (DeviceInstanceIdW == NULL) + return FALSE; + + bResult = SetupDiOpenDeviceInfoW(DeviceInfoSet, + DeviceInstanceIdW, hwndParent, OpenFlags, DeviceInfoData); + + MyFree(DeviceInstanceIdW); + + return bResult; +} + + +/********************************************************************** * + * SetupDiOpenDeviceInfoW (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiOpenDeviceInfoW( + IN HDEVINFO DeviceInfoSet, + IN PCWSTR DeviceInstanceId, + IN HWND hwndParent OPTIONAL, + IN DWORD OpenFlags, + OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + struct DeviceInfoSet *list; + HKEY hEnumKey, hKey; + DWORD rc; + BOOL ret = FALSE; + + TRACE("%p %S %p %lx %p\n", DeviceInfoSet, DeviceInstanceId, hwndParent, OpenFlags, DeviceInfoData); + + if (OpenFlags & DIOD_CANCEL_REMOVE) + FIXME("DIOD_CANCEL_REMOVE flag not implemented\n"); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!DeviceInstanceId) + SetLastError(ERROR_INVALID_PARAMETER); + else if (OpenFlags & ~(DIOD_CANCEL_REMOVE | DIOD_INHERIT_CLASSDRVS)) + { + TRACE("Unknown flags: 0x%08lx\n", OpenFlags & ~(DIOD_CANCEL_REMOVE | DIOD_INHERIT_CLASSDRVS)); + SetLastError(ERROR_INVALID_PARAMETER); + } + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + struct DeviceInfoElement *deviceInfo = NULL; + /* Search if device already exists in DeviceInfoSet. + * If yes, return the existing element + * If no, create a new element using informations in registry + */ + PLIST_ENTRY ItemList = list->ListHead.Flink; + while (ItemList != &list->ListHead) + { + // TODO + //if (good one) + // break; + FIXME("not implemented\n"); + ItemList = ItemList->Flink; + } + + if (deviceInfo) + { + // good one found + if (DeviceInfoData) + { + memcpy(&DeviceInfoData->ClassGuid, &deviceInfo->ClassGuid, sizeof(GUID)); + DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->Reserved = (ULONG_PTR)deviceInfo; + } + ret = TRUE; + } + else + { + /* Open supposed registry key */ + rc = RegOpenKeyExW( + list->HKLM, + EnumKeyName, + 0, /* Options */ + KEY_ENUMERATE_SUB_KEYS, + &hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + return FALSE; + } + rc = RegOpenKeyExW( + hEnumKey, + DeviceInstanceId, + 0, /* Options */ + KEY_QUERY_VALUE, + &hKey); + RegCloseKey(hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + return FALSE; + } + + deviceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfoElement) + (wcslen(DeviceInstanceId) + 1) * sizeof(WCHAR)); + if (!deviceInfo) + { + RegCloseKey(hKey); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + wcscpy(deviceInfo->Data, DeviceInstanceId); + deviceInfo->DeviceName = deviceInfo->Data; + //FIXME deviceInfo->UniqueId = &deviceInfo->Data[pEndOfInstancePath - InstancePath + 1]; + deviceInfo->DeviceDescription = NULL; + //FIXME memcpy(&deviceInfo->ClassGuid, FIXME, sizeof(GUID)); + deviceInfo->CreationFlags = 0; + deviceInfo->hwndParent = hwndParent; + deviceInfo->Flags = 0; /* FIXME */ + deviceInfo->FlagsEx = 0; /* FIXME */ + InitializeListHead(&deviceInfo->DriverListHead); + InitializeListHead(&deviceInfo->InterfaceHead); + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); + + RegCloseKey(hKey); + ret = TRUE; + } + + if (ret && deviceInfo && DeviceInfoData) + { + memcpy(&DeviceInfoData->ClassGuid, &deviceInfo->ClassGuid, sizeof(GUID)); + DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->Reserved = (ULONG_PTR)deviceInfo; + } + } + + return ret; +} + + +/********************************************************************** * + * SetupDiEnumDriverInfoA (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiEnumDriverInfoA( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN DWORD DriverType, + IN DWORD MemberIndex, + OUT PSP_DRVINFO_DATA_A DriverInfoData) +{ + SP_DRVINFO_DATA_V2_W driverInfoData2W; + BOOL ret = FALSE; + + TRACE("%p %p 0x%lx %ld %p\n", DeviceInfoSet, DeviceInfoData, + DriverType, MemberIndex, DriverInfoData); + + if (DriverInfoData == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V1_A) && DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V2_A)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + driverInfoData2W.cbSize = sizeof(SP_DRVINFO_DATA_V2_W); + ret = SetupDiEnumDriverInfoW(DeviceInfoSet, DeviceInfoData, + DriverType, MemberIndex, &driverInfoData2W); + + if (ret) + { + /* Do W->A conversion */ + DriverInfoData->DriverType = driverInfoData2W.DriverType; + DriverInfoData->Reserved = driverInfoData2W.Reserved; + if (WideCharToMultiByte(CP_ACP, 0, driverInfoData2W.Description, -1, + DriverInfoData->Description, LINE_LEN, NULL, NULL) == 0) + { + DriverInfoData->Description[0] = '\0'; + ret = FALSE; + } + if (WideCharToMultiByte(CP_ACP, 0, driverInfoData2W.MfgName, -1, + DriverInfoData->MfgName, LINE_LEN, NULL, NULL) == 0) + { + DriverInfoData->MfgName[0] = '\0'; + ret = FALSE; + } + if (WideCharToMultiByte(CP_ACP, 0, driverInfoData2W.ProviderName, -1, + DriverInfoData->ProviderName, LINE_LEN, NULL, NULL) == 0) + { + DriverInfoData->ProviderName[0] = '\0'; + ret = FALSE; + } + if (DriverInfoData->cbSize == sizeof(SP_DRVINFO_DATA_V2_A)) + { + /* Copy more fields */ + DriverInfoData->DriverDate = driverInfoData2W.DriverDate; + DriverInfoData->DriverVersion = driverInfoData2W.DriverVersion; + } + } + } + + TRACE("Returning %d\n", ret); + return ret; +} + + +/********************************************************************** * + * SetupDiEnumDriverInfoW (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiEnumDriverInfoW( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN DWORD DriverType, + IN DWORD MemberIndex, + OUT PSP_DRVINFO_DATA_W DriverInfoData) +{ + PLIST_ENTRY ListHead; + BOOL ret = FALSE; + + TRACE("%p %p 0x%lx %ld %p\n", DeviceInfoSet, DeviceInfoData, + DriverType, MemberIndex, DriverInfoData); + + if (!DeviceInfoSet || !DriverInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DriverType != SPDIT_CLASSDRIVER && DriverType != SPDIT_COMPATDRIVER) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DriverType == SPDIT_CLASSDRIVER && DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DriverType == SPDIT_COMPATDRIVER && !DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V1_W) && DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V2_W)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + struct DeviceInfoElement *devInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + PLIST_ENTRY ItemList; + if (DriverType == SPDIT_CLASSDRIVER || + devInfo->CreationFlags & DICD_INHERIT_CLASSDRVS) + { + ListHead = &((struct DeviceInfoSet *)DeviceInfoSet)->DriverListHead; + } + else + { + ListHead = &devInfo->DriverListHead; + } + + ItemList = ListHead->Flink; + while (ItemList != ListHead && MemberIndex-- > 0) + ItemList = ItemList->Flink; + if (ItemList == ListHead) + SetLastError(ERROR_NO_MORE_ITEMS); + else + { + struct DriverInfoElement *DrvInfo = (struct DriverInfoElement *)ItemList; + + memcpy( + DriverInfoData, + &DrvInfo->Info, + DriverInfoData->cbSize); + ret = TRUE; + } + } + + TRACE("Returning %d\n", ret); + return ret; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-08-08 16:08:30 UTC (rev 17211) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-08-08 16:09:48 UTC (rev 17212) @@ -268,7 +268,7 @@ @ stdcall SetupDiBuildClassInfoList(long ptr long ptr) @ stdcall SetupDiBuildClassInfoListExA(long ptr long ptr str ptr) @ stdcall SetupDiBuildClassInfoListExW(long ptr long ptr wstr ptr) -@ stub SetupDiBuildDriverInfoList +@ stdcall SetupDiBuildDriverInfoList(long ptr long) @ stdcall SetupDiCallClassInstaller(long ptr ptr) @ stub SetupDiCancelDriverInfoSearch @ stub SetupDiChangeState @@ -293,12 +293,12 @@ @ stub SetupDiDeleteDeviceRegKey @ stub SetupDiDestroyClassImageList @ stdcall SetupDiDestroyDeviceInfoList(long) -@ stub SetupDiDestroyDriverInfoList +@ stdcall SetupDiDestroyDriverInfoList(long ptr long) @ stub SetupDiDrawMiniIcon @ stdcall SetupDiEnumDeviceInfo(long long ptr) @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) -@ stub SetupDiEnumDriverInfoA -@ stub SetupDiEnumDriverInfoW +@ stdcall SetupDiEnumDriverInfoA(long ptr long long ptr) +@ stdcall SetupDiEnumDriverInfoW(long ptr long long ptr) @ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr) @ stdcall SetupDiGetActualSectionToInstallW(long wstr wstr long ptr ptr) @ stub SetupDiGetClassBitmapIndex @@ -359,8 +359,8 @@ @ stdcall SetupDiOpenClassRegKeyExA(ptr long long str ptr) @ stdcall SetupDiOpenClassRegKeyExW(ptr long long wstr ptr) @ stdcall SetupDiOpenDevRegKey(ptr ptr long long long long) -@ stub SetupDiOpenDeviceInfoA -@ stub SetupDiOpenDeviceInfoW +@ stdcall SetupDiOpenDeviceInfoA(ptr str long long ptr) +@ stdcall SetupDiOpenDeviceInfoW(ptr wstr long long ptr) @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) @ stub SetupDiOpenDeviceInterfaceRegKey @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr)

19 years, 1 month

[ion] 17211: - Actually remove the file. Thanks Usurp.

by ion＠svn.reactos.com

- Actually remove the file. Thanks Usurp.

19 years, 1 month

[hpoussin] 17210: Change structures used to keep information about devices/interfaces/drivers. This one is more logical and should be more extensible

by hpoussin＠svn.reactos.com

Change structures used to keep information about devices/interfaces/drivers. This one is more logical and should be more extensible Sorry, i've disabled code to enumerate devices implementing some interface (not ported) Do related changes in the file Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-08-08 15:56:27 UTC (rev 17209) +++ trunk/reactos/lib/setupapi/devinst.c 2005-08-08 16:06:52 UTC (rev 17210) @@ -76,50 +76,116 @@ 'E','n','u','m',0}; -typedef struct _DeviceInfo +/* FIXME: header mess */ +DEFINE_GUID(GUID_NULL, + 0x00000000L, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); + +#define SETUP_DEV_INFO_SET_MAGIC 0xd00ff057 + +struct DeviceInterface /* Element of DeviceInfoElement.InterfaceHead */ { - LIST_ENTRY ItemEntry; - BOOL IsDevice; /* This entry is a device or an interface */ - union - { - struct - { - GUID ClassGuid; - WCHAR InstancePath[0]; /* "ACPI\PNP0501\4&2658d0a0&0" */ - } Device; - struct - { - GUID InterfaceGuid; - GUID ClassGuid; -#ifndef __WINESRC__ - /* Pointer into Data field. Contains something like */ - /* "ACPI\PNP0501\4&2658d0a0&0" */ - PWSTR pInstancePath; -#endif - /* Pointer into Data field. Contains something like - * "\\?\ACPI#PNP0501#4&2658d0a0&0#{GUID}", or "COMx" for WINE */ - PWSTR pSymbolicLink; - WCHAR Data[0]; - } Interface; - }; -} DeviceInfo; + LIST_ENTRY ListEntry; -#define SETUP_DEV_INFO_LIST_MAGIC 0xd00ff056 + GUID InterfaceClassGuid; + + /* SPINT_ACTIVE : the interface is active/enabled + * SPINT_DEFAULT: the interface is the default interface for the device class FIXME??? + * SPINT_REMOVED: the interface is removed + */ + DWORD Flags; -typedef struct _DeviceInfoList + WCHAR SymbolicLink[0]; /* \\?\ACPI#PNP0501#4&2658d0a0&0#{GUID} */ +}; + +struct DriverInfoElement /* Element of DeviceInfoSet.DriverListHead and DeviceInfoElement.DriverListHead */ { - DWORD magic; - GUID ClassGuid; /* Only devices related of this class are in the device list */ - HWND hWnd; + LIST_ENTRY ListEntry; + + SP_DRVINFO_DATA_V2_W Info; +}; + +struct DeviceInfoElement /* Element of DeviceInfoSet.ListHead */ +{ + LIST_ENTRY ListEntry; + + /* Information about devnode: + * - DeviceName: + * "Root\*PNP0501" for example. + * It doesn't contain the unique ID for the device + * (points into the Data field at the end of the structure) + * WARNING: no NULL char exist between DeviceName and UniqueId + * in Data field! + * - UniqueId + * "5&1be2108e&0" or "0000" + * If DICD_GENERATE_ID is specified in creation flags, + * this unique ID is autogenerated using 4 digits, base 10 + * (points into the Data field at the end of the structure) + * - DeviceDescription + * String which identifies the device. Can be NULL. If not NULL, + * points into the Data field at the end of the structure + * - ClassGuid + * Identifies the class of this device. FIXME: can it be GUID_NULL? + * - CreationFlags + * Is a combination of: + * - DICD_GENERATE_ID + * the unique ID needs to be generated + * - DICD_INHERIT_CLASSDRVS + * inherit driver of the device info set (== same pointer) + * - hwndParent + * Used when doing device-specific actions. Can be NULL + */ + PCWSTR DeviceName; + PCWSTR UniqueId; + PCWSTR DeviceDescription; + GUID ClassGuid; + DWORD CreationFlags; + HWND hwndParent; + + /* Flags is a combination of: + * - DI_DIDCOMPAT + * Set when the device driver list is created + * FlagsEx is a combination of: + */ + DWORD Flags; + DWORD FlagsEx; + + /* If CreationFlags contains DICD_INHERIT_CLASSDRVS, this list is invalid */ + /* If the driver is not searched/detected, this list is empty */ + LIST_ENTRY DriverListHead; /* List of struct DriverInfoElement */ + + /* List of interfaces implemented by this device */ + LIST_ENTRY InterfaceHead; /* List of struct DeviceInterface */ + + WCHAR Data[0]; +}; + +struct DeviceInfoSet /* HDEVINFO */ +{ + DWORD magic; /* SETUP_DEV_INFO_SET_MAGIC */ + GUID ClassGuid; /* If != GUID_NULL, only devices of this class can be in the device info set */ + HWND hwndParent; /* only used on non-device-specific actions, like as a select-device dialog using the global class driver list */ HKEY HKLM; /* Local or distant HKEY_LOCAL_MACHINE registry key */ - DWORD numberOfEntries; - LIST_ENTRY ListHead; -} DeviceInfoList; -/* FIXME: header mess */ -DEFINE_GUID(GUID_NULL, - 0x00000000L, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); + /* Flags is a combination of: + * - DI_FLAGSEX_DIDINFOLIST + * - DI_DIDCLASS + * - DI_MULTMFGS + * Set by SetupDiBuildDriverInfoList if drivers of + * multiple manufacturers found + * - DI_FLAGSEX_DIDCOMPATINFO + * - DI_COMPAT_FROM_CLASS + * Forces SetupDiBuildDriverInfoList to build a class drivers list + * FlagsEx is a combination of: + */ + DWORD Flags; + DWORD FlagsEx; + /* If the driver is not searched/detected, this list is empty */ + LIST_ENTRY DriverListHead; /* List of struct DriverInfoElement */ + + LIST_ENTRY ListHead; /* List of struct DeviceInfoElement */ +}; + /*********************************************************************** * SetupDiBuildClassInfoList (SETUPAPI.@) */ @@ -627,7 +693,7 @@ LPWSTR MachineNameW = NULL; HDEVINFO hDevInfo; - TRACE("\n"); + TRACE("%p %p %s %p\n", ClassGuid, hwndParent, MachineName, Reserved); if (MachineName) { @@ -654,21 +720,24 @@ PCWSTR MachineName, PVOID Reserved) { - DeviceInfoList* list; + struct DeviceInfoSet *list; DWORD rc; - TRACE("%p %p %p %p\n", ClassGuid, hwndParent, MachineName, Reserved); + TRACE("%p %p %S %p\n", ClassGuid, hwndParent, MachineName, Reserved); - list = HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceInfoList)); + list = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfoSet)); if (!list) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return (HDEVINFO)INVALID_HANDLE_VALUE; } - list->magic = SETUP_DEV_INFO_LIST_MAGIC; - list->hWnd = hwndParent; - list->numberOfEntries = 0; + list->magic = SETUP_DEV_INFO_SET_MAGIC; + memcpy( + &list->ClassGuid, + ClassGuid ? ClassGuid : &GUID_NULL, + sizeof(list->ClassGuid)); + list->hwndParent = hwndParent; if (MachineName) { rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &list->HKLM); @@ -683,11 +752,9 @@ { list->HKLM = HKEY_LOCAL_MACHINE; } - - memcpy( - &list->ClassGuid, - ClassGuid ? ClassGuid : &GUID_NULL, - sizeof(list->ClassGuid)); + list->Flags = 0; /* FIXME */ + list->FlagsEx = 0; /* FIXME */ + InitializeListHead(&list->DriverListHead); InitializeListHead(&list->ListHead); return (HDEVINFO)list; } @@ -707,25 +774,24 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (DeviceInfoSet && DeviceInfoSet != (HDEVINFO)INVALID_HANDLE_VALUE) { - DeviceInfoList *list = (DeviceInfoList *)DeviceInfoSet; + struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; - if (list->magic != SETUP_DEV_INFO_LIST_MAGIC) + if (list->magic != SETUP_DEV_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); - else if (MemberIndex >= list->numberOfEntries) - SetLastError(ERROR_NO_MORE_ITEMS); else { PLIST_ENTRY ItemList = list->ListHead.Flink; - DeviceInfo* DevInfo; - while (MemberIndex-- > 0) + while (ItemList != &list->ListHead && MemberIndex-- > 0) ItemList = ItemList->Flink; - DevInfo = (DeviceInfo *)ItemList; - if (DevInfo->IsDevice) + if (ItemList == &list->ListHead) + SetLastError(ERROR_NO_MORE_ITEMS); + else { + struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)ItemList; memcpy(&DeviceInfoData->ClassGuid, - &DevInfo->Device.ClassGuid, + &DevInfo->ClassGuid, sizeof(GUID)); DeviceInfoData->DevInst = 0; /* FIXME */ /* Note: this appears to be dangerous, passing a private @@ -736,10 +802,6 @@ DeviceInfoData->Reserved = (ULONG_PTR)DevInfo; ret = TRUE; } - else - { - SetLastError(ERROR_INVALID_PARAMETER); - } } } else @@ -1095,7 +1157,7 @@ } static LONG SETUP_CreateDevListFromEnumerator( - DeviceInfoList* list, + struct DeviceInfoSet *list, LPCGUID pClassGuid OPTIONAL, LPCWSTR Enumerator, HKEY hEnumeratorKey) /* handle to Enumerator registry key */ @@ -1104,7 +1166,7 @@ WCHAR KeyBuffer[MAX_PATH]; WCHAR InstancePath[MAX_PATH]; LPWSTR pEndOfInstancePath; /* Pointer into InstancePath buffer */ - DeviceInfo* deviceInfo; + struct DeviceInfoElement *deviceInfo; DWORD i = 0, j; DWORD dwLength, dwRegType; DWORD rc; @@ -1178,6 +1240,7 @@ else if (pClassGuid) { GUID KeyGuid; + KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) { RegCloseKey(hDeviceIdKey); @@ -1189,17 +1252,25 @@ } /* Add the entry to the list */ - deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Device.InstancePath) + (wcslen(InstancePath) + 1) * sizeof(WCHAR)); + deviceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfoElement) + (wcslen(InstancePath) + 1) * sizeof(WCHAR)); if (!deviceInfo) { RegCloseKey(hDeviceIdKey); return ERROR_NO_SYSTEM_RESOURCES; } - deviceInfo->IsDevice = TRUE; - memcpy(&deviceInfo->Device.ClassGuid, pClassGuid, sizeof(GUID)); - wcscpy(deviceInfo->Device.InstancePath, InstancePath); - InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); - list->numberOfEntries++; + TRACE("Adding '%S' to device info set %p\n", InstancePath, list); + wcscpy(deviceInfo->Data, InstancePath); + deviceInfo->DeviceName = deviceInfo->Data; + deviceInfo->UniqueId = &deviceInfo->Data[pEndOfInstancePath - InstancePath + 1]; + deviceInfo->DeviceDescription = NULL; + memcpy(&deviceInfo->ClassGuid, pClassGuid, sizeof(GUID)); + deviceInfo->CreationFlags = 0; + deviceInfo->hwndParent = NULL; + deviceInfo->Flags = 0; /* FIXME */ + deviceInfo->FlagsEx = 0; /* FIXME */ + InitializeListHead(&deviceInfo->DriverListHead); + InitializeListHead(&deviceInfo->InterfaceHead); + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); } RegCloseKey(hDeviceIdKey); } @@ -1208,7 +1279,7 @@ } static LONG SETUP_CreateDevList( - DeviceInfoList* list, + struct DeviceInfoSet *list, PCWSTR MachineName OPTIONAL, LPGUID class OPTIONAL, PCWSTR Enumerator OPTIONAL) @@ -1301,7 +1372,7 @@ #ifdef __WINESRC__ static LONG SETUP_CreateSerialDeviceList( - DeviceInfoList *list, + struct DeviceInfoSet *list, PCWSTR MachineName, LPGUID InterfaceGuid, PCWSTR DeviceInstanceW) @@ -1312,7 +1383,7 @@ LPWSTR devices; static const WCHAR devicePrefixW[] = { 'C','O','M',0 }; LPWSTR ptr; - DeviceInfo *deviceInfo; + //DeviceInfo *deviceInfo; if (MachineName) WARN("'MachineName' is ignored on Wine!\n"); @@ -1350,6 +1421,7 @@ { /* We have found a device */ TRACE("Adding %s to list\n", debugstr_w(ptr)); +#if 0 deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Interface.Data) + (strlenW(ptr) + 1) * sizeof(WCHAR)); if (!deviceInfo) @@ -1363,7 +1435,9 @@ memcpy(&deviceInfo->Interface.InterfaceGuid, InterfaceGuid, sizeof(GUID)); wcscpy(deviceInfo->Interface.pSymbolicLink, ptr); InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); - list->numberOfEntries++; +#else + FIXME("not implemented\n"); +#endif } } if (devices != buf) @@ -1374,7 +1448,7 @@ #else /* __WINESRC__ */ static LONG SETUP_CreateInterfaceList( - DeviceInfoList *list, + struct DeviceInfoSet *list, PCWSTR MachineName, LPGUID InterfaceGuid, PCWSTR DeviceInstanceW /* OPTIONAL */) @@ -1619,7 +1693,7 @@ PVOID reserved) { HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE; - DeviceInfoList *list; + struct DeviceInfoSet *list; LPGUID pClassGuid; LONG rc; @@ -1629,8 +1703,8 @@ /* Create the deviceset if not set */ if (deviceset) { - list = (DeviceInfoList *)deviceset; - if (list->magic != SETUP_DEV_INFO_LIST_MAGIC) + list = (struct DeviceInfoSet *)deviceset; + if (list->magic != SETUP_DEV_INFO_SET_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); return INVALID_HANDLE_VALUE; @@ -1644,7 +1718,7 @@ NULL, machine, NULL); if (hDeviceInfo == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; - list = (DeviceInfoList *)hDeviceInfo; + list = (struct DeviceInfoSet *)hDeviceInfo; } if (IsEqualIID(&list->ClassGuid, &GUID_NULL)) @@ -1730,8 +1804,6 @@ TRACE("%p, %p, %s, 0x%08lx, %p\n", DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), MemberIndex, DeviceInterfaceData); - if (DeviceInfoData) - FIXME(": unimplemented with PSP_DEVINFO_DATA set\n"); if (!DeviceInterfaceData) SetLastError(ERROR_INVALID_PARAMETER); @@ -1739,39 +1811,54 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else if (DeviceInfoSet && DeviceInfoSet != (HDEVINFO)INVALID_HANDLE_VALUE) { - DeviceInfoList *list = (DeviceInfoList *)DeviceInfoSet; + struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; - if (list->magic == SETUP_DEV_INFO_LIST_MAGIC) + if (list->magic == SETUP_DEV_INFO_SET_MAGIC) { - if (MemberIndex >= list->numberOfEntries) - SetLastError(ERROR_NO_MORE_ITEMS); - else + PLIST_ENTRY ItemList = list->ListHead.Flink; + BOOL Found = FALSE; + while (ItemList != &list->ListHead && !Found) { - PLIST_ENTRY ItemList = list->ListHead.Flink; - DeviceInfo* DevInfo; - while (MemberIndex-- > 0) + PLIST_ENTRY InterfaceListEntry; + struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)ItemList; + if (DeviceInfoData && (struct DeviceInfoElement *)DeviceInfoData->Reserved != DevInfo) + { + /* We are not searching for this element */ ItemList = ItemList->Flink; - DevInfo = (DeviceInfo *)ItemList; - - if (DevInfo->IsDevice) - SetLastError(ERROR_INVALID_PARAMETER); - else if (!IsEqualIID(&DevInfo->Interface.InterfaceGuid, InterfaceClassGuid)) - SetLastError(ERROR_INVALID_PARAMETER); - else + continue; + } + InterfaceListEntry = DevInfo->InterfaceHead.Flink; + while (InterfaceListEntry != &DevInfo->InterfaceHead && !Found) { - memcpy(&DeviceInterfaceData->InterfaceClassGuid, - &DevInfo->Interface.InterfaceGuid, - sizeof(DeviceInterfaceData->InterfaceClassGuid)); - DeviceInterfaceData->Flags = 0; /* FIXME */ - /* Note: this appears to be dangerous, passing a private - * pointer a heap-allocated datum to the caller. However, the - * expected lifetime of the device data is the same as the - * HDEVINFO; once that is closed, the data are no longer valid. - */ - DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo; - ret = TRUE; + struct DeviceInterface *DevItf = (struct DeviceInterface *)InterfaceListEntry; + if (!IsEqualIID(&DevItf->InterfaceClassGuid, InterfaceClassGuid)) + { + InterfaceListEntry = InterfaceListEntry->Flink; + continue; + } + if (MemberIndex-- == 0) + { + /* return this item */ + memcpy(&DeviceInterfaceData->InterfaceClassGuid, + &DevItf->InterfaceClassGuid, + sizeof(GUID)); + DeviceInterfaceData->Flags = 0; /* FIXME */ + /* Note: this appears to be dangerous, passing a private + * pointer a heap-allocated datum to the caller. However, the + * expected lifetime of the device data is the same as the + * HDEVINFO; once that is closed, the data are no longer valid. + */ + DeviceInterfaceData->Reserved = (ULONG_PTR)DevItf; + Found = TRUE; + } + MemberIndex--; } + ItemList = ItemList->Flink; } + if (!Found) + SetLastError(ERROR_NO_MORE_ITEMS); + else + ret = TRUE; } else SetLastError(ERROR_INVALID_HANDLE); @@ -1791,14 +1878,21 @@ TRACE("%p\n", devinfo); if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE) { - DeviceInfoList *list = (DeviceInfoList *)devinfo; + struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo; - if (list->magic == SETUP_DEV_INFO_LIST_MAGIC) + if (list->magic == SETUP_DEV_INFO_SET_MAGIC) { - PLIST_ENTRY ListEntry; + PLIST_ENTRY ListEntry, InterfaceEntry; + struct DeviceInfoElement *deviceInfo; while (!IsListEmpty(&list->ListHead)) { ListEntry = RemoveHeadList(&list->ListHead); + deviceInfo = (struct DeviceInfoElement *)ListEntry; + while (!IsListEmpty(&deviceInfo->InterfaceHead)) + { + InterfaceEntry = RemoveHeadList(&deviceInfo->InterfaceHead); + HeapFree(GetProcessHeap(), 0, InterfaceEntry); + } HeapFree(GetProcessHeap(), 0, ListEntry); } if (list->HKLM != HKEY_LOCAL_MACHINE) @@ -1905,7 +1999,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_HANDLE); - else if (((DeviceInfoList*)DeviceInfoSet)->magic != SETUP_DEV_INFO_LIST_MAGIC) + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -1919,6 +2013,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else { +#if 0 DeviceInfo *deviceInfo = (DeviceInfo *)DeviceInterfaceData->Reserved; LPCWSTR devName = deviceInfo->Interface.pSymbolicLink; DWORD sizeRequired = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + @@ -1949,6 +2044,11 @@ } ret = TRUE; } +#else + FIXME("not implemented\n"); + SetLastError(ERROR_GEN_FAILURE); + ret = FALSE; +#endif } TRACE("Returning %d\n", ret); @@ -2052,7 +2152,7 @@ if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_HANDLE); - else if (((DeviceInfoList *)DeviceInfoSet)->magic != SETUP_DEV_INFO_LIST_MAGIC) + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); @@ -2060,12 +2160,10 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else if (Property >= SPDRP_MAXIMUM_PROPERTY) SetLastError(ERROR_INVALID_PARAMETER); - else if (!((DeviceInfo *)DeviceInfoData->Reserved)->IsDevice) - SetLastError(ERROR_INVALID_PARAMETER); else { - DeviceInfoList *list = (DeviceInfoList *)DeviceInfoSet; - DeviceInfo* DevInfo = (DeviceInfo *)DeviceInfoData->Reserved; + struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; switch (Property) { @@ -2142,7 +2240,7 @@ } rc = RegOpenKeyExW( hEnumKey, - DevInfo->Device.InstancePath, + DevInfo->Data, 0, /* Options */ KEY_QUERY_VALUE, &hKey); @@ -2173,7 +2271,7 @@ case SPDRP_PHYSICAL_DEVICE_OBJECT_NAME: { - DWORD required = (wcslen(DevInfo->Device.InstancePath) + 1) * sizeof(WCHAR); + DWORD required = (wcslen(DevInfo->Data) + 1) * sizeof(WCHAR); if (PropertyRegDataType) *PropertyRegDataType = REG_SZ; @@ -2181,7 +2279,7 @@ *RequiredSize = required; if (PropertyBufferSize >= required) { - wcscpy((LPWSTR)PropertyBuffer, DevInfo->Device.InstancePath); + wcscpy((LPWSTR)PropertyBuffer, DevInfo->Data); ret = TRUE; } else

19 years, 1 month

[mbosma] 17209: Fix a bug, thanks to Salamander again.

by mbosma＠svn.reactos.com

Fix a bug, 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 15:49:37 UTC (rev 17208) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-08-08 15:56:27 UTC (rev 17209) @@ -34,8 +34,8 @@ Global.dwGlobalFlags |= DDRAWISURFGBL_ISGDISURFACE; Global.lpDD = &This->owner->DirectDrawGlobal; - Global.wHeight = This->owner->Width; - Global.wWidth = This->owner->Height; + Global.wHeight = This->owner->Height; + Global.wWidth = This->owner->Width; Global.dwLinearSize = Global.wWidth * This->owner->Bpp/8; // Surface More Struct

19 years, 1 month

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