Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-diffs] [ion] 18097: Open BNO directory with correct privileges, open CSR connection with correct path. Add InWindows boolean to use the right CSR ServerID in windows and add a hack to get kernel32 to be loadable if used with .local to force an application to use our kernel and not the system one. The result of this is that our kernel32 can now load in Windows XP (not 2000).
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

Open BNO directory with correct privileges, open CSR connection with correct path. Add InWindows boolean to use the right CSR ServerID in windows and add a hack to get kernel32 to be loadable if used with .local to force an application to use our kernel and not the system one. The result of this is that our kernel32 can now load in Windows XP (not 2000). Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/lib/kernel32/kernel32.def Modified: trunk/reactos/lib/kernel32/misc/dllmain.c _____ Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-09-26 16:13:50 UTC (rev 18096) +++ trunk/reactos/include/ndk/obtypes.h 2005-09-26 18:03:17 UTC (rev 18097) @@ -36,7 +36,7 @@ #define DIRECTORY_TRAVERSE 0x0002 #define DIRECTORY_CREATE_OBJECT 0x0004 #define DIRECTORY_CREATE_SUBDIRECTORY 0x0008 -#define DIRECTORY_ALL_ACCESS STANDARD_RIGHTS_REQUIRED | 0xF +#define DIRECTORY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0xF) #endif /* Duplication Flags */ _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2005-09-26 16:13:50 UTC (rev 18096) +++ trunk/reactos/lib/kernel32/kernel32.def 2005-09-26 18:03:17 UTC (rev 18097) @@ -55,7 +55,8 @@ BaseFlushAppcompatCache@0 ;BaseInitAppcompatCache ;BaseInitAppcompatCacheSupport -;BaseProcessInitPostImport +BaseProcessInitPostImport@0 +BaseQueryModuleData@20 BaseUpdateAppcompatCache@12 Beep@8 BeginUpdateResourceA@8 _____ Modified: trunk/reactos/lib/kernel32/misc/dllmain.c --- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-09-26 16:13:50 UTC (rev 18096) +++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-09-26 18:03:17 UTC (rev 18097) @@ -13,11 +13,9 @@ #include <k32.h> -#define NDEBUG +//#define NDEBUG #include "../include/debug.h" -#define CSR_BASE_DLL 0 // <- This should be 1 when CSR gets committed - /* GLOBALS *******************************************************************/ extern UNICODE_STRING SystemDirectory; @@ -26,6 +24,8 @@ HANDLE hProcessHeap = NULL; HMODULE hCurrentModule = NULL; HANDLE hBaseDir = NULL; +PPEB Peb; +ULONG SessionId; static BOOL DllInitialized = FALSE; static BOOL ConsoleInitialized = FALSE; @@ -44,6 +44,7 @@ extern BOOL FASTCALL NlsInit(); extern VOID FASTCALL NlsUninit(); +BOOLEAN InWindows = FALSE; HANDLE STDCALL @@ -52,41 +53,77 @@ BOOL bInheritHandle, DWORD dwOptions); +#define WIN_OBJ_DIR L"\\Windows" +#define SESSION_DIR L"\\Sessions" + /* FUNCTIONS *****************************************************************/ -static NTSTATUS +NTSTATUS +WINAPI OpenBaseDirectory(PHANDLE DirHandle) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\BaseNamedObjects"); - NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\BaseNamedObjects"); + NTSTATUS Status; - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE|OBJ_PERMANENT, - NULL, - NULL); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); - Status = NtOpenDirectoryObject(DirHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) + Status = NtOpenDirectoryObject(DirHandle, + DIRECTORY_ALL_ACCESS & + ~(DELETE | WRITE_DAC | WRITE_OWNER), + &ObjectAttributes); + if (!NT_SUCCESS(Status)) { - Status = NtCreateDirectoryObject(DirHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DbgPrint("NtCreateDirectoryObject() failed\n"); - } - - return Status; + /* FIXME: It's not our job to create the BNO directory, csr does it */ + Status = NtCreateDirectoryObject(DirHandle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateDirectoryObject() failed\n"); + } } - return STATUS_SUCCESS; + DPRINT("Opened BNO: %lx\n", *DirHandle); + return Status; } +/* + * @unimplemented + */ BOOL +WINAPI +BaseQueryModuleData(IN LPSTR ModuleName, + IN LPSTR Unknown, + IN PVOID Unknown2, + IN PVOID Unknown3, + IN PVOID Unknown4) +{ + DPRINT1("BaseQueryModuleData called: %s %s %x %x %x\n", + ModuleName, + Unknown, + Unknown2, + Unknown3, + Unknown4); + return FALSE; +} + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +BaseProcessInitPostImport(VOID) +{ + /* FIXME: Initialize TS pointers */ + return STATUS_SUCCESS; +} + +BOOL STDCALL BasepInitConsole(VOID) { @@ -210,20 +247,75 @@ BOOLEAN IsServer; ULONG Dummy; ULONG DummySize = sizeof(Dummy); + WCHAR SessionDir[256]; DPRINT("DllMain(hInst %lx, dwReason %lu)\n", hDll, dwReason); + /* Cache the PEB and Session ID */ + Peb = NtCurrentPeb(); + SessionId = Peb->SessionId; + switch (dwReason) { case DLL_PROCESS_ATTACH: + /* OK, yes, this is really retarded but it works for now */ + InWindows = NtCurrentPeb()->BeingDebugged; + + /* + * CreateProcess will run in the real kernel32 and it will write + * its own BaseProcessStartThunk EIP in the CONTEXT that ZwContinue + * will get. We'll be first called by Ldr while initializing, and we'll + * be wrapped in 3 layers of SEH, followed by two frames, finally + * followed by our CONTEXT on the stack. We'll modify the EIP in it + * to match the correct one (our own) and then everything works. + * Tested on XP and 2K3, probably doesn't work in 2K. + */ + if (InWindows) + { + /* + * Due to yet another bug in how Windows handles .local, LDR will + * actually end up loading us twice. The second time will be the + * "official" load, at a totally different address. It will be, + * it will be at -that- address that all the APIs will be called. + * However, that address is dynamic while this one will be static, + * so we'll do initilization with this one. Plus, at this one, + * we know exactly that we're within 3 SEH layers. + */ + if (hDll == (HANDLE)0x7c800000) + { + PULONG Eip; + Eip = (PULONG)*(PULONG)*(PULONG)NtCurrentTeb()->Tib.ExceptionList + + 0x9 + + FIELD_OFFSET(CONTEXT, Eip) / sizeof(ULONG); + *Eip = (ULONG)BaseProcessStartThunk; + } + } + /* Don't bother us for each thread */ LdrDisableThreadCalloutsForDll((PVOID)hDll); + /* Setup the right Object Directory path */ + if (!SessionId) + { + /* Use the raw path */ + wcscpy(SessionDir, WIN_OBJ_DIR); + } + else + { + /* Use the session path */ + swprintf(SessionDir, + L"%ws\\%ld%ws", + SESSION_DIR, + SessionId, + WIN_OBJ_DIR); + } + /* Connect to the base server */ - Status = CsrClientConnectToServer(L"\\Windows", // <- FIXME: SessionDir - CSR_BASE_DLL, + DPRINT("Connecting to CSR...\n"); + Status = CsrClientConnectToServer(SessionDir, + InWindows ? 1 : 0, &Dummy, &DummySize, &IsServer); @@ -238,85 +330,85 @@ if (!IsServer) { /* Set the termination port for the thread */ + DPRINT("Creating new thread for CSR\n"); CsrNewThread(); } - hProcessHeap = RtlGetProcessHeap(); - hCurrentModule = hDll; + hProcessHeap = RtlGetProcessHeap(); + hCurrentModule = hDll; + DPRINT("Heap: %p\n", hProcessHeap); - /* - * Initialize WindowsDirectory and SystemDirectory - */ - DPRINT("NtSystemRoot: %S\n", - SharedUserData->NtSystemRoot); - RtlCreateUnicodeString (&WindowsDirectory, - SharedUserData->NtSystemRoot); - SystemDirectory.MaximumLength = WindowsDirectory.MaximumLength + 18; - SystemDirectory.Length = WindowsDirectory.Length + 18; - SystemDirectory.Buffer = RtlAllocateHeap (hProcessHeap, - 0, - SystemDirectory.MaximumLength); - wcscpy (SystemDirectory.Buffer, WindowsDirectory.Buffer); - wcscat (SystemDirectory.Buffer, L"\\System32"); + /* + * Initialize WindowsDirectory and SystemDirectory + */ + DPRINT("NtSystemRoot: %S\n", SharedUserData->NtSystemRoot); + RtlCreateUnicodeString (&WindowsDirectory, SharedUserData->NtSystemRoot); + SystemDirectory.MaximumLength = WindowsDirectory.MaximumLength + 18; + SystemDirectory.Length = WindowsDirectory.Length + 18; + SystemDirectory.Buffer = RtlAllocateHeap(hProcessHeap, + 0, + SystemDirectory.MaximumLength); + wcscpy(SystemDirectory.Buffer, WindowsDirectory.Buffer); + wcscat(SystemDirectory.Buffer, L"\\System32"); - /* Open object base directory */ - Status = OpenBaseDirectory(&hBaseDir); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Failed to open object base directory (Status %lx)\n", - Status); - return FALSE; - } + /* Open object base directory */ + Status = OpenBaseDirectory(&hBaseDir); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open object base directory (Status %lx)\n", Status); + return FALSE; + } - /* Initialize the DLL critical section */ - RtlInitializeCriticalSection(&DllLock); + /* Initialize the DLL critical section */ + RtlInitializeCriticalSection(&DllLock); - /* Initialize the National Language Support routines */ - if (! NlsInit()) - { + /* Initialize the National Language Support routines */ + if (!NlsInit()) + { + DPRINT1("NLS Init failed\n"); return FALSE; - } + } - /* Initialize Console Support */ - if (!BasepInitConsole()) - { - DPRINT1("Failure to set up console\n"); - return FALSE; - } + /* Initialize Console Support */ + if (!BasepInitConsole()) + { + DPRINT1("Failure to set up console\n"); + return FALSE; + } - /* Insert more dll attach stuff here! */ + /* Insert more dll attach stuff here! */ + DllInitialized = TRUE; + DPRINT1("Initialization complete\n"); + break; - DllInitialized = TRUE; - break; + case DLL_PROCESS_DETACH: - case DLL_PROCESS_DETACH: - DPRINT("DLL_PROCESS_DETACH\n"); - if (DllInitialized == TRUE) - { - /* Insert more dll detach stuff here! */ + DPRINT("DLL_PROCESS_DETACH\n"); + if (DllInitialized == TRUE) + { + /* Insert more dll detach stuff here! */ + NlsUninit(); - NlsUninit(); + /* Delete DLL critical section */ + if (ConsoleInitialized == TRUE) + { + RtlDeleteCriticalSection (&ConsoleLock); + } + RtlDeleteCriticalSection (&DllLock); - /* Delete DLL critical section */ - if (ConsoleInitialized == TRUE) - { - RtlDeleteCriticalSection (&ConsoleLock); - } - RtlDeleteCriticalSection (&DllLock); + /* Close object base directory */ + NtClose(hBaseDir); - /* Close object base directory */ - NtClose(hBaseDir); + RtlFreeUnicodeString (&SystemDirectory); + RtlFreeUnicodeString (&WindowsDirectory); + } + break; - RtlFreeUnicodeString (&SystemDirectory); - RtlFreeUnicodeString (&WindowsDirectory); - } - break; - - default: - break; + default: + break; } - return TRUE; + return TRUE; } /* EOF */

1 0

[fireball] 18096: Christoph von Wittich: fix for bug 824 ("memory leak in welcome").
by fireball＠svn.reactos.com 26 Sep '05

26 Sep '05

Christoph von Wittich: fix for bug 824 ("memory leak in welcome"). -LoadBitmap without DeleteObject -SelectObject is used with wrong DC Modified: trunk/reactos/subsys/system/welcome/welcome.c _____ Modified: trunk/reactos/subsys/system/welcome/welcome.c --- trunk/reactos/subsys/system/welcome/welcome.c 2005-09-26 16:07:23 UTC (rev 18095) +++ trunk/reactos/subsys/system/welcome/welcome.c 2005-09-26 16:13:50 UTC (rev 18096) @@ -143,6 +143,7 @@ ulInnerWidth = BitmapInfo.bmWidth; ulInnerHeight = (ulInnerWidth * 3) / 4; ulTitleHeight = BitmapInfo.bmHeight + 3; + DeleteObject(hTitleBitmap); } ulInnerHeight -= GetSystemMetrics(SM_CYCAPTION); @@ -485,7 +486,7 @@ rcPanel->right - rcPanel->left, rcPanel->bottom - 3, hdcMem, 0, 0, SRCCOPY); - SelectObject(hdc, hOldBitmap); + SelectObject(hdcMem, hOldBitmap); /* Dark blue line */ hOldBrush = SelectObject(hdc, hbrDarkBlue);

1 0

[fireball] 18095: Christoph von Wittich: fix for bug 823 ("Resource leak in regedit").
by fireball＠svn.reactos.com 26 Sep '05

26 Sep '05

Christoph von Wittich: fix for bug 823 ("Resource leak in regedit"). Modified: trunk/reactos/subsys/system/regedit/main.c _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-09-26 15:50:37 UTC (rev 18094) +++ trunk/reactos/subsys/system/regedit/main.c 2005-09-26 16:07:23 UTC (rev 18095) @@ -165,6 +165,7 @@ { UnregisterHexEditorClass(hInstance); DestroyMenu(hMenuFrame); + DestroyMenu(hPopupMenus); UnloadAclUiDll(); }

1 0

[fireball] 18094: Christoph von Wittich: fix for bug 822 ("Resource leak in calc").
by fireball＠svn.reactos.com 26 Sep '05

26 Sep '05

Christoph von Wittich: fix for bug 822 ("Resource leak in calc"). Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-09-26 13:02:01 UTC (rev 18093) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-09-26 15:50:37 UTC (rev 18094) @@ -2847,6 +2847,15 @@ { int i; + if (menus[MENU_STD] != 0) + DestroyMenu(menus[MENU_STD]); + + if (menus[MENU_SCIMS] != 0) + DestroyMenu(menus[MENU_SCIMS]); + + if (menus[MENU_SCIWS] != 0) + DestroyMenu(menus[MENU_SCIWS]); + for (i=0;i<calc->numButtons;i++) DestroyWindow(calc->cb[i].hBtn); }

1 0

[weiden] 18093: export RegOverridePredefKey, forgot to commit this change
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

export RegOverridePredefKey, forgot to commit this change Modified: trunk/reactos/lib/advapi32/advapi32.def _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-09-26 12:44:03 UTC (rev 18092) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-09-26 13:02:01 UTC (rev 18093) @@ -503,7 +503,7 @@ RegOpenKeyExW@20 RegOpenKeyW@12 RegOpenUserClassesRoot@16 -;RegOverridePredefKey +RegOverridePredefKey@8 RegQueryInfoKeyA@48 RegQueryInfoKeyW@48 RegQueryMultipleValuesA@20

1 0

[weiden] 18092: implemented RegOverridePredefKey()
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

implemented RegOverridePredefKey() Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-09-26 12:05:27 UTC (rev 18091) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-09-26 12:44:03 UTC (rev 18092) @@ -5,6 +5,7 @@ * FILE: lib/advapi32/reg/reg.c * PURPOSE: Registry functions * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * Thomas Weidenmueller <w3seek(a)reactos.com> * UPDATE HISTORY: * Created 01/11/98 * 19990309 EA Stubs @@ -88,6 +89,54 @@ static NTSTATUS +OpenPredefinedKey(IN ULONG Index, + OUT HANDLE Handle) +{ + NTSTATUS Status; + + switch (Index) + { + case 0: /* HKEY_CLASSES_ROOT */ + Status = OpenClassesRootKey (Handle); + break; + + case 1: /* HKEY_CURRENT_USER */ + Status = RtlOpenCurrentUser (MAXIMUM_ALLOWED, + Handle); + break; + + case 2: /* HKEY_LOCAL_MACHINE */ + Status = OpenLocalMachineKey (Handle); + break; + + case 3: /* HKEY_USERS */ + Status = OpenUsersKey (Handle); + break; +#if 0 + case 4: /* HKEY_PERFORMANCE_DATA */ + Status = OpenPerformanceDataKey (Handle); + break; +#endif + + case 5: /* HKEY_CURRENT_CONFIG */ + Status = OpenCurrentConfigKey (Handle); + break; + + case 6: /* HKEY_DYN_DATA */ + Status = STATUS_NOT_IMPLEMENTED; + break; + + default: + WARN("MapDefaultHandle() no handle creator\n"); + Status = STATUS_INVALID_PARAMETER; + break; + } + + return Status; +} + + +static NTSTATUS MapDefaultKey (OUT PHANDLE RealKey, IN HKEY Key) { @@ -127,42 +176,8 @@ if (DoOpen) { /* create/open the default handle */ - switch (Index) - { - case 0: /* HKEY_CLASSES_ROOT */ - Status = OpenClassesRootKey (Handle); - break; - - case 1: /* HKEY_CURRENT_USER */ - Status = RtlOpenCurrentUser (MAXIMUM_ALLOWED, - Handle); - break; - - case 2: /* HKEY_LOCAL_MACHINE */ - Status = OpenLocalMachineKey (Handle); - break; - - case 3: /* HKEY_USERS */ - Status = OpenUsersKey (Handle); - break; -#if 0 - case 4: /* HKEY_PERFORMANCE_DATA */ - Status = OpenPerformanceDataKey (Handle); - break; -#endif - case 5: /* HKEY_CURRENT_CONFIG */ - Status = OpenCurrentConfigKey (Handle); - break; - - case 6: /* HKEY_DYN_DATA */ - Status = STATUS_NOT_IMPLEMENTED; - break; - - default: - WARN("MapDefaultHandle() no handle creator\n"); - Status = STATUS_INVALID_PARAMETER; - break; - } + Status = OpenPredefinedKey(Index, + Handle); } if (NT_SUCCESS(Status)) @@ -294,6 +309,63 @@ /*********************************************************************** * + * RegOverridePredefKey + * + * @implemented + */ +LONG STDCALL +RegOverridePredefKey(IN HKEY hKey, + IN HKEY hNewHKey OPTIONAL) +{ + LONG ErrorCode = ERROR_SUCCESS; + + if (hKey == HKEY_CLASSES_ROOT || + hKey == HKEY_CURRENT_CONFIG || + hKey == HKEY_CURRENT_USER || + hKey == HKEY_LOCAL_MACHINE || + hKey == HKEY_PERFORMANCE_DATA || + hKey == HKEY_USERS) + { + PHANDLE Handle; + ULONG Index; + + Index = (ULONG)hKey & 0x0FFFFFFF; + Handle = &DefaultHandleTable[Index]; + + if (hNewHKey == NULL) + { + /* restore the default mapping */ + NTSTATUS Status = OpenPredefinedKey(Index, + &hNewHKey); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + ASSERT(hNewHKey != NULL); + } + + RtlEnterCriticalSection (&HandleTableCS); + + /* close the currently mapped handle if existing */ + if (*Handle != NULL) + { + NtClose(*Handle); + } + + /* update the mapping */ + *Handle = hNewHKey; + + RtlLeaveCriticalSection (&HandleTableCS); + } + else + ErrorCode = ERROR_INVALID_HANDLE; + + return ErrorCode; +} + + +/********************************************************************** ** * RegCloseKey * * @implemented

1 0

[hpoussin] 18091: Update .inf files
by hpoussin＠svn.reactos.com 26 Sep '05

26 Sep '05

Update .inf files Modified: trunk/reactos/media/inf/mouse.inf Modified: trunk/reactos/media/inf/ports.inf Modified: trunk/reactos/media/inf/usbport.inf _____ Modified: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-09-26 11:43:14 UTC (rev 18090) +++ trunk/reactos/media/inf/mouse.inf 2005-09-26 12:05:27 UTC (rev 18091) @@ -25,13 +25,18 @@ [Manufacturer] %StdMfg% = StdMfg +%IbmMfg% = IbmMfg %LogMfg% = LogMfg %MSMfg% = MSMfg [StdMfg] %SERIAL_MOUSE.DeviceDesc% = Serial_Inst,*PNP0F0C,SERENUM\PNP0F0C,*PNP0F17,SERENUM\PNP0F17,SERIAL_MOU SE %PS2_MOUSE.DeviceDesc% = PS2_Inst,*PNP0F0E,*PNP0F19,PS2_MOUSE +%HID_MOUSE.DeviceDesc% = HID_Inst,HID_DEVICE_SYSTEM_MOUSE +[IbmMfg] +*IBM3780.DeviceDesc = PS2_Inst,*IBM3780 + [LogMfg] %*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08 %*PNP0F12.DeviceDesc% = PS2_Inst,*PNP0F12 @@ -97,31 +102,44 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSys Rq",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","MouseResol ution",0x00010001,0x00000003 +;---------------------------- HID MOUSE DRIVER -------------------------- + +[HID_Inst.NT] +CopyFiles = HID_CopyFiles, Mouclass_CopyFiles + +[HID_CopyFiles] +mouhid.sys + +[HID_Inst.NT.Services] +AddService = mouhid, 0x00000002, mouhid_Service_Inst +AddService = mouclass, , mouclass_Service_Inst + +[mouhid_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 0 +ServiceBinary = %12%\mouhid.sys +LoadOrderGroup = Pointer Port + ;-------------------------------- STRINGS ------------------------------- [Strings] ReactOS = "ReactOS Team" MouseClassName = "Mice and other pointing devices" + StdMfg = "(Standard mice)" +SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse" +PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse" +HID_MOUSE.DeviceDesc = "HID Mouse" + +IbmMfg = "IBM" +*IBM3780.DeviceDesc = "IBM PS/2 Trackpoint" + LogMfg = "Logitech" -MSMfg = "Microsoft" +*PNP0F08.DeviceDesc = "Logitech Serial Mouse" +*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse" +MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Microsoft Serial Mouse" *PNP0F03.DeviceDesc = "Microsoft PS/2-style Mouse" -*PNP0F08.DeviceDesc = "Logitech Serial Mouse" -*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse" *PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice" -SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse" -PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse" - -[String.040c] -MouseClassName = "Souris et autres dispositifs de pointage" -StdMfg = "(Souris standard)" - -*PNP0F01.DeviceDesc = "Souris Microsoft sur port sÚrie" -*PNP0F03.DeviceDesc = "Souris Microsoft sur port PS/2" -*PNP0F08.DeviceDesc = "Souris Logitech sur port sÚrie" -*PNP0F12.DeviceDesc = "Souris Logitech sur port PS/2" -*PNP0F13.DeviceDesc = "Souris compatible PS/2" -SERIAL_MOUSE.DeviceDesc = "Souris standard sur port sÚrie" -PS2_MOUSE.DeviceDesc = "Souris standard sur port PS/2" \ No newline at end of file _____ Modified: trunk/reactos/media/inf/ports.inf --- trunk/reactos/media/inf/ports.inf 2005-09-26 11:43:14 UTC (rev 18090) +++ trunk/reactos/media/inf/ports.inf 2005-09-26 12:05:27 UTC (rev 18091) @@ -61,14 +61,7 @@ [Strings] ReactOS = "ReactOS Team" PortsClassName = "Serial and parallel ports" -StdMfg = "(Standard ports)" +StdMfg = "(Standard ports)" *PNP0500.DeviceDesc = "Serial communication port" *PNP0501.DeviceDesc = "Serial communication port" - -[String.040c] -PortsClassName = "Ports (SÚrie et parallÞle)" -StdMfg = "(Ports standard)" - -*PNP0500.DeviceDesc = "Port de communication sÚrie" -*PNP0501.DeviceDesc = "Port de communication sÚrie" \ No newline at end of file _____ Modified: trunk/reactos/media/inf/usbport.inf --- trunk/reactos/media/inf/usbport.inf 2005-09-26 11:43:14 UTC (rev 18090) +++ trunk/reactos/media/inf/usbport.inf 2005-09-26 12:05:27 UTC (rev 18091) @@ -39,7 +39,7 @@ ;------------------------------ UHCI DRIVER ----------------------------- [UHCI_Inst.NT] -CopyFiles = UHCI_CopyFiles +CopyFiles = UHCI_CopyFiles.NT [UHCI_CopyFiles.NT] usbport.sys @@ -58,7 +58,7 @@ ;------------------------------ OHCI DRIVER ----------------------------- [OHCI_Inst.NT] -CopyFiles = OHCI_CopyFiles +CopyFiles = OHCI_CopyFiles.NT [OHCI_CopyFiles.NT] usbport.sys @@ -77,7 +77,7 @@ ;------------------------------ EHCI DRIVER ----------------------------- [EHCI_Inst.NT] -CopyFiles = EHCI_CopyFiles +CopyFiles = EHCI_CopyFiles.NT [EHCI_CopyFiles.NT] usbport.sys @@ -96,7 +96,7 @@ ;---------------------------- ROOT HUB DRIVER --------------------------- [RootHub_Inst.NT] -CopyFiles = RootHub_CopyFiles +CopyFiles = RootHub_CopyFiles.NT [RootHub_CopyFiles.NT] usbport.sys

1 0

[hpoussin] 18090: Fix signedness (SetupGetIntField takes a PINT argument, not a PUINT one)
by hpoussin＠svn.reactos.com 26 Sep '05

26 Sep '05

Fix signedness (SetupGetIntField takes a PINT argument, not a PUINT one) Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:39:24 UTC (rev 18089) +++ trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:43:14 UTC (rev 18090) @@ -4385,7 +4385,7 @@ DWORD SectionNameLength = 0; BOOL Result = FALSE; INFCONTEXT ContextService; - UINT Flags; + INT Flags; DWORD RequiredSize; HINF hInf = NULL; LPCWSTR AssociatedService = NULL;

1 0

[hpoussin] 18089: Implement parts of SetupDiInstallDevice
by hpoussin＠svn.reactos.com 26 Sep '05

26 Sep '05

Implement parts of SetupDiInstallDevice Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:37:32 UTC (rev 18088) +++ trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:39:24 UTC (rev 18089) @@ -4377,22 +4377,227 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { + struct DriverInfoElement *DriverInfo; + struct DeviceInfoSet *DevInfoSet = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + SYSTEMTIME DriverDate; + WCHAR SectionName[MAX_PATH]; + DWORD SectionNameLength = 0; + BOOL Result = FALSE; + INFCONTEXT ContextService; + UINT Flags; + DWORD RequiredSize; + HINF hInf = NULL; + LPCWSTR AssociatedService = NULL; + BOOL RebootRequired = FALSE; + HKEY hEnumKey, hKey; + LONG rc; + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); - /* Steps to follow: - * 0. If DI_FLAGSEX_SETFAILEDINSTALL is set, set FAILEDINSTALL flag in ConfigFlags registry and exit - * 1. Create driver key and write InfPath and ProviderName - * 2a Process inf sections: {DDInstall}, {DDInstall}.HW [SetupDiOpenDevRegKey] - * b Process {DDInstall}.LogConfigOverride if present [SetupDiOpenDevRegKey] - * c Process {DDInstall}.Services [SetupDiOpenDevRegKey] - * 3. Copy inf file to Inf\ directory [SetupCopyOEMInf] - * 4. Install other waiting files - * 5. Load the driver/Call AddDevice - * 6. Send IRP_MN_START_DEVICE if DI_NEEDRESTART, DI_NEEDREBOOT and DI_DONOTCALLCONFIGMG are not set - */ + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (DeviceInfoData && ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!DeviceInfoData && ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else + Result = TRUE; - FIXME("SetupDiInstallDevice not implemented. Doing nothing\n"); - //SetLastError(ERROR_GEN_FAILURE); - //return FALSE; + if (!Result) + { + /* One parameter is bad */ + return FALSE; + } + + /* FIXME: If DI_FLAGSEX_SETFAILEDINSTALL is set, set FAILEDINSTALL flag in ConfigFlags registry and exit */ + + if (DeviceInfoData) + DriverInfo = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver; + else + DriverInfo = ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver; + FileTimeToSystemTime(&DriverInfo->Info.DriverDate, &DriverDate); + + hInf = SetupOpenInfFileW(DriverInfo->InfPath, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + return FALSE; + + Result = SetupDiGetActualSectionToInstallW(hInf, DriverInfo->InfSection, + SectionName, MAX_PATH, &SectionNameLength, NULL); + if (!Result || SectionNameLength > MAX_PATH - 9) + { + SetupCloseInfFile(hInf); + return FALSE; + } + + /* Create driver key information */ + FIXME("FIXME: Create driver key information\n"); + + /* Write information to driver key */ + FIXME("FIXME: Write information to driver key\n"); + FIXME("DriverDate : '%u-%u-%u'\n", 0, DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); + FIXME("DriverDateData :"); { ULONG i; for (i = 0; i < sizeof(DriverInfo->Info.DriverDate); i++) DbgPrint(" %02x", ((PCHAR)&DriverInfo->Info.DriverDate)[i] & 0xff); } DbgPrint("\n"); + FIXME("DriverDesc : '%S'\n", DriverInfo->Info.Description); + FIXME("DriverVersion : '%u.%u.%u.%u'\n", DriverInfo->Info.DriverVersion & 0xff, (DriverInfo->Info.DriverVersion >> 8) & 0xff, (DriverInfo->Info.DriverVersion >> 16) & 0xff, (DriverInfo->Info.DriverVersion >> 24) & 0xff); + FIXME("InfPath : '%S'\n", DriverInfo->InfPath); + FIXME("InfSection : '%S'\n", DriverInfo->InfSection); /* FIXME: remove extension */ + FIXME("InfSectionExt : '%S'\n", L"???"); /* FIXME */ + FIXME("MatchingDeviceId: '%S'\n", L"???"); /* FIXME */ + FIXME("ProviderName : '%S'\n", DriverInfo->Info.ProviderName); + + /* Install services */ + wcscat(SectionName, L".Services"); + Result = SetupFindFirstLineW(hInf, SectionName, NULL, &ContextService); + while (Result) + { + LPWSTR ServiceName = NULL; + LPWSTR ServiceSection = NULL; + + Result = SetupGetStringFieldW( + &ContextService, + 1, /* Field index */ + NULL, 0, + &RequiredSize); + if (!Result) + goto cleanup; + if (RequiredSize > 0) + { + /* We got the needed size for the buffer */ + ServiceName = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!ServiceName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + Result = SetupGetStringFieldW( + &ContextService, + 1, /* Field index */ + ServiceName, RequiredSize, + &RequiredSize); + if (!Result) + goto cleanup; + } + Result = SetupGetIntField( + &ContextService, + 2, /* Field index */ + &Flags); + if (!Result) + { + /* The field may be empty. Ignore the error */ + Flags = 0; + } + Result = SetupGetStringFieldW( + &ContextService, + 3, /* Field index */ + NULL, 0, + &RequiredSize); + if (!Result) + goto cleanup; + if (RequiredSize > 0) + { + /* We got the needed size for the buffer */ + ServiceSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!ServiceSection) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + Result = SetupGetStringFieldW( + &ContextService, + 3, /* Field index */ + ServiceSection, RequiredSize, + &RequiredSize); + if (!Result) + goto cleanup; + } + SetLastError(ERROR_SUCCESS); + Result = SetupInstallServicesFromInfSectionExW(hInf, ServiceSection, Flags, DeviceInfoSet, DeviceInfoData, NULL, NULL); + if (Result && (Flags & SPSVCINST_ASSOCSERVICE)) + { + AssociatedService = ServiceName; + ServiceName = NULL; + if (GetLastError() == ERROR_SUCCESS_REBOOT_REQUIRED) + RebootRequired = TRUE; + } +cleanup: + HeapFree(GetProcessHeap(), 0, ServiceName); + HeapFree(GetProcessHeap(), 0, ServiceSection); + if (!Result) + { + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); + return FALSE; + } + Result = SetupFindNextLine(&ContextService, &ContextService); + } + + /* Copy .inf file to Inf\ directory */ + FIXME("FIXME: Copy .inf file to Inf\\ directory\n"); /* SetupCopyOEMInf */ + + /* Write information to enum key */ + rc = RegOpenKeyExW(DevInfoSet->HKLM, + EnumKeyName, + 0, + KEY_ENUMERATE_SUB_KEYS, + &hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); + return FALSE; + } + rc = RegOpenKeyExW( + hEnumKey, + DevInfo->DeviceName, + 0, /* Options */ + KEY_SET_VALUE, + &hKey); + RegCloseKey(hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); + return FALSE; + } + FIXME("FIXME: Write information to enum key\n"); + FIXME("ParentIdPrefix : '%S'\n", L"0000"); /* FIXME */ + //FIXME("Service : '%S'\n", AssociatedService); + FIXME("Class : '%S'\n", L"???"); /* FIXME: SetupDiGetINFClass */ + FIXME("ClassGUID : '%S'\n", L"???"); /* FIXME: SetupDiGetINFClass */ + //FIXME("DeviceDesc : '%S'\n", DriverInfo->Info.Description); + FIXME("Driver : '%S'\n", L"???"); /* FIXME: autogenerated key */ + //FIXME("Mfg : '%S'\n", DriverInfo->Info.MfgName); + rc = RegSetValueEx(hKey, L"Service", 0, REG_SZ, (const BYTE *)AssociatedService, (wcslen(AssociatedService) + 1) * sizeof(WCHAR)); + if (rc == ERROR_SUCCESS) + rc = RegSetValueEx(hKey, L"DeviceDesc", 0, REG_SZ, (const BYTE *)DriverInfo->Info.Description, (wcslen(DriverInfo->Info.Description) + 1) * sizeof(WCHAR)); + if (rc == ERROR_SUCCESS) + rc = RegSetValueEx(hKey, L"Mfg", 0, REG_SZ, (const BYTE *)DriverInfo->Info.MfgName, (wcslen(DriverInfo->Info.MfgName) + 1) * sizeof(WCHAR)); + RegCloseKey(hKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); + return FALSE; + } + + /* Load the driver/call AddDevice */ + FIXME("FIXME: Load the driver/call AddDevice\n"); + + /* Send IRP_MN_START_DEVICE if needed */ + //if (!RebootRequired && !(Flags & (DI_NEEDRESTART | DI_NEEDREBOOT | DI_DONOTCALLCONFIGMG))) + FIXME("FIXME: Send IRP_MN_START_DEVICE\n"); + + /* End of installation */ + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); return TRUE; }

1 0

[hpoussin] 18088: Implement SetupInstallServicesFromInfSectionA/W, SetupInstallServicesFromInfSectionExW
by hpoussin＠svn.reactos.com 26 Sep '05

26 Sep '05

Implement SetupInstallServicesFromInfSectionA/W, SetupInstallServicesFromInfSectionExW Add stub for SetupInstallServicesFromInfSectionExW Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-09-26 11:35:23 UTC (rev 18087) +++ trunk/reactos/lib/setupapi/install.c 2005-09-26 11:37:32 UTC (rev 18088) @@ -953,3 +953,43 @@ RtlFreeUnicodeString( &cmdlineW ); } } + + +/********************************************************************** * + * SetupInstallServicesFromInfSectionA (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF hinf, PCSTR sectionname, DWORD flags ) +{ + return SetupInstallServicesFromInfSectionExA( hinf, sectionname, flags, + NULL, NULL, NULL, NULL ); +} + + +/********************************************************************** * + * SetupInstallServicesFromInfSectionW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR sectionname, DWORD flags ) +{ + return SetupInstallServicesFromInfSectionExW( hinf, sectionname, flags, + NULL, NULL, NULL, NULL ); +} + + +/********************************************************************** * + * SetupInstallServicesFromInfSectionExA (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionExA( HINF hinf, PCSTR sectionname, DWORD flags, HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data, PVOID reserved1, PVOID reserved2 ) +{ + UNICODE_STRING sectionnameW; + BOOL ret = FALSE; + + if (RtlCreateUnicodeStringFromAsciiz( &sectionnameW, sectionname )) + { + ret = SetupInstallServicesFromInfSectionExW( hinf, sectionnameW.Buffer, flags, devinfo, devinfo_data, reserved1, reserved2 ); + RtlFreeUnicodeString( &sectionnameW ); + } + else + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + + return ret; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-09-26 11:35:23 UTC (rev 18087) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-09-26 11:37:32 UTC (rev 18088) @@ -437,10 +437,10 @@ @ stdcall SetupInstallFilesFromInfSectionW(long long long wstr wstr long) @ stdcall SetupInstallFromInfSectionA(long long str long long str long ptr ptr long ptr) @ stdcall SetupInstallFromInfSectionW(long long wstr long long wstr long ptr ptr long ptr) -@ stub SetupInstallServicesFromInfSectionA -@ stub SetupInstallServicesFromInfSectionExA -@ stub SetupInstallServicesFromInfSectionExW -@ stub SetupInstallServicesFromInfSectionW +@ stdcall SetupInstallServicesFromInfSectionA(long str long) +@ stdcall SetupInstallServicesFromInfSectionExA(long str long ptr ptr ptr ptr) +@ stdcall SetupInstallServicesFromInfSectionExW(long wstr long ptr ptr ptr ptr) +@ stdcall SetupInstallServicesFromInfSectionW(long wstr long) @ stdcall SetupIterateCabinetA(str long ptr ptr) @ stdcall SetupIterateCabinetW(wstr long ptr ptr) @ stub SetupLogErrorA _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-09-26 11:35:23 UTC (rev 18087) +++ trunk/reactos/lib/setupapi/stubs.c 2005-09-26 11:37:32 UTC (rev 18088) @@ -125,6 +125,15 @@ } /*********************************************************************** + * SetupInstallServicesFromInfSectionExW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname, DWORD flags, HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data, PVOID reserved1, PVOID reserved2 ) +{ + FIXME("Stub %p, %s, 0x%lx, %p, %p, %p, %p\n", hinf, debugstr_w(sectionname), flags, devinfo, devinfo_data, reserved1, reserved2); + return TRUE; +} + +/********************************************************************** * * SetupTerminateFileLog(SETUPAPI.@) */ BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle)

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