Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[dreimer] 47946: /me hides deep in the dark of loong warning messages
by dreimer＠svn.reactos.org 05 Jul '10

05 Jul '10

Author: dreimer Date: Mon Jul 5 11:39:50 2010 New Revision: 47946 URL: http://svn.reactos.org/svn/reactos?rev=47946&view=rev Log: /me hides deep in the dark of loong warning messages Modified: trunk/reactos/base/shell/cmd/rsrc.rc Modified: trunk/reactos/base/shell/cmd/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/rsrc.rc?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/rsrc.rc [iso-8859-1] Mon Jul 5 11:39:50 2010 @@ -8,8 +8,8 @@ #include "lang/pl-PL.rc" #include "lang/no-NO.rc" #include "lang/sk-SK.rc" -#include "lang/uk-UA.rc" #include "lang/de-DE.rc" #include "lang/ja-JP.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc"

1 0

[dreimer] 47945: update wine's unicode app to 1.2rc6. (Samuel Serapion) update kernel32 nls files to be able to build it with the new unicode tool. convert the cmd rc files to utf-8 to fix building. Apply Igor Paliychuk's Ukrainian translation Patch.
by dreimer＠svn.reactos.org 05 Jul '10

05 Jul '10

Author: dreimer Date: Mon Jul 5 11:36:22 2010 New Revision: 47945 URL: http://svn.reactos.org/svn/reactos?rev=47945&view=rev Log: update wine's unicode app to 1.2rc6. (Samuel Serapion) update kernel32 nls files to be able to build it with the new unicode tool. convert the cmd rc files to utf-8 to fix building. Apply Igor Paliychuk's Ukrainian translation Patch. Modified: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/rsrc.rc trunk/reactos/base/shell/explorer/explorer-uk.rc trunk/reactos/dll/cpl/access/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/joy/lang/uk-UA.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc trunk/reactos/dll/win32/kernel32/nls/brf.nls trunk/reactos/dll/win32/kernel32/nls/cht.nls trunk/reactos/dll/win32/kernel32/nls/esp.nls trunk/reactos/dll/win32/kernel32/nls/fra.nls trunk/reactos/dll/win32/kernel32/nls/frb.nls trunk/reactos/dll/win32/kernel32/nls/frc.nls trunk/reactos/dll/win32/kernel32/nls/frl.nls trunk/reactos/dll/win32/kernel32/nls/frm.nls trunk/reactos/dll/win32/kernel32/nls/frs.nls trunk/reactos/dll/win32/kernel32/nls/ita.nls trunk/reactos/dll/win32/kernel32/nls/lth.nls trunk/reactos/dll/win32/kernel32/nls/plk.nls trunk/reactos/dll/win32/kernel32/nls/rom.nls trunk/reactos/dll/win32/kernel32/nls/rus.nls trunk/reactos/dll/win32/kernel32/nls/ukr.nls trunk/reactos/dll/win32/kernel32/nls/zhm.nls trunk/reactos/dll/win32/netshell/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/tools/unicode/c_037.c trunk/reactos/tools/unicode/c_10000.c trunk/reactos/tools/unicode/c_10006.c trunk/reactos/tools/unicode/c_10007.c trunk/reactos/tools/unicode/c_10029.c trunk/reactos/tools/unicode/c_1006.c trunk/reactos/tools/unicode/c_10079.c trunk/reactos/tools/unicode/c_10081.c trunk/reactos/tools/unicode/c_1026.c trunk/reactos/tools/unicode/c_1250.c trunk/reactos/tools/unicode/c_1251.c trunk/reactos/tools/unicode/c_1252.c trunk/reactos/tools/unicode/c_1253.c trunk/reactos/tools/unicode/c_1254.c trunk/reactos/tools/unicode/c_1255.c trunk/reactos/tools/unicode/c_1256.c trunk/reactos/tools/unicode/c_1257.c trunk/reactos/tools/unicode/c_1258.c trunk/reactos/tools/unicode/c_1361.c trunk/reactos/tools/unicode/c_20127.c trunk/reactos/tools/unicode/c_20866.c trunk/reactos/tools/unicode/c_20932.c trunk/reactos/tools/unicode/c_21866.c trunk/reactos/tools/unicode/c_28591.c trunk/reactos/tools/unicode/c_28592.c trunk/reactos/tools/unicode/c_28593.c trunk/reactos/tools/unicode/c_28594.c trunk/reactos/tools/unicode/c_28595.c trunk/reactos/tools/unicode/c_28596.c trunk/reactos/tools/unicode/c_28597.c trunk/reactos/tools/unicode/c_28598.c trunk/reactos/tools/unicode/c_28599.c trunk/reactos/tools/unicode/c_28600.c trunk/reactos/tools/unicode/c_28603.c trunk/reactos/tools/unicode/c_28604.c trunk/reactos/tools/unicode/c_28605.c trunk/reactos/tools/unicode/c_28606.c trunk/reactos/tools/unicode/c_424.c trunk/reactos/tools/unicode/c_437.c trunk/reactos/tools/unicode/c_500.c trunk/reactos/tools/unicode/c_737.c trunk/reactos/tools/unicode/c_775.c trunk/reactos/tools/unicode/c_850.c trunk/reactos/tools/unicode/c_852.c trunk/reactos/tools/unicode/c_855.c trunk/reactos/tools/unicode/c_856.c trunk/reactos/tools/unicode/c_857.c trunk/reactos/tools/unicode/c_860.c trunk/reactos/tools/unicode/c_861.c trunk/reactos/tools/unicode/c_862.c trunk/reactos/tools/unicode/c_863.c trunk/reactos/tools/unicode/c_864.c trunk/reactos/tools/unicode/c_865.c trunk/reactos/tools/unicode/c_866.c trunk/reactos/tools/unicode/c_869.c trunk/reactos/tools/unicode/c_874.c trunk/reactos/tools/unicode/c_875.c trunk/reactos/tools/unicode/c_878.c trunk/reactos/tools/unicode/c_932.c trunk/reactos/tools/unicode/c_936.c trunk/reactos/tools/unicode/c_949.c trunk/reactos/tools/unicode/c_950.c trunk/reactos/tools/unicode/casemap.c trunk/reactos/tools/unicode/collation.c trunk/reactos/tools/unicode/string.c trunk/reactos/tools/unicode/wctomb.c trunk/reactos/tools/unicode/wctype.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… Modified: trunk/reactos/base/shell/cmd/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/rsrc.rc?rev… Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/dll/cpl/access/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/uk-UA.… Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/joy/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/uk-UA.rc?… Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/uk-U… Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… Modified: trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/uk-U… Modified: trunk/reactos/dll/win32/kernel32/nls/brf.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/brf… Modified: trunk/reactos/dll/win32/kernel32/nls/cht.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cht… Modified: trunk/reactos/dll/win32/kernel32/nls/esp.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esp… Modified: trunk/reactos/dll/win32/kernel32/nls/fra.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/fra… Modified: trunk/reactos/dll/win32/kernel32/nls/frb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frb… Modified: trunk/reactos/dll/win32/kernel32/nls/frc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frc… Modified: trunk/reactos/dll/win32/kernel32/nls/frl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frl… Modified: trunk/reactos/dll/win32/kernel32/nls/frm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frm… Modified: trunk/reactos/dll/win32/kernel32/nls/frs.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frs… Modified: trunk/reactos/dll/win32/kernel32/nls/ita.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ita… Modified: trunk/reactos/dll/win32/kernel32/nls/lth.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/lth… Modified: trunk/reactos/dll/win32/kernel32/nls/plk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/plk… Modified: trunk/reactos/dll/win32/kernel32/nls/rom.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rom… Modified: trunk/reactos/dll/win32/kernel32/nls/rus.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rus… Modified: trunk/reactos/dll/win32/kernel32/nls/ukr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ukr… Modified: trunk/reactos/dll/win32/kernel32/nls/zhm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhm… Modified: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/uk… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… Modified: trunk/reactos/tools/unicode/c_037.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_037.c?rev=… Modified: trunk/reactos/tools/unicode/c_10000.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10000.c?re… Modified: trunk/reactos/tools/unicode/c_10006.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10006.c?re… Modified: trunk/reactos/tools/unicode/c_10007.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10007.c?re… Modified: trunk/reactos/tools/unicode/c_10029.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10029.c?re… Modified: trunk/reactos/tools/unicode/c_1006.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1006.c?rev… Modified: trunk/reactos/tools/unicode/c_10079.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10079.c?re… Modified: trunk/reactos/tools/unicode/c_10081.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10081.c?re… Modified: trunk/reactos/tools/unicode/c_1026.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1026.c?rev… Modified: trunk/reactos/tools/unicode/c_1250.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1250.c?rev… Modified: trunk/reactos/tools/unicode/c_1251.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1251.c?rev… Modified: trunk/reactos/tools/unicode/c_1252.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1252.c?rev… Modified: trunk/reactos/tools/unicode/c_1253.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1253.c?rev… Modified: trunk/reactos/tools/unicode/c_1254.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1254.c?rev… Modified: trunk/reactos/tools/unicode/c_1255.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1255.c?rev… Modified: trunk/reactos/tools/unicode/c_1256.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1256.c?rev… Modified: trunk/reactos/tools/unicode/c_1257.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1257.c?rev… Modified: trunk/reactos/tools/unicode/c_1258.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1258.c?rev… Modified: trunk/reactos/tools/unicode/c_1361.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1361.c?rev… Modified: trunk/reactos/tools/unicode/c_20127.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20127.c?re… Modified: trunk/reactos/tools/unicode/c_20866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20866.c?re… Modified: trunk/reactos/tools/unicode/c_20932.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20932.c?re… Modified: trunk/reactos/tools/unicode/c_21866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_21866.c?re… Modified: trunk/reactos/tools/unicode/c_28591.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28591.c?re… Modified: trunk/reactos/tools/unicode/c_28592.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28592.c?re… Modified: trunk/reactos/tools/unicode/c_28593.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28593.c?re… Modified: trunk/reactos/tools/unicode/c_28594.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28594.c?re… Modified: trunk/reactos/tools/unicode/c_28595.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28595.c?re… Modified: trunk/reactos/tools/unicode/c_28596.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28596.c?re… Modified: trunk/reactos/tools/unicode/c_28597.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28597.c?re… Modified: trunk/reactos/tools/unicode/c_28598.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28598.c?re… Modified: trunk/reactos/tools/unicode/c_28599.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28599.c?re… Modified: trunk/reactos/tools/unicode/c_28600.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28600.c?re… Modified: trunk/reactos/tools/unicode/c_28603.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28603.c?re… Modified: trunk/reactos/tools/unicode/c_28604.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28604.c?re… Modified: trunk/reactos/tools/unicode/c_28605.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28605.c?re… Modified: trunk/reactos/tools/unicode/c_28606.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28606.c?re… Modified: trunk/reactos/tools/unicode/c_424.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_424.c?rev=… Modified: trunk/reactos/tools/unicode/c_437.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_437.c?rev=… Modified: trunk/reactos/tools/unicode/c_500.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_500.c?rev=… Modified: trunk/reactos/tools/unicode/c_737.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_737.c?rev=… Modified: trunk/reactos/tools/unicode/c_775.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_775.c?rev=… Modified: trunk/reactos/tools/unicode/c_850.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_850.c?rev=… Modified: trunk/reactos/tools/unicode/c_852.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_852.c?rev=… Modified: trunk/reactos/tools/unicode/c_855.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_855.c?rev=… Modified: trunk/reactos/tools/unicode/c_856.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_856.c?rev=… Modified: trunk/reactos/tools/unicode/c_857.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_857.c?rev=… Modified: trunk/reactos/tools/unicode/c_860.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_860.c?rev=… Modified: trunk/reactos/tools/unicode/c_861.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_861.c?rev=… Modified: trunk/reactos/tools/unicode/c_862.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_862.c?rev=… Modified: trunk/reactos/tools/unicode/c_863.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_863.c?rev=… Modified: trunk/reactos/tools/unicode/c_864.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_864.c?rev=… Modified: trunk/reactos/tools/unicode/c_865.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_865.c?rev=… Modified: trunk/reactos/tools/unicode/c_866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_866.c?rev=… Modified: trunk/reactos/tools/unicode/c_869.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_869.c?rev=… Modified: trunk/reactos/tools/unicode/c_874.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_874.c?rev=… Modified: trunk/reactos/tools/unicode/c_875.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_875.c?rev=… Modified: trunk/reactos/tools/unicode/c_878.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_878.c?rev=… Modified: trunk/reactos/tools/unicode/c_932.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_932.c?rev=… Modified: trunk/reactos/tools/unicode/c_936.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_936.c?rev=… Modified: trunk/reactos/tools/unicode/c_949.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_949.c?rev=… Modified: trunk/reactos/tools/unicode/c_950.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_950.c?rev=… Modified: trunk/reactos/tools/unicode/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/casemap.c?re… Modified: trunk/reactos/tools/unicode/collation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/collation.c?… Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… Modified: trunk/reactos/tools/unicode/wctomb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctomb.c?rev… Modified: trunk/reactos/tools/unicode/wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctype.c?rev…

1 0

[dreimer] 47944: Silence zlibs warnings (Samuel Serapion) Update eeadme.wine
by dreimer＠svn.reactos.org 05 Jul '10

05 Jul '10

Author: dreimer Date: Mon Jul 5 11:29:24 2010 New Revision: 47944 URL: http://svn.reactos.org/svn/reactos?rev=47944&view=rev Log: Silence zlibs warnings (Samuel Serapion) Update eeadme.wine Modified: trunk/reactos/lib/3rdparty/zlib/gzguts.h trunk/reactos/lib/3rdparty/zlib/zlib.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/3rdparty/zlib/gzguts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/gzguts.h… ============================================================================== --- trunk/reactos/lib/3rdparty/zlib/gzguts.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/zlib/gzguts.h [iso-8859-1] Mon Jul 5 11:29:24 2010 @@ -25,6 +25,7 @@ # include <stdlib.h> # include <limits.h> #endif +#include <io.h> #include <fcntl.h> #ifdef NO_DEFLATE /* for compatibility with old definition */ Modified: trunk/reactos/lib/3rdparty/zlib/zlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zlib.rbu… ============================================================================== --- trunk/reactos/lib/3rdparty/zlib/zlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/zlib/zlib.rbuild [iso-8859-1] Mon Jul 5 11:29:24 2010 @@ -3,6 +3,7 @@ <group> <module name="zlib" type="staticlibrary" allowwarnings="true"> <include base="zlib">.</include> + <define name="NO_VIZ"/> <file>adler32.c</file> <file>compress.c</file> <file>crc32.c</file> @@ -21,6 +22,7 @@ </module> <module name="zlibhost" type="hoststaticlibrary" allowwarnings="true"> <include base="zlibhost">.</include> + <define name="NO_VIZ"/> <file>adler32.c</file> <file>compress.c</file> <file>crc32.c</file> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Jul 5 11:29:24 2010 @@ -21,8 +21,8 @@ The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/widl # Synced to Wine-1_1_41 +reactos/tools/unicode # Synced to Wine-1_2rc6 +reactos/tools/widl # Synced to Wine-1_2rc6 reactos/tools/winebuild # Synced to Wine-1_1_13 reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wpp # Synced to Wine-20081105 (~Wine-1.1.7)

1 0

[dreimer] 47943: Remove one leftover which is not really needed. Thx to Samuel for kicking me to get my attention ; -)
by dreimer＠svn.reactos.org 04 Jul '10

04 Jul '10

Author: dreimer Date: Sun Jul 4 20:27:45 2010 New Revision: 47943 URL: http://svn.reactos.org/svn/reactos?rev=47943&view=rev Log: Remove one leftover which is not really needed. Thx to Samuel for kicking me to get my attention ;-) Removed: trunk/rostests/winetests/msvcrt/msvcrt.h Modified: trunk/rostests/winetests/msvcrt/misc.c Modified: trunk/rostests/winetests/msvcrt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/misc.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/misc.c [iso-8859-1] Sun Jul 4 20:27:45 2010 @@ -20,10 +20,10 @@ #include "wine/test.h" #include <errno.h> -#include "msvcrt.h" +// #include "msvcrt.h" static int (__cdecl *prand_s)(unsigned int *); -static int (__cdecl *pmemcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t); +static int (__cdecl *pmemcpy_s)(void *, size_t, void*, size_t); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); static void init(void) Removed: trunk/rostests/winetests/msvcrt/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt.h… ============================================================================== --- trunk/rostests/winetests/msvcrt/msvcrt.h [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/msvcrt.h (removed) @@ -1,841 +1,0 @@ -/* - * Copyright 2001 Jon Griffiths - * Copyright 2004 Dimitrie O. Paun - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * NOTES - * Naming conventions - * - Symbols are prefixed with MSVCRT_ if they conflict - * with libc symbols - * - Internal symbols are usually prefixed by msvcrt_. - * - Exported symbols that are not present in the public - * headers are usually kept the same as the original. - * Other conventions - * - To avoid conflicts with the standard C library, - * no msvcrt headers are included in the implementation. - * - Instead, symbols are duplicated here, prefixed with - * MSVCRT_, as explained above. - * - To avoid inconsistencies, a test for each symbol is - * added into tests/headers.c. Please always add a - * corresponding test when you add a new symbol! - */ - -#ifndef __WINE_MSVCRT_H -#define __WINE_MSVCRT_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -#define MSVCRT_LONG_MAX 0x7fffffffL -#define MSVCRT_ULONG_MAX 0xffffffffUL -#define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) -#define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) -#define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) - -typedef unsigned short MSVCRT_wchar_t; -typedef unsigned short MSVCRT_wint_t; -typedef unsigned short MSVCRT_wctype_t; -typedef unsigned short MSVCRT__ino_t; -typedef unsigned int MSVCRT__fsize_t; -typedef int MSVCRT_long; -typedef unsigned int MSVCRT_ulong; -#ifdef _WIN64 -typedef unsigned __int64 MSVCRT_size_t; -typedef __int64 MSVCRT_intptr_t; -typedef unsigned __int64 MSVCRT_uintptr_t; -#else -typedef unsigned long MSVCRT_size_t; -typedef long MSVCRT_intptr_t; -typedef unsigned long MSVCRT_uintptr_t; -#endif -typedef unsigned int MSVCRT__dev_t; -typedef int MSVCRT__off_t; -typedef int MSVCRT_clock_t; -typedef int MSVCRT___time32_t; -typedef __int64 DECLSPEC_ALIGN(8) MSVCRT___time64_t; -typedef __int64 DECLSPEC_ALIGN(8) MSVCRT_fpos_t; - -typedef void (*__cdecl MSVCRT_terminate_handler)(void); -typedef void (*__cdecl MSVCRT_terminate_function)(void); -typedef void (*__cdecl MSVCRT_unexpected_handler)(void); -typedef void (*__cdecl MSVCRT_unexpected_function)(void); -typedef void (*__cdecl MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); -typedef void (*__cdecl MSVCRT__beginthread_start_routine_t)(void *); -typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); -typedef int (*__cdecl MSVCRT__onexit_t)(void); -typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, unsigned, MSVCRT_uintptr_t); - -typedef struct {long double x;} MSVCRT__LDOUBLE; - -struct MSVCRT_tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; - - -/* TLS data */ -extern DWORD msvcrt_tls_index; - -struct __thread_data { - int thread_errno; - MSVCRT_ulong thread_doserrno; - unsigned int random_seed; /* seed for rand() */ - char *strtok_next; /* next ptr for strtok() */ - unsigned char *mbstok_next; /* next ptr for mbstok() */ - MSVCRT_wchar_t *wcstok_next; /* next ptr for wcstok() */ - char *efcvt_buffer; /* buffer for ecvt/fcvt */ - char *asctime_buffer; /* buffer for asctime */ - MSVCRT_wchar_t *wasctime_buffer; /* buffer for wasctime */ - struct MSVCRT_tm time_buffer; /* buffer for localtime/gmtime */ - char *strerror_buffer; /* buffer for strerror */ - int fpecode; - MSVCRT_terminate_function terminate_handler; - MSVCRT_unexpected_function unexpected_handler; - MSVCRT__se_translator_function se_translator; - EXCEPTION_RECORD *exc_record; - struct MSVCRT_localeinfo_struct *locale; -}; - -typedef struct __thread_data thread_data_t; - -extern thread_data_t *msvcrt_get_thread_data(void); - -extern int MSVCRT___lc_codepage; -extern int MSVCRT___lc_collate_cp; -extern int MSVCRT___mb_cur_max; -extern WORD MSVCRT__ctype [257]; -extern WORD* MSVCRT__pctype; - -void msvcrt_set_errno(int); - -void __cdecl _purecall(void); -void __cdecl _amsg_exit(int errnum); - -extern char **MSVCRT__environ; -extern MSVCRT_wchar_t **MSVCRT__wenviron; - -extern char ** msvcrt_SnapshotOfEnvironmentA(char **); -extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **); - -MSVCRT_wchar_t *msvcrt_wstrdupa(const char *); - -/* FIXME: This should be declared in new.h but it's not an extern "C" so - * it would not be much use anyway. Even for Winelib applications. - */ -int __cdecl MSVCRT__set_new_mode(int mode); - -void* __cdecl MSVCRT_operator_new(MSVCRT_size_t); -void __cdecl MSVCRT_operator_delete(void*); - -typedef void* (*__cdecl malloc_func_t)(MSVCRT_size_t); -typedef void (*__cdecl free_func_t)(void*); - -extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); -extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int); - -/* Setup and teardown multi threaded locks */ -extern void msvcrt_init_mt_locks(void); -extern void msvcrt_free_mt_locks(void); - -extern void msvcrt_init_io(void); -extern void msvcrt_free_io(void); -extern void msvcrt_init_console(void); -extern void msvcrt_free_console(void); -extern void msvcrt_init_args(void); -extern void msvcrt_free_args(void); -extern void msvcrt_init_signals(void); -extern void msvcrt_free_signals(void); - -extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**); - -extern unsigned int __cdecl _control87(unsigned int, unsigned int); - -/* run-time error codes */ -#define _RT_STACK 0 -#define _RT_NULLPTR 1 -#define _RT_FLOAT 2 -#define _RT_INTDIV 3 -#define _RT_EXECMEM 5 -#define _RT_EXECFORM 6 -#define _RT_EXECENV 7 -#define _RT_SPACEARG 8 -#define _RT_SPACEENV 9 -#define _RT_ABORT 10 -#define _RT_NPTR 12 -#define _RT_FPTR 13 -#define _RT_BREAK 14 -#define _RT_INT 15 -#define _RT_THREAD 16 -#define _RT_LOCK 17 -#define _RT_HEAP 18 -#define _RT_OPENCON 19 -#define _RT_QWIN 20 -#define _RT_NOMAIN 21 -#define _RT_NONCONT 22 -#define _RT_INVALDISP 23 -#define _RT_ONEXIT 24 -#define _RT_PUREVIRT 25 -#define _RT_STDIOINIT 26 -#define _RT_LOWIOINIT 27 -#define _RT_HEAPINIT 28 -#define _RT_DOMAIN 120 -#define _RT_SING 121 -#define _RT_TLOSS 122 -#define _RT_CRNL 252 -#define _RT_BANNER 255 - -struct MSVCRT___timeb32 { - MSVCRT___time32_t time; - unsigned short millitm; - short timezone; - short dstflag; -}; - -struct MSVCRT___timeb64 { - MSVCRT___time64_t time; - unsigned short millitm; - short timezone; - short dstflag; -}; - -struct MSVCRT__iobuf { - char* _ptr; - int _cnt; - char* _base; - int _flag; - int _file; - int _charbuf; - int _bufsiz; - char* _tmpfname; -}; - -typedef struct MSVCRT__iobuf MSVCRT_FILE; - -struct MSVCRT_lconv { - char* decimal_point; - char* thousands_sep; - char* grouping; - char* int_curr_symbol; - char* currency_symbol; - char* mon_decimal_point; - char* mon_thousands_sep; - char* mon_grouping; - char* positive_sign; - char* negative_sign; - char int_frac_digits; - char frac_digits; - char p_cs_precedes; - char p_sep_by_space; - char n_cs_precedes; - char n_sep_by_space; - char p_sign_posn; - char n_sign_posn; -}; - -struct MSVCRT__exception { - int type; - char* name; - double arg1; - double arg2; - double retval; -}; - -struct MSVCRT__complex { - double x; /* Real part */ - double y; /* Imaginary part */ -}; - -typedef struct MSVCRT__div_t { - int quot; /* quotient */ - int rem; /* remainder */ -} MSVCRT_div_t; - -typedef struct MSVCRT__ldiv_t { - MSVCRT_long quot; /* quotient */ - MSVCRT_long rem; /* remainder */ -} MSVCRT_ldiv_t; - -struct MSVCRT__heapinfo { - int* _pentry; - MSVCRT_size_t _size; - int _useflag; -}; - -#ifdef __i386__ -struct MSVCRT___JUMP_BUFFER { - unsigned long Ebp; - unsigned long Ebx; - unsigned long Edi; - unsigned long Esi; - unsigned long Esp; - unsigned long Eip; - unsigned long Registration; - unsigned long TryLevel; - /* Start of new struct members */ - unsigned long Cookie; - unsigned long UnwindFunc; - unsigned long UnwindData[6]; -}; -#endif /* __i386__ */ - -struct MSVCRT__diskfree_t { - unsigned int total_clusters; - unsigned int avail_clusters; - unsigned int sectors_per_cluster; - unsigned int bytes_per_sector; -}; - -struct MSVCRT__finddata32_t { - unsigned int attrib; - MSVCRT___time32_t time_create; - MSVCRT___time32_t time_access; - MSVCRT___time32_t time_write; - MSVCRT__fsize_t size; - char name[260]; -}; - -struct MSVCRT__finddata32i64_t { - unsigned int attrib; - MSVCRT___time32_t time_create; - MSVCRT___time32_t time_access; - MSVCRT___time32_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - char name[260]; -}; - -struct MSVCRT__finddata64i32_t { - unsigned int attrib; - MSVCRT___time64_t time_create; - MSVCRT___time64_t time_access; - MSVCRT___time64_t time_write; - MSVCRT__fsize_t size; - char name[260]; -}; - -struct MSVCRT__finddata64_t { - unsigned int attrib; - MSVCRT___time64_t time_create; - MSVCRT___time64_t time_access; - MSVCRT___time64_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - char name[260]; -}; - -struct MSVCRT__wfinddata32_t { - unsigned int attrib; - MSVCRT___time32_t time_create; - MSVCRT___time32_t time_access; - MSVCRT___time32_t time_write; - MSVCRT__fsize_t size; - MSVCRT_wchar_t name[260]; -}; - -struct MSVCRT__wfinddata32i64_t { - unsigned int attrib; - MSVCRT___time32_t time_create; - MSVCRT___time32_t time_access; - MSVCRT___time32_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - MSVCRT_wchar_t name[260]; -}; - -struct MSVCRT__wfinddata64i32_t { - unsigned int attrib; - MSVCRT___time64_t time_create; - MSVCRT___time64_t time_access; - MSVCRT___time64_t time_write; - MSVCRT__fsize_t size; - MSVCRT_wchar_t name[260]; -}; - -struct MSVCRT__wfinddata64_t { - unsigned int attrib; - MSVCRT___time64_t time_create; - MSVCRT___time64_t time_access; - MSVCRT___time64_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - MSVCRT_wchar_t name[260]; -}; - -struct MSVCRT___utimbuf32 -{ - MSVCRT___time32_t actime; - MSVCRT___time32_t modtime; -}; - -struct MSVCRT___utimbuf64 -{ - MSVCRT___time64_t actime; - MSVCRT___time64_t modtime; -}; - -/* for FreeBSD */ -#undef st_atime -#undef st_ctime -#undef st_mtime - -struct MSVCRT__stat32 { - MSVCRT__dev_t st_dev; - MSVCRT__ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - MSVCRT__dev_t st_rdev; - MSVCRT__off_t st_size; - MSVCRT___time32_t st_atime; - MSVCRT___time32_t st_mtime; - MSVCRT___time32_t st_ctime; -}; - -struct MSVCRT__stat32i64 { - MSVCRT__dev_t st_dev; - MSVCRT__ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - MSVCRT__dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - MSVCRT___time32_t st_atime; - MSVCRT___time32_t st_mtime; - MSVCRT___time32_t st_ctime; -}; - -struct MSVCRT__stat64i32 { - MSVCRT__dev_t st_dev; - MSVCRT__ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - MSVCRT__dev_t st_rdev; - MSVCRT__off_t st_size; - MSVCRT___time64_t st_atime; - MSVCRT___time64_t st_mtime; - MSVCRT___time64_t st_ctime; -}; - -struct MSVCRT__stat64 { - MSVCRT__dev_t st_dev; - MSVCRT__ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - MSVCRT__dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - MSVCRT___time64_t st_atime; - MSVCRT___time64_t st_mtime; - MSVCRT___time64_t st_ctime; -}; - -#ifdef _WIN64 -#define MSVCRT__finddata_t MSVCRT__finddata64i32_t -#define MSVCRT__finddatai64_t MSVCRT__finddata64_t -#define MSVCRT__wfinddata_t MSVCRT__wfinddata64i32_t -#define MSVCRT__wfinddatai64_t MSVCRT__wfinddata64_t -#define MSVCRT__stat MSVCRT__stat64i32 -#define MSVCRT__stati64 MSVCRT__stat64 -#else -#define MSVCRT__finddata_t MSVCRT__finddata32_t -#define MSVCRT__finddatai64_t MSVCRT__finddata32i64_t -#define MSVCRT__wfinddata_t MSVCRT__wfinddata32_t -#define MSVCRT__wfinddatai64_t MSVCRT__wfinddata32i64_t -#define MSVCRT__stat MSVCRT__stat32 -#define MSVCRT__stati64 MSVCRT__stat32i64 -#endif - -#define MSVCRT_WEOF (MSVCRT_wint_t)(0xFFFF) -#define MSVCRT_EOF (-1) -#define MSVCRT_TMP_MAX 0x7fff -#define MSVCRT_RAND_MAX 0x7fff -#define MSVCRT_BUFSIZ 512 - -#define MSVCRT_STDIN_FILENO 0 -#define MSVCRT_STDOUT_FILENO 1 -#define MSVCRT_STDERR_FILENO 2 - -/* more file._flag flags, but these conflict with Unix */ -#define MSVCRT__IOFBF 0x0000 -#define MSVCRT__IONBF 0x0004 -#define MSVCRT__IOLBF 0x0040 - -#define MSVCRT_FILENAME_MAX 260 -#define MSVCRT_DRIVE_MAX 3 -#define MSVCRT_FNAME_MAX 256 -#define MSVCRT_DIR_MAX 256 -#define MSVCRT_EXT_MAX 256 -#define MSVCRT_PATH_MAX 260 -#define MSVCRT_stdin (MSVCRT__iob+MSVCRT_STDIN_FILENO) -#define MSVCRT_stdout (MSVCRT__iob+MSVCRT_STDOUT_FILENO) -#define MSVCRT_stderr (MSVCRT__iob+MSVCRT_STDERR_FILENO) - -#define MSVCRT__P_WAIT 0 -#define MSVCRT__P_NOWAIT 1 -#define MSVCRT__P_OVERLAY 2 -#define MSVCRT__P_NOWAITO 3 -#define MSVCRT__P_DETACH 4 - -#define MSVCRT_EPERM 1 -#define MSVCRT_ENOENT 2 -#define MSVCRT_ESRCH 3 -#define MSVCRT_EINTR 4 -#define MSVCRT_EIO 5 -#define MSVCRT_ENXIO 6 -#define MSVCRT_E2BIG 7 -#define MSVCRT_ENOEXEC 8 -#define MSVCRT_EBADF 9 -#define MSVCRT_ECHILD 10 -#define MSVCRT_EAGAIN 11 -#define MSVCRT_ENOMEM 12 -#define MSVCRT_EACCES 13 -#define MSVCRT_EFAULT 14 -#define MSVCRT_EBUSY 16 -#define MSVCRT_EEXIST 17 -#define MSVCRT_EXDEV 18 -#define MSVCRT_ENODEV 19 -#define MSVCRT_ENOTDIR 20 -#define MSVCRT_EISDIR 21 -#define MSVCRT_EINVAL 22 -#define MSVCRT_ENFILE 23 -#define MSVCRT_EMFILE 24 -#define MSVCRT_ENOTTY 25 -#define MSVCRT_EFBIG 27 -#define MSVCRT_ENOSPC 28 -#define MSVCRT_ESPIPE 29 -#define MSVCRT_EROFS 30 -#define MSVCRT_EMLINK 31 -#define MSVCRT_EPIPE 32 -#define MSVCRT_EDOM 33 -#define MSVCRT_ERANGE 34 -#define MSVCRT_EDEADLK 36 -#define MSVCRT_EDEADLOCK MSVCRT_EDEADLK -#define MSVCRT_ENAMETOOLONG 38 -#define MSVCRT_ENOLCK 39 -#define MSVCRT_ENOSYS 40 -#define MSVCRT_ENOTEMPTY 41 -#define MSVCRT_EILSEQ 42 - -#define MSVCRT_LC_ALL 0 -#define MSVCRT_LC_COLLATE 1 -#define MSVCRT_LC_CTYPE 2 -#define MSVCRT_LC_MONETARY 3 -#define MSVCRT_LC_NUMERIC 4 -#define MSVCRT_LC_TIME 5 -#define MSVCRT_LC_MIN MSVCRT_LC_ALL -#define MSVCRT_LC_MAX MSVCRT_LC_TIME - -#define MSVCRT__HEAPEMPTY -1 -#define MSVCRT__HEAPOK -2 -#define MSVCRT__HEAPBADBEGIN -3 -#define MSVCRT__HEAPBADNODE -4 -#define MSVCRT__HEAPEND -5 -#define MSVCRT__HEAPBADPTR -6 - -#define MSVCRT__FREEENTRY 0 -#define MSVCRT__USEDENTRY 1 - -#define MSVCRT__OUT_TO_DEFAULT 0 -#define MSVCRT__REPORT_ERRMODE 3 - -/* ASCII char classification table - binary compatible */ -#define MSVCRT__UPPER 0x0001 /* C1_UPPER */ -#define MSVCRT__LOWER 0x0002 /* C1_LOWER */ -#define MSVCRT__DIGIT 0x0004 /* C1_DIGIT */ -#define MSVCRT__SPACE 0x0008 /* C1_SPACE */ -#define MSVCRT__PUNCT 0x0010 /* C1_PUNCT */ -#define MSVCRT__CONTROL 0x0020 /* C1_CNTRL */ -#define MSVCRT__BLANK 0x0040 /* C1_BLANK */ -#define MSVCRT__HEX 0x0080 /* C1_XDIGIT */ -#define MSVCRT__LEADBYTE 0x8000 -#define MSVCRT__ALPHA (0x0100|MSVCRT__UPPER|MSVCRT__LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ - -#define MSVCRT__IOREAD 0x0001 -#define MSVCRT__IOWRT 0x0002 -#define MSVCRT__IOMYBUF 0x0008 -#define MSVCRT__IOEOF 0x0010 -#define MSVCRT__IOERR 0x0020 -#define MSVCRT__IOSTRG 0x0040 -#define MSVCRT__IORW 0x0080 - -#define MSVCRT__S_IEXEC 0x0040 -#define MSVCRT__S_IWRITE 0x0080 -#define MSVCRT__S_IREAD 0x0100 -#define MSVCRT__S_IFIFO 0x1000 -#define MSVCRT__S_IFCHR 0x2000 -#define MSVCRT__S_IFDIR 0x4000 -#define MSVCRT__S_IFREG 0x8000 -#define MSVCRT__S_IFMT 0xF000 - -#define MSVCRT__LK_UNLCK 0 -#define MSVCRT__LK_LOCK 1 -#define MSVCRT__LK_NBLCK 2 -#define MSVCRT__LK_RLCK 3 -#define MSVCRT__LK_NBRLCK 4 - -#define MSVCRT__SH_COMPAT 0x00 /* Compatibility */ -#define MSVCRT__SH_DENYRW 0x10 /* Deny read/write */ -#define MSVCRT__SH_DENYWR 0x20 /* Deny write */ -#define MSVCRT__SH_DENYRD 0x30 /* Deny read */ -#define MSVCRT__SH_DENYNO 0x40 /* Deny nothing */ - -#define MSVCRT__O_RDONLY 0 -#define MSVCRT__O_WRONLY 1 -#define MSVCRT__O_RDWR 2 -#define MSVCRT__O_ACCMODE (MSVCRT__O_RDONLY|MSVCRT__O_WRONLY|MSVCRT__O_RDWR) -#define MSVCRT__O_APPEND 0x0008 -#define MSVCRT__O_RANDOM 0x0010 -#define MSVCRT__O_SEQUENTIAL 0x0020 -#define MSVCRT__O_TEMPORARY 0x0040 -#define MSVCRT__O_NOINHERIT 0x0080 -#define MSVCRT__O_CREAT 0x0100 -#define MSVCRT__O_TRUNC 0x0200 -#define MSVCRT__O_EXCL 0x0400 -#define MSVCRT__O_SHORT_LIVED 0x1000 -#define MSVCRT__O_TEXT 0x4000 -#define MSVCRT__O_BINARY 0x8000 -#define MSVCRT__O_RAW MSVCRT__O_BINARY - -/* _statusfp bit flags */ -#define MSVCRT__SW_INEXACT 0x00000001 /* inexact (precision) */ -#define MSVCRT__SW_UNDERFLOW 0x00000002 /* underflow */ -#define MSVCRT__SW_OVERFLOW 0x00000004 /* overflow */ -#define MSVCRT__SW_ZERODIVIDE 0x00000008 /* zero divide */ -#define MSVCRT__SW_INVALID 0x00000010 /* invalid */ - -#define MSVCRT__SW_UNEMULATED 0x00000040 /* unemulated instruction */ -#define MSVCRT__SW_SQRTNEG 0x00000080 /* square root of a neg number */ -#define MSVCRT__SW_STACKOVERFLOW 0x00000200 /* FP stack overflow */ -#define MSVCRT__SW_STACKUNDERFLOW 0x00000400 /* FP stack underflow */ - -#define MSVCRT__SW_DENORMAL 0x00080000 /* denormal status bit */ - -/* fpclass constants */ -#define MSVCRT__FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */ -#define MSVCRT__FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */ -#define MSVCRT__FPCLASS_NINF 0x0004 /* Negative Infinity */ -#define MSVCRT__FPCLASS_NN 0x0008 /* Negative Normal */ -#define MSVCRT__FPCLASS_ND 0x0010 /* Negative Denormal */ -#define MSVCRT__FPCLASS_NZ 0x0020 /* Negative Zero */ -#define MSVCRT__FPCLASS_PZ 0x0040 /* Positive Zero */ -#define MSVCRT__FPCLASS_PD 0x0080 /* Positive Denormal */ -#define MSVCRT__FPCLASS_PN 0x0100 /* Positive Normal */ -#define MSVCRT__FPCLASS_PINF 0x0200 /* Positive Infinity */ - -#define MSVCRT__EM_INVALID 0x00000010 -#define MSVCRT__EM_DENORMAL 0x00080000 -#define MSVCRT__EM_ZERODIVIDE 0x00000008 -#define MSVCRT__EM_OVERFLOW 0x00000004 -#define MSVCRT__EM_UNDERFLOW 0x00000002 -#define MSVCRT__EM_INEXACT 0x00000001 -#define MSVCRT__IC_AFFINE 0x00040000 -#define MSVCRT__IC_PROJECTIVE 0x00000000 -#define MSVCRT__RC_CHOP 0x00000300 -#define MSVCRT__RC_UP 0x00000200 -#define MSVCRT__RC_DOWN 0x00000100 -#define MSVCRT__RC_NEAR 0x00000000 -#define MSVCRT__PC_24 0x00020000 -#define MSVCRT__PC_53 0x00010000 -#define MSVCRT__PC_64 0x00000000 - -#define MSVCRT_CLOCKS_PER_SEC 1000 - -/* signals */ -#define MSVCRT_SIGINT 2 -#define MSVCRT_SIGILL 4 -#define MSVCRT_SIGFPE 8 -#define MSVCRT_SIGSEGV 11 -#define MSVCRT_SIGTERM 15 -#define MSVCRT_SIGBREAK 21 -#define MSVCRT_SIGABRT 22 -#define MSVCRT_NSIG (MSVCRT_SIGABRT + 1) - -typedef void (__cdecl *MSVCRT___sighandler_t)(int); - -#define MSVCRT_SIG_DFL ((MSVCRT___sighandler_t)0) -#define MSVCRT_SIG_IGN ((MSVCRT___sighandler_t)1) -#define MSVCRT_SIG_ERR ((MSVCRT___sighandler_t)-1) - -#define MSVCRT__FPE_INVALID 0x81 -#define MSVCRT__FPE_DENORMAL 0x82 -#define MSVCRT__FPE_ZERODIVIDE 0x83 -#define MSVCRT__FPE_OVERFLOW 0x84 -#define MSVCRT__FPE_UNDERFLOW 0x85 -#define MSVCRT__FPE_INEXACT 0x86 -#define MSVCRT__FPE_UNEMULATED 0x87 -#define MSVCRT__FPE_SQRTNEG 0x88 -#define MSVCRT__FPE_STACKOVERFLOW 0x8a -#define MSVCRT__FPE_STACKUNDERFLOW 0x8b -#define MSVCRT__FPE_EXPLICITGEN 0x8c - -#define _MS 0x01 -#define _MP 0x02 -#define _M1 0x04 -#define _M2 0x08 - -#define _SBUP 0x10 -#define _SBLOW 0x20 - -#define _MBC_SINGLE 0 -#define _MBC_LEAD 1 -#define _MBC_TRAIL 2 -#define _MBC_ILLEGAL -1 - -#define _MB_CP_SBCS 0 -#define _MB_CP_OEM -2 -#define _MB_CP_ANSI -3 -#define _MB_CP_LOCALE -4 - -#define MSVCRT__TRUNCATE ((MSVCRT_size_t)-1) - -void __cdecl MSVCRT_free(void*); -void* __cdecl MSVCRT_malloc(MSVCRT_size_t); -void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); -void* __cdecl MSVCRT_realloc(void*,MSVCRT_size_t); - -int __cdecl MSVCRT_iswalpha(MSVCRT_wint_t); -int __cdecl MSVCRT_iswspace(MSVCRT_wint_t); -int __cdecl MSVCRT_iswdigit(MSVCRT_wint_t); -int __cdecl MSVCRT_isleadbyte(int); - -int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); -int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); -MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); -MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); -void __cdecl MSVCRT__exit(int); -void __cdecl MSVCRT_abort(void); -MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); -int* __cdecl MSVCRT__errno(void); -char* __cdecl MSVCRT_getenv(const char*); -char* __cdecl MSVCRT_setlocale(int,const char*); -int __cdecl MSVCRT_fclose(MSVCRT_FILE*); -void __cdecl MSVCRT_terminate(void); -MSVCRT_FILE* __cdecl MSVCRT__iob_func(void); -MSVCRT_clock_t __cdecl MSVCRT_clock(void); -MSVCRT___time32_t __cdecl MSVCRT__time32(MSVCRT___time32_t*); -MSVCRT___time64_t __cdecl MSVCRT__time64(MSVCRT___time64_t*); -MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *); -MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); -int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); -int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, - const MSVCRT_wchar_t *format, __ms_va_list valist ); -int __cdecl MSVCRT_raise(int sig); - -typedef struct MSVCRT_tagLC_ID { - unsigned short wLanguage; - unsigned short wCountry; - unsigned short wCodePage; -} MSVCRT_LC_ID, *MSVCRT_LPLC_ID; - -typedef struct MSVCRT_threadlocaleinfostruct { - int refcount; - unsigned int lc_codepage; - unsigned int lc_collate_cp; - unsigned long lc_handle[6]; - MSVCRT_LC_ID lc_id[6]; - struct { - char *locale; - wchar_t *wlocale; - int *refcount; - int *wrefcount; - } lc_category[6]; - int lc_clike; - int mb_cur_max; - int *lconv_intl_refcount; - int *lconv_num_refcount; - int *lconv_mon_refcount; - struct MSVCRT_lconv *lconv; - int *ctype1_refcount; - unsigned short *ctype1; - unsigned short *pctype; - unsigned char *pclmap; - unsigned char *pcumap; - struct MSVCRT___lc_time_data *lc_time_curr; -} MSVCRT_threadlocinfo; - -typedef struct MSVCRT_threadmbcinfostruct { - int refcount; - int mbcodepage; - int ismbcodepage; - int mblcid; - unsigned short mbulinfo[6]; - char mbctype[257]; - char mbcasemap[256]; -} MSVCRT_threadmbcinfo; - -typedef struct MSVCRT_threadlocaleinfostruct *MSVCRT_pthreadlocinfo; -typedef struct MSVCRT_threadmbcinfostruct *MSVCRT_pthreadmbcinfo; - -typedef struct MSVCRT_localeinfo_struct -{ - MSVCRT_pthreadlocinfo locinfo; - MSVCRT_pthreadmbcinfo mbcinfo; -} MSVCRT__locale_tstruct, *MSVCRT__locale_t; - -#define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 -#define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 - -extern MSVCRT__locale_t MSVCRT_locale; -MSVCRT__locale_t get_locale(void); -void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); - -#ifndef __WINE_MSVCRT_TEST -int __cdecl MSVCRT__write(int,const void*,unsigned int); -int __cdecl _getch(void); -int __cdecl _ismbblead(unsigned int); -int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); -MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); -MSVCRT_intptr_t __cdecl MSVRT__spawnvpe(int,const char*,const char* const *,const char* const *); -MSVCRT_intptr_t __cdecl _wspawnve(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *); -MSVCRT_intptr_t __cdecl _wspawnvpe(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *); -void __cdecl _searchenv(const char*,const char*,char*); -int __cdecl _getdrive(void); -char* __cdecl _strdup(const char*); -char* __cdecl MSVCRT__strnset(char*,int,MSVCRT_size_t); -char* __cdecl _strset(char*,int); -int __cdecl _ungetch(int); -int __cdecl _cputs(const char*); -int __cdecl _cprintf(const char*,...); -char*** __cdecl __p__environ(void); -int* __cdecl __p___mb_cur_max(void); -unsigned int* __cdecl __p__fmode(void); -MSVCRT_wchar_t* __cdecl _wcsdup(const MSVCRT_wchar_t*); -MSVCRT_wchar_t*** __cdecl __p__wenviron(void); -char* __cdecl _strdate(char* date); -char* __cdecl _strtime(char* date); -int __cdecl _setmbcp(int); -int __cdecl MSVCRT__close(int); -int __cdecl MSVCRT__dup(int); -int __cdecl MSVCRT__dup2(int, int); -int __cdecl MSVCRT__pipe(int *, unsigned int, int); -MSVCRT_wchar_t* __cdecl _wgetenv(const MSVCRT_wchar_t*); -void __cdecl _wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_wchar_t*); -MSVCRT_intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*); -void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, - const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); -#endif - -#endif /* __WINE_MSVCRT_H */

1 0

[spetreolle] 47942: fix widl unix build.
by spetreolle＠svn.reactos.org 04 Jul '10

04 Jul '10

Author: spetreolle Date: Sun Jul 4 20:20:10 2010 New Revision: 47942 URL: http://svn.reactos.org/svn/reactos?rev=47942&view=rev Log: fix widl unix build. Modified: trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=4… ============================================================================== --- trunk/reactos/tools/widl/typelib.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typelib.c [iso-8859-1] Sun Jul 4 20:20:10 2010 @@ -35,8 +35,7 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" +#include <host/typedefs.h> #include "widl.h" #include "utils.h" Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… ============================================================================== --- trunk/reactos/tools/widl/typelib_struct.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typelib_struct.h [iso-8859-1] Sun Jul 4 20:20:10 2010 @@ -302,7 +302,7 @@ * */ -#include "pshpack1.h" +#include <host/pshpack1.h> typedef struct { /*00*/ DWORD SLTG_magic; /* 0x47544c53 == "SLTG" */ @@ -599,7 +599,7 @@ WORD typeofarray */ -#include "poppack.h" +#include <host/poppack.h> /*---------------------------END--------------------------------------------*/ #endif Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widltypes.h [iso-8859-1] Sun Jul 4 20:20:10 2010 @@ -20,6 +20,13 @@ #ifndef __WIDL_WIDLTYPES_H #define __WIDL_WIDLTYPES_H + +#define S_OK 0 +#define S_FALSE 1 +#define E_OUTOFMEMORY ((HRESULT)0x8007000EL) +#define TYPE_E_IOERROR ((HRESULT)0x80028CA2L) + +#define max(a, b) ((a) > (b) ? a : b) #include <stdarg.h> #include <assert.h> Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/write_msft.c [iso-8859-1] Sun Jul 4 20:20:10 2010 @@ -40,10 +40,8 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +#include <host/typedefs.h> +#include <host/nls.h> #include "widl.h" #include "typelib.h"

1 0

[khornicek] 47941: Update test lists for winetests too.
by khornicek＠svn.reactos.org 04 Jul '10

04 Jul '10

Author: khornicek Date: Sun Jul 4 19:57:31 2010 New Revision: 47941 URL: http://svn.reactos.org/svn/reactos?rev=47941&view=rev Log: Update test lists for winetests too. Modified: trunk/rostests/winetests/msvcrt/testlist.c trunk/rostests/winetests/setupapi/testlist.c trunk/rostests/winetests/shlwapi/testlist.c trunk/rostests/winetests/urlmon/testlist.c Modified: trunk/rostests/winetests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/testlist… ============================================================================== --- trunk/rostests/winetests/msvcrt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/testlist.c [iso-8859-1] Sun Jul 4 19:57:31 2010 @@ -13,6 +13,7 @@ extern void func_file(void); extern void func_headers(void); extern void func_heap(void); +extern void func_locale(void); extern void func_misc(void); extern void func_printf(void); extern void func_scanf(void); @@ -29,10 +30,11 @@ { "file", func_file }, { "headers", func_headers }, { "heap", func_heap }, + { "locale", func_locale }, { "misc", func_misc }, { "printf", func_printf }, { "scanf", func_scanf }, - { "signal", func_signal }, + { "signal", func_signal }, { "string", func_string }, { "time", func_time }, { 0, 0 } Modified: trunk/rostests/winetests/setupapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/testli… ============================================================================== --- trunk/rostests/winetests/setupapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/testlist.c [iso-8859-1] Sun Jul 4 19:57:31 2010 @@ -12,6 +12,7 @@ extern void func_misc(void); extern void func_parser(void); extern void func_query(void); +extern void func_setupcab(void); extern void func_stringtable(void); const struct test winetest_testlist[] = @@ -22,6 +23,7 @@ { "misc", func_misc }, { "parser", func_parser }, { "query", func_query }, + { "setupcab", func_setupcab }, { "stringtable", func_stringtable }, { 0, 0 } }; Modified: trunk/rostests/winetests/shlwapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/testlis… ============================================================================== --- trunk/rostests/winetests/shlwapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/testlist.c [iso-8859-1] Sun Jul 4 19:57:31 2010 @@ -14,6 +14,7 @@ extern void func_path(void); extern void func_shreg(void); extern void func_string(void); +extern void func_thread(void); extern void func_url(void); const struct test winetest_testlist[] = @@ -26,6 +27,7 @@ { "path", func_path }, { "shreg", func_shreg }, { "string", func_string }, + { "thread", func_thread }, { "url", func_url }, { 0, 0 } }; Modified: trunk/rostests/winetests/urlmon/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/testlist… ============================================================================== --- trunk/rostests/winetests/urlmon/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/testlist.c [iso-8859-1] Sun Jul 4 19:57:31 2010 @@ -11,15 +11,17 @@ extern void func_protocol(void); extern void func_sec_mgr(void); extern void func_stream(void); +extern void func_uri(void); extern void func_url(void); const struct test winetest_testlist[] = { - { "generated", func_generated }, - { "misc", func_misc }, - { "protocol", func_protocol }, - { "sec_mgr", func_sec_mgr }, - { "stream", func_stream }, - { "url", func_url }, + { "generated", func_generated }, + { "misc", func_misc }, + { "protocol", func_protocol }, + { "sec_mgr", func_sec_mgr }, + { "stream", func_stream }, + { "uri", func_uri }, + { "url", func_url }, { 0, 0 } };

1 0

[dreimer] 47940: Update WIDL to Wine 1.2 rc6 + sync/modify two idl files making problems with the new widl. Patch by Samuel Serapion, tested by me
by dreimer＠svn.reactos.org 04 Jul '10

04 Jul '10

Author: dreimer Date: Sun Jul 4 19:52:38 2010 New Revision: 47940 URL: http://svn.reactos.org/svn/reactos?rev=47940&view=rev Log: Update WIDL to Wine 1.2 rc6 + sync/modify two idl files making problems with the new widl. Patch by Samuel Serapion, tested by me Modified: trunk/reactos/include/psdk/mlang.idl trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/tools/widl/expr.c trunk/reactos/tools/widl/expr.h trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/typetree.c trunk/reactos/tools/widl/typetree.h trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/mlang.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mlang.idl?rev… Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… Modified: trunk/reactos/tools/widl/expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.c?rev=4794… Modified: trunk/reactos/tools/widl/expr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.h?rev=4794… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=47… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=47… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=47… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=47… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=4… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=4… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=4… Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… Modified: trunk/reactos/tools/widl/typetree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.c?rev=… Modified: trunk/reactos/tools/widl/typetree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.h?rev=… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=4794… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

1 0

[dreimer] 47939: Sync advapi32, gdi32, gdiplus, inetmib1, kernel32, mlang, msi, msvcrt, ntdll, oleaut32, rpcrt4, secur32, setupapi, shdocvw, shlwapi, snmpapi, twain_32, urlmon, user32, userenv, usp10, winhttp, wininet, wintrust, ws2_32 winetests to Wine 1.2rc6
by dreimer＠svn.reactos.org 04 Jul '10

04 Jul '10

Author: dreimer Date: Sun Jul 4 19:08:47 2010 New Revision: 47939 URL: http://svn.reactos.org/svn/reactos?rev=47939&view=rev Log: Sync advapi32, gdi32, gdiplus, inetmib1, kernel32, mlang, msi, msvcrt, ntdll, oleaut32, rpcrt4, secur32, setupapi, shdocvw, shlwapi, snmpapi, twain_32, urlmon, user32, userenv, usp10, winhttp, wininet, wintrust, ws2_32 winetests to Wine 1.2rc6 Added: trunk/rostests/winetests/msvcrt/locale.c (with props) trunk/rostests/winetests/msvcrt/msvcrt.h (with props) trunk/rostests/winetests/oleaut32/dispatch.c (with props) trunk/rostests/winetests/oleaut32/test_reg.idl (with props) trunk/rostests/winetests/setupapi/setupcab.c (with props) trunk/rostests/winetests/shlwapi/thread.c (with props) trunk/rostests/winetests/urlmon/uri.c (with props) Removed: trunk/rostests/winetests/msvcrt/Makefile.in Modified: trunk/rostests/winetests/advapi32/security.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/graphics.c trunk/rostests/winetests/gdiplus/pen.c trunk/rostests/winetests/inetmib1/main.c trunk/rostests/winetests/kernel32/debugger.c trunk/rostests/winetests/kernel32/heap.c trunk/rostests/winetests/mlang/mlang.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/patch.c trunk/rostests/winetests/msvcrt/dir.c trunk/rostests/winetests/msvcrt/file.c trunk/rostests/winetests/msvcrt/misc.c trunk/rostests/winetests/msvcrt/msvcrt.rbuild trunk/rostests/winetests/msvcrt/printf.c trunk/rostests/winetests/msvcrt/string.c trunk/rostests/winetests/ntdll/exception.c trunk/rostests/winetests/ntdll/om.c trunk/rostests/winetests/oleaut32/oleaut32.rbuild trunk/rostests/winetests/oleaut32/olefont.c trunk/rostests/winetests/oleaut32/olepicture.c trunk/rostests/winetests/oleaut32/safearray.c trunk/rostests/winetests/oleaut32/testlist.c trunk/rostests/winetests/oleaut32/tmarshal.c trunk/rostests/winetests/oleaut32/tmarshal.idl trunk/rostests/winetests/oleaut32/tmarshal.rc trunk/rostests/winetests/oleaut32/tmarshal_dispids.h trunk/rostests/winetests/oleaut32/typelib.c trunk/rostests/winetests/oleaut32/usrmarshal.c trunk/rostests/winetests/oleaut32/varformat.c trunk/rostests/winetests/oleaut32/vartest.c trunk/rostests/winetests/oleaut32/vartype.c trunk/rostests/winetests/rpcrt4/cstub.c trunk/rostests/winetests/rpcrt4/generated.c trunk/rostests/winetests/rpcrt4/ndr_marshall.c trunk/rostests/winetests/rpcrt4/rpc.c trunk/rostests/winetests/rpcrt4/rpc_protseq.c trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild trunk/rostests/winetests/rpcrt4/server.c trunk/rostests/winetests/rpcrt4/server.idl trunk/rostests/winetests/secur32/ntlm.c trunk/rostests/winetests/secur32/schannel.c trunk/rostests/winetests/secur32/secur32.c trunk/rostests/winetests/setupapi/install.c trunk/rostests/winetests/setupapi/misc.c trunk/rostests/winetests/setupapi/setupapi.rbuild trunk/rostests/winetests/shdocvw/shortcut.c trunk/rostests/winetests/shdocvw/webbrowser.c trunk/rostests/winetests/shlwapi/ordinal.c trunk/rostests/winetests/shlwapi/shlwapi.rbuild trunk/rostests/winetests/shlwapi/url.c trunk/rostests/winetests/snmpapi/util.c trunk/rostests/winetests/twain_32/dsm.c trunk/rostests/winetests/urlmon/misc.c trunk/rostests/winetests/urlmon/protocol.c trunk/rostests/winetests/urlmon/sec_mgr.c trunk/rostests/winetests/urlmon/url.c trunk/rostests/winetests/urlmon/urlmon.rbuild trunk/rostests/winetests/user32/class.c trunk/rostests/winetests/user32/combo.c trunk/rostests/winetests/user32/cursoricon.c trunk/rostests/winetests/user32/dce.c trunk/rostests/winetests/user32/dde.c trunk/rostests/winetests/user32/dialog.c trunk/rostests/winetests/user32/edit.c trunk/rostests/winetests/user32/generated.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/win.c trunk/rostests/winetests/userenv/userenv.c trunk/rostests/winetests/usp10/usp10.c trunk/rostests/winetests/winhttp/notification.c trunk/rostests/winetests/winhttp/url.c trunk/rostests/winetests/winhttp/winhttp.c trunk/rostests/winetests/winhttp/winhttp.rbuild trunk/rostests/winetests/wininet/http.c trunk/rostests/winetests/wininet/internet.c trunk/rostests/winetests/wininet/url.c trunk/rostests/winetests/wintrust/crypt.c trunk/rostests/winetests/ws2_32/sock.c trunk/rostests/winetests/ws2_32/ws2_32.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… Modified: trunk/rostests/winetests/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/pen.c?r… Modified: trunk/rostests/winetests/inetmib1/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetmib1/main.c… Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… Modified: trunk/rostests/winetests/kernel32/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/heap.c… Modified: trunk/rostests/winetests/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?r… Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=4… Modified: trunk/rostests/winetests/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/patch.c?rev… Removed: trunk/rostests/winetests/msvcrt/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/Makefile… Modified: trunk/rostests/winetests/msvcrt/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/dir.c?re… Modified: trunk/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/file.c?r… Added: trunk/rostests/winetests/msvcrt/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/locale.c… Modified: trunk/rostests/winetests/msvcrt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/misc.c?r… Added: trunk/rostests/winetests/msvcrt/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt.h… Modified: trunk/rostests/winetests/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt.r… Modified: trunk/rostests/winetests/msvcrt/printf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/printf.c… Modified: trunk/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/string.c… Modified: trunk/rostests/winetests/ntdll/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception… Modified: trunk/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… Added: trunk/rostests/winetests/oleaut32/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/dispat… Modified: trunk/rostests/winetests/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/oleaut… Modified: trunk/rostests/winetests/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olefon… Modified: trunk/rostests/winetests/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olepic… Modified: trunk/rostests/winetests/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/safear… Added: trunk/rostests/winetests/oleaut32/test_reg.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/test_r… Modified: trunk/rostests/winetests/oleaut32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/testli… Modified: trunk/rostests/winetests/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… Modified: trunk/rostests/winetests/oleaut32/tmarshal.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… Modified: trunk/rostests/winetests/oleaut32/tmarshal.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… Modified: trunk/rostests/winetests/oleaut32/tmarshal_dispids.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… Modified: trunk/rostests/winetests/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/usrmar… Modified: trunk/rostests/winetests/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/varfor… Modified: trunk/rostests/winetests/oleaut32/vartest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartes… Modified: trunk/rostests/winetests/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp… Modified: trunk/rostests/winetests/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/cstub.c?… Modified: trunk/rostests/winetests/rpcrt4/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/generate… Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/ndr_mars… Modified: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… Modified: trunk/rostests/winetests/rpcrt4/rpc_protseq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc_prot… Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpcrt4.r… Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… Modified: trunk/rostests/winetests/rpcrt4/server.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.i… Modified: trunk/rostests/winetests/secur32/ntlm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/ntlm.c?… Modified: trunk/rostests/winetests/secur32/schannel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/schanne… Modified: trunk/rostests/winetests/secur32/secur32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/secur32… Modified: trunk/rostests/winetests/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/instal… Modified: trunk/rostests/winetests/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/misc.c… Modified: trunk/rostests/winetests/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/setupa… Added: trunk/rostests/winetests/setupapi/setupcab.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/setupc… Modified: trunk/rostests/winetests/shdocvw/shortcut.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/shortcu… Modified: trunk/rostests/winetests/shdocvw/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/webbrow… Modified: trunk/rostests/winetests/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/ordinal… Modified: trunk/rostests/winetests/shlwapi/shlwapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/shlwapi… Added: trunk/rostests/winetests/shlwapi/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/thread.… Modified: trunk/rostests/winetests/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/url.c?r… Modified: trunk/rostests/winetests/snmpapi/util.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/snmpapi/util.c?… Modified: trunk/rostests/winetests/twain_32/dsm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/dsm.c?… Modified: trunk/rostests/winetests/urlmon/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/misc.c?r… Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… Modified: trunk/rostests/winetests/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/sec_mgr.… Added: trunk/rostests/winetests/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/uri.c?re… Modified: trunk/rostests/winetests/urlmon/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re… Modified: trunk/rostests/winetests/urlmon/urlmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/urlmon.r… Modified: trunk/rostests/winetests/user32/class.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/class.c?… Modified: trunk/rostests/winetests/user32/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/combo.c?… Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… Modified: trunk/rostests/winetests/user32/dce.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dce.c?re… Modified: trunk/rostests/winetests/user32/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dde.c?re… Modified: trunk/rostests/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dialog.c… Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… Modified: trunk/rostests/winetests/user32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/generate… Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… Modified: trunk/rostests/winetests/userenv/userenv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/userenv/userenv… Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… Modified: trunk/rostests/winetests/winhttp/notification.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/notific… Modified: trunk/rostests/winetests/winhttp/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/url.c?r… Modified: trunk/rostests/winetests/winhttp/winhttp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/winhttp… Modified: trunk/rostests/winetests/winhttp/winhttp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/winhttp… Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… Modified: trunk/rostests/winetests/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/interne… Modified: trunk/rostests/winetests/wininet/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/url.c?r… Modified: trunk/rostests/winetests/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/crypt.… Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… Modified: trunk/rostests/winetests/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/ws2_32.r…

1 0

[dreimer] 47938: Another updated wine header to fix some synched winetest's build process.
by dreimer＠svn.reactos.org 04 Jul '10

04 Jul '10

Author: dreimer Date: Sun Jul 4 19:06:38 2010 New Revision: 47938 URL: http://svn.reactos.org/svn/reactos?rev=47938&view=rev Log: Another updated wine header to fix some synched winetest's build process. Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sun Jul 4 19:06:38 2010 @@ -65,6 +65,14 @@ extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } +/* strcmpW is avaiable for tests compiled under Wine, but not in standalone + * builds under Windows, so we reimplement it under a different name. */ +static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) +{ + while (*str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + #ifdef STANDALONE #define START_TEST(name) \ static void func_##name(void); \ @@ -74,23 +82,31 @@ #define START_TEST(name) void func_##name(void) #endif +#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#define __winetest_cdecl __cdecl +#define __winetest_va_list __builtin_ms_va_list +#else +#define __winetest_cdecl +#define __winetest_va_list va_list +#endif + extern int broken( int condition ); -extern int winetest_vok( int condition, const char *msg, va_list ap ); -extern void winetest_vskip( const char *msg, va_list ap ); +extern int winetest_vok( int condition, const char *msg, __winetest_va_list ap ); +extern void winetest_vskip( const char *msg, __winetest_va_list ap ); #ifdef __GNUC__ -extern void winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); -extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); -extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); -extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); +extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); +extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); +extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); +extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); #else /* __GNUC__ */ -extern void winetest_ok( int condition, const char *msg, ... ); -extern void winetest_skip( const char *msg, ... ); -extern void winetest_win_skip( const char *msg, ... ); -extern void winetest_trace( const char *msg, ... ); +extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ); +extern void __winetest_cdecl winetest_skip( const char *msg, ... ); +extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ); +extern void __winetest_cdecl winetest_trace( const char *msg, ... ); #endif /* __GNUC__ */ @@ -160,6 +176,14 @@ #include <stdio.h> +#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +# define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __winetest_va_end(list) __builtin_ms_va_end(list) +#else +# define __winetest_va_start(list,arg) va_start(list,arg) +# define __winetest_va_end(list) va_end(list) +#endif + struct test { const char *name; @@ -275,7 +299,7 @@ * Return: * 0 if condition does not have the expected value, 1 otherwise */ -int winetest_vok( int condition, const char *msg, va_list args ) +int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); @@ -322,30 +346,30 @@ } } -void winetest_ok( int condition, const char *msg, ... ) -{ - va_list valist; - - va_start(valist, msg); +void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) +{ + __winetest_va_list valist; + + __winetest_va_start(valist, msg); winetest_vok(condition, msg, valist); - va_end(valist); -} - -void winetest_trace( const char *msg, ... ) -{ - va_list valist; + __winetest_va_end(valist); +} + +void __winetest_cdecl winetest_trace( const char *msg, ... ) +{ + __winetest_va_list valist; tls_data* data=get_tls_data(); if (winetest_debug > 0) { fprintf( stdout, "%s:%d: ", data->current_file, data->current_line ); - va_start(valist, msg); + __winetest_va_start(valist, msg); vfprintf(stdout, msg, valist); - va_end(valist); - } -} - -void winetest_vskip( const char *msg, va_list args ) + __winetest_va_end(valist); + } +} + +void winetest_vskip( const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); @@ -354,23 +378,23 @@ skipped++; } -void winetest_skip( const char *msg, ... ) -{ - va_list valist; - va_start(valist, msg); +void __winetest_cdecl winetest_skip( const char *msg, ... ) +{ + __winetest_va_list valist; + __winetest_va_start(valist, msg); winetest_vskip(msg, valist); - va_end(valist); -} - -void winetest_win_skip( const char *msg, ... ) -{ - va_list valist; - va_start(valist, msg); + __winetest_va_end(valist); +} + +void __winetest_cdecl winetest_win_skip( const char *msg, ... ) +{ + __winetest_va_list valist; + __winetest_va_start(valist, msg); if (strcmp(winetest_platform, "windows") == 0) winetest_vskip(msg, valist); else winetest_vok(0, msg, valist); - va_end(valist); + __winetest_va_end(valist); } void winetest_start_todo( const char* platform )

1 0

[ekohl] 47936: [ADVAPI32/LSASRV] - Implement LookupPrivilegeNameW and LsaLookupPrivilegeName. - Move lookup code from LookupPrivilegeNameW and LsarLookupPrivilegeValue into a separate file.
by ekohl＠svn.reactos.org 04 Jul '10

04 Jul '10

Author: ekohl Date: Sun Jul 4 12:51:39 2010 New Revision: 47936 URL: http://svn.reactos.org/svn/reactos?rev=47936&view=rev Log: [ADVAPI32/LSASRV] - Implement LookupPrivilegeNameW and LsaLookupPrivilegeName. - Move lookup code from LookupPrivilegeNameW and LsarLookupPrivilegeValue into a separate file. Added: trunk/reactos/dll/win32/lsasrv/privileges.c (with props) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Jul 4 12:51:39 2010 @@ -69,6 +69,27 @@ return ptr; } + +static BOOL LsapIsLocalComputer(PLSA_UNICODE_STRING ServerName) +{ + DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; + BOOL Result; + LPWSTR buf; + + if (ServerName == NULL || ServerName->Length == 0 || ServerName->Buffer == NULL) + return TRUE; + + buf = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); + Result = GetComputerNameW(buf, &dwSize); + if (Result && (ServerName->Buffer[0] == '\\') && (ServerName->Buffer[1] == '\\')) + ServerName += 2; + Result = Result && !lstrcmpW(ServerName->Buffer, buf); + HeapFree(GetProcessHeap(), 0, buf); + + return Result; +} + + handle_t __RPC_USER PLSAPR_SERVER_NAME_bind(PLSAPR_SERVER_NAME pszSystemName) { @@ -397,6 +418,40 @@ } /* + * @unmplemented + */ +NTSTATUS +WINAPI +LsaLookupPrivilegeName(IN LSA_HANDLE PolicyHandle, + IN PLUID Value, + OUT PUNICODE_STRING *Name) +{ + PRPC_UNICODE_STRING NameBuffer = NULL; + NTSTATUS Status; + + TRACE("(%p,%p,%p) stub\n", PolicyHandle, Value, Name); + + RpcTryExcept + { + Status = LsarLookupPrivilegeName(PolicyHandle, + Value, + &NameBuffer); + + *Name = (PUNICODE_STRING)NameBuffer; + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + if (NameBuffer != NULL) + MIDL_user_free(NameBuffer); + + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + +/* * @implemented */ NTSTATUS @@ -408,7 +463,7 @@ LUID Luid; NTSTATUS Status; - FIXME("(%p,%p,%p) stub\n", PolicyHandle, Name, Value); + TRACE("(%p,%p,%p) stub\n", PolicyHandle, Name, Value); RpcTryExcept { @@ -510,6 +565,10 @@ TRACE("LsaOpenPolicy (%s,%p,0x%08x,%p)\n", SystemName ? debugstr_w(SystemName->Buffer) : "(null)", ObjectAttributes, DesiredAccess, PolicyHandle); + + /* FIXME: RPC should take care of this */ + if (!LsapIsLocalComputer(SystemName)) + return RPC_NT_SERVER_UNAVAILABLE; RpcTryExcept { Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sun Jul 4 12:51:39 2010 @@ -1419,11 +1419,13 @@ LPCWSTR lpPrivilegeName, PLUID lpLuid) { - LSA_OBJECT_ATTRIBUTES ObjectAttributes = {0}; - LSA_UNICODE_STRING SystemName; - LSA_UNICODE_STRING PrivilegeName; + OBJECT_ATTRIBUTES ObjectAttributes = {0}; + UNICODE_STRING SystemName; + UNICODE_STRING PrivilegeName; LSA_HANDLE PolicyHandle = NULL; NTSTATUS Status; + + TRACE("%S,%S,%p\n", lpSystemName, lpPrivilegeName, lpLuid); RtlInitUnicodeString(&SystemName, lpSystemName); @@ -1565,36 +1567,61 @@ LPWSTR lpName, LPDWORD cchName) { - size_t privNameLen; - - TRACE("%s,%p,%p,%p\n",debugstr_w(lpSystemName), lpLuid, lpName, cchName); - - if (!ADVAPI_IsLocalComputer(lpSystemName)) - { - SetLastError(RPC_S_SERVER_UNAVAILABLE); - return FALSE; - } - - if (lpLuid->HighPart || (lpLuid->LowPart < SE_MIN_WELL_KNOWN_PRIVILEGE || - lpLuid->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE)) - { - SetLastError(ERROR_NO_SUCH_PRIVILEGE); - return FALSE; - } - privNameLen = strlenW(WellKnownPrivNames[lpLuid->LowPart]); - /* Windows crashes if cchName is NULL, so will I */ - if (*cchName <= privNameLen) - { - *cchName = privNameLen + 1; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - else - { - strcpyW(lpName, WellKnownPrivNames[lpLuid->LowPart]); - *cchName = privNameLen; - return TRUE; - } + OBJECT_ATTRIBUTES ObjectAttributes = {0}; + UNICODE_STRING SystemName; + PUNICODE_STRING PrivilegeName = NULL; + LSA_HANDLE PolicyHandle = NULL; + NTSTATUS Status; + + TRACE("%S,%p,%p,%p\n", lpSystemName, lpLuid, lpName, cchName); + + RtlInitUnicodeString(&SystemName, + lpSystemName); + + Status = LsaOpenPolicy(lpSystemName ? &SystemName : NULL, + &ObjectAttributes, + POLICY_LOOKUP_NAMES, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + SetLastError(LsaNtStatusToWinError(Status)); + return FALSE; + } + + Status = LsaLookupPrivilegeName(PolicyHandle, + lpLuid, + &PrivilegeName); + if (NT_SUCCESS(Status)) + { + if (PrivilegeName->Length + sizeof(WCHAR) > (*cchName) * sizeof(WCHAR)) + { + Status = STATUS_BUFFER_TOO_SMALL; + + (*cchName) = (PrivilegeName->Length + sizeof(WCHAR)) / sizeof(WCHAR); + } + else + { + RtlMoveMemory(lpName, + PrivilegeName->Buffer, + PrivilegeName->Length); + lpName[PrivilegeName->Length / sizeof(WCHAR)] = 0; + + (*cchName) = PrivilegeName->Length / sizeof(WCHAR); + } + + LsaFreeMemory(PrivilegeName->Buffer); + LsaFreeMemory(PrivilegeName); + } + + LsaClose(PolicyHandle); + + if (!NT_SUCCESS(Status)) + { + SetLastError(LsaNtStatusToWinError(Status)); + return FALSE; + } + + return TRUE; } Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Jul 4 12:51:39 2010 @@ -6,6 +6,9 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include <string.h> + +#include "lsasrv.h" #include "lsa_s.h" #include <wine/debug.h> @@ -520,40 +523,7 @@ PRPC_UNICODE_STRING Name, PLUID Value) { - static const WCHAR * const DefaultPrivNames[] = - { - L"SeCreateTokenPrivilege", - L"SeAssignPrimaryTokenPrivilege", - L"SeLockMemoryPrivilege", - L"SeIncreaseQuotaPrivilege", - L"SeMachineAccountPrivilege", - L"SeTcbPrivilege", - L"SeSecurityPrivilege", - L"SeTakeOwnershipPrivilege", - L"SeLoadDriverPrivilege", - L"SeSystemProfilePrivilege", - L"SeSystemtimePrivilege", - L"SeProfileSingleProcessPrivilege", - L"SeIncreaseBasePriorityPrivilege", - L"SeCreatePagefilePrivilege", - L"SeCreatePermanentPrivilege", - L"SeBackupPrivilege", - L"SeRestorePrivilege", - L"SeShutdownPrivilege", - L"SeDebugPrivilege", - L"SeAuditPrivilege", - L"SeSystemEnvironmentPrivilege", - L"SeChangeNotifyPrivilege", - L"SeRemoteShutdownPrivilege", - L"SeUndockPrivilege", - L"SeSyncAgentPrivilege", - L"SeEnableDelegationPrivilege", - L"SeManageVolumePrivilege", - L"SeImpersonatePrivilege", - L"SeCreateGlobalPrivilege" - }; - ULONG Priv; - + NTSTATUS Status; TRACE("LsarLookupPrivilegeValue(%p, %wZ, %p)\n", PolicyHandle, Name, Value); @@ -564,19 +534,12 @@ return STATUS_INVALID_HANDLE; } - for (Priv = 0; Priv < sizeof(DefaultPrivNames) / sizeof(DefaultPrivNames[0]); Priv++) - { - if (0 == _wcsicmp(Name->Buffer, DefaultPrivNames[Priv])) - { - Value->LowPart = Priv + SE_MIN_WELL_KNOWN_PRIVILEGE; - Value->HighPart = 0; - return STATUS_SUCCESS; - } - } - - WARN("LsarLookupPrivilegeValue: no such privilege %wZ\n", Name); - - return STATUS_NO_SUCH_PRIVILEGE; + TRACE("Privilege: %wZ\n", Name); + + Status = LsarpLookupPrivilegeValue((PUNICODE_STRING)Name, + Value); + + return Status; } @@ -586,8 +549,20 @@ PLUID Value, PRPC_UNICODE_STRING *Name) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("LsarLookupPrivilegeName(%p, %p, %p)\n", + PolicyHandle, Value, Name); + + if (!LsapValidateDbHandle(PolicyHandle, LsaDbPolicyHandle)) + { + ERR("Invalid handle\n"); + return STATUS_INVALID_HANDLE; + } + + Status = LsarpLookupPrivilegeName(Value, (PUNICODE_STRING*)Name); + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Jul 4 12:51:39 2010 @@ -12,3 +12,12 @@ /* lsarpc.c */ VOID LsarStartRpcServer(VOID); + +/* privileges.c */ +NTSTATUS +LsarpLookupPrivilegeName(PLUID Value, + PUNICODE_STRING *Name); + +NTSTATUS +LsarpLookupPrivilegeValue(PUNICODE_STRING Name, + PLUID Value); Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Sun Jul 4 12:51:39 2010 @@ -11,5 +11,6 @@ <file>authport.c</file> <file>lsarpc.c</file> <file>lsasrv.c</file> + <file>privileges.c</file> <file>lsasrv.rc</file> </module> Added: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c (added) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Sun Jul 4 12:51:39 2010 @@ -1,0 +1,197 @@ +#define WIN32_NO_STATUS +#include <windows.h> +#include <ntsecapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +#include <wchar.h> +#include <string.h> + + +#include <wine/debug.h> + + +static const WCHAR SE_CREATE_TOKEN_NAME_W[] = + { 'S','e','C','r','e','a','t','e','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_ASSIGNPRIMARYTOKEN_NAME_W[] = + { 'S','e','A','s','s','i','g','n','P','r','i','m','a','r','y','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_LOCK_MEMORY_NAME_W[] = + { 'S','e','L','o','c','k','M','e','m','o','r','y','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_INCREASE_QUOTA_NAME_W[] = + { 'S','e','I','n','c','r','e','a','s','e','Q','u','o','t','a','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_MACHINE_ACCOUNT_NAME_W[] = + { 'S','e','M','a','c','h','i','n','e','A','c','c','o','u','n','t','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_TCB_NAME_W[] = + { 'S','e','T','c','b','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_SECURITY_NAME_W[] = + { 'S','e','S','e','c','u','r','i','t','y','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_TAKE_OWNERSHIP_NAME_W[] = + { 'S','e','T','a','k','e','O','w','n','e','r','s','h','i','p','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_LOAD_DRIVER_NAME_W[] = + { 'S','e','L','o','a','d','D','r','i','v','e','r','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_SYSTEM_PROFILE_NAME_W[] = + { 'S','e','S','y','s','t','e','m','P','r','o','f','i','l','e','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_SYSTEMTIME_NAME_W[] = + { 'S','e','S','y','s','t','e','m','t','i','m','e','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_PROF_SINGLE_PROCESS_NAME_W[] = + { 'S','e','P','r','o','f','i','l','e','S','i','n','g','l','e','P','r','o','c','e','s','s','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_INC_BASE_PRIORITY_NAME_W[] = + { 'S','e','I','n','c','r','e','a','s','e','B','a','s','e','P','r','i','o','r','i','t','y','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_CREATE_PAGEFILE_NAME_W[] = + { 'S','e','C','r','e','a','t','e','P','a','g','e','f','i','l','e','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_CREATE_PERMANENT_NAME_W[] = + { 'S','e','C','r','e','a','t','e','P','e','r','m','a','n','e','n','t','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_BACKUP_NAME_W[] = + { 'S','e','B','a','c','k','u','p','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_RESTORE_NAME_W[] = + { 'S','e','R','e','s','t','o','r','e','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_SHUTDOWN_NAME_W[] = + { 'S','e','S','h','u','t','d','o','w','n','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_DEBUG_NAME_W[] = + { 'S','e','D','e','b','u','g','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_AUDIT_NAME_W[] = + { 'S','e','A','u','d','i','t','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_SYSTEM_ENVIRONMENT_NAME_W[] = + { 'S','e','S','y','s','t','e','m','E','n','v','i','r','o','n','m','e','n','t','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_CHANGE_NOTIFY_NAME_W[] = + { 'S','e','C','h','a','n','g','e','N','o','t','i','f','y','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_REMOTE_SHUTDOWN_NAME_W[] = + { 'S','e','R','e','m','o','t','e','S','h','u','t','d','o','w','n','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_UNDOCK_NAME_W[] = + { 'S','e','U','n','d','o','c','k','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_SYNC_AGENT_NAME_W[] = + { 'S','e','S','y','n','c','A','g','e','n','t','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_ENABLE_DELEGATION_NAME_W[] = + { 'S','e','E','n','a','b','l','e','D','e','l','e','g','a','t','i','o','n','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_MANAGE_VOLUME_NAME_W[] = + { 'S','e','M','a','n','a','g','e','V','o','l','u','m','e','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_IMPERSONATE_NAME_W[] = + { 'S','e','I','m','p','e','r','s','o','n','a','t','e','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_CREATE_GLOBAL_NAME_W[] = + { 'S','e','C','r','e','a','t','e','G','l','o','b','a','l','P','r','i','v','i','l','e','g','e',0 }; + +static const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1] = +{ + NULL, + NULL, + SE_CREATE_TOKEN_NAME_W, + SE_ASSIGNPRIMARYTOKEN_NAME_W, + SE_LOCK_MEMORY_NAME_W, + SE_INCREASE_QUOTA_NAME_W, + SE_MACHINE_ACCOUNT_NAME_W, + SE_TCB_NAME_W, + SE_SECURITY_NAME_W, + SE_TAKE_OWNERSHIP_NAME_W, + SE_LOAD_DRIVER_NAME_W, + SE_SYSTEM_PROFILE_NAME_W, + SE_SYSTEMTIME_NAME_W, + SE_PROF_SINGLE_PROCESS_NAME_W, + SE_INC_BASE_PRIORITY_NAME_W, + SE_CREATE_PAGEFILE_NAME_W, + SE_CREATE_PERMANENT_NAME_W, + SE_BACKUP_NAME_W, + SE_RESTORE_NAME_W, + SE_SHUTDOWN_NAME_W, + SE_DEBUG_NAME_W, + SE_AUDIT_NAME_W, + SE_SYSTEM_ENVIRONMENT_NAME_W, + SE_CHANGE_NOTIFY_NAME_W, + SE_REMOTE_SHUTDOWN_NAME_W, + SE_UNDOCK_NAME_W, + SE_SYNC_AGENT_NAME_W, + SE_ENABLE_DELEGATION_NAME_W, + SE_MANAGE_VOLUME_NAME_W, + SE_IMPERSONATE_NAME_W, + SE_CREATE_GLOBAL_NAME_W, +}; + +static const WCHAR * const DefaultPrivNames[] = +{ + L"SeCreateTokenPrivilege", + L"SeAssignPrimaryTokenPrivilege", + L"SeLockMemoryPrivilege", + L"SeIncreaseQuotaPrivilege", + L"SeMachineAccountPrivilege", + L"SeTcbPrivilege", + L"SeSecurityPrivilege", + L"SeTakeOwnershipPrivilege", + L"SeLoadDriverPrivilege", + L"SeSystemProfilePrivilege", + L"SeSystemtimePrivilege", + L"SeProfileSingleProcessPrivilege", + L"SeIncreaseBasePriorityPrivilege", + L"SeCreatePagefilePrivilege", + L"SeCreatePermanentPrivilege", + L"SeBackupPrivilege", + L"SeRestorePrivilege", + L"SeShutdownPrivilege", + L"SeDebugPrivilege", + L"SeAuditPrivilege", + L"SeSystemEnvironmentPrivilege", + L"SeChangeNotifyPrivilege", + L"SeRemoteShutdownPrivilege", + L"SeUndockPrivilege", + L"SeSyncAgentPrivilege", + L"SeEnableDelegationPrivilege", + L"SeManageVolumePrivilege", + L"SeImpersonatePrivilege", + L"SeCreateGlobalPrivilege" +}; + + +NTSTATUS +LsarpLookupPrivilegeName(PLUID Value, + PUNICODE_STRING *Name) +{ + PUNICODE_STRING NameBuffer; + + if (Value->HighPart || + (Value->LowPart < SE_MIN_WELL_KNOWN_PRIVILEGE || + Value->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE)) + { + return STATUS_NO_SUCH_PRIVILEGE; + } + + NameBuffer = MIDL_user_allocate(sizeof(UNICODE_STRING)); + if (NameBuffer == NULL) + return STATUS_NO_MEMORY; + + NameBuffer->Length = wcslen(WellKnownPrivNames[Value->LowPart]) * sizeof(WCHAR); + NameBuffer->MaximumLength = NameBuffer->Length + sizeof(WCHAR); + + NameBuffer->Buffer = MIDL_user_allocate(NameBuffer->MaximumLength); + if (NameBuffer == NULL) + { + MIDL_user_free(NameBuffer); + return STATUS_NO_MEMORY; + } + + wcscpy(NameBuffer->Buffer, WellKnownPrivNames[Value->LowPart]); + + *Name = NameBuffer; + + return STATUS_SUCCESS; +} + + +NTSTATUS +LsarpLookupPrivilegeValue(PUNICODE_STRING Name, + PLUID Value) +{ + ULONG Priv; + + if (Name->Length == 0 || Name->Buffer == NULL) + return STATUS_NO_SUCH_PRIVILEGE; + + for (Priv = 0; Priv < sizeof(DefaultPrivNames) / sizeof(DefaultPrivNames[0]); Priv++) + { + if (0 == _wcsicmp(Name->Buffer, DefaultPrivNames[Priv])) + { + Value->LowPart = Priv + SE_MIN_WELL_KNOWN_PRIVILEGE; + Value->HighPart = 0; + return STATUS_SUCCESS; + } + } + + return STATUS_NO_SUCH_PRIVILEGE; +} Propchange: trunk/reactos/dll/win32/lsasrv/privileges.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/lsasrv/privileges.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sun Jul 4 12:51:39 2010 @@ -698,6 +698,7 @@ PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID*); NTSTATUS NTAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); +NTSTATUS NTAPI LsaLookupPrivilegeName(LSA_HANDLE, PLUID, PLSA_UNICODE_STRING*); NTSTATUS NTAPI LsaLookupPrivilegeValue(LSA_HANDLE, PLSA_UNICODE_STRING, PLUID); NTSTATUS NTAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID*, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_NAME*);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010