Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 04:44:39 2008 New Revision: 36454 URL: http://svn.reactos.org/svn/reactos?rev=36454&view=rev Log: Minor 64bit fixes. Modified: branches/ros-amd64-bringup/reactos/dll/cpl/console/console.c Modified: branches/ros-amd64-bringup/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/console/console.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/console/console.c [iso-8859-1] Wed Sep 24 04:44:39 2008 @@ -12,7 +12,7 @@ #define WM_SETCONSOLE (WM_USER+10) -LONG APIENTRY InitApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +LONG APIENTRY InitApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK FontProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK LayoutProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

16 years, 3 months

[sserapion] 36453: Convert to spec.

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 04:41:42 2008 New Revision: 36453 URL: http://svn.reactos.org/svn/reactos?rev=36453&view=rev Log: Convert to spec. Added: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.spec (contents, props changed) - copied, changed from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.def Removed: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.def Modified: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.def (removed) @@ -1,9 +1,0 @@ -LIBRARY appwiz.cpl - -EXPORTS -CPlApplet@16 -;NewLinkHere@16 -;NewLinkHereA@16 -;NewLinkHereW@16 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.rbuild [iso-8859-1] Wed Sep 24 04:41:42 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="appwiz-new" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz-new.cpl" unicode="yes" allowwarnings="true"> - <importlibrary definition="appwiz.def" /> + <importlibrary definition="appwiz.spec.def" /> <include base="appwiz-new">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> @@ -19,4 +19,5 @@ <file>appwiz.c</file> <file>createlink.c</file> <file>appwiz.rc</file> + <file>appwiz.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.spec (from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.spec [iso-8859-1] Wed Sep 24 04:41:42 2008 @@ -1,9 +1,4 @@ -LIBRARY appwiz.cpl - -EXPORTS -CPlApplet@16 -;NewLinkHere@16 -;NewLinkHereA@16 -;NewLinkHereW@16 - -; EOF +@ stdcall CPlApplet(ptr long ptr ptr) +#@ stdcall NewLinkHere(ptr long ptr ptr) +#@ stdcall NewLinkHereA(ptr long ptr ptr) +#@ stdcall NewLinkHereW(ptr long ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz-new/appwiz.spec ------------------------------------------------------------------------------ svn:mergeinfo =

16 years, 3 months

[sserapion] 36452: Convert appwiz.cpl to spec

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 04:39:44 2008 New Revision: 36452 URL: http://svn.reactos.org/svn/reactos?rev=36452&view=rev Log: Convert appwiz.cpl to spec Added: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.spec (contents, props changed) - copied, changed from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.def Removed: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.def Modified: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.def (removed) @@ -1,9 +1,0 @@ -LIBRARY appwiz.cpl - -EXPORTS -CPlApplet@16 -NewLinkHere@16 -NewLinkHereA@16 -NewLinkHereW@16 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.rbuild [iso-8859-1] Wed Sep 24 04:39:44 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz.cpl" unicode="yes"> - <importlibrary definition="appwiz.def" /> + <importlibrary definition="appwiz.spec.def" /> <include base="appwiz">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> @@ -19,4 +19,5 @@ <file>createlink.c</file> <file>updates.c</file> <file>appwiz.rc</file> + <file>appwiz.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.spec (from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.spec [iso-8859-1] Wed Sep 24 04:39:44 2008 @@ -1,9 +1,4 @@ -LIBRARY appwiz.cpl - -EXPORTS -CPlApplet@16 -NewLinkHere@16 -NewLinkHereA@16 -NewLinkHereW@16 - -; EOF +@ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall NewLinkHere(ptr long ptr ptr) +@ stdcall NewLinkHereA(ptr long ptr ptr) +@ stdcall NewLinkHereW(ptr long ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/appwiz/appwiz.spec ------------------------------------------------------------------------------ svn:mergeinfo =

16 years, 3 months

[fireball] 36451: Juriy Sidorov <jura@cp-lab.com> - Fix existing font substitutions. - Add FreeMono as substitution for Courier and Courier New. - Optimize font substitution tables and make them easy to maintain. See issue #3483 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Sep 24 03:17:15 2008 New Revision: 36451 URL: http://svn.reactos.org/svn/reactos?rev=36451&view=rev Log: Juriy Sidorov <jura(a)cp-lab.com> - Fix existing font substitutions. - Add FreeMono as substitution for Courier and Courier New. - Optimize font substitution tables and make them easy to maintain. See issue #3483 for more details. Modified: trunk/reactos/base/setup/usetup/muifonts.h trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/media/inf/font.inf Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Wed Sep 24 03:17:15 2008 @@ -1,13 +1,14 @@ #ifndef LANG_MUI_FONTS_H__ #define LANG_MUI_FONTS_H__ -MUI_SUBFONT CP1250Fonts[] = +MUI_SUBFONT LatinFonts[] = { - /*Font Subtitle */ + /*Font Substitute */ - { L"Arial", L"Tahoma" }, - { L"Courier New", L"Tahoma" }, - { L"Times New Roman", L"Tahoma" }, + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Times New Roman", L"Liberation Serif" }, { L"Tahoma", L"Tahoma" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, @@ -16,11 +17,12 @@ { NULL, NULL } }; -MUI_SUBFONT CP1251Fonts[] = +MUI_SUBFONT CyrillicFonts[] = { - { L"Arial", L"Tahoma" }, - { L"Courier New", L"Tahoma" }, - { L"Times New Roman", L"Tahoma" }, + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Times New Roman", L"Liberation Serif" }, { L"Tahoma", L"Tahoma" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, @@ -29,172 +31,45 @@ { NULL, NULL } }; -MUI_SUBFONT CP1252Fonts[] = +MUI_SUBFONT GreekFonts[] = { - { L"Arial", L"Tahoma" }, - { L"Courier New", L"Tahoma" }, - { L"Times New Roman", L"Tahoma" }, - { L"Tahoma", L"Tahoma" }, - { L"MS Sans Serif", L"Tahoma" }, - { L"MS Shell Dlg", L"Tahoma" }, - { L"MS Shell Dlg 2", L"Tahoma" }, - { L"Helv", L"Tahoma" }, + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"DejaVu Sans" }, { NULL, NULL } }; -MUI_SUBFONT CP1253Fonts[] = +MUI_SUBFONT HebrewFonts[] = { - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Arial", L"DejaVu Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Times New Roman", L"DejaVu Serif" }, { L"Tahoma", L"DejaVu Sans" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, - { NULL, NULL } -}; - -MUI_SUBFONT CP1254Fonts[] = -{ - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, - { NULL, NULL } -}; - -MUI_SUBFONT CP1255Fonts[] = -{ - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, - { NULL, NULL } -}; - -MUI_SUBFONT CP1256Fonts[] = -{ - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, - { NULL, NULL } -}; - -MUI_SUBFONT CP1257Fonts[] = -{ - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, - { NULL, NULL } -}; - -MUI_SUBFONT CP1258Fonts[] = -{ - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, - { NULL, NULL } -}; - -MUI_SUBFONT CP874Fonts[] = -{ - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, - { NULL, NULL } -}; - -MUI_SUBFONT CP932Fonts[] = -{ - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, - { NULL, NULL } -}; - -MUI_SUBFONT CP936Fonts[] = -{ - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, - { NULL, NULL } -}; - -MUI_SUBFONT CP949Fonts[] = -{ - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, - { NULL, NULL } -}; - -MUI_SUBFONT CP950Fonts[] = -{ - { L"Arial", L"Liberation Sans" }, - { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, + { L"Helv", L"DejaVu Sans" }, { NULL, NULL } }; MUI_SUBFONT UnicodeFonts[] = { - { L"Arial", L"Liberation Sans" }, + { L"Arial", L"DejaVu Sans" }, + { L"Courier", L"DejaVu Sans Mono" }, { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"Liberation Serif" }, + { L"Times New Roman", L"DejaVu Serif" }, { L"Tahoma", L"DejaVu Sans" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"Liberation Sans" }, + { L"Helv", L"DejaVu Sans" }, { NULL, NULL } }; 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] Wed Sep 24 03:17:15 2008 @@ -134,144 +134,144 @@ 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 }, - {L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, caESLayouts }, - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", enUSPages, enUSErrorEntries, enUSStrings, CP950Fonts, zhTWLayouts }, - {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 }, - {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enGBLayouts }, - {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enAULayouts }, - {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enCALayouts }, - {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enNZLayouts }, - {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enIELayouts }, - {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enZALayouts }, - {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enJMLayouts }, - {L"00002409", L"1252", L"850", L"10000", L"English (Caribbean)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enCBLayouts }, - {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enBZLayouts }, - {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", enUSPages, enUSErrorEntries, enUSStrings, CP1252Fonts, enTTLayouts }, - {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 }, - {L"0000100A", L"1252", L"850", L"10000", L"Spanish (Guatemala)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esGTLayouts }, - {L"0000140A", L"1252", L"850", L"10000", L"Spanish (Costa Rica)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esCRLayouts }, - {L"0000180A", L"1252", L"850", L"10000", L"Spanish (Panama)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esPALayouts }, - {L"00001C0A", L"1252", L"850", L"10000", L"Spanish (Dominican Republic)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esDOLayouts }, - {L"0000200A", L"1252", L"850", L"10000", L"Spanish (Venezuela)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esVELayouts }, - {L"0000240A", L"1252", L"850", L"10000", L"Spanish (Colombia)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esCOLayouts }, - {L"0000280A", L"1252", L"850", L"10000", L"Spanish (Peru)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esPELayouts }, - {L"00002C0A", L"1252", L"850", L"10000", L"Spanish (Argentina)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esARLayouts }, - {L"0000300A", L"1252", L"850", L"10000", L"Spanish (Ecuador)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esECLayouts }, - {L"0000340A", L"1252", L"850", L"10000", L"Spanish (Chile)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esCLLayouts }, - {L"0000380A", L"1252", L"850", L"10000", L"Spanish (Uruguay)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esUYLayouts }, - {L"00003C0A", L"1252", L"850", L"10000", L"Spanish (Paraguay)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esPYLayouts }, - {L"0000400A", L"1252", L"850", L"10000", L"Spanish (Bolivia)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esBOLayouts }, - {L"0000440A", L"1252", L"850", L"10000", L"Spanish (El Salvador)", esESPages, esESErrorEntries, esESStrings, CP1252Fonts, esSVLayouts }, - {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 }, + /* 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, LatinFonts, afZALayouts }, + {L"0000041C", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, sqALLayouts }, + {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSALayouts }, + {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arIQLayouts }, + {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arEGLayouts }, + {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLYLayouts }, + {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arDZLayouts }, + {L"00001801", L"1256", L"720", L"10004", L"Arabic (Morocco)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arMALayouts }, + {L"00001C01", L"1256", L"720", L"10004", L"Arabic (Tunisia)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arTNLayouts }, + {L"00002001", L"1256", L"720", L"10004", L"Arabic (Oman)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arOMLayouts }, + {L"00002401", L"1256", L"720", L"10004", L"Arabic (Yemen)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arYELayouts }, + {L"00002801", L"1256", L"720", L"10004", L"Arabic (Syria)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSYLayouts }, + {L"00002C01", L"1256", L"720", L"10004", L"Arabic (Jordan)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arJOLayouts }, + {L"00003001", L"1256", L"720", L"10004", L"Arabic (Lebanon)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLBLayouts }, + {L"00003401", L"1256", L"720", L"10004", L"Arabic (Kuwait)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arKWLayouts }, + {L"00003801", L"1256", L"720", L"10004", L"Arabic (U.A.E.)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arAELayouts }, + {L"00003C01", L"1256", L"720", L"10004", L"Arabic (Bahrain)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arBHLayouts }, + {L"00004001", L"1256", L"720", L"10004", L"Arabic (Qatar)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, 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, CyrillicFonts, azAZLayouts }, + {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, azAZLayouts }, + {L"0000042D", L"1252", L"850", L"10000", L"Basque", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, euESLayouts }, + {L"00000423", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, beBYLayouts }, + {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, + {L"00000455", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, enUSLayouts }, + {L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, + {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhTWLayouts }, + {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhCNLayouts }, + {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhHKLayouts }, + {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhSGLayouts }, + {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhMOLayouts }, + {L"0000041A", L"1250", L"852", L"10029", L"Croatian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, + {L"00000405", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts, csCZLayouts }, + {L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, 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, LatinFonts, nlNLLayouts }, + {L"00000813", L"1252", L"850", L"10000", L"Dutch (Belgium)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nlBELayouts }, + {L"00000409", L"1252", L"437", L"10000", L"English (United States)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, + {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enGBLayouts }, + {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enAULayouts }, + {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCALayouts }, + {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enNZLayouts }, + {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enIELayouts }, + {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZALayouts }, + {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enJMLayouts }, + {L"00002409", L"1252", L"850", L"10000", L"English (Caribbean)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCBLayouts }, + {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enBZLayouts }, + {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enTTLayouts }, + {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZWLayouts }, + {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enPHLayouts }, + {L"00000425", L"1257", L"775", L"10029", L"Estonian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, etEELayouts }, + {L"00000438", L"1252", L"850", L"10079", L"Faeroese", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, foFOLayouts }, + {L"00000429", L"1256", L"720", L"10004", L"Farsi", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, faIRLayouts }, + {L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, fiFILayouts }, + {L"00000C0C", L"1252", L"850", L"10000", L"French (Canada)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCALayouts }, + {L"0000040C", L"1252", L"850", L"10000", L"French (France)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frFRLayouts }, + {L"0000080C", L"1252", L"850", L"10000", L"French (Belgium)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frBELayouts }, + {L"0000100C", L"1252", L"850", L"10000", L"French (Switzerland)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCHLayouts }, + {L"0000140C", L"1252", L"850", L"10000", L"French (Luxembourg)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frLULayouts }, + {L"0000180C", L"1252", L"850", L"10000", L"French (Monaco)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frMCLayouts }, + {L"00000456", L"1252", L"850", L"10000", L"Galician (Spain)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, 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, LatinFonts, deDELayouts }, + {L"00000807", L"1252", L"850", L"10000", L"German (Switzerland)", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deCHLayouts }, + {L"00000C07", L"1252", L"850", L"10000", L"German (Austria)", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deATLayouts }, + {L"00001007", L"1252", L"850", L"10000", L"German (Luxembourg)", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLULayouts }, + {L"00001407", L"1252", L"850", L"10000", L"German (Liechtenstein)", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLILayouts }, + {L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings, GreekFonts, 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, HebrewFonts, 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, LatinFonts, huHULayouts }, + {L"0000040F", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, isISLayouts }, + {L"00000421", L"1252", L"850", L"10079", L"Indonesian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, idIDLayouts }, + {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", itITPages, itITErrorEntries, itITStrings, LatinFonts, itITLayouts }, + {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, jaJPLayouts }, + {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, + {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, 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, UnicodeFonts, koKRLayouts }, + {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts }, + {L"00000426", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, lvLVLayouts }, + {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings, LatinFonts, ltLTLayouts }, + {L"0000042F", L"1251", L"866", L"10007", L"FYRO Macedonian", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mkMKLayouts }, + {L"0000083E", L"1252", L"850", L"10000", L"Malay (Brunei Darussalam)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, msBNLayouts }, + {L"0000043E", L"1252", L"850", L"10000", L"Malay (Malaysia)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, 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, CyrillicFonts, mnMNLayouts }, + {L"00000414", L"1252", L"850", L"10000", L"Norwegian (Bokmal)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nnNOLayouts }, + {L"00000814", L"1252", L"850", L"10000", L"Norwegian (Nynorsk)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nnNOLayouts }, + {L"00000415", L"1250", L"852", L"10029", L"Polish", plPLPages, plPLErrorEntries, plPLStrings, LatinFonts, plPLLayouts }, + {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptPTLayouts }, + {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, 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, LatinFonts, roROLayouts }, + {L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, ruRUStrings, CyrillicFonts, 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, CyrillicFonts, srSPLayouts }, + {L"0000081A", L"1250", L"852", L"10029", L"Serbian (Latin)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, srSPLayouts }, + {L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings, LatinFonts, skSKLayouts }, + {L"00000424", L"1250", L"852", L"10029", L"Slovenian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, slSILayouts }, + {L"0000040A", L"1252", L"850", L"10000", L"Spanish (Traditional Sort)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, + {L"0000080A", L"1252", L"850", L"10000", L"Spanish (Mexico)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esMXLayouts }, + {L"00000C0A", L"1252", L"850", L"10000", L"Spanish (International Sort)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, + {L"0000100A", L"1252", L"850", L"10000", L"Spanish (Guatemala)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esGTLayouts }, + {L"0000140A", L"1252", L"850", L"10000", L"Spanish (Costa Rica)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCRLayouts }, + {L"0000180A", L"1252", L"850", L"10000", L"Spanish (Panama)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPALayouts }, + {L"00001C0A", L"1252", L"850", L"10000", L"Spanish (Dominican Republic)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esDOLayouts }, + {L"0000200A", L"1252", L"850", L"10000", L"Spanish (Venezuela)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esVELayouts }, + {L"0000240A", L"1252", L"850", L"10000", L"Spanish (Colombia)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCOLayouts }, + {L"0000280A", L"1252", L"850", L"10000", L"Spanish (Peru)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPELayouts }, + {L"00002C0A", L"1252", L"850", L"10000", L"Spanish (Argentina)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esARLayouts }, + {L"0000300A", L"1252", L"850", L"10000", L"Spanish (Ecuador)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esECLayouts }, + {L"0000340A", L"1252", L"850", L"10000", L"Spanish (Chile)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCLLayouts }, + {L"0000380A", L"1252", L"850", L"10000", L"Spanish (Uruguay)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esUYLayouts }, + {L"00003C0A", L"1252", L"850", L"10000", L"Spanish (Paraguay)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPYLayouts }, + {L"0000400A", L"1252", L"850", L"10000", L"Spanish (Bolivia)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esBOLayouts }, + {L"0000440A", L"1252", L"850", L"10000", L"Spanish (El Salvador)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esSVLayouts }, + {L"0000480A", L"1252", L"850", L"10000", L"Spanish (Honduras)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esHNLayouts }, + {L"00004C0A", L"1252", L"850", L"10000", L"Spanish (Nicaragua)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esNILayouts }, + {L"0000500A", L"1252", L"850", L"10000", L"Spanish (Puerto Rico)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPRLayouts }, + {L"00000441", L"1252", L"437", L"10000", L"Swahili", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, swKELayouts }, + {L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svSELayouts }, + {L"0000081D", L"1252", L"850", L"10000", L"Swedish (Finland)", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, 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, CyrillicFonts, 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, UnicodeFonts, thTHLayouts }, + {L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, trTRLayouts }, + {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings, CyrillicFonts, ukUALayouts }, + {L"00000420", L"1256", L"720", L"10004", L"Urdu", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, urPKLayouts }, + {L"00000443", L"1254", L"857", L"10029", L"Uzbek (Latin)", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, uzUZLayouts }, + {L"00000843", L"1251", L"866", L"10007", L"Uzbek (Cyrillic)", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, uzUZLayouts }, + {L"0000042A", L"1258", L"1258",L"10000", L"Vietnamese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, viVNLayouts }, + {L"00000435", L"1252", L"850", L"10000", L"Zulu", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, {NULL, NULL, NULL, NULL, NULL, NULL} }; Modified: trunk/reactos/media/inf/font.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/font.inf?rev=364… ============================================================================== Binary files - no diff available.

16 years, 3 months

[fireball] 36450: - Make SmCreateUserProcess accept two flags: the old "wait for" one, and a new "reserve 1Mb" one. NT reserves lower 1MB of address space when starting a subsystem process. ReactOS should too, however right now this change is disabled (leads to boot problems).

by fireball＠svn.reactos.org

Author: fireball Date: Wed Sep 24 03:12:41 2008 New Revision: 36450 URL: http://svn.reactos.org/svn/reactos?rev=36450&view=rev Log: - Make SmCreateUserProcess accept two flags: the old "wait for" one, and a new "reserve 1Mb" one. NT reserves lower 1MB of address space when starting a subsystem process. ReactOS should too, however right now this change is disabled (leads to boot problems). Modified: trunk/reactos/base/system/smss/initrun.c trunk/reactos/base/system/smss/smapiexec.c trunk/reactos/base/system/smss/smss.h Modified: trunk/reactos/base/system/smss/initrun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initrun.c… ============================================================================== --- trunk/reactos/base/system/smss/initrun.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initrun.c [iso-8859-1] Wed Sep 24 03:12:41 2008 @@ -80,8 +80,8 @@ /* Create NT process */ Status = SmCreateUserProcess (ImagePath, - CommandLine, - TRUE, /* wait */ + CommandLine, + SM_CREATE_FLAG_WAIT, NULL, NULL); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/base/system/smss/smapiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapiexec… ============================================================================== --- trunk/reactos/base/system/smss/smapiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapiexec.c [iso-8859-1] Wed Sep 24 03:12:41 2008 @@ -22,8 +22,10 @@ * ARGUMENTS * ImagePath: absolute path of the image to run; * CommandLine: arguments and options for ImagePath; - * WaitForIt: TRUE for boot time processes and FALSE for - * subsystems bootstrapping; + * Flags: Wait flag: Set for boot time processes and unset for + * subsystems bootstrapping; + * 1Mb reserve flag: Set for subsystems, unset for everything +* else * Timeout: optional: used if WaitForIt==TRUE; * ProcessHandle: optional: a duplicated handle for the child process (storage provided by the caller). @@ -35,7 +37,7 @@ NTSTATUS STDCALL SmCreateUserProcess (LPWSTR ImagePath, LPWSTR CommandLine, - BOOLEAN WaitForIt, + ULONG Flags, PLARGE_INTEGER Timeout OPTIONAL, PRTL_USER_PROCESS_INFORMATION UserProcessInfo OPTIONAL) { @@ -106,7 +108,12 @@ __FUNCTION__, Status); return Status; } - +#ifdef ROS_DOESNT_SUCK + /* Reserve lower 1Mb, if requested */ + if (Flags & SM_CREATE_FLAG_RESERVE_1MB) + ProcessParameters->Flags |= RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB; +#endif + /* Create the user process */ Status = RtlCreateUserProcess (& ImagePathString, OBJ_CASE_INSENSITIVE, ProcessParameters, @@ -141,7 +148,7 @@ } /* Wait for process termination */ - if (WaitForIt) + if (Flags & SM_CREATE_FLAG_WAIT) { Status = NtWaitForSingleObject (pProcessInfo->ProcessHandle, FALSE, @@ -151,13 +158,13 @@ DPRINT1("SM: %s: NtWaitForSingleObject failed with Status=0x%08lx\n", __FUNCTION__, Status); } - - } - if (NULL == UserProcessInfo) - { - NtClose(pProcessInfo->ProcessHandle); - NtClose(pProcessInfo->ThreadHandle); - } + } + + if (NULL == UserProcessInfo) + { + NtClose(pProcessInfo->ProcessHandle); + NtClose(pProcessInfo->ThreadHandle); + } return Status; } @@ -230,9 +237,9 @@ Request->SmHeader.Status = SmCreateUserProcess(ImagePath, CommandLine, - FALSE, /* wait */ - NULL, /* timeout */ - & ProcessInfo); + SM_CREATE_FLAG_RESERVE_1MB, + NULL, /* timeout */ + & ProcessInfo); if (NT_SUCCESS(Request->SmHeader.Status)) { Status = SmCreateClient (& ProcessInfo, Name); Modified: trunk/reactos/base/system/smss/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.h?re… ============================================================================== --- trunk/reactos/base/system/smss/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.h [iso-8859-1] Wed Sep 24 03:12:41 2008 @@ -61,9 +61,11 @@ /* smapiexec.c */ +#define SM_CREATE_FLAG_WAIT 0x01 +#define SM_CREATE_FLAG_RESERVE_1MB 0x02 NTSTATUS STDCALL SmCreateUserProcess(LPWSTR ImagePath, LPWSTR CommandLine, - BOOLEAN WaitForIt, + ULONG Flags, PLARGE_INTEGER Timeout OPTIONAL, PRTL_USER_PROCESS_INFORMATION UserProcessInfo OPTIONAL); NTSTATUS FASTCALL SmExecPgm(PSM_PORT_MESSAGE);

16 years, 3 months

[amunger] 36449: Remove a overzealous check. MSDN says to avoid calling with NumberOfBytes == 0, but it is valid. Addresses bug 3715.

by amunger＠svn.reactos.org

Author: amunger Date: Wed Sep 24 02:52:19 2008 New Revision: 36449 URL: http://svn.reactos.org/svn/reactos?rev=36449&view=rev Log: Remove a overzealous check. MSDN says to avoid calling with NumberOfBytes == 0, but it is valid. Addresses bug 3715. Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=364… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Wed Sep 24 02:52:19 2008 @@ -36,8 +36,6 @@ PVOID Block; PCHAR TagChars = (PCHAR)&Tag; - if (NumberOfBytes == 0) - KeBugCheckEx(BAD_POOL_CALLER, 0x00, 0, PoolType, Tag); if (Tag == 0) KeBugCheckEx(BAD_POOL_CALLER, 0x9b, PoolType, NumberOfBytes, (ULONG_PTR)Caller); if (Tag == TAG('B','I','G',0))

16 years, 3 months

[sserapion] 36448: Sorry, these are DialogBoxParams.:(

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 02:33:48 2008 New Revision: 36448 URL: http://svn.reactos.org/svn/reactos?rev=36448&view=rev Log: Sorry, these are DialogBoxParams.:( Modified: branches/ros-amd64-bringup/reactos/base/system/winlogon/sas.c branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.c branches/ros-amd64-bringup/reactos/base/system/winlogon/wlx.c Modified: branches/ros-amd64-bringup/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/winlogon/sas.c [iso-8859-1] Wed Sep 24 02:33:48 2008 @@ -505,7 +505,7 @@ return STATUS_SUCCESS; } -static LRESULT CALLBACK +static INT_PTR CALLBACK ShutdownComputerWindowProc( IN HWND hwndDlg, IN UINT uMsg, Modified: branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Wed Sep 24 02:33:48 2008 @@ -185,7 +185,7 @@ return Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); } -static LRESULT CALLBACK +static INT_PTR CALLBACK GinaLoadFailedWindowProc( IN HWND hwndDlg, IN UINT uMsg, Modified: branches/ros-amd64-bringup/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/winlogon/wlx.c [iso-8859-1] Wed Sep 24 02:33:48 2008 @@ -23,7 +23,7 @@ /* FUNCTIONS ****************************************************************/ -static LRESULT CALLBACK +static INT_PTR CALLBACK DefaultWlxWindowProc( IN HWND hwndDlg, IN UINT uMsg,

16 years, 3 months

[sserapion] 36447: Fix 64bit warnings/errors.

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 00:08:25 2008 New Revision: 36447 URL: http://svn.reactos.org/svn/reactos?rev=36447&view=rev Log: Fix 64bit warnings/errors. Modified: branches/ros-amd64-bringup/reactos/base/system/smss/client.c branches/ros-amd64-bringup/reactos/base/system/smss/initss.c branches/ros-amd64-bringup/reactos/base/system/smss/smapicomp.c Modified: branches/ros-amd64-bringup/reactos/base/system/smss/client.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/smss/client.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/smss/client.c [iso-8859-1] Wed Sep 24 00:08:25 2008 @@ -451,7 +451,7 @@ SmpClientDirectory.CandidateClient->ServerProcess = (HANDLE) ProcessInfo->ProcessHandle; SmpClientDirectory.CandidateClient->ServerProcessId = - (ULONG) ProcessInfo->ClientId.UniqueProcess; + (DWORD_PTR) ProcessInfo->ClientId.UniqueProcess; /* * Copy the program name */ Modified: branches/ros-amd64-bringup/reactos/base/system/smss/initss.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/smss/initss.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/smss/initss.c [iso-8859-1] Wed Sep 24 00:08:25 2008 @@ -57,8 +57,8 @@ RtlZeroMemory (& ProcessInfo, sizeof ProcessInfo); ProcessInfo.Size = sizeof ProcessInfo; - ProcessInfo.ProcessHandle = (HANDLE) SmSsProcessId; - ProcessInfo.ClientId.UniqueProcess = (HANDLE) SmSsProcessId; + ProcessInfo.ProcessHandle = (HANDLE) UlongToPtr(SmSsProcessId); + ProcessInfo.ClientId.UniqueProcess = (HANDLE) UlongToPtr(SmSsProcessId); DPRINT("SM: %s: ProcessInfo.ProcessHandle=%p\n", __FUNCTION__,ProcessInfo.ProcessHandle); Status = SmCreateClient (& ProcessInfo, PgmName); Modified: branches/ros-amd64-bringup/reactos/base/system/smss/smapicomp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/smss/smapicomp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/smss/smapicomp.c [iso-8859-1] Wed Sep 24 00:08:25 2008 @@ -40,7 +40,7 @@ DPRINT("SM: %s: ClientId.UniqueProcess=%p\n", __FUNCTION__, Request->Header.ClientId.UniqueProcess); - Status = SmCompleteClientInitialization ((ULONG) Request->Header.ClientId.UniqueProcess); + Status = SmCompleteClientInitialization (PtrToUlong(Request->Header.ClientId.UniqueProcess)); if (!NT_SUCCESS(Status)) { DPRINT1("SM: %s: SmCompleteClientInitialization failed (Status=0x%08lx)\n",

16 years, 3 months

[sserapion] 36446: It is blasphemy to say that DLGPROC returns BOOL.

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 00:06:55 2008 New Revision: 36446 URL: http://svn.reactos.org/svn/reactos?rev=36446&view=rev Log: It is blasphemy to say that DLGPROC returns BOOL. Modified: branches/ros-amd64-bringup/reactos/base/system/winlogon/sas.c branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.c branches/ros-amd64-bringup/reactos/base/system/winlogon/wlx.c Modified: branches/ros-amd64-bringup/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/winlogon/sas.c [iso-8859-1] Wed Sep 24 00:06:55 2008 @@ -505,7 +505,7 @@ return STATUS_SUCCESS; } -static BOOL CALLBACK +static LRESULT CALLBACK ShutdownComputerWindowProc( IN HWND hwndDlg, IN UINT uMsg, Modified: branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Wed Sep 24 00:06:55 2008 @@ -185,7 +185,7 @@ return Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); } -static BOOL CALLBACK +static LRESULT CALLBACK GinaLoadFailedWindowProc( IN HWND hwndDlg, IN UINT uMsg, Modified: branches/ros-amd64-bringup/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/winlogon/wlx.c [iso-8859-1] Wed Sep 24 00:06:55 2008 @@ -23,7 +23,7 @@ /* FUNCTIONS ****************************************************************/ -static BOOL CALLBACK +static LRESULT CALLBACK DefaultWlxWindowProc( IN HWND hwndDlg, IN UINT uMsg,

16 years, 3 months

[sserapion] 36445: Minor 64bit fixes.

by sserapion＠svn.reactos.org

Author: sserapion Date: Tue Sep 23 23:36:35 2008 New Revision: 36445 URL: http://svn.reactos.org/svn/reactos?rev=36445&view=rev Log: Minor 64bit fixes. Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] Tue Sep 23 23:36:35 2008 @@ -307,10 +307,10 @@ ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL); - TRACE ("RunFile: ShellExecuteA/W returned %d\n", (DWORD)ret); + TRACE ("RunFile: ShellExecuteA/W returned %p\n", (DWORD_PTR)ret); FreeLibrary(hShell32); - return (((DWORD)ret) > 32); + return (((DWORD_PTR)ret) > 32); }

16 years, 3 months

← Newer
1
...
13
14
15
16
17
18
19
...
75
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008