Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[fireball] 17258: Fixed a typo. According to the url pointed out by Royce3, it's right ( http://www.osronline.com/lists_archive/ntdev/thread1866.html)
by fireball＠svn.reactos.com 10 Aug '05

10 Aug '05

Fixed a typo. According to the url pointed out by Royce3, it's right ( http://www.osronline.com/lists_archive/ntdev/thread1866.html) Modified: trunk/reactos/ntoskrnl/ke/event.c _____ Modified: trunk/reactos/ntoskrnl/ke/event.c --- trunk/reactos/ntoskrnl/ke/event.c 2005-08-10 11:45:50 UTC (rev 17257) +++ trunk/reactos/ntoskrnl/ke/event.c 2005-08-10 16:33:49 UTC (rev 17258) @@ -44,7 +44,7 @@ /* Initialize the Dispatcher Header */ KeInitializeDispatcherHeader(&Event->Header, Type, - sizeof(Event) / sizeof(ULONG), + sizeof(*Event) / sizeof(ULONG), State); }

1 0

[hbirr] 17257: Fixed the base detection in RtlUnicodeStringToInteger.
by hbirr＠svn.reactos.com 10 Aug '05

10 Aug '05

Fixed the base detection in RtlUnicodeStringToInteger. Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-08-10 09:09:28 UTC (rev 17256) +++ trunk/reactos/lib/rtl/unicode.c 2005-08-10 11:45:50 UTC (rev 17257) @@ -876,44 +876,47 @@ USHORT CharsRemaining = str->Length / sizeof(WCHAR); WCHAR wchCurrent; int digit; + ULONG newbase = 10; ULONG RunningTotal = 0; char bMinus = 0; - while (CharsRemaining >= 1 && *lpwstr <= ' ') { + while (CharsRemaining >= 1 && *lpwstr <= L' ') { lpwstr++; CharsRemaining--; } /* while */ if (CharsRemaining >= 1) { - if (*lpwstr == '+') { + if (*lpwstr == L'+') { lpwstr++; CharsRemaining--; - } else if (*lpwstr == '-') { + } else if (*lpwstr == L'-') { bMinus = 1; lpwstr++; CharsRemaining--; } /* if */ } /* if */ + if (CharsRemaining >= 2 && lpwstr[0] == L'0') { + if (lpwstr[1] == L'b' || lpwstr[1] == L'B') { + lpwstr += 2; + CharsRemaining -= 2; + newbase = 2; + } else if (lpwstr[1] == L'o' || lpwstr[1] == L'O') { + lpwstr += 2; + CharsRemaining -= 2; + newbase = 8; + } else if (lpwstr[1] == L'x' || lpwstr[1] == L'X') { + lpwstr += 2; + CharsRemaining -= 2; + newbase = 16; + } /* if */ + } if (base == 0) { - base = 10; - if (CharsRemaining >= 2 && lpwstr[0] == '0') { - if (lpwstr[1] == 'b') { - lpwstr += 2; - CharsRemaining -= 2; - base = 2; - } else if (lpwstr[1] == 'o') { - lpwstr += 2; - CharsRemaining -= 2; - base = 8; - } else if (lpwstr[1] == 'x') { - lpwstr += 2; - CharsRemaining -= 2; - base = 16; - } /* if */ - } /* if */ - } else if (base != 2 && base != 8 && base != 10 && base != 16) { + base = newbase; + } else if ((base != newbase) || + (base != 2 && base != 8 && base != 10 && base != 16)) { return STATUS_INVALID_PARAMETER; + } /* if */ if (value == NULL) { @@ -922,12 +925,12 @@ while (CharsRemaining >= 1) { wchCurrent = *lpwstr; - if (wchCurrent >= '0' && wchCurrent <= '9') { - digit = wchCurrent - '0'; - } else if (wchCurrent >= 'A' && wchCurrent <= 'Z') { - digit = wchCurrent - 'A' + 10; - } else if (wchCurrent >= 'a' && wchCurrent <= 'z') { - digit = wchCurrent - 'a' + 10; + if (wchCurrent >= L'0' && wchCurrent <= L'9') { + digit = wchCurrent - L'0'; + } else if (wchCurrent >= L'A' && wchCurrent <= L'Z') { + digit = wchCurrent - L'A' + 10; + } else if (wchCurrent >= L'a' && wchCurrent <= L'z') { + digit = wchCurrent - L'a' + 10; } else { digit = -1; } /* if */

1 0

[ea] 17256: Alex Ionescu: more details about the CSR core protocol.
by ea＠svn.reactos.com 10 Aug '05

10 Aug '05

Alex Ionescu: more details about the CSR core protocol. Modified: trunk/reactos/include/subsys/csr/protocol.h _____ Modified: trunk/reactos/include/subsys/csr/protocol.h --- trunk/reactos/include/subsys/csr/protocol.h 2005-08-10 08:36:37 UTC (rev 17255) +++ trunk/reactos/include/subsys/csr/protocol.h 2005-08-10 09:09:28 UTC (rev 17256) @@ -5,14 +5,33 @@ #define MAKE_CSR_OPCODE(s,m) ((s) << 16) + (m) -// Gary Nebbett +// +// Shared CSR Message Header for all CSR Servers +// Gary Nebbett - Alex Ionescu +// typedef struct _CSR_PORT_MESSAGE_HEADER { - DWORD Unused1; - ULONG Opcode; - ULONG Status; - ULONG Unused2; + // + // LPC Header + // + PORT_MESSAGE PortHeader; + // + // Buffer allocated with CsrAllocateCaptureBuffer. + // Sent as 2nd parameter to CsrClientCallServer. + // + PVOID CsrCaptureData; + + // + // CSR API Message ID and Return Value + // + CSR_API_NUMBER Opcode; + ULONG Status; + ULONG Reserved; + + // + // Server-defined union of supported structures + // } CSR_PORT_MESSAGE_HEADER, * PCSR_PORT_MESSAGE_HEADER; #endif /* ndef __INCLUDE_CSR_LPCPROTO_H */

1 0

[ea] 17255: Change the demo VMS subsystem definition.
by ea＠svn.reactos.com 10 Aug '05

10 Aug '05

Change the demo VMS subsystem definition. Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-08-10 08:28:08 UTC (rev 17254) +++ trunk/reactos/bootdata/hivesys.inf 2005-08-10 08:36:37 UTC (rev 17255) @@ -362,10 +362,11 @@ ; Subsystems HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys " -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix","Os2" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix","Os2","Vms" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Os2",0x00020000,"%SystemRoot%\system32\os2ss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Vms",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\VMS SharedSection=128 Windows=Off SubSystemType=Text ServerDll=vmssrv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.ex e" ; PNP Root device

1 0

[ea] 17254: Some new internal headers (draft) to be used in the planned CSR/WIN split subsystem server.
by ea＠svn.reactos.com 10 Aug '05

10 Aug '05

Some new internal headers (draft) to be used in the planned CSR/WIN split subsystem server. Added: trunk/reactos/include/subsys/csr/ Added: trunk/reactos/include/subsys/csr/protocol.h Added: trunk/reactos/include/subsys/csr/server.h Added: trunk/reactos/include/subsys/win/ Added: trunk/reactos/include/subsys/win/base.h Added: trunk/reactos/include/subsys/win/windows.h _____ Added: trunk/reactos/include/subsys/csr/protocol.h --- trunk/reactos/include/subsys/csr/protocol.h 2005-08-10 03:59:01 UTC (rev 17253) +++ trunk/reactos/include/subsys/csr/protocol.h 2005-08-10 08:28:08 UTC (rev 17254) @@ -0,0 +1,18 @@ +#ifndef __INCLUDE_CSR_PROTOCOL_H +#define __INCLUDE_CSR_PROTOCOL_H + +typedef ULONG CSR_API_NUMBER; + +#define MAKE_CSR_OPCODE(s,m) ((s) << 16) + (m) + +// Gary Nebbett +typedef struct _CSR_PORT_MESSAGE_HEADER +{ + DWORD Unused1; + ULONG Opcode; + ULONG Status; + ULONG Unused2; + +} CSR_PORT_MESSAGE_HEADER, * PCSR_PORT_MESSAGE_HEADER; + +#endif /* ndef __INCLUDE_CSR_LPCPROTO_H */ Property changes on: trunk/reactos/include/subsys/csr/protocol.h ___________________________________________________________________ Name: svn:keywords + author id date revision Name: svn:eol-style + native _____ Added: trunk/reactos/include/subsys/csr/server.h --- trunk/reactos/include/subsys/csr/server.h 2005-08-10 03:59:01 UTC (rev 17253) +++ trunk/reactos/include/subsys/csr/server.h 2005-08-10 08:28:08 UTC (rev 17254) @@ -0,0 +1,75 @@ +#if !defined(__INCLUDE_CSR_SERVER_H) +#define __INCLUDE_CSR_SERVER_H + +#define CSR_SRV_SERVER 0 + +typedef struct _CSR_SESSION +{ + ULONG SessionId; + +} CSR_SESSION, * PCSR_SESSION; + + +typedef struct _CSR_PROCESS +{ + HANDLE Process; + ULONG ReferenceCount; + +} CSR_PROCESS, * PCSR_PROCESS; + +typedef struct _CSR_THREAD +{ + HANDLE Thread; + PCSR_SESSION CsrSession; + PCSR_PROCESS CsrProcess; + ULONG ReferenceCount; + +} CSR_THREAD, * PCSR_THREAD; + +typedef struct _CSR_WAIT +{ + PCSR_PROCESS CsrThread; + +} CSR_WAIT, * PCSR_WAIT; + +/* symbols exported by native DLL csrsrv.dll */ + +NTSTATUS STDCALL CsrAddStaticServerThread(); +NTSTATUS STDCALL CsrCallServerFromServer(); +NTSTATUS STDCALL CsrConnectToUser(); +NTSTATUS STDCALL CsrCreateProcess(); +NTSTATUS STDCALL CsrCreateRemoteThread(); +NTSTATUS STDCALL CsrCreateSession(); +NTSTATUS STDCALL CsrCreateThread(); +NTSTATUS STDCALL CsrCreateWait(); +NTSTATUS STDCALL CsrDebugProcess(); +NTSTATUS STDCALL CsrDebugProcessStop(); +NTSTATUS STDCALL CsrDereferenceProcess(); +NTSTATUS STDCALL CsrDereferenceThread(); +NTSTATUS STDCALL CsrDereferenceWait(); +NTSTATUS STDCALL CsrDestroyProcess(); +NTSTATUS STDCALL CsrDestroyThread(); +NTSTATUS STDCALL CsrExecServerThread(); +NTSTATUS STDCALL CsrGetApiPorts(PHANDLE,PHANDLE); +NTSTATUS STDCALL CsrGetProcessLuid(); +NTSTATUS STDCALL CsrImpersonateClient(); +NTSTATUS STDCALL CsrLockProcessByClientId(); +NTSTATUS STDCALL CsrLockThreadByClientId(); +NTSTATUS STDCALL CsrMoveSatisfiedWait(); +NTSTATUS STDCALL CsrNotifyWait(); +NTSTATUS STDCALL CsrPopulateDosDevices(); +HANDLE STDCALL CsrQueryApiPort(VOID); +NTSTATUS STDCALL CsrReferenceThread(); +NTSTATUS STDCALL CsrRevertToSelf(); +NTSTATUS STDCALL CsrServerInitialization(ULONG,LPWSTR*); +NTSTATUS STDCALL CsrSetBackgroundPriority(); +NTSTATUS STDCALL CsrSetCallingSpooler(); +NTSTATUS STDCALL CsrSetForegroundPriority(); +NTSTATUS STDCALL CsrShutdownProcesses(); +NTSTATUS STDCALL CsrUnhandledExceptionFilter(); +NTSTATUS STDCALL CsrUnlockProcess(); +NTSTATUS STDCALL CsrUnlockThread(); +NTSTATUS STDCALL CsrValidateMessageBuffer(); +NTSTATUS STDCALL CsrValidateMessageString(); + +#endif /* ndef __INCLUDE_CSR_SERVER_H */ Property changes on: trunk/reactos/include/subsys/csr/server.h ___________________________________________________________________ Name: svn:keywords + author id date revision Name: svn:eol-style + native _____ Added: trunk/reactos/include/subsys/win/base.h --- trunk/reactos/include/subsys/win/base.h 2005-08-10 03:59:01 UTC (rev 17253) +++ trunk/reactos/include/subsys/win/base.h 2005-08-10 08:28:08 UTC (rev 17254) @@ -0,0 +1,14 @@ +#if !defined(__INCLUDE_WIN_BASE_H) +#define __INCLUDE_WIN_BASE_H + +#include <csr/protocol.h> + +/* w32 base server */ + +#define WIN_SRV_BASE 1 + +NTSTATUS STDCALL BaseSetProcessCreateNotify (); +NTSTATUS STDCALL ServerDllInitialization (); + +#endif /* ndef __INCLUDE_WIN_BASE_H */ + Property changes on: trunk/reactos/include/subsys/win/base.h ___________________________________________________________________ Name: svn:keywords + author id date revision Name: svn:eol-style + native _____ Added: trunk/reactos/include/subsys/win/windows.h --- trunk/reactos/include/subsys/win/windows.h 2005-08-10 03:59:01 UTC (rev 17253) +++ trunk/reactos/include/subsys/win/windows.h 2005-08-10 08:28:08 UTC (rev 17254) @@ -0,0 +1,16 @@ +#if !defined(__INCLUDE_WIN_WINDOWS_H) +#define __INCLUDE_WIN_WINDOWS_H + +#include <csr/protocol.h> + +/* w32 console server */ +#define WIN_SRV_WIN_CONSOLE 2 +NTSTATUS STDCALL ConServerDllInitialization (); + +/* w32 user server */ +#define WIN_SRV_WIN_USER 3 +NTSTATUS STDCALL UserServerDllInitialization (); + +#endif /* ndef __INCLUDE_WIN_WINDOWS_H */ + + Property changes on: trunk/reactos/include/subsys/win/windows.h ___________________________________________________________________ Name: svn:keywords + author id date revision Name: svn:eol-style + native

1 0

[sedwards] 17253: another shot at fixing writes
by sedwards＠svn.reactos.com 10 Aug '05

10 Aug '05

another shot at fixing writes Modified: trunk/rosapps/sysutils/dosfsck/io.c _____ Modified: trunk/rosapps/sysutils/dosfsck/io.c --- trunk/rosapps/sysutils/dosfsck/io.c 2005-08-10 03:32:15 UTC (rev 17252) +++ trunk/rosapps/sysutils/dosfsck/io.c 2005-08-10 03:59:01 UTC (rev 17253) @@ -186,7 +186,7 @@ } new = alloc(sizeof(CHANGE)); new->pos = pos; - memcpy(new->data = alloc(new->size = size),data,size); + memcpy(new->data = alloc(new->size = readsize_aligned),data,readsize_aligned); new->next = NULL; if (last) last->next = new; else changes = new;

1 0

[royce] 17252: fix typo
by royce＠svn.reactos.com 10 Aug '05

10 Aug '05

fix typo Modified: trunk/reactos/config.template.xml _____ Modified: trunk/reactos/config.template.xml --- trunk/reactos/config.template.xml 2005-08-09 20:12:35 UTC (rev 17251) +++ trunk/reactos/config.template.xml 2005-08-10 03:32:15 UTC (rev 17252) @@ -18,7 +18,7 @@ <!-- Which CPU ReactOS should be optimized for. Specify one of: - i486, i586, pentium, pentium2, pentum3, pentium4, athlon-xp, athlon-mp, + i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, athlon-mp, k6-2 See GCC manual for more CPU names and which CPUs GCC can optimize for.

1 0

[hpoussin] 17251: Active functions related to interfaces enumeration: SETUP_CreateSerialDeviceList, SETUP_CreateInterfaceList, SetupDiGetDeviceInterfaceDetailW. They were disabled since r17210
by hpoussin＠svn.reactos.com 09 Aug '05

09 Aug '05

Active functions related to interfaces enumeration: SETUP_CreateSerialDeviceList, SETUP_CreateInterfaceList, SetupDiGetDeviceInterfaceDetailW. They were disabled since r17210 Replace ERROR_NO_SYSTEM_RESOURCES by ERROR_NOT_ENOUGH_MEMORY Replace #ifdef __WINESRC__ by #ifndef __REACTOS__, as ReactOS also defines __WINESRC__ Minor fixes Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-08-09 19:52:16 UTC (rev 17250) +++ trunk/reactos/lib/setupapi/devinst.c 2005-08-09 20:12:35 UTC (rev 17251) @@ -82,11 +82,13 @@ #define SETUP_DEV_INFO_SET_MAGIC 0xd00ff057 -struct DeviceInterface /* Element of DeviceInfoElement.InterfaceHead */ +struct DeviceInterface /* Element of DeviceInfoElement.InterfaceListHead */ { LIST_ENTRY ListEntry; + struct DeviceInfoElement* DeviceInfo; GUID InterfaceClassGuid; + /* SPINT_ACTIVE : the interface is active/enabled * SPINT_DEFAULT: the interface is the default interface for the device class FIXME??? @@ -157,7 +159,7 @@ struct DriverInfoElement *SelectedDriver; /* List of interfaces implemented by this device */ - LIST_ENTRY InterfaceHead; /* List of struct DeviceInterface */ + LIST_ENTRY InterfaceListHead; /* List of struct DeviceInterface */ WCHAR Data[0]; }; @@ -1167,11 +1169,12 @@ struct DeviceInfoElement *deviceInfo; *pDeviceInfo = NULL; + if (IsEqualIID(&pClassGuid, &GUID_NULL)) { FIXME("Bad argument!!!"); return FALSE; }/* FIXME: remove */ deviceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfoElement) + (wcslen(InstancePath) + 1) * sizeof(WCHAR)); if (!deviceInfo) { - SetLastError(ERROR_NO_SYSTEM_RESOURCES); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } wcscpy(deviceInfo->Data, InstancePath); @@ -1185,12 +1188,39 @@ deviceInfo->FlagsEx = 0; /* FIXME */ deviceInfo->SelectedDriver = NULL; InitializeListHead(&deviceInfo->DriverListHead); - InitializeListHead(&deviceInfo->InterfaceHead); + InitializeListHead(&deviceInfo->InterfaceListHead); *pDeviceInfo = deviceInfo; return TRUE; } +static BOOL +CreateDeviceInterface( + IN struct DeviceInfoElement* deviceInfo, + IN LPCWSTR SymbolicLink, + IN LPCGUID pInterfaceGuid, + OUT struct DeviceInterface **pDeviceInterface) +{ + struct DeviceInterface *deviceInterface; + + *pDeviceInterface = NULL; + if (IsEqualIID(&pInterfaceGuid, &GUID_NULL)) { FIXME("Bad argument!!!"); return FALSE; }/* FIXME: remove */ + + deviceInterface = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInterface) + (wcslen(SymbolicLink) + 1) * sizeof(WCHAR)); + if (!deviceInterface) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + deviceInterface->DeviceInfo = deviceInfo; + wcscpy(deviceInterface->SymbolicLink, SymbolicLink); + deviceInterface->Flags = 0; /* FIXME */ + memcpy(&deviceInterface->InterfaceClassGuid, pInterfaceGuid, sizeof(GUID)); + + *pDeviceInterface = deviceInterface; + return TRUE; +} + static LONG SETUP_CreateDevListFromEnumerator( struct DeviceInfoSet *list, LPCGUID pClassGuid OPTIONAL, @@ -1393,7 +1423,7 @@ } } -#ifdef __WINESRC__ +#ifndef __REACTOS__ static LONG SETUP_CreateSerialDeviceList( struct DeviceInfoSet *list, PCWSTR MachineName, @@ -1406,7 +1436,7 @@ LPWSTR devices; static const WCHAR devicePrefixW[] = { 'C','O','M',0 }; LPWSTR ptr; - //DeviceInfo *deviceInfo; + struct DeviceInfoElement *deviceInfo; if (MachineName) WARN("'MachineName' is ignored on Wine!\n"); @@ -1426,7 +1456,7 @@ HeapFree(GetProcessHeap(), 0, devices); devices = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); if (!devices) - return ERROR_NO_SYSTEM_RESOURCES; + return ERROR_NOT_ENOUGH_MEMORY; *devices = '\0'; } else @@ -1443,24 +1473,25 @@ if (strncmpW(devicePrefixW, ptr, sizeof(devicePrefixW) / sizeof(devicePrefixW[0]) - 1) == 0) { /* We have found a device */ + struct DeviceInterface *interfaceInfo; TRACE("Adding %s to list\n", debugstr_w(ptr)); -#if 0 - deviceInfo = HeapAlloc(GetProcessHeap(), 0, - FIELD_OFFSET(DeviceInfo, Interface.Data) + (strlenW(ptr) + 1) * sizeof(WCHAR)); - if (!deviceInfo) + /* Step 1. Create a device info element */ + if (!CreateDeviceInfoElement(ptr, &GUID_SERENUM_BUS_ENUMERATOR, &deviceInfo)) { if (devices != buf) HeapFree(GetProcessHeap(), 0, devices); - return ERROR_NO_SYSTEM_RESOURCES; + return GetLastError(); } - deviceInfo->IsDevice = FALSE; - deviceInfo->Interface.pSymbolicLink = &deviceInfo->Interface.Data[0]; - memcpy(&deviceInfo->Interface.InterfaceGuid, InterfaceGuid, sizeof(GUID)); - wcscpy(deviceInfo->Interface.pSymbolicLink, ptr); - InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); -#else - FIXME("not implemented\n"); -#endif + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); + + /* Step 2. Create an interface list for this element */ + if (!CreateDeviceInterface(deviceInfo, ptr, InterfaceGuid, &interfaceInfo)) + { + if (devices != buf) + HeapFree(GetProcessHeap(), 0, devices); + return GetLastError(); + } + InsertTailList(&deviceInfo->InterfaceListHead, &interfaceInfo->ListEntry); } } if (devices != buf) @@ -1468,7 +1499,7 @@ return ERROR_SUCCESS; } -#else /* __WINESRC__ */ +#else /* __REACTOS__ */ static LONG SETUP_CreateInterfaceList( struct DeviceInfoSet *list, @@ -1488,7 +1519,7 @@ DWORD dwLength, dwInstancePathLength; DWORD dwRegType; GUID ClassGuid; - DeviceInfo *deviceInfo; + struct DeviceInfoElement *deviceInfo; /* Open registry key related to this interface */ hInterfaceKey = SetupDiOpenClassRegKeyExW(InterfaceGuid, KEY_ENUMERATE_SUB_KEYS, DIOCR_INTERFACE, MachineName, NULL); @@ -1537,7 +1568,7 @@ { RegCloseKey(hDeviceInstanceKey); RegCloseKey(hInterfaceKey); - return ERROR_NO_SYSTEM_RESOURCES; + return ERROR_NOT_ENOUGH_MEMORY; } rc = RegQueryValueExW(hDeviceInstanceKey, DeviceInstance, NULL, NULL, (LPBYTE)InstancePath, &dwInstancePathLength); if (rc != ERROR_SUCCESS) @@ -1622,6 +1653,9 @@ j = 0; while (TRUE) { + LPWSTR pSymbolicLink; + struct DeviceInterface *interfaceInfo; + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); rc = RegEnumKeyExW(hDeviceInstanceKey, j, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); if (rc == ERROR_NO_MORE_ITEMS) @@ -1663,45 +1697,55 @@ RegCloseKey(hInterfaceKey); return ERROR_GEN_FAILURE; } - deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Interface.Data) + dwInstancePathLength + dwLength + 2 * sizeof(WCHAR)); - if (!deviceInfo) + + /* We have found a device */ + /* Step 1. Create a device info element */ + if (!CreateDeviceInfoElement(InstancePath, &ClassGuid, &deviceInfo)) { RegCloseKey(hReferenceKey); RegCloseKey(hDeviceInstanceKey); RegCloseKey(hInterfaceKey); - return ERROR_NO_SYSTEM_RESOURCES; + return GetLastError(); } - deviceInfo->Interface.pInstancePath = &deviceInfo->Interface.Data[0]; - deviceInfo->Interface.pSymbolicLink = &deviceInfo->Interface.Data[dwInstancePathLength + 1]; - rc = RegQueryValueExW(hReferenceKey, SymbolicLink, NULL, NULL, (LPBYTE)deviceInfo->Interface.pSymbolicLink, &dwLength); + TRACE("Adding device %s to list\n", debugstr_w(InstancePath)); + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); + + /* Step 2. Create an interface list for this element */ + pSymbolicLink = HeapAlloc(GetProcessHeap(), 0, (dwLength + 1) * sizeof(WCHAR)); + if (!pSymbolicLink) + { + RegCloseKey(hReferenceKey); + RegCloseKey(hDeviceInstanceKey); + RegCloseKey(hInterfaceKey); + return ERROR_NOT_ENOUGH_MEMORY; + } + rc = RegQueryValueExW(hReferenceKey, SymbolicLink, NULL, NULL, (LPBYTE)pSymbolicLink, &dwLength); + pSymbolicLink[dwLength / sizeof(WCHAR)] = '\0'; RegCloseKey(hReferenceKey); if (rc != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, deviceInfo); + HeapFree(GetProcessHeap(), 0, pSymbolicLink); RegCloseKey(hDeviceInstanceKey); RegCloseKey(hInterfaceKey); return rc; } - deviceInfo->Interface.pSymbolicLink[dwLength / sizeof(WCHAR)] = '\0'; - TRACE("Symbolic link %s\n", debugstr_w(deviceInfo->Interface.pSymbolicLink)); - - /* Add this entry to the list */ - TRACE("Entry found\n"); - deviceInfo->IsDevice = FALSE; - memcpy( - &deviceInfo->Interface.InterfaceGuid, - InterfaceGuid, - sizeof(deviceInfo->Interface.InterfaceGuid)); - wcscpy(deviceInfo->Interface.pInstancePath, InstancePath); - InsertTailList(&list->ListHead, &deviceInfo->ItemEntry); - list->numberOfEntries++; + if (!CreateDeviceInterface(deviceInfo, pSymbolicLink, InterfaceGuid, &interfaceInfo)) + { + HeapFree(GetProcessHeap(), 0, pSymbolicLink); + RegCloseKey(hDeviceInstanceKey); + RegCloseKey(hInterfaceKey); + return GetLastError(); + } + TRACE("Adding interface %s to list\n", debugstr_w(pSymbolicLink)); + HeapFree(GetProcessHeap(), 0, pSymbolicLink); + InsertTailList(&deviceInfo->InterfaceListHead, &interfaceInfo->ListEntry); } RegCloseKey(hDeviceInstanceKey); } RegCloseKey(hInterfaceKey); return ERROR_SUCCESS; } -#endif /* __WINESRC__ */ +#endif /* __REACTOS__ */ /*********************************************************************** * SetupDiGetClassDevsExW (SETUPAPI.@) @@ -1776,7 +1820,7 @@ return INVALID_HANDLE_VALUE; } -#ifdef __WINESRC__ +#ifndef __REACTOS__ /* Special case: find serial ports by calling QueryDosDevice */ if (IsEqualIID(class, &GUID_DEVINTERFACE_COMPORT)) rc = SETUP_CreateSerialDeviceList(list, machine, (LPGUID)class, enumstr); @@ -1787,9 +1831,9 @@ ERR("Wine can only enumerate serial devices at the moment!\n"); rc = ERROR_INVALID_PARAMETER; } -#else /* __WINESRC__ */ +#else /* __REACTOS__ */ rc = SETUP_CreateInterfaceList(list, machine, (LPGUID)class, enumstr); -#endif /* __WINESRC__ */ +#endif /* __REACTOS__ */ if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1825,7 +1869,7 @@ { BOOL ret = FALSE; - TRACE("%p, %p, %s, 0x%08lx, %p\n", DeviceInfoSet, DeviceInfoData, + TRACE("%p, %p, %s, %ld, %p\n", DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), MemberIndex, DeviceInterfaceData); if (!DeviceInterfaceData) @@ -1850,8 +1894,8 @@ ItemList = ItemList->Flink; continue; } - InterfaceListEntry = DevInfo->InterfaceHead.Flink; - while (InterfaceListEntry != &DevInfo->InterfaceHead && !Found) + InterfaceListEntry = DevInfo->InterfaceListHead.Flink; + while (InterfaceListEntry != &DevInfo->InterfaceListHead && !Found) { struct DeviceInterface *DevItf = (struct DeviceInterface *)InterfaceListEntry; if (!IsEqualIID(&DevItf->InterfaceClassGuid, InterfaceClassGuid)) @@ -1874,7 +1918,7 @@ DeviceInterfaceData->Reserved = (ULONG_PTR)DevItf; Found = TRUE; } - MemberIndex--; + InterfaceListEntry = InterfaceListEntry->Flink; } ItemList = ItemList->Flink; } @@ -1911,9 +1955,9 @@ { ListEntry = RemoveHeadList(&list->ListHead); deviceInfo = (struct DeviceInfoElement *)ListEntry; - while (!IsListEmpty(&deviceInfo->InterfaceHead)) + while (!IsListEmpty(&deviceInfo->InterfaceListHead)) { - InterfaceEntry = RemoveHeadList(&deviceInfo->InterfaceHead); + InterfaceEntry = RemoveHeadList(&deviceInfo->InterfaceListHead); HeapFree(GetProcessHeap(), 0, InterfaceEntry); } HeapFree(GetProcessHeap(), 0, ListEntry); @@ -1928,6 +1972,8 @@ } else SetLastError(ERROR_INVALID_HANDLE); + + TRACE("Returning %d\n", ret); return ret; } @@ -2036,11 +2082,10 @@ SetLastError(ERROR_INVALID_PARAMETER); else { -#if 0 - DeviceInfo *deviceInfo = (DeviceInfo *)DeviceInterfaceData->Reserved; - LPCWSTR devName = deviceInfo->Interface.pSymbolicLink; + struct DeviceInterface *deviceInterface = (struct DeviceInterface *)DeviceInterfaceData->Reserved; + LPCWSTR devName = deviceInterface->SymbolicLink; DWORD sizeRequired = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + - lstrlenW(devName); + (lstrlenW(devName) + 1) * sizeof(WCHAR); if (sizeRequired > DeviceInterfaceDetailDataSize) { @@ -2055,7 +2100,7 @@ if (DeviceInfoData) { memcpy(&DeviceInfoData->ClassGuid, - &deviceInfo->Interface.ClassGuid, + &deviceInterface->DeviceInfo->ClassGuid, sizeof(GUID)); DeviceInfoData->DevInst = 0; /* FIXME */ /* Note: this appears to be dangerous, passing a private @@ -2063,15 +2108,10 @@ * expected lifetime of the device data is the same as the * HDEVINFO; once that is closed, the data are no longer valid. */ - DeviceInfoData->Reserved = (ULONG_PTR)deviceInfo; + DeviceInfoData->Reserved = (ULONG_PTR)deviceInterface->DeviceInfo; } ret = TRUE; } -#else - FIXME("not implemented\n"); - SetLastError(ERROR_GEN_FAILURE); - ret = FALSE; -#endif } TRACE("Returning %d\n", ret); @@ -2643,7 +2683,7 @@ lpFullGuidString = HeapAlloc(GetProcessHeap(), 0, (dwLength + 3) * sizeof(WCHAR)); if (!lpFullGuidString) { - SetLastError(ERROR_NO_SYSTEM_RESOURCES); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); RpcStringFreeW(&lpGuidString); return INVALID_HANDLE_VALUE; } @@ -2864,7 +2904,7 @@ { struct DeviceInfoElement *deviceInfo; - if (CreateDeviceInfoElement(DeviceName, &GUID_NULL /* FIXME */, &deviceInfo)) + if (CreateDeviceInfoElement(DeviceName, ClassGuid, &deviceInfo)) { InsertTailList(&list->ListHead, &deviceInfo->ListEntry);

1 0

[greatlrd] 17250: Thx harmut you did see the small bug, I miss, do not use MAX_PATH as lenght of command line, it must be CMDLINE_LENGTH instead, patch by Brandon Turner
by greatlrd＠svn.reactos.com 09 Aug '05

09 Aug '05

Thx harmut you did see the small bug, I miss, do not use MAX_PATH as lenght of command line, it must be CMDLINE_LENGTH instead, patch by Brandon Turner Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-08-09 19:35:07 UTC (rev 17249) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-08-09 19:52:16 UTC (rev 17250) @@ -296,9 +296,9 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest) { TCHAR szFullName[MAX_PATH]; - TCHAR first[MAX_PATH]; - TCHAR rest[MAX_PATH]; - TCHAR full[MAX_PATH]; + TCHAR first[CMDLINE_LENGTH]; + TCHAR rest[CMDLINE_LENGTH]; + TCHAR full[CMDLINE_LENGTH]; #ifndef __REACTOS__ TCHAR szWindowTitle[MAX_PATH]; #endif

1 0

[hbirr] 17249: Silence a debug message.
by hbirr＠svn.reactos.com 09 Aug '05

09 Aug '05

Silence a debug message. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-08-09 19:12:46 UTC (rev 17248) +++ trunk/reactos/ntoskrnl/io/file.c 2005-08-09 19:35:07 UTC (rev 17249) @@ -916,9 +916,8 @@ /* HACK */ FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; + DPRINT("%wZ\n", ObjectAttributes->ObjectName); - DPRINT1("%wZ\n", ObjectAttributes->ObjectName); - ObDereferenceObject (DeviceObject); }

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005