Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 22949: Implement CM_Add_Empty_Log_Conf[_Ex] and add PNP_AddEmptyLogConf stub.
by ekohl＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: ekohl Date: Sun Jul 9 01:37:32 2006 New Revision: 22949 URL: http://svn.reactos.org/svn/reactos?rev=22949&view=rev Log: Implement CM_Add_Empty_Log_Conf[_Ex] and add PNP_AddEmptyLogConf stub. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/include/ddk/cfgmgr32.h trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Sun Jul 9 01:37:32 2006 @@ -1245,6 +1245,26 @@ } +/* Function 42 */ +CONFIGRET +PNP_AddEmptyLogConf(handle_t BindingHandle, + wchar_t *DeviceInstance, + ULONG ulPriority, + ULONG *ulLogConfTag, + ULONG ulFlags) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_AddEmptyLogConf() called\n"); + + *ulLogConfTag = 0; /* FIXME */ + + DPRINT1("PNP_AddEmptyLogConf() done (returns %lx)\n", ret); + + return ret; +} + + /* Function 58 */ CONFIGRET PNP_RunDetection(handle_t BindingHandle, Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Sun Jul 9 01:37:32 2006 @@ -25,8 +25,8 @@ ;CMP_UnregisterNotification ;CMP_WaitNoPendingInstallEvents ;CMP_WaitServices -;CM_Add_Empty_Log_Conf(a)16=SETUPAPI.CM_Add_Empty_Log_Conf -;CM_Add_Empty_Log_Conf_Ex(a)20=SETUPAPI.CM_Add_Empty_Log_Conf_Ex +CM_Add_Empty_Log_Conf(a)16=SETUPAPI.CM_Add_Empty_Log_Conf +CM_Add_Empty_Log_Conf_Ex(a)20=SETUPAPI.CM_Add_Empty_Log_Conf_Ex CM_Add_IDA(a)12=SETUPAPI.CM_Add_IDA CM_Add_IDW(a)12=SETUPAPI.CM_Add_IDW CM_Add_ID_ExA(a)16=SETUPAPI.CM_Add_ID_ExA Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sun Jul 9 01:37:32 2006 @@ -46,6 +46,17 @@ } MACHINE_INFO, *PMACHINE_INFO; +typedef struct _LOG_CONF_INFO +{ + ULONG ulMagic; + DEVINST dnDevInst; + ULONG ulFlags; + ULONG ulTag; +} LOG_CONF_INFO, *PLOG_CONF_INFO; + +#define LOG_CONF_MAGIC 0x464E434C /* "LCNF" */ + + static BOOL GuidToString(LPGUID Guid, LPWSTR String) { LPWSTR lpString; @@ -116,6 +127,96 @@ break; Sleep(5000); + } + + return ret; +} + + +/*********************************************************************** + * CM_Add_Empty_Log_Conf [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Add_Empty_Log_Conf( + PLOG_CONF plcLogConf, DEVINST dnDevInst, PRIORITY Priority, + ULONG ulFlags) +{ + TRACE("%p %p %lu %lx\n", plcLogConf, dnDevInst, Priority, ulFlags); + return CM_Add_Empty_Log_Conf_Ex(plcLogConf, dnDevInst, Priority, + ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Add_Empty_Log_Conf_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex( + PLOG_CONF plcLogConf, DEVINST dnDevInst, PRIORITY Priority, + ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + ULONG ulLogConfTag = 0; + LPWSTR lpDevInst; + PLOG_CONF_INFO pLogConfInfo; + CONFIGRET ret = CR_SUCCESS; + + FIXME("%p %p %lu %lx %p\n", + plcLogConf, dnDevInst, Priority, ulFlags, hMachine); + + if (!IsUserAdmin()) + return CR_ACCESS_DENIED; + + if (plcLogConf == NULL) + return CR_INVALID_POINTER; + + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (Priority > 0xFFFF) + return CR_INVALID_PRIORITY; + + if (ulFlags & ~(LOG_CONF_BITS | PRIORITY_BIT)) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + ret = PNP_AddEmptyLogConf(BindingHandle, lpDevInst, Priority, &ulLogConfTag, ulFlags); + if (ret == CR_SUCCESS) + { + pLogConfInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_CONF_INFO)); + if (pLogConfInfo == NULL) + { + ret = CR_OUT_OF_MEMORY; + } + else + { + pLogConfInfo->ulMagic = LOG_CONF_MAGIC; + pLogConfInfo->dnDevInst = dnDevInst; + pLogConfInfo->ulFlags = ulFlags; + pLogConfInfo->ulTag = ulLogConfTag; + + *plcLogConf = (LOG_CONF)pLogConfInfo; + + ret = CR_SUCCESS; + } } return ret; Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sun Jul 9 01:37:32 2006 @@ -9,8 +9,8 @@ @ stub CMP_UnregisterNotification @ stub CMP_WaitNoPendingInstallEvents @ stub CMP_WaitServicesAvailable -@ stub CM_Add_Empty_Log_Conf -@ stub CM_Add_Empty_Log_Conf_Ex +@ stdcall CM_Add_Empty_Log_Conf(ptr ptr long long) +@ stdcall CM_Add_Empty_Log_Conf_Ex(ptr ptr long long ptr) @ stdcall CM_Add_IDA(ptr str long) @ stdcall CM_Add_IDW(ptr wstr long) @ stdcall CM_Add_ID_ExA(ptr str long ptr) Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h (original) +++ trunk/reactos/include/ddk/cfgmgr32.h Sun Jul 9 01:37:32 2006 @@ -619,6 +619,15 @@ /* FIXME: Missing CMP_WaitServicesAvailable */ /* CM_Add_Empty_Log_Conf.ulFlags constants */ +#define BASIC_LOG_CONF 0x00000000 +#define FILTERED_LOG_CONF 0x00000001 +#define ALLOC_LOG_CONF 0x00000002 +#define BOOT_LOG_CONF 0x00000003 +#define FORCED_LOG_CONF 0x00000004 +#define OVERRIDE_LOG_CONF 0x00000005 +#define NUM_LOG_CONF 0x00000006 +#define LOG_CONF_BITS 0x00000007 + #define PRIORITY_EQUAL_FIRST 0x00000008 #define PRIORITY_EQUAL_LAST 0x00000000 #define PRIORITY_BIT 0x00000008 Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl (original) +++ trunk/reactos/include/reactos/idl/pnp.idl Sun Jul 9 01:37:32 2006 @@ -4,6 +4,7 @@ #define WORD unsigned short #define DWORD unsigned long +#define ULONG unsigned long #define CONFIGRET unsigned long #define BOOL unsigned long #define PBOOL unsigned long * @@ -197,6 +198,13 @@ [in, out] unsigned long *Value, [in] DWORD Flags); + /* Function 42 */ + CONFIGRET PNP_AddEmptyLogConf(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] ULONG ulPriority, + [out] ULONG *ulLogConfTag, + [in] ULONG ulFlags); + /* Function 58 */ CONFIGRET PNP_RunDetection(handle_t BindingHandle, [in] unsigned long Flags); Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg… ============================================================================== --- trunk/reactos/include/reactos/wine/cfgmgr32.h (original) +++ trunk/reactos/include/reactos/wine/cfgmgr32.h Sun Jul 9 01:37:32 2006 @@ -34,6 +34,11 @@ typedef DWORD DEVNODE; typedef DEVNODE *PDEVNODE; typedef ULONG REGDISPOSITION; +typedef DWORD_PTR LOG_CONF; +typedef LOG_CONF *PLOG_CONF; +typedef ULONG PRIORITY; +typedef PRIORITY *PPRIORITY; + typedef CHAR *DEVINSTID_A; typedef WCHAR *DEVINSTID_W; @@ -53,6 +58,7 @@ #define CR_INVALID_DEVICE_ID 0x0000001E #define CR_INVALID_DATA 0x0000001F #define CR_NO_SUCH_VALUE 0x00000025 +#define CR_INVALID_PRIORITY 0x00000027 #define CR_NO_SUCH_REGISTRY_KEY 0x0000002E #define CR_INVALID_MACHINENAME 0x0000002F #define CR_ACCESS_DENIED 0x00000033 @@ -189,12 +195,28 @@ #define CM_SET_HW_PROF_FLAGS_UI_NOT_OK 0x00000001 #define CM_SET_HW_PROF_FLAGS_BITS 0x00000001 +/* ulFlags for Log_Conf functions */ +#define BASIC_LOG_CONF 0x00000000 +#define FILTERED_LOG_CONF 0x00000001 +#define ALLOC_LOG_CONF 0x00000002 +#define BOOT_LOG_CONF 0x00000003 +#define FORCED_LOG_CONF 0x00000004 +#define OVERRIDE_LOG_CONF 0x00000005 +#define NUM_LOG_CONF 0x00000006 +#define LOG_CONF_BITS 0x00000007 + +#define PRIORITY_EQUAL_FIRST 0x00000008 +#define PRIORITY_EQUAL_LAST 0x00000000 +#define PRIORITY_BIT 0x00000008 + #define CMP_MAGIC 0x01234567 CONFIGRET WINAPI CMP_Init_Detection( DWORD ); CONFIGRET WINAPI CMP_Report_LogOn( DWORD, DWORD ); +CONFIGRET WINAPI CM_Add_Empty_Log_Conf( PLOG_CONF, DEVINST, PRIORITY, ULONG ); +CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex( PLOG_CONF, DEVINST, PRIORITY, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Add_IDA( DEVINST, PSTR, ULONG ); CONFIGRET WINAPI CM_Add_IDW( DEVINST, PWSTR, ULONG ); #define CM_Add_ID WINELIB_NAME_AW(CM_Add_ID)

1 0

[fireball] 22948: [AUDIT] + [FORMATTING] - Coding style applied (make file's header proper, add headers for every function) - All functions except one are documented in MSDN - One undocumented function will undergo further examination and documentation
by fireball＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: fireball Date: Sun Jul 9 01:33:25 2006 New Revision: 22948 URL: http://svn.reactos.org/svn/reactos?rev=22948&view=rev Log: [AUDIT] + [FORMATTING] - Coding style applied (make file's header proper, add headers for every function) - All functions except one are documented in MSDN - One undocumented function will undergo further examination and documentation Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Sun Jul 9 01:33:25 2006 @@ -1,7 +1,7 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/deviface.c + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/iomgr/deviface.c * PURPOSE: Device interface functions * * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) @@ -20,868 +20,974 @@ static PWCHAR BaseKeyString = L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\DeviceClasses\\"; -/* +/*++ + * @name IoOpenDeviceInterfaceRegistryKey * @unimplemented - */ - -NTSTATUS STDCALL -IoOpenDeviceInterfaceRegistryKey( - IN PUNICODE_STRING SymbolicLinkName, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE DeviceInterfaceKey) + * + * Provides a handle to the device's interface instance registry key. + * Documented in WDK. + * + * @param SymbolicLinkName + * Pointer to a string which identifies the device interface instance + * + * @param DesiredAccess + * Desired ACCESS_MASK used to access the key (like KEY_READ, + * KEY_WRITE, etc) + * + * @param DeviceInterfaceKey + * If a call has been succesfull, a handle to the registry key + * will be stored there + * + * @return Three different NTSTATUS values in case of errors, and STATUS_SUCCESS + * otherwise (see WDK for details) + * + * @remarks Must be called at IRQL = PASSIVE_LEVEL in the context of a system thread + * + *--*/ +NTSTATUS +NTAPI +IoOpenDeviceInterfaceRegistryKey(IN PUNICODE_STRING SymbolicLinkName, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE DeviceInterfaceKey) { - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } -/* +/*++ + * @name IoGetDeviceInterfaceAlias * @unimplemented - */ - -NTSTATUS STDCALL -IoGetDeviceInterfaceAlias( - IN PUNICODE_STRING SymbolicLinkName, - IN CONST GUID *AliasInterfaceClassGuid, - OUT PUNICODE_STRING AliasSymbolicLinkName) + * + * Returns the alias device interface of the specified device interface + * instance, if the alias exists. + * Documented in WDK. + * + * @param SymbolicLinkName + * Pointer to a string which identifies the device interface instance + * + * @param AliasInterfaceClassGuid + * See WDK + * + * @param AliasSymbolicLinkName + * See WDK + * + * @return Three different NTSTATUS values in case of errors, and STATUS_SUCCESS + * otherwise (see WDK for details) + * + * @remarks Must be called at IRQL = PASSIVE_LEVEL in the context of a system thread + * + *--*/ +NTSTATUS +NTAPI +IoGetDeviceInterfaceAlias(IN PUNICODE_STRING SymbolicLinkName, + IN CONST GUID *AliasInterfaceClassGuid, + OUT PUNICODE_STRING AliasSymbolicLinkName) { - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } +/*++ + * @name IopOpenInterfaceKey + * + * Returns the alias device interface of the specified device interface + * + * @param InterfaceClassGuid + * FILLME + * + * @param DesiredAccess + * FILLME + * + * @param pInterfaceKey + * FILLME + * + * @return Usual NTSTATUS + * + * @remarks None + * + *--*/ static NTSTATUS -IopOpenInterfaceKey( - IN CONST GUID *InterfaceClassGuid, - IN ACCESS_MASK DesiredAccess, - OUT HANDLE *pInterfaceKey) +IopOpenInterfaceKey(IN CONST GUID *InterfaceClassGuid, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE *pInterfaceKey) { - UNICODE_STRING LocalMachine = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\"); - UNICODE_STRING GuidString; - UNICODE_STRING KeyName; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE InterfaceKey = INVALID_HANDLE_VALUE; - NTSTATUS Status; - - GuidString.Buffer = KeyName.Buffer = NULL; - - Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlStringFromGUID() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - KeyName.Length = 0; - KeyName.MaximumLength = LocalMachine.Length + (wcslen(REGSTR_PATH_DEVICE_CLASSES) + 1) * sizeof(WCHAR) + GuidString.Length; - KeyName.Buffer = ExAllocatePool(PagedPool, KeyName.MaximumLength); - if (!KeyName.Buffer) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - - Status = RtlAppendUnicodeStringToString(&KeyName, &LocalMachine); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); - goto cleanup; - } - Status = RtlAppendUnicodeToString(&KeyName, REGSTR_PATH_DEVICE_CLASSES); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); - goto cleanup; - } - Status = RtlAppendUnicodeToString(&KeyName, L"\\"); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); - goto cleanup; - } - Status = RtlAppendUnicodeStringToString(&KeyName, &GuidString); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - InitializeObjectAttributes( - &ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey( - &InterfaceKey, - DesiredAccess, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - *pInterfaceKey = InterfaceKey; - Status = STATUS_SUCCESS; + UNICODE_STRING LocalMachine = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\"); + UNICODE_STRING GuidString; + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE InterfaceKey = INVALID_HANDLE_VALUE; + NTSTATUS Status; + + GuidString.Buffer = KeyName.Buffer = NULL; + + Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlStringFromGUID() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + KeyName.Length = 0; + KeyName.MaximumLength = LocalMachine.Length + (wcslen(REGSTR_PATH_DEVICE_CLASSES) + 1) * sizeof(WCHAR) + GuidString.Length; + KeyName.Buffer = ExAllocatePool(PagedPool, KeyName.MaximumLength); + if (!KeyName.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + Status = RtlAppendUnicodeStringToString(&KeyName, &LocalMachine); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeToString(&KeyName, REGSTR_PATH_DEVICE_CLASSES); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeToString(&KeyName, L"\\"); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeStringToString(&KeyName, &GuidString); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + InitializeObjectAttributes( + &ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey( + &InterfaceKey, + DesiredAccess, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + *pInterfaceKey = InterfaceKey; + Status = STATUS_SUCCESS; cleanup: - if (!NT_SUCCESS(Status)) - { - if (InterfaceKey != INVALID_HANDLE_VALUE) - ZwClose(InterfaceKey); - } - RtlFreeUnicodeString(&GuidString); - RtlFreeUnicodeString(&KeyName); - return Status; + if (!NT_SUCCESS(Status)) + { + if (InterfaceKey != INVALID_HANDLE_VALUE) + ZwClose(InterfaceKey); + } + RtlFreeUnicodeString(&GuidString); + RtlFreeUnicodeString(&KeyName); + return Status; } -/* - * IoGetDeviceInterfaces +/*++ + * @name IoGetDeviceInterfaces + * @implemented * * Returns a list of device interfaces of a particular device interface class. - * - * Parameters - * InterfaceClassGuid - * Points to a class GUID specifying the device interface class. - * - * PhysicalDeviceObject - * Points to an optional PDO that narrows the search to only the - * device interfaces of the device represented by the PDO. - * - * Flags - * Specifies flags that modify the search for device interfaces. The - * DEVICE_INTERFACE_INCLUDE_NONACTIVE flag specifies that the list of - * returned symbolic links should contain also disabled device - * interfaces in addition to the enabled ones. - * - * SymbolicLinkList - * Points to a character pointer that is filled in on successful return - * with a list of unicode strings identifying the device interfaces - * that match the search criteria. The newly allocated buffer contains - * a list of symbolic link names. Each unicode string in the list is - * null-terminated; the end of the whole list is marked by an additional - * NULL. The caller is responsible for freeing the buffer (ExFreePool) - * when it is no longer needed. - * If no device interfaces match the search criteria, this routine - * returns STATUS_SUCCESS and the string contains a single NULL - * character. - * - * Status - * @implemented - * - */ - -NTSTATUS STDCALL -IoGetDeviceInterfaces( - IN CONST GUID *InterfaceClassGuid, - IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, - IN ULONG Flags, - OUT PWSTR *SymbolicLinkList) + * Documented in WDK + * + * @param InterfaceClassGuid + * Points to a class GUID specifying the device interface class + * + * @param PhysicalDeviceObject + * Points to an optional PDO that narrows the search to only the + * device interfaces of the device represented by the PDO + * + * @param Flags + * Specifies flags that modify the search for device interfaces. The + * DEVICE_INTERFACE_INCLUDE_NONACTIVE flag specifies that the list of + * returned symbolic links should contain also disabled device + * interfaces in addition to the enabled ones. + * + * @param SymbolicLinkList + * Points to a character pointer that is filled in on successful return + * with a list of unicode strings identifying the device interfaces + * that match the search criteria. The newly allocated buffer contains + * a list of symbolic link names. Each unicode string in the list is + * null-terminated; the end of the whole list is marked by an additional + * NULL. The caller is responsible for freeing the buffer (ExFreePool) + * when it is no longer needed. + * If no device interfaces match the search criteria, this routine + * returns STATUS_SUCCESS and the string contains a single NULL + * character. + * + * @return Usual NTSTATUS + * + * @remarks None + * + *--*/ +NTSTATUS +NTAPI +IoGetDeviceInterfaces(IN CONST GUID *InterfaceClassGuid, + IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, + IN ULONG Flags, + OUT PWSTR *SymbolicLinkList) { - UNICODE_STRING Control = RTL_CONSTANT_STRING(L"Control"); - UNICODE_STRING SymbolicLink = RTL_CONSTANT_STRING(L"SymbolicLink"); - HANDLE InterfaceKey = INVALID_HANDLE_VALUE; - HANDLE DeviceKey = INVALID_HANDLE_VALUE; - HANDLE ReferenceKey = INVALID_HANDLE_VALUE; - HANDLE ControlKey = INVALID_HANDLE_VALUE; - PKEY_BASIC_INFORMATION DeviceBi = NULL; - PKEY_BASIC_INFORMATION ReferenceBi = NULL; - PKEY_VALUE_PARTIAL_INFORMATION bip = NULL; - UNICODE_STRING KeyName; - OBJECT_ATTRIBUTES ObjectAttributes; - BOOLEAN FoundRightPDO = FALSE; - ULONG i = 0, j, Size; - UNICODE_STRING ReturnBuffer = {0,}; - NTSTATUS Status; - - PAGED_CODE(); - - Status = IopOpenInterfaceKey(InterfaceClassGuid, KEY_ENUMERATE_SUB_KEYS, &InterfaceKey); - if (!NT_SUCCESS(Status)) - { - DPRINT("IopOpenInterfaceKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - /* Enumerate subkeys (ie the different device objets) */ - while (TRUE) - { - Status = ZwEnumerateKey( - InterfaceKey, - i, - KeyBasicInformation, - NULL, - 0, - &Size); - if (Status == STATUS_NO_MORE_ENTRIES) - break; - else if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) - { - DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - DeviceBi = ExAllocatePool(PagedPool, Size); - if (!DeviceBi) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - Status = ZwEnumerateKey( - InterfaceKey, - i++, - KeyBasicInformation, - DeviceBi, - Size, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - /* Open device key */ - KeyName.Length = KeyName.MaximumLength = DeviceBi->NameLength; - KeyName.Buffer = DeviceBi->Name; - InitializeObjectAttributes( - &ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - InterfaceKey, - NULL); - Status = ZwOpenKey( - &DeviceKey, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - if (PhysicalDeviceObject) - { - /* Check if we are on the right physical device object, - * by reading the DeviceInstance string - */ - DPRINT1("PhysicalDeviceObject != NULL. Case not implemented.\n"); - //FoundRightPDO = TRUE; - Status = STATUS_NOT_IMPLEMENTED; - goto cleanup; - } - - /* Enumerate subkeys (ie the different reference strings) */ - j = 0; - while (TRUE) - { - Status = ZwEnumerateKey( - DeviceKey, - j, + UNICODE_STRING Control = RTL_CONSTANT_STRING(L"Control"); + UNICODE_STRING SymbolicLink = RTL_CONSTANT_STRING(L"SymbolicLink"); + HANDLE InterfaceKey = INVALID_HANDLE_VALUE; + HANDLE DeviceKey = INVALID_HANDLE_VALUE; + HANDLE ReferenceKey = INVALID_HANDLE_VALUE; + HANDLE ControlKey = INVALID_HANDLE_VALUE; + PKEY_BASIC_INFORMATION DeviceBi = NULL; + PKEY_BASIC_INFORMATION ReferenceBi = NULL; + PKEY_VALUE_PARTIAL_INFORMATION bip = NULL; + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + BOOLEAN FoundRightPDO = FALSE; + ULONG i = 0, j, Size; + UNICODE_STRING ReturnBuffer = {0,}; + NTSTATUS Status; + + PAGED_CODE(); + + Status = IopOpenInterfaceKey(InterfaceClassGuid, KEY_ENUMERATE_SUB_KEYS, &InterfaceKey); + if (!NT_SUCCESS(Status)) + { + DPRINT("IopOpenInterfaceKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + /* Enumerate subkeys (ie the different device objets) */ + while (TRUE) + { + Status = ZwEnumerateKey( + InterfaceKey, + i, KeyBasicInformation, NULL, 0, &Size); - if (Status == STATUS_NO_MORE_ENTRIES) + if (Status == STATUS_NO_MORE_ENTRIES) + { break; - else if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) - { + } + else if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); goto cleanup; - } - - ReferenceBi = ExAllocatePool(PagedPool, Size); - if (!ReferenceBi) - { + } + + DeviceBi = ExAllocatePool(PagedPool, Size); + if (!DeviceBi) + { DPRINT("ExAllocatePool() failed\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; - } - Status = ZwEnumerateKey( - DeviceKey, - j++, + } + Status = ZwEnumerateKey( + InterfaceKey, + i++, KeyBasicInformation, - ReferenceBi, + DeviceBi, Size, &Size); - if (!NT_SUCCESS(Status)) - { + if (!NT_SUCCESS(Status)) + { DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); goto cleanup; - } - - KeyName.Length = KeyName.MaximumLength = ReferenceBi->NameLength; - KeyName.Buffer = ReferenceBi->Name; - if (RtlEqualUnicodeString(&KeyName, &Control, TRUE)) - { - /* Skip Control subkey */ - goto NextReferenceString; - } - - /* Open reference key */ - InitializeObjectAttributes( + } + + /* Open device key */ + KeyName.Length = KeyName.MaximumLength = DeviceBi->NameLength; + KeyName.Buffer = DeviceBi->Name; + InitializeObjectAttributes( &ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, - DeviceKey, + InterfaceKey, NULL); - Status = ZwOpenKey( - &ReferenceKey, - KEY_QUERY_VALUE, + Status = ZwOpenKey( + &DeviceKey, + KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { + if (!NT_SUCCESS(Status)) + { DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; - } - - if (!(Flags & DEVICE_INTERFACE_INCLUDE_NONACTIVE)) - { - /* We have to check if the interface is enabled, by - * reading the Linked value in the Control subkey - */ + } + + if (PhysicalDeviceObject) + { + /* Check if we are on the right physical device object, + * by reading the DeviceInstance string + */ + DPRINT1("PhysicalDeviceObject != NULL. Case not implemented.\n"); + //FoundRightPDO = TRUE; + Status = STATUS_NOT_IMPLEMENTED; + goto cleanup; + } + + /* Enumerate subkeys (ie the different reference strings) */ + j = 0; + while (TRUE) + { + Status = ZwEnumerateKey( + DeviceKey, + j, + KeyBasicInformation, + NULL, + 0, + &Size); + if (Status == STATUS_NO_MORE_ENTRIES) + { + break; + } + else if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + ReferenceBi = ExAllocatePool(PagedPool, Size); + if (!ReferenceBi) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + Status = ZwEnumerateKey( + DeviceKey, + j++, + KeyBasicInformation, + ReferenceBi, + Size, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + KeyName.Length = KeyName.MaximumLength = ReferenceBi->NameLength; + KeyName.Buffer = ReferenceBi->Name; + if (RtlEqualUnicodeString(&KeyName, &Control, TRUE)) + { + /* Skip Control subkey */ + goto NextReferenceString; + } + + /* Open reference key */ InitializeObjectAttributes( - &ObjectAttributes, - &Control, - OBJ_CASE_INSENSITIVE, - ReferenceKey, - NULL); + &ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DeviceKey, + NULL); Status = ZwOpenKey( - &ControlKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - /* That's OK. The key doesn't exist (yet) because - * the interface is not activated. - */ - goto NextReferenceString; - } - else if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - /* FIXME: Read the Linked value - * If it doesn't exist => ERROR - * If it is not a REG_DWORD or Size != sizeof(ULONG) => ERROR - * If its value is 0, go to NextReferenceString - * At the moment, do as if it is active... - */ - DPRINT1("Checking if device is enabled is not implemented yet!\n"); - } - - /* Read the SymbolicLink string and add it into SymbolicLinkList */ - Status = ZwQueryValueKey( - ReferenceKey, - &SymbolicLink, - KeyValuePartialInformation, - NULL, - 0, - &Size); - if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) - { - DPRINT("ZwQueryValueKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - bip = ExAllocatePool(PagedPool, Size); - if (!bip) - { + &ReferenceKey, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + if (!(Flags & DEVICE_INTERFACE_INCLUDE_NONACTIVE)) + { + /* We have to check if the interface is enabled, by + * reading the Linked value in the Control subkey + */ + InitializeObjectAttributes( + &ObjectAttributes, + &Control, + OBJ_CASE_INSENSITIVE, + ReferenceKey, + NULL); + Status = ZwOpenKey( + &ControlKey, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* That's OK. The key doesn't exist (yet) because + * the interface is not activated. + */ + goto NextReferenceString; + } + else if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + /* FIXME: Read the Linked value + * If it doesn't exist => ERROR + * If it is not a REG_DWORD or Size != sizeof(ULONG) => ERROR + * If its value is 0, go to NextReferenceString + * At the moment, do as if it is active... + */ + DPRINT1("Checking if device is enabled is not implemented yet!\n"); + } + + /* Read the SymbolicLink string and add it into SymbolicLinkList */ + Status = ZwQueryValueKey( + ReferenceKey, + &SymbolicLink, + KeyValuePartialInformation, + NULL, + 0, + &Size); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT("ZwQueryValueKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + bip = ExAllocatePool(PagedPool, Size); + if (!bip) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + Status = ZwQueryValueKey( + ReferenceKey, + &SymbolicLink, + KeyValuePartialInformation, + bip, + Size, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwQueryValueKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + else if (bip->Type != REG_SZ) + { + DPRINT("Unexpected registry type 0x%lx (expected 0x%lx)\n", bip->Type, REG_SZ); + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + else if (bip->DataLength < 5 * sizeof(WCHAR)) + { + DPRINT("Registry string too short (length %lu, expected %lu at least)\n", bip->DataLength < 5 * sizeof(WCHAR)); + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + KeyName.Length = KeyName.MaximumLength = bip->DataLength - 4 * sizeof(WCHAR); + KeyName.Buffer = &((PWSTR)bip->Data)[4]; + if (KeyName.Length && KeyName.Buffer[KeyName.Length / sizeof(WCHAR)] == UNICODE_NULL) + { + /* Remove trailing NULL */ + KeyName.Length -= sizeof(WCHAR); + } + + /* Add new symbolic link to symbolic link list */ + if (ReturnBuffer.Length + KeyName.Length + sizeof(WCHAR) > ReturnBuffer.MaximumLength) + { + PWSTR NewBuffer; + ReturnBuffer.MaximumLength = max(ReturnBuffer.MaximumLength * 2, ReturnBuffer.Length + KeyName.Length + 2 * sizeof(WCHAR)); + NewBuffer = ExAllocatePool(PagedPool, ReturnBuffer.MaximumLength); + if (!NewBuffer) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); + ExFreePool(ReturnBuffer.Buffer); + ReturnBuffer.Buffer = NewBuffer; + } + DPRINT("Adding symbolic link %wZ\n", &KeyName); + Status = RtlAppendUnicodeStringToString(&ReturnBuffer, &KeyName); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + /* RtlAppendUnicodeStringToString added a NULL at the end of the + * destination string, but didn't increase the Length field. + * Do it for it. + */ + ReturnBuffer.Length += sizeof(WCHAR); + +NextReferenceString: + ExFreePool(ReferenceBi); + ReferenceBi = NULL; + ExFreePool(bip); + bip = NULL; + if (ReferenceKey != INVALID_HANDLE_VALUE) + { + ZwClose(ReferenceKey); + ReferenceKey = INVALID_HANDLE_VALUE; + } + if (ControlKey != INVALID_HANDLE_VALUE) + { + ZwClose(ControlKey); + ControlKey = INVALID_HANDLE_VALUE; + } + } + if (FoundRightPDO) + { + /* No need to go further, as we already have found what we searched */ + break; + } + + ExFreePool(DeviceBi); + DeviceBi = NULL; + ZwClose(DeviceKey); + DeviceKey = INVALID_HANDLE_VALUE; + } + + /* Add final NULL to ReturnBuffer */ + if (ReturnBuffer.Length >= ReturnBuffer.MaximumLength) + { + PWSTR NewBuffer; + ReturnBuffer.MaximumLength += sizeof(WCHAR); + NewBuffer = ExAllocatePool(PagedPool, ReturnBuffer.MaximumLength); + if (!NewBuffer) + { DPRINT("ExAllocatePool() failed\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; - } - Status = ZwQueryValueKey( - ReferenceKey, - &SymbolicLink, - KeyValuePartialInformation, - bip, - Size, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwQueryValueKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - else if (bip->Type != REG_SZ) - { - DPRINT("Unexpected registry type 0x%lx (expected 0x%lx)\n", bip->Type, REG_SZ); - Status = STATUS_UNSUCCESSFUL; - goto cleanup; - } - else if (bip->DataLength < 5 * sizeof(WCHAR)) - { - DPRINT("Registry string too short (length %lu, expected %lu at least)\n", bip->DataLength < 5 * sizeof(WCHAR)); - Status = STATUS_UNSUCCESSFUL; - goto cleanup; - } - KeyName.Length = KeyName.MaximumLength = bip->DataLength - 4 * sizeof(WCHAR); - KeyName.Buffer = &((PWSTR)bip->Data)[4]; - if (KeyName.Length && KeyName.Buffer[KeyName.Length / sizeof(WCHAR)] == UNICODE_NULL) - /* Remove trailing NULL */ - KeyName.Length -= sizeof(WCHAR); - - /* Add new symbolic link to symbolic link list */ - if (ReturnBuffer.Length + KeyName.Length + sizeof(WCHAR) > ReturnBuffer.MaximumLength) - { - PWSTR NewBuffer; - ReturnBuffer.MaximumLength = max(ReturnBuffer.MaximumLength * 2, ReturnBuffer.Length + KeyName.Length + 2 * sizeof(WCHAR)); - NewBuffer = ExAllocatePool(PagedPool, ReturnBuffer.MaximumLength); - if (!NewBuffer) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); - ExFreePool(ReturnBuffer.Buffer); - ReturnBuffer.Buffer = NewBuffer; - } - DPRINT("Adding symbolic link %wZ\n", &KeyName); - Status = RtlAppendUnicodeStringToString(&ReturnBuffer, &KeyName); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); - goto cleanup; - } - /* RtlAppendUnicodeStringToString added a NULL at the end of the - * destination string, but didn't increase the Length field. - * Do it for it. - */ - ReturnBuffer.Length += sizeof(WCHAR); - -NextReferenceString: - ExFreePool(ReferenceBi); - ReferenceBi = NULL; - ExFreePool(bip); - bip = NULL; - if (ReferenceKey != INVALID_HANDLE_VALUE) - { - ZwClose(ReferenceKey); - ReferenceKey = INVALID_HANDLE_VALUE; - } - if (ControlKey != INVALID_HANDLE_VALUE) - { - ZwClose(ControlKey); - ControlKey = INVALID_HANDLE_VALUE; - } - } - if (FoundRightPDO) - { - /* No need to go further, as we already have found what we searched */ - break; - } - - ExFreePool(DeviceBi); - DeviceBi = NULL; - ZwClose(DeviceKey); - DeviceKey = INVALID_HANDLE_VALUE; - } - - /* Add final NULL to ReturnBuffer */ - if (ReturnBuffer.Length >= ReturnBuffer.MaximumLength) - { - PWSTR NewBuffer; - ReturnBuffer.MaximumLength += sizeof(WCHAR); - NewBuffer = ExAllocatePool(PagedPool, ReturnBuffer.MaximumLength); - if (!NewBuffer) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); - ExFreePool(ReturnBuffer.Buffer); - ReturnBuffer.Buffer = NewBuffer; - } - ReturnBuffer.Buffer[ReturnBuffer.Length / sizeof(WCHAR)] = UNICODE_NULL; - *SymbolicLinkList = ReturnBuffer.Buffer; - Status = STATUS_SUCCESS; + } + RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); + ExFreePool(ReturnBuffer.Buffer); + ReturnBuffer.Buffer = NewBuffer; + } + ReturnBuffer.Buffer[ReturnBuffer.Length / sizeof(WCHAR)] = UNICODE_NULL; + *SymbolicLinkList = ReturnBuffer.Buffer; + Status = STATUS_SUCCESS; cleanup: - if (!NT_SUCCESS(Status)) - ExFreePool(ReturnBuffer.Buffer); - if (InterfaceKey != INVALID_HANDLE_VALUE) - ZwClose(InterfaceKey); - if (DeviceKey != INVALID_HANDLE_VALUE) - ZwClose(DeviceKey); - if (ReferenceKey != INVALID_HANDLE_VALUE) - ZwClose(ReferenceKey); - if (ControlKey != INVALID_HANDLE_VALUE) - ZwClose(ControlKey); - ExFreePool(DeviceBi); - ExFreePool(ReferenceBi); - ExFreePool(bip); - return Status; + if (!NT_SUCCESS(Status)) + ExFreePool(ReturnBuffer.Buffer); + if (InterfaceKey != INVALID_HANDLE_VALUE) + ZwClose(InterfaceKey); + if (DeviceKey != INVALID_HANDLE_VALUE) + ZwClose(DeviceKey); + if (ReferenceKey != INVALID_HANDLE_VALUE) + ZwClose(ReferenceKey); + if (ControlKey != INVALID_HANDLE_VALUE) + ZwClose(ControlKey); + ExFreePool(DeviceBi); + ExFreePool(ReferenceBi); + ExFreePool(bip); + return Status; } -/* +/*++ + * @name IoRegisterDeviceInterface * @implemented - */ - -NTSTATUS STDCALL -IoRegisterDeviceInterface( - IN PDEVICE_OBJECT PhysicalDeviceObject, - IN CONST GUID *InterfaceClassGuid, - IN PUNICODE_STRING ReferenceString OPTIONAL, - OUT PUNICODE_STRING SymbolicLinkName) + * + * Registers a device interface class, if it has not been previously registered, + * and creates a new instance of the interface class, which a driver can + * subsequently enable for use by applications or other system components. + * Documented in WDK. + * + * @param PhysicalDeviceObject + * Points to an optional PDO that narrows the search to only the + * device interfaces of the device represented by the PDO + * + * @param InterfaceClassGuid + * Points to a class GUID specifying the device interface class + * + * @param ReferenceString + * Optional parameter, pointing to a unicode string. For a full + * description of this rather rarely used param (usually drivers + * pass NULL here) see WDK + * + * @param SymbolicLinkName + * Pointer to the resulting unicode string + * + * @return Usual NTSTATUS + * + * @remarks Must be called at IRQL = PASSIVE_LEVEL in the context of a + * system thread + * + *--*/ +NTSTATUS +NTAPI +IoRegisterDeviceInterface(IN PDEVICE_OBJECT PhysicalDeviceObject, + IN CONST GUID *InterfaceClassGuid, + IN PUNICODE_STRING ReferenceString OPTIONAL, + OUT PUNICODE_STRING SymbolicLinkName) { - PUNICODE_STRING InstancePath; - UNICODE_STRING GuidString; - UNICODE_STRING SubKeyName; - UNICODE_STRING InterfaceKeyName; - UNICODE_STRING BaseKeyName; - UCHAR PdoNameInfoBuffer[sizeof(OBJECT_NAME_INFORMATION) + (256 * sizeof(WCHAR))]; - POBJECT_NAME_INFORMATION PdoNameInfo = (POBJECT_NAME_INFORMATION)PdoNameInfoBuffer; - UNICODE_STRING DeviceInstance = RTL_CONSTANT_STRING(L"DeviceInstance"); - UNICODE_STRING SymbolicLink = RTL_CONSTANT_STRING(L"SymbolicLink"); - HANDLE ClassKey; - HANDLE InterfaceKey; - HANDLE SubKey; - ULONG StartIndex; - OBJECT_ATTRIBUTES ObjectAttributes; - ULONG i; - NTSTATUS Status; - - ASSERT_IRQL(PASSIVE_LEVEL); - - if (!(PhysicalDeviceObject->Flags & DO_BUS_ENUMERATED_DEVICE)) - { - DPRINT("PhysicalDeviceObject 0x%p is not a valid Pdo\n", PhysicalDeviceObject); - return STATUS_INVALID_PARAMETER_1; - } - - Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlStringFromGUID() failed with status 0x%08lx\n", Status); - return Status; - } - - /* Create Pdo name: \Device\xxxxxxxx (unnamed device) */ - Status = ObQueryNameString( - PhysicalDeviceObject, - PdoNameInfo, - sizeof(PdoNameInfoBuffer), - &i); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObQueryNameString() failed with status 0x%08lx\n", Status); - return Status; - } - ASSERT(PdoNameInfo->Name.Length); - - /* Create base key name for this interface: HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{GUID} */ - ASSERT(((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode); - InstancePath = &((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode->InstancePath; - BaseKeyName.Length = wcslen(BaseKeyString) * sizeof(WCHAR); - BaseKeyName.MaximumLength = BaseKeyName.Length - + GuidString.Length; - BaseKeyName.Buffer = ExAllocatePool( - PagedPool, - BaseKeyName.MaximumLength); - if (!BaseKeyName.Buffer) - { - DPRINT("ExAllocatePool() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - wcscpy(BaseKeyName.Buffer, BaseKeyString); - RtlAppendUnicodeStringToString(&BaseKeyName, &GuidString); - - /* Create BaseKeyName key in registry */ - InitializeObjectAttributes( - &ObjectAttributes, - &BaseKeyName, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_OPENIF, - NULL, /* RootDirectory */ - NULL); /* SecurityDescriptor */ - - Status = ZwCreateKey( - &ClassKey, - KEY_WRITE, - &ObjectAttributes, - 0, /* TileIndex */ - NULL, /* Class */ - REG_OPTION_VOLATILE, - NULL); /* Disposition */ - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); - ExFreePool(BaseKeyName.Buffer); - return Status; - } - - /* Create key name for this interface: ##?#ACPI#PNP0501#1#{GUID} */ - InterfaceKeyName.Length = 0; - InterfaceKeyName.MaximumLength = - 4 * sizeof(WCHAR) + /* 4 = size of ##?# */ - InstancePath->Length + - sizeof(WCHAR) + /* 1 = size of # */ - GuidString.Length; - InterfaceKeyName.Buffer = ExAllocatePool( - PagedPool, - InterfaceKeyName.MaximumLength); - if (!InterfaceKeyName.Buffer) - { - DPRINT("ExAllocatePool() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlAppendUnicodeToString(&InterfaceKeyName, L"##?#"); - StartIndex = InterfaceKeyName.Length / sizeof(WCHAR); - RtlAppendUnicodeStringToString(&InterfaceKeyName, InstancePath); - for (i = 0; i < InstancePath->Length / sizeof(WCHAR); i++) - { - if (InterfaceKeyName.Buffer[StartIndex + i] == '\\') - InterfaceKeyName.Buffer[StartIndex + i] = '#'; - } - RtlAppendUnicodeToString(&InterfaceKeyName, L"#"); - RtlAppendUnicodeStringToString(&InterfaceKeyName, &GuidString); - - /* Create the interface key in registry */ - InitializeObjectAttributes( - &ObjectAttributes, - &InterfaceKeyName, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_OPENIF, - ClassKey, - NULL); /* SecurityDescriptor */ - - Status = ZwCreateKey( - &InterfaceKey, - KEY_WRITE, - &ObjectAttributes, - 0, /* TileIndex */ - NULL, /* Class */ - REG_OPTION_VOLATILE, - NULL); /* Disposition */ - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); - ZwClose(ClassKey); - ExFreePool(BaseKeyName.Buffer); - return Status; - } - - /* Write DeviceInstance entry. Value is InstancePath */ - Status = ZwSetValueKey( - InterfaceKey, - &DeviceInstance, - 0, /* TileIndex */ - REG_SZ, - InstancePath->Buffer, - InstancePath->Length); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); - ZwClose(InterfaceKey); - ZwClose(ClassKey); - ExFreePool(InterfaceKeyName.Buffer); - ExFreePool(BaseKeyName.Buffer); - return Status; - } - - /* Create subkey. Name is #ReferenceString */ - SubKeyName.Length = 0; - SubKeyName.MaximumLength = sizeof(WCHAR); - if (ReferenceString && ReferenceString->Length) - SubKeyName.MaximumLength += ReferenceString->Length; - SubKeyName.Buffer = ExAllocatePool( - PagedPool, - SubKeyName.MaximumLength); - if (!SubKeyName.Buffer) - { - DPRINT("ExAllocatePool() failed\n"); - ZwClose(InterfaceKey); - ZwClose(ClassKey); - ExFreePool(InterfaceKeyName.Buffer); - ExFreePool(BaseKeyName.Buffer); - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlAppendUnicodeToString(&SubKeyName, L"#"); - if (ReferenceString && ReferenceString->Length) - RtlAppendUnicodeStringToString(&SubKeyName, ReferenceString); - - /* Create SubKeyName key in registry */ - InitializeObjectAttributes( - &ObjectAttributes, - &SubKeyName, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - InterfaceKey, /* RootDirectory */ - NULL); /* SecurityDescriptor */ - - Status = ZwCreateKey( - &SubKey, - KEY_WRITE, - &ObjectAttributes, - 0, /* TileIndex */ - NULL, /* Class */ - REG_OPTION_VOLATILE, - NULL); /* Disposition */ - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); - ZwClose(InterfaceKey); - ZwClose(ClassKey); - ExFreePool(InterfaceKeyName.Buffer); - ExFreePool(BaseKeyName.Buffer); - return Status; - } - - /* Create symbolic link name: \??\ACPI#PNP0501#1#{GUID}\ReferenceString */ - SymbolicLinkName->Length = 0; - SymbolicLinkName->MaximumLength = SymbolicLinkName->Length - + 4 * sizeof(WCHAR) /* 4 = size of \??\ */ - + InstancePath->Length - + sizeof(WCHAR) /* 1 = size of # */ - + GuidString.Length - + sizeof(WCHAR); /* final NULL */ - if (ReferenceString && ReferenceString->Length) - SymbolicLinkName->MaximumLength += sizeof(WCHAR) + ReferenceString->Length; - SymbolicLinkName->Buffer = ExAllocatePool( - PagedPool, - SymbolicLinkName->MaximumLength); - if (!SymbolicLinkName->Buffer) - { - DPRINT("ExAllocatePool() failed\n"); - ZwClose(SubKey); - ZwClose(InterfaceKey); - ZwClose(ClassKey); - ExFreePool(InterfaceKeyName.Buffer); - ExFreePool(SubKeyName.Buffer); - ExFreePool(BaseKeyName.Buffer); - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlAppendUnicodeToString(SymbolicLinkName, L"\\??\\"); - StartIndex = SymbolicLinkName->Length / sizeof(WCHAR); - RtlAppendUnicodeStringToString(SymbolicLinkName, InstancePath); - for (i = 0; i < InstancePath->Length / sizeof(WCHAR); i++) - { - if (SymbolicLinkName->Buffer[StartIndex + i] == '\\') - SymbolicLinkName->Buffer[StartIndex + i] = '#'; - } - RtlAppendUnicodeToString(SymbolicLinkName, L"#"); - RtlAppendUnicodeStringToString(SymbolicLinkName, &GuidString); - if (ReferenceString && ReferenceString->Length) - { - RtlAppendUnicodeToString(SymbolicLinkName, L"\\"); - RtlAppendUnicodeStringToString(SymbolicLinkName, ReferenceString); - } - SymbolicLinkName->Buffer[SymbolicLinkName->Length/sizeof(WCHAR)] = L'\0'; - - /* Create symbolic link */ - DPRINT("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); - Status = IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); - if (!NT_SUCCESS(Status)) - { - DPRINT("IoCreateSymbolicLink() failed with status 0x%08lx\n", Status); - ZwClose(SubKey); - ZwClose(InterfaceKey); - ZwClose(ClassKey); - ExFreePool(SubKeyName.Buffer); - ExFreePool(InterfaceKeyName.Buffer); - ExFreePool(BaseKeyName.Buffer); - ExFreePool(SymbolicLinkName->Buffer); - return Status; - } - - /* Write symbolic link name in registry */ - SymbolicLinkName->Buffer[1] = '\\'; - Status = ZwSetValueKey( - SubKey, - &SymbolicLink, - 0, /* TileIndex */ - REG_SZ, - SymbolicLinkName->Buffer, - SymbolicLinkName->Length); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); - ExFreePool(SymbolicLinkName->Buffer); - } - - /* Remove \\?\ at the start of symbolic link name */ - SymbolicLinkName->Length -= 4 * sizeof(WCHAR); - SymbolicLinkName->MaximumLength -= 4 * sizeof(WCHAR); - RtlMoveMemory( - SymbolicLinkName->Buffer, - &SymbolicLinkName->Buffer[4], - SymbolicLinkName->Length); - - ZwClose(SubKey); - ZwClose(InterfaceKey); - ZwClose(ClassKey); - ExFreePool(SubKeyName.Buffer); - ExFreePool(InterfaceKeyName.Buffer); - ExFreePool(BaseKeyName.Buffer); - - return Status; + PUNICODE_STRING InstancePath; + UNICODE_STRING GuidString; + UNICODE_STRING SubKeyName; + UNICODE_STRING InterfaceKeyName; + UNICODE_STRING BaseKeyName; + UCHAR PdoNameInfoBuffer[sizeof(OBJECT_NAME_INFORMATION) + (256 * sizeof(WCHAR))]; + POBJECT_NAME_INFORMATION PdoNameInfo = (POBJECT_NAME_INFORMATION)PdoNameInfoBuffer; + UNICODE_STRING DeviceInstance = RTL_CONSTANT_STRING(L"DeviceInstance"); + UNICODE_STRING SymbolicLink = RTL_CONSTANT_STRING(L"SymbolicLink"); + HANDLE ClassKey; + HANDLE InterfaceKey; + HANDLE SubKey; + ULONG StartIndex; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG i; + NTSTATUS Status; + + ASSERT_IRQL(PASSIVE_LEVEL); + + if (!(PhysicalDeviceObject->Flags & DO_BUS_ENUMERATED_DEVICE)) + { + DPRINT("PhysicalDeviceObject 0x%p is not a valid Pdo\n", PhysicalDeviceObject); + return STATUS_INVALID_PARAMETER_1; + } + + Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlStringFromGUID() failed with status 0x%08lx\n", Status); + return Status; + } + + /* Create Pdo name: \Device\xxxxxxxx (unnamed device) */ + Status = ObQueryNameString( + PhysicalDeviceObject, + PdoNameInfo, + sizeof(PdoNameInfoBuffer), + &i); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObQueryNameString() failed with status 0x%08lx\n", Status); + return Status; + } + ASSERT(PdoNameInfo->Name.Length); + + /* Create base key name for this interface: HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{GUID} */ + ASSERT(((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode); + InstancePath = &((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode->InstancePath; + BaseKeyName.Length = wcslen(BaseKeyString) * sizeof(WCHAR); + BaseKeyName.MaximumLength = BaseKeyName.Length + + GuidString.Length; + BaseKeyName.Buffer = ExAllocatePool( + PagedPool, + BaseKeyName.MaximumLength); + if (!BaseKeyName.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + wcscpy(BaseKeyName.Buffer, BaseKeyString); + RtlAppendUnicodeStringToString(&BaseKeyName, &GuidString); + + /* Create BaseKeyName key in registry */ + InitializeObjectAttributes( + &ObjectAttributes, + &BaseKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_OPENIF, + NULL, /* RootDirectory */ + NULL); /* SecurityDescriptor */ + + Status = ZwCreateKey( + &ClassKey, + KEY_WRITE, + &ObjectAttributes, + 0, /* TileIndex */ + NULL, /* Class */ + REG_OPTION_VOLATILE, + NULL); /* Disposition */ + + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + ExFreePool(BaseKeyName.Buffer); + return Status; + } + + /* Create key name for this interface: ##?#ACPI#PNP0501#1#{GUID} */ + InterfaceKeyName.Length = 0; + InterfaceKeyName.MaximumLength = + 4 * sizeof(WCHAR) + /* 4 = size of ##?# */ + InstancePath->Length + + sizeof(WCHAR) + /* 1 = size of # */ + GuidString.Length; + InterfaceKeyName.Buffer = ExAllocatePool( + PagedPool, + InterfaceKeyName.MaximumLength); + if (!InterfaceKeyName.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlAppendUnicodeToString(&InterfaceKeyName, L"##?#"); + StartIndex = InterfaceKeyName.Length / sizeof(WCHAR); + RtlAppendUnicodeStringToString(&InterfaceKeyName, InstancePath); + for (i = 0; i < InstancePath->Length / sizeof(WCHAR); i++) + { + if (InterfaceKeyName.Buffer[StartIndex + i] == '\\') + InterfaceKeyName.Buffer[StartIndex + i] = '#'; + } + RtlAppendUnicodeToString(&InterfaceKeyName, L"#"); + RtlAppendUnicodeStringToString(&InterfaceKeyName, &GuidString); + + /* Create the interface key in registry */ + InitializeObjectAttributes( + &ObjectAttributes, + &InterfaceKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_OPENIF, + ClassKey, + NULL); /* SecurityDescriptor */ + + Status = ZwCreateKey( + &InterfaceKey, + KEY_WRITE, + &ObjectAttributes, + 0, /* TileIndex */ + NULL, /* Class */ + REG_OPTION_VOLATILE, + NULL); /* Disposition */ + + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + ZwClose(ClassKey); + ExFreePool(BaseKeyName.Buffer); + return Status; + } + + /* Write DeviceInstance entry. Value is InstancePath */ + Status = ZwSetValueKey( + InterfaceKey, + &DeviceInstance, + 0, /* TileIndex */ + REG_SZ, + InstancePath->Buffer, + InstancePath->Length); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); + ZwClose(InterfaceKey); + ZwClose(ClassKey); + ExFreePool(InterfaceKeyName.Buffer); + ExFreePool(BaseKeyName.Buffer); + return Status; + } + + /* Create subkey. Name is #ReferenceString */ + SubKeyName.Length = 0; + SubKeyName.MaximumLength = sizeof(WCHAR); + if (ReferenceString && ReferenceString->Length) + SubKeyName.MaximumLength += ReferenceString->Length; + SubKeyName.Buffer = ExAllocatePool( + PagedPool, + SubKeyName.MaximumLength); + if (!SubKeyName.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + ZwClose(InterfaceKey); + ZwClose(ClassKey); + ExFreePool(InterfaceKeyName.Buffer); + ExFreePool(BaseKeyName.Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlAppendUnicodeToString(&SubKeyName, L"#"); + if (ReferenceString && ReferenceString->Length) + RtlAppendUnicodeStringToString(&SubKeyName, ReferenceString); + + /* Create SubKeyName key in registry */ + InitializeObjectAttributes( + &ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + InterfaceKey, /* RootDirectory */ + NULL); /* SecurityDescriptor */ + + Status = ZwCreateKey( + &SubKey, + KEY_WRITE, + &ObjectAttributes, + 0, /* TileIndex */ + NULL, /* Class */ + REG_OPTION_VOLATILE, + NULL); /* Disposition */ + + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + ZwClose(InterfaceKey); + ZwClose(ClassKey); + ExFreePool(InterfaceKeyName.Buffer); + ExFreePool(BaseKeyName.Buffer); + return Status; + } + + /* Create symbolic link name: \??\ACPI#PNP0501#1#{GUID}\ReferenceString */ + SymbolicLinkName->Length = 0; + SymbolicLinkName->MaximumLength = SymbolicLinkName->Length + + 4 * sizeof(WCHAR) /* 4 = size of \??\ */ + + InstancePath->Length + + sizeof(WCHAR) /* 1 = size of # */ + + GuidString.Length + + sizeof(WCHAR); /* final NULL */ + if (ReferenceString && ReferenceString->Length) + SymbolicLinkName->MaximumLength += sizeof(WCHAR) + ReferenceString->Length; + SymbolicLinkName->Buffer = ExAllocatePool( + PagedPool, + SymbolicLinkName->MaximumLength); + if (!SymbolicLinkName->Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + ZwClose(SubKey); + ZwClose(InterfaceKey); + ZwClose(ClassKey); + ExFreePool(InterfaceKeyName.Buffer); + ExFreePool(SubKeyName.Buffer); + ExFreePool(BaseKeyName.Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlAppendUnicodeToString(SymbolicLinkName, L"\\??\\"); + StartIndex = SymbolicLinkName->Length / sizeof(WCHAR); + RtlAppendUnicodeStringToString(SymbolicLinkName, InstancePath); + for (i = 0; i < InstancePath->Length / sizeof(WCHAR); i++) + { + if (SymbolicLinkName->Buffer[StartIndex + i] == '\\') + SymbolicLinkName->Buffer[StartIndex + i] = '#'; + } + RtlAppendUnicodeToString(SymbolicLinkName, L"#"); + RtlAppendUnicodeStringToString(SymbolicLinkName, &GuidString); + if (ReferenceString && ReferenceString->Length) + { + RtlAppendUnicodeToString(SymbolicLinkName, L"\\"); + RtlAppendUnicodeStringToString(SymbolicLinkName, ReferenceString); + } + SymbolicLinkName->Buffer[SymbolicLinkName->Length/sizeof(WCHAR)] = L'\0'; + + /* Create symbolic link */ + DPRINT("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); + Status = IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoCreateSymbolicLink() failed with status 0x%08lx\n", Status); + ZwClose(SubKey); + ZwClose(InterfaceKey); + ZwClose(ClassKey); + ExFreePool(SubKeyName.Buffer); + ExFreePool(InterfaceKeyName.Buffer); + ExFreePool(BaseKeyName.Buffer); + ExFreePool(SymbolicLinkName->Buffer); + return Status; + } + + /* Write symbolic link name in registry */ + SymbolicLinkName->Buffer[1] = '\\'; + Status = ZwSetValueKey( + SubKey, + &SymbolicLink, + 0, /* TileIndex */ + REG_SZ, + SymbolicLinkName->Buffer, + SymbolicLinkName->Length); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); + ExFreePool(SymbolicLinkName->Buffer); + } + + /* Remove \\?\ at the start of symbolic link name */ + SymbolicLinkName->Length -= 4 * sizeof(WCHAR); + SymbolicLinkName->MaximumLength -= 4 * sizeof(WCHAR); + RtlMoveMemory( + SymbolicLinkName->Buffer, + &SymbolicLinkName->Buffer[4], + SymbolicLinkName->Length); + + ZwClose(SubKey); + ZwClose(InterfaceKey); + ZwClose(ClassKey); + ExFreePool(SubKeyName.Buffer); + ExFreePool(InterfaceKeyName.Buffer); + ExFreePool(BaseKeyName.Buffer); + + return Status; } -/* +/*++ + * @name IoSetDeviceInterfaceState * @implemented - */ - -NTSTATUS STDCALL -IoSetDeviceInterfaceState( - IN PUNICODE_STRING SymbolicLinkName, - IN BOOLEAN Enable) + * + * Enables or disables an instance of a previously registered device + * interface class. + * Documented in WDK. + * + * @param SymbolicLinkName + * Pointer to the string identifying instance to enable or disable + * + * @param Enable + * TRUE = enable, FALSE = disable + * + * @return Usual NTSTATUS + * + * @remarks Must be called at IRQL = PASSIVE_LEVEL in the context of a + * system thread + * + *--*/ +NTSTATUS +NTAPI +IoSetDeviceInterfaceState(IN PUNICODE_STRING SymbolicLinkName, + IN BOOLEAN Enable) { - PDEVICE_OBJECT PhysicalDeviceObject; - PFILE_OBJECT FileObject; - UNICODE_STRING ObjectName; - UNICODE_STRING GuidString; - PWCHAR StartPosition; - PWCHAR EndPosition; - NTSTATUS Status; - LPCGUID EventGuid; - - if (SymbolicLinkName == NULL) - return STATUS_INVALID_PARAMETER_1; - - DPRINT("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); - - /* Symbolic link name is ACPI#PNP0501#1#{GUID}\ReferenceString */ - /* Get GUID from SymbolicLinkName */ - StartPosition = wcschr(SymbolicLinkName->Buffer, L'{'); - EndPosition = wcschr(SymbolicLinkName->Buffer, L'}'); - if (!StartPosition ||!EndPosition || StartPosition > EndPosition) - return STATUS_INVALID_PARAMETER_1; - GuidString.Buffer = StartPosition; - GuidString.MaximumLength = GuidString.Length = (ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition; - - /* Create \??\SymbolicLinkName string */ - ObjectName.Length = 0; - ObjectName.MaximumLength = SymbolicLinkName->Length + 4 * sizeof(WCHAR); - ObjectName.Buffer = ExAllocatePool(PagedPool, ObjectName.MaximumLength); - if (!ObjectName.Buffer) - return STATUS_INSUFFICIENT_RESOURCES; - RtlAppendUnicodeToString(&ObjectName, L"\\??\\"); - RtlAppendUnicodeStringToString(&ObjectName, SymbolicLinkName); - - /* Get pointer to the PDO */ - Status = IoGetDeviceObjectPointer(&ObjectName, - 0, /* DesiredAccess */ - &FileObject, - &PhysicalDeviceObject); - if (!NT_SUCCESS(Status)) - { - ExFreePool(ObjectName.Buffer); - return Status; - } - - EventGuid = Enable ? &GUID_DEVICE_INTERFACE_ARRIVAL : &GUID_DEVICE_INTERFACE_REMOVAL; - IopNotifyPlugPlayNotification( - PhysicalDeviceObject, - EventCategoryDeviceInterfaceChange, - EventGuid, - &GuidString, - (PVOID)SymbolicLinkName); - - ObDereferenceObject(FileObject); - ExFreePool(ObjectName.Buffer); - - return STATUS_SUCCESS; + PDEVICE_OBJECT PhysicalDeviceObject; + PFILE_OBJECT FileObject; + UNICODE_STRING ObjectName; + UNICODE_STRING GuidString; + PWCHAR StartPosition; + PWCHAR EndPosition; + NTSTATUS Status; + LPCGUID EventGuid; + + if (SymbolicLinkName == NULL) + return STATUS_INVALID_PARAMETER_1; + + DPRINT("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); + + /* Symbolic link name is ACPI#PNP0501#1#{GUID}\ReferenceString */ + /* Get GUID from SymbolicLinkName */ + StartPosition = wcschr(SymbolicLinkName->Buffer, L'{'); + EndPosition = wcschr(SymbolicLinkName->Buffer, L'}'); + if (!StartPosition ||!EndPosition || StartPosition > EndPosition) + return STATUS_INVALID_PARAMETER_1; + GuidString.Buffer = StartPosition; + GuidString.MaximumLength = GuidString.Length = (ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition; + + /* Create \??\SymbolicLinkName string */ + ObjectName.Length = 0; + ObjectName.MaximumLength = SymbolicLinkName->Length + 4 * sizeof(WCHAR); + ObjectName.Buffer = ExAllocatePool(PagedPool, ObjectName.MaximumLength); + if (!ObjectName.Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + RtlAppendUnicodeToString(&ObjectName, L"\\??\\"); + RtlAppendUnicodeStringToString(&ObjectName, SymbolicLinkName); + + /* Get pointer to the PDO */ + Status = IoGetDeviceObjectPointer(&ObjectName, + 0, /* DesiredAccess */ + &FileObject, + &PhysicalDeviceObject); + if (!NT_SUCCESS(Status)) + { + ExFreePool(ObjectName.Buffer); + return Status; + } + + EventGuid = Enable ? &GUID_DEVICE_INTERFACE_ARRIVAL : &GUID_DEVICE_INTERFACE_REMOVAL; + IopNotifyPlugPlayNotification( + PhysicalDeviceObject, + EventCategoryDeviceInterfaceChange, + EventGuid, + &GuidString, + (PVOID)SymbolicLinkName); + + ObDereferenceObject(FileObject); + ExFreePool(ObjectName.Buffer); + + return STATUS_SUCCESS; } /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/iomgr/deviface.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22947: Install dejavu font on livecd and bootcd and change everthing to dejavu fonts. Rember console apps can not use dejavu font for it will regress. that is the reasson we keep old bitstream fonts for now. and another problem is bitstream font is hardcode into console apps (example cmd), it have been hard code in csrss and maybe some more place.
by greatlrd＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: greatlrd Date: Sun Jul 9 00:49:55 2006 New Revision: 22947 URL: http://svn.reactos.org/svn/reactos?rev=22947&view=rev Log: Install dejavu font on livecd and bootcd and change everthing to dejavu fonts. Rember console apps can not use dejavu font for it will regress. that is the reasson we keep old bitstream fonts for now. and another problem is bitstream font is hardcode into console apps (example cmd), it have been hard code in csrss and maybe some more place. Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Sun Jul 9 00:49:55 2006 @@ -37,15 +37,15 @@ ; Font substitutes ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Bitstream Vera Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"Bitstream Vera Sans Mono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"DejaVu Vera Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"DejaVu Vera Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Marlett",0x00000000,"TGMarlett" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Bitstream Vera Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Bitstream Vera Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Bitstream Vera Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Bitstream Vera Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Bitstream Vera Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Bitstream Vera Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"DejaVu Vera Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"DejaVu Vera Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Vera Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Vera Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Vera Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"DejaVu Vera Sans" ; Time zone settings HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sun Jul 9 00:49:55 2006 @@ -57,6 +57,7 @@ ;base\applications\reporterror\reporterror.exe 1 base\applications\sc\sc.exe 1 base\applications\screenshot\screenshot.exe 1 +base\applications\screensavers\matrix\matrix.scr 1 base\applications\servman\servman.exe 1 base\applications\shutdown\shutdown.exe 1 ;base\applications\sm\sm.exe 1 @@ -267,6 +268,26 @@ drivers\video\videoprt\videoprt.sys 2 ; Media +media\fonts\DejaVuSans.ttf 3 +media\fonts\DejaVuSans-Bold.ttf 3 +media\fonts\DejaVuSans-BoldOblique.ttf 3 +media\fonts\DejaVuSansCondensed.ttf 3 +media\fonts\DejaVuSansCondensed-Bold.ttf 3 +media\fonts\DejaVuSansCondensed-Oblique.ttf 3 +media\fonts\DejaVuSans-ExtraLight.ttf 3 +media\fonts\DejaVuSansMono.ttf 3 +media\fonts\DejaVuSansMono-Bold.ttf 3 +media\fonts\DejaVuSansMono-BoldOblique.ttf 3 +media\fonts\DejaVuSansMono-Oblique.ttf 3 +media\fonts\DejaVuSans-Oblique.ttf 3 +media\fonts\DejaVuSerif.ttf 3 +media\fonts\DejaVuSerif-Bold.ttf 3 +media\fonts\DejaVuSerif-BoldOblique.ttf 3 +media\fonts\DejaVuSerifCondensed.ttf 3 +media\fonts\DejaVuSerifCondensed-Bold.ttf 3 +media\fonts\DejaVuSerifCondensed-BoldOblique.ttf 3 +media\fonts\DejaVuSerifCondensed-Oblique.ttf 3 +media\fonts\DejaVuSerif-Oblique.ttf 3 media\fonts\c0419bt_.ttf 3 media\fonts\c0582bt_.ttf 3 media\fonts\c0583bt_.ttf 3

1 0

[greatlrd] 22946: fixing last bug for jolite file names. now we can use so long file name we like. I was force fixing this bug for getting dejavu font to be install on livecd I was hopping some else have fixing this long standing bug.
by greatlrd＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: greatlrd Date: Sun Jul 9 00:45:33 2006 New Revision: 22946 URL: http://svn.reactos.org/svn/reactos?rev=22946&view=rev Log: fixing last bug for jolite file names. now we can use so long file name we like. I was force fixing this bug for getting dejavu font to be install on livecd I was hopping some else have fixing this long standing bug. Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c (original) +++ trunk/reactos/tools/cdmake/cdmake.c Sun Jul 9 00:45:33 2006 @@ -1077,12 +1077,19 @@ { if (d != &root) { - get_file_specifications(d->parent); - append_string_to_source(d->name); + get_file_specifications(d->parent); + if (d->joliet_name == NULL) + append_string_to_source(d->name); + else + append_string_to_source(d->joliet_name); + if (((d->flags & DIRECTORY_FLAG) == 0 || joliet) && d->extension[0] != 0) { - *end_source++ = '.'; - append_string_to_source(d->extension); + if (d->joliet_name == NULL) + { + *end_source++ = '.'; + append_string_to_source(d->extension); + } } if (d->flags & DIRECTORY_FLAG) *end_source++ = DIR_SEPARATOR_CHAR;

1 0

[cwittich] 22945: -fixed msvc errors
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sun Jul 9 00:32:22 2006 New Revision: 22945 URL: http://svn.reactos.org/svn/reactos?rev=22945&view=rev Log: -fixed msvc errors Modified: trunk/reactos/dll/win32/devmgr/De.rc trunk/reactos/dll/win32/devmgr/Es.rc trunk/reactos/dll/win32/devmgr/Hu.rc trunk/reactos/dll/win32/devmgr/Pl.rc trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/precomp.h trunk/reactos/dll/win32/devmgr/stubs.c Modified: trunk/reactos/dll/win32/devmgr/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/De.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/devmgr/De.rc (original) +++ trunk/reactos/dll/win32/devmgr/De.rc Sun Jul 9 00:32:22 2006 @@ -69,16 +69,13 @@ IDS_DEV_NO_VALID_LOG_CONF "ReactOS kann die Ressourcen für dieses Gerät nicht feststellen." IDS_DEV_FAILED_INSTALL "Die Treiber für dieses Gerät sind nicht installiert." IDS_DEV_HARDWARE_DISABLED "Dieses Gerät ist deaktiviert, weil das BIOS für dieses Gerät ihm keine Ressourcen zugeteilt hat." - IDS_DEV_CANT_SHARE_IRQ "Dieses Gerät benutzt einen Interrupt (IRQ), der bereits von einem anderen Gerät benutzt wird und nicht geteilt werden kann. "\ - "Sie müssen die kollidierenden Einstellungen ändern, oder den real-mode Treiber entfernen, der den Konflikt verursacht." + IDS_DEV_CANT_SHARE_IRQ "Dieses Gerät benutzt einen Interrupt (IRQ), der bereits von einem anderen Gerät benutzt wird und nicht geteilt werden kann. Sie müssen die kollidierenden Einstellungen ändern, oder den real-mode Treiber entfernen, der den Konflikt verursacht." IDS_DEV_FAILED_ADD "Dieses Gerät arbeitet nicht korrekt, weil $1 nicht korrekt funktioniert." IDS_DEV_DISABLED_SERVICE "ReactOS kann die Treiber für dieses Gerät nicht installieren, weil auf das (Netz-)Laufwerk, auf dem die Installationsdateien abgelegt sind, nicht zugegriffen werden kann." IDS_DEV_TRANSLATION_FAILED "Dieses Gerät reagiert nicht auf seinen Treiber." - IDS_DEV_NO_SOFTCONFIG "ReactOS kann die Einstellungen für dieses Gerät nicht feststellen. Lesen sie die Dokumentation, die mit diesem Gerät kam und benutzen sie den Reiter \"Ressourcen\" umd die Konfiguration vorzunehmen." - IDS_DEV_BIOS_TABLE "Die System-Firmware ihres Computers beinhaltet nicht genug Information um dieses Gerät korrekt konfigurieren und benutzen zu können. "\ - "Um dieses Gerät benutzen zu können, kontaktieren sie bitte ihren Computerhersteller um ein Firmware oder BIOS update zu erhalten." - IDS_DEV_IRQ_TRANSLATION_FAILED "Dieses Gerät beantragt einen PCI-Interrupt, ist aber für einen ISA-Interrupt konfiguriert (oder andersherum). "\ - "Bitte benutzen sie das System-Setup Programm dieses Computers, um den Interrupt für dieses Gerät neu zu konfigurieren." + IDS_DEV_NO_SOFTCONFIG "ReactOS kann die Einstellungen für dieses Gerät nicht feststellen. Lesen sie die Dokumentation, die mit diesem Gerät kam und benutzen sie den Reiter ""Ressourcen"" umd die Konfiguration vorzunehmen." + IDS_DEV_BIOS_TABLE "Die System-Firmware ihres Computers beinhaltet nicht genug Information um dieses Gerät korrekt konfigurieren und benutzen zu können. Um dieses Gerät benutzen zu können, kontaktieren sie bitte ihren Computerhersteller um ein Firmware oder BIOS update zu erhalten." + IDS_DEV_IRQ_TRANSLATION_FAILED "Dieses Gerät beantragt einen PCI-Interrupt, ist aber für einen ISA-Interrupt konfiguriert (oder andersherum). Bitte benutzen sie das System-Setup Programm dieses Computers, um den Interrupt für dieses Gerät neu zu konfigurieren." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kann den Gerätetreiber für dieses Gerät nicht initialisieren." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS kann den Gerätetreiber für dieses Gerät nicht laden, weil eine noch frühere Instanz des Gerätetreibers im Speicher ist." IDS_DEV_DRIVER_FAILED_LOAD "Der Gerätetreiber für diese Hardware kann nicht geladen werden. Der Treiber ist möglicherweise beschädigt oder nicht vorhanden." @@ -89,7 +86,7 @@ IDS_DEV_HALTED "Eine Anwendung oder ein Dienst hat dieses Gerät heruntergefahren." IDS_DEV_PHANTOM "Dieses Gerät ist momentan nicht mit dem Computer verbunden." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS kann auf dieses Gerät nicht zugreifen, weil das Betriebssystem heruntergefahren wird." - IDS_DEV_HELD_FOR_EJECT "ReactOS kann dieses Gerät nicht benutzen, weil es für \"Sicheres Entfernen\" vorbereitet wurde, aber es wurde bisher nicht vom Computer entfernt." + IDS_DEV_HELD_FOR_EJECT "ReactOS kann dieses Gerät nicht benutzen, weil es für ""Sicheres Entfernen"" vorbereitet wurde, aber es wurde bisher nicht vom Computer entfernt." IDS_DEV_DRIVER_BLOCKED "Die Ausführung der Software für dieses Gerät wurde blockiert, weil bekannt ist, dass sie Probleme mit ReactOS hat. Kontaktieren sie den Hersteller für einen neuen Treiber." IDS_DEV_REGISTRY_TOO_LARGE "Die neuen Hardwaregeräte können nicht gestartet werden, da die Systemstruktur zu groß ist (die Struktur überschreitet die Registrierungsgrößenbeschränkung)." IDS_DEV_SETPROPERTIES_FAILED "ReactOS konnte die Einstellungen für dieses Gerät nicht verändern." Modified: trunk/reactos/dll/win32/devmgr/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/Es.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/devmgr/Es.rc (original) +++ trunk/reactos/dll/win32/devmgr/Es.rc Sun Jul 9 00:32:22 2006 @@ -65,16 +65,13 @@ IDS_DEV_NO_VALID_LOG_CONF "ReactOS no puede especificar los recursos para este dispositivo." IDS_DEV_FAILED_INSTALL "Los drivers para este dispositivo no están instalados." IDS_DEV_HARDWARE_DISABLED "Este dispositivo es desabilitado porque el BIOS para el dispositivo no le dio ningun recurso." - IDS_DEV_CANT_SHARE_IRQ "Este dispositivo está utilizando un recurso de la petición de interrupción (IRQ) que usa otro dispositivo y no puede ser compartido." \ - "Usted debe cambiar la opción que esta confligiendo o remover el real-mode driver que causa el conflicto." + IDS_DEV_CANT_SHARE_IRQ "Este dispositivo está utilizando un recurso de la petición de interrupción (IRQ) que usa otro dispositivo y no puede ser compartido. Usted debe cambiar la opción que esta confligiendo o remover el real-mode driver que causa el conflicto." IDS_DEV_FAILED_ADD "Este dispositivo no está funcionando correctamente porque $1 no está trabajando correctamente." IDS_DEV_DISABLED_SERVICE "ReactOS no puede instalar los drivers para este dispositivo porque no se puede accesar el disco o la localización en la red que tiene los archivos de instalación." IDS_DEV_TRANSLATION_FAILED "Este dispositivo no responde a su driver." IDS_DEV_NO_SOFTCONFIG "ReactOS no puede determinar las propiedades de este dispositivo. Consulte la documentación que vino con este dispositivo y utiliza la lengüeta del recurso para fijar la configuración correcta." - IDS_DEV_BIOS_TABLE "Los soportes lógicos inalterables del sistema(firmware) no incluyen suficiente información para configurar correctamente y utilizar este dispositivo" \ - "Para utilizar este dispositivo, entre en contacto con su fabricante de computadora para obtener una actualización del BIOS." - IDS_DEV_IRQ_TRANSLATION_FAILED "Este dispocitivo esta pidiendo un interruptor PC pero es configurado para interruptor ISA (o vice versa). "\ - "Por favor utilize el programa de configuración del BIOS para reconfigurar el interruptor para este dispositivo." + IDS_DEV_BIOS_TABLE "Los soportes lógicos inalterables del sistema(firmware) no incluyen suficiente información para configurar correctamente y utilizar este dispositivo Para utilizar este dispositivo, entre en contacto con su fabricante de computadora para obtener una actualización del BIOS." + IDS_DEV_IRQ_TRANSLATION_FAILED "Este dispocitivo esta pidiendo un interruptor PC pero es configurado para interruptor ISA (o vice versa). Por favor utilize el programa de configuración del BIOS para reconfigurar el interruptor para este dispositivo." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS no puede inicializar el driver de dispositivo para este hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS no puede cargar el driver de dispositivo para este hardware porque un caso anterior del driver de dispositivo todavía está en memoria." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS no puede cargar el driver de dispositivo para este hardware. El driver puede estar corrompido o ausente." @@ -85,7 +82,7 @@ IDS_DEV_HALTED "Una applicación o un servicio ha cerrado este dispositivo de hardware." IDS_DEV_PHANTOM "Actualmente, este dispositivo de hardware no está conectado a la computadora." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS no puede accesar este dispositivo de hardware porque el sistema operativo está en el proceso de cerrar." - IDS_DEV_HELD_FOR_EJECT "ReactOS no puede usar este dispositivo de hardware por que ha sido preparado para \"remoción segura\", pero aun no ha sido desconectado de la computadora." + IDS_DEV_HELD_FOR_EJECT "ReactOS no puede usar este dispositivo de hardware por que ha sido preparado para ""remoción segura"", pero aun no ha sido desconectado de la computadora." IDS_DEV_DRIVER_BLOCKED "El software para este dispositivo se ha bloqueado de comenzar porque tiene problemas con ReactOS. Entre en contacto con su vendedor de hardware para un driver nuevo." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS no puede encender los nuevos dispositivos de hardware porque la colmena(hive) del sistema es demasiado grande (excede el límite del tamaño del registro)." IDS_DEV_SETPROPERTIES_FAILED "ReactOS no fue capaz de cambiar las propiedades de este dispositivo." Modified: trunk/reactos/dll/win32/devmgr/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/Hu.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/devmgr/Hu.rc (original) +++ trunk/reactos/dll/win32/devmgr/Hu.rc Sun Jul 9 00:32:22 2006 @@ -64,16 +64,13 @@ IDS_DEV_NO_VALID_LOG_CONF "A ReactOS nemtudja megállapítani, hogy milyen erõforrásokat igényel az eszköz." IDS_DEV_FAILED_INSTALL "Az eszközhoz nincsenek illesztõprogramok telepítve." IDS_DEV_HARDWARE_DISABLED "Az eszköz levan tiltva, mivel a BIOS-a nem adott neki erõforrást." - IDS_DEV_CANT_SHARE_IRQ "Ez az eszköz egy olyan megszakítást (IRQ) igényelt, amit egy másik eszköz használ és nem oszthatja meg. "\ - "Meg kell változtatnod az erõforrás kiosztást, vagy eltávolítanod a real-mode (16 bites) illesztõprogramot." + IDS_DEV_CANT_SHARE_IRQ "Ez az eszköz egy olyan megszakítást (IRQ) igényelt, amit egy másik eszköz használ és nem oszthatja meg. Meg kell változtatnod az erõforrás kiosztást, vagy eltávolítanod a real-mode (16 bites) illesztõprogramot." IDS_DEV_FAILED_ADD "Ez az eszköz nem tud megfelelõen mûködni, mivel a(z) $1 sem mûködik megfelelõen." IDS_DEV_DISABLED_SERVICE "A ReactOS nem tudja feltelepíteni az eszköz illesztõprogramjait, mivel a programokat tartalmazó hely nem elérhetõ." IDS_DEV_TRANSLATION_FAILED "Ez az eszköz nem válaszol a illesztõprogramjának." IDS_DEV_NO_SOFTCONFIG "A ReactOS nem tudja kitalálni a beállításokat ehhez az eszközhöz. Használd a felhasználói utasítást, ami ehhez az eszközhöz jár, és állítsd be az erõforrásait." - IDS_DEV_BIOS_TABLE "A számítógép nem tud elég információt adni, hogy ezt az eszközt megfelelõen használja. "\ - "Konzultálj a gép karbantartójával, illetve a céggel aki szállította, hogy igényelj egy firmware vagy BIOS frissítést." - IDS_DEV_IRQ_TRANSLATION_FAILED "Ez az eszköz egy PCI megszakítást igényelt de ISA megszakítást használ (vagy fordítva). "\ - "Használd a géphez kapott illesztõprogramokat, hogy beállíthasd megfelelõen." + IDS_DEV_BIOS_TABLE "A számítógép nem tud elég információt adni, hogy ezt az eszközt megfelelõen használja. Konzultálj a gép karbantartójával, illetve a céggel aki szállította, hogy igényelj egy firmware vagy BIOS frissítést." + IDS_DEV_IRQ_TRANSLATION_FAILED "Ez az eszköz egy PCI megszakítást igényelt de ISA megszakítást használ (vagy fordítva). Használd a géphez kapott illesztõprogramokat, hogy beállíthasd megfelelõen." IDS_DEV_FAILED_DRIVER_ENTRY "A ReactOS nem tudja elindítani az eszköz illesztõprogramját." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "A ReactOS nem tudja elindítani az eszköz illesztõprogramját mivel egy elõzõ illesztõprogram már bevan töltve a memóriában." IDS_DEV_DRIVER_FAILED_LOAD "A ReactOS nem tudja elindítani az eszköz illesztõprogramját. Az illesztõprogram sérült vagy hiányzik." @@ -84,7 +81,7 @@ IDS_DEV_HALTED "Egy alkalmazás vagy szolgáltatás leállította ezt az eszközt." IDS_DEV_PHANTOM "Jelenleg ez az eszköz nincs a számítógéphez csatlakoztatva." IDS_DEV_SYSTEM_SHUTDOWN "A ReactOS nem tud hozzáférni ehhez az eszközhöz, mivel a rendszer a leállítás folyamatában van." - IDS_DEV_HELD_FOR_EJECT "A ReactOS nem tudja használni ezt az eszközt, mivel a \"Biztonságos eltávolítás\" fázisba került de még nem lett eltávolítva." + IDS_DEV_HELD_FOR_EJECT "A ReactOS nem tudja használni ezt az eszközt, mivel a ""Biztonságos eltávolítás"" fázisba került de még nem lett eltávolítva." IDS_DEV_DRIVER_BLOCKED "Az eszközhöz tartozó szoftver nem lett elindítva mivel nem mûködik a ReactOS-al. Kérj egy friss illesztõprogram csomagot a gyártójától." IDS_DEV_REGISTRY_TOO_LARGE "A ReactOS nem tudja elindítani ezt az eszközt mert a rendszerleíró elérte a maximum méretét." IDS_DEV_SETPROPERTIES_FAILED "A ReactOS nem tudta megváltoztatni az eszköz beállításait." Modified: trunk/reactos/dll/win32/devmgr/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/Pl.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/devmgr/Pl.rc (original) +++ trunk/reactos/dll/win32/devmgr/Pl.rc Sun Jul 9 00:32:22 2006 @@ -65,16 +65,13 @@ IDS_DEV_NO_VALID_LOG_CONF "ReactOS nie potrafi³ odnaleæ zasobów dla tego urz¹dzenia." IDS_DEV_FAILED_INSTALL "Nie zainstalowano sterownika dla tego urz¹dzenia." IDS_DEV_HARDWARE_DISABLED "Urz¹dzenie jest wy³¹czone poniewa¿ BIOS nie przydzieli³ ¿adnych zasobów dla tego urz¹dzenia." - IDS_DEV_CANT_SHARE_IRQ "Urz¹dzenie rz¹da przerwañ (IRQ) których u¿ywa inne urz¹dzenie i których nie mo¿na rozdzieliæ. "\ - "Musisz zmieniæ konfliktowe ustawienia lub usun¹æ sterownik powoduj¹cy konflikt." + IDS_DEV_CANT_SHARE_IRQ "Urz¹dzenie rz¹da przerwañ (IRQ) których u¿ywa inne urz¹dzenie i których nie mo¿na rozdzieliæ. Musisz zmieniæ konfliktowe ustawienia lub usun¹æ sterownik powoduj¹cy konflikt." IDS_DEV_FAILED_ADD "Urz¹dzenie nie dzia³a prawid³owo poniewa¿ $1 równie¿ nie dzia³a poprawnie." IDS_DEV_DISABLED_SERVICE "ReactOS nie móg³ zainstalowaæ sterownika dla urz¹dzenia poniewa¿ nie móg³ uzyskaæ dostêpu do lokacji zawartej w pliku instalacyjnym." IDS_DEV_TRANSLATION_FAILED "Sterownik nie jest przeznaczony dla tego urz¹dzenia." IDS_DEV_NO_SOFTCONFIG "ReactOS nie móg³ okreliæ ustawieñ dla tego urz¹dzenia. poszukaj rozwi¹zania w dokumentacji urz¹dzenia i u¿yj palety ustawieñ zasobów aby skonfigurowaæ je rêcznie." - IDS_DEV_BIOS_TABLE "Firmware twojego komputera zawiera zbyt ma³o informacji aby skonfigurowaæ i u¿ywaæ tego urz¹dzenia. "\ - "Aby uruchomiæ urzadzenie, skontaktuj siê z producentem w celu uaktualnienia firmware-u lub BIOS-u ." - IDS_DEV_IRQ_TRANSLATION_FAILED "Urz¹dzenie rz¹da przerwañ PCI chocia¿ znajduje siê w ISA (lub na odwrót). "\ - "Zmieñ ustawienia przerwañ dla tego urz¹dzenia korzystaj¹c z konfiguratora systemu." + IDS_DEV_BIOS_TABLE "Firmware twojego komputera zawiera zbyt ma³o informacji aby skonfigurowaæ i u¿ywaæ tego urz¹dzenia. Aby uruchomiæ urzadzenie, skontaktuj siê z producentem w celu uaktualnienia firmware-u lub BIOS-u ." + IDS_DEV_IRQ_TRANSLATION_FAILED "Urz¹dzenie rz¹da przerwañ PCI chocia¿ znajduje siê w ISA (lub na odwrót). Zmieñ ustawienia przerwañ dla tego urz¹dzenia korzystaj¹c z konfiguratora systemu." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nie móg³ uruchomiæ sterownika dla tego urz¹dzenia." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS nie móg³ uruchomiæ sterownika dla tego urz¹dzenia poniewa¿ poprzedni sterownik jest nadal w pamiêci." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS nie móg³ uruchomiæ sterownika dla tego urz¹dzenia. Brak sterownika lub sterownik mo¿e byæ uszkodzony." @@ -85,7 +82,7 @@ IDS_DEV_HALTED "Program lub us³uga przerwa³a dzia³anie urz¹dzenia." IDS_DEV_PHANTOM "Obecnie urz¹dzenie nie jest pod³¹czone do komputera." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS nie mo¿e uzyskaæ dostêpu do urzadzenia poniewa¿ trwa zamykanie systemu." - IDS_DEV_HELD_FOR_EJECT "ReactOS nie mo¿e uzyskaæ dostêpu do urzadzenia poniewa¿ urz¹dzenie to by³o przygotowane do \"bezpiecznego usuniêcia\", ale nie zosta³o od³¹czone." + IDS_DEV_HELD_FOR_EJECT "ReactOS nie mo¿e uzyskaæ dostêpu do urzadzenia poniewa¿ urz¹dzenie to by³o przygotowane do ""bezpiecznego usuniêcia"", ale nie zosta³o od³¹czone." IDS_DEV_DRIVER_BLOCKED "Oprogramowanie urz¹dzenia zosta³o zablokowane przy starcie poniewa¿ nie wspó³pracuje poprewnie z systemem ReactOS. Spróbuj zainstalowaæ nowszy sterownik." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS nie mo¿e uruchomiæ nowego urz¹dzenia poniewa¿ j¹dro systemu jest zbyt wielkie (przekracza limit rozmiaru rejestru)." IDS_DEV_SETPROPERTIES_FAILED "ReactOS nie by³ w stanie zmieniæ parametrów instalacyjnych tego urz¹dzenia." Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c Sun Jul 9 00:32:22 2006 @@ -488,7 +488,7 @@ 0); if (Index != CB_ERR) { - INT iRet = SendMessage(hComboBox, + INT iRet = (INT) SendMessage(hComboBox, CB_GETITEMDATA, (WPARAM)Index, 0); @@ -605,7 +605,7 @@ if (dap->DevPropSheets[iPage] != NULL) { PropSheet_RemovePage(hPropSheetDlg, - -1, + (WPARAM) -1, dap->DevPropSheets[iPage]); } } Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h Sun Jul 9 00:32:22 2006 @@ -12,14 +12,14 @@ ULONG DbgPrint(PCH Format,...); -WINBOOL +BOOL WINAPI DeviceManager_ExecuteA(HWND hWndParent, HINSTANCE hInst, LPCSTR lpMachineName, int nCmdShow); -WINBOOL +BOOL WINAPI DeviceManager_ExecuteW(HWND hWndParent, HINSTANCE hInst, @@ -103,7 +103,7 @@ #define DEV_PRINT_SELECTED (1) #define DEV_PRINT_ALL (2) -WINBOOL +BOOL WINAPI DeviceManagerPrintA(LPCSTR lpMachineName, LPCSTR lpPrinter, @@ -111,7 +111,7 @@ UINT uNumberOfGuids, LPGUID lpGuids); -WINBOOL +BOOL WINAPI DeviceManagerPrintW(LPCWSTR lpMachineName, LPCWSTR lpPrinter, Modified: trunk/reactos/dll/win32/devmgr/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/stubs.c (original) +++ trunk/reactos/dll/win32/devmgr/stubs.c Sun Jul 9 00:32:22 2006 @@ -45,7 +45,7 @@ * * @unimplemented */ -WINBOOL +BOOL WINAPI DeviceManager_ExecuteA(HWND hWndParent, HINSTANCE hInst, @@ -82,7 +82,7 @@ * * @unimplemented */ -WINBOOL +BOOL WINAPI DeviceManager_ExecuteW(HWND hWndParent, HINSTANCE hInst, @@ -349,7 +349,7 @@ * * @unimplemented */ -WINBOOL +BOOL WINAPI DeviceManagerPrintA(LPCSTR lpMachineName, LPCSTR lpPrinter, @@ -393,7 +393,7 @@ * * @unimplemented */ -WINBOOL +BOOL WINAPI DeviceManagerPrintW(LPCWSTR lpMachineName, LPCWSTR lpPrinter,

1 0

[greatlrd] 22944: commit import Dejavu font to ReactOS, we need keep bitstream font for Console apps for it is hard code there and there, for console apps, example let cmd working without regress. Now we need change the reactos reg and to the packages.diff.
by greatlrd＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: greatlrd Date: Sun Jul 9 00:05:44 2006 New Revision: 22944 URL: http://svn.reactos.org/svn/reactos?rev=22944&view=rev Log: commit import Dejavu font to ReactOS, we need keep bitstream font for Console apps for it is hard code there and there, for console apps, example let cmd working without regress. Now we need change the reactos reg and to the packages.diff. Added: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf (with props) trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf (with props) trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSans.ttf (with props) trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf (with props) trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSansCondensed.ttf (with props) trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf (with props) trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSansMono.ttf (with props) trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf (with props) trunk/reactos/media/fonts/DejaVuSerif-BoldOblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSerif-Oblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSerif.ttf (with props) trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf (with props) trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldOblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSerifCondensed-Oblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf (with props) trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt trunk/reactos/media/fonts/doc/DejaVu_BUGS.txt trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt trunk/reactos/media/fonts/doc/DejaVu_README.txt trunk/reactos/media/fonts/doc/DejaVu_langcover.txt trunk/reactos/media/fonts/doc/DejaVu_status.txt trunk/reactos/media/fonts/doc/DejaVu_unicover.txt trunk/reactos/media/fonts/doc/LICENSE_DejaVu.txt Modified: trunk/reactos/media/fonts/fonts.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… Added: trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… Added: trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Ext… Added: trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Obl… Added: trunk/reactos/media/fonts/DejaVuSans.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans.ttf… Added: trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Added: trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Added: trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Added: trunk/reactos/media/fonts/DejaVuSansCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Added: trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Added: trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Added: trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Added: trunk/reactos/media/fonts/DejaVuSansMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Added: trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Added: trunk/reactos/media/fonts/DejaVuSerif-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Added: trunk/reactos/media/fonts/DejaVuSerif-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Ob… Added: trunk/reactos/media/fonts/DejaVuSerif.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif.tt… Added: trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Added: trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Added: trunk/reactos/media/fonts/DejaVuSerifCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Added: trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Added: trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_AUT… Added: trunk/reactos/media/fonts/doc/DejaVu_BUGS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_BUG… Added: trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_NEW… Added: trunk/reactos/media/fonts/doc/DejaVu_README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_REA… Added: trunk/reactos/media/fonts/doc/DejaVu_langcover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_lan… Added: trunk/reactos/media/fonts/doc/DejaVu_status.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_sta… Added: trunk/reactos/media/fonts/doc/DejaVu_unicover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_uni… Added: trunk/reactos/media/fonts/doc/LICENSE_DejaVu.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/LICENSE_De… Modified: trunk/reactos/media/fonts/fonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/fonts.rbuild?r…

1 0

[cwittich] 22943: -don't use PROJECT_LFLAGS for freeldr because ld != mingw32-ld
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sat Jul 8 23:44:36 2006 New Revision: 22943 URL: http://svn.reactos.org/svn/reactos?rev=22943&view=rev Log: -don't use PROJECT_LFLAGS for freeldr because ld != mingw32-ld Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Jul 8 23:44:36 2006 @@ -2742,8 +2742,7 @@ fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, - "\t${ld} %s -N -Ttext=0x8000 -o %s %s %s\n", - GetLinkerMacro ().c_str (), + "\t${ld} -N -Ttext=0x8000 -o %s %s %s\n", junk_tmp.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str () );

1 0

[ion] 22942: - Write some TODOs. I'm now done with I/O IRP APIs and File Object handling. Let me know of regressions. - Next up... driver loading.
by ion＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: ion Date: Sat Jul 8 23:41:20 2006 New Revision: 22942 URL: http://svn.reactos.org/svn/reactos?rev=22942&view=rev Log: - Write some TODOs. I'm now done with I/O IRP APIs and File Object handling. Let me know of regressions. - Next up... driver loading. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 23:41:20 2006 @@ -14,6 +14,25 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#if 0 + IOTRACE(IO_IRP_DEBUG, + "%s - Queueing IRP %p\n", + __FUNCTION__, + Irp); +#endif + +/// +// +// TODO: +// - Add support for Fast Dispatch I/O. +// - Verify ShareAccess APIs, XP added some new semantics. +// - Add Access Checks in IopParseDevice. +// - Add validation checks in IoCreateFile. +// - Add tracing. +// - See why queueing IRPs and cancelling them causes crashes +// +/// /* PRIVATE FUNCTIONS *********************************************************/ @@ -1638,7 +1657,6 @@ } } - /* * @implemented */ @@ -1819,7 +1837,6 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - /* * @implemented Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sat Jul 8 23:41:20 2006 @@ -24,12 +24,13 @@ /// // // TODO: -// - Add SEH to some places where it's missing (MDLs, etc) -// - Add a generic Cleanup/Exception Routine -// - Add probe/alignment checks for Query/Set routines -// - Add another parameter to IopCleanupFailedIrp -// - Add support for Fast Dispatch I/O -// - Add support for some fast-paths when querying/setting data +// - Add SEH to some places where it's missing (MDLs, etc). +// - Add a generic Cleanup/Exception Routine. +// - Add probe/alignment checks for Query/Set routines. +// - Add another parameter to IopCleanupFailedIrp. +// - Add support for Fast Dispatch I/O. +// - Add support for some fast-paths when querying/setting data. +// - Add tracing. // ///

1 0

[ion] 22941: - Zero out the OPEN_PACKET and only set non-zero members in functions that use it. - NtCancelIoFile: - Don't use macro-based list looping. - Update operation counts. - Wait 10ms instead of 100ms.
by ion＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: ion Date: Sat Jul 8 23:28:08 2006 New Revision: 22941 URL: http://svn.reactos.org/svn/reactos?rev=22941&view=rev Log: - Zero out the OPEN_PACKET and only set non-zero members in functions that use it. - NtCancelIoFile: - Don't use macro-based list looping. - Update operation counts. - Wait 10ms instead of 100ms. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 23:28:08 2006 @@ -1099,33 +1099,19 @@ IsBasic = (FileInformationSize == sizeof(FILE_BASIC_INFORMATION)); /* Setup the Open Packet */ + RtlZeroMemory(&OpenPacket, sizeof(OPEN_PACKET)); OpenPacket.Type = IO_TYPE_OPEN_PACKET; OpenPacket.Size = sizeof(OPEN_PACKET); - OpenPacket.FileObject = NULL; - OpenPacket.FinalStatus = STATUS_SUCCESS; - OpenPacket.Information = 0; - OpenPacket.ParseCheck = 0; - OpenPacket.RelatedFileObject = NULL; - OpenPacket.AllocationSize.QuadPart = 0; OpenPacket.CreateOptions = FILE_OPEN_REPARSE_POINT; - OpenPacket.FileAttributes = 0; OpenPacket.ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - OpenPacket.EaBuffer = NULL; - OpenPacket.EaLength = 0; - OpenPacket.Options = 0; OpenPacket.Disposition = FILE_OPEN; OpenPacket.BasicInformation = IsBasic ? FileInformation : NULL; OpenPacket.NetworkInformation = IsBasic ? &NetworkOpenInfo : (AccessMode != KernelMode) ? &NetworkOpenInfo : FileInformation; - OpenPacket.CreateFileType = 0; - OpenPacket.MailslotOrPipeParameters = NULL; - OpenPacket.Override = FALSE; OpenPacket.QueryOnly = TRUE; - OpenPacket.DeleteOnly = FALSE; OpenPacket.FullAttributes = IsBasic ? FALSE : TRUE; OpenPacket.DummyFileObject = &DummyFileObject; - OpenPacket.InternalFlags = 0; /* Update the operation count */ IopUpdateOperationCount(IopOtherTransfer); @@ -1314,13 +1300,9 @@ } /* Setup the Open Packet */ + RtlZeroMemory(&OpenPacket, sizeof(OPEN_PACKET)); OpenPacket.Type = IO_TYPE_OPEN_PACKET; OpenPacket.Size = sizeof(OPEN_PACKET); - OpenPacket.FileObject = NULL; - OpenPacket.FinalStatus = STATUS_SUCCESS; - OpenPacket.Information = 0; - OpenPacket.ParseCheck = 0; - OpenPacket.RelatedFileObject = NULL; OpenPacket.OriginalAttributes = *ObjectAttributes; OpenPacket.AllocationSize = SafeAllocationSize; OpenPacket.CreateOptions = CreateOptions; @@ -1330,16 +1312,8 @@ OpenPacket.EaLength = EaLength; OpenPacket.Options = Options; OpenPacket.Disposition = CreateDisposition; - OpenPacket.BasicInformation = NULL; - OpenPacket.NetworkInformation = NULL; OpenPacket.CreateFileType = CreateFileType; OpenPacket.MailslotOrPipeParameters = ExtraCreateParameters; - OpenPacket.Override = FALSE; - OpenPacket.QueryOnly = FALSE; - OpenPacket.DeleteOnly = FALSE; - OpenPacket.FullAttributes = FALSE; - OpenPacket.DummyFileObject = NULL; - OpenPacket.InternalFlags = 0; /* Update the operation count */ IopUpdateOperationCount(IopOtherTransfer); @@ -1596,31 +1570,17 @@ PAGED_CODE(); /* Setup the Open Packet */ + RtlZeroMemory(&OpenPacket, sizeof(OPEN_PACKET)); OpenPacket.Type = IO_TYPE_OPEN_PACKET; OpenPacket.Size = sizeof(OPEN_PACKET); - OpenPacket.FileObject = NULL; - OpenPacket.FinalStatus = STATUS_SUCCESS; - OpenPacket.Information = 0; - OpenPacket.ParseCheck = 0; - OpenPacket.RelatedFileObject = NULL; - OpenPacket.AllocationSize.QuadPart = 0; OpenPacket.CreateOptions = OpenOptions | FILE_OPEN_REPARSE_POINT; - OpenPacket.FileAttributes = 0; OpenPacket.ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - OpenPacket.EaBuffer = NULL; - OpenPacket.EaLength = 0; OpenPacket.Options = IO_FORCE_ACCESS_CHECK; OpenPacket.Disposition = FILE_OPEN; - OpenPacket.BasicInformation = NULL; OpenPacket.NetworkInformation = Buffer; - OpenPacket.CreateFileType = 0; - OpenPacket.MailslotOrPipeParameters = NULL; - OpenPacket.Override = FALSE; OpenPacket.QueryOnly = TRUE; - OpenPacket.DeleteOnly = FALSE; OpenPacket.FullAttributes = TRUE; OpenPacket.DummyFileObject = &DummyFileObject; - OpenPacket.InternalFlags = 0; /* * Attempt opening the file. This will call the I/O Parse Routine for @@ -2146,25 +2106,32 @@ LARGE_INTEGER Interval; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; + PLIST_ENTRY ListHead, NextEntry; PAGED_CODE(); + /* Check the previous mode */ if (PreviousMode != KernelMode) { + /* Enter SEH for probing */ _SEH_TRY { + /* Probe the I/O Status Block */ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Return exception code on failure */ if (!NT_SUCCESS(Status)) return Status; } + /* Reference the file object */ Status = ObReferenceObjectByHandle(FileHandle, 0, IoFileObjectType, @@ -2176,59 +2143,77 @@ /* IRP cancellations are synchronized at APC_LEVEL. */ OldIrql = KfRaiseIrql(APC_LEVEL); - /* - * Walk the list of active IRPs and cancel the ones that belong to - * our file object. - */ - + /* Get the current thread */ Thread = PsGetCurrentThread(); - LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) - { + /* Update the operation counts */ + IopUpdateOperationCount(IopOtherTransfer); + + /* Loop the list */ + ListHead = &Thread->IrpList; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the IRP and check if the File Object matches */ + Irp = CONTAINING_RECORD(NextEntry, IRP, ThreadListEntry); if (Irp->Tail.Overlay.OriginalFileObject == FileObject) { + /* Cancel this IRP and keep looping */ IoCancelIrp(Irp); - /* Don't break here, we want to cancel all IRPs for the file object. */ OurIrpsInList = TRUE; } - } - + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Lower the IRQL */ KfLowerIrql(OldIrql); - while (OurIrpsInList) - { - OurIrpsInList = FALSE; - - /* Wait a short while and then look if all our IRPs were completed. */ - Interval.QuadPart = -1000000; /* 100 milliseconds */ - KeDelayExecutionThread(KernelMode, FALSE, &Interval); - - OldIrql = KfRaiseIrql(APC_LEVEL); - - /* - * Look in the list if all IRPs for the specified file object - * are completed (or cancelled). If someone sends a new IRP - * for our file object while we're here we can happily loop - * forever. - */ - - LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) - { - if (Irp->Tail.Overlay.OriginalFileObject == FileObject) + /* Check if we had found an IRP */ + if (OurIrpsInList) + { + /* Setup a 10ms wait */ + Interval.QuadPart = -100000; + + /* Start looping */ + while (OurIrpsInList) + { + /* Do the wait */ + KeDelayExecutionThread(KernelMode, FALSE, &Interval); + OurIrpsInList = FALSE; + + /* Raise IRQL */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* Now loop the list again */ + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) { - OurIrpsInList = TRUE; - break; + /* Get the IRP and check if the File Object matches */ + Irp = CONTAINING_RECORD(NextEntry, IRP, ThreadListEntry); + if (Irp->Tail.Overlay.OriginalFileObject == FileObject) + { + /* Keep looping */ + OurIrpsInList = TRUE; + break; + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; } - } - - KfLowerIrql(OldIrql); - } - + + /* Lower the IRQL */ + KeLowerIrql(OldIrql); + } + } + + /* Enter SEH for writing back the I/O Status */ _SEH_TRY { + /* Write success */ IoStatusBlock->Status = STATUS_SUCCESS; IoStatusBlock->Information = 0; - Status = STATUS_SUCCESS; } _SEH_HANDLE { @@ -2236,8 +2221,9 @@ } _SEH_END; + /* Dereference the file object and return success */ ObDereferenceObject(FileObject); - return Status; + return STATUS_SUCCESS; } /* @@ -2255,33 +2241,16 @@ PAGED_CODE(); /* Setup the Open Packet */ + RtlZeroMemory(&OpenPacket, sizeof(OPEN_PACKET)); OpenPacket.Type = IO_TYPE_OPEN_PACKET; OpenPacket.Size = sizeof(OPEN_PACKET); - OpenPacket.FileObject = NULL; - OpenPacket.FinalStatus = STATUS_SUCCESS; - OpenPacket.Information = 0; - OpenPacket.ParseCheck = 0; - OpenPacket.RelatedFileObject = NULL; - OpenPacket.AllocationSize.QuadPart = 0; OpenPacket.CreateOptions = FILE_DELETE_ON_CLOSE; - OpenPacket.FileAttributes = 0; OpenPacket.ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - OpenPacket.EaBuffer = NULL; - OpenPacket.EaLength = 0; - OpenPacket.Options = 0; OpenPacket.Disposition = FILE_OPEN; - OpenPacket.BasicInformation = NULL; - OpenPacket.NetworkInformation = NULL; - OpenPacket.CreateFileType = 0; - OpenPacket.MailslotOrPipeParameters = NULL; - OpenPacket.Override = FALSE; - OpenPacket.QueryOnly = FALSE; OpenPacket.DeleteOnly = TRUE; - OpenPacket.FullAttributes = FALSE; OpenPacket.DummyFileObject = &DummyFileObject; - OpenPacket.InternalFlags = 0; /* Update the operation counts */ IopUpdateOperationCount(IopOtherTransfer);

1 0

[cwittich] 22940: -fixed some msvc /W4 warnings
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sat Jul 8 23:14:12 2006 New Revision: 22940 URL: http://svn.reactos.org/svn/reactos?rev=22940&view=rev Log: -fixed some msvc /W4 warnings Modified: trunk/reactos/dll/keyboard/kbdbe/kbdbe.c trunk/reactos/dll/keyboard/kbdda/kbdda.c Modified: trunk/reactos/dll/keyboard/kbdbe/kbdbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbe/kbdbe.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbe/kbdbe.c (original) +++ trunk/reactos/dll/keyboard/kbdbe/kbdbe.c Sat Jul 8 23:14:12 2006 @@ -491,5 +491,8 @@ ULONG dwReason, PVOID reserved) { + UNREFERENCED_PARAMETER(hinstDll); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(reserved); return 1; } Modified: trunk/reactos/dll/keyboard/kbdda/kbdda.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/kbdda.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdda/kbdda.c (original) +++ trunk/reactos/dll/keyboard/kbdda/kbdda.c Sat Jul 8 23:14:12 2006 @@ -490,5 +490,8 @@ ULONG dwReason, PVOID reserved) { + UNREFERENCED_PARAMETER(hinstDll); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(reserved); return 1; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs