[cfinck] 28434: Merge 28402:28433

Author: cfinck
Date: Mon Aug 20 23:50:07 2007
New Revision: 28434

URL: http://svn.reactos.org/svn/reactos?rev=28434&view=rev
Log:
Merge 28402:28433

Added:
    branches/ros-branch-0_3_3-new/reactos/dll/win32/winsta/winsta.rbuild
      - copied unchanged from r28432, trunk/reactos/dll/win32/winsta/winsta.rbuild
    branches/ros-branch-0_3_3-new/reactos/dll/win32/ws2_32/misc/async.c
      - copied unchanged from r28432, trunk/reactos/dll/win32/ws2_32/misc/async.c
    branches/ros-branch-0_3_3-new/reactos/include/reactos/wine/winsock16.h
      - copied unchanged from r28432, trunk/reactos/include/reactos/wine/winsock16.h
    branches/ros-branch-0_3_3-new/reactos/tools/mkhive/mkhive.sln
      - copied unchanged from r28432, trunk/reactos/tools/mkhive/mkhive.sln
    branches/ros-branch-0_3_3-new/reactos/tools/mkhive/mkhive.vcproj
      - copied unchanged from r28432, trunk/reactos/tools/mkhive/mkhive.vcproj
Modified:
    branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/more/more.c
    branches/ros-branch-0_3_3-new/reactos/baseaddress.rbuild
    branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/access.c
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/display.c
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/general.c
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/keyboard.c
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/cs-CZ.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/de-DE.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/en-US.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/es-ES.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/fr-FR.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/hu-HU.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/id-ID.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/it-IT.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/ja-JP.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/nl-NL.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/pl-PL.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/ru-RU.rc
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/mouse.c
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/resource.h
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/sound.c
    branches/ros-branch-0_3_3-new/reactos/dll/cpl/ncpa/lang/fr-FR.rc
    branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/gdi32.def
    branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/misc/stubs.c
    branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/objects/bitmap.c
    branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/objects/dc.c
    branches/ros-branch-0_3_3-new/reactos/dll/win32/win32.rbuild
    branches/ros-branch-0_3_3-new/reactos/dll/win32/ws2_32/misc/ns.c
    branches/ros-branch-0_3_3-new/reactos/dll/win32/ws2_32/ws2_32.rbuild
    branches/ros-branch-0_3_3-new/reactos/drivers/video/miniport/vbe/vbemp.c
    branches/ros-branch-0_3_3-new/reactos/include/ddk/ddrawint.h
    branches/ros-branch-0_3_3-new/reactos/include/ddk/winddk.h
    branches/ros-branch-0_3_3-new/reactos/include/psdk/winnt.h
    branches/ros-branch-0_3_3-new/reactos/include/reactos/win32k/ntgdibad.h
    branches/ros-branch-0_3_3-new/reactos/lib/cmlib/cmlib.mak
    branches/ros-branch-0_3_3-new/reactos/ntoskrnl/kdbg/i386/i386-dis.c
    branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ob/obhandle.c
    branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/ntuser/windc.c
    branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/color.c
    branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/dc.c
    branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/dibobj.c
    branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/w32ksvc.db
    branches/ros-branch-0_3_3-new/reactos/tools/cabman/cabinet.cxx
    branches/ros-branch-0_3_3-new/reactos/tools/cdmake/cdmake.c
    branches/ros-branch-0_3_3-new/reactos/tools/mkhive/mkhive.h
    branches/ros-branch-0_3_3-new/reactos/tools/mkhive/reginf.c
    branches/ros-branch-0_3_3-new/reactos/tools/mkhive/registry.c
    branches/ros-branch-0_3_3-new/reactos/tools/nci/ncitool.c
    branches/ros-branch-0_3_3-new/reactos/tools/ssprintf.cpp
    branches/ros-branch-0_3_3-new/reactos/tools/tools.mak
    branches/ros-branch-0_3_3-new/reactos/tools/unicode/cptable.c
    branches/ros-branch-0_3_3-new/reactos/tools/unicode/mbtowc.c
    branches/ros-branch-0_3_3-new/reactos/tools/unicode/string.c
    branches/ros-branch-0_3_3-new/reactos/tools/unicode/unicode.mak
    branches/ros-branch-0_3_3-new/reactos/tools/unicode/utf8.c
    branches/ros-branch-0_3_3-new/reactos/tools/unicode/wctomb.c
    branches/ros-branch-0_3_3-new/reactos/tools/wrc/dumpres.c
    branches/ros-branch-0_3_3-new/reactos/tools/wrc/genres.c
    branches/ros-branch-0_3_3-new/reactos/tools/wrc/lex.yy.c
    branches/ros-branch-0_3_3-new/reactos/tools/wrc/newstruc.c
    branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.l
    branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.tab.c
    branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.y
    branches/ros-branch-0_3_3-new/reactos/tools/wrc/utils.c
    branches/ros-branch-0_3_3-new/reactos/tools/wrc/wrc.c
    branches/ros-branch-0_3_3-new/reactos/tools/xml.cpp
    branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml
    branches/ros-branch-0_3_3-new/rostests/dxtest/win32kdxtest/dump.c

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/more/more.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/bas...

Modified: branches/ros-branch-0_3_3-new/reactos/baseaddress.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/bas...

Modified: branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/boo...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/access.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/display.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/general.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/keyboard.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/id-ID.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/mouse.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/resource.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/sound.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/ncpa/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/gdi32.def
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/objects/bitmap.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/objects/dc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/win32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/ws2_32/misc/ns.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/ws2_32/ws2_32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dll...

Modified: branches/ros-branch-0_3_3-new/reactos/drivers/video/miniport/vbe/vbemp.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dri...

Modified: branches/ros-branch-0_3_3-new/reactos/include/ddk/ddrawint.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/inc...

Modified: branches/ros-branch-0_3_3-new/reactos/include/ddk/winddk.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/inc...

Modified: branches/ros-branch-0_3_3-new/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/inc...

Modified: branches/ros-branch-0_3_3-new/reactos/include/reactos/win32k/ntgdibad.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/inc...

Modified: branches/ros-branch-0_3_3-new/reactos/lib/cmlib/cmlib.mak
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/lib...

Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/kdbg/i386/i386-dis.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nto...

Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ob/obhandle.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nto...

Modified: branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/ntuser/windc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/sub...

Modified: branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/color.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/sub...

Modified: branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/dc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/sub...

Modified: branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/dibobj.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/sub...

Modified: branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/w32ksvc.db
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/sub...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/cabman/cabinet.cxx
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/cdmake/cdmake.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/mkhive/mkhive.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/mkhive/reginf.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/mkhive/registry.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/nci/ncitool.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/ssprintf.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/tools.mak
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/cptable.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/mbtowc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/string.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/unicode.mak
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/utf8.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/wctomb.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/dumpres.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/genres.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/lex.yy.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/newstruc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.l
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.tab.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.y
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/utils.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/wrc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/reactos/tools/xml.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/too...

Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/rosapps/dow...

Modified: branches/ros-branch-0_3_3-new/rostests/dxtest/win32kdxtest/dump.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/rostests/dx...