Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 33826: - Add more languages - Add scrolling to position in languages list
by dchapyshev＠svn.reactos.org 02 Jun '08

02 Jun '08

Author: dchapyshev Date: Mon Jun 2 10:34:57 2008 New Revision: 33826 URL: http://svn.reactos.org/svn/reactos?rev=33826&view=rev Log: - Add more languages - Add scrolling to position in languages list Added: trunk/reactos/base/setup/usetup/lang/af-ZA.h (with props) trunk/reactos/base/setup/usetup/lang/ar-AE.h (with props) trunk/reactos/base/setup/usetup/lang/ar-BH.h (with props) trunk/reactos/base/setup/usetup/lang/ar-JO.h (with props) trunk/reactos/base/setup/usetup/lang/ar-KW.h (with props) trunk/reactos/base/setup/usetup/lang/ar-LB.h (with props) trunk/reactos/base/setup/usetup/lang/ar-MA.h (with props) trunk/reactos/base/setup/usetup/lang/ar-OM.h (with props) trunk/reactos/base/setup/usetup/lang/ar-QA.h (with props) trunk/reactos/base/setup/usetup/lang/ar-SY.h (with props) trunk/reactos/base/setup/usetup/lang/ar-TN.h (with props) trunk/reactos/base/setup/usetup/lang/ar-YE.h (with props) trunk/reactos/base/setup/usetup/lang/de-AT.h (with props) trunk/reactos/base/setup/usetup/lang/de-LI.h (with props) trunk/reactos/base/setup/usetup/lang/de-LU.h (with props) trunk/reactos/base/setup/usetup/lang/dv-MV.h (with props) trunk/reactos/base/setup/usetup/lang/eu-ES.h (with props) trunk/reactos/base/setup/usetup/lang/fa-IR.h (with props) trunk/reactos/base/setup/usetup/lang/fo-FO.h (with props) trunk/reactos/base/setup/usetup/lang/fr-CH.h (with props) trunk/reactos/base/setup/usetup/lang/fr-LU.h (with props) trunk/reactos/base/setup/usetup/lang/fr-MC.h (with props) trunk/reactos/base/setup/usetup/lang/gl-ES.h (with props) trunk/reactos/base/setup/usetup/lang/gu-IN.h (with props) trunk/reactos/base/setup/usetup/lang/hi-IN.h (with props) trunk/reactos/base/setup/usetup/lang/hr-HR.h (with props) trunk/reactos/base/setup/usetup/lang/id-ID.h (with props) trunk/reactos/base/setup/usetup/lang/it-CH.h (with props) trunk/reactos/base/setup/usetup/lang/kn-IN.h (with props) trunk/reactos/base/setup/usetup/lang/kok-IN.h (with props) trunk/reactos/base/setup/usetup/lang/ky-KG.h (with props) trunk/reactos/base/setup/usetup/lang/mn-MN.h (with props) trunk/reactos/base/setup/usetup/lang/mr-IN.h (with props) trunk/reactos/base/setup/usetup/lang/ms-BN.h (with props) trunk/reactos/base/setup/usetup/lang/ms-MY.h (with props) trunk/reactos/base/setup/usetup/lang/pa-IN.h (with props) trunk/reactos/base/setup/usetup/lang/sa-IN.h (with props) trunk/reactos/base/setup/usetup/lang/sl-SI.h (with props) trunk/reactos/base/setup/usetup/lang/sv-FI.h (with props) trunk/reactos/base/setup/usetup/lang/sw-KE.h (with props) trunk/reactos/base/setup/usetup/lang/syr-SY.h (with props) trunk/reactos/base/setup/usetup/lang/ta-IN.h (with props) trunk/reactos/base/setup/usetup/lang/te-IN.h (with props) trunk/reactos/base/setup/usetup/lang/ur-PK.h (with props) trunk/reactos/base/setup/usetup/lang/zh-MO.h (with props) Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/genlist.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/base/setup/usetup/settings.c trunk/reactos/base/setup/usetup/settings.h Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -423,6 +423,39 @@ VOID +ScrollToPositionGenericList (PGENERIC_LIST List, ULONG uIndex) +{ + PLIST_ENTRY Entry; + ULONG uCount = 0; + + if (List->CurrentEntry == NULL) + return; + + do + { + if (List->CurrentEntry->Entry.Flink != &List->ListHead) + { + Entry = List->CurrentEntry->Entry.Flink; + if (List->LastShown == &List->CurrentEntry->Entry) + { + List->FirstShown = List->FirstShown->Flink; + List->LastShown = List->LastShown->Flink; + } + List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + } + uCount++; + } + while (uIndex != uCount); + + if (List->Redraw) + { + DrawListEntries(List); + DrawScrollBarGenericList(List); + } +} + + +VOID ScrollUpGenericList (PGENERIC_LIST List) { PLIST_ENTRY Entry; Modified: trunk/reactos/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -68,6 +68,9 @@ ScrollPageUpGenericList(PGENERIC_LIST List); VOID +ScrollToPositionGenericList (PGENERIC_LIST List, ULONG uIndex); + +VOID SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry); PGENERIC_LIST_ENTRY Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -612,6 +612,8 @@ xScreen - 3, yScreen - 3); + ScrollToPositionGenericList (LanguageList, GetDefaultLanguageIndex()); + MUIDisplayPage(LANGUAGE_PAGE); while(TRUE) Added: trunk/reactos/base/setup/usetup/lang/af-ZA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/af-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/af-ZA.h (added) +++ trunk/reactos/base/setup/usetup/lang/af-ZA.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AF_ZA_H__ +#define LANG_AF_ZA_H__ + +MUI_LAYOUTS afZALayouts[] = +{ + { L"0436", L"00000409" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/af-ZA.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-AE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-AE.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-AE.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_AE_H__ +#define LANG_AR_AE_H__ + +MUI_LAYOUTS arAELayouts[] = +{ + { L"0409", L"00000409" }, + { L"3801", L"00000401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-AE.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-BH.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-BH.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-BH.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_BH_H__ +#define LANG_AR_BH_H__ + +MUI_LAYOUTS arBHLayouts[] = +{ + { L"0409", L"00000409" }, + { L"3C01", L"00000401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-BH.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-JO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-JO.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-JO.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_JO_H__ +#define LANG_AR_JO_H__ + +MUI_LAYOUTS arJOLayouts[] = +{ + { L"0409", L"00000409" }, + { L"2C01", L"00000401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-JO.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-KW.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-KW.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-KW.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_KW_H__ +#define LANG_AR_KW_H__ + +MUI_LAYOUTS arKWLayouts[] = +{ + { L"0409", L"00000409" }, + { L"3401", L"00000401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-KW.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-LB.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-LB.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-LB.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_LB_H__ +#define LANG_AR_LB_H__ + +MUI_LAYOUTS arLBLayouts[] = +{ + { L"0409", L"00000409" }, + { L"3001", L"00000401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-LB.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-MA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-MA.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-MA.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_MA_H__ +#define LANG_AR_MA_H__ + +MUI_LAYOUTS arMALayouts[] = +{ + { L"040C", L"0000040C" }, + { L"1801", L"00020401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-MA.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-OM.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-OM.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-OM.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_OM_H__ +#define LANG_AR_OM_H__ + +MUI_LAYOUTS arOMLayouts[] = +{ + { L"0409", L"00000409" }, + { L"2001", L"00000401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-OM.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-QA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-QA.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-QA.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_QA_H__ +#define LANG_AR_QA_H__ + +MUI_LAYOUTS arQALayouts[] = +{ + { L"0409", L"00000409" }, + { L"4001", L"00000401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-QA.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-SY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-SY.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-SY.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_SY_H__ +#define LANG_AR_SY_H__ + +MUI_LAYOUTS arSYLayouts[] = +{ + { L"0409", L"00000409" }, + { L"2801", L"00000401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-SY.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-TN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-TN.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-TN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_TN_H__ +#define LANG_AR_TN_H__ + +MUI_LAYOUTS arTNLayouts[] = +{ + { L"040C", L"0000040C" }, + { L"1C01", L"00020401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-TN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ar-YE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ar-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ar-YE.h (added) +++ trunk/reactos/base/setup/usetup/lang/ar-YE.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_AR_YE_H__ +#define LANG_AR_YE_H__ + +MUI_LAYOUTS arYELayouts[] = +{ + { L"0409", L"00000409" }, + { L"2401", L"00000401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ar-YE.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/de-AT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-AT.h (added) +++ trunk/reactos/base/setup/usetup/lang/de-AT.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_DE_AT_H__ +#define LANG_DE_AT_H__ + +MUI_LAYOUTS deATLayouts[] = +{ + { L"0C07", L"00000407" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/de-AT.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/de-LI.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-LI.h (added) +++ trunk/reactos/base/setup/usetup/lang/de-LI.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_DE_LI_H__ +#define LANG_DE_LI_H__ + +MUI_LAYOUTS deLILayouts[] = +{ + { L"1407", L"00000407" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/de-LI.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/de-LU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-LU.h (added) +++ trunk/reactos/base/setup/usetup/lang/de-LU.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_DE_LU_H__ +#define LANG_DE_LU_H__ + +MUI_LAYOUTS deLULayouts[] = +{ + { L"1007", L"00000407" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/de-LU.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/dv-MV.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/dv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/dv-MV.h (added) +++ trunk/reactos/base/setup/usetup/lang/dv-MV.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_DV_MV_H__ +#define LANG_DV_MV_H__ + +MUI_LAYOUTS dvMVLayouts[] = +{ + { L"0409", L"00000409" }, + { L"0465", L"00000465" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/dv-MV.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/eu-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/eu-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/eu-ES.h (added) +++ trunk/reactos/base/setup/usetup/lang/eu-ES.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_EU_ES_H__ +#define LANG_EU_ES_H__ + +MUI_LAYOUTS euESLayouts[] = +{ + { L"042D", L"0000040A" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/eu-ES.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/fa-IR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fa-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fa-IR.h (added) +++ trunk/reactos/base/setup/usetup/lang/fa-IR.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,12 @@ +#ifndef LANG_FA_IR_H__ +#define LANG_FA_IR_H__ + +MUI_LAYOUTS faIRLayouts[] = +{ + { L"0409", L"00000409" }, + { L"0429", L"00000429" }, + { L"0429", L"00000401" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/fa-IR.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/fo-FO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fo-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fo-FO.h (added) +++ trunk/reactos/base/setup/usetup/lang/fo-FO.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_FO_FO_H__ +#define LANG_FO_FO_H__ + +MUI_LAYOUTS foFOLayouts[] = +{ + { L"0438", L"00000406" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/fo-FO.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/fr-CH.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-CH.h (added) +++ trunk/reactos/base/setup/usetup/lang/fr-CH.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_FR_CH_H__ +#define LANG_FR_CH_H__ + +MUI_LAYOUTS frCHLayouts[] = +{ + { L"100C", L"0000100C" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/fr-CH.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/fr-LU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-LU.h (added) +++ trunk/reactos/base/setup/usetup/lang/fr-LU.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_FR_LU_H__ +#define LANG_FR_LU_H__ + +MUI_LAYOUTS frLULayouts[] = +{ + { L"140C", L"0000040C" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/fr-LU.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/fr-MC.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-MC.h (added) +++ trunk/reactos/base/setup/usetup/lang/fr-MC.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_FR_MC_H__ +#define LANG_FR_MC_H__ + +MUI_LAYOUTS frMCLayouts[] = +{ + { L"180C", L"0000040C" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/fr-MC.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/gl-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/gl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/gl-ES.h (added) +++ trunk/reactos/base/setup/usetup/lang/gl-ES.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_GL_ES_H__ +#define LANG_GL_ES_H__ + +MUI_LAYOUTS glESLayouts[] = +{ + { L"0456", L"0000040A" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/gl-ES.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/gu-IN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/gu-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/gu-IN.h (added) +++ trunk/reactos/base/setup/usetup/lang/gu-IN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,12 @@ +#ifndef LANG_GU_IN_H__ +#define LANG_GU_IN_H__ + +MUI_LAYOUTS guINLayouts[] = +{ + { L"0409", L"00000409" }, + { L"0447", L"00000447" }, + { L"0439", L"00000439" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/gu-IN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/hi-IN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/hi-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/hi-IN.h (added) +++ trunk/reactos/base/setup/usetup/lang/hi-IN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,12 @@ +#ifndef LANG_HI_IN_H__ +#define LANG_HI_IN_H__ + +MUI_LAYOUTS hiINLayouts[] = +{ + { L"0409", L"00000409" }, + { L"0439", L"00010439" }, + { L"0439", L"00000439" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/hi-IN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/hr-HR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/hr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/hr-HR.h (added) +++ trunk/reactos/base/setup/usetup/lang/hr-HR.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_HR_HR_H__ +#define LANG_HR_HR_H__ + +MUI_LAYOUTS hrHRLayouts[] = +{ + { L"041A", L"0000041A" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/hr-HR.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/id-ID.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/id-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/id-ID.h (added) +++ trunk/reactos/base/setup/usetup/lang/id-ID.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_ID_ID_H__ +#define LANG_ID_ID_H__ + +MUI_LAYOUTS idIDLayouts[] = +{ + { L"0421", L"00000409" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/id-ID.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/it-CH.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-CH.h (added) +++ trunk/reactos/base/setup/usetup/lang/it-CH.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_IT_CH_H__ +#define LANG_IT_CH_H__ + +MUI_LAYOUTS itCHLayouts[] = +{ + { L"0810", L"00000410" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/it-CH.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/kn-IN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/kn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/kn-IN.h (added) +++ trunk/reactos/base/setup/usetup/lang/kn-IN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,12 @@ +#ifndef LANG_KN_IN_H__ +#define LANG_KN_IN_H__ + +MUI_LAYOUTS knINLayouts[] = +{ + { L"0409", L"00000409" }, + { L"044B", L"0000044B" }, + { L"0439", L"00010439" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/kn-IN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/kok-IN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/kok… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/kok-IN.h (added) +++ trunk/reactos/base/setup/usetup/lang/kok-IN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_KOK_IN_H__ +#define LANG_KOK_IN_H__ + +MUI_LAYOUTS kokINLayouts[] = +{ + { L"0409", L"00000409" }, + { L"0457", L"00000439" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/kok-IN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ky-KG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ky-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ky-KG.h (added) +++ trunk/reactos/base/setup/usetup/lang/ky-KG.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_KY_KG_H__ +#define LANG_KY_KG_H__ + +MUI_LAYOUTS kyKGLayouts[] = +{ + { L"0440", L"00000440" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ky-KG.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/mn-MN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/mn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/mn-MN.h (added) +++ trunk/reactos/base/setup/usetup/lang/mn-MN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_MN_MN_H__ +#define LANG_MN_MN_H__ + +MUI_LAYOUTS mnMNLayouts[] = +{ + { L"0450", L"00000450" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/mn-MN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/mr-IN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/mr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/mr-IN.h (added) +++ trunk/reactos/base/setup/usetup/lang/mr-IN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,12 @@ +#ifndef LANG_MR_IN_H__ +#define LANG_MR_IN_H__ + +MUI_LAYOUTS mrINLayouts[] = +{ + { L"0409", L"00000409" }, + { L"044E", L"0000044E" }, + { L"044E", L"00000439" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/mr-IN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ms-BN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ms-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ms-BN.h (added) +++ trunk/reactos/base/setup/usetup/lang/ms-BN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,10 @@ +#ifndef LANG_MS_BN_H__ +#define LANG_MS_BN_H__ + +MUI_LAYOUTS msBNLayouts[] = +{ + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ms-BN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ms-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ms-MY.h (added) +++ trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,10 @@ +#ifndef LANG_MS_MY_H__ +#define LANG_MS_MY_H__ + +MUI_LAYOUTS msMYLayouts[] = +{ + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ms-MY.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/pa-IN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pa-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pa-IN.h (added) +++ trunk/reactos/base/setup/usetup/lang/pa-IN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,12 @@ +#ifndef LANG_PA_IN_H__ +#define LANG_PA_IN_H__ + +MUI_LAYOUTS paINLayouts[] = +{ + { L"0409", L"00000409" }, + { L"0446", L"00000446" }, + { L"0439", L"00010439" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/pa-IN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/sa-IN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sa-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sa-IN.h (added) +++ trunk/reactos/base/setup/usetup/lang/sa-IN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_SA_IN_H__ +#define LANG_SA_IN_H__ + +MUI_LAYOUTS saINLayouts[] = +{ + { L"0409", L"00000409" }, + { L"044F", L"00000439" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/sa-IN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/sl-SI.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sl-SI.h (added) +++ trunk/reactos/base/setup/usetup/lang/sl-SI.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_SL_SI_H__ +#define LANG_SL_SI_H__ + +MUI_LAYOUTS slSILayouts[] = +{ + { L"0424", L"00000424" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/sl-SI.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/sv-FI.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-FI.h (added) +++ trunk/reactos/base/setup/usetup/lang/sv-FI.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_SV_FI_H__ +#define LANG_SV_FI_H__ + +MUI_LAYOUTS svFILayouts[] = +{ + { L"081D", L"0000041D" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/sv-FI.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/sw-KE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sw-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sw-KE.h (added) +++ trunk/reactos/base/setup/usetup/lang/sw-KE.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,10 @@ +#ifndef LANG_SW_KE_H__ +#define LANG_SW_KE_H__ + +MUI_LAYOUTS swKELayouts[] = +{ + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/sw-KE.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/syr-SY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/syr… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/syr-SY.h (added) +++ trunk/reactos/base/setup/usetup/lang/syr-SY.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_SYR_SY_H__ +#define LANG_SYR_SY_H__ + +MUI_LAYOUTS syrSYLayouts[] = +{ + { L"0409", L"00000409" }, + { L"045A", L"0000045A" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/syr-SY.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ta-IN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ta-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ta-IN.h (added) +++ trunk/reactos/base/setup/usetup/lang/ta-IN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_TA_IN_H__ +#define LANG_TA_IN_H__ + +MUI_LAYOUTS taINLayouts[] = +{ + { L"0409", L"00000409" }, + { L"0449", L"00000449" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ta-IN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/te-IN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/te-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/te-IN.h (added) +++ trunk/reactos/base/setup/usetup/lang/te-IN.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,12 @@ +#ifndef LANG_TE_IN_H__ +#define LANG_TE_IN_H__ + +MUI_LAYOUTS teINLayouts[] = +{ + { L"0409", L"00000409" }, + { L"044A", L"0000044A" }, + { L"0439", L"00010439" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/te-IN.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/ur-PK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ur-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ur-PK.h (added) +++ trunk/reactos/base/setup/usetup/lang/ur-PK.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_UR_PK_H__ +#define LANG_UR_PK_H__ + +MUI_LAYOUTS urPKLayouts[] = +{ + { L"0420", L"00000420" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/ur-PK.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/zh-MO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/zh-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/zh-MO.h (added) +++ trunk/reactos/base/setup/usetup/lang/zh-MO.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,0 +1,13 @@ +#ifndef LANG_ZH_MO_H__ +#define LANG_ZH_MO_H__ + +MUI_LAYOUTS zhMOLayouts[] = +{ + { L"0409", L"00000409" }, + { L"0804", L"E00E0804" }, + { L"0404", L"E0020404" }, + { L"0404", L"E0080404" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/zh-MO.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -1,19 +1,35 @@ #ifndef LANG_MUI_LANGUAGES_H__ #define LANG_MUI_LANGUAGES_H__ +#include "lang/af-ZA.h" +#include "lang/ar-AE.h" +#include "lang/ar-BH.h" #include "lang/ar-DZ.h" #include "lang/ar-EG.h" #include "lang/ar-IQ.h" +#include "lang/ar-JO.h" +#include "lang/ar-KW.h" +#include "lang/ar-LB.h" #include "lang/ar-LY.h" +#include "lang/ar-MA.h" +#include "lang/ar-OM.h" +#include "lang/ar-QA.h" #include "lang/ar-SA.h" +#include "lang/ar-SY.h" +#include "lang/ar-TN.h" +#include "lang/ar-YE.h" #include "lang/az-AZ.h" #include "lang/be-BY.h" #include "lang/bg-BG.h" #include "lang/ca-ES.h" #include "lang/cs-CZ.h" #include "lang/da-DK.h" +#include "lang/de-AT.h" #include "lang/de-CH.h" #include "lang/de-DE.h" +#include "lang/de-LI.h" +#include "lang/de-LU.h" +#include "lang/dv-MV.h" #include "lang/el-GR.h" #include "lang/en-AU.h" #include "lang/en-BZ.h" @@ -48,57 +64,99 @@ #include "lang/es-UY.h" #include "lang/es-VE.h" #include "lang/et-EE.h" +#include "lang/eu-ES.h" +#include "lang/fa-IR.h" #include "lang/fi-FI.h" +#include "lang/fo-FO.h" #include "lang/fr-BE.h" #include "lang/fr-CA.h" +#include "lang/fr-CH.h" #include "lang/fr-FR.h" +#include "lang/fr-LU.h" +#include "lang/fr-MC.h" +#include "lang/gl-ES.h" +#include "lang/gu-IN.h" #include "lang/he-IL.h" +#include "lang/hi-IN.h" +#include "lang/hr-HR.h" #include "lang/hu-HU.h" #include "lang/hy-AM.h" +#include "lang/id-ID.h" #include "lang/is-IS.h" +#include "lang/it-CH.h" #include "lang/it-IT.h" #include "lang/ja-JP.h" #include "lang/ka-GE.h" #include "lang/kk-KZ.h" +#include "lang/kn-IN.h" +#include "lang/kok-IN.h" #include "lang/ko-KR.h" +#include "lang/ky-KG.h" #include "lang/lt-LT.h" #include "lang/lv-LV.h" #include "lang/mk-MK.h" +#include "lang/mn-MN.h" +#include "lang/mr-IN.h" +#include "lang/ms-BN.h" +#include "lang/ms-MY.h" #include "lang/nl-BE.h" #include "lang/nl-NL.h" #include "lang/nn-NO.h" +#include "lang/pa-IN.h" #include "lang/pl-PL.h" #include "lang/pt-BR.h" #include "lang/pt-PT.h" #include "lang/ro-RO.h" #include "lang/ru-RU.h" +#include "lang/sa-IN.h" #include "lang/sk-SK.h" +#include "lang/sl-SI.h" #include "lang/sq-AL.h" #include "lang/sr-SP.h" +#include "lang/sv-FI.h" #include "lang/sv-SE.h" +#include "lang/sw-KE.h" +#include "lang/syr-SY.h" +#include "lang/ta-IN.h" +#include "lang/te-IN.h" #include "lang/th-TH.h" #include "lang/tr-TR.h" #include "lang/tt-TA.h" #include "lang/uk-UA.h" +#include "lang/ur-PK.h" #include "lang/uz-UZ.h" #include "lang/vi-VN.h" #include "lang/zh-CN.h" #include "lang/zh-HK.h" +#include "lang/zh-MO.h" #include "lang/zh-SG.h" #include "lang/zh-TW.h" const MUI_LANGUAGE LanguageList[] = { /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings, fonts, kb layouts */ + {L"00000436", L"1252", L"850", L"10000", L"Afrikaans", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, afZALayouts }, {L"0000041C", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts, sqALLayouts }, {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arSALayouts }, {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arIQLayouts }, {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arEGLayouts }, {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arLYLayouts }, {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arDZLayouts }, + {L"00001801", L"1256", L"720", L"10004", L"Arabic (Morocco)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arMALayouts }, + {L"00001C01", L"1256", L"720", L"10004", L"Arabic (Tunisia)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arTNLayouts }, + {L"00002001", L"1256", L"720", L"10004", L"Arabic (Oman)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arOMLayouts }, + {L"00002401", L"1256", L"720", L"10004", L"Arabic (Yemen)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arYELayouts }, + {L"00002801", L"1256", L"720", L"10004", L"Arabic (Syria)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arSYLayouts }, + {L"00002C01", L"1256", L"720", L"10004", L"Arabic (Jordan)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arJOLayouts }, + {L"00003001", L"1256", L"720", L"10004", L"Arabic (Lebanon)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arLBLayouts }, + {L"00003401", L"1256", L"720", L"10004", L"Arabic (Kuwait)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arKWLayouts }, + {L"00003801", L"1256", L"720", L"10004", L"Arabic (U.A.E.)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arAELayouts }, + {L"00003C01", L"1256", L"720", L"10004", L"Arabic (Bahrain)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arBHLayouts }, + {L"00004001", L"1256", L"720", L"10004", L"Arabic (Qatar)", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, arQALayouts }, {L"0000042B", L"0", L"1", L"2", L"Armenian", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,hyAMLayouts }, {L"0000082C", L"1251", L"866", L"10007", L"Azeri (Cyrillic)", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, azAZLayouts }, {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", enUSPages, enUSErrorEntries, enUSStrings, CP1254Fonts, azAZLayouts }, + {L"0000042D", L"1252", L"850", L"10000", L"Basque", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, euESLayouts }, {L"00000423", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, beBYLayouts }, {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings, CP1251Fonts, bgBGLayouts }, {L"00000455", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,enUSLayouts }, @@ -107,8 +165,11 @@ {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings, CP936Fonts, zhCNLayouts }, {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", enUSPages, enUSErrorEntries, enUSStrings, CP950Fonts, zhHKLayouts }, {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", enUSPages, enUSErrorEntries, enUSStrings, CP936Fonts, zhSGLayouts }, + {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", enUSPages, enUSErrorEntries, enUSStrings, CP950Fonts, zhMOLayouts }, + {L"0000041A", L"1250", L"852", L"10029", L"Croatian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts, hrHRLayouts }, {L"00000405", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings, CP1250Fonts, csCZLayouts }, {L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, daDKLayouts }, + {L"00000465", L"0", L"1", L"2", L"Divehi (Maldives)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,dvMVLayouts }, {L"00000413", L"1252", L"850", L"10000", L"Dutch (Netherlands)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, nlNLLayouts }, {L"00000813", L"1252", L"850", L"10000", L"Dutch (Belgium)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, nlBELayouts }, {L"00000409", L"1252", L"437", L"10000", L"English (United States)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, @@ -125,33 +186,57 @@ {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enZWLayouts }, {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enPHLayouts }, {L"00000425", L"1257", L"775", L"10029", L"Estonian", enUSPages, enUSErrorEntries, enUSStrings, CP1257Fonts, etEELayouts }, + {L"00000438", L"1252", L"850", L"10079", L"Faeroese", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, foFOLayouts }, + {L"00000429", L"1256", L"720", L"10004", L"Farsi", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, faIRLayouts }, {L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, fiFILayouts }, {L"00000C0C", L"1252", L"850", L"10000", L"French (Canada)", frFRPages, frFRErrorEntries, frFRStrings, CP1252Fonts, frCALayouts }, {L"0000040C", L"1252", L"850", L"10000", L"French (France)", frFRPages, frFRErrorEntries, frFRStrings, CP1252Fonts, frFRLayouts }, {L"0000080C", L"1252", L"850", L"10000", L"French (Belgium)", frFRPages, frFRErrorEntries, frFRStrings, CP1252Fonts, frBELayouts }, + {L"0000100C", L"1252", L"850", L"10000", L"French (Switzerland)", frFRPages, frFRErrorEntries, frFRStrings, CP1252Fonts, frCHLayouts }, + {L"0000140C", L"1252", L"850", L"10000", L"French (Luxembourg)", frFRPages, frFRErrorEntries, frFRStrings, CP1252Fonts, frLULayouts }, + {L"0000180C", L"1252", L"850", L"10000", L"French (Monaco)", frFRPages, frFRErrorEntries, frFRStrings, CP1252Fonts, frMCLayouts }, + {L"00000456", L"1252", L"850", L"10000", L"Galician (Spain)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, glESLayouts }, {L"00000437", L"0", L"1", L"2", L"Georgian", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,kaGELayouts }, {L"00000407", L"1252", L"850", L"10000", L"German (Germany)", deDEPages, deDEErrorEntries, deDEStrings, CP1252Fonts, deDELayouts }, {L"00000807", L"1252", L"850", L"10000", L"German (Switzerland)", deDEPages, deDEErrorEntries, deDEStrings, CP1252Fonts, deCHLayouts }, + {L"00000C07", L"1252", L"850", L"10000", L"German (Austria)", deDEPages, deDEErrorEntries, deDEStrings, CP1252Fonts, deATLayouts }, + {L"00001007", L"1252", L"850", L"10000", L"German (Luxembourg)", deDEPages, deDEErrorEntries, deDEStrings, CP1252Fonts, deLULayouts }, + {L"00001407", L"1252", L"850", L"10000", L"German (Liechtenstein)", deDEPages, deDEErrorEntries, deDEStrings, CP1252Fonts, deLILayouts }, {L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings, CP1253Fonts, elGRLayouts }, + {L"00000447", L"0", L"1", L"2", L"Gujarati (India)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,guINLayouts }, {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings, CP1255Fonts, heILLayouts }, + {L"00000439", L"1252", L"437", L"10000", L"Hindi", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,hiINLayouts }, {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts, huHULayouts }, {L"0000040F", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, isISLayouts }, + {L"00000421", L"1252", L"850", L"10079", L"Indonesian", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, idIDLayouts }, {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", itITPages, itITErrorEntries, itITStrings, CP1252Fonts, itITLayouts }, + {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", itITPages, itITErrorEntries, itITStrings, CP1252Fonts, itCHLayouts }, {L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings, CP932Fonts, jaJPLayouts }, + {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, knINLayouts }, {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, kkKZLayouts }, + {L"00000457", L"0", L"437", L"2", L"Konkani", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,kokINLayouts}, {L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings, CP949Fonts, koKRLayouts }, + {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, kyKGLayouts }, {L"00000426", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings, CP1257Fonts, lvLVLayouts }, {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings, CP1257Fonts, ltLTLayouts }, {L"0000042F", L"1251", L"866", L"10007", L"FYRO Macedonian", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, mkMKLayouts }, + {L"0000083E", L"1252", L"850", L"10000", L"Malay (Brunei Darussalam)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, msBNLayouts }, + {L"0000043E", L"1252", L"850", L"10000", L"Malay (Malaysia)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, msMYLayouts }, + {L"0000044E", L"0", L"1", L"2", L"Marathi", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,mrINLayouts }, + {L"00000450", L"1251", L"866", L"10007", L"Mongolian (Mongolia)", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, mnMNLayouts }, {L"00000414", L"1252", L"850", L"10000", L"Norwegian (Bokmal)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, nnNOLayouts }, + {L"00000814", L"1252", L"850", L"10000", L"Norwegian (Nynorsk)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, nnNOLayouts }, {L"00000415", L"1250", L"852", L"10029", L"Polish", plPLPages, plPLErrorEntries, plPLStrings, CP1250Fonts, plPLLayouts }, {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, ptPTLayouts }, {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, ptBRLayouts }, + {L"00000446", L"0", L"1", L"2", L"Punjabi (India)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,paINLayouts }, {L"00000418", L"1250", L"852", L"10029", L"Romanian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts, roROLayouts }, {L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, ruRUStrings, CP1251Fonts, ruRULayouts }, + {L"0000044F", L"0", L"1", L"2", L"Sanskrit", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,saINLayouts }, {L"00000C1A", L"1251", L"855", L"10007", L"Serbian (Cyrillic)", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, srSPLayouts }, {L"0000081A", L"1250", L"852", L"10029", L"Serbian (Latin)", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts, srSPLayouts }, {L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings, CP1250Fonts, skSKLayouts }, + {L"00000424", L"1250", L"852", L"10029", L"Slovenian", enUSPages, enUSErrorEntries, enUSStrings, CP1250Fonts, slSILayouts }, {L"0000040A", L"1252", L"850", L"10000", L"Spanish (Traditional Sort)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esESLayouts }, {L"0000080A", L"1252", L"850", L"10000", L"Spanish (Mexico)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esMXLayouts }, {L"00000C0A", L"1252", L"850", L"10000", L"Spanish (International Sort)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esESLayouts }, @@ -172,11 +257,18 @@ {L"0000480A", L"1252", L"850", L"10000", L"Spanish (Honduras)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esHNLayouts }, {L"00004C0A", L"1252", L"850", L"10000", L"Spanish (Nicaragua)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esNILayouts }, {L"0000500A", L"1252", L"850", L"10000", L"Spanish (Puerto Rico)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esPRLayouts }, + {L"00000441", L"1252", L"437", L"10000", L"Swahili", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, swKELayouts }, {L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings, CP1252Fonts, svSELayouts }, + {L"0000081D", L"1252", L"850", L"10000", L"Swedish (Finland)", svSEPages, svSEErrorEntries, svSEStrings, CP1252Fonts, svFILayouts }, + {L"0000045A", L"0", L"1", L"2", L"Syriac (Syria)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,syrSYLayouts}, + {L"00000449", L"0", L"1", L"2", L"Tamil", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,taINLayouts }, {L"00000444", L"1251", L"866", L"10007", L"Tatar", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, ttTALayouts }, + {L"0000044A", L"0", L"1", L"2", L"Telugu (India)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,teINLayouts }, {L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings, CP874Fonts, thTHLayouts }, {L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings, CP1254Fonts, trTRLayouts }, {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings, CP1251Fonts, ukUALayouts }, + {L"00000420", L"1256", L"720", L"10004", L"Urdu", enUSPages, enUSErrorEntries, enUSStrings, CP1256Fonts, urPKLayouts }, + {L"00000443", L"1254", L"857", L"10029", L"Uzbek (Latin)", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, uzUZLayouts }, {L"00000843", L"1251", L"866", L"10007", L"Uzbek (Cyrillic)", enUSPages, enUSErrorEntries, enUSStrings, CP1251Fonts, uzUZLayouts }, {L"0000042A", L"1258", L"1258",L"10000", L"Vietnamese", enUSPages, enUSErrorEntries, enUSStrings, CP1258Fonts, viVNLayouts }, {L"00000435", L"1252", L"850", L"10000", L"Zulu", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enUSLayouts }, Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -742,7 +742,15 @@ return List; } -PGENERIC_LIST +ULONG DefaultLanguageIndex = 0; + +ULONG +GetDefaultLanguageIndex(VOID) +{ + return DefaultLanguageIndex; +} + +PGENERIC_LIST CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage) { CHAR Buffer[128]; @@ -751,6 +759,7 @@ PWCHAR KeyName; PWCHAR KeyValue; PWCHAR UserData; + ULONG uIndex = 0; /* Get default language id */ if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) @@ -769,7 +778,7 @@ if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) { - DestroyGenericList(List, FALSE); + DestroyGenericList(List, FALSE); return NULL; } @@ -792,11 +801,14 @@ wcscpy(UserData, KeyName); + if (!_wcsicmp(KeyName, DefaultLanguage)) DefaultLanguageIndex = uIndex; + sprintf(Buffer, "%S", KeyValue); AppendGenericListEntry(List, Buffer, UserData, - _wcsicmp(KeyName, DefaultLanguage) ? FALSE : TRUE); + FALSE); + uIndex++; } while (SetupFindNextLine(&Context, &Context)); return List; Modified: trunk/reactos/base/setup/usetup/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.h [iso-8859-1] Mon Jun 2 10:34:57 2008 @@ -49,7 +49,10 @@ CreateKeyboardLayoutList(HINF InfFile, WCHAR *DefaultKBLayout); PGENERIC_LIST -CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage); +CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage); + +ULONG +GetDefaultLanguageIndex(VOID); BOOLEAN ProcessLocaleRegistry(PGENERIC_LIST List);

1 0

[fireball] 33825: Stefan Ginsberg <stefan__100__@hotmail.com> - Remove ExTryToAcquireResourceExclusiveLite from NDK since it's not exported by NT kernel. - Add ObSetSecurityObjectByPointer, RtlInitAnsiStringEx (and implement it, rather straightforward) to NDK. - Uncomment exports in ntoskrnl_i386.def which are already implemented. - Add KeInvalidateAllCaches to ARM's stubs.
by fireball＠svn.reactos.org 02 Jun '08

02 Jun '08

Author: fireball Date: Mon Jun 2 05:21:49 2008 New Revision: 33825 URL: http://svn.reactos.org/svn/reactos?rev=33825&view=rev Log: Stefan Ginsberg <stefan__100__(a)hotmail.com> - Remove ExTryToAcquireResourceExclusiveLite from NDK since it's not exported by NT kernel. - Add ObSetSecurityObjectByPointer, RtlInitAnsiStringEx (and implement it, rather straightforward) to NDK. - Uncomment exports in ntoskrnl_i386.def which are already implemented. - Add KeInvalidateAllCaches to ARM's stubs. Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/unicode.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Mon Jun 2 05:21:49 2008 @@ -94,16 +94,6 @@ ExfUnblockPushLock( PEX_PUSH_LOCK PushLock, PVOID CurrentWaitBlock -); - -// -// Resource Functions -// -NTKERNELAPI -BOOLEAN -NTAPI -ExTryToAcquireResourceExclusiveLite( - IN PERESOURCE Resource ); // Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] Mon Jun 2 05:21:49 2008 @@ -109,6 +109,15 @@ ); NTKERNELAPI +NTSTATUS +NTAPI +ObSetSecurityObjectByPointer( + IN PVOID Object, + IN SECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor +); + +NTKERNELAPI BOOLEAN NTAPI ObFindHandleForObject( Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Jun 2 05:21:49 2008 @@ -1628,8 +1628,6 @@ IN BOOLEAN AllocateDestinationString ); -#endif - NTSYSAPI NTSTATUS NTAPI @@ -1638,6 +1636,8 @@ IN PCUNICODE_STRING SourceString, OUT PUNICODE_STRING DestinationString ); + +#endif NTSYSAPI BOOLEAN @@ -1754,6 +1754,14 @@ VOID NTAPI RtlInitAnsiString( + PANSI_STRING DestinationString, + PCSZ SourceString +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlInitAnsiStringEx( PANSI_STRING DestinationString, PCSZ SourceString ); Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=3382… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Mon Jun 2 05:21:49 2008 @@ -432,6 +432,30 @@ DestinationString->Buffer = (PCHAR)SourceString; } +NTSTATUS +NTAPI +RtlInitAnsiStringEx(IN OUT PANSI_STRING DestinationString, + IN PCSZ SourceString) +{ + ULONG DestSize; + + if(SourceString) + { + DestSize = strlen(SourceString); + if (DestSize >= 0xFFFF) return STATUS_NAME_TOO_LONG; + DestinationString->Length = (USHORT)DestSize; + DestinationString->MaximumLength = (USHORT)DestSize + sizeof(CHAR); + } + else + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + } + + DestinationString->Buffer = (PCHAR)SourceString; + return STATUS_SUCCESS; + +} /* * @implemented * Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Mon Jun 2 05:21:49 2008 @@ -1001,6 +1001,12 @@ /* OTHER FUNCTIONS **********************************************************/ +BOOLEAN +NTAPI +ExTryToAcquireResourceExclusiveLite( + IN PERESOURCE Resource +); + LONGLONG FASTCALL ExfpInterlockedExchange64( Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Mon Jun 2 05:21:49 2008 @@ -21,6 +21,7 @@ GENERATE_ARM_STUB KeGetRecommendedSharedDataAlignment GENERATE_ARM_STUB KeIcacheFlushCount GENERATE_ARM_STUB KeInitializeInterrupt +GENERATE_ARM_STUB KeInvalidateAllCaches GENERATE_ARM_STUB KeNumberProcessors GENERATE_ARM_STUB KeQueryActiveProcessors GENERATE_ARM_STUB KeRaiseUserException Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Mon Jun 2 05:21:49 2008 @@ -82,7 +82,7 @@ ExDesktopObjectType ExDisableResourceBoostLite@4 @ExEnterCriticalRegionAndAcquireFastMutexUnsafe@4 -;ExEnterCriticalRegionAndAcquireResourceExclusive +ExEnterCriticalRegionAndAcquireResourceExclusive@4 ;ExEnterCriticalRegionAndAcquireResourceShared ;ExEnterCriticalRegionAndAcquireSharedWaitForExclusive ExEnumHandleTable@16 @@ -137,7 +137,7 @@ ExReinitializeResourceLite@4 @ExReleaseFastMutexUnsafe@4 @ExReleaseFastMutexUnsafeAndLeaveCriticalRegion@4 -;ExReleaseResourceAndLeaveCriticalRegion +@ExReleaseResourceAndLeaveCriticalRegion@4 ExReleaseResourceForThreadLite@8 @ExReleaseResourceLite@4 ExReleaseRundownProtection=@ExfReleaseRundownProtection@4 @@ -158,8 +158,8 @@ ExWaitForRundownProtectionRelease=@ExfWaitForRundownProtectionRelease@4 ExWaitForRundownProtectionReleaseCacheAware=@ExfWaitForRundownProtectionReleaseCacheAware@4 ExWindowStationObjectType DATA -;ExfAcquirePushLockExclusive -;ExfAcquirePushLockShared +@ExfAcquirePushLockExclusive@4 +@ExfAcquirePushLockShared@4 @ExfInterlockedAddUlong@12 @ExfInterlockedCompareExchange64@12 @ExfInterlockedInsertHeadList@12 @@ -167,11 +167,11 @@ @ExfInterlockedPopEntryList@8 @ExfInterlockedPushEntryList@12 @ExfInterlockedRemoveHeadList@8 -;ExfReleasePushLock -;ExfReleasePushLockExclusive -;ExfReleasePushLockShared -;ExfTryToWakePushLock -;ExfUnblockPushLock +@ExfReleasePushLock@4 +@ExfReleasePushLockExclusive@4 +@ExfReleasePushLockShared@4 +@ExfTryToWakePushLock@4 +@ExfUnblockPushLock@8 @Exfi386InterlockedDecrementLong@4 @Exfi386InterlockedExchangeUlong@8 @Exfi386InterlockedIncrementLong@4 @@ -199,7 +199,7 @@ FsRtlCheckOplock FsRtlCopyRead FsRtlCopyWrite -;FsRtlCreateSectionForDataScan +FsRtlCreateSectionForDataScan@40 FsRtlCurrentBatchOplock FsRtlDeleteKeyFromTunnelCache FsRtlDeleteTunnelCache @@ -549,7 +549,7 @@ KeAcquireSpinLockAtDpcLevel@4 ;KeAcquireSpinLockForDpc KeAddSystemServiceTable@20 -;KeAreAllApcsDisabled +KeAreAllApcsDisabled@0 KeAreApcsDisabled@0 KeAttachProcess@4 KeBugCheck@4 @@ -606,8 +606,8 @@ KeInsertQueue@8 KeInsertQueueApc@16 KeInsertQueueDpc@12 -;KeInvalidateAllCaches -;KeIpiGenericCall +KeInvalidateAllCaches@0 +KeIpiGenericCall@8 KeIsAttachedProcess@0 KeIsExecutingDpc@0 ;KeIsWaitListEmpty @@ -682,7 +682,7 @@ ;KeTestSpinLock KeTickCount DATA @KeTryToAcquireGuardedMutex@4 -;KeTryToAcquireSpinLockAtDpcLevel +@KeTryToAcquireSpinLockAtDpcLevel@4 KeUnstackDetachProcess@4 KeUpdateRunTime@4 KeUpdateSystemTime@0 @@ -888,11 +888,11 @@ ObReferenceObjectByHandle@24 ObReferenceObjectByName@32 ObReferenceObjectByPointer@16 -;ObReferenceSecurityDescriptor@8 +ObReferenceSecurityDescriptor@8 ObReleaseObjectSecurity@8 ;ObSetHandleAttributes@12 -;ObSetSecurityDescriptorInfo@24 -;ObSetSecurityObjectByPointer@12 +ObSetSecurityDescriptorInfo@24 +ObSetSecurityObjectByPointer@12 @ObfDereferenceObject@4 @ObfReferenceObject@4 ;PfxFindPrefix @@ -974,7 +974,7 @@ PsImpersonateClient@20 PsInitialSystemProcess DATA PsIsProcessBeingDebugged@4 -;PsIsSystempProcess +;PsIsSystemProcess PsIsSystemThread@4 PsIsThreadImpersonating@4 PsIsThreadTerminating@4 @@ -1018,7 +1018,7 @@ KeRosDumpStackFrames@8 RtlAbsoluteToSelfRelativeSD@12 RtlAddAccessAllowedAce@16 -;RtlAddAccessAllowedAceEx +RtlAddAccessAllowedAceEx@20 RtlAddAce@20 RtlAddAtomToAtomTable@12 RtlAddRange@36 @@ -1140,11 +1140,11 @@ RtlImageDirectoryEntryToData@16 RtlImageNtHeader@4 RtlInitAnsiString@8 -;RtlInitAnsiStringEx +RtlInitAnsiStringEx@8 RtlInitCodePageTable@8 RtlInitString@8 RtlInitUnicodeString@8 -;RtlInitUnicodeStringEx +RtlInitUnicodeStringEx@8 RtlInitializeBitMap@12 RtlInitializeGenericTable@20 RtlInitializeGenericTableAvl@20

1 0

[cfinck] 33824: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second time quickly after the first time (timing problem in the network code?). - Fix the behaviour on an ioctlsocket FIONREAD call: The output buffer is not touched, when we have no socket, but when we have no connection, it is set to 0. - Forward the socket call to WSA
by cfinck＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: cfinck Date: Sun Jun 1 17:08:45 2008 New Revision: 33824 URL: http://svn.reactos.org/svn/reactos?rev=33824&view=rev Log: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second time quickly after the first time (timing problem in the network code?). - Fix the behaviour on an ioctlsocket FIONREAD call: The output buffer is not touched, when we have no socket, but when we have no connection, it is set to 0. - Forward the socket call to WSASocketW instead of WSASocketA, minimal performance improvement Added: trunk/rostests/apitests/ws2_32/ (with props) trunk/rostests/apitests/ws2_32/helpers.c (with props) trunk/rostests/apitests/ws2_32/testlist.c (with props) trunk/rostests/apitests/ws2_32/tests/ trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c (with props) trunk/rostests/apitests/ws2_32/tests/recv.c (with props) trunk/rostests/apitests/ws2_32/ws2_32.c (with props) trunk/rostests/apitests/ws2_32/ws2_32.h (with props) trunk/rostests/apitests/ws2_32/ws2_32.rbuild (with props) Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c trunk/reactos/drivers/network/afd/afd/info.c trunk/rostests/apitests/directory.rbuild Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -166,7 +166,7 @@ IN INT type, IN INT protocol) { - return WSASocketA(af, + return WSASocketW(af, type, protocol, NULL, Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -49,9 +49,9 @@ break; case AFD_INFO_RECEIVE_CONTENT_SIZE: - /* Only touch InfoReq if we actually have a valid connection. + /* Only touch InfoReq if a socket has been set up. Behaviour was verified under WinXP SP2. */ - if(FCB->Connection.Handle) + if(FCB->AddressFile.Object) InfoReq->Information.Ulong = FCB->Recv.Content - FCB->Recv.BytesUsed; break; Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/directory.rbuild [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -23,4 +23,8 @@ <directory name="w32knapi"> <xi:include href="w32knapi/w32knapi.rbuild" /> </directory> + + <directory name="ws2_32"> + <xi:include href="ws2_32/ws2_32.rbuild" /> + </directory> </group> Propchange: trunk/rostests/apitests/ws2_32/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jun 1 17:08:45 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/rostests/apitests/ws2_32/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/helpers.c… ============================================================================== --- trunk/rostests/apitests/ws2_32/helpers.c (added) +++ trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,65 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/helpers.c + * PURPOSE: Helper functions for the socket tests + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "ws2_32.h" + +int CreateSocket(PTESTINFO pti, SOCKET* psck) +{ + /* Create the socket */ + *psck = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + TEST(*psck != INVALID_SOCKET); + + if(*psck == INVALID_SOCKET) + { + printf("Winsock error code is %u\n", WSAGetLastError()); + WSACleanup(); + return APISTATUS_ASSERTION_FAILED; + } + + return APISTATUS_NORMAL; +} + +int ConnectToReactOSWebsite(PTESTINFO pti, SOCKET sck) +{ + int iResult; + struct hostent* host; + struct sockaddr_in sa; + + /* Connect to "www.reactos.org" */ + host = gethostbyname("www.reactos.org"); + + sa.sin_family = AF_INET; + sa.sin_addr.s_addr = *(u_long*)host->h_addr_list[0]; + sa.sin_port = htons(80); + + SCKTEST(connect(sck, (struct sockaddr *)&sa, sizeof(sa))); + + return APISTATUS_NORMAL; +} + +int GetRequestAndWait(PTESTINFO pti, SOCKET sck) +{ + const char szGetRequest[] = "GET / HTTP/1.0\r\n\r\n"; + int iResult; + struct fd_set readable; + + /* Send the GET request */ + SCKTEST(send(sck, szGetRequest, strlen(szGetRequest), 0)); + TEST(iResult == strlen(szGetRequest)); + + /* Shutdown the SEND connection */ + SCKTEST(shutdown(sck, SD_SEND)); + + /* Wait until we're ready to read */ + FD_ZERO(&readable); + FD_SET(sck, &readable); + + SCKTEST(select(0, &readable, NULL, NULL, NULL)); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/helpers.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c (added) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,33 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/testlist.c + * PURPOSE: Test list file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#ifndef _WS2_32_TESTLIST_H +#define _WS2_32_TESTLIST_H + +#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) + +#include "ws2_32.h" + +/* include the tests */ +#include "tests/ioctlsocket.c" +#include "tests/recv.c" + +/* The List of tests */ +TESTENTRY TestList[] = +{ + { L"ioctlsocket", Test_ioctlsocket }, + { L"recv", Test_recv } +}; + +/* The function that gives us the number of tests */ +INT NumTests(void) +{ + return ARRAY_SIZE(TestList); +} + +#endif Propchange: trunk/rostests/apitests/ws2_32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/tests/ioc… ============================================================================== --- trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c (added) +++ trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,83 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/tests/ioctlsocket.c + * PURPOSE: Tests for the ioctlsocket function + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "../ws2_32.h" + +/* For valid test results, the ReactOS Website needs to return at least 2 bytes on a "GET / HTTP/1.0" request. */ +INT +Test_ioctlsocket(PTESTINFO pti) +{ + LPSTR pszBuf; + int iResult; + SOCKET sck; + ULONG BytesAvailable; + ULONG BytesToRead; + WSADATA wdata; + + /* Start up Winsock */ + TEST(WSAStartup(MAKEWORD(2, 2), &wdata) == 0); + + /* If we call ioctlsocket without a socket, it should return with an error and do nothing. */ + BytesAvailable = 0xdeadbeef; + TEST(ioctlsocket(0, FIONREAD, &BytesAvailable) == SOCKET_ERROR); + TEST(BytesAvailable == 0xdeadbeef); + + /* Create the socket */ + iResult = CreateSocket(pti, &sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Now we can pass at least a socket, but we have no connection yet. The function should return 0. */ + BytesAvailable = 0xdeadbeef; + TEST(ioctlsocket(sck, FIONREAD, &BytesAvailable) == 0); + TEST(BytesAvailable == 0); + + /* Connect to "www.reactos.org" */ + iResult = ConnectToReactOSWebsite(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Even with a connection, there shouldn't be any bytes available. */ + TEST(ioctlsocket(sck, FIONREAD, &BytesAvailable) == 0); + TEST(BytesAvailable == 0); + + /* Send the GET request */ + iResult = GetRequestAndWait(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Try ioctlsocket with FIONREAD. There should be bytes available now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable != 0); + + /* Get half of the data */ + BytesToRead = BytesAvailable / 2; + pszBuf = (LPSTR) HeapAlloc(g_hHeap, 0, BytesToRead); + SCKTEST(recv(sck, pszBuf, BytesToRead, 0)); + HeapFree(g_hHeap, 0, pszBuf); + + BytesToRead = BytesAvailable - BytesToRead; + + /* Now try ioctlsocket again. BytesAvailable should be at the value saved in BytesToRead now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable == BytesToRead); + + /* Read those bytes */ + pszBuf = (LPSTR) HeapAlloc(g_hHeap, 0, BytesToRead); + SCKTEST(recv(sck, pszBuf, BytesToRead, 0)); + HeapFree(g_hHeap, 0, pszBuf); + + /* Try it for the last time. BytesAvailable should be at 0 now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable == 0); + + closesocket(sck); + WSACleanup(); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/tests/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/tests/rec… ============================================================================== --- trunk/rostests/apitests/ws2_32/tests/recv.c (added) +++ trunk/rostests/apitests/ws2_32/tests/recv.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,69 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/tests/recv.c + * PURPOSE: Tests for the recv function + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "../ws2_32.h" + +#define RECV_BUF 4 + +/* For valid test results, the ReactOS Website needs to return at least 8 bytes on a "GET / HTTP/1.0" request. + Also the first 4 bytes and the last 4 bytes need to be different. + Both factors usually apply on standard HTTP responses. */ +INT +Test_recv(PTESTINFO pti) +{ + const char szDummyBytes[RECV_BUF] = {0xFF, 0x00, 0xFF, 0x00}; + + char szBuf1[RECV_BUF]; + char szBuf2[RECV_BUF]; + int iResult; + SOCKET sck; + WSADATA wdata; + + /* Start up Winsock */ + TEST(WSAStartup(MAKEWORD(2, 2), &wdata) == 0); + + /* If we call recv without a socket, it should return with an error and do nothing. */ + memcpy(szBuf1, szDummyBytes, RECV_BUF); + TEST(recv(0, szBuf1, RECV_BUF, 0) == SOCKET_ERROR); + TEST(!memcmp(szBuf1, szDummyBytes, RECV_BUF)); + + /* Create the socket */ + iResult = CreateSocket(pti, &sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Now we can pass at least a socket, but we have no connection yet. Should return with an error and do nothing. */ + memcpy(szBuf1, szDummyBytes, RECV_BUF); + TEST(recv(sck, szBuf1, RECV_BUF, 0) == SOCKET_ERROR); + TEST(!memcmp(szBuf1, szDummyBytes, RECV_BUF)); + + /* Connect to "www.reactos.org" */ + iResult = ConnectToReactOSWebsite(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Send the GET request */ + iResult = GetRequestAndWait(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Receive the data. + MSG_PEEK will not change the internal number of bytes read, so that a subsequent request should return the same bytes again. */ + SCKTEST(recv(sck, szBuf1, RECV_BUF, MSG_PEEK)); + SCKTEST(recv(sck, szBuf2, RECV_BUF, 0)); + TEST(!memcmp(szBuf1, szBuf2, RECV_BUF)); + + /* The last recv() call moved the internal file pointer, so that the next request should return different data. */ + SCKTEST(recv(sck, szBuf1, RECV_BUF, 0)); + TEST(memcmp(szBuf1, szBuf2, RECV_BUF)); + + closesocket(sck); + WSACleanup(); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/tests/recv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.c?… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.c (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,24 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/ws2_32.c + * PURPOSE: Program entry point + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "ws2_32.h" + +HANDLE g_hHeap; + +BOOL +IsFunctionPresent(LPWSTR lpszFunction) +{ + return TRUE; +} + +int wmain() +{ + g_hHeap = GetProcessHeap(); + + return TestMain(L"ws2_32_apitests", L"ws2_32.dll"); +} Propchange: trunk/rostests/apitests/ws2_32/ws2_32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.h?… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.h (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.h [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,36 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/ws2_32.h + * PURPOSE: Main header file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#ifndef _WS2_32_APITESTS_H +#define _WS2_32_APITESTS_H + +#include <winsock2.h> + +#include "../apitest.h" + +/* Simple macro for executing a socket command and doing cleanup operations in case of a failure */ +#define SCKTEST(_cmd_) \ + iResult = _cmd_; \ + TEST(iResult != SOCKET_ERROR); \ + if(iResult == SOCKET_ERROR) \ + { \ + printf("Winsock error code is %u\n", WSAGetLastError()); \ + closesocket(sck); \ + WSACleanup(); \ + return APISTATUS_ASSERTION_FAILED; \ + } + +/* helpers.c */ +int CreateSocket(PTESTINFO pti, SOCKET* sck); +int ConnectToReactOSWebsite(PTESTINFO pti, SOCKET sck); +int GetRequestAndWait(PTESTINFO pti, SOCKET sck); + +/* ws2_32.c */ +extern HANDLE g_hHeap; + +#endif Propchange: trunk/rostests/apitests/ws2_32/ws2_32.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.rb… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.rbuild (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.rbuild [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,11 @@ +<module name="ws2_32_apitests" type="win32cui" unicode="yes"> + <define name="_WIN32_WINNT">0x0501</define> + <library>apitest</library> + <library>kernel32</library> + <library>user32</library> + <library>shell32</library> + <library>ws2_32</library> + <file>helpers.c</file> + <file>testlist.c</file> + <file>ws2_32.c</file> +</module> Propchange: trunk/rostests/apitests/ws2_32/ws2_32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 33823: Use the Windows CreateFile/WriteFile functions instead of open/write. Fixes compilation with MSVC. (note that you also have to change the calling convention from __stdcall to __cdecl in the auto-created project file for the lib)
by cfinck＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: cfinck Date: Sun Jun 1 15:34:12 2008 New Revision: 33823 URL: http://svn.reactos.org/svn/reactos?rev=33823&view=rev Log: Use the Windows CreateFile/WriteFile functions instead of open/write. Fixes compilation with MSVC. (note that you also have to change the calling convention from __stdcall to __cdecl in the auto-created project file for the lib) Modified: trunk/rostests/apitests/apitest.c trunk/rostests/apitests/apitest.h Modified: trunk/rostests/apitests/apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.c?rev=33… ============================================================================== --- trunk/rostests/apitests/apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apitest.c [iso-8859-1] Sun Jun 1 15:34:12 2008 @@ -29,25 +29,25 @@ } BOOL -WriteFileHeader(UINT hFile, LPWSTR pszModule) +WriteFileHeader(HANDLE hFile, LPDWORD lpdwBytesWritten, LPWSTR pszModule) { char szHeader[100]; - _write(hFile, szFileHeader1, strlen(szFileHeader1)); + WriteFile(hFile, szFileHeader1, strlen(szFileHeader1), lpdwBytesWritten, NULL); sprintf(szHeader, "<title>%ls Test results</title>", pszModule); - _write(hFile, szHeader, strlen(szHeader)); - _write(hFile, szFileHeader2, strlen(szFileHeader2)); + WriteFile(hFile, szHeader, strlen(szHeader), lpdwBytesWritten, NULL); + WriteFile(hFile, szFileHeader2, strlen(szFileHeader2), lpdwBytesWritten, NULL); sprintf(szHeader, "<h1>Test results for %ls</h1>", pszModule); - _write(hFile, szHeader, strlen(szHeader)); - - _write(hFile, szTableHeader, strlen(szTableHeader)); + WriteFile(hFile, szHeader, strlen(szHeader), lpdwBytesWritten, NULL); + + WriteFile(hFile, szTableHeader, strlen(szTableHeader), lpdwBytesWritten, NULL); return TRUE; } BOOL -WriteRow(UINT hFile, LPWSTR pszFunction, PTESTINFO pti) +WriteRow(HANDLE hFile, LPDWORD lpdwBytesWritten, LPWSTR pszFunction, PTESTINFO pti) { char szLine[500]; @@ -75,7 +75,8 @@ sprintf(szLine + strlen(szLine), "<td>%d / %d / %d</td><td>%d</td></tr>\n", pti->passed+pti->failed, pti->passed, pti->failed, pti->rfailed); - _write(hFile, szLine, strlen(szLine)); + WriteFile(hFile, szLine, strlen(szLine), lpdwBytesWritten, NULL); + return TRUE; } @@ -87,7 +88,8 @@ TESTINFO ti; INT opassed, ofailed, orfailed; BOOL bAll, bStatus; - UINT hFile = 0; + HANDLE hFile = NULL; + DWORD dwBytesWritten; ti.bRegress = FALSE; bAll = FALSE; @@ -132,16 +134,20 @@ if (bStatus) { + WCHAR szOutputFile[MAX_PATH]; + ti.bRegress = TRUE; - char szOutputFile[MAX_PATH]; - wsprintf(szOutputFile, "%ls.html", pszName); - hFile = _open(szOutputFile, O_CREAT | O_TRUNC | O_RDWR, 00700); - if (hFile == -1) + wcscpy(szOutputFile, pszName); + wcscat(szOutputFile, L".html"); + hFile = CreateFileW(szOutputFile, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + if (hFile == INVALID_HANDLE_VALUE) { printf("Could not create output file.\n"); return 0; } - WriteFileHeader(hFile, pszModule); + + WriteFileHeader(hFile, &dwBytesWritten, pszModule); } for (i = 0; i < NumTests(); i++) @@ -171,7 +177,7 @@ { if (ti.rfailed > 0) ti.nApiStatus = APISTATUS_REGRESSION; - WriteRow(hFile, TestList[i].Test, &ti); + WriteRow(hFile, &dwBytesWritten, TestList[i].Test, &ti); } break; } @@ -187,8 +193,8 @@ if (bStatus) { - _write(hFile, szFileFooter, strlen(szFileFooter)); - _close(hFile); + WriteFile(hFile, szFileFooter, strlen(szFileFooter), &dwBytesWritten, NULL); + CloseHandle(hFile); } if (ti.bRegress) Modified: trunk/rostests/apitests/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=33… ============================================================================== --- trunk/rostests/apitests/apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/apitest.h [iso-8859-1] Sun Jun 1 15:34:12 2008 @@ -4,10 +4,7 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#include <fcntl.h> #include <windows.h> - -#define open _open #define APISTATUS_NORMAL 0 #define APISTATUS_NOT_FOUND 1

1 0

[hpoussin] 33822: Fix debug message
by hpoussin＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: hpoussin Date: Sun Jun 1 14:56:21 2008 New Revision: 33822 URL: http://svn.reactos.org/svn/reactos?rev=33822&view=rev Log: Fix debug message Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Sun Jun 1 14:56:21 2008 @@ -1047,7 +1047,7 @@ IN PSID pSid2, OUT BOOL* pfEqual) { - FIXME("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return FALSE; } @@ -1060,7 +1060,7 @@ OUT PSID ppDomainSid, IN OUT DWORD* cbSid) { - FIXME("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return FALSE; } @@ -1238,7 +1238,7 @@ BOOL ret; SID* pisid; - TRACE("%s %p\n", StringSid, sid); + TRACE("%s %p\n", debugstr_w(StringSid), sid); if (!StringSid) {

1 0

[hpoussin] 33821: Add a "ReactOS (WinLdr)" entry when using a debug build
by hpoussin＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: hpoussin Date: Sun Jun 1 14:15:15 2008 New Revision: 33821 URL: http://svn.reactos.org/svn/reactos?rev=33821&view=rev Log: Add a "ReactOS (WinLdr)" entry when using a debug build Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sun Jun 1 14:15:15 2008 @@ -380,12 +380,14 @@ L"ReactOS_Debug", L"\"ReactOS (Debug)\""); +#ifdef DBG /* ReactOS_WinLdr="ReactOS (WinLdr)" */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"ReactOS_WinLdr", L"\"ReactOS (WinLdr)\""); +#endif /* Create "ReactOS" section */ IniSection = IniCacheAppendSection(IniCache, @@ -437,6 +439,7 @@ L"Options", L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); +#ifdef DBG /* Create "ReactOS_WinLdr" section */ IniSection = IniCacheAppendSection(IniCache, L"ReactOS_WinLdr"); @@ -461,6 +464,7 @@ INSERT_LAST, L"Options", L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); +#endif /* Save the ini file */ IniCacheSave(IniCache, IniPath);

1 0

[cfinck] 33820: - Add a parameter for listing all valid test names - Generate valid XHTML 1.0 Strict
by cfinck＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: cfinck Date: Sun Jun 1 13:37:55 2008 New Revision: 33820 URL: http://svn.reactos.org/svn/reactos?rev=33820&view=rev Log: - Add a parameter for listing all valid test names - Generate valid XHTML 1.0 Strict Modified: trunk/rostests/apitests/apitest.c Modified: trunk/rostests/apitests/apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.c?rev=33… ============================================================================== --- trunk/rostests/apitests/apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apitest.c [iso-8859-1] Sun Jun 1 13:37:55 2008 @@ -1,17 +1,30 @@ #include "apitest.h" -const char szFileHeader[] = "<html><head><style>\ntd.red {color:red}\ntd.green{color:green}\n</style>\n</head>\n<body>\n<head>\n"; -const char szTableHeader[] = "<table width = '800'><tr><th align='left'>Function</th><th align='left'>Status</th><th align='left'>Tests (all/passed/failed)</th><th align='left'>Regressions</th></tr>"; +const char szFileHeader1[] = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n" + "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" + "<head>\n" + "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n"; +const char szFileHeader2[] = "<style type=\"text/css\">\n" + "body {font-family: sans-serif;}\n" + "table {width: 100%;}\n" + "th {text-align: left;}\n" + "td.red {color: red;}\n" + "td.green {color: green;}\n" + "</style>\n" + "</head>\n" + "<body>\n"; +const char szTableHeader[] = "<table><tr><th>Function</th><th>Status</th><th>Tests (all/passed/failed)</th><th>Regressions</th></tr>"; const char szFileFooter[] = "</table></body></html>"; void OutputUsage(LPWSTR pszName) { printf("\nUsage:\n\n"); - printf("%ls.exe <TestName> - perform individual test\n", pszName); - printf("%ls.exe all - perform all tests\n", pszName); - printf("%ls.exe status - create api status file\n", pszName); - printf("%ls.exe -r ... - perform regression testing\n", pszName); + printf("%ls.exe <TestName> - Perform individual test\n", pszName); + printf("%ls.exe all - Perform all tests\n", pszName); + printf("%ls.exe tests - List the valid test names\n", pszName); + printf("%ls.exe status - Create api status file\n", pszName); + printf("%ls.exe -r ... - Perform regression testing\n", pszName); printf("\n"); } @@ -20,10 +33,16 @@ { char szHeader[100]; - _write(hFile, szFileHeader, strlen(szFileHeader)); - sprintf(szHeader, "<H1>Test results for %ls</H1>", pszModule); + _write(hFile, szFileHeader1, strlen(szFileHeader1)); + sprintf(szHeader, "<title>%ls Test results</title>", pszModule); _write(hFile, szHeader, strlen(szHeader)); + _write(hFile, szFileHeader2, strlen(szFileHeader2)); + + sprintf(szHeader, "<h1>Test results for %ls</h1>", pszModule); + _write(hFile, szHeader, strlen(szHeader)); + _write(hFile, szTableHeader, strlen(szTableHeader)); + return TRUE; } @@ -37,19 +56,19 @@ switch(pti->nApiStatus) { case APISTATUS_NOT_FOUND: - strcat(szLine, "<td class='red'>not found</td>"); + strcat(szLine, "<td class=\"red\">not found</td>"); break; case APISTATUS_UNIMPLEMENTED: - strcat(szLine, "<td class='red'>unimplemented</td>"); + strcat(szLine, "<td class=\"red\">unimplemented</td>"); break; case APISTATUS_ASSERTION_FAILED: - strcat(szLine, "<td class='red'>assertion failed</td>"); + strcat(szLine, "<td class=\"red\">assertion failed</td>"); break; case APISTATUS_REGRESSION: - strcat(szLine, "<td class='red'>Regression!</td>"); + strcat(szLine, "<td class=\"red\">Regression!</td>"); break; case APISTATUS_NORMAL: - strcat(szLine, "<td class='green'>Implemented</td>"); + strcat(szLine, "<td class=\"green\">Implemented</td>"); break; } @@ -98,6 +117,16 @@ { bAll = TRUE; bStatus = TRUE; + } + else if (_wcsicmp(argv[i], L"tests") == 0) + { + /* List all the tests and exit */ + printf("Valid test names:\n\n"); + + for (i = 0; i < NumTests(); i++) + printf("%ls\n", TestList[i].Test); + + return 0; } }

1 0

[hpoussin] 33819: Remove dead code (GetActualSourceFilename, GetSourceFilenames, GetSourceFilenamesWithoutGeneratedFiles) In rules, put generated file name at the end of the line
by hpoussin＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: hpoussin Date: Sun Jun 1 13:20:30 2008 New Revision: 33819 URL: http://svn.reactos.org/svn/reactos?rev=33819&view=rev Log: Remove dead code (GetActualSourceFilename, GetSourceFilenames, GetSourceFilenamesWithoutGeneratedFiles) In rules, put generated file name at the end of the line Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jun 1 13:20:30 2008 @@ -281,49 +281,6 @@ return ""; } -/* caller needs to delete the returned object */ -const FileLocation* -MingwModuleHandler::GetActualSourceFilename ( - const FileLocation* file ) const -{ - string filename = file->name; - - string extension = GetExtension ( *file ); - if ( extension == ".spec" || extension == ".SPEC" ) - { - const FileLocation *objectFile = GetObjectFilename ( file, module ); - FileLocation *sourceFile = new FileLocation ( - objectFile->directory, - objectFile->relative_path, - ReplaceExtension ( objectFile->name, ".c" ) ); - delete objectFile; - return sourceFile; - } - else if ( ( extension == ".idl" || extension == ".IDL" ) && - ( module.type == RpcServer || module.type == RpcClient || module.type == RpcProxy ) ) - { - const FileLocation *objectFile = GetObjectFilename ( file, module ); - FileLocation *sourceFile = new FileLocation ( - objectFile->directory, - objectFile->relative_path, - ReplaceExtension ( objectFile->name, ".c" ) ); - delete objectFile; - return sourceFile; - } - else if ( extension == ".mc" || extension == ".MC" ) - { - const FileLocation *objectFile = GetObjectFilename ( file, module ); - FileLocation *sourceFile = new FileLocation ( - objectFile->directory, - objectFile->relative_path, - ReplaceExtension ( objectFile->name, ".rc" ) ); - delete objectFile; - return sourceFile; - } - else - return new FileLocation ( *file ); -} - string MingwModuleHandler::GetExtraDependencies ( const FileLocation *file ) const @@ -486,56 +443,6 @@ const FileLocation& file = v[i]; dependencies.push_back ( backend->GetFullName ( file ) ); } -} - -void -MingwModuleHandler::GetSourceFilenames ( vector<FileLocation>& list, - bool includeGeneratedFiles ) const -{ - size_t i; - - const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; - for ( i = 0; i < compilationUnits.size (); i++ ) - { - if ( includeGeneratedFiles || !compilationUnits[i]->IsGeneratedFile () ) - { - const FileLocation& compilationName = compilationUnits[i]->GetFilename (); - const FileLocation* sourceFileLocation = GetActualSourceFilename ( &compilationName ); - list.push_back ( *sourceFileLocation ); - delete sourceFileLocation; - } - } - // intentionally make a copy so that we can append more work in - // the middle of processing without having to go recursive - vector<If*> v = module.non_if_data.ifs; - for ( i = 0; i < v.size (); i++ ) - { - size_t j; - If& rIf = *v[i]; - // check for sub-ifs to add to list - const vector<If*>& ifs = rIf.data.ifs; - for ( j = 0; j < ifs.size (); j++ ) - v.push_back ( ifs[j] ); - const vector<CompilationUnit*>& compilationUnits = rIf.data.compilationUnits; - for ( j = 0; j < compilationUnits.size (); j++ ) - { - CompilationUnit& compilationUnit = *compilationUnits[j]; - if ( includeGeneratedFiles || !compilationUnit.IsGeneratedFile () ) - { - const FileLocation& compilationName = compilationUnit.GetFilename (); - const FileLocation* sourceFileLocation = GetActualSourceFilename ( &compilationName ); - list.push_back ( *sourceFileLocation ); - delete sourceFileLocation; - } - } - } -} - -void -MingwModuleHandler::GetSourceFilenamesWithoutGeneratedFiles ( - vector<FileLocation>& list ) const -{ - GetSourceFilenames ( list, false ); } /* caller needs to delete the returned object */ @@ -1265,7 +1172,7 @@ Rule gasRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_GAS)\n" - "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(module_name)_CFLAGS)\n", + "\t${gcc} -x assembler-with-cpp -o $@ -D__ASM__ $($(module_name)_CFLAGS) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule bootRule ( "$(source): ${$(module_name)_precondition}\n" @@ -1289,10 +1196,12 @@ "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp 2>$(NUL)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).coff", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h: $(WMC_TARGET) $(source)\n" +Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h: $(WMC_TARGET) $(source) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc $(source)\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", NULL ); + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc", + "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source)\n" @@ -1301,7 +1210,7 @@ "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o", @@ -1318,7 +1227,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o", @@ -1329,7 +1238,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o", @@ -1340,7 +1249,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", @@ -1353,22 +1262,22 @@ Rule gccRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule gccHostRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${host_gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", + "\t${host_gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", + "\t${gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${host_gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", + "\t${host_gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule emptyRule ( "", NULL ); @@ -1378,7 +1287,6 @@ const Rule *rule, const string& extraDependencies ) { - const FileLocation *generatedSourceFileName = GetActualSourceFilename ( sourceFile ); const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); string dependencies = extraDependencies; @@ -1401,9 +1309,7 @@ if ( rpcDependencies.size () > 0 ) dependencies += " " + v2s ( backend, rpcDependencies, 5 ); - rule->Execute ( fMakefile, backend, module, generatedSourceFileName, clean_files, dependencies, flags ); - - delete generatedSourceFileName; + rule->Execute ( fMakefile, backend, module, sourceFile, clean_files, dependencies, flags ); } string @@ -2348,8 +2254,6 @@ MingwModuleHandler::GeneratePreconditionDependencies () { string preconditionDependenciesName = GetPreconditionDependenciesName (); - vector<FileLocation> sourceFilenames; - GetSourceFilenamesWithoutGeneratedFiles ( sourceFilenames ); string_list dependencies; GetDefaultDependencies ( dependencies ); GetModuleDependencies ( dependencies ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Sun Jun 1 13:20:30 2008 @@ -84,7 +84,6 @@ virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); std::string GetWorkingDirectory () const; std::string GetBasename ( const std::string& filename ) const; - const FileLocation* GetActualSourceFilename ( const FileLocation* file ) const; std::string GetExtraDependencies ( const FileLocation *file ) const; std::string GetCompilationUnitDependencies ( const CompilationUnit& compilationUnit ) const; const FileLocation* GetModuleArchiveFilename () const; @@ -94,9 +93,6 @@ string_list& targets ); void GetModuleDependencies ( string_list& dependencies ); std::string GetAllDependencies () const; - void GetSourceFilenames ( std::vector<FileLocation>& list, - bool includeGeneratedFiles ) const; - void GetSourceFilenamesWithoutGeneratedFiles ( std::vector<FileLocation>& list ) const; const FileLocation* GetObjectFilename ( const FileLocation* sourceFile, const Module& module ) const;

1 0

[cfinck] 33818: Set svn:eol-style "native" for all apitest stuff
by cfinck＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: cfinck Date: Sun Jun 1 13:06:22 2008 New Revision: 33818 URL: http://svn.reactos.org/svn/reactos?rev=33818&view=rev Log: Set svn:eol-style "native" for all apitest stuff Modified: trunk/rostests/apitests/apitest.c (contents, props changed) trunk/rostests/apitests/apitest.h (contents, props changed) trunk/rostests/apitests/directory.rbuild (props changed) trunk/rostests/apitests/gdi32api/gdi.h (contents, props changed) trunk/rostests/apitests/gdi32api/gdi32api.c (contents, props changed) trunk/rostests/apitests/gdi32api/gdi32api.h (contents, props changed) trunk/rostests/apitests/gdi32api/gdi32api.rbuild (contents, props changed) trunk/rostests/apitests/gdi32api/testlist.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/CreateFont.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/CreatePen.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/CreateRectRgn.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/ExtCreatePen.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/GetDIBits.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/GetObject.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/GetStockObject.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/SelectObject.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c (contents, props changed) trunk/rostests/apitests/gdi32api/tests/SetSysColors.c (contents, props changed) trunk/rostests/apitests/user32api/testlist.c (contents, props changed) trunk/rostests/apitests/user32api/tests/ScrollDC.c (contents, props changed) trunk/rostests/apitests/user32api/tests/ScrollWindowEx.c (contents, props changed) trunk/rostests/apitests/user32api/user32api.c (contents, props changed) trunk/rostests/apitests/user32api/user32api.h (contents, props changed) trunk/rostests/apitests/user32api/user32api.rbuild (contents, props changed) trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetDIBits.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c (contents, props changed) trunk/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c (contents, props changed) trunk/rostests/apitests/w32knapi/resource.h (contents, props changed) trunk/rostests/apitests/w32knapi/testlist.c (contents, props changed) trunk/rostests/apitests/w32knapi/w32knapi.c (contents, props changed) trunk/rostests/apitests/w32knapi/w32knapi.h (contents, props changed) trunk/rostests/apitests/w32knapi/w32knapi.rbuild (contents, props changed) trunk/rostests/apitests/w32knapi/w32knapi.rc (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.c?rev=33… Modified: trunk/rostests/apitests/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=33… Modified: trunk/rostests/apitests/gdi32api/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi.h?r… Modified: trunk/rostests/apitests/gdi32api/gdi32api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi32ap… Modified: trunk/rostests/apitests/gdi32api/gdi32api.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi32ap… Modified: trunk/rostests/apitests/gdi32api/gdi32api.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi32ap… Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… Modified: trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/A… Modified: trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… Modified: trunk/rostests/apitests/gdi32api/tests/CreateFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… Modified: trunk/rostests/apitests/gdi32api/tests/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… Modified: trunk/rostests/apitests/gdi32api/tests/CreateRectRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… Modified: trunk/rostests/apitests/gdi32api/tests/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/E… Modified: trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… Modified: trunk/rostests/apitests/gdi32api/tests/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… Modified: trunk/rostests/apitests/gdi32api/tests/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… Modified: trunk/rostests/apitests/gdi32api/tests/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… Modified: trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… Modified: trunk/rostests/apitests/gdi32api/tests/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… Modified: trunk/rostests/apitests/user32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/testli… Modified: trunk/rostests/apitests/user32api/tests/ScrollDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… Modified: trunk/rostests/apitests/user32api/tests/ScrollWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… Modified: trunk/rostests/apitests/user32api/user32api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/user32… Modified: trunk/rostests/apitests/user32api/user32api.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/user32… Modified: trunk/rostests/apitests/user32api/user32api.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/user32… Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… Modified: trunk/rostests/apitests/w32knapi/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/resourc… Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… Modified: trunk/rostests/apitests/w32knapi/w32knapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… Modified: trunk/rostests/apitests/w32knapi/w32knapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap…

1 0

[jimtabor] 33817: Stefan Ginsberg <stefan__100__ at hotmail.com> - Move MetaFile stubs into Metafile.c.
by jimtabor＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: jimtabor Date: Sun Jun 1 12:47:46 2008 New Revision: 33817 URL: http://svn.reactos.org/svn/reactos?rev=33817&view=rev Log: Stefan Ginsberg <stefan__100__ at hotmail.com> - Move MetaFile stubs into Metafile.c. Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/metafile.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c [iso-8859-1] Sun Jun 1 12:47:46 2008 @@ -1,34 +1,35 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ */ + * PROJECT: ReactOS Win32k Subsystem + * LICENSE: GPL - See COPYING in the top level directory + * FILE: win32k/objects/metafile.c + * PURPOSE: Metafile Implementation + * PROGRAMMERS: ... + */ + +/* INCLUDES ******************************************************************/ #include <w32k.h> #define NDEBUG #include <debug.h> - -// -// -// Rewrite is in progress, this function is subject to change at any time. -// 04/30/2007 -// +/* System Service Calls ******************************************************/ + +/* + * @unimplemented + */ +LONG +APIENTRY +NtGdiConvertMetafileRect(IN HDC hDC, + IN OUT PRECTL pRect) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ HDC STDCALL NtGdiCreateMetafileDC(IN HDC hdc) @@ -236,5 +237,37 @@ #endif } +/* + * @unimplemented + */ +HANDLE +APIENTRY +NtGdiCreateServerMetaFile(IN DWORD iType, + IN ULONG cjData, + IN PBYTE pjData, + IN DWORD mm, + IN DWORD xExt, + IN DWORD yExt) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +ULONG +APIENTRY +NtGdiGetServerMetaFileBits(IN HANDLE hmo, + IN ULONG cjData, + OUT OPTIONAL PBYTE pjData, + OUT PDWORD piType, + OUT PDWORD pmm, + OUT PDWORD pxExt, + OUT PDWORD pyExt) +{ + UNIMPLEMENTED; + return 0; +} /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun Jun 1 12:47:46 2008 @@ -1650,24 +1650,6 @@ /* * @unimplemented */ -HANDLE -APIENTRY -NtGdiCreateServerMetaFile( - IN DWORD iType, - IN ULONG cjData, - IN LPBYTE pjData, - IN DWORD mm, - IN DWORD xExt, - IN DWORD yExt) -{ - UNIMPLEMENTED; - return NULL; -} - - - /* - * @unimplemented - */ HBITMAP APIENTRY NtGdiClearBitmapAttributes( @@ -1844,19 +1826,6 @@ { UNIMPLEMENTED; return FALSE; -} - - /* - * @unimplemented - */ -LONG -APIENTRY -NtGdiConvertMetafileRect( - IN HDC hdc, - IN OUT PRECTL prect) -{ - UNIMPLEMENTED; - return 0; } /* @@ -2433,24 +2402,6 @@ { UNIMPLEMENTED; return FALSE; -} - - /* - * @unimplemented - */ -ULONG -APIENTRY -NtGdiGetServerMetaFileBits( - IN HANDLE hmo, - IN ULONG cjData, - OUT OPTIONAL LPBYTE pjData, - OUT PDWORD piType, - OUT PDWORD pmm, - OUT PDWORD pxExt, - OUT PDWORD pyExt) -{ - UNIMPLEMENTED; - return 0; } /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs