Author: akhaldi
Date: Thu Oct 30 11:52:53 2014
New Revision: 65121
URL: http://svn.reactos.org/svn/reactos?rev=65121&view=rev
Log:
* Sync up to trunk head (r65120).
Added:
branches/shell-experiments/dll/win32/kernel32/winnls/lang/cs-CZ.rc
- copied unchanged from r65120,
trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc
Modified:
branches/shell-experiments/ (props changed)
branches/shell-experiments/boot/bootdata/hivedef.inf
branches/shell-experiments/dll/win32/kernel32/kernel32.rc
branches/shell-experiments/dll/win32/kernel32/winnls/lang/en-US.rc
branches/shell-experiments/dll/win32/kernel32/winnls/lang/fr-FR.rc
branches/shell-experiments/dll/win32/kernel32/winnls/lang/sq-AL.rc
branches/shell-experiments/dll/win32/kernel32/winnls/lang/tr-TR.rc
branches/shell-experiments/dll/win32/netapi32/user.c
branches/shell-experiments/drivers/filesystems/fastfat/create.c
branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c
branches/shell-experiments/drivers/filesystems/fastfat/iface.c
branches/shell-experiments/drivers/filesystems/fastfat/misc.c
branches/shell-experiments/drivers/filesystems/ntfs/fsctl.c
branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h
branches/shell-experiments/drivers/filesystems/ntfs/volinfo.c
branches/shell-experiments/drivers/storage/class/disk/disk.c
branches/shell-experiments/drivers/storage/ide/uniata/id_ata.cpp
branches/shell-experiments/drivers/storage/ide/uniata/id_init.cpp
branches/shell-experiments/drivers/storage/ide/uniata/uniata_ver.h
branches/shell-experiments/media/nls/c_037.nls
branches/shell-experiments/ntoskrnl/io/iomgr/file.c
Propchange: branches/shell-experiments/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 30 11:52:53 2014
@@ -18,4 +18,4 @@
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:61927-65095
+/trunk/reactos:61927-65120
Modified: branches/shell-experiments/boot/bootdata/hivedef.inf
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata/hivedef.inf?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/boot/bootdata/hivedef.inf [iso-8859-1]
(original)
+++ branches/shell-experiments/boot/bootdata/hivedef.inf [iso-8859-1]
Thu Oct 30 11:52:53 2014
@@ -1,4 +1,4 @@
-[Version]
+[Version]
Signature="$ReactOS$"
[AddReg]
@@ -301,6 +301,15 @@
HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color
#29",0x00010001,0x006a240a
HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color
#30",0x00010001,0x00c8d0d4
HKCU,"Control Panel\Appearance\New
Schemes\0\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Brick
HKCU,"Control Panel\Appearance\New
Schemes\1","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\1","LegacyName",0x00020000,"%DESKTOP_SCHEME_1%"
@@ -363,6 +372,15 @@
HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color
#29",0x00010001,0x00808000
HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color
#30",0x00010001,0x00a5bfc2
HKCU,"Control Panel\Appearance\New
Schemes\1\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Eggplant
HKCU,"Control Panel\Appearance\New
Schemes\2","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\2","LegacyName",0x00020000,"%DESKTOP_SCHEME_2%"
@@ -425,6 +443,15 @@
HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Color
#29",0x00010001,0x00788058
HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Color
#30",0x00010001,0x00a8b090
HKCU,"Control Panel\Appearance\New
Schemes\2\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Green Olive
HKCU,"Control Panel\Appearance\New
Schemes\3","DisplayName",0x00020000,"@themeui.dll,-877"
HKCU,"Control Panel\Appearance\New
Schemes\3","LegacyName",0x00020000,"%DESKTOP_SCHEME_3%"
@@ -487,6 +514,15 @@
HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Color
#29",0x00010001,0x00649759
HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Color
#30",0x00010001,0x00a9c8a2
HKCU,"Control Panel\Appearance\New
Schemes\3\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; High Contrast 1
HKCU,"Control Panel\Appearance\New
Schemes\4","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\4","LegacyName",0x00020000,"%DESKTOP_SCHEME_4%"
@@ -549,6 +585,15 @@
HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Color
#29",0x00010001,0x00008000
HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Color
#30",0x00010001,0x00000000
HKCU,"Control Panel\Appearance\New
Schemes\4\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; High Contrast 2
HKCU,"Control Panel\Appearance\New
Schemes\5","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\5","LegacyName",0x00020000,"%DESKTOP_SCHEME_5%"
@@ -611,6 +656,15 @@
HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Color
#29",0x00010001,0x00ff0000
HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Color
#30",0x00010001,0x00000000
HKCU,"Control Panel\Appearance\New
Schemes\5\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; High Contrast Black
HKCU,"Control Panel\Appearance\New
Schemes\6","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\6\","LegacyName",0x00020000,"%DESKTOP_SCHEME_6%"
@@ -673,6 +727,15 @@
HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Color
#29",0x00010001,0x00800080
HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Color
#30",0x00010001,0x00000000
HKCU,"Control Panel\Appearance\New
Schemes\6\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; High Contrast White
HKCU,"Control Panel\Appearance\New
Schemes\7","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\7","LegacyName",0x00020000,"%DESKTOP_SCHEME_7%"
@@ -735,6 +798,15 @@
HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Color
#29",0x00010001,0x00000000
HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Color
#30",0x00010001,0x00ffffff
HKCU,"Control Panel\Appearance\New
Schemes\7\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Lilac
HKCU,"Control Panel\Appearance\New
Schemes\8","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\8","LegacyName",0x00020000,"%DESKTOP_SCHEME_8%"
@@ -797,6 +869,15 @@
HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Color
#29",0x00010001,0x00b14e5a
HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Color
#30",0x00010001,0x00d9a8ae
HKCU,"Control Panel\Appearance\New
Schemes\8\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Maple
HKCU,"Control Panel\Appearance\New
Schemes\9","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\9","LegacyName",0x00020000,"%DESKTOP_SCHEME_9%"
@@ -859,6 +940,15 @@
HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Color
#29",0x00010001,0x0046a6c6
HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Color
#30",0x00010001,0x00aed8e6
HKCU,"Control Panel\Appearance\New
Schemes\9\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Marine
HKCU,"Control Panel\Appearance\New
Schemes\10","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\10","LegacyName",0x00020000,"%DESKTOP_SCHEME_10%"
@@ -921,6 +1011,15 @@
HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Color
#29",0x00010001,0x00800000
HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Color
#30",0x00010001,0x00b8c088
HKCU,"Control Panel\Appearance\New
Schemes\10\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Plum
HKCU,"Control Panel\Appearance\New
Schemes\11","DisplayName",0x00020000,"@themeui.dll,-869"
HKCU,"Control Panel\Appearance\New
Schemes\11","LegacyName",0x00020000,"%DESKTOP_SCHEME_11%"
@@ -983,6 +1082,15 @@
HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Color
#29",0x00010001,0x00808000
HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Color
#30",0x00010001,0x009098a8
HKCU,"Control Panel\Appearance\New
Schemes\11\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Pumpkin
HKCU,"Control Panel\Appearance\New
Schemes\12","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\12","LegacyName",0x00020000,"%DESKTOP_SCHEME_12%"
@@ -1045,6 +1153,15 @@
HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Color
#29",0x00010001,0x00800080
HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Color
#30",0x00010001,0x009dd5ec
HKCU,"Control Panel\Appearance\New
Schemes\12\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Rainy Day
HKCU,"Control Panel\Appearance\New
Schemes\13","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\13","LegacyName",0x00020000,"%DESKTOP_SCHEME_13%"
@@ -1107,6 +1224,15 @@
HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Color
#29",0x00010001,0x007d654f
HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Color
#30",0x00010001,0x00b19983
HKCU,"Control Panel\Appearance\New
Schemes\13\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; ReactOS Classic
HKCU,"Control Panel\Appearance\New
Schemes\14","DisplayName",0x00020000,"@themeui.dll,-880"
HKCU,"Control Panel\Appearance\New
Schemes\14","LegacyName",0x00020000,"%DESKTOP_SCHEME_14%"
@@ -1169,6 +1295,15 @@
HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Color
#29",0x00010001,0x00800000
HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Color
#30",0x00010001,0x00c0c0c0
HKCU,"Control Panel\Appearance\New
Schemes\14\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Rose
HKCU,"Control Panel\Appearance\New
Schemes\15","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\15","LegacyName",0x00020000,"%DESKTOP_SCHEME_15%"
@@ -1231,6 +1366,15 @@
HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Color
#29",0x00010001,0x0070609f
HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Color
#30",0x00010001,0x00b7afcf
HKCU,"Control Panel\Appearance\New
Schemes\15\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Sand
HKCU,"Control Panel\Appearance\New
Schemes\16","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\16","LegacyName",0x00020000,"%DESKTOP_SCHEME_16%"
@@ -1293,6 +1437,15 @@
HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Color
#29",0x00010001,0x00808000
HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Color
#30",0x00010001,0x00bbccd5
HKCU,"Control Panel\Appearance\New
Schemes\16\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Sky (WinXP-like)
HKCU,"Control Panel\Appearance\New
Schemes\17","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\17","LegacyName",0x00020000,"%DESKTOP_SCHEME_17%"
@@ -1355,6 +1508,15 @@
HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Color
#29",0x00010001,0x00c56a31
HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Color
#30",0x00010001,0x00d8e9ec
HKCU,"Control Panel\Appearance\New
Schemes\17\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Slate
HKCU,"Control Panel\Appearance\New
Schemes\18","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\18","LegacyName",0x00020000,"%DESKTOP_SCHEME_18%"
@@ -1417,6 +1579,15 @@
HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Color
#29",0x00010001,0x00978055
HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Color
#30",0x00010001,0x00c8b99d
HKCU,"Control Panel\Appearance\New
Schemes\18\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Storm
HKCU,"Control Panel\Appearance\New
Schemes\19","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\19","LegacyName",0x00020000,"%DESKTOP_SCHEME_19%"
@@ -1479,6 +1650,15 @@
HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Color
#29",0x00010001,0x00800080
HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Color
#30",0x00010001,0x00c0c0c0
HKCU,"Control Panel\Appearance\New
Schemes\19\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Teal
HKCU,"Control Panel\Appearance\New
Schemes\20","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\20","LegacyName",0x00020000,"%DESKTOP_SCHEME_20%"
@@ -1541,6 +1721,15 @@
HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Color
#29",0x00010001,0x00808000
HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Color
#30",0x00010001,0x00c0c0c0
HKCU,"Control Panel\Appearance\New
Schemes\20\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
; Wheat
HKCU,"Control Panel\Appearance\New
Schemes\21","DisplayName",0x00020000,"@themeui.dll,-851"
HKCU,"Control Panel\Appearance\New
Schemes\21","LegacyName",0x00020000,"%DESKTOP_SCHEME_21%"
@@ -1603,6 +1792,15 @@
HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Color
#29",0x00010001,0x00008080
HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Color
#30",0x00010001,0x00a0dede
HKCU,"Control Panel\Appearance\New
Schemes\21\Sizes\0","Contrast",0x00010001,0x00000000
+HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size
#0",0x000b0001,01,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size
#1",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size
#2",0x000b0001,10,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size
#3",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size
#4",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size
#5",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size
#6",0x000b0001,0c,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size
#7",0x000b0001,12,00,00,00,00,00,00,00
+HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size
#8",0x000b0001,12,00,00,00,00,00,00,00
HKCU,"Control Panel\Sound","Beep",2,"yes"
HKCU,"Control Panel\Sound","ExtendedSounds",2,"yes"
Modified: branches/shell-experiments/dll/win32/kernel32/kernel32.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/kernel32/kernel32.rc?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/kernel32/kernel32.rc [iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/kernel32/kernel32.rc [iso-8859-1]
Thu Oct 30 11:52:53 2014
@@ -11,14 +11,15 @@
/* UTF-8 */
#pragma code_page(65001)
-
+#ifdef LANGUAGE_CS_CZ
+ #include "winnls/lang/cs-CZ.rc"
+#endif
#ifdef LANGUAGE_DE_DE
#include "winnls/lang/de-DE.rc"
#endif
#ifdef LANGUAGE_EN_US
#include "winnls/lang/en-US.rc"
#endif
-#pragma code_page(65001)
#ifdef LANGUAGE_ES_ES
#include "winnls/lang/es-ES.rc"
#endif
Modified: branches/shell-experiments/dll/win32/kernel32/winnls/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/kernel32/winnls/lang/en-US.rc?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/kernel32/winnls/lang/en-US.rc
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/kernel32/winnls/lang/en-US.rc
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -1,5 +1,3 @@
-#pragma code_page(1252)
-
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
STRINGTABLE
Modified: branches/shell-experiments/dll/win32/kernel32/winnls/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/kernel32/winnls/lang/fr-FR.rc?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/kernel32/winnls/lang/fr-FR.rc
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/kernel32/winnls/lang/fr-FR.rc
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -1,5 +1,3 @@
-#pragma code_page(1252)
-
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
STRINGTABLE
Modified: branches/shell-experiments/dll/win32/kernel32/winnls/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/kernel32/winnls/lang/sq-AL.rc?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/kernel32/winnls/lang/sq-AL.rc
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/kernel32/winnls/lang/sq-AL.rc
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -1,5 +1,3 @@
-#pragma code_page(1252)
-
LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
STRINGTABLE
Modified: branches/shell-experiments/dll/win32/kernel32/winnls/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/kernel32/winnls/lang/tr-TR.rc?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/kernel32/winnls/lang/tr-TR.rc
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/kernel32/winnls/lang/tr-TR.rc
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -1,7 +1,4 @@
/* TRANSLATOR: 2014 Erdem Ersoy (eersoy93) ([email protected]) */
-
-#pragma code_page(1252)
-
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE
Modified: branches/shell-experiments/dll/win32/netapi32/user.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/netapi32/user.c?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/netapi32/user.c [iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/netapi32/user.c [iso-8859-1]
Thu Oct 30 11:52:53 2014
@@ -3414,7 +3414,7 @@
umi0 = (PUSER_MODALS_INFO_0)*bufptr;
umi0->usrmod0_min_passwd_len = PasswordInfo->MinPasswordLength;
- umi0->usrmod0_max_passwd_age =
(ULONG)(PasswordInfo->MaxPasswordAge.QuadPart / 10000000);
+ umi0->usrmod0_max_passwd_age =
(ULONG)(-PasswordInfo->MaxPasswordAge.QuadPart / 10000000);
umi0->usrmod0_min_passwd_age =
DeltaTimeToSeconds(PasswordInfo->MinPasswordAge);
umi0->usrmod0_force_logoff =
@@ -3427,10 +3427,6 @@
switch (ServerRoleInfo->DomainServerRole)
{
-
- umi1->usrmod1_role = UAS_ROLE_STANDALONE;
- umi1->usrmod1_role = UAS_ROLE_MEMBER;
-
case DomainServerRolePrimary:
umi1->usrmod1_role = UAS_ROLE_PRIMARY;
break;
Modified: branches/shell-experiments/drivers/filesystems/fastfat/create.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/filesystems/fastfat/create.c?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/filesystems/fastfat/create.c
[iso-8859-1] (original)
+++ branches/shell-experiments/drivers/filesystems/fastfat/create.c
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -497,7 +497,6 @@
pFcb = DeviceExt->VolumeFcb;
vfatAttachFCBToFileObject(DeviceExt, pFcb, FileObject);
- vfatGrabFCB(DeviceExt, pFcb);
Irp->IoStatus.Information = FILE_OPENED;
return STATUS_SUCCESS;
Modified: branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c
[iso-8859-1] (original)
+++ branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -89,7 +89,6 @@
return Status;
}
- PartitionInfoIsValid = TRUE;
DPRINT("Partition Information:\n");
DPRINT("StartingOffset %I64x\n",
PartitionInfo.StartingOffset.QuadPart / 512);
DPRINT("PartitionLength %I64x\n",
PartitionInfo.PartitionLength.QuadPart / 512);
@@ -108,6 +107,7 @@
PartitionInfo.PartitionType == PARTITION_FAT32_XINT13 ||
PartitionInfo.PartitionType == PARTITION_XINT13)
{
+ PartitionInfoIsValid = TRUE;
*RecognizedFS = TRUE;
}
}
@@ -117,6 +117,7 @@
PartitionInfo.PartitionLength.QuadPart > 0)
{
/* This is possible a removable media formated as super floppy */
+ PartitionInfoIsValid = TRUE;
*RecognizedFS = TRUE;
}
}
Modified: branches/shell-experiments/drivers/filesystems/fastfat/iface.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/filesystems/fastfat/iface.c?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/filesystems/fastfat/iface.c
[iso-8859-1] (original)
+++ branches/shell-experiments/drivers/filesystems/fastfat/iface.c
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -99,6 +99,7 @@
DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] =
VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = VfatShutdown;
DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = VfatBuildRequest;
+ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_CLEANUP] = VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_PNP] = VfatBuildRequest;
Modified: branches/shell-experiments/drivers/filesystems/fastfat/misc.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/filesystems/fastfat/misc.c?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/filesystems/fastfat/misc.c
[iso-8859-1] (original)
+++ branches/shell-experiments/drivers/filesystems/fastfat/misc.c
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -95,6 +95,16 @@
static
NTSTATUS
+VfatDeviceControl(
+ IN PVFAT_IRP_CONTEXT IrpContext)
+{
+ IoSkipCurrentIrpStackLocation(IrpContext->Irp);
+
+ return IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp);
+}
+
+static
+NTSTATUS
VfatDispatchRequest(
IN PVFAT_IRP_CONTEXT IrpContext)
{
@@ -127,6 +137,8 @@
return VfatSetVolumeInformation(IrpContext);
case IRP_MJ_LOCK_CONTROL:
return VfatLockControl(IrpContext);
+ case IRP_MJ_DEVICE_CONTROL:
+ return VfatDeviceControl(IrpContext);
case IRP_MJ_CLEANUP:
return VfatCleanup(IrpContext);
case IRP_MJ_FLUSH_BUFFERS:
Modified: branches/shell-experiments/drivers/filesystems/ntfs/fsctl.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/filesystems/ntfs/fsctl.c?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/filesystems/ntfs/fsctl.c [iso-8859-1]
(original)
+++ branches/shell-experiments/drivers/filesystems/ntfs/fsctl.c [iso-8859-1]
Thu Oct 30 11:52:53 2014
@@ -526,6 +526,85 @@
}
+static
+NTSTATUS
+NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject,
+ PIRP Irp)
+{
+ NTSTATUS Status;
+ PIO_STACK_LOCATION Stack;
+ PDEVICE_EXTENSION DeviceExt;
+ PNTFS_VOLUME_DATA_BUFFER DataBuffer;
+ PNTFS_ATTR_RECORD Attribute;
+
+ DPRINT1("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp);
+
+ Stack = IoGetCurrentIrpStackLocation(Irp);
+ switch (Stack->Parameters.FileSystemControl.FsControlCode)
+ {
+ case FSCTL_GET_NTFS_VOLUME_DATA:
+ DeviceExt = DeviceObject->DeviceExtension;
+ DataBuffer = (PNTFS_VOLUME_DATA_BUFFER)Irp->UserBuffer;
+
+ if (Stack->Parameters.FileSystemControl.OutputBufferLength <
sizeof(NTFS_VOLUME_DATA_BUFFER) ||
+ Irp->UserBuffer == NULL)
+ {
+ DPRINT1("Invalid output! %d %p\n",
Stack->Parameters.FileSystemControl.OutputBufferLength, Irp->UserBuffer);
+ Status = STATUS_INVALID_PARAMETER;
+ break;
+ }
+
+ DataBuffer->VolumeSerialNumber.QuadPart =
DeviceExt->NtfsInfo.SerialNumber;
+ DataBuffer->NumberSectors.QuadPart =
DeviceExt->NtfsInfo.SectorCount;
+ DataBuffer->TotalClusters.QuadPart =
DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster;
+ DataBuffer->FreeClusters.QuadPart = NtfsGetFreeClusters(DeviceExt);
+ DataBuffer->TotalReserved.QuadPart = 0LL; // FIXME
+ DataBuffer->BytesPerSector = DeviceExt->NtfsInfo.BytesPerSector;
+ DataBuffer->BytesPerCluster = DeviceExt->NtfsInfo.BytesPerCluster;
+ DataBuffer->BytesPerFileRecordSegment =
DeviceExt->NtfsInfo.BytesPerFileRecord;
+ DataBuffer->ClustersPerFileRecordSegment =
DeviceExt->NtfsInfo.BytesPerFileRecord / DeviceExt->NtfsInfo.BytesPerCluster;
+ DataBuffer->MftStartLcn.QuadPart =
DeviceExt->NtfsInfo.MftStart.QuadPart;
+ DataBuffer->Mft2StartLcn.QuadPart =
DeviceExt->NtfsInfo.MftMirrStart.QuadPart;
+ DataBuffer->MftZoneStart.QuadPart = 0; // FIXME
+ DataBuffer->MftZoneEnd.QuadPart = 0; // FIXME
+
+ Attribute =
(PNTFS_ATTR_RECORD)((ULONG_PTR)DeviceExt->MasterFileTable +
DeviceExt->MasterFileTable->AttributeOffset);
+ while (Attribute <
(PNTFS_ATTR_RECORD)((ULONG_PTR)DeviceExt->MasterFileTable +
DeviceExt->MasterFileTable->BytesInUse) &&
+ Attribute->Type != AttributeEnd)
+ {
+ if (Attribute->Type == AttributeData)
+ {
+ ASSERT(Attribute->IsNonResident);
+ DataBuffer->MftValidDataLength.QuadPart =
Attribute->NonResident.DataSize;
+
+ break;
+ }
+
+ Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute +
Attribute->Length);
+ }
+
+ if (Stack->Parameters.FileSystemControl.OutputBufferLength >=
sizeof(NTFS_EXTENDED_VOLUME_DATA) + sizeof(NTFS_VOLUME_DATA_BUFFER))
+ {
+ PNTFS_EXTENDED_VOLUME_DATA ExtendedData =
(PNTFS_EXTENDED_VOLUME_DATA)((ULONG_PTR)Irp->UserBuffer +
sizeof(NTFS_VOLUME_DATA_BUFFER));
+
+ ExtendedData->ByteCount = sizeof(NTFS_EXTENDED_VOLUME_DATA);
+ ExtendedData->MajorVersion = DeviceExt->NtfsInfo.MajorVersion;
+ ExtendedData->MinorVersion = DeviceExt->NtfsInfo.MinorVersion;
+ }
+
+ Status = STATUS_SUCCESS;
+ break;
+
+ default:
+ DPRINT1("Invalid user request: %x\n",
Stack->Parameters.FileSystemControl.FsControlCode);
+ Status = STATUS_INVALID_DEVICE_REQUEST;
+ break;
+ }
+
+ return Status;
+}
+
+
NTSTATUS
NTAPI
NtfsFsdFileSystemControl(PDEVICE_OBJECT DeviceObject,
@@ -541,9 +620,12 @@
switch (Stack->MinorFunction)
{
case IRP_MN_KERNEL_CALL:
+ DPRINT1("NTFS: IRP_MN_USER_FS_REQUEST\n");
+ Status = STATUS_INVALID_DEVICE_REQUEST;
+ break;
+
case IRP_MN_USER_FS_REQUEST:
- DPRINT("NTFS: IRP_MN_USER_FS_REQUEST/IRP_MN_KERNEL_CALL\n");
- Status = STATUS_INVALID_DEVICE_REQUEST;
+ Status = NtfsUserFsRequest(DeviceObject, Irp);
break;
case IRP_MN_MOUNT_VOLUME:
@@ -557,7 +639,7 @@
break;
default:
- DPRINT("NTFS FSC: MinorFunction %d\n", Stack->MinorFunction);
+ DPRINT1("NTFS FSC: MinorFunction %d\n", Stack->MinorFunction);
Status = STATUS_INVALID_DEVICE_REQUEST;
break;
}
Modified: branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h [iso-8859-1]
(original)
+++ branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h [iso-8859-1]
Thu Oct 30 11:52:53 2014
@@ -715,6 +715,9 @@
/* volinfo.c */
+ULONGLONG
+NtfsGetFreeClusters(PDEVICE_EXTENSION DeviceExt);
+
NTSTATUS
NtfsQueryVolumeInformation(PNTFS_IRP_CONTEXT IrpContext);
Modified: branches/shell-experiments/drivers/filesystems/ntfs/volinfo.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/filesystems/ntfs/volinfo.c?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/filesystems/ntfs/volinfo.c
[iso-8859-1] (original)
+++ branches/shell-experiments/drivers/filesystems/ntfs/volinfo.c
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -32,7 +32,6 @@
/* FUNCTIONS ****************************************************************/
-static
ULONGLONG
NtfsGetFreeClusters(PDEVICE_EXTENSION DeviceExt)
{
Modified: branches/shell-experiments/drivers/storage/class/disk/disk.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/storage/class/disk/disk.c?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/storage/class/disk/disk.c
[iso-8859-1] (original)
+++ branches/shell-experiments/drivers/storage/class/disk/disk.c
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -384,11 +384,6 @@
InitializationData.ClassDeviceControl = ScsiDiskDeviceControl;
InitializationData.ClassShutdownFlush = ScsiDiskShutdownFlush;
InitializationData.ClassCreateClose = NULL;
-
- //
- // HACK! Please check below to the implementation of the function
- //
- DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] =
ScsiDiskFileSystemControl;
//
// Call the class init routine
@@ -1555,6 +1550,7 @@
Irp->IoStatus.Status = STATUS_INVALID_PARAMETER;
}
+ DPRINT1("STATUS_INVALID_PARAMETER\n");
return STATUS_INVALID_PARAMETER;
}
@@ -5213,55 +5209,3 @@
} // end UpdateDeviceObjects()
-//
-// This function is supposed only to support NTFS tools
-// from M. Russinovich. This is kind of huge hack and is
-// totally undocumented :-).
-//
-NTSTATUS
-NtfsRussinovichism(PDEVICE_OBJECT DeviceObject,
- PIRP Irp)
-{
- UNIMPLEMENTED;
- return STATUS_NOT_IMPLEMENTED;
-}
-
-//
-// Hack: this function is not supposed to be implemented
-// Even though it's required to enable some M. Russinovich
-// to directly request disks so that they can dump NTFS data
-// without going through the driver.
-// We don't expect doing more from here, hence the limited
-// implementation and support.
-//
-NTSTATUS
-NTAPI
-ScsiDiskFileSystemControl(PDEVICE_OBJECT DeviceObject,
- PIRP Irp)
-{
- PIO_STACK_LOCATION Stack;
- NTSTATUS Status;
-
- DPRINT1("ScsiDiskFileSystemControl(%p, %p)\n", DeviceObject, Irp);
-
- Stack = IoGetCurrentIrpStackLocation(Irp);
-
- switch (Stack->MinorFunction)
- {
- case IRP_MN_USER_FS_REQUEST:
- Status = NtfsRussinovichism(DeviceObject, Irp);
- break;
-
- default:
- DPRINT("MinorFunction %d\n", Stack->MinorFunction);
- Status = STATUS_INVALID_DEVICE_REQUEST;
- break;
- }
-
- Irp->IoStatus.Status = Status;
- Irp->IoStatus.Information = 0;
-
- IoCompleteRequest(Irp, IO_NO_INCREMENT);
-
- return Status;
-}
Modified: branches/shell-experiments/drivers/storage/ide/uniata/id_ata.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/storage/ide/uniata/id_ata.cpp?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/storage/ide/uniata/id_ata.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/drivers/storage/ide/uniata/id_ata.cpp
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -4020,8 +4020,13 @@
}
chan->ChannelCtrlFlags &= ~CTRFLAGS_INTR_DISABLED;
} else {
- AtapiWritePort1(chan, IDX_IO2_o_Control,
+ if(deviceExtension->HwFlags & UNIATA_AHCI) {
+ // keep interrupts disabled
+ UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_IE, 0);
+ } else {
+ AtapiWritePort1(chan, IDX_IO2_o_Control,
IDE_DC_DISABLE_INTERRUPTS /*| IDE_DC_A_4BIT*/ );
+ }
}
return;
} // end AtapiEnableInterrupts()
Modified: branches/shell-experiments/drivers/storage/ide/uniata/id_init.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/storage/ide/uniata/id_init.cpp?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/storage/ide/uniata/id_init.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/drivers/storage/ide/uniata/id_init.cpp
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -522,7 +522,8 @@
ScsiPortFreeDeviceBase(HwDeviceExtension,
deviceExtension->BaseIoAddressBM_0);
- deviceExtension->BaseIoAddressBM_0 = 0;
+ deviceExtension->BaseIoAddressBM_0.Addr = 0;
+ deviceExtension->BaseIoAddressBM_0.MemIo = 0;
deviceExtension->BusMaster = DMA_MODE_NONE;
deviceExtension->MaxTransferMode = ATA_PIO4;
break;
@@ -1170,22 +1171,61 @@
break;
}
if(deviceExtension->MaxTransferMode >= ATA_SA150) {
+
+ BOOLEAN OrigAHCI = FALSE;
+
GetPciConfig1(0x90, tmp8);
KdPrint2((PRINT_PREFIX "Intel chip config: %x\n", tmp8));
/* SATA parts can be either compat or AHCI */
+ MemIo = FALSE;
if(ChipFlags & UNIATA_AHCI) {
-
+ OrigAHCI = TRUE;
if(tmp8 & 0xc0) {
//KdPrint2((PRINT_PREFIX "AHCI not supported yet\n"));
//return FALSE;
KdPrint2((PRINT_PREFIX "try run AHCI\n"));
break;
}
- KdPrint2((PRINT_PREFIX "Compatible mode\n"));
+ BaseIoAddressBM = AtapiGetIoRange(HwDeviceExtension,
ConfigInfo, pciData, SystemIoBusNumber,
+ 4, 0, sizeof(IDE_BUSMASTER_REGISTERS));
+ if(BaseIoAddressBM) {
+ KdPrint2((PRINT_PREFIX "Intel BM check at %x\n",
BaseIoAddressBM));
+ /* check if we really have valid BM registers */
+ if((*ConfigInfo->AccessRanges)[4].RangeInMemory) {
+ KdPrint2((PRINT_PREFIX "MemIo[4]\n"));
+ MemIo = TRUE;
+ }
+ deviceExtension->BaseIoAddressBM_0.Addr = BaseIoAddressBM;
+ deviceExtension->BaseIoAddressBM_0.MemIo = MemIo;
+
+ tmp8 = AtapiReadPortEx1(NULL,
(ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),IDX_BM_Status);
+ KdPrint2((PRINT_PREFIX "BM status: %x\n", tmp8));
+ /* cleanup */
+ ScsiPortFreeDeviceBase(HwDeviceExtension,
(PCHAR)BaseIoAddressBM);
+ deviceExtension->BaseIoAddressBM_0.Addr = 0;
+ deviceExtension->BaseIoAddressBM_0.MemIo = 0;
+
+ if(tmp8 == 0xff) {
+ KdPrint2((PRINT_PREFIX "invalid BM status, keep AHCI
mode\n"));
+ break;
+ }
+ }
+ KdPrint2((PRINT_PREFIX "Compatible mode, reallocate LUNs\n"));
+ deviceExtension->NumberLuns = 2; // we may be in Legacy mode
+ if(!UniataAllocateLunExt(deviceExtension, 2)) {
+ KdPrint2((PRINT_PREFIX "can't re-allocate Luns\n"));
+ return STATUS_UNSUCCESSFUL;
+ }
}
deviceExtension->HwFlags &= ~UNIATA_AHCI;
+ MemIo = FALSE;
/* if BAR(5) is IO it should point to SATA interface registers */
+ if(OrigAHCI) {
+ /* Skip BAR(5) in compatible mode */
+ KdPrint2((PRINT_PREFIX "Ignore BAR5 on compatible\n"));
+ BaseMemAddress = 0;
+ } else
if(deviceExtension->DevID == 0x28288086 &&
pciData->u.type0.SubVendorID == 0x106b) {
/* Skip BAR(5) on ICH8M Apples, system locks up on access. */
@@ -1195,7 +1235,7 @@
BaseMemAddress = AtapiGetIoRange(HwDeviceExtension,
ConfigInfo, pciData, SystemIoBusNumber,
5, 0, 0x10);
if(BaseMemAddress &&
(*ConfigInfo->AccessRanges)[5].RangeInMemory) {
- KdPrint2((PRINT_PREFIX "MemIo\n"));
+ KdPrint2((PRINT_PREFIX "MemIo[5]\n"));
MemIo = TRUE;
}
}
Modified: branches/shell-experiments/drivers/storage/ide/uniata/uniata_ver.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/storage/ide/uniata/uniata_ver.h?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/drivers/storage/ide/uniata/uniata_ver.h
[iso-8859-1] (original)
+++ branches/shell-experiments/drivers/storage/ide/uniata/uniata_ver.h
[iso-8859-1] Thu Oct 30 11:52:53 2014
@@ -1,10 +1,10 @@
-#define UNIATA_VER_STR "45b1"
-#define UNIATA_VER_DOT 0.45.2.1
+#define UNIATA_VER_STR "45c1"
+#define UNIATA_VER_DOT 0.45.3.1
#define UNIATA_VER_MJ 0
#define UNIATA_VER_MN 45
#define UNIATA_VER_SUB_MJ 2
#define UNIATA_VER_SUB_MN 1
-#define UNIATA_VER_DOT_COMMA 0,45,2,1
-#define UNIATA_VER_DOT_STR "0.45.2.1"
+#define UNIATA_VER_DOT_COMMA 0,45,3,1
+#define UNIATA_VER_DOT_STR "0.45.3.1"
#define UNIATA_VER_YEAR 2014
#define UNIATA_VER_YEAR_STR "2014"
Modified: branches/shell-experiments/media/nls/c_037.nls
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/nls/c_037.nls?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
Binary files - no diff available.
Modified: branches/shell-experiments/ntoskrnl/io/iomgr/file.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/iomgr/file.c?rev=65121&r1=65120&r2=65121&view=diff
==============================================================================
--- branches/shell-experiments/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original)
+++ branches/shell-experiments/ntoskrnl/io/iomgr/file.c [iso-8859-1] Thu Oct 30
11:52:53 2014
@@ -419,6 +419,7 @@
DirectOpen = TRUE;
}
+#if 1
/* FIXME: Small hack still exists, have to check why...
* This is triggered multiple times by usetup and then once per boot.
*/
@@ -438,6 +439,7 @@
WRITE_DAC));
DirectOpen = TRUE;
}
+#endif
/* Check if we have a related FO that wasn't a direct open */
if ((OpenPacket->RelatedFileObject) &&
