Author: hpoussin
Date: Fri May 12 11:36:12 2006
New Revision: 21896
URL: http://svn.reactos.ru/svn/reactos?rev=21896&view=rev
Log:
Misc fixes:
- Add System Bus Extender service group (used by pciide driver)
- Fix tags for Boot Bus Extender services
- Remove deprecated entries for ide.sys
- Let not the hardware wizard display the "Unknown device" (hack)
Modified:
trunk/reactos/boot/bootdata/hivesys.inf
Modified: trunk/reactos/boot/bootdata/hivesys.inf
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys.inf (original)
+++ trunk/reactos/boot/bootdata/hivesys.inf Fri May 12 11:36:12 2006
@@ -36,6 +36,9 @@
HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB",,0x00000012
HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB","CurrentConfig",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB\Hardware Profiles\0000","FriendlyName",0x00000000,"New Hardware Profile"
+; The following line is only here to prevent the "New hardware wizard" to display a window for "Unknown device".
+; This device comes from Root plug and play bus (ntoskrnl/io/pnproot.c) and this one should never appear
+HKLM,"SYSTEM\CurrentControlSet\Enum\Root\LEGACY_UNKNOWN\0000","ConfigFlags",0x00010001,0x00000040
; Keyboard Layouts
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout File",0x00000000,"kbdda.dll"
@@ -352,6 +355,7 @@
; Service groups
HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \
"Boot Bus Extender", \
+ "System Bus Extender", \
"SCSI Port", \
"SCSI Miniport", \
"Primary Disk", \
@@ -379,6 +383,7 @@
; Group order, the first DWORD is the count of entries,
; the following dwords are the tag entries for the load order.
HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Boot Bus Extender", 0x00000001, \
+ 0x02, 0x00, 0x00, 0x00, \
0x01, 0x00, 0x00, 0x00, \
0x02, 0x00, 0x00, 0x00
HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","SCSI Miniport", 0x00000001, \
@@ -468,6 +473,7 @@
HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","ImagePath",0x00020000,"system32\drivers\acpi.sys"
HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Start",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Tag",0x00010001,0x00000001
; Beep device driver
HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000000
@@ -554,13 +560,6 @@
HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32\drivers\fs_rec.sys"
HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008
-
-; IDE driver (deprecated)
-;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","ErrorControl",0x00010001,0x00000000
-;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Group",0x00000000,"Primary Disk"
-;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","ImagePath",0x00020000,"system32\drivers\ide.sys"
-;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Start",0x00010001,0x00000004
-;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Type",0x00010001,0x00000001
; i8042 port driver
HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000
@@ -642,6 +641,7 @@
HKLM,"SYSTEM\CurrentControlSet\Services\PCI","ImagePath",0x00020000,"system32\drivers\pci.sys"
HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Start",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Tag",0x00010001,0x00000002
; ACPI bus
HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","HardwareID",0x00010000,"*PNP0C08"
Author: hpoussin
Date: Fri May 12 02:23:20 2006
New Revision: 21893
URL: http://svn.reactos.ru/svn/reactos?rev=21893&view=rev
Log:
Fix converting the typelib file name to unicode by using the correct buffer size.
Modified:
trunk/reactos/dll/win32/oleaut32/tmarshal.c
Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarshal…
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/tmarshal.c (original)
+++ trunk/reactos/dll/win32/oleaut32/tmarshal.c Fri May 12 02:23:20 2006
@@ -283,7 +283,7 @@
ERR("Could not get typelib fn?\n");
return E_FAIL;
}
- MultiByteToWideChar(CP_ACP, 0, tlfn, -1, tlfnW, -1);
+ MultiByteToWideChar(CP_ACP, 0, tlfn, -1, tlfnW, sizeof(tlfnW) / sizeof(tlfnW[0]));
hres = LoadTypeLib(tlfnW,&tl);
if (hres) {
ERR("Failed to load typelib for %s, but it should be there.\n",debugstr_guid(riid));