Skip to content

Commit d787142

Browse files
braginbragin
committed
- Merge 27154:27632 for the following directories:
 * boot * hal * include * lib * media (excluding fonts!) * ntoskrnl * tools * baseaddress.rbuild/reactos.rbuild from the root folder svn path=/branches/olpc/; revision=27633
2 parents 6914f5f + 5bce20b commit d787142

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+4862
-4266
lines changed

‎ReactOS.rbuild

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,39 +29,36 @@
2929
<if property="GDB" value="0">
3030
<if property="OPTIMIZE" value="1">
3131
<compilerflag>-Os</compilerflag>
32-
<compilerflag>-Wno-strict-aliasing</compilerflag>
3332
<compilerflag>-ftracer</compilerflag>
3433
<compilerflag>-momit-leaf-frame-pointer</compilerflag>
3534
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
3635
</if>
3736
<if property="OPTIMIZE" value="2">
3837
<compilerflag>-Os</compilerflag>
39-
<compilerflag>-Wno-strict-aliasing</compilerflag>
4038
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
4139
</if>
4240
<if property="OPTIMIZE" value="3">
4341
<compilerflag>-O1</compilerflag>
44-
<compilerflag>-Wno-strict-aliasing</compilerflag>
4542
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
4643
</if>
4744
<if property="OPTIMIZE" value="4">
4845
<compilerflag>-O2</compilerflag>
49-
<compilerflag>-Wno-strict-aliasing</compilerflag>
5046
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
5147
</if>
5248
<if property="OPTIMIZE" value="5">
5349
<compilerflag>-O3</compilerflag>
54-
<compilerflag>-Wno-strict-aliasing</compilerflag>
5550
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
5651
</if>
5752
</if>
5853

54+
<compilerflag>-Wno-strict-aliasing</compilerflag>
5955
<compilerflag>-Wpointer-arith</compilerflag>
6056
<linkerflag>-enable-stdcall-fixup</linkerflag>
6157
6258
<include>.</include>
6359
<include>include</include>
6460
<include>include/psdk</include>
61+
<include root="intermediate">include/psdk</include>
6562
<include>include/dxsdk</include>
6663
<include>include/crt</include>
6764
<include>include/ddk</include>

‎baseaddress.rbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<group>
44
<property name="BASEADDRESS_REGTESTS" value="0x07000000" />
55
<property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" />
6+
<property name="BASEADDRESS_COMCAT" value="0x20A50000" />
67
<property name="BASEADDRESS_DEVENUM" value="0x35680000" />
78
<property name="BASEADDRESS_PWRCFG" value="0x587e0000" />
89
<property name="BASEADDRESS_MMSYS" value="0x588a0000" />

‎boot/bootdata/hivesys.inf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0423",0x00000000,"l_intl.n
240240
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0424",0x00000000,"l_intl.nls"
241241
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0425",0x00000000,"l_intl.nls"
242242
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0426",0x00000000,"l_intl.nls"
243-
;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0427",0x00000000,"l_intl.nls"
243+
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0427",0x00000000,"l_intl.nls"
244244
;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0429",0x00000000,"l_intl.nls"
245245
;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042a",0x00000000,"l_intl.nls"
246246
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042b",0x00000000,"l_intl.nls"
@@ -348,7 +348,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000423",0x00000000,"5"
348348
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000424",0x00000000,"2"
349349
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000425",0x00000000,"3"
350350
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000426",0x00000000,"3"
351-
;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3"
351+
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3"
352352
;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00000000,""
353353
;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00000000,""
354354
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,""

‎boot/bootdata/packages/reactos.dff

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ dll\win32\cards\cards.dll 1
152152
dll\win32\cfgmgr32\cfgmgr32.dll 1
153153
dll\win32\clusapi\clusapi.dll 1
154154
dll\win32\console\console.dll 1
155+
dll\win32\comcat\comcat.dll 1
155156
dll\win32\comctl32\comctl32.dll 1
156157
dll\win32\comdlg32\comdlg32.dll 1
157158
dll\win32\crtdll\crtdll.dll 1
@@ -224,12 +225,13 @@ dll\win32\ufatx\ufatx.dll 1 optional
224225
dll\win32\urlmon\urlmon.dll 1
225226
dll\win32\user32\user32.dll 1
226227
dll\win32\userenv\userenv.dll 1
228+
dll\win32\usp10\usp10.dll 1
227229
dll\win32\uxtheme\uxtheme.dll 1
228230
dll\win32\version\version.dll 1
229231
dll\win32\vdmdbg\vdmdbg.dll 1
230232
dll\win32\wininet\wininet.dll 1
231233
dll\win32\winmm\winmm.dll 1
232-
dll\win32\winmm\wavemap\msacm32.drv 1
234+
dll\win32\winmm\wavemap\msacm32.drv 1 optional
233235
dll\win32\winspool\winspool.drv 1
234236
dll\win32\wintrust\wintrust.dll 1
235237
dll\win32\wldap32\wldap32.dll 1
@@ -244,12 +246,10 @@ dll\win32\wtsapi32\wtsapi32.dll 1
244246
drivers\base\bootvid\bootvid.dll 1
245247
drivers\base\beep\beep.sys 2
246248
drivers\base\null\null.sys 2
247-
drivers\base\serial\serial.sys 2
248249

249250
drivers\bus\acpi\acpi.sys 2
250251
drivers\bus\isapnp\isapnp.sys 2
251252
drivers\bus\pci\pci.sys 2
252-
drivers\bus\serenum\serenum.sys 2
253253

254254
drivers\filesystems\fs_rec\fs_rec.sys 2
255255
drivers\filesystems\msfs\msfs.sys 2
@@ -267,13 +267,16 @@ drivers\network\wshtcpip\wshtcpip.dll 1
267267
drivers\network\dd\ne2000\ne2000.sys 2
268268
drivers\network\dd\pcnet\pcnet.sys 2
269269

270+
drivers\serial\serenum\serenum.sys 2
271+
drivers\serial\serial\serial.sys 2
272+
270273
drivers\storage\ide\pciide\pciide.sys 2
271274
drivers\storage\ide\pciidex\pciidex.sys 2
272275

273-
;drivers\usb\miniport\usbohci\usbohci.sys 2
274-
;drivers\usb\miniport\usbuhci\usbuhci.sys 2
275-
;drivers\usb\usbhub\usbhub.sys 2
276-
;drivers\usb\usbport\usbport.sys 2
276+
;drivers\usb\miniport\usbohci\usbohci.sys 2
277+
;drivers\usb\miniport\usbuhci\usbuhci.sys 2
278+
;drivers\usb\usbhub\usbhub.sys 2
279+
;drivers\usb\usbport\usbport.sys 2
277280
drivers\usb\nt4compat\usbdriver\usbdriver.sys 2
278281

279282
drivers\video\displays\vga\vgaddi.dll 1
@@ -507,3 +510,4 @@ modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional
507510
modules\rostests\winetests\user32\user32_winetest.exe 7 optional
508511
modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional
509512
modules\rostests\winetests\version\version_winetest.exe 7 optional
513+
modules\wallpaper\lake.bmp 4 optional

‎boot/freeldr/fdebug/fdebug.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ IDI_FDEBUG ICON "fdebug.ico"
1414
#include "lang/ja-JP.rc"
1515
#include "lang/nb-NO.rc"
1616
#include "lang/pl-PL.rc"
17+
#include "lang/ru-RU.rc"
1718
#include "lang/tr-TR.rc"
1819

‎boot/freeldr/fdebug/lang/hu-HU.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
55
#ifdef _WIN32
6-
LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
6+
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
77
#pragma code_page(1252)
88
#endif //_WIN32
99

0 commit comments

Comments
 (0)